|
|
@ -437,7 +437,11 @@ define([
|
|
|
|
}, 500);
|
|
|
|
}, 500);
|
|
|
|
socket.onClose.push(function () {
|
|
|
|
socket.onClose.push(function () {
|
|
|
|
clearTimeout(to);
|
|
|
|
clearTimeout(to);
|
|
|
|
|
|
|
|
if (toolbar && typeof toolbar.remove === 'function') {
|
|
|
|
toolbar.remove();
|
|
|
|
toolbar.remove();
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
warn("toolbar.remove is not a function"); //why not?
|
|
|
|
|
|
|
|
}
|
|
|
|
setAutosaveHiddenState(false);
|
|
|
|
setAutosaveHiddenState(false);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
@ -752,6 +756,12 @@ define([
|
|
|
|
//error(false, "userDocBeforePatch != textAreaVal");
|
|
|
|
//error(false, "userDocBeforePatch != textAreaVal");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
var op = attempt(Otaml.makeTextOperation)(userDocBeforePatch, realtime.getUserDoc());
|
|
|
|
var op = attempt(Otaml.makeTextOperation)(userDocBeforePatch, realtime.getUserDoc());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (typeof op === 'undefined') {
|
|
|
|
|
|
|
|
warn("TypeError: op is undefined");
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var oldValue = textAreaVal;
|
|
|
|
var oldValue = textAreaVal;
|
|
|
|
var newValue = realtime.getUserDoc();
|
|
|
|
var newValue = realtime.getUserDoc();
|
|
|
|
// Fix cursor and/or selection
|
|
|
|
// Fix cursor and/or selection
|
|
|
@ -825,7 +835,11 @@ define([
|
|
|
|
}, 500);
|
|
|
|
}, 500);
|
|
|
|
socket.onClose.push(function () {
|
|
|
|
socket.onClose.push(function () {
|
|
|
|
clearTimeout(to);
|
|
|
|
clearTimeout(to);
|
|
|
|
|
|
|
|
if (toolbar && typeof toolbar.remove === 'function') {
|
|
|
|
toolbar.remove();
|
|
|
|
toolbar.remove();
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
warn("toolbar.remove is not a function"); //why not?
|
|
|
|
|
|
|
|
}
|
|
|
|
setAutosaveHiddenState(false);
|
|
|
|
setAutosaveHiddenState(false);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
socket.onEvent = function(){
|
|
|
|
socket.onEvent = function(){
|
|
|
|