correctly exit linked mode when up arrow pressed

aclement · Jan 26, 2012 · 4c1bbb9 · 4c1bbb9
1 parent b480e19
commit 4c1bbb9
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/editorFeatures.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/editorFeatures.js
@@ -928,16 +928,20 @@ function(mUndoStack, mKeyBinding, mRulers, mAnnotations, mTextDND, mRegex) {
 		isStatusActive: function() {
 			return this.linkedModeActive;
 		},
+		lineUp: function() {
+			this.cancel(false);
+			return false;
+		},
 		lineDown: function() {
-		    this.cancel();
-		    return true;
+			this.cancel(true);
+			return true;
 		},
 		enter: function() {
-			this.cancel();
+			this.cancel(true);
 			return true;
 		},
-		/** Exits Linked Mode. Places the caret at linkedModeEscapePosition. */
-		cancel: function() {
+		/** Exits Linked Mode. Optionally places the caret at linkedModeEscapePosition. */
+		cancel: function(placeCaret) {
 			if (!this.linkedModeActive) {
 				return;
 			}
@@ -946,8 +950,10 @@ function(mUndoStack, mKeyBinding, mRulers, mAnnotations, mTextDND, mRegex) {
 			this.textView.setKeyBinding(new mKeyBinding.KeyBinding(9), "tab");
 			this.textView.setKeyBinding(new mKeyBinding.KeyBinding(9, false, true), null);
 
-			this.textView.setCaretOffset(this.linkedModeEscapePosition, false);
-
+			if (placeCaret===true) {
+				this.textView.setCaretOffset(this.linkedModeEscapePosition, false);
+			}
+
 			this.editor.reportStatus("Linked Mode exited");
 		},
 		/**