Fix parentRule and implement parentStyleSheet

parentRule and parentStyleSheet should match the spec now.

Author: NV

lib/CSSKeyframeRule.js

@@ -14,6 +14,7 @@ CSSOM.CSSKeyframeRule = function CSSKeyframeRule() {
 	CSSOM.CSSRule.call(this);
 	this.keyText = '';
 	this.style = new CSSOM.CSSStyleDeclaration;
+	this.style.parentRule = this;
 };
 
 CSSOM.CSSKeyframeRule.prototype = new CSSOM.CSSRule;

lib/CSSRule.js

@@ -10,6 +10,7 @@ var CSSOM = {};
  */
 CSSOM.CSSRule = function CSSRule() {
 	this.parentRule = null;
+	this.parentStyleSheet = null;
 };
 
 CSSOM.CSSRule.STYLE_RULE = 1;

lib/CSSStyleDeclaration.js

@@ -9,6 +9,7 @@ var CSSOM = {};
  */
 CSSOM.CSSStyleDeclaration = function CSSStyleDeclaration(){
 	this.length = 0;
+	this.parentRule = null;
 
 	// NON-STANDARD
 	this._importants = {};

lib/CSSStyleRule.js

@@ -15,6 +15,7 @@ CSSOM.CSSStyleRule = function CSSStyleRule() {
 	CSSOM.CSSRule.call(this);
 	this.selectorText = "";
 	this.style = new CSSOM.CSSStyleDeclaration;
+	this.style.parentRule = this;
 };
 
 CSSOM.CSSStyleRule.prototype = new CSSOM.CSSRule;

lib/CSSStyleSheet.js

@@ -11,6 +11,7 @@ var CSSOM = {
  * @see http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSStyleSheet
  */
 CSSOM.CSSStyleSheet = function CSSStyleSheet() {
+	CSSOM.StyleSheet.call(this);
 	this.cssRules = [];
 };
 

lib/StyleSheet.js

@@ -7,7 +7,9 @@ var CSSOM = {};
  * @constructor
  * @see http://dev.w3.org/csswg/cssom/#the-stylesheet-interface
  */
-CSSOM.StyleSheet = function StyleSheet(){};
+CSSOM.StyleSheet = function StyleSheet() {
+	this.parentStyleSheet = null;
+};
 
 
 //.CommonJS

lib/parse.js

@@ -44,9 +44,12 @@ CSSOM.parse = function parse(token) {
 
 	var styleSheet = new CSSOM.CSSStyleSheet;
 
-	// @type CSSStyleSheet|CSSMediaRule
+	// @type CSSStyleSheet|CSSMediaRule|CSSKeyframesRule
 	var currentScope = styleSheet;
 
+	// @type CSSMediaRule|CSSKeyframesRule
+	var parentRule;
+
 	var selector, name, value, priority="", styleRule, mediaRule, importRule, keyframesRule, keyframeRule;
 
 	for (var character; character = token.charAt(i); i++) {
@@ -152,14 +155,17 @@ CSSOM.parse = function parse(token) {
 				state = "before-name";
 			} else if (state === "atBlock") {
 				mediaRule.media.mediaText = buffer.trim();
-				mediaRule.parentRule = currentScope;
-				currentScope = mediaRule;
+				currentScope = parentRule = mediaRule;
+				mediaRule.parentStyleSheet = styleSheet;
 				buffer = "";
 				state = "before-selector";
 			} else if (state === "keyframesRule-begin") {
 				keyframesRule.name = buffer.trim();
-				keyframesRule.parentRule = currentScope;
-				currentScope = keyframesRule;
+				if (parentRule) {
+					keyframesRule.parentRule = parentRule;
+				}
+				keyframesRule.parentStyleSheet = styleSheet;
+				currentScope = parentRule = keyframesRule;
 				buffer = "";
 				state = "keyframeRule-begin";
 			} else if (state === "keyframeRule-begin") {
@@ -217,9 +223,9 @@ CSSOM.parse = function parse(token) {
 					break;
 				case "importRule":
 					importRule = new CSSOM.CSSImportRule;
-					importRule.parentRule = currentScope;
+					importRule.parentStyleSheet = importRule.styleSheet.parentStyleSheet = styleSheet;
 					importRule.cssText = buffer + character;
-					currentScope.cssRules.push(importRule);
+					styleSheet.cssRules.push(importRule);
 					buffer = "";
 					state = "before-selector";
 					break;
@@ -237,7 +243,10 @@ CSSOM.parse = function parse(token) {
 				case "before-name":
 				case "name":
 					styleRule.__ends = i + 1;
-					styleRule.parentRule = currentScope;
+					if (parentRule) {
+						styleRule.parentRule = parentRule;
+					}
+					styleRule.parentStyleSheet = styleSheet;
 					currentScope.cssRules.push(styleRule);
 					buffer = "";
 					if (currentScope.constructor === CSSOM.CSSKeyframesRule) {
@@ -250,13 +259,14 @@ CSSOM.parse = function parse(token) {
 				case "before-selector":
 				case "selector":
 					// End of media rule.
-					// Nesting rules aren't supported yet
-					if (!currentScope.parentRule) {
+					if (!parentRule) {
 						throw "unexpected }";
 					}
 					currentScope.__ends = i + 1;
-					currentScope.parentRule.cssRules.push(currentScope);
-					currentScope = currentScope.parentRule;
+					// Nesting rules aren’t supported yet
+					styleSheet.cssRules.push(currentScope);
+					currentScope = styleSheet;
+					parentRule = null;
 					buffer = "";
 					state = "before-selector";
 					break;

test/CSSStyleDeclaration.test.js

@@ -5,6 +5,7 @@ test("CSSStyleDeclaration", function(){
 	equalOwnProperties(d, {
 		0: "color",
 		length: 1,
+		parentRule: null,
 		color: "purple"
 	});
 
@@ -13,6 +14,7 @@ test("CSSStyleDeclaration", function(){
 		0: "color",
 		1: "width",
 		length: 2,
+		parentRule: null,
 		color: "purple",
 		width: "128px"
 	});