From aed0c16acc6d39485f68567d255f923a34febcd3 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 15 Apr 2014 16:16:01 -0700 Subject: [PATCH 1/5] Remove github auth token methods --- package.json | 1 - src/atom.coffee | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/package.json b/package.json index 1bb1386de..311b31c71 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,6 @@ "grim": "0.6.0", "guid": "0.0.10", "jasmine-tagged": "^1.1.1", - "keytar": "1.x", "less-cache": "0.12.0", "mixto": "1.x", "mkdirp": "0.3.5", diff --git a/src/atom.coffee b/src/atom.coffee index 59c3d1578..6a096a22f 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -1,6 +1,5 @@ crypto = require 'crypto' ipc = require 'ipc' -keytar = require 'keytar' os = require 'os' path = require 'path' remote = require 'remote' @@ -484,17 +483,6 @@ class Atom extends Model isReleasedVersion: -> @constructor.isReleasedVersion() - getGitHubAuthTokenName: -> - 'Atom GitHub API Token' - - # Public: Set the the github token in the keychain - setGitHubAuthToken: (token) -> - keytar.replacePassword(@getGitHubAuthTokenName(), 'github', token) - - # Public: Get the github token from the keychain - getGitHubAuthToken: -> - keytar.getPassword(@getGitHubAuthTokenName(), 'github') - # Public: Get the directory path to Atom's configuration area. # # Returns the absolute path to ~/.atom From 33557b87eb3fcc48a0e62751c7169c505451875b Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 15 Apr 2014 16:26:21 -0700 Subject: [PATCH 2/5] Upgrade to feedback@0.30.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 311b31c71..a148b6105 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "command-palette": "0.20.0", "dev-live-reload": "0.30.0", "exception-reporting": "0.17.0", - "feedback": "0.29.0", + "feedback": "0.30.0", "find-and-replace": "0.97.0", "fuzzy-finder": "0.49.0", "git-diff": "0.28.0", From a61dff6e219f2e1b82d9142dbf60669a980c38cb Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Tue, 15 Apr 2014 18:46:02 -0600 Subject: [PATCH 3/5] :non-potable_water: Unsubscribe from Editor when EditorView is removed This replaces calls to `@editor.on` with `@subscribe @editor`. That causes us to correctly unsubscribe when the editor is removed, avoiding a memory leak. --- src/editor-view.coffee | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/editor-view.coffee b/src/editor-view.coffee index b07eb3424..8fc28392c 100644 --- a/src/editor-view.coffee +++ b/src/editor-view.coffee @@ -535,34 +535,34 @@ class EditorView extends View @editor.setVisible(true) - @editor.on "destroyed", => + @subscribe @editor, "destroyed", => @remove() - @editor.on "contents-conflicted.editor", => + @subscribe @editor, "contents-conflicted.editor", => @showBufferConflictAlert(@editor) - @editor.on "path-changed.editor", => + @subscribe @editor, "path-changed.editor", => @editor.reloadGrammar() @trigger 'editor:path-changed' - @editor.on "grammar-changed.editor", => + @subscribe @editor, "grammar-changed.editor", => @trigger 'editor:grammar-changed' - @editor.on 'selection-added.editor', (selection) => + @subscribe @editor, 'selection-added.editor', (selection) => @newCursors.push(selection.cursor) @newSelections.push(selection) @requestDisplayUpdate() - @editor.on 'screen-lines-changed.editor', (e) => + @subscribe @editor, 'screen-lines-changed.editor', (e) => @handleScreenLinesChange(e) - @editor.on 'scroll-top-changed.editor', (scrollTop) => + @subscribe @editor, 'scroll-top-changed.editor', (scrollTop) => @scrollTop(scrollTop) - @editor.on 'scroll-left-changed.editor', (scrollLeft) => + @subscribe @editor, 'scroll-left-changed.editor', (scrollLeft) => @scrollLeft(scrollLeft) - @editor.on 'soft-wrap-changed.editor', (softWrap) => + @subscribe @editor, 'soft-wrap-changed.editor', (softWrap) => @setSoftWrap(softWrap) @trigger 'editor:path-changed' From d554b7fd03114f24deb28b387eece33b175fc1c4 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Tue, 15 Apr 2014 18:50:36 -0600 Subject: [PATCH 4/5] Remove scopes from event names in subscriptions --- src/editor-view.coffee | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/editor-view.coffee b/src/editor-view.coffee index 8fc28392c..1dd776c65 100644 --- a/src/editor-view.coffee +++ b/src/editor-view.coffee @@ -538,31 +538,31 @@ class EditorView extends View @subscribe @editor, "destroyed", => @remove() - @subscribe @editor, "contents-conflicted.editor", => + @subscribe @editor, "contents-conflicted", => @showBufferConflictAlert(@editor) - @subscribe @editor, "path-changed.editor", => + @subscribe @editor, "path-changed", => @editor.reloadGrammar() @trigger 'editor:path-changed' - @subscribe @editor, "grammar-changed.editor", => + @subscribe @editor, "grammar-changed", => @trigger 'editor:grammar-changed' - @subscribe @editor, 'selection-added.editor', (selection) => + @subscribe @editor, 'selection-added', (selection) => @newCursors.push(selection.cursor) @newSelections.push(selection) @requestDisplayUpdate() - @subscribe @editor, 'screen-lines-changed.editor', (e) => + @subscribe @editor, 'screen-lines-changed', (e) => @handleScreenLinesChange(e) - @subscribe @editor, 'scroll-top-changed.editor', (scrollTop) => + @subscribe @editor, 'scroll-top-changed', (scrollTop) => @scrollTop(scrollTop) - @subscribe @editor, 'scroll-left-changed.editor', (scrollLeft) => + @subscribe @editor, 'scroll-left-changed', (scrollLeft) => @scrollLeft(scrollLeft) - @subscribe @editor, 'soft-wrap-changed.editor', (softWrap) => + @subscribe @editor, 'soft-wrap-changed', (softWrap) => @setSoftWrap(softWrap) @trigger 'editor:path-changed' From 34f624c89531fb46297fb6371d04fd5035dc8fef Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Tue, 15 Apr 2014 19:07:57 -0600 Subject: [PATCH 5/5] Unsubscribe from the editor model with ::unsubscribe --- src/editor-view.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor-view.coffee b/src/editor-view.coffee index 1dd776c65..7f6a99b45 100644 --- a/src/editor-view.coffee +++ b/src/editor-view.coffee @@ -527,7 +527,7 @@ class EditorView extends View if @editor @saveScrollPositionForEditor() - @editor.off(".editor") + @unsubscribe(@editor) @editor = editor