Merge "RCFilters: Prevent live update fetch if model is in conflict"

diff --combined resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index b489f4e,f3ea248..30bec87
--- 1/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
--- 2/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@@ -105,7 -105,7 +105,7 @@@
                                        allowArbitrary: true,
                                        validate: $.isNumeric,
                                        range: {
 -                                              min: 1,
 +                                              min: 0, // The server normalizes negative numbers to 0 results
                                                max: 1000
                                        },
                                        sortFunc: function ( a, b ) { return Number( a.name ) - Number( b.name ); },
@@@ -115,7 -115,7 +115,7 @@@
                                        // we should remove all sticky behavior methods completely
                                        // See T172156
                                        // isSticky: true,
 -                                      filters: displayConfig.arrayLimit.map( function ( num ) {
 +                                      filters: displayConfig.limitArray.map( function ( num ) {
                                                return controller._createFilterDataFromNumber( num, num );
                                        } )
                                },
@@@ -128,7 -128,7 +128,7 @@@
                                        validate: $.isNumeric,
                                        range: {
                                                min: 0,
 -                                              max: displayConfig.maxLimit
 +                                              max: displayConfig.maxDays
                                        },
                                        sortFunc: function ( a, b ) { return Number( a.name ) - Number( b.name ); },
                                        numToLabelFunc: function ( i ) {
@@@ -143,7 -143,7 +143,7 @@@
                                                // Hours (1, 2, 6, 12)
                                                0.04166, 0.0833, 0.25, 0.5
                                        // Days
 -                                      ].concat( displayConfig.arrayDays )
 +                                      ].concat( displayConfig.daysArray )
                                                .map( function ( num ) {
                                                        return controller._createFilterDataFromNumber(
                                                                num,
@@@ -540,6 -540,7 +540,7 @@@
                        new mw.Uri().query.liveupdate;
  
                return !document.hidden &&
+                       !this.filtersModel.hasConflict() &&
                        !this.changesListModel.getNewChangesExist() &&
                        !this.updatingChangesList &&
                        liveUpdateFeatureFlag;