From 7c19d1520df5cb9edfc537726b079ba5248fd25f Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Tue, 31 Oct 2017 20:02:26 +0200 Subject: [PATCH] Tweaked script/style tag formatting --- system/src/Grav/Common/Twig/Node/TwigNodeScript.php | 2 +- system/src/Grav/Common/Twig/Node/TwigNodeStyle.php | 2 +- .../Grav/Common/Twig/TokenParser/TwigTokenParserScript.php | 5 +++-- .../Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeScript.php b/system/src/Grav/Common/Twig/Node/TwigNodeScript.php index 40d6e5e86..1bd509e1b 100644 --- a/system/src/Grav/Common/Twig/Node/TwigNodeScript.php +++ b/system/src/Grav/Common/Twig/Node/TwigNodeScript.php @@ -94,7 +94,7 @@ class TwigNodeScript extends \Twig_Node implements \Twig_NodeOutputInterface $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 index 0cb239541..a3d13dbef 100644 --- a/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php +++ b/system/src/Grav/Common/Twig/Node/TwigNodeStyle.php @@ -90,7 +90,7 @@ class TwigNodeStyle extends \Twig_Node implements \Twig_NodeOutputInterface $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 index 8677452a5..364b7ad7b 100644 --- a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserScript.php +++ b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserScript.php @@ -13,9 +13,9 @@ use Grav\Common\Twig\Node\TwigNodeScript; /** * 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 @@ class TwigTokenParserScript extends \Twig_TokenParser $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 index 3be798f0c..bff1c8c03 100644 --- a/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php +++ b/system/src/Grav/Common/Twig/TokenParser/TwigTokenParserStyle.php @@ -13,9 +13,9 @@ use Grav\Common\Twig\Node\TwigNodeStyle; /** * 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 @@ class TwigTokenParserStyle extends \Twig_TokenParser $priority = null; if ($stream->nextIf(\Twig_Token::NAME_TYPE, 'priority')) { + $stream->expect(\Twig_Token::PUNCTUATION_TYPE, ':'); $priority = $this->parser->getExpressionParser()->parseExpression(); }