wassname/HackFlowy
1
0
Fork 0
mirror of https://github.com/wassname/HackFlowy.git synced 2026-09-09 11:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Semi-Naive Real-Time-Editing Works (as far as I can tell). Todos= CursorLogic+AuthorSync

Browse Source
This commit is contained in:
Curtis SerVaas
2014-10-10 07:52:04 -04:00
parent b9f0448db7
commit 6c2fefb1ad
5 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/backbone/router.js
+13 -6
View File
@@ -100,9 +100,13 @@ var that = this;
socket.emitWrapper = function(eventName, data){
console.log(this);
if(this.socket.connected){
var oldTime = CURRENT_TIMESTAMP;
CURRENT_TIMESTAMP = Date.now();
this.emit(eventName, data, [CURRENT_TIMESTAMP, oldTime]);
if(eventName=="newNode" || eventName=="movedNode" || eventName=="removeNode"){
var oldTime = CURRENT_TIMESTAMP;
CURRENT_TIMESTAMP = Date.now();
this.emit(eventName, data, [CURRENT_TIMESTAMP, oldTime]);
return;
}
this.emit(eventName, data);
}
else{ //(alert + lock)
alert("Internet connection down. Edits not synced. Refresh when back online.");
@@ -190,11 +194,12 @@ socket.on("updateReceived", function(data){
parentModel.get("children")[newIndex] = instance._id;
})
socket.on("newNode", function(data){
socket.on("newNode", function(data, newTime){
//need the instance + the index.
var modelJson = data[1]; //(includes the negative ID to find later);
var parId = data[0][0];
var newIndex = data[0][1];
CURRENT_TIMESTAMP = newTime;
var newNode = new NodeModel(modelJson);
nodesCollection.add(newNode);
@@ -234,8 +239,9 @@ socket.on("blurred", function(data){
});
});
socket.on("removeNode", function(data){
socket.on("removeNode", function(data, newTime){
var tempVo = {}; //PROTECTING STATE!!
CURRENT_TIMESTAMP = newTime;
// tempVo.author = data[3]; //(actually, unnecessary...)
tempVo.thisId = data[0];
@@ -248,7 +254,8 @@ socket.on("removeNode", function(data){
removeNode(tempVo, true); //true means came from broadcast.
});
socket.on("movedNode", function(data){
socket.on("movedNode", function(data, newTime){
CURRENT_TIMESTAMP = newTime;
var ids = data[0];
var indices = data[1];
var author = data[2];
public/js/libs/myLogic/addNode.js
+8 -1
View File
@@ -1,5 +1,12 @@
var guidGenerator = function() {
var S4 = function() {
return (((1+Math.random())*0x10000)|0).toString(16).substring(1);
};
return (S4()+S4()+"-"+S4()+"-"+S4()+"-"+S4()+"-"+S4()+S4()+S4());
}
addNode = function(botStr, topStr){
var randomId = ( -1 * Math.floor( Math.random() * 100000000) )
var randomId = guidGenerator();
var modelJSON = {
_id: randomId
, text: botStr