jQuery noconflict compatibility / deprecated jQuery.msie

1 files changed, 9 insertions, 9 deletions

diff --git a/gmap_arcgis.js b/gmap_arcgis.js
index b3816ca..34e8f12 100644
--- a/gmap_arcgis.js
+++ b/gmap_arcgis.js
@@ -60,7 +60,7 @@ function gmapArcgis(config) {
 
       if (window.blockUI.length == 0) {
         if (this.config.overlaySelector != undefined) {
-          $(this.config.overlaySelector).unblock();
+          jQuery(this.config.overlaySelector).unblock();
         }
         else {
           jQuery.unblockUI();
@@ -82,7 +82,7 @@ function gmapArcgis(config) {
         window.blockUI[params.name] = true;
 
         if (this.config.overlaySelector != undefined) {
-          $(this.config.overlaySelector).block(params);
+          jQuery(this.config.overlaySelector).block(params);
         }
         else {
           jQuery.blockUI(params);
@@ -96,7 +96,7 @@ function gmapArcgis(config) {
         return;
       }
 
-      if ($.browser.msie === false || $.browser.msie === undefined) {
+      //if (jQuery.browser.msie === false || jQuery.browser.msie === undefined) {
         message = this.config.overlayMessage;
 
         if (this.config.overlayCss != undefined) {
@@ -117,7 +117,7 @@ function gmapArcgis(config) {
         }
 
         this.blockUI(params);
-      }
+      //}
     },
 
     // Show overlay dependending on element configuration
@@ -555,7 +555,7 @@ function gmapArcgis(config) {
       var step  = (self.config.sliders[slider].step  != undefined) ? self.config.sliders[slider].step  : 1;
 
       if (type == 'selectToUISlider') {
-        $(element).selectToUISlider({
+        jQuery(element).selectToUISlider({
           sliderOptions: {
             slide: function(event, ui) {
               self.sliderUpdate.apply(self, [ ui.value - 1, slider ]);
@@ -565,7 +565,7 @@ function gmapArcgis(config) {
       }
       else {
         // Max is the number of layers in the service
-        $(element).slider({
+        jQuery(element).slider({
             value:   value,
             min:     min,
             max:     max,
@@ -614,8 +614,8 @@ function gmapArcgis(config) {
       var FIT_PAD = 40;
 
       for (var zoom = MAX_ZOOM; zoom >= MIN_ZOOM; --zoom) {
-        if (worldCoordWidth  * (1 << zoom) + 2 * FIT_PAD < $(map.getDiv()).width() &&
-            worldCoordHeight * (1 << zoom) + 2 * FIT_PAD < $(map.getDiv()).height()) {
+        if (worldCoordWidth  * (1 << zoom) + 2 * FIT_PAD < jQuery(map.getDiv()).width() &&
+            worldCoordHeight * (1 << zoom) + 2 * FIT_PAD < jQuery(map.getDiv()).height()) {
               return zoom;
             }
       }
@@ -716,7 +716,7 @@ function gmapArcgis(config) {
 
         // A closure here keeps the right layer to the async response
         (function(layer, args) {
-          $.ajax({
+          jQuery.ajax({
             type: 'get',
             url: url,
             dataType: 'jsonp',