Merge pull request NV#67 from Jimdo/jshint-fixes

NV · NV · commit 40af58cabd5a · 2013-12-05T12:14:23.000-08:00
Fixes all JSHint problems.
diff --git a/Jakefile.js b/Jakefile.js
@@ -15,12 +15,13 @@ task("default", ["build/CSSOM.js"]);
 
 directory("build");
 
-file("build/CSSOM.js", ["src/files.js", "src/CSSOM.js", "build"], function() {
-	var parts = [readFile("src/CSSOM.js")];
+file("build/CSSOM.js", ["src/files.js", "src/CSSOM_START.js", "src/CSSOM_END.js", "build"], function() {
+	var parts = [readFile("src/CSSOM_START.js")];
 	require("./src/files").files.forEach(function(path) {
 		var text = readFile("lib/" + path + ".js");
 		parts.push(stripCommonJS(text).trimLeft());
 	});
+	parts.push(readFile("src/CSSOM_END.js"));
 	FS.writeFileSync("build/CSSOM.js", parts.join(""));
 	process.stdout.write("build/CSSOM.js is done\n");
 });
diff --git a/lib/CSSDocumentRule.js b/lib/CSSDocumentRule.js
@@ -12,11 +12,11 @@ var CSSOM = {
  */
 CSSOM.CSSDocumentRule = function CSSDocumentRule() {
     CSSOM.CSSRule.call(this);
-    this.matcher = new CSSOM.MatcherList;
+    this.matcher = new CSSOM.MatcherList();
     this.cssRules = [];
 };
 
-CSSOM.CSSDocumentRule.prototype = new CSSOM.CSSRule;
+CSSOM.CSSDocumentRule.prototype = new CSSOM.CSSRule();
 CSSOM.CSSDocumentRule.prototype.constructor = CSSOM.CSSDocumentRule;
 CSSOM.CSSDocumentRule.prototype.type = 10;
 //FIXME
diff --git a/lib/CSSFontFaceRule.js b/lib/CSSFontFaceRule.js
@@ -12,11 +12,11 @@ var CSSOM = {
  */
 CSSOM.CSSFontFaceRule = function CSSFontFaceRule() {
 	CSSOM.CSSRule.call(this);
-	this.style = new CSSOM.CSSStyleDeclaration;
+	this.style = new CSSOM.CSSStyleDeclaration();
 	this.style.parentRule = this;
 };
 
-CSSOM.CSSFontFaceRule.prototype = new CSSOM.CSSRule;
+CSSOM.CSSFontFaceRule.prototype = new CSSOM.CSSRule();
 CSSOM.CSSFontFaceRule.prototype.constructor = CSSOM.CSSFontFaceRule;
 CSSOM.CSSFontFaceRule.prototype.type = 5;
 //FIXME
diff --git a/lib/CSSImportRule.js b/lib/CSSImportRule.js
@@ -15,11 +15,11 @@ var CSSOM = {
 CSSOM.CSSImportRule = function CSSImportRule() {
 	CSSOM.CSSRule.call(this);
 	this.href = "";
-	this.media = new CSSOM.MediaList;
-	this.styleSheet = new CSSOM.CSSStyleSheet;
+	this.media = new CSSOM.MediaList();
+	this.styleSheet = new CSSOM.CSSStyleSheet();
 };
 
-CSSOM.CSSImportRule.prototype = new CSSOM.CSSRule;
+CSSOM.CSSImportRule.prototype = new CSSOM.CSSRule();
 CSSOM.CSSImportRule.prototype.constructor = CSSOM.CSSImportRule;
 CSSOM.CSSImportRule.prototype.type = 3;
 
@@ -42,8 +42,7 @@ Object.defineProperty(CSSOM.CSSImportRule.prototype, "cssText", {
 
     var buffer = '';
     var index;
-    var mediaText = '';
-    for (var character; character = cssText.charAt(i); i++) {
+    for (var character; (character = cssText.charAt(i)); i++) {
 
       switch (character) {
         case ' ':
diff --git a/lib/CSSKeyframeRule.js b/lib/CSSKeyframeRule.js
@@ -13,11 +13,11 @@ var CSSOM = {
 CSSOM.CSSKeyframeRule = function CSSKeyframeRule() {
 	CSSOM.CSSRule.call(this);
 	this.keyText = '';
-	this.style = new CSSOM.CSSStyleDeclaration;
+	this.style = new CSSOM.CSSStyleDeclaration();
 	this.style.parentRule = this;
 };
 
-CSSOM.CSSKeyframeRule.prototype = new CSSOM.CSSRule;
+CSSOM.CSSKeyframeRule.prototype = new CSSOM.CSSRule();
 CSSOM.CSSKeyframeRule.prototype.constructor = CSSOM.CSSKeyframeRule;
 CSSOM.CSSKeyframeRule.prototype.type = 9;
 //FIXME
diff --git a/lib/CSSKeyframesRule.js b/lib/CSSKeyframesRule.js
@@ -15,7 +15,7 @@ CSSOM.CSSKeyframesRule = function CSSKeyframesRule() {
 	this.cssRules = [];
 };
 
-CSSOM.CSSKeyframesRule.prototype = new CSSOM.CSSRule;
+CSSOM.CSSKeyframesRule.prototype = new CSSOM.CSSRule();
 CSSOM.CSSKeyframesRule.prototype.constructor = CSSOM.CSSKeyframesRule;
 CSSOM.CSSKeyframesRule.prototype.type = 8;
 //FIXME
diff --git a/lib/CSSMediaRule.js b/lib/CSSMediaRule.js
@@ -13,11 +13,11 @@ var CSSOM = {
  */
 CSSOM.CSSMediaRule = function CSSMediaRule() {
 	CSSOM.CSSRule.call(this);
-	this.media = new CSSOM.MediaList;
+	this.media = new CSSOM.MediaList();
 	this.cssRules = [];
 };
 
-CSSOM.CSSMediaRule.prototype = new CSSOM.CSSRule;
+CSSOM.CSSMediaRule.prototype = new CSSOM.CSSRule();
 CSSOM.CSSMediaRule.prototype.constructor = CSSOM.CSSMediaRule;
 CSSOM.CSSMediaRule.prototype.type = 4;
 //FIXME
diff --git a/lib/CSSStyleRule.js b/lib/CSSStyleRule.js
@@ -14,11 +14,11 @@ var CSSOM = {
 CSSOM.CSSStyleRule = function CSSStyleRule() {
 	CSSOM.CSSRule.call(this);
 	this.selectorText = "";
-	this.style = new CSSOM.CSSStyleDeclaration;
+	this.style = new CSSOM.CSSStyleDeclaration();
 	this.style.parentRule = this;
 };
 
-CSSOM.CSSStyleRule.prototype = new CSSOM.CSSRule;
+CSSOM.CSSStyleRule.prototype = new CSSOM.CSSRule();
 CSSOM.CSSStyleRule.prototype.constructor = CSSOM.CSSStyleRule;
 CSSOM.CSSStyleRule.prototype.type = 1;
 
@@ -58,10 +58,10 @@ CSSOM.CSSStyleRule.parse = function(ruleText) {
 		"value": true
 	};
 
-	var styleRule = new CSSOM.CSSStyleRule;
-	var selector, name, value, priority="";
+	var styleRule = new CSSOM.CSSStyleRule();
+	var name, priority="";
 
-	for (var character; character = ruleText.charAt(i); i++) {
+	for (var character; (character = ruleText.charAt(i)); i++) {
 
 		switch (character) {
 
diff --git a/lib/CSSStyleSheet.js b/lib/CSSStyleSheet.js
@@ -16,7 +16,7 @@ CSSOM.CSSStyleSheet = function CSSStyleSheet() {
 };
 
 
-CSSOM.CSSStyleSheet.prototype = new CSSOM.StyleSheet;
+CSSOM.CSSStyleSheet.prototype = new CSSOM.StyleSheet();
 CSSOM.CSSStyleSheet.prototype.constructor = CSSOM.CSSStyleSheet;
 
 
diff --git a/lib/CSSValue.js b/lib/CSSValue.js
@@ -19,13 +19,13 @@ CSSOM.CSSValue.prototype = {
 	set cssText(text) {
 		var name = this._getConstructorName();
 
-		throw new Exception('DOMException: property "cssText" of "' + name + '" is readonly!');
+		throw new Error('DOMException: property "cssText" of "' + name + '" is readonly and can not be replaced with "' + text + '"!');
 	},
 
 	get cssText() {
 		var name = this._getConstructorName();
 
-		throw new Exception('getter "cssText" of "' + name + '" is not implemented!');
+		throw new Error('getter "cssText" of "' + name + '" is not implemented!');
 	},
 
 	_getConstructorName: function() {
diff --git a/lib/CSSValueExpression.js b/lib/CSSValueExpression.js
@@ -15,17 +15,17 @@ CSSOM.CSSValueExpression = function CSSValueExpression(token, idx) {
 	this._idx = idx;
 };
 
-CSSOM.CSSValueExpression.prototype = new CSSOM.CSSValue;
+CSSOM.CSSValueExpression.prototype = new CSSOM.CSSValue();
 CSSOM.CSSValueExpression.prototype.constructor = CSSOM.CSSValueExpression;
 
 /**
  * parse css expression() value
  *
  * @return {Object}
- *				 - error:
- *				 or
- *				 - idx:
- *				 - expression:
+ *         - error:
+ *         or
+ *         - idx:
+ *         - expression:
  *
  * Example:
  *
@@ -48,7 +48,7 @@ CSSOM.CSSValueExpression.prototype.parse = function() {
 		character = token.charAt(idx);
 
 		// end of token
-		if (character == '') {
+		if (character === '') {
 			error = 'css expression error: unfinished expression!';
 			break;
 		}
@@ -65,14 +65,14 @@ CSSOM.CSSValueExpression.prototype.parse = function() {
 				break;
 
 			case '/':
-				if (info = this._parseJSComment(token, idx)) { // comment?
+				if ((info = this._parseJSComment(token, idx))) { // comment?
 					if (info.error) {
 						error = 'css expression error: unfinished comment in expression!';
 					} else {
 						idx = info.idx;
 						// ignore the comment
 					}
-				} else if (info = this._parseJSRexExp(token, idx)) { // regexp
+				} else if ((info = this._parseJSRexExp(token, idx))) { // regexp
 					idx = info.idx;
 					expression += info.text;
 				} else { // other
@@ -101,7 +101,7 @@ CSSOM.CSSValueExpression.prototype.parse = function() {
 		}
 
 		// end of expression
-		if (paren.length == 0) {
+		if (paren.length === 0) {
 			break;
 		}
 	}
@@ -110,12 +110,12 @@ CSSOM.CSSValueExpression.prototype.parse = function() {
 	if (error) {
 		ret = {
 			error: error
-		}
+		};
 	} else {
 		ret = {
 			idx: idx,
 			expression: expression
-		}
+		};
 	}
 
 	return ret;
@@ -155,12 +155,12 @@ CSSOM.CSSValueExpression.prototype._parseJSComment = function(token, idx) {
 			return {
 				idx: endIdx,
 				text: text
-			}
+			};
 		} else {
-			error = 'css expression error: unfinished comment in expression!';
+			var error = 'css expression error: unfinished comment in expression!';
 			return {
 				error: error
-			}
+			};
 		}
 	} else {
 		return false;
@@ -189,7 +189,7 @@ CSSOM.CSSValueExpression.prototype._parseJSString = function(token, idx, sep) {
 		return {
 			idx: endIdx,
 			text: text
-		}
+		};
 	}
 };
 
@@ -198,10 +198,10 @@ CSSOM.CSSValueExpression.prototype._parseJSString = function(token, idx, sep) {
  * parse regexp in css expression
  *
  * @return {Object|false}
- *				 - idx:
- *				 - regExp:
- *				 or 
- *				 false
+ *				- idx:
+ *				- regExp:
+ *				or 
+ *				false
  */
 
 /*
@@ -247,7 +247,7 @@ all legal RegExp
 		delete /a/
 				in /a/
 instanceof /a/
-			 new /a/
+				new /a/
 		typeof /a/
 			void /a/
 
@@ -266,7 +266,7 @@ CSSOM.CSSValueExpression.prototype._parseJSRexExp = function(token, idx) {
 				/\%$/,
 				/\=$/,
 				/\>$/,
-				/\<$/,
+				/<$/,
 				/\&$/,
 				/\|$/,
 				/\^$/,
@@ -278,7 +278,7 @@ CSSOM.CSSValueExpression.prototype._parseJSRexExp = function(token, idx) {
 				/instanceof$/,
 				/new$/,
 				/typeof$/,
-				/void$/,
+				/void$/
 			];
 
 	var isLegal = legalRegx.some(function(reg) {
@@ -318,7 +318,7 @@ CSSOM.CSSValueExpression.prototype._findMatchedIdx = function(token, idx, sep) {
 		} else {
 			var text = token.substring(idx + 1, endIdx),
 					matched = text.match(/\\+$/);
-			if (!matched || matched[0] % 2 == 0) { // not escaped
+			if (!matched || matched[0] % 2 === 0) { // not escaped
 				break;
 			} else {
 				startIdx = endIdx;
@@ -334,7 +334,7 @@ CSSOM.CSSValueExpression.prototype._findMatchedIdx = function(token, idx, sep) {
 
 
 	return endIdx;
-}
+};
 
 
 
diff --git a/lib/clone.js b/lib/clone.js
@@ -18,7 +18,7 @@ var CSSOM = {
  */
 CSSOM.clone = function clone(stylesheet) {
 
-	var cloned = new CSSOM.CSSStyleSheet;
+	var cloned = new CSSOM.CSSStyleSheet();
 
 	var rules = stylesheet.cssRules;
 	if (!rules) {
@@ -37,11 +37,11 @@ CSSOM.clone = function clone(stylesheet) {
 
 	for (var i=0, rulesLength=rules.length; i < rulesLength; i++) {
 		var rule = rules[i];
-		var ruleClone = cloned.cssRules[i] = new RULE_TYPES[rule.type];
+		var ruleClone = cloned.cssRules[i] = new RULE_TYPES[rule.type]();
 
 		var style = rule.style;
 		if (style) {
-			var styleClone = ruleClone.style = new CSSOM.CSSStyleDeclaration;
+			var styleClone = ruleClone.style = new CSSOM.CSSStyleDeclaration();
 			for (var j=0, styleLength=style.length; j < styleLength; j++) {
 				var name = styleClone[j] = style[j];
 				styleClone[name] = style[name];
diff --git a/lib/parse.js b/lib/parse.js
diff --git a/src/CSSOM.js b/src/CSSOM.js
diff --git a/src/CSSOM_END.js b/src/CSSOM_END.js
diff --git a/src/CSSOM_START.js b/src/CSSOM_START.js
