diff --git a/www/common/hyperjson.js b/www/common/hyperjson.js index 27bee7cee..ff04a0da9 100644 --- a/www/common/hyperjson.js +++ b/www/common/hyperjson.js @@ -52,13 +52,6 @@ define([], function () { return x; }; - /* DOM2HyperJSON accepts a DOM element/node - and converts it into Hyperjson. It optionally accepts a predicate - which is used for filtering out subtrees of the DOM from the result. - - The function, if provided, must return true for elements which - should be preserved, and 'false' for elements which should be removed. - */ var DOM2HyperJSON = function(el, predicate, filter){ if(!el.tagName && el.nodeType === Node.TEXT_NODE){ return el.textContent; diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js index 3fd00231d..437d5fb48 100644 --- a/www/common/realtime-input.js +++ b/www/common/realtime-input.js @@ -141,6 +141,11 @@ define([ verbose(message); allMessages.push(message); + if (!initializing) { + if (toReturn.onLocal) { + toReturn.onLocal(); + } + } // pass the message into Chainpad realtime.message(message); }; @@ -167,6 +172,7 @@ define([ messagesHistory.push(decryptedMsg); return decryptedMsg; } catch (err) { + console.error(err); return message; } @@ -283,8 +289,6 @@ define([ Netflux.connect(websocketUrl).then(function(network) { // pass messages that come out of netflux into our local handler - // TODO avoid calling findChannelById for each message - // but only if we can prove it won't introduce bugs network.on('message', function (msg, sender) { // Direct message var wchan = findChannelById(network.webChannels, channel); if(wchan) {