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

Timestamp:

Jul 23, 2012, 3:01:09 PM (12 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with 2.4, new options

File:

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

extensions/Autosize/js/autosize.dimensions.js

@@ -33 +33 @@
             options = options || false;
             options = jQuery.extend({ margin: options });
-
+            Maxi_val = this.parent().width();
             var val = this.is(':visible') ? this[0]['offset' + name] :
                     num(this,
@@ -118 +118 @@
       myposition = "";
       results = {
+        visible:false ,
         position: "",
         top: 0,
@@ -127 +128 @@
         borderwidth: borderwidth,
         padding: padding,
-        margin: margin, id: "", nodeName: ""
+        margin: margin,
+
+        out: {
+          width: 0,
+          height: 0,
+          right: 0,
+          bottom: 0
+        },
+       
+        exterieur: {
+          width: 0,
+          height: 0,
+          right: 0,
+          bottom: 0
+        },
+    
+        general: {
+          width: 0,
+          height: 0,
+          right: 0,
+          bottom: 0,
+          marges: { height:0,
+                    top: 0,
+                    bottom: 0,
+                    width: 0,
+                    left: 0,
+                    right: 0
+                    }
+                },
+        src:"",
+        useMap : "" ,
+        id: "",
+        nodeName: ""
       };
       ;
@@ -150 +183 @@
           out_width = jQuery(elem).outerWidth();
           out_height = jQuery(elem).outerHeight();
-          elem_parent =elem.parentElement;
+          elem_parent = elem.parentElement;
           if (typeof elem_parent == "undefined") {
             elem_parent = window;
@@ -207 +240 @@
         Top = Cl_Position.top;
 
-       visible= jQuery(elem).is(':visible');
-        results = {src: elem.src || "none",
+        visible = jQuery(elem).is(':visible');
+        results = { 
+          useMap : elem.useMap || "none",
+          src: elem.src || "none",
           visible: visible || false,
           position: myposition,
@@ -239 +274 @@
             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
-            }
-
-
+            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,
@@ -311 +359 @@
       var element = jQuery(elt).get(0);
       propriete = [];
-      try{
-      if (jQuery(element).length > 0)
-      if (window.getComputedStyle) // Mozilla Firefox & cie
-      {
-        var propriete = window.getComputedStyle(element, null);
-      }
-      else if (element.currentStyle) // Microsoft Internet Explorer
-      {
-
-        var propriete = element.currentStyle;
-      }
-        }catch(e){
-
-        }
+      try {
+        if (jQuery(element).length > 0)
+          if (window.getComputedStyle) // Mozilla Firefox & cie
+          {
+            var propriete = window.getComputedStyle(element, null);
+          }
+          else if (element.currentStyle) // Microsoft Internet Explorer
+          {
+
+            var propriete = element.currentStyle;
+          }
+      } catch (e) {
+
+      }
       return propriete;
     },
@@ -334 +382 @@
 
   /**************************
-    * Get_val_int
-    * params: element,valeur maxi
-    * return: valeur entiere
+  * Get_val_int
+  * params: element,valeur maxi
+  * return: valeur entiere
   ******************************/
   Get_Val_int = function (myObj, Maxi_val, Mini_val, prop) {
 
-      var val = 0;
-      Maxi_val = parseInt(Maxi_val || "0");
-
-      /*
-      - numérique suivie de px ou % ou pt ou em, 
-      - thin, bordure mince, 
-      - medium, bordure moyenne (valeur par défaut), 
-      - thick, bordure épaisse, 
-      - inherit, hérite de son parent (css2).
-      */
-
-      if (!myObj) {
+    var val = 0;
+    Maxi_val = parseInt(Maxi_val || "0");
+
+    /*
+    - numérique suivie de px ou % ou pt ou em, 
+    - thin, bordure mince, 
+    - medium, bordure moyenne (valeur par défaut), 
+    - thick, bordure épaisse, 
+    - inherit, hérite de son parent (css2).
+    */
+
+    if (!myObj) {
+      return Maxi_val;
+    }
+
+    if (typeof (myObj) == "string") {
+      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;
+      }
+
+      var reg1 = new RegExp("auto", "g");
+      if (myObj.match(reg1)) {
         return Maxi_val;
       }
-
-      if (typeof (myObj) == "string") {
-        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;
-        }
-
-        var reg1 = new RegExp("auto", "g");
-        if (myObj.match(reg1)) {
-          return Maxi_val;
-        }
 
       if (prop) {
@@ -384 +432 @@
         myObj = num(prop.elem, prop.prop);
       } else {
-          reg1 = new RegExp("px", "g");
+        reg1 = new RegExp("px", "g");
+        if (myObj.match(reg1)) {
+
+          myObj = Parse_Int(myObj);
+
+        } else {
+          reg1 = new RegExp("%", "g");
           if (myObj.match(reg1)) {
-
-          myObj = Parse_Int(myObj);
-
-          } else {
-            reg1 = new RegExp("%", "g");
-            if (myObj.match(reg1)) {
-              myObj = myObj.replace(reg1, "");
-              val = Math.ceil(myObj * Maxi_val / 100);
-              return val;
-            }
+            myObj = myObj.replace(reg1, "");
+            val = Math.ceil(myObj * Maxi_val / 100);
+            return val;
           }
         }
-        if (Mini_val)
-          if (myObj < Mini_val) return Maxi_val;
+      }
+      if (Mini_val)
+        if (myObj < Mini_val) return Maxi_val;
       val = Parse_Int(myObj);
 
-      } else {
+    } else {
       val = Parse_Int(myObj);
-      }
+    }
     if (typeof (val) == "NaN")
       return Maxi_val;
-      return val;
-
-    }
+    return val;
+
+  }
 
   /*
@@ -415 +463 @@
   */
   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)) {
+    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 {
+      } if (valeur_num.match(RegExp("%", "gi"))) {
         valeur_num = valeur_num.replace(reg1, "");
+        valeur_num = Math.ceil(valeur_num * Maxi_val / 100);
+      } else {
+        valeur_num = valeur_num.replace(reg1, "");
+      }
     }
-   }
     valeur_num = Math.ceil(valeur_num);
     return valeur_num || 0;
@@ -434 +485 @@
   };
 
-  myjQuery = jQuery;
-  my$ = $;
+ // myjQuery = jQuery;
+ // my$ = $;
 
 })(jQuery);