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 "Change 'editfont' default preference to 'monospace'"
[lhc/web/wiklou.git]
/
resources
/
src
/
mediawiki.rcfilters
/
dm
/
mw.rcfilters.dm.SavedQueriesModel.js
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
8536570
..
a7f3d23
100644
(file)
--- a/
resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
+++ b/
resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.SavedQueriesModel.js
@@
-2,6
+2,7
@@
/**
* View model for saved queries
*
/**
* View model for saved queries
*
+ * @class
* @mixins OO.EventEmitter
* @mixins OO.EmitterList
*
* @mixins OO.EventEmitter
* @mixins OO.EmitterList
*
@@
-65,13
+66,16
@@
* the above structure.
* @param {Object} [baseState] An object representing the base state
* so we can normalize the data
* the above structure.
* @param {Object} [baseState] An object representing the base state
* so we can normalize the data
+ * @param {string[]} [ignoreFilters] Filters to ignore and remove from
+ * the data
* @fires initialize
*/
* @fires initialize
*/
- mw.rcfilters.dm.SavedQueriesModel.prototype.initialize = function ( savedQueries, baseState ) {
+ mw.rcfilters.dm.SavedQueriesModel.prototype.initialize = function ( savedQueries, baseState
, ignoreFilters
) {
var items = [],
defaultItem = null;
savedQueries = savedQueries || {};
var items = [],
defaultItem = null;
savedQueries = savedQueries || {};
+ ignoreFilters = ignoreFilters || {};
this.baseState = baseState;
this.baseState = baseState;
@@
-90,6
+94,11
@@
// for existing users, who are only betalabs users at the moment.
normalizedData.highlights.highlight = !!Number( normalizedData.highlights.highlight );
// for existing users, who are only betalabs users at the moment.
normalizedData.highlights.highlight = !!Number( normalizedData.highlights.highlight );
+ // Backwards-compat fix: Remove sticky parameters from the 'ignoreFilters' list
+ ignoreFilters.forEach( function ( name ) {
+ delete normalizedData.filters[ name ];
+ } );
+
item = new mw.rcfilters.dm.SavedQueryItemModel(
id,
obj.label,
item = new mw.rcfilters.dm.SavedQueryItemModel(
id,
obj.label,
@@
-118,6
+127,7
@@
*
* @param {string} label Label for the new query
* @param {Object} data Data for the new query
*
* @param {string} label Label for the new query
* @param {Object} data Data for the new query
+ * @return {string} ID of the newly added query
*/
mw.rcfilters.dm.SavedQueriesModel.prototype.addNewQuery = function ( label, data ) {
var randomID = ( new Date() ).getTime(),
*/
mw.rcfilters.dm.SavedQueriesModel.prototype.addNewQuery = function ( label, data ) {
var randomID = ( new Date() ).getTime(),
@@
-131,6
+141,8
@@
normalizedData
)
] );
normalizedData
)
] );
+
+ return randomID;
};
/**
};
/**