jenkins-bot has submitted this change and it was merged.
Change subject: Only reload page after CollectionEditOverlay if page is special.
......................................................................
Only reload page after CollectionEditOverlay if page is special.
No need to reload on article pages (causes loosing CTA's).
Bug: T98299
Change-Id: I7f54e21de4ec14d12493d0de86170fe8548aa74c
---
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.routes/routes.js
2 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
index a420196..e925a5d 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -41,11 +41,12 @@
additionalClassNames: 'cancel',
label: mw.msg( 'mobile-frontend-overlay-close' )
} ).options,
+ collection: null,
+ reloadOnSave: false,
confirmExitMessage: mw.msg(
'gather-edit-collection-confirm' ),
editSuccessMsg: mw.msg(
'gather-update-collection-success' ),
editFailedError: mw.msg(
'gather-edit-collection-failed-error' ),
unknownCollectionError: mw.msg(
'gather-error-unknown-collection' ),
- collection: null,
heading: mw.msg( 'gather-edit-collection-heading' ),
nameLabel: mw.msg( 'gather-edit-collection-label-name'
),
descriptionLabel: mw.msg(
'gather-edit-collection-label-description' ),
@@ -202,9 +203,12 @@
* @private
*/
_reloadCollection: function () {
+ var self = this;
window.setTimeout( function () {
router.navigate( '/' );
- window.location.reload();
+ if ( self.options.reloadOnSave ) {
+ window.location.reload();
+ }
}, 100 );
},
/**
diff --git a/resources/ext.gather.routes/routes.js
b/resources/ext.gather.routes/routes.js
index 9ac42ea..8811b2b 100644
--- a/resources/ext.gather.routes/routes.js
+++ b/resources/ext.gather.routes/routes.js
@@ -13,11 +13,13 @@
if ( collection ) {
if ( action === 'edit' ) {
loader.loadModule(
'ext.gather.collection.editor', true ).done( function ( loadingOverlay ) {
- var CollectionEditOverlay =
M.require( 'ext.gather.collection.edit/CollectionEditOverlay' );
+ var CollectionEditOverlay =
M.require( 'ext.gather.collection.edit/CollectionEditOverlay' ),
+ isSpecialPage =
mw.config.get( 'wgNamespaceNumber' ) === mw.config.get( 'wgNamespaceIds'
).special;
loadingOverlay.hide();
d.resolve(
new
CollectionEditOverlay( {
- collection:
collection
+ collection:
collection,
+ reloadOnSave:
isSpecialPage
} )
);
} );
--
To view, visit https://gerrit.wikimedia.org/r/209199
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f54e21de4ec14d12493d0de86170fe8548aa74c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jhernandez <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
