MarkTraceur has uploaded a new change for review. https://gerrit.wikimedia.org/r/163032
Change subject: Retain image size when switching embed type ...................................................................... Retain image size when switching embed type Change-Id: Ie852f1aef39d21740cf16fb891ab69486f7d4ef6 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/916 --- M resources/mmv/ui/mmv.ui.reuse.embed.js 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/32/163032/1 diff --git a/resources/mmv/ui/mmv.ui.reuse.embed.js b/resources/mmv/ui/mmv.ui.reuse.embed.js index be0702d..5ee3d2f 100644 --- a/resources/mmv/ui/mmv.ui.reuse.embed.js +++ b/resources/mmv/ui/mmv.ui.reuse.embed.js @@ -267,6 +267,8 @@ EP.handleSizeSwitch = function ( item ) { var value = item.getData(); + this.currentSizeName = value.name; + this.changeSize( value.width, value.height ); }; @@ -276,7 +278,8 @@ * @param {OO.ui.MenuItemWidget} item */ EP.handleTypeSwitch = function ( item ) { - var value = item.getData(); + var sizeItems, currentSizeItem, i, item, + value = item.getData(); mw.mmv.actionLogger.log( 'embed-switched-to-' + value ); @@ -302,6 +305,24 @@ .add( this.embedSizeSwitchWikitext.$element ) .toggleClass( 'active', value === 'wikitext' ); + // If the user has selected a size, select that instead + if ( this.currentSizeName ) { + sizeItems = this.currentSizeMenu.getItems(); + + for ( i = 0; i < sizeItems.length; i++ ) { + item = sizeItems[i]; + + if ( item.getData().name === this.currentSizeName ) { + currentSizeItem = item; + } + } + + if ( currentSizeItem ) { + this.currentSizeMenu.selectItem( currentSizeItem ); + this.isSizeMenuDefaultReset = true; + } + } + // Reset current selection to default when switching the first time if ( ! this.isSizeMenuDefaultReset ) { this.resetCurrentSizeMenuToDefault(); -- To view, visit https://gerrit.wikimedia.org/r/163032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie852f1aef39d21740cf16fb891ab69486f7d4ef6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: MarkTraceur <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
