Tweaked script/style tag formatting

getgrav · Oct 31, 2017 · 7c19d15 · 7c19d15
1 parent 84789cb
commit 7c19d15
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeScript.php b/system/src/Grav/Common/Twig/Node/TwigNodeScript.php
@@ -94,7 +94,7 @@ public function compile(\Twig_Compiler $compiler)
             $compiler
                 ->write("ob_start();\n")
                 ->subcompile($this->getNode('body'))
-                ->write("\$content = ob_end_clean();")
+                ->write("\$content = ob_get_clean();")
                 ->write("\$assets->addInlineJs(\$content, \$priority, \$group, \$attributes);\n");
         }
     }

diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php b/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php
@@ -90,7 +90,7 @@ public function compile(\Twig_Compiler $compiler)
             $compiler
                 ->write("ob_start();\n")
                 ->subcompile($this->getNode('body'))
-                ->write("\$content = ob_end_clean();")
+                ->write("\$content = ob_get_clean();")
                 ->write("\$assets->addInlineCss(\$content, \$priority, \$group);\n");
         }
     }

diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserScript.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserScript.php
@@ -13,9 +13,9 @@
 /**
  * Adds a script to head/bottom/custom location in the document.
  *
- * {% script 'theme://js/something.js' in 'bottom' priority 20 with { defer: true, async: true } %}
+ * {% script 'theme://js/something.js' in 'bottom' priority: 20 with { defer: true, async: true } %}
  *
- * {% script in 'bottom' priority 20 %}
+ * {% script in 'bottom' priority: 20 %}
  *     alert('Warning!');
  * {% endscript %}
 
@@ -71,6 +71,7 @@ protected function parseArguments(\Twig_Token $token)
 
         $priority = null;
         if ($stream->nextIf(\Twig_Token::NAME_TYPE, 'priority')) {
+            $stream->expect(\Twig_Token::PUNCTUATION_TYPE, ':');
             $priority = $this->parser->getExpressionParser()->parseExpression();
         }
 

diff --git a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php
@@ -13,9 +13,9 @@
 /**
  * Adds a style to the document.
  *
- * {% style 'theme://css/foo.css' priority 20 %}
+ * {% style 'theme://css/foo.css' priority: 20 %}
 
- * {% style priority 20 with { media: 'screen' } %}
+ * {% style priority: 20 with { media: 'screen' } %}
  *     a { color: red; }
  * {% endstyle %}
  */
@@ -64,6 +64,7 @@ protected function parseArguments(\Twig_Token $token)
 
         $priority = null;
         if ($stream->nextIf(\Twig_Token::NAME_TYPE, 'priority')) {
+            $stream->expect(\Twig_Token::PUNCTUATION_TYPE, ':');
             $priority = $this->parser->getExpressionParser()->parseExpression();
         }