Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/227444
Change subject: Revert "Make label view multiline by default" ...................................................................... Revert "Make label view multiline by default" This reverts commit 8508d3bf812577920842cfe682739f9594cda478 Bug: T106327 Change-Id: Ic2008f5f0c68fd685aaacc1012732dfc85e9f786 --- M view/resources/jquery/wikibase/jquery.wikibase.labelview.js M view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js M view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js 3 files changed, 13 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/44/227444/1 diff --git a/view/resources/jquery/wikibase/jquery.wikibase.labelview.js b/view/resources/jquery/wikibase/jquery.wikibase.labelview.js index 3564a36..0715d96 100644 --- a/view/resources/jquery/wikibase/jquery.wikibase.labelview.js +++ b/view/resources/jquery/wikibase/jquery.wikibase.labelview.js @@ -38,7 +38,6 @@ $entityId: '.wikibase-labelview-entityid' }, value: null, - inputNodeName: 'TEXTAREA', helpMessage: mw.msg( 'wikibase-label-input-help-message' ), entityId: null, showEntityId: false @@ -55,7 +54,6 @@ !( this.options.value instanceof wb.datamodel.Term ) || !this.options.entityId || !this.options.labelsChanger - || this.options.inputNodeName !== 'INPUT' && this.options.inputNodeName !== 'TEXTAREA' ) { throw new Error( 'Required option not specified properly' ); } @@ -144,7 +142,7 @@ return deferred.resolve().promise(); } - var $input = $( document.createElement( this.options.inputNodeName ) ); + var $input = $( '<input />' ); $input .addClass( this.widgetFullName + '-input' ) @@ -156,11 +154,6 @@ ) .attr( 'lang', languageCode ) .attr( 'dir', $.util.getDirectionality( languageCode ) ) - .on( 'keydown.' + this.widgetName, function( event ) { - if( event.keyCode === $.ui.keyCode.ENTER ) { - event.preventDefault(); - } - } ) .on( 'eachchange.' + this.widgetName, function( event ) { self._trigger( 'change' ); } ); @@ -170,10 +163,7 @@ } if( $.fn.inputautoexpand ) { - $input.inputautoexpand( { - expandHeight: true, - suppressNewLine: true - } ); + $input.inputautoexpand(); } this.$text.empty().append( $input ); @@ -203,7 +193,7 @@ */ _afterStopEditing: function( dropValue ) { if( dropValue && this.options.value.getText() === '' ) { - this.$text.children( '.' + this.widgetFullName + '-input' ).val( '' ); + this.$text.children( 'input' ).val( '' ); } return PARENT.prototype._afterStopEditing.call( this, dropValue ); }, @@ -237,7 +227,7 @@ var response = PARENT.prototype._setOption.call( this, key, value ); if( key === 'disabled' && this.isInEditMode() ) { - this.$text.children( '.' + this.widgetFullName + '-input' ).prop( 'disabled', value ); + this.$text.children( 'input' ).prop( 'disabled', value ); } return response; @@ -261,7 +251,7 @@ return new wb.datamodel.Term( this.options.value.getLanguageCode(), - $.trim( this.$text.children( '.' + this.widgetFullName + '-input' ).val() ) + $.trim( this.$text.children( 'input' ).val() ) ); }, @@ -270,7 +260,7 @@ */ focus: function() { if( this.isInEditMode() ) { - this.$text.children( '.' + this.widgetFullName + '-input' ).focus(); + this.$text.children( 'input' ).focus(); } else { this.element.focus(); } diff --git a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js index 860f792..52be41b 100644 --- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js +++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js @@ -196,7 +196,7 @@ } ); addToQueue( $queue, function() { - entitytermsforlanguageview.$label.find( 'input, textarea' ).val( '' ); + entitytermsforlanguageview.$label.find( 'input' ).val( '' ); entitytermsforlanguageview.stopEditing(); } ); @@ -224,14 +224,14 @@ 'Verified isInitialValue() returning true.' ); - entitytermsforlanguageview.$label.find( 'input, textarea' ).val( 'changed' ); + entitytermsforlanguageview.$label.find( 'input' ).val( 'changed' ); assert.ok( !entitytermsforlanguageview.isInitialValue(), 'Verified isInitialValue() returning false after changing value.' ); - entitytermsforlanguageview.$label.find( 'input, textarea' ).val( 'test label' ); + entitytermsforlanguageview.$label.find( 'input' ).val( 'test label' ); assert.ok( entitytermsforlanguageview.isInitialValue(), diff --git a/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js b/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js index 0b3cf33..9ee4b1a 100644 --- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js +++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js @@ -98,7 +98,7 @@ labelview.startEditing(); assert.ok( - labelview.$text.find( 'textarea' ).length === 1, + labelview.$text.find( 'input' ).length === 1, 'Generated input element.' ); @@ -108,7 +108,7 @@ labelview.stopEditing(); // should not trigger event labelview.startEditing(); - labelview.$text.find( 'textarea' ).val( '' ); + labelview.$text.find( 'input' ).val( '' ); labelview.stopEditing(); } ); @@ -124,14 +124,14 @@ 'Verified isInitialValue() returning true.' ); - labelview.$text.find( 'textarea' ).val( 'changed' ); + labelview.$text.find( 'input' ).val( 'changed' ); assert.ok( !labelview.isInitialValue(), 'Verified isInitialValue() returning false after changing value.' ); - labelview.$text.find( 'textarea' ).val( 'test label' ); + labelview.$text.find( 'input' ).val( 'test label' ); assert.ok( labelview.isInitialValue(), -- To view, visit https://gerrit.wikimedia.org/r/227444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2008f5f0c68fd685aaacc1012732dfc85e9f786 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.26wmf16 Gerrit-Owner: Addshore <addshorew...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits