revise handling of @media in css parser

my first take was completely wrong-headed
codemirror · Oct 8, 2010 · 57cf34e · 57cf34e
1 parent 58441a0
commit 57cf34e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/js/parsecss.js b/js/parsecss.js
@@ -128,16 +128,18 @@ var CSSParser = Editor.Parser = (function() {
         if (content == "\n")
           token.indentation = indentCSS(inBraces, inRule, basecolumn);
 
-        if (content == "{")
+        if (content == "{" && inDecl == "@media")
+          inDecl = false;
+        else if (content == "{")
           inBraces = true;
         else if (content == "}")
           inBraces = inRule = inDecl = false;
         else if (content == ";")
           inRule = inDecl = false;
         else if (inBraces && style != "css-comment" && style != "whitespace")
           inRule = true;
-        else if (!inBraces && style == "css-at" && content != "@media")
-          inDecl = true;
+        else if (!inBraces && style == "css-at")
+          inDecl = content;
 
         return token;
       },