diff --git a/examples/chat/index.html b/examples/chat/index.html index b4bda974..ae1da662 100644 --- a/examples/chat/index.html +++ b/examples/chat/index.html @@ -1,3 +1,4 @@ +
- - + + \ No newline at end of file diff --git a/gun.js b/gun.js index d5ffb873..cffc126c 100644 --- a/gun.js +++ b/gun.js @@ -424,9 +424,9 @@ gun._.at('node').event(function($){ var node = gun.__.graph[$.soul]; - if($.field){ return cb.call(gun, node[$.field], $.field) } + if($.field){ return cb.call(gun, node[$.field], $.field || $.at) } if(!gun.__.flag.end[$.soul]){ return } - cb.call(gun, Gun.obj.copy(node)); + cb.call(gun, Gun.obj.copy(node), $.field || $.at); }); return gun; @@ -983,7 +983,7 @@ Gun.obj.map(gun.__.opt.peers, function(peer, url){ request(url, nodes, function(err, reply){ reply.body = reply.body || reply.chunk || reply.end || reply.write; - console.log("PUT success?", err, reply); + Gun.log("PUT success?", err, reply); if(err || !reply || (err = reply.body && reply.body.err)){ return cb({err: Gun.log(err || "Error: Put failed on " + url) }); } else { diff --git a/lib/file.js b/lib/file.js index a04103f5..b12c6cb8 100644 --- a/lib/file.js +++ b/lib/file.js @@ -6,7 +6,7 @@ var Gun = require('../gun'), file = {}; Gun.on('opt').event(function(gun, opts){ - if(opts.s3 && opts.s3.key){ return } // don't use this plugin if S3 is being used. + if(opts.file === false && opts.s3 && opts.s3.key){ return } // don't use this plugin if S3 is being used. opts.file = opts.file || 'data.json'; var fs = require('fs'); diff --git a/lib/wsp.js b/lib/wsp.js index 6d5d7460..e5db17ce 100644 --- a/lib/wsp.js +++ b/lib/wsp.js @@ -104,7 +104,6 @@ //console.log(req); if(req && req.url && Gun.obj.has(req.url.query, '*')){ return gun.all(req.url.key + req.url.search, function(err, list){ - console.log("reply all with", err, list); cb({headers: reply.headers, body: (err? (err.err? err : {err: err || "Unknown error."}) : list || null ) }) }); }