dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add 'autocomplete' option to HTMLTextField"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialJavaScriptTest.php
diff --git
a/includes/specials/SpecialJavaScriptTest.php
b/includes/specials/SpecialJavaScriptTest.php
index
5d36a3c
..
0e2e7db
100644
(file)
--- a/
includes/specials/SpecialJavaScriptTest.php
+++ b/
includes/specials/SpecialJavaScriptTest.php
@@
-118,7
+118,7
@@
class SpecialJavaScriptTest extends SpecialPage {
. 'window.__karma__.loaded = function () {};'
. '}';
. 'window.__karma__.loaded = function () {};'
. '}';
- // The below is essentially a pure-javascript version of OutputPage::
getHeadScripts
.
+ // The below is essentially a pure-javascript version of OutputPage::
headElement()
.
$startup = $rl->makeModuleResponse( $startupContext, [
'startup' => $rl->getModule( 'startup' ),
] );
$startup = $rl->makeModuleResponse( $startupContext, [
'startup' => $rl->getModule( 'startup' ),
] );
@@
-166,7
+166,7
@@
class SpecialJavaScriptTest extends SpecialPage {
[ 'raw' => true, 'sync' => true ]
);
[ 'raw' => true, 'sync' => true ]
);
- $head = implode( "\n",
array_merge( $styles['html'], $scripts['html'] )
);
+ $head = implode( "\n",
[ $styles, $scripts ]
);
$summary = $this->getSummaryHtml();
$html = <<<HTML
<!DOCTYPE html>
$summary = $this->getSummaryHtml();
$html = <<<HTML
<!DOCTYPE html>