Aarcos has uploaded a new change for review. https://gerrit.wikimedia.org/r/119649
Change subject: Fix some text selection issues with share/embed ...................................................................... Fix some text selection issues with share/embed Change-Id: Ic9d330c04d4e9335cdfce6e99870d1e5877b2a90 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/374 --- M MultimediaViewer.i18n.php M MultimediaViewer.php M resources/mmv/ui/mmv.ui.reuse.embed.js M resources/mmv/ui/mmv.ui.reuse.share.js 4 files changed, 18 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/49/119649/1 diff --git a/MultimediaViewer.i18n.php b/MultimediaViewer.i18n.php index 1012db8..8118453 100644 --- a/MultimediaViewer.i18n.php +++ b/MultimediaViewer.i18n.php @@ -82,6 +82,7 @@ 'multimediaviewer-fileusage-global-section' => 'On other sites', 'multimediaviewer-reuse-link' => 'Use this file', + 'multimediaviewer-reuse-loading-placeholder' => 'Loading...', 'multimediaviewer-share-tab' => 'Share', 'multimediaviewer-embed-tab' => 'Embed', @@ -247,6 +248,7 @@ See also: * {{msg-mw|Multimediaviewer-fileusage-local-section}}', 'multimediaviewer-reuse-link' => 'Text of the link on the metadata panel which opens the reuse panel', + 'multimediaviewer-reuse-loading-placeholder' => 'Text that appears in all reuse text boxes as a placeholder while the data loads', 'multimediaviewer-share-tab' => 'Tab title text for the file reuse panel - used for the section with shareable URLs.', 'multimediaviewer-embed-tab' => 'Tab title text for the file reuse panel - used for the section with embeddable HTML and wikitext.', 'multimediaviewer-link-to-page' => 'Used as alt-text to describe a URL that goes to a File: page for an image.', diff --git a/MultimediaViewer.php b/MultimediaViewer.php index bf64701..0b86aa5 100644 --- a/MultimediaViewer.php +++ b/MultimediaViewer.php @@ -423,10 +423,6 @@ 'mmv.ui', 'oojs', ), - - 'messages' => array( - 'multimediaviewer-reuse-link', - ), ), $moduleInfo( 'mmv/ui' ) ); $wgResourceModules['mmv.ui.reuse.share'] = array_merge( array( @@ -445,6 +441,7 @@ ), 'messages' => array( + 'multimediaviewer-reuse-loading-placeholder', 'multimediaviewer-share-tab', 'multimediaviewer-link-to-file', @@ -470,6 +467,7 @@ ), 'messages' => array( + 'multimediaviewer-reuse-loading-placeholder', 'multimediaviewer-embed-tab', 'multimediaviewer-embed-html', 'multimediaviewer-embed-wt', diff --git a/resources/mmv/ui/mmv.ui.reuse.embed.js b/resources/mmv/ui/mmv.ui.reuse.embed.js index 8d5f247..37aa99e 100644 --- a/resources/mmv/ui/mmv.ui.reuse.embed.js +++ b/resources/mmv/ui/mmv.ui.reuse.embed.js @@ -79,11 +79,17 @@ readOnly: true } ); + this.embedTextHtml.$element.find( 'textarea' ) + .prop( 'placeholder', mw.message( 'multimediaviewer-reuse-loading-placeholder' ).text() ); + this.embedTextWikitext = new oo.ui.TextInputWidget( { classes: [ 'mw-mlb-embed-text-wt', 'active' ], multiline: true, readOnly: true } ); + + this.embedTextWikitext.$element.find( 'textarea' ) + .prop( 'placeholder', mw.message( 'multimediaviewer-reuse-loading-placeholder' ).text() ); $( '<p>' ) .append( @@ -107,7 +113,6 @@ wikitextButtonOption = new oo.ui.ButtonOptionWidget( 'wt', { label: mw.message( 'multimediaviewer-embed-wt' ).text(), - selected: true } ); htmlButtonOption = new oo.ui.ButtonOptionWidget( 'html', { label: mw.message( 'multimediaviewer-embed-html' ).text() @@ -152,7 +157,6 @@ }, { label: mw.message( 'multimediaviewer-small-embed-size', 0, 0 ).text(), - selected: true } ), this.embedWtSizeChoices.medium = new oo.ui.MenuItemWidget( { @@ -191,7 +195,6 @@ }, { label: mw.message( 'multimediaviewer-small-embed-size', 0, 0 ).text(), - selected: true } ), this.embedHtmlSizeChoices.medium = new oo.ui.MenuItemWidget( { @@ -524,6 +527,7 @@ this.currentSizeMenu.selectItem( this.currentSizeMenu.getSelectedItem() ); this.getThumbnailUrlPromise().done( function ( thumbnail ) { embed.setThumbnailURL( thumbnail ); + embed.select(); } ); }; diff --git a/resources/mmv/ui/mmv.ui.reuse.share.js b/resources/mmv/ui/mmv.ui.reuse.share.js index 389171c..aaffcba 100644 --- a/resources/mmv/ui/mmv.ui.reuse.share.js +++ b/resources/mmv/ui/mmv.ui.reuse.share.js @@ -42,6 +42,9 @@ readOnly: true } ); + this.pageInput.$element.find( 'input' ) + .prop( 'placeholder', mw.message( 'multimediaviewer-reuse-loading-placeholder' ).text() ); + this.$pageLink = $( '<a>' ) .addClass( 'mw-mlb-share-page-link' ) .prop( 'alt', mw.message( 'multimediaviewer-link-to-page' ).text() ) @@ -70,6 +73,10 @@ // FIXME this should be handled by mmv.js to be DRY var url = image.descriptionUrl + '#mediaviewer/' + image.title.getMainText(); this.pageInput.setValue( url ); + + // Bring focus after setting the value to trigger selection + this.pageInput.$element.focus(); + this.$pageLink.prop( 'href', url ); }; -- To view, visit https://gerrit.wikimedia.org/r/119649 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9d330c04d4e9335cdfce6e99870d1e5877b2a90 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Aarcos <aarcos.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
