Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/207267
Change subject: hygiene: make resource names consistent with their paths
......................................................................
hygiene: make resource names consistent with their paths
Change-Id: I899d9f263bd5aa483982dd27f1a77f1a5e9233c0
---
M resources/ext.gather.collection.confirm/ConfirmationOverlay.js
M resources/ext.gather.collection.delete/CollectionDeleteOverlay.js
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.collection.flag/CollectionFlagOverlay.js
M resources/ext.gather.routes/routes.js
M tests/qunit/ext.gather.collection.editor/test_CollectionEditOverlay.js
6 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gather
refs/changes/67/207267/1
diff --git a/resources/ext.gather.collection.confirm/ConfirmationOverlay.js
b/resources/ext.gather.collection.confirm/ConfirmationOverlay.js
index aa3ee26..4f7a9b9 100644
--- a/resources/ext.gather.collection.confirm/ConfirmationOverlay.js
+++ b/resources/ext.gather.collection.confirm/ConfirmationOverlay.js
@@ -49,6 +49,6 @@
}
} );
- M.define( 'ext.gather.confirm/ConfirmationOverlay', ConfirmationOverlay
);
+ M.define( 'ext.gather.collection.confirm/ConfirmationOverlay',
ConfirmationOverlay );
}( mw.mobileFrontend, jQuery ) );
diff --git a/resources/ext.gather.collection.delete/CollectionDeleteOverlay.js
b/resources/ext.gather.collection.delete/CollectionDeleteOverlay.js
index 28e8f2c..046ff1f 100644
--- a/resources/ext.gather.collection.delete/CollectionDeleteOverlay.js
+++ b/resources/ext.gather.collection.delete/CollectionDeleteOverlay.js
@@ -6,7 +6,7 @@
toast = M.require( 'toast' ),
futureToasts = M.require( 'ext.gather.alerts/futureToasts' ),
CollectionsApi = M.require(
'ext.gather.watchstar/CollectionsApi' ),
- ConfirmationOverlay = M.require(
'ext.gather.confirm/ConfirmationOverlay' );
+ ConfirmationOverlay = M.require(
'ext.gather.collection.confirm/ConfirmationOverlay' );
/**
* Overlay for deleting a collection
@@ -65,6 +65,6 @@
}
} );
- M.define( 'ext.gather.delete/CollectionDeleteOverlay',
CollectionDeleteOverlay );
+ M.define( 'ext.gather.collection.delete/CollectionDeleteOverlay',
CollectionDeleteOverlay );
}( mw.mobileFrontend, jQuery ) );
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index aab72f0..b941476 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -9,7 +9,7 @@
SchemaGather = M.require( 'ext.gather.logging/SchemaGather' ),
schema = new SchemaGather(),
router = M.require( 'router' ),
- CollectionDeleteOverlay = M.require(
'ext.gather.delete/CollectionDeleteOverlay' );
+ CollectionDeleteOverlay = M.require(
'ext.gather.collection.delete/CollectionDeleteOverlay' );
/**
* Overlay for editing a collection
@@ -291,6 +291,6 @@
}
} );
- M.define( 'ext.gather.edit/CollectionEditOverlay',
CollectionEditOverlay );
+ M.define( 'ext.gather.collection.edit/CollectionEditOverlay',
CollectionEditOverlay );
}( mw.mobileFrontend, jQuery ) );
diff --git a/resources/ext.gather.collection.flag/CollectionFlagOverlay.js
b/resources/ext.gather.collection.flag/CollectionFlagOverlay.js
index 0795e58..76766ae 100644
--- a/resources/ext.gather.collection.flag/CollectionFlagOverlay.js
+++ b/resources/ext.gather.collection.flag/CollectionFlagOverlay.js
@@ -1,7 +1,7 @@
( function ( M, $ ) {
var CollectionFlagOverlay,
- ConfirmationOverlay = M.require(
'ext.gather.confirm/ConfirmationOverlay' ),
+ ConfirmationOverlay = M.require(
'ext.gather.collection.confirm/ConfirmationOverlay' ),
SchemaGatherFlags = M.require(
'ext.gather.logging/SchemaGatherFlags' ),
schema = new SchemaGatherFlags(),
toast = M.require( 'toast' );
diff --git a/resources/ext.gather.routes/routes.js
b/resources/ext.gather.routes/routes.js
index 24e1d9b..d31f6a3 100644
--- a/resources/ext.gather.routes/routes.js
+++ b/resources/ext.gather.routes/routes.js
@@ -12,7 +12,7 @@
if ( collection ) {
if ( action === 'edit' ) {
mw.loader.using(
'ext.gather.collection.editor' ).done( function () {
- var CollectionEditOverlay =
M.require( 'ext.gather.edit/CollectionEditOverlay' );
+ var CollectionEditOverlay =
M.require( 'ext.gather.collection.edit/CollectionEditOverlay' );
d.resolve(
new
CollectionEditOverlay( {
collection:
collection
@@ -21,7 +21,7 @@
} );
} else if ( action === 'delete' ) {
mw.loader.using(
'ext.gather.collection.delete' ).done( function () {
- var CollectionDeleteOverlay =
M.require( 'ext.gather.delete/CollectionDeleteOverlay' );
+ var CollectionDeleteOverlay =
M.require( 'ext.gather.collection.delete/CollectionDeleteOverlay' );
d.resolve(
new
CollectionDeleteOverlay( {
collection:
collection
diff --git
a/tests/qunit/ext.gather.collection.editor/test_CollectionEditOverlay.js
b/tests/qunit/ext.gather.collection.editor/test_CollectionEditOverlay.js
index 911c7b9..8ec7406 100644
--- a/tests/qunit/ext.gather.collection.editor/test_CollectionEditOverlay.js
+++ b/tests/qunit/ext.gather.collection.editor/test_CollectionEditOverlay.js
@@ -1,5 +1,5 @@
( function ( M ) {
- var CollectionEditOverlay = M.require(
'ext.gather.edit/CollectionEditOverlay' ),
+ var CollectionEditOverlay = M.require(
'ext.gather.collection.edit/CollectionEditOverlay' ),
collection,
overlay;
--
To view, visit https://gerrit.wikimedia.org/r/207267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I899d9f263bd5aa483982dd27f1a77f1a5e9233c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Robmoen <rm...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
