aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template/twig/node/includeasset.php
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-01-17 20:11:36 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-01-25 00:31:45 +0100
commit52b3d54805af6d0a89ede1cd2acac92cd95693c0 (patch)
tree83b86f33995d5cdc69d54e73b8da2d3379e41c98 /phpBB/phpbb/template/twig/node/includeasset.php
parentd8af5ac4f9ddc1de16af73f5af1f2c465ee124e4 (diff)
downloadforums-52b3d54805af6d0a89ede1cd2acac92cd95693c0.tar
forums-52b3d54805af6d0a89ede1cd2acac92cd95693c0.tar.gz
forums-52b3d54805af6d0a89ede1cd2acac92cd95693c0.tar.bz2
forums-52b3d54805af6d0a89ede1cd2acac92cd95693c0.tar.xz
forums-52b3d54805af6d0a89ede1cd2acac92cd95693c0.zip
[ticket/13717] Set the assets after rendering the whole template
The goal being to be able to call INCLUDECSS/JS from anywhere in any tempalte or event PHPBB3-13717
Diffstat (limited to 'phpBB/phpbb/template/twig/node/includeasset.php')
-rw-r--r--phpBB/phpbb/template/twig/node/includeasset.php27
1 files changed, 7 insertions, 20 deletions
diff --git a/phpBB/phpbb/template/twig/node/includeasset.php b/phpBB/phpbb/template/twig/node/includeasset.php
index 324823b8d7..3d3c6e4df8 100644
--- a/phpBB/phpbb/template/twig/node/includeasset.php
+++ b/phpBB/phpbb/template/twig/node/includeasset.php
@@ -49,33 +49,20 @@ abstract class includeasset extends \Twig_Node
->write("\$local_file = \$this->getEnvironment()->findTemplate(\$asset_path);\n")
->write("\$asset->set_path(\$local_file, true);\n")
->outdent()
- ->write("\$asset->add_assets_version('{$config['assets_version']}');\n")
- ->write("\$asset_file = \$asset->get_url();\n")
->write("}\n")
+ ->write("\$asset->add_assets_version('{$config['assets_version']}');\n")
->outdent()
->write("}\n")
- ->write("\$context['definition']->append('{$this->get_definition_name()}', '")
- ;
-
- $this->append_asset($compiler);
-
- $compiler
- ->raw("\n');\n")
+ ->write("\$context['definition']->set('STYLESHEETS', '__STYLESHEETS_PLACEHOLDER__');\n")
+ ->write("\$context['definition']->set('SCRIPTS', '__SCRIPTS_PLACEHOLDER__');\n")
+ ->write("\$this->getEnvironment()->get_assets_bag()->add_{$this->get_setters_name()}(\$asset);")
;
}
/**
- * Get the definition name
+ * Get the name of the assets bag setter
*
- * @return string (e.g. 'SCRIPTS')
- */
- abstract public function get_definition_name();
-
- /**
- * Append the output code for the asset
- *
- * @param \Twig_Compiler A Twig_Compiler instance
- * @return null
+ * @return string (e.g. 'script')
*/
- abstract protected function append_asset(\Twig_Compiler $compiler);
+ abstract public function get_setters_name();
}