Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect

This commit is contained in:
ansuz committed 2016-02-12 10:24:11 +01:00
commit 7f92abc7bf
4 files changed
+30 -25

No files matched your search

+3 -3
View File
@@ -230,8 +230,8 @@ define([
//verbose("Received own message");
} else {
//verbose("Received remote message");
// obviously this is only going to get called if
onRemote && onRemote(realtime.getAuthDoc());
// obviously this is only going to get called if
onRemote && onRemote(realtime.getUserDoc());
}
}
}
@@ -290,7 +290,7 @@ define([
});
return {
onEvent: function () {
onEvent();
onEvent();
},
bumpSharejs: function () { bump(); }
};