From f8399eaaa62e780691023d1d5352468848eaa66d Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 8 Feb 2018 11:08:10 +0100 Subject: [PATCH 1/2] avoid concatenating 'undefined' in drive interface --- www/drive/inner.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/www/drive/inner.js b/www/drive/inner.js index 11d96df42..be4909415 100644 --- a/www/drive/inner.js +++ b/www/drive/inner.js @@ -2673,11 +2673,14 @@ define([ var data = JSON.parse(JSON.stringify(filesOp.getFileData(el))); if (!data || !data.href) { return void cb('INVALID_FILE'); } data.href = base + data.href; + + var roUrl; if (ro) { data.roHref = data.href; delete data.href; } else { - data.roHref = base + getReadOnlyUrl(el); + roUrl = getReadOnlyUrl(el); + if (roUrl) { data.roHref = base + roUrl; } } UIElements.getProperties(common, data, cb); From 1191c14a2989ecba2e2cb51557045972964caf6e Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 8 Feb 2018 11:11:51 +0100 Subject: [PATCH 2/2] lint compliance --- customize.dist/messages.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/customize.dist/messages.js b/customize.dist/messages.js index 16128df9c..bffb95654 100755 --- a/customize.dist/messages.js +++ b/customize.dist/messages.js @@ -101,8 +101,8 @@ define(req, function(Util, Default, Language) { checkInObject(Default, translation, []); // Push the removals at the end missing.sort(function (a, b) { - if (a[2] === 0 && b[2] !== 0) return 1; - if (a[2] !== 0 && b[2] === 0) return -1; + if (a[2] === 0 && b[2] !== 0) { return 1; } + if (a[2] !== 0 && b[2] === 0) { return -1; } return 0; }); Array.prototype.push.apply(allMissing, missing); // Destructive concat