diff options
| author | Eric Moffatt <emoffatt@ca.ibm.com> | 2015-06-25 14:44:36 -0400 |
|---|---|---|
| committer | Anthony Hunter <anthonyh@ca.ibm.com> | 2015-06-26 14:41:14 -0400 |
| commit | 0eb94ca1ec1dfeb304ac8ff2b66e99e8b646b5b5 (patch) | |
| tree | ce76664b05e8e098f5e15a4aba7b36e72b433cdb | |
| parent | 07a50239e5b436599f02ee80a76f36c2b3ee49ee (diff) | |
| download | org.eclipse.orion.client-origin/stable_20150622.zip org.eclipse.orion.client-origin/stable_20150622.tar.gz org.eclipse.orion.client-origin/stable_20150622.tar.bz2 | |
Bug 470842 - [Rename] Hitting rename when already in rename causes unexpected behaviororigin/stable_20150622
| -rw-r--r-- | bundles/org.eclipse.orion.client.javascript/web/javascript/commands/renameCommand.js | 1 | ||||
| -rw-r--r-- | bundles/org.eclipse.orion.client.ui/web/orion/editorView.js | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/commands/renameCommand.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/commands/renameCommand.js index caa9b34..402265f 100644 --- a/bundles/org.eclipse.orion.client.javascript/web/javascript/commands/renameCommand.js +++ b/bundles/org.eclipse.orion.client.javascript/web/javascript/commands/renameCommand.js @@ -49,6 +49,7 @@ define([ } var groups = [{data: {}, positions: offsets}]; var linkModel = {groups: groups}; + deferred.resolve(cachedContext.exitLinkedMode()); deferred.resolve(cachedContext.enterLinkedMode(linkModel)); } deferred.resolve(); diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js b/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js index 418e33b..aa9e1f3 100644 --- a/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js +++ b/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js @@ -542,6 +542,9 @@ define([ contextImpl.enterLinkedMode = function(linkedModeModel) {
editor.getLinkedMode().enterLinkedMode(linkedModeModel);
};
+ contextImpl.exitLinkedMode = function(escapePosition) {
+ editor.getLinkedMode().exitLinkedMode(escapePosition);
+ };
/**
* @description Opens the given location
* @function
|