Changeset 7895 for extensions/cl_conflit/js

Timestamp:

Nov 27, 2010, 6:14:46 PM (13 years ago)

Author:

cljosse

Message:

[cl_conflit] save

File:

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

extensions/cl_conflit/js/conflit.js

@@ -13 +13 @@
     // jQuery est chargé
 }
-try {
-    Conflit = { version: Version };
-} catch (e) {
-
-}
+
 //===================================================
 var detect = navigator.userAgent.toLowerCase();
@@ -145 +141 @@
         }
     } else if (element == document) {
+
+        ret_element = jQuery(element);
+        return ret_element;
+
+
+     } else if (element == window) {
 
         ret_element = jQuery(element);
@@ -304 +306 @@
         var e_message = e.message;
         var e_stack = e.stack;
+        var state_ff = "";
         if (e_stack) { //Firefox Opera 3.6
             //=== test fichier source =============
@@ -343 +346 @@
                         break;
                     }
-                    if (Src_Match.match("jQuery")) {
+                    if (Src_Match.match("jQuery", "gi")) {
                         callstack.push("jQuery");
                         isCallstackPopulated = true;
+                     
                         break;
                     }
@@ -351 +355 @@
             }
             //callstack.shift();
+            state_ff = callstack.join('\n');
             isCallstackPopulated = false;
         }
@@ -386 +391 @@
 
         currentFunction = currentFunction.caller;
+        var fn2 = currentFunction.toString(); // fonction d'appel local (conflit)
         currentFunction = currentFunction.caller;
         //$family
@@ -407 +413 @@
             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;
             }
             //======================
@@ -421 +427 @@
 
                 states.push('paMOOramics');
-
+              break;
             }
             if (fn.match(RegExp("observe|responder|stopobserving|fireContentLoadedEvent", "gi"))) {
                 states.push('rv_gmaps');
-
+                break;
             }
             //? bubble  
@@ -433 +439 @@
 
                     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;
 
 
@@ -449 +466 @@
 
     }
+  // state_ff + "|" +
     state = states.join('\n');
+    if (state == "")
+        state = state_ff;
+
     Fn = all_functions;
     return { state: state, fn: callstack.join('\n') };
@@ -463 +484 @@
     });
     //==============================================
+    librairies=[];
     jQuery.extend(jQuery.expr[':'], {
         // Nom du sélecteur personnalisé
@@ -497 +519 @@
                     if (a.src.match(RegExp("mootools|pamooramic|luciano", "gi"))) {
                         jQuery.noop;
-
+                        librairies.push(a.src);
                     }
 
@@ -534 +556 @@
 
 }
-if (typeof ($fn) != "function") {
-    $.fn = function (options) {
-        return jQuery.fn(options);
-    }
-
-
-}
+
 if (typeof ($.get) != "function") {
     $.get = function (options) {
@@ -550 +566 @@
 $_ = $;
 function save_framework(page) {
-    Conflit = { version: Version };
+    try {
+        Conflit = { version: Version, name: cl_plugin };
+    } catch (e) {
+
+    }
+    
     $_ = $;
     return