From e82e32d2738a9afff43c472571be830db0151201 Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Tue, 12 Dec 2017 14:50:09 +0100 Subject: [PATCH 1/4] Remove saucelabs because it's broken --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index c756e5452..0440c2a1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,3 @@ before_script: - ./node_modules/bower/bin/bower install - node ./server.js & - sleep 2 -addons: - sauce_connect: - username: "cjdelisle" - access_key: - secure: "pgGh8YGXLPq6fpdwwK2jnjRtwXPbVWQ/HIFvwX7E6HBpzxxcF2edE8sCdonWW9TP2LQisZFmVLqoSnZWMnjBr2CBAMKMFvaHQDJDQCo4v3BXkID7KgqyKmNcwW+FPfSJ5MxNBro8/GE/awkhZzJLYGUTS5zi/gVuIUwdi6cHI8s="i - tunnel_domains: localhost From c0e49211c49fb2900f8175ed0fcbf36bd9ff75bb Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 12 Dec 2017 14:51:51 +0100 Subject: [PATCH 2/4] eat errors related to cursors --- www/common/cursor.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/www/common/cursor.js b/www/common/cursor.js index 04276a179..845067a80 100644 --- a/www/common/cursor.js +++ b/www/common/cursor.js @@ -86,6 +86,7 @@ define([ }; var fixSelection = cursor.fixSelection = function (sel, range) { + try { if (Tree.contains(Range.start.el, inner) && Tree.contains(Range.end.el, inner)) { var order = Tree.orderOfNodes(Range.start.el, Range.end.el, inner); var backward; @@ -118,6 +119,7 @@ define([ console.error(errText); return errText; } + } catch (e) { console.error(e); } }; cursor.pushDelta = function (oldVal, newVal) { From d486a2308c7adcac95e68237113d2ff5a0fd223e Mon Sep 17 00:00:00 2001 From: Caleb James DeLisle Date: Tue, 12 Dec 2017 14:54:12 +0100 Subject: [PATCH 3/4] see if this works.... --- .travis.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0440c2a1d..d77e49fa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,4 @@ language: node_js -env: - matrix: - - "BROWSER='firefox::Windows 10'" - - "BROWSER='chrome::Windows 10'" - #- "BROWSER='MicrosoftEdge:14.14393:Windows 10'" - #- "BROWSER='internet explorer:11.103:Windows 10'" - #- "BROWSER='safari:10.0:macOS 10.12'" - #- "BROWSER='safari:9.0:OS X 10.11'" branches: only: - master @@ -14,11 +6,6 @@ branches: - staging node_js: - "6.6.0" -before_script: +script: - npm run-script lint - npm run-script flow - - cp config.example.js config.js - - npm install bower - - ./node_modules/bower/bin/bower install - - node ./server.js & - - sleep 2 From afcf3d06b36ace3e0179772eb4c9dfc4427043a1 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 12 Dec 2017 16:00:05 +0100 Subject: [PATCH 4/4] unpin pads when they are removed from your drive --- www/common/outer/async-store.js | 1 + www/common/outer/userObject.js | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js index 9aaba8627..8e6c91f70 100644 --- a/www/common/outer/async-store.js +++ b/www/common/outer/async-store.js @@ -837,6 +837,7 @@ define([ var proxy = store.proxy; var userObject = store.userObject = UserObject.init(proxy.drive, { pinPads: Store.pinPads, + unpinPads: Store.unpinPads, loggedIn: store.loggedIn, log: function (msg) { postMessage("DRIVE_LOG", msg); diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js index 10a796e3c..32e3e3b92 100644 --- a/www/common/outer/userObject.js +++ b/www/common/outer/userObject.js @@ -13,6 +13,9 @@ define([ }; module.init = function (config, exp, files) { + var unpinPads = config.unpinPads || function () { + console.error("unpinPads was not provided"); + }; var pinPads = config.pinPads; var loggedIn = config.loggedIn; var workgroup = config.workgroup; @@ -83,11 +86,21 @@ define([ if (workgroup || (!loggedIn && !config.testMode)) { return; } var filesList = exp.getFiles([ROOT, 'hrefArray', TRASH]); + var toClean = []; exp.getFiles([FILES_DATA]).forEach(function (id) { if (filesList.indexOf(id) === -1) { + var fd = exp.getFileData(id); + if (fd && fd.href) { + toClean.push(Hash.hrefToHexChannelId(fd.href)); + } spliceFileData(id); } }); + if (!toClean.length) { return; } + unpinPads(toClean, function (response) { + if (response && response.error) { return console.error(response.error); } + // console.error(response); + }); }; var deleteHrefs = function (ids) { ids.forEach(function (obj) {