Attachment 232609 Details for Bug 411286 – Fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Fix

file_411286.txt (text/plain), 2.63 KB, created by Bogdan Gheorghe

on 2013-06-20 14:09:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bogdan Gheorghe

Created: 2013-06-20 14:09:47 EDT

Size: 2.63 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/vi.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/vi.js
>index 5820cb0..90bd206 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/vi.js
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/vi.js
>@@ -473,12 +473,12 @@
> 	mixin(StatusLineMode.prototype, /** @lends orion.editor.viMode.StatusLineMode.prototype */ {
> 		createKeyBindings: function() {
> 			var bindings = [];
>-			bindings.push({actionID: "cancel",		keyBinding: createStroke(27), predefined: true}); //$NON-NLS-0$
>+			bindings.push({actionID: "vi-:-ESC",		keyBinding: createStroke(27), predefined: true}); //$NON-NLS-0$
> 			return bindings;
> 		},
> 		_createActions: function(view) {
> 			var self = this;
>-			view.setAction("cancel", function() { //$NON-NLS-0$
>+			view.setAction("vi-:-ESC", function() { //$NON-NLS-0$
> 				view.removeKeyMode(self);
> 				view.addKeyMode(self.viMode);
> 				return true;
>@@ -508,7 +508,7 @@
> 	mixin(EditMode.prototype, /** @lends orion.editor.viMode.EditMode.prototype */ {
> 		createKeyBindings: function() {
> 			var bindings = NumberMode.prototype.createKeyBindings.call(this);
>-			bindings.push({actionID: "cancel",		keyBinding: createStroke(27), predefined: true}); //$NON-NLS-0$
>+			bindings.push({actionID: "vi-"+this.key+"ESC",		keyBinding: createStroke(27), predefined: true});//$NON-NLS-1$ //$NON-NLS-0$
> 			bindings.push({actionID: "vi-"+this.key+"-"+this.key,	keyBinding: createStroke(this.key, false, false, false, false, "keypress")});//$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
> 			return bindings;
> 		},
>@@ -560,7 +560,7 @@
> 		_createActions: function(view) {
> 			NumberMode.prototype._createActions.call(this, view);
> 			var self = this;
>-			view.setAction("cancel", function() { //$NON-NLS-0$
>+			view.setAction("vi-"+self.key+"ESC", function() { //$NON-NLS-1$ //$NON-NLS-0$
> 				view.removeKeyMode(self);
> 				view.addKeyMode(self.viMode);
> 				return true;
>@@ -594,12 +594,12 @@
> 	mixin(InsertMode.prototype, /** @lends orion.editor.viMode.InsertMode.prototype */ {
> 		createKeyBindings: function() {
> 			var bindings = [];
>-			bindings.push({actionID: "cancel",		keyBinding: createStroke(27), predefined: true}); //$NON-NLS-0$
>+			bindings.push({actionID: "vi-insert-ESC",		keyBinding: createStroke(27), predefined: true}); //$NON-NLS-0$
> 			return bindings;
> 		},
> 		_createActions: function(view) {
> 			var self = this;
>-			view.setAction("cancel", function() { //$NON-NLS-0$
>+			view.setAction("vi-insert-ESC", function() { //$NON-NLS-0$
> 				view.removeKeyMode(self);
> 				view.addKeyMode(self.viMode);
> 				return true;

Actions: View

Attachments on bug 411286: 232609