Changeset 18716 for extensions/Autosize/js/conflit.js

Timestamp:

Oct 22, 2012, 4:47:26 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, add option: SelMax / Autosize (default setting)

File:

• extensions/Autosize/js/conflit.js (modified) (5 diffs)

extensions/Autosize/js/conflit.js

@@ -5 +5 @@
 var OS, version;
 //==============================================================================
-browser = detect_browser();
+var browser = detect_browser();
 image_w = 600;
 image_h = 400
+var pamoorama_detect = true;
 
 function detect_browser() {
@@ -491 +492 @@
     $.ajax = function (args) {
       return jQuery.ajax(args);
-    }
+    }   
 }
    
@@ -506 +507 @@
 
     if (typeof (Parent) == "undefined")
-        Parent = "#theImage";
+      Parent = "#theImage";
+        if(typeof jQuery(Parent).infos=="function"){
   info_image = jQuery(Parent).infos();
   p0 = jQuery(Parent);
@@ -525 +527 @@
       } catch (e) {
       }
-
+    }
     }
   }
@@ -537 +539 @@
     //=================================================
     if (typeof jQuery.fn.infos != "function") {
-      jQuery = myjQuery;
+     try{ jQuery = myjQuery;
       $ = my$;
+      }catch(e){
+
+      }
     }
   });