Changeset 6255

Timestamp:

02/27/07 11:35:21 (2 years ago)

Author:

madrobby

Message:

Prototype: Optimize Element.getStyle and add new Element.getOpacity method. Special case IE and Opera getStyle methods. Closes #7648. [Tobie Langel, Thomas Fuchs]

Files:

• spinoffs/prototype/trunk/CHANGELOG (modified) (1 diff)
• spinoffs/prototype/trunk/src/dom.js (modified) (4 diffs)
• spinoffs/prototype/trunk/test/unit/dom.html (modified) (1 diff)

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Optimize Element.getStyle and add new Element.getOpacity method. Special case IE and Opera getStyle methods.  Closes #7648.  [Tobie Langel, Thomas Fuchs]
-
-* Optimize Element.setStyle and add new Element.setOpacity method, special case IE and Gecko opacity methods.  Closes #7585.  [savetheclocktower]

spinoffs/prototype/trunk/src/dom.js

@@ -302 +302 @@
-  getStyle: function(element, style) {
-    element = $(element);
-
-
-
+
-    var value = element.style[style];
-    if (!value) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-    }
-    
-    if((value == 'auto') && ['width','height'].include(style) && (element.getStyle('display') != 'none'))
-      value = element['offset'+style.capitalize()] + 'px';
-    
-    if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
-      if (Element.getStyle(element, 'position') == 'static') value = 'auto';
-    if(style == 'opacity') {
-      if(value) return parseFloat(value);
-      if(value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
-        if(value[1]) return parseFloat(value[1]) / 100;  
-      return 1.0; 
-    }
-    return value == 'auto' ? null : value;
-  },
-  
-  setStyle: function(element, style) {
-    element = $(element);
-    var elementStyle = element.style;
-    for (var name in style) {
-      var value = style[name];
-      if (name == 'opacity') element.setOpacity(value);
-      if (name == 'float' || name == 'cssFloat') {
-        name = (typeof elementStyle.styleFloat != 'undefined') ?
-          'styleFloat' : 'cssFloat';
-      }
-      elementStyle[name.camelize()] = value;
-    }
-    return element;
-  },
@@ -346 +334 @@
-  setOpacity: function(element, value) {
-    element = $(element);
-
+
+
-    return element;
-  },
@@ -422 +411 @@
-Object.extend(Element.Methods, {childOf: Element.Methods.descendantOf});
-
+if (Prototype.Browser.Opera) { 
+  Element.Methods._getStyle = Element.Methods.getStyle; 
+  Element.Methods.getStyle = function(element, style) { 
+    switch(style) { 
+      case 'left': 
+      case 'top': 
+      case 'right': 
+      case 'bottom': 
+        if(Element._getStyle(element, 'position') == 'static') return null; 
+      default: return Element._getStyle(element, style); 
+    } 
+  }; 
+}
+
-if (Prototype.Browser.IE) {
+  Element.Methods.getStyle = function(element, style) {
+    element = $(element);
+    style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
+    var value = element.style[style];
+    if (!value && element.currentStyle) value = element.currentStyle[style];
+
+    if (style == 'opacity') {
+      if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
+        if (value[1]) return parseFloat(value[1]) / 100;
+      return 1.0;
+    }
+
+    if (value == 'auto') {
+      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
+        return element['offset'+style.capitalize()] + 'px';
+      return null;
+    }
+    return value;
+  };
+  
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
@@ -439 +462 @@
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
-
-
-
-
+
+
-    return element;
-  };

spinoffs/prototype/trunk/test/unit/dom.html

@@ -715 +715 @@
-    }},
-    
+    testElementGetOpacity: function() {with(this) {
+      assertEqual(0.45, $('op1').setOpacity(0.45).getOpacity());
+    }},
+    
-    testElementReadAttribute: function() {with(this) {
-      assertEqual('test.html' , $('attributes_with_issues_1').readAttribute('href'));