From c8b9830298e094b8ec6d15d5f1e7a89a9f8ef93c Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 16 May 2019 16:10:13 +0200 Subject: [PATCH 1/2] Fix duplicate entries in the recent pads --- www/drive/inner.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/www/drive/inner.js b/www/drive/inner.js index a58cee94f..f6146fb4e 100644 --- a/www/drive/inner.js +++ b/www/drive/inner.js @@ -2465,6 +2465,8 @@ define([ var header7, header28, headerOld; var i = 0; + var channels = []; + $list.append(h('li.cp-app-drive-element-separator', h('span', Messages.drive_active1Day))); filesList.some(function (arr) { if (i >= limit) { return true; } @@ -2481,6 +2483,8 @@ define([ var path = paths[0]; if (manager.isPathIn(path, [TRASH])) { return; } + if (channels.indexOf(file.channel) !== -1) { return; } + channels.push(file.channel); if (!header7 && file.atime < last1) { $list.append(h('li.cp-app-drive-element-separator', h('span', Messages.drive_active7Days))); From de3bb5cdcf511b9839350a849eeb5e9bd16d6e40 Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 16 May 2019 16:14:25 +0200 Subject: [PATCH 2/2] Ignore jshint on mailbox placeholder --- www/common/outer/mailbox.js | 1 + 1 file changed, 1 insertion(+) diff --git a/www/common/outer/mailbox.js b/www/common/outer/mailbox.js index ab9d24d58..313690a29 100644 --- a/www/common/outer/mailbox.js +++ b/www/common/outer/mailbox.js @@ -1,3 +1,4 @@ +// jshint ignore: start define([ '/common/common-util.js', '/common/common-constants.js',