Merge pull request #4878 from lkcampbell/fix-issue-4778

Fix issue 4778: Do not show Active Line Highlight when editor has selection
adobe · Aug 23, 2013 · 5829ef7 · 5829ef7
2 parents 55e0995 + aea644d
commit 5829ef7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/editor/Editor.js b/src/editor/Editor.js
@@ -249,7 +249,25 @@ define(function (require, exports, module) {
             }
         }
     }
-
+
+    /**
+     * @private
+     * Handle any cursor movement in editor, including selecting and unselecting text.
+     * @param {jQueryObject} jqEvent jQuery event object
+     * @param {Editor} editor Current, focused editor (main or inline)
+     * @param {!Event} event
+     */
+    function _handleCursorActivity(jqEvent, editor, event) {
+        // If there is a selection in the editor, temporarily hide Active Line Highlight
+        if (editor.hasSelection()) {
+            if (editor._codeMirror.getOption("styleActiveLine")) {
+                editor._codeMirror.setOption("styleActiveLine", false);
+            }
+        } else {
+            editor._codeMirror.setOption("styleActiveLine", _styleActiveLine);
+        }
+    }
+
     function _handleKeyEvents(jqEvent, editor, event) {
         _checkElectricChars(jqEvent, editor, event);
 
@@ -382,6 +400,7 @@ define(function (require, exports, module) {
         this._installEditorListeners();
 
         $(this)
+            .on("cursorActivity", _handleCursorActivity)
             .on("keyEvent", _handleKeyEvents)
             .on("change", this._handleEditorChange.bind(this));
 
@@ -1550,10 +1569,15 @@ 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.setShowActiveLine = function (value, editor) {
         _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
@@ -29,6 +29,7 @@ define(function (require, exports, module) {
 
     var AppInit                 = require("utils/AppInit"),
         Editor                  = require("editor/Editor").Editor,
+        EditorManager           = require("editor/EditorManager"),
         Commands                = require("command/Commands"),
         CommandManager          = require("command/CommandManager"),
         Strings                 = require("strings");
@@ -48,7 +49,7 @@ define(function (require, exports, module) {
      * Activates/Deactivates showing active line option
      */
     function _toggleActiveLine() {
-        Editor.setShowActiveLine(!Editor.getShowActiveLine());
+        Editor.setShowActiveLine(!Editor.getShowActiveLine(), EditorManager.getCurrentFullEditor());
         CommandManager.get(Commands.TOGGLE_ACTIVE_LINE).setChecked(Editor.getShowActiveLine());
     }