Related to #91

krasimir · Jun 20, 2014 · be3c8fb · be3c8fb
1 parent 6b7f627
commit be3c8fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/api/add.js b/lib/api/add.js
@@ -178,7 +178,7 @@ module.exports = function(API) {
 					props = toRegister[i].props,
 					allRules = API.getRules(stylesheet);
 				var pc = options && options.preventCombining ? '|' + options.preventCombining.join('|') : '';
-				var uid = pc.indexOf('|' + selector.replace(/^%(.*)?%/, '')) >= 0 ? '~~' + (selector.match(/^%(.*)?%/) ? API.numOfAddedRules++ : API.numOfAddedRules) + '~~' : '';
+				var uid = pc.indexOf('|' + selector.replace(/^%.*?%/, '')) >= 0 ? '~~' + (selector.match(/^%.*?%/) ? API.numOfAddedRules++ : API.numOfAddedRules) + '~~' : '';
 				// overwrite already added value
 				var current = allRules[uid + selector] || {};
 				for(var propNew in props) {

diff --git a/lib/processors/css/CSS.js b/lib/processors/css/CSS.js
@@ -16,14 +16,14 @@ var toCSS = function(rules, options, indent) {
 			css += rules[selector][selector] + newline;
 		// handling normal styles
 		} else {
-			var entityStyle = indent[0] + selector.replace(/~~(.+)~~/, '').replace(/^%(.*)?%/, '') + ' {' + newline;
+			var entityStyle = indent[0] + selector.replace(/~~(.+)~~/, '').replace(/^%.*?%/, '') + ' {' + newline;
 			var entity = '';
 			for(var prop in rules[selector]) {
 				var value = rules[selector][prop];
 				if(value === "") {
 					value = '""';
 				}
-				prop = prop.replace(/~~(.+)~~/, '').replace(/^%(.*)+?%/, '');
+				prop = prop.replace(/~~(.+)~~/, '').replace(/^%.*?%/, '');
 				if(options && options.keepCamelCase === true) {
 					entity += indent[1] + prop + ': ' + value + ';' + newline;
 				} else {
@@ -90,7 +90,7 @@ var combineSelectors = function(rules, preventCombining) {
 		if(map[i].combine === true && map[i].selector !== false) {
 			for(var j=i+1;j<map.length; j++) {
 				if(map[i].prop === map[j].prop && map[i].value === map[j].value) {
-					map[i].selector += ', ' + map[j].selector.replace(/~~(.+)~~/, '').replace(/^%(.*)+?%/, '');
+					map[i].selector += ', ' + map[j].selector.replace(/~~(.+)~~/, '').replace(/^%.*?%/, '');
 					map[j].selector = false; // marking for removal
 				}
 			}