Merge "resourceloader: Add wgWikiID to mw.config in the startup module"

diff --git a/resources/src/mediawiki.rcfilters/dm/ItemModel.js b/resources/src/mediawiki.rcfilters/dm/ItemModel.js
index ae8ac5f..eccc5df 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/ItemModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/ItemModel.js
@@ -259,7 +259,7 @@ ItemModel.prototype.getIdentifiers = function () {
  * @return {boolean}
  */
 ItemModel.prototype.isHighlightSupported = function () {
-       return !!this.getCssClass();
+       return !!this.getCssClass() && !OO.ui.isMobile();
 };
 
 /**

diff --git a/resources/src/mediawiki.rcfilters/ui/ChangesListWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/ChangesListWrapperWidget.js
index 1a5ae6c..f92685b 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/ChangesListWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/ChangesListWrapperWidget.js
@@ -101,7 +101,7 @@ ChangesListWrapperWidget.prototype.onModelUpdate = function (
                isEmpty = $changesListContent === 'NO_RESULTS',
                // For enhanced mode, we have to load these modules, which are
                // not loaded for the 'regular' mode in the backend
-               loaderPromise = mw.user.options.get( 'usenewrc' ) ?
+               loaderPromise = mw.user.options.get( 'usenewrc' ) && !OO.ui.isMobile() ?
                        mw.loader.using( [ 'mediawiki.special.changeslist.enhanced', 'mediawiki.icon' ] ) :
                        $.Deferred().resolve(),
                widget = this;

diff --git a/resources/src/mediawiki.rcfilters/ui/ItemMenuOptionWidget.js b/resources/src/mediawiki.rcfilters/ui/ItemMenuOptionWidget.js
index 710bd65..7ac981b 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/ItemMenuOptionWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/ItemMenuOptionWidget.js
@@ -20,6 +20,7 @@ ItemMenuOptionWidget = function MwRcfiltersUiItemMenuOptionWidget(
        controller, filtersViewModel, invertModel, itemModel, highlightPopup, config
 ) {
        var layout,
+               $widgetRow,
                classes = [],
                $label = $( '<div>' )
                        .addClass( 'mw-rcfilters-ui-itemMenuOptionWidget-label' );
@@ -93,29 +94,34 @@ ItemMenuOptionWidget = function MwRcfiltersUiItemMenuOptionWidget(
        // defaults on 'click' as well.
        layout.$label.on( 'click', false );
 
-       this.$element
-               .addClass( 'mw-rcfilters-ui-itemMenuOptionWidget' )
-               .addClass( 'mw-rcfilters-ui-itemMenuOptionWidget-view-' + this.itemModel.getGroupModel().getView() )
+       $widgetRow = $( '<div>' )
+               .addClass( 'mw-rcfilters-ui-table' )
                .append(
                        $( '<div>' )
-                               .addClass( 'mw-rcfilters-ui-table' )
+                               .addClass( 'mw-rcfilters-ui-row' )
                                .append(
                                        $( '<div>' )
-                                               .addClass( 'mw-rcfilters-ui-row' )
-                                               .append(
-                                                       $( '<div>' )
-                                                               .addClass( 'mw-rcfilters-ui-cell mw-rcfilters-ui-itemMenuOptionWidget-itemCheckbox' )
-                                                               .append( layout.$element ),
-                                                       $( '<div>' )
-                                                               .addClass( 'mw-rcfilters-ui-cell mw-rcfilters-ui-itemMenuOptionWidget-excludeLabel' )
-                                                               .append( this.excludeLabel.$element ),
-                                                       $( '<div>' )
-                                                               .addClass( 'mw-rcfilters-ui-cell mw-rcfilters-ui-itemMenuOptionWidget-highlightButton' )
-                                                               .append( this.highlightButton.$element )
-                                               )
+                                               .addClass( 'mw-rcfilters-ui-cell mw-rcfilters-ui-itemMenuOptionWidget-itemCheckbox' )
+                                               .append( layout.$element )
                                )
                );
 
+       if ( !OO.ui.isMobile() ) {
+               $widgetRow.find( '.mw-rcfilters-ui-row' ).append(
+                       $( '<div>' )
+                               .addClass( 'mw-rcfilters-ui-cell mw-rcfilters-ui-itemMenuOptionWidget-excludeLabel' )
+                               .append( this.excludeLabel.$element ),
+                       $( '<div>' )
+                               .addClass( 'mw-rcfilters-ui-cell mw-rcfilters-ui-itemMenuOptionWidget-highlightButton' )
+                               .append( this.highlightButton.$element )
+               );
+       }
+
+       this.$element
+               .addClass( 'mw-rcfilters-ui-itemMenuOptionWidget' )
+               .addClass( 'mw-rcfilters-ui-itemMenuOptionWidget-view-' + this.itemModel.getGroupModel().getView() )
+               .append( $widgetRow );
+
        if ( this.itemModel.getIdentifiers() ) {
                this.itemModel.getIdentifiers().forEach( function ( ident ) {
                        classes.push( 'mw-rcfilters-ui-itemMenuOptionWidget-identifier-' + ident );