From 5fba3d4c23656924c3ae9b8a6cdc6bb195979a17 Mon Sep 17 00:00:00 2001
From: Arian <arian@aryweb.nl>
Date: Sun, 5 Feb 2012 04:59:38 +0100
Subject: [PATCH] Use removeAttribute in IE if the value for setStyle is ''or
 null. This is the second part for using .setStyle('opacity', null); where the
 actual filter property is removed so it falls back to other CSS definitions.

---
 Source/Element/Element.Style.js          | 18 +++++++++++++++---
 Specs/1.4client/Element/Element.Style.js | 15 ++++++++++++++-
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/Source/Element/Element.Style.js b/Source/Element/Element.Style.js
index 9abd3ecae..9718c69fe 100644
--- a/Source/Element/Element.Style.js
+++ b/Source/Element/Element.Style.js
@@ -18,6 +18,13 @@ provides: Element.Style
 
 var html = document.html;
 
+// Check for oldIE, which does not remove styles when they're set to null
+var el = document.createElement('div');
+el.style.color = 'red';
+el.style.color = null;
+var doesNotRemoveStyles = el.style.color == 'red';
+el = null;
+
 Element.Properties.styles = {set: function(styles){
 	this.setStyles(styles);
 }};
@@ -34,11 +41,13 @@ var setVisibility = function(element, opacity){
 var setOpacity = (hasOpacity ? function(element, opacity){
 	element.style.opacity = opacity;
 } : (hasFilter ? function(element, opacity){
-	if (!element.currentStyle || !element.currentStyle.hasLayout) element.style.zoom = 1;
+	var style = element.style;
+	if (!element.currentStyle || !element.currentStyle.hasLayout) style.zoom = 1;
 	if (opacity == null) opacity = '';
 	else opacity = 'alpha(opacity=' + (opacity * 100).limit(0, 100).round() + ')';
-	var filter = element.style.filter || element.getComputedStyle('filter') || '';
-	element.style.filter = reAlpha.test(filter) ? filter.replace(reAlpha, opacity) : filter + opacity;
+	var filter = style.filter || element.getComputedStyle('filter') || '';
+	style.filter = reAlpha.test(filter) ? filter.replace(reAlpha, opacity) : filter + opacity;
+	if (!style.filter) style.removeAttribute('filter');
 } : setVisibility));
 
 var getOpacity = (hasOpacity ? function(element){
@@ -82,6 +91,9 @@ Element.implement({
 			value = Math.round(value);
 		}
 		this.style[property] = value;
+		if ((value == '' || value == null) && doesNotRemoveStyles && this.style.removeAttribute){
+			this.style.removeAttribute(property);
+		}
 		return this;
 	},
 
diff --git a/Specs/1.4client/Element/Element.Style.js b/Specs/1.4client/Element/Element.Style.js
index 1fbab5439..0e61fdf2d 100644
--- a/Specs/1.4client/Element/Element.Style.js
+++ b/Specs/1.4client/Element/Element.Style.js
@@ -14,7 +14,13 @@ describe('Element.Style', function(){
 			var className = String.uniqueID();
 			var style = this.style = document.createElement('style');
 			style.type = 'text/css';
-			var definition = '.' + className + '{ opacity: 0.5; filter: alpha(opacity=50); }';
+			var definition = [
+				'.' + className + '{',
+					'opacity: 0.5;',
+					'filter: alpha(opacity=50);',
+					'color: #ff0000;',
+				'}'
+			].join('');
 
 			// fix this, see https://github.com/mootools/mootools-core/issues/2265
 			if (style.styleSheet) style.styleSheet.cssText = definition;
@@ -44,6 +50,13 @@ describe('Element.Style', function(){
 			expect(this.element.getStyle('opacity')).toEqual(0.5);
 		});
 
+		it('should remove the style by setting it to `null`', function(){
+			this.element.setStyle('color', '#FF9900');
+			expect(this.element.getStyle('color')).toEqual('#ff9900');
+			this.element.setStyle('color', null);
+			expect(this.element.getStyle('color')).toEqual('#ff0000');
+		});
+
 	});
 
 });