[fusion-commits] r1591 - in branches/fusion-1.1: MapGuide widgets

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-10-10 11:24:02 -0400 (Fri, 10 Oct 2008)
New Revision: 1591

Modified:
   branches/fusion-1.1/MapGuide/MapGuide.js
   branches/fusion-1.1/widgets/Help.js
   branches/fusion-1.1/widgets/TaskPane.js
Log:
re #126: remove default params from TaskPane and add to Help widget; other widgets already add the necessary params;
fix error with mapName param for queryLayer

Modified: branches/fusion-1.1/MapGuide/MapGuide.js
===================================================================
--- branches/fusion-1.1/MapGuide/MapGuide.js	2008-10-10 14:01:27 UTC (rev 1590)
+++ branches/fusion-1.1/MapGuide/MapGuide.js	2008-10-10 15:24:02 UTC (rev 1591)
@@ -508,7 +508,7 @@
       if ( bSingleTile ) {
         params = {        //single tile params
           session: this.getSessionID(),
-          mapname: this._sMapname,
+          mapName: this._sMapname,
           clientagent: this.clientAgent
         };
         params.showLayers = this.aShowLayers.length > 0 ? this.aShowLayers.toString() : null;

Modified: branches/fusion-1.1/widgets/Help.js
===================================================================
--- branches/fusion-1.1/widgets/Help.js	2008-10-10 14:01:27 UTC (rev 1590)
+++ branches/fusion-1.1/widgets/Help.js	2008-10-10 15:24:02 UTC (rev 1591)
@@ -63,6 +63,19 @@
     
     execute : 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: branches/fusion-1.1/widgets/TaskPane.js
===================================================================
--- branches/fusion-1.1/widgets/TaskPane.js	2008-10-10 14:01:27 UTC (rev 1590)
+++ branches/fusion-1.1/widgets/TaskPane.js	2008-10-10 15:24:02 UTC (rev 1591)
@@ -153,19 +153,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;