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

Timestamp:

Nov 10, 2010, 9:36:16 AM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] fix bugs.

File:

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

extensions/Autosize/js/conflit.js

@@ -21 +21 @@
 if (retour.match(RegExp("jQuery", "gi"))) {
         ret_element = jQuery(element);
+    } else if (retour.match(RegExp("GMaps", "gi"))) {
+        ret_element = jQuery(element);
     } else if (retour.match(RegExp("pamooramics", "gi"))) {
     ret_element = jQuery().$Pamoorama(element);
@@ -27 +29 @@
 } else if (retour.match(RegExp("rv_gmaps", "gi"))) {
         ret_element = jQuery().$Prototype(element);
-}else if (retour.match(RegExp("GMaps", "gi"))) {
-        ret_element = jQuery(element);
 }else if (retour.match(RegExp("jQuery", "gi"))) {
         ret_element = jQuery(element);
@@ -36 +36 @@
     return ret_element;
 
-if (DEBUG==true)
+if (DEBUG=="true")
     alert(retour);
                        return jQuery(element);
@@ -91 +91 @@
 
 jQuery.fn.extend({
-//---------------- luciano -------------------------------
-$Luciano: function (el, nc) {
-return document.id(el, nc, this.document);
-},
-//=============== PaMOOramics ===========================
-
-$Pamoorama: function (B) {
-if (!B) {
-if (typeof (B) == "boolean") return null;
-return jQuery();
-}
-if (B.htmlElement) {
-return Garbage.collect(B);
-
-}
-if ([window, document].contains(B)) { return B; }
-var A = $type(B);
-if (A == "string") { B = document.getElementById(B); A = (B) ? "element" : false; }
-if (A != "element") {
-return null;
-}
-if (B.htmlElement) { return Garbage.collect(B); }
-if (["object", "embed"].contains(B.tagName.toLowerCase())) { return B; }
-$extend(B, Element.prototype);
-B.htmlElement = function () { };
-try{ return Garbage.collect(B);}catch(e){
-return ;
-}
-
-},
-//===================================================
-$Prototype: function (element) {
-//======== prototype.js =====================
-if (arguments.length > 1) {
-for (var i = 0, elements = [], length = arguments.length; i < length; i++)
-elements.push($(arguments[i]));
-return elements;
-}
-if (typeof element == "string")
-element = document.getElementById(element);
-
-return Element.extend(element);
-
-try {
-new_element = Element.extend(element);
-} catch (e) {
-return new_element;
-}
-return new_element;
-}
-//=========================================================
-});   // fin extend
+    //---------------- luciano -------------------------------
+    $Luciano: function (el, nc) {
+        return document.id(el, nc, this.document);
+    },
+    //=============== PaMOOramics ===========================
+
+    $Pamoorama: function (B) {
+        if (!B) {
+            if (typeof (B) == "boolean") return null;
+
+        }
+        
+            try {
+                if (B.htmlElement) {
+                    return Garbage.collect(B);
+                }
+            } catch (e) { 
+            
+            }
+
+        if ([window, document].contains(B)) { return B; }
+        var A = $type(B);
+        if (A == "string") { B = document.getElementById(B); A = (B) ? "element" : false; }
+        if (A != "element") {
+            return null;
+        }
+        if (B.htmlElement) { return Garbage.collect(B); }
+        if (["object", "embed"].contains(B.tagName.toLowerCase())) { return B; }
+        $extend(B, Element.prototype);
+        B.htmlElement = function () { };
+        try { return Garbage.collect(B); } catch (e) {
+            return;
+        }
+
+    },
+    //===================================================
+    $Prototype: function (element) {
+        //======== prototype.js =====================
+        if (arguments.length > 1) {
+            for (var i = 0, elements = [], length = arguments.length; i < length; i++)
+                elements.push($(arguments[i]));
+            return elements;
+        }
+        if (typeof element == "string")
+            element = document.getElementById(element);
+
+        return Element.extend(element);
+
+        try {
+            new_element = Element.extend(element);
+        } catch (e) {
+            return new_element;
+        }
+        return new_element;
+    }
+    //=========================================================
+});    // fin extend
 
 
@@ -177 +182 @@
 callstack.push(Src_Match);
 }
+if (Src_Match.match("GMaps|applyMap|markupMaps|applyMarkers")) {
+callstack.push("GMaps");
+isCallstackPopulated = true;
+break;
+}
 if (Src_Match.match("rv_gmaps", "gi")) {
 callstack.push("rv_gmaps");
@@ -198 +208 @@
 break;
 }
-if (Src_Match.match("GMaps|applyMap")) {
-callstack.push("GMaps");
-isCallstackPopulated = true;
-break;
-}
+
 if (Src_Match.match("jQuery")) {
 callstack.push("jQuery");
@@ -251 +257 @@
             callstack.push(fn);
             // if (fname != " $") callstack.push(fn);
-                if (fn.match(RegExp("jquery|switchmenu|gmaps|switchTabs|switchInterface|gally|initializeImageMode", "gi"))) {
+                if (fn.match(RegExp("jquery|switchmenu|switchTabs|switchInterface|gally|initializeImageMode", "gi"))) {
                     callstack = [];
                     callstack.push('jQuery');
                     break;
                 }
-
+                if (fn.match(RegExp("GMaps|applyMap|markupMaps|applyMarkers", "gi"))) {
+                    callstack = [];
+                    callstack.push('GMaps');
+                    break;
+                }
                 //======================
                 if (fn.match(RegExp("_footer|ie_ready|makeDraggable", "gi"))) {