prototype a vdom-based markdown editor
avoid unnecessary redraws. discover a bug, apparently vdom replaces all child elements after an element which was modified. As such, changing b in [a, b, c, d] causes b, c, and d to be redrawn. This is undesirable.pull/1/head
ansuz
9 years ago
parent
d14e42fedd
commit
aa6bbabc62
@ -0,0 +1,40 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
|
||||
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
|
||||
<style>
|
||||
*{
|
||||
padding: 0px;
|
||||
margin: 0px;
|
||||
}
|
||||
|
||||
.half {
|
||||
position: fixed;
|
||||
box-sizing: border-box;
|
||||
border: 1px solid blue;
|
||||
width: 50vw;
|
||||
height: 100vh;
|
||||
font-size: 15px;
|
||||
background-color: #222;
|
||||
color: #CCC;
|
||||
top: 0px;
|
||||
}
|
||||
|
||||
textarea{
|
||||
left: 0px;
|
||||
}
|
||||
#target {
|
||||
right: 0px;
|
||||
overflow: scroll;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<textarea class="half"></textarea>
|
||||
<div id="target" class="half">
|
||||
<div id="inner"></div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -0,0 +1,84 @@
|
||||
define([
|
||||
'/api/config?cb=' + Math.random().toString(16).substring(2),
|
||||
'/common/realtime-input.js',
|
||||
'/common/messages.js',
|
||||
'/common/crypto.js',
|
||||
'/common/marked.js',
|
||||
'/common/convert.js',
|
||||
'/bower_components/jquery/dist/jquery.min.js',
|
||||
'/customize/pad.js'
|
||||
], function (Config, Realtime, Messages, Crypto, Marked, Convert) {
|
||||
var $ = jQuery;
|
||||
|
||||
var Vdom = Convert.core.vdom,
|
||||
Hyperjson = Convert.core.hyperjson,
|
||||
Hyperscript = Convert.core.hyperscript;
|
||||
|
||||
$(window).on('hashchange', function() {
|
||||
window.location.reload();
|
||||
});
|
||||
if (window.location.href.indexOf('#') === -1) {
|
||||
window.location.href = window.location.href + '#' + Crypto.genKey();
|
||||
return;
|
||||
}
|
||||
|
||||
var key = Crypto.parseKey(window.location.hash.substring(1));
|
||||
|
||||
var $textarea = $('textarea'),
|
||||
$target = $('#target');
|
||||
|
||||
/*
|
||||
var draw = function (content) {
|
||||
// draw stuff
|
||||
$target.html(Marked(content));
|
||||
}; */
|
||||
|
||||
window.draw = (function () {
|
||||
var target = $target[0],
|
||||
inner = $target.find('#inner')[0];
|
||||
|
||||
if (!target) { throw new Error(); }
|
||||
|
||||
var Previous = Convert.dom.to.vdom(inner);
|
||||
return function (md) {
|
||||
var rendered = Marked(md);
|
||||
|
||||
// make a dom
|
||||
var R = $('<div id="inner">'+rendered+'</div>')[0];
|
||||
|
||||
var New = Convert.dom.to.vdom(R);
|
||||
|
||||
var patches = Vdom.diff(Previous, New);
|
||||
|
||||
Vdom.patch(inner, patches);
|
||||
|
||||
Previous = New;
|
||||
};
|
||||
}());
|
||||
|
||||
var redrawTimeout;
|
||||
|
||||
var rts = $textarea.toArray().map(function (e, i) {
|
||||
var rt = Realtime.start(e, // window
|
||||
Config.websocketURL, // websocketUrl
|
||||
Crypto.rand64(8), // userName
|
||||
key.channel, // channel
|
||||
key.cryptKey,
|
||||
null,
|
||||
function (){
|
||||
redrawTimeout && clearTimeout(redrawTimeout);
|
||||
setTimeout(function () {
|
||||
draw($textarea.val());
|
||||
}, 500);
|
||||
}); // cryptKey
|
||||
return rt;
|
||||
})[0];
|
||||
|
||||
//rts.onEvent
|
||||
window.rts = rts;
|
||||
|
||||
$textarea.on('change keyup keydown', function () {
|
||||
//console.log("pewpew");
|
||||
draw($textarea.val());
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,281 @@
|
||||
/*
|
||||
* Copyright 2014 XWiki SAS
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
define([
|
||||
'/common/messages.js',
|
||||
'/bower_components/reconnectingWebsocket/reconnecting-websocket.js',
|
||||
'/common/crypto.js',
|
||||
'/common/toolbar.js',
|
||||
'/common/sharejs_textarea.js',
|
||||
'/common/chainpad.js',
|
||||
'/bower_components/jquery/dist/jquery.min.js',
|
||||
], function (Messages, ReconnectingWebSocket, Crypto, Toolbar, sharejs) {
|
||||
var $ = window.jQuery;
|
||||
var ChainPad = window.ChainPad;
|
||||
var PARANOIA = true;
|
||||
var module = { exports: {} };
|
||||
|
||||
/**
|
||||
* If an error is encountered but it is recoverable, do not immediately fail
|
||||
* but if it keeps firing errors over and over, do fail.
|
||||
*/
|
||||
var MAX_RECOVERABLE_ERRORS = 15;
|
||||
|
||||
/** Maximum number of milliseconds of lag before we fail the connection. */
|
||||
var MAX_LAG_BEFORE_DISCONNECT = 20000;
|
||||
|
||||
var debug = function (x) { console.log(x); },
|
||||
warn = function (x) { console.error(x); },
|
||||
verbose = function (x) { /*console.log(x);*/ };
|
||||
|
||||
// ------------------ Trapping Keyboard Events ---------------------- //
|
||||
|
||||
var bindEvents = function (element, events, callback, unbind) {
|
||||
for (var i = 0; i < events.length; i++) {
|
||||
var e = events[i];
|
||||
if (element.addEventListener) {
|
||||
if (unbind) {
|
||||
element.removeEventListener(e, callback, false);
|
||||
} else {
|
||||
element.addEventListener(e, callback, false);
|
||||
}
|
||||
} else {
|
||||
if (unbind) {
|
||||
element.detachEvent('on' + e, callback);
|
||||
} else {
|
||||
element.attachEvent('on' + e, callback);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
var bindAllEvents = function (textarea, docBody, onEvent, unbind)
|
||||
{
|
||||
// FIXME why docBody?
|
||||
|
||||
docBody && bindEvents(docBody,
|
||||
['textInput', 'keydown', 'keyup', 'select', 'cut', 'paste'],
|
||||
onEvent,
|
||||
unbind);
|
||||
bindEvents(textarea,
|
||||
['mousedown','mouseup','click','change'],
|
||||
onEvent,
|
||||
unbind);
|
||||
};
|
||||
|
||||
var isSocketDisconnected = function (socket, realtime) {
|
||||
var sock = socket._socket;
|
||||
return sock.readyState === sock.CLOSING
|
||||
|| sock.readyState === sock.CLOSED
|
||||
|| (realtime.getLag().waiting && realtime.getLag().lag > MAX_LAG_BEFORE_DISCONNECT);
|
||||
};
|
||||
|
||||
// this differs from other functions with similar names in that
|
||||
// you are expected to pass a socket into it.
|
||||
var checkSocket = function (socket) {
|
||||
if (isSocketDisconnected(socket, socket.realtime) &&
|
||||
!socket.intentionallyClosing) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
var abort = function (socket, realtime) {
|
||||
realtime.abort();
|
||||
try { socket._socket.close(); } catch (e) { warn(e); }
|
||||
};
|
||||
|
||||
var handleError = function (socket, realtime, err, docHTML, allMessages) {
|
||||
// var internalError = createDebugInfo(err, realtime, docHTML, allMessages);
|
||||
abort(socket, realtime);
|
||||
};
|
||||
|
||||
var makeWebsocket = function (url) {
|
||||
var socket = new ReconnectingWebSocket(url);
|
||||
var out = {
|
||||
onOpen: [],
|
||||
onClose: [],
|
||||
onError: [],
|
||||
onMessage: [],
|
||||
send: function (msg) { socket.send(msg); },
|
||||
close: function () { socket.close(); },
|
||||
_socket: socket
|
||||
};
|
||||
var mkHandler = function (name) {
|
||||
return function (evt) {
|
||||
for (var i = 0; i < out[name].length; i++) {
|
||||
if (out[name][i](evt) === false) {
|
||||
console.log(name +"Handler");
|
||||
return;
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
socket.onopen = mkHandler('onOpen');
|
||||
socket.onclose = mkHandler('onClose');
|
||||
socket.onerror = mkHandler('onError');
|
||||
socket.onmessage = mkHandler('onMessage');
|
||||
return out;
|
||||
};
|
||||
|
||||
var start = module.exports.start =
|
||||
function (textarea, websocketUrl, userName, channel, cryptKey, doc, onRemote)
|
||||
{
|
||||
var passwd = 'y';
|
||||
|
||||
console.log({
|
||||
textarea: textarea,
|
||||
websocketUrl: websocketUrl,
|
||||
userName: userName,
|
||||
channel: channel,
|
||||
cryptKey: cryptKey
|
||||
});
|
||||
|
||||
var socket = makeWebsocket(websocketUrl);
|
||||
// define this in case it gets called before the rest of our stuff is ready.
|
||||
var onEvent = function () { };
|
||||
|
||||
var allMessages = [];
|
||||
var isErrorState = false;
|
||||
var initializing = true;
|
||||
var recoverableErrorCount = 0;
|
||||
|
||||
var $textarea = $(textarea);
|
||||
|
||||
var bump = function () {};
|
||||
|
||||
socket.onOpen.push(function (evt) {
|
||||
if (!initializing) {
|
||||
console.log("Starting");
|
||||
socket.realtime.start();
|
||||
return;
|
||||
}
|
||||
|
||||
var realtime = socket.realtime = ChainPad.create(userName,
|
||||
passwd,
|
||||
channel,
|
||||
$(textarea).val());
|
||||
|
||||
onEvent = function () {
|
||||
if (isErrorState || initializing) { return; }
|
||||
/* var currentDoc = $textarea.val();
|
||||
if (currentDoc !== realtime.getUserDoc()) { warn("currentDoc !== realtime.getUserDoc()"); } */
|
||||
};
|
||||
|
||||
realtime.onUserListChange(function (userList) {
|
||||
if (!initializing || userList.indexOf(userName) === -1) { return; }
|
||||
// if we spot ourselves being added to the document, we'll switch
|
||||
// 'initializing' off because it means we're fully synced.
|
||||
|
||||
// we should only see this happen once
|
||||
initializing = false;
|
||||
debug("Userlist: ["+userList.join(",")+"]");
|
||||
});
|
||||
|
||||
var whoami = new RegExp(userName.replace(/./, function (c) {
|
||||
return '\\' +c;
|
||||
}));
|
||||
|
||||
// when you receive a message...
|
||||
socket.onMessage.push(function (evt) {
|
||||
verbose(evt.data);
|
||||
if (isErrorState) { return; }
|
||||
|
||||
//console.log(evt);
|
||||
var message = Crypto.decrypt(evt.data, cryptKey);
|
||||
verbose(message);
|
||||
allMessages.push(message);
|
||||
if (!initializing) {
|
||||
if (PARANOIA) {
|
||||
onEvent();
|
||||
}
|
||||
}
|
||||
realtime.message(message);
|
||||
if (/\[5,/.test(message)) { verbose("pong"); }
|
||||
if (/\[2,/.test(message)) {
|
||||
verbose("Got a patch");
|
||||
if (whoami.test(message)) {
|
||||
verbose("Received own message");
|
||||
} else {
|
||||
onRemote && onRemote(realtime.getAuthDoc());
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// when a message is ready to send
|
||||
realtime.onMessage(function (message) {
|
||||
if (isErrorState) { return; }
|
||||
message = Crypto.encrypt(message, cryptKey);
|
||||
try {
|
||||
socket.send(message);
|
||||
} catch (e) {
|
||||
warn(e);
|
||||
}
|
||||
});
|
||||
|
||||
// actual socket bindings
|
||||
socket.onmessage = function (evt) {
|
||||
for (var i = 0; i < socket.onMessage.length; i++) {
|
||||
if (socket.onMessage[i](evt) === false) { return; }
|
||||
}
|
||||
};
|
||||
socket.onclose = function (evt) {
|
||||
for (var i = 0; i < socket.onMessage.length; i++) {
|
||||
if (socket.onClose[i](evt) === false) { return; }
|
||||
}
|
||||
};
|
||||
|
||||
socket.onerror = warn;
|
||||
|
||||
debug('started');
|
||||
|
||||
var socketChecker = setInterval(function () {
|
||||
if (checkSocket(socket)) {
|
||||
warn("Socket disconnected!");
|
||||
$textarea.attr('disabled', true);
|
||||
|
||||
recoverableErrorCount += 1;
|
||||
|
||||
if (recoverableErrorCount >= MAX_RECOVERABLE_ERRORS) {
|
||||
warn("Giving up!");
|
||||
abort(socket, realtime);
|
||||
socketChecker && clearInterval(socketChecker);
|
||||
}
|
||||
} else {
|
||||
$textarea.attr('disabled', false);
|
||||
}
|
||||
},200);
|
||||
|
||||
bindAllEvents(textarea, doc, onEvent, false)
|
||||
|
||||
// attach textarea?
|
||||
sharejs.attach(textarea, realtime);
|
||||
|
||||
realtime.start();
|
||||
|
||||
// this has three names :|
|
||||
bump = realtime.bumpSharejs;
|
||||
});
|
||||
return {
|
||||
onEvent: function () {
|
||||
onEvent();
|
||||
},
|
||||
bumpSharejs: function () { bump(); }
|
||||
};
|
||||
};
|
||||
return module.exports;
|
||||
});
|
||||
Loading…
Reference in New Issue