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

Fix issue with lazy loading and PR view (#435)

This commit is contained in:
Will Simons 2017-09-01 12:57:58 -07:00 committed by Buu Nguyen
parent 56948ba9a3
commit 63f57adead
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/view.tree.js
View File

@ -23,7 +23,9 @@ class TreeView {
$jstree.settings.core.data = (node, cb) => { $jstree.settings.core.data = (node, cb) => {
const loadAll = this.adapter.canLoadEntireTree() && const loadAll = this.adapter.canLoadEntireTree() &&
this.store.get(STORE.LOADALL) this.store.get(STORE.LOADALL)
node = !loadAll && (node.id === '#' ? {path: ''} : node.original) // No lazy loading in PR tree view
const isPR = this.store.get(STORE.PR) && repo.pullNumber
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) {
@ -31,7 +33,7 @@ class TreeView {
} }
else { else {
treeData = this._sort(treeData) treeData = this._sort(treeData)
if (loadAll) { if (loadAll || isPR) {
treeData = this._collapse(treeData) treeData = this._collapse(treeData)
} }
cb(treeData) cb(treeData)