Changeset 6215

Timestamp:

02/23/07 01:19:18 (2 years ago)

Author:

madrobby

Message:

Prototype: Optimize Element.setStyle and add new Element.setOpacity method, special case IE and Gecko opacity methods. Closes #7585. [savetheclocktower]

Files:

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

spinoffs/prototype/trunk/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Optimize Element.setStyle and add new Element.setOpacity method, special case IE and Gecko opacity methods.  Closes #7585.  [savetheclocktower]
-
-* Add unified Browser detection by providing Prototype.Browser.(IE|Gecko|WebKit|Opera) booleans.  Closes #6800.  [savetheclocktower]

spinoffs/prototype/trunk/src/dom.js

@@ -322 +322 @@
-    if(style == 'opacity') {
-      if(value) return parseFloat(value);
-  
+
-        if(value[1]) return parseFloat(value[1]) / 100;  
-      return 1.0; 
@@ -331 +331 @@
-  setStyle: function(element, style) {
-    element = $(element);
+    var elementStyle = element.style;
-    for (var name in style) {
-      var value = style[name];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return element;
-  },
@@ -425 +421 @@
-
-Object.extend(Element.Methods, {childOf: Element.Methods.descendantOf});
+
+if (Prototype.Browser.IE) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    var filter = element.getStyle('filter'), style = element.style;
+    if (value == 1 || value === '') {
+      style.filter = filter.replace(/alpha\([^\)]*\)/gi,'');
+      return element;
+    } else if (value < 0.00001) value = 0;
+    style.filter = filter.replace(/alpha\([^\)]*\)/gi, '') +
+      'alpha(opacity=' + (value * 100) + ')';
+    return element;   
+  };
+}
+
+if (Prototype.Browser.Gecko) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    var style = element.style;
+    if (value == 1) value = 0.999999;
+    else if (value < 0.00001) value = 0;
+    style.opacity = value;
+    return element;
+  };
+}
-
-Element._attributeTranslations = {};

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

@@ -631 +631 @@
-    }},
-    
+    testElementSetOpacity: function() { with(this) {
+      [0,0.1,0.5,0.999].each(function(opacity){
+        $('style_test_3').setOpacity(opacity);
+        // b/c of rounding issues on IE special case
+        assert($('style_test_3').getStyle('opacity').toString().startsWith(opacity));
+      });
+      
+      assertEqual(0,
+        $('style_test_3').setOpacity(0.0000001).getStyle('opacity'));
+      
+      // for Firefox, we don't set to 1, because of flickering
+      assert(
+        $('style_test_3').setOpacity(0.9999999).getStyle('opacity') > 0.999
+      );
+    }},
+    
-    testElementGetStyle: function() { with(this) {
-      assertEqual("none",
@@ -682 +698 @@
-      assertEqual(0.3, $('op3').getStyle('opacity'));
-      
+      $('op3').setStyle({opacity: 0});
+      assertEqual(0, $('op3').getStyle('opacity'));
+      
-      if(navigator.appVersion.match(/MSIE/)) {
-        assertEqual('alpha(opacity=30)', $('op1').getStyle('filter'));
-        assertEqual('progid:DXImageTransform.Microsoft.Blur(strength=10)alpha(opacity=30)', $('op2').getStyle('filter'));
-
+
+
+
-        assertEqual(0.3, $('op4-ie').getStyle('opacity'));
-      }