Merge branch 'release/1.0.4'

siteorigin · Nov 10, 2015 · 6aa4a24 · 6aa4a24
2 parents ecf9006 + eb597f2
commit 6aa4a24
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/js/css.js b/js/css.js
@@ -17,7 +17,7 @@
         this.cssRegex = new RegExp('([\\s\\S]*?){([\\s\\S]*?)}', 'gi');
         this.cssMediaQueryRegex = '((@media [\\s\\S]*?){([\\s\\S]*?}\\s*?)})';
         this.cssKeyframeRegex = '((@.*?keyframes [\\s\\S]*?){([\\s\\S]*?}\\s*?)})';
-        this.combinedCSSRegex = '((\\s*?@media[\\s\\S]*?){([\\s\\S]*?)}\\s*?})|(([\\s\\S]*?){([\\s\\S]*?)})'; //to match css & media queries together
+        this.combinedCSSRegex = '((\\s*?(?:\\/\\*[\\s\\S]*?\\*\\/)?\\s*?@media[\\s\\S]*?){([\\s\\S]*?)}\\s*?})|(([\\s\\S]*?){([\\s\\S]*?)})'; //to match css & media queries together
         this.cssCommentsRegex = '(\\/\\*[\\s\\S]*?\\*\\/)';
         this.cssImportStatementRegex = new RegExp('@import .*?;', 'gi');
     };

diff --git a/readme.txt b/readme.txt
@@ -61,6 +61,9 @@ We offer free support on the [SiteOrigin support forums](https://siteorigin.com/
 
 == Changelog ==
 
+= 1.0.4 - 10 November 2015=
+* Fixed CSS parsing when going into visual mode.
+
 = 1.0.3 - 29 October 2015=
 * Changed video image
 * Adjust revision times by GMT offset.