dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "RCFilters: Prevent live update fetch if model is in conflict"
[lhc/web/wiklou.git]
/
resources
/
src
/
mediawiki.rcfilters
/
mw.rcfilters.Controller.js
diff --git
a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index
b489f4e
..
30bec87
100644
(file)
--- 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;