jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393953 )
Change subject: ui.SearchPreview: Simplify label display
......................................................................
ui.SearchPreview: Simplify label display
The entire thing is a label, so just put it in the 'label' config option?
I have no idea why you went to such lengths to do this differently.
Change-Id: I1f7b36cc7d68cb98eba4a6d12bd488e6e81bda0a
---
M modules/ext.advancedSearch.css
M modules/ui/ext.advancedSearch.SearchPreview.js
M tests/qunit/ui/SearchPreview.test.js
3 files changed, 12 insertions(+), 30 deletions(-)
Approvals:
WMDE-Fisch: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ext.advancedSearch.css b/modules/ext.advancedSearch.css
index 47ecf75..75312ac 100644
--- a/modules/ext.advancedSearch.css
+++ b/modules/ext.advancedSearch.css
@@ -9,27 +9,13 @@
margin-right: 0.3125em;
}
-.mw-advancedSearch-searchPreview-previewPill {
- display: inline-flex;
- display: -ms-inline-flexbox;
- flex-flow: row nowrap;
- -ms-flex-direction: row;
- flex: 0 1 auto;
-}
-
-.mw-advancedSearch-searchPreview-previewPill > .oo-ui-labelElement-label {
- order: 1;
- -ms-flex-order: 1;
-}
-
-.mw-advancedSearch-searchPreview-previewPill > .content {
+.mw-advancedSearch-searchPreview-previewPill > .oo-ui-labelElement-label >
.mw-advancedSearch-searchPreview-content {
display: inline-block;
text-overflow: ellipsis;
overflow: hidden;
max-width: 5em;
- order: 2;
- -ms-flex-order: 2;
padding-left: 0.3em;
+ vertical-align: bottom;
}
.mw-advancedSearch-fieldContainer {
diff --git a/modules/ui/ext.advancedSearch.SearchPreview.js
b/modules/ui/ext.advancedSearch.SearchPreview.js
index c7af82e..3d8beda 100644
--- a/modules/ui/ext.advancedSearch.SearchPreview.js
+++ b/modules/ui/ext.advancedSearch.SearchPreview.js
@@ -111,16 +111,12 @@
mw.libs.advancedSearch.ui.SearchPreview.prototype.generateTag =
function ( optionId, value ) {
var formattedValue = this.formatValue( optionId, value ),
tag = new OO.ui.TagItemWidget( {
- label: mw.msg( 'advancedsearch-field-' +
optionId ),
- content: [
- new OO.ui.HtmlSnippet(
- $( '<span>' ) // redundant
span to cover browsers without support for bdi tag
- .addClass( 'content' )
- .append(
- $( '<bdi>'
).text( formattedValue )
- )
- )
- ]
+ label: $()
+ .add( $( '<span>' ).text( mw.msg(
'advancedsearch-field-' + optionId ) ) )
+ // redundant span to cover browsers
without support for bdi tag
+ .add( $( '<span>' ).addClass(
'mw-advancedSearch-searchPreview-content' ).append(
+ $( '<bdi>' ).text(
formattedValue )
+ ) )
} );
tag.toggleDraggable( false ); // constructor config has no
effect; https://phabricator.wikimedia.org/T172781
diff --git a/tests/qunit/ui/SearchPreview.test.js
b/tests/qunit/ui/SearchPreview.test.js
index 8cdaf1b..641b0f5 100644
--- a/tests/qunit/ui/SearchPreview.test.js
+++ b/tests/qunit/ui/SearchPreview.test.js
@@ -106,8 +106,8 @@
assert.equal( element.title, 'my field value' );
// https://phabricator.wikimedia.org/T172781 prevents a
semantic way to check for draggable
assert.ok( $( element ).hasClass(
'oo-ui-draggableElement-undraggable' ) );
- assert.equal( $( '.content', element ).html(), '<bdi>my field
value</bdi>' );
- assert.equal( $( '.oo-ui-labelElement-label', element ).html(),
'my label:' );
+ assert.equal( $( '.mw-advancedSearch-searchPreview-content',
element ).html(), '<bdi>my field value</bdi>' );
+ assert.equal( $( '.oo-ui-labelElement-label span', element
).html(), 'my label:' );
} );
QUnit.test( 'Tag content is HTML-safe', function ( assert ) {
@@ -118,7 +118,7 @@
var element = tag.$element[ 0 ];
- assert.equal( $( '.content', element ).html(),
'<bdi><script>alert("evil");</script></bdi>' );
+ assert.equal( $( '.mw-advancedSearch-searchPreview-content',
element ).html(), '<bdi><script>alert("evil");</script></bdi>' );
} );
QUnit.test( 'Tag label is HTML-safe', function ( assert ) {
@@ -130,7 +130,7 @@
var element = tag.$element[ 0 ];
- assert.equal( $( '.oo-ui-labelElement-label', element ).html(),
'<div>block</div>' );
+ assert.equal( $( '.oo-ui-labelElement-label span', element
).html(), '<div>block</div>' );
} );
QUnit.test( 'Tag removals clears store', function ( assert ) {
--
To view, visit https://gerrit.wikimedia.org/r/393953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f7b36cc7d68cb98eba4a6d12bd488e6e81bda0a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
