[Mapbender-commits] r8916 - in trunk/mapbender/http: extensions/fontIconPicker-2.0.0 plugins

[svn_mapbender at osgeo.org]

Author: hwbllmnn
Date: 2014-05-28 02:23:05 -0700 (Wed, 28 May 2014)
New Revision: 8916

Modified:
   trunk/mapbender/http/extensions/fontIconPicker-2.0.0/jquery.fonticonpicker.js
   trunk/mapbender/http/plugins/mb_digitize_widget.php
Log:
fixed icon selection in picker


Modified: trunk/mapbender/http/extensions/fontIconPicker-2.0.0/jquery.fonticonpicker.js
===================================================================
--- trunk/mapbender/http/extensions/fontIconPicker-2.0.0/jquery.fonticonpicker.js	2014-05-28 08:23:51 UTC (rev 8915)
+++ trunk/mapbender/http/extensions/fontIconPicker-2.0.0/jquery.fonticonpicker.js	2014-05-28 09:23:05 UTC (rev 8916)
@@ -395,7 +395,7 @@
 			/**
 			 * On icon selected
 			 */
-			this.iconContainer.bind('click', '.fip-box', $.proxy(function (e) {
+			this.iconContainer.delegate('.fip-box', 'click', $.proxy(function (e) {
 				this.setSelectedIcon($(e.currentTarget).find('i').attr('data-fip-value'));
 				this.toggleIconSelector();
 			}, this));

Modified: trunk/mapbender/http/plugins/mb_digitize_widget.php
===================================================================
--- trunk/mapbender/http/plugins/mb_digitize_widget.php	2014-05-28 08:23:51 UTC (rev 8915)
+++ trunk/mapbender/http/plugins/mb_digitize_widget.php	2014-05-28 09:23:05 UTC (rev 8916)
@@ -263,18 +263,11 @@
             iconList = [],
             search = [];
 
-        // For each icon
         $.each(icons.icons, function(i, v) {
             iconList.push( classPrefix + v.properties.name );
-
-            if ( v.icon && v.icon.tags && v.icon.tags.length ) {
-                search.push( v.properties.name + ' ' + v.icon.tags.join(' ') );
-            } else {
-                search.push( v.properties.name );
-            }
         });
 
-        editStyleDialog.find('.digitize-style-predefined input[name="marker-symbol"]').fontIconPicker({source: iconList, searchSource: search, emptyIcon: false});
+        editStyleDialog.find('.digitize-style-predefined input[name="marker-symbol"]').fontIconPicker({source: iconList, hasSearch: false, emptyIcon: false});
 
         return function() {
             editStyleDialog.dialog('open');