浏览代码

[AsseticBundle] added twig support for asset packages

Kris Wallsmith 14 年之前
父节点
当前提交
06074c367d

+ 3 - 3
src/Symfony/Bundle/AsseticBundle/Twig/DynamicExtension.php

@@ -24,9 +24,9 @@ class DynamicExtension extends AsseticExtension
     public function getTokenParsers()
     {
         return array(
-            new DynamicTokenParser($this->factory, 'javascripts', 'js/*.js', $this->debug),
-            new DynamicTokenParser($this->factory, 'stylesheets', 'css/*.css', $this->debug),
-            new DynamicTokenParser($this->factory, 'image', 'images/*', $this->debug, true),
+            new DynamicTokenParser($this->factory, 'javascripts', 'js/*.js', $this->debug, false, array('package')),
+            new DynamicTokenParser($this->factory, 'stylesheets', 'css/*.css', $this->debug, false, array('package')),
+            new DynamicTokenParser($this->factory, 'image', 'images/*', $this->debug, true, array('package')),
         );
     }
 }

+ 3 - 3
src/Symfony/Bundle/AsseticBundle/Twig/StaticExtension.php

@@ -24,9 +24,9 @@ class StaticExtension extends AsseticExtension
     public function getTokenParsers()
     {
         return array(
-            new StaticTokenParser($this->factory, 'javascripts', 'js/*.js', $this->debug),
-            new StaticTokenParser($this->factory, 'stylesheets', 'css/*.css', $this->debug),
-            new StaticTokenParser($this->factory, 'image', 'images/*', $this->debug, true),
+            new StaticTokenParser($this->factory, 'javascripts', 'js/*.js', $this->debug, false, array('package')),
+            new StaticTokenParser($this->factory, 'stylesheets', 'css/*.css', $this->debug, false, array('package')),
+            new StaticTokenParser($this->factory, 'image', 'images/*', $this->debug, true, array('package')),
         );
     }
 }

+ 1 - 0
src/Symfony/Bundle/AsseticBundle/Twig/StaticNode.php

@@ -29,6 +29,7 @@ class StaticNode extends AsseticNode
             new \Twig_Node_Expression_Name('asset', $body->getLine()),
             new \Twig_Node(array(
                 new \Twig_Node_Expression_Constant($this->getAttribute('output'), $body->getLine()),
+                new \Twig_Node_Expression_Constant($this->hasAttribute('package') ? $this->getAttribute('package') : null, $body->getLine()),
             )),
             $body->getLine()
         );