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 30204c279..000000000 Binary files a/internal_packages/system-tray/assets/darwin/ic-systemtray-nylas@2x.png and /dev/null differ 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;