Merge branch 'joomla3' of https://github.com/Fabrik/fabrik into joomla3

Fabrik · Mar 7, 2016 · 2a32704 · 2a32704
2 parents 73af45e + e5d388d
commit 2a32704
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 17 deletions.
diff --git a/media/com_fabrik/js/elementlist-min.js b/media/com_fabrik/js/elementlist-min.js
diff --git a/media/com_fabrik/js/elementlist.js b/media/com_fabrik/js/elementlist.js
@@ -91,7 +91,8 @@ FbElementList = new Class({
 				this.form.events[action][uid] = true;
 
 				jQuery(c).on(action, delegate, function (event) {
-					event.preventDefault();
+					// Changed from preventDefault() to stopPropagation() as the former prevents radios from selecting
+					event.stopPropagation();
 					// Don't use the usual jQuery this, as we need to bind the plugin as 'this' to the event.
 					var target = jQuery(event.currentTarget), elid, that, subEls;
 					if (target.prop('tagName') === 'LABEL') {

diff --git a/plugins/fabrik_element/googlemap/forms/fields.xml b/plugins/fabrik_element/googlemap/forms/fields.xml
@@ -17,6 +17,7 @@
 					<option value="G_SATELLITE_MAP">PLG_ELEMENT_GOOGLE_MAP_SATELITE</option>
 					<option value="G_HYBRID_MAP">PLG_ELEMENT_GOOGLE_MAP_HYBRID</option>
 					<option value="TERRAIN">PLG_ELEMENT_GOOGLE_MAP_TERRAIN</option>
+					<option value="OSM">PLG_ELEMENT_GOOGLE_MAP_OSM</option>
 			</field>
 
 			<field name="fb_gm_zoomlevel"