From 57cf34e3d57ce27ef2942a832864d31d72fd546c Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 8 Oct 2010 14:57:55 +0200
Subject: [PATCH] revise handling of @media in css parser

my first take was completely wrong-headed
---
 js/parsecss.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/js/parsecss.js b/js/parsecss.js
index afa979b5..21c958cc 100644
--- a/js/parsecss.js
+++ b/js/parsecss.js
@@ -128,7 +128,9 @@ 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;
@@ -136,8 +138,8 @@ var CSSParser = Editor.Parser = (function() {
           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;
       },