Removing filtering from the CSS preprocessor

krasimir · Dec 24, 2013 · 0573685 · 0573685
1 parent 2a350e3
commit 0573685
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 66 deletions.
diff --git a/benchmarks/scripts/compile.css.js b/benchmarks/scripts/compile.css.js
@@ -1,4 +1,12 @@
 var api = require("../../index.js")();
+api.plugin("hoverEffect", function(api, color) {
+	return {
+		":hover": {
+			color: color,
+            background: api.lighten(color, 60)
+		}
+	}
+})
 module.exports = function() {
 	api.add({
 		body: {
@@ -7,7 +15,8 @@ module.exports = function() {
 			},
 			p: {
 				span: {
-					fontSize: "20px"
+					fontSize: "20px",
+					hoverEffect: '#999'
 				}
 			}
 		}
@@ -16,7 +25,8 @@ module.exports = function() {
 			lineHeight: "20px"
 		},
 		header: {
-			marginTop: "20px"
+			marginTop: "20px",
+			hoverEffect: '#999'
 		}
 	}).compile(function(err, css) {
 

diff --git a/client-side/build/absurd.js b/client-side/build/absurd.js
@@ -1000,26 +1000,6 @@ var toCSS = function(rules, options) {
 	return css;
 }
 
-// dealing with false values
-var filterRules = function(rules) {
-	var arr = {};
-	for(var selector in rules) {
-		var areThereAnyProps = false;
-		var props = {};
-		for(var prop in rules[selector]) {
-			var value = rules[selector][prop];
-			if(value !== false && typeof value != 'object') {
-				areThereAnyProps = true;
-				props[prop] = value;
-			}
-		}
-		if(areThereAnyProps) {
-			arr[selector] = props;
-		}
-	}
-	return arr;
-}
-
 // combining selectors
 var combineSelectors = function(rules) {
 	var map = {},
@@ -1064,7 +1044,7 @@ lib.processors.css.CSS = function() {
 		options = options || defaultOptions;
 		var css = '';
 		for(var stylesheet in rules) {
-			var r = filterRules(rules[stylesheet]);
+			var r = rules[stylesheet];
 			r = options.combineSelectors ? combineSelectors(r) : r;
 			if(stylesheet === "mainstream") {
 				css += toCSS(r, options);

diff --git a/client-side/build/absurd.min.js b/client-side/build/absurd.min.js
diff --git a/client-side/tmp/absurd.js b/client-side/tmp/absurd.js
@@ -546,26 +546,6 @@ var toCSS = function(rules, options) {
 	return css;
 }
 
-// dealing with false values
-var filterRules = function(rules) {
-	var arr = {};
-	for(var selector in rules) {
-		var areThereAnyProps = false;
-		var props = {};
-		for(var prop in rules[selector]) {
-			var value = rules[selector][prop];
-			if(value !== false && typeof value != 'object') {
-				areThereAnyProps = true;
-				props[prop] = value;
-			}
-		}
-		if(areThereAnyProps) {
-			arr[selector] = props;
-		}
-	}
-	return arr;
-}
-
 // combining selectors
 var combineSelectors = function(rules) {
 	var map = {},
@@ -610,7 +590,7 @@ lib.processors.css.CSS = function() {
 		options = options || defaultOptions;
 		var css = '';
 		for(var stylesheet in rules) {
-			var r = filterRules(rules[stylesheet]);
+			var r = rules[stylesheet];
 			r = options.combineSelectors ? combineSelectors(r) : r;
 			if(stylesheet === "mainstream") {
 				css += toCSS(r, options);

diff --git a/lib/processors/css/CSS.js b/lib/processors/css/CSS.js
@@ -29,26 +29,6 @@ var toCSS = function(rules, options) {
 	return css;
 }
 
-// dealing with false values
-var filterRules = function(rules) {
-	var arr = {};
-	for(var selector in rules) {
-		var areThereAnyProps = false;
-		var props = {};
-		for(var prop in rules[selector]) {
-			var value = rules[selector][prop];
-			if(value !== false && typeof value != 'object') {
-				areThereAnyProps = true;
-				props[prop] = value;
-			}
-		}
-		if(areThereAnyProps) {
-			arr[selector] = props;
-		}
-	}
-	return arr;
-}
-
 // combining selectors
 var combineSelectors = function(rules) {
 	var map = {},
@@ -93,7 +73,7 @@ module.exports = function() {
 		options = options || defaultOptions;
 		var css = '';
 		for(var stylesheet in rules) {
-			var r = filterRules(rules[stylesheet]);
+			var r = rules[stylesheet];
 			r = options.combineSelectors ? combineSelectors(r) : r;
 			if(stylesheet === "mainstream") {
 				css += toCSS(r, options);