[Mapbender-commits] r8985 - in trunk/mapbender/http: plugins widgets

[svn_mapbender at osgeo.org]

Author: hwbllmnn
Date: 2014-07-04 04:58:18 -0700 (Fri, 04 Jul 2014)
New Revision: 8985

Modified:
   trunk/mapbender/http/plugins/mb_digitize_widget.php
   trunk/mapbender/http/widgets/w_digitize.js
Log:
fixed bugs when switching tools


Modified: trunk/mapbender/http/plugins/mb_digitize_widget.php
===================================================================
--- trunk/mapbender/http/plugins/mb_digitize_widget.php	2014-07-04 08:04:52 UTC (rev 8984)
+++ trunk/mapbender/http/plugins/mb_digitize_widget.php	2014-07-04 11:58:18 UTC (rev 8985)
@@ -177,10 +177,21 @@
         name: 'kml-digitizer-pseudo',
         go: $.noop,
         stop: function() {
-            that.deactivate();
+            $('#mapframe1').data('mb_digitize').isPaused = true;
         }
     });
 
+    $('body > img').bind('click', function() {
+        if(!inProgress) {
+            return;
+        }
+        var active = $(this)[0].status == 1 && $(this)[0] != btnelem;
+
+        if(active) {
+            $('#mapframe1').data('mb_digitize').isPaused = false;
+        }
+    });
+
     var create = function() {
         $.ajax({
             url: '../extensions/makiicons/selection.json',
@@ -725,10 +736,8 @@
     };
 
     this.activate = function () {
-        if(!btnelem[0].status === 1) {
-            mb_disableButton('img');
-            btnelem[0].status = 1;
-        }
+        $('#kml-digitizer-pseudo').click();
+
         var mode = status.match(/(new|edit)-.+/)[1];
 
         if(mode === 'new') {

Modified: trunk/mapbender/http/widgets/w_digitize.js
===================================================================
--- trunk/mapbender/http/widgets/w_digitize.js	2014-07-04 08:04:52 UTC (rev 8984)
+++ trunk/mapbender/http/widgets/w_digitize.js	2014-07-04 11:58:18 UTC (rev 8985)
@@ -325,6 +325,10 @@
     },
 
     _addPoint: function (e) {
+        if(this.isPaused) {
+            return;
+        }
+
         var mousePos = this._map.getMousePosition(e);
 
         var len = this._digitizePoints.length;