From fd75b8e3d594f0d590e436fb689d4f75e19b1a33 Mon Sep 17 00:00:00 2001 From: "Brenton \"B-Train\" Fletcher" Date: Thu, 13 Apr 2017 12:27:15 +1000 Subject: [PATCH 1/2] Fix jQuery-isms that are removed in Atom 1.16 --- lib/tree-view-open-files-view.coffee | 4 ++-- lib/tree-view-open-files.coffee | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tree-view-open-files-view.coffee b/lib/tree-view-open-files-view.coffee index 22414ab..13cf36f 100644 --- a/lib/tree-view-open-files-view.coffee +++ b/lib/tree-view-open-files-view.coffee @@ -54,5 +54,5 @@ class TreeViewOpenFilesView show: -> requirePackages('tree-view').then ([treeView]) => - treeView.treeView.find('.tree-view-scroller').css 'background', treeView.treeView.find('.tree-view').css 'background' - treeView.treeView.prepend @element + treeView.treeView.scroller.style.background = getComputedStyle(treeView.treeView.element).background + treeView.treeView.element.insertBefore(@element, treeView.treeView.element.firstChild) diff --git a/lib/tree-view-open-files.coffee b/lib/tree-view-open-files.coffee index c31f2cb..f600bb9 100644 --- a/lib/tree-view-open-files.coffee +++ b/lib/tree-view-open-files.coffee @@ -19,7 +19,7 @@ module.exports = @treeViewOpenFilesView.show() atom.commands.add 'atom-workspace', 'tree-view:toggle', => - if treeView.treeView?.is(':visible') + if treeView.treeView?.isVisible() @treeViewOpenFilesView.show() else @treeViewOpenFilesView.hide() From f56a220fed13966e07562b8072b17dd807d796eb Mon Sep 17 00:00:00 2001 From: Brenton Fletcher Date: Tue, 23 May 2017 19:18:38 +1000 Subject: [PATCH 2/2] Update observePanes call to deal with Docks being introduced in Atom 1.17; Fix tree-view toggle toggling tree-view-open-files backwards; General cleanup --- lib/tree-view-open-files-view.coffee | 23 ++++++++++------------- lib/tree-view-open-files.coffee | 8 ++------ 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/lib/tree-view-open-files-view.coffee b/lib/tree-view-open-files-view.coffee index 13cf36f..7f3cf58 100644 --- a/lib/tree-view-open-files-view.coffee +++ b/lib/tree-view-open-files-view.coffee @@ -1,4 +1,3 @@ -{requirePackages} = require 'atom-utils' {CompositeDisposable} = require 'event-kit' _ = require 'lodash' @@ -6,18 +5,21 @@ TreeViewOpenFilesPaneView = require './tree-view-open-files-pane-view' module.exports = class TreeViewOpenFilesView - constructor: (serializeState) -> + constructor: (treeView) -> + @treeView = treeView + # Create root element @element = document.createElement('div') @element.classList.add('tree-view-open-files') @groups = [] @paneSub = new CompositeDisposable @paneSub.add atom.workspace.observePanes (pane) => - @addTabGroup pane - destroySub = pane.onDidDestroy => - destroySub.dispose() - @removeTabGroup pane - @paneSub.add destroySub + if(atom.workspace.isTextEditor(pane.getActiveItem())) + @addTabGroup pane + destroySub = pane.onDidDestroy => + destroySub.dispose() + @removeTabGroup pane + @paneSub.add destroySub @configSub = atom.config.observe 'tree-view-open-files.maxHeight', (maxHeight) => @element.style.maxHeight = if maxHeight > 0 then "#{maxHeight}px" else 'none' @@ -33,9 +35,6 @@ class TreeViewOpenFilesView @groups[group].destroy() @groups.splice group, 1 - # Returns an object that can be retrieved when package is activated - serialize: -> - # Tear down any state and detach destroy: -> @element.remove() @@ -53,6 +52,4 @@ class TreeViewOpenFilesView @element.remove() show: -> - requirePackages('tree-view').then ([treeView]) => - treeView.treeView.scroller.style.background = getComputedStyle(treeView.treeView.element).background - treeView.treeView.element.insertBefore(@element, treeView.treeView.element.firstChild) + @treeView.treeView.element.insertBefore(@element, @treeView.treeView.element.firstChild) diff --git a/lib/tree-view-open-files.coffee b/lib/tree-view-open-files.coffee index f600bb9..440f36d 100644 --- a/lib/tree-view-open-files.coffee +++ b/lib/tree-view-open-files.coffee @@ -13,16 +13,13 @@ module.exports = activate: (state) -> requirePackages('tree-view').then ([treeView]) => - @treeViewOpenFilesView = new TreeViewOpenFilesView + @treeViewOpenFilesView = new TreeViewOpenFilesView(treeView) if treeView.treeView @treeViewOpenFilesView.show() atom.commands.add 'atom-workspace', 'tree-view:toggle', => - if treeView.treeView?.isVisible() - @treeViewOpenFilesView.show() - else - @treeViewOpenFilesView.hide() + @treeViewOpenFilesView.toggle() atom.commands.add 'atom-workspace', 'tree-view:show', => @treeViewOpenFilesView.show() @@ -31,4 +28,3 @@ module.exports = @treeViewOpenFilesView.destroy() serialize: -> - #TreeViewOpenFilesViewState: @TreeViewOpenFilesView.serialize()