jenkins-bot has submitted this change and it was merged.
Change subject: Move modules/vendor/* to vendor/modules/*
......................................................................
Move modules/vendor/* to vendor/modules/*
Tools that take whitelists rather than blacklists (like jsduck)
have difficulty with things like "process everything in modules/
except modules/vendor". So instead, move all 3rd-party code to
the vendor/ directory so modules/ only contains our code.
Change-Id: I0a2497e5f9e8a79ef5600e5e78c7da3c26181947
---
M .jshintignore
M Gruntfile.js
M Resources.php
R vendor/modules/Storer.js
R vendor/modules/handlebars-v3.0.0.js
5 files changed, 12 insertions(+), 10 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintignore b/.jshintignore
index db20c5e..8d8bf20 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,3 +1,2 @@
modules/jquery.scroll.js
-modules/vendor/handlebars-v2.0.0-alpha.2.js
-modules/vendor/Storer.js
+vendor
diff --git a/Gruntfile.js b/Gruntfile.js
index 3bba215..8da5e1b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -19,12 +19,11 @@
},
all: [
'*.js',
- 'modules/**/*.js',
- '!modules/vendor/*.js'
+ 'modules/**/*.js'
]
},
jscs: {
- src: [ '<%= jshint.all %>', '!modules/vendor/**' ]
+ src: '<%= jshint.all %>'
},
csslint: {
options: {
diff --git a/Resources.php b/Resources.php
index e103c57..6b8aa95 100644
--- a/Resources.php
+++ b/Resources.php
@@ -308,10 +308,12 @@
),
) + $mobile,
// MediaWiki Handlebars provider. Should not have anything
Flow-specific
- 'mediawiki.template.handlebars' => $flowResourceTemplate + array(
+ 'mediawiki.template.handlebars' => array(
+ 'localBasePath' => __DIR__,
+ 'remoteExtPath' => 'Flow',
'scripts' => array(
- 'vendor/handlebars-v3.0.0.js',
- 'handlebars.js',
+ 'vendor/modules/handlebars-v3.0.0.js',
+ 'modules/handlebars.js',
),
'dependencies' => array(
'mediawiki.template',
@@ -395,9 +397,11 @@
'flow-reply-link',
)
) + $mobile,
- 'ext.flow.vendor.storer' => $flowResourceTemplate + array(
+ 'ext.flow.vendor.storer' => array(
+ 'localBasePath' => __DIR__,
+ 'remoteExtPath' => 'Flow',
'scripts' => array(
- 'vendor/Storer.js',
+ 'vendor/modules/Storer.js',
),
) + $mobile,
'ext.flow.undo' => $flowResourceTemplate + array(
diff --git a/modules/vendor/Storer.js b/vendor/modules/Storer.js
similarity index 100%
rename from modules/vendor/Storer.js
rename to vendor/modules/Storer.js
diff --git a/modules/vendor/handlebars-v3.0.0.js
b/vendor/modules/handlebars-v3.0.0.js
similarity index 100%
rename from modules/vendor/handlebars-v3.0.0.js
rename to vendor/modules/handlebars-v3.0.0.js
--
To view, visit https://gerrit.wikimedia.org/r/208058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a2497e5f9e8a79ef5600e5e78c7da3c26181947
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
