[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

phpBB/includes/template/twig/node/includejs.php

@@ -31,9 +31,17 @@ class phpbb_template_twig_node_includejs extends Twig_Node
 		$config = $this->environment->get_phpbb_config();
 
         $compiler
-			->write("\$context['definition']->append('SCRIPTS', '<script type=\"text/javascript\" src=\"' . ")
+			->write("\$js_file = ")
         	->subcompile($this->getNode('expr'))
-        	->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>');\n")
+			->raw(";\n")
+			->write("if (!file_exists(\$js_file)) {\n")
+			->indent()
+				->write("\$js_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$js_file);\n")
+			->outdent()
+			->write("}\n")
+			->write("\$context['definition']->append('SCRIPTS', '<script type=\"text/javascript\" src=\"' . ")
+			->raw("\$js_file")
+        	->raw(" . '?assets_version=" . $config['assets_version'] . "\"></script>\n');\n")
         ;
     }
 }

phpBB/styles/prosilver/template/memberlist_search.html

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

phpBB/styles/prosilver/template/overall_footer.html

@@ -53,9 +53,9 @@
 
 <script type="text/javascript" src="{T_JQUERY_LINK}"></script>
 <!-- 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>
+<!-- INCLUDEJS forum_fn.js -->
-<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<!-- INCLUDEJS {T_ASSETS_PATH}/javascript/core.js -->
-<!-- INCLUDEJS {T_TEMPLATE_PATH}/ajax.js -->
+<!-- INCLUDEJS ajax.js -->
 {$SCRIPTS}
 
 <!-- EVENT overall_footer_after -->

phpBB/styles/prosilver/template/posting_buttons.html

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

phpBB/styles/prosilver/template/timezone_option.html

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

phpBB/styles/prosilver/template/ucp_avatar_options.html

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

phpBB/styles/subsilver2/template/timezone_option.html

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

phpBB/styles/subsilver2/template/ucp_groups_manage.html

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

phpBB/styles/subsilver2/template/ucp_profile_avatar.html

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