From 74252d58d9b1f783b89635a39fe7457ef3bdc081 Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Tue, 17 Nov 2015 15:36:32 -0800 Subject: [PATCH] =?UTF-8?q?bump(=E2=9A=A1=EF=B8=8F):=20Electron=200.29.2?= =?UTF-8?q?=20>=200.34.3,=20Sqlite=203.0.11=20>=203.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal_packages/feedback/lib/main.cjsx | 3 ++- .../assets/darwin/ic-systemtray-nylas@2x.png | Bin 18374 -> 0 bytes package.json | 12 ++++++------ script/bootstrap | 2 +- spec/nylas-protocol-handler-spec.coffee | 14 ++++---------- src/browser/nylas-protocol-handler.coffee | 4 ++-- static/components/popover.less | 1 - 7 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 internal_packages/system-tray/assets/darwin/ic-systemtray-nylas@2x.png diff --git a/internal_packages/feedback/lib/main.cjsx b/internal_packages/feedback/lib/main.cjsx index f278ffafc..07881281b 100644 --- a/internal_packages/feedback/lib/main.cjsx +++ b/internal_packages/feedback/lib/main.cjsx @@ -8,8 +8,9 @@ module.exports = ComponentRegistry.register FeedbackButton, location: WorkspaceStore.Sheet.Global.Footer - protocol.registerProtocol 'nylas-feedback-available', => + protocol.registerStringProtocol 'nylas-feedback-available', (request, callback) => FeedbackActions.feedbackAvailable() + callback('ok') serialize: -> diff --git a/internal_packages/system-tray/assets/darwin/ic-systemtray-nylas@2x.png b/internal_packages/system-tray/assets/darwin/ic-systemtray-nylas@2x.png deleted file mode 100644 index 30204c2796eb1d7f1e9bf22d784718dd075c414f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18374 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 E0SM}mQUCw| diff --git a/package.json b/package.json index 00bf31ff1..b76f1f670 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,10 @@ "bugs": { "url": "https://github.com/nylas/N1/issues" }, - "electronVersion": "0.29.2", + "electronVersion": "0.34.3", "dependencies": { "async": "^0.9", - "atom-keymap": "5.1.11", + "atom-keymap": "^6.1.1", "babel-core": "^5.8.21", "bluebird": "^2.9", "classnames": "1.2.1", @@ -40,11 +40,11 @@ "mkdirp": "^0.5", "moment": "^2.8", "moment-timezone": "^0.3", - "nslog": "^2.0.0", + "nslog": "^3", "node-uuid": "^1.4", "nock": "^2", "optimist": "0.4.0", - "pathwatcher": "^4.4.0", + "pathwatcher": "~6.2", "property-accessors": "^1", "promise-queue": "2.1.1", "proxyquire": "1.3.1", @@ -55,7 +55,7 @@ "reflux": "0.1.13", "request": "^2.53", "request-progress": "^0.3", - "runas": "^2.0", + "runas": "^3.1", "sanitize-html": "1.9.0", "scoped-property-store": "^0.16.2", "season": "^5.1", @@ -63,7 +63,7 @@ "serializable": "^1", "service-hub": "^0.2.0", "space-pen": "3.8.2", - "spellchecker": "2.2.1", + "spellchecker": "^3.1.2", "temp": "^0.8", "theorist": "^1.0", "underscore": "^1.8", diff --git a/script/bootstrap b/script/bootstrap index 38412992d..25de03c44 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -48,7 +48,7 @@ function makeSqlite3Command() { // Use our local version of npm (npm 3x) to build sqlite var npmPath = '"' + path.resolve(__dirname, '..', 'build', 'node_modules', '.bin', 'npm') + '"'; - return npmPath + " install https://github.com/bengotow/node-sqlite3/archive/master.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v44-"+targetPlatform+"-"+targetArch + return npmPath + " install https://github.com/mapbox/node-sqlite3/archive/v3.1.1.tar.gz --ignore-scripts && cd node_modules/sqlite3 && "+nodeGypPath+" configure rebuild --target="+targetElectronVersion+" --arch="+targetArch+" --target_platform="+targetPlatform+" --dist-url=https://atom.io/download/atom-shell --module_name=node_sqlite3 --module_path=../lib/binding/node-v46-"+targetPlatform+"-"+targetArch } function bootstrap() { diff --git a/spec/nylas-protocol-handler-spec.coffee b/spec/nylas-protocol-handler-spec.coffee index 416831de5..fa048ffc5 100644 --- a/spec/nylas-protocol-handler-spec.coffee +++ b/spec/nylas-protocol-handler-spec.coffee @@ -1,15 +1,9 @@ -{$} = require '../src/space-pen-extensions' - describe '"nylas" protocol URL', -> it 'sends the file relative in the package as response', -> called = false - callback = -> called = true - $.ajax - url: 'nylas://async/package.json' - success: callback - # In old versions of jQuery, ajax calls to custom protocol would always - # be treated as error eventhough the browser thinks it's a success - # request. - error: callback + request = new XMLHttpRequest() + request.addEventListener('load', -> called = true) + request.open('GET', 'nylas://async/package.json', true) + request.send() waitsFor 'request to be done', -> called is true diff --git a/src/browser/nylas-protocol-handler.coffee b/src/browser/nylas-protocol-handler.coffee index 4ea7de25d..5fcda935c 100644 --- a/src/browser/nylas-protocol-handler.coffee +++ b/src/browser/nylas-protocol-handler.coffee @@ -30,7 +30,7 @@ class NylasProtocolHandler # Creates the 'Nylas' custom protocol handler. registerNylasProtocol: -> - protocol.registerProtocol 'nylas', (request) => + protocol.registerFileProtocol 'nylas', (request, callback) => relativePath = path.normalize(request.url.substr(7)) if relativePath.indexOf('assets/') is 0 @@ -42,4 +42,4 @@ class NylasProtocolHandler filePath = path.join(loadPath, relativePath) break if fs.statSyncNoException(filePath).isFile?() - new protocol.RequestFileJob(filePath) + callback(filePath) diff --git a/static/components/popover.less b/static/components/popover.less index b9a16a7be..7ed0a6e4b 100644 --- a/static/components/popover.less +++ b/static/components/popover.less @@ -7,7 +7,6 @@ .popover { display: flex; - flex-direction: column; max-height:400px; background-color: @background-primary; border-radius: @border-radius-base;