From c9eadaecf265472309eaff3a98bbb424a4d8a812 Mon Sep 17 00:00:00 2001 From: Moriel Schottlender Date: Wed, 2 Aug 2017 19:30:48 -0700 Subject: [PATCH] RCFilters: Prevent live update fetch if model is in conflict Change-Id: I52df598036a33fe203d6411fa9cfb6a485a8504d --- resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index 16822d8810..f3ea248b4d 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js @@ -540,6 +540,7 @@ new mw.Uri().query.liveupdate; return !document.hidden && + !this.filtersModel.hasConflict() && !this.changesListModel.getNewChangesExist() && !this.updatingChangesList && liveUpdateFeatureFlag; -- 2.20.1