[fusion-commits] r1539 - trunk/MapGuide

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-09-16 16:05:23 -0400 (Tue, 16 Sep 2008)
New Revision: 1539

Modified:
   trunk/MapGuide/MapGuide.js
Log:
re #65: patch applied to trunk

Modified: trunk/MapGuide/MapGuide.js
===================================================================
--- trunk/MapGuide/MapGuide.js	2008-09-16 18:14:11 UTC (rev 1538)
+++ trunk/MapGuide/MapGuide.js	2008-09-16 20:05:23 UTC (rev 1539)
@@ -94,7 +94,12 @@
           }
         }
        
-        this.sMapResourceId = mapTag.resourceId ? mapTag.resourceId : '';
+        var newTheme = Fusion.getQueryParam('theme');
+        if (newTheme != '') {
+          this.sMapResourceId = newTheme;
+        } else {
+          this.sMapResourceId = mapTag.resourceId ? mapTag.resourceId : '';
+        }
         
         rootOpts = {
           displayInLegend: this.bDisplayInLegend,
@@ -314,6 +319,7 @@
             this.oLayerOL.events.register("loadcancel", this, this.loadEnd);
             
             //this is to distinguish between a regular map and an overview map
+            this.bMapLoaded = true;
             if (this.bIsMapWidgetLayer) {
               this.mapWidget.addMap(this);
               this.mapWidget.oMapOL.setBaseLayer(this.oLayerOL);
@@ -323,7 +329,6 @@
             } else {
               this.triggerEvent(Fusion.Event.MAP_LOADED);
             }
-            this.bMapLoaded = true;
         }
         this.mapWidget._removeWorker();
     },