jenkins-bot has submitted this change and it was merged.
Change subject: Rename intro.js and outro.js to have .txt extensions
......................................................................
Rename intro.js and outro.js to have .txt extensions
This will make it easier to e.g. pass all of src/ to jsduck
without it tripping on parse errors.
This also fixes the static jsduck test in Jenkins since we can't
use /dist/ without building a distribution from source first,
and we can't easily pass all files except intro/outro to jsduck
because it doesn't support wildcards and doesn't support excluding
files (we'd have to list each directory and file separately).
Change-Id: I7481ddb210c963063a9483ddc8b3ac1fc0de056e
---
M .jshintignore
M Gruntfile.js
M build/modules.json
M jsduck.config.json
R src/intro.js.txt
R src/outro.js.txt
6 files changed, 4 insertions(+), 8 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintignore b/.jshintignore
index a20a828..01792af 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -3,5 +3,3 @@
docs/
lib/
node_modules
-src/intro.js
-src/outro.js
diff --git a/Gruntfile.js b/Gruntfile.js
index 3f9480a..e646c2d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -82,9 +82,7 @@
jscs: {
dev: [
'<%= jshint.dev %>',
- '!demos/{dist,lib}/**',
- '!src/intro.js',
- '!src/outro.js'
+ '!demos/{dist,lib}/**'
],
dist: '<%= jshint.dist %>'
},
diff --git a/build/modules.json b/build/modules.json
index 5942490..9a65934 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -1,7 +1,7 @@
{
"oojs-ui": {
"scripts": [
- "src/intro.js",
+ "src/intro.js.txt",
"src/core.js",
"src/Element.js",
"src/Frame.js",
@@ -65,7 +65,7 @@
"src/widgets/ToggleWidget.js",
"src/widgets/ToggleButtonWidget.js",
"src/widgets/ToggleSwitchWidget.js",
- "src/outro.js"
+ "src/outro.js.txt"
],
"styles": [
"src/styles/intro.css",
diff --git a/jsduck.config.json b/jsduck.config.json
index d36e398..da6cff6 100644
--- a/jsduck.config.json
+++ b/jsduck.config.json
@@ -10,6 +10,6 @@
"--": [
"jsduck.external.js",
"lib/oojs.js",
- "dist/oojs-ui.js"
+ "src"
]
}
diff --git a/src/intro.js b/src/intro.js.txt
similarity index 100%
rename from src/intro.js
rename to src/intro.js.txt
diff --git a/src/outro.js b/src/outro.js.txt
similarity index 100%
rename from src/outro.js
rename to src/outro.js.txt
--
To view, visit https://gerrit.wikimedia.org/r/130623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7481ddb210c963063a9483ddc8b3ac1fc0de056e
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
