mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-20 07:21:30 +02:00
Code Issues Releases Wiki Activity

Merge PR #778 branch 'cyberalien/ticket/10800' into develop

Browse Source 
* cyberalien/ticket/10800:
  [ticket/10800] Changing html to js for includejs tests
  [ticket/10800] Changing template paths in tests
This commit is contained in:
Oleg Pudeyev
2012-06-11 20:02:35 -04:00
parent f22c99ffdb 5114edcafe
commit d8946e74de
10 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/template/templates/child_only.js Normal file
View File

@@ -0,0 +1 @@
// JavaScript file only in a child style.

4
tests/template/templates/includejs.html
View File

@@ -1,5 +1,5 @@
<!-- INCLUDEJS parent_and_child.html -->
<!-- INCLUDEJS parent_and_child.js -->
<!-- INCLUDEJS {PARENT} -->
<!-- DEFINE $TEST = 'child_only.html' -->
<!-- DEFINE $TEST = 'child_only.js' -->
<!-- INCLUDEJS {$TEST} -->
{SCRIPTS}

1
tests/template/templates/parent_and_child.js Normal file
View File

@@ -0,0 +1 @@
// JavaScript file in a child style.