Changeset 8740 for extensions/cl_conflit/js/conflit.js

Timestamp:

Jan 18, 2011, 5:17:36 PM (13 years ago)

Author:

cljosse

Message:

[cl_conflit] compatibility whith GMaps

File:

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

extensions/cl_conflit/js/conflit.js

@@ -37 +37 @@
         else OS = "an unknown operating system";
     }
-
+    mybrowser.version =version;
+    mybrowser.OS = OS;
     mybrowser.browser = lbrowser;
     return mybrowser
@@ -72 +73 @@
 function conflit(element, nc) {
     //--- cl_conflit 
-    if (typeof MooTools=="undefined" && typeof  Prototype=="undefined" ) {
+    if (typeof MooTools == "undefined" && typeof Prototype == "undefined") {
         ret_element = jQuery(element);
         return ret_element;
@@ -94 +95 @@
     }
     else if (retour.match(RegExp("rv_gmaps", "gi"))) {
-    try{
-        ret_element = myjQuery().$Prototype(element);
-        }
-        catch(e)
-        {
-
+        try {
             ret_element = myjQuery().$Prototype(element);
-
-        }
-    } else if (retour.match(RegExp("GMaps", "gi"))) {      
+        }
+        catch (e) {
+
+            ret_element = myjQuery().$Prototype(element);
+
+        }
+    } else if (retour.match(RegExp("GMaps", "gi"))) {
 
         ret_element = jQuery(element);
@@ -492 +492 @@
 
     }
+    if (jQuery('#browser').length > 0) {
+        jQuery('#browser').val(browser.browser);
+    }
     if (typeof (Parent) == "undefined")
         Parent = "#theImage";
@@ -508 +511 @@
                     };
                     //==== compatibilité Gally/LLGBO ===                 
-                    jQuery(Parent).css({ position: "static" });          
+                    jQuery(Parent).css({ position: "static" });
 
                 }
@@ -543 +546 @@
         return a;
     }
+
+    if (typeof ($.extend) != "function") {
+
+     $.extend = function (a,b) {
+         return jQuery.extend(a, b);
+        } ;
+
+ 
+     }
 
     if (typeof ($.ajax) != "function") {