From 409caab5603a2178a0e81d949e72fb48f0f60bdc Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Date: Thu, 31 Mar 2016 12:26:17 +0300 Subject: [PATCH 01/12] Allow to specify Min Height - Needed for big projects --- lib/tree-view-open-files-view.coffee | 3 +++ lib/tree-view-open-files.coffee | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/lib/tree-view-open-files-view.coffee b/lib/tree-view-open-files-view.coffee index 22414ab..5757c5a 100644 --- a/lib/tree-view-open-files-view.coffee +++ b/lib/tree-view-open-files-view.coffee @@ -22,6 +22,9 @@ class TreeViewOpenFilesView @configSub = atom.config.observe 'tree-view-open-files.maxHeight', (maxHeight) => @element.style.maxHeight = if maxHeight > 0 then "#{maxHeight}px" else 'none' + @configSub = atom.config.observe 'tree-view-open-files.minHeight', (minHeight) => + @element.style.minHeight = if minHeight > 0 then "#{minHeight}px" else 'none' + addTabGroup: (pane) -> group = new TreeViewOpenFilesPaneView group.setPane pane diff --git a/lib/tree-view-open-files.coffee b/lib/tree-view-open-files.coffee index c31f2cb..6543f83 100644 --- a/lib/tree-view-open-files.coffee +++ b/lib/tree-view-open-files.coffee @@ -10,6 +10,11 @@ module.exports = default: 250 min: 0 description: 'Maximum height of the list before scrolling is required. Set to 0 to disable scrolling.' + minHeight: + type: 'integer' + default: 0 + min: 0 + description: 'Minimum height of the list. Set to 0 to disable scrolling.' activate: (state) -> requirePackages('tree-view').then ([treeView]) => From 1e48b3cf5ef76a5d602db3212fc80b6882f035c4 Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Vasile Date: Mon, 9 Jan 2017 04:35:09 +0200 Subject: [PATCH 02/12] Add Functionality MinHeight --- lib/tree-view-open-files-view.coffee | 4 ++-- package.json | 8 ++++---- styles/tree-view-open-files.less | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/tree-view-open-files-view.coffee b/lib/tree-view-open-files-view.coffee index 5757c5a..da64009 100644 --- a/lib/tree-view-open-files-view.coffee +++ b/lib/tree-view-open-files-view.coffee @@ -19,10 +19,10 @@ class TreeViewOpenFilesView @removeTabGroup pane @paneSub.add destroySub - @configSub = atom.config.observe 'tree-view-open-files.maxHeight', (maxHeight) => + @configSub = atom.config.observe 'tree-view-open-files-updated.maxHeight', (maxHeight) => @element.style.maxHeight = if maxHeight > 0 then "#{maxHeight}px" else 'none' - @configSub = atom.config.observe 'tree-view-open-files.minHeight', (minHeight) => + @configSub = atom.config.observe 'tree-view-open-files-updated.minHeight', (minHeight) => @element.style.minHeight = if minHeight > 0 then "#{minHeight}px" else 'none' addTabGroup: (pane) -> diff --git a/package.json b/package.json index e758d72..b51e362 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { - "name": "tree-view-open-files", + "name": "tree-view-open-files-updated", "main": "./lib/tree-view-open-files", - "version": "0.3.0", - "description": "Show open files in a list above the tree view.", - "repository": "https://github.com/postcasio/tree-view-open-files", + "version": "0.0.1", + "description": "Show open files in a list above the tree view. Added additional functions.", + "repository": "https://github.com/sergiu-gordienco/tree-view-open-files", "license": "MIT", "engines": { "atom": ">=1.1.0" diff --git a/styles/tree-view-open-files.less b/styles/tree-view-open-files.less index 1dc9199..c6bd907 100644 --- a/styles/tree-view-open-files.less +++ b/styles/tree-view-open-files.less @@ -1,6 +1,20 @@ @import "ui-variables"; .tree-view-open-files { + position: relative; + + &::after { + content: " "; + overflow: hidden; + height: 1px; + width: 100%; + background: rgba(128, 128, 128, 0.25); + + position: absolute; + bottom: 0; + left: 0; + } + > .list-tree { width: 100%; overflow: auto; From 64ed8f539cb93a6b349e2190ad1b1c2f368c423d Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Vasile Date: Mon, 9 Jan 2017 04:41:04 +0200 Subject: [PATCH 03/12] Add Functionality MinHeight --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b51e362..9d890f3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tree-view-open-files-updated", "main": "./lib/tree-view-open-files", - "version": "0.0.1", + "version": "0.4.0", "description": "Show open files in a list above the tree view. Added additional functions.", "repository": "https://github.com/sergiu-gordienco/tree-view-open-files", "license": "MIT", From d6612b3a62861a733fe59ca2d92702709b49d52f Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Vasile Date: Mon, 9 Jan 2017 04:41:28 +0200 Subject: [PATCH 04/12] Add Functionality MinHeight --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d890f3..7183bed 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tree-view-open-files-updated", "main": "./lib/tree-view-open-files", - "version": "0.4.0", + "version": "0.4.1", "description": "Show open files in a list above the tree view. Added additional functions.", "repository": "https://github.com/sergiu-gordienco/tree-view-open-files", "license": "MIT", From 705a107a292be225491065b232d7011ddaad5d96 Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Vasile Date: Mon, 9 Jan 2017 05:09:42 +0200 Subject: [PATCH 05/12] Organize styles --- styles/tree-view-open-files.less | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/styles/tree-view-open-files.less b/styles/tree-view-open-files.less index c6bd907..c684844 100644 --- a/styles/tree-view-open-files.less +++ b/styles/tree-view-open-files.less @@ -1,19 +1,20 @@ @import "ui-variables"; -.tree-view-open-files { - position: relative; +.tree-view-open-files::after { + content: " "; + overflow: hidden; + height: 1px; + width: 100%; + + background: rgba(128, 128, 128, 0.25); - &::after { - content: " "; - overflow: hidden; - height: 1px; - width: 100%; - background: rgba(128, 128, 128, 0.25); + position: absolute; + bottom: 0; + left: 0; +} - position: absolute; - bottom: 0; - left: 0; - } +.tree-view-open-files { + position: relative; > .list-tree { width: 100%; From dfc5720ce59b66a6e64c79e41bc8a427340220ef Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Vasile Date: Wed, 11 Jan 2017 18:23:13 +0200 Subject: [PATCH 06/12] Fix Styles --- styles/tree-view-open-files.less | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/styles/tree-view-open-files.less b/styles/tree-view-open-files.less index c684844..6bf96da 100644 --- a/styles/tree-view-open-files.less +++ b/styles/tree-view-open-files.less @@ -1,16 +1,7 @@ @import "ui-variables"; -.tree-view-open-files::after { - content: " "; - overflow: hidden; - height: 1px; - width: 100%; - - background: rgba(128, 128, 128, 0.25); - - position: absolute; - bottom: 0; - left: 0; +.tree-view-open-files { + border-bottom: 1px solid rgba(128, 128, 128, 0.25); } .tree-view-open-files { From b60fd402767f58e4116ef5579cdae6a092bb10b3 Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Vasile Date: Wed, 11 Jan 2017 18:24:13 +0200 Subject: [PATCH 07/12] update version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7183bed..b1e78a5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tree-view-open-files-updated", "main": "./lib/tree-view-open-files", - "version": "0.4.1", + "version": "0.4.2", "description": "Show open files in a list above the tree view. Added additional functions.", "repository": "https://github.com/sergiu-gordienco/tree-view-open-files", "license": "MIT", From e91fb44efc22f1d6bfeaab9f0d42b466dd5614ae Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Vasile Date: Wed, 11 Jan 2017 18:26:08 +0200 Subject: [PATCH 08/12] Update License --- LICENSE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LICENSE.md b/LICENSE.md index eaeeafe..01d3a76 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,3 +1,5 @@ +Updated version: Copyright (c) 2016 Gordienco Sergiu + Copyright (c) 2014 Dominic Adelaar Permission is hereby granted, free of charge, to any person obtaining From 2828488577555957c91cf06a9bdc449b1d036aac Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Date: Tue, 1 Aug 2017 09:38:16 +0300 Subject: [PATCH 09/12] Fix issues in atom 1.18.0 --- CHANGELOG.md | 4 ++++ lib/tree-view-open-files-pane-view.coffee | 3 +++ lib/tree-view-open-files-view.coffee | 10 ++++++---- package.json | 2 +- styles/tree-view-open-files.less | 7 +++++++ 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b6421c..39d4741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.0 +* Add support for atom 1.18.0 + + ## 0.2.3 * Show modified status diff --git a/lib/tree-view-open-files-pane-view.coffee b/lib/tree-view-open-files-pane-view.coffee index 39d0dda..ce55d87 100644 --- a/lib/tree-view-open-files-pane-view.coffee +++ b/lib/tree-view-open-files-pane-view.coffee @@ -40,6 +40,9 @@ class TreeViewOpenFilesPaneView @pane = pane @paneSub.add pane.observeItems (item) => + if !item.getPath?() + return + @container.parentElement.parentElement.setAttribute("data-is-pane-active", "true") listItem = document.createElement('li') listItem.classList.add('file', 'list-item') listItem.setAttribute('is', 'tree-view-file') diff --git a/lib/tree-view-open-files-view.coffee b/lib/tree-view-open-files-view.coffee index da64009..5cdcc77 100644 --- a/lib/tree-view-open-files-view.coffee +++ b/lib/tree-view-open-files-view.coffee @@ -53,9 +53,11 @@ class TreeViewOpenFilesView @show() hide: -> - @element.remove() - + # @element.remove() + Array::slice.call(treeView.treeView.list.parentElement.querySelector('.tree-view-open-files')).forEach (node) -> + node.parentElement.removeChild node + return 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.find('.tree-view-scroller').css 'background', treeView.treeView.find('.tree-view').css 'background' + treeView.treeView.list.parentElement.insertBefore @element , treeView.treeView.list diff --git a/package.json b/package.json index b1e78a5..d6cf3f5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tree-view-open-files-updated", "main": "./lib/tree-view-open-files", - "version": "0.4.2", + "version": "0.5.0", "description": "Show open files in a list above the tree view. Added additional functions.", "repository": "https://github.com/sergiu-gordienco/tree-view-open-files", "license": "MIT", diff --git a/styles/tree-view-open-files.less b/styles/tree-view-open-files.less index 6bf96da..7e0cae2 100644 --- a/styles/tree-view-open-files.less +++ b/styles/tree-view-open-files.less @@ -3,6 +3,13 @@ .tree-view-open-files { border-bottom: 1px solid rgba(128, 128, 128, 0.25); } +.tree-view-open-files > ul { + display: none; +} + +.tree-view-open-files > ul[data-is-pane-active="true"] { + display: block; +} .tree-view-open-files { position: relative; From db364a6f2f0730ac42671e928c05468d60fb2c9f Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Date: Tue, 1 Aug 2017 09:45:29 +0300 Subject: [PATCH 10/12] Prepare 1.0.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d6cf3f5..7b1fd1b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tree-view-open-files-updated", "main": "./lib/tree-view-open-files", - "version": "0.5.0", + "version": "1.0.0", "description": "Show open files in a list above the tree view. Added additional functions.", "repository": "https://github.com/sergiu-gordienco/tree-view-open-files", "license": "MIT", From 2e6da7e39e9d8d97c85f7369ac457bea8f662337 Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Date: Tue, 12 Sep 2017 01:22:29 +0300 Subject: [PATCH 11/12] Add Panel with opened files as fixed --- lib/tree-view-open-files-view.coffee | 21 +++++++++++++++++++++ styles/tree-view-open-files.less | 5 +++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/tree-view-open-files-view.coffee b/lib/tree-view-open-files-view.coffee index 5cdcc77..e665507 100644 --- a/lib/tree-view-open-files-view.coffee +++ b/lib/tree-view-open-files-view.coffee @@ -9,7 +9,26 @@ class TreeViewOpenFilesView constructor: (serializeState) -> # Create root element @element = document.createElement('div') + @elementHolder = document.createElement('div') @element.classList.add('tree-view-open-files') + @element.classList.add('tree-view') + @elementHolder.classList.add('tree-view-open-files-holder') + element = @element + elementHolder = @elementHolder + + f = -> + if !elementHolder.parentElement and element.parentElement + element.parentElement.insertBefore elementHolder, element + elementHolder.style.height = element.innerHeight + "px" + s = elementHolder.getBoundingClientRect() + if s + element.style.width = s.width + 'px' + if elementHolder.parentElement + element.style.top = elementHolder.parentElement.getBoundingClientRect().top + 'px' + element.style.left = s.left + 'px' + return + + setInterval f, 100 @groups = [] @paneSub = new CompositeDisposable @paneSub.add atom.workspace.observePanes (pane) => @@ -21,9 +40,11 @@ class TreeViewOpenFilesView @configSub = atom.config.observe 'tree-view-open-files-updated.maxHeight', (maxHeight) => @element.style.maxHeight = if maxHeight > 0 then "#{maxHeight}px" else 'none' + @elementHolder.style.maxHeight = if maxHeight > 0 then "#{maxHeight}px" else 'none' @configSub = atom.config.observe 'tree-view-open-files-updated.minHeight', (minHeight) => @element.style.minHeight = if minHeight > 0 then "#{minHeight}px" else 'none' + @elementHolder.style.minHeight = if minHeight > 0 then "#{minHeight}px" else 'none' addTabGroup: (pane) -> group = new TreeViewOpenFilesPaneView diff --git a/styles/tree-view-open-files.less b/styles/tree-view-open-files.less index 7e0cae2..5183f88 100644 --- a/styles/tree-view-open-files.less +++ b/styles/tree-view-open-files.less @@ -12,7 +12,8 @@ } .tree-view-open-files { - position: relative; + position: fixed; + top: 20px; > .list-tree { width: 100%; @@ -24,8 +25,8 @@ overflow: auto; flex: 0 0 1; - position: relative; order: 0; + z-index: 2; .close-open-file { background: none; From 223e7c9a2bf577eb2dba1bc7be7e7e20fee3e4fa Mon Sep 17 00:00:00 2001 From: Sergiu Gordienco Date: Tue, 12 Sep 2017 01:22:56 +0300 Subject: [PATCH 12/12] Prepare 1.1.0 release --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7b1fd1b..1019c29 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tree-view-open-files-updated", "main": "./lib/tree-view-open-files", - "version": "1.0.0", + "version": "1.1.0", "description": "Show open files in a list above the tree view. Added additional functions.", "repository": "https://github.com/sergiu-gordienco/tree-view-open-files", "license": "MIT",