jenkins-bot has submitted this change and it was merged.
Change subject: Move JavaScripts from javascripts/common
......................................................................
Move JavaScripts from javascripts/common
Move one up to javascripts/ and remove javascripts/common/
Bug: 71524
Change-Id: I091803b7859e6c0268bb2c7022565b806c988b91
---
M .jshintignore
M includes/Resources.php
R javascripts/CtaDrawer.js
R javascripts/Drawer.js
R javascripts/LoadingOverlay.js
R javascripts/Overlay.js
R javascripts/OverlayManager.js
R javascripts/Page.js
R javascripts/PageApi.js
R javascripts/Panel.js
R javascripts/README.md
R javascripts/Router.js
R javascripts/Section.js
R javascripts/View.js
R javascripts/api.js
R javascripts/application.js
R javascripts/history-alpha.js
R javascripts/mainmenu.js
R javascripts/modes.js
R javascripts/settings.js
R javascripts/template.js
R javascripts/toast.js
R javascripts/user.js
R tests/qunit/test_Overlay.js
R tests/qunit/test_OverlayManager.js
R tests/qunit/test_Page.js
R tests/qunit/test_PageApi.js
R tests/qunit/test_Router.js
R tests/qunit/test_api.js
R tests/qunit/test_application.js
R tests/qunit/test_history-alpha.js
31 files changed, 20 insertions(+), 19 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintignore b/.jshintignore
index 171be43..57e0837 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,4 +1,5 @@
javascripts/externals
+javascripts/README.md
tests/js/fixtures.js
tests/externals
styleguide-template
diff --git a/includes/Resources.php b/includes/Resources.php
index f95ea94..d229a1f 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -30,7 +30,7 @@
'ext.mantle.hogan',
),
'scripts' => array(
- 'javascripts/common/template.js',
+ 'javascripts/template.js',
),
'targets' => array( 'mobile', 'desktop' ),
),
@@ -125,8 +125,8 @@
'ext.mantle.oo',
),
'scripts' => array(
- 'javascripts/common/modes.js',
- 'javascripts/common/mainmenu.js',
+ 'javascripts/modes.js',
+ 'javascripts/mainmenu.js',
'javascripts/modules/lastEdited/time.js',
'javascripts/modules/lastEdited/lastEdited.js',
),
@@ -161,15 +161,15 @@
'mobile-frontend-language-article-heading',
),
'scripts' => array(
- 'javascripts/common/Router.js',
- 'javascripts/common/OverlayManager.js',
- 'javascripts/common/api.js',
- 'javascripts/common/PageApi.js',
- 'javascripts/common/Panel.js',
- 'javascripts/common/Section.js',
- 'javascripts/common/Page.js',
- 'javascripts/common/application.js',
- 'javascripts/common/settings.js',
+ 'javascripts/Router.js',
+ 'javascripts/OverlayManager.js',
+ 'javascripts/api.js',
+ 'javascripts/PageApi.js',
+ 'javascripts/Panel.js',
+ 'javascripts/Section.js',
+ 'javascripts/Page.js',
+ 'javascripts/application.js',
+ 'javascripts/settings.js',
),
'position' => 'bottom',
),
@@ -191,7 +191,7 @@
'mobile.head',
),
'scripts' => array(
- 'javascripts/common/user.js',
+ 'javascripts/user.js',
),
),
@@ -498,7 +498,7 @@
),
'scripts' => array(
'javascripts/externals/epoch.js',
- 'javascripts/common/history-alpha.js',
+ 'javascripts/history-alpha.js',
'javascripts/modules/lazyload.js',
),
),
@@ -568,8 +568,8 @@
'mobile.startup',
),
'scripts' => array(
- 'javascripts/common/Overlay.js',
- 'javascripts/common/LoadingOverlay.js',
+ 'javascripts/Overlay.js',
+ 'javascripts/LoadingOverlay.js',
),
'messages' => array(
'mobile-frontend-overlay-close',
@@ -611,10 +611,10 @@
),
'scripts' => array(
'javascripts/modules/routes.js',
- 'javascripts/common/Drawer.js',
- 'javascripts/common/CtaDrawer.js',
+ 'javascripts/Drawer.js',
+ 'javascripts/CtaDrawer.js',
'javascripts/widgets/progress-bar.js',
- 'javascripts/common/toast.js',
+ 'javascripts/toast.js',
'javascripts/modules/uploads/PhotoUploaderButton.js',
'javascripts/modules/uploads/LeadPhotoUploaderButton.js',
'javascripts/modules/mf-stop-mobile-redirect.js',
diff --git a/javascripts/common/CtaDrawer.js b/javascripts/CtaDrawer.js
similarity index 100%
rename from javascripts/common/CtaDrawer.js
rename to javascripts/CtaDrawer.js
diff --git a/javascripts/common/Drawer.js b/javascripts/Drawer.js
similarity index 100%
rename from javascripts/common/Drawer.js
rename to javascripts/Drawer.js
diff --git a/javascripts/common/LoadingOverlay.js
b/javascripts/LoadingOverlay.js
similarity index 100%
rename from javascripts/common/LoadingOverlay.js
rename to javascripts/LoadingOverlay.js
diff --git a/javascripts/common/Overlay.js b/javascripts/Overlay.js
similarity index 100%
rename from javascripts/common/Overlay.js
rename to javascripts/Overlay.js
diff --git a/javascripts/common/OverlayManager.js
b/javascripts/OverlayManager.js
similarity index 100%
rename from javascripts/common/OverlayManager.js
rename to javascripts/OverlayManager.js
diff --git a/javascripts/common/Page.js b/javascripts/Page.js
similarity index 100%
rename from javascripts/common/Page.js
rename to javascripts/Page.js
diff --git a/javascripts/common/PageApi.js b/javascripts/PageApi.js
similarity index 100%
rename from javascripts/common/PageApi.js
rename to javascripts/PageApi.js
diff --git a/javascripts/common/Panel.js b/javascripts/Panel.js
similarity index 100%
rename from javascripts/common/Panel.js
rename to javascripts/Panel.js
diff --git a/javascripts/common/README.md b/javascripts/README.md
similarity index 100%
rename from javascripts/common/README.md
rename to javascripts/README.md
diff --git a/javascripts/common/Router.js b/javascripts/Router.js
similarity index 100%
rename from javascripts/common/Router.js
rename to javascripts/Router.js
diff --git a/javascripts/common/Section.js b/javascripts/Section.js
similarity index 100%
rename from javascripts/common/Section.js
rename to javascripts/Section.js
diff --git a/javascripts/common/View.js b/javascripts/View.js
similarity index 100%
rename from javascripts/common/View.js
rename to javascripts/View.js
diff --git a/javascripts/common/api.js b/javascripts/api.js
similarity index 100%
rename from javascripts/common/api.js
rename to javascripts/api.js
diff --git a/javascripts/common/application.js b/javascripts/application.js
similarity index 100%
rename from javascripts/common/application.js
rename to javascripts/application.js
diff --git a/javascripts/common/history-alpha.js b/javascripts/history-alpha.js
similarity index 100%
rename from javascripts/common/history-alpha.js
rename to javascripts/history-alpha.js
diff --git a/javascripts/common/mainmenu.js b/javascripts/mainmenu.js
similarity index 100%
rename from javascripts/common/mainmenu.js
rename to javascripts/mainmenu.js
diff --git a/javascripts/common/modes.js b/javascripts/modes.js
similarity index 100%
rename from javascripts/common/modes.js
rename to javascripts/modes.js
diff --git a/javascripts/common/settings.js b/javascripts/settings.js
similarity index 100%
rename from javascripts/common/settings.js
rename to javascripts/settings.js
diff --git a/javascripts/common/template.js b/javascripts/template.js
similarity index 100%
rename from javascripts/common/template.js
rename to javascripts/template.js
diff --git a/javascripts/common/toast.js b/javascripts/toast.js
similarity index 100%
rename from javascripts/common/toast.js
rename to javascripts/toast.js
diff --git a/javascripts/common/user.js b/javascripts/user.js
similarity index 100%
rename from javascripts/common/user.js
rename to javascripts/user.js
diff --git a/tests/qunit/common/test_Overlay.js b/tests/qunit/test_Overlay.js
similarity index 100%
rename from tests/qunit/common/test_Overlay.js
rename to tests/qunit/test_Overlay.js
diff --git a/tests/qunit/common/test_OverlayManager.js
b/tests/qunit/test_OverlayManager.js
similarity index 100%
rename from tests/qunit/common/test_OverlayManager.js
rename to tests/qunit/test_OverlayManager.js
diff --git a/tests/qunit/common/test_Page.js b/tests/qunit/test_Page.js
similarity index 100%
rename from tests/qunit/common/test_Page.js
rename to tests/qunit/test_Page.js
diff --git a/tests/qunit/common/test_PageApi.js b/tests/qunit/test_PageApi.js
similarity index 100%
rename from tests/qunit/common/test_PageApi.js
rename to tests/qunit/test_PageApi.js
diff --git a/tests/qunit/common/test_Router.js b/tests/qunit/test_Router.js
similarity index 100%
rename from tests/qunit/common/test_Router.js
rename to tests/qunit/test_Router.js
diff --git a/tests/qunit/common/test_api.js b/tests/qunit/test_api.js
similarity index 100%
rename from tests/qunit/common/test_api.js
rename to tests/qunit/test_api.js
diff --git a/tests/qunit/common/test_application.js
b/tests/qunit/test_application.js
similarity index 100%
rename from tests/qunit/common/test_application.js
rename to tests/qunit/test_application.js
diff --git a/tests/qunit/common/test_history-alpha.js
b/tests/qunit/test_history-alpha.js
similarity index 100%
rename from tests/qunit/common/test_history-alpha.js
rename to tests/qunit/test_history-alpha.js
--
To view, visit https://gerrit.wikimedia.org/r/164142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I091803b7859e6c0268bb2c7022565b806c988b91
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>
Gerrit-Reviewer: Awjrichards <aricha...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de>
Gerrit-Reviewer: JGonera <jgon...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
