Merge "Show a warning in edit preview when a template loop is detected"

[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 a520bdb..8d0aa05 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -561,6 +561,7 @@
                        'liveUpdate',
                        {
                                limit: 1,
+                               peek: 1, // bypasses all UI
                                from: this.changesListModel.getNextFrom()
                        }
                );
@@ -1055,7 +1056,7 @@
                                }
                        } );
 
-                       return $.extend( true, {}, savedParams, savedHighlights );
+                       return $.extend( true, {}, savedParams, savedHighlights, { invert: String( Number( data.invert || 0 ) ) } );
                }
 
                return this.filtersModel.getDefaultParams();
@@ -1130,6 +1131,7 @@
 
                counterId = counterId || 'updateChangesList';
                params = params || {};
+               params.action = 'render'; // bypasses MW chrome
 
                uri.extend( params );
 
@@ -1149,7 +1151,7 @@
 
                return $.ajax( uri.toString(), { contentType: 'html' } )
                        .then(
-                               function ( html ) {
+                               function ( html, reason ) {
                                        var $parsed,
                                                pieces;
 
@@ -1157,7 +1159,15 @@
                                                return $.Deferred().reject();
                                        }
 
-                                       $parsed = $( $.parseHTML( html ) );
+                                       if ( params.peek && reason === 'notmodified' ) {
+                                               return {
+                                                       changes: 'NO_RESULTS'
+                                               };
+                                       }
+
+                                       // Because of action=render, the response is a list of nodes.
+                                       // It has to be put under a root node so it can be queried.
+                                       $parsed = $( '<div>' ).append( $( $.parseHTML( html ) ) );
 
                                        pieces = {
                                                // Changes list