[Mapbender-commits] r9047 - trunk/mapbender/http/plugins

[svn_mapbender at osgeo.org]

Author: hwbllmnn
Date: 2014-08-13 01:43:01 -0700 (Wed, 13 Aug 2014)
New Revision: 9047

Modified:
   trunk/mapbender/http/plugins/mb_digitize_widget.php
Log:
always extract style info from inputs when saving


Modified: trunk/mapbender/http/plugins/mb_digitize_widget.php
===================================================================
--- trunk/mapbender/http/plugins/mb_digitize_widget.php	2014-08-13 08:16:56 UTC (rev 9046)
+++ trunk/mapbender/http/plugins/mb_digitize_widget.php	2014-08-13 08:43:01 UTC (rev 9047)
@@ -373,10 +373,13 @@
             var url = $link.parent().parent().attr('title');
             var feature = kml._kmls[url].data.features[idx];
             var isline = false;
+            var ispoint = false;
 
+
             kml.zoomToFeature(url, idx);
 
             if(feature.geometry.type.match(/point/i)) {
+                ispoint = true;
                 editStyleDialog.find('input[name*="fill"],input[name*="stroke"],.opacity-slider').parent().parent().css('display', 'none');
                 editStyleDialog.find('input[name*="marker"]').parent().parent().css('display', 'table-row');
                 if(feature.properties['marker-type'] === 'custom') {
@@ -390,6 +393,7 @@
                 }
             }
             if(feature.geometry.type.match(/line/i)) {
+                isline = true;
                 editStyleDialog.find('input[name*="fill"],input[name*="marker"],.opacity-slider[data-name="fill-opacity"]').parent().parent().css('display', 'none');
                 editStyleDialog.find('input[name*="stroke"],.opacity-slider[data-name="stroke-opacity"]').parent().parent().css('display', 'table-row');
                 editStyleDialog.find('.digitize-style-custom').css('display', 'block');
@@ -439,6 +443,10 @@
                     return;
                 }
 
+                if(!ispoint && $(this).attr('name').match(/marker/)) {
+                    return;
+                }
+
                 if($(this).attr('name') === 'stroke-width') {
                     var val = $(this).val();
                     if(!(!isNaN(parseFloat(val)) && isFinite(val)) || $(this).val() <= 0) {
@@ -483,7 +491,7 @@
             editStyleDialog.find('input[name="fill"]').spectrum();
             editStyleDialog.find('input[name="stroke"]').spectrum();
             editStyleDialog.find('input[name="marker-color"]').spectrum();
-            editStyleDialog.find('input[name="marker-symbol"]').change();
+            editStyleDialog.find('input').change();
             if(menu)
                 menu.menu('destroy').remove();
         };