makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/twig] Changing INCLUDEJS behavior slightly

Browse source 
Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP

PHPBB3-11598
This commit is contained in:
Nathaniel Guse 2013-07-01 12:26:01 -05:00
parent e9bbeeb1a4
commit 6c30441ad4
10 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/includes/template/twig/lexer.php
View file

@ -44,6 +44,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
'DEFINE.+=',
'INCLUDE',
'INCLUDEPHP',
'INCLUDEJS',
), $code);
// Fix our BEGIN statements

2
phpBB/styles/prosilver/template/memberlist_search.html
View file

@ -38,7 +38,7 @@ function insert_single(user)
// ]]>
</script>
<!-- ENDIF -->
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/forum_fn.js' -->
<!-- INCLUDEJS {T_TEMPLATE_PATH}/forum_fn.js -->
<h2 class="solo">{L_FIND_USERNAME}</h2>
<form method="post" action="{S_MODE_ACTION}" id="search_memberlist">

2
phpBB/styles/prosilver/template/overall_footer.html
View file

@ -55,7 +55,7 @@
<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/forum_fn.js?assets_version={T_ASSETS_VERSION}"></script>
<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/ajax.js' -->
<!-- INCLUDEJS {T_TEMPLATE_PATH}/ajax.js -->
{SCRIPTS}
<!-- EVENT overall_footer_after -->

2
phpBB/styles/prosilver/template/posting_buttons.html
View file

@ -52,7 +52,7 @@
// ]]>
</script>
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/editor.js' -->
<!-- INCLUDEJS {T_TEMPLATE_PATH}/editor.js -->
<!-- IF S_BBCODE_ALLOWED -->
<div id="colour_palette" style="display: none;">

2
phpBB/styles/prosilver/template/timezone_option.html
View file

@ -15,6 +15,6 @@
{S_TZ_OPTIONS}
</select>
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/timezone.js' -->
<!-- INCLUDEJS {T_TEMPLATE_PATH}/timezone.js -->
</dd>
</dl>

2
phpBB/styles/prosilver/template/ucp_avatar_options.html
View file

@ -47,4 +47,4 @@
</div>
</div>
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/avatars.js' -->
<!-- INCLUDEJS {T_TEMPLATE_PATH}/avatars.js -->

2
phpBB/styles/subsilver2/template/timezone_option.html
View file

@ -15,6 +15,6 @@
{S_TZ_OPTIONS}
</select>
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/timezone.js' -->
<!-- INCLUDEJS {T_TEMPLATE_PATH}/timezone.js -->
</td>
</tr>

2
phpBB/styles/subsilver2/template/ucp_groups_manage.html
View file

@ -95,7 +95,7 @@
</tr>
</table>
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/avatars.js' -->
<!-- INCLUDEJS {T_TEMPLATE_PATH}/avatars.js -->
<!-- ELSEIF S_LIST -->

2
phpBB/styles/subsilver2/template/ucp_profile_avatar.html
View file

@ -48,6 +48,6 @@
</tr>
</table>
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/avatars.js' -->
<!-- INCLUDEJS {T_TEMPLATE_PATH}/avatars.js -->
<!-- INCLUDE ucp_footer.html -->

12
tests/template/templates/includejs.html
View file

@ -1,8 +1,8 @@
<!-- INCLUDEJS 'parent_and_child.js' -->
<!-- INCLUDEJS PARENT -->
<!-- INCLUDEJS parent_and_child.js -->
<!-- INCLUDEJS {PARENT} -->
<!-- DEFINE $TEST = 'child_only.js' -->
<!-- INCLUDEJS TEST -->
<!-- INCLUDEJS 'subdir/' ~ PARENT -->
<!-- INCLUDEJS SUBDIR ~ '/subsubdir/' ~ PARENT -->
<!-- INCLUDEJS SUBDIR ~ '/parent_only.' ~ EXT -->
<!-- INCLUDEJS {$TEST} -->
<!-- INCLUDEJS subdir/{PARENT} -->
<!-- INCLUDEJS {SUBDIR}/subsubdir/{PARENT} -->
<!-- INCLUDEJS {SUBDIR}/parent_only.{EXT} -->
{SCRIPTS}