urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-14 20:02:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

actually fix EMPTY usage

Browse Source
This commit is contained in:
Anton Dyudin 2015-09-23 16:53:48 -07:00
parent b07f6fab02
commit cdad444127
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1693,8 +1693,10 @@ TreeStore = _.extend(EventEmitter.prototype, {
return this.fulfillAt(this.getTree(path.split('/')), path, query); return this.fulfillAt(this.getTree(path.split('/')), path, query);
}, },
fulfillAt: function(tree, path, query) { fulfillAt: function(tree, path, query) {
var data, k, ref, sub, t; var data, have, k, sub, t;
data = this.fulfillLocal(path, query); data = this.fulfillLocal(path, query);
have = _data[path];
if (have != null) {
for (k in query) { for (k in query) {
t = query[k]; t = query[k];
if (!QUERIES[k]) { if (!QUERIES[k]) {
@ -1703,15 +1705,16 @@ TreeStore = _.extend(EventEmitter.prototype, {
if (t !== QUERIES[k]) { if (t !== QUERIES[k]) {
throw TypeError("Wrong query type: " + k + ", '" + t + "'"); throw TypeError("Wrong query type: " + k + ", '" + t + "'");
} }
data[k] = (ref = _data[path]) != null ? ref[k] : void 0; data[k] = have[k];
} }
if (query.kids && !_data[path].EMPTY) { if (query.kids && !have.EMPTY) {
data.kids = {}; data.kids = {};
for (k in tree) { for (k in tree) {
sub = tree[k]; sub = tree[k];
data.kids[k] = this.fulfillAt(sub, path + "/" + k, query.kids); data.kids[k] = this.fulfillAt(sub, path + "/" + k, query.kids);
} }
} }
}
if (!_.isEmpty(data)) { if (!_.isEmpty(data)) {
return data; return data;
} }

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

@ -21,10 +21,12 @@ TreeStore = _.extend EventEmitter.prototype, {
fulfill: (path,query) -> @fulfillAt (@getTree path.split '/'),path,query fulfill: (path,query) -> @fulfillAt (@getTree path.split '/'),path,query
fulfillAt: (tree,path,query)-> fulfillAt: (tree,path,query)->
data = @fulfillLocal path, query data = @fulfillLocal path, query
have = _data[path]
if have?
for k,t of query when QUERIES[k] for k,t of query when QUERIES[k]
if t isnt QUERIES[k] then throw TypeError "Wrong query type: #{k}, '#{t}'" if t isnt QUERIES[k] then throw TypeError "Wrong query type: #{k}, '#{t}'"
data[k] = _data[path]?[k] data[k] = have[k]
if query.kids and not _data[path]?.EMPTY if query.kids and not have.EMPTY
data.kids = {} data.kids = {}
for k,sub of tree for k,sub of tree
data.kids[k] = @fulfillAt sub, path+"/"+k, query.kids data.kids[k] = @fulfillAt sub, path+"/"+k, query.kids