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

Timestamp:

Nov 1, 2010, 5:58:25 PM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] fix bug with pamooramic...

File:

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

extensions/Autosize/js/conflit.js

@@ -1 +1 @@
 //==== autosize  remplace $(... avec jQuery( ====
 var d1 = 0;
-var init_tb = 0;
-
-jQuery(window).load(function () {
-    if (jQuery("#theImage").css("position") == "relative") {
-        //==== compatibilité Gally/LLGBO ===
-        //--- passage relative ==> static ===/
-        jQuery("#theImage").css("position", "static");
-    }
-    tp = typeof (Browser);
-    if (tp !="undefined")
-        if (Browser.loaded == true) {
-            n = Browser;
-        }
-    });
-
-
-    function $(element, nc) {
+var init_tb = 0;             
+
+
+ function $(element, nc) {
+                  return conflit(element, nc);
+              }
+
+jQuery(document).ready(
+
+      function (jQuery) {
+
+
+
+           tpj = jQuery("#pamoorama");
+          if (tpj.length > 0) {             }
+          jQuery(window).load(function () {
+              if (jQuery("#theImage").css("position") == "relative") {
+                  //==== compatibilité Gally/LLGBO ===
+                  //--- passage relative ==> static ===/
+                  jQuery("#theImage").css("position", "static");
+              }
+
+
+              tp = typeof (Browser);
+              if (tp != "undefined")
+                  if (Browser.loaded == true) {
+                      n = Browser;
+                  }
+                  function $(element, nc) {
+                      return conflit(element, nc);
+                  }
+             
+          });
+
+      })
+;
+    function conflit(element, nc) {
         //============== détection framework ==================
         var tp1 = typeof (MooTools);
@@ -203 +223 @@
         }
         //========== test jQuery ? ==============
-
+        if (tpe == "string")
+            if (element.match(RegExp("^#", "g")) ) {
+                return new_element;
+            }
         if (jq.match(RegExp("^#", "g")) || jq == "html") {
             return new_element;