From ac2f723aba54357c3ad9d2b951b58ee6e1e962eb Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 15 Apr 2014 13:13:53 -0700 Subject: [PATCH 1/9] Use PaneContainerViews::getPaneViews --- src/workspace-view.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index 52803a8ef..1dde00d0f 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -316,7 +316,7 @@ class WorkspaceView extends View # # Returns an Array of all open {PaneView}s. getPaneViews: -> - @panes.getPanes() + @panes.getPaneViews() # Public: Register a function to be called for every current and future # editor view in the workspace. From e6040972d80a92ec5899e2e2e3a4946d2ecc4d22 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 15 Apr 2014 14:03:46 -0700 Subject: [PATCH 2/9] Update multiple packages. --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 1bb1386de..1d8a88f3b 100644 --- a/package.json +++ b/package.json @@ -67,15 +67,15 @@ "autocomplete": "0.27.0", "autoflow": "0.16.0", "autosave": "0.13.0", - "background-tips": "0.10.0", + "background-tips": "0.11.0", "bookmarks": "0.22.0", - "bracket-matcher": "0.30.0", + "bracket-matcher": "0.31.0", "command-palette": "0.20.0", "dev-live-reload": "0.30.0", "exception-reporting": "0.17.0", "feedback": "0.29.0", "find-and-replace": "0.97.0", - "fuzzy-finder": "0.49.0", + "fuzzy-finder": "0.50.0", "git-diff": "0.28.0", "go-to-line": "0.19.0", "grammar-selector": "0.24.0", @@ -93,7 +93,7 @@ "status-bar": "0.39.0", "styleguide": "0.28.0", "symbols-view": "0.49.0", - "tabs": "0.34.0", + "tabs": "0.35.0", "timecop": "0.17.0", "tree-view": "0.89.0", "update-package-dependencies": "0.6.0", From 7c00e02b1a3b635240ee833f565757e0c59f420e Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 15 Apr 2014 14:04:20 -0700 Subject: [PATCH 3/9] Deprecate PaneContainerView::getActivePane Use PaneContainerView::getActivePaneView instead. --- src/pane-container-view.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pane-container-view.coffee b/src/pane-container-view.coffee index 1421b1283..1849441a2 100644 --- a/src/pane-container-view.coffee +++ b/src/pane-container-view.coffee @@ -81,6 +81,10 @@ class PaneContainerView extends View @find('.pane:has(:focus)').view() getActivePane: -> + deprecate("Use PaneContainerView::getActivePaneView instead.") + @getActivePaneView() + + getActivePaneView: -> @viewForModel(@model.activePane) getActivePaneItem: -> From ad0ed7e6345964ea7a98d9733ba4b41dd4b443a8 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 15 Apr 2014 14:04:35 -0700 Subject: [PATCH 4/9] Don't use of deprecated methods internally --- src/workspace-view.coffee | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index 1dde00d0f..b6e0990d6 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -151,7 +151,7 @@ class WorkspaceView extends View @command 'pane:reopen-closed-item', => @reopenItemSync() - @command 'core:close', => if @getActivePaneItem()? then @destroyActivePaneItem() else @destroyActivePane() + @command 'core:close', => if @getModel().getActivePane().getActiveItem()? then @destroyActivePaneItem() else @destroyActivePane() @command 'core:save', => @saveActivePaneItem() @command 'core:save-as', => @saveActivePaneItemAs() @@ -182,8 +182,8 @@ class WorkspaceView extends View detailedMessage: "The shell commands `atom` and `apm` are installed." handleFocus: -> - if @getActivePane() - @getActivePane().focus() + if @getActivePaneView() + @getActivePaneView().focus() false else @updateTitle() @@ -205,7 +205,7 @@ class WorkspaceView extends View # Updates the application's title, based on whichever file is open. updateTitle: -> if projectPath = atom.project.getPath() - if item = @getActivePaneItem() + if item = @getModel().getActivePane().getActiveItem() @setTitle("#{item.getTitle?() ? 'untitled'} - #{projectPath}") else @setTitle(projectPath) @@ -272,7 +272,7 @@ class WorkspaceView extends View # # Returns a {PaneView}. getActivePaneView: -> - @panes.getActivePane() + @panes.getActivePaneView() # Public: Get the view associated with the active pane item. # From 411cf579f42528b57eb7899432eafc1f8bc536e6 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 15 Apr 2014 14:21:25 -0700 Subject: [PATCH 5/9] Add Workspace::getActivePaneItem --- src/workspace.coffee | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/workspace.coffee b/src/workspace.coffee index 1bf80678e..cc29853b0 100644 --- a/src/workspace.coffee +++ b/src/workspace.coffee @@ -223,6 +223,12 @@ class Workspace extends Model paneForUri: (uri) -> @paneContainer.paneForUri(uri) + # Public: Get the active {Pane}'s active item. + # + # Returns an pane item {Object}. + getActivePaneItem: -> + @paneContainer.getActivePane().getActiveItem() + # Public: Save the active pane item. # # If the active pane item currently has a URI according to the item's From d6ec73886f7167399f6d3f2391cfdbece44e6283 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 15 Apr 2014 14:55:28 -0700 Subject: [PATCH 6/9] Add PaneContainer::getActivePane --- src/pane-container.coffee | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pane-container.coffee b/src/pane-container.coffee index a02afed9e..535e55607 100644 --- a/src/pane-container.coffee +++ b/src/pane-container.coffee @@ -39,6 +39,9 @@ class PaneContainer extends Model getPanes: -> @root?.getPanes() ? [] + getActivePane: -> + @activePane + paneForUri: (uri) -> find @getPanes(), (pane) -> pane.itemForUri(uri)? From 5824b127edda8a37f3a379f7b4ecb8ff14ad8ca5 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 15 Apr 2014 15:23:25 -0700 Subject: [PATCH 7/9] Update multiple packages --- package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 1d8a88f3b..46c63e0a4 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "autocomplete": "0.27.0", "autoflow": "0.16.0", "autosave": "0.13.0", - "background-tips": "0.11.0", + "background-tips": "0.12.0", "bookmarks": "0.22.0", "bracket-matcher": "0.31.0", "command-palette": "0.20.0", @@ -79,23 +79,23 @@ "git-diff": "0.28.0", "go-to-line": "0.19.0", "grammar-selector": "0.24.0", - "image-view": "0.32.0", + "image-view": "0.33.0", "keybinding-resolver": "0.17.0", "link": "0.22.0", "markdown-preview": "0.62.0", "metrics": "0.32.0", "open-on-github": "0.28.0", "package-generator": "0.30.0", - "release-notes": "0.26.0", - "settings-view": "0.107.0", - "snippets": "0.40.0", + "release-notes": "0.27.0", + "settings-view": "0.108.0", + "snippets": "0.41.0", "spell-check": "0.33.0", - "status-bar": "0.39.0", - "styleguide": "0.28.0", + "status-bar": "0.40.0", + "styleguide": "0.29.0", "symbols-view": "0.49.0", - "tabs": "0.35.0", - "timecop": "0.17.0", - "tree-view": "0.89.0", + "tabs": "0.36.0", + "timecop": "0.18.0", + "tree-view": "0.90.0", "update-package-dependencies": "0.6.0", "welcome": "0.12.0", "whitespace": "0.22.0", From 8988d55d25d4812a8de5361f2f0c1f2c76a82175 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 15 Apr 2014 15:27:24 -0700 Subject: [PATCH 8/9] Upgrade to find-and-replace@0.98.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 46c63e0a4..351b2689c 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "dev-live-reload": "0.30.0", "exception-reporting": "0.17.0", "feedback": "0.29.0", - "find-and-replace": "0.97.0", + "find-and-replace": "0.98.0", "fuzzy-finder": "0.50.0", "git-diff": "0.28.0", "go-to-line": "0.19.0", From b4c8cb4bf95628dc325d516a1cc2742cfefef04f Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 15 Apr 2014 15:31:56 -0700 Subject: [PATCH 9/9] Use Workspace::getActivePaneItem --- src/workspace-view.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index b6e0990d6..c4bcaad36 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -151,7 +151,7 @@ class WorkspaceView extends View @command 'pane:reopen-closed-item', => @reopenItemSync() - @command 'core:close', => if @getModel().getActivePane().getActiveItem()? then @destroyActivePaneItem() else @destroyActivePane() + @command 'core:close', => if @getModel().getActivePaneItem()? then @destroyActivePaneItem() else @destroyActivePane() @command 'core:save', => @saveActivePaneItem() @command 'core:save-as', => @saveActivePaneItemAs() @@ -205,7 +205,7 @@ class WorkspaceView extends View # Updates the application's title, based on whichever file is open. updateTitle: -> if projectPath = atom.project.getPath() - if item = @getModel().getActivePane().getActiveItem() + if item = @getModel().getActivePaneItem() @setTitle("#{item.getTitle?() ? 'untitled'} - #{projectPath}") else @setTitle(projectPath)