Fix :nth-child, :not and similar selector modifiers in panel. Fixes #249

ankit · Jul 11, 2013 · bbab063 · bbab063 · LiamKarlMitchell · Jun 14, 2018
1 parent 0a00aaf
commit bbab063
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/stylebot/editor/style.js b/stylebot/editor/style.js
@@ -175,21 +175,25 @@ stylebot.style = {
    */
   applyPageCSS: function(css, shouldSave, data) {
     if (shouldSave === undefined) { shouldSave = true; }
-
     var parsedRules = {};
 
     if (css != '') {
-      if (!this.parser)
+      if (!this.parser) {
         this.parser = new CSSParser();
+      }
+
       try {
         var sheet = this.parser.parse(css, false, true);
         parsedRules = CSSUtils.getRulesFromParserObject(sheet);
       } catch (e) {
         console.log(e);
+        return false;
       }
     }
 
-    if (parsedRules['error']) { return parsedRules['error']; }
+    if (parsedRules['error']) {
+      return parsedRules['error'];
+    }
 
     this.clearInlineCSS(this.cache.elements);
     this.updateStyleElement(parsedRules);

diff --git a/stylebot/libs/parser.js b/stylebot/libs/parser.js
@@ -3994,6 +3994,9 @@ CSSParser.prototype = {
           if (!canNegate)
             return null;
           token = this.getToken(true, true);
+          if (!token.isNotNull()) {
+            return null;
+          }
           var simpleSelector = this.parseSimpleSelector(token, isFirstInChain, false);
           if (!simpleSelector)
             return null;
@@ -4010,6 +4013,9 @@ CSSParser.prototype = {
         else {
           while (true) {
             token = this.getToken(false, true);
+            if (!token.isNotNull()) {
+              break;
+            }
             if (token.isSymbol(")")) {
               s += ")";
               break;