ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-11 16:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'anton/nobreach' into pending

Browse Source
This commit is contained in:
Philip C Monk 2015-09-23 19:34:56 -04:00
commit 172a80a610
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pub/tree/src/js/main.js
View File

@ -1705,7 +1705,7 @@ TreeStore = _.extend(EventEmitter.prototype, {
}
data[k] = (ref = _data[path]) != null ? ref[k] : void 0;
}
if (query.kids && !_data.EMPTY) {
if (query.kids && !_data[path].EMPTY) {
data.kids = {};
for (k in tree) {
sub = tree[k];
@ -1762,7 +1762,7 @@ TreeStore = _.extend(EventEmitter.prototype, {
this.loadValues(tree[k], path + "/" + k, v);
}
if (data.kids && _.isEmpty(data.kids)) {
_data.EMPTY = true;
old.EMPTY = true;
old.body = {
gn: 'div',
c: [

4
pub/tree/src/js/stores/TreeStore.coffee
View File

@ -24,7 +24,7 @@ TreeStore = _.extend EventEmitter.prototype, {
for k,t of query when QUERIES[k]
if t isnt QUERIES[k] then throw TypeError "Wrong query type: #{k}, '#{t}'"
data[k] = _data[path]?[k]
if query.kids and not _data.EMPTY
if query.kids and not _data[path].EMPTY
data.kids = {}
for k,sub of tree
data.kids[k] = @fulfillAt sub, path+"/"+k, query.kids
@ -54,7 +54,7 @@ TreeStore = _.extend EventEmitter.prototype, {
@loadValues tree[k], path+"/"+k, v
if data.kids && _.isEmpty data.kids
_data.EMPTY = true
old.EMPTY = true
old.body =
gn: 'div'
c: [ {gn:'h1', ga:{className:'error'}, c:['Error: Empty path']}