Merge "Use new API for descriptions in TitleWidget"

diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less b/resources/src/mediawiki.less/mediawiki.mixins.less
index c64c761..53dccc2 100644 (file)
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -30,8 +30,6 @@
 // compatibility (browsers able to understand gradient syntax support also SVG).
 // http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique
 //
-// We use gzip compression, which means that it is okay to embed twice.
-//
 // We do not embed the fallback image on the assumption that the gain for old browsers
 // is not worth the harm done to modern ones.
 .background-image-svg( @svg, @fallback ) {

diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
index 13d6b68..188650a 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.TagItemWidget.js
@@ -87,11 +87,17 @@
                // Update label if needed
                var labelMsg = this.itemModel.getLabelMessageKey( this.invertModel.isSelected() );
                if ( labelMsg ) {
-                       this.setLabel( $( '<div>' ).html(
-                               mw.message( labelMsg, mw.html.escape( this.itemModel.getLabel() ) ).parse()
+                       this.setLabel( $( '<div>' ).append(
+                               $( '<bdi>' ).html(
+                                       mw.message( labelMsg, mw.html.escape( this.itemModel.getLabel() ) ).parse()
+                               )
                        ).contents() );
                } else {
-                       this.setLabel( this.itemModel.getLabel() );
+                       this.setLabel(
+                               $( '<bdi>' ).append(
+                                       this.itemModel.getLabel()
+                               )
+                       );
                }
 
                this.setCurrentMuteState();