Changeset 7910

Timestamp:

Nov 28, 2010, 3:23:06 PM (13 years ago)

Author:

cljosse

Message:

[cl_conflit] fcompatibility outerWidth(true) jquery1.4.1 jquery1.4.3

Location:

extensions/cl_conflit

Files:

• js/Affiche_script.js (deleted)
• js/conflit.js (modified) (1 diff)
• js/jquery.dimensions.js (modified) (3 diffs)
• main.inc.php (modified) (1 diff)

extensions/cl_conflit/js/conflit.js

@@ -181 +181 @@
             p0 = jQuery(Parent);
             if (p0.length > 0) {    
+
                 //======================================================
                 if (theme.match("gally", "gi"))

extensions/cl_conflit/js/jquery.dimensions.js

@@ -14 +14 @@
 */
 (function (jQuery) {
-    jQuery.dimensions = { cl_version: '1.3' };
+    jQuery.dimensions = { cl_dimensions_version: '1.3' };
     /*
     * Interception Height, Width
@@ -31 +31 @@
                     var torl = name == 'Height' ? 'Top' : 'Left',
                         borr = name == 'Height' ? 'Bottom' : 'Right';
-                    options = jQuery.extend({ margin: false },
-                                                options || {});
+                    options = options || false;
+                    options = jQuery.extend({ margin: options } );
+
                     var val = this.is(':visible') ? this[0]['offset' + name] :
                         num(this,
@@ -39 +40 @@
                         num(this, 'border' + borr + 'Width') +
                         num(this, 'padding' + torl) +
-                        num(this, 'padding' + borr);
+                        num(this, 'padding' + borr)
+
+                        ;
                     return val + (options.margin ? (num(this, 'margin' + torl) + num(this, 'margin' + borr)) : 0);
                 };

extensions/cl_conflit/main.inc.php

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