unbuild for @mmalmi 's fix

This commit is contained in:
Mark Nadal 2018-12-20 18:18:40 -08:00
parent 6246704e11
commit a0e93717ae
5 changed files with 17 additions and 15 deletions

4
gun.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -61,13 +61,16 @@ function cache(key, back){
return at; return at;
} }
function soul(gun, cb, opt, as){ function soul(gun, cb, opt, as){
var cat = gun._, tmp; var cat = gun._, acks = 0, tmp;
if(tmp = cat.soul){ return cb(tmp, as, cat), gun } if(tmp = cat.soul){ return cb(tmp, as, cat), gun }
if(tmp = cat.link){ return cb(tmp, as, cat), gun } if(tmp = cat.link){ return cb(tmp, as, cat), gun }
gun.get(function(msg, ev){ // TODO: Bug! Needs once semantics? gun.get(function(msg, ev){
if(u === msg.put && (tmp = (obj_map(cat.root.opt.peers, function(v,k,t){t(k)})||[]).length) && acks++ <= tmp){
return;
}
ev.rid(msg); ev.rid(msg);
var at = ((at = msg.$) && at._) || {}; var at = ((at = msg.$) && at._) || {};
tmp = at.link || at.soul || rel.is(msg.put) || node_soul(msg.put); tmp = at.link || at.soul || rel.is(msg.put) || node_soul(msg.put) || at.dub;
cb(tmp, as, msg, ev); cb(tmp, as, msg, ev);
}, {out: {get: {'.':true}}}); }, {out: {get: {'.':true}}});
return gun; return gun;
@ -118,7 +121,7 @@ function rid(at){
//obj.del(map, at); // TODO: Warning: This unsubscribes ALL of this chain's listeners from this link, not just the one callback event. //obj.del(map, at); // TODO: Warning: This unsubscribes ALL of this chain's listeners from this link, not just the one callback event.
return; return;
} }
var obj = Gun.obj, obj_has = obj.has, obj_to = Gun.obj.to; var obj = Gun.obj, obj_map = obj.map, obj_has = obj.has, obj_to = Gun.obj.to;
var num_is = Gun.num.is; var num_is = Gun.num.is;
var rel = Gun.val.link, node_soul = Gun.node.soul, node_ = Gun.node._; var rel = Gun.val.link, node_soul = Gun.node.soul, node_ = Gun.node._;
var empty = {}, u; var empty = {}, u;

View File

@ -30,7 +30,7 @@ Gun.chain.put = function(data, cb, as){
}); });
return gun; return gun;
} }
as.$ = gun = root.get(as.soul); as.$ = root.get(as.soul);
as.ref = as.$; as.ref = as.$;
ify(as); ify(as);
return gun; return gun;
@ -185,8 +185,8 @@ function any(soul, as, msg, eve){
as.data = obj_put({}, at.get, as.data); as.data = obj_put({}, at.get, as.data);
}); });
} }
tmp = tmp || at.get; tmp = tmp || at.soul || at.link || at.dub;// || at.get;
at = (at.root.$.get(tmp)._); at = tmp? (at.root.$.get(tmp)._) : at;
as.soul = tmp; as.soul = tmp;
data = as.data; data = as.data;
} }

View File

@ -4,13 +4,12 @@ Gun.chain.set = function(item, cb, opt){
var gun = this, soul; var gun = this, soul;
cb = cb || function(){}; cb = cb || function(){};
opt = opt || {}; opt.item = opt.item || item; opt = opt || {}; opt.item = opt.item || item;
if(soul = Gun.node.soul(item)){ return gun.set(gun.back(-1).get(soul), cb, opt) } if(soul = Gun.node.soul(item)){ item = Gun.obj.put({}, soul, Gun.val.link.ify(soul)) }
if(!Gun.is(item)){ if(!Gun.is(item)){
var id = gun.back('opt.uuid')(); if(Gun.obj.is(item)){;
if(id && Gun.obj.is(item)){ item = gun.back(-1).get(soul = soul || Gun.node.soul(item) || gun.back('opt.uuid')()).put(item);
return gun.set(gun._.root.$.put(item, id), cb, opt);
} }
return gun.get((Gun.state.lex() + Gun.text.random(7))).put(item, cb, opt); return gun.get(soul || (Gun.state.lex() + Gun.text.random(7))).put(item, cb, opt);
} }
item.get(function(soul, o, msg){ item.get(function(soul, o, msg){
if(!soul){ return cb.call(gun, {err: Gun.log('Only a node can be linked! Not "' + msg.put + '"!')}) } if(!soul){ return cb.call(gun, {err: Gun.log('Only a node can be linked! Not "' + msg.put + '"!')}) }

View File

@ -42,7 +42,7 @@ State.ify = function(n, k, s, v, soul){ // put a key's state on a node.
return n; return n;
} }
State.to = function(from, k, to){ State.to = function(from, k, to){
var val = from[k]; // BUGGY! var val = (from||{})[k];
if(obj_is(val)){ if(obj_is(val)){
val = obj_copy(val); val = obj_copy(val);
} }