HUE-145. Launching HUE help app after closing it fails

* removing errant .orig file * changing usage of the deprecated .destroyed property on widgets to the .isDestroyed() method * fixing the showHelp launcher
subtleGradient · Aug 12, 2010 · bda50b2 · bda50b2
1 parent c330fd4
commit bda50b2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/apps/help/src/help/static/js/Source/Help/Help.js b/apps/help/src/help/static/js/Source/Help/Help.js
@@ -44,6 +44,6 @@ var Help = new Class({
 				return path.replace('/help/', '');
 			}
 		});
-		if (!CCS.Desktop.helpInstance || CCS.Desktop.helpInstance.destroyed) CCS.Desktop.helpInstance = this;
+		if (!CCS.Desktop.helpInstance || CCS.Desktop.helpInstance.isDestroyed()) CCS.Desktop.helpInstance = this;
 	}
 });
diff --git a/desktop/core/static/js/Source/CCS/CCS.Desktop.js b/desktop/core/static/js/Source/CCS/CCS.Desktop.js
@@ -297,7 +297,7 @@ CCS.Desktop = {
 			instances.each(function(instance) {
 				//if it has a serialize method and it's not destroyed
 				//store its serialization
-				if (instance.serialize && !instance.destroyed) state[component].push(instance.serialize());
+				if (instance.serialize && !instance.isDestroyed()) state[component].push(instance.serialize());
 			});
 		});
 		//return the object of all the states
@@ -528,8 +528,13 @@ CCS.Desktop = {
 
 	showHelp: function(componentOrInstance, url) {
 		var data = this.getBootstrap(componentOrInstance) || {};
-		if (this.healthInstance && !this.healthInstance.destroyed && data.help) this.healthInstance.load({ requestPath: url || data.help }).focus();
-		else this.healthInstance = CCS.Desktop.launch('Help', data.help);
+		if (this.healthInstance && !this.healthInstance.isDestroyed() && (url || data.help)) {
+			this.healthInstance.load({ requestPath: url || data.help }).focus();
+		} else {
+			CCS.Desktop.launch('Help', data.help, function(instance) {
+				if (instance) this.healthInstance = instance;
+			}.bind(this));
+		}
 	}
 
 };

diff --git a/ext/thirdparty/js/art-widgets.hash b/ext/thirdparty/js/art-widgets.hash
@@ -1 +1 @@
-9bbccdd1056faa716874312dff00264293388f1a
+64154fa1c0dce2a58654fcd308f17ac538b54c1a
diff --git a/ext/thirdparty/js/art-widgets.hash.orig b/ext/thirdparty/js/art-widgets.hash.orig