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

Timestamp:

Nov 28, 2010, 11:06:31 AM (13 years ago)

Author:

cljosse

Message:

[cl_conflit] fix conflict with rv_gmaps

File:

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

extensions/Autosize/js/conflit.js

@@ -13 +13 @@
     // jQuery est chargé
 }
-try {
-    Conflit = { version: Version };
-} catch (e) {
-
-}
+
 //===================================================
 var detect = navigator.userAgent.toLowerCase();
@@ -309 +305 @@
         var e_message = e.message;
         var e_stack = e.stack;
+        var state_ff = "";
         if (e_stack) { //Firefox Opera 3.6
             //=== test fichier source =============
@@ -348 +345 @@
                         break;
                     }
-                    if (Src_Match.match("jQuery")) {
+                    if (Src_Match.match("jQuery", "gi")) {
                         callstack.push("jQuery");
                         isCallstackPopulated = true;
+                     
                         break;
                     }
@@ -356 +354 @@
             }
             //callstack.shift();
+            state_ff = callstack.join('\n');
             isCallstackPopulated = false;
         }
@@ -391 +390 @@
 
         currentFunction = currentFunction.caller;
+        var fn2 = currentFunction.toString(); // fonction d'appel local (conflit)
         currentFunction = currentFunction.caller;
         //$family
@@ -412 +412 @@
             if (fn.match(RegExp("jquery|switchmenu|switchTabs|switchInterface|gally|initializeImageMode", "gi"))) {
                 states.push('jQuery');
-
+                break;
             }
             if (fn.match(RegExp("dialog..open", "gi"))) {
                 states.push('GMaps');
-
+                break;
             }
             if (fn.match(RegExp("GMaps|applyMap|markupMaps|applyMarkers", "gi"))) {
                 states.push('GMaps');
-
+                break;
             }
             //======================
@@ -426 +426 @@
 
                 states.push('paMOOramics');
-
-            }
-            if (fn.match(RegExp("observe|responder|stopobserving|fireContentLoadedEvent", "gi"))) {
+              break;
+          }
+          //window_1290934905697_top
+          if (fn.match(RegExp("window_|WindowUtilities", "gi"))) {
+              states.push('rv_gmaps');
+              break;
+          }
+          if (fn.match(RegExp("that.overlayOpacity", "gi"))) {
+              states.push('rv_gmaps');
+              break;
+          }
+          if (fn.match(RegExp("For backward compatibility like win", "gi"))) {
+              states.push('rv_gmaps');
+              break;
+          }
+          if (fn.match(RegExp("overlay_modal|HTMLDivElement|constraintPad", "gi"))) {
+              states.push('rv_gmaps');
+              break;
+          }
+
+            if (fn.match(RegExp("__content|__method|observe|responder|stopobserving|fireContentLoadedEvent", "gi"))) {
                 states.push('rv_gmaps');
-
+                break;
             }
             //? bubble  
@@ -438 +456 @@
 
                     states.push('Luciano');
-
+                    break;
                 }
             }
+            // "window.fireEvent('domready')"
+            Expression = new RegExp("window.fireEvent", "gi")
+            if (fn.match(Expression)) {  //luciano
+                // "window.fireEvent('domready')"
+                Expression = new RegExp("window.fireEvent..domready..", "gi")
+                if (fn.match(Expression)) {
+                    states.push('Luciano');
+                    break;
+                }
+            }
             if (fn.match(RegExp("(splat|buildFrameWork|photoNext)", "gi"))) {  //luciano
 
                 states.push('Luciano');
-
-            }
-
-            if (all_functions.length > 50) break;
+                break;
+            }
+
+            if (all_functions.length > 50) 
+            break;
 
 
@@ -454 +483 @@
 
     }
+  // state_ff + "|" +
     state = states.join('\n');
+    if (state == "") {
+        if (DEBUG == "true") {
+            Fn = all_functions.join('\n');
+            alert("non trouvé:" + Fn + "\n"  + fn2 + "\n Firefox:" + state_ff);
+        }
+        state = state_ff;
+    }
+
     Fn = all_functions;
-    return { state: state, fn: callstack.join('\n') };
+    return { state: state, fn: callstack.join('\n'),fn1:fn2 };
 }
 //====================================
@@ -468 +506 @@
     });
     //==============================================
+    librairies=[];
     jQuery.extend(jQuery.expr[':'], {
         // Nom du sélecteur personnalisé
@@ -502 +541 @@
                     if (a.src.match(RegExp("mootools|pamooramic|luciano", "gi"))) {
                         jQuery.noop;
-
+                        librairies.push(a.src);
                     }
 
@@ -514 +553 @@
     *
     */
-
-
-
-
-
-
 })(jQuery);
 
@@ -539 +572 @@
 
 }
-if (typeof ($fn) != "function") {
-    $.fn = function (options) {
-        return jQuery.fn(options);
-    }
-
-
-}
+
 if (typeof ($.get) != "function") {
     $.get = function (options) {
@@ -555 +582 @@
 $_ = $;
 function save_framework(page) {
-    Conflit = { version: Version };
+    try {
+        Conflit = { version: Version, name: cl_plugin };
+    } catch (e) {
+
+    }
+    
     $_ = $;
     return