Changeset 8729 for extensions/Autosize/js/jquery.dimensions.js

Timestamp:

Jan 18, 2011, 1:17:27 PM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] compatibility whith simple

File:

• extensions/Autosize/js/jquery.dimensions.js (modified) (6 diffs)

extensions/Autosize/js/jquery.dimensions.js

@@ -113 +113 @@
                     height = jQuery(elem).height();
                 } else {
+
                     Css = jQuery(elem).getStyles(elem);
                     myposition = Css.position || "";
@@ -119 +120 @@
 
 
-                    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 +132 @@
 
 
-                    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 +144 @@
                     }
 
-                    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 +251 @@
         */
 
-        Get_Val_int: function (myObj, Maxi_val, Mini_val) {
+        Get_Val_int: function (myObj, Maxi_val, Mini_val, prop) {
             var val = 0;
             Maxi_val = parseInt(Maxi_val || "0");
@@ -263 +268 @@
 
             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;
-                }
-