[Mapbender-commits] r8992 - in trunk/mapbender: http/plugins lib

[svn_mapbender at osgeo.org]

Author: hwbllmnn
Date: 2014-07-07 04:34:03 -0700 (Mon, 07 Jul 2014)
New Revision: 8992

Modified:
   trunk/mapbender/http/plugins/mb_digitize_widget.php
   trunk/mapbender/lib/mb.ui.displayKmlFeatures.js
Log:
fixed a few null dereference bugs


Modified: trunk/mapbender/http/plugins/mb_digitize_widget.php
===================================================================
--- trunk/mapbender/http/plugins/mb_digitize_widget.php	2014-07-04 14:00:42 UTC (rev 8991)
+++ trunk/mapbender/http/plugins/mb_digitize_widget.php	2014-07-07 11:34:03 UTC (rev 8992)
@@ -187,8 +187,10 @@
         }
         var active = $(this)[0].status == 1 && $(this)[0] != btnelem;
 
-        if(active) {
-            $('#mapframe1').data('mb_digitize').isPaused = false;
+        var dig = $('#mapframe1').data('mb_digitize');
+
+        if(active && dig) {
+            dig.isPaused = false;
         }
     });
 

Modified: trunk/mapbender/lib/mb.ui.displayKmlFeatures.js
===================================================================
--- trunk/mapbender/lib/mb.ui.displayKmlFeatures.js	2014-07-04 14:00:42 UTC (rev 8991)
+++ trunk/mapbender/lib/mb.ui.displayKmlFeatures.js	2014-07-07 11:34:03 UTC (rev 8992)
@@ -404,6 +404,9 @@
         this.cache = {};
         var $map = $(this.element).mapbender();
         var itm = this._kmls[url];
+        if(!itm) {
+            return;
+        }
         this.element.trigger('kml:loaded',{type:"geojson",data:itm.data,url:itm.url,display: itm.display, refreshing: true});
         $map.setMapRequest();
     },