adding PR#44 which cleans up the removeComments function

chuckcarpenter · Mar 30, 2014 · 51a9bf8 · 51a9bf8
2 parents 2bac6d0 + a66c9a5
commit 51a9bf8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "REM-unit-polyfill",
-  "version": "1.1.0",
+  "version": "1.2.2",
   "homepage": "https://github.com/chuckcarpenter/REM-unit-polyfill",
   "authors": [
     "Chuck Carpenter <chuck.carpenter@me.com>",

diff --git a/js/rem.js b/js/rem.js
@@ -171,13 +171,12 @@
     removeComments = function ( css ) {
         var start = css.search(/\/\*/),
             end = css.search(/\*\//);
-        if ( (start > -1) && (end > start) ) {
+        while ( (start > -1) && (end > start) ) {
             css = css.substring(0, start) + css.substring(end + 2);
-            return removeComments(css);
-        }
-        else {
-            return css;
+            start = css.search(/\/\*/);
+            end = css.search(/\*\//);
         }
+        return css;
     },
 
     // Test for Media Query support
@@ -194,7 +193,7 @@
             css = css.replace(/@media[\s\S]*?\}\s*\}/, "");
         }
 
-        return css; 
+        return css;
     },
 
     getXMLHttpRequest = function () { // we're gonna check if our browser will let us use AJAX

diff --git a/js/rem.min.js b/js/rem.min.js
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "rem",
   "description": "A polyfill to parse CSS links and rewrite pixel equivalents into head for non supporting browsers",
-  "main": "rem.js",
-  "version": "1.2.1",
+  "main": "js/rem.js",
+  "version": "1.2.2",
   "authors": [
     "Chuck Carpenter <chuck.carpenter@me.com>", 
     "Lucas Serven <lserven@gmail.com>"