Changeset 8740

Timestamp:

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

Author:

cljosse

Message:

[cl_conflit] compatibility whith GMaps

Location:

extensions/cl_conflit

Files:

• js/conflit.js (modified) (6 diffs)
• js/jquery.dimensions.js (modified) (5 diffs)
• main.inc.php (modified) (1 diff)

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") {

extensions/cl_conflit/js/jquery.dimensions.js

@@ -119 +119 @@
 
 
-                    borderwidth.left = jQuery(elem).Get_Val_int(Css.borderLeftWidth);
-                    borderwidth.right = jQuery(elem).Get_Val_int(Css.borderRightWidth);
-                    borderwidth.top = jQuery(elem).Get_Val_int(Css.borderTopWidth);
-                    borderwidth.bottom = jQuery(elem).Get_Val_int(Css.borderBottomWidth);
+                    borderwidth.left = jQuery(elem).Get_Val_int(Css.borderLeftWidth, "", "", 'borderLeftWidth');
+                    borderwidth.right = jQuery(elem).Get_Val_int(Css.borderRightWidth, "", "", 'borderRightWidth');
+                    borderwidth.top = jQuery(elem).Get_Val_int(Css.borderTopWidth, "", "", 'borderTopWidth');
+                    borderwidth.bottom = jQuery(elem).Get_Val_int(Css.borderBottomWidth, "", "", 'borderBottomWidth');
                     try {
                         borderwidth.width = Css.borderWidth;
@@ -131 +131 @@
 
 
-                    margin.left = jQuery(elem).Get_Val_int(Css.marginLeft);
-                    margin.right = jQuery(elem).Get_Val_int(Css.marginRight);
-                    margin.top = jQuery(elem).Get_Val_int(Css.marginTop);
-                    margin.bottom = jQuery(elem).Get_Val_int(Css.marginBottom);
+                    margin.left = jQuery(elem).Get_Val_int(Css.marginLeft, "", "", 'marginLeft');
+                    margin.right = jQuery(elem).Get_Val_int(Css.marginRight, "", "", 'marginRight');
+                    margin.top = jQuery(elem).Get_Val_int(Css.marginTop, "", "", 'marginTop');
+                    margin.bottom = jQuery(elem).Get_Val_int(Css.marginBottom, "", "", 'marginBottom');
                     try {
                         margin.margin = Css.margin;
@@ -141 +141 @@
                     }
 
-                    padding.left = jQuery(elem).Get_Val_int(Css.paddingLeft);
-                    padding.right = jQuery(elem).Get_Val_int(Css.paddingRight);
-                    padding.top = jQuery(elem).Get_Val_int(Css.paddingTop);
-                    padding.bottom = jQuery(elem).Get_Val_int(Css.paddingBottom);
+
+                    padding.left = jQuery(elem).Get_Val_int(Css.paddingLeft, "", "", 'paddingLeft');
+                    padding.right = jQuery(elem).Get_Val_int(Css.paddingRight, "", "", 'paddingRight');
+                    padding.top = jQuery(elem).Get_Val_int(Css.paddingTop, "", "", 'paddingTop');
+                    padding.bottom = jQuery(elem).Get_Val_int(Css.paddingBottom, "", "", 'paddingBottom');
                     try {
                         padding.padding = Css.padding;
@@ -246 +247 @@
         */
 
-        Get_Val_int: function (myObj, Maxi_val, Mini_val) {
+        Get_Val_int: function (myObj, Maxi_val, Mini_val, prop) {
             var val = 0;
 
@@ -264 +265 @@
 
             if (typeof (myObj) == "string") {
-                if (myObj == "none") return Maxi_val;
+                switch (myObj) {
+                    case 'thin':
+                        return 1;
+                        break;
+                    case 'medium':
+                        return 2;
+                        break;
+                    case 'thick':
+                        return 4;
+                        break;
+                    case 'inherit':
+                        break;
+                    case 'none':
+                        return Maxi_val;
+                        break;
+                    default:
+                        break;
+                }
+                el = this.get(0);
                 var reg1 = new RegExp("auto", "g")
                 if (myObj.match(reg1)) {
                     return Maxi_val;
                 }
-                reg1 = new RegExp("px", "g")
-                if (myObj.match(reg1)) {
-
-                    myObj = parseInt(myObj);
-
-                }
+                if (prop)
+                    myObj = num(el, prop);
                 else {
-                    reg1 = new RegExp("%", "g")
+                    reg1 = new RegExp("px", "g")
                     if (myObj.match(reg1)) {
-                        val = Math.ceil(myObj * Maxi_val / 100);
-                        return val;
-                    }
+
+                        myObj = parseInt(myObj);
+
+                    } else {
+                        reg1 = new RegExp("%", "g")
+                        if (myObj.match(reg1)) {
+                            val = Math.ceil(myObj * Maxi_val / 100);
+                            return val;
+                        }
+
+                    }
+
                 }
 
                 if (Mini_val)
                     if (myObj < Mini_val) return Maxi_val;
-
-                switch (myObj) {
-                    case 'thin':
-                        return 1;
-                        break;
-                    case 'medium':
-                        return 2;
-                        break;
-                    case 'thick':
-                        return 4;
-                        break;
-                    case 'inherit':
-                        break;
-                    default:
-                        break;
-                }
-
 
 

extensions/cl_conflit/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: cl_conflit
-Version: 1.0.7
+Version: 1.0.8
 Description: gestion des conflits entre jQuery et les autres librairies
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=474