Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/123181
Change subject: Using new "afterdraw" event to set focus on value variation input box ...................................................................... Using new "afterdraw" event to set focus on value variation input box Since the Variation's draw() has been converted to asynchronous operation, the focus can only be set after being notified about draw() having finished. (bug 62606) Change-Id: I7275028b753f59d7ff8e535d40a197d0cfb16194 --- M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.NoValue.js M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.SomeValue.js M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js 5 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/81/123181/1 diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js index 232dcc7..2decdd8 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js @@ -326,7 +326,9 @@ if ( this._getPropertySelector() !== null ) { this._getPropertySelector().element.focus(); } else if( this._variation ) { - this._variation.focus(); + $( this._variation ).one( 'afterdraw', function() { + this.focus(); + } ); } } } ), diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.NoValue.js b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.NoValue.js index 9d56f84..3d20ce9 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.NoValue.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.NoValue.js @@ -24,6 +24,7 @@ draw: function() { // display same message in edit and non-edit mode! this.$viewPort.empty().text( mw.msg( 'wikibase-snakview-variations-novalue-label' ) ); + $( this ).trigger( 'afterdraw' ); } } ); diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.SomeValue.js b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.SomeValue.js index fcfabfd..f414704 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.SomeValue.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.SomeValue.js @@ -24,6 +24,7 @@ draw: function() { // display same message in edit and non-edit mode! this.$viewPort.empty().text( mw.msg( 'wikibase-snakview-variations-somevalue-label' ) ); + $( this ).trigger( 'afterdraw' ); } } ); diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js index be35d5f..609fbd0 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js @@ -202,9 +202,12 @@ ); _render(); + + $( self ).trigger( 'afterdraw' ); } ); } else { _render(); + $( self ).trigger( 'afterdraw' ); } }, diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js index 89914a7..eac2d9b 100644 --- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js +++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js @@ -26,6 +26,9 @@ * output, this is where this variation can express its current state and/or display * input elements for user interaction. * @param {wikibase.store.EntityStore} entityStore + * + * @event afterdraw: Triggered on the Variation object after drawing the variation. + * (1) {jQuery.Event} */ var SELF = jQuery.wikibase.snakview.variations.Variation = function WbSnakviewVariationsVariation( viewState, $viewPort, entityStore ) @@ -163,6 +166,8 @@ * not yet inserted, this will take care of its insertion. * * @since 0.4 + * + * @triggers afterdraw */ draw: util.abstractMember, -- To view, visit https://gerrit.wikimedia.org/r/123181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7275028b753f59d7ff8e535d40a197d0cfb16194 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater <henning.sna...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits