From e4aa82fda1994ab49e7e9138cf9e29ab8716df89 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 20 Nov 2013 14:55:49 -0800 Subject: [PATCH] Remove window.rootView shims --- src/atom-package.coffee | 10 +++------- src/select-list.coffee | 4 +--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/atom-package.coffee b/src/atom-package.coffee index 3f8d5832a..0bdac5841 100644 --- a/src/atom-package.coffee +++ b/src/atom-package.coffee @@ -216,18 +216,14 @@ class AtomPackage extends Package @activateStylesheets() @requireMainModule() - # Private: TODO remove once packages have been updated - getRootView: -> - atom?.rootView ? window.rootView - subscribeToActivationEvents: -> return unless @metadata.activationEvents? if _.isArray(@metadata.activationEvents) - @getRootView().command(event, @handleActivationEvent) for event in @metadata.activationEvents + atom.rootView.command(event, @handleActivationEvent) for event in @metadata.activationEvents else if _.isString(@metadata.activationEvents) - @getRootView().command(@metadata.activationEvents, @handleActivationEvent) + atom.rootView.command(@metadata.activationEvents, @handleActivationEvent) else - @getRootView().command(event, selector, @handleActivationEvent) for event, selector of @metadata.activationEvents + atom.rootView.command(event, selector, @handleActivationEvent) for event, selector of @metadata.activationEvents handleActivationEvent: (event) => bubblePathEventHandlers = @disableEventHandlersOnBubblePath(event) diff --git a/src/select-list.coffee b/src/select-list.coffee index 1cf195c55..0c8bc41ff 100644 --- a/src/select-list.coffee +++ b/src/select-list.coffee @@ -171,9 +171,7 @@ class SelectList extends View if @previouslyFocusedElement?.isOnDom() @previouslyFocusedElement.focus() else - # TODO Remove once all packages have been updated - rootView = atom?.rootView ? window.rootView - rootView.focus() + atom.rootView.focus() # Public: cancelled: ->