p71924506
/
GitCodeTree
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify previous fix

This commit is contained in:
Buu Nguyen 2017-09-01 13:27:29 -07:00
parent c0e271d1d5
commit 879a2bbd31
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/view.tree.js
View File

@ -21,11 +21,10 @@ class TreeView {
const $jstree = this.$jstree const $jstree = this.$jstree
$jstree.settings.core.data = (node, cb) => { $jstree.settings.core.data = (node, cb) => {
const loadAll = this.adapter.canLoadEntireTree() && const prMode = this.store.get(STORE.PR) && repo.pullNumber
this.store.get(STORE.LOADALL) const loadAll = this.adapter.canLoadEntireTree() && (prMode || this.store.get(STORE.LOADALL))
// No lazy loading in PR tree view
const isPR = this.store.get(STORE.PR) && repo.pullNumber node = !loadAll && (node.id === '#' ? {path: ''} : node.original)
node = !loadAll && !isPR && (node.id === '#' ? {path: ''} : node.original)
this.adapter.loadCodeTree({repo, token, node}, (err, treeData) => { this.adapter.loadCodeTree({repo, token, node}, (err, treeData) => {
if (err) { if (err) {
@ -33,7 +32,7 @@ class TreeView {
} }
else { else {
treeData = this._sort(treeData) treeData = this._sort(treeData)
if (loadAll || isPR) { if (loadAll) {
treeData = this._collapse(treeData) treeData = this._collapse(treeData)
} }
cb(treeData) cb(treeData)