Commit graph

9 commits

Author SHA1 Message Date
Nathaniel Guse
ab5a79a823 [ticket/11388] includejs inherit from includeasset
Copied from the INCLUDECSS PR, since this needed to be modified.

Added checks for argument strings/anchors/http/https paths in asset files
to load files properly

PHPBB3-11388
2013-07-10 13:19:34 -05:00
Nathan Guse
c5c34ff831 [feature/twig] Add check for defined IN_PHPBB in all new Twig related files
PHPBB3-11598
2013-07-05 13:10:35 -05:00
Nathaniel Guse
57c2d99e65 [feature/twig] Fix indentation
PHPBB3-11598
2013-07-02 12:34:16 -05:00
Nathaniel Guse
59d13d0535 [feature/twig] INCLUDEJS behavior now supports local relative paths
This was done because T_TEMPLATE_PATH is not always correct for js files
(e.g. the inheriting style does not include these). Now we use the Twig
Loader to find the correct file to link to (most specific file first, then
parent styles). Also allows using @namespace convention

PHPBB3-11598
2013-07-02 11:07:12 -05:00
Nathaniel Guse
156d5c671f [feature/twig] INCLUDEJS now uses the definition class
This had to be done because, like DEFINE, setting variables to $context
only affected the local file and any children, not parent templates.

PHPBB3-11598
2013-07-02 10:13:16 -05:00
Nathaniel Guse
3ca99f8122 [feature/twig] Append assets_version to includejs tag
Some fixes for main template parser

PHPBB3-11598
2013-06-24 22:37:58 -05:00
Nathan Guse
1a0819bdc4 [feature/twig] Changing INCLUDEJS behavior
Was:
<!-- INCLUDEJS template/foo.js -->

Now:
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' -->

Reasons for this:
1. INCLUDEJS is 3.1-dev only

2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path
to styles/name/ directory)

3. INCLUDEJS could not include files from outside directories or anywhere
else

4. It was easier to change INCLUDEJS behavior to something more flexible
and useful than hack around it to make it work as it was with Twig.

PHPBB3-11598
2013-06-24 13:32:31 -05:00
Nathan Guse
95884edf08 [feature/twig] Correcting output of INCLUDEJS
PHPBB3-11598
2013-06-12 12:32:56 -05:00
Nathan Guse
15114067e6 [feature/twig] Replace phpBB template code with Twig syntax, then parse w/Twig
Fixing begin token/node, adding includejs token/node

PHPBB3-11598
2013-06-10 11:17:11 -05:00