Changeset 16638 for extensions/Autosize/js/autosize.dimensions.js

Timestamp:

Jul 12, 2012, 12:33:43 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, fix offset right

File:

• extensions/Autosize/js/autosize.dimensions.js (modified) (9 diffs)

extensions/Autosize/js/autosize.dimensions.js

@@ -8 +8 @@
 * $LastChangedDate: 2010-10-23 08:43:48 -0600 (Thu, 20 Dec 2007) $
 * By cljosse
-* Version: 1.2
+* Version: 1.3
 *
 * Requires: jQuery 1.2+
@@ -135 +135 @@
         if (elem.nodeName) nodeName = elem.nodeName;
 
-
+        width = jQuery(elem).width();
+        height = jQuery(elem).height();
         if (elem == window) {
 
@@ -141 +142 @@
           width = jQuery(elem).width();
           height = jQuery(elem).height();
+          out_width = width;
+          out_height = height;
         } else {
 
           Css = jQuery(elem).getStyles(elem);
           myposition = Css.position.toString() || "";
-          width = jQuery(elem).outerWidth();
-          height = jQuery(elem).outerHeight();
+          out_width = jQuery(elem).outerWidth();
+          out_height = jQuery(elem).outerHeight();
           elem_parent =elem.parentElement;
           if (typeof elem_parent == "undefined") {
             elem_parent = window;
           }
+          out_width = jQuery(elem).outerWidth();
+          out_height = jQuery(elem).outerHeight();
+          in_width = jQuery(elem).innerWidth();
+          in_height = jQuery(elem).innerHeight();
           if (typeof Css.width != "undefined")
-            width = jQuery(elem).Get_Val_int(Css.width, jQuery(elem_parent).width(), 0);
+            width = Get_Val_int(Css.width, jQuery(elem_parent).width(), 0);
 
           if (typeof Css.height != "undefined")
-            height = jQuery(elem).Get_Val_int(Css.height, jQuery(elem_parent).height(), 0);
-
-
-
-
-
-
-          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');
+            height = Get_Val_int(Css.height, jQuery(elem_parent).height(), 0);
+
+
+          borderwidth.left = Get_Val_int(Css.borderLeftWidth, "", "", { elem: elem, prop: 'borderLeftWidth' });
+          borderwidth.right = Get_Val_int(Css.borderRightWidth, "", "", { elem: elem, prop: 'borderRightWidth' });
+          borderwidth.top = Get_Val_int(Css.borderTopWidth, "", "", { elem: elem, prop: 'borderTopWidth' });
+          borderwidth.bottom = Get_Val_int(Css.borderBottomWidth, "", "", { elem: elem, prop: 'borderBottomWidth' });
           try {
             borderwidth.width = Css.borderWidth;
@@ -172 +175 @@
           }
 
-
-
-          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');
+          margin.left = Get_Val_int(Css.marginLeft, "", "", { elem: elem, prop: 'marginLeft' });
+          margin.right = Get_Val_int(Css.marginRight, "", "", { elem: elem, prop: 'marginRight' });
+          margin.top = Get_Val_int(Css.marginTop, "", "", { elem: elem, prop: 'marginTop' });
+          margin.bottom = Get_Val_int(Css.marginBottom, "", "", { elem: elem, prop: 'marginBottom' });
 
 
@@ -187 +188 @@
 
 
-          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');
+          padding.left = Get_Val_int(Css.paddingLeft, "", "", { elem: elem, prop: 'paddingLeft' });
+          padding.right = Get_Val_int(Css.paddingRight, "", "", { elem: elem, prop: 'paddingRight' });
+          padding.top = Get_Val_int(Css.paddingTop, "", "", { elem: elem, prop: 'paddingTop' });
+          padding.bottom = Get_Val_int(Css.paddingBottom, "", "", { elem: elem, prop: 'paddingBottom' });
 
           try {
@@ -208 +209 @@
        visible= jQuery(elem).is(':visible');
         results = {src: elem.src || "none",
-          visible: visible || "false",
+          visible: visible || false,
           position: myposition,
           top: Top,
           left: Left,
-          width: width,
+          width: width,  // valeur interieur
           height: height,
           right: Left + width,
           bottom: Top + height,
+
+          padding: padding,
+
+          out: {
+            width: in_width,
+            height: in_height,
+            right: Left + in_width,
+            bottom: Top + in_height
+          },
           borderwidth: borderwidth,
+          exterieur: {
+            width: out_width,
+            height: out_height,
+            right: Left + out_width,
+            bottom: Top + out_height
+          },
           margin: margin,
-          padding: padding,
+          general: {
+            width: out_width + margin.left + margin.right,
+            height: out_height + margin.top + margin.bottom,
+            right: Left + out_width + margin.left + margin.right,
+            bottom: Top + out_height + margin.top + margin.bottom,
+            marges: { height: margin.top + borderwidth.top + padding.top +
+                              margin.bottom + borderwidth.bottom + padding.bottom,
+              top: margin.top + borderwidth.top + padding.top,
+              bottom: margin.bottom + borderwidth.bottom + padding.bottom,
+              width: margin.left + borderwidth.left + padding.left +
+                              margin.right + borderwidth.right + padding.right,
+              left: margin.left + borderwidth.left + padding.left,
+              right: margin.right + borderwidth.right + padding.right
+            }
+
+
+          },
           id: id,
           nodeName: nodeName
@@ -295 +327 @@
       return propriete;
     },
-    /*
+    Get_Val_int: function (myObj, Maxi_val, Mini_val, prop) {
+
+      return Get_Val_int(myObj, Maxi_val, Mini_val, prop);
+    }
+  });
+
+  /**************************
     * Get_val_int
     * params: element,valeur maxi
     * return: valeur entiere
-    */
-
-    Get_Val_int: function (myObj, Maxi_val, Mini_val, prop) {
+  ******************************/
+  Get_Val_int = function (myObj, Maxi_val, Mini_val, prop) {
+
       var val = 0;
       Maxi_val = parseInt(Maxi_val || "0");
@@ -336 +374 @@
             break;
         }
-        el = this.get(0);
+
         var reg1 = new RegExp("auto", "g");
         if (myObj.match(reg1)) {
           return Maxi_val;
         }
-        if (prop)
-          myObj = num(el, prop);
-        else {
+
+      if (prop) {
+
+        myObj = num(prop.elem, prop.prop);
+      } else {
           reg1 = new RegExp("px", "g");
           if (myObj.match(reg1)) {
 
-            myObj = parseInt(myObj);
+          myObj = Parse_Int(myObj);
 
           } else {
@@ -356 +396 @@
               return val;
             }
-
-          }
-
-        }
-
+          }
+        }
         if (Mini_val)
           if (myObj < Mini_val) return Maxi_val;
-
-
-        val = parseInt(myObj);
+      val = Parse_Int(myObj);
 
       } else {
-        val = parseInt(myObj);
+      val = Parse_Int(myObj);
       }
-      if (typeof (val) == "NaN") return Maxi_val;
+    if (typeof (val) == "NaN")
+      return Maxi_val;
       return val;
+
     }
-  });
+
   /*
   *
   */
+  function Parse_Int(valeur_num) {
+  if (!jQuery.isNumeric(valeur_num)){
+    valeur_num = valeur_num.toString();
+    reg1 = new RegExp("px", "gi");
+    if (valeur_num.match(reg1)) {
+        valeur_num = valeur_num.replace(reg1, "");
+    } else {
+        valeur_num = valeur_num.replace(reg1, "");
+    }
+   }
+    valeur_num = Math.ceil(valeur_num);
+    return valeur_num || 0;
+  }
+
   function num(el, prop) {
-    return parseInt(jQuery.curCSS(el.jquery ? el[0] : el, prop, true)) || 0;
+    valeur_num = jQuery.curCSS(el.jquery ? el[0] : el, prop, true);
+
+    return Parse_Int(valeur_num);
   };