[fusion-commits] r1592 - trunk/widgets

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-10-10 11:26:57 -0400 (Fri, 10 Oct 2008)
New Revision: 1592

Modified:
   trunk/widgets/Help.js
   trunk/widgets/TaskPane.js
Log:
closes #126: patch applied to trunk

Modified: trunk/widgets/Help.js
===================================================================
--- trunk/widgets/Help.js	2008-10-10 15:24:02 UTC (rev 1591)
+++ trunk/widgets/Help.js	2008-10-10 15:26:57 UTC (rev 1592)
@@ -61,6 +61,19 @@
     
     activate: function() {
         var url = this.baseUrl;
+        
+        var map = this.getMap();
+        var params = [];
+        params.push('LOCALE='+Fusion.locale);
+        params.push('SESSION='+map.getSessionID());
+        params.push('MAPNAME='+map.getMapName());
+        if (url.indexOf('?') < 0) {
+            url += '?';
+        } else if (url.slice(-1) != '&') {
+            url += '&';
+        }
+        url += params.join('&');
+        
         /* check to see if this is going into a task pane */
         var taskPaneTarget = Fusion.getWidgetById(this.target);
         if ( taskPaneTarget ) {

Modified: trunk/widgets/TaskPane.js
===================================================================
--- trunk/widgets/TaskPane.js	2008-10-10 15:24:02 UTC (rev 1591)
+++ trunk/widgets/TaskPane.js	2008-10-10 15:26:57 UTC (rev 1592)
@@ -144,19 +144,6 @@
             this.aExecutedTasks.splice(this.nCurrentTask, this.aExecutedTasks.length - this.nCurrentTask);
         }
         
-        //add in default Fusion parameters to the URL
-        var map = this.getMap();
-        var params = [];
-        params.push('LOCALE='+Fusion.locale);
-        params.push('SESSION='+map.getSessionID());
-        params.push('MAPNAME='+map.getMapName());
-        if (url.indexOf('?') < 0) {
-            url += '?';
-        } else if (url.slice(-1) != '&') {
-            url += '&';
-        }
-        url += params.join('&');
-        
         this.aExecutedTasks.push(url);
         ++this.nCurrentTask;
         this.iframe.src = url;