Attachment 235404 Details for Bug 377777 – work in progress

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

[patch] work in progress

file_377777.txt (text/plain), 2.15 KB, created by Silenio Quarti

on 2013-09-11 16:11:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Silenio Quarti

Created: 2013-09-11 16:11:58 EDT

Size: 2.15 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js b/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js
>index 51a0ee7..98f6c50 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/commandRegistry.js
>@@ -250,9 +250,9 @@
> 		 * because the command framework will open and close parameter collectors as needed and 
> 		 * call the command callback with the values of those parameters.
> 		 */
>-		closeParameterCollector: function() {
>+		closeParameterCollector: function(toolbarId) {
> 			if (this._parameterCollector) {
>-				this._parameterCollector.close();
>+				this._parameterCollector.close(toolbarId);
> 			}
> 		},
> 		
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
>index efd42a6..0f60be9 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
>@@ -129,7 +129,7 @@
> 		}
> 		// close any open slideouts because if we are retargeting the command
> 		if (toolbarItem.Location !== lastItemLoaded.Location) {
>-			commandRegistry.closeParameterCollector();
>+			commandRegistry.closeParameterCollector(toolbarId);
> 			lastItemLoaded.Location = toolbarItem.Location;
> 		}
> 
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/parameterCollectors.js b/bundles/org.eclipse.orion.client.ui/web/orion/parameterCollectors.js
>index bdd733c..4caac9e 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/parameterCollectors.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/parameterCollectors.js
>@@ -37,8 +37,11 @@
> 	
> 	CommandParameterCollector.prototype = /** @lends orion.parametercollectors.CommandParameterCollector.prototype */ {
> 	
>-		close: function () {
>+		close: function (toolbarId) {
> 			if (this._activeElements) {
>+				if (toolbarId && this._activeElements.toolbar && this._activeElements.toolbar.id !== toolbarId) {
>+					return;
>+				}
> 				if (this._activeElements.parameterArea) {
> 					lib.empty(this._activeElements.parameterArea);
> 				}

Actions: View | Diff

Attachments on bug 377777: 235404