added test and patch to ensure styles set on an element via element.s…

…tyle.display='block' for example, are serialized during innerHTML. thanks to star for noting this issue
thatcher · Aug 18, 2010 · 04ab596 · 04ab596
1 parent c37c427
commit 04ab596
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/build.properties b/build.properties
@@ -2,7 +2,7 @@
 PROJECT: env-js
 BUILD_MAJOR: 1
 BUILD_MINOR: 2
-BUILD_ID: 29
+BUILD_ID: 30
 BUILD_VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
 BUILD: ${PROJECT}.${BUILD_VERSION}
 VERSION: ${BUILD} ${DSTAMP}

diff --git a/specs/css/spec.js b/specs/css/spec.js
@@ -141,6 +141,15 @@ test('adding style element', function() {
 
 });
 
+test('serializing attribute when set with element.style.name', function(){
+	var divWrapper = document.createElement('div');
+	var div = document.createElement('div');
+	divWrapper.appendChild(div);
+    div.id = 'styleSerializeTest';
+	div.style.display = 'block';
+    equals(divWrapper.innerHTML, '<div id="styleSerializeTest" style="display: block;"/>', 'styles serialized');
+});
+
 test('box model', function(){
 	var div1 = document.createElement('div');
 	div1.id = "div1";

diff --git a/src/css/htmlelement.js b/src/css/htmlelement.js
@@ -20,7 +20,7 @@ __extend__(HTMLElement.prototype, {
             $css2properties[this.css2uuid] = new CSS2Properties(this);
         }
         return $css2properties[this.css2uuid];
-    },
+    }
 });
 
 /**
@@ -41,7 +41,7 @@ var updateCss2Props = function(elem, values) {
         $css2properties[elem.css2uuid] = new CSS2Properties(elem);
     }
     __cssTextToStyles__($css2properties[elem.css2uuid], values);
-}
+};
 
 var origSetAttribute =  HTMLElement.prototype.setAttribute;
 
@@ -51,4 +51,17 @@ HTMLElement.prototype.setAttribute = function(name, value) {
     if (name === "style") {
         updateCss2Props(this, value);
     }
-}
+};
+
+var origGetAttribute =  HTMLElement.prototype.getAttribute;
+
+HTMLElement.prototype.getAttribute = function(name) {
+    //console.log("CSS set attribute: " + name + ", " + value);
+	var style;
+    if (name === "style") {
+        style = this.style.cssText;
+		return style===""?null:style;
+    }else{
+	    return origGetAttribute.apply(this, arguments);
+	}
+};
diff --git a/src/html/element.js b/src/html/element.js
@@ -154,6 +154,7 @@ __extend__(HTMLElement.prototype, {
             name = (this.tagName+"").toLowerCase(),
             attrs,
             attrstring = "",
+			style = false,
             i;
 
         // serialize namespace declarations
@@ -171,7 +172,15 @@ __extend__(HTMLElement.prototype, {
         attrs = this.attributes;
         for(i=0;i< attrs.length;i++){
             attrstring += " "+attrs[i].name+'="'+attrs[i].xml+'"';
+			if(attrs[i].name == 'style'){
+				style = true;
+			}
         }
+		if(!style ){
+			style = this.getAttribute('style');
+			if(style!='')
+				attrstring += ' style="'+style+'"';
+		}
 
         if(this.hasChildNodes()){
             // serialize this Element