Fix an issue with missing characters when several users were typing at the same time
This commit is contained in:
@@ -52,13 +52,6 @@ define([], function () {
|
|||||||
return x;
|
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){
|
var DOM2HyperJSON = function(el, predicate, filter){
|
||||||
if(!el.tagName && el.nodeType === Node.TEXT_NODE){
|
if(!el.tagName && el.nodeType === Node.TEXT_NODE){
|
||||||
return el.textContent;
|
return el.textContent;
|
||||||
|
|||||||
@@ -141,6 +141,11 @@ define([
|
|||||||
verbose(message);
|
verbose(message);
|
||||||
allMessages.push(message);
|
allMessages.push(message);
|
||||||
|
|
||||||
|
if (!initializing) {
|
||||||
|
if (toReturn.onLocal) {
|
||||||
|
toReturn.onLocal();
|
||||||
|
}
|
||||||
|
}
|
||||||
// pass the message into Chainpad
|
// pass the message into Chainpad
|
||||||
realtime.message(message);
|
realtime.message(message);
|
||||||
};
|
};
|
||||||
@@ -167,6 +172,7 @@ define([
|
|||||||
messagesHistory.push(decryptedMsg);
|
messagesHistory.push(decryptedMsg);
|
||||||
return decryptedMsg;
|
return decryptedMsg;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -283,8 +289,6 @@ define([
|
|||||||
Netflux.connect(websocketUrl).then(function(network) {
|
Netflux.connect(websocketUrl).then(function(network) {
|
||||||
// pass messages that come out of netflux into our local handler
|
// 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
|
network.on('message', function (msg, sender) { // Direct message
|
||||||
var wchan = findChannelById(network.webChannels, channel);
|
var wchan = findChannelById(network.webChannels, channel);
|
||||||
if(wchan) {
|
if(wchan) {
|
||||||
|
|||||||
Reference in New Issue
Block a user