Krinkle has uploaded a new change for review. https://gerrit.wikimedia.org/r/130625
Change subject: Move intro.js and outro.js out of src/ into build/ ...................................................................... Move intro.js and outro.js out of src/ into build/ This will make it easier to e.g. pass all of src/ to jsduck. Also rename to not end in .js since they are not parseable and require all kinds of exclusions to work properly. Having them be a .txt file solves all that. Change-Id: Ibef6b8ebd6b497d9b2c83680a8e4fac2a2984954 --- M .jshintignore M Gruntfile.js R build/dist-intro.js.txt R build/dist-outro.js.txt M build/modules.json 5 files changed, 3 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/25/130625/1 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/src/intro.js b/build/dist-intro.js.txt similarity index 100% rename from src/intro.js rename to build/dist-intro.js.txt diff --git a/src/outro.js b/build/dist-outro.js.txt similarity index 100% rename from src/outro.js rename to build/dist-outro.js.txt diff --git a/build/modules.json b/build/modules.json index 5942490..a3fe0ae 100644 --- a/build/modules.json +++ b/build/modules.json @@ -1,7 +1,7 @@ { "oojs-ui": { "scripts": [ - "src/intro.js", + "build/dist-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" + "build/dist-outro.js.txt" ], "styles": [ "src/styles/intro.css", -- To view, visit https://gerrit.wikimedia.org/r/130625 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibef6b8ebd6b497d9b2c83680a8e4fac2a2984954 Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Krinkle <krinklem...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits