From 490d489ace38a8d82c339dd558810c51779e4812 Mon Sep 17 00:00:00 2001 From: Chris Wanstrath Date: Mon, 21 Nov 2011 21:02:00 -0800 Subject: [PATCH] add Router, move everything over to it --- extensions/docs/docs.coffee | 2 +- extensions/gist/gist.coffee | 2 +- extensions/markdownpreview/markdownpreview.coffee | 2 +- extensions/showkeybindings/showkeybindings.coffee | 2 +- src/atom/browser.coffee | 2 +- src/atom/editor.coffee | 2 +- src/atom/project.coffee | 8 ++------ src/atom/router.coffee | 15 +++++++++++++++ src/atom/window.coffee | 10 ++-------- src/startup.coffee | 10 ++++++---- 10 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 src/atom/router.coffee diff --git a/extensions/docs/docs.coffee b/extensions/docs/docs.coffee index 6621067d5..c81167478 100644 --- a/extensions/docs/docs.coffee +++ b/extensions/docs/docs.coffee @@ -6,7 +6,7 @@ Browser = require 'browser' module.exports = class Docs extends Browser - window.resourceTypes.push this + atom.router.add this running: true diff --git a/extensions/gist/gist.coffee b/extensions/gist/gist.coffee index 83c3d1e1c..7c922e8b8 100644 --- a/extensions/gist/gist.coffee +++ b/extensions/gist/gist.coffee @@ -10,7 +10,7 @@ Base64 = require 'gist/base64' module.exports = class Gist extends Editor - window.resourceTypes.push this + atom.router.add this open: (url) -> return if not url diff --git a/extensions/markdownpreview/markdownpreview.coffee b/extensions/markdownpreview/markdownpreview.coffee index 789860922..1d25b8f6f 100644 --- a/extensions/markdownpreview/markdownpreview.coffee +++ b/extensions/markdownpreview/markdownpreview.coffee @@ -9,7 +9,7 @@ converter = new Showdown.converter module.exports = class Markdownpreview extends Browser - window.resourceTypes.push this + atom.router.add this running: true diff --git a/extensions/showkeybindings/showkeybindings.coffee b/extensions/showkeybindings/showkeybindings.coffee index b65f6682a..d9d5fb356 100644 --- a/extensions/showkeybindings/showkeybindings.coffee +++ b/extensions/showkeybindings/showkeybindings.coffee @@ -6,7 +6,7 @@ Browser = require 'browser' module.exports = class Showkeybindings extends Browser - window.resourceTypes.push this + atom.router.add this constructor: -> atom.keybinder.load require.resolve "showkeybindings/key-bindings.coffee" diff --git a/src/atom/browser.coffee b/src/atom/browser.coffee index e45ba905e..1b979a035 100644 --- a/src/atom/browser.coffee +++ b/src/atom/browser.coffee @@ -4,7 +4,7 @@ Resource = require 'resource' module.exports = class Browser extends Resource - window.resourceTypes.push this + atom.router.add this url: null diff --git a/src/atom/editor.coffee b/src/atom/editor.coffee index 12c53a127..7482cd53a 100644 --- a/src/atom/editor.coffee +++ b/src/atom/editor.coffee @@ -11,7 +11,7 @@ EditorPane = require 'editor-pane' # editor:open (editor) -> Called when an editor is opened. module.exports = class Editor extends Resource - window.resourceTypes.push this + atom.router.add this dirty: false diff --git a/src/atom/project.coffee b/src/atom/project.coffee index e6d34c792..101f7cc3a 100644 --- a/src/atom/project.coffee +++ b/src/atom/project.coffee @@ -12,7 +12,7 @@ Resource = require 'resource' # in a project. module.exports = class Project extends Resource - window.resourceTypes.push this + atom.router.add this settings: # Regexp used to ignore paths. @@ -57,11 +57,7 @@ class Project extends Resource true else # Try to open all others - for resourceType in window.resourceTypes - resource = new resourceType - break if success = resource.open url - - if success + if resource = atom.router.open url @resources[url] = @activeResource = resource atom.trigger 'project:resource:open', this, resource atom.trigger 'project:resource:active', this, resource diff --git a/src/atom/router.coffee b/src/atom/router.coffee new file mode 100644 index 000000000..c90bf24de --- /dev/null +++ b/src/atom/router.coffee @@ -0,0 +1,15 @@ +module.exports = +class Router + resources: [] + + add: (resource) -> + @resources.unshift resource + + open: (url) -> + success = false + + for resourceType in @resources + resource = new resourceType + break if success = resource.open url + + resource if success diff --git a/src/atom/window.coffee b/src/atom/window.coffee index 1c81afb5f..7ba4482e9 100644 --- a/src/atom/window.coffee +++ b/src/atom/window.coffee @@ -7,19 +7,13 @@ _ = require 'underscore' # Events: # window:load - Same as window.onLoad. Final event of app startup. windowAdditions = - resourceTypes: [] - url: $atomController.url?.toString() startup: -> atom.trigger 'window:load', this - success = false - for resourceType in @resourceTypes.reverse() - @resource = new resourceType - break if success = @resource.open @url - - throw "I DON'T KNOW ABOUT #{@url}" if not success + if not @resource = atom.router.open @url + throw "I DON'T KNOW ABOUT #{@url}" shutdown: -> diff --git a/src/startup.coffee b/src/startup.coffee index a15470430..d5610863b 100644 --- a/src/startup.coffee +++ b/src/startup.coffee @@ -4,14 +4,11 @@ require 'window' window.atom = {} App = require 'app' -Browser = require 'browser' -Editor = require 'editor' Event = require 'event' ExtensionManager = require 'extension-manager' KeyBinder = require 'key-binder' Native = require 'native' -Project = require 'project' -Resource = require 'resource' +Router = require 'router' Settings = require 'settings' Storage = require 'storage' @@ -23,8 +20,13 @@ for name, method of atom.event atom.native = new Native atom.storage = new Storage atom.keybinder = new KeyBinder +atom.router = new Router atom.settings = new Settings +Browser = require 'browser' +Editor = require 'editor' +Project = require 'project' + atom.extensions = {} atom.extensionManager = new ExtensionManager