Merge pull request #104 from SemanticMediaWiki/ajax-icon1

ajax set icon #92
ProfessionalWiki · Aug 25, 2016 · fac4b2b · fac4b2b
2 parents 74accb4 + a0e44e3
commit fac4b2b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/ext.sm.common.js b/src/ext.sm.common.js
@@ -28,7 +28,7 @@ window.sm = new ( function( $, mw ) {
         } );
     };
 
-    this.ajaxUpdateMarker = function( map, query ) {
+    this.ajaxUpdateMarker = function( map, query, icon ) {
         return this.sendQuery(query).done( function( data ) {
             if ( !data.hasOwnProperty( 'query' ) ||
                     !data.query.hasOwnProperty( 'results' )) {
@@ -45,7 +45,8 @@ window.sm = new ( function( $, mw ) {
                         lat: coordinates.lat,
                         lon: coordinates.lon,
                         title: location.fulltext,
-                        text: '<b><a href="' + location.fullurl + '">' + location.fulltext + '</a></b>'
+                        text: '<b><a href="' + location.fullurl + '">' + location.fulltext + '</a></b>',
+                        icon: icon
                     };
                     map.addMarker( markerOptions );
                 }

diff --git a/src/services/GoogleMaps3/ext.sm.googlemaps3ajax.js b/src/services/GoogleMaps3/ext.sm.googlemaps3ajax.js
@@ -36,7 +36,7 @@
                         if ( ajaxRequest !== null ) {
                             ajaxRequest.abort();
                         }
-                        ajaxRequest = sm.ajaxUpdateMarker( map, query ).done( function () {
+                        ajaxRequest = sm.ajaxUpdateMarker( map, query, map.options.icon ).done( function () {
                             map.createMarkerCluster();
                             ajaxRequest = null;
                         } );

diff --git a/src/services/Leaflet/ext.sm.leafletajax.js b/src/services/Leaflet/ext.sm.leafletajax.js
@@ -33,7 +33,7 @@
                     if ( ajaxRequest !== null ) {
                         ajaxRequest.abort();
                     }
-                    ajaxRequest = sm.ajaxUpdateMarker( map, query ).done( function () {
+                    ajaxRequest = sm.ajaxUpdateMarker( map, query, map.options.icon ).done( function () {
                         map.createMarkerCluster();
                         ajaxRequest = null;
                     } );

diff --git a/src/services/OpenLayers/ext.sm.openlayersajax.js b/src/services/OpenLayers/ext.sm.openlayersajax.js
@@ -31,7 +31,7 @@
                     if ( ajaxRequest !== null ) {
                         ajaxRequest.abort();
                     }
-                    ajaxRequest = sm.ajaxUpdateMarker( map, query ).done( function () {
+                    ajaxRequest = sm.ajaxUpdateMarker( map, query, map.options.icon ).done( function () {
                         ajaxRequest = null;
                     } );
                 } );