[fusion-commits] r2474 - in trunk: lib widgets

[svn_fusion at osgeo.org]

Author: liuar
Date: 2011-12-01 02:04:17 -0800 (Thu, 01 Dec 2011)
New Revision: 2474

Modified:
   trunk/lib/Widget.js
   trunk/widgets/TaskPane.js
Log:
on behalf of libr(Bruce li)

Issues:
The 'go to previous task executed' button does not work well.

Reason:
The function of loading task panel of specified widget was called more than once, which call themselves because of incorrect logic.


Modified: trunk/lib/Widget.js
===================================================================
--- trunk/lib/Widget.js	2011-12-01 05:44:31 UTC (rev 2473)
+++ trunk/lib/Widget.js	2011-12-01 10:04:17 UTC (rev 2474)
@@ -119,9 +119,11 @@
         if (uiObj.addEvents) {
             if (Fusion.Widget.uiInstances[this.type][0].uiObj &&
                 Fusion.Widget.uiInstances[this.type][0].uiObj.options.active &&
-                Fusion.Widget.uiInstances[this.type][0].shouldActivateWith(this) &&
-                uiObj.setActive) {
-                uiObj.setActive(true);
+                Fusion.Widget.uiInstances[this.type][0].shouldActivateWith(this)) {
+                uiObj.options.active = true;
+                if (uiObj.domA) {
+                    uiObj.domA.addClass('jx' + uiObj.options.type + 'Active');
+                }
             }
             
             uiObj.addEvents({
@@ -132,9 +134,11 @@
                     var instances = Fusion.Widget.uiInstances[this.type];
                     for (var i=0; i<instances.length; i++) {
                         var instance = instances[i];
-                        if (instance.shouldActivateWith(this) &&
-                            instance.uiObj && instance.uiObj.setActive) {
-                            instance.uiObj.setActive(false);
+                        if (instance.shouldActivateWith(this) && instance.uiObj) {
+                            instance.uiObj.options.active = false;
+                            if (instance.uiObj.domA) {
+                                instance.uiObj.domA.removeClass('jx' + instance.uiObj.options.type + 'Active');
+                            }
                         }
                     }
                     this.deactivate();
@@ -143,9 +147,11 @@
                     var instances = Fusion.Widget.uiInstances[this.type];
                     for (var i=0; i<instances.length; i++) {
                         var instance = instances[i];
-                        if (instance.shouldActivateWith(this) &&
-                            instance.uiObj && instance.uiObj.setActive) {
-                            instance.uiObj.setActive(true);
+                        if (instance.shouldActivateWith(this) && instance.uiObj) {
+                            instance.uiObj.options.active = true;
+                            if (instance.uiObj.domA) {
+                                instance.uiObj.domA.addClass('jx' + instance.uiObj.options.type + 'Active');
+                            }                            
                         }
                     }
                     this.activate();

Modified: trunk/widgets/TaskPane.js
===================================================================
--- trunk/widgets/TaskPane.js	2011-12-01 05:44:31 UTC (rev 2473)
+++ trunk/widgets/TaskPane.js	2011-12-01 10:04:17 UTC (rev 2474)
@@ -157,7 +157,7 @@
 
     setInitialContent: function(url) {
         this.aExecutedTasks = [];
-        this.nCurrentTask = 0;
+        this.nCurrentTask = -1;
         this.setContent(url);
     },