merging master

This commit is contained in:
Mark Nadal 2015-01-22 05:23:35 -07:00
commit 9d8f044f7c
2 changed files with 3 additions and 3 deletions

View File

@ -125,9 +125,8 @@ And we do not think that attitude will generate any progress for people.
Instead, we want to make everyone an expert by actually getting really good at explaining the concepts.
So join our community, in the quest of learning cool things and helping yourself and others build awesome technology.
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/amark/gun?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Google Group: https://groups.google.com/forum/#!forum/g-u-n
- [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/amark/gun?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) (all chats relating to GUN and development should be here! IRC style)
- Google Group: https://groups.google.com/forum/#!forum/g-u-n (for slower threaded discussions)
## Ahead
- ~~Realtime push to the browser~~

View File

@ -110,6 +110,7 @@
//console.log("transport.loading key ->", key, gun.__.graph, gun.__.keys);
gun.load(key, function(err, node){
//tran.sub.scribe(req.tab, node._[Gun._.soul]);
// TODO: MAJOR BUG!!!! This is crashing server if the socket gets disconnected or something.
cb({headers: reply.headers, body: (err? (err.err? err : {err: err || "Unknown error."}) : node || null)});
});
}