Merge "RCFilters: Actually recognize a saved query default and delete when removed"

diff --git a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
index 3ffc12e..efccc11 100644 (file)
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@ -68,7 +68,8 @@
         * @fires initialize
         */
        mw.rcfilters.dm.SavedQueriesModel.prototype.initialize = function ( savedQueries, baseState ) {
-               var items = [];
+               var items = [],
+                       defaultItem = null;
 
                savedQueries = savedQueries || {};
 
@@ -76,7 +77,9 @@
 
                this.clearItems();
                $.each( savedQueries.queries || {}, function ( id, obj ) {
-                       var normalizedData = $.extend( true, {}, baseState, obj.data );
+                       var item,
+                               normalizedData = $.extend( true, {}, baseState, obj.data ),
+                               isDefault = String( savedQueries.default ) === String( id );
 
                        // Backwards-compat fix: We stored the 'highlight' state with
                        // "1" and "0" instead of true/false; for already-stored states,
@@ -87,17 +90,23 @@
                        // for existing users, who are only betalabs users at the moment.
                        normalizedData.highlights.highlight = !!Number( normalizedData.highlights.highlight );
 
-                       items.push(
-                               new mw.rcfilters.dm.SavedQueryItemModel(
-                                       id,
-                                       obj.label,
-                                       normalizedData,
-                                       { 'default': savedQueries.default === id }
-                               )
+                       item = new mw.rcfilters.dm.SavedQueryItemModel(
+                               id,
+                               obj.label,
+                               normalizedData,
+                               { 'default': isDefault }
                        );
+
+                       if ( isDefault ) {
+                               defaultItem = item;
+                       }
+
+                       items.push( item );
                } );
 
-               this.default = savedQueries.default;
+               if ( defaultItem ) {
+                       this.default = defaultItem.getID();
+               }
 
                this.addItems( items );
 
@@ -124,6 +133,25 @@
                ] );
        };
 
+       /**
+        * Remove query from model
+        *
+        * @param {string} queryID Query ID
+        */
+       mw.rcfilters.dm.SavedQueriesModel.prototype.removeQuery = function ( queryID ) {
+               var query = this.getItemByID( queryID );
+
+               if ( query ) {
+                       // Check if this item was the default
+                       if ( String( this.getDefault() ) === String( queryID ) ) {
+                               // Nulify the default
+                               this.savedQueriesModel.setDefault( null );
+                       }
+
+                       this.savedQueriesModel.removeItems( [ query ] );
+               }
+       };
+
        /**
         * Get an item that matches the requested query
         *

diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 95e11d5..ebf2201 100644 (file)
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@ -257,15 +257,8 @@
         * @param {string} queryID Query id
         */
        mw.rcfilters.Controller.prototype.removeSavedQuery = function ( queryID ) {
-               var query = this.savedQueriesModel.getItemByID( queryID );
+               this.savedQueriesModel.removeQuery( queryID );
 
-               this.savedQueriesModel.removeItems( [ query ] );
-
-               // Check if this item was the default
-               if ( this.savedQueriesModel.getDefault() === queryID ) {
-                       // Nulify the default
-                       this.savedQueriesModel.setDefault( null );
-               }
                this._saveSavedQueries();
        };