jenkins-bot has submitted this change and it was merged.
Change subject: Add intro.js.txt and outro.js.txt to all distribution JS files
......................................................................
Add intro.js.txt and outro.js.txt to all distribution JS files
oojs-ui-apex.js and oojs-ui-mediawiki.js were missing it previously.
Implemented this in Gruntfile to avoid similar mistakes in modules.yaml
in the future.
Change-Id: I4bfdcce3d3408b7cd6066f3e608d771eaeda3974
---
M Gruntfile.js
M build/modules.yaml
2 files changed, 11 insertions(+), 16 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index ab899b0..81799c4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,6 +14,7 @@
colorizeSvgFiles = {},
requiredFiles = [],
concatCssFiles = {},
+ concatJsFiles = {},
rtlFiles = {},
minBanner = '/*! OOjs UI v<%= pkg.version %> |
http://oojs.mit-license.org */';
@@ -39,7 +40,8 @@
grunt.loadTasks( 'build/tasks' );
( function () {
- var module, theme;
+ var distFile, module, theme, moduleStyleFiles;
+
function themify( str ) {
return str.replace( /\{theme\}/g, theme ).replace(
/\{Theme\}/g, themes[ theme ] );
}
@@ -57,18 +59,12 @@
delete modules[ module ];
}
}
- }() );
- ( function () {
- var module;
for ( module in modules ) {
requiredFiles.push.apply( requiredFiles, modules[
module ].scripts || [] );
requiredFiles.push.apply( requiredFiles, modules[
module ].styles || [] );
}
- }() );
- ( function () {
- var distFile, module, moduleStyleFiles;
function rtlPath( fileName ) {
return fileName.replace( /\.(\w+)$/, '.rtl.$1' );
}
@@ -112,6 +108,12 @@
concatCssFiles[ distFile ] =
moduleStyleFiles.map( processFile );
concatCssFiles[ rtlPath( distFile ) ] =
concatCssFiles[ distFile ].map( rtlPath );
}
+ if ( modules[ module ].scripts ) {
+ distFile = 'dist/' + module + '.js';
+ concatJsFiles[ distFile ] = modules[ module
].scripts.slice();
+ concatJsFiles[ distFile ].unshift(
'src/intro.js.txt' );
+ concatJsFiles[ distFile ].push(
'src/outro.js.txt' );
+ }
}
}() );
@@ -149,11 +151,7 @@
banner: grunt.file.read( 'build/banner.txt' )
},
js: {
- files: {
- 'dist/oojs-ui.js': modules[ 'oojs-ui'
].scripts,
- 'dist/oojs-ui-apex.js': modules[
'oojs-ui-apex' ].scripts,
- 'dist/oojs-ui-mediawiki.js': modules[
'oojs-ui-mediawiki' ].scripts
- }
+ files: concatJsFiles
},
css: {
files: concatCssFiles
diff --git a/build/modules.yaml b/build/modules.yaml
index 1a67158..784ab8c 100644
--- a/build/modules.yaml
+++ b/build/modules.yaml
@@ -2,7 +2,6 @@
# The JavaScript library.
"oojs-ui": {
"scripts": [
- "src/intro.js.txt",
"src/core.js",
"src/mixin.js",
@@ -112,9 +111,7 @@
"src/widgets/OutlineSelectWidget.js",
"src/widgets/TabSelectWidget.js",
"src/widgets/NumberInputWidget.js",
- "src/widgets/ToggleSwitchWidget.js",
-
- "src/outro.js.txt"
+ "src/widgets/ToggleSwitchWidget.js"
]
},
--
To view, visit https://gerrit.wikimedia.org/r/267716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4bfdcce3d3408b7cd6066f3e608d771eaeda3974
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
