jenkins-bot has submitted this change and it was merged.
Change subject: Allow different JS files to be referenced in different rt
server views
......................................................................
Allow different JS files to be referenced in different rt server views
Change-Id: If3ab219885bafb42f4c9e959de6169b6057721ed
---
M tests/server/server.js
M tests/server/views/commits.html
M tests/server/views/layout.html
3 files changed, 20 insertions(+), 6 deletions(-)
Approvals:
Marcoil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/server/server.js b/tests/server/server.js
index b31d893..a51af5f 100755
--- a/tests/server/server.js
+++ b/tests/server/server.js
@@ -706,6 +706,19 @@
}
};
+// block helper to reference js files in page head.
+// options.fn is a function taking the present context and returning a string
+// (whatever is between {{#jsFiles}} and {{/jsFiles}} in a template).
+// This string becomes the value of a 'javascripts' key added to the context,
to be
+// rendered as html where {{{javascripts}}} appears in layout.html.
+hbs.registerHelper('jsFiles', function(options){
+ if (!this.javascripts) {
+ this.javascripts = {};
+ }
+ this.javascripts = options.fn(this);
+ return null;
+});
+
var pageListData = [
{ url: '/topfails', title: 'Results by title' },
{ url: '/failedFetches', title: 'Non-existing test pages' },
@@ -1395,8 +1408,6 @@
// List of all commits
app.use( '/commits', GET_commits );
-
-app.use( '/static', express.static( __dirname + '/static' ) );
// Clients will GET this path if they want to run a test
coordApp.get( /^\/title$/, getTitle );
diff --git a/tests/server/views/commits.html b/tests/server/views/commits.html
index de2e0e8..aa50f3e 100644
--- a/tests/server/views/commits.html
+++ b/tests/server/views/commits.html
@@ -1,3 +1,9 @@
+{{#jsFiles}}
+ <script src='/static/js/jquery-min.js'></script>
+ <script src='/static/js/commitList.js'></script>
+ <script src='/static/js/app.js'></script>
+{{/jsFiles}}
+
<h1 class='heading'>Revisions since {{latest}}</h1>
<div id='content'>
diff --git a/tests/server/views/layout.html b/tests/server/views/layout.html
index 8799610..270c3ab 100644
--- a/tests/server/views/layout.html
+++ b/tests/server/views/layout.html
@@ -2,10 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
- <script src='/static/js/jquery-min.js'></script>
- <script src='/static/js/commitList.js'></script>
- <script src='/static/js/app.js'></script>
-
+ {{{javascripts}}}
<link type='text/css' href="/static/style.css" rel="stylesheet">
</head>
<body>
--
To view, visit https://gerrit.wikimedia.org/r/113121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3ab219885bafb42f4c9e959de6169b6057721ed
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Bebirchall <bebirch...@gmail.com>
Gerrit-Reviewer: Marcoil <marc...@wikimedia.org>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
