Sitic has submitted this change and it was merged. Change subject: Fix filtering ......................................................................
Fix filtering Change-Id: Ie26b2248c484ec2523d463758b9360ebcc802e3d --- M frontend/src/app/services.js M frontend/src/components/settings/settings.controller.js 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Sitic: Verified; Looks good to me, approved diff --git a/frontend/src/app/services.js b/frontend/src/app/services.js index e33a1ae..d99a4e2 100644 --- a/frontend/src/app/services.js +++ b/frontend/src/app/services.js @@ -126,15 +126,15 @@ return; } - $log.info('showing first 100 watchlist entries'); + $log.info('showing first watchlist entries (maximum 100)'); vm.watchlist.filtered = $filter('watchlist')(vm.watchlist.original, vm.config); if (typeof searchtext !== 'undefined') { vm.watchlist.filtered = $filter('filter')(vm.watchlist.filtered, searchtext); } + var temp = vm.watchlist.filtered.slice(0, 100); vm.watchlist.active.length = 0; Array.prototype.push.apply(vm.watchlist.active, temp); - $log.info(vm.watchlist.active.length); }; vm.filterWatchlistDebounced = debounce(vm.filterWatchlist, 250); diff --git a/frontend/src/components/settings/settings.controller.js b/frontend/src/components/settings/settings.controller.js index 2f00add..6014d66 100644 --- a/frontend/src/components/settings/settings.controller.js +++ b/frontend/src/components/settings/settings.controller.js @@ -7,7 +7,7 @@ vm.oldconfig = vm.config; vm.saveConfig = function () { dataService.saveConfig(); - dataService.filterWatchlist('watchlist', dataService.config); + dataService.filterWatchlist(); }; vm.reload = function () { -- To view, visit https://gerrit.wikimedia.org/r/219486 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie26b2248c484ec2523d463758b9360ebcc802e3d Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/crosswatch Gerrit-Branch: master Gerrit-Owner: Sitic <jan.leb...@online.de> Gerrit-Reviewer: Sitic <jan.leb...@online.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits