[fusion-commits] r1550 - in trunk: MapGuide lib

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-09-24 14:32:55 -0400 (Wed, 24 Sep 2008)
New Revision: 1550

Modified:
   trunk/MapGuide/MapGuide.js
   trunk/lib/Map.js
Log:
closes #132: patch applied to trunk

Modified: trunk/MapGuide/MapGuide.js
===================================================================
--- trunk/MapGuide/MapGuide.js	2008-09-24 18:29:07 UTC (rev 1549)
+++ trunk/MapGuide/MapGuide.js	2008-09-24 18:32:55 UTC (rev 1550)
@@ -313,7 +313,7 @@
                 this.oLayerOL.destroy();
             }
 
-            this.oLayerOL = this.createOLLayer(this._sMapname, true, this.bSingleTile);
+            this.oLayerOL = this.createOLLayer(this._sMapname, true, this.bSingleTile,2);
             this.oLayerOL.events.register("loadstart", this, this.loadStart);
             this.oLayerOL.events.register("loadend", this, this.loadEnd);
             this.oLayerOL.events.register("loadcancel", this, this.loadEnd);
@@ -533,13 +533,17 @@
      */
     createOLLayer: function(layerName, bIsBaseLayer, bSingleTile, behaviour) {
       var layerOptions = {
-        units : this.units,
-        isBaseLayer : bIsBaseLayer,
-        maxExtent : this._oMaxExtent,
-        maxResolution : 'auto',
-        ratio : this.ratio,
-        transitionEffect : 'resize'
+        units: this.units,
+        isBaseLayer: bIsBaseLayer,
+        maxExtent: this._oMaxExtent,
+        maxResolution: 'auto',
+        useOverlay: this.selectionAsOverlay,
+        ratio: this.ratio
+//        transitionEffect : 'resize'
       };
+      if (!/WebKit/.test(navigator.userAgent)) {
+        layerOptions.transitionEffect = 'resize';
+      }
 
       //add in scales array if supplied
       if (this.scales && this.scales.length>0) {

Modified: trunk/lib/Map.js
===================================================================
--- trunk/lib/Map.js	2008-09-24 18:29:07 UTC (rev 1549)
+++ trunk/lib/Map.js	2008-09-24 18:32:55 UTC (rev 1550)
@@ -159,6 +159,7 @@
         //register for OL map extent change events
         this.oMapOL.events.register('moveend', this, this.mapExtentsChanged);
         
+        this._oDomObj.onselectstart = function() {return false;};
         this._oDomObj.oncontextmenu = function() {return false;};
         OpenLayers.Event.observe(this._oDomObj, 'contextmenu', 
                             OpenLayers.Function.bind(this.onContextMenu, this));