[Mapbender-commits] r9911 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2018-06-06 01:49:54 -0700 (Wed, 06 Jun 2018)
New Revision: 9911

Modified:
   trunk/mapbender/http/javascripts/mod_changeEPSG.php
   trunk/mapbender/http/javascripts/mod_pan.js
Log:
Bugfixes for problems which occur while when a user pan the map.

Modified: trunk/mapbender/http/javascripts/mod_changeEPSG.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_changeEPSG.php	2018-05-28 12:48:51 UTC (rev 9910)
+++ trunk/mapbender/http/javascripts/mod_changeEPSG.php	2018-06-06 08:49:54 UTC (rev 9911)
@@ -243,14 +243,16 @@
 			//
 			if (newExtent[i].frameName === myTarget){
 				var map = $("#" + myTarget).mapbender();
+                
+                if (map.mb_MapHistoryObj) {
+                    for (var ii = 0; ii < map.mb_MapHistoryObj.length; ii++) {
+                        if (map.mb_MapHistoryObj[ii].epsg == newExtent[i].newSrs) {
+                            exists = ii;
+                            var goback = true;
+                        }
+                    }
+                }
 
-				for (var ii = 0; ii < map.mb_MapHistoryObj.length; ii++) {
-					if (map.mb_MapHistoryObj[ii].epsg == newExtent[i].newSrs) {
-						exists = ii;
-						var goback = true;
-					}
-				}
-
 				if (goback) {
 					var extArray = map.mb_MapHistoryObj[exists].extent.toString().split(",");
 					var newExt = new Extent(

Modified: trunk/mapbender/http/javascripts/mod_pan.js
===================================================================
--- trunk/mapbender/http/javascripts/mod_pan.js	2018-05-28 12:48:51 UTC (rev 9910)
+++ trunk/mapbender/http/javascripts/mod_pan.js	2018-06-06 08:49:54 UTC (rev 9911)
@@ -34,7 +34,7 @@
 	var map = Mapbender.modules[options.target];
 
 
-    var mousedown = function (e) {
+    var movestart = function (e) {
         mb_panActive = true;
         startPos = map.getMousePosition(e);
         stopPos = new Point(startPos);
@@ -41,7 +41,7 @@
         return false;
     };
 
-    var mousemove = function (e) {
+    var move = function (e) {
         if (!mb_panActive) {
             return false;
         }
@@ -54,7 +54,7 @@
         return false;
     };
 
-    var mouseup = function (e) {
+    var moveend = function (e) {
         if (!mb_panActive) {
             return false;
         }
@@ -72,7 +72,7 @@
         map.moveMap();
         map.zoom(false, 1.0, realCenter);   
         return false;
-    }; 
+    };
 
 	var button = new Mapbender.Button({
 		domElement: that,
@@ -88,9 +88,10 @@
 			}
 			$(map.getDomElement())
 				.css("cursor", "move")
-				.mousedown(mousedown)
-                .mousemove(mousemove)
-                .mouseup(mouseup);
+				.mousedown(movestart)
+                .mousemove(move)
+                .mouseup(moveend)
+                .mouseleave(moveend);
 		},
 		stop: function () {
 			if (!map) {
@@ -98,10 +99,16 @@
 			}
 			$(map.getDomElement())
 				.css("cursor", "default")
-				.unbind("mousedown", mousedown)
-				.unbind("mouseup", mouseup)
-				.unbind("mousemove", mousemove);
+				.unbind("mousedown", movestart)
+                .unbind("mousemove", move)
+				.unbind("mouseup", moveend)
+                .unbind("mouseleave", moveend);
 			mb_panActive = false;
 		}
 	});
+    
+    // deactivate if ui-dialog opens
+    $(document).bind('dialogopen', function () {
+        button.stop();
+    });
 });