Changeset 6286

Timestamp:

03/02/07 13:22:19 (1 year ago)

Author:

mislav

Message:

reverting [6285], unnecessary merge from trunk

Files:

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

spinoffs/prototype/branches/event/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
-* Add optional third parameter "camlized" to Element.setStyle, for optimized performance if style names are known to be camelCased.  [Thomas Fuchs]
-
-* Fix a bug in the simulated hasAttribute for IE due to getAttributeNode sometimes returning null.  [sam]
-
-* 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]
-
-* Add unified Browser detection by providing Prototype.Browser.(IE|Gecko|WebKit|Opera) booleans.  Closes #6800.  [savetheclocktower]

spinoffs/prototype/branches/event/src/dom.js

@@ -302 +302 @@
-  getStyle: function(element, style) {
-    element = $(element);
-
+
+
+
-    var value = element.style[style];
-    if (!value) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return value == 'auto' ? null : value;
-  },
-  
-getOpacity: function(element
-return $(element).getStyle('opacity'
-},
-
-setStyle: function(element, styles, camelized
-element = $(element);
-var elementStyle = element.style;
-
-for (var property in styles
-if (property == 'opacity') element.setOpacity(styles[property])
-else 
-elementStyle[(property == 'float' || property == 'cssFloat') ?
-(elementStyle.styleFloat === undefined ? 'cssFloat' : 'styleFloat') : 
-  (camelized ? property : property.camelize())] = styles[property];
-
-return element;
-},
-
-setOpacity: function(element, value) {
-element = $(element)
-element.style.opacity = (value == 1 || value === '') ? '' : 
-  (value < 0.00001) ? 0 : value;
+setStyle: function(element, style
+element = $(element
+  for (var name in style) {
+    var value = style[name];
+    if(name == 'opacity'
+    if (value == 1) {
+      value = (/Gecko/.test(navigator.userAgent) &&
+
+      if(/MSIE/.test(navigator.userAgent) && !window.opera
+      element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
+  } else if(value === '') {
+  if(/MSIE/.test(navigator.userAgent) && !window.opera)
+  element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
+} else {
+
+      if(/MSIE/.test(navigator.userAgent) && !window.opera)
+          element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'') +
+            'alpha(opacity='+value*100+')';
+      }
+  } else if(['float','cssFloat'].include(name)) name = (typeof element.style.styleFloat != 'undefined') ? 'styleFloat' : 'cssFloat'
+  element.style[name.camelize()] = value;
+}
-    return element;
-  },
@@ -409 +426 @@
-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);
-    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);
-    element.style.opacity = (value == 1) ? 0.999999 : 
-      (value === '') ? '' : (value < 0.00001) ? 0 : value;
-    return element;
-  };
-}
-
-Element._attributeTranslations = {};
-
@@ -511 +471 @@
-Element.Methods.Simulated = {
-  hasAttribute: function(element, attribute) {
-, node
+
-    attribute = t.names[attribute] || attribute;
-
-
+
-  }
-};

spinoffs/prototype/branches/event/test/unit/dom.html

@@ -631 +631 @@
-    }},
-    
-    testElementSetStyleCamelized: function() { with(this) {
-      $('style_test_3').setStyle({ marginTop: '30px'}, true);
-      assertEqual('30px', $('style_test_3').style.marginTop);
-      
-      // This would work if camelized parameter is false
-      $('style_test_3').setStyle({ 'margin-top': '20px'}, true);
-      assertEqual('30px', $('style_test_3').style.marginTop);
-    }},
-    
-    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",
@@ -707 +682 @@
-      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'));
-      }
@@ -722 +692 @@
-      // which expected non-camelized strings)
-      assertEqual("12px", $('style_test_1').getStyle('fontSize'));
-    }},
-    
-    testElementGetOpacity: function() {with(this) {
-      assertEqual(0.45, $('op1').setOpacity(0.45).getOpacity());
-    }},
-