Merge pull request #4927 from lkcampbell/unit-test-4778

RaymondLim · RaymondLim · commit a3b84f9e544a · 2013-08-26T15:39:40.000-07:00
Fix unit test failure from pull request #4878. Added unit test for hiding Active Line highlight when editor has selection.
diff --git a/src/editor/Editor.js b/src/editor/Editor.js
@@ -1478,6 +1478,14 @@ define(function (require, exports, module) {
     function _setEditorOption(value, cmOption) {
         _instances.forEach(function (editor) {
             editor._codeMirror.setOption(cmOption, value);
+            
+            // If there is a selection in the editor, temporarily hide Active Line Highlight
+            if ((cmOption === "styleActiveLine") && (value === true)) {
+                if (editor.hasSelection()) {
+                    editor._codeMirror.setOption("styleActiveLine", false);
+                }
+            }
+            
             $(editor).triggerHandler("optionChange", [cmOption, value]);
         });
     }
@@ -1569,15 +1577,10 @@ define(function (require, exports, module) {
     /**
      * Sets show active line option and reapply it to all open editors.
      * @param {boolean} value
-     * @param {Editor} editor Current, focused editor (main or inline)
      */
-    Editor.setShowActiveLine = function (value, editor) {
+    Editor.setShowActiveLine = function (value) {
         _styleActiveLine = value;
         _setEditorOptionAndPref(value, "styleActiveLine", "styleActiveLine");
-        
-        if (editor.hasSelection()) {
-            editor._codeMirror.setOption("styleActiveLine", false);
-        }
     };
     
     /** @type {boolean} Returns true if show active line is enabled for all editors */
diff --git a/src/editor/EditorOptionHandlers.js b/src/editor/EditorOptionHandlers.js
@@ -49,7 +49,7 @@ define(function (require, exports, module) {
      * Activates/Deactivates showing active line option
      */
     function _toggleActiveLine() {
-        Editor.setShowActiveLine(!Editor.getShowActiveLine(), EditorManager.getCurrentFullEditor());
+        Editor.setShowActiveLine(!Editor.getShowActiveLine());
         CommandManager.get(Commands.TOGGLE_ACTIVE_LINE).setChecked(Editor.getShowActiveLine());
     }
     
diff --git a/test/spec/EditorOptionHandlers-test.js b/test/spec/EditorOptionHandlers-test.js
@@ -121,6 +121,13 @@ define(function (require, exports, module) {
             });
         }
         
+        function checkActiveLineOption(editor, shouldBe) {
+            runs(function () {
+                expect(editor).toBeTruthy();
+                expect(editor._codeMirror.getOption("styleActiveLine")).toBe(shouldBe);
+            });
+        }
+        
         function checkLineNumbers(editor, shouldShow) {
             runs(function () {
                 var gutterElement, $lineNumbers;
@@ -270,6 +277,16 @@ define(function (require, exports, module) {
                 });
             });
             
+            it("should have the active line option be FALSE when the editor has a selection", function () {
+                openEditor(CSS_FILE);
+                
+                runs(function () {
+                    var editor = EditorManager.getCurrentFullEditor();
+                    editor.setSelection({line: 0, ch: 0}, {line: 0, ch: 1});
+                    checkActiveLineOption(editor, false);
+                });
+            });
+            
             it("should style the active line when opening another document with show active line on", function () {
                 openEditor(CSS_FILE);
                 openAnotherEditor(HTML_FILE);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ define(function (require, exports, module) {`
`49`	`49`	`* Activates/Deactivates showing active line option`
`50`	`50`	`*/`
`51`	`51`	`function _toggleActiveLine() {`
`52`		`- Editor.setShowActiveLine(!Editor.getShowActiveLine(), EditorManager.getCurrentFullEditor());`
	`52`	`+ Editor.setShowActiveLine(!Editor.getShowActiveLine());`
`53`	`53`	`CommandManager.get(Commands.TOGGLE_ACTIVE_LINE).setChecked(Editor.getShowActiveLine());`
`54`	`54`	`}`
`55`	`55`