diff --git a/gun.js b/gun.js index 141b747d..dc1fb76b 100644 --- a/gun.js +++ b/gun.js @@ -553,13 +553,21 @@ } } else { (ctx[$.soul] = function(delta, $$){ - $$ = $$ || $; var node = gun.__.graph[$$.soul]; - if(delta && $.soul != Gun.is.soul.on(delta)){ return } + $$ = $$ || $; var node = gun.__.graph[$$.soul], soul; + if(delta && $$.soul != Gun.is.soul.on(delta)){ return } + if($$.field && (soul = Gun.is.soul(node[$$.field]))){ + (ctx[$$.soul + $$.field] || {off:function(){}}).off(); + ctx[$$.soul + $$.field] = gun.__.on(soul).event(function(delta){ + ctx[$.soul](delta, {soul: soul, field: null, at: $.field}); + }); + // TODO: do we need to load it? what about that $.gun context? + return; + } + if(opt.raw){ return cb.call($$.gun || gun, $$, delta, this) } if(!opt.end && Gun.obj.empty(delta, Gun._.meta)){ return } if($$.key){ node = Gun.union.pseudo($.key, gun.__.key.s[$.key]) || node } if(opt.change){ node = delta || node } - //root.console.log("ON IT BABY!", $$, node); cb.call($$.gun || gun, Gun.obj.copy($$.field? node[$$.field] : node), $$.field || $$.at); })(gun.__.graph[$.soul], $); if(!opt.once){ gun.__.on($.soul).event(ctx[$.soul]) } diff --git a/test/common.js b/test/common.js index 16e177d1..e004705f 100644 --- a/test/common.js +++ b/test/common.js @@ -1838,14 +1838,24 @@ describe('Gun', function(){ }); it("gun put null path on put sub object", function(done){ // consensus4's bug + done.c = 1; var gun = Gun(); //Gun.log.verbose = true; var game = gun.put({board: null, teamA: null, teamB: null, turn: null}).key('the/game'); - game.path('board').on(function(board){ - console.log("board updated", board); + game.path('board').on(function(board, field){ + expect(field).to.be('board'); + if(done.c == 1){ + expect(board).to.not.be.ok(); + } + if(done.c === 2){ + done.c++; + delete board._; + expect(board).to.be.eql({11: ' ', 22: ' ', 33: 'A'}); + done(); + } }); setTimeout(function(){ - //game.path('board').put({11: ' ', 22: ' ', 33: 'A'}); + done.c++; game.put({board: {11: ' ', 22: ' ', 33: 'A'}}); },100); });