Changeset 7912 for extensions/Autosize/js

Timestamp:

Nov 28, 2010, 4:36:17 PM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] setup cl_conflit

Location:

extensions/Autosize/js

Files:

• conflit.js (modified) (5 diffs)
• jquery.dimensions.js (modified) (2 diffs)

extensions/Autosize/js/conflit.js

@@ -184 +184 @@
 
             info_image = jQuery(Parent).infos();
-            if (info_image.height==0) {
-                Parent = "#theImageBox";
-            }
-
-
             p0 = jQuery(Parent);
-
-            if (p0.length > 0) {
-             
-  
+            if (p0.length > 0) {    
+
                 //======================================================
                 if (theme.match("gally", "gi"))
@@ -199 +192 @@
                         if (typeof (currentTab) == "undefined") inittoolbar();
                         else initializeImageMode("resize");
-                    };
+                    
 
                     if (info_image.position != "static") {
@@ -206 +199 @@
                     jQuery(Parent).css({ position: "static" } );
                     jQuery("#imageToolBar").css({ position: "relative", top: "0px" });
+                    };
                 }
             }
@@ -429 +423 @@
           }
           //window_1290934905697_top
-          if (fn.match(RegExp("window_|WindowUtilities", "gi"))) {
+          if (fn.match(RegExp("window_..|WindowUtilities", "gi"))) {
               states.push('rv_gmaps');
               break;
@@ -583 +577 @@
 function save_framework(page) {
     try {
-        Conflit = { version: Version, name: cl_plugin };
+        Conflit = { version: cl_version, name: cl_plugin };
     } catch (e) {
 

extensions/Autosize/js/jquery.dimensions.js

@@ -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);
                 };