jenkins-bot has submitted this change and it was merged.
Change subject: Fix delete overlay
......................................................................
Fix delete overlay
Also kill delete route
Bug: T96167
Bug: T98324
Change-Id: Ib6330e392ce672355850e5a1b814acbc640975c9
(cherry picked from commit 941b40b2528ae934457c7e3c4f9e1a4cc68d0d0c)
---
M resources/ext.gather.collection.editor/CollectionEditOverlay.js
M resources/ext.gather.routes/routes.js
2 files changed, 1 insertion(+), 10 deletions(-)
Approvals:
Robmoen: 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..4ccba83 100644
--- a/resources/ext.gather.collection.editor/CollectionEditOverlay.js
+++ b/resources/ext.gather.collection.editor/CollectionEditOverlay.js
@@ -184,7 +184,7 @@
var deleteOverlay = new CollectionDeleteOverlay( {
collection: this.options.collection
} );
- this.$el.append( deleteOverlay.$el );
+ deleteOverlay.show();
},
/**
* Event handler when the back button is clicked on the
title/edit description pane.
diff --git a/resources/ext.gather.routes/routes.js
b/resources/ext.gather.routes/routes.js
index 65e4d66..3f013d8 100644
--- a/resources/ext.gather.routes/routes.js
+++ b/resources/ext.gather.routes/routes.js
@@ -19,15 +19,6 @@
} )
);
} );
- } else if ( action === 'delete' ) {
- mw.loader.using(
'ext.gather.collection.delete' ).done( function () {
- var CollectionDeleteOverlay =
M.require( 'ext.gather.collection.delete/CollectionDeleteOverlay' );
- d.resolve(
- new
CollectionDeleteOverlay( {
- collection:
collection
- } )
- );
- } );
} else {
toast.show( mw.msg(
'gather-no-such-action' ), 'error' );
}
--
To view, visit https://gerrit.wikimedia.org/r/209618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6330e392ce672355850e5a1b814acbc640975c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: wmf/1.26wmf4
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Robmoen <rm...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
