From deb2084fc5da975b1d571f26412bb351c39a42d6 Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Mon, 7 Mar 2016 12:00:45 +0100 Subject: [PATCH 001/257] Add the socket connection checker --- www/common/netflux.js | 35 +++++++++---------------- www/common/realtime-input.js | 51 ++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 47 deletions(-) diff --git a/www/common/netflux.js b/www/common/netflux.js index 1d0e9c809..6919a72cd 100644 --- a/www/common/netflux.js +++ b/www/common/netflux.js @@ -1025,12 +1025,6 @@ return /******/ (function(modules) { // webpackBootstrap this.protocol = _ServiceProvider2.default.get(cs.EXCHANGEPROTOCOL_SERVICE); this.defaults = { signaling: 'ws://localhost:9000', - /** - * If an error is encountered but it is recoverable, do not immediately fail - * but if it keeps firing errors over and over, do fail. - */ - recoverableErrorCount: 0, - MAX_RECOVERABLE_ERRORS: 15, // Maximum number of milliseconds of lag before we fail the connection. MAX_LAG_BEFORE_DISCONNECT: 20000 }; @@ -1040,6 +1034,8 @@ return /******/ (function(modules) { // webpackBootstrap _createClass(WebSocketService, [{ key: 'join', value: function join(key) { + var _this = this; + var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; var settings = Object.assign({}, this.settings, options); @@ -1051,24 +1047,19 @@ return /******/ (function(modules) { // webpackBootstrap resolve(socket); }; socket.onerror = reject; - }); - } - - // Check the status of the socket connection - /*var isSocketDisconnected = function (realtime) { - let sock = ws._socket; - return sock.readyState === sock.CLOSING - || sock.readyState === sock.CLOSED - || (realtime.getLag().waiting && realtime.getLag().lag > MAX_LAG_BEFORE_DISCONNECT); - } - var checkSocket = module.exports.checkSocket = function (realtime) { - if (isSocketDisconnected(realtime) && !socket.intentionallyClosing) { + // Check the status of the socket connection + var isSocketDisconnected = function isSocketDisconnected(realtime, sock) { + return sock.readyState === sock.CLOSING || sock.readyState === sock.CLOSED || realtime.getLag().waiting && realtime.getLag().lag > _this.settings.MAX_LAG_BEFORE_DISCONNECT; + }; + socket.checkSocket = function (realtime) { + if (isSocketDisconnected(realtime, socket) && !socket.intentionallyClosing) { return true; - } else { + } else { return false; - } - };*/ - + } + }; + }); + } }]); return WebSocketService; diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js index ecd19e015..08473e3f8 100644 --- a/www/common/realtime-input.js +++ b/www/common/realtime-input.js @@ -31,7 +31,7 @@ define([ var debug = function (x) { console.log(x); }, warn = function (x) { console.error(x); }, verbose = function (x) { console.log(x); }; - // verbose = function () {}; // comment out to enable verbose logging + verbose = function () {}; // comment out to enable verbose logging // ------------------ Trapping Keyboard Events ---------------------- // @@ -130,7 +130,7 @@ define([ }); // Check the connection to the channel - //checkConnection(wc); + checkConnection(wc); bindAllEvents(textarea, doc, onEvent, false); @@ -202,31 +202,32 @@ define([ } var checkConnection = function(wc) { - //TODO - /*var socketChecker = setInterval(function () { - if (netflux.checkSocket(realtime)) { - warn("Socket disconnected!"); - - recoverableErrorCount += 1; - - if (recoverableErrorCount >= MAX_RECOVERABLE_ERRORS) { - warn("Giving up!"); - realtime.abort(); - wc.leave() - .then(null, function(err) { - warn(err); - }); - if (config.onAbort) { - config.onAbort({ - socket: socket - }); + if(wc.channels && wc.channels.size > 0) { + var channels = Array.from(wc.channels); + var channel = channels[0]; + + var socketChecker = setInterval(function () { + if (channel.checkSocket(realtime)) { + warn("Socket disconnected!"); + + recoverableErrorCount += 1; + + if (recoverableErrorCount >= MAX_RECOVERABLE_ERRORS) { + warn("Giving up!"); + realtime.abort(); + try { channel.close(); } catch (e) { warn(e); } + if (config.onAbort) { + config.onAbort({ + socket: channel + }); + } + if (socketChecker) { clearInterval(socketChecker); } } - if (socketChecker) { clearInterval(socketChecker); } + } else { + // it's working as expected, continue } - } else { - // it's working as expected, continue - } - }, 200);*/ + }, 200); + } } return { From 60c3aceb0dc1a4887d92a9bde6bb3befc4b657f3 Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Mon, 7 Mar 2016 17:18:47 +0100 Subject: [PATCH 002/257] Add chatflux server --- www/common/netflux.js | 112 ++++++++++++++++------------------- www/common/realtime-input.js | 84 +++++++++++++++++++------- 2 files changed, 113 insertions(+), 83 deletions(-) diff --git a/www/common/netflux.js b/www/common/netflux.js index 6919a72cd..5764ffd7c 100644 --- a/www/common/netflux.js +++ b/www/common/netflux.js @@ -129,9 +129,6 @@ return /******/ (function(modules) { // webpackBootstrap webChannel.onopen = function () { resolve(webChannel); }; - if (settings.openWebChannel && settings.openWebChannel === true) { - webChannel.onopen(); - } }); }); } @@ -215,8 +212,6 @@ return /******/ (function(modules) { // webpackBootstrap this.protocol = cs.EXCHANGEPROTOCOL_SERVICE; // Public attributes - this.topology = this.settings.topology; - this.topologyService = _ServiceProvider2.default.get(this.topology); this.id; this.myID = this._generateID(); this.channels = new Set(); @@ -290,7 +285,7 @@ return /******/ (function(modules) { // webpackBootstrap this.topologyService = _ServiceProvider2.default.get(topologyServiceName); }, get: function get() { - return this.settings.topology; + return this.settigns.topology; } }]); @@ -619,7 +614,8 @@ return /******/ (function(modules) { // webpackBootstrap for (var _iterator = webChannel.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { var c = _step.value; - c.send(data); + var msg = JSON.stringify([c.seq++, data.type, webChannel.id, data.msg]); + c.send(msg); } } catch (err) { _didIteratorError = true; @@ -647,7 +643,8 @@ return /******/ (function(modules) { // webpackBootstrap for (var _iterator2 = webChannel.channels[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { var c = _step2.value; - c.send(data); + var msg = JSON.stringify([c.seq++, data.type, id, data.msg]); + c.send(msg); } } catch (err) { _didIteratorError2 = true; @@ -1024,9 +1021,7 @@ return /******/ (function(modules) { // webpackBootstrap this.NAME = this.constructor.name; this.protocol = _ServiceProvider2.default.get(cs.EXCHANGEPROTOCOL_SERVICE); this.defaults = { - signaling: 'ws://localhost:9000', - // Maximum number of milliseconds of lag before we fail the connection. - MAX_LAG_BEFORE_DISCONNECT: 20000 + signaling: 'ws://localhost:9000' }; this.settings = Object.assign({}, this.defaults, options); } @@ -1034,30 +1029,23 @@ return /******/ (function(modules) { // webpackBootstrap _createClass(WebSocketService, [{ key: 'join', value: function join(key) { - var _this = this; - var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; var settings = Object.assign({}, this.settings, options); return new Promise(function (resolve, reject) { var connection = undefined; var socket = new window.WebSocket(settings.signaling); + socket.seq = 1; socket.facade = options.facade || null; socket.onopen = function () { - resolve(socket); - }; - socket.onerror = reject; - // Check the status of the socket connection - var isSocketDisconnected = function isSocketDisconnected(realtime, sock) { - return sock.readyState === sock.CLOSING || sock.readyState === sock.CLOSED || realtime.getLag().waiting && realtime.getLag().lag > _this.settings.MAX_LAG_BEFORE_DISCONNECT; - }; - socket.checkSocket = function (realtime) { - if (isSocketDisconnected(realtime, socket) && !socket.intentionallyClosing) { - return true; + if (key && key !== '') { + socket.send(JSON.stringify([socket.seq++, 'JOIN', key])); } else { - return false; + socket.send(JSON.stringify([socket.seq++, 'JOIN'])); } + resolve(socket); }; + socket.onerror = reject; }); } }]); @@ -1202,18 +1190,13 @@ return /******/ (function(modules) { // webpackBootstrap _createClass(WebSocketProtocolService, [{ key: 'onmessage', value: function onmessage(e) { - var msg = e.data; + var msg = JSON.parse(e.data); var socket = e.currentTarget; var webChannel = socket.webChannel; var topology = cs.STAR_SERVICE; - webChannel.topology = topology; - webChannel.topologyService = _ServiceProvider2.default.get(topology); - webChannel.onMessage('', msg); - - /* - let topology = cs.STAR_SERVICE - let topologyService = ServiceProvider.get(topology) - if (msg[0] !== 0) { + var topologyService = _ServiceProvider2.default.get(topology); + + if (msg[0] !== 0) { return; } if (msg[1] === 'IDENT') { @@ -1227,56 +1210,65 @@ return /******/ (function(modules) { // webpackBootstrap socket.send(JSON.stringify(msg)); return; } - if (msg[2] === 'MSG') { - } + if (msg[2] === 'MSG') {} // We have received a new direct message from another user if (msg[2] === 'MSG' && msg[3] === socket.uid) { // Find the peer exists in one of our channels or create a new one - if(typeof socket.facade._onPeerMessage === "function") - socket.facade._onPeerMessage(msg[1], msg); + if (typeof socket.facade._onPeerMessage === "function") socket.facade._onPeerMessage(msg[1], msg); } if (msg[2] === 'JOIN' && (webChannel.id == null || webChannel.id === msg[3])) { - if(!webChannel.id) { // New unnamed channel : get its name from the first "JOIN" message - var chanName = window.location.hash = msg[3]; - webChannel.id = chanName; + if (!webChannel.id) { + // New unnamed channel : get its name from the first "JOIN" message + if (!window.location.hash) { + var chanName = window.location.hash = msg[3]; + } + webChannel.id = msg[3]; } - if (msg[1] === socket.uid) { // If the user catches himself registering, he is synchronized with the server + + if (msg[1] === socket.uid) { + // If the user catches himself registering, he is synchronized with the server webChannel.onopen(); - } - else { // Trigger onJoining() when another user is joining the channel - // Register the user in the list of peers in the channel - var linkQuality = (msg[1] === '_HISTORY_KEEPER_') ? 1000 : 0; - var sendToPeer = function(data) { - topologyService.sendTo(msg[1], webChannel, {type : 'MSG', msg: data}); - } - var peer = {id: msg[1], connector: socket, linkQuality: linkQuality, send: sendToPeer}; - if(webChannel.peers.indexOf(peer) === -1) { + } else { + // Trigger onJoining() when another user is joining the channel + + // Register the user in the list of peers in the channel + var linkQuality = msg[1] === '_HISTORY_KEEPER_' ? 1000 : 0; + var sendToPeer = function sendToPeer(data) { + topologyService.sendTo(msg[1], webChannel, { type: 'MSG', msg: data }); + }; + var peer = { id: msg[1], connector: socket, linkQuality: linkQuality, send: sendToPeer }; + if (webChannel.peers.indexOf(peer) === -1) { webChannel.peers.push(peer); } - if(typeof webChannel.onJoining === "function") - webChannel.onJoining(msg[1]); + + if (typeof webChannel.onJoining === "function") webChannel.onJoining(msg[1]); } } - // We have received a new message in that channel + // We have received a new message in that channel from another peer if (msg[2] === 'MSG' && msg[3] === webChannel.id) { // Find the peer who sent the message and display it //TODO Use Peer instead of peer.id (msg[1]) : - if(typeof webChannel.onMessage === "function") - + if (typeof webChannel.onMessage === "function") webChannel.onMessage(msg[1], msg[4]); } // Someone else has left the channel, remove him from the list of peers if (msg[2] === 'LEAVE' && msg[3] === webChannel.id) { //TODO Use Peer instead of peer.id (msg[1]) : - if(typeof webChannel.onLeaving === "function") - webChannel.onLeaving(msg[1], webChannel); + if (typeof webChannel.onLeaving === "function") webChannel.onLeaving(msg[1], webChannel); } - */ } }, { key: 'message', value: function message(code, data) { - // The message is already prepared and encrypted - return data.data; + var type = undefined; + switch (code) { + case cs.USER_DATA: + type = 'MSG'; + break; + case cs.JOIN_START: + type = 'JOIN'; + break; + } + return { type: type, msg: data.data }; } }]); diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js index 08473e3f8..0f77f421c 100644 --- a/www/common/realtime-input.js +++ b/www/common/realtime-input.js @@ -101,9 +101,20 @@ define([ var initializing = true; var bump = function () {}; + + var onPeerMessage = function (peer, msg) { + if(peer === '_HISTORY_KEEPER_') { + var msgHistory = JSON.parse(msg[4]); + onMessage(msgHistory[1], msgHistory[4]); + } + else { + warn('Illegal direct message'); + } + }; var options = { - signaling: websocketUrl, + // signaling: websocketUrl, + signaling: 'ws://localhost:9000', topology: 'StarTopologyService', protocol: 'WebSocketProtocolService', connector: 'WebSocketService', @@ -111,26 +122,42 @@ define([ }; var realtime; + // Add the Facade's peer messages handler + Netflux._onPeerMessage = onPeerMessage; // Connect to the WebSocket server Netflux.join(channel, options).then(function(wc) { + wc.onMessage = onMessage; // On receiving message wc.onJoining = onJoining; // On user joining the session // Open a Chainpad session realtime = createRealtime(); - realtime.onUserListChange(function (userList) { - var opt = {userList : userList}; - // TODO : onJoining should only a a "newPeer" parameter - wc.onJoining(opt); - }); + + // we're fully synced + initializing = false; + + // execute an onReady callback if one was supplied + if (config.onReady) { + config.onReady(); + } + // On sending message realtime.onMessage(function(message) { + // Do not send authentication messages since it is handled by Netflux + var parsed = parseMessage(message); + if (parsed.content[0] !== 0) { message = Crypto.encrypt(message, cryptKey); wc.send(message); + } }); + + // Get the channel history + var hc; + wc.peers.forEach(function (p) { if (!hc || p.linkQuality > hc.linkQuality) { hc = p; } }); + hc.send(JSON.stringify(['GET_HISTORY', wc.id])); // Check the connection to the channel - checkConnection(wc); + //checkConnection(wc); bindAllEvents(textarea, doc, onEvent, false); @@ -156,8 +183,11 @@ define([ return '\\' +c; })); - var onMessage = function(user, message) { + var onMessage = function(peer, msg) { + // remove the password + var passLen = msg.substring(0,msg.indexOf(':')); + var message = msg.substring(passLen.length+1 + Number(passLen)); message = Crypto.decrypt(message, cryptKey); verbose(message); @@ -183,22 +213,13 @@ define([ } } } - var onJoining = function(optionnalData) { - var userList = optionnalData.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. - initializing = false; + + var onJoining = function(peer, channel) { + + } + + var onLeaving = function(peer, channel) { - // execute an onReady callback if one was supplied - // pass an object so we can extend this later - if (config.onReady) { - config.onReady({ - userList: userList - }); - } } var checkConnection = function(wc) { @@ -230,6 +251,23 @@ define([ } } + var parseMessage = function (msg) { + var res ={}; + // two or more? use a for + ['pass','user','channelId','content'].forEach(function(attr){ + var len=msg.slice(0,msg.indexOf(':')), + // taking an offset lets us slice out the prop + // and saves us one string copy + o=len.length+1, + prop=res[attr]=msg.slice(o,Number(len)+o); + // slice off the property and its descriptor + msg = msg.slice(prop.length+o); + }); + // content is the only attribute that's not a string + res.content=JSON.parse(res.content); + return res; + }; + return { onEvent: function () { onEvent(); From 09a06a8bc5d26ef4f7c96ada279a2acd9bcc8c49 Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Mon, 7 Mar 2016 17:35:31 +0100 Subject: [PATCH 003/257] Replace the chainpad server by the netflux server --- NetFluxWebsocketServer.js | 186 +++++++++++++++++++++++++++++++++++ server.js | 4 +- www/common/realtime-input.js | 4 +- 3 files changed, 191 insertions(+), 3 deletions(-) create mode 100644 NetFluxWebsocketServer.js diff --git a/NetFluxWebsocketServer.js b/NetFluxWebsocketServer.js new file mode 100644 index 000000000..3ffb96fe7 --- /dev/null +++ b/NetFluxWebsocketServer.js @@ -0,0 +1,186 @@ +;(function () { 'use strict'; +let Crypto = require('crypto'); +let WebSocket = require('ws'); + +let LAG_MAX_BEFORE_DISCONNECT = 30000; +let LAG_MAX_BEFORE_PING = 15000; +let HISTORY_KEEPER_ID = "_HISTORY_KEEPER_"; + +let dropUser; + +let now = function () { return (new Date()).getTime(); }; + +let sendMsg = function (ctx, user, msg) { + try { + console.log('<' + JSON.stringify(msg)); + user.socket.send(JSON.stringify(msg)); + } catch (e) { + console.log(e.stack); + dropUser(ctx, user); + } +}; + +let sendChannelMessage = function (ctx, channel, msgStruct) { + msgStruct.unshift(0); + channel.forEach(function (user) { sendMsg(ctx, user, msgStruct); }); + if (msgStruct[2] === 'MSG') { + ctx.store.message(channel.id, JSON.stringify(msgStruct), function () { }); + } +}; + +dropUser = function (ctx, user) { + if (user.socket.readyState !== WebSocket.CLOSING + && user.socket.readyState !== WebSocket.CLOSED) + { + try { + user.socket.close(); + } catch (e) { + console.log("Failed to disconnect ["+user.id+"], attempting to terminate"); + try { + user.socket.terminate(); + } catch (ee) { + console.log("Failed to terminate ["+user.id+"] *shrug*"); + } + } + } + delete ctx.users[user.id]; + Object.keys(ctx.channels).forEach(function (chanName) { + let chan = ctx.channels[chanName]; + let idx = chan.indexOf(user); + if (idx < 0) { return; } + console.log("Removing ["+user.id+"] from channel ["+chanName+"]"); + chan.splice(idx, 1); + if (chan.length === 0) { + console.log("Removing empty channel ["+chanName+"]"); + delete ctx.channels[chanName]; + } else { + sendChannelMessage(ctx, chan, [user.id, 'LEAVE', chanName, 'Quit: [ dropUser() ]']); + } + }); +}; + +let getHistory = function (ctx, channelName, handler) { + ctx.store.getMessages(channelName, function (msgStr) { handler(JSON.parse(msgStr)); }); +}; + +let randName = function () { return Crypto.randomBytes(16).toString('hex'); }; + +let handleMessage = function (ctx, user, msg) { + let json = JSON.parse(msg); + let seq = json.shift(); + let cmd = json[0]; + let obj = json[1]; + + user.timeOfLastMessage = now(); + user.pingOutstanding = false; + + if (cmd === 'JOIN') { + /*if (obj && obj.length !== 32) { + sendMsg(ctx, user, [seq, 'ERROR', 'ENOENT', obj]); + return; + }*/ + let chanName = obj || randName(); + let chan = ctx.channels[chanName] = ctx.channels[chanName] || []; + chan.id = chanName; + sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'JOIN', chanName]); + chan.forEach(function (u) { sendMsg(ctx, user, [0, u.id, 'JOIN', chanName]); }); + chan.push(user); + sendChannelMessage(ctx, chan, [user.id, 'JOIN', chanName]); + return; + } + if (cmd === 'MSG') { + if (obj === HISTORY_KEEPER_ID) { + let parsed; + try { parsed = JSON.parse(json[2]); } catch (err) { return; } + if (parsed[0] === 'GET_HISTORY') { + console.log('getHistory ' + parsed[1]); + getHistory(ctx, parsed[1], function (msg) { + sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)]); + }); + } + return; + } + if (obj && !ctx.channels[obj] && !ctx.users[obj]) { + sendMsg(ctx, user, [seq, 'ERROR', 'ENOENT', obj]); + return; + } + let target; + json.unshift(user.id); + if ((target = ctx.channels[obj])) { + sendChannelMessage(ctx, target, json); + return; + } + if ((target = ctx.users[obj])) { + json.unshift(0); + sendMsg(ctx, target, json); + return; + } + } + if (cmd === 'LEAVE') { + let err; + let chan; + let idx; + if (!obj) { err = 'EINVAL'; } + if (!err && !(chan = ctx.channels[obj])) { err = 'ENOENT'; } + if (!err && (idx = chan.indexOf(user)) === -1) { err = 'NOT_IN_CHAN'; } + if (err) { + sendMsg(ctx, user, [seq, 'ERROR', err]); + return; + } + json.unshift(user.id); + sendChannelMessage(ctx, chan, [user.id, 'LEAVE', chan.id]); + chan.splice(idx, 1); + } + if (cmd === 'PING') { + sendMsg(ctx, user, [seq, 'PONG', obj]); + return; + } +}; + +let run = module.exports.run = function (storage, socketServer) { + let ctx = { + users: {}, + channels: {}, + store: storage + }; + setInterval(function () { + Object.keys(ctx.users).forEach(function (userId) { + let u = ctx.users[userId]; + if (now() - u.timeOfLastMessage > LAG_MAX_BEFORE_DISCONNECT) { + dropUser(ctx, u); + } else if (!u.pingOutstanding && now() - u.timeOfLastMessage > LAG_MAX_BEFORE_PING) { + sendMsg(ctx, u, [0, 'PING', now()]); + u.pingOutstanding = true; + } + }); + }, 5000); + socketServer.on('connection', function(socket) { + let conn = socket.upgradeReq.connection; + let user = { + addr: conn.remoteAddress + '|' + conn.remotePort, + socket: socket, + id: randName(), + timeOfLastMessage: now(), + pingOutstanding: false + }; + ctx.users[user.id] = user; + sendMsg(ctx, user, [0, 'IDENT', user.id]); + socket.on('message', function(message) { + console.log('>'+message); + try { + handleMessage(ctx, user, message); + } catch (e) { + console.log(e.stack); + dropUser(ctx, user); + } + }); + socket.on('close', function (evt) { + for (let userId in ctx.users) { + if (ctx.users[userId].socket === socket) { + dropUser(ctx, ctx.users[userId]); + } + } + }); + }); +}; +}()); diff --git a/server.js b/server.js index 3a7c49af4..3bfacb792 100644 --- a/server.js +++ b/server.js @@ -7,6 +7,7 @@ var Https = require('https'); var Fs = require('fs'); var WebSocketServer = require('ws').Server; var ChainPadSrv = require('./ChainPadSrv'); +var NetfluxSrv = require('./NetFluxWebsocketServer'); var config = require('./config'); config.websocketPort = config.websocketPort || config.httpPort; @@ -79,5 +80,6 @@ if (config.websocketPort !== config.httpPort) { var wsSrv = new WebSocketServer(wsConfig); Storage.create(config, function (store) { console.log('DB connected'); - ChainPadSrv.create(wsSrv, store); + // ChainPadSrv.create(wsSrv, store); + NetfluxSrv.run(store, wsSrv); }); diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js index 0f77f421c..6599512b8 100644 --- a/www/common/realtime-input.js +++ b/www/common/realtime-input.js @@ -113,8 +113,8 @@ define([ }; var options = { - // signaling: websocketUrl, - signaling: 'ws://localhost:9000', + signaling: websocketUrl, + // signaling: 'ws://localhost:9000', topology: 'StarTopologyService', protocol: 'WebSocketProtocolService', connector: 'WebSocketService', From c4f62fb8124f5107eb623948a12560202997793a Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Tue, 8 Mar 2016 11:25:37 +0100 Subject: [PATCH 004/257] First try with WebRTC --- www/common/netflux.js | 9 ++- www/common/realtime-input.js | 118 +++++++++++++++++++++-------------- 2 files changed, 79 insertions(+), 48 deletions(-) diff --git a/www/common/netflux.js b/www/common/netflux.js index 5764ffd7c..5252a4767 100644 --- a/www/common/netflux.js +++ b/www/common/netflux.js @@ -254,7 +254,7 @@ return /******/ (function(modules) { // webpackBootstrap _this.topologyService.broadcast(_this, protocol.message(cs.JOIN_FINISH, id)); _this.onJoining(id); }); - }).then(function (data) { + }, settings).then(function (data) { return data; }); } @@ -747,6 +747,7 @@ return /******/ (function(modules) { // webpackBootstrap return new Promise(function (resolve, reject) { var connections = []; + console.log(settings); var socket = new window.WebSocket(settings.signaling); socket.onopen = function () { socket.send(JSON.stringify({ key: settings.key })); @@ -804,8 +805,10 @@ return /******/ (function(modules) { // webpackBootstrap return new Promise(function (resolve, reject) { var connection = undefined; var socket = new window.WebSocket(settings.signaling); + console.log('Socket created'); socket.onopen = function () { connection = new _this2.RTCPeerConnection(settings.webRTCOptions); + console.log('RTC created'); connection.onicecandidate = function (e) { if (e.candidate !== null) { var candidate = { @@ -816,6 +819,8 @@ return /******/ (function(modules) { // webpackBootstrap } }; var dc = connection.createDataChannel(key); + console.log('data channel created'); + console.log(dc); dc.onopen = function () { resolve(dc); }; @@ -827,6 +832,8 @@ return /******/ (function(modules) { // webpackBootstrap }; socket.onmessage = function (e) { var msg = JSON.parse(e.data); + console.log('message'); + console.log(msg); if (Reflect.has(msg, 'data')) { if (Reflect.has(msg.data, 'answer')) { var sd = Object.assign(new _this2.RTCSessionDescription(), msg.data.answer); diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js index 6599512b8..787e66acb 100644 --- a/www/common/realtime-input.js +++ b/www/common/realtime-input.js @@ -113,61 +113,85 @@ define([ }; var options = { - signaling: websocketUrl, - // signaling: 'ws://localhost:9000', - topology: 'StarTopologyService', - protocol: 'WebSocketProtocolService', - connector: 'WebSocketService', - openWebChannel: true + // signaling: websocketUrl, + signaling: 'ws://localhost:8000', + key: channel + // topology: 'StarTopologyService', + // protocol: 'WebSocketProtocolService', + // connector: 'WebSocketService', + // openWebChannel: true }; + console.log(options); var realtime; // Add the Facade's peer messages handler Netflux._onPeerMessage = onPeerMessage; - // Connect to the WebSocket server - Netflux.join(channel, options).then(function(wc) { - - wc.onMessage = onMessage; // On receiving message - wc.onJoining = onJoining; // On user joining the session - - // Open a Chainpad session - realtime = createRealtime(); - - // we're fully synced - initializing = false; - - // execute an onReady callback if one was supplied - if (config.onReady) { - config.onReady(); - } - - // On sending message - realtime.onMessage(function(message) { - // Do not send authentication messages since it is handled by Netflux - var parsed = parseMessage(message); - if (parsed.content[0] !== 0) { - message = Crypto.encrypt(message, cryptKey); - wc.send(message); + + var webchannel = Netflux.create(); + webchannel.openForJoining(options).then(function(data) { + console.log('keys'); + console.log(channel); + console.log(data); + webchannel.onmessage = onMessage; // On receiving message + webchannel.onJoining = onJoining; // On user joining the session + webchannel.onLeaving = onLeaving; // On user leaving the session + + // console.log('resolved'); + + onOpen(); + + }, function(err) { + console.log('rejected'); + console.error(err); + }); + + var onOpen = function() { + // Connect to the WebSocket server + Netflux.join(channel, options).then(function(wc) { + + wc.onmessage = onMessage; // On receiving message + wc.onJoining = onJoining; // On user joining the session + wc.onLeaving = onLeaving; // On user leaving the session + + // Open a Chainpad session + realtime = createRealtime(); + + // we're fully synced + initializing = false; + + // execute an onReady callback if one was supplied + if (config.onReady) { + config.onReady(); } - }); - - // Get the channel history - var hc; - wc.peers.forEach(function (p) { if (!hc || p.linkQuality > hc.linkQuality) { hc = p; } }); - hc.send(JSON.stringify(['GET_HISTORY', wc.id])); + + // On sending message + realtime.onMessage(function(message) { + // Do not send authentication messages since it is handled by Netflux + var parsed = parseMessage(message); + if (parsed.content[0] !== 0) { + message = Crypto.encrypt(message, cryptKey); + wc.send(message); + } + }); + + // Get the channel history + // var hc; + // wc.peers.forEach(function (p) { if (!hc || p.linkQuality > hc.linkQuality) { hc = p; } }); + // hc.send(JSON.stringify(['GET_HISTORY', wc.id])); - // Check the connection to the channel - //checkConnection(wc); + // Check the connection to the channel + //checkConnection(wc); - bindAllEvents(textarea, doc, onEvent, false); + bindAllEvents(textarea, doc, onEvent, false); - sharejs.attach(textarea, realtime); - bump = realtime.bumpSharejs; + sharejs.attach(textarea, realtime); + bump = realtime.bumpSharejs; - realtime.start(); - }, function(error) { - warn(error); - }); + realtime.start(); + }, function(error) { + warn(error); + }); + } var createRealtime = function() { return ChainPad.create(userName, @@ -215,11 +239,11 @@ define([ } var onJoining = function(peer, channel) { - + console.log('Someone joined : '+peer) } var onLeaving = function(peer, channel) { - + console.log('Someone left : '+peer) } var checkConnection = function(wc) { From 870b2dbb7eaa021851cbadcd2e3448b931c532a1 Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Tue, 8 Mar 2016 11:45:03 +0100 Subject: [PATCH 005/257] Add the WebRTC server in Cryptpad --- WebRTCSrv.js | 68 ++++++++++++++++++++++++++++++++++++ server.js | 4 ++- www/common/realtime-input.js | 4 +-- 3 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 WebRTCSrv.js diff --git a/WebRTCSrv.js b/WebRTCSrv.js new file mode 100644 index 000000000..06dfd61f4 --- /dev/null +++ b/WebRTCSrv.js @@ -0,0 +1,68 @@ +'use strict' +let WebSocketServer = require('ws').Server +const PORT = 8000 +const UNSUPPORTED_DATA = 1007 +const POLICY_VIOLATION = 1008 +const CLOSE_UNSUPPORTED = 1003 + +// let server = new WebSocketServer({port: PORT}, () => { + // console.log('Server runs on: ws://localhost:' + PORT) +// }) + +var run = module.exports.run = function(storage, server) { + server.on('connection', (socket) => { + socket.on('message', (data) => { + try { + let msg = JSON.parse(data) + console.log(msg); + if (msg.hasOwnProperty('key')) { + for (let master of server.clients) { + if (master.key === msg.key) { + socket.close(POLICY_VIOLATION, 'The key already exists') + console.log('ERROR key exists'); + return + } + } + socket.key = msg.key + socket.joiningClients = [] + } else if (msg.hasOwnProperty('id')) { + for (let index in socket.joiningClients) { + if (index == msg.id) { + socket.joiningClients[index].send(JSON.stringify({data: msg.data})) + return + } + } + socket.close(POLICY_VIOLATION, 'Unknown id') + } else if (msg.hasOwnProperty('join')) { + for (let master of server.clients) { + if (master.key === msg.join) { + console.log('joined'); + socket.master = master + master.joiningClients.push(socket) + let id = master.joiningClients.length - 1 + master.send(JSON.stringify({id, data: msg.data})) + return + } + } + console.log('ERROR unknown key'); + socket.close(POLICY_VIOLATION, 'Unknown key') + } else if (msg.hasOwnProperty('data') && socket.hasOwnProperty('master')) { + let id = socket.master.joiningClients.indexOf(socket) + socket.master.send(JSON.stringify({id, data: msg.data})) + } else { + socket.close(UNSUPPORTED_DATA, 'Unsupported message format') + } + } catch (event) { + socket.close(CLOSE_UNSUPPORTED, 'Server accepts only JSON') + } + }) + + socket.on('close', (event) => { + if (socket.hasOwnProperty('joiningClients')) { + for (let client of socket.joiningClients) { + client.close(POLICY_VIOLATION, 'The peer is no longer available') + } + } + }) + }) +} \ No newline at end of file diff --git a/server.js b/server.js index 3bfacb792..538efce28 100644 --- a/server.js +++ b/server.js @@ -8,6 +8,7 @@ var Fs = require('fs'); var WebSocketServer = require('ws').Server; var ChainPadSrv = require('./ChainPadSrv'); var NetfluxSrv = require('./NetFluxWebsocketServer'); +var WebRTCSrv = require('./WebRTCSrv'); var config = require('./config'); config.websocketPort = config.websocketPort || config.httpPort; @@ -81,5 +82,6 @@ var wsSrv = new WebSocketServer(wsConfig); Storage.create(config, function (store) { console.log('DB connected'); // ChainPadSrv.create(wsSrv, store); - NetfluxSrv.run(store, wsSrv); + // NetfluxSrv.run(store, wsSrv); + WebRTCSrv.run(store, wsSrv); }); diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js index 787e66acb..17eb724f5 100644 --- a/www/common/realtime-input.js +++ b/www/common/realtime-input.js @@ -113,8 +113,8 @@ define([ }; var options = { - // signaling: websocketUrl, - signaling: 'ws://localhost:8000', + signaling: websocketUrl, + // signaling: 'ws://localhost:8000', key: channel // topology: 'StarTopologyService', // protocol: 'WebSocketProtocolService', From c536ecbc1ce01b69f7692bd97c77d2b84c311ca4 Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Tue, 8 Mar 2016 15:13:57 +0100 Subject: [PATCH 006/257] Temp commit --- WebRTCSrv.js | 4 --- www/common/netflux.js | 2 ++ www/common/realtime-input.js | 53 +++++++++++++++++++++++++++--------- 3 files changed, 42 insertions(+), 17 deletions(-) diff --git a/WebRTCSrv.js b/WebRTCSrv.js index 06dfd61f4..e3e0a3c42 100644 --- a/WebRTCSrv.js +++ b/WebRTCSrv.js @@ -5,10 +5,6 @@ const UNSUPPORTED_DATA = 1007 const POLICY_VIOLATION = 1008 const CLOSE_UNSUPPORTED = 1003 -// let server = new WebSocketServer({port: PORT}, () => { - // console.log('Server runs on: ws://localhost:' + PORT) -// }) - var run = module.exports.run = function(storage, server) { server.on('connection', (socket) => { socket.on('message', (data) => { diff --git a/www/common/netflux.js b/www/common/netflux.js index 5252a4767..d63470bba 100644 --- a/www/common/netflux.js +++ b/www/common/netflux.js @@ -500,6 +500,7 @@ return /******/ (function(modules) { // webpackBootstrap }, { key: 'broadcast', value: function broadcast(webChannel, data) { + console.log(data); var _iteratorNormalCompletion = true; var _didIteratorError = false; var _iteratorError = undefined; @@ -508,6 +509,7 @@ return /******/ (function(modules) { // webpackBootstrap for (var _iterator = webChannel.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { var c = _step.value; + console.log(c); c.send(data); } } catch (err) { diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js index 17eb724f5..ebddde624 100644 --- a/www/common/realtime-input.js +++ b/www/common/realtime-input.js @@ -127,27 +127,46 @@ define([ // Add the Facade's peer messages handler Netflux._onPeerMessage = onPeerMessage; + function getParameterByName(name, url) { + if (!url) url = window.location.href; + name = name.replace(/[\[\]]/g, "\\$&"); + var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), + results = regex.exec(url); + if (!results) return null; + if (!results[2]) return ''; + return decodeURIComponent(results[2].replace(/\+/g, " ")); + } + + if(getParameterByName("server")) { + console.log('SERVER'); + console.log(channel); var webchannel = Netflux.create(); webchannel.openForJoining(options).then(function(data) { - console.log('keys'); - console.log(channel); - console.log(data); - webchannel.onmessage = onMessage; // On receiving message - webchannel.onJoining = onJoining; // On user joining the session - webchannel.onLeaving = onLeaving; // On user leaving the session // console.log('resolved'); - onOpen(); + onOpen(webchannel); }, function(err) { console.log('rejected'); console.error(err); }); - - var onOpen = function() { + } + else { + console.log('CLIENT'); + console.log(channel); // Connect to the WebSocket server Netflux.join(channel, options).then(function(wc) { + onOpen(wc); + }, function(error) { + warn(error); + }); + } + + var onOpen = function(wc) { + + console.log('joined the channel'); + console.log(wc.myID); wc.onmessage = onMessage; // On receiving message wc.onJoining = onJoining; // On user joining the session @@ -166,12 +185,16 @@ define([ // On sending message realtime.onMessage(function(message) { + // TODO: put in ChaindpadAdapter // Do not send authentication messages since it is handled by Netflux var parsed = parseMessage(message); if (parsed.content[0] !== 0) { + console.log('ENVOI '+message); message = Crypto.encrypt(message, cryptKey); wc.send(message); + onMessage('', message); } + // END-TODO }); // Get the channel history @@ -188,9 +211,7 @@ define([ bump = realtime.bumpSharejs; realtime.start(); - }, function(error) { - warn(error); - }); + } var createRealtime = function() { @@ -208,12 +229,18 @@ define([ })); var onMessage = function(peer, msg) { + + // TODO : put in ChainpadAdapter // remove the password var passLen = msg.substring(0,msg.indexOf(':')); var message = msg.substring(passLen.length+1 + Number(passLen)); + message = Crypto.decrypt(message, cryptKey); - + console.log('RECOIS '+message); + + // END-TODO ChainpadAdapter + verbose(message); allMessages.push(message); if (!initializing) { From b7885eb5396831f686a1f157c29da365f94fed26 Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Wed, 9 Mar 2016 18:35:39 +0100 Subject: [PATCH 007/257] Fix channel history --- WebRTCSrv.js | 27 ++++++- www/common/netflux.js | 139 +++++++++++++++++++++++------------ www/common/realtime-input.js | 42 +++++++---- 3 files changed, 145 insertions(+), 63 deletions(-) diff --git a/WebRTCSrv.js b/WebRTCSrv.js index e3e0a3c42..8b0c78321 100644 --- a/WebRTCSrv.js +++ b/WebRTCSrv.js @@ -36,6 +36,7 @@ var run = module.exports.run = function(storage, server) { socket.master = master master.joiningClients.push(socket) let id = master.joiningClients.length - 1 + console.log(id); master.send(JSON.stringify({id, data: msg.data})) return } @@ -54,10 +55,30 @@ var run = module.exports.run = function(storage, server) { }) socket.on('close', (event) => { - if (socket.hasOwnProperty('joiningClients')) { - for (let client of socket.joiningClients) { - client.close(POLICY_VIOLATION, 'The peer is no longer available') + console.log('someone has closed'); + // If not master + if (socket.hasOwnProperty('master')) { + let masterClients = socket.master.joiningClients + for (let client of masterClients) { + if(client.id === socket.id) { + console.log('close client '+client.key) + client.close(POLICY_VIOLATION, 'The peer is no longer available') + //masterClients.splice(masterClients.indexOf(client),1); + } + } + } + else if (socket.hasOwnProperty('joiningClients')) { + let firstClient + let masterClients = socket.joiningClients + for (let client of masterClients) { + firstClient = client + break; } + firstClient.close(POLICY_VIOLATION, 'The master is no longer available') + //masterClients.splice(masterClients.indexOf(firstClient),1); + firstClient.joiningClients = masterClients + console.log('change master from '+socket.key+' to '+firstClient.key) + socket = firstClient } }) }) diff --git a/www/common/netflux.js b/www/common/netflux.js index d63470bba..1c434e46c 100644 --- a/www/common/netflux.js +++ b/www/common/netflux.js @@ -226,8 +226,35 @@ return /******/ (function(modules) { // webpackBootstrap }, { key: 'send', value: function send(data) { - var protocol = _ServiceProvider2.default.get(this.settings.protocol); - this.topologyService.broadcast(this, protocol.message(cs.USER_DATA, { id: this.myID, data: data })); + var channel = this; + return new Promise(function (resolve, reject) { + if (channel.channels.size === 0) { + console.log('sizenull');resolve(); + } + var protocol = _ServiceProvider2.default.get(channel.settings.protocol); + channel.topologyService.broadcast(channel, protocol.message(cs.USER_DATA, { id: channel.myID, data: data })).then(resolve, reject); + }); + } + }, { + key: 'getHistory', + value: function getHistory(historyKeeperID) { + var channel = this; + return new Promise(function (resolve, reject) { + console.log(channel); + console.log('Je veux history ' + channel.myID); + var protocol = _ServiceProvider2.default.get(channel.settings.protocol); + channel.topologyService.sendTo(historyKeeperID, channel, protocol.message(cs.GET_HISTORY, { id: channel.myID, data: '' })).then(resolve, reject); + }); + } + }, { + key: 'sendTo', + value: function sendTo(id, msg) { + var channel = this; + return new Promise(function (resolve, reject) { + var protocol = _ServiceProvider2.default.get(channel.settings.protocol); + console.log('WCsendTo ' + id); + channel.topologyService.sendTo(id, channel, protocol.message(cs.USER_DATA, { id: channel.myID, data: msg })).then(resolve, reject); + }); } }, { key: 'openForJoining', @@ -305,6 +332,7 @@ return /******/ (function(modules) { // webpackBootstrap }); // API user's message var USER_DATA = exports.USER_DATA = 0; + var GET_HISTORY = exports.GET_HISTORY = 6; // Internal messages var JOIN_START = exports.JOIN_START = 2; @@ -379,7 +407,7 @@ return /******/ (function(modules) { // webpackBootstrap value: function get(code) { var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; - var service = undefined; + var service = void 0; switch (code) { case cs.WEBRTC_SERVICE: service = new _WebRTCService2.default(options); @@ -441,6 +469,8 @@ return /******/ (function(modules) { // webpackBootstrap var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; _classCallCheck(this, FullyConnectedService); + + console.log('SERVICE FULLY CONNECTED CONSTRUCTED'); } _createClass(FullyConnectedService, [{ @@ -500,62 +530,70 @@ return /******/ (function(modules) { // webpackBootstrap }, { key: 'broadcast', value: function broadcast(webChannel, data) { - console.log(data); - var _iteratorNormalCompletion = true; - var _didIteratorError = false; - var _iteratorError = undefined; - - try { - for (var _iterator = webChannel.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { - var c = _step.value; + return new Promise(function (resolve, reject) { + var _iteratorNormalCompletion = true; + var _didIteratorError = false; + var _iteratorError = undefined; - console.log(c); - c.send(data); - } - } catch (err) { - _didIteratorError = true; - _iteratorError = err; - } finally { try { - if (!_iteratorNormalCompletion && _iterator.return) { - _iterator.return(); + for (var _iterator = webChannel.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + var c = _step.value; + + c.send(data); } + } catch (err) { + _didIteratorError = true; + _iteratorError = err; } finally { - if (_didIteratorError) { - throw _iteratorError; + try { + if (!_iteratorNormalCompletion && _iterator.return) { + _iterator.return(); + } + } finally { + if (_didIteratorError) { + throw _iteratorError; + } } } - } + + resolve(); + }); } }, { key: 'sendTo', value: function sendTo(id, webChannel, data) { - var _iteratorNormalCompletion2 = true; - var _didIteratorError2 = false; - var _iteratorError2 = undefined; + console.log('sending to ' + id); - try { - for (var _iterator2 = webChannel.channels[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { - var c = _step2.value; + return new Promise(function (resolve, reject) { + var _iteratorNormalCompletion2 = true; + var _didIteratorError2 = false; + var _iteratorError2 = undefined; - if (c.peerID == id) { - c.send(data); - } - } - } catch (err) { - _didIteratorError2 = true; - _iteratorError2 = err; - } finally { try { - if (!_iteratorNormalCompletion2 && _iterator2.return) { - _iterator2.return(); + for (var _iterator2 = webChannel.channels[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { + var c = _step2.value; + + if (c.peerID == id) { + c.send(data); + } } + } catch (err) { + _didIteratorError2 = true; + _iteratorError2 = err; } finally { - if (_didIteratorError2) { - throw _iteratorError2; + try { + if (!_iteratorNormalCompletion2 && _iterator2.return) { + _iterator2.return(); + } + } finally { + if (_didIteratorError2) { + throw _iteratorError2; + } } } - } + + resolve(); + }); } }, { key: 'leave', @@ -805,7 +843,7 @@ return /******/ (function(modules) { // webpackBootstrap var settings = Object.assign({}, this.settings, options); return new Promise(function (resolve, reject) { - var connection = undefined; + var connection = void 0; var socket = new window.WebSocket(settings.signaling); console.log('Socket created'); socket.onopen = function () { @@ -928,8 +966,8 @@ return /******/ (function(modules) { // webpackBootstrap }, function () {}); })(); } else if (msg.sdp.type === 'answer') { - var sd = Object.assign(new this.RTCSessionDescription(), msg.sdp); - webChannel.connections.get(msg.senderPeerID).setRemoteDescription(sd, function () {}, function () {}); + var _sd = Object.assign(new this.RTCSessionDescription(), msg.sdp); + webChannel.connections.get(msg.senderPeerID).setRemoteDescription(_sd, function () {}, function () {}); } } else if (Reflect.has(msg, 'candidate')) { webChannel.connections.get(msg.senderPeerID).addIceCandidate(new this.RTCIceCandidate(msg.candidate)); @@ -1042,7 +1080,7 @@ return /******/ (function(modules) { // webpackBootstrap var settings = Object.assign({}, this.settings, options); return new Promise(function (resolve, reject) { - var connection = undefined; + var connection = void 0; var socket = new window.WebSocket(settings.signaling); socket.seq = 1; socket.facade = options.facade || null; @@ -1108,6 +1146,10 @@ return /******/ (function(modules) { // webpackBootstrap case cs.USER_DATA: webChannel.onmessage(msg.id, msg.data); break; + case cs.GET_HISTORY: + console.log("SOMEONE WANTS HISTORY"); + webChannel.onPeerMessage(msg.id, msg.code); + break; case cs.SERVICE_DATA: var service = _ServiceProvider2.default.get(msg.service); service.onmessage(channel, msg.data); @@ -1139,6 +1181,9 @@ return /******/ (function(modules) { // webpackBootstrap msg.id = data.id; msg.data = data.data; break; + case cs.GET_HISTORY: + msg.id = data.id; + break; case cs.SERVICE_DATA: msg.service = data.service; msg.data = Object.assign({}, data.data); @@ -1268,7 +1313,7 @@ return /******/ (function(modules) { // webpackBootstrap }, { key: 'message', value: function message(code, data) { - var type = undefined; + var type = void 0; switch (code) { case cs.USER_DATA: type = 'MSG'; diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js index ebddde624..6ba825f53 100644 --- a/www/common/realtime-input.js +++ b/www/common/realtime-input.js @@ -102,16 +102,8 @@ define([ var bump = function () {}; - var onPeerMessage = function (peer, msg) { - if(peer === '_HISTORY_KEEPER_') { - var msgHistory = JSON.parse(msg[4]); - onMessage(msgHistory[1], msgHistory[4]); - } - else { - warn('Illegal direct message'); - } - }; - + var messagesHistory = []; + var options = { signaling: websocketUrl, // signaling: 'ws://localhost:8000', @@ -125,7 +117,7 @@ define([ var realtime; // Add the Facade's peer messages handler - Netflux._onPeerMessage = onPeerMessage; + // Netflux._onPeerMessage = onPeerMessage; function getParameterByName(name, url) { if (!url) url = window.location.href; @@ -171,6 +163,9 @@ define([ wc.onmessage = onMessage; // On receiving message wc.onJoining = onJoining; // On user joining the session wc.onLeaving = onLeaving; // On user leaving the session + wc.onPeerMessage = function(peerId, type) { + onPeerMessage(peerId, wc); // On user leaving the session + } // Open a Chainpad session realtime = createRealtime(); @@ -191,12 +186,21 @@ define([ if (parsed.content[0] !== 0) { console.log('ENVOI '+message); message = Crypto.encrypt(message, cryptKey); - wc.send(message); - onMessage('', message); + wc.send(message).then(function() { + onMessage('', message); + }); } // END-TODO }); + var hc; + for (let c of wc.channels) { hc = c; break; } + if(hc) { + console.log('history keeper :'); + console.log(hc); + console.log('onPeer '+hc.peerID) + wc.getHistory(hc.peerID); + } // Get the channel history // var hc; // wc.peers.forEach(function (p) { if (!hc || p.linkQuality > hc.linkQuality) { hc = p; } }); @@ -227,16 +231,28 @@ define([ var whoami = new RegExp(userName.replace(/[\/\+]/g, function (c) { return '\\' +c; })); + + var onPeerMessage = function(peerID, wc) { + console.log(messagesHistory); + console.log('RTsendTo '+peerID); + messagesHistory.forEach(function(msg) { + console.log(msg); + //var message = Crypto.encrypt('1:y'+msg, cryptKey); + wc.sendTo(peerID, msg); + }); + }; var onMessage = function(peer, msg) { // TODO : put in ChainpadAdapter // remove the password + messagesHistory.push(msg); var passLen = msg.substring(0,msg.indexOf(':')); var message = msg.substring(passLen.length+1 + Number(passLen)); message = Crypto.decrypt(message, cryptKey); + console.log('RECOIS '+message); // END-TODO ChainpadAdapter From ae8f6f7f2c5cebee3ef8939a7fbb75c5ac127210 Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Thu, 10 Mar 2016 14:03:31 +0100 Subject: [PATCH 008/257] Ability to choose which protocol to use (Websocket or WebRTC) with Netflux --- WebRTCSrv.js | 35 +------ config.js.dist | 2 + customize.dist/index.html | 6 +- server.js | 43 +++++--- www/common/netflux.js | 119 +++++++++++---------- www/common/realtime-input.js | 194 +++++++++++++++++------------------ www/hack/main.js | 1 + www/vdom/main.js | 1 + 8 files changed, 196 insertions(+), 205 deletions(-) diff --git a/WebRTCSrv.js b/WebRTCSrv.js index 8b0c78321..c97c18b79 100644 --- a/WebRTCSrv.js +++ b/WebRTCSrv.js @@ -1,11 +1,10 @@ 'use strict' let WebSocketServer = require('ws').Server -const PORT = 8000 const UNSUPPORTED_DATA = 1007 const POLICY_VIOLATION = 1008 const CLOSE_UNSUPPORTED = 1003 -var run = module.exports.run = function(storage, server) { +var run = module.exports.run = function(server) { server.on('connection', (socket) => { socket.on('message', (data) => { try { @@ -15,7 +14,6 @@ var run = module.exports.run = function(storage, server) { for (let master of server.clients) { if (master.key === msg.key) { socket.close(POLICY_VIOLATION, 'The key already exists') - console.log('ERROR key exists'); return } } @@ -32,16 +30,13 @@ var run = module.exports.run = function(storage, server) { } else if (msg.hasOwnProperty('join')) { for (let master of server.clients) { if (master.key === msg.join) { - console.log('joined'); socket.master = master master.joiningClients.push(socket) let id = master.joiningClients.length - 1 - console.log(id); master.send(JSON.stringify({id, data: msg.data})) return } } - console.log('ERROR unknown key'); socket.close(POLICY_VIOLATION, 'Unknown key') } else if (msg.hasOwnProperty('data') && socket.hasOwnProperty('master')) { let id = socket.master.joiningClients.indexOf(socket) @@ -55,31 +50,11 @@ var run = module.exports.run = function(storage, server) { }) socket.on('close', (event) => { - console.log('someone has closed'); - // If not master - if (socket.hasOwnProperty('master')) { - let masterClients = socket.master.joiningClients - for (let client of masterClients) { - if(client.id === socket.id) { - console.log('close client '+client.key) - client.close(POLICY_VIOLATION, 'The peer is no longer available') - //masterClients.splice(masterClients.indexOf(client),1); - } - } - } - else if (socket.hasOwnProperty('joiningClients')) { - let firstClient - let masterClients = socket.joiningClients - for (let client of masterClients) { - firstClient = client - break; + if (socket.hasOwnProperty('joiningClients')) { + for (let client of socket.joiningClients) { + client.close(POLICY_VIOLATION, 'The peer is no longer available') } - firstClient.close(POLICY_VIOLATION, 'The master is no longer available') - //masterClients.splice(masterClients.indexOf(firstClient),1); - firstClient.joiningClients = masterClients - console.log('change master from '+socket.key+' to '+firstClient.key) - socket = firstClient } - }) + }); }) } \ No newline at end of file diff --git a/config.js.dist b/config.js.dist index f61828e4c..56d7a1fc8 100644 --- a/config.js.dist +++ b/config.js.dist @@ -11,6 +11,8 @@ module.exports = { httpPort: 3000, // the port used for websockets websocketPort: 3001, + // the port used for webrtc (uncomment to use the WebRTC server) + // webrtcPort: 3002, // You now have a choice of storage engines diff --git a/customize.dist/index.html b/customize.dist/index.html index b652894e6..69e2eaa9f 100644 --- a/customize.dist/index.html +++ b/customize.dist/index.html @@ -123,9 +123,12 @@

- diff --git a/www/vdom/inner.html b/www/_pad/inner.html similarity index 100% rename from www/vdom/inner.html rename to www/_pad/inner.html diff --git a/www/_pad/main.js b/www/_pad/main.js new file mode 100644 index 000000000..6925d4150 --- /dev/null +++ b/www/_pad/main.js @@ -0,0 +1,58 @@ +define([ + '/api/config?cb=' + Math.random().toString(16).substring(2), + '/pad/realtime-wysiwyg.js', + '/common/messages.js', + '/common/crypto.js', + '/bower_components/jquery/dist/jquery.min.js', + '/customize/pad.js' +], function (Config, RTWysiwyg, Messages, Crypto) { + var $ = window.jQuery; + var ifrw = $('#pad-iframe')[0].contentWindow; + var Ckeditor = ifrw.CKEDITOR; + + var andThen = function (Ckeditor) { + $(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 editor = Ckeditor.replace('editor1', { + removeButtons: 'Source,Maximize', + // magicline plugin inserts html crap into the document which is not part of the + // document itself and causes problems when it's sent across the wire and reflected back + removePlugins: 'magicline,resize' + }); + editor.on('instanceReady', function () { + editor.execCommand('maximize'); + + // (contenteditable) iframe in an iframe + ifrw.$('iframe')[0].contentDocument.body.innerHTML = Messages.initialState; + + var rtw = + RTWysiwyg.start(ifrw, // window + Config.websocketURL, // websocketUrl + Crypto.rand64(8), // userName + key.channel, // channel + key.cryptKey); // cryptKey + editor.on('change', function () { rtw.onEvent(); }); + }); + window.editor = editor; + window.RTWysiwyg = RTWysiwyg; + }; + + var interval = 100; + var first = function () { + Ckeditor = ifrw.CKEDITOR; + if (Ckeditor) { + andThen(Ckeditor); + } else { + console.log("Ckeditor was not defined. Trying again in %sms",interval); + setTimeout(first, interval); + } + }; + + $(first); +}); diff --git a/www/pad/rangy.js b/www/_pad/rangy.js similarity index 100% rename from www/pad/rangy.js rename to www/_pad/rangy.js diff --git a/www/pad/realtime-wysiwyg.js b/www/_pad/realtime-wysiwyg.js similarity index 100% rename from www/pad/realtime-wysiwyg.js rename to www/_pad/realtime-wysiwyg.js diff --git a/www/common/toolbar.js b/www/common/toolbar.js index ac7d61d5c..c4692bcfe 100644 --- a/www/common/toolbar.js +++ b/www/common/toolbar.js @@ -127,16 +127,20 @@ define([ }; var getOtherUsers = function(myUserName, userList, userData) { - var length = userList.length; - var list = (length > 1) ? ' : ' : ''; + var i = 0; + var list = ''; userList.forEach(function(user) { if(user !== myUserName) { var data = (userData) ? (userData[user] || null) : null; - var userName = (data) ? data.name : user; - list += userName + ', '; + var userName = (data) ? data.name : null; + if(userName) { + if(i === 0) list = ' : '; + list += userName + ', '; + i++; + } } }); - return (length > 1) ? list.slice(0, -2) : list; + return (i > 0) ? list.slice(0, -2) : list; } var createChangeName = function($container, userList, buttonID) { diff --git a/www/pad/index.html b/www/pad/index.html index 685f73398..2116d14c9 100644 --- a/www/pad/index.html +++ b/www/pad/index.html @@ -4,6 +4,10 @@ +
+ + diff --git a/www/pad/main.js b/www/pad/main.js index 6925d4150..68682ef68 100644 --- a/www/pad/main.js +++ b/www/pad/main.js @@ -1,14 +1,25 @@ define([ '/api/config?cb=' + Math.random().toString(16).substring(2), - '/pad/realtime-wysiwyg.js', '/common/messages.js', '/common/crypto.js', + '/common/realtime-input.js', + '/common/convert.js', + '/common/toolbar.js', + '/common/cursor.js', + '/common/json-ot.js', + '/bower_components/diff-dom/diffDOM.js', '/bower_components/jquery/dist/jquery.min.js', '/customize/pad.js' -], function (Config, RTWysiwyg, Messages, Crypto) { +], function (Config, Messages, Crypto, realtimeInput, Convert, Toolbar, Cursor, JsonOT) { var $ = window.jQuery; var ifrw = $('#pad-iframe')[0].contentWindow; - var Ckeditor = ifrw.CKEDITOR; + var Ckeditor; // to be initialized later... + var DiffDom = window.diffDOM; + + window.Toolbar = Toolbar; + + var userName = Crypto.rand64(8), + toolbar; var andThen = function (Ckeditor) { $(window).on('hashchange', function() { @@ -18,29 +29,238 @@ define([ window.location.href = window.location.href + '#' + Crypto.genKey(); return; } + + var fixThings = false; var key = Crypto.parseKey(window.location.hash.substring(1)); - var editor = Ckeditor.replace('editor1', { + var editor = window.editor = Ckeditor.replace('editor1', { + // https://dev.ckeditor.com/ticket/10907 + needsBrFiller: fixThings, + needsNbspFiller: fixThings, removeButtons: 'Source,Maximize', // magicline plugin inserts html crap into the document which is not part of the // document itself and causes problems when it's sent across the wire and reflected back removePlugins: 'magicline,resize' }); - editor.on('instanceReady', function () { + + editor.on('instanceReady', function (Ckeditor) { editor.execCommand('maximize'); + var documentBody = ifrw.$('iframe')[0].contentDocument.body; + + documentBody.innerHTML = Messages.initialState; + + var inner = window.inner = documentBody; + var cursor = window.cursor = Cursor(inner); + + var $textarea = $('#feedback'); + + var setEditable = function (bool) { + inner.setAttribute('contenteditable', + (typeof (bool) !== 'undefined'? bool : true)); + }; + + // don't let the user edit until the pad is ready + setEditable(false); + + var diffOptions = { + preDiffApply: function (info) { + + // no use trying to recover the cursor if it doesn't exist + if (!cursor.exists()) { return; } + + /* frame is either 0, 1, 2, or 3, depending on which + cursor frames were affected: none, first, last, or both + */ + var frame = info.frame = cursor.inNode(info.node); + + if (!frame) { return; } + + var debug = info.debug = { + frame: frame, + action: info.diff.action, + cursorLength: cursor.getLength(), + node: info.node + }; + + if (info.diff.oldValue) { debug.oldValue = info.diff.oldValue; } + if (info.diff.newValue) { debug.newValue = info.diff.newValue; } + if (typeof info.diff.oldValue === 'string' && typeof info.diff.newValue === 'string') { + var pushes = cursor.pushDelta(info.diff.oldValue, info.diff.newValue); + debug.commonStart = pushes.commonStart; + debug.commonEnd = pushes.commonEnd; + debug.insert = pushes.insert; + debug.remove = pushes.remove; + + if (frame & 1) { + // push cursor start if necessary + if (pushes.commonStart < cursor.Range.start.offset) { + cursor.Range.start.offset += pushes.delta; + } + } + if (frame & 2) { + // push cursor end if necessary + if (pushes.commonStart < cursor.Range.end.offset) { + cursor.Range.end.offset += pushes.delta; + } + } + } + console.log("###################################"); + console.log(debug); + }, + postDiffApply: function (info) { + if (info.frame) { + if (info.node) { + if (info.frame & 1) { cursor.fixStart(info.node); } + if (info.frame & 2) { cursor.fixEnd(info.node); } + } else { console.error("info.node did not exist"); } + + var sel = cursor.makeSelection(); + var range = cursor.makeRange(); + + cursor.fixSelection(sel, range); + } + } + }; + + var initializing = true; + var userList = {}; // List of pretty name of all users (mapped with their server ID) + var toolbarList; // List of users still connected to the channel (server IDs) + var addToUserList = function(data) { + for (var attrname in data) { userList[attrname] = data[attrname]; } + if(toolbarList && typeof toolbarList.onChange === "function") { + toolbarList.onChange(userList); + } + }; + + var myData = {}; + var myUserName = ''; // My "pretty name" + var myID; // My server ID + + var setMyID = function(info) { + myID = info.myID || null; + myUserName = myID; + }; + + var createChangeName = function(id, $container) { + var buttonElmt = $container.find('#'+id)[0]; + buttonElmt.addEventListener("click", function() { + var newName = prompt("Change your name :", myUserName) + if (newName && newName.trim()) { + myUserName = newName.trim(); + myData[myID] = { + name: myUserName + }; + addToUserList(myData); + editor.fire( 'change' ); + } + }); + }; + + // apply patches, and try not to lose the cursor in the process! + var applyHjson = function (shjson) { + var hjson = JSON.parse(shjson); + var peerUserList = hjson[hjson.length-1]; + if(peerUserList.metadata) { + var userData = peerUserList.metadata; + addToUserList(userData); + delete hjson[hjson.length-1]; + } + var userDocStateDom = Convert.hjson.to.dom(hjson); + userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf + var DD = new DiffDom(diffOptions); + var patch = (DD).diff(inner, userDocStateDom); + (DD).apply(inner, patch); + }; + + var onRemote = function (shjson) { + if (initializing) { return; } + + // remember where the cursor is + cursor.update(); + + // build a dom from HJSON, diff, and patch the editor + applyHjson(shjson); + }; + + var onInit = function (info) { + var $bar = $('#pad-iframe')[0].contentWindow.$('#cke_1_toolbox'); + toolbarList = info.userList; + var config = { + userData: userList, + changeNameID: 'cryptpad-changeName' + }; + toolbar = info.realtime.toolbar = Toolbar.create($bar, info.myID, info.realtime, info.webChannel, info.userList, config); + createChangeName('cryptpad-changeName', $bar); + /* TODO handle disconnects and such*/ + }; + + var onReady = function (info) { + console.log("Unlocking editor"); + initializing = false; + setEditable(true); + applyHjson($textarea.val()); + $textarea.trigger('keyup'); + }; + + var onAbort = function (info) { + console.log("Aborting the session!"); + // stop the user from continuing to edit + setEditable(false); + // TODO inform them that the session was torn down + toolbar.failed(); + }; + + + + var realtimeOptions = { + // the textarea that we will sync + textarea: $textarea[0], + + // the websocket URL (deprecated?) + websocketURL: Config.websocketURL, + webrtcURL: Config.webrtcURL, + + // our username + userName: userName, + + // the channel we will communicate over + channel: key.channel, + + // our encryption key + cryptKey: key.cryptKey, + + // configuration :D + doc: inner, + // first thing called + onInit: onInit, + + onReady: onReady, + + setMyID: setMyID, + + // when remote changes occur + onRemote: onRemote, + + // handle aborts + onAbort: onAbort, + + // really basic operational transform + transformFunction : JsonOT.validate + // pass in websocket/netflux object TODO + }; + + var rti = window.rti = realtimeInput.start(realtimeOptions); - // (contenteditable) iframe in an iframe - ifrw.$('iframe')[0].contentDocument.body.innerHTML = Messages.initialState; + $textarea.val(JSON.stringify(Convert.dom.to.hjson(inner))); - var rtw = - RTWysiwyg.start(ifrw, // window - Config.websocketURL, // websocketUrl - Crypto.rand64(8), // userName - key.channel, // channel - key.cryptKey); // cryptKey - editor.on('change', function () { rtw.onEvent(); }); + editor.on('change', function () { + var hjson = Convert.core.hyperjson.fromDOM(inner); + if(myData !== {}) { + hjson[hjson.length] = {metadata: userList}; + } + $textarea.val(JSON.stringify(hjson)); + rti.bumpSharejs(); + }); }); - window.editor = editor; - window.RTWysiwyg = RTWysiwyg; }; var interval = 100; diff --git a/www/vdom/main.js b/www/vdom/main.js deleted file mode 100644 index 9f055462d..000000000 --- a/www/vdom/main.js +++ /dev/null @@ -1,279 +0,0 @@ -define([ - '/api/config?cb=' + Math.random().toString(16).substring(2), - '/common/messages.js', - '/common/crypto.js', - '/common/realtime-input.js', - '/common/convert.js', - '/common/toolbar.js', - '/common/cursor.js', - '/common/json-ot.js', - '/bower_components/diff-dom/diffDOM.js', - '/bower_components/jquery/dist/jquery.min.js', - '/customize/pad.js' -], function (Config, Messages, Crypto, realtimeInput, Convert, Toolbar, Cursor, JsonOT) { - var $ = window.jQuery; - var ifrw = $('#pad-iframe')[0].contentWindow; - var Ckeditor; // to be initialized later... - var DiffDom = window.diffDOM; - - window.Toolbar = Toolbar; - - var userName = Crypto.rand64(8), - toolbar; - - var andThen = function (Ckeditor) { - $(window).on('hashchange', function() { - window.location.reload(); - }); - if (window.location.href.indexOf('#') === -1) { - window.location.href = window.location.href + '#' + Crypto.genKey(); - return; - } - - var fixThings = false; - var key = Crypto.parseKey(window.location.hash.substring(1)); - var editor = window.editor = Ckeditor.replace('editor1', { - // https://dev.ckeditor.com/ticket/10907 - needsBrFiller: fixThings, - needsNbspFiller: fixThings, - removeButtons: 'Source,Maximize', - // magicline plugin inserts html crap into the document which is not part of the - // document itself and causes problems when it's sent across the wire and reflected back - removePlugins: 'magicline,resize' - }); - - editor.on('instanceReady', function (Ckeditor) { - editor.execCommand('maximize'); - var documentBody = ifrw.$('iframe')[0].contentDocument.body; - - documentBody.innerHTML = Messages.initialState; - - var inner = window.inner = documentBody; - var cursor = window.cursor = Cursor(inner); - - var $textarea = $('#feedback'); - - var setEditable = function (bool) { - inner.setAttribute('contenteditable', - (typeof (bool) !== 'undefined'? bool : true)); - }; - - // don't let the user edit until the pad is ready - setEditable(false); - - var diffOptions = { - preDiffApply: function (info) { - - // no use trying to recover the cursor if it doesn't exist - if (!cursor.exists()) { return; } - - /* frame is either 0, 1, 2, or 3, depending on which - cursor frames were affected: none, first, last, or both - */ - var frame = info.frame = cursor.inNode(info.node); - - if (!frame) { return; } - - var debug = info.debug = { - frame: frame, - action: info.diff.action, - cursorLength: cursor.getLength(), - node: info.node - }; - - if (info.diff.oldValue) { debug.oldValue = info.diff.oldValue; } - if (info.diff.newValue) { debug.newValue = info.diff.newValue; } - if (typeof info.diff.oldValue === 'string' && typeof info.diff.newValue === 'string') { - var pushes = cursor.pushDelta(info.diff.oldValue, info.diff.newValue); - debug.commonStart = pushes.commonStart; - debug.commonEnd = pushes.commonEnd; - debug.insert = pushes.insert; - debug.remove = pushes.remove; - - if (frame & 1) { - // push cursor start if necessary - if (pushes.commonStart < cursor.Range.start.offset) { - cursor.Range.start.offset += pushes.delta; - } - } - if (frame & 2) { - // push cursor end if necessary - if (pushes.commonStart < cursor.Range.end.offset) { - cursor.Range.end.offset += pushes.delta; - } - } - } - console.log("###################################"); - console.log(debug); - }, - postDiffApply: function (info) { - if (info.frame) { - if (info.node) { - if (info.frame & 1) { cursor.fixStart(info.node); } - if (info.frame & 2) { cursor.fixEnd(info.node); } - } else { console.error("info.node did not exist"); } - - var sel = cursor.makeSelection(); - var range = cursor.makeRange(); - - cursor.fixSelection(sel, range); - } - } - }; - - var initializing = true; - var userList = []; // List of pretty name of all users (mapped with their server ID) - var toolbarList; // List of users still connected to the channel (server IDs) - var addToUserList = function(data) { - for (var attrname in data) { userList[attrname] = data[attrname]; } - if(toolbarList && typeof toolbarList.onChange === "function") { - toolbarList.onChange(userList); - } - }; - - var myData = {}; - var myUserName = ''; // My "pretty name" - var myID; // My server ID - - var setMyID = function(info) { - myID = info.myID || null; - myUserName = myID; - }; - - var createChangeName = function(id, $container) { - var buttonElmt = $container.find('#'+id)[0]; - buttonElmt.addEventListener("click", function() { - var newName = prompt("Change your name :", myUserName) - if (newName && newName.trim()) { - myUserName = newName.trim(); - myData[myID] = { - name: myUserName - }; - addToUserList(myData); - editor.fire( 'change' ); - } - }); - }; - - // apply patches, and try not to lose the cursor in the process! - var applyHjson = function (shjson) { - var hjson = JSON.parse(shjson); - var peerUserList = hjson[hjson.length-1]; - if(peerUserList.mydata) { - var userData = peerUserList.mydata; - addToUserList(userData); - delete hjson[hjson.length-1]; - } - var userDocStateDom = Convert.hjson.to.dom(hjson); - userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf - var DD = new DiffDom(diffOptions); - var patch = (DD).diff(inner, userDocStateDom); - (DD).apply(inner, patch); - }; - - var onRemote = function (shjson) { - if (initializing) { return; } - - // remember where the cursor is - cursor.update(); - - // build a dom from HJSON, diff, and patch the editor - applyHjson(shjson); - }; - - var onInit = function (info) { - var $bar = $('#pad-iframe')[0].contentWindow.$('#cke_1_toolbox'); - toolbarList = info.userList; - var config = { - userList: userList, - changeNameID: 'cryptpad-changeName' - }; - toolbar = info.realtime.toolbar = Toolbar.create($bar, info.myID, info.realtime, info.webChannel, info.userList, config); - createChangeName('cryptpad-changeName', $bar); - /* TODO handle disconnects and such*/ - }; - - var onReady = function (info) { - console.log("Unlocking editor"); - initializing = false; - setEditable(true); - applyHjson($textarea.val()); - $textarea.trigger('keyup'); - }; - - var onAbort = function (info) { - console.log("Aborting the session!"); - // stop the user from continuing to edit - setEditable(false); - // TODO inform them that the session was torn down - toolbar.failed(); - }; - - - - var realtimeOptions = { - // the textarea that we will sync - textarea: $textarea[0], - - // the websocket URL (deprecated?) - websocketURL: Config.websocketURL, - webrtcURL: Config.webrtcURL, - - // our username - userName: userName, - - // the channel we will communicate over - channel: key.channel, - - // our encryption key - cryptKey: key.cryptKey, - - // configuration :D - doc: inner, - // first thing called - onInit: onInit, - - onReady: onReady, - - setMyID: setMyID, - - // when remote changes occur - onRemote: onRemote, - - // handle aborts - onAbort: onAbort, - - // really basic operational transform - transformFunction : JsonOT.validate - // pass in websocket/netflux object TODO - }; - - var rti = window.rti = realtimeInput.start(realtimeOptions); - - $textarea.val(JSON.stringify(Convert.dom.to.hjson(inner))); - - editor.on('change', function () { - var hjson = Convert.core.hyperjson.fromDOM(inner); - if(myData !== {}) { - hjson[hjson.length] = {mydata: myData}; - myData = {}; - } - $textarea.val(JSON.stringify(hjson)); - rti.bumpSharejs(); - }); - }); - }; - - var interval = 100; - var first = function () { - Ckeditor = ifrw.CKEDITOR; - if (Ckeditor) { - andThen(Ckeditor); - } else { - console.log("Ckeditor was not defined. Trying again in %sms",interval); - setTimeout(first, interval); - } - }; - - $(first); -}); From 38d797a4f13d356eb883b23e108d2b87e0dd30e1 Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Wed, 16 Mar 2016 17:38:26 +0100 Subject: [PATCH 025/257] Fix issue with Chrome and WebRTC --- www/common/realtime-input.js | 1 + 1 file changed, 1 insertion(+) diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js index d39bae228..9bc3ebc62 100644 --- a/www/common/realtime-input.js +++ b/www/common/realtime-input.js @@ -14,6 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ +window.Reflect = { has: (x,y) => { return (y in x); } }; define([ '/common/messages.js', '/common/netflux.js', From de6db0285c0ff9c1a73c84fca4cbd877ccfc17e5 Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Wed, 16 Mar 2016 17:48:27 +0100 Subject: [PATCH 026/257] Limit the size of the usernames to 32 chars --- www/pad/main.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/www/pad/main.js b/www/pad/main.js index 68682ef68..3c8787ea8 100644 --- a/www/pad/main.js +++ b/www/pad/main.js @@ -145,7 +145,11 @@ define([ buttonElmt.addEventListener("click", function() { var newName = prompt("Change your name :", myUserName) if (newName && newName.trim()) { - myUserName = newName.trim(); + var myUserNameTemp = newName.trim(); + if(newName.trim().length > 32) { + myUserNameTemp = myUserNameTemp.substr(0, 31); + } + myUserName = myUserNameTemp; myData[myID] = { name: myUserName }; From fbe6225681b796daaf9d2f3240a024ba9943d1a1 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 22 Mar 2016 10:06:42 +0100 Subject: [PATCH 027/257] Don't attempt to use the cursor selection when it has length 0 RTWYSIWYG-20 RTWYSIWYG-24 --- www/common/cursor.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/www/common/cursor.js b/www/common/cursor.js index 583a8860b..069f896c7 100644 --- a/www/common/cursor.js +++ b/www/common/cursor.js @@ -136,10 +136,9 @@ define([ verbose("cursor.update"); root = root || inner; sel = sel || Rangy.getSelection(root); - // FIXME under what circumstances are no ranges found? if (!sel.rangeCount) { error('[cursor.update] no ranges found'); - //return 'no ranges found'; + return; } var range = sel.getRangeAt(0); From 0ff4906f0e571555bce4113fdfdf30102045c100 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 22 Mar 2016 10:16:14 +0100 Subject: [PATCH 028/257] implement better serialization of class names RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element selectors which hyperscript could not parse. --- www/common/hyperjson.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/www/common/hyperjson.js b/www/common/hyperjson.js index db6d3f20f..2f0badbd4 100644 --- a/www/common/hyperjson.js +++ b/www/common/hyperjson.js @@ -17,7 +17,7 @@ define([], function () { var callOnHyperJSON = function (hj, cb) { var children; - + if (hj && hj[2]) { children = hj[2].map(function (child) { if (isArray(child)) { @@ -39,6 +39,14 @@ define([], function () { return cb(hj[0], hj[1], children); }; + var prependDot = function (token) { + return '.' + token; + }; + + var isTruthy = function (x) { + return x; + }; + var DOM2HyperJSON = function(el){ if(!el.tagName && el.nodeType === Node.TEXT_NODE){ return el.textContent; @@ -73,7 +81,14 @@ define([], function () { delete attributes.id; } if(attributes.class){ - sel = sel +'.'+ attributes.class.replace(/ /g,"."); + /* TODO this can be done with RegExps alone, and it will be faster + but this works and is a little less error prone, albeit slower + come back and speed it up when it comes time to optimize */ + sel = sel +'.'+ attributes.class + .split(/\s+/) + .split(isTruthy) + .map(prependDot) + .join(''); delete attributes.class; } result.push(sel); From 4f3fcb08a41622535a650f8fa52756dc7f633d77 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 22 Mar 2016 10:19:13 +0100 Subject: [PATCH 029/257] better error reporting when the operational transform fails to parse JSON --- www/common/json-ot.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/www/common/json-ot.js b/www/common/json-ot.js index 167e3d11a..238ccc18a 100644 --- a/www/common/json-ot.js +++ b/www/common/json-ot.js @@ -12,7 +12,12 @@ define([ JSON.parse(text3); return resultOp; } catch (e) { - console.log(e); + console.error(e); + console.log({ + resultOp: resultOp, + text2: text2, + text3: text3 + }); } // returning **null** breaks out of the loop From f98fda76040268624cf86a3cd6eec4b79b7cd010 Mon Sep 17 00:00:00 2001 From: ansuz Date: Tue, 22 Mar 2016 19:28:50 +0100 Subject: [PATCH 030/257] fix string manipulation off-by-one --- www/common/hyperjson.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/hyperjson.js b/www/common/hyperjson.js index 2f0badbd4..35975aede 100644 --- a/www/common/hyperjson.js +++ b/www/common/hyperjson.js @@ -84,7 +84,7 @@ define([], function () { /* TODO this can be done with RegExps alone, and it will be faster but this works and is a little less error prone, albeit slower come back and speed it up when it comes time to optimize */ - sel = sel +'.'+ attributes.class + sel = sel + attributes.class .split(/\s+/) .split(isTruthy) .map(prependDot) From 475ca9bea8f3efa17a750ccbf571025091ec2af7 Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 23 Mar 2016 12:31:16 +0100 Subject: [PATCH 031/257] hyperjson.js : used split instead of filter... oops --- www/common/hyperjson.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/hyperjson.js b/www/common/hyperjson.js index 35975aede..660c62194 100644 --- a/www/common/hyperjson.js +++ b/www/common/hyperjson.js @@ -84,9 +84,10 @@ define([], function () { /* TODO this can be done with RegExps alone, and it will be faster but this works and is a little less error prone, albeit slower come back and speed it up when it comes time to optimize */ + sel = sel + attributes.class .split(/\s+/) - .split(isTruthy) + .filter(isTruthy) .map(prependDot) .join(''); delete attributes.class; From c047d5310fb0efca14b7a9dd72fd57fc385b3fe0 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 24 Mar 2016 12:11:31 +0100 Subject: [PATCH 032/257] implement optional filtering in hyperjson Implemented via callback, return falsey if you want to filter an element and all of its children from the serialized result. Conflicts: www/common/convert.js --- www/common/convert.js | 24 +++++++++++++++++++++--- www/common/hyperjson.js | 15 ++++++++++++--- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/www/common/convert.js b/www/common/convert.js index d37e98539..973881c80 100644 --- a/www/common/convert.js +++ b/www/common/convert.js @@ -1,14 +1,16 @@ define([ + '/common/virtual-dom.js', '/common/hyperjson.js', '/common/hyperscript.js' -], function (hyperjson, hyperscript) { +], function (vdom, hyperjson, hyperscript) { // complain if you don't find the required APIs - if (!(hyperjson && hyperscript)) { throw new Error(); } + if (!(vdom && hyperjson && hyperscript)) { throw new Error(); } // Generate a matrix of conversions /* convert.dom.to.hjson, convert.hjson.to.dom, convert.dom.to.vdom, convert.vdom.to.dom, + convert.vdom.to.hjson, convert.hjson.to.vdom and of course, identify functions in case you try to convert a datatype to itself @@ -20,13 +22,28 @@ define([ methods = { dom:{ dom: Self, - hjson: hyperjson.fromDOM + hjson: hyperjson.fromDOM, + vdom: function (D) { + return hyperjson.callOn(hyperjson.fromDOM(D), vdom.h); + } }, hjson:{ hjson: Self, dom: function (H) { // hyperjson.fromDOM, return hyperjson.callOn(H, hyperscript); + }, + vdom: function (H) { + return hyperjson.callOn(H, vdom.h); + } + }, + vdom:{ + vdom: Self, + dom: function (V) { + return vdom.create(V); + }, + hjson: function (V) { + return hyperjson.fromDOM(vdom.create(V)); } } }, @@ -38,6 +55,7 @@ define([ }()); convert.core = { + vdom: vdom, hyperjson: hyperjson, hyperscript: hyperscript }; diff --git a/www/common/hyperjson.js b/www/common/hyperjson.js index 660c62194..31a2caf08 100644 --- a/www/common/hyperjson.js +++ b/www/common/hyperjson.js @@ -47,13 +47,20 @@ define([], function () { return x; }; - var DOM2HyperJSON = function(el){ + var DOM2HyperJSON = function(el, predicate){ if(!el.tagName && el.nodeType === Node.TEXT_NODE){ return el.textContent; } if(!el.attributes){ return; } + + if (predicate) { + if (!predicate(el)) { + // shortcircuit + return; + } + } var attributes = {}; var i = 0; @@ -102,10 +109,12 @@ define([], function () { // js hint complains if we use 'var' here i = 0; + for(; i < el.childNodes.length; i++){ - children.push(DOM2HyperJSON(el.childNodes[i])); + children.push(DOM2HyperJSON(el.childNodes[i], predicate)); } - result.push(children); + + result.push(children.filter(isTruthy)); return result; }; From cd462ed8724337521a6753fc0806e83dfb0dbc2f Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 24 Mar 2016 12:28:45 +0100 Subject: [PATCH 033/257] Merge legacy websocket version --- www/socket/index.html | 41 +++++ www/socket/inner.html | 12 ++ www/socket/main.js | 288 ++++++++++++++++++++++++++++++ www/socket/realtime-input.js | 329 +++++++++++++++++++++++++++++++++++ www/socket/toolbar.js | 233 +++++++++++++++++++++++++ 5 files changed, 903 insertions(+) create mode 100644 www/socket/index.html create mode 100644 www/socket/inner.html create mode 100644 www/socket/main.js create mode 100644 www/socket/realtime-input.js create mode 100644 www/socket/toolbar.js diff --git a/www/socket/index.html b/www/socket/index.html new file mode 100644 index 000000000..6ee2a8596 --- /dev/null +++ b/www/socket/index.html @@ -0,0 +1,41 @@ + + + + + + + + + + + + + diff --git a/www/socket/inner.html b/www/socket/inner.html new file mode 100644 index 000000000..bf79dcd0d --- /dev/null +++ b/www/socket/inner.html @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/www/socket/main.js b/www/socket/main.js new file mode 100644 index 000000000..cbb7f66ed --- /dev/null +++ b/www/socket/main.js @@ -0,0 +1,288 @@ +define([ + '/api/config?cb=' + Math.random().toString(16).substring(2), + '/common/messages.js', + '/common/crypto.js', + '/socket/realtime-input.js', + '/common/convert.js', + '/socket/toolbar.js', + '/common/cursor.js', + '/common/json-ot.js', + '/bower_components/diff-dom/diffDOM.js', + '/bower_components/jquery/dist/jquery.min.js', + '/customize/pad.js' +], function (Config, Messages, Crypto, realtimeInput, Convert, Toolbar, Cursor, JsonOT) { + var $ = window.jQuery; + var ifrw = $('#pad-iframe')[0].contentWindow; + var Ckeditor; // to be initialized later... + var DiffDom = window.diffDOM; + + window.Convert = Convert; + + window.Toolbar = Toolbar; + + var userName = Crypto.rand64(8), + toolbar; + + var module = {}; + + var andThen = function (Ckeditor) { + $(window).on('hashchange', function() { + window.location.reload(); + }); + if (window.location.href.indexOf('#') === -1) { + window.location.href = window.location.href + '#' + Crypto.genKey(); + return; + } + + var fixThings = false; + var key = Crypto.parseKey(window.location.hash.substring(1)); + var editor = window.editor = Ckeditor.replace('editor1', { + // https://dev.ckeditor.com/ticket/10907 + needsBrFiller: fixThings, + needsNbspFiller: fixThings, + removeButtons: 'Source,Maximize', + // magicline plugin inserts html crap into the document which is not part of the + // document itself and causes problems when it's sent across the wire and reflected back + // but we filter it now, so that's ok. + removePlugins: 'resize' + }); + + editor.on('instanceReady', function (Ckeditor) { + editor.execCommand('maximize'); + var documentBody = ifrw.$('iframe')[0].contentDocument.body; + + documentBody.innerHTML = Messages.initialState; + + var inner = window.inner = documentBody; + var cursor = window.cursor = Cursor(inner); + + var $textarea = $('#feedback'); + + var setEditable = function (bool) { + // inner.style.backgroundColor = bool? 'unset': 'grey'; + inner.setAttribute('contenteditable', bool); + }; + + // don't let the user edit until the pad is ready + setEditable(false); + + var diffOptions = { + preDiffApply: function (info) { + + // no use trying to recover the cursor if it doesn't exist + if (!cursor.exists()) { return; } + + /* frame is either 0, 1, 2, or 3, depending on which + cursor frames were affected: none, first, last, or both + */ + var frame = info.frame = cursor.inNode(info.node); + + if (!frame) { return; } + + if (typeof info.diff.oldValue === 'string' && typeof info.diff.newValue === 'string') { + var pushes = cursor.pushDelta(info.diff.oldValue, info.diff.newValue); + + if (frame & 1) { + // push cursor start if necessary + if (pushes.commonStart < cursor.Range.start.offset) { + cursor.Range.start.offset += pushes.delta; + } + } + if (frame & 2) { + // push cursor end if necessary + if (pushes.commonStart < cursor.Range.end.offset) { + cursor.Range.end.offset += pushes.delta; + } + } + } + }, + postDiffApply: function (info) { + if (info.frame) { + if (info.node) { + if (info.frame & 1) { cursor.fixStart(info.node); } + if (info.frame & 2) { cursor.fixEnd(info.node); } + } else { console.error("info.node did not exist"); } + + var sel = cursor.makeSelection(); + var range = cursor.makeRange(); + + cursor.fixSelection(sel, range); + } + } + }; + + var initializing = true; + + var assertStateMatches = function () { + var userDocState = module.realtimeInput.realtime.getUserDoc(); + var currentState = $textarea.val(); + if (currentState !== userDocState) { + console.log({ + userDocState: userDocState, + currentState: currentState + }); + throw new Error("currentState !== userDocState"); + } + }; + + // apply patches, and try not to lose the cursor in the process! + var applyHjson = function (shjson) { + setEditable(false); + var userDocStateDom = Convert.hjson.to.dom(JSON.parse(shjson)); + userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf + var DD = new DiffDom(diffOptions); + + assertStateMatches(); + + var patch = (DD).diff(inner, userDocStateDom); + (DD).apply(inner, patch); + + // push back to the textarea so we get a userDocState + setEditable(true); + }; + + var onRemote = function (shjson) { + if (initializing) { return; } + + // remember where the cursor is + cursor.update(); + + // TODO call propogate + + // build a dom from HJSON, diff, and patch the editor + applyHjson(shjson); + }; + + var onInit = function (info) { + var $bar = $('#pad-iframe')[0].contentWindow.$('#cke_1_toolbox'); + toolbar = info.realtime.toolbar = Toolbar.create($bar, userName, info.realtime); + /* TODO handle disconnects and such*/ + }; + + var onReady = function (info) { + console.log("Unlocking editor"); + initializing = false; + setEditable(true); + applyHjson($textarea.val()); + $textarea.trigger('keyup'); + }; + + var onAbort = function (info) { + console.log("Aborting the session!"); + // stop the user from continuing to edit + setEditable(false); + // TODO inform them that the session was torn down + toolbar.failed(); + }; + + var realtimeOptions = { + // configuration :D + doc: inner, + // first thing called + onInit: onInit, + + onReady: onReady, + + // when remote changes occur + onRemote: onRemote, + + // handle aborts + onAbort: onAbort, + + // really basic operational transform + transformFunction : JsonOT.validate + // pass in websocket/netflux object TODO + }; + + var rti = module.realtimeInput = window.rti = realtimeInput.start($textarea[0], // synced element + Config.websocketURL, // websocketURL, ofc + userName, // userName + key.channel, // channelName + key.cryptKey, // key + realtimeOptions); + + $textarea.val(JSON.stringify(Convert.dom.to.hjson(inner))); + + var isNotMagicLine = function (el) { + // factor as: + // return !(el.tagName === 'SPAN' && el.contentEditable === 'false'); + var filter = (el.tagName === 'SPAN' && el.contentEditable === 'false'); + if (filter) { + console.log("[hyperjson.serializer] prevented an element" + + "from being serialized:", el); + return false; + } + return true; + }; + + var propogate = function () { + var hjson = Convert.core.hyperjson.fromDOM(inner, isNotMagicLine); + + $textarea.val(JSON.stringify(hjson)); + rti.bumpSharejs(); + }; + + var testInput = window.testInput = function (el, offset) { + var i = 0, + j = offset, + input = "The quick red fox jumped over the lazy brown dog. ", + l = input.length, + errors = 0, + max_errors = 15, + interval; + var cancel = function () { + if (interval) { window.clearInterval(interval); } + }; + + interval = window.setInterval(function () { + propogate(); + try { + el.replaceData(j, 0, input.charAt(i)); + } catch (err) { + errors++; + if (errors >= max_errors) { + console.log("Max error number exceeded"); + cancel(); + } + + console.error(err); + var next = document.createTextNode(""); + el.parentNode.appendChild(next); + el = next; + j = 0; + } + i = (i + 1) % l; + j++; + }, 200); + + return { + cancel: cancel + }; + }; + + var easyTest = window.easyTest = function () { + cursor.update(); + var start = cursor.Range.start; + var test = testInput(start.el, start.offset); + //window.rti.bumpSharejs(); + propogate(); + return test; + }; + + editor.on('change', propogate); + }); + }; + + var interval = 100; + var first = function () { + Ckeditor = ifrw.CKEDITOR; + if (Ckeditor) { + andThen(Ckeditor); + } else { + console.log("Ckeditor was not defined. Trying again in %sms",interval); + setTimeout(first, interval); + } + }; + + $(first); +}); diff --git a/www/socket/realtime-input.js b/www/socket/realtime-input.js new file mode 100644 index 000000000..556a4b3c8 --- /dev/null +++ b/www/socket/realtime-input.js @@ -0,0 +1,329 @@ +/* + * 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 . + */ +define([ + '/common/messages.js', + '/bower_components/reconnectingWebsocket/reconnecting-websocket.js', + '/common/crypto.js', + '/common/sharejs_textarea.js', + '/common/chainpad.js', + '/bower_components/jquery/dist/jquery.min.js', +], function (Messages, ReconnectingWebSocket, Crypto, 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) + { + /* + we use docBody for the purposes of CKEditor. + because otherwise special keybindings like ctrl-b and ctrl-i + would open bookmarks and info instead of applying bold/italic styles + */ + if (docBody) { + bindEvents(docBody, + ['textInput', 'keydown', 'keyup', 'select', 'cut', 'paste'], + onEvent, + unbind); + } + bindEvents(textarea, + ['mousedown','mouseup','click','change'], + onEvent, + unbind); + }; + + /* websocket stuff */ + 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; + } + }; + + // TODO before removing websocket implementation + // bind abort to onLeaving + 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; + }; + /* end websocket stuff */ + + var start = module.exports.start = + function (textarea, websocketUrl, userName, channel, cryptKey, config) + { + + var passwd = 'y'; + + // make sure configuration is defined + config = config || {}; + + var doc = config.doc || null; + + // trying to deprecate onRemote, prefer loading it via the conf + var onRemote = config.onRemote || null; + + var transformFunction = config.transformFunction || null; + + var socket; + + if (config.socketAdaptor) { + // do netflux stuff + } else { + 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 () {}; + + var toReturn = { + socket: socket + }; + + socket.onOpen.push(function (evt) { + if (!initializing) { + console.log("Starting"); + // realtime is passed around as an attribute of the socket + // FIXME?? + socket.realtime.start(); + return; + } + + var realtime = toReturn.realtime = socket.realtime = ChainPad.create(userName, + passwd, + channel, + $(textarea).val(), + { + transformFunction: config.transformFunction + }); + + if (config.onInit) { + // extend as you wish + config.onInit({ + realtime: realtime + }); + } + + onEvent = function () { + // This looks broken + if (isErrorState || initializing) { return; } + }; + + 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. + initializing = false; + + // execute an onReady callback if one was supplied + // pass an object so we can extend this later + if (config.onReady) { + // extend as you wish + config.onReady({ + userList: userList + }); + } + }); + + var whoami = new RegExp(userName.replace(/[\/\+]/g, function (c) { + return '\\' +c; + })); + + // when you receive a message... + socket.onMessage.push(function (evt) { + verbose(evt.data); + if (isErrorState) { return; } + + var message = Crypto.decrypt(evt.data, cryptKey); + verbose(message); + allMessages.push(message); + if (!initializing) { + if (PARANOIA) { + // FIXME this is out of sync with the application logic + onEvent(); + } + } + realtime.message(message); + if (/\[5,/.test(message)) { verbose("pong"); } + + if (!initializing) { + if (/\[2,/.test(message)) { + //verbose("Got a patch"); + if (whoami.test(message)) { + //verbose("Received own message"); + } else { + //verbose("Received remote message"); + // obviously this is only going to get called if + if (onRemote) { onRemote(realtime.getUserDoc()); } + } + } + } + }); + + // 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; + + // TODO confirm that we can rely on netflux API + var socketChecker = setInterval(function () { + if (checkSocket(socket)) { + warn("Socket disconnected!"); + + recoverableErrorCount += 1; + + if (recoverableErrorCount >= MAX_RECOVERABLE_ERRORS) { + warn("Giving up!"); + abort(socket, realtime); + if (config.onAbort) { + config.onAbort({ + socket: socket + }); + } + if (socketChecker) { clearInterval(socketChecker); } + } + } else { + // it's working as expected, continue + } + }, 200); + + bindAllEvents(textarea, doc, onEvent, false); + + // attach textarea + // NOTE: should be able to remove the websocket without damaging this + sharejs.attach(textarea, realtime); + + realtime.start(); + debug('started'); + + bump = realtime.bumpSharejs; + }); + + toReturn.onEvent = function () { onEvent(); }; + toReturn.bumpSharejs = function () { bump(); }; + + return toReturn; + }; + return module.exports; +}); diff --git a/www/socket/toolbar.js b/www/socket/toolbar.js new file mode 100644 index 000000000..4159ea0ac --- /dev/null +++ b/www/socket/toolbar.js @@ -0,0 +1,233 @@ +define([ + '/common/messages.js' +], function (Messages) { + + /** Id of the element for getting debug info. */ + var DEBUG_LINK_CLS = 'rtwysiwyg-debug-link'; + + /** Id of the div containing the user list. */ + var USER_LIST_CLS = 'rtwysiwyg-user-list'; + + /** Id of the div containing the lag info. */ + var LAG_ELEM_CLS = 'rtwysiwyg-lag'; + + /** The toolbar class which contains the user list, debug link and lag. */ + var TOOLBAR_CLS = 'rtwysiwyg-toolbar'; + + /** Key in the localStore which indicates realtime activity should be disallowed. */ + var LOCALSTORAGE_DISALLOW = 'rtwysiwyg-disallow'; + + var SPINNER_DISAPPEAR_TIME = 3000; + var SPINNER = [ '-', '\\', '|', '/' ]; + + var uid = function () { + return 'rtwysiwyg-uid-' + String(Math.random()).substring(2); + }; + + var createRealtimeToolbar = function ($container) { + var id = uid(); + $container.prepend( + '
' + + '
' + + '
' + + '
' + ); + var toolbar = $container.find('#'+id); + toolbar.append([ + '' + ].join('\n')); + return toolbar; + }; + + var createEscape = function ($container) { + var id = uid(); + $container.append('
⇐ Back
'); + var $ret = $container.find('#'+id); + $ret.on('click', function () { + window.location.href = '/'; + }); + return $ret[0]; + }; + + var createSpinner = function ($container) { + var id = uid(); + $container.append(''); + return $container.find('#'+id)[0]; + }; + + var kickSpinner = function (spinnerElement, reversed) { + var txt = spinnerElement.textContent || '-'; + var inc = (reversed) ? -1 : 1; + spinnerElement.textContent = SPINNER[(SPINNER.indexOf(txt) + inc) % SPINNER.length]; + if (spinnerElement.timeout) { clearTimeout(spinnerElement.timeout); } + spinnerElement.timeout = setTimeout(function () { + spinnerElement.textContent = ''; + }, SPINNER_DISAPPEAR_TIME); + }; + + var createUserList = function ($container) { + var id = uid(); + $container.append('
'); + return $container.find('#'+id)[0]; + }; + + var updateUserList = function (myUserName, listElement, userList) { + var meIdx = userList.indexOf(myUserName); + if (meIdx === -1) { + listElement.textContent = Messages.synchronizing; + return; + } + if (userList.length === 1) { + listElement.textContent = Messages.editingAlone; + } else if (userList.length === 2) { + listElement.textContent = Messages.editingWithOneOtherPerson; + } else { + listElement.textContent = Messages.editingWith + ' ' + (userList.length - 1) + ' ' + Messages.otherPeople; + } + }; + + var createLagElement = function ($container) { + var id = uid(); + $container.append('
'); + return $container.find('#'+id)[0]; + }; + + var checkLag = function (realtime, lagElement) { + var lag = realtime.getLag(); + var lagSec = lag.lag/1000; + var lagMsg = Messages.lag + ' '; + if (lag.waiting && lagSec > 1) { + lagMsg += "?? " + Math.floor(lagSec); + } else { + lagMsg += lagSec; + } + lagElement.textContent = lagMsg; + }; + + // this is a little hack, it should go in it's own file. + // FIXME ok, so let's put it in its own file then + // TODO there should also be a 'clear recent pads' button + var rememberPad = function () { + // FIXME, this is overly complicated, use array methods + var recentPadsStr = localStorage['CryptPad_RECENTPADS']; + var recentPads = []; + if (recentPadsStr) { recentPads = JSON.parse(recentPadsStr); } + // TODO use window.location.hash or something like that + if (window.location.href.indexOf('#') === -1) { return; } + var now = new Date(); + var out = []; + for (var i = recentPads.length; i >= 0; i--) { + if (recentPads[i] && + // TODO precompute this time value, maybe make it configurable? + // FIXME precompute the date too, why getTime every time? + now.getTime() - recentPads[i][1] < (1000*60*60*24*30) && + recentPads[i][0] !== window.location.href) + { + out.push(recentPads[i]); + } + } + out.push([window.location.href, now.getTime()]); + localStorage['CryptPad_RECENTPADS'] = JSON.stringify(out); + }; + + var create = function ($container, myUserName, realtime) { + var toolbar = createRealtimeToolbar($container); + createEscape(toolbar.find('.rtwysiwyg-toolbar-leftside')); + var userListElement = createUserList(toolbar.find('.rtwysiwyg-toolbar-leftside')); + var spinner = createSpinner(toolbar.find('.rtwysiwyg-toolbar-rightside')); + var lagElement = createLagElement(toolbar.find('.rtwysiwyg-toolbar-rightside')); + + rememberPad(); + + var connected = false; + + realtime.onUserListChange(function (userList) { + if (userList.indexOf(myUserName) !== -1) { connected = true; } + if (!connected) { return; } + updateUserList(myUserName, userListElement, userList); + }); + + var ks = function () { + if (connected) { kickSpinner(spinner, false); } + }; + + realtime.onPatch(ks); + // Try to filter out non-patch messages, doesn't have to be perfect this is just the spinner + realtime.onMessage(function (msg) { if (msg.indexOf(':[2,') > -1) { ks(); } }); + + setInterval(function () { + if (!connected) { return; } + checkLag(realtime, lagElement); + }, 3000); + + return { + failed: function () { + connected = false; + userListElement.textContent = ''; + lagElement.textContent = ''; + }, + reconnecting: function () { + connected = false; + userListElement.textContent = Messages.reconnecting; + lagElement.textContent = ''; + }, + connected: function () { + connected = true; + } + }; + }; + + return { create: create }; +}); From e066730b6835bf1645d9d67302fe590267bd1f1d Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 24 Mar 2016 12:46:35 +0100 Subject: [PATCH 034/257] add notes about how hyperjson is to be used --- www/common/hyperjson.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/www/common/hyperjson.js b/www/common/hyperjson.js index 31a2caf08..880a7fe3e 100644 --- a/www/common/hyperjson.js +++ b/www/common/hyperjson.js @@ -47,6 +47,13 @@ define([], function () { 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){ if(!el.tagName && el.nodeType === Node.TEXT_NODE){ return el.textContent; From 42c972116b6c497ee333053557008f55805feeb8 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 24 Mar 2016 12:50:04 +0100 Subject: [PATCH 035/257] leave TODO re: diffDOM and magicline Hyperjson guarantees that magicline elements are not sent across the wire. DiffDOM must guarantee that magicline elements will not be removed on remote edits. --- www/socket/main.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/www/socket/main.js b/www/socket/main.js index cbb7f66ed..a4c60afa8 100644 --- a/www/socket/main.js +++ b/www/socket/main.js @@ -68,6 +68,12 @@ define([ var diffOptions = { preDiffApply: function (info) { + /* TODO DiffDOM will filter out magicline plugin elements + in practice this will make it impossible to use it + while someone else is typing, which could be annoying + + we should check when such an element is going to be + removed, and prevent that from happening. */ // no use trying to recover the cursor if it doesn't exist if (!cursor.exists()) { return; } @@ -190,8 +196,8 @@ define([ onAbort: onAbort, // really basic operational transform + // reject patch if it results in invalid JSON transformFunction : JsonOT.validate - // pass in websocket/netflux object TODO }; var rti = module.realtimeInput = window.rti = realtimeInput.start($textarea[0], // synced element From 5ef7e29a9bf4966a078c98e483602fff22c0a7b1 Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Fri, 1 Apr 2016 17:58:33 +0200 Subject: [PATCH 036/257] Add the latest changes from _socket into the netflux pad --- www/common/realtime-input.js | 78 ++++------- www/pad/index.html | 6 + www/pad/main.js | 253 ++++++++++++++++++++++++----------- 3 files changed, 204 insertions(+), 133 deletions(-) diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js index 9bc3ebc62..635af830a 100644 --- a/www/common/realtime-input.js +++ b/www/common/realtime-input.js @@ -20,10 +20,10 @@ define([ '/common/netflux.js', '/common/crypto.js', '/common/toolbar.js', - '/common/sharejs_textarea.js', + '/_socket/text-patcher.js', '/common/chainpad.js', '/bower_components/jquery/dist/jquery.min.js', -], function (Messages, Netflux, Crypto, Toolbar, sharejs) { +], function (Messages, Netflux, Crypto, Toolbar, TextPatcher) { var $ = window.jQuery; var ChainPad = window.ChainPad; var PARANOIA = true; @@ -61,25 +61,6 @@ define([ } }; - var bindAllEvents = function (textarea, docBody, onEvent, unbind) - { - /* - we use docBody for the purposes of CKEditor. - because otherwise special keybindings like ctrl-b and ctrl-i - would open bookmarks and info instead of applying bold/italic styles - */ - if (docBody) { - bindEvents(docBody, - ['textInput', 'keydown', 'keyup', 'select', 'cut', 'paste'], - onEvent, - unbind); - } - bindEvents(textarea, - ['mousedown','mouseup','click','change'], - onEvent, - unbind); - }; - var getParameterByName = function (name, url) { if (!url) { url = window.location.href; } name = name.replace(/[\[\]]/g, "\\$&"); @@ -93,7 +74,6 @@ define([ var start = module.exports.start = function (config) { - var textarea = config.textarea; var websocketUrl = config.websocketURL; var webrtcUrl = config.webrtcURL; var userName = config.userName; @@ -106,19 +86,16 @@ define([ var doc = config.doc || null; - // trying to deprecate onRemote, prefer loading it via the conf - var onRemote = config.onRemote || null; - - // define this in case it gets called before the rest of our stuff is ready. - var onEvent = function () { }; - var allMessages = []; var initializing = true; var recoverableErrorCount = 0; - var bump = function () {}; + var toReturn = {}; var messagesHistory = []; var chainpadAdapter = {}; var realtime; + + // define this in case it gets called before the rest of our stuff is ready. + var onEvent = toReturn.onEvent = function (newText) { }; var parseMessage = function (msg) { var res ={}; @@ -167,11 +144,11 @@ define([ verbose(message); allMessages.push(message); - if (!initializing) { - if (PARANOIA) { - onEvent(); - } - } + // if (!initializing) { + // if (toReturn.onLocal) { + // toReturn.onLocal(); + // } + // } realtime.message(message); if (/\[5,/.test(message)) { verbose("pong"); } @@ -183,7 +160,11 @@ define([ } else { //verbose("Received remote message"); // obviously this is only going to get called if - if (onRemote) { onRemote(realtime.getUserDoc()); } + if (config.onRemote) { + config.onRemote({ + realtime: realtime + }); + } } } } @@ -263,7 +244,7 @@ define([ return ChainPad.create(userName, passwd, channel, - $(textarea).val(), + config.initialState || {}, { transformFunction: config.transformFunction }); @@ -286,7 +267,9 @@ define([ // execute an onReady callback if one was supplied if (config.onReady) { - config.onReady(); + config.onReady({ + realtime: realtime + }); } } @@ -334,16 +317,10 @@ define([ hc.send(JSON.stringify(['GET_HISTORY', wc.id])); } - // Check the connection to the channel - if(!rtc) { - // TODO - // checkConnection(wc); - } - - bindAllEvents(textarea, doc, onEvent, false); - - sharejs.attach(textarea, realtime); - bump = realtime.bumpSharejs; + + toReturn.patchText = TextPatcher.create({ + realtime: realtime + }); realtime.start(); }; @@ -401,12 +378,7 @@ define([ } }; - return { - onEvent: function () { - onEvent(); - }, - bumpSharejs: function () { bump(); } - }; + return toReturn; }; return module.exports; }); diff --git a/www/pad/index.html b/www/pad/index.html index 2116d14c9..fccdfff02 100644 --- a/www/pad/index.html +++ b/www/pad/index.html @@ -38,6 +38,12 @@ right: 0px; top: 70px; } + #debug button { + visibility: hidden; + } + #debug:hover button { + visibility: visible; + } diff --git a/www/pad/main.js b/www/pad/main.js index 3c8787ea8..02d3006e5 100644 --- a/www/pad/main.js +++ b/www/pad/main.js @@ -3,24 +3,46 @@ define([ '/common/messages.js', '/common/crypto.js', '/common/realtime-input.js', - '/common/convert.js', + '/common/hyperjson.js', + '/common/hyperscript.js', '/common/toolbar.js', '/common/cursor.js', '/common/json-ot.js', '/bower_components/diff-dom/diffDOM.js', '/bower_components/jquery/dist/jquery.min.js', '/customize/pad.js' -], function (Config, Messages, Crypto, realtimeInput, Convert, Toolbar, Cursor, JsonOT) { +], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT) { var $ = window.jQuery; var ifrw = $('#pad-iframe')[0].contentWindow; var Ckeditor; // to be initialized later... var DiffDom = window.diffDOM; window.Toolbar = Toolbar; + window.Hyperjson = Hyperjson; + + var hjsonToDom = function (H) { + return Hyperjson.callOn(H, Hyperscript); + }; + + var module = window.REALTIME_MODULE = { + localChangeInProgress: 0 + }; var userName = Crypto.rand64(8), toolbar; + var isNotMagicLine = function (el) { + // factor as: + // return !(el.tagName === 'SPAN' && el.contentEditable === 'false'); + var filter = (el.tagName === 'SPAN' && el.contentEditable === 'false'); + if (filter) { + console.log("[hyperjson.serializer] prevented an element" + + "from being serialized:", el); + return false; + } + return true; + }; + var andThen = function (Ckeditor) { $(window).on('hashchange', function() { window.location.reload(); @@ -39,7 +61,7 @@ define([ removeButtons: 'Source,Maximize', // magicline plugin inserts html crap into the document which is not part of the // document itself and causes problems when it's sent across the wire and reflected back - removePlugins: 'magicline,resize' + removePlugins: 'resize' }); editor.on('instanceReady', function (Ckeditor) { @@ -51,8 +73,6 @@ define([ var inner = window.inner = documentBody; var cursor = window.cursor = Cursor(inner); - var $textarea = $('#feedback'); - var setEditable = function (bool) { inner.setAttribute('contenteditable', (typeof (bool) !== 'undefined'? bool : true)); @@ -63,6 +83,31 @@ define([ var diffOptions = { preDiffApply: function (info) { + /* DiffDOM will filter out magicline plugin elements + in practice this will make it impossible to use it + while someone else is typing, which could be annoying. + + we should check when such an element is going to be + removed, and prevent that from happening. */ + if (info.node && info.node.tagName === 'SPAN' && + info.node.contentEditable === "true") { + // it seems to be a magicline plugin element... + if (info.diff.action === 'removeElement') { + // and you're about to remove it... + // this probably isn't what you want + + /* + I have never seen this in the console, but the + magic line is still getting removed on remote + edits. This suggests that it's getting removed + by something other than diffDom. + */ + console.log("preventing removal of the magic line!"); + + // return true to prevent diff application + return true; + } + } // no use trying to recover the cursor if it doesn't exist if (!cursor.exists()) { return; } @@ -74,21 +119,8 @@ define([ if (!frame) { return; } - var debug = info.debug = { - frame: frame, - action: info.diff.action, - cursorLength: cursor.getLength(), - node: info.node - }; - - if (info.diff.oldValue) { debug.oldValue = info.diff.oldValue; } - if (info.diff.newValue) { debug.newValue = info.diff.newValue; } if (typeof info.diff.oldValue === 'string' && typeof info.diff.newValue === 'string') { var pushes = cursor.pushDelta(info.diff.oldValue, info.diff.newValue); - debug.commonStart = pushes.commonStart; - debug.commonEnd = pushes.commonEnd; - debug.insert = pushes.insert; - debug.remove = pushes.remove; if (frame & 1) { // push cursor start if necessary @@ -103,8 +135,6 @@ define([ } } } - console.log("###################################"); - console.log(debug); }, postDiffApply: function (info) { if (info.frame) { @@ -121,6 +151,8 @@ define([ } }; + var now = function () { return new Date().getTime(); }; + var initializing = true; var userList = {}; // List of pretty name of all users (mapped with their server ID) var toolbarList; // List of users still connected to the channel (server IDs) @@ -130,11 +162,11 @@ define([ toolbarList.onChange(userList); } }; - + var myData = {}; var myUserName = ''; // My "pretty name" var myID; // My server ID - + var setMyID = function(info) { myID = info.myID || null; myUserName = myID; @@ -147,7 +179,7 @@ define([ if (newName && newName.trim()) { var myUserNameTemp = newName.trim(); if(newName.trim().length > 32) { - myUserNameTemp = myUserNameTemp.substr(0, 31); + myUserNameTemp = myUserNameTemp.substr(0, 32); } myUserName = myUserNameTemp; myData[myID] = { @@ -159,33 +191,87 @@ define([ }); }; + var DD = new DiffDom(diffOptions); + // apply patches, and try not to lose the cursor in the process! var applyHjson = function (shjson) { - var hjson = JSON.parse(shjson); - var peerUserList = hjson[hjson.length-1]; - if(peerUserList.metadata) { - var userData = peerUserList.metadata; - addToUserList(userData); - delete hjson[hjson.length-1]; - } - var userDocStateDom = Convert.hjson.to.dom(hjson); + // var hjson = JSON.parse(shjson); + // var peerUserList = hjson[hjson.length-1]; + // if(peerUserList.metadata) { + // var userData = peerUserList.metadata; + // addToUserList(userData); + // delete hjson[hjson.length-1]; + // } + var userDocStateDom = hjsonToDom(JSON.parse(shjson)); userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf - var DD = new DiffDom(diffOptions); var patch = (DD).diff(inner, userDocStateDom); (DD).apply(inner, patch); }; - var onRemote = function (shjson) { + var realtimeOptions = { + // provide initialstate... + initialState: JSON.stringify(Hyperjson.fromDOM(inner, isNotMagicLine)), + + // the websocket URL (deprecated?) + websocketURL: Config.websocketURL, + webrtcURL: Config.webrtcURL, + + // our username + userName: userName, + + // the channel we will communicate over + channel: key.channel, + + // our encryption key + cryptKey: key.cryptKey, + + // configuration :D + doc: inner, + + setMyID: setMyID, + + // really basic operational transform + transformFunction : JsonOT.validate + // pass in websocket/netflux object TODO + }; + + var onRemote = realtimeOptions.onRemote = function (info) { if (initializing) { return; } + var shjson = info.realtime.getUserDoc(); + // remember where the cursor is cursor.update(); + // Extract the user list (metadata) from the hyperjson + var hjson = JSON.parse(shjson); + var peerUserList = hjson[hjson.length-1]; + if(peerUserList.metadata) { + var userData = peerUserList.metadata; + // Update the local user data + userList = userData; + // Send the new data to the toolbar + if(toolbarList && typeof toolbarList.onChange === "function") { + toolbarList.onChange(userList); + } + hjson.pop(); + } + // build a dom from HJSON, diff, and patch the editor applyHjson(shjson); + + // Build a new stringified Chainpad hyperjson without metadata to compare with the one build from the dom + shjson = JSON.stringify(hjson); + + var hjson2 = Hyperjson.fromDOM(inner); + var shjson2 = JSON.stringify(hjson2); + if (shjson2 !== shjson) { + console.error("shjson2 !== shjson"); + module.realtimeInput.patchText(shjson2); + } }; - var onInit = function (info) { + var onInit = realtimeOptions.onInit = function (info) { var $bar = $('#pad-iframe')[0].contentWindow.$('#cke_1_toolbox'); toolbarList = info.userList; var config = { @@ -197,15 +283,15 @@ define([ /* TODO handle disconnects and such*/ }; - var onReady = function (info) { + var onReady = realtimeOptions.onReady = function (info) { console.log("Unlocking editor"); initializing = false; setEditable(true); - applyHjson($textarea.val()); - $textarea.trigger('keyup'); + var shjson = info.realtime.getUserDoc(); + applyHjson(shjson); }; - var onAbort = function (info) { + var onAbort = realtimeOptions.onAbort = function (info) { console.log("Aborting the session!"); // stop the user from continuing to edit setEditable(false); @@ -213,57 +299,64 @@ define([ toolbar.failed(); }; - - - var realtimeOptions = { - // the textarea that we will sync - textarea: $textarea[0], - // the websocket URL (deprecated?) - websocketURL: Config.websocketURL, - webrtcURL: Config.webrtcURL, - // our username - userName: userName, - // the channel we will communicate over - channel: key.channel, - - // our encryption key - cryptKey: key.cryptKey, - - // configuration :D - doc: inner, - // first thing called - onInit: onInit, - - onReady: onReady, - - setMyID: setMyID, - - // when remote changes occur - onRemote: onRemote, - // handle aborts - onAbort: onAbort, + var rti = module.realtimeInput = realtimeInput.start(realtimeOptions); - // really basic operational transform - transformFunction : JsonOT.validate - // pass in websocket/netflux object TODO + /* catch `type="_moz"` before it goes over the wire */ + var brFilter = function (hj) { + if (hj[1].type === '_moz') { hj[1].type = undefined; } + return hj; }; - var rti = window.rti = realtimeInput.start(realtimeOptions); - - $textarea.val(JSON.stringify(Convert.dom.to.hjson(inner))); - - editor.on('change', function () { - var hjson = Convert.core.hyperjson.fromDOM(inner); - if(myData !== {}) { + // $textarea.val(JSON.stringify(Convert.dom.to.hjson(inner))); + + /* It's incredibly important that you assign 'rti.onLocal' + It's used inside of realtimeInput to make sure that all changes + make it into chainpad. + + It's being assigned this way because it can't be passed in, and + and can't be easily returned from realtime input without making + the code less extensible. + */ + var propogate = rti.onLocal = function () { + /* if the problem were a matter of external patches being + applied while a local patch were in progress, then we would + expect to be able to check and find + 'module.localChangeInProgress' with a non-zero value while + we were applying a remote change. + */ + var hjson = Hyperjson.fromDOM(inner, isNotMagicLine, brFilter); + if(Object.keys(myData).length > 0) { hjson[hjson.length] = {metadata: userList}; } - $textarea.val(JSON.stringify(hjson)); - rti.bumpSharejs(); - }); + var shjson = JSON.stringify(hjson); + if (!rti.patchText(shjson)) { + return; + } + rti.onEvent(shjson); + }; + + /* hitting enter makes a new line, but places the cursor inside + of the
instead of the

. This makes it such that you + cannot type until you click, which is rather unnacceptable. + If the cursor is ever inside such a
, you probably want + to push it out to the parent element, which ought to be a + paragraph tag. This needs to be done on keydown, otherwise + the first such keypress will not be inserted into the P. */ + inner.addEventListener('keydown', cursor.brFix); + + editor.on('change', propogate); + // editor.on('change', function () { + // var hjson = Convert.core.hyperjson.fromDOM(inner); + // if(myData !== {}) { + // hjson[hjson.length] = {metadata: userList}; + // } + // $textarea.val(JSON.stringify(hjson)); + // rti.bumpSharejs(); + // }); }); }; From ba4faea939935e434abf49fe882f4697b4edc92a Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Tue, 5 Apr 2016 12:17:43 +0200 Subject: [PATCH 037/257] Update the pads to run with the latest improvements to the websocket server --- NetfluxWebsocketSrv.js | 198 +++++++++++++++++++++++++++++++++++ customize.dist/index.html | 4 +- server.js | 3 +- www/common/netflux.js | 42 ++++++-- www/common/realtime-input.js | 21 ++-- www/pad/main.js | 24 +++-- 6 files changed, 261 insertions(+), 31 deletions(-) create mode 100644 NetfluxWebsocketSrv.js diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js new file mode 100644 index 000000000..4d59f25d2 --- /dev/null +++ b/NetfluxWebsocketSrv.js @@ -0,0 +1,198 @@ +;(function () { 'use strict'; +const Crypto = require('crypto'); +const LogStore = require('./storage/LogStore'); + +const LAG_MAX_BEFORE_DISCONNECT = 30000; +const LAG_MAX_BEFORE_PING = 15000; +const HISTORY_KEEPER_ID = Crypto.randomBytes(8).toString('hex'); + +const USE_HISTORY_KEEPER = true; + +let dropUser; + +const now = function () { return (new Date()).getTime(); }; + +const sendMsg = function (ctx, user, msg) { + try { + console.log('<' + JSON.stringify(msg)); + user.socket.send(JSON.stringify(msg)); + } catch (e) { + console.log(e.stack); + dropUser(ctx, user); + } +}; + +const sendChannelMessage = function (ctx, channel, msgStruct) { + msgStruct.unshift(0); + channel.forEach(function (user) { + if(msgStruct[2] !== 'MSG' || user.id !== msgStruct[1]) { // We don't want to send back a message to its sender, in order to save bandwidth + sendMsg(ctx, user, msgStruct); + } + }); + if (USE_HISTORY_KEEPER && msgStruct[2] === 'MSG') { + ctx.store.message(channel.id, JSON.stringify(msgStruct), function () { }); + } +}; + +dropUser = function (ctx, user) { + if (user.socket.readyState !== 2 /* WebSocket.CLOSING */ + && user.socket.readyState !== 3 /* WebSocket.CLOSED */) + { + try { + user.socket.close(); + } catch (e) { + console.log("Failed to disconnect ["+user.id+"], attempting to terminate"); + try { + user.socket.terminate(); + } catch (ee) { + console.log("Failed to terminate ["+user.id+"] *shrug*"); + } + } + } + delete ctx.users[user.id]; + Object.keys(ctx.channels).forEach(function (chanName) { + let chan = ctx.channels[chanName]; + let idx = chan.indexOf(user); + if (idx < 0) { return; } + console.log("Removing ["+user.id+"] from channel ["+chanName+"]"); + chan.splice(idx, 1); + if (chan.length === 0) { + console.log("Removing empty channel ["+chanName+"]"); + delete ctx.channels[chanName]; + } else { + sendChannelMessage(ctx, chan, [user.id, 'LEAVE', chanName, 'Quit: [ dropUser() ]']); + } + }); +}; + +const getHistory = function (ctx, channelName, handler) { + ctx.store.getMessages(channelName, function (msgStr) { handler(JSON.parse(msgStr)); }); +}; + +const randName = function () { return Crypto.randomBytes(16).toString('hex'); }; + +const handleMessage = function (ctx, user, msg) { + let json = JSON.parse(msg); + let seq = json.shift(); + let cmd = json[0]; + let obj = json[1]; + + user.timeOfLastMessage = now(); + user.pingOutstanding = false; + + if (cmd === 'JOIN') { + if (obj && obj.length !== 32) { + sendMsg(ctx, user, [seq, 'ERROR', 'ENOENT', obj]); + return; + } + let chanName = obj || randName(); + sendMsg(ctx, user, [seq, 'ACK', chanName]); + let chan = ctx.channels[chanName] = ctx.channels[chanName] || []; + chan.id = chanName; + if (USE_HISTORY_KEEPER) { + sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'JOIN', chanName]); + } + chan.forEach(function (u) { sendMsg(ctx, user, [0, u.id, 'JOIN', chanName]); }); + chan.push(user); + sendChannelMessage(ctx, chan, [user.id, 'JOIN', chanName]); + return; + } + if (cmd === 'MSG') { + if (obj === HISTORY_KEEPER_ID) { + let parsed; + try { parsed = JSON.parse(json[2]); } catch (err) { return; } + if (parsed[0] === 'GET_HISTORY') { + console.log('getHistory ' + parsed[1]); + getHistory(ctx, parsed[1], function (msg) { + sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)]); + }); + sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, 0]); + } + return; + } + if (obj && !ctx.channels[obj] && !ctx.users[obj]) { + sendMsg(ctx, user, [seq, 'ERROR', 'ENOENT', obj]); + return; + } + sendMsg(ctx, user, [seq, 'ACK', '']); + let target; + json.unshift(user.id); + if ((target = ctx.channels[obj])) { + sendChannelMessage(ctx, target, json); + return; + } + if ((target = ctx.users[obj])) { + json.unshift(0); + sendMsg(ctx, target, json); + return; + } + } + if (cmd === 'LEAVE') { + let err; + let chan; + let idx; + if (!obj) { err = 'EINVAL'; } + if (!err && !(chan = ctx.channels[obj])) { err = 'ENOENT'; } + if (!err && (idx = chan.indexOf(user)) === -1) { err = 'NOT_IN_CHAN'; } + if (err) { + sendMsg(ctx, user, [seq, 'ERROR', err]); + return; + } + sendMsg(ctx, user, [seq, 'ACK', chan.id]); + json.unshift(user.id); + sendChannelMessage(ctx, chan, [user.id, 'LEAVE', chan.id]); + chan.splice(idx, 1); + } + if (cmd === 'PING') { + sendMsg(ctx, user, [seq, 'ACK', obj]); + return; + } +}; + +let run = module.exports.run = function (storage, socketServer) { + let ctx = { + users: {}, + channels: {}, + store: LogStore.create('messages.log', storage) + }; + setInterval(function () { + Object.keys(ctx.users).forEach(function (userId) { + let u = ctx.users[userId]; + if (now() - u.timeOfLastMessage > LAG_MAX_BEFORE_DISCONNECT) { + dropUser(ctx, u); + } else if (!u.pingOutstanding && now() - u.timeOfLastMessage > LAG_MAX_BEFORE_PING) { + sendMsg(ctx, u, [0, 'PING', now()]); + u.pingOutstanding = true; + } + }); + }, 5000); + socketServer.on('connection', function(socket) { + let conn = socket.upgradeReq.connection; + let user = { + addr: conn.remoteAddress + '|' + conn.remotePort, + socket: socket, + id: randName(), + timeOfLastMessage: now(), + pingOutstanding: false + }; + ctx.users[user.id] = user; + sendMsg(ctx, user, [0, '', 'IDENT', user.id]); + socket.on('message', function(message) { + console.log('>'+message); + try { + handleMessage(ctx, user, message); + } catch (e) { + console.log(e.stack); + dropUser(ctx, user); + } + }); + socket.on('close', function (evt) { + for (let userId in ctx.users) { + if (ctx.users[userId].socket === socket) { + dropUser(ctx, ctx.users[userId]); + } + } + }); + }); +}; +}()); diff --git a/customize.dist/index.html b/customize.dist/index.html index 15c1285f1..60cefe347 100644 --- a/customize.dist/index.html +++ b/customize.dist/index.html @@ -125,9 +125,9 @@ + + + + +

+ + + + + diff --git a/www/padrtc/inner.html b/www/padrtc/inner.html new file mode 100644 index 000000000..bf79dcd0d --- /dev/null +++ b/www/padrtc/inner.html @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/www/padrtc/main.js b/www/padrtc/main.js new file mode 100644 index 000000000..ba983e799 --- /dev/null +++ b/www/padrtc/main.js @@ -0,0 +1,356 @@ +define([ + '/api/config?cb=' + Math.random().toString(16).substring(2), + '/common/messages.js', + '/common/crypto.js', + '/padrtc/realtime-input.js', + '/common/hyperjson.js', + '/common/hyperscript.js', + '/common/toolbar.js', + '/common/cursor.js', + '/common/json-ot.js', + '/bower_components/diff-dom/diffDOM.js', + '/bower_components/jquery/dist/jquery.min.js', + '/customize/pad.js' +], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT) { + var $ = window.jQuery; + var ifrw = $('#pad-iframe')[0].contentWindow; + var Ckeditor; // to be initialized later... + var DiffDom = window.diffDOM; + + window.Toolbar = Toolbar; + window.Hyperjson = Hyperjson; + + var hjsonToDom = function (H) { + return Hyperjson.callOn(H, Hyperscript); + }; + + var module = window.REALTIME_MODULE = { + localChangeInProgress: 0 + }; + + var userName = Crypto.rand64(8), + toolbar; + + var isNotMagicLine = function (el) { + // factor as: + // return !(el.tagName === 'SPAN' && el.contentEditable === 'false'); + var filter = (el.tagName === 'SPAN' && el.contentEditable === 'false'); + if (filter) { + console.log("[hyperjson.serializer] prevented an element" + + "from being serialized:", el); + return false; + } + return true; + }; + + var andThen = function (Ckeditor) { + // $(window).on('hashchange', function() { + // window.location.reload(); + // }); + var key; + var channel = ''; + if (window.location.href.indexOf('#') === -1) { + key = Crypto.genKey(); + // window.location.href = window.location.href + '#' + Crypto.genKey(); + // return; + } + else { + var hash = window.location.hash.substring(1); + var sep = hash.indexOf('|'); + channel = hash.substr(0,sep); + key = hash.substr(sep+1); + } + + var fixThings = false; + // var key = Crypto.parseKey(window.location.hash.substring(1)); + var editor = window.editor = Ckeditor.replace('editor1', { + // https://dev.ckeditor.com/ticket/10907 + needsBrFiller: fixThings, + needsNbspFiller: fixThings, + removeButtons: 'Source,Maximize', + // magicline plugin inserts html crap into the document which is not part of the + // document itself and causes problems when it's sent across the wire and reflected back + removePlugins: 'resize' + }); + + editor.on('instanceReady', function (Ckeditor) { + editor.execCommand('maximize'); + var documentBody = ifrw.$('iframe')[0].contentDocument.body; + + documentBody.innerHTML = Messages.initialState; + + var inner = window.inner = documentBody; + var cursor = window.cursor = Cursor(inner); + + var setEditable = function (bool) { + inner.setAttribute('contenteditable', + (typeof (bool) !== 'undefined'? bool : true)); + }; + + // don't let the user edit until the pad is ready + setEditable(false); + + var diffOptions = { + preDiffApply: function (info) { + /* Don't remove local instances of the magicline plugin */ + if (info.node && info.node.tagName === 'SPAN' && + info.node.getAttribute('contentEditable') === 'false') { + return true; + } + + if (!cursor.exists()) { return; } + var frame = info.frame = cursor.inNode(info.node); + if (!frame) { return; } + if (typeof info.diff.oldValue === 'string' && + typeof info.diff.newValue === 'string') { + var pushes = cursor.pushDelta(info.diff.oldValue, + info.diff.newValue); + if (frame & 1) { + if (pushes.commonStart < cursor.Range.start.offset) { + cursor.Range.start.offset += pushes.delta; + } + } + if (frame & 2) { + if (pushes.commonStart < cursor.Range.end.offset) { + cursor.Range.end.offset += pushes.delta; + } + } + } + }, + postDiffApply: function (info) { + if (info.frame) { + if (info.node) { + if (info.frame & 1) { cursor.fixStart(info.node); } + if (info.frame & 2) { cursor.fixEnd(info.node); } + } else { console.log("info.node did not exist"); } + + var sel = cursor.makeSelection(); + var range = cursor.makeRange(); + + cursor.fixSelection(sel, range); + } + } + }; + + var now = function () { return new Date().getTime(); }; + + var initializing = true; + var userList = {}; // List of pretty name of all users (mapped with their server ID) + var toolbarList; // List of users still connected to the channel (server IDs) + var addToUserList = function(data) { + for (var attrname in data) { userList[attrname] = data[attrname]; } + if(toolbarList && typeof toolbarList.onChange === "function") { + toolbarList.onChange(userList); + } + }; + + var myData = {}; + var myUserName = ''; // My "pretty name" + var myID; // My server ID + + var setMyID = function(info) { + myID = info.myID || null; + myUserName = myID; + }; + + var createChangeName = function(id, $container) { + var buttonElmt = $container.find('#'+id)[0]; + buttonElmt.addEventListener("click", function() { + var newName = prompt("Change your name :", myUserName) + if (newName && newName.trim()) { + var myUserNameTemp = newName.trim(); + if(newName.trim().length > 32) { + myUserNameTemp = myUserNameTemp.substr(0, 32); + } + myUserName = myUserNameTemp; + myData[myID] = { + name: myUserName + }; + addToUserList(myData); + editor.fire( 'change' ); + } + }); + }; + + var DD = new DiffDom(diffOptions); + + // apply patches, and try not to lose the cursor in the process! + var applyHjson = function (shjson) { + // var hjson = JSON.parse(shjson); + // var peerUserList = hjson[hjson.length-1]; + // if(peerUserList.metadata) { + // var userData = peerUserList.metadata; + // addToUserList(userData); + // delete hjson[hjson.length-1]; + // } + var userDocStateDom = hjsonToDom(JSON.parse(shjson)); + userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf + var patch = (DD).diff(inner, userDocStateDom); + (DD).apply(inner, patch); + }; + + var realtimeOptions = { + // provide initialstate... + initialState: JSON.stringify(Hyperjson.fromDOM(inner, isNotMagicLine)), + + // the websocket URL (deprecated?) + websocketURL: Config.websocketURL, + webrtcURL: Config.webrtcURL, + + // our username + userName: userName, + + // the channel we will communicate over + channel: channel, + + // our encryption key + cryptKey: key, + + // configuration :D + doc: inner, + + setMyID: setMyID, + + // really basic operational transform + transformFunction : JsonOT.validate + // pass in websocket/netflux object TODO + }; + + var onRemote = realtimeOptions.onRemote = function (info) { + if (initializing) { return; } + + var shjson = info.realtime.getUserDoc(); + + // remember where the cursor is + cursor.update(); + + // Extract the user list (metadata) from the hyperjson + var hjson = JSON.parse(shjson); + var peerUserList = hjson[hjson.length-1]; + if(peerUserList.metadata) { + var userData = peerUserList.metadata; + // Update the local user data + userList = userData; + // Send the new data to the toolbar + if(toolbarList && typeof toolbarList.onChange === "function") { + toolbarList.onChange(userList); + } + hjson.pop(); + } + + // build a dom from HJSON, diff, and patch the editor + applyHjson(shjson); + + // Build a new stringified Chainpad hyperjson without metadata to compare with the one build from the dom + shjson = JSON.stringify(hjson); + + var hjson2 = Hyperjson.fromDOM(inner); + var shjson2 = JSON.stringify(hjson2); + if (shjson2 !== shjson) { + console.error("shjson2 !== shjson"); + module.realtimeInput.patchText(shjson2); + } + }; + + var onInit = realtimeOptions.onInit = function (info) { + var $bar = $('#pad-iframe')[0].contentWindow.$('#cke_1_toolbox'); + toolbarList = info.userList; + var config = { + userData: userList, + changeNameID: 'cryptpad-changeName' + }; + toolbar = info.realtime.toolbar = Toolbar.create($bar, info.myID, info.realtime, info.webChannel, info.userList, config); + createChangeName('cryptpad-changeName', $bar); + /* TODO handle disconnects and such*/ + }; + + var onReady = realtimeOptions.onReady = function (info) { + console.log("Unlocking editor"); + initializing = false; + setEditable(true); + var shjson = info.realtime.getUserDoc(); + applyHjson(shjson); + }; + + var onAbort = realtimeOptions.onAbort = function (info) { + console.log("Aborting the session!"); + // stop the user from continuing to edit + setEditable(false); + // TODO inform them that the session was torn down + toolbar.failed(); + }; + + + + + + var rti = module.realtimeInput = realtimeInput.start(realtimeOptions); + + /* catch `type="_moz"` before it goes over the wire */ + var brFilter = function (hj) { + if (hj[1].type === '_moz') { hj[1].type = undefined; } + return hj; + }; + + // $textarea.val(JSON.stringify(Convert.dom.to.hjson(inner))); + + /* It's incredibly important that you assign 'rti.onLocal' + It's used inside of realtimeInput to make sure that all changes + make it into chainpad. + + It's being assigned this way because it can't be passed in, and + and can't be easily returned from realtime input without making + the code less extensible. + */ + var propogate = rti.onLocal = function () { + /* if the problem were a matter of external patches being + applied while a local patch were in progress, then we would + expect to be able to check and find + 'module.localChangeInProgress' with a non-zero value while + we were applying a remote change. + */ + var hjson = Hyperjson.fromDOM(inner, isNotMagicLine, brFilter); + if(Object.keys(myData).length > 0) { + hjson[hjson.length] = {metadata: userList}; + } + var shjson = JSON.stringify(hjson); + if (!rti.patchText(shjson)) { + return; + } + rti.onEvent(shjson); + }; + + /* hitting enter makes a new line, but places the cursor inside + of the
instead of the

. This makes it such that you + cannot type until you click, which is rather unnacceptable. + If the cursor is ever inside such a
, you probably want + to push it out to the parent element, which ought to be a + paragraph tag. This needs to be done on keydown, otherwise + the first such keypress will not be inserted into the P. */ + inner.addEventListener('keydown', cursor.brFix); + + editor.on('change', propogate); + // editor.on('change', function () { + // var hjson = Convert.core.hyperjson.fromDOM(inner); + // if(myData !== {}) { + // hjson[hjson.length] = {metadata: userList}; + // } + // $textarea.val(JSON.stringify(hjson)); + // rti.bumpSharejs(); + // }); + }); + }; + + var interval = 100; + var first = function () { + Ckeditor = ifrw.CKEDITOR; + if (Ckeditor) { + andThen(Ckeditor); + } else { + console.log("Ckeditor was not defined. Trying again in %sms",interval); + setTimeout(first, interval); + } + }; + + $(first); +}); diff --git a/www/padrtc/netflux.js b/www/padrtc/netflux.js new file mode 100644 index 000000000..d01302980 --- /dev/null +++ b/www/padrtc/netflux.js @@ -0,0 +1,1473 @@ +(function webpackUniversalModuleDefinition(root, factory) { + if(typeof exports === 'object' && typeof module === 'object') + module.exports = factory(); + else if(typeof define === 'function' && define.amd) + define([], factory); + else if(typeof exports === 'object') + exports["nf"] = factory(); + else + root["nf"] = factory(); +})(this, function() { +return /******/ (function(modules) { // webpackBootstrap +/******/ // The module cache +/******/ var installedModules = {}; + +/******/ // The require function +/******/ function __webpack_require__(moduleId) { + +/******/ // Check if module is in cache +/******/ if(installedModules[moduleId]) +/******/ return installedModules[moduleId].exports; + +/******/ // Create a new module (and put it into the cache) +/******/ var module = installedModules[moduleId] = { +/******/ exports: {}, +/******/ id: moduleId, +/******/ loaded: false +/******/ }; + +/******/ // Execute the module function +/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__); + +/******/ // Flag the module as loaded +/******/ module.loaded = true; + +/******/ // Return the exports of the module +/******/ return module.exports; +/******/ } + + +/******/ // expose the modules object (__webpack_modules__) +/******/ __webpack_require__.m = modules; + +/******/ // expose the module cache +/******/ __webpack_require__.c = installedModules; + +/******/ // __webpack_public_path__ +/******/ __webpack_require__.p = ""; + +/******/ // Load entry module and return exports +/******/ return __webpack_require__(0); +/******/ }) +/************************************************************************/ +/******/ ([ +/* 0 */ +/***/ function(module, exports, __webpack_require__) { + + 'use strict'; + + var _Facade = __webpack_require__(1); + + var _Facade2 = _interopRequireDefault(_Facade); + + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + + module.exports = new _Facade2.default(); + +/***/ }, +/* 1 */ +/***/ function(module, exports, __webpack_require__) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + + var _WebChannel = __webpack_require__(2); + + var _WebChannel2 = _interopRequireDefault(_WebChannel); + + var _ServiceProvider = __webpack_require__(4); + + var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider); + + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + + var Facade = function () { + function Facade() { + var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; + + _classCallCheck(this, Facade); + + this.defaults = { + webrtc: {} + }; + this.settings = Object.assign({}, this.defaults, options); + } + + _createClass(Facade, [{ + key: 'create', + value: function create() { + var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; + + return new _WebChannel2.default(); + } + }, { + key: 'join', + value: function join(key) { + var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; + + var defaults = { + connector: 'WebRTCService', + protocol: 'ExchangeProtocolService' + }; + var settings = Object.assign({}, defaults, options); + var connector = _ServiceProvider2.default.get(settings.connector); + var protocol = _ServiceProvider2.default.get(settings.protocol); + var connectorOptions = { signaling: settings.signaling, facade: this }; + return new Promise(function (resolve, reject) { + connector.join(key, connectorOptions).then(function (channel) { + var webChannel = new _WebChannel2.default(options); + channel.webChannel = webChannel; + channel.onmessage = protocol.onmessage; + webChannel.channels.add(channel); + webChannel.onopen = function () { + resolve(webChannel); + }; + }, reject); + }); + } + }, { + key: 'invite', + value: function invite() { + // TODO + } + }, { + key: '_onJoining', + value: function _onJoining() { + // TODO + } + }, { + key: '_onLeaving', + value: function _onLeaving() { + // TODO + } + }, { + key: '_onMessage', + value: function _onMessage() { + // TODO + } + }, { + key: '_onPeerMessage', + value: function _onPeerMessage() { + // TODO + } + }, { + key: '_onInvite', + value: function _onInvite() { + // TODO + } + }]); + + return Facade; + }(); + + exports.default = Facade; + +/***/ }, +/* 2 */ +/***/ function(module, exports, __webpack_require__) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + + var _constants = __webpack_require__(3); + + var cs = _interopRequireWildcard(_constants); + + var _ServiceProvider = __webpack_require__(4); + + var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider); + + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + + function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + + var WebChannel = function () { + function WebChannel() { + var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; + + _classCallCheck(this, WebChannel); + + this.defaults = { + connector: cs.WEBRTC_SERVICE, + topology: cs.FULLYCONNECTED_SERVICE, + protocol: cs.EXCHANGEPROTOCOL_SERVICE + }; + this.settings = Object.assign({}, this.defaults, options); + + // Private attributes + this.protocol = cs.EXCHANGEPROTOCOL_SERVICE; + + // Public attributes + this.id; + this.myID = this._generateID(); + this.channels = new Set(); + this.onjoining; + this.onleaving; + this.onmessage; + } + + _createClass(WebChannel, [{ + key: 'leave', + value: function leave() {} + }, { + key: 'send', + value: function send(data) { + var channel = this; + return new Promise(function (resolve, reject) { + if (channel.channels.size === 0) { + resolve(); + } + var protocol = _ServiceProvider2.default.get(channel.settings.protocol); + channel.topologyService.broadcast(channel, protocol.message(cs.USER_DATA, { id: channel.myID, data: data })).then(resolve, reject); + }); + } + }, { + key: 'sendPing', + value: function sendPing() { + var channel = this; + return new Promise(function (resolve, reject) { + if (channel.channels.size === 0) { + resolve(); + } + var protocol = _ServiceProvider2.default.get(channel.settings.protocol); + channel.topologyService.broadcast(channel, protocol.message(cs.PING, { data: '' })).then(resolve, reject); + }); + } + }, { + key: 'getHistory', + value: function getHistory(historyKeeperID) { + var channel = this; + return new Promise(function (resolve, reject) { + var protocol = _ServiceProvider2.default.get(channel.settings.protocol); + channel.topologyService.sendTo(historyKeeperID, channel, protocol.message(cs.GET_HISTORY, { id: channel.myID, data: '' })).then(resolve, reject); + }); + } + }, { + key: 'sendTo', + value: function sendTo(id, msg) { + var channel = this; + return new Promise(function (resolve, reject) { + var protocol = _ServiceProvider2.default.get(channel.settings.protocol); + channel.topologyService.sendTo(id, channel, protocol.message(cs.USER_DATA, { id: channel.myID, data: msg })).then(resolve, reject); + }); + } + }, { + key: 'openForJoining', + value: function openForJoining() { + var _this = this; + + var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; + + var settings = Object.assign({}, this.settings, options); + var connector = _ServiceProvider2.default.get(settings.connector); + return connector.open(function (channel) { + // 1) New dataChannel connection established. + // NEXT: add it to the network + var protocol = _ServiceProvider2.default.get(_this.protocol); + _this.topologyService = _ServiceProvider2.default.get(_this.settings.topology); + channel.webChannel = _this; + channel.onmessage = protocol.onmessage; + + // 2.1) Send to the new client the webChannel topology name + channel.send(protocol.message(cs.JOIN_START, _this.settings.topology)); + + // 2.2) Ask to topology to add the new client to this webChannel + _this.topologyService.addStart(channel, _this).then(function (id) { + _this.topologyService.broadcast(_this, protocol.message(cs.JOIN_FINISH, id)); + _this.onJoining(id); + }); + }, settings).then(function (data) { + return data; + }); + } + }, { + key: 'closeForJoining', + value: function closeForJoining() {} + }, { + key: 'isInviting', + value: function isInviting() {} + }, { + key: '_generateID', + value: function _generateID() { + var MIN_LENGTH = 10; + var DELTA_LENGTH = 10; + var MASK = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; + var result = ''; + var length = MIN_LENGTH + Math.round(Math.random() * DELTA_LENGTH); + + for (var i = 0; i < length; i++) { + result += MASK[Math.round(Math.random() * (MASK.length - 1))]; + } + return result; + } + }, { + key: 'topology', + set: function set(topologyServiceName) { + this.settings.topology = topologyServiceName; + this.topologyService = _ServiceProvider2.default.get(topologyServiceName); + }, + get: function get() { + return this.settigns.topology; + } + }]); + + return WebChannel; + }(); + + exports.default = WebChannel; + +/***/ }, +/* 3 */ +/***/ function(module, exports) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + // API user's message + var USER_DATA = exports.USER_DATA = 0; + var GET_HISTORY = exports.GET_HISTORY = 6; + + // Internal messages + var JOIN_START = exports.JOIN_START = 2; + var JOIN_FINISH = exports.JOIN_FINISH = 4; + var YOUR_NEW_ID = exports.YOUR_NEW_ID = 5; + var PING = exports.PING = 7; + + // Internal message to a specific Service + var SERVICE_DATA = exports.SERVICE_DATA = 3; + + var WEBRTC_SERVICE = exports.WEBRTC_SERVICE = 'WebRTCService'; + var WEBSOCKET_SERVICE = exports.WEBSOCKET_SERVICE = 'WebSocketService'; + var FULLYCONNECTED_SERVICE = exports.FULLYCONNECTED_SERVICE = 'FullyConnectedService'; + var STAR_SERVICE = exports.STAR_SERVICE = 'StarTopologyService'; + var EXCHANGEPROTOCOL_SERVICE = exports.EXCHANGEPROTOCOL_SERVICE = 'ExchangeProtocolService'; + var WSPROTOCOL_SERVICE = exports.WSPROTOCOL_SERVICE = 'WebSocketProtocolService'; + +/***/ }, +/* 4 */ +/***/ function(module, exports, __webpack_require__) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + + var _constants = __webpack_require__(3); + + var cs = _interopRequireWildcard(_constants); + + var _FullyConnectedService = __webpack_require__(5); + + var _FullyConnectedService2 = _interopRequireDefault(_FullyConnectedService); + + var _StarTopologyService = __webpack_require__(6); + + var _StarTopologyService2 = _interopRequireDefault(_StarTopologyService); + + var _WebRTCService = __webpack_require__(7); + + var _WebRTCService2 = _interopRequireDefault(_WebRTCService); + + var _WebSocketService = __webpack_require__(8); + + var _WebSocketService2 = _interopRequireDefault(_WebSocketService); + + var _ExchangeProtocolService = __webpack_require__(9); + + var _ExchangeProtocolService2 = _interopRequireDefault(_ExchangeProtocolService); + + var _WebSocketProtocolService = __webpack_require__(10); + + var _WebSocketProtocolService2 = _interopRequireDefault(_WebSocketProtocolService); + + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + + function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + + var services = new Map(); + + var ServiceProvider = function () { + function ServiceProvider() { + _classCallCheck(this, ServiceProvider); + } + + _createClass(ServiceProvider, null, [{ + key: 'get', + value: function get(code) { + var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; + + var service = undefined; + switch (code) { + case cs.WEBRTC_SERVICE: + service = new _WebRTCService2.default(options); + break; + case cs.WEBSOCKET_SERVICE: + service = new _WebSocketService2.default(options); + break; + case cs.FULLYCONNECTED_SERVICE: + service = new _FullyConnectedService2.default(options); + break; + case cs.STAR_SERVICE: + service = new _StarTopologyService2.default(options); + break; + case cs.EXCHANGEPROTOCOL_SERVICE: + service = new _ExchangeProtocolService2.default(options); + break; + case cs.WSPROTOCOL_SERVICE: + service = new _WebSocketProtocolService2.default(options); + break; + } + services.set(code, service); + return service; + } + }]); + + return ServiceProvider; + }(); + + exports.default = ServiceProvider; + +/***/ }, +/* 5 */ +/***/ function(module, exports, __webpack_require__) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + + var _constants = __webpack_require__(3); + + var cs = _interopRequireWildcard(_constants); + + var _ServiceProvider = __webpack_require__(4); + + var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider); + + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + + function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + + var FullyConnectedService = function () { + function FullyConnectedService() { + var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; + + _classCallCheck(this, FullyConnectedService); + } + + _createClass(FullyConnectedService, [{ + key: 'addStart', + value: function addStart(channel, webChannel) { + var _this = this; + + var protocol = _ServiceProvider2.default.get(cs.EXCHANGEPROTOCOL_SERVICE); + return new Promise(function (resolve, reject) { + channel.peerID = _this._generateID(); + channel.send(protocol.message(cs.YOUR_NEW_ID, { + newID: channel.peerID, + myID: webChannel.myID + })); + if (Reflect.has(webChannel, 'aboutToJoin') && webChannel.aboutToJoin instanceof Map) { + webChannel.aboutToJoin.set(channel.peerID, channel); + } else { + webChannel.aboutToJoin = new Map(); + } + + if (webChannel.channels.size === 0) { + webChannel.channels.add(channel); + channel.onclose = function () { + webChannel.onLeaving(channel.peerID); + webChannel.channels.delete(channel); + }; + resolve(channel.peerID); + } else { + (function () { + webChannel.successfullyConnected = new Map(); + webChannel.successfullyConnected.set(channel.peerID, 0); + webChannel.connectionSucceed = function (id, withId) { + var counter = webChannel.successfullyConnected.get(withId); + webChannel.successfullyConnected.set(withId, ++counter); + if (webChannel.successfullyConnected.get(withId) === webChannel.channels.size) { + _this.addFinish(webChannel, withId); + resolve(withId); + } + }; + var connector = _ServiceProvider2.default.get(cs.WEBRTC_SERVICE); + webChannel.channels.forEach(function (c) { + connector.connect(channel.peerID, webChannel, c.peerID); + }); + })(); + } + }); + } + }, { + key: 'addFinish', + value: function addFinish(webChannel, id) { + if (id != webChannel.myID) { + (function () { + var channel = webChannel.aboutToJoin.get(id); + webChannel.channels.add(webChannel.aboutToJoin.get(id)); + channel.onclose = function () { + webChannel.onLeaving(channel.peerID); + webChannel.channels.delete(channel); + }; + //webChannel.aboutToJoin.delete(id) + if (Reflect.has(webChannel, 'successfullyConnected')) { + webChannel.successfullyConnected.delete(id); + } + })(); + } else { + webChannel.onopen(); + } + } + }, { + key: 'broadcast', + value: function broadcast(webChannel, data) { + return new Promise(function (resolve, reject) { + var _iteratorNormalCompletion = true; + var _didIteratorError = false; + var _iteratorError = undefined; + + try { + for (var _iterator = webChannel.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + var c = _step.value; + + c.send(data); + } + } catch (err) { + _didIteratorError = true; + _iteratorError = err; + } finally { + try { + if (!_iteratorNormalCompletion && _iterator.return) { + _iterator.return(); + } + } finally { + if (_didIteratorError) { + throw _iteratorError; + } + } + } + + resolve(); + }); + } + }, { + key: 'sendTo', + value: function sendTo(id, webChannel, data) { + return new Promise(function (resolve, reject) { + var _iteratorNormalCompletion2 = true; + var _didIteratorError2 = false; + var _iteratorError2 = undefined; + + try { + for (var _iterator2 = webChannel.channels[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { + var c = _step2.value; + + if (c.peerID == id) { + c.send(data); + } + } + } catch (err) { + _didIteratorError2 = true; + _iteratorError2 = err; + } finally { + try { + if (!_iteratorNormalCompletion2 && _iterator2.return) { + _iterator2.return(); + } + } finally { + if (_didIteratorError2) { + throw _iteratorError2; + } + } + } + + resolve(); + }); + } + }, { + key: 'leave', + value: function leave(webChannel) { + this.broadcast(webChannel); + } + }, { + key: '_generateID', + value: function _generateID() { + var MIN_LENGTH = 10; + var DELTA_LENGTH = 10; + var MASK = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; + var length = MIN_LENGTH + Math.round(Math.random() * DELTA_LENGTH); + var maskLastIndex = MASK.length - 1; + var result = ''; + + for (var i = 0; i < length; i++) { + result += MASK[Math.round(Math.random() * maskLastIndex)]; + } + return result; + } + }]); + + return FullyConnectedService; + }(); + + exports.default = FullyConnectedService; + +/***/ }, +/* 6 */ +/***/ function(module, exports) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + + var StarTopologyService = function () { + function StarTopologyService() { + var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; + + _classCallCheck(this, StarTopologyService); + } + + _createClass(StarTopologyService, [{ + key: 'broadcast', + value: function broadcast(webChannel, data) { + return new Promise(function (resolve, reject) { + var _iteratorNormalCompletion = true; + var _didIteratorError = false; + var _iteratorError = undefined; + + try { + for (var _iterator = webChannel.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + var c = _step.value; + + var msg = undefined; + // Create the string message + var date = new Date().getTime(); + if (data.type === 'PING') { + msg = JSON.stringify([c.seq++, 'PING', date]); + } else { + msg = JSON.stringify([c.seq++, data.type, webChannel.id, data.msg]); + } + // Store the message with his sequence number to know what message has caused the reception of an ACK + // This is used in WebSocketProtocolService + var srvMsg = JSON.parse(msg); + srvMsg.shift(); + srvMsg.unshift(webChannel.myID); + srvMsg.unshift(0); + webChannel.waitingAck[c.seq - 1] = { resolve: resolve, reject: reject, time: date, data: srvMsg }; + // Send the message to the server + c.send(msg); + } + // resolve(); + } catch (err) { + _didIteratorError = true; + _iteratorError = err; + } finally { + try { + if (!_iteratorNormalCompletion && _iterator.return) { + _iterator.return(); + } + } finally { + if (_didIteratorError) { + throw _iteratorError; + } + } + } + }); + } + }, { + key: 'sendTo', + value: function sendTo(id, webChannel, data) { + return new Promise(function (resolve, reject) { + var _iteratorNormalCompletion2 = true; + var _didIteratorError2 = false; + var _iteratorError2 = undefined; + + try { + for (var _iterator2 = webChannel.channels[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) { + var c = _step2.value; + + var msg = JSON.stringify([c.seq++, data.type, id, data.msg]); + c.send(msg); + } + } catch (err) { + _didIteratorError2 = true; + _iteratorError2 = err; + } finally { + try { + if (!_iteratorNormalCompletion2 && _iterator2.return) { + _iterator2.return(); + } + } finally { + if (_didIteratorError2) { + throw _iteratorError2; + } + } + } + + resolve(); + }); + } + }]); + + return StarTopologyService; + }(); + + exports.default = StarTopologyService; + +/***/ }, +/* 7 */ +/***/ function(module, exports, __webpack_require__) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + + var _constants = __webpack_require__(3); + + var cs = _interopRequireWildcard(_constants); + + var _ServiceProvider = __webpack_require__(4); + + var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider); + + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + + function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + + var WEBRTC_DATA = 0; + var CONNECT_WITH = 1; + var CONNECT_WITH_SUCCEED = 2; + + var WebRTCService = function () { + function WebRTCService() { + var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; + + _classCallCheck(this, WebRTCService); + + this.NAME = this.constructor.name; + this.protocol = _ServiceProvider2.default.get(cs.EXCHANGEPROTOCOL_SERVICE); + this.defaults = { + signaling: 'ws://localhost:8000', + webRTCOptions: { + iceServers: [{ + urls: ['stun:23.21.150.121', 'stun:stun.l.google.com:19302'] + }, { + urls: 'turn:numb.viagenie.ca', + credential: 'webrtcdemo', + username: 'louis%40mozilla.com' + }] + } + }; + this.settings = Object.assign({}, this.defaults, options); + + // Declare WebRTC related global(window) constructors + this.RTCPeerConnection = window.RTCPeerConnection || window.mozRTCPeerConnection || window.webkitRTCPeerConnection || window.msRTCPeerConnection; + + this.RTCIceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate || window.RTCIceCandidate || window.msRTCIceCandidate; + + this.RTCSessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription || window.webkitRTCSessionDescription || window.msRTCSessionDescription; + } + + _createClass(WebRTCService, [{ + key: 'connect', + value: function connect(newPeerID, webChannel, peerID) { + webChannel.topologyService.sendTo(peerID, webChannel, this._msg(CONNECT_WITH, { key: newPeerID, intermediaryID: webChannel.myID })); + } + }, { + key: 'open', + value: function open(onchannel) { + var _this = this; + + var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; + + var defaults = { + key: this._randomKey() + }; + var settings = Object.assign({}, this.settings, defaults, options); + + return new Promise(function (resolve, reject) { + var connections = []; + var socket = new window.WebSocket(settings.signaling); + socket.onopen = function () { + socket.send(JSON.stringify({ key: settings.key })); + resolve({ url: _this.settings.signaling, key: settings.key }); + }; + socket.onmessage = function (e) { + var msg = JSON.parse(e.data); + if (Reflect.has(msg, 'id') && Reflect.has(msg, 'data')) { + if (Reflect.has(msg.data, 'offer')) { + (function () { + var connection = new _this.RTCPeerConnection(settings.webRTCOptions); + connections.push(connection); + connection.ondatachannel = function (e) { + e.channel.onopen = function () { + onchannel(e.channel); + }; + }; + connection.onicecandidate = function (e) { + if (e.candidate !== null) { + var candidate = { + candidate: e.candidate.candidate, + sdpMLineIndex: e.candidate.sdpMLineIndex + }; + socket.send(JSON.stringify({ id: msg.id, data: { candidate: candidate } })); + } + }; + var sd = Object.assign(new _this.RTCSessionDescription(), msg.data.offer); + connection.setRemoteDescription(sd, function () { + connection.createAnswer(function (answer) { + connection.setLocalDescription(answer, function () { + socket.send(JSON.stringify({ + id: msg.id, + data: { answer: connection.localDescription.toJSON() } })); + }, function () {}); + }, function () {}); + }, function () {}); + })(); + } else if (Reflect.has(msg.data, 'candidate')) { + var candidate = new _this.RTCIceCandidate(msg.data.candidate); + connections[msg.id].addIceCandidate(candidate); + } + } + }; + socket.onerror = reject; + }); + } + }, { + key: 'join', + value: function join(key) { + var _this2 = this; + + var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; + + var settings = Object.assign({}, this.settings, options); + return new Promise(function (resolve, reject) { + var connection = undefined; + var socket = new window.WebSocket(settings.signaling); + socket.onopen = function () { + connection = new _this2.RTCPeerConnection(settings.webRTCOptions); + connection.onicecandidate = function (e) { + if (e.candidate !== null) { + var candidate = { + candidate: e.candidate.candidate, + sdpMLineIndex: e.candidate.sdpMLineIndex + }; + socket.send(JSON.stringify({ data: { candidate: candidate } })); + } + }; + var dc = connection.createDataChannel(key); + dc.onopen = function () { + resolve(dc); + }; + connection.createOffer(function (offer) { + connection.setLocalDescription(offer, function () { + socket.send(JSON.stringify({ join: key, data: { offer: connection.localDescription.toJSON() } })); + }, reject); + }, reject); + }; + socket.onclose = function (e) { + reject(e); + }; + socket.onmessage = function (e) { + var msg = JSON.parse(e.data); + if (Reflect.has(msg, 'data')) { + if (Reflect.has(msg.data, 'answer')) { + var sd = Object.assign(new _this2.RTCSessionDescription(), msg.data.answer); + connection.setRemoteDescription(sd, function () {}, reject); + } else if (Reflect.has(msg.data, 'candidate')) { + var candidate = new _this2.RTCIceCandidate(msg.data.candidate); + connection.addIceCandidate(candidate); + } else { + reject(); + } + } else { + reject(); + } + }; + socket.onerror = reject; + }); + } + }, { + key: '_randomKey', + value: function _randomKey() { + var MIN_LENGTH = 10; + var DELTA_LENGTH = 10; + var MASK = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; + var result = ''; + var length = MIN_LENGTH + Math.round(Math.random() * DELTA_LENGTH); + + for (var i = 0; i < length; i++) { + result += MASK[Math.round(Math.random() * (MASK.length - 1))]; + } + return result; + } + }, { + key: '_msg', + value: function _msg(code, data) { + var msg = { service: this.constructor.name }; + msg.data = {}; + msg.data.code = code; + Object.assign(msg.data, data); + return this.protocol.message(cs.SERVICE_DATA, msg); + } + }, { + key: 'onmessage', + value: function onmessage(channel, msg) { + var _this3 = this; + + var webChannel = channel.webChannel; + if (!Reflect.has(webChannel, 'connections')) { + webChannel.connections = new Map(); + } + switch (msg.code) { + case WEBRTC_DATA: + if (webChannel.myID === msg.recipientPeerID) { + if (Reflect.has(msg, 'sdp')) { + if (msg.sdp.type === 'offer') { + (function () { + var connection = new _this3.RTCPeerConnection(_this3.settings.webRTCOptions); + webChannel.connections.set(msg.senderPeerID, connection); + connection.ondatachannel = function (e) { + e.channel.onopen = function () { + e.channel.peerID = msg.senderPeerID; + e.channel.webChannel = webChannel; + e.channel.onmessage = _this3.protocol.onmessage; + webChannel.channels.add(e.channel); + e.channel.onclose = function () { + webChannel.onLeaving(e.channel.peerID); + webChannel.channels.delete(e.channel); + }; + }; + }; + connection.onicecandidate = function (e) { + if (e.candidate !== null) { + var candidate = { + candidate: e.candidate.candidate, + sdpMLineIndex: e.candidate.sdpMLineIndex + }; + channel.send(_this3._msg(WEBRTC_DATA, { + senderPeerID: webChannel.myID, + recipientPeerID: msg.senderPeerID, + candidate: candidate + })); + } + }; + var sd = Object.assign(new _this3.RTCSessionDescription(), msg.sdp); + connection.setRemoteDescription(sd, function () { + connection.createAnswer(function (answer) { + connection.setLocalDescription(answer, function () { + channel.send(_this3._msg(WEBRTC_DATA, { + senderPeerID: webChannel.myID, + recipientPeerID: msg.senderPeerID, + sdp: connection.localDescription.toJSON() + })); + }, function () {}); + }, function () {}); + }, function () {}); + })(); + } else if (msg.sdp.type === 'answer') { + var sd = Object.assign(new this.RTCSessionDescription(), msg.sdp); + webChannel.connections.get(msg.senderPeerID).setRemoteDescription(sd, function () {}, function () {}); + } + } else if (Reflect.has(msg, 'candidate')) { + webChannel.connections.get(msg.senderPeerID).addIceCandidate(new this.RTCIceCandidate(msg.candidate)); + } + } else { + var data = this._msg(WEBRTC_DATA, msg); + if (webChannel.aboutToJoin.has(msg.recipientPeerID)) { + webChannel.aboutToJoin.get(msg.recipientPeerID).send(data); + } else { + webChannel.topologyService.sendTo(msg.recipientPeerID, webChannel, data); + } + } + break; + case CONNECT_WITH: + var connection = new this.RTCPeerConnection(this.settings.webRTCOptions); + connection.onicecandidate = function (e) { + if (e.candidate !== null) { + var candidate = { + candidate: e.candidate.candidate, + sdpMLineIndex: e.candidate.sdpMLineIndex + }; + webChannel.topologyService.sendTo(msg.intermediaryID, webChannel, _this3._msg(WEBRTC_DATA, { + senderPeerID: webChannel.myID, + recipientPeerID: msg.key, + candidate: candidate + })); + } + }; + var dc = connection.createDataChannel(msg.key); + dc.onopen = function () { + if (!Reflect.has(webChannel, 'aboutToJoin')) { + webChannel.aboutToJoin = new Map(); + } + webChannel.aboutToJoin.set(dc.label, dc); + dc.onmessage = _this3.protocol.onmessage; + dc.peerID = dc.label; + dc.webChannel = webChannel; + webChannel.topologyService.sendTo(msg.intermediaryID, webChannel, _this3._msg(CONNECT_WITH_SUCCEED, { + senderPeerID: webChannel.myID, + recipientPeerID: dc.label + })); + }; + connection.createOffer(function (offer) { + connection.setLocalDescription(offer, function () { + webChannel.topologyService.sendTo(msg.intermediaryID, webChannel, _this3._msg(WEBRTC_DATA, { + senderPeerID: webChannel.myID, + recipientPeerID: msg.key, + sdp: connection.localDescription.toJSON() + })); + webChannel.connections.set(msg.key, connection); + }, function () {}); + }, function () {}); + break; + case CONNECT_WITH_SUCCEED: + webChannel.connectionSucceed(msg.senderPeerID, msg.recipientPeerID); + break; + } + } + }]); + + return WebRTCService; + }(); + + exports.default = WebRTCService; + +/***/ }, +/* 8 */ +/***/ function(module, exports, __webpack_require__) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + + var _constants = __webpack_require__(3); + + var cs = _interopRequireWildcard(_constants); + + var _ServiceProvider = __webpack_require__(4); + + var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider); + + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + + function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + + var WebSocketService = function () { + function WebSocketService() { + var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; + + _classCallCheck(this, WebSocketService); + + this.NAME = this.constructor.name; + this.protocol = _ServiceProvider2.default.get(cs.EXCHANGEPROTOCOL_SERVICE); + this.defaults = { + signaling: 'ws://localhost:9000', + REQUEST_TIMEOUT: 5000 + }; + this.settings = Object.assign({}, this.defaults, options); + } + + _createClass(WebSocketService, [{ + key: 'join', + value: function join(key) { + var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; + + var settings = Object.assign({}, this.settings, options); + return new Promise(function (resolve, reject) { + var connection = undefined; + var socket = new window.WebSocket(settings.signaling); + setInterval(function () { + if (socket.webChannel && socket.webChannel.waitingAck) { + var waitingAck = socket.webChannel.waitingAck; + for (var id in waitingAck) { + var req = waitingAck[id]; + var now = new Date().getTime(); + if (now - req.time > settings.REQUEST_TIMEOUT) { + delete socket.webChannel.waitingAck[id]; + req.reject({ type: 'TIMEOUT', message: 'waited ' + now - req.time + 'ms' }); + } + } + } + }, 5000); + socket.seq = 1; + socket.facade = options.facade || null; + socket.onopen = function () { + if (key && key !== '') { + socket.send(JSON.stringify([socket.seq++, 'JOIN', key])); + } else { + socket.send(JSON.stringify([socket.seq++, 'JOIN'])); + } + resolve(socket); + }; + socket.onerror = reject; + }); + } + }]); + + return WebSocketService; + }(); + + exports.default = WebSocketService; + +/***/ }, +/* 9 */ +/***/ function(module, exports, __webpack_require__) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + + var _constants = __webpack_require__(3); + + var cs = _interopRequireWildcard(_constants); + + var _ServiceProvider = __webpack_require__(4); + + var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider); + + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + + function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + + var ExchangeProtocolService = function () { + function ExchangeProtocolService() { + var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; + + _classCallCheck(this, ExchangeProtocolService); + } + + _createClass(ExchangeProtocolService, [{ + key: 'onmessage', + value: function onmessage(e) { + var msg = JSON.parse(e.data); + var channel = e.currentTarget; + var webChannel = channel.webChannel; + + switch (msg.code) { + case cs.USER_DATA: + webChannel.onmessage(msg.id, msg.data); + break; + case cs.GET_HISTORY: + webChannel.onPeerMessage(msg.id, msg.code); + break; + case cs.SERVICE_DATA: + var service = _ServiceProvider2.default.get(msg.service); + service.onmessage(channel, msg.data); + break; + case cs.YOUR_NEW_ID: + // TODO: change names + webChannel.myID = msg.newID; + channel.peerID = msg.myID; + break; + case cs.JOIN_START: + // 2.1) Send to the new client the webChannel topology + webChannel.topology = msg.topology; + webChannel.topologyService = _ServiceProvider2.default.get(msg.topology); + break; + case cs.JOIN_FINISH: + webChannel.topologyService.addFinish(webChannel, msg.id); + if (msg.id != webChannel.myID) { + // A new user has just registered + webChannel.onJoining(msg.id); + } else { + (function () { + // We're fully synced, trigger onJoining for all existing users + var waitForOnJoining = function waitForOnJoining() { + if (typeof webChannel.onJoining !== "function") { + setTimeout(waitForOnJoining, 500); + return; + } + var _iteratorNormalCompletion = true; + var _didIteratorError = false; + var _iteratorError = undefined; + + try { + for (var _iterator = webChannel.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + var c = _step.value; + + webChannel.onJoining(c.peerID); + } + } catch (err) { + _didIteratorError = true; + _iteratorError = err; + } finally { + try { + if (!_iteratorNormalCompletion && _iterator.return) { + _iterator.return(); + } + } finally { + if (_didIteratorError) { + throw _iteratorError; + } + } + } + }; + waitForOnJoining(); + })(); + } + break; + } + } + }, { + key: 'message', + value: function message(code, data) { + var msg = { code: code }; + switch (code) { + case cs.USER_DATA: + msg.id = data.id; + msg.data = data.data; + break; + case cs.GET_HISTORY: + msg.id = data.id; + break; + case cs.SERVICE_DATA: + msg.service = data.service; + msg.data = Object.assign({}, data.data); + break; + case cs.YOUR_NEW_ID: + msg.newID = data.newID; + msg.myID = data.myID; + break; + case cs.JOIN_START: + msg.topology = data; + break; + case cs.JOIN_FINISH: + msg.id = data; + break; + } + return JSON.stringify(msg); + } + }]); + + return ExchangeProtocolService; + }(); + + exports.default = ExchangeProtocolService; + +/***/ }, +/* 10 */ +/***/ function(module, exports, __webpack_require__) { + + 'use strict'; + + Object.defineProperty(exports, "__esModule", { + value: true + }); + + var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + + var _constants = __webpack_require__(3); + + var cs = _interopRequireWildcard(_constants); + + var _ServiceProvider = __webpack_require__(4); + + var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider); + + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + + function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + + function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + + var WebSocketProtocolService = function () { + function WebSocketProtocolService() { + var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0]; + + _classCallCheck(this, WebSocketProtocolService); + } + + _createClass(WebSocketProtocolService, [{ + key: 'onmessage', + value: function onmessage(e) { + var msg = JSON.parse(e.data); + var socket = e.currentTarget; + var webChannel = socket.webChannel; + var topology = cs.STAR_SERVICE; + var topologyService = _ServiceProvider2.default.get(topology); + var history_keeper = webChannel.hc; + + if (msg[0] !== 0 && msg[1] !== 'ACK') { + return; + } + + if (msg[2] === 'IDENT' && msg[1] === '') { + socket.uid = msg[3]; + webChannel.myID = msg[3]; + webChannel.peers = []; + webChannel.waitingAck = []; + webChannel.topology = topology; + return; + } + if (msg[1] === 'PING') { + msg[1] = 'PONG'; + socket.send(JSON.stringify(msg)); + return; + } + if (msg[1] === 'ACK') { + var seq = msg[0]; + if (webChannel.waitingAck[seq]) { + var waitingAck = webChannel.waitingAck[seq]; + waitingAck.resolve(); + var newMsg = waitingAck.data; + if (newMsg[2] === 'PING') { + // PING message : set the lag + var lag = new Date().getTime() - newMsg[3]; + webChannel.getLag = function () { + return lag; + }; + } + delete webChannel.waitingAck[seq]; + } + return; + } + // We have received a new direct message from another user + if (msg[2] === 'MSG' && msg[3] === socket.uid) { + // If it comes from the history keeper, send it to the user + if (msg[1] === history_keeper) { + if (msg[4] === 0) { + webChannel.onmessage(msg[1], msg[4]); + return; + } + var msgHistory = JSON.parse(msg[4]); + webChannel.onmessage(msgHistory[1], msgHistory[4]); + } + return; + } + if (msg[2] === 'JOIN' && (webChannel.id == null || webChannel.id === msg[3])) { + if (!webChannel.id) { + // New unnamed channel : get its name from the first "JOIN" message + if (!window.location.hash) { + var chanName = window.location.hash = msg[3]; + } + webChannel.id = msg[3]; + } + + if (msg[1] === socket.uid) { + // If the user catches himself registering, he is synchronized with the server + webChannel.onopen(); + } else { + // Trigger onJoining() when another user is joining the channel + // Register the user in the list of peers in the channel + if (webChannel.peers.length === 0 && msg[1].length === 16) { + // We've just catched the history keeper (16 characters length name) + history_keeper = msg[1]; + webChannel.hc = history_keeper; + } + var linkQuality = msg[1] === history_keeper ? 1000 : 0; + var sendToPeer = function sendToPeer(data) { + topologyService.sendTo(msg[1], webChannel, { type: 'MSG', msg: data }); + }; + var peer = { id: msg[1], connector: socket, linkQuality: linkQuality, send: sendToPeer }; + if (webChannel.peers.indexOf(peer) === -1) { + webChannel.peers.push(peer); + } + + if (msg[1] !== history_keeper) { + // Trigger onJoining with that peer once the function is loaded (i.e. once the channel is synced) + var waitForOnJoining = function waitForOnJoining() { + if (typeof webChannel.onJoining !== "function") { + setTimeout(waitForOnJoining, 500); + return; + } + webChannel.onJoining(msg[1]); + }; + waitForOnJoining(); + } + } + return; + } + // We have received a new message in that channel from another peer + if (msg[2] === 'MSG' && msg[3] === webChannel.id) { + // Find the peer who sent the message and display it + //TODO Use Peer instead of peer.id (msg[1]) : + if (typeof webChannel.onmessage === "function") webChannel.onmessage(msg[1], msg[4]); + return; + } + // Someone else has left the channel, remove him from the list of peers + if (msg[2] === 'LEAVE' && msg[3] === webChannel.id) { + //TODO Use Peer instead of peer.id (msg[1]) : + if (typeof webChannel.onLeaving === "function") webChannel.onLeaving(msg[1], webChannel); + return; + } + } + }, { + key: 'message', + value: function message(code, data) { + var type = undefined; + switch (code) { + case cs.USER_DATA: + type = 'MSG'; + break; + case cs.JOIN_START: + type = 'JOIN'; + break; + case cs.PING: + type = 'PING'; + break; + } + return { type: type, msg: data.data }; + } + }]); + + return WebSocketProtocolService; + }(); + + exports.default = WebSocketProtocolService; + +/***/ } +/******/ ]) +}); +; \ No newline at end of file diff --git a/www/padrtc/realtime-input.js b/www/padrtc/realtime-input.js new file mode 100644 index 000000000..af0f22a1d --- /dev/null +++ b/www/padrtc/realtime-input.js @@ -0,0 +1,397 @@ +/* + * 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 . + */ +window.Reflect = { has: (x,y) => { return (y in x); } }; +define([ + '/common/messages.js', + '/padrtc/netflux.js', + '/common/crypto.js', + '/common/toolbar.js', + '/_socket/text-patcher.js', + '/common/es6-promise.min.js', + '/common/chainpad.js', + '/bower_components/jquery/dist/jquery.min.js', +], function (Messages, Netflux, Crypto, Toolbar, TextPatcher) { + 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; + + var debug = function (x) { console.log(x); }, + warn = function (x) { console.error(x); }, + verbose = function (x) { console.log(x); }; + verbose = function () {}; // comment out to enable verbose logging + + // ------------------ 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 getParameterByName = function (name, url) { + if (!url) { url = window.location.href; } + name = name.replace(/[\[\]]/g, "\\$&"); + var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), + results = regex.exec(url); + if (!results) { return null; } + if (!results[2]) { return ''; } + return decodeURIComponent(results[2].replace(/\+/g, " ")); + }; + + var start = module.exports.start = + function (config) + { + var websocketUrl = config.websocketURL; + var webrtcUrl = config.webrtcURL; + var userName = config.userName; + var channel = config.channel; + var chanKey = config.cryptKey; + var cryptKey = Crypto.parseKey(chanKey).cryptKey; + var passwd = 'y'; + + // make sure configuration is defined + config = config || {}; + + var doc = config.doc || null; + + var allMessages = []; + var initializing = true; + var recoverableErrorCount = 0; + var toReturn = {}; + var messagesHistory = []; + var chainpadAdapter = {}; + var realtime; + + // define this in case it gets called before the rest of our stuff is ready. + var onEvent = toReturn.onEvent = function (newText) { }; + + var parseMessage = function (msg) { + var res ={}; + // two or more? use a for + ['pass','user','channelId','content'].forEach(function(attr){ + var len=msg.slice(0,msg.indexOf(':')), + // taking an offset lets us slice out the prop + // and saves us one string copy + o=len.length+1, + prop=res[attr]=msg.slice(o,Number(len)+o); + // slice off the property and its descriptor + msg = msg.slice(prop.length+o); + }); + // content is the only attribute that's not a string + res.content=JSON.parse(res.content); + return res; + }; + + var mkMessage = function (user, chan, content) { + content = JSON.stringify(content); + return user.length + ':' + user + + chan.length + ':' + chan + + content.length + ':' + content; + }; + + var onPeerMessage = function(toId, type, wc) { + if(type === 6) { + messagesHistory.forEach(function(msg) { + wc.sendTo(toId, '1:y'+msg); + }); + wc.sendTo(toId, '0'); + } + }; + + var whoami = new RegExp(userName.replace(/[\/\+]/g, function (c) { + return '\\' +c; + })); + + var onMessage = function(peer, msg, wc) { + + if(msg === 0 || msg === '0') { + onReady(wc); + return; + } + var message = chainpadAdapter.msgIn(peer, msg); + + verbose(message); + allMessages.push(message); + // if (!initializing) { + // if (toReturn.onLocal) { + // toReturn.onLocal(); + // } + // } + realtime.message(message); + if (/\[5,/.test(message)) { verbose("pong"); } + + if (!initializing) { + if (/\[2,/.test(message)) { + //verbose("Got a patch"); + if (whoami.test(message)) { + //verbose("Received own message"); + } else { + //verbose("Received remote message"); + // obviously this is only going to get called if + if (config.onRemote) { + config.onRemote({ + realtime: realtime + }); + } + } + } + } + }; + + var userList = { + onChange : function() {}, + users: [] + }; + var onJoining = function(peer) { + var list = userList.users; + if(list.indexOf(peer) === -1) { + userList.users.push(peer); + } + userList.onChange(); + }; + + var onLeaving = function(peer) { + var list = userList.users; + var index = list.indexOf(peer); + if(index !== -1) { + userList.users.splice(index, 1); + } + userList.onChange(); + }; + + chainpadAdapter = { + msgIn : function(peerId, msg) { + var parsed = parseMessage(msg); + // Remove the password from the message + var passLen = msg.substring(0,msg.indexOf(':')); + var message = msg.substring(passLen.length+1 + Number(passLen)); + try { + var decryptedMsg = Crypto.decrypt(message, cryptKey); + messagesHistory.push(decryptedMsg); + return decryptedMsg; + } catch (err) { + return message; + } + + }, + msgOut : function(msg, wc) { + var parsed = parseMessage(msg); + if(parsed.content[0] === 0) { // We're registering : send a REGISTER_ACK to Chainpad + onMessage('', '1:y'+mkMessage('', channel, [1,0])); + return; + } + if(parsed.content[0] === 4) { // PING message from Chainpad + parsed.content[0] = 5; + onMessage('', '1:y'+mkMessage(parsed.user, parsed.channelId, parsed.content)); + wc.sendPing(); + return; + } + return Crypto.encrypt(msg, cryptKey); + } + }; + + var options = {}; + + var rtc = true; + + if(channel.trim().length > 0) { + options.key = channel; + } + if(!webrtcUrl) { + rtc = false; + options.signaling = websocketUrl; + options.topology = 'StarTopologyService'; + options.protocol = 'WebSocketProtocolService'; + options.connector = 'WebSocketService'; + options.openWebChannel = true; + } + else { + options.signaling = webrtcUrl; + } + + var createRealtime = function(chan) { + return ChainPad.create(userName, + passwd, + channel, + config.initialState || {}, + { + transformFunction: config.transformFunction + }); + }; + + var onReady = function(wc) { + if(config.onInit) { + config.onInit({ + myID: wc.myID, + realtime: realtime, + getLag: wc.getLag, + userList: userList + }); + } + // Trigger onJoining with our own Cryptpad username to tell the toolbar that we are synced + onJoining(wc.myID); + + // we're fully synced + initializing = false; + + // execute an onReady callback if one was supplied + if (config.onReady) { + config.onReady({ + realtime: realtime + }); + } + } + + var onOpen = function(wc) { + channel = wc.id; + window.location.hash = channel + '|' + chanKey; + // Add the handlers to the WebChannel + wc.onmessage = function(peer, msg) { // On receiving message + onMessage(peer, msg, wc); + }; + wc.onJoining = onJoining; // On user joining the session + wc.onLeaving = onLeaving; // On user leaving the session + wc.onPeerMessage = function(peerId, type) { + onPeerMessage(peerId, type, wc); + }; + if(config.setMyID) { + config.setMyID({ + myID: wc.myID + }); + } + // Open a Chainpad session + realtime = createRealtime(); + + // Sending a message... + realtime.onMessage(function(message) { + // Filter messages sent by Chainpad to make it compatible with Netflux + message = chainpadAdapter.msgOut(message, wc); + if(message) { + wc.send(message).then(function() { + // Send the message back to Chainpad once it is sent to the recipients. + onMessage(wc.myID, message); + }, function(err) { + // The message has not been sent, display the error. + console.error(err); + }); + } + }); + + // Get the channel history + var hc; + if(rtc) { + wc.channels.forEach(function (c) { if(!hc) { hc = c; } }); + if(hc) { + wc.getHistory(hc.peerID); + } + } + else { + // TODO : Improve WebSocket service to use the latest Netflux's API + wc.peers.forEach(function (p) { if (!hc || p.linkQuality > hc.linkQuality) { hc = p; } }); + hc.send(JSON.stringify(['GET_HISTORY', wc.id])); + } + + + toReturn.patchText = TextPatcher.create({ + realtime: realtime + }); + + realtime.start(); + }; + + var createRTCChannel = function () { + // Check if the WebRTC channel exists and create it if necessary + var webchannel = Netflux.create(); + webchannel.openForJoining(options).then(function(data) { + console.log(data); + webchannel.id = data.key + onOpen(webchannel); + onReady(webchannel); + }, function(error) { + warn(error); + }); + }; + + var joinChannel = function() { + // Connect to the WebSocket/WebRTC channel + Netflux.join(channel, options).then(function(wc) { + if(channel.trim().length > 0) { + wc.id = channel + } + onOpen(wc); + }, function(error) { + if(rtc && error.code === 1008) {// Unexisting RTC channel + createRTCChannel(); + } + else { warn(error); } + }); + }; + joinChannel(); + + var checkConnection = function(wc) { + if(wc.channels && wc.channels.size > 0) { + var channels = Array.from(wc.channels); + var channel = channels[0]; + + var socketChecker = setInterval(function () { + if (channel.checkSocket(realtime)) { + warn("Socket disconnected!"); + + recoverableErrorCount += 1; + + if (recoverableErrorCount >= MAX_RECOVERABLE_ERRORS) { + warn("Giving up!"); + realtime.abort(); + try { channel.close(); } catch (e) { warn(e); } + if (config.onAbort) { + config.onAbort({ + socket: channel + }); + } + if (socketChecker) { clearInterval(socketChecker); } + } + } else { + // it's working as expected, continue + } + }, 200); + } + }; + + return toReturn; + }; + return module.exports; +}); From 692fe24b323c0635b9f2f895e30baa933d44accc Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Mon, 11 Apr 2016 14:27:58 +0200 Subject: [PATCH 041/257] Ability to use the old Chainpad server in parallel of the netflux server --- ChainPadSrv.js | 1 + server.js | 1 + 2 files changed, 2 insertions(+) diff --git a/ChainPadSrv.js b/ChainPadSrv.js index 4ed6ff840..e2d7a9ef6 100644 --- a/ChainPadSrv.js +++ b/ChainPadSrv.js @@ -177,6 +177,7 @@ var create = module.exports.create = function (socketServer, store) { }; socketServer.on('connection', function(socket) { + if(socket.upgradeReq.url !== '/cryptpad_websocket_old') { return; } socket.on('message', function(message) { try { handleMessage(ctx, socket, message); diff --git a/server.js b/server.js index ce7d6ec49..f3d472dea 100644 --- a/server.js +++ b/server.js @@ -84,5 +84,6 @@ var wsSrv = new WebSocketServer(wsConfig); Storage.create(config, function (store) { console.log('DB connected'); NetfluxSrv.run(store, wsSrv); + ChainPadSrv.create(wsSrv, store); WebRTCSrv.run(wsSrv); }); From c53baab99dcad689e6a40fe545a74877614960bb Mon Sep 17 00:00:00 2001 From: Yann Flory Date: Mon, 11 Apr 2016 14:43:39 +0200 Subject: [PATCH 042/257] Update Codepad with the latest improvements --- www/code/html-patcher.js | 483 --- www/code/main.js | 6 +- www/code/rangy.js | 3743 ---------------------- www/code/realtime-wysiwyg.js | 358 --- www/code/{rtwiki.js => rt_codemirror.js} | 458 +-- www/code/sharejs_textarea.js | 263 -- www/code/toolbar.js | 246 ++ 7 files changed, 253 insertions(+), 5304 deletions(-) delete mode 100644 www/code/html-patcher.js delete mode 100644 www/code/rangy.js delete mode 100644 www/code/realtime-wysiwyg.js rename www/code/{rtwiki.js => rt_codemirror.js} (50%) delete mode 100644 www/code/sharejs_textarea.js create mode 100644 www/code/toolbar.js diff --git a/www/code/html-patcher.js b/www/code/html-patcher.js deleted file mode 100644 index d36552d85..000000000 --- a/www/code/html-patcher.js +++ /dev/null @@ -1,483 +0,0 @@ -/* - * 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 . - */ -define([ - '/bower_components/jquery/dist/jquery.min.js', - '/common/otaml.js' -], function () { - - var $ = window.jQuery; - var Otaml = window.Otaml; - var module = { exports: {} }; - var PARANOIA = true; - - var debug = function (x) { }; - debug = function (x) { console.log(x); }; - - var getNextSiblingDeep = function (node, parent) - { - if (node.firstChild) { return node.firstChild; } - do { - if (node.nextSibling) { return node.nextSibling; } - node = node.parentNode; - } while (node && node !== parent); - }; - - var getOuterHTML = function (node) - { - var html = node.outerHTML; - if (html) { return html; } - if (node.parentNode && node.parentNode.childNodes.length === 1) { - return node.parentNode.innerHTML; - } - var div = document.createElement('div'); - div.appendChild(node.cloneNode(true)); - return div.innerHTML; - }; - - var nodeFromHTML = function (html) - { - var e = document.createElement('div'); - e.innerHTML = html; - return e.childNodes[0]; - }; - - var getInnerHTML = function (node) - { - var html = node.innerHTML; - if (html) { return html; } - var outerHTML = getOuterHTML(node); - var tw = Otaml.tagWidth(outerHTML); - if (!tw) { return outerHTML; } - return outerHTML.substring(tw, outerHTML.lastIndexOf(''; - if (PARANOIA && spanHTML !== span.outerHTML) { throw new Error(); } - - node.parentNode.insertBefore(span, node); - var newDocText = getInnerHTML(dom); - idx = newDocText.lastIndexOf(spanHTML); - if (idx === -1 || idx !== newDocText.indexOf(spanHTML)) { throw new Error(); } - node.parentNode.removeChild(span); - - if (PARANOIA && getInnerHTML(dom) !== docText) { throw new Error(); } - } - - if (PARANOIA && docText.indexOf(content, idx) !== idx) { throw new Error(); } - return idx; - }; - - var patchString = module.exports.patchString = function (oldString, offset, toRemove, toInsert) - { - return oldString.substring(0, offset) + toInsert + oldString.substring(offset + toRemove); - }; - - var getNodeAtOffset = function (docText, offset, dom) - { - if (PARANOIA && dom.childNodes.length && docText !== dom.innerHTML) { throw new Error(); } - if (offset < 0) { throw new Error(); } - - var idx = 0; - for (var i = 0; i < dom.childNodes.length; i++) { - var childOuterHTML = getOuterHTML(dom.childNodes[i]); - if (PARANOIA && docText.indexOf(childOuterHTML, idx) !== idx) { throw new Error(); } - if (i === 0 && idx >= offset) { - return { node: dom, pos: 0 }; - } - if (idx + childOuterHTML.length > offset) { - var childInnerHTML = childOuterHTML; - var tw = Otaml.tagWidth(childOuterHTML); - if (tw) { - childInnerHTML = childOuterHTML.substring(tw, childOuterHTML.lastIndexOf(' docText.length) { throw new Error(); } - var beforeOffset = docText.substring(0, offset); - if (beforeOffset.indexOf('&') > -1) { - var tn = nodeFromHTML(beforeOffset); - offset = tn.data.length; - } - } else { - offset = 0; - } - - return { node: dom, pos: offset }; - }; - - var relocatedPositionInNode = function (newNode, oldNode, offset) - { - if (newNode.nodeName !== '#text' || oldNode.nodeName !== '#text' || offset === 0) { - offset = 0; - } else if (oldNode.data === newNode.data) { - // fallthrough - } else if (offset > newNode.length) { - offset = newNode.length; - } else if (oldNode.data.substring(0, offset) === newNode.data.substring(0, offset)) { - // keep same offset and fall through - } else { - var rOffset = oldNode.length - offset; - if (oldNode.data.substring(offset) === - newNode.data.substring(newNode.length - rOffset)) - { - offset = newNode.length - rOffset; - } else { - offset = 0; - } - } - return { node: newNode, pos: offset }; - }; - - var pushNode = function (list, node) { - if (node.nodeName === '#text') { - list.push.apply(list, node.data.split('')); - } else { - list.push('#' + node.nodeName); - } - }; - - var getChildPath = function (parent) { - var out = []; - for (var next = parent; next; next = getNextSiblingDeep(next, parent)) { - pushNode(out, next); - } - return out; - }; - - var tryFromBeginning = function (oldPath, newPath) { - for (var i = 0; i < oldPath.length; i++) { - if (oldPath[i] !== newPath[i]) { return i; } - } - return oldPath.length; - }; - - var tryFromEnd = function (oldPath, newPath) { - for (var i = 1; i <= oldPath.length; i++) { - if (oldPath[oldPath.length - i] !== newPath[newPath.length - i]) { - return false; - } - } - return true; - }; - - /** - * returns 2 arrays (before and after). - * before is string representations (see nodeId()) of all nodes before the target - * node and after is representations of all nodes which follow. - */ - var getNodePaths = function (parent, node) { - var before = []; - var next = parent; - for (; next && next !== node; next = getNextSiblingDeep(next, parent)) { - pushNode(before, next); - } - - if (next !== node) { throw new Error(); } - - var after = []; - next = getNextSiblingDeep(next, parent); - for (; next; next = getNextSiblingDeep(next, parent)) { - pushNode(after, next); - } - - return { before: before, after: after }; - }; - - var nodeAtIndex = function (parent, idx) { - var node = parent; - for (var i = 0; i < idx; i++) { - if (node.nodeName === '#text') { - if (i + node.data.length > idx) { return node; } - i += node.data.length - 1; - } - node = getNextSiblingDeep(node); - } - return node; - }; - - var getRelocatedPosition = function (newParent, oldParent, oldNode, oldOffset, origText, op) - { - var newPath = getChildPath(newParent); - if (newPath.length === 1) { - return { node: null, pos: 0 }; - } - var oldPaths = getNodePaths(oldParent, oldNode); - - var idx = -1; - var fromBeginning = tryFromBeginning(oldPaths.before, newPath); - if (fromBeginning === oldPaths.before.length) { - idx = oldPaths.before.length; - } else if (tryFromEnd(oldPaths.after, newPath)) { - idx = (newPath.length - oldPaths.after.length - 1); - } else { - idx = fromBeginning; - var id = 'relocate-' + String(Math.random()).substring(2); - $(document.body).append(''); - $('#'+id).val(JSON.stringify([origText, op, newPath, getChildPath(oldParent), oldPaths])); - } - - var out = nodeAtIndex(newParent, idx); - return relocatedPositionInNode(out, oldNode, oldOffset); - }; - - // We can't create a real range until the new parent is installed in the document - // but we need the old range to be in the document so we can do comparisons - // so create a "pseudo" range instead. - var getRelocatedPseudoRange = function (newParent, oldParent, range, origText, op) - { - if (!range.startContainer) { - throw new Error(); - } - if (!newParent) { throw new Error(); } - - // Copy because tinkering in the dom messes up the original range. - var startContainer = range.startContainer; - var startOffset = range.startOffset; - var endContainer = range.endContainer; - var endOffset = range.endOffset; - - var newStart = - getRelocatedPosition(newParent, oldParent, startContainer, startOffset, origText, op); - - if (!newStart.node) { - // there is probably nothing left of the document so just clear the selection. - endContainer = null; - } - - var newEnd = { node: newStart.node, pos: newStart.pos }; - if (endContainer) { - if (endContainer !== startContainer) { - newEnd = getRelocatedPosition(newParent, oldParent, endContainer, endOffset, origText, op); - } else if (endOffset !== startOffset) { - newEnd = { - node: newStart.node, - pos: relocatedPositionInNode(newStart.node, endContainer, endOffset).pos - }; - } else { - newEnd = { node: newStart.node, pos: newStart.pos }; - } - } - - return { start: newStart, end: newEnd }; - }; - - var replaceAllChildren = function (parent, newParent) - { - var c; - while ((c = parent.firstChild)) { - parent.removeChild(c); - } - while ((c = newParent.firstChild)) { - newParent.removeChild(c); - parent.appendChild(c); - } - }; - - var isAncestorOf = function (maybeDecendent, maybeAncestor) { - while ((maybeDecendent = maybeDecendent.parentNode)) { - if (maybeDecendent === maybeAncestor) { return true; } - } - return false; - }; - - var getSelectedRange = function (rangy, ifrWindow, selection) { - selection = selection || rangy.getSelection(ifrWindow); - if (selection.rangeCount === 0) { - return; - } - var range = selection.getRangeAt(0); - range.backward = (selection.rangeCount === 1 && selection.isBackward()); - if (!range.startContainer) { - throw new Error(); - } - - // Occasionally, some browsers *cough* firefox *cough* will attach the range to something - // which has been used in the past but is nolonger part of the dom... - if (range.startContainer && - isAncestorOf(range.startContainer, ifrWindow.document)) - { - return range; - } - - return; - }; - - var applyHTMLOp = function (docText, op, dom, rangy, ifrWindow) - { - var parent = getNodeAtOffset(docText, op.offset, dom).node; - var htmlToRemove = docText.substring(op.offset, op.offset + op.toRemove); - - var parentInnerHTML; - var indexOfInnerHTML; - var localOffset; - for (;;) { - for (;;) { - parentInnerHTML = parent.innerHTML; - if (typeof(parentInnerHTML) !== 'undefined' - && parentInnerHTML.indexOf(htmlToRemove) !== -1) - { - break; - } - if (parent === dom || !(parent = parent.parentNode)) { throw new Error(); } - } - - var indexOfOuterHTML = 0; - var tw = 0; - if (parent !== dom) { - indexOfOuterHTML = offsetOfNodeOuterHTML(docText, parent, dom, ifrWindow); - tw = Otaml.tagWidth(docText.substring(indexOfOuterHTML)); - } - indexOfInnerHTML = indexOfOuterHTML + tw; - - localOffset = op.offset - indexOfInnerHTML; - - if (localOffset >= 0 && localOffset + op.toRemove <= parentInnerHTML.length) { - break; - } - - parent = parent.parentNode; - if (!parent) { throw new Error(); } - } - - if (PARANOIA && - docText.substr(indexOfInnerHTML, parentInnerHTML.length) !== parentInnerHTML) - { - throw new Error(); - } - - var newParentInnerHTML = - patchString(parentInnerHTML, localOffset, op.toRemove, op.toInsert); - - // Create a temp container for holding the children of the parent node. - // Once we've identified the new range, we'll return the nodes to the - // original parent. This is because parent might be the and we - // don't want to destroy all of our event listeners. - var babysitter = ifrWindow.document.createElement('div'); - // give it a uid so that we can prove later that it's not in the document, - // see getSelectedRange() - babysitter.setAttribute('id', uniqueId()); - babysitter.innerHTML = newParentInnerHTML; - - var range = getSelectedRange(rangy, ifrWindow); - - // doesn't intersect at all - if (!range || !range.containsNode(parent, true)) { - replaceAllChildren(parent, babysitter); - return; - } - - var pseudoRange = getRelocatedPseudoRange(babysitter, parent, range, rangy); - range.detach(); - replaceAllChildren(parent, babysitter); - if (pseudoRange.start.node) { - var selection = rangy.getSelection(ifrWindow); - var newRange = rangy.createRange(); - newRange.setStart(pseudoRange.start.node, pseudoRange.start.pos); - newRange.setEnd(pseudoRange.end.node, pseudoRange.end.pos); - selection.setSingleRange(newRange); - } - return; - }; - - var applyHTMLOpHammer = function (docText, op, dom, rangy, ifrWindow) - { - var newDocText = patchString(docText, op.offset, op.toRemove, op.toInsert); - var babysitter = ifrWindow.document.createElement('body'); - // give it a uid so that we can prove later that it's not in the document, - // see getSelectedRange() - babysitter.setAttribute('id', uniqueId()); - babysitter.innerHTML = newDocText; - - var range = getSelectedRange(rangy, ifrWindow); - - // doesn't intersect at all - if (!range) { - replaceAllChildren(dom, babysitter); - return; - } - - var pseudoRange = getRelocatedPseudoRange(babysitter, dom, range, docText, op); - range.detach(); - replaceAllChildren(dom, babysitter); - if (pseudoRange.start.node) { - var selection = rangy.getSelection(ifrWindow); - var newRange = rangy.createRange(); - newRange.setStart(pseudoRange.start.node, pseudoRange.start.pos); - newRange.setEnd(pseudoRange.end.node, pseudoRange.end.pos); - selection.setSingleRange(newRange); - } - return; - }; - - /* Return whether the selection range has been "dirtied" and needs to be reloaded. */ - var applyOp = module.exports.applyOp = function (docText, op, dom, rangy, ifrWindow) - { - if (PARANOIA && docText !== getInnerHTML(dom)) { throw new Error(); } - - if (op.offset + op.toRemove > docText.length) { - throw new Error(); - } - try { - applyHTMLOpHammer(docText, op, dom, rangy, ifrWindow); - var result = patchString(docText, op.offset, op.toRemove, op.toInsert); - var innerHTML = getInnerHTML(dom); - if (result !== innerHTML) { - $(document.body).append(''); - $(document.body).append(''); - var SEP = '\n\n\n\n\n\n\n\n\n\n'; - $('#statebox').val(docText + SEP + result + SEP + innerHTML); - var diff = Otaml.makeTextOperation(result, innerHTML); - $('#errorbox').val(JSON.stringify(op) + '\n' + JSON.stringify(diff)); - throw new Error(); - } - } catch (err) { - if (PARANOIA) { console.log(err.stack); } - // The big hammer - dom.innerHTML = patchString(docText, op.offset, op.toRemove, op.toInsert); - } - }; - - return module.exports; -}); diff --git a/www/code/main.js b/www/code/main.js index 12804cbb0..9f5d1fa1c 100644 --- a/www/code/main.js +++ b/www/code/main.js @@ -1,10 +1,10 @@ define([ '/api/config?cb=' + Math.random().toString(16).substring(2), - '/code/rtwiki.js', + '/code/rt_codemirror.js', '/common/messages.js', '/common/crypto.js', '/bower_components/jquery/dist/jquery.min.js' -], function (Config, RTWiki, Messages, Crypto) { +], function (Config, RTCode, Messages, Crypto) { var $ = window.jQuery; var ifrw = $('#pad-iframe')[0].contentWindow; @@ -36,7 +36,7 @@ define([ editor.setValue(Messages.codeInitialState); var rtw = - RTWiki.start(ifrw, + RTCode.start(ifrw, Config.websocketURL, Crypto.rand64(8), key.channel, diff --git a/www/code/rangy.js b/www/code/rangy.js deleted file mode 100644 index 787e2b88e..000000000 --- a/www/code/rangy.js +++ /dev/null @@ -1,3743 +0,0 @@ -/** - * Rangy, a cross-browser JavaScript range and selection library - * http://code.google.com/p/rangy/ - * - * Copyright 2013, Tim Down - * Licensed under the MIT license. - * Version: 1.3alpha.804 - * Build date: 8 December 2013 - */ - -/* - TODO FIXME use www/common/rangy if possible... - -*/ - -(function(global) { - var amdSupported = (typeof global.define == "function" && global.define.amd); - - var OBJECT = "object", FUNCTION = "function", UNDEFINED = "undefined"; - - // Minimal set of properties required for DOM Level 2 Range compliance. Comparison constants such as START_TO_START - // are omitted because ranges in KHTML do not have them but otherwise work perfectly well. See issue 113. - var domRangeProperties = ["startContainer", "startOffset", "endContainer", "endOffset", "collapsed", - "commonAncestorContainer"]; - - // Minimal set of methods required for DOM Level 2 Range compliance - var domRangeMethods = ["setStart", "setStartBefore", "setStartAfter", "setEnd", "setEndBefore", - "setEndAfter", "collapse", "selectNode", "selectNodeContents", "compareBoundaryPoints", "deleteContents", - "extractContents", "cloneContents", "insertNode", "surroundContents", "cloneRange", "toString", "detach"]; - - var textRangeProperties = ["boundingHeight", "boundingLeft", "boundingTop", "boundingWidth", "htmlText", "text"]; - - // Subset of TextRange's full set of methods that we're interested in - var textRangeMethods = ["collapse", "compareEndPoints", "duplicate", "moveToElementText", "parentElement", "select", - "setEndPoint", "getBoundingClientRect"]; - - /*----------------------------------------------------------------------------------------------------------------*/ - - // Trio of functions taken from Peter Michaux's article: - // http://peter.michaux.ca/articles/feature-detection-state-of-the-art-browser-scripting - function isHostMethod(o, p) { - var t = typeof o[p]; - return t == FUNCTION || (!!(t == OBJECT && o[p])) || t == "unknown"; - } - - function isHostObject(o, p) { - return !!(typeof o[p] == OBJECT && o[p]); - } - - function isHostProperty(o, p) { - return typeof o[p] != UNDEFINED; - } - - // Creates a convenience function to save verbose repeated calls to tests functions - function createMultiplePropertyTest(testFunc) { - return function(o, props) { - var i = props.length; - while (i--) { - if (!testFunc(o, props[i])) { - return false; - } - } - return true; - }; - } - - // Next trio of functions are a convenience to save verbose repeated calls to previous two functions - var areHostMethods = createMultiplePropertyTest(isHostMethod); - var areHostObjects = createMultiplePropertyTest(isHostObject); - var areHostProperties = createMultiplePropertyTest(isHostProperty); - - function isTextRange(range) { - return range && areHostMethods(range, textRangeMethods) && areHostProperties(range, textRangeProperties); - } - - function getBody(doc) { - return isHostObject(doc, "body") ? doc.body : doc.getElementsByTagName("body")[0]; - } - - var modules = {}; - - var api = { - version: "1.3alpha.804", - initialized: false, - supported: true, - - util: { - isHostMethod: isHostMethod, - isHostObject: isHostObject, - isHostProperty: isHostProperty, - areHostMethods: areHostMethods, - areHostObjects: areHostObjects, - areHostProperties: areHostProperties, - isTextRange: isTextRange, - getBody: getBody - }, - - features: {}, - - modules: modules, - config: { - alertOnFail: true, - alertOnWarn: false, - preferTextRange: false - } - }; - - function consoleLog(msg) { - if (isHostObject(window, "console") && isHostMethod(window.console, "log")) { - window.console.log(msg); - } - } - - function alertOrLog(msg, shouldAlert) { - if (shouldAlert) { - window.alert(msg); - } else { - consoleLog(msg); - } - } - - function fail(reason) { - api.initialized = true; - api.supported = false; - alertOrLog("Rangy is not supported on this page in your browser. Reason: " + reason, api.config.alertOnFail); - } - - api.fail = fail; - - function warn(msg) { - alertOrLog("Rangy warning: " + msg, api.config.alertOnWarn); - } - - api.warn = warn; - - // Add utility extend() method - if ({}.hasOwnProperty) { - api.util.extend = function(obj, props, deep) { - var o, p; - for (var i in props) { - if (props.hasOwnProperty(i)) { - o = obj[i]; - p = props[i]; - //if (deep) alert([o !== null, typeof o == "object", p !== null, typeof p == "object"]) - if (deep && o !== null && typeof o == "object" && p !== null && typeof p == "object") { - api.util.extend(o, p, true); - } - obj[i] = p; - } - } - return obj; - }; - } else { - fail("hasOwnProperty not supported"); - } - - // Test whether Array.prototype.slice can be relied on for NodeLists and use an alternative toArray() if not - (function() { - var el = document.createElement("div"); - el.appendChild(document.createElement("span")); - var slice = [].slice; - var toArray; - try { - if (slice.call(el.childNodes, 0)[0].nodeType == 1) { - toArray = function(arrayLike) { - return slice.call(arrayLike, 0); - }; - } - } catch (e) {} - - if (!toArray) { - toArray = function(arrayLike) { - var arr = []; - for (var i = 0, len = arrayLike.length; i < len; ++i) { - arr[i] = arrayLike[i]; - } - return arr; - }; - } - - api.util.toArray = toArray; - })(); - - - // Very simple event handler wrapper function that doesn't attempt to solve issues such as "this" handling or - // normalization of event properties - var addListener; - if (isHostMethod(document, "addEventListener")) { - addListener = function(obj, eventType, listener) { - obj.addEventListener(eventType, listener, false); - }; - } else if (isHostMethod(document, "attachEvent")) { - addListener = function(obj, eventType, listener) { - obj.attachEvent("on" + eventType, listener); - }; - } else { - fail("Document does not have required addEventListener or attachEvent method"); - } - - api.util.addListener = addListener; - - var initListeners = []; - - function getErrorDesc(ex) { - return ex.message || ex.description || String(ex); - } - - // Initialization - function init() { - if (api.initialized) { - return; - } - var testRange; - var implementsDomRange = false, implementsTextRange = false; - - // First, perform basic feature tests - - if (isHostMethod(document, "createRange")) { - testRange = document.createRange(); - if (areHostMethods(testRange, domRangeMethods) && areHostProperties(testRange, domRangeProperties)) { - implementsDomRange = true; - } - testRange.detach(); - } - - var body = getBody(document); - if (!body || body.nodeName.toLowerCase() != "body") { - fail("No body element found"); - return; - } - - if (body && isHostMethod(body, "createTextRange")) { - testRange = body.createTextRange(); - if (isTextRange(testRange)) { - implementsTextRange = true; - } - } - - if (!implementsDomRange && !implementsTextRange) { - fail("Neither Range nor TextRange are available"); - return; - } - - api.initialized = true; - api.features = { - implementsDomRange: implementsDomRange, - implementsTextRange: implementsTextRange - }; - - // Initialize modules - var module, errorMessage; - for (var moduleName in modules) { - if ( (module = modules[moduleName]) instanceof Module ) { - module.init(module, api); - } - } - - // Call init listeners - for (var i = 0, len = initListeners.length; i < len; ++i) { - try { - initListeners[i](api); - } catch (ex) { - errorMessage = "Rangy init listener threw an exception. Continuing. Detail: " + getErrorDesc(ex); - consoleLog(errorMessage); - } - } - } - - // Allow external scripts to initialize this library in case it's loaded after the document has loaded - api.init = init; - - // Execute listener immediately if already initialized - api.addInitListener = function(listener) { - if (api.initialized) { - listener(api); - } else { - initListeners.push(listener); - } - }; - - var createMissingNativeApiListeners = []; - - api.addCreateMissingNativeApiListener = function(listener) { - createMissingNativeApiListeners.push(listener); - }; - - function createMissingNativeApi(win) { - win = win || window; - init(); - - // Notify listeners - for (var i = 0, len = createMissingNativeApiListeners.length; i < len; ++i) { - createMissingNativeApiListeners[i](win); - } - } - - api.createMissingNativeApi = createMissingNativeApi; - - function Module(name, dependencies, initializer) { - this.name = name; - this.dependencies = dependencies; - this.initialized = false; - this.supported = false; - this.initializer = initializer; - } - - Module.prototype = { - init: function(api) { - var requiredModuleNames = this.dependencies || []; - for (var i = 0, len = requiredModuleNames.length, requiredModule, moduleName; i < len; ++i) { - moduleName = requiredModuleNames[i]; - - requiredModule = modules[moduleName]; - if (!requiredModule || !(requiredModule instanceof Module)) { - throw new Error("required module '" + moduleName + "' not found"); - } - - requiredModule.init(); - - if (!requiredModule.supported) { - throw new Error("required module '" + moduleName + "' not supported"); - } - } - - // Now run initializer - this.initializer(this) - }, - - fail: function(reason) { - this.initialized = true; - this.supported = false; - throw new Error("Module '" + this.name + "' failed to load: " + reason); - }, - - warn: function(msg) { - api.warn("Module " + this.name + ": " + msg); - }, - - deprecationNotice: function(deprecated, replacement) { - api.warn("DEPRECATED: " + deprecated + " in module " + this.name + "is deprecated. Please use " - + replacement + " instead"); - }, - - createError: function(msg) { - return new Error("Error in Rangy " + this.name + " module: " + msg); - } - }; - - function createModule(isCore, name, dependencies, initFunc) { - var newModule = new Module(name, dependencies, function(module) { - if (!module.initialized) { - module.initialized = true; - try { - initFunc(api, module); - module.supported = true; - } catch (ex) { - var errorMessage = "Module '" + name + "' failed to load: " + getErrorDesc(ex); - consoleLog(errorMessage); - } - } - }); - modules[name] = newModule; - -/* - // Add module AMD support - if (!isCore && amdSupported) { - global.define(["rangy-core"], function(rangy) { - - }); - } -*/ - } - - api.createModule = function(name) { - // Allow 2 or 3 arguments (second argument is an optional array of dependencies) - var initFunc, dependencies; - if (arguments.length == 2) { - initFunc = arguments[1]; - dependencies = []; - } else { - initFunc = arguments[2]; - dependencies = arguments[1]; - } - createModule(false, name, dependencies, initFunc); - }; - - api.createCoreModule = function(name, dependencies, initFunc) { - createModule(true, name, dependencies, initFunc); - }; - - /*----------------------------------------------------------------------------------------------------------------*/ - - // Ensure rangy.rangePrototype and rangy.selectionPrototype are available immediately - - function RangePrototype() {} - api.RangePrototype = RangePrototype; - api.rangePrototype = new RangePrototype(); - - function SelectionPrototype() {} - api.selectionPrototype = new SelectionPrototype(); - - /*----------------------------------------------------------------------------------------------------------------*/ - - // Wait for document to load before running tests - - var docReady = false; - - var loadHandler = function(e) { - if (!docReady) { - docReady = true; - if (!api.initialized) { - init(); - } - } - }; - - // Test whether we have window and document objects that we will need - if (typeof window == UNDEFINED) { - fail("No window found"); - return; - } - if (typeof document == UNDEFINED) { - fail("No document found"); - return; - } - - if (isHostMethod(document, "addEventListener")) { - document.addEventListener("DOMContentLoaded", loadHandler, false); - } - - // Add a fallback in case the DOMContentLoaded event isn't supported - addListener(window, "load", loadHandler); - - /*----------------------------------------------------------------------------------------------------------------*/ - - // AMD, for those who like this kind of thing - - if (amdSupported) { - // AMD. Register as an anonymous module. - global.define(function() { - api.amd = true; - return api; - }); - } - - // Create a "rangy" property of the global object in any case. Other Rangy modules (which use Rangy's own simple - // module system) rely on the existence of this global property - global.rangy = api; -})(this); - -rangy.createCoreModule("DomUtil", [], function(api, module) { - var UNDEF = "undefined"; - var util = api.util; - - // Perform feature tests - if (!util.areHostMethods(document, ["createDocumentFragment", "createElement", "createTextNode"])) { - module.fail("document missing a Node creation method"); - } - - if (!util.isHostMethod(document, "getElementsByTagName")) { - module.fail("document missing getElementsByTagName method"); - } - - var el = document.createElement("div"); - if (!util.areHostMethods(el, ["insertBefore", "appendChild", "cloneNode"] || - !util.areHostObjects(el, ["previousSibling", "nextSibling", "childNodes", "parentNode"]))) { - module.fail("Incomplete Element implementation"); - } - - // innerHTML is required for Range's createContextualFragment method - if (!util.isHostProperty(el, "innerHTML")) { - module.fail("Element is missing innerHTML property"); - } - - var textNode = document.createTextNode("test"); - if (!util.areHostMethods(textNode, ["splitText", "deleteData", "insertData", "appendData", "cloneNode"] || - !util.areHostObjects(el, ["previousSibling", "nextSibling", "childNodes", "parentNode"]) || - !util.areHostProperties(textNode, ["data"]))) { - module.fail("Incomplete Text Node implementation"); - } - - /*----------------------------------------------------------------------------------------------------------------*/ - - // Removed use of indexOf because of a bizarre bug in Opera that is thrown in one of the Acid3 tests. I haven't been - // able to replicate it outside of the test. The bug is that indexOf returns -1 when called on an Array that - // contains just the document as a single element and the value searched for is the document. - var arrayContains = /*Array.prototype.indexOf ? - function(arr, val) { - return arr.indexOf(val) > -1; - }:*/ - - function(arr, val) { - var i = arr.length; - while (i--) { - if (arr[i] === val) { - return true; - } - } - return false; - }; - - // Opera 11 puts HTML elements in the null namespace, it seems, and IE 7 has undefined namespaceURI - function isHtmlNamespace(node) { - var ns; - return typeof node.namespaceURI == UNDEF || ((ns = node.namespaceURI) === null || ns == "http://www.w3.org/1999/xhtml"); - } - - function parentElement(node) { - var parent = node.parentNode; - return (parent.nodeType == 1) ? parent : null; - } - - function getNodeIndex(node) { - var i = 0; - while( (node = node.previousSibling) ) { - ++i; - } - return i; - } - - function getNodeLength(node) { - switch (node.nodeType) { - case 7: - case 10: - return 0; - case 3: - case 8: - return node.length; - default: - return node.childNodes.length; - } - } - - function getCommonAncestor(node1, node2) { - var ancestors = [], n; - for (n = node1; n; n = n.parentNode) { - ancestors.push(n); - } - - for (n = node2; n; n = n.parentNode) { - if (arrayContains(ancestors, n)) { - return n; - } - } - - return null; - } - - function isAncestorOf(ancestor, descendant, selfIsAncestor) { - var n = selfIsAncestor ? descendant : descendant.parentNode; - while (n) { - if (n === ancestor) { - return true; - } else { - n = n.parentNode; - } - } - return false; - } - - function isOrIsAncestorOf(ancestor, descendant) { - return isAncestorOf(ancestor, descendant, true); - } - - function getClosestAncestorIn(node, ancestor, selfIsAncestor) { - var p, n = selfIsAncestor ? node : node.parentNode; - while (n) { - p = n.parentNode; - if (p === ancestor) { - return n; - } - n = p; - } - return null; - } - - function isCharacterDataNode(node) { - var t = node.nodeType; - return t == 3 || t == 4 || t == 8 ; // Text, CDataSection or Comment - } - - function isTextOrCommentNode(node) { - if (!node) { - return false; - } - var t = node.nodeType; - return t == 3 || t == 8 ; // Text or Comment - } - - function insertAfter(node, precedingNode) { - var nextNode = precedingNode.nextSibling, parent = precedingNode.parentNode; - if (nextNode) { - parent.insertBefore(node, nextNode); - } else { - parent.appendChild(node); - } - return node; - } - - // Note that we cannot use splitText() because it is bugridden in IE 9. - function splitDataNode(node, index, positionsToPreserve) { - var newNode = node.cloneNode(false); - newNode.deleteData(0, index); - node.deleteData(index, node.length - index); - insertAfter(newNode, node); - - // Preserve positions - if (positionsToPreserve) { - for (var i = 0, position; position = positionsToPreserve[i++]; ) { - // Handle case where position was inside the portion of node after the split point - if (position.node == node && position.offset > index) { - position.node = newNode; - position.offset -= index; - } - // Handle the case where the position is a node offset within node's parent - else if (position.node == node.parentNode && position.offset > getNodeIndex(node)) { - ++position.offset; - } - } - } - return newNode; - } - - function getDocument(node) { - if (node.nodeType == 9) { - return node; - } else if (typeof node.ownerDocument != UNDEF) { - return node.ownerDocument; - } else if (typeof node.document != UNDEF) { - return node.document; - } else if (node.parentNode) { - return getDocument(node.parentNode); - } else { - throw module.createError("getDocument: no document found for node"); - } - } - - function getWindow(node) { - var doc = getDocument(node); - if (typeof doc.defaultView != UNDEF) { - return doc.defaultView; - } else if (typeof doc.parentWindow != UNDEF) { - return doc.parentWindow; - } else { - throw module.createError("Cannot get a window object for node"); - } - } - - function getIframeDocument(iframeEl) { - if (typeof iframeEl.contentDocument != UNDEF) { - return iframeEl.contentDocument; - } else if (typeof iframeEl.contentWindow != UNDEF) { - return iframeEl.contentWindow.document; - } else { - throw module.createError("getIframeDocument: No Document object found for iframe element"); - } - } - - function getIframeWindow(iframeEl) { - if (typeof iframeEl.contentWindow != UNDEF) { - return iframeEl.contentWindow; - } else if (typeof iframeEl.contentDocument != UNDEF) { - return iframeEl.contentDocument.defaultView; - } else { - throw module.createError("getIframeWindow: No Window object found for iframe element"); - } - } - - // This looks bad. Is it worth it? - function isWindow(obj) { - return obj && util.isHostMethod(obj, "setTimeout") && util.isHostObject(obj, "document"); - } - - function getContentDocument(obj, module, methodName) { - var doc; - - if (!obj) { - doc = document; - } - - // Test if a DOM node has been passed and obtain a document object for it if so - else if (util.isHostProperty(obj, "nodeType")) { - doc = (obj.nodeType == 1 && obj.tagName.toLowerCase() == "iframe") - ? getIframeDocument(obj) : getDocument(obj); - } - - // Test if the doc parameter appears to be a Window object - else if (isWindow(obj)) { - doc = obj.document; - } - - if (!doc) { - throw module.createError(methodName + "(): Parameter must be a Window object or DOM node"); - } - - return doc; - } - - function getRootContainer(node) { - var parent; - while ( (parent = node.parentNode) ) { - node = parent; - } - return node; - } - - function comparePoints(nodeA, offsetA, nodeB, offsetB) { - // See http://www.w3.org/TR/DOM-Level-2-Traversal-Range/ranges.html#Level-2-Range-Comparing - var nodeC, root, childA, childB, n; - if (nodeA == nodeB) { - // Case 1: nodes are the same - return offsetA === offsetB ? 0 : (offsetA < offsetB) ? -1 : 1; - } else if ( (nodeC = getClosestAncestorIn(nodeB, nodeA, true)) ) { - // Case 2: node C (container B or an ancestor) is a child node of A - return offsetA <= getNodeIndex(nodeC) ? -1 : 1; - } else if ( (nodeC = getClosestAncestorIn(nodeA, nodeB, true)) ) { - // Case 3: node C (container A or an ancestor) is a child node of B - return getNodeIndex(nodeC) < offsetB ? -1 : 1; - } else { - root = getCommonAncestor(nodeA, nodeB); - if (!root) { - throw new Error("comparePoints error: nodes have no common ancestor"); - } - - // Case 4: containers are siblings or descendants of siblings - childA = (nodeA === root) ? root : getClosestAncestorIn(nodeA, root, true); - childB = (nodeB === root) ? root : getClosestAncestorIn(nodeB, root, true); - - if (childA === childB) { - // This shouldn't be possible - throw module.createError("comparePoints got to case 4 and childA and childB are the same!"); - } else { - n = root.firstChild; - while (n) { - if (n === childA) { - return -1; - } else if (n === childB) { - return 1; - } - n = n.nextSibling; - } - } - } - } - - /*----------------------------------------------------------------------------------------------------------------*/ - - // Test for IE's crash (IE 6/7) or exception (IE >= 8) when a reference to garbage-collected text node is queried - var crashyTextNodes = false; - - function isBrokenNode(node) { - try { - node.parentNode; - return false; - } catch (e) { - return true; - } - } - - (function() { - var el = document.createElement("b"); - el.innerHTML = "1"; - var textNode = el.firstChild; - el.innerHTML = "
"; - crashyTextNodes = isBrokenNode(textNode); - - api.features.crashyTextNodes = crashyTextNodes; - })(); - - /*----------------------------------------------------------------------------------------------------------------*/ - - function inspectNode(node) { - if (!node) { - return "[No node]"; - } - if (crashyTextNodes && isBrokenNode(node)) { - return "[Broken node]"; - } - if (isCharacterDataNode(node)) { - return '"' + node.data + '"'; - } - if (node.nodeType == 1) { - var idAttr = node.id ? ' id="' + node.id + '"' : ""; - return "<" + node.nodeName + idAttr + ">[" + getNodeIndex(node) + "][" + node.childNodes.length + "][" + (node.innerHTML || "[innerHTML not supported]").slice(0, 25) + "]"; - } - return node.nodeName; - } - - function fragmentFromNodeChildren(node) { - var fragment = getDocument(node).createDocumentFragment(), child; - while ( (child = node.firstChild) ) { - fragment.appendChild(child); - } - return fragment; - } - - var getComputedStyleProperty; - if (typeof window.getComputedStyle != UNDEF) { - getComputedStyleProperty = function(el, propName) { - return getWindow(el).getComputedStyle(el, null)[propName]; - }; - } else if (typeof document.documentElement.currentStyle != UNDEF) { - getComputedStyleProperty = function(el, propName) { - return el.currentStyle[propName]; - }; - } else { - module.fail("No means of obtaining computed style properties found"); - } - - function NodeIterator(root) { - this.root = root; - this._next = root; - } - - NodeIterator.prototype = { - _current: null, - - hasNext: function() { - return !!this._next; - }, - - next: function() { - var n = this._current = this._next; - var child, next; - if (this._current) { - child = n.firstChild; - if (child) { - this._next = child; - } else { - next = null; - while ((n !== this.root) && !(next = n.nextSibling)) { - n = n.parentNode; - } - this._next = next; - } - } - return this._current; - }, - - detach: function() { - this._current = this._next = this.root = null; - } - }; - - function createIterator(root) { - return new NodeIterator(root); - } - - function DomPosition(node, offset) { - this.node = node; - this.offset = offset; - } - - DomPosition.prototype = { - equals: function(pos) { - return !!pos && this.node === pos.node && this.offset == pos.offset; - }, - - inspect: function() { - return "[DomPosition(" + inspectNode(this.node) + ":" + this.offset + ")]"; - }, - - toString: function() { - return this.inspect(); - } - }; - - function DOMException(codeName) { - this.code = this[codeName]; - this.codeName = codeName; - this.message = "DOMException: " + this.codeName; - } - - DOMException.prototype = { - INDEX_SIZE_ERR: 1, - HIERARCHY_REQUEST_ERR: 3, - WRONG_DOCUMENT_ERR: 4, - NO_MODIFICATION_ALLOWED_ERR: 7, - NOT_FOUND_ERR: 8, - NOT_SUPPORTED_ERR: 9, - INVALID_STATE_ERR: 11 - }; - - DOMException.prototype.toString = function() { - return this.message; - }; - - api.dom = { - arrayContains: arrayContains, - isHtmlNamespace: isHtmlNamespace, - parentElement: parentElement, - getNodeIndex: getNodeIndex, - getNodeLength: getNodeLength, - getCommonAncestor: getCommonAncestor, - isAncestorOf: isAncestorOf, - isOrIsAncestorOf: isOrIsAncestorOf, - getClosestAncestorIn: getClosestAncestorIn, - isCharacterDataNode: isCharacterDataNode, - isTextOrCommentNode: isTextOrCommentNode, - insertAfter: insertAfter, - splitDataNode: splitDataNode, - getDocument: getDocument, - getWindow: getWindow, - getIframeWindow: getIframeWindow, - getIframeDocument: getIframeDocument, - getBody: util.getBody, - isWindow: isWindow, - getContentDocument: getContentDocument, - getRootContainer: getRootContainer, - comparePoints: comparePoints, - isBrokenNode: isBrokenNode, - inspectNode: inspectNode, - getComputedStyleProperty: getComputedStyleProperty, - fragmentFromNodeChildren: fragmentFromNodeChildren, - createIterator: createIterator, - DomPosition: DomPosition - }; - - api.DOMException = DOMException; -}); -rangy.createCoreModule("DomRange", ["DomUtil"], function(api, module) { - var dom = api.dom; - var util = api.util; - var DomPosition = dom.DomPosition; - var DOMException = api.DOMException; - - var isCharacterDataNode = dom.isCharacterDataNode; - var getNodeIndex = dom.getNodeIndex; - var isOrIsAncestorOf = dom.isOrIsAncestorOf; - var getDocument = dom.getDocument; - var comparePoints = dom.comparePoints; - var splitDataNode = dom.splitDataNode; - var getClosestAncestorIn = dom.getClosestAncestorIn; - var getNodeLength = dom.getNodeLength; - var arrayContains = dom.arrayContains; - var getRootContainer = dom.getRootContainer; - var crashyTextNodes = api.features.crashyTextNodes; - - /*----------------------------------------------------------------------------------------------------------------*/ - - // Utility functions - - function isNonTextPartiallySelected(node, range) { - return (node.nodeType != 3) && - (isOrIsAncestorOf(node, range.startContainer) || isOrIsAncestorOf(node, range.endContainer)); - } - - function getRangeDocument(range) { - return range.document || getDocument(range.startContainer); - } - - function getBoundaryBeforeNode(node) { - return new DomPosition(node.parentNode, getNodeIndex(node)); - } - - function getBoundaryAfterNode(node) { - return new DomPosition(node.parentNode, getNodeIndex(node) + 1); - } - - function insertNodeAtPosition(node, n, o) { - var firstNodeInserted = node.nodeType == 11 ? node.firstChild : node; - if (isCharacterDataNode(n)) { - if (o == n.length) { - dom.insertAfter(node, n); - } else { - n.parentNode.insertBefore(node, o == 0 ? n : splitDataNode(n, o)); - } - } else if (o >= n.childNodes.length) { - n.appendChild(node); - } else { - n.insertBefore(node, n.childNodes[o]); - } - return firstNodeInserted; - } - - function rangesIntersect(rangeA, rangeB, touchingIsIntersecting) { - assertRangeValid(rangeA); - assertRangeValid(rangeB); - - if (getRangeDocument(rangeB) != getRangeDocument(rangeA)) { - throw new DOMException("WRONG_DOCUMENT_ERR"); - } - - var startComparison = comparePoints(rangeA.startContainer, rangeA.startOffset, rangeB.endContainer, rangeB.endOffset), - endComparison = comparePoints(rangeA.endContainer, rangeA.endOffset, rangeB.startContainer, rangeB.startOffset); - - return touchingIsIntersecting ? startComparison <= 0 && endComparison >= 0 : startComparison < 0 && endComparison > 0; - } - - function cloneSubtree(iterator) { - var partiallySelected; - for (var node, frag = getRangeDocument(iterator.range).createDocumentFragment(), subIterator; node = iterator.next(); ) { - partiallySelected = iterator.isPartiallySelectedSubtree(); - node = node.cloneNode(!partiallySelected); - if (partiallySelected) { - subIterator = iterator.getSubtreeIterator(); - node.appendChild(cloneSubtree(subIterator)); - subIterator.detach(true); - } - - if (node.nodeType == 10) { // DocumentType - throw new DOMException("HIERARCHY_REQUEST_ERR"); - } - frag.appendChild(node); - } - return frag; - } - - function iterateSubtree(rangeIterator, func, iteratorState) { - var it, n; - iteratorState = iteratorState || { stop: false }; - for (var node, subRangeIterator; node = rangeIterator.next(); ) { - if (rangeIterator.isPartiallySelectedSubtree()) { - if (func(node) === false) { - iteratorState.stop = true; - return; - } else { - // The node is partially selected by the Range, so we can use a new RangeIterator on the portion of - // the node selected by the Range. - subRangeIterator = rangeIterator.getSubtreeIterator(); - iterateSubtree(subRangeIterator, func, iteratorState); - subRangeIterator.detach(true); - if (iteratorState.stop) { - return; - } - } - } else { - // The whole node is selected, so we can use efficient DOM iteration to iterate over the node and its - // descendants - it = dom.createIterator(node); - while ( (n = it.next()) ) { - if (func(n) === false) { - iteratorState.stop = true; - return; - } - } - } - } - } - - function deleteSubtree(iterator) { - var subIterator; - while (iterator.next()) { - if (iterator.isPartiallySelectedSubtree()) { - subIterator = iterator.getSubtreeIterator(); - deleteSubtree(subIterator); - subIterator.detach(true); - } else { - iterator.remove(); - } - } - } - - function extractSubtree(iterator) { - for (var node, frag = getRangeDocument(iterator.range).createDocumentFragment(), subIterator; node = iterator.next(); ) { - - if (iterator.isPartiallySelectedSubtree()) { - node = node.cloneNode(false); - subIterator = iterator.getSubtreeIterator(); - node.appendChild(extractSubtree(subIterator)); - subIterator.detach(true); - } else { - iterator.remove(); - } - if (node.nodeType == 10) { // DocumentType - throw new DOMException("HIERARCHY_REQUEST_ERR"); - } - frag.appendChild(node); - } - return frag; - } - - function getNodesInRange(range, nodeTypes, filter) { - var filterNodeTypes = !!(nodeTypes && nodeTypes.length), regex; - var filterExists = !!filter; - if (filterNodeTypes) { - regex = new RegExp("^(" + nodeTypes.join("|") + ")$"); - } - - var nodes = []; - iterateSubtree(new RangeIterator(range, false), function(node) { - if (filterNodeTypes && !regex.test(node.nodeType)) { - return; - } - if (filterExists && !filter(node)) { - return; - } - // Don't include a boundary container if it is a character data node and the range does not contain any - // of its character data. See issue 190. - var sc = range.startContainer; - if (node == sc && isCharacterDataNode(sc) && range.startOffset == sc.length) { - return; - } - - var ec = range.endContainer; - if (node == ec && isCharacterDataNode(ec) && range.endOffset == 0) { - return; - } - - nodes.push(node); - }); - return nodes; - } - - function inspect(range) { - var name = (typeof range.getName == "undefined") ? "Range" : range.getName(); - return "[" + name + "(" + dom.inspectNode(range.startContainer) + ":" + range.startOffset + ", " + - dom.inspectNode(range.endContainer) + ":" + range.endOffset + ")]"; - } - - /*----------------------------------------------------------------------------------------------------------------*/ - - // RangeIterator code partially borrows from IERange by Tim Ryan (http://github.com/timcameronryan/IERange) - - function RangeIterator(range, clonePartiallySelectedTextNodes) { - this.range = range; - this.clonePartiallySelectedTextNodes = clonePartiallySelectedTextNodes; - - - if (!range.collapsed) { - this.sc = range.startContainer; - this.so = range.startOffset; - this.ec = range.endContainer; - this.eo = range.endOffset; - var root = range.commonAncestorContainer; - - if (this.sc === this.ec && isCharacterDataNode(this.sc)) { - this.isSingleCharacterDataNode = true; - this._first = this._last = this._next = this.sc; - } else { - this._first = this._next = (this.sc === root && !isCharacterDataNode(this.sc)) ? - this.sc.childNodes[this.so] : getClosestAncestorIn(this.sc, root, true); - this._last = (this.ec === root && !isCharacterDataNode(this.ec)) ? - this.ec.childNodes[this.eo - 1] : getClosestAncestorIn(this.ec, root, true); - } - } - } - - RangeIterator.prototype = { - _current: null, - _next: null, - _first: null, - _last: null, - isSingleCharacterDataNode: false, - - reset: function() { - this._current = null; - this._next = this._first; - }, - - hasNext: function() { - return !!this._next; - }, - - next: function() { - // Move to next node - var current = this._current = this._next; - if (current) { - this._next = (current !== this._last) ? current.nextSibling : null; - - // Check for partially selected text nodes - if (isCharacterDataNode(current) && this.clonePartiallySelectedTextNodes) { - if (current === this.ec) { - (current = current.cloneNode(true)).deleteData(this.eo, current.length - this.eo); - } - if (this._current === this.sc) { - (current = current.cloneNode(true)).deleteData(0, this.so); - } - } - } - - return current; - }, - - remove: function() { - var current = this._current, start, end; - - if (isCharacterDataNode(current) && (current === this.sc || current === this.ec)) { - start = (current === this.sc) ? this.so : 0; - end = (current === this.ec) ? this.eo : current.length; - if (start != end) { - current.deleteData(start, end - start); - } - } else { - if (current.parentNode) { - current.parentNode.removeChild(current); - } else { - } - } - }, - - // Checks if the current node is partially selected - isPartiallySelectedSubtree: function() { - var current = this._current; - return isNonTextPartiallySelected(current, this.range); - }, - - getSubtreeIterator: function() { - var subRange; - if (this.isSingleCharacterDataNode) { - subRange = this.range.cloneRange(); - subRange.collapse(false); - } else { - subRange = new Range(getRangeDocument(this.range)); - var current = this._current; - var startContainer = current, startOffset = 0, endContainer = current, endOffset = getNodeLength(current); - - if (isOrIsAncestorOf(current, this.sc)) { - startContainer = this.sc; - startOffset = this.so; - } - if (isOrIsAncestorOf(current, this.ec)) { - endContainer = this.ec; - endOffset = this.eo; - } - - updateBoundaries(subRange, startContainer, startOffset, endContainer, endOffset); - } - return new RangeIterator(subRange, this.clonePartiallySelectedTextNodes); - }, - - detach: function(detachRange) { - if (detachRange) { - this.range.detach(); - } - this.range = this._current = this._next = this._first = this._last = this.sc = this.so = this.ec = this.eo = null; - } - }; - - /*----------------------------------------------------------------------------------------------------------------*/ - - // Exceptions - - function RangeException(codeName) { - this.code = this[codeName]; - this.codeName = codeName; - this.message = "RangeException: " + this.codeName; - } - - RangeException.prototype = { - BAD_BOUNDARYPOINTS_ERR: 1, - INVALID_NODE_TYPE_ERR: 2 - }; - - RangeException.prototype.toString = function() { - return this.message; - }; - - /*----------------------------------------------------------------------------------------------------------------*/ - - var beforeAfterNodeTypes = [1, 3, 4, 5, 7, 8, 10]; - var rootContainerNodeTypes = [2, 9, 11]; - var readonlyNodeTypes = [5, 6, 10, 12]; - var insertableNodeTypes = [1, 3, 4, 5, 7, 8, 10, 11]; - var surroundNodeTypes = [1, 3, 4, 5, 7, 8]; - - function createAncestorFinder(nodeTypes) { - return function(node, selfIsAncestor) { - var t, n = selfIsAncestor ? node : node.parentNode; - while (n) { - t = n.nodeType; - if (arrayContains(nodeTypes, t)) { - return n; - } - n = n.parentNode; - } - return null; - }; - } - - var getDocumentOrFragmentContainer = createAncestorFinder( [9, 11] ); - var getReadonlyAncestor = createAncestorFinder(readonlyNodeTypes); - var getDocTypeNotationEntityAncestor = createAncestorFinder( [6, 10, 12] ); - - function assertNoDocTypeNotationEntityAncestor(node, allowSelf) { - if (getDocTypeNotationEntityAncestor(node, allowSelf)) { - throw new RangeException("INVALID_NODE_TYPE_ERR"); - } - } - - function assertNotDetached(range) { - if (!range.startContainer) { - throw new DOMException("INVALID_STATE_ERR"); - } - } - - function assertValidNodeType(node, invalidTypes) { - if (!arrayContains(invalidTypes, node.nodeType)) { - throw new RangeException("INVALID_NODE_TYPE_ERR"); - } - } - - function assertValidOffset(node, offset) { - if (offset < 0 || offset > (isCharacterDataNode(node) ? node.length : node.childNodes.length)) { - throw new DOMException("INDEX_SIZE_ERR"); - } - } - - function assertSameDocumentOrFragment(node1, node2) { - if (getDocumentOrFragmentContainer(node1, true) !== getDocumentOrFragmentContainer(node2, true)) { - throw new DOMException("WRONG_DOCUMENT_ERR"); - } - } - - function assertNodeNotReadOnly(node) { - if (getReadonlyAncestor(node, true)) { - throw new DOMException("NO_MODIFICATION_ALLOWED_ERR"); - } - } - - function assertNode(node, codeName) { - if (!node) { - throw new DOMException(codeName); - } - } - - function isOrphan(node) { - return (crashyTextNodes && dom.isBrokenNode(node)) || - !arrayContains(rootContainerNodeTypes, node.nodeType) && !getDocumentOrFragmentContainer(node, true); - } - - function isValidOffset(node, offset) { - return offset <= (isCharacterDataNode(node) ? node.length : node.childNodes.length); - } - - function isRangeValid(range) { - return (!!range.startContainer && !!range.endContainer - && !isOrphan(range.startContainer) - && !isOrphan(range.endContainer) - && isValidOffset(range.startContainer, range.startOffset) - && isValidOffset(range.endContainer, range.endOffset)); - } - - function assertRangeValid(range) { - assertNotDetached(range); - if (!isRangeValid(range)) { - throw new Error("Range error: Range is no longer valid after DOM mutation (" + range.inspect() + ")"); - } - } - - /*----------------------------------------------------------------------------------------------------------------*/ - - // Test the browser's innerHTML support to decide how to implement createContextualFragment - var styleEl = document.createElement("style"); - var htmlParsingConforms = false; - try { - styleEl.innerHTML = "x"; - htmlParsingConforms = (styleEl.firstChild.nodeType == 3); // Opera incorrectly creates an element node - } catch (e) { - // IE 6 and 7 throw - } - - api.features.htmlParsingConforms = htmlParsingConforms; - - var createContextualFragment = htmlParsingConforms ? - - // Implementation as per HTML parsing spec, trusting in the browser's implementation of innerHTML. See - // discussion and base code for this implementation at issue 67. - // Spec: http://html5.org/specs/dom-parsing.html#extensions-to-the-range-interface - // Thanks to Aleks Williams. - function(fragmentStr) { - // "Let node the context object's start's node." - var node = this.startContainer; - var doc = getDocument(node); - - // "If the context object's start's node is null, raise an INVALID_STATE_ERR - // exception and abort these steps." - if (!node) { - throw new DOMException("INVALID_STATE_ERR"); - } - - // "Let element be as follows, depending on node's interface:" - // Document, Document Fragment: null - var el = null; - - // "Element: node" - if (node.nodeType == 1) { - el = node; - - // "Text, Comment: node's parentElement" - } else if (isCharacterDataNode(node)) { - el = dom.parentElement(node); - } - - // "If either element is null or element's ownerDocument is an HTML document - // and element's local name is "html" and element's namespace is the HTML - // namespace" - if (el === null || ( - el.nodeName == "HTML" - && dom.isHtmlNamespace(getDocument(el).documentElement) - && dom.isHtmlNamespace(el) - )) { - - // "let element be a new Element with "body" as its local name and the HTML - // namespace as its namespace."" - el = doc.createElement("body"); - } else { - el = el.cloneNode(false); - } - - // "If the node's document is an HTML document: Invoke the HTML fragment parsing algorithm." - // "If the node's document is an XML document: Invoke the XML fragment parsing algorithm." - // "In either case, the algorithm must be invoked with fragment as the input - // and element as the context element." - el.innerHTML = fragmentStr; - - // "If this raises an exception, then abort these steps. Otherwise, let new - // children be the nodes returned." - - // "Let fragment be a new DocumentFragment." - // "Append all new children to fragment." - // "Return fragment." - return dom.fragmentFromNodeChildren(el); - } : - - // In this case, innerHTML cannot be trusted, so fall back to a simpler, non-conformant implementation that - // previous versions of Rangy used (with the exception of using a body element rather than a div) - function(fragmentStr) { - assertNotDetached(this); - var doc = getRangeDocument(this); - var el = doc.createElement("body"); - el.innerHTML = fragmentStr; - - return dom.fragmentFromNodeChildren(el); - }; - - function splitRangeBoundaries(range, positionsToPreserve) { - assertRangeValid(range); - - var sc = range.startContainer, so = range.startOffset, ec = range.endContainer, eo = range.endOffset; - var startEndSame = (sc === ec); - - if (isCharacterDataNode(ec) && eo > 0 && eo < ec.length) { - splitDataNode(ec, eo, positionsToPreserve); - } - - if (isCharacterDataNode(sc) && so > 0 && so < sc.length) { - sc = splitDataNode(sc, so, positionsToPreserve); - if (startEndSame) { - eo -= so; - ec = sc; - } else if (ec == sc.parentNode && eo >= getNodeIndex(sc)) { - eo++; - } - so = 0; - } - range.setStartAndEnd(sc, so, ec, eo); - } - - /*----------------------------------------------------------------------------------------------------------------*/ - - var rangeProperties = ["startContainer", "startOffset", "endContainer", "endOffset", "collapsed", - "commonAncestorContainer"]; - - var s2s = 0, s2e = 1, e2e = 2, e2s = 3; - var n_b = 0, n_a = 1, n_b_a = 2, n_i = 3; - - util.extend(api.rangePrototype, { - compareBoundaryPoints: function(how, range) { - assertRangeValid(this); - assertSameDocumentOrFragment(this.startContainer, range.startContainer); - - var nodeA, offsetA, nodeB, offsetB; - var prefixA = (how == e2s || how == s2s) ? "start" : "end"; - var prefixB = (how == s2e || how == s2s) ? "start" : "end"; - nodeA = this[prefixA + "Container"]; - offsetA = this[prefixA + "Offset"]; - nodeB = range[prefixB + "Container"]; - offsetB = range[prefixB + "Offset"]; - return comparePoints(nodeA, offsetA, nodeB, offsetB); - }, - - insertNode: function(node) { - assertRangeValid(this); - assertValidNodeType(node, insertableNodeTypes); - assertNodeNotReadOnly(this.startContainer); - - if (isOrIsAncestorOf(node, this.startContainer)) { - throw new DOMException("HIERARCHY_REQUEST_ERR"); - } - - // No check for whether the container of the start of the Range is of a type that does not allow - // children of the type of node: the browser's DOM implementation should do this for us when we attempt - // to add the node - - var firstNodeInserted = insertNodeAtPosition(node, this.startContainer, this.startOffset); - this.setStartBefore(firstNodeInserted); - }, - - cloneContents: function() { - assertRangeValid(this); - - var clone, frag; - if (this.collapsed) { - return getRangeDocument(this).createDocumentFragment(); - } else { - if (this.startContainer === this.endContainer && isCharacterDataNode(this.startContainer)) { - clone = this.startContainer.cloneNode(true); - clone.data = clone.data.slice(this.startOffset, this.endOffset); - frag = getRangeDocument(this).createDocumentFragment(); - frag.appendChild(clone); - return frag; - } else { - var iterator = new RangeIterator(this, true); - clone = cloneSubtree(iterator); - iterator.detach(); - } - return clone; - } - }, - - canSurroundContents: function() { - assertRangeValid(this); - assertNodeNotReadOnly(this.startContainer); - assertNodeNotReadOnly(this.endContainer); - - // Check if the contents can be surrounded. Specifically, this means whether the range partially selects - // no non-text nodes. - var iterator = new RangeIterator(this, true); - var boundariesInvalid = (iterator._first && (isNonTextPartiallySelected(iterator._first, this)) || - (iterator._last && isNonTextPartiallySelected(iterator._last, this))); - iterator.detach(); - return !boundariesInvalid; - }, - - surroundContents: function(node) { - assertValidNodeType(node, surroundNodeTypes); - - if (!this.canSurroundContents()) { - throw new RangeException("BAD_BOUNDARYPOINTS_ERR"); - } - - // Extract the contents - var content = this.extractContents(); - - // Clear the children of the node - if (node.hasChildNodes()) { - while (node.lastChild) { - node.removeChild(node.lastChild); - } - } - - // Insert the new node and add the extracted contents - insertNodeAtPosition(node, this.startContainer, this.startOffset); - node.appendChild(content); - - this.selectNode(node); - }, - - cloneRange: function() { - assertRangeValid(this); - var range = new Range(getRangeDocument(this)); - var i = rangeProperties.length, prop; - while (i--) { - prop = rangeProperties[i]; - range[prop] = this[prop]; - } - return range; - }, - - toString: function() { - assertRangeValid(this); - var sc = this.startContainer; - if (sc === this.endContainer && isCharacterDataNode(sc)) { - return (sc.nodeType == 3 || sc.nodeType == 4) ? sc.data.slice(this.startOffset, this.endOffset) : ""; - } else { - var textParts = [], iterator = new RangeIterator(this, true); - iterateSubtree(iterator, function(node) { - // Accept only text or CDATA nodes, not comments - if (node.nodeType == 3 || node.nodeType == 4) { - textParts.push(node.data); - } - }); - iterator.detach(); - return textParts.join(""); - } - }, - - // The methods below are all non-standard. The following batch were introduced by Mozilla but have since - // been removed from Mozilla. - - compareNode: function(node) { - assertRangeValid(this); - - var parent = node.parentNode; - var nodeIndex = getNodeIndex(node); - - if (!parent) { - throw new DOMException("NOT_FOUND_ERR"); - } - - var startComparison = this.comparePoint(parent, nodeIndex), - endComparison = this.comparePoint(parent, nodeIndex + 1); - - if (startComparison < 0) { // Node starts before - return (endComparison > 0) ? n_b_a : n_b; - } else { - return (endComparison > 0) ? n_a : n_i; - } - }, - - comparePoint: function(node, offset) { - assertRangeValid(this); - assertNode(node, "HIERARCHY_REQUEST_ERR"); - assertSameDocumentOrFragment(node, this.startContainer); - - if (comparePoints(node, offset, this.startContainer, this.startOffset) < 0) { - return -1; - } else if (comparePoints(node, offset, this.endContainer, this.endOffset) > 0) { - return 1; - } - return 0; - }, - - createContextualFragment: createContextualFragment, - - toHtml: function() { - assertRangeValid(this); - var container = this.commonAncestorContainer.parentNode.cloneNode(false); - container.appendChild(this.cloneContents()); - return container.innerHTML; - }, - - // touchingIsIntersecting determines whether this method considers a node that borders a range intersects - // with it (as in WebKit) or not (as in Gecko pre-1.9, and the default) - intersectsNode: function(node, touchingIsIntersecting) { - assertRangeValid(this); - assertNode(node, "NOT_FOUND_ERR"); - if (getDocument(node) !== getRangeDocument(this)) { - return false; - } - - var parent = node.parentNode, offset = getNodeIndex(node); - assertNode(parent, "NOT_FOUND_ERR"); - - var startComparison = comparePoints(parent, offset, this.endContainer, this.endOffset), - endComparison = comparePoints(parent, offset + 1, this.startContainer, this.startOffset); - - return touchingIsIntersecting ? startComparison <= 0 && endComparison >= 0 : startComparison < 0 && endComparison > 0; - }, - - isPointInRange: function(node, offset) { - assertRangeValid(this); - assertNode(node, "HIERARCHY_REQUEST_ERR"); - assertSameDocumentOrFragment(node, this.startContainer); - - return (comparePoints(node, offset, this.startContainer, this.startOffset) >= 0) && - (comparePoints(node, offset, this.endContainer, this.endOffset) <= 0); - }, - - // The methods below are non-standard and invented by me. - - // Sharing a boundary start-to-end or end-to-start does not count as intersection. - intersectsRange: function(range) { - return rangesIntersect(this, range, false); - }, - - // Sharing a boundary start-to-end or end-to-start does count as intersection. - intersectsOrTouchesRange: function(range) { - return rangesIntersect(this, range, true); - }, - - intersection: function(range) { - if (this.intersectsRange(range)) { - var startComparison = comparePoints(this.startContainer, this.startOffset, range.startContainer, range.startOffset), - endComparison = comparePoints(this.endContainer, this.endOffset, range.endContainer, range.endOffset); - - var intersectionRange = this.cloneRange(); - if (startComparison == -1) { - intersectionRange.setStart(range.startContainer, range.startOffset); - } - if (endComparison == 1) { - intersectionRange.setEnd(range.endContainer, range.endOffset); - } - return intersectionRange; - } - return null; - }, - - union: function(range) { - if (this.intersectsOrTouchesRange(range)) { - var unionRange = this.cloneRange(); - if (comparePoints(range.startContainer, range.startOffset, this.startContainer, this.startOffset) == -1) { - unionRange.setStart(range.startContainer, range.startOffset); - } - if (comparePoints(range.endContainer, range.endOffset, this.endContainer, this.endOffset) == 1) { - unionRange.setEnd(range.endContainer, range.endOffset); - } - return unionRange; - } else { - throw new RangeException("Ranges do not intersect"); - } - }, - - containsNode: function(node, allowPartial) { - if (allowPartial) { - return this.intersectsNode(node, false); - } else { - return this.compareNode(node) == n_i; - } - }, - - containsNodeContents: function(node) { - return this.comparePoint(node, 0) >= 0 && this.comparePoint(node, getNodeLength(node)) <= 0; - }, - - containsRange: function(range) { - var intersection = this.intersection(range); - return intersection !== null && range.equals(intersection); - }, - - containsNodeText: function(node) { - var nodeRange = this.cloneRange(); - nodeRange.selectNode(node); - var textNodes = nodeRange.getNodes([3]); - if (textNodes.length > 0) { - nodeRange.setStart(textNodes[0], 0); - var lastTextNode = textNodes.pop(); - nodeRange.setEnd(lastTextNode, lastTextNode.length); - var contains = this.containsRange(nodeRange); - nodeRange.detach(); - return contains; - } else { - return this.containsNodeContents(node); - } - }, - - getNodes: function(nodeTypes, filter) { - assertRangeValid(this); - return getNodesInRange(this, nodeTypes, filter); - }, - - getDocument: function() { - return getRangeDocument(this); - }, - - collapseBefore: function(node) { - assertNotDetached(this); - - this.setEndBefore(node); - this.collapse(false); - }, - - collapseAfter: function(node) { - assertNotDetached(this); - - this.setStartAfter(node); - this.collapse(true); - }, - - getBookmark: function(containerNode) { - var doc = getRangeDocument(this); - var preSelectionRange = api.createRange(doc); - containerNode = containerNode || dom.getBody(doc); - preSelectionRange.selectNodeContents(containerNode); - var range = this.intersection(preSelectionRange); - var start = 0, end = 0; - if (range) { - preSelectionRange.setEnd(range.startContainer, range.startOffset); - start = preSelectionRange.toString().length; - end = start + range.toString().length; - preSelectionRange.detach(); - } - - return { - start: start, - end: end, - containerNode: containerNode - }; - }, - - moveToBookmark: function(bookmark) { - var containerNode = bookmark.containerNode; - var charIndex = 0; - this.setStart(containerNode, 0); - this.collapse(true); - var nodeStack = [containerNode], node, foundStart = false, stop = false; - var nextCharIndex, i, childNodes; - - while (!stop && (node = nodeStack.pop())) { - if (node.nodeType == 3) { - nextCharIndex = charIndex + node.length; - if (!foundStart && bookmark.start >= charIndex && bookmark.start <= nextCharIndex) { - this.setStart(node, bookmark.start - charIndex); - foundStart = true; - } - if (foundStart && bookmark.end >= charIndex && bookmark.end <= nextCharIndex) { - this.setEnd(node, bookmark.end - charIndex); - stop = true; - } - charIndex = nextCharIndex; - } else { - childNodes = node.childNodes; - i = childNodes.length; - while (i--) { - nodeStack.push(childNodes[i]); - } - } - } - }, - - getName: function() { - return "DomRange"; - }, - - equals: function(range) { - return Range.rangesEqual(this, range); - }, - - isValid: function() { - return isRangeValid(this); - }, - - inspect: function() { - return inspect(this); - } - }); - - function copyComparisonConstantsToObject(obj) { - obj.START_TO_START = s2s; - obj.START_TO_END = s2e; - obj.END_TO_END = e2e; - obj.END_TO_START = e2s; - - obj.NODE_BEFORE = n_b; - obj.NODE_AFTER = n_a; - obj.NODE_BEFORE_AND_AFTER = n_b_a; - obj.NODE_INSIDE = n_i; - } - - function copyComparisonConstants(constructor) { - copyComparisonConstantsToObject(constructor); - copyComparisonConstantsToObject(constructor.prototype); - } - - function createRangeContentRemover(remover, boundaryUpdater) { - return function() { - assertRangeValid(this); - - var sc = this.startContainer, so = this.startOffset, root = this.commonAncestorContainer; - - var iterator = new RangeIterator(this, true); - - // Work out where to position the range after content removal - var node, boundary; - if (sc !== root) { - node = getClosestAncestorIn(sc, root, true); - boundary = getBoundaryAfterNode(node); - sc = boundary.node; - so = boundary.offset; - } - - // Check none of the range is read-only - iterateSubtree(iterator, assertNodeNotReadOnly); - - iterator.reset(); - - // Remove the content - var returnValue = remover(iterator); - iterator.detach(); - - // Move to the new position - boundaryUpdater(this, sc, so, sc, so); - - return returnValue; - }; - } - - function createPrototypeRange(constructor, boundaryUpdater, detacher) { - function createBeforeAfterNodeSetter(isBefore, isStart) { - return function(node) { - assertNotDetached(this); - assertValidNodeType(node, beforeAfterNodeTypes); - assertValidNodeType(getRootContainer(node), rootContainerNodeTypes); - - var boundary = (isBefore ? getBoundaryBeforeNode : getBoundaryAfterNode)(node); - (isStart ? setRangeStart : setRangeEnd)(this, boundary.node, boundary.offset); - }; - } - - function setRangeStart(range, node, offset) { - var ec = range.endContainer, eo = range.endOffset; - if (node !== range.startContainer || offset !== range.startOffset) { - // Check the root containers of the range and the new boundary, and also check whether the new boundary - // is after the current end. In either case, collapse the range to the new position - if (getRootContainer(node) != getRootContainer(ec) || comparePoints(node, offset, ec, eo) == 1) { - ec = node; - eo = offset; - } - boundaryUpdater(range, node, offset, ec, eo); - } - } - - function setRangeEnd(range, node, offset) { - var sc = range.startContainer, so = range.startOffset; - if (node !== range.endContainer || offset !== range.endOffset) { - // Check the root containers of the range and the new boundary, and also check whether the new boundary - // is after the current end. In either case, collapse the range to the new position - if (getRootContainer(node) != getRootContainer(sc) || comparePoints(node, offset, sc, so) == -1) { - sc = node; - so = offset; - } - boundaryUpdater(range, sc, so, node, offset); - } - } - - // Set up inheritance - var F = function() {}; - F.prototype = api.rangePrototype; - constructor.prototype = new F(); - - util.extend(constructor.prototype, { - setStart: function(node, offset) { - assertNotDetached(this); - assertNoDocTypeNotationEntityAncestor(node, true); - assertValidOffset(node, offset); - - setRangeStart(this, node, offset); - }, - - setEnd: function(node, offset) { - assertNotDetached(this); - assertNoDocTypeNotationEntityAncestor(node, true); - assertValidOffset(node, offset); - - setRangeEnd(this, node, offset); - }, - - /** - * Convenience method to set a range's start and end boundaries. Overloaded as follows: - * - Two parameters (node, offset) creates a collapsed range at that position - * - Three parameters (node, startOffset, endOffset) creates a range contained with node starting at - * startOffset and ending at endOffset - * - Four parameters (startNode, startOffset, endNode, endOffset) creates a range starting at startOffset in - * startNode and ending at endOffset in endNode - */ - setStartAndEnd: function() { - assertNotDetached(this); - - var args = arguments; - var sc = args[0], so = args[1], ec = sc, eo = so; - - switch (args.length) { - case 3: - eo = args[2]; - break; - case 4: - ec = args[2]; - eo = args[3]; - break; - } - - boundaryUpdater(this, sc, so, ec, eo); - }, - - setBoundary: function(node, offset, isStart) { - this["set" + (isStart ? "Start" : "End")](node, offset); - }, - - setStartBefore: createBeforeAfterNodeSetter(true, true), - setStartAfter: createBeforeAfterNodeSetter(false, true), - setEndBefore: createBeforeAfterNodeSetter(true, false), - setEndAfter: createBeforeAfterNodeSetter(false, false), - - collapse: function(isStart) { - assertRangeValid(this); - if (isStart) { - boundaryUpdater(this, this.startContainer, this.startOffset, this.startContainer, this.startOffset); - } else { - boundaryUpdater(this, this.endContainer, this.endOffset, this.endContainer, this.endOffset); - } - }, - - selectNodeContents: function(node) { - assertNotDetached(this); - assertNoDocTypeNotationEntityAncestor(node, true); - - boundaryUpdater(this, node, 0, node, getNodeLength(node)); - }, - - selectNode: function(node) { - assertNotDetached(this); - assertNoDocTypeNotationEntityAncestor(node, false); - assertValidNodeType(node, beforeAfterNodeTypes); - - var start = getBoundaryBeforeNode(node), end = getBoundaryAfterNode(node); - boundaryUpdater(this, start.node, start.offset, end.node, end.offset); - }, - - extractContents: createRangeContentRemover(extractSubtree, boundaryUpdater), - - deleteContents: createRangeContentRemover(deleteSubtree, boundaryUpdater), - - canSurroundContents: function() { - assertRangeValid(this); - assertNodeNotReadOnly(this.startContainer); - assertNodeNotReadOnly(this.endContainer); - - // Check if the contents can be surrounded. Specifically, this means whether the range partially selects - // no non-text nodes. - var iterator = new RangeIterator(this, true); - var boundariesInvalid = (iterator._first && (isNonTextPartiallySelected(iterator._first, this)) || - (iterator._last && isNonTextPartiallySelected(iterator._last, this))); - iterator.detach(); - return !boundariesInvalid; - }, - - detach: function() { - detacher(this); - }, - - splitBoundaries: function() { - splitRangeBoundaries(this); - }, - - splitBoundariesPreservingPositions: function(positionsToPreserve) { - splitRangeBoundaries(this, positionsToPreserve); - }, - - normalizeBoundaries: function() { - assertRangeValid(this); - - var sc = this.startContainer, so = this.startOffset, ec = this.endContainer, eo = this.endOffset; - - var mergeForward = function(node) { - var sibling = node.nextSibling; - if (sibling && sibling.nodeType == node.nodeType) { - ec = node; - eo = node.length; - node.appendData(sibling.data); - sibling.parentNode.removeChild(sibling); - } - }; - - var mergeBackward = function(node) { - var sibling = node.previousSibling; - if (sibling && sibling.nodeType == node.nodeType) { - sc = node; - var nodeLength = node.length; - so = sibling.length; - node.insertData(0, sibling.data); - sibling.parentNode.removeChild(sibling); - if (sc == ec) { - eo += so; - ec = sc; - } else if (ec == node.parentNode) { - var nodeIndex = getNodeIndex(node); - if (eo == nodeIndex) { - ec = node; - eo = nodeLength; - } else if (eo > nodeIndex) { - eo--; - } - } - } - }; - - var normalizeStart = true; - - if (isCharacterDataNode(ec)) { - if (ec.length == eo) { - mergeForward(ec); - } - } else { - if (eo > 0) { - var endNode = ec.childNodes[eo - 1]; - if (endNode && isCharacterDataNode(endNode)) { - mergeForward(endNode); - } - } - normalizeStart = !this.collapsed; - } - - if (normalizeStart) { - if (isCharacterDataNode(sc)) { - if (so == 0) { - mergeBackward(sc); - } - } else { - if (so < sc.childNodes.length) { - var startNode = sc.childNodes[so]; - if (startNode && isCharacterDataNode(startNode)) { - mergeBackward(startNode); - } - } - } - } else { - sc = ec; - so = eo; - } - - boundaryUpdater(this, sc, so, ec, eo); - }, - - collapseToPoint: function(node, offset) { - assertNotDetached(this); - assertNoDocTypeNotationEntityAncestor(node, true); - assertValidOffset(node, offset); - this.setStartAndEnd(node, offset); - } - }); - - copyComparisonConstants(constructor); - } - - /*----------------------------------------------------------------------------------------------------------------*/ - - // Updates commonAncestorContainer and collapsed after boundary change - function updateCollapsedAndCommonAncestor(range) { - range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset); - range.commonAncestorContainer = range.collapsed ? - range.startContainer : dom.getCommonAncestor(range.startContainer, range.endContainer); - } - - function updateBoundaries(range, startContainer, startOffset, endContainer, endOffset) { - range.startContainer = startContainer; - range.startOffset = startOffset; - range.endContainer = endContainer; - range.endOffset = endOffset; - range.document = dom.getDocument(startContainer); - - updateCollapsedAndCommonAncestor(range); - } - - function detach(range) { - assertNotDetached(range); - range.startContainer = range.startOffset = range.endContainer = range.endOffset = range.document = null; - range.collapsed = range.commonAncestorContainer = null; - } - - function Range(doc) { - this.startContainer = doc; - this.startOffset = 0; - this.endContainer = doc; - this.endOffset = 0; - this.document = doc; - updateCollapsedAndCommonAncestor(this); - } - - createPrototypeRange(Range, updateBoundaries, detach); - - util.extend(Range, { - rangeProperties: rangeProperties, - RangeIterator: RangeIterator, - copyComparisonConstants: copyComparisonConstants, - createPrototypeRange: createPrototypeRange, - inspect: inspect, - getRangeDocument: getRangeDocument, - rangesEqual: function(r1, r2) { - return r1.startContainer === r2.startContainer && - r1.startOffset === r2.startOffset && - r1.endContainer === r2.endContainer && - r1.endOffset === r2.endOffset; - } - }); - - api.DomRange = Range; - api.RangeException = RangeException; -}); -rangy.createCoreModule("WrappedRange", ["DomRange"], function(api, module) { - var WrappedRange, WrappedTextRange; - var dom = api.dom; - var util = api.util; - var DomPosition = dom.DomPosition; - var DomRange = api.DomRange; - var getBody = dom.getBody; - var getContentDocument = dom.getContentDocument; - var isCharacterDataNode = dom.isCharacterDataNode; - - - /*----------------------------------------------------------------------------------------------------------------*/ - - if (api.features.implementsDomRange) { - // This is a wrapper around the browser's native DOM Range. It has two aims: - // - Provide workarounds for specific browser bugs - // - provide convenient extensions, which are inherited from Rangy's DomRange - - (function() { - var rangeProto; - var rangeProperties = DomRange.rangeProperties; - - function updateRangeProperties(range) { - var i = rangeProperties.length, prop; - while (i--) { - prop = rangeProperties[i]; - range[prop] = range.nativeRange[prop]; - } - // Fix for broken collapsed property in IE 9. - range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset); - } - - function updateNativeRange(range, startContainer, startOffset, endContainer, endOffset) { - var startMoved = (range.startContainer !== startContainer || range.startOffset != startOffset); - var endMoved = (range.endContainer !== endContainer || range.endOffset != endOffset); - var nativeRangeDifferent = !range.equals(range.nativeRange); - - // Always set both boundaries for the benefit of IE9 (see issue 35) - if (startMoved || endMoved || nativeRangeDifferent) { - range.setEnd(endContainer, endOffset); - range.setStart(startContainer, startOffset); - } - } - - function detach(range) { - range.nativeRange.detach(); - range.detached = true; - var i = rangeProperties.length; - while (i--) { - range[ rangeProperties[i] ] = null; - } - } - - var createBeforeAfterNodeSetter; - - WrappedRange = function(range) { - if (!range) { - throw module.createError("WrappedRange: Range must be specified"); - } - this.nativeRange = range; - updateRangeProperties(this); - }; - - DomRange.createPrototypeRange(WrappedRange, updateNativeRange, detach); - - rangeProto = WrappedRange.prototype; - - rangeProto.selectNode = function(node) { - this.nativeRange.selectNode(node); - updateRangeProperties(this); - }; - - rangeProto.cloneContents = function() { - return this.nativeRange.cloneContents(); - }; - - // Due to a long-standing Firefox bug that I have not been able to find a reliable way to detect, - // insertNode() is never delegated to the native range. - - rangeProto.surroundContents = function(node) { - this.nativeRange.surroundContents(node); - updateRangeProperties(this); - }; - - rangeProto.collapse = function(isStart) { - this.nativeRange.collapse(isStart); - updateRangeProperties(this); - }; - - rangeProto.cloneRange = function() { - return new WrappedRange(this.nativeRange.cloneRange()); - }; - - rangeProto.refresh = function() { - updateRangeProperties(this); - }; - - rangeProto.toString = function() { - return this.nativeRange.toString(); - }; - - // Create test range and node for feature detection - - var testTextNode = document.createTextNode("test"); - getBody(document).appendChild(testTextNode); - var range = document.createRange(); - - /*--------------------------------------------------------------------------------------------------------*/ - - // Test for Firefox 2 bug that prevents moving the start of a Range to a point after its current end and - // correct for it - - range.setStart(testTextNode, 0); - range.setEnd(testTextNode, 0); - - try { - range.setStart(testTextNode, 1); - - rangeProto.setStart = function(node, offset) { - this.nativeRange.setStart(node, offset); - updateRangeProperties(this); - }; - - rangeProto.setEnd = function(node, offset) { - this.nativeRange.setEnd(node, offset); - updateRangeProperties(this); - }; - - createBeforeAfterNodeSetter = function(name) { - return function(node) { - this.nativeRange[name](node); - updateRangeProperties(this); - }; - }; - - } catch(ex) { - - rangeProto.setStart = function(node, offset) { - try { - this.nativeRange.setStart(node, offset); - } catch (ex) { - this.nativeRange.setEnd(node, offset); - this.nativeRange.setStart(node, offset); - } - updateRangeProperties(this); - }; - - rangeProto.setEnd = function(node, offset) { - try { - this.nativeRange.setEnd(node, offset); - } catch (ex) { - this.nativeRange.setStart(node, offset); - this.nativeRange.setEnd(node, offset); - } - updateRangeProperties(this); - }; - - createBeforeAfterNodeSetter = function(name, oppositeName) { - return function(node) { - try { - this.nativeRange[name](node); - } catch (ex) { - this.nativeRange[oppositeName](node); - this.nativeRange[name](node); - } - updateRangeProperties(this); - }; - }; - } - - rangeProto.setStartBefore = createBeforeAfterNodeSetter("setStartBefore", "setEndBefore"); - rangeProto.setStartAfter = createBeforeAfterNodeSetter("setStartAfter", "setEndAfter"); - rangeProto.setEndBefore = createBeforeAfterNodeSetter("setEndBefore", "setStartBefore"); - rangeProto.setEndAfter = createBeforeAfterNodeSetter("setEndAfter", "setStartAfter"); - - /*--------------------------------------------------------------------------------------------------------*/ - - // Always use DOM4-compliant selectNodeContents implementation: it's simpler and less code than testing - // whether the native implementation can be trusted - rangeProto.selectNodeContents = function(node) { - this.setStartAndEnd(node, 0, dom.getNodeLength(node)); - }; - - /*--------------------------------------------------------------------------------------------------------*/ - - // Test for and correct WebKit bug that has the behaviour of compareBoundaryPoints round the wrong way for - // constants START_TO_END and END_TO_START: https://bugs.webkit.org/show_bug.cgi?id=20738 - - range.selectNodeContents(testTextNode); - range.setEnd(testTextNode, 3); - - var range2 = document.createRange(); - range2.selectNodeContents(testTextNode); - range2.setEnd(testTextNode, 4); - range2.setStart(testTextNode, 2); - - if (range.compareBoundaryPoints(range.START_TO_END, range2) == -1 && - range.compareBoundaryPoints(range.END_TO_START, range2) == 1) { - // This is the wrong way round, so correct for it - - rangeProto.compareBoundaryPoints = function(type, range) { - range = range.nativeRange || range; - if (type == range.START_TO_END) { - type = range.END_TO_START; - } else if (type == range.END_TO_START) { - type = range.START_TO_END; - } - return this.nativeRange.compareBoundaryPoints(type, range); - }; - } else { - rangeProto.compareBoundaryPoints = function(type, range) { - return this.nativeRange.compareBoundaryPoints(type, range.nativeRange || range); - }; - } - - /*--------------------------------------------------------------------------------------------------------*/ - - // Test for IE 9 deleteContents() and extractContents() bug and correct it. See issue 107. - - var el = document.createElement("div"); - el.innerHTML = "123"; - var textNode = el.firstChild; - var body = getBody(document); - body.appendChild(el); - - range.setStart(textNode, 1); - range.setEnd(textNode, 2); - range.deleteContents(); - - if (textNode.data == "13") { - // Behaviour is correct per DOM4 Range so wrap the browser's implementation of deleteContents() and - // extractContents() - rangeProto.deleteContents = function() { - this.nativeRange.deleteContents(); - updateRangeProperties(this); - }; - - rangeProto.extractContents = function() { - var frag = this.nativeRange.extractContents(); - updateRangeProperties(this); - return frag; - }; - } else { - } - - body.removeChild(el); - body = null; - - /*--------------------------------------------------------------------------------------------------------*/ - - // Test for existence of createContextualFragment and delegate to it if it exists - if (util.isHostMethod(range, "createContextualFragment")) { - rangeProto.createContextualFragment = function(fragmentStr) { - return this.nativeRange.createContextualFragment(fragmentStr); - }; - } - - /*--------------------------------------------------------------------------------------------------------*/ - - // Clean up - getBody(document).removeChild(testTextNode); - range.detach(); - range2.detach(); - - rangeProto.getName = function() { - return "WrappedRange"; - }; - - api.WrappedRange = WrappedRange; - - api.createNativeRange = function(doc) { - doc = getContentDocument(doc, module, "createNativeRange"); - return doc.createRange(); - }; - })(); - } - - if (api.features.implementsTextRange) { - /* - This is a workaround for a bug where IE returns the wrong container element from the TextRange's parentElement() - method. For example, in the following (where pipes denote the selection boundaries): - -

  • | a
  • b |
- - var range = document.selection.createRange(); - alert(range.parentElement().id); // Should alert "ul" but alerts "b" - - This method returns the common ancestor node of the following: - - the parentElement() of the textRange - - the parentElement() of the textRange after calling collapse(true) - - the parentElement() of the textRange after calling collapse(false) - */ - var getTextRangeContainerElement = function(textRange) { - var parentEl = textRange.parentElement(); - var range = textRange.duplicate(); - range.collapse(true); - var startEl = range.parentElement(); - range = textRange.duplicate(); - range.collapse(false); - var endEl = range.parentElement(); - var startEndContainer = (startEl == endEl) ? startEl : dom.getCommonAncestor(startEl, endEl); - - return startEndContainer == parentEl ? startEndContainer : dom.getCommonAncestor(parentEl, startEndContainer); - }; - - var textRangeIsCollapsed = function(textRange) { - return textRange.compareEndPoints("StartToEnd", textRange) == 0; - }; - - // Gets the boundary of a TextRange expressed as a node and an offset within that node. This function started out as - // an improved version of code found in Tim Cameron Ryan's IERange (http://code.google.com/p/ierange/) but has - // grown, fixing problems with line breaks in preformatted text, adding workaround for IE TextRange bugs, handling - // for inputs and images, plus optimizations. - var getTextRangeBoundaryPosition = function(textRange, wholeRangeContainerElement, isStart, isCollapsed, startInfo) { - var workingRange = textRange.duplicate(); - workingRange.collapse(isStart); - var containerElement = workingRange.parentElement(); - - // Sometimes collapsing a TextRange that's at the start of a text node can move it into the previous node, so - // check for that - if (!dom.isOrIsAncestorOf(wholeRangeContainerElement, containerElement)) { - containerElement = wholeRangeContainerElement; - } - - - // Deal with nodes that cannot "contain rich HTML markup". In practice, this means form inputs, images and - // similar. See http://msdn.microsoft.com/en-us/library/aa703950%28VS.85%29.aspx - if (!containerElement.canHaveHTML) { - var pos = new DomPosition(containerElement.parentNode, dom.getNodeIndex(containerElement)); - return { - boundaryPosition: pos, - nodeInfo: { - nodeIndex: pos.offset, - containerElement: pos.node - } - }; - } - - var workingNode = dom.getDocument(containerElement).createElement("span"); - - // Workaround for HTML5 Shiv's insane violation of document.createElement(). See Rangy issue 104 and HTML5 - // Shiv issue 64: https://github.com/aFarkas/html5shiv/issues/64 - if (workingNode.parentNode) { - workingNode.parentNode.removeChild(workingNode); - } - - var comparison, workingComparisonType = isStart ? "StartToStart" : "StartToEnd"; - var previousNode, nextNode, boundaryPosition, boundaryNode; - var start = (startInfo && startInfo.containerElement == containerElement) ? startInfo.nodeIndex : 0; - var childNodeCount = containerElement.childNodes.length; - var end = childNodeCount; - - // Check end first. Code within the loop assumes that the endth child node of the container is definitely - // after the range boundary. - var nodeIndex = end; - - while (true) { - if (nodeIndex == childNodeCount) { - containerElement.appendChild(workingNode); - } else { - containerElement.insertBefore(workingNode, containerElement.childNodes[nodeIndex]); - } - workingRange.moveToElementText(workingNode); - comparison = workingRange.compareEndPoints(workingComparisonType, textRange); - if (comparison == 0 || start == end) { - break; - } else if (comparison == -1) { - if (end == start + 1) { - // We know the endth child node is after the range boundary, so we must be done. - break; - } else { - start = nodeIndex; - } - } else { - end = (end == start + 1) ? start : nodeIndex; - } - nodeIndex = Math.floor((start + end) / 2); - containerElement.removeChild(workingNode); - } - - - // We've now reached or gone past the boundary of the text range we're interested in - // so have identified the node we want - boundaryNode = workingNode.nextSibling; - - if (comparison == -1 && boundaryNode && isCharacterDataNode(boundaryNode)) { - // This is a character data node (text, comment, cdata). The working range is collapsed at the start of the - // node containing the text range's boundary, so we move the end of the working range to the boundary point - // and measure the length of its text to get the boundary's offset within the node. - workingRange.setEndPoint(isStart ? "EndToStart" : "EndToEnd", textRange); - - var offset; - - if (/[\r\n]/.test(boundaryNode.data)) { - /* - For the particular case of a boundary within a text node containing rendered line breaks (within a 
-                    element, for example), we need a slightly complicated approach to get the boundary's offset in IE. The
-                    facts:
-                    
-                    - Each line break is represented as \r in the text node's data/nodeValue properties
-                    - Each line break is represented as \r\n in the TextRange's 'text' property
-                    - The 'text' property of the TextRange does not contain trailing line breaks
-                    
-                    To get round the problem presented by the final fact above, we can use the fact that TextRange's
-                    moveStart() and moveEnd() methods return the actual number of characters moved, which is not necessarily
-                    the same as the number of characters it was instructed to move. The simplest approach is to use this to
-                    store the characters moved when moving both the start and end of the range to the start of the document
-                    body and subtracting the start offset from the end offset (the "move-negative-gazillion" method).
-                    However, this is extremely slow when the document is large and the range is near the end of it. Clearly
-                    doing the mirror image (i.e. moving the range boundaries to the end of the document) has the same
-                    problem.
-                    
-                    Another approach that works is to use moveStart() to move the start boundary of the range up to the end
-                    boundary one character at a time and incrementing a counter with the value returned by the moveStart()
-                    call. However, the check for whether the start boundary has reached the end boundary is expensive, so
-                    this method is slow (although unlike "move-negative-gazillion" is largely unaffected by the location of
-                    the range within the document).
-                    
-                    The method below is a hybrid of the two methods above. It uses the fact that a string containing the
-                    TextRange's 'text' property with each \r\n converted to a single \r character cannot be longer than the
-                    text of the TextRange, so the start of the range is moved that length initially and then a character at
-                    a time to make up for any trailing line breaks not contained in the 'text' property. This has good
-                    performance in most situations compared to the previous two methods.
-                    */
-                    var tempRange = workingRange.duplicate();
-                    var rangeLength = tempRange.text.replace(/\r\n/g, "\r").length;
-
-                    offset = tempRange.moveStart("character", rangeLength);
-                    while ( (comparison = tempRange.compareEndPoints("StartToEnd", tempRange)) == -1) {
-                        offset++;
-                        tempRange.moveStart("character", 1);
-                    }
-                } else {
-                    offset = workingRange.text.length;
-                }
-                boundaryPosition = new DomPosition(boundaryNode, offset);
-            } else {
-
-                // If the boundary immediately follows a character data node and this is the end boundary, we should favour
-                // a position within that, and likewise for a start boundary preceding a character data node
-                previousNode = (isCollapsed || !isStart) && workingNode.previousSibling;
-                nextNode = (isCollapsed || isStart) && workingNode.nextSibling;
-                if (nextNode && isCharacterDataNode(nextNode)) {
-                    boundaryPosition = new DomPosition(nextNode, 0);
-                } else if (previousNode && isCharacterDataNode(previousNode)) {
-                    boundaryPosition = new DomPosition(previousNode, previousNode.data.length);
-                } else {
-                    boundaryPosition = new DomPosition(containerElement, dom.getNodeIndex(workingNode));
-                }
-            }
-
-            // Clean up
-            workingNode.parentNode.removeChild(workingNode);
-
-            return {
-                boundaryPosition: boundaryPosition,
-                nodeInfo: {
-                    nodeIndex: nodeIndex,
-                    containerElement: containerElement
-                }
-            };
-        };
-
-        // Returns a TextRange representing the boundary of a TextRange expressed as a node and an offset within that node.
-        // This function started out as an optimized version of code found in Tim Cameron Ryan's IERange
-        // (http://code.google.com/p/ierange/)
-        var createBoundaryTextRange = function(boundaryPosition, isStart) {
-            var boundaryNode, boundaryParent, boundaryOffset = boundaryPosition.offset;
-            var doc = dom.getDocument(boundaryPosition.node);
-            var workingNode, childNodes, workingRange = getBody(doc).createTextRange();
-            var nodeIsDataNode = isCharacterDataNode(boundaryPosition.node);
-
-            if (nodeIsDataNode) {
-                boundaryNode = boundaryPosition.node;
-                boundaryParent = boundaryNode.parentNode;
-            } else {
-                childNodes = boundaryPosition.node.childNodes;
-                boundaryNode = (boundaryOffset < childNodes.length) ? childNodes[boundaryOffset] : null;
-                boundaryParent = boundaryPosition.node;
-            }
-
-            // Position the range immediately before the node containing the boundary
-            workingNode = doc.createElement("span");
-
-            // Making the working element non-empty element persuades IE to consider the TextRange boundary to be within the
-            // element rather than immediately before or after it
-            workingNode.innerHTML = "&#feff;";
-
-            // insertBefore is supposed to work like appendChild if the second parameter is null. However, a bug report
-            // for IERange suggests that it can crash the browser: http://code.google.com/p/ierange/issues/detail?id=12
-            if (boundaryNode) {
-                boundaryParent.insertBefore(workingNode, boundaryNode);
-            } else {
-                boundaryParent.appendChild(workingNode);
-            }
-
-            workingRange.moveToElementText(workingNode);
-            workingRange.collapse(!isStart);
-
-            // Clean up
-            boundaryParent.removeChild(workingNode);
-
-            // Move the working range to the text offset, if required
-            if (nodeIsDataNode) {
-                workingRange[isStart ? "moveStart" : "moveEnd"]("character", boundaryOffset);
-            }
-
-            return workingRange;
-        };
-
-        /*------------------------------------------------------------------------------------------------------------*/
-
-        // This is a wrapper around a TextRange, providing full DOM Range functionality using rangy's DomRange as a
-        // prototype
-
-        WrappedTextRange = function(textRange) {
-            this.textRange = textRange;
-            this.refresh();
-        };
-
-        WrappedTextRange.prototype = new DomRange(document);
-
-        WrappedTextRange.prototype.refresh = function() {
-            var start, end, startBoundary;
-
-            // TextRange's parentElement() method cannot be trusted. getTextRangeContainerElement() works around that.
-            var rangeContainerElement = getTextRangeContainerElement(this.textRange);
-
-            if (textRangeIsCollapsed(this.textRange)) {
-                end = start = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, true,
-                    true).boundaryPosition;
-            } else {
-                startBoundary = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, true, false);
-                start = startBoundary.boundaryPosition;
-
-                // An optimization used here is that if the start and end boundaries have the same parent element, the
-                // search scope for the end boundary can be limited to exclude the portion of the element that precedes
-                // the start boundary
-                end = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, false, false,
-                    startBoundary.nodeInfo).boundaryPosition;
-            }
-
-            this.setStart(start.node, start.offset);
-            this.setEnd(end.node, end.offset);
-        };
-
-        WrappedTextRange.prototype.getName = function() {
-            return "WrappedTextRange";
-        };
-
-        DomRange.copyComparisonConstants(WrappedTextRange);
-
-        WrappedTextRange.rangeToTextRange = function(range) {
-            if (range.collapsed) {
-                return createBoundaryTextRange(new DomPosition(range.startContainer, range.startOffset), true);
-            } else {
-                var startRange = createBoundaryTextRange(new DomPosition(range.startContainer, range.startOffset), true);
-                var endRange = createBoundaryTextRange(new DomPosition(range.endContainer, range.endOffset), false);
-                var textRange = getBody( DomRange.getRangeDocument(range) ).createTextRange();
-                textRange.setEndPoint("StartToStart", startRange);
-                textRange.setEndPoint("EndToEnd", endRange);
-                return textRange;
-            }
-        };
-
-        api.WrappedTextRange = WrappedTextRange;
-
-        // IE 9 and above have both implementations and Rangy makes both available. The next few lines sets which
-        // implementation to use by default.
-        if (!api.features.implementsDomRange || api.config.preferTextRange) {
-            // Add WrappedTextRange as the Range property of the global object to allow expression like Range.END_TO_END to work
-            var globalObj = (function() { return this; })();
-            if (typeof globalObj.Range == "undefined") {
-                globalObj.Range = WrappedTextRange;
-            }
-
-            api.createNativeRange = function(doc) {
-                doc = getContentDocument(doc, module, "createNativeRange");
-                return getBody(doc).createTextRange();
-            };
-
-            api.WrappedRange = WrappedTextRange;
-        }
-    }
-
-    api.createRange = function(doc) {
-        doc = getContentDocument(doc, module, "createRange");
-        return new api.WrappedRange(api.createNativeRange(doc));
-    };
-
-    api.createRangyRange = function(doc) {
-        doc = getContentDocument(doc, module, "createRangyRange");
-        return new DomRange(doc);
-    };
-
-    api.createIframeRange = function(iframeEl) {
-        module.deprecationNotice("createIframeRange()", "createRange(iframeEl)");
-        return api.createRange(iframeEl);
-    };
-
-    api.createIframeRangyRange = function(iframeEl) {
-        module.deprecationNotice("createIframeRangyRange()", "createRangyRange(iframeEl)");
-        return api.createRangyRange(iframeEl);
-    };
-
-    api.addCreateMissingNativeApiListener(function(win) {
-        var doc = win.document;
-        if (typeof doc.createRange == "undefined") {
-            doc.createRange = function() {
-                return api.createRange(doc);
-            };
-        }
-        doc = win = null;
-    });
-});
-// This module creates a selection object wrapper that conforms as closely as possible to the Selection specification
-// in the HTML Editing spec (http://dvcs.w3.org/hg/editing/raw-file/tip/editing.html#selections)
-rangy.createCoreModule("WrappedSelection", ["DomRange", "WrappedRange"], function(api, module) {
-    api.config.checkSelectionRanges = true;
-
-    var BOOLEAN = "boolean";
-    var NUMBER = "number";
-    var dom = api.dom;
-    var util = api.util;
-    var isHostMethod = util.isHostMethod;
-    var DomRange = api.DomRange;
-    var WrappedRange = api.WrappedRange;
-    var DOMException = api.DOMException;
-    var DomPosition = dom.DomPosition;
-    var getNativeSelection;
-    var selectionIsCollapsed;
-    var features = api.features;
-    var CONTROL = "Control";
-    var getDocument = dom.getDocument;
-    var getBody = dom.getBody;
-    var rangesEqual = DomRange.rangesEqual;
-
-
-    // Utility function to support direction parameters in the API that may be a string ("backward" or "forward") or a
-    // Boolean (true for backwards).
-    function isDirectionBackward(dir) {
-        return (typeof dir == "string") ? /^backward(s)?$/i.test(dir) : !!dir;
-    }
-
-    function getWindow(win, methodName) {
-        if (!win) {
-            return window;
-        } else if (dom.isWindow(win)) {
-            return win;
-        } else if (win instanceof WrappedSelection) {
-            return win.win;
-        } else {
-            var doc = dom.getContentDocument(win, module, methodName);
-            return dom.getWindow(doc);
-        }
-    }
-
-    function getWinSelection(winParam) {
-        return getWindow(winParam, "getWinSelection").getSelection();
-    }
-
-    function getDocSelection(winParam) {
-        return getWindow(winParam, "getDocSelection").document.selection;
-    }
-    
-    function winSelectionIsBackward(sel) {
-        var backward = false;
-        if (sel.anchorNode) {
-            backward = (dom.comparePoints(sel.anchorNode, sel.anchorOffset, sel.focusNode, sel.focusOffset) == 1);
-        }
-        return backward;
-    }
-
-    // Test for the Range/TextRange and Selection features required
-    // Test for ability to retrieve selection
-    var implementsWinGetSelection = isHostMethod(window, "getSelection"),
-        implementsDocSelection = util.isHostObject(document, "selection");
-
-    features.implementsWinGetSelection = implementsWinGetSelection;
-    features.implementsDocSelection = implementsDocSelection;
-
-    var useDocumentSelection = implementsDocSelection && (!implementsWinGetSelection || api.config.preferTextRange);
-
-    if (useDocumentSelection) {
-        getNativeSelection = getDocSelection;
-        api.isSelectionValid = function(winParam) {
-            var doc = getWindow(winParam, "isSelectionValid").document, nativeSel = doc.selection;
-
-            // Check whether the selection TextRange is actually contained within the correct document
-            return (nativeSel.type != "None" || getDocument(nativeSel.createRange().parentElement()) == doc);
-        };
-    } else if (implementsWinGetSelection) {
-        getNativeSelection = getWinSelection;
-        api.isSelectionValid = function() {
-            return true;
-        };
-    } else {
-        module.fail("Neither document.selection or window.getSelection() detected.");
-    }
-
-    api.getNativeSelection = getNativeSelection;
-
-    var testSelection = getNativeSelection();
-    var testRange = api.createNativeRange(document);
-    var body = getBody(document);
-
-    // Obtaining a range from a selection
-    var selectionHasAnchorAndFocus = util.areHostProperties(testSelection,
-        ["anchorNode", "focusNode", "anchorOffset", "focusOffset"]);
-
-    features.selectionHasAnchorAndFocus = selectionHasAnchorAndFocus;
-
-    // Test for existence of native selection extend() method
-    var selectionHasExtend = isHostMethod(testSelection, "extend");
-    features.selectionHasExtend = selectionHasExtend;
-    
-    // Test if rangeCount exists
-    var selectionHasRangeCount = (typeof testSelection.rangeCount == NUMBER);
-    features.selectionHasRangeCount = selectionHasRangeCount;
-
-    var selectionSupportsMultipleRanges = false;
-    var collapsedNonEditableSelectionsSupported = true;
-
-    var addRangeBackwardToNative = selectionHasExtend ?
-        function(nativeSelection, range) {
-            var doc = DomRange.getRangeDocument(range);
-            var endRange = api.createRange(doc);
-            endRange.collapseToPoint(range.endContainer, range.endOffset);
-            nativeSelection.addRange(getNativeRange(endRange));
-            nativeSelection.extend(range.startContainer, range.startOffset);
-        } : null;
-
-    if (util.areHostMethods(testSelection, ["addRange", "getRangeAt", "removeAllRanges"]) &&
-            typeof testSelection.rangeCount == NUMBER && features.implementsDomRange) {
-
-        (function() {
-            // Previously an iframe was used but this caused problems in some circumstances in IE, so tests are
-            // performed on the current document's selection. See issue 109.
-
-            // Note also that if a selection previously existed, it is wiped by these tests. This should usually be fine
-            // because initialization usually happens when the document loads, but could be a problem for a script that
-            // loads and initializes Rangy later. If anyone complains, code could be added to save and restore the
-            // selection.
-            var sel = window.getSelection();
-            if (sel) {
-                // Store the current selection
-                var originalSelectionRangeCount = sel.rangeCount;
-                var selectionHasMultipleRanges = (originalSelectionRangeCount > 1);
-                var originalSelectionRanges = [];
-                var originalSelectionBackward = winSelectionIsBackward(sel); 
-                for (var i = 0; i < originalSelectionRangeCount; ++i) {
-                    originalSelectionRanges[i] = sel.getRangeAt(i);
-                }
-                
-                // Create some test elements
-                var body = getBody(document);
-                var testEl = body.appendChild( document.createElement("div") );
-                testEl.contentEditable = "false";
-                var textNode = testEl.appendChild( document.createTextNode("\u00a0\u00a0\u00a0") );
-
-                // Test whether the native selection will allow a collapsed selection within a non-editable element
-                var r1 = document.createRange();
-
-                r1.setStart(textNode, 1);
-                r1.collapse(true);
-                sel.addRange(r1);
-                collapsedNonEditableSelectionsSupported = (sel.rangeCount == 1);
-                sel.removeAllRanges();
-
-                // Test whether the native selection is capable of supporting multiple ranges
-                if (!selectionHasMultipleRanges) {
-                    var r2 = r1.cloneRange();
-                    r1.setStart(textNode, 0);
-                    r2.setEnd(textNode, 3);
-                    r2.setStart(textNode, 2);
-                    sel.addRange(r1);
-                    sel.addRange(r2);
-
-                    selectionSupportsMultipleRanges = (sel.rangeCount == 2);
-                    r2.detach();
-                }
-
-                // Clean up
-                body.removeChild(testEl);
-                sel.removeAllRanges();
-                r1.detach();
-
-                for (i = 0; i < originalSelectionRangeCount; ++i) {
-                    if (i == 0 && originalSelectionBackward) {
-                        if (addRangeBackwardToNative) {
-                            addRangeBackwardToNative(sel, originalSelectionRanges[i]);
-                        } else {
-                            api.warn("Rangy initialization: original selection was backwards but selection has been restored forwards because browser does not support Selection.extend");
-                            sel.addRange(originalSelectionRanges[i])
-                        }
-                    } else {
-                        sel.addRange(originalSelectionRanges[i])
-                    }
-                }
-            }
-        })();
-    }
-
-    features.selectionSupportsMultipleRanges = selectionSupportsMultipleRanges;
-    features.collapsedNonEditableSelectionsSupported = collapsedNonEditableSelectionsSupported;
-
-    // ControlRanges
-    var implementsControlRange = false, testControlRange;
-
-    if (body && isHostMethod(body, "createControlRange")) {
-        testControlRange = body.createControlRange();
-        if (util.areHostProperties(testControlRange, ["item", "add"])) {
-            implementsControlRange = true;
-        }
-    }
-    features.implementsControlRange = implementsControlRange;
-
-    // Selection collapsedness
-    if (selectionHasAnchorAndFocus) {
-        selectionIsCollapsed = function(sel) {
-            return sel.anchorNode === sel.focusNode && sel.anchorOffset === sel.focusOffset;
-        };
-    } else {
-        selectionIsCollapsed = function(sel) {
-            return sel.rangeCount ? sel.getRangeAt(sel.rangeCount - 1).collapsed : false;
-        };
-    }
-
-    function updateAnchorAndFocusFromRange(sel, range, backward) {
-        var anchorPrefix = backward ? "end" : "start", focusPrefix = backward ? "start" : "end";
-        sel.anchorNode = range[anchorPrefix + "Container"];
-        sel.anchorOffset = range[anchorPrefix + "Offset"];
-        sel.focusNode = range[focusPrefix + "Container"];
-        sel.focusOffset = range[focusPrefix + "Offset"];
-    }
-
-    function updateAnchorAndFocusFromNativeSelection(sel) {
-        var nativeSel = sel.nativeSelection;
-        sel.anchorNode = nativeSel.anchorNode;
-        sel.anchorOffset = nativeSel.anchorOffset;
-        sel.focusNode = nativeSel.focusNode;
-        sel.focusOffset = nativeSel.focusOffset;
-    }
-
-    function updateEmptySelection(sel) {
-        sel.anchorNode = sel.focusNode = null;
-        sel.anchorOffset = sel.focusOffset = 0;
-        sel.rangeCount = 0;
-        sel.isCollapsed = true;
-        sel._ranges.length = 0;
-    }
-
-    function getNativeRange(range) {
-        var nativeRange;
-        if (range instanceof DomRange) {
-            nativeRange = api.createNativeRange(range.getDocument());
-            nativeRange.setEnd(range.endContainer, range.endOffset);
-            nativeRange.setStart(range.startContainer, range.startOffset);
-        } else if (range instanceof WrappedRange) {
-            nativeRange = range.nativeRange;
-        } else if (features.implementsDomRange && (range instanceof dom.getWindow(range.startContainer).Range)) {
-            nativeRange = range;
-        }
-        return nativeRange;
-    }
-
-    function rangeContainsSingleElement(rangeNodes) {
-        if (!rangeNodes.length || rangeNodes[0].nodeType != 1) {
-            return false;
-        }
-        for (var i = 1, len = rangeNodes.length; i < len; ++i) {
-            if (!dom.isAncestorOf(rangeNodes[0], rangeNodes[i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function getSingleElementFromRange(range) {
-        var nodes = range.getNodes();
-        if (!rangeContainsSingleElement(nodes)) {
-            throw module.createError("getSingleElementFromRange: range " + range.inspect() + " did not consist of a single element");
-        }
-        return nodes[0];
-    }
-
-    // Simple, quick test which only needs to distinguish between a TextRange and a ControlRange
-    function isTextRange(range) {
-        return !!range && typeof range.text != "undefined";
-    }
-
-    function updateFromTextRange(sel, range) {
-        // Create a Range from the selected TextRange
-        var wrappedRange = new WrappedRange(range);
-        sel._ranges = [wrappedRange];
-
-        updateAnchorAndFocusFromRange(sel, wrappedRange, false);
-        sel.rangeCount = 1;
-        sel.isCollapsed = wrappedRange.collapsed;
-    }
-
-    function updateControlSelection(sel) {
-        // Update the wrapped selection based on what's now in the native selection
-        sel._ranges.length = 0;
-        if (sel.docSelection.type == "None") {
-            updateEmptySelection(sel);
-        } else {
-            var controlRange = sel.docSelection.createRange();
-            if (isTextRange(controlRange)) {
-                // This case (where the selection type is "Control" and calling createRange() on the selection returns
-                // a TextRange) can happen in IE 9. It happens, for example, when all elements in the selected
-                // ControlRange have been removed from the ControlRange and removed from the document.
-                updateFromTextRange(sel, controlRange);
-            } else {
-                sel.rangeCount = controlRange.length;
-                var range, doc = getDocument(controlRange.item(0));
-                for (var i = 0; i < sel.rangeCount; ++i) {
-                    range = api.createRange(doc);
-                    range.selectNode(controlRange.item(i));
-                    sel._ranges.push(range);
-                }
-                sel.isCollapsed = sel.rangeCount == 1 && sel._ranges[0].collapsed;
-                updateAnchorAndFocusFromRange(sel, sel._ranges[sel.rangeCount - 1], false);
-            }
-        }
-    }
-
-    function addRangeToControlSelection(sel, range) {
-        var controlRange = sel.docSelection.createRange();
-        var rangeElement = getSingleElementFromRange(range);
-
-        // Create a new ControlRange containing all the elements in the selected ControlRange plus the element
-        // contained by the supplied range
-        var doc = getDocument(controlRange.item(0));
-        var newControlRange = getBody(doc).createControlRange();
-        for (var i = 0, len = controlRange.length; i < len; ++i) {
-            newControlRange.add(controlRange.item(i));
-        }
-        try {
-            newControlRange.add(rangeElement);
-        } catch (ex) {
-            throw module.createError("addRange(): Element within the specified Range could not be added to control selection (does it have layout?)");
-        }
-        newControlRange.select();
-
-        // Update the wrapped selection based on what's now in the native selection
-        updateControlSelection(sel);
-    }
-
-    var getSelectionRangeAt;
-
-    if (isHostMethod(testSelection, "getRangeAt")) {
-        // try/catch is present because getRangeAt() must have thrown an error in some browser and some situation.
-        // Unfortunately, I didn't write a comment about the specifics and am now scared to take it out. Let that be a
-        // lesson to us all, especially me.
-        getSelectionRangeAt = function(sel, index) {
-            try {
-                return sel.getRangeAt(index);
-            } catch (ex) {
-                return null;
-            }
-        };
-    } else if (selectionHasAnchorAndFocus) {
-        getSelectionRangeAt = function(sel) {
-            var doc = getDocument(sel.anchorNode);
-            var range = api.createRange(doc);
-            range.setStartAndEnd(sel.anchorNode, sel.anchorOffset, sel.focusNode, sel.focusOffset);
-
-            // Handle the case when the selection was selected backwards (from the end to the start in the
-            // document)
-            if (range.collapsed !== this.isCollapsed) {
-                range.setStartAndEnd(sel.focusNode, sel.focusOffset, sel.anchorNode, sel.anchorOffset);
-            }
-
-            return range;
-        };
-    }
-
-    function WrappedSelection(selection, docSelection, win) {
-        this.nativeSelection = selection;
-        this.docSelection = docSelection;
-        this._ranges = [];
-        this.win = win;
-        this.refresh();
-    }
-
-    WrappedSelection.prototype = api.selectionPrototype;
-
-    function deleteProperties(sel) {
-        sel.win = sel.anchorNode = sel.focusNode = sel._ranges = null;
-        sel.rangeCount = sel.anchorOffset = sel.focusOffset = 0;
-        sel.detached = true;
-    }
-
-    var cachedRangySelections = [];
-
-    function actOnCachedSelection(win, action) {
-        var i = cachedRangySelections.length, cached, sel;
-        while (i--) {
-            cached = cachedRangySelections[i];
-            sel = cached.selection;
-            if (action == "deleteAll") {
-                deleteProperties(sel);
-            } else if (cached.win == win) {
-                if (action == "delete") {
-                    cachedRangySelections.splice(i, 1);
-                    return true;
-                } else {
-                    return sel;
-                }
-            }
-        }
-        if (action == "deleteAll") {
-            cachedRangySelections.length = 0;
-        }
-        return null;
-    }
-
-    var getSelection = function(win) {
-        // Check if the parameter is a Rangy Selection object
-        if (win && win instanceof WrappedSelection) {
-            win.refresh();
-            return win;
-        }
-
-        win = getWindow(win, "getNativeSelection");
-
-        var sel = actOnCachedSelection(win);
-        var nativeSel = getNativeSelection(win), docSel = implementsDocSelection ? getDocSelection(win) : null;
-        if (sel) {
-            sel.nativeSelection = nativeSel;
-            sel.docSelection = docSel;
-            sel.refresh();
-        } else {
-            sel = new WrappedSelection(nativeSel, docSel, win);
-            cachedRangySelections.push( { win: win, selection: sel } );
-        }
-        return sel;
-    };
-
-    api.getSelection = getSelection;
-
-    api.getIframeSelection = function(iframeEl) {
-        module.deprecationNotice("getIframeSelection()", "getSelection(iframeEl)");
-        return api.getSelection(dom.getIframeWindow(iframeEl));
-    };
-
-    var selProto = WrappedSelection.prototype;
-
-    function createControlSelection(sel, ranges) {
-        // Ensure that the selection becomes of type "Control"
-        var doc = getDocument(ranges[0].startContainer);
-        var controlRange = getBody(doc).createControlRange();
-        for (var i = 0, el, len = ranges.length; i < len; ++i) {
-            el = getSingleElementFromRange(ranges[i]);
-            try {
-                controlRange.add(el);
-            } catch (ex) {
-                throw module.createError("setRanges(): Element within one of the specified Ranges could not be added to control selection (does it have layout?)");
-            }
-        }
-        controlRange.select();
-
-        // Update the wrapped selection based on what's now in the native selection
-        updateControlSelection(sel);
-    }
-
-    // Selecting a range
-    if (!useDocumentSelection && selectionHasAnchorAndFocus && util.areHostMethods(testSelection, ["removeAllRanges", "addRange"])) {
-        selProto.removeAllRanges = function() {
-            this.nativeSelection.removeAllRanges();
-            updateEmptySelection(this);
-        };
-
-        var addRangeBackward = function(sel, range) {
-            addRangeBackwardToNative(sel.nativeSelection, range);
-            sel.refresh();
-        };
-
-        if (selectionHasRangeCount) {
-            selProto.addRange = function(range, direction) {
-                if (implementsControlRange && implementsDocSelection && this.docSelection.type == CONTROL) {
-                    addRangeToControlSelection(this, range);
-                } else {
-                    if (isDirectionBackward(direction) && selectionHasExtend) {
-                        addRangeBackward(this, range);
-                    } else {
-                        var previousRangeCount;
-                        if (selectionSupportsMultipleRanges) {
-                            previousRangeCount = this.rangeCount;
-                        } else {
-                            this.removeAllRanges();
-                            previousRangeCount = 0;
-                        }
-                        // Clone the native range so that changing the selected range does not affect the selection.
-                        // This is contrary to the spec but is the only way to achieve consistency between browsers. See
-                        // issue 80.
-                        this.nativeSelection.addRange(getNativeRange(range).cloneRange());
-
-                        // Check whether adding the range was successful
-                        this.rangeCount = this.nativeSelection.rangeCount;
-
-                        if (this.rangeCount == previousRangeCount + 1) {
-                            // The range was added successfully
-
-                            // Check whether the range that we added to the selection is reflected in the last range extracted from
-                            // the selection
-                            if (api.config.checkSelectionRanges) {
-                                var nativeRange = getSelectionRangeAt(this.nativeSelection, this.rangeCount - 1);
-                                if (nativeRange && !rangesEqual(nativeRange, range)) {
-                                    // Happens in WebKit with, for example, a selection placed at the start of a text node
-                                    range = new WrappedRange(nativeRange);
-                                }
-                            }
-                            this._ranges[this.rangeCount - 1] = range;
-                            updateAnchorAndFocusFromRange(this, range, selectionIsBackward(this.nativeSelection));
-                            this.isCollapsed = selectionIsCollapsed(this);
-                        } else {
-                            // The range was not added successfully. The simplest thing is to refresh
-                            this.refresh();
-                        }
-                    }
-                }
-            };
-        } else {
-            selProto.addRange = function(range, direction) {
-                if (isDirectionBackward(direction) && selectionHasExtend) {
-                    addRangeBackward(this, range);
-                } else {
-                    this.nativeSelection.addRange(getNativeRange(range));
-                    this.refresh();
-                }
-            };
-        }
-
-        selProto.setRanges = function(ranges) {
-            if (implementsControlRange && ranges.length > 1) {
-                createControlSelection(this, ranges);
-            } else {
-                this.removeAllRanges();
-                for (var i = 0, len = ranges.length; i < len; ++i) {
-                    this.addRange(ranges[i]);
-                }
-            }
-        };
-    } else if (isHostMethod(testSelection, "empty") && isHostMethod(testRange, "select") &&
-               implementsControlRange && useDocumentSelection) {
-
-        selProto.removeAllRanges = function() {
-            // Added try/catch as fix for issue #21
-            try {
-                this.docSelection.empty();
-
-                // Check for empty() not working (issue #24)
-                if (this.docSelection.type != "None") {
-                    // Work around failure to empty a control selection by instead selecting a TextRange and then
-                    // calling empty()
-                    var doc;
-                    if (this.anchorNode) {
-                        doc = getDocument(this.anchorNode);
-                    } else if (this.docSelection.type == CONTROL) {
-                        var controlRange = this.docSelection.createRange();
-                        if (controlRange.length) {
-                            doc = getDocument( controlRange.item(0) );
-                        }
-                    }
-                    if (doc) {
-                        var textRange = getBody(doc).createTextRange();
-                        textRange.select();
-                        this.docSelection.empty();
-                    }
-                }
-            } catch(ex) {}
-            updateEmptySelection(this);
-        };
-
-        selProto.addRange = function(range) {
-            if (this.docSelection.type == CONTROL) {
-                addRangeToControlSelection(this, range);
-            } else {
-                api.WrappedTextRange.rangeToTextRange(range).select();
-                this._ranges[0] = range;
-                this.rangeCount = 1;
-                this.isCollapsed = this._ranges[0].collapsed;
-                updateAnchorAndFocusFromRange(this, range, false);
-            }
-        };
-
-        selProto.setRanges = function(ranges) {
-            this.removeAllRanges();
-            var rangeCount = ranges.length;
-            if (rangeCount > 1) {
-                createControlSelection(this, ranges);
-            } else if (rangeCount) {
-                this.addRange(ranges[0]);
-            }
-        };
-    } else {
-        module.fail("No means of selecting a Range or TextRange was found");
-        return false;
-    }
-
-    selProto.getRangeAt = function(index) {
-        if (index < 0 || index >= this.rangeCount) {
-            throw new DOMException("INDEX_SIZE_ERR");
-        } else {
-            // Clone the range to preserve selection-range independence. See issue 80.
-            return this._ranges[index].cloneRange();
-        }
-    };
-
-    var refreshSelection;
-
-    if (useDocumentSelection) {
-        refreshSelection = function(sel) {
-            var range;
-            if (api.isSelectionValid(sel.win)) {
-                range = sel.docSelection.createRange();
-            } else {
-                range = getBody(sel.win.document).createTextRange();
-                range.collapse(true);
-            }
-
-            if (sel.docSelection.type == CONTROL) {
-                updateControlSelection(sel);
-            } else if (isTextRange(range)) {
-                updateFromTextRange(sel, range);
-            } else {
-                updateEmptySelection(sel);
-            }
-        };
-    } else if (isHostMethod(testSelection, "getRangeAt") && typeof testSelection.rangeCount == NUMBER) {
-        refreshSelection = function(sel) {
-            if (implementsControlRange && implementsDocSelection && sel.docSelection.type == CONTROL) {
-                updateControlSelection(sel);
-            } else {
-                sel._ranges.length = sel.rangeCount = sel.nativeSelection.rangeCount;
-                if (sel.rangeCount) {
-                    for (var i = 0, len = sel.rangeCount; i < len; ++i) {
-                        sel._ranges[i] = new api.WrappedRange(sel.nativeSelection.getRangeAt(i));
-                    }
-                    updateAnchorAndFocusFromRange(sel, sel._ranges[sel.rangeCount - 1], selectionIsBackward(sel.nativeSelection));
-                    sel.isCollapsed = selectionIsCollapsed(sel);
-                } else {
-                    updateEmptySelection(sel);
-                }
-            }
-        };
-    } else if (selectionHasAnchorAndFocus && typeof testSelection.isCollapsed == BOOLEAN && typeof testRange.collapsed == BOOLEAN && features.implementsDomRange) {
-        refreshSelection = function(sel) {
-            var range, nativeSel = sel.nativeSelection;
-            if (nativeSel.anchorNode) {
-                range = getSelectionRangeAt(nativeSel, 0);
-                sel._ranges = [range];
-                sel.rangeCount = 1;
-                updateAnchorAndFocusFromNativeSelection(sel);
-                sel.isCollapsed = selectionIsCollapsed(sel);
-            } else {
-                updateEmptySelection(sel);
-            }
-        };
-    } else {
-        module.fail("No means of obtaining a Range or TextRange from the user's selection was found");
-        return false;
-    }
-
-    selProto.refresh = function(checkForChanges) {
-        var oldRanges = checkForChanges ? this._ranges.slice(0) : null;
-        var oldAnchorNode = this.anchorNode, oldAnchorOffset = this.anchorOffset;
-
-        refreshSelection(this);
-        if (checkForChanges) {
-            // Check the range count first
-            var i = oldRanges.length;
-            if (i != this._ranges.length) {
-                return true;
-            }
-
-            // Now check the direction. Checking the anchor position is the same is enough since we're checking all the
-            // ranges after this
-            if (this.anchorNode != oldAnchorNode || this.anchorOffset != oldAnchorOffset) {
-                return true;
-            }
-
-            // Finally, compare each range in turn
-            while (i--) {
-                if (!rangesEqual(oldRanges[i], this._ranges[i])) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    };
-
-    // Removal of a single range
-    var removeRangeManually = function(sel, range) {
-        var ranges = sel.getAllRanges();
-        sel.removeAllRanges();
-        for (var i = 0, len = ranges.length; i < len; ++i) {
-            if (!rangesEqual(range, ranges[i])) {
-                sel.addRange(ranges[i]);
-            }
-        }
-        if (!sel.rangeCount) {
-            updateEmptySelection(sel);
-        }
-    };
-
-    if (implementsControlRange) {
-        selProto.removeRange = function(range) {
-            if (this.docSelection.type == CONTROL) {
-                var controlRange = this.docSelection.createRange();
-                var rangeElement = getSingleElementFromRange(range);
-
-                // Create a new ControlRange containing all the elements in the selected ControlRange minus the
-                // element contained by the supplied range
-                var doc = getDocument(controlRange.item(0));
-                var newControlRange = getBody(doc).createControlRange();
-                var el, removed = false;
-                for (var i = 0, len = controlRange.length; i < len; ++i) {
-                    el = controlRange.item(i);
-                    if (el !== rangeElement || removed) {
-                        newControlRange.add(controlRange.item(i));
-                    } else {
-                        removed = true;
-                    }
-                }
-                newControlRange.select();
-
-                // Update the wrapped selection based on what's now in the native selection
-                updateControlSelection(this);
-            } else {
-                removeRangeManually(this, range);
-            }
-        };
-    } else {
-        selProto.removeRange = function(range) {
-            removeRangeManually(this, range);
-        };
-    }
-
-    // Detecting if a selection is backward
-    var selectionIsBackward;
-    if (!useDocumentSelection && selectionHasAnchorAndFocus && features.implementsDomRange) {
-        selectionIsBackward = winSelectionIsBackward;
-
-        selProto.isBackward = function() {
-            return selectionIsBackward(this);
-        };
-    } else {
-        selectionIsBackward = selProto.isBackward = function() {
-            return false;
-        };
-    }
-
-    // Create an alias for backwards compatibility. From 1.3, everything is "backward" rather than "backwards"
-    selProto.isBackwards = selProto.isBackward;
-
-    // Selection stringifier
-    // This is conformant to the old HTML5 selections draft spec but differs from WebKit and Mozilla's implementation.
-    // The current spec does not yet define this method.
-    selProto.toString = function() {
-        var rangeTexts = [];
-        for (var i = 0, len = this.rangeCount; i < len; ++i) {
-            rangeTexts[i] = "" + this._ranges[i];
-        }
-        return rangeTexts.join("");
-    };
-
-    function assertNodeInSameDocument(sel, node) {
-        if (sel.win.document != getDocument(node)) {
-            throw new DOMException("WRONG_DOCUMENT_ERR");
-        }
-    }
-
-    // No current browser conforms fully to the spec for this method, so Rangy's own method is always used
-    selProto.collapse = function(node, offset) {
-        assertNodeInSameDocument(this, node);
-        var range = api.createRange(node);
-        range.collapseToPoint(node, offset);
-        this.setSingleRange(range);
-        this.isCollapsed = true;
-    };
-
-    selProto.collapseToStart = function() {
-        if (this.rangeCount) {
-            var range = this._ranges[0];
-            this.collapse(range.startContainer, range.startOffset);
-        } else {
-            throw new DOMException("INVALID_STATE_ERR");
-        }
-    };
-
-    selProto.collapseToEnd = function() {
-        if (this.rangeCount) {
-            var range = this._ranges[this.rangeCount - 1];
-            this.collapse(range.endContainer, range.endOffset);
-        } else {
-            throw new DOMException("INVALID_STATE_ERR");
-        }
-    };
-
-    // The spec is very specific on how selectAllChildren should be implemented so the native implementation is
-    // never used by Rangy.
-    selProto.selectAllChildren = function(node) {
-        assertNodeInSameDocument(this, node);
-        var range = api.createRange(node);
-        range.selectNodeContents(node);
-        this.setSingleRange(range);
-    };
-
-    selProto.deleteFromDocument = function() {
-        // Sepcial behaviour required for IE's control selections
-        if (implementsControlRange && implementsDocSelection && this.docSelection.type == CONTROL) {
-            var controlRange = this.docSelection.createRange();
-            var element;
-            while (controlRange.length) {
-                element = controlRange.item(0);
-                controlRange.remove(element);
-                element.parentNode.removeChild(element);
-            }
-            this.refresh();
-        } else if (this.rangeCount) {
-            var ranges = this.getAllRanges();
-            if (ranges.length) {
-                this.removeAllRanges();
-                for (var i = 0, len = ranges.length; i < len; ++i) {
-                    ranges[i].deleteContents();
-                }
-                // The spec says nothing about what the selection should contain after calling deleteContents on each
-                // range. Firefox moves the selection to where the final selected range was, so we emulate that
-                this.addRange(ranges[len - 1]);
-            }
-        }
-    };
-
-    // The following are non-standard extensions
-    selProto.eachRange = function(func, returnValue) {
-        for (var i = 0, len = this._ranges.length; i < len; ++i) {
-            if ( func( this.getRangeAt(i) ) ) {
-                return returnValue;
-            }
-        }
-    };
-
-    selProto.getAllRanges = function() {
-        var ranges = [];
-        this.eachRange(function(range) {
-            ranges.push(range);
-        });
-        return ranges;
-    };
-
-    selProto.setSingleRange = function(range, direction) {
-        this.removeAllRanges();
-        this.addRange(range, direction);
-    };
-
-    selProto.callMethodOnEachRange = function(methodName, params) {
-        var results = [];
-        this.eachRange( function(range) {
-            results.push( range[methodName].apply(range, params) );
-        } );
-        return results;
-    };
-    
-    function createStartOrEndSetter(isStart) {
-        return function(node, offset) {
-            var range;
-            if (this.rangeCount) {
-                range = this.getRangeAt(0);
-                range["set" + (isStart ? "Start" : "End")](node, offset);
-            } else {
-                range = api.createRange(this.win.document);
-                range.setStartAndEnd(node, offset);
-            }
-            this.setSingleRange(range, this.isBackward());
-        };
-    }
-
-    selProto.setStart = createStartOrEndSetter(true);
-    selProto.setEnd = createStartOrEndSetter(false);
-    
-    // Add select() method to Range prototype. Any existing selection will be removed.
-    api.rangePrototype.select = function(direction) {
-        getSelection( this.getDocument() ).setSingleRange(this, direction);
-    };
-
-    selProto.changeEachRange = function(func) {
-        var ranges = [];
-        var backward = this.isBackward();
-
-        this.eachRange(function(range) {
-            func(range);
-            ranges.push(range);
-        });
-
-        this.removeAllRanges();
-        if (backward && ranges.length == 1) {
-            this.addRange(ranges[0], "backward");
-        } else {
-            this.setRanges(ranges);
-        }
-    };
-
-    selProto.containsNode = function(node, allowPartial) {
-        return this.eachRange( function(range) {
-            return range.containsNode(node, allowPartial);
-        }, true );
-    };
-
-    selProto.getBookmark = function(containerNode) {
-        return {
-            backward: this.isBackward(),
-            rangeBookmarks: this.callMethodOnEachRange("getBookmark", [containerNode])
-        };
-    };
-
-    selProto.moveToBookmark = function(bookmark) {
-        var selRanges = [];
-        for (var i = 0, rangeBookmark, range; rangeBookmark = bookmark.rangeBookmarks[i++]; ) {
-            range = api.createRange(this.win);
-            range.moveToBookmark(rangeBookmark);
-            selRanges.push(range);
-        }
-        if (bookmark.backward) {
-            this.setSingleRange(selRanges[0], "backward");
-        } else {
-            this.setRanges(selRanges);
-        }
-    };
-
-    selProto.toHtml = function() {
-        return this.callMethodOnEachRange("toHtml").join("");
-    };
-
-    function inspect(sel) {
-        var rangeInspects = [];
-        var anchor = new DomPosition(sel.anchorNode, sel.anchorOffset);
-        var focus = new DomPosition(sel.focusNode, sel.focusOffset);
-        var name = (typeof sel.getName == "function") ? sel.getName() : "Selection";
-
-        if (typeof sel.rangeCount != "undefined") {
-            for (var i = 0, len = sel.rangeCount; i < len; ++i) {
-                rangeInspects[i] = DomRange.inspect(sel.getRangeAt(i));
-            }
-        }
-        return "[" + name + "(Ranges: " + rangeInspects.join(", ") +
-                ")(anchor: " + anchor.inspect() + ", focus: " + focus.inspect() + "]";
-    }
-
-    selProto.getName = function() {
-        return "WrappedSelection";
-    };
-
-    selProto.inspect = function() {
-        return inspect(this);
-    };
-
-    selProto.detach = function() {
-        actOnCachedSelection(this.win, "delete");
-        deleteProperties(this);
-    };
-
-    WrappedSelection.detachAll = function() {
-        actOnCachedSelection(null, "deleteAll");
-    };
-
-    WrappedSelection.inspect = inspect;
-    WrappedSelection.isDirectionBackward = isDirectionBackward;
-
-    api.Selection = WrappedSelection;
-
-    api.selectionPrototype = selProto;
-
-    api.addCreateMissingNativeApiListener(function(win) {
-        if (typeof win.getSelection == "undefined") {
-            win.getSelection = function() {
-                return getSelection(win);
-            };
-        }
-        win = null;
-    });
-});
diff --git a/www/code/realtime-wysiwyg.js b/www/code/realtime-wysiwyg.js
deleted file mode 100644
index 4363c07f7..000000000
--- a/www/code/realtime-wysiwyg.js
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * 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 .
- */
-define([
-    '/code/html-patcher.js',
-    '/code/errorbox.js',
-    '/common/messages.js',
-    '/bower_components/reconnectingWebsocket/reconnecting-websocket.js',
-    '/common/crypto.js',
-    '/common/toolbar.js',
-    '/code/rangy.js',
-    '/common/chainpad.js',
-    '/common/otaml.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-], function (HTMLPatcher, ErrorBox, Messages, ReconnectingWebSocket, Crypto, Toolbar) {
-
-window.ErrorBox = ErrorBox;
-
-    var $ = window.jQuery;
-    var Rangy = window.rangy;
-    Rangy.init();
-    var ChainPad = window.ChainPad;
-    var Otaml = window.Otaml;
-
-    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;
-
-    // ------------------ 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 (cmDiv, onEvent, unbind)
-    {
-        bindEvents(cmDiv,
-                   ['textInput', 'keydown', 'keyup', 'select', 'cut', 'paste', 'mousedown','mouseup','click'],
-                   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);
-    };
-
-    var abort = function (socket, realtime) {
-        realtime.abort();
-        realtime.toolbar.failed();
-        try { socket._socket.close(); } catch (e) { }
-    };
-
-    var createDebugInfo = function (cause, realtime, docHTML, allMessages) {
-        return JSON.stringify({
-            cause: cause,
-            realtimeUserDoc: realtime.getUserDoc(),
-            realtimeAuthDoc: realtime.getAuthDoc(),
-            docHTML: docHTML,
-            allMessages: allMessages,
-        });
-    };
-
-    var handleError = function (socket, realtime, err, docHTML, allMessages) {
-        var internalError = createDebugInfo(err, realtime, docHTML, allMessages);
-        abort(socket, realtime);
-        ErrorBox.show('error', docHTML, internalError);
-    };
-
-    var getDocHTML = function (doc) {
-        return $(doc).val();
-    };
-
-    var transformCursorCMRemove = function(text, cursor, pos, length) {
-      var newCursor = cursor;
-      var textLines = text.substr(0, pos).split("\n");
-      var removedTextLineNumber = textLines.length-1;
-      var removedTextColumnIndex = textLines[textLines.length-1].length;
-      var removedLines = text.substr(pos, length).split("\n").length - 1;
-      if(cursor.line > (removedTextLineNumber + removedLines)) {
-        newCursor.line -= removedLines;
-      }
-      else if(removedLines > 0 && cursor.line === (removedTextLineNumber+removedLines)) {
-        var lastLineCharsRemoved = text.substr(pos, length).split("\n")[removedLines].length;
-        if(cursor.ch >= lastLineCharsRemoved) {
-          newCursor.line = removedTextLineNumber;
-          newCursor.ch = removedTextColumnIndex + cursor.ch - lastLineCharsRemoved;
-        }
-        else {
-          newCursor.line -= removedLines;
-          newCursor.ch = removedTextColumnIndex;
-        }
-      }
-      else if(cursor.line === removedTextLineNumber && cursor.ch > removedTextLineNumber) {
-        newCursor.ch -= Math.min(length, cursor.ch-removedTextLineNumber);
-      }
-      return newCursor;
-    };
-    var transformCursorCMInsert = function(oldtext, cursor, pos, text) {
-      var newCursor = cursor;
-      var textLines = oldtext.substr(0, pos).split("\n");
-      var addedTextLineNumber = textLines.length-1;
-      var addedTextColumnIndex = textLines[textLines.length-1].length;
-      var addedLines = text.split("\n").length - 1;
-      if(cursor.line > addedTextLineNumber) {
-        newCursor.line += addedLines;
-      }
-      else if(cursor.line === addedTextLineNumber && cursor.ch > addedTextColumnIndex) {
-        newCursor.line += addedLines;
-        if(addedLines > 0) {
-          newCursor.ch = newCursor.ch - addedTextColumnIndex + text.split("\n")[addedLines].length;
-        }
-        else {
-          newCursor.ch += text.split("\n")[addedLines].length;
-        }
-      }
-      return newCursor;
-    };
-
-    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) { 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 (window, websocketUrl, userName, channel, cryptKey)
-    {
-        var passwd = 'y';
-        //var wysiwygDiv = window.document.getElementById('cke_1_contents');
-        var doc = window.document.getElementById('editor1');
-        var cmDiv = window.document.getElementsByClassName('CodeMirror')[0];
-        var cmEditor = cmDiv.CodeMirror;
-        //var ifr = wysiwygDiv.getElementsByTagName('iframe')[0];
-        var socket = makeWebsocket(websocketUrl);
-        var onEvent = function () { };
-
-        var allMessages = [];
-        var isErrorState = false;
-        var initializing = true;
-        var recoverableErrorCount = 0;
-        var error = function (recoverable, err) {
-console.log(new Error().stack);
-            console.log('error: ' + err.stack);
-            if (recoverable && recoverableErrorCount++ < MAX_RECOVERABLE_ERRORS) { return; }
-            var realtime = socket.realtime;
-            var docHtml = getDocHTML(doc);
-            isErrorState = true;
-            handleError(socket, realtime, err, docHtml, allMessages);
-        };
-        var attempt = function (func) {
-            return function () {
-                var e;
-                try { return func.apply(func, arguments); } catch (ee) { e = ee; }
-                if (e) {
-                    console.log(e.stack);
-                    error(true, e);
-                }
-            };
-        };
-        var checkSocket = function () {
-            if (isSocketDisconnected(socket, socket.realtime) && !socket.intentionallyClosing) {
-                //isErrorState = true;
-                //abort(socket, socket.realtime);
-                //ErrorBox.show('disconnected', getDocHTML(doc));
-                return true;
-            }
-            return false;
-        };
-
-        socket.onOpen.push(function (evt) {
-            if (!initializing) {
-                socket.realtime.start();
-                return;
-            }
-
-            var realtime = socket.realtime =
-                ChainPad.create(userName,
-                                passwd,
-                                channel,
-                                getDocHTML(doc),
-                                { transformFunction: Otaml.transform });
-
-            var toolbar = realtime.toolbar =
-                Toolbar.create(window.$('#cme_toolbox'), userName, realtime);
-
-            onEvent = function () {
-                if (isErrorState) { return; }
-                if (initializing) { return; }
-
-                var oldDocText = realtime.getUserDoc();
-                var docText = getDocHTML(doc);
-                var op = attempt(Otaml.makeTextOperation)(oldDocText, docText);
-
-                if (!op) { return; }
-
-                if (op.toRemove > 0) {
-                    attempt(realtime.remove)(op.offset, op.toRemove);
-                }
-                if (op.toInsert.length > 0) {
-                    attempt(realtime.insert)(op.offset, op.toInsert);
-                }
-
-                if (realtime.getUserDoc() !== docText) {
-                    error(false, 'realtime.getUserDoc() !== docText');
-                }
-            };
-
-            var userDocBeforePatch;
-            var incomingPatch = function () {
-                if (isErrorState || initializing) { return; }
-                userDocBeforePatch = userDocBeforePatch || getDocHTML(doc);
-                if (PARANOIA && userDocBeforePatch !== getDocHTML(doc)) {
-                    error(false, "userDocBeforePatch != getDocHTML(doc)");
-                }
-                var op = attempt(Otaml.makeTextOperation)(userDocBeforePatch, realtime.getUserDoc());
-                var oldValue = getDocHTML(doc);
-                var newValue = realtime.getUserDoc();
-                // Fix cursor and/or selection
-                var oldCursor = cmEditor.getCursor();
-                var oldCursorCMStart = cmEditor.getCursor('from');
-                var oldCursorCMEnd = cmEditor.getCursor('to');
-                var newCursor;
-                var newSelection;
-                if(oldCursorCMStart !== oldCursorCMEnd) { // Selection
-                    if (op.toRemove > 0) {
-                        newSelection = [transformCursorCMRemove(oldValue, oldCursorCMStart, op.offset, op.toRemove), transformCursorCMRemove(oldValue, oldCursorCMEnd, op.offset, op.toRemove)];
-                    }
-                    if (op.toInsert.length > 0) {
-                        newSelection = [transformCursorCMInsert(oldValue, oldCursorCMStart, op.offset, op.toInsert), transformCursorCMInsert(oldValue, oldCursorCMEnd, op.offset, op.toInsert)];
-                    }
-                }
-                else { // Cursor
-                    if (op.toRemove > 0) {
-                        newCursor = transformCursorCMRemove(oldValue, oldCursor, op.offset, op.toRemove);
-                    }
-                    if (op.toInsert.length > 0) {
-                        newCursor = transformCursorCMInsert(oldValue, oldCursor, op.offset, op.toInsert);
-                    }
-                }
-                $(doc).val(newValue);
-                cmEditor.setValue(newValue);
-                if(newCursor) {
-                  cmEditor.setCursor(newCursor);
-                }
-                else {
-                  cmEditor.setSelection(newSelection[0], newSelection[1]);
-                }
-            };
-
-            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.
-                initializing = false;
-                incomingPatch();
-            });
-
-            socket.onMessage.push(function (evt) {
-                if (isErrorState) { return; }
-                var message = Crypto.decrypt(evt.data, cryptKey);
-                allMessages.push(message);
-                if (!initializing) {
-                    if (PARANOIA) { onEvent(); }
-                    userDocBeforePatch = realtime.getUserDoc();
-                }
-                realtime.message(message);
-            });
-            realtime.onMessage(function (message) {
-                if (isErrorState) { return; }
-                message = Crypto.encrypt(message, cryptKey);
-                try {
-                    socket.send(message);
-                } catch (e) {
-                    error(true, e.stack);
-                }
-            });
-
-            realtime.onPatch(incomingPatch);
-
-            bindAllEvents(cmDiv, onEvent, false);
-
-            setInterval(function () {
-                if (isErrorState || checkSocket()) {
-                    toolbar.reconnecting();
-                }
-            }, 200);
-
-            realtime.start();
-            toolbar.connected();
-
-            //console.log('started');
-        });
-        return {
-            onEvent: function () { onEvent(); }
-        };
-    };
-
-    return module.exports;
-});
diff --git a/www/code/rtwiki.js b/www/code/rt_codemirror.js
similarity index 50%
rename from www/code/rtwiki.js
rename to www/code/rt_codemirror.js
index c17b98daa..7135651ae 100644
--- a/www/code/rtwiki.js
+++ b/www/code/rt_codemirror.js
@@ -6,7 +6,7 @@ define([
   '/common/crypto.js',
   '/code/errorbox.js',
   '/common/messages.js',
-  '/common/toolbar.js',
+  '/code/toolbar.js',
   '/common/chainpad.js',
   '/common/otaml.js',
   '/bower_components/jquery/dist/jquery.min.js'
@@ -16,17 +16,6 @@ define([
     var Otaml = window.Otaml;
     var module = { exports: {} };
 
-    var LOCALSTORAGE_DISALLOW = 'rtwiki-disallow';
-
-    // Number for a message type which will not interfere with chainpad.
-    var MESSAGE_TYPE_ISAVED = 5000;
-
-    // how often to check if the document has been saved recently
-    var SAVE_DOC_CHECK_CYCLE = 20000;
-
-    // how often to save the document
-    var SAVE_DOC_TIME = 60000;
-
     // How long to wait before determining that the connection is lost.
     var MAX_LAG_BEFORE_DISCONNECT = 30000;
 
@@ -36,37 +25,6 @@ define([
     var debug = function (x) { };
     //debug = function (x) { console.log(x) };
     warn = function (x) { console.log(x); };
-    var setStyle = function () {
-        $('head').append([
-            ''
-         ].join(''));
-    };
 
     var uid = function () {
         return 'rtwiki-uid-' + String(Math.random()).substring(2);
@@ -151,178 +109,6 @@ define([
         return lagElement;
     };
 
-    var createRealtimeToolbar = function (container) {
-        var id = uid();
-        $(container).prepend(
-            '
' +
-                '
' +
-                '
' +
-            '
'
-        );
-        return $('#'+id);
-    };
-
-    var now = function () { return (new Date()).getTime(); };
-
-    var getFormToken = function () {
-        return $('meta[name="form_token"]').attr('content');
-    };
-
-    var getDocumentSection = function (sectionNum, andThen) {
-        debug("getting document section...");
-        $.ajax({
-            url: window.docediturl,
-            type: "POST",
-            async: true,
-            dataType: 'text',
-            data: {
-                xpage: 'editwiki',
-                section: ''+sectionNum
-            },
-            success: function (jqxhr) {
-                var content = $(jqxhr).find('#content');
-                if (!content || !content.length) {
-                    andThen(new Error("could not find content"));
-                } else {
-                    andThen(undefined, content.text());
-                }
-            },
-            error: function (jqxhr, err, cause) {
-                andThen(new Error(err));
-            }
-        });
-    };
-
-    var getIndexOfDocumentSection = function (documentContent, sectionNum, andThen) {
-        getDocumentSection(sectionNum, function (err, content) {
-            if (err) {
-                andThen(err);
-                return;
-            }
-            // This is screwed up, XWiki generates the section by rendering the XDOM back to
-            // XWiki2.0 syntax so it's not possible to find the actual location of a section.
-            // See: http://jira.xwiki.org/browse/XWIKI-10430
-            var idx = documentContent.indexOf(content);
-            if (idx === -1) {
-                content = content.split('\n')[0];
-                idx = documentContent.indexOf(content);
-            }
-            if (idx === -1) {
-                warn("Could not find section content..");
-            } else if (idx !== documentContent.lastIndexOf(content)) {
-                warn("Duplicate section content..");
-            } else {
-                andThen(undefined, idx);
-                return;
-            }
-            andThen(undefined, 0);
-        });
-    };
-
-    var seekToSection = function (textArea, andThen) {
-        var sect = window.location.hash.match(/^#!([\W\w]*&)?section=([0-9]+)/);
-        if (!sect || !sect[2]) {
-            andThen();
-            return;
-        }
-        var text = $(textArea).text();
-        getIndexOfDocumentSection(text, Number(sect[2]), function (err, idx) {
-            if (err) { andThen(err); return; }
-            if (idx === 0) {
-                warn("Attempted to seek to a section which could not be found");
-            } else {
-                var heightOne = $(textArea)[0].scrollHeight;
-                $(textArea).text(text.substring(idx));
-                var heightTwo = $(textArea)[0].scrollHeight;
-                $(textArea).text(text);
-                $(textArea).scrollTop(heightOne - heightTwo);
-            }
-            andThen();
-        });
-    };
-
-    var saveDocument = function (textArea, language, andThen) {
-        debug("saving document...");
-        $.ajax({
-            url: window.docsaveurl,
-            type: "POST",
-            async: true,
-            dataType: 'text',
-            data: {
-                xredirect: '',
-                content: $(textArea).val(),
-                xeditaction: 'edit',
-                comment: 'Auto-Saved by Realtime Session',
-                action_saveandcontinue: 'Save & Continue',
-                minorEdit: 1,
-                ajax: true,
-                form_token: getFormToken(),
-                language: language
-            },
-            success: function () {
-                andThen();
-            },
-            error: function (jqxhr, err, cause) {
-                warn(err);
-                // Don't callback, this way in case of error we will keep trying.
-                //andThen();
-            }
-        });
-    };
-
-    /**
-     * If we are editing a page which does not exist and creating it from a template
-     * then we should not auto-save the document otherwise it will cause RTWIKI-16
-     */
-    var createPageMode = function () {
-        return (window.location.href.indexOf('template=') !== -1);
-    };
-
-    var createSaver = function (socket, channel, myUserName, textArea, demoMode, language) {
-        var timeOfLastSave = now();
-        socket.onMessage.unshift(function (evt) {
-            // get the content...
-            var chanIdx = evt.data.indexOf(channel);
-            var content = evt.data.substring(evt.data.indexOf(':[', chanIdx + channel.length)+1);
-
-            // parse
-            var json = JSON.parse(content);
-
-            // not an isaved message
-            if (json[0] !== MESSAGE_TYPE_ISAVED) { return; }
-
-            timeOfLastSave = now();
-            return false;
-        });
-
-        var lastSavedState = '';
-        var to;
-        var check = function () {
-            if (to) { clearTimeout(to); }
-            debug("createSaver.check");
-            to = setTimeout(check, Math.random() * SAVE_DOC_CHECK_CYCLE);
-            if (now() - timeOfLastSave < SAVE_DOC_TIME) { return; }
-            var toSave = $(textArea).val();
-            if (lastSavedState === toSave) { return; }
-            if (demoMode) { return; }
-            saveDocument(textArea, language, function () {
-                debug("saved document");
-                timeOfLastSave = now();
-                lastSavedState = toSave;
-                var saved = JSON.stringify([MESSAGE_TYPE_ISAVED, 0]);
-                socket.send('1:x' +
-                    myUserName.length + ':' + myUserName +
-                    channel.length + ':' + channel +
-                    saved.length + ':' + saved
-                );
-            });
-        };
-        check();
-        socket.onClose.push(function () {
-            clearTimeout(to);
-        });
-    };
-
     var isSocketDisconnected = function (socket, realtime) {
         return socket.readyState === socket.CLOSING ||
             socket.readyState === socket.CLOSED ||
@@ -338,243 +124,6 @@ define([
         }
     };
 
-    var startWebSocket = function (textArea,
-                                   toolbarContainer,
-                                   websocketUrl,
-                                   userName,
-                                   channel,
-                                   messages,
-                                   demoMode,
-                                   language)
-    {
-        debug("Opening websocket");
-        localStorage.removeItem(LOCALSTORAGE_DISALLOW);
-
-        var toolbar = createRealtimeToolbar(toolbarContainer);
-        var socket = new WebSocket(websocketUrl);
-        socket.onClose = [];
-        socket.onMessage = [];
-        var initState = $(textArea).val();
-        var realtime = socket.realtime = ChainPad.create(userName, 'x', channel, initState);
-        // for debugging
-        window.rtwiki_chainpad = realtime;
-
-        // http://jira.xwiki.org/browse/RTWIKI-21
-        var onbeforeunload = window.onbeforeunload || function () { };
-        window.onbeforeunload = function (ev) {
-            socket.intentionallyClosing = true;
-            return onbeforeunload(ev);
-        };
-
-        var isErrorState = false;
-        var checkSocket = function () {
-            if (socket.intentionallyClosing || isErrorState) { return false; }
-            if (isSocketDisconnected(socket, realtime)) {
-                realtime.abort();
-                socket.close();
-                ErrorBox.show('disconnected');
-                isErrorState = true;
-                return true;
-            }
-            return false;
-        };
-
-        socket.onopen = function (evt) {
-
-            var initializing = true;
-
-            var userListElement = createUserList(realtime,
-                                                 userName,
-                                                 toolbar.find('.rtwiki-toolbar-leftside'),
-                                                 messages);
-
-            userListElement.text(messages.initializing);
-
-            createLagElement(socket,
-                             realtime,
-                             toolbar.find('.rtwiki-toolbar-rightside'),
-                             messages);
-
-            setAutosaveHiddenState(true);
-
-            createSaver(socket, channel, userName, textArea, demoMode, language);
-
-            socket.onMessage.push(function (evt) {
-                debug(evt.data);
-                realtime.message(evt.data);
-            });
-            realtime.onMessage(function (message) { socket.send(message); });
-
-            $(textArea).attr("disabled", "disabled");
-
-            realtime.onUserListChange(function (userList) {
-                if (initializing && userList.indexOf(userName) > -1) {
-                    initializing = false;
-                    $(textArea).val(realtime.getUserDoc());
-                    textArea.attach($(textArea)[0], realtime);
-                    $(textArea).removeAttr("disabled");
-                }
-                if (!initializing) {
-                    updateUserList(userName, userListElement, userList, messages);
-                }
-            });
-
-
-            debug("Bound websocket");
-            realtime.start();
-        };
-        socket.onclose = function (evt) {
-            for (var i = 0; i < socket.onClose.length; i++) {
-                if (socket.onClose[i](evt) === false) { return; }
-            }
-        };
-        socket.onmessage = function (evt) {
-            for (var i = 0; i < socket.onMessage.length; i++) {
-                if (socket.onMessage[i](evt) === false) { return; }
-            }
-        };
-        socket.onerror = function (err) {
-            warn(err);
-            checkSocket(realtime);
-        };
-
-        var to = setInterval(function () {
-            checkSocket(realtime);
-        }, 500);
-        socket.onClose.push(function () {
-            clearTimeout(to);
-            if (toolbar && typeof toolbar.remove === 'function') {
-                toolbar.remove();
-            } else {
-                warn("toolbar.remove is not a function"); //why not?
-            }
-            setAutosaveHiddenState(false);
-        });
-
-        return socket;
-    };
-
-    var stopWebSocket = function (socket) {
-        debug("Stopping websocket");
-        socket.intentionallyClosing = true;
-        if (!socket) { return; }
-        if (socket.realtime) { socket.realtime.abort(); }
-        socket.close();
-    };
-
-    var checkSectionEdit = function () {
-        var href = window.location.href;
-        if (href.indexOf('#') === -1) { href += '#!'; }
-        var si = href.indexOf('section=');
-        if (si === -1 || si > href.indexOf('#')) { return false; }
-        var m = href.match(/([&]*section=[0-9]+)/)[1];
-        href = href.replace(m, '');
-        if (m[0] === '&') { m = m.substring(1); }
-        href = href + '&' + m;
-        window.location.href = href;
-        return true;
-    };
-
-    var editor = function (websocketUrl, userName, messages, channel, demoMode, language) {
-        var contentInner = $('#xwikieditcontentinner');
-        var textArea = contentInner.find('#content');
-        if (!textArea.length) {
-            warn("WARNING: Could not find textarea to bind to");
-            return;
-        }
-
-        if (createPageMode()) { return; }
-
-        if (checkSectionEdit()) { return; }
-
-        setStyle();
-
-        var checked = (localStorage.getItem(LOCALSTORAGE_DISALLOW)) ? "" : 'checked="checked"';
-        var allowRealtimeCbId = uid();
-        $('#mainEditArea .buttons').append(
-            '
' +
-                '' +
-            '
'
-        );
-
-        var socket;
-        var checkboxClick = function (checked) {
-            if (checked || demoMode) {
-                socket = startWebSocket(textArea,
-                                        contentInner,
-                                        websocketUrl,
-                                        userName,
-                                        channel,
-                                        messages,
-                                        demoMode,
-                                        language);
-            } else if (socket) {
-                localStorage.setItem(LOCALSTORAGE_DISALLOW, 1);
-                stopWebSocket(socket);
-                socket = undefined;
-            }
-        };
-
-        seekToSection(textArea, function (err) {
-            if (err) { throw err; }
-            $('#'+allowRealtimeCbId).click(function () { checkboxClick(this.checked); });
-            checkboxClick(checked);
-        });
-    };
-
-    var main = module.exports.main = function (websocketUrl,
-                                               userName,
-                                               messages,
-                                               channel,
-                                               demoMode,
-                                               language)
-    {
-
-        if (!websocketUrl) {
-            throw new Error("No WebSocket URL, please ensure Realtime Backend is installed.");
-        }
-
-        // Either we are in edit mode or the document is locked.
-        // There is no cross-language way that the UI tells us the document is locked
-        // but we can hunt for the force button.
-        var forceLink = $('a[href$="&force=1"][href*="/edit/"]');
-
-        var hasActiveRealtimeSession = function () {
-            forceLink.text(messages.joinSession);
-            forceLink.attr('href', forceLink.attr('href') + '&editor=wiki');
-        };
-
-        if (forceLink.length && !localStorage.getItem(LOCALSTORAGE_DISALLOW)) {
-            // ok it's locked.
-            var socket = new WebSocket(websocketUrl);
-            socket.onopen = function (evt) {
-                socket.onmessage = function (evt) {
-                    debug("Message! " + evt.data);
-                    var regMsgEnd = '3:[0]';
-                    if (evt.data.indexOf(regMsgEnd) !== evt.data.length - regMsgEnd.length) {
-                        // Not a register message
-                    } else if (evt.data.indexOf(userName.length + ':' + userName) === 0) {
-                        // It's us registering
-                    } else {
-                        // Someone has registered
-                        debug("hasActiveRealtimeSession");
-                        socket.close();
-                        hasActiveRealtimeSession();
-                    }
-                };
-                socket.send('1:x' + userName.length + ':' + userName +
-                    channel.length + ':' + channel + '3:[0]');
-                debug("Bound websocket");
-            };
-        } else if (window.XWiki.editor === 'wiki' || demoMode) {
-            editor(websocketUrl, userName, messages, channel, demoMode, language);
-        }
-    };
-  
     // CodeMirror/RTWiki
     // Trapping Keyboard Events
     var bindEvents = function (element, events, callback, unbind) {
@@ -760,12 +309,12 @@ define([
             var incomingPatch = function () {
                 if (isErrorState || initializing) { return; }
                 var textAreaVal = $(textArea).val();
+                                console.log($(textArea).val());
                 userDocBeforePatch = userDocBeforePatch || textAreaVal;
                 if (userDocBeforePatch !== textAreaVal) {
                   //error(false, "userDocBeforePatch !== textAreaVal");
                 }
                 var op = attempt(Otaml.makeTextOperation)(userDocBeforePatch, realtime.getUserDoc());
-
                 if (typeof op === 'undefined') {
                     warn("TypeError: op is undefined");
                     return;
@@ -796,6 +345,7 @@ define([
                     }
                 }
                 $(textArea).val(newValue);
+                userDocBeforePatch = newValue;
                 cmEditor.setValue(newValue);
                 if(newCursor) {
                   cmEditor.setCursor(newCursor);
@@ -884,7 +434,7 @@ define([
         if (!websocketUrl) {
             throw new Error("No WebSocket URL, please ensure Realtime Backend is installed.");
         }
-        var cme = cmEditor(window, websocketUrl, userName, Messages, channel, cryptkey);
+        var cme = cmEditor(window, websocketUrl+'_old', userName, Messages, channel, cryptkey);
         return {
             onEvent: function () { 
               cme.onEvent();
diff --git a/www/code/sharejs_textarea.js b/www/code/sharejs_textarea.js
deleted file mode 100644
index 14076033a..000000000
--- a/www/code/sharejs_textarea.js
+++ /dev/null
@@ -1,263 +0,0 @@
-define(function () {
-
-/**
- * Licensed under the standard MIT license:
- *
- * Copyright 2011 Joseph Gentle.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * See: https://github.com/share/ShareJS/blob/master/LICENSE
- */
-
-/* This contains the textarea binding for ShareJS. This binding is really
- * simple, and a bit slow on big documents (Its O(N). However, it requires no
- * changes to the DOM and no heavy libraries like ace. It works for any kind of
- * text input field.
- *
- * You probably want to use this binding for small fields on forms and such.
- * For code editors or rich text editors or whatever, I recommend something
- * heavier.
- */
-
-
-/* applyChange creates the edits to convert oldval -> newval.
- *
- * This function should be called every time the text element is changed.
- * Because changes are always localised, the diffing is quite easy. We simply
- * scan in from the start and scan in from the end to isolate the edited range,
- * then delete everything that was removed & add everything that was added.
- * This wouldn't work for complex changes, but this function should be called
- * on keystroke - so the edits will mostly just be single character changes.
- * Sometimes they'll paste text over other text, but even then the diff
- * generated by this algorithm is correct.
- *
- * This algorithm is O(N). I suspect you could speed it up somehow using regular expressions.
- */
-var applyChange = function(ctx, oldval, newval) {
-  // Strings are immutable and have reference equality. I think this test is O(1), so its worth doing.
-  if (oldval === newval) { return; }
-
-  var commonStart = 0;
-  while (oldval.charAt(commonStart) === newval.charAt(commonStart)) {
-    commonStart++;
-  }
-
-  var commonEnd = 0;
-  while (oldval.charAt(oldval.length - 1 - commonEnd) === newval.charAt(newval.length - 1 - commonEnd) &&
-      commonEnd + commonStart < oldval.length && commonEnd + commonStart < newval.length) {
-    commonEnd++;
-  }
-
-  if (oldval.length !== commonStart + commonEnd) {
-    ctx.remove(commonStart, oldval.length - commonStart - commonEnd);
-  }
-  if (newval.length !== commonStart + commonEnd) {
-    ctx.insert(commonStart, newval.slice(commonStart, newval.length - commonEnd));
-  }
-};
-
-/**
- * Fix issues with textarea content which is different per-browser.
- */
-var cannonicalize = function (content) {
-
-    return content.replace(/\r\n/g, '\n');
-};
-
-// Attach a textarea to a document's editing context.
-//
-// The context is optional, and will be created from the document if its not
-// specified.
-var attachTextarea = function(elem, ctx, cmElem) {
-
-  // initial state will always fail the !== check in genop.
-  var content = {};
-
-  // Replace the content of the text area with newText, and transform the
-  // current cursor by the specified function.
-  var replaceText = function(newText, transformCursor, transformCursorCM) {
-      var newCursor;
-      var newSelection;
-
-    if(cmElem) {
-      // Fix cursor here?
-      var cursorCM = cmElem.getCursor();
-      var cursorCMStart = cmElem.getCursor('from');
-      var cursorCMEnd = cmElem.getCursor('to');
-      if(cursorCMStart !== cursorCMEnd) {
-          newSelection = [transformCursorCM(elem.value, cursorCMStart), transformCursorCM(elem.value, cursorCMEnd)];
-      }
-      else {
-          newCursor = transformCursorCM(elem.value, cursorCM);
-      }
-    }
-    
-    if (transformCursor && !cmElem) {
-        newSelection = [transformCursor(elem.selectionStart), transformCursor(elem.selectionEnd)];
-    }
-
-    // Fixate the window's scroll while we set the element's value. Otherwise
-    // the browser scrolls to the element.
-    var scrollTop = elem.scrollTop;
-    elem.value = newText;
-    if(cmElem) {
-      // Fix cursor here?
-      cmElem.setValue(newText);
-      if(newCursor) {
-        cmElem.setCursor(newCursor);
-      }
-      else {
-        cmElem.setSelection(newSelection[0], newSelection[1]);
-      }
-    }
-    content = elem.value; // Not done on one line so the browser can do newline conversion.
-    
-    if(!cmElem) {
-      if (elem.scrollTop !== scrollTop) { elem.scrollTop = scrollTop; }
-
-      // Setting the selection moves the cursor. We'll just have to let your
-      // cursor drift if the element isn't active, though usually users don't
-      // care.
-      if (newSelection && window.document.activeElement === elem) {
-        elem.selectionStart = newSelection[0];
-        elem.selectionEnd = newSelection[1];
-      }
-    }
-  };
-
-  //replaceText(ctx.get());
-
-
-  // *** remote -> local changes
-
-  ctx.onRemove(function(pos, length) {
-    var transformCursor = function(cursor) {
-      // If the cursor is inside the deleted region, we only want to move back to the start
-      // of the region. Hence the Math.min.
-      return pos < cursor ? cursor - Math.min(length, cursor - pos) : cursor;
-    };
-    var transformCursorCM = function(text, cursor) {
-      var newCursor = cursor;
-      var textLines = text.substr(0, pos).split("\n");
-      var removedTextLineNumber = textLines.length-1;
-      var removedTextColumnIndex = textLines[textLines.length-1].length;
-      var removedLines = text.substr(pos, length).split("\n").length - 1;
-      if(cursor.line > (removedTextLineNumber + removedLines)) {
-        newCursor.line -= removedLines;
-      }
-      else if(removedLines > 0 && cursor.line === (removedTextLineNumber+removedLines)) {
-        var lastLineCharsRemoved = text.substr(pos, length).split("\n")[removedLines].length;
-        if(cursor.ch >= lastLineCharsRemoved) {
-          newCursor.line = removedTextLineNumber;
-          newCursor.ch = removedTextColumnIndex + cursor.ch - lastLineCharsRemoved;
-        }
-        else {
-          newCursor.line -= removedLines;
-          newCursor.ch = removedTextColumnIndex;
-        }
-      }
-      else if(cursor.line === removedTextLineNumber && cursor.ch > removedTextLineNumber) {
-        newCursor.ch -= Math.min(length, cursor.ch-removedTextLineNumber);
-      }
-      return newCursor;
-    };
-    replaceText(ctx.getUserDoc(), transformCursor, transformCursorCM);
-  });
-
-  ctx.onInsert(function(pos, text) {
-    var transformCursor = function(cursor) {
-      return pos < cursor ? cursor + text.length : cursor;
-    };
-    var transformCursorCM = function(oldtext, cursor) {
-      var newCursor = cursor;
-      var textLines = oldtext.substr(0, pos).split("\n");
-      var addedTextLineNumber = textLines.length-1;
-      var addedTextColumnIndex = textLines[textLines.length-1].length;
-      var addedLines = text.split("\n").length - 1;
-      if(cursor.line > addedTextLineNumber) {
-        newCursor.line += addedLines;
-      }
-      else if(cursor.line === addedTextLineNumber && cursor.ch > addedTextColumnIndex) {
-        newCursor.line += addedLines;
-        if(addedLines > 0) {
-          newCursor.ch = newCursor.ch - addedTextColumnIndex + text.split("\n")[addedLines].length;
-        }
-        else {
-          newCursor.ch += text.split("\n")[addedLines].length;
-        }
-      }
-      return newCursor;
-    };
-    replaceText(ctx.getUserDoc(), transformCursor, transformCursorCM);
-  });
-
-
-  // *** local -> remote changes
-
-  // This function generates operations from the changed content in the textarea.
-  var genOp = function() {
-    // In a timeout so the browser has time to propogate the event's changes to the DOM.
-    setTimeout(function() {
-      var val = elem.value;
-      if (val !== content) {
-        applyChange(ctx, ctx.getUserDoc(), cannonicalize(val));
-      }
-    }, 0);
-  };
-
-  var eventNames = ['textInput', 'keydown', 'keyup', 'select', 'cut', 'paste'];
-  for (var i = 0; i < eventNames.length; i++) {
-    var e = eventNames[i];
-    if (elem.addEventListener) {
-      elem.addEventListener(e, genOp, false);
-    } else {
-      elem.attachEvent('on' + e, genOp);
-    }
-  }
-  window.setTimeout(function() {
-    if(cmElem) {
-      var elem2 =  cmElem;
-      elem2.on('change', function() {
-        elem2.save();
-        genOp();
-      });
-    }
-    else {
-    console.log('CM inexistant');
-    }
-  }, 500);
-
-
-  ctx.detach = function() {
-    for (var i = 0; i < eventNames.length; i++) {
-      var e = eventNames[i];
-      if (elem.removeEventListener) {
-        elem.removeEventListener(e, genOp, false);
-      } else {
-        elem.detachEvent('on' + e, genOp);
-      }
-    }
-  };
-
-  return ctx;
-};
-
-return { attach: attachTextarea };
-});
diff --git a/www/code/toolbar.js b/www/code/toolbar.js
new file mode 100644
index 000000000..8871833ff
--- /dev/null
+++ b/www/code/toolbar.js
@@ -0,0 +1,246 @@
+define([
+    '/common/messages.js'
+], function (Messages) {
+
+    /** Id of the element for getting debug info. */
+    var DEBUG_LINK_CLS = 'rtwysiwyg-debug-link';
+
+    /** Id of the div containing the user list. */
+    var USER_LIST_CLS = 'rtwysiwyg-user-list';
+
+    /** Id of the div containing the lag info. */
+    var LAG_ELEM_CLS = 'rtwysiwyg-lag';
+
+    /** The toolbar class which contains the user list, debug link and lag. */
+    var TOOLBAR_CLS = 'rtwysiwyg-toolbar';
+
+    /** Key in the localStore which indicates realtime activity should be disallowed. */
+    var LOCALSTORAGE_DISALLOW = 'rtwysiwyg-disallow';
+
+    var SPINNER_DISAPPEAR_TIME = 3000;
+    var SPINNER = [ '-', '\\', '|', '/' ];
+
+    var uid = function () {
+        return 'rtwysiwyg-uid-' + String(Math.random()).substring(2);
+    };
+
+    var createRealtimeToolbar = function ($container) {
+        var id = uid();
+        $container.prepend(
+            '
' +
+                '
' +
+                '
' +
+            '
'
+        );
+        var toolbar = $container.find('#'+id);
+        toolbar.append([
+            ''
+         ].join('\n'));
+        return toolbar;
+    };
+
+    var createEscape = function ($container) {
+        var id = uid();
+        $container.append('
⇐ Back
');
+        var $ret = $container.find('#'+id);
+        $ret.on('click', function () {
+            window.location.href = '/';
+        });
+        return $ret[0];
+    };
+
+    var createSpinner = function ($container) {
+        var id = uid();
+        $container.append('');
+        return $container.find('#'+id)[0];
+    };
+
+    var kickSpinner = function (spinnerElement, reversed) {
+        var txt = spinnerElement.textContent || '-';
+        var inc = (reversed) ? -1 : 1;
+        spinnerElement.textContent = SPINNER[(SPINNER.indexOf(txt) + inc) % SPINNER.length];
+        if (spinnerElement.timeout) { clearTimeout(spinnerElement.timeout); }
+        spinnerElement.timeout = setTimeout(function () {
+            spinnerElement.textContent = '';
+        }, SPINNER_DISAPPEAR_TIME);
+    };
+
+    var createUserList = function ($container) {
+        var id = uid();
+        $container.append('
');
+        return $container.find('#'+id)[0];
+    };
+
+    var getOtherUsers = function(myUserName, userList) {
+      var i = 0;
+      var list = '';
+      userList.forEach(function(user) {
+        if(user !== myUserName) {
+          if(i === 0) list = ' : ';
+          list += user + ', ';
+          i++;
+        }
+      });
+      return (i > 0) ? list.slice(0, -2) : list;
+    }
+
+    var updateUserList = function (myUserName, listElement, userList) {
+        var meIdx = userList.indexOf(myUserName);
+        if (meIdx === -1) {
+            listElement.textContent = Messages.synchronizing;
+            return;
+        }
+        if (userList.length === 1) {
+            listElement.innerHTML = Messages.editingAlone;
+        } else if (userList.length === 2) {
+            listElement.innerHTML = Messages.editingWithOneOtherPerson + getOtherUsers(myUserName, userList);
+        } else {
+            listElement.innerHTML = Messages.editingWith + ' ' + (userList.length - 1) + ' ' + Messages.otherPeople + getOtherUsers(myUserName, userList);
+        }
+    };
+
+    var createLagElement = function ($container) {
+        var id = uid();
+        $container.append('
');
+        return $container.find('#'+id)[0];
+    };
+
+    var checkLag = function (realtime, lagElement) {
+        var lag = realtime.getLag();
+        var lagSec = lag.lag/1000;
+        var lagMsg = Messages.lag + ' ';
+        if (lag.waiting && lagSec > 1) {
+            lagMsg += "?? " + Math.floor(lagSec);
+        } else {
+            lagMsg += lagSec;
+        }
+        lagElement.textContent = lagMsg;
+    };
+
+    // this is a little hack, it should go in it's own file.
+    // FIXME ok, so let's put it in its own file then
+    // TODO there should also be a 'clear recent pads' button
+    var rememberPad = function () {
+        // FIXME, this is overly complicated, use array methods
+        var recentPadsStr = localStorage['CryptPad_RECENTPADS'];
+        var recentPads = [];
+        if (recentPadsStr) { recentPads = JSON.parse(recentPadsStr); }
+        // TODO use window.location.hash or something like that
+        if (window.location.href.indexOf('#') === -1) { return; }
+        var now = new Date();
+        var out = [];
+        for (var i = recentPads.length; i >= 0; i--) {
+            if (recentPads[i] &&
+                // TODO precompute this time value, maybe make it configurable?
+                // FIXME precompute the date too, why getTime every time?
+                now.getTime() - recentPads[i][1] < (1000*60*60*24*30) &&
+                recentPads[i][0] !== window.location.href)
+            {
+                out.push(recentPads[i]);
+            }
+        }
+        out.push([window.location.href, now.getTime()]);
+        localStorage['CryptPad_RECENTPADS'] = JSON.stringify(out);
+    };
+
+    var create = function ($container, myUserName, realtime) {
+        var toolbar = createRealtimeToolbar($container);
+        createEscape(toolbar.find('.rtwysiwyg-toolbar-leftside'));
+        var userListElement = createUserList(toolbar.find('.rtwysiwyg-toolbar-leftside'));
+        var spinner = createSpinner(toolbar.find('.rtwysiwyg-toolbar-rightside'));
+        var lagElement = createLagElement(toolbar.find('.rtwysiwyg-toolbar-rightside'));
+
+        rememberPad();
+
+        var connected = false;
+
+        realtime.onUserListChange(function (userList) {
+            if (userList.indexOf(myUserName) !== -1) { connected = true; }
+            if (!connected) { return; }
+            updateUserList(myUserName, userListElement, userList);
+        });
+
+        var ks = function () {
+            if (connected) { kickSpinner(spinner, false); }
+        };
+
+        realtime.onPatch(ks);
+        // Try to filter out non-patch messages, doesn't have to be perfect this is just the spinner
+        realtime.onMessage(function (msg) { if (msg.indexOf(':[2,') > -1) { ks(); } });
+
+        setInterval(function () {
+            if (!connected) { return; }
+            checkLag(realtime, lagElement);
+        }, 3000);
+
+        return {
+            failed: function () {
+                connected = false;
+                userListElement.textContent = '';
+                lagElement.textContent = '';
+            },
+            reconnecting: function () {
+                connected = false;
+                userListElement.textContent = Messages.reconnecting;
+                lagElement.textContent = '';
+            },
+            connected: function () {
+                connected = true;
+            }
+        };
+    };
+
+    return { create: create };
+});
\ No newline at end of file

From 9330b00f02ec04adf163d2c051afbf48d3a5a2fa Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Mon, 11 Apr 2016 14:54:49 +0200
Subject: [PATCH 043/257] Hide the spreadsheet button until it is fixed

---
 customize.dist/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/index.html b/customize.dist/index.html
index cdf6e9934..3dd81b486 100644
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -220,7 +220,7 @@
         
       

From 713c90242b2e74be51b0f7d41961647ac35b478c Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Mon, 11 Apr 2016 15:00:22 +0200
Subject: [PATCH 044/257] Hide the usernames when they have not been changed

---
 www/common/toolbar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 738d20c57..6b6323684 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -132,7 +132,7 @@ define([
       userList.forEach(function(user) {
         if(user !== myUserName) {
           var data = (userData) ? (userData[user] || null) : null;
-          var userName = (data) ? data.name : user;
+          var userName = (data) ? data.name : null;
           if(userName) {
             if(i === 0) list = ' : ';
             list += userName + ', ';

From c2e0dded3ad176d1addd831dd8723c71e2fa9fed Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Mon, 11 Apr 2016 15:47:40 +0200
Subject: [PATCH 045/257] Fix an issue with the cursor sometimes disappearing
 when a patch was received

Update CodeMirror to the latest version (5.13.2)
---
 www/code/codemirror-5.13.2/.gitattributes     |    8 +
 www/code/codemirror-5.13.2/.gitignore         |    8 +
 www/code/codemirror-5.13.2/.npmignore         |   10 +
 www/code/codemirror-5.13.2/.travis.yml        |    4 +
 www/code/codemirror-5.13.2/AUTHORS            |  558 ++
 www/code/codemirror-5.13.2/CHANGELOG.md       |  718 +++
 www/code/codemirror-5.13.2/CONTRIBUTING.md    |   88 +
 www/code/codemirror-5.13.2/LICENSE            |   19 +
 www/code/codemirror-5.13.2/README.md          |   28 +
 .../addon/comment/comment.js                  |  196 +
 .../addon/comment/continuecomment.js          |   85 +
 .../codemirror-5.13.2/addon/dialog/dialog.css |   32 +
 .../codemirror-5.13.2/addon/dialog/dialog.js  |  157 +
 .../addon/display/autorefresh.js              |   47 +
 .../addon/display/fullscreen.css              |    6 +
 .../addon/display/fullscreen.js               |   41 +
 .../codemirror-5.13.2/addon/display/panel.js  |  112 +
 .../addon/display/placeholder.js              |   62 +
 .../codemirror-5.13.2/addon/display/rulers.js |   63 +
 .../addon/edit/closebrackets.js               |  195 +
 .../codemirror-5.13.2/addon/edit/closetag.js  |  169 +
 .../addon/edit/continuelist.js                |   51 +
 .../addon/edit/matchbrackets.js               |  120 +
 .../codemirror-5.13.2/addon/edit/matchtags.js |   66 +
 .../addon/edit/trailingspace.js               |   27 +
 .../addon/fold/brace-fold.js                  |  105 +
 .../addon/fold/comment-fold.js                |   59 +
 .../codemirror-5.13.2/addon/fold/foldcode.js  |  149 +
 .../addon/fold/foldgutter.css                 |   20 +
 .../addon/fold/foldgutter.js                  |  146 +
 .../addon/fold/indent-fold.js                 |   44 +
 .../addon/fold/markdown-fold.js               |   49 +
 .../codemirror-5.13.2/addon/fold/xml-fold.js  |  182 +
 .../addon/hint/anyword-hint.js                |   41 +
 .../codemirror-5.13.2/addon/hint/css-hint.js  |   60 +
 .../codemirror-5.13.2/addon/hint/html-hint.js |  348 ++
 .../addon/hint/javascript-hint.js             |  146 +
 .../addon/hint/show-hint.css                  |   38 +
 .../codemirror-5.13.2/addon/hint/show-hint.js |  447 ++
 .../codemirror-5.13.2/addon/hint/sql-hint.js  |  281 +
 .../codemirror-5.13.2/addon/hint/xml-hint.js  |  110 +
 .../addon/lint/coffeescript-lint.js           |   41 +
 .../codemirror-5.13.2/addon/lint/css-lint.js  |   35 +
 .../codemirror-5.13.2/addon/lint/html-lint.js |   46 +
 .../addon/lint/javascript-lint.js             |  136 +
 .../codemirror-5.13.2/addon/lint/json-lint.js |   31 +
 .../codemirror-5.13.2/addon/lint/lint.css     |   73 +
 www/code/codemirror-5.13.2/addon/lint/lint.js |  238 +
 .../codemirror-5.13.2/addon/lint/yaml-lint.js |   28 +
 .../codemirror-5.13.2/addon/merge/merge.css   |  113 +
 .../codemirror-5.13.2/addon/merge/merge.js    |  773 +++
 .../codemirror-5.13.2/addon/mode/loadmode.js  |   64 +
 .../codemirror-5.13.2/addon/mode/multiplex.js |  123 +
 .../addon/mode/multiplex_test.js              |   33 +
 .../codemirror-5.13.2/addon/mode/overlay.js   |   85 +
 .../codemirror-5.13.2/addon/mode/simple.js    |  213 +
 .../addon/runmode/colorize.js                 |   40 +
 .../addon/runmode/runmode-standalone.js       |  157 +
 .../addon/runmode/runmode.js                  |   72 +
 .../addon/runmode/runmode.node.js             |  179 +
 .../addon/scroll/annotatescrollbar.js         |  118 +
 .../addon/scroll/scrollpastend.js             |   46 +
 .../addon/scroll/simplescrollbars.css         |   66 +
 .../addon/scroll/simplescrollbars.js          |  149 +
 .../addon/search/jump-to-line.js              |   49 +
 .../addon/search/match-highlighter.js         |  149 +
 .../addon/search/matchesonscrollbar.css       |    8 +
 .../addon/search/matchesonscrollbar.js        |   97 +
 .../codemirror-5.13.2/addon/search/search.js  |  228 +
 .../addon/search/searchcursor.js              |  189 +
 .../addon/selection/active-line.js            |   74 +
 .../addon/selection/mark-selection.js         |  118 +
 .../addon/selection/selection-pointer.js      |   98 +
 .../codemirror-5.13.2/addon/tern/tern.css     |   87 +
 www/code/codemirror-5.13.2/addon/tern/tern.js |  701 +++
 .../codemirror-5.13.2/addon/tern/worker.js    |   44 +
 .../codemirror-5.13.2/addon/wrap/hardwrap.js  |  142 +
 www/code/codemirror-5.13.2/bin/authors.sh     |    6 +
 www/code/codemirror-5.13.2/bin/compress       |   92 +
 www/code/codemirror-5.13.2/bin/lint           |    3 +
 www/code/codemirror-5.13.2/bin/release        |   45 +
 .../codemirror-5.13.2/bin/source-highlight    |   51 +
 www/code/codemirror-5.13.2/bower.json         |   17 +
 .../codemirror-5.13.2/demo/activeline.html    |   78 +
 .../codemirror-5.13.2/demo/anywordhint.html   |   79 +
 www/code/codemirror-5.13.2/demo/bidi.html     |   74 +
 www/code/codemirror-5.13.2/demo/btree.html    |   83 +
 www/code/codemirror-5.13.2/demo/buffers.html  |  109 +
 .../codemirror-5.13.2/demo/changemode.html    |   58 +
 .../codemirror-5.13.2/demo/closebrackets.html |   52 +
 www/code/codemirror-5.13.2/demo/closetag.html |   41 +
 www/code/codemirror-5.13.2/demo/complete.html |   79 +
 www/code/codemirror-5.13.2/demo/emacs.html    |   75 +
 www/code/codemirror-5.13.2/demo/folding.html  |   95 +
 .../codemirror-5.13.2/demo/fullscreen.html    |   83 +
 www/code/codemirror-5.13.2/demo/hardwrap.html |   75 +
 .../codemirror-5.13.2/demo/html5complete.html |   56 +
 .../codemirror-5.13.2/demo/indentwrap.html    |   59 +
 www/code/codemirror-5.13.2/demo/lint.html     |  171 +
 www/code/codemirror-5.13.2/demo/loadmode.html |   72 +
 www/code/codemirror-5.13.2/demo/marker.html   |   52 +
 .../codemirror-5.13.2/demo/markselection.html |   52 +
 .../demo/matchhighlighter.html                |  103 +
 .../codemirror-5.13.2/demo/matchtags.html     |   48 +
 www/code/codemirror-5.13.2/demo/merge.html    |  122 +
 .../codemirror-5.13.2/demo/multiplex.html     |   75 +
 www/code/codemirror-5.13.2/demo/mustache.html |   69 +
 www/code/codemirror-5.13.2/demo/panel.html    |  136 +
 .../codemirror-5.13.2/demo/placeholder.html   |   45 +
 www/code/codemirror-5.13.2/demo/preview.html  |   87 +
 .../codemirror-5.13.2/demo/requirejs.html     |   70 +
 www/code/codemirror-5.13.2/demo/resize.html   |   51 +
 www/code/codemirror-5.13.2/demo/rulers.html   |   49 +
 www/code/codemirror-5.13.2/demo/runmode.html  |   62 +
 www/code/codemirror-5.13.2/demo/search.html   |   99 +
 .../codemirror-5.13.2/demo/simplemode.html    |  186 +
 .../demo/simplescrollbars.html                |   82 +
 .../demo/spanaffectswrapping_shim.html        |   85 +
 www/code/codemirror-5.13.2/demo/sublime.html  |   77 +
 www/code/codemirror-5.13.2/demo/tern.html     |  133 +
 www/code/codemirror-5.13.2/demo/theme.html    |  162 +
 .../codemirror-5.13.2/demo/trailingspace.html |   48 +
 .../demo/variableheight.html                  |   67 +
 www/code/codemirror-5.13.2/demo/vim.html      |  112 +
 .../codemirror-5.13.2/demo/visibletabs.html   |   62 +
 www/code/codemirror-5.13.2/demo/widget.html   |   85 +
 .../codemirror-5.13.2/demo/xmlcomplete.html   |  119 +
 .../codemirror-5.13.2/doc/activebookmark.js   |   57 +
 www/code/codemirror-5.13.2/doc/compress.html  |  346 ++
 www/code/codemirror-5.13.2/doc/docs.css       |  271 +
 www/code/codemirror-5.13.2/doc/internals.html |  504 ++
 www/code/codemirror-5.13.2/doc/logo.png       |  Bin 0 -> 9310 bytes
 www/code/codemirror-5.13.2/doc/logo.svg       |  181 +
 www/code/codemirror-5.13.2/doc/manual.html    | 3382 +++++++++++
 www/code/codemirror-5.13.2/doc/realworld.html |  179 +
 www/code/codemirror-5.13.2/doc/releases.html  | 1238 ++++
 www/code/codemirror-5.13.2/doc/reporting.html |   61 +
 .../codemirror-5.13.2/doc/upgrade_v2.2.html   |   96 +
 .../codemirror-5.13.2/doc/upgrade_v3.html     |  230 +
 .../codemirror-5.13.2/doc/upgrade_v4.html     |  144 +
 www/code/codemirror-5.13.2/doc/yinyang.png    |  Bin 0 -> 4633 bytes
 www/code/codemirror-5.13.2/index.html         |  199 +
 www/code/codemirror-5.13.2/keymap/emacs.js    |  412 ++
 www/code/codemirror-5.13.2/keymap/sublime.js  |  569 ++
 www/code/codemirror-5.13.2/keymap/vim.js      | 5066 +++++++++++++++++
 .../lib}/codemirror.css                       |    6 +-
 .../{ => codemirror-5.13.2/lib}/codemirror.js |  370 +-
 .../{ => codemirror-5.13.2}/mode/apl/apl.js   |    0
 .../mode/apl/index.html                       |    0
 .../mode/asciiarmor/asciiarmor.js             |    0
 .../mode/asciiarmor/index.html                |    0
 .../mode/asn.1/asn.1.js                       |    0
 .../mode/asn.1/index.html                     |    3 +-
 .../mode/asterisk/asterisk.js                 |    0
 .../mode/asterisk/index.html                  |    0
 .../mode/brainfuck/brainfuck.js               |    0
 .../mode/brainfuck/index.html                 |    0
 .../mode/clike/clike.js                       |  302 +-
 .../mode/clike/index.html                     |  112 +-
 .../mode/clike/scala.html                     |    0
 .../mode/clike/test.js                        |    9 +
 .../mode/clojure/clojure.js                   |   12 +-
 .../mode/clojure/index.html                   |    3 +
 .../mode/cmake/cmake.js                       |    0
 .../mode/cmake/index.html                     |    0
 .../mode/cobol/cobol.js                       |    0
 .../mode/cobol/index.html                     |    0
 .../mode/coffeescript/coffeescript.js         |   11 -
 .../mode/coffeescript/index.html              |    0
 .../mode/commonlisp/commonlisp.js             |    0
 .../mode/commonlisp/index.html                |    0
 .../codemirror-5.13.2/mode/crystal/crystal.js |  391 ++
 .../codemirror-5.13.2/mode/crystal/index.html |  119 +
 .../{ => codemirror-5.13.2}/mode/css/css.js   |   38 +-
 .../{ => codemirror-5.13.2}/mode/css/gss.html |    0
 .../mode/css/gss_test.js                      |    0
 .../mode/css/index.html                       |    0
 .../mode/css/less.html                        |    0
 .../mode/css/less_test.js                     |    4 +-
 .../mode/css/scss.html                        |    0
 .../mode/css/scss_test.js                     |    2 +-
 .../{ => codemirror-5.13.2}/mode/css/test.js  |   10 +-
 .../mode/cypher/cypher.js                     |    6 +-
 .../mode/cypher/index.html                    |    0
 www/code/{ => codemirror-5.13.2}/mode/d/d.js  |    0
 .../{ => codemirror-5.13.2}/mode/d/index.html |    0
 www/code/codemirror-5.13.2/mode/dart/dart.js  |  157 +
 .../mode/dart/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/diff/diff.js |    0
 .../mode/diff/index.html                      |    0
 .../mode/django/django.js                     |   32 +-
 .../mode/django/index.html                    |    0
 .../mode/dockerfile/dockerfile.js             |    0
 .../mode/dockerfile/index.html                |    0
 .../{ => codemirror-5.13.2}/mode/dtd/dtd.js   |    0
 .../mode/dtd/index.html                       |    0
 .../mode/dylan/dylan.js                       |   85 +-
 .../mode/dylan/index.html                     |    0
 www/code/codemirror-5.13.2/mode/dylan/test.js |   88 +
 .../{ => codemirror-5.13.2}/mode/ebnf/ebnf.js |    0
 .../mode/ebnf/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/ecl/ecl.js   |    0
 .../mode/ecl/index.html                       |    0
 .../mode/eiffel/eiffel.js                     |    0
 .../mode/eiffel/index.html                    |    0
 .../{ => codemirror-5.13.2}/mode/elm/elm.js   |    0
 .../mode/elm/index.html                       |    0
 .../mode/erlang/erlang.js                     |    0
 .../mode/erlang/index.html                    |    0
 .../mode/factor/factor.js                     |    0
 .../mode/factor/index.html                    |    0
 www/code/codemirror-5.13.2/mode/fcl/fcl.js    |  173 +
 .../codemirror-5.13.2/mode/fcl/index.html     |  108 +
 .../mode/forth/forth.js                       |    0
 .../mode/forth/index.html                     |    0
 .../mode/fortran/fortran.js                   |    0
 .../mode/fortran/index.html                   |    0
 .../{ => codemirror-5.13.2}/mode/gas/gas.js   |    0
 .../mode/gas/index.html                       |    0
 .../{ => codemirror-5.13.2}/mode/gfm/gfm.js   |    0
 .../mode/gfm/index.html                       |    0
 .../{ => codemirror-5.13.2}/mode/gfm/test.js  |    0
 .../mode/gherkin/gherkin.js                   |    0
 .../mode/gherkin/index.html                   |    0
 .../{ => codemirror-5.13.2}/mode/go/go.js     |    0
 .../mode/go/index.html                        |    0
 .../mode/groovy/groovy.js                     |    0
 .../mode/groovy/index.html                    |    0
 .../{ => codemirror-5.13.2}/mode/haml/haml.js |    6 +-
 .../mode/haml/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/haml/test.js |    0
 .../mode/handlebars/handlebars.js             |   19 +-
 .../mode/handlebars/index.html                |   18 +-
 .../mode/haskell-literate/haskell-literate.js |   43 +
 .../mode/haskell-literate/index.html          |  282 +
 .../mode/haskell/haskell.js                   |    0
 .../mode/haskell/index.html                   |    0
 .../{ => codemirror-5.13.2}/mode/haxe/haxe.js |   17 +-
 .../mode/haxe/index.html                      |    0
 .../mode/htmlembedded/htmlembedded.js         |    0
 .../mode/htmlembedded/index.html              |    0
 .../mode/htmlmixed/htmlmixed.js               |   42 +-
 .../mode/htmlmixed/index.html                 |    0
 .../{ => codemirror-5.13.2}/mode/http/http.js |    0
 .../mode/http/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/idl/idl.js   |    0
 .../mode/idl/index.html                       |    0
 .../{ => codemirror-5.13.2}/mode/index.html   |   11 +-
 .../mode/jade/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/jade/jade.js |    6 +-
 .../mode/javascript/index.html                |    0
 .../mode/javascript/javascript.js             |   76 +-
 .../mode/javascript/json-ld.html              |    0
 .../mode/javascript/test.js                   |   48 +-
 .../mode/javascript/typescript.html           |    0
 .../mode/jinja2/index.html                    |    0
 .../mode/jinja2/jinja2.js                     |    0
 .../codemirror-5.13.2/mode/jsx/index.html     |   89 +
 www/code/codemirror-5.13.2/mode/jsx/jsx.js    |  147 +
 www/code/codemirror-5.13.2/mode/jsx/test.js   |   69 +
 .../mode/julia/index.html                     |    0
 .../codemirror-5.13.2/mode/julia/julia.js     |  392 ++
 .../mode/livescript/index.html                |    0
 .../mode/livescript/livescript.js             |    0
 .../mode/lua/index.html                       |    0
 .../{ => codemirror-5.13.2}/mode/lua/lua.js   |    0
 .../mode/markdown/index.html                  |    0
 .../mode/markdown/markdown.js                 |  207 +-
 .../mode/markdown/test.js                     |  120 +
 .../mode/mathematica/index.html               |    0
 .../mode/mathematica/mathematica.js           |    0
 www/code/{ => codemirror-5.13.2}/mode/meta.js |   21 +-
 .../mode/mirc/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/mirc/mirc.js |    0
 .../mode/mllike/index.html                    |    0
 .../mode/mllike/mllike.js                     |    0
 .../mode/modelica/index.html                  |    0
 .../mode/modelica/modelica.js                 |    0
 .../codemirror-5.13.2/mode/mscgen/index.html  |  151 +
 .../mode/mscgen/mscgen.js                     |    4 +-
 .../mode/mscgen/mscgen_test.js                |    0
 .../mode/mscgen/msgenny_test.js               |    0
 .../mode/mscgen/xu_test.js                    |    0
 .../mode/mumps/index.html                     |    4 +-
 .../mode/mumps/mumps.js                       |    0
 .../mode/nginx/index.html                     |    4 +-
 .../mode/nginx/nginx.js                       |    2 +-
 .../codemirror-5.13.2/mode/nsis/index.html    |   80 +
 www/code/codemirror-5.13.2/mode/nsis/nsis.js  |   95 +
 .../mode/ntriples/index.html                  |    0
 .../mode/ntriples/ntriples.js                 |    0
 .../mode/octave/index.html                    |    0
 .../mode/octave/octave.js                     |    0
 .../mode/oz/index.html                        |    0
 .../{ => codemirror-5.13.2}/mode/oz/oz.js     |    0
 .../mode/pascal/index.html                    |    0
 .../mode/pascal/pascal.js                     |    0
 .../mode/pegjs/index.html                     |    0
 .../mode/pegjs/pegjs.js                       |    0
 .../mode/perl/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/perl/perl.js |    0
 .../mode/php/index.html                       |    0
 .../{ => codemirror-5.13.2}/mode/php/php.js   |    0
 .../{ => codemirror-5.13.2}/mode/php/test.js  |    0
 .../mode/pig/index.html                       |    4 +-
 .../{ => codemirror-5.13.2}/mode/pig/pig.js   |    0
 .../mode/properties/index.html                |    0
 .../mode/properties/properties.js             |    0
 .../mode/protobuf/index.html                  |   64 +
 .../mode/protobuf/protobuf.js                 |   68 +
 .../mode/puppet/index.html                    |    0
 .../mode/puppet/puppet.js                     |    0
 .../mode/python/index.html                    |    0
 .../mode/python/python.js                     |  108 +-
 .../{ => codemirror-5.13.2}/mode/q/index.html |    0
 www/code/{ => codemirror-5.13.2}/mode/q/q.js  |    0
 .../{ => codemirror-5.13.2}/mode/r/index.html |    0
 www/code/{ => codemirror-5.13.2}/mode/r/r.js  |    2 +
 .../mode/rpm/changes/index.html               |    0
 .../mode/rpm/index.html                       |    0
 .../{ => codemirror-5.13.2}/mode/rpm/rpm.js   |   26 +-
 .../mode/rst/index.html                       |    0
 .../{ => codemirror-5.13.2}/mode/rst/rst.js   |    0
 .../mode/ruby/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/ruby/ruby.js |    2 +-
 .../{ => codemirror-5.13.2}/mode/ruby/test.js |    0
 .../mode/rust/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/rust/rust.js |   19 +-
 .../{ => codemirror-5.13.2}/mode/rust/test.js |    1 -
 .../mode/sass/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/sass/sass.js |    0
 .../mode/scheme/index.html                    |    0
 .../mode/scheme/scheme.js                     |    0
 .../mode/shell/index.html                     |    0
 .../mode/shell/shell.js                       |    0
 .../mode/shell/test.js                        |    0
 .../mode/sieve/index.html                     |    0
 .../mode/sieve/sieve.js                       |    0
 .../mode/slim/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/slim/slim.js |    0
 .../{ => codemirror-5.13.2}/mode/slim/test.js |    0
 .../mode/smalltalk/index.html                 |    0
 .../mode/smalltalk/smalltalk.js               |    0
 .../mode/smarty/index.html                    |    0
 .../mode/smarty/smarty.js                     |    0
 .../mode/solr/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/solr/solr.js |    0
 .../mode/soy/index.html                       |    0
 .../{ => codemirror-5.13.2}/mode/soy/soy.js   |    0
 .../mode/sparql/index.html                    |    0
 .../mode/sparql/sparql.js                     |   10 +-
 .../mode/spreadsheet/index.html               |    0
 .../mode/spreadsheet/spreadsheet.js           |    5 +-
 .../mode/sql/index.html                       |    1 +
 .../{ => codemirror-5.13.2}/mode/sql/sql.js   |   16 +-
 .../mode/stex/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/stex/stex.js |    0
 .../{ => codemirror-5.13.2}/mode/stex/test.js |    0
 .../mode/stylus/index.html                    |    0
 .../mode/stylus/stylus.js                     |    0
 .../mode/swift/index.html                     |   20 +-
 .../codemirror-5.13.2/mode/swift/swift.js     |  202 +
 .../mode/tcl/index.html                       |    0
 .../{ => codemirror-5.13.2}/mode/tcl/tcl.js   |   32 +-
 .../mode/textile/index.html                   |    0
 .../mode/textile/test.js                      |    0
 .../mode/textile/textile.js                   |    0
 .../mode/tiddlywiki/index.html                |    0
 .../mode/tiddlywiki/tiddlywiki.css            |    0
 .../mode/tiddlywiki/tiddlywiki.js             |    0
 .../mode/tiki/index.html                      |    0
 .../mode/tiki/tiki.css                        |    2 +-
 .../{ => codemirror-5.13.2}/mode/tiki/tiki.js |    0
 .../mode/toml/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/toml/toml.js |    0
 .../mode/tornado/index.html                   |    0
 .../mode/tornado/tornado.js                   |    0
 .../mode/troff/index.html                     |    0
 .../mode/troff/troff.js                       |    4 +-
 .../mode/ttcn-cfg/index.html                  |    0
 .../mode/ttcn-cfg/ttcn-cfg.js                 |    0
 .../mode/ttcn/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/ttcn/ttcn.js |    0
 .../mode/turtle/index.html                    |    0
 .../mode/turtle/turtle.js                     |    0
 .../mode/twig/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/twig/twig.js |   15 +-
 .../mode/vb/index.html                        |    0
 .../{ => codemirror-5.13.2}/mode/vb/vb.js     |    0
 .../mode/vbscript/index.html                  |    0
 .../mode/vbscript/vbscript.js                 |    0
 .../mode/velocity/index.html                  |    2 +
 .../mode/velocity/velocity.js                 |    2 +-
 .../mode/verilog/index.html                   |    0
 .../mode/verilog/test.js                      |    0
 .../mode/verilog/verilog.js                   |    0
 .../mode/vhdl/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/vhdl/vhdl.js |    0
 .../mode/vue/index.html                       |    0
 .../{ => codemirror-5.13.2}/mode/vue/vue.js   |    0
 .../mode/xml/index.html                       |    6 +-
 .../{ => codemirror-5.13.2}/mode/xml/test.js  |    0
 .../{ => codemirror-5.13.2}/mode/xml/xml.js   |  149 +-
 .../mode/xquery/index.html                    |    0
 .../mode/xquery/test.js                       |    0
 .../mode/xquery/xquery.js                     |    0
 .../mode/yaml-frontmatter/index.html          |  121 +
 .../mode/yaml-frontmatter/yaml-frontmatter.js |   68 +
 .../mode/yaml/index.html                      |    0
 .../{ => codemirror-5.13.2}/mode/yaml/yaml.js |    0
 .../mode/z80/index.html                       |    0
 .../{ => codemirror-5.13.2}/mode/z80/z80.js   |    0
 www/code/codemirror-5.13.2/package.json       |   28 +
 .../codemirror-5.13.2/test/comment_test.js    |  100 +
 www/code/codemirror-5.13.2/test/doc_test.js   |  371 ++
 www/code/codemirror-5.13.2/test/driver.js     |  138 +
 www/code/codemirror-5.13.2/test/emacs_test.js |  147 +
 www/code/codemirror-5.13.2/test/index.html    |  253 +
 www/code/codemirror-5.13.2/test/lint.js       |   11 +
 www/code/codemirror-5.13.2/test/mode_test.css |   23 +
 www/code/codemirror-5.13.2/test/mode_test.js  |  192 +
 www/code/codemirror-5.13.2/test/multi_test.js |  285 +
 .../codemirror-5.13.2/test/phantom_driver.js  |   31 +
 www/code/codemirror-5.13.2/test/run.js        |   31 +
 .../codemirror-5.13.2/test/scroll_test.js     |  115 +
 .../codemirror-5.13.2/test/search_test.js     |   62 +
 .../codemirror-5.13.2/test/sql-hint-test.js   |  189 +
 .../codemirror-5.13.2/test/sublime_test.js    |  303 +
 www/code/codemirror-5.13.2/test/test.js       | 2151 +++++++
 www/code/codemirror-5.13.2/test/vim_test.js   | 4003 +++++++++++++
 www/code/codemirror-5.13.2/theme/3024-day.css |   41 +
 .../codemirror-5.13.2/theme/3024-night.css    |   39 +
 www/code/codemirror-5.13.2/theme/abcdef.css   |   32 +
 .../theme/ambiance-mobile.css                 |    5 +
 www/code/codemirror-5.13.2/theme/ambiance.css |   74 +
 .../codemirror-5.13.2/theme/base16-dark.css   |   38 +
 .../codemirror-5.13.2/theme/base16-light.css  |   38 +
 www/code/codemirror-5.13.2/theme/bespin.css   |   34 +
 .../codemirror-5.13.2/theme/blackboard.css    |   32 +
 www/code/codemirror-5.13.2/theme/cobalt.css   |   25 +
 .../codemirror-5.13.2/theme/colorforth.css    |   33 +
 www/code/codemirror-5.13.2/theme/dracula.css  |   41 +
 www/code/codemirror-5.13.2/theme/eclipse.css  |   23 +
 www/code/codemirror-5.13.2/theme/elegant.css  |   13 +
 .../codemirror-5.13.2/theme/erlang-dark.css   |   34 +
 .../codemirror-5.13.2/theme/hopscotch.css     |   34 +
 www/code/codemirror-5.13.2/theme/icecoder.css |   43 +
 www/code/codemirror-5.13.2/theme/isotope.css  |   34 +
 .../codemirror-5.13.2/theme/lesser-dark.css   |   47 +
 .../codemirror-5.13.2/theme/liquibyte.css     |   95 +
 www/code/codemirror-5.13.2/theme/material.css |   53 +
 www/code/codemirror-5.13.2/theme/mbo.css      |   37 +
 www/code/codemirror-5.13.2/theme/mdn-like.css |   46 +
 www/code/codemirror-5.13.2/theme/midnight.css |   45 +
 www/code/codemirror-5.13.2/theme/monokai.css  |   36 +
 www/code/codemirror-5.13.2/theme/neat.css     |   12 +
 www/code/codemirror-5.13.2/theme/neo.css      |   43 +
 www/code/codemirror-5.13.2/theme/night.css    |   27 +
 .../codemirror-5.13.2/theme/paraiso-dark.css  |   38 +
 .../codemirror-5.13.2/theme/paraiso-light.css |   38 +
 .../theme/pastel-on-dark.css                  |   53 +
 .../codemirror-5.13.2/theme/railscasts.css    |   34 +
 www/code/codemirror-5.13.2/theme/rubyblue.css |   25 +
 www/code/codemirror-5.13.2/theme/seti.css     |   44 +
 .../codemirror-5.13.2/theme/solarized.css     |  163 +
 .../codemirror-5.13.2/theme/the-matrix.css    |   30 +
 .../theme/tomorrow-night-bright.css           |   35 +
 .../theme/tomorrow-night-eighties.css         |   38 +
 www/code/codemirror-5.13.2/theme/ttcn.css     |   64 +
 www/code/codemirror-5.13.2/theme/twilight.css |   32 +
 .../codemirror-5.13.2/theme/vibrant-ink.css   |   34 +
 www/code/codemirror-5.13.2/theme/xq-dark.css  |   53 +
 www/code/codemirror-5.13.2/theme/xq-light.css |   43 +
 www/code/codemirror-5.13.2/theme/yeti.css     |   44 +
 www/code/codemirror-5.13.2/theme/zenburn.css  |   37 +
 www/code/inner.html                           |   38 +-
 www/code/mode/dart/dart.js                    |   50 -
 www/code/mode/julia/julia.js                  |  299 -
 www/code/mode/kotlin/index.html               |   89 -
 www/code/mode/kotlin/kotlin.js                |  284 -
 www/code/mode/mscgen/index.html               |   65 -
 www/code/mode/mscgen/index_msgenny.html       |   44 -
 www/code/mode/mscgen/index_xu.html            |   70 -
 www/code/mode/swift/swift.js                  |  203 -
 www/code/rt_codemirror.js                     |    4 +-
 www/code/toolbar.js                           |   19 +-
 486 files changed, 41341 insertions(+), 1823 deletions(-)
 create mode 100644 www/code/codemirror-5.13.2/.gitattributes
 create mode 100644 www/code/codemirror-5.13.2/.gitignore
 create mode 100644 www/code/codemirror-5.13.2/.npmignore
 create mode 100644 www/code/codemirror-5.13.2/.travis.yml
 create mode 100644 www/code/codemirror-5.13.2/AUTHORS
 create mode 100644 www/code/codemirror-5.13.2/CHANGELOG.md
 create mode 100644 www/code/codemirror-5.13.2/CONTRIBUTING.md
 create mode 100644 www/code/codemirror-5.13.2/LICENSE
 create mode 100644 www/code/codemirror-5.13.2/README.md
 create mode 100644 www/code/codemirror-5.13.2/addon/comment/comment.js
 create mode 100644 www/code/codemirror-5.13.2/addon/comment/continuecomment.js
 create mode 100644 www/code/codemirror-5.13.2/addon/dialog/dialog.css
 create mode 100644 www/code/codemirror-5.13.2/addon/dialog/dialog.js
 create mode 100644 www/code/codemirror-5.13.2/addon/display/autorefresh.js
 create mode 100644 www/code/codemirror-5.13.2/addon/display/fullscreen.css
 create mode 100644 www/code/codemirror-5.13.2/addon/display/fullscreen.js
 create mode 100644 www/code/codemirror-5.13.2/addon/display/panel.js
 create mode 100644 www/code/codemirror-5.13.2/addon/display/placeholder.js
 create mode 100644 www/code/codemirror-5.13.2/addon/display/rulers.js
 create mode 100644 www/code/codemirror-5.13.2/addon/edit/closebrackets.js
 create mode 100644 www/code/codemirror-5.13.2/addon/edit/closetag.js
 create mode 100644 www/code/codemirror-5.13.2/addon/edit/continuelist.js
 create mode 100644 www/code/codemirror-5.13.2/addon/edit/matchbrackets.js
 create mode 100644 www/code/codemirror-5.13.2/addon/edit/matchtags.js
 create mode 100644 www/code/codemirror-5.13.2/addon/edit/trailingspace.js
 create mode 100644 www/code/codemirror-5.13.2/addon/fold/brace-fold.js
 create mode 100644 www/code/codemirror-5.13.2/addon/fold/comment-fold.js
 create mode 100644 www/code/codemirror-5.13.2/addon/fold/foldcode.js
 create mode 100644 www/code/codemirror-5.13.2/addon/fold/foldgutter.css
 create mode 100644 www/code/codemirror-5.13.2/addon/fold/foldgutter.js
 create mode 100644 www/code/codemirror-5.13.2/addon/fold/indent-fold.js
 create mode 100644 www/code/codemirror-5.13.2/addon/fold/markdown-fold.js
 create mode 100644 www/code/codemirror-5.13.2/addon/fold/xml-fold.js
 create mode 100644 www/code/codemirror-5.13.2/addon/hint/anyword-hint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/hint/css-hint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/hint/html-hint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/hint/javascript-hint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/hint/show-hint.css
 create mode 100644 www/code/codemirror-5.13.2/addon/hint/show-hint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/hint/sql-hint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/hint/xml-hint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/lint/coffeescript-lint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/lint/css-lint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/lint/html-lint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/lint/javascript-lint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/lint/json-lint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/lint/lint.css
 create mode 100644 www/code/codemirror-5.13.2/addon/lint/lint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/lint/yaml-lint.js
 create mode 100644 www/code/codemirror-5.13.2/addon/merge/merge.css
 create mode 100644 www/code/codemirror-5.13.2/addon/merge/merge.js
 create mode 100644 www/code/codemirror-5.13.2/addon/mode/loadmode.js
 create mode 100644 www/code/codemirror-5.13.2/addon/mode/multiplex.js
 create mode 100644 www/code/codemirror-5.13.2/addon/mode/multiplex_test.js
 create mode 100644 www/code/codemirror-5.13.2/addon/mode/overlay.js
 create mode 100644 www/code/codemirror-5.13.2/addon/mode/simple.js
 create mode 100644 www/code/codemirror-5.13.2/addon/runmode/colorize.js
 create mode 100644 www/code/codemirror-5.13.2/addon/runmode/runmode-standalone.js
 create mode 100644 www/code/codemirror-5.13.2/addon/runmode/runmode.js
 create mode 100644 www/code/codemirror-5.13.2/addon/runmode/runmode.node.js
 create mode 100644 www/code/codemirror-5.13.2/addon/scroll/annotatescrollbar.js
 create mode 100644 www/code/codemirror-5.13.2/addon/scroll/scrollpastend.js
 create mode 100644 www/code/codemirror-5.13.2/addon/scroll/simplescrollbars.css
 create mode 100644 www/code/codemirror-5.13.2/addon/scroll/simplescrollbars.js
 create mode 100644 www/code/codemirror-5.13.2/addon/search/jump-to-line.js
 create mode 100644 www/code/codemirror-5.13.2/addon/search/match-highlighter.js
 create mode 100644 www/code/codemirror-5.13.2/addon/search/matchesonscrollbar.css
 create mode 100644 www/code/codemirror-5.13.2/addon/search/matchesonscrollbar.js
 create mode 100644 www/code/codemirror-5.13.2/addon/search/search.js
 create mode 100644 www/code/codemirror-5.13.2/addon/search/searchcursor.js
 create mode 100644 www/code/codemirror-5.13.2/addon/selection/active-line.js
 create mode 100644 www/code/codemirror-5.13.2/addon/selection/mark-selection.js
 create mode 100644 www/code/codemirror-5.13.2/addon/selection/selection-pointer.js
 create mode 100644 www/code/codemirror-5.13.2/addon/tern/tern.css
 create mode 100644 www/code/codemirror-5.13.2/addon/tern/tern.js
 create mode 100644 www/code/codemirror-5.13.2/addon/tern/worker.js
 create mode 100644 www/code/codemirror-5.13.2/addon/wrap/hardwrap.js
 create mode 100644 www/code/codemirror-5.13.2/bin/authors.sh
 create mode 100644 www/code/codemirror-5.13.2/bin/compress
 create mode 100644 www/code/codemirror-5.13.2/bin/lint
 create mode 100644 www/code/codemirror-5.13.2/bin/release
 create mode 100644 www/code/codemirror-5.13.2/bin/source-highlight
 create mode 100644 www/code/codemirror-5.13.2/bower.json
 create mode 100644 www/code/codemirror-5.13.2/demo/activeline.html
 create mode 100644 www/code/codemirror-5.13.2/demo/anywordhint.html
 create mode 100644 www/code/codemirror-5.13.2/demo/bidi.html
 create mode 100644 www/code/codemirror-5.13.2/demo/btree.html
 create mode 100644 www/code/codemirror-5.13.2/demo/buffers.html
 create mode 100644 www/code/codemirror-5.13.2/demo/changemode.html
 create mode 100644 www/code/codemirror-5.13.2/demo/closebrackets.html
 create mode 100644 www/code/codemirror-5.13.2/demo/closetag.html
 create mode 100644 www/code/codemirror-5.13.2/demo/complete.html
 create mode 100644 www/code/codemirror-5.13.2/demo/emacs.html
 create mode 100644 www/code/codemirror-5.13.2/demo/folding.html
 create mode 100644 www/code/codemirror-5.13.2/demo/fullscreen.html
 create mode 100644 www/code/codemirror-5.13.2/demo/hardwrap.html
 create mode 100644 www/code/codemirror-5.13.2/demo/html5complete.html
 create mode 100644 www/code/codemirror-5.13.2/demo/indentwrap.html
 create mode 100644 www/code/codemirror-5.13.2/demo/lint.html
 create mode 100644 www/code/codemirror-5.13.2/demo/loadmode.html
 create mode 100644 www/code/codemirror-5.13.2/demo/marker.html
 create mode 100644 www/code/codemirror-5.13.2/demo/markselection.html
 create mode 100644 www/code/codemirror-5.13.2/demo/matchhighlighter.html
 create mode 100644 www/code/codemirror-5.13.2/demo/matchtags.html
 create mode 100644 www/code/codemirror-5.13.2/demo/merge.html
 create mode 100644 www/code/codemirror-5.13.2/demo/multiplex.html
 create mode 100644 www/code/codemirror-5.13.2/demo/mustache.html
 create mode 100644 www/code/codemirror-5.13.2/demo/panel.html
 create mode 100644 www/code/codemirror-5.13.2/demo/placeholder.html
 create mode 100644 www/code/codemirror-5.13.2/demo/preview.html
 create mode 100644 www/code/codemirror-5.13.2/demo/requirejs.html
 create mode 100644 www/code/codemirror-5.13.2/demo/resize.html
 create mode 100644 www/code/codemirror-5.13.2/demo/rulers.html
 create mode 100644 www/code/codemirror-5.13.2/demo/runmode.html
 create mode 100644 www/code/codemirror-5.13.2/demo/search.html
 create mode 100644 www/code/codemirror-5.13.2/demo/simplemode.html
 create mode 100644 www/code/codemirror-5.13.2/demo/simplescrollbars.html
 create mode 100644 www/code/codemirror-5.13.2/demo/spanaffectswrapping_shim.html
 create mode 100644 www/code/codemirror-5.13.2/demo/sublime.html
 create mode 100644 www/code/codemirror-5.13.2/demo/tern.html
 create mode 100644 www/code/codemirror-5.13.2/demo/theme.html
 create mode 100644 www/code/codemirror-5.13.2/demo/trailingspace.html
 create mode 100644 www/code/codemirror-5.13.2/demo/variableheight.html
 create mode 100644 www/code/codemirror-5.13.2/demo/vim.html
 create mode 100644 www/code/codemirror-5.13.2/demo/visibletabs.html
 create mode 100644 www/code/codemirror-5.13.2/demo/widget.html
 create mode 100644 www/code/codemirror-5.13.2/demo/xmlcomplete.html
 create mode 100644 www/code/codemirror-5.13.2/doc/activebookmark.js
 create mode 100644 www/code/codemirror-5.13.2/doc/compress.html
 create mode 100644 www/code/codemirror-5.13.2/doc/docs.css
 create mode 100644 www/code/codemirror-5.13.2/doc/internals.html
 create mode 100644 www/code/codemirror-5.13.2/doc/logo.png
 create mode 100644 www/code/codemirror-5.13.2/doc/logo.svg
 create mode 100644 www/code/codemirror-5.13.2/doc/manual.html
 create mode 100644 www/code/codemirror-5.13.2/doc/realworld.html
 create mode 100644 www/code/codemirror-5.13.2/doc/releases.html
 create mode 100644 www/code/codemirror-5.13.2/doc/reporting.html
 create mode 100644 www/code/codemirror-5.13.2/doc/upgrade_v2.2.html
 create mode 100644 www/code/codemirror-5.13.2/doc/upgrade_v3.html
 create mode 100644 www/code/codemirror-5.13.2/doc/upgrade_v4.html
 create mode 100644 www/code/codemirror-5.13.2/doc/yinyang.png
 create mode 100644 www/code/codemirror-5.13.2/index.html
 create mode 100644 www/code/codemirror-5.13.2/keymap/emacs.js
 create mode 100644 www/code/codemirror-5.13.2/keymap/sublime.js
 create mode 100644 www/code/codemirror-5.13.2/keymap/vim.js
 rename www/code/{ => codemirror-5.13.2/lib}/codemirror.css (97%)
 rename www/code/{ => codemirror-5.13.2/lib}/codemirror.js (97%)
 rename www/code/{ => codemirror-5.13.2}/mode/apl/apl.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/apl/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/asciiarmor/asciiarmor.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/asciiarmor/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/asn.1/asn.1.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/asn.1/index.html (98%)
 rename www/code/{ => codemirror-5.13.2}/mode/asterisk/asterisk.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/asterisk/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/brainfuck/brainfuck.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/brainfuck/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/clike/clike.js (70%)
 rename www/code/{ => codemirror-5.13.2}/mode/clike/index.html (65%)
 rename www/code/{ => codemirror-5.13.2}/mode/clike/scala.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/clike/test.js (83%)
 rename www/code/{ => codemirror-5.13.2}/mode/clojure/clojure.js (96%)
 rename www/code/{ => codemirror-5.13.2}/mode/clojure/index.html (97%)
 rename www/code/{ => codemirror-5.13.2}/mode/cmake/cmake.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/cmake/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/cobol/cobol.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/cobol/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/coffeescript/coffeescript.js (97%)
 rename www/code/{ => codemirror-5.13.2}/mode/coffeescript/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/commonlisp/commonlisp.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/commonlisp/index.html (100%)
 create mode 100644 www/code/codemirror-5.13.2/mode/crystal/crystal.js
 create mode 100644 www/code/codemirror-5.13.2/mode/crystal/index.html
 rename www/code/{ => codemirror-5.13.2}/mode/css/css.js (96%)
 rename www/code/{ => codemirror-5.13.2}/mode/css/gss.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/css/gss_test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/css/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/css/less.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/css/less_test.js (91%)
 rename www/code/{ => codemirror-5.13.2}/mode/css/scss.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/css/scss_test.js (97%)
 rename www/code/{ => codemirror-5.13.2}/mode/css/test.js (96%)
 rename www/code/{ => codemirror-5.13.2}/mode/cypher/cypher.js (86%)
 rename www/code/{ => codemirror-5.13.2}/mode/cypher/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/d/d.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/d/index.html (100%)
 create mode 100644 www/code/codemirror-5.13.2/mode/dart/dart.js
 rename www/code/{ => codemirror-5.13.2}/mode/dart/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/diff/diff.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/diff/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/django/django.js (90%)
 rename www/code/{ => codemirror-5.13.2}/mode/django/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/dockerfile/dockerfile.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/dockerfile/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/dtd/dtd.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/dtd/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/dylan/dylan.js (80%)
 rename www/code/{ => codemirror-5.13.2}/mode/dylan/index.html (100%)
 create mode 100644 www/code/codemirror-5.13.2/mode/dylan/test.js
 rename www/code/{ => codemirror-5.13.2}/mode/ebnf/ebnf.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/ebnf/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/ecl/ecl.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/ecl/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/eiffel/eiffel.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/eiffel/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/elm/elm.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/elm/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/erlang/erlang.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/erlang/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/factor/factor.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/factor/index.html (100%)
 create mode 100644 www/code/codemirror-5.13.2/mode/fcl/fcl.js
 create mode 100644 www/code/codemirror-5.13.2/mode/fcl/index.html
 rename www/code/{ => codemirror-5.13.2}/mode/forth/forth.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/forth/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/fortran/fortran.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/fortran/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/gas/gas.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/gas/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/gfm/gfm.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/gfm/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/gfm/test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/gherkin/gherkin.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/gherkin/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/go/go.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/go/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/groovy/groovy.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/groovy/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/haml/haml.js (97%)
 rename www/code/{ => codemirror-5.13.2}/mode/haml/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/haml/test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/handlebars/handlebars.js (67%)
 rename www/code/{ => codemirror-5.13.2}/mode/handlebars/index.html (84%)
 create mode 100644 www/code/codemirror-5.13.2/mode/haskell-literate/haskell-literate.js
 create mode 100644 www/code/codemirror-5.13.2/mode/haskell-literate/index.html
 rename www/code/{ => codemirror-5.13.2}/mode/haskell/haskell.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/haskell/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/haxe/haxe.js (97%)
 rename www/code/{ => codemirror-5.13.2}/mode/haxe/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/htmlembedded/htmlembedded.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/htmlembedded/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/htmlmixed/htmlmixed.js (76%)
 rename www/code/{ => codemirror-5.13.2}/mode/htmlmixed/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/http/http.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/http/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/idl/idl.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/idl/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/index.html (92%)
 rename www/code/{ => codemirror-5.13.2}/mode/jade/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/jade/jade.js (99%)
 rename www/code/{ => codemirror-5.13.2}/mode/javascript/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/javascript/javascript.js (91%)
 rename www/code/{ => codemirror-5.13.2}/mode/javascript/json-ld.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/javascript/test.js (76%)
 rename www/code/{ => codemirror-5.13.2}/mode/javascript/typescript.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/jinja2/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/jinja2/jinja2.js (100%)
 create mode 100644 www/code/codemirror-5.13.2/mode/jsx/index.html
 create mode 100644 www/code/codemirror-5.13.2/mode/jsx/jsx.js
 create mode 100644 www/code/codemirror-5.13.2/mode/jsx/test.js
 rename www/code/{ => codemirror-5.13.2}/mode/julia/index.html (100%)
 create mode 100644 www/code/codemirror-5.13.2/mode/julia/julia.js
 rename www/code/{ => codemirror-5.13.2}/mode/livescript/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/livescript/livescript.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/lua/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/lua/lua.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/markdown/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/markdown/markdown.js (83%)
 rename www/code/{ => codemirror-5.13.2}/mode/markdown/test.js (83%)
 rename www/code/{ => codemirror-5.13.2}/mode/mathematica/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/mathematica/mathematica.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/meta.js (92%)
 rename www/code/{ => codemirror-5.13.2}/mode/mirc/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/mirc/mirc.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/mllike/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/mllike/mllike.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/modelica/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/modelica/modelica.js (100%)
 create mode 100644 www/code/codemirror-5.13.2/mode/mscgen/index.html
 rename www/code/{ => codemirror-5.13.2}/mode/mscgen/mscgen.js (98%)
 rename www/code/{ => codemirror-5.13.2}/mode/mscgen/mscgen_test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/mscgen/msgenny_test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/mscgen/xu_test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/mumps/index.html (98%)
 rename www/code/{ => codemirror-5.13.2}/mode/mumps/mumps.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/nginx/index.html (99%)
 rename www/code/{ => codemirror-5.13.2}/mode/nginx/nginx.js (99%)
 create mode 100644 www/code/codemirror-5.13.2/mode/nsis/index.html
 create mode 100644 www/code/codemirror-5.13.2/mode/nsis/nsis.js
 rename www/code/{ => codemirror-5.13.2}/mode/ntriples/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/ntriples/ntriples.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/octave/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/octave/octave.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/oz/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/oz/oz.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/pascal/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/pascal/pascal.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/pegjs/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/pegjs/pegjs.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/perl/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/perl/perl.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/php/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/php/php.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/php/test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/pig/index.html (98%)
 rename www/code/{ => codemirror-5.13.2}/mode/pig/pig.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/properties/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/properties/properties.js (100%)
 create mode 100644 www/code/codemirror-5.13.2/mode/protobuf/index.html
 create mode 100644 www/code/codemirror-5.13.2/mode/protobuf/protobuf.js
 rename www/code/{ => codemirror-5.13.2}/mode/puppet/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/puppet/puppet.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/python/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/python/python.js (78%)
 rename www/code/{ => codemirror-5.13.2}/mode/q/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/q/q.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/r/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/r/r.js (99%)
 rename www/code/{ => codemirror-5.13.2}/mode/rpm/changes/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/rpm/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/rpm/rpm.js (80%)
 rename www/code/{ => codemirror-5.13.2}/mode/rst/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/rst/rst.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/ruby/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/ruby/ruby.js (99%)
 rename www/code/{ => codemirror-5.13.2}/mode/ruby/test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/rust/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/rust/rust.js (82%)
 rename www/code/{ => codemirror-5.13.2}/mode/rust/test.js (96%)
 rename www/code/{ => codemirror-5.13.2}/mode/sass/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/sass/sass.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/scheme/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/scheme/scheme.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/shell/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/shell/shell.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/shell/test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/sieve/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/sieve/sieve.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/slim/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/slim/slim.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/slim/test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/smalltalk/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/smalltalk/smalltalk.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/smarty/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/smarty/smarty.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/solr/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/solr/solr.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/soy/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/soy/soy.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/sparql/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/sparql/sparql.js (96%)
 rename www/code/{ => codemirror-5.13.2}/mode/spreadsheet/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/spreadsheet/spreadsheet.js (97%)
 rename www/code/{ => codemirror-5.13.2}/mode/sql/index.html (97%)
 rename www/code/{ => codemirror-5.13.2}/mode/sql/sql.js (78%)
 rename www/code/{ => codemirror-5.13.2}/mode/stex/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/stex/stex.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/stex/test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/stylus/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/stylus/stylus.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/swift/index.html (99%)
 create mode 100644 www/code/codemirror-5.13.2/mode/swift/swift.js
 rename www/code/{ => codemirror-5.13.2}/mode/tcl/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/tcl/tcl.js (88%)
 rename www/code/{ => codemirror-5.13.2}/mode/textile/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/textile/test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/textile/textile.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/tiddlywiki/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/tiddlywiki/tiddlywiki.css (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/tiddlywiki/tiddlywiki.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/tiki/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/tiki/tiki.css (91%)
 rename www/code/{ => codemirror-5.13.2}/mode/tiki/tiki.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/toml/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/toml/toml.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/tornado/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/tornado/tornado.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/troff/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/troff/troff.js (93%)
 rename www/code/{ => codemirror-5.13.2}/mode/ttcn-cfg/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/ttcn-cfg/ttcn-cfg.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/ttcn/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/ttcn/ttcn.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/turtle/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/turtle/turtle.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/twig/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/twig/twig.js (87%)
 rename www/code/{ => codemirror-5.13.2}/mode/vb/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/vb/vb.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/vbscript/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/vbscript/vbscript.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/velocity/index.html (98%)
 rename www/code/{ => codemirror-5.13.2}/mode/velocity/velocity.js (99%)
 rename www/code/{ => codemirror-5.13.2}/mode/verilog/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/verilog/test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/verilog/verilog.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/vhdl/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/vhdl/vhdl.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/vue/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/vue/vue.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/xml/index.html (86%)
 rename www/code/{ => codemirror-5.13.2}/mode/xml/test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/xml/xml.js (70%)
 rename www/code/{ => codemirror-5.13.2}/mode/xquery/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/xquery/test.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/xquery/xquery.js (100%)
 create mode 100644 www/code/codemirror-5.13.2/mode/yaml-frontmatter/index.html
 create mode 100644 www/code/codemirror-5.13.2/mode/yaml-frontmatter/yaml-frontmatter.js
 rename www/code/{ => codemirror-5.13.2}/mode/yaml/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/yaml/yaml.js (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/z80/index.html (100%)
 rename www/code/{ => codemirror-5.13.2}/mode/z80/z80.js (100%)
 create mode 100644 www/code/codemirror-5.13.2/package.json
 create mode 100644 www/code/codemirror-5.13.2/test/comment_test.js
 create mode 100644 www/code/codemirror-5.13.2/test/doc_test.js
 create mode 100644 www/code/codemirror-5.13.2/test/driver.js
 create mode 100644 www/code/codemirror-5.13.2/test/emacs_test.js
 create mode 100644 www/code/codemirror-5.13.2/test/index.html
 create mode 100644 www/code/codemirror-5.13.2/test/lint.js
 create mode 100644 www/code/codemirror-5.13.2/test/mode_test.css
 create mode 100644 www/code/codemirror-5.13.2/test/mode_test.js
 create mode 100644 www/code/codemirror-5.13.2/test/multi_test.js
 create mode 100644 www/code/codemirror-5.13.2/test/phantom_driver.js
 create mode 100644 www/code/codemirror-5.13.2/test/run.js
 create mode 100644 www/code/codemirror-5.13.2/test/scroll_test.js
 create mode 100644 www/code/codemirror-5.13.2/test/search_test.js
 create mode 100644 www/code/codemirror-5.13.2/test/sql-hint-test.js
 create mode 100644 www/code/codemirror-5.13.2/test/sublime_test.js
 create mode 100644 www/code/codemirror-5.13.2/test/test.js
 create mode 100644 www/code/codemirror-5.13.2/test/vim_test.js
 create mode 100644 www/code/codemirror-5.13.2/theme/3024-day.css
 create mode 100644 www/code/codemirror-5.13.2/theme/3024-night.css
 create mode 100644 www/code/codemirror-5.13.2/theme/abcdef.css
 create mode 100644 www/code/codemirror-5.13.2/theme/ambiance-mobile.css
 create mode 100644 www/code/codemirror-5.13.2/theme/ambiance.css
 create mode 100644 www/code/codemirror-5.13.2/theme/base16-dark.css
 create mode 100644 www/code/codemirror-5.13.2/theme/base16-light.css
 create mode 100644 www/code/codemirror-5.13.2/theme/bespin.css
 create mode 100644 www/code/codemirror-5.13.2/theme/blackboard.css
 create mode 100644 www/code/codemirror-5.13.2/theme/cobalt.css
 create mode 100644 www/code/codemirror-5.13.2/theme/colorforth.css
 create mode 100644 www/code/codemirror-5.13.2/theme/dracula.css
 create mode 100644 www/code/codemirror-5.13.2/theme/eclipse.css
 create mode 100644 www/code/codemirror-5.13.2/theme/elegant.css
 create mode 100644 www/code/codemirror-5.13.2/theme/erlang-dark.css
 create mode 100644 www/code/codemirror-5.13.2/theme/hopscotch.css
 create mode 100644 www/code/codemirror-5.13.2/theme/icecoder.css
 create mode 100644 www/code/codemirror-5.13.2/theme/isotope.css
 create mode 100644 www/code/codemirror-5.13.2/theme/lesser-dark.css
 create mode 100644 www/code/codemirror-5.13.2/theme/liquibyte.css
 create mode 100644 www/code/codemirror-5.13.2/theme/material.css
 create mode 100644 www/code/codemirror-5.13.2/theme/mbo.css
 create mode 100644 www/code/codemirror-5.13.2/theme/mdn-like.css
 create mode 100644 www/code/codemirror-5.13.2/theme/midnight.css
 create mode 100644 www/code/codemirror-5.13.2/theme/monokai.css
 create mode 100644 www/code/codemirror-5.13.2/theme/neat.css
 create mode 100644 www/code/codemirror-5.13.2/theme/neo.css
 create mode 100644 www/code/codemirror-5.13.2/theme/night.css
 create mode 100644 www/code/codemirror-5.13.2/theme/paraiso-dark.css
 create mode 100644 www/code/codemirror-5.13.2/theme/paraiso-light.css
 create mode 100644 www/code/codemirror-5.13.2/theme/pastel-on-dark.css
 create mode 100644 www/code/codemirror-5.13.2/theme/railscasts.css
 create mode 100644 www/code/codemirror-5.13.2/theme/rubyblue.css
 create mode 100644 www/code/codemirror-5.13.2/theme/seti.css
 create mode 100644 www/code/codemirror-5.13.2/theme/solarized.css
 create mode 100644 www/code/codemirror-5.13.2/theme/the-matrix.css
 create mode 100644 www/code/codemirror-5.13.2/theme/tomorrow-night-bright.css
 create mode 100644 www/code/codemirror-5.13.2/theme/tomorrow-night-eighties.css
 create mode 100644 www/code/codemirror-5.13.2/theme/ttcn.css
 create mode 100644 www/code/codemirror-5.13.2/theme/twilight.css
 create mode 100644 www/code/codemirror-5.13.2/theme/vibrant-ink.css
 create mode 100644 www/code/codemirror-5.13.2/theme/xq-dark.css
 create mode 100644 www/code/codemirror-5.13.2/theme/xq-light.css
 create mode 100644 www/code/codemirror-5.13.2/theme/yeti.css
 create mode 100644 www/code/codemirror-5.13.2/theme/zenburn.css
 delete mode 100644 www/code/mode/dart/dart.js
 delete mode 100644 www/code/mode/julia/julia.js
 delete mode 100644 www/code/mode/kotlin/index.html
 delete mode 100644 www/code/mode/kotlin/kotlin.js
 delete mode 100644 www/code/mode/mscgen/index.html
 delete mode 100644 www/code/mode/mscgen/index_msgenny.html
 delete mode 100644 www/code/mode/mscgen/index_xu.html
 delete mode 100644 www/code/mode/swift/swift.js

diff --git a/www/code/codemirror-5.13.2/.gitattributes b/www/code/codemirror-5.13.2/.gitattributes
new file mode 100644
index 000000000..f8bdd60f4
--- /dev/null
+++ b/www/code/codemirror-5.13.2/.gitattributes
@@ -0,0 +1,8 @@
+*.txt   text
+*.js    text
+*.html  text
+*.md    text
+*.json  text
+*.yml   text
+*.css   text
+*.svg   text
diff --git a/www/code/codemirror-5.13.2/.gitignore b/www/code/codemirror-5.13.2/.gitignore
new file mode 100644
index 000000000..f91c241f2
--- /dev/null
+++ b/www/code/codemirror-5.13.2/.gitignore
@@ -0,0 +1,8 @@
+/node_modules
+/npm-debug.log
+/test*.html
+.tern-*
+*~
+*.swp
+.idea
+*.iml
diff --git a/www/code/codemirror-5.13.2/.npmignore b/www/code/codemirror-5.13.2/.npmignore
new file mode 100644
index 000000000..5ed053f89
--- /dev/null
+++ b/www/code/codemirror-5.13.2/.npmignore
@@ -0,0 +1,10 @@
+/node_modules
+/demo
+/doc
+/test
+/test*.html
+/index.html
+/mode/*/*test.js
+/mode/*/*.html
+/mode/index.html
+.*
diff --git a/www/code/codemirror-5.13.2/.travis.yml b/www/code/codemirror-5.13.2/.travis.yml
new file mode 100644
index 000000000..52b8b8159
--- /dev/null
+++ b/www/code/codemirror-5.13.2/.travis.yml
@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - stable
+sudo: false
diff --git a/www/code/codemirror-5.13.2/AUTHORS b/www/code/codemirror-5.13.2/AUTHORS
new file mode 100644
index 000000000..03b1ac5b0
--- /dev/null
+++ b/www/code/codemirror-5.13.2/AUTHORS
@@ -0,0 +1,558 @@
+List of CodeMirror contributors. Updated before every release.
+
+4r2r
+Aaron Brooks
+Abdelouahab
+Abe Fettig
+Adam Ahmed
+Adam King
+adanlobato
+Adán Lobato
+Adrian Aichner
+aeroson
+Ahmad Amireh
+Ahmad M. Zawawi
+ahoward
+Akeksandr Motsjonov
+Alberto González Palomo
+Alberto Pose
+Albert Xing
+Alexander Pavlov
+Alexander Schepanovski
+Alexander Shvets
+Alexander Solovyov
+Alexandre Bique
+alexey-k
+Alex Piggott
+Aliaksei Chapyzhenka
+Allen Sarkisyan
+Amin Shali
+Amin Ullah Khan
+amshali@google.com
+Amsul
+amuntean
+Amy
+Ananya Sen
+anaran
+AndersMad
+Anders Nawroth
+Anderson Mesquita
+Anders Wåglund
+Andrea G
+Andreas Reischuck
+Andres Taylor
+Andre von Houck
+Andrey Fedorov
+Andrey Klyuchnikov
+Andrey Lushnikov
+Andy Joslin
+Andy Kimball
+Andy Li
+Angelo
+angelozerr
+angelo.zerr@gmail.com
+Ankit
+Ankit Ahuja
+Ansel Santosa
+Anthony Dugois
+anthonygego
+Anthony Gégo
+Anthony Grimes
+Anton Kovalyov
+AQNOUCH Mohammed
+areos
+Arnab Bose
+as3boyan
+AtomicPages LLC
+Atul Bhouraskar
+Aurelian Oancea
+Barret Rennie
+Basarat Ali Syed
+Bastian Müller
+belhaj
+Bem Jones-Bey
+benbro
+Beni Cherniavsky-Paskin
+Benjamin DeCoste
+Ben Keen
+Ben Mosher
+Bernhard Sirlinger
+Bert Chang
+Billy Moon
+binny
+B Krishna Chaitanya
+Blaine G
+blukat29
+boomyjee
+borawjm
+Brad Metcalf
+Brandon Frohs
+Brandon Wamboldt
+Brett Zamir
+Brian Grinstead
+Brian Sletten
+Bruce Mitchener
+Caitlin Potter
+Calin Barbat
+Chad Jolly
+Chandra Sekhar Pydi
+Charles Skelton
+Cheah Chu Yeow
+Chris Coyier
+Chris Ford
+Chris Granger
+Chris Houseknecht
+Chris Lohfink
+Chris Morgan
+Christian Oyarzun
+Christian Petrov
+Christopher Brown
+Christopher Mitchell
+Christopher Pfohl
+Chunliang Lyu
+ciaranj
+CodeAnimal
+coderaiser
+Cole R Lawrence
+ComFreek
+Curtis Gagliardi
+dagsta
+daines
+Dale Jung
+Dan Bentley
+Dan Heberden
+Daniel, Dao Quang Minh
+Daniele Di Sarli
+Daniel Faust
+Daniel Huigens
+Daniel Kesler
+Daniel KJ
+Daniel Neel
+Daniel Parnell
+Danny Yoo
+darealshinji
+Darius Roberts
+Dave Brondsema
+Dave Myers
+David Barnett
+David Mignot
+David Pathakjee
+David Vázquez
+David Whittington
+deebugger
+Deep Thought
+Devin Abbott
+Devon Carew
+dignifiedquire
+Dimage Sapelkin
+Dmitry Kiselyov
+domagoj412
+Dominator008
+Domizio Demichelis
+Doug Wikle
+Drew Bratcher
+Drew Hintz
+Drew Khoury
+Drini Cami
+Dror BG
+duralog
+eborden
+edsharp
+ekhaled
+Elisée
+Enam Mijbah Noor
+Eric Allam
+Erik Welander
+eustas
+Fabien O'Carroll
+Fabio Zendhi Nagao
+Faiza Alsaied
+Fauntleroy
+fbuchinger
+feizhang365
+Felipe Lalanne
+Felix Raab
+Filip Noetzel
+flack
+ForbesLindesay
+Forbes Lindesay
+Ford_Lawnmower
+Forrest Oliphant
+Frank Wiegand
+Gabriel Gheorghian
+Gabriel Horner
+Gabriel Nahmias
+galambalazs
+Gautam Mehta
+Gavin Douglas
+gekkoe
+geowarin
+Gerard Braad
+Gergely Hegykozi
+Giovanni Calò
+Glebov Boris
+Glenn Jorde
+Glenn Ruehle
+Golevka
+Google Inc.
+Gordon Smith
+Grant Skinner
+greengiant
+Gregory Koberger
+Guillaume Massé
+Guillaume Massé
+guraga
+Gustavo Rodrigues
+Hakan Tunc
+Hans Engel
+Hardest
+Hasan Karahan
+Hector Oswaldo Caballero
+Herculano Campos
+Hiroyuki Makino
+hitsthings
+Hocdoc
+Hugues Malphettes
+Ian Beck
+Ian Dickinson
+Ian Wehrman
+Ian Wetherbee
+Ice White
+ICHIKAWA, Yuji
+idleberg
+ilvalle
+Ingo Richter
+Irakli Gozalishvili
+Ivan Kurnosov
+Ivoah
+Jacob Lee
+Jakob Miland
+Jakub Vrana
+Jakub Vrána
+James Campos
+James Thorne
+Jamie Hill
+Jan Jongboom
+jankeromnes
+Jan Keromnes
+Jan Odvarko
+Jan Schär
+Jan T. Sott
+Jared Forsyth
+Jason
+Jason Barnabe
+Jason Grout
+Jason Johnston
+Jason San Jose
+Jason Siefken
+Jaydeep Solanki
+Jean Boussier
+Jeff Blaisdell
+jeffkenton
+Jeff Pickhardt
+jem (graphite)
+Jeremy Parmenter
+Jim
+JobJob
+jochenberger
+Jochen Berger
+Johan Ask
+John Connor
+John Engler
+John Lees-Miller
+John Snelson
+John Van Der Loo
+Jon Ander Peñalba
+Jonas Döbertin
+Jonathan Malmaud
+jongalloway
+Jon Malmaud
+Jon Sangster
+Joost-Wim Boekesteijn
+Joseph Pecoraro
+Josh Cohen
+Joshua Newman
+Josh Watzman
+jots
+jsoojeon
+ju1ius
+Juan Benavides Romero
+Jucovschi Constantin
+Juho Vuori
+Julien Rebetez
+Justin Andresen
+Justin Hileman
+jwallers@gmail.com
+kaniga
+karevn
+Kayur Patel
+Ken Newman
+ken restivo
+Ken Rockot
+Kevin Earls
+Kevin Sawicki
+Kevin Ushey
+Klaus Silveira
+Koh Zi Han, Cliff
+komakino
+Konstantin Lopuhin
+koops
+ks-ifware
+kubelsmieci
+KwanEsq
+Lanfei
+Lanny
+Laszlo Vidacs
+leaf corcoran
+Leonid Khachaturov
+Leon Sorokin
+Leonya Khachaturov
+Liam Newman
+Libo Cannici
+LloydMilligan
+LM
+lochel
+Lorenzo Stoakes
+Luciano Longo
+Luke Stagner
+lynschinzer
+M1cha
+Madhura Jayaratne
+Maksim Lin
+Maksym Taran
+Malay Majithia
+Manuel Rego Casasnovas
+Marat Dreizin
+Marcel Gerber
+Marco Aurélio
+Marco Munizaga
+Marcus Bointon
+Marek Rudnicki
+Marijn Haverbeke
+Mário Gonçalves
+Mario Pietsch
+Mark Anderson
+Mark Lentczner
+Marko Bonaci
+Markus Bordihn
+Martin Balek
+Martín Gaitán
+Martin Hasoň
+Martin Hunt
+Martin Laine
+Martin Zagora
+Mason Malone
+Mateusz Paprocki
+Mathias Bynens
+mats cronqvist
+Matt Gaide
+Matthew Bauer
+Matthew Beale
+Matthew Rathbone
+Matthias Bussonnier
+Matthias BUSSONNIER
+Matt McDonald
+Matt Pass
+Matt Sacks
+mauricio
+Maximilian Hils
+Maxim Kraev
+Max Kirsch
+Max Schaefer
+Max Xiantu
+mbarkhau
+McBrainy
+melpon
+Metatheos
+Micah Dubinko
+Michael
+Michael Goderbauer
+Michael Grey
+Michael Kaminsky
+Michael Lehenbauer
+Michael Zhou
+Michal Dorner
+Mighty Guava
+Miguel Castillo
+mihailik
+Mike
+Mike Brevoort
+Mike Diaz
+Mike Ivanov
+Mike Kadin
+MinRK
+Miraculix87
+misfo
+mkaminsky11
+mloginov
+Moritz Schwörer
+mps
+ms
+mtaran-google
+Narciso Jaramillo
+Nathan Williams
+ndr
+nerbert
+nextrevision
+ngn
+nguillaumin
+Ng Zhi An
+Nicholas Bollweg
+Nicholas Bollweg (Nick)
+Nick Kreeger
+Nick Small
+Nicolò Ribaudo
+Niels van Groningen
+nightwing
+Nikita Beloglazov
+Nikita Vasilyev
+Nikolay Kostov
+nilp0inter
+Nisarg Jhaveri
+nlwillia
+noragrossman
+Norman Rzepka
+Oreoluwa Onatemowo
+pablo
+pabloferz
+Page
+Panupong Pasupat
+paris
+Paris
+Patil Arpith
+Patrick Stoica
+Patrick Strawderman
+Paul Garvin
+Paul Ivanov
+Pavel
+Pavel Feldman
+Pavel Strashkin
+Paweł Bartkiewicz
+peteguhl
+peter
+Peter Flynn
+peterkroon
+Peter Kroon
+Philipp A
+Philip Stadermann
+Pierre Gerold
+Piët Delport
+prasanthj
+Prasanth J
+Prayag Verma
+Radek Piórkowski
+Rahul
+Rahul Anand
+ramwin1
+Randall Mason
+Randy Burden
+Randy Edmunds
+Rasmus Erik Voel Jensen
+ray ratchup
+Ray Ratchup
+Richard Denton
+Richard van der Meer
+Richard Z.H. Wang
+Robert Crossfield
+Roberto Abdelkader Martínez Pérez
+robertop23
+Robert Plummer
+Rrandom
+Ruslan Osmanov
+Ryan Prior
+sabaca
+Samuel Ainsworth
+sandeepshetty
+Sander AKA Redsandro
+santec
+Sascha Peilicke
+satamas
+satchmorun
+sathyamoorthi
+S. Chris Colbert
+SCLINIC\jdecker
+Scott Aikin
+Scott Goodhew
+Sebastian Zaha
+Sergey Goder
+Se-Won Kim
+shaund
+shaun gilchrist
+Shawn A
+Shea Bunge
+sheopory
+Shiv Deepak
+Shmuel Englard
+Shubham Jain
+silverwind
+sinkuu
+snasa
+soliton4
+sonson
+spastorelli
+srajanpaliwal
+Stanislav Oaserele
+Stas Kobzar
+Stefan Borsje
+Steffen Beyer
+Steffen Bruchmann
+Stephen Lavelle
+Steve Champagne
+Steve O'Hara
+stoskov
+Stu Kennedy
+Sungho Kim
+sverweij
+Taha Jahangir
+Tako Schotanus
+Takuji Shimokawa
+Tarmil
+TDaglis
+tel
+tfjgeorge
+Thaddee Tyl
+thanasis
+TheHowl
+think
+Thomas Dvornik
+Thomas Schmid
+Tim Alby
+Tim Baumann
+Timothy Farrell
+Timothy Hatcher
+TobiasBg
+Tomas-A
+Tomas Varaneckas
+Tom Erik Støwer
+Tom MacWright
+Tony Jian
+Travis Heppe
+Triangle717
+Tristan Tarrant
+TSUYUSATO Kitsune
+twifkak
+Vestimir Markov
+vf
+Victor Bocharsky
+Vincent Woo
+Volker Mische
+wenli
+Wes Cossick
+Wesley Wiser
+Will Binns-Smith
+Will Dean
+William Jamieson
+William Stein
+Willy
+Wojtek Ptak
+Wu Cheng-Han
+Xavier Mendez
+Yassin N. Hassan
+YNH Webdev
+Yunchi Luo
+Yuvi Panda
+Zac Anger
+Zachary Dremann
+Zhang Hao
+zziuni
+魏鹏刚
diff --git a/www/code/codemirror-5.13.2/CHANGELOG.md b/www/code/codemirror-5.13.2/CHANGELOG.md
new file mode 100644
index 000000000..b0a6ab57f
--- /dev/null
+++ b/www/code/codemirror-5.13.2/CHANGELOG.md
@@ -0,0 +1,718 @@
+## 5.13.2 (2016-03-23)
+
+### Bugfixes
+
+Solves a problem where the gutter would sometimes not extend all the way to the end of the document.
+
+## 5.13.0 (2016-03-21)
+
+### New features
+
+New DOM event forwarded: [`"dragleave"`](http://codemirror.net/doc/manual.html#event_dom).
+
+[protobuf mode](http://codemirror.net/mode/protobuf/index.html): Newly added.
+
+### Bugfixes
+
+Fix problem where [`findMarks`](http://codemirror.net/doc/manual.html#findMarks) sometimes failed to find multi-line marks.
+
+Fix crash that showed up when atomic ranges and bidi text were combined.
+
+[show-hint addon](http://codemirror.net/demo/complete.html): Completion widgets no longer close when the line indented or dedented.
+
+[merge addon](http://codemirror.net/demo/merge.html): Fix bug when merging chunks at the end of the file.
+
+[placeholder addon](http://codemirror.net/doc/manual.html#addon_placeholder): No longer gets confused by [`swapDoc`](http://codemirror.net/doc/manual.html#swapDoc).
+
+[simplescrollbars addon](http://codemirror.net/doc/manual.html#addon_simplescrollbars): Fix invalid state when deleting at end of document.
+
+[clike mode](http://codemirror.net/mode/clike/index.html): No longer gets confused when a comment starts after an operator.
+
+[markdown mode](http://codemirror.net/mode/markdown/index.html): Now supports CommonMark-style flexible list indentation.
+
+[dylan mode](http://codemirror.net/mode/dylan/index.html): Several improvements and fixes.
+
+## 5.12.0 (2016-02-19)
+
+### New features
+
+[Vim bindings](http://codemirror.net/demo/vim.html): Ctrl-Q is now an alias for Ctrl-V.
+
+[Vim bindings](http://codemirror.net/demo/vim.html): The Vim API now exposes an `unmap` method to unmap bindings.
+
+[active-line addon](http://codemirror.net/demo/activeline.html): This addon can now style the active line's gutter.
+
+[FCL mode](http://codemirror.net/mode/fcl/): Newly added.
+
+[SQL mode](http://codemirror.net/mode/sql/): Now has a Postgresql dialect.
+
+### Bugfixes
+
+Fix [issue](https://github.com/codemirror/CodeMirror/issues/3781) where trying to scroll to a horizontal position outside of the document's width could cause the gutter to be positioned incorrectly.
+
+Use absolute, rather than fixed positioning in the context-menu intercept hack, to work around a [problem](https://github.com/codemirror/CodeMirror/issues/3238) when the editor is inside a transformed parent container.
+
+Solve a [problem](https://github.com/codemirror/CodeMirror/issues/3821) where the horizontal scrollbar could hide text in Firefox.
+
+Fix a [bug](https://github.com/codemirror/CodeMirror/issues/3834) that caused phantom scroll space under the text in some situations.
+
+[Sublime Text bindings](http://codemirror.net/demo/sublime.html): Bind delete-line to Shift-Ctrl-K on OS X.
+
+[Markdown mode](http://codemirror.net/mode/markdown/): Fix [issue](https://github.com/codemirror/CodeMirror/issues/3787) where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.
+
+[Markdown mode](http://codemirror.net/mode/markdown/): Ignore backslashes in code fragments.
+
+[Markdown mode](http://codemirror.net/mode/markdown/): Use whichever mode is registered as `text/html` to parse HTML.
+
+[Clike mode](http://codemirror.net/mode/clike/): Improve indentation of Scala `=>` functions.
+
+[Python mode](http://codemirror.net/mode/python/): Improve indentation of bracketed code.
+
+[HTMLMixed mode](http://codemirror.net/mode/htmlmixed/): Support multi-line opening tags for sub-languages (`
+
+
+
+
+
+

+
Active Line Demo

+

+
+    
+
+    
Styling the current cursor line.

+
+  

diff --git a/www/code/codemirror-5.13.2/demo/anywordhint.html b/www/code/codemirror-5.13.2/demo/anywordhint.html
new file mode 100644
index 000000000..0a7caece2
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/anywordhint.html
@@ -0,0 +1,79 @@
+
+
+CodeMirror: Any Word Completion Demo
+
+
+
+
+
+
+
+
+
+
+
+

+
Any Word Completion Demo

+

+
+
Press ctrl-space to activate autocompletion. The
+completion uses
+the anyword-hint.js
+module, which simply looks at nearby words in the buffer and completes
+to those.

+
+    
+  

diff --git a/www/code/codemirror-5.13.2/demo/bidi.html b/www/code/codemirror-5.13.2/demo/bidi.html
new file mode 100644
index 000000000..6dd73bec3
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/bidi.html
@@ -0,0 +1,74 @@
+
+
+CodeMirror: Bi-directional Text Demo
+
+
+
+
+
+
+
+
+
+

+
Bi-directional Text Demo

+

+
+    
+
+  
Demonstration of bi-directional text support. See
+  the related
+  blog post for more background.

+
+  
Note: There is
+  a known
+  bug with cursor motion and mouse clicks in bi-directional lines
+  that are line wrapped.

+
+

diff --git a/www/code/codemirror-5.13.2/demo/btree.html b/www/code/codemirror-5.13.2/demo/btree.html
new file mode 100644
index 000000000..ba07bc74f
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/btree.html
@@ -0,0 +1,83 @@
+
+
+CodeMirror: B-Tree visualization
+
+
+
+
+
+
+
+
+

+
B-Tree visualization

+

+      

+
+    
+
+

+
+  

diff --git a/www/code/codemirror-5.13.2/demo/buffers.html b/www/code/codemirror-5.13.2/demo/buffers.html
new file mode 100644
index 000000000..16ffc7dfe
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/buffers.html
@@ -0,0 +1,109 @@
+
+
+CodeMirror: Multiple Buffer & Split View Demo
+
+
+
+
+
+
+
+
+
+
+

+
Multiple Buffer & Split View Demo

+
+
+    

+    

+      Select buffer: 
+          
+    

+    

+    

+      Select buffer: 
+          
+    

+
+    
+
+    
Demonstration of
+    using linked documents
+    to provide a split view on a document, and
+    using swapDoc
+    to use a single editor to display multiple documents.

+
+  

diff --git a/www/code/codemirror-5.13.2/demo/changemode.html b/www/code/codemirror-5.13.2/demo/changemode.html
new file mode 100644
index 000000000..9405932ab
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/changemode.html
@@ -0,0 +1,58 @@
+
+
+CodeMirror: Mode-Changing Demo
+
+
+
+
+
+
+
+
+
+
+

+
Mode-Changing Demo

+

+
+
On changes to the content of the above editor, a (crude) script
+tries to auto-detect the language used, and switches the editor to
+either JavaScript or Scheme mode based on that.

+
+
+  

diff --git a/www/code/codemirror-5.13.2/demo/closebrackets.html b/www/code/codemirror-5.13.2/demo/closebrackets.html
new file mode 100644
index 000000000..d702f5269
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/closebrackets.html
@@ -0,0 +1,52 @@
+
+
+CodeMirror: Closebrackets Demo
+
+
+
+
+
+
+
+
+
+
+

+
Closebrackets Demo

+

+
+    
+  

diff --git a/www/code/codemirror-5.13.2/demo/closetag.html b/www/code/codemirror-5.13.2/demo/closetag.html
new file mode 100644
index 000000000..79959d2c4
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/closetag.html
@@ -0,0 +1,41 @@
+
+
+CodeMirror: Close-Tag Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Close-Tag Demo

+

+
+    
+  

diff --git a/www/code/codemirror-5.13.2/demo/complete.html b/www/code/codemirror-5.13.2/demo/complete.html
new file mode 100644
index 000000000..cdf49dbeb
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/complete.html
@@ -0,0 +1,79 @@
+
+
+CodeMirror: Autocomplete Demo
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Autocomplete Demo

+

+
+
Press ctrl-space to activate autocompletion. Built
+on top of the show-hint
+and javascript-hint
+addons.

+
+    
+  

diff --git a/www/code/codemirror-5.13.2/demo/emacs.html b/www/code/codemirror-5.13.2/demo/emacs.html
new file mode 100644
index 000000000..c626b8d40
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/emacs.html
@@ -0,0 +1,75 @@
+
+
+CodeMirror: Emacs bindings demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Emacs bindings demo

+

+
+
The emacs keybindings are enabled by
+including keymap/emacs.js and setting
+the keyMap option to "emacs". Because
+CodeMirror's internal API is quite different from Emacs, they are only
+a loose approximation of actual emacs bindings, though.

+
+
Also note that a lot of browsers disallow certain keys from being
+captured. For example, Chrome blocks both Ctrl-W and Ctrl-N, with the
+result that idiomatic use of Emacs keys will constantly close your tab
+or open a new window.

+
+    
+
+  

diff --git a/www/code/codemirror-5.13.2/demo/folding.html b/www/code/codemirror-5.13.2/demo/folding.html
new file mode 100644
index 000000000..81cbf9894
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/folding.html
@@ -0,0 +1,95 @@
+
+
+
+  CodeMirror: Code Folding Demo
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+
+
+
+

+  
Code Folding Demo

+  

+    
JavaScript:

+    

+    
HTML:

+    

+    
Markdown:

+    

+  

+  
+

+
diff --git a/www/code/codemirror-5.13.2/demo/fullscreen.html b/www/code/codemirror-5.13.2/demo/fullscreen.html
new file mode 100644
index 000000000..1fbdc488e
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/fullscreen.html
@@ -0,0 +1,83 @@
+
+
+CodeMirror: Full Screen Editing
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Full Screen Editing

+

+  
+
+    
Demonstration of
+    the fullscreen
+    addon. Press F11 when cursor is in the editor to
+    toggle full screen editing. Esc can also be used
+    to exit full screen editing.

+  

diff --git a/www/code/codemirror-5.13.2/demo/hardwrap.html b/www/code/codemirror-5.13.2/demo/hardwrap.html
new file mode 100644
index 000000000..84ba0cc0c
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/hardwrap.html
@@ -0,0 +1,75 @@
+
+
+CodeMirror: Hard-wrapping Demo
+
+
+
+
+
+
+
+
+
+
+

+
Hard-wrapping Demo

+

+
+
Demonstration of
+the hardwrap addon.
+The above editor has its change event hooked up to
+the wrapParagraphsInRange method, so that the paragraphs
+are reflown as you are typing.

+
+
+
+

diff --git a/www/code/codemirror-5.13.2/demo/html5complete.html b/www/code/codemirror-5.13.2/demo/html5complete.html
new file mode 100644
index 000000000..411baae3e
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/html5complete.html
@@ -0,0 +1,56 @@
+
+
+
+  CodeMirror: HTML completion demo
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+
+  
+
+  

+    
HTML completion demo

+
+    
Shows the XML completer
+    parameterized with information about the tags in HTML.
+    Press ctrl-space to activate completion.

+
+    

+
+    
+  

+
diff --git a/www/code/codemirror-5.13.2/demo/indentwrap.html b/www/code/codemirror-5.13.2/demo/indentwrap.html
new file mode 100644
index 000000000..3d3d0af6a
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/indentwrap.html
@@ -0,0 +1,59 @@
+
+
+CodeMirror: Indented wrapped line demo
+
+
+
+
+
+
+
+
+
+

+
Indented wrapped line demo

+

+
+    
This page uses a hack on top of the "renderLine"
+    event to make wrapped text line up with the base indentation of
+    the line.

+
+    
+
+  

diff --git a/www/code/codemirror-5.13.2/demo/lint.html b/www/code/codemirror-5.13.2/demo/lint.html
new file mode 100644
index 000000000..96009b4e1
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/lint.html
@@ -0,0 +1,171 @@
+
+
+CodeMirror: Linter Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Linter Demo

+
+
+    

+
+    

+
+    

+
+
+  

diff --git a/www/code/codemirror-5.13.2/demo/loadmode.html b/www/code/codemirror-5.13.2/demo/loadmode.html
new file mode 100644
index 000000000..809cd9022
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/loadmode.html
@@ -0,0 +1,72 @@
+
+
+CodeMirror: Lazy Mode Loading Demo
+
+
+
+
+
+
+
+
+
+
+

+
Lazy Mode Loading Demo

+
Current mode: text/plain

+

+
Filename, mime, or mode name:  

+
+    
+  

diff --git a/www/code/codemirror-5.13.2/demo/marker.html b/www/code/codemirror-5.13.2/demo/marker.html
new file mode 100644
index 000000000..3a8b85000
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/marker.html
@@ -0,0 +1,52 @@
+
+
+CodeMirror: Breakpoint Demo
+
+
+
+
+
+
+
+
+
+

+
Breakpoint Demo

+

+
+
Click the line-number gutter to add or remove 'breakpoints'.

+
+    
+
+  

diff --git a/www/code/codemirror-5.13.2/demo/markselection.html b/www/code/codemirror-5.13.2/demo/markselection.html
new file mode 100644
index 000000000..d4c8a7a0d
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/markselection.html
@@ -0,0 +1,52 @@
+
+
+CodeMirror: Selection Marking Demo
+
+
+
+
+
+
+
+
+
+
+

+
Selection Marking Demo

+

+
+    
+
+    
Simple addon to easily mark (and style) selected text. Docs.

+
+  

diff --git a/www/code/codemirror-5.13.2/demo/matchhighlighter.html b/www/code/codemirror-5.13.2/demo/matchhighlighter.html
new file mode 100644
index 000000000..893d72134
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/matchhighlighter.html
@@ -0,0 +1,103 @@
+
+
+CodeMirror: Match Highlighter Demo
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Match Highlighter Demo

+

+
+    
+
+    
Search and highlight occurences of the selected text.

+
+  

diff --git a/www/code/codemirror-5.13.2/demo/matchtags.html b/www/code/codemirror-5.13.2/demo/matchtags.html
new file mode 100644
index 000000000..175639a39
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/matchtags.html
@@ -0,0 +1,48 @@
+
+
+CodeMirror: Tag Matcher Demo
+
+
+
+
+
+
+
+
+
+
+
+

+
Tag Matcher Demo

+
+
+    

+
+    
+
+    
Put the cursor on or inside a pair of tags to highlight them.
+    Press Ctrl-J to jump to the tag that matches the one under the
+    cursor.

+  

diff --git a/www/code/codemirror-5.13.2/demo/merge.html b/www/code/codemirror-5.13.2/demo/merge.html
new file mode 100644
index 000000000..20783b866
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/merge.html
@@ -0,0 +1,122 @@
+
+
+CodeMirror: merge view demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
merge view demo

+
+
+

+
+
The merge
+addon provides an interface for displaying and merging diffs,
+either two-way
+or three-way.
+The left (or center) pane is editable, and the differences with the
+other pane(s) are optionally shown live as you edit
+it. In the two-way configuration, there are also options to pad changed
+sections to align them, and to collapse unchanged
+stretches of text.

+
+
This addon depends on
+the google-diff-match-patch
+library to compute the diffs.

+
+
+

diff --git a/www/code/codemirror-5.13.2/demo/multiplex.html b/www/code/codemirror-5.13.2/demo/multiplex.html
new file mode 100644
index 000000000..ca8c80aed
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/multiplex.html
@@ -0,0 +1,75 @@
+
+
+CodeMirror: Multiplexing Parser Demo
+
+
+
+
+
+
+
+
+
+
+

+
Multiplexing Parser Demo

+

+
+    
+
+    
Demonstration of a multiplexing mode, which, at certain
+    boundary strings, switches to one or more inner modes. The out
+    (HTML) mode does not get fed the content of the <<
+    >> blocks. See
+    the manual and
+    the source for more
+    information.

+
+    

+      Parsing/Highlighting Tests:
+      normal,
+      verbose.
+    

+
+  

diff --git a/www/code/codemirror-5.13.2/demo/mustache.html b/www/code/codemirror-5.13.2/demo/mustache.html
new file mode 100644
index 000000000..ae4e6a891
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/mustache.html
@@ -0,0 +1,69 @@
+
+
+CodeMirror: Overlay Parser Demo
+
+
+
+
+
+
+
+
+
+
+

+
Overlay Parser Demo

+

+
+    
+
+    
Demonstration of a mode that parses HTML, highlighting
+    the Mustache templating
+    directives inside of it by using the code
+    in overlay.js. View
+    source to see the 15 lines of code needed to accomplish this.

+
+  

diff --git a/www/code/codemirror-5.13.2/demo/panel.html b/www/code/codemirror-5.13.2/demo/panel.html
new file mode 100644
index 000000000..b3b0b7ca6
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/panel.html
@@ -0,0 +1,136 @@
+
+
+CodeMirror: Panel Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
Panel Demo

+
+

+    
+

+
+

+  The panel
+  addon allows you to display panels above or below an editor.
+  

+  Click the links below to add panels at the given position:
+

+
+

+

+  top
+  after-top
+  before-bottom
+  bottom
+

+

+  You can also replace an existing panel:
+

+

+  
+  
+

+
+
+
+

+
+

diff --git a/www/code/codemirror-5.13.2/demo/placeholder.html b/www/code/codemirror-5.13.2/demo/placeholder.html
new file mode 100644
index 000000000..432331a48
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/placeholder.html
@@ -0,0 +1,45 @@
+
+
+CodeMirror: Placeholder demo
+
+
+
+
+
+
+
+
+
+

+
Placeholder demo

+

+
+    
The placeholder
+    plug-in adds an option placeholder that can be set to
+    make text appear in the editor when it is empty and not focused.
+    If the source textarea has a placeholder attribute,
+    it will automatically be inherited.

+
+    
+
+  

diff --git a/www/code/codemirror-5.13.2/demo/preview.html b/www/code/codemirror-5.13.2/demo/preview.html
new file mode 100644
index 000000000..19e1530b8
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/preview.html
@@ -0,0 +1,87 @@
+
+
+CodeMirror: HTML5 preview
+
+
+
+
+
+
+
+
+
+
+
+
+

+
HTML5 preview

+
+    
+    
+    
+  

diff --git a/www/code/codemirror-5.13.2/demo/requirejs.html b/www/code/codemirror-5.13.2/demo/requirejs.html
new file mode 100644
index 000000000..438ef9fbf
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/requirejs.html
@@ -0,0 +1,70 @@
+
+
+
+  CodeMirror: HTML completion demo
+  
+  
+
+  
+  
+  
+  
+
+
+
+  
+
+  

+    
RequireJS module loading demo

+
+    
This demo does the same thing as
+    the HTML5 completion demo, but
+    loads its dependencies
+    with Require.js, rather than
+    explicitly. Press ctrl-space to activate
+    completion.

+
+    

+
+    
+
+    
+  

+
diff --git a/www/code/codemirror-5.13.2/demo/resize.html b/www/code/codemirror-5.13.2/demo/resize.html
new file mode 100644
index 000000000..1c1ef390a
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/resize.html
@@ -0,0 +1,51 @@
+
+
+CodeMirror: Autoresize Demo
+
+
+
+
+
+
+
+
+
+

+
Autoresize Demo

+

+
+
By setting an editor's height style
+to auto and giving
+the viewportMargin
+a value of Infinity, CodeMirror can be made to
+automatically resize to fit its content.

+
+    
+
+  

diff --git a/www/code/codemirror-5.13.2/demo/rulers.html b/www/code/codemirror-5.13.2/demo/rulers.html
new file mode 100644
index 000000000..2ac411158
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/rulers.html
@@ -0,0 +1,49 @@
+
+
+CodeMirror: Ruler Demo
+
+
+
+
+
+
+
+
+
+

+
Ruler Demo

+
+
+
+
Demonstration of
+the rulers addon, which
+displays vertical lines at given column offsets.

+
+

diff --git a/www/code/codemirror-5.13.2/demo/runmode.html b/www/code/codemirror-5.13.2/demo/runmode.html
new file mode 100644
index 000000000..ab8938d8d
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/runmode.html
@@ -0,0 +1,62 @@
+
+
+CodeMirror: Mode Runner Demo
+
+
+
+
+
+
+
+
+
+

+
Mode Runner Demo

+
+
+    

+    
+    

+
+    
+
+    
Running a CodeMirror mode outside of the editor.
+    The CodeMirror.runMode function, defined
+    in addon/runmode/runmode.js takes the following arguments:

+
+    

+      
text (string)

+      
The document to run through the highlighter.

+      
mode (mode spec)

+      
The mode to use (must be loaded as normal).

+      
output (function or DOM node)

+      
If this is a function, it will be called for each token with
+      two arguments, the token's text and the token's style class (may
+      be null for unstyled tokens). If it is a DOM node,
+      the tokens will be converted to span elements as in
+      an editor, and inserted into the node
+      (through innerHTML).

+    

+
+  

diff --git a/www/code/codemirror-5.13.2/demo/search.html b/www/code/codemirror-5.13.2/demo/search.html
new file mode 100644
index 000000000..a5a889719
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/search.html
@@ -0,0 +1,99 @@
+
+
+CodeMirror: Search/Replace Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Search/Replace Demo

+

+
+    
+
+    
Demonstration of primitive search/replace functionality. The
+    keybindings (which can be configured with custom keymaps) are:

+    

+      
Ctrl-F / Cmd-F
Start searching

+      
Ctrl-G / Cmd-G
Find next

+      
Shift-Ctrl-G / Shift-Cmd-G
Find previous

+      
Shift-Ctrl-F / Cmd-Option-F
Replace

+      
Shift-Ctrl-R / Shift-Cmd-Option-F
Replace all

+      
Alt-F
Persistent search (dialog doesn't autoclose,
+      enter to find next, Shift-Enter to find previous)

+      
Alt-G
Jump to line

+    

+    
Searching is enabled by
+    including addon/search/search.js
+    and addon/search/searchcursor.js.
+    Jump to line - including addon/search/jumpToLine.js.

+    
For good-looking input dialogs, you also want to include
+    addon/dialog/dialog.js
+    and addon/dialog/dialog.css.

+  

diff --git a/www/code/codemirror-5.13.2/demo/simplemode.html b/www/code/codemirror-5.13.2/demo/simplemode.html
new file mode 100644
index 000000000..49778ef1e
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/simplemode.html
@@ -0,0 +1,186 @@
+
+
+CodeMirror: Simple Mode Demo
+
+
+
+
+
+
+
+
+
+
+
+

+
Simple Mode Demo

+
+
The mode/simple
+addon allows CodeMirror modes to be specified using a relatively simple
+declarative format. This format is not as powerful as writing code
+directly against the mode
+interface, but is a lot easier to get started with, and
+sufficiently expressive for many simple language modes.

+
+
This interface is still in flux. It is unlikely to be scrapped or
+overhauled completely, so do start writing code against it, but
+details might change as it stabilizes, and you might have to tweak
+your code when upgrading.

+
+
Simple modes (loosely based on
+the Common
+JavaScript Syntax Highlighting Specification, which never took
+off), are state machines, where each state has a number of rules that
+match tokens. A rule describes a type of token that may occur in the
+current state, and possibly a transition to another state caused by
+that token.

+
+
The CodeMirror.defineSimpleMode(name, states) method
+takes a mode name and an object that describes the mode's states. The
+editor below shows an example of such a mode (and is itself
+highlighted by the mode shown in it).

+
+

+
+
Each state is an array of rules. A rule may have the following properties:

+
+

+  
regex: string | RegExp

+  
The regular expression that matches the token. May be a string
+  or a regex object. When a regex, the ignoreCase flag
+  will be taken into account when matching the token. This regex
+  should only capture groups when the token property is
+  an array.

+  
token: string | null

+  
An optional token style. Multiple styles can be specified by
+  separating them with dots or spaces. When the regex for
+  this rule captures groups, it must capture all of the
+  string (since JS provides no way to find out where a group matched),
+  and this property must hold an array of token styles that has one
+  style for each matched group.

+  
sol: boolean

+  
When true, this token will only match at the start of the line.
+  (The ^ regexp marker doesn't work as you'd expect in
+  this context because of limitations in JavaScript's RegExp
+  API.)

+  
next: string

+  
When a next property is present, the mode will
+  transfer to the state named by the property when the token is
+  encountered.

+  
push: string

+  
Like next, but instead replacing the current state
+  by the new state, the current state is kept on a stack, and can be
+  returned to with the pop directive.

+  
pop: bool

+  
When true, and there is another state on the state stack, will
+  cause the mode to pop that state off the stack and transition to
+  it.

+  
mode: {spec, end, persistent}

+  
Can be used to embed another mode inside a mode. When present,
+  must hold an object with a spec property that describes
+  the embedded mode, and an optional end end property
+  that specifies the regexp that will end the extent of the mode. When
+  a persistent property is set (and true), the nested
+  mode's state will be preserved between occurrences of the mode.

+  
indent: bool

+  
When true, this token changes the indentation to be one unit
+  more than the current line's indentation.

+  
dedent: bool

+  
When true, this token will pop one scope off the indentation
+  stack.

+  
dedentIfLineStart: bool

+  
If a token has its dedent property set, it will, by
+  default, cause lines where it appears at the start to be dedented.
+  Set this property to false to prevent that behavior.

+

+
+
The meta property of the states object is special, and
+will not be interpreted as a state. Instead, properties set on it will
+be set on the mode, which is useful for properties
+like lineComment,
+which sets the comment style for a mode. The simple mode addon also
+recognizes a few such properties:

+
+

+  
dontIndentStates: array<string>

+  
An array of states in which the mode's auto-indentation should
+  not take effect. Usually used for multi-line comment and string
+  states.

+

+
+
+
+
+
+

diff --git a/www/code/codemirror-5.13.2/demo/simplescrollbars.html b/www/code/codemirror-5.13.2/demo/simplescrollbars.html
new file mode 100644
index 000000000..9d4093264
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/simplescrollbars.html
@@ -0,0 +1,82 @@
+
+
+CodeMirror: Simple Scrollbar Demo
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Simple Scrollbar Demo

+

+
+
The simplescrollbars addon defines two
+styles of non-native scrollbars: "simple" and "overlay" (click to try), which can be passed to
+the scrollbarStyle option. These implement
+the scrollbar using DOM elements, allowing more control over
+its appearance.

+
+  
+

diff --git a/www/code/codemirror-5.13.2/demo/spanaffectswrapping_shim.html b/www/code/codemirror-5.13.2/demo/spanaffectswrapping_shim.html
new file mode 100644
index 000000000..879d99b60
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/spanaffectswrapping_shim.html
@@ -0,0 +1,85 @@
+
+
+CodeMirror: Automatically derive odd wrapping behavior for your browser
+
+
+
+
+
+

+
Automatically derive odd wrapping behavior for your browser

+
+
+    
This is a hack to automatically derive
+    a spanAffectsWrapping regexp for a browser. See the
+    comments above that variable
+    in lib/codemirror.js
+    for some more details.

+
+    

+    

+
+    
+  

diff --git a/www/code/codemirror-5.13.2/demo/sublime.html b/www/code/codemirror-5.13.2/demo/sublime.html
new file mode 100644
index 000000000..233dd83a4
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/sublime.html
@@ -0,0 +1,77 @@
+
+
+CodeMirror: Sublime Text bindings demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Sublime Text bindings demo

+
+
The sublime keymap defines many Sublime Text-specific
+bindings for CodeMirror. See the code below for an overview.

+
+
Enable the keymap by
+loading keymap/sublime.js
+and setting
+the keyMap
+option to "sublime".

+
+
(A lot of the search functionality is still missing.)
+
+
+
+

diff --git a/www/code/codemirror-5.13.2/demo/tern.html b/www/code/codemirror-5.13.2/demo/tern.html
new file mode 100644
index 000000000..b7b65608e
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/tern.html
@@ -0,0 +1,133 @@
+
+
+CodeMirror: Tern Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Tern Demo

+

+
+
Demonstrates integration of Tern
+and CodeMirror. The following keys are bound:

+
+

+  
Ctrl-Space
Autocomplete

+  
Ctrl-O
Find docs for the expression at the cursor

+  
Ctrl-I
Find type at cursor

+  
Alt-.
Jump to definition (Alt-, to jump back)

+  
Ctrl-Q
Rename variable

+  
Ctrl-.
Select all occurrences of a variable

+

+
+
Documentation is sparse for now. See the top of
+the script for a rough API
+overview.

+
+
+
+  

diff --git a/www/code/codemirror-5.13.2/demo/theme.html b/www/code/codemirror-5.13.2/demo/theme.html
new file mode 100644
index 000000000..300e2625e
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/theme.html
@@ -0,0 +1,162 @@
+
+
+CodeMirror: Theme Demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Theme Demo

+

+
+
Select a theme: 
+

+
+
+  

diff --git a/www/code/codemirror-5.13.2/demo/trailingspace.html b/www/code/codemirror-5.13.2/demo/trailingspace.html
new file mode 100644
index 000000000..1992ba3ff
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/trailingspace.html
@@ -0,0 +1,48 @@
+
+
+CodeMirror: Trailing Whitespace Demo
+
+
+
+
+
+
+
+
+
+

+
Trailing Whitespace Demo

+

+
+    
+
+
Uses
+the trailingspace
+addon to highlight trailing whitespace.

+
+  

diff --git a/www/code/codemirror-5.13.2/demo/variableheight.html b/www/code/codemirror-5.13.2/demo/variableheight.html
new file mode 100644
index 000000000..d49942864
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/variableheight.html
@@ -0,0 +1,67 @@
+
+
+CodeMirror: Variable Height Demo
+
+
+
+
+
+
+
+
+
+
+

+
Variable Height Demo

+

+    
+  

diff --git a/www/code/codemirror-5.13.2/demo/vim.html b/www/code/codemirror-5.13.2/demo/vim.html
new file mode 100644
index 000000000..f27b8b8e2
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/vim.html
@@ -0,0 +1,112 @@
+
+
+CodeMirror: Vim bindings demo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
Vim bindings demo

+
+
Note: The CodeMirror vim bindings do not have an
+active maintainer. That means that if you report bugs in it, they are
+likely to go unanswered. It also means that if you want to help, you
+are very welcome to look
+at the
+open issues and see which ones you can solve.

+
+

+
Key buffer: 

+
+
The vim keybindings are enabled by including keymap/vim.js and setting the
+keyMap option to vim.

+
+
Features

+
+
    
+  
  • All common motions and operators, including text objects
    • 
+  
  • Operator motion orthogonality
    • 
+  
  • Visual mode - characterwise, linewise, blockwise
    • 
+  
  • Full macro support (q, @)
    • 
+  
  • Incremental highlighted search (/, ?, #, *, g#, g*)
    • 
+  
  • Search/replace with confirm (:substitute, :%s)
    • 
+  
  • Search history
    • 
+  
  • Jump lists (Ctrl-o, Ctrl-i)
    • 
+  
  • Key/command mapping with API (:map, :nmap, :vmap)
    • 
+  
  • Sort (:sort)
    • 
+  
  • Marks (`, ')
    • 
+  
  • :global
    • 
+  
  • Insert mode behaves identical to base CodeMirror
    • 
+  
  • Cross-buffer yank/paste
    • 
+

+
+
For the full list of key mappings and Ex commands, refer to the
+defaultKeymap and defaultExCommandMap at the
+top of keymap/vim.js.
+
+
Note that while the vim mode tries to emulate the most useful
+features of vim as faithfully as possible, it does not strive to
+become a complete vim implementation

+
+    
+
+  

diff --git a/www/code/codemirror-5.13.2/demo/visibletabs.html b/www/code/codemirror-5.13.2/demo/visibletabs.html
new file mode 100644
index 000000000..2eec337ed
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/visibletabs.html
@@ -0,0 +1,62 @@
+
+
+CodeMirror: Visible tabs demo
+
+
+
+
+
+
+
+
+
+

+
Visible tabs demo

+

+
+
Tabs inside the editor are spans with the
+class cm-tab, and can be styled.

+
+    
+
+  

diff --git a/www/code/codemirror-5.13.2/demo/widget.html b/www/code/codemirror-5.13.2/demo/widget.html
new file mode 100644
index 000000000..da39a9297
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/widget.html
@@ -0,0 +1,85 @@
+
+
+CodeMirror: Inline Widget Demo
+
+
+
+
+
+
+
+
+
+
+

+
Inline Widget Demo

+
+
+    

+    
+
This demo runs JSHint over the code
+in the editor (which is the script used on this page), and
+inserts line widgets to
+display the warnings that JSHint comes up with.

+  

diff --git a/www/code/codemirror-5.13.2/demo/xmlcomplete.html b/www/code/codemirror-5.13.2/demo/xmlcomplete.html
new file mode 100644
index 000000000..043f0c429
--- /dev/null
+++ b/www/code/codemirror-5.13.2/demo/xmlcomplete.html
@@ -0,0 +1,119 @@
+
+
+CodeMirror: XML Autocomplete Demo
+
+
+
+
+
+
+
+
+
+
+
+
+

+
XML Autocomplete Demo

+

+
+    
Press ctrl-space, or type a '<' character to
+    activate autocompletion. This demo defines a simple schema that
+    guides completion. The schema can be customized—see
+    the manual.

+
+    
Development of the xml-hint addon was kindly
+    sponsored
+    by www.xperiment.mobi.

+
+    
+  

diff --git a/www/code/codemirror-5.13.2/doc/activebookmark.js b/www/code/codemirror-5.13.2/doc/activebookmark.js
new file mode 100644
index 000000000..407282d02
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/activebookmark.js
@@ -0,0 +1,57 @@
+// Kludge in HTML5 tag recognition in IE8
+document.createElement("section");
+document.createElement("article");
+
+(function() {
+  if (!window.addEventListener) return;
+  var pending = false, prevVal = null;
+
+  function updateSoon() {
+    if (!pending) {
+      pending = true;
+      setTimeout(update, 250);
+    }
+  }
+
+  function update() {
+    pending = false;
+    var marks = document.getElementById("nav").getElementsByTagName("a"), found;
+    for (var i = 0; i < marks.length; ++i) {
+      var mark = marks[i], m;
+      if (mark.getAttribute("data-default")) {
+        if (found == null) found = i;
+      } else if (m = mark.href.match(/#(.*)/)) {
+        var ref = document.getElementById(m[1]);
+        if (ref && ref.getBoundingClientRect().top < 50)
+          found = i;
+      }
+    }
+    if (found != null && found != prevVal) {
+      prevVal = found;
+      var lis = document.getElementById("nav").getElementsByTagName("li");
+      for (var i = 0; i < lis.length; ++i) lis[i].className = "";
+      for (var i = 0; i < marks.length; ++i) {
+        if (found == i) {
+          marks[i].className = "active";
+          for (var n = marks[i]; n; n = n.parentNode)
+            if (n.nodeName == "LI") n.className = "active";
+        } else {
+          marks[i].className = "";
+        }
+      }
+    }
+  }
+
+  window.addEventListener("scroll", updateSoon);
+  window.addEventListener("load", updateSoon);
+  window.addEventListener("hashchange", function() {
+    setTimeout(function() {
+      var hash = document.location.hash, found = null, m;
+      var marks = document.getElementById("nav").getElementsByTagName("a");
+      for (var i = 0; i < marks.length; i++)
+        if ((m = marks[i].href.match(/(#.*)/)) && m[1] == hash) { found = i; break; }
+      if (found != null) for (var i = 0; i < marks.length; i++)
+        marks[i].className = i == found ? "active" : "";
+    }, 300);
+  });
+})();
diff --git a/www/code/codemirror-5.13.2/doc/compress.html b/www/code/codemirror-5.13.2/doc/compress.html
new file mode 100644
index 000000000..47d689429
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/compress.html
@@ -0,0 +1,346 @@
+
+
+CodeMirror: Compression Helper
+
+
+
+
+
+
+
+
+

+
+
Script compression helper

+
+    
To optimize loading CodeMirror, especially when including a
+    bunch of different modes, it is recommended that you combine and
+    minify (and preferably also gzip) the scripts. This page makes
+    those first two steps very easy. Simply select the version and
+    scripts you need in the form below, and
+    click Compress to download the minified script
+    file.

+
+    

+      
+      
Version: 

+
+      
+
+      

+         with UglifyJS
+      

+      
+      
Custom code to add to the compressed file:

+    

+
+    
+
+

diff --git a/www/code/codemirror-5.13.2/doc/docs.css b/www/code/codemirror-5.13.2/doc/docs.css
new file mode 100644
index 000000000..881d2aa45
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/docs.css
@@ -0,0 +1,271 @@
+@font-face {
+  font-family: 'Source Sans Pro';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(//themes.googleusercontent.com/static/fonts/sourcesanspro/v5/ODelI1aHBYDBqgeIAH2zlBM0YzuT7MdOe03otPbuUS0.woff) format('woff');
+}
+
+body, html { margin: 0; padding: 0; height: 100%; }
+section, article { display: block; padding: 0; }
+
+body {
+  background: #f8f8f8;
+  font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+}
+
+p { margin-top: 0; }
+
+h2, h3, h1 {
+  font-weight: normal;
+  margin-bottom: .7em;
+}
+h1 { font-size: 140%; }
+h2 { font-size: 120%; }
+h3 { font-size: 110%; }
+article > h2:first-child, section:first-child > h2 { margin-top: 0; }
+
+#nav h1 {
+  margin-right: 12px;
+  margin-top: 0;
+  margin-bottom: 2px;
+  color: #d30707;
+  letter-spacing: .5px;
+}
+
+a, a:visited, a:link, .quasilink {
+  color: #A21313;
+  text-decoration: none;
+}
+
+em {
+  padding-right: 2px;
+}
+
+.quasilink {
+  cursor: pointer;
+}
+
+article {
+  max-width: 700px;
+  margin: 0 0 0 160px;
+  border-left: 2px solid #E30808;
+  border-right: 1px solid #ddd;
+  padding: 30px 50px 100px 50px;
+  background: white;
+  z-index: 2;
+  position: relative;
+  min-height: 100%;
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+}
+
+#nav {
+  position: fixed;
+  padding-top: 30px;
+  max-height: 100%;
+  box-sizing: -moz-border-box;
+  box-sizing: border-box;
+  overflow-y: auto;
+  left: 0; right: none;
+  width: 160px;
+  text-align: right;
+  z-index: 1;
+}
+
+@media screen and (min-width: 1000px) {
+  article {
+    margin: 0 auto;
+  }
+  #nav {
+    right: 50%;
+    width: auto;
+    border-right: 349px solid transparent;
+  }
+}
+
+#nav ul {
+  display: block;
+  margin: 0; padding: 0;
+  margin-bottom: 32px;
+}
+
+#nav li {
+  display: block;
+  margin-bottom: 4px;
+}
+
+#nav li ul {
+  font-size: 80%;
+  margin-bottom: 0;
+  display: none;
+}
+
+#nav li.active ul {
+  display: block;
+}
+
+#nav li li a {
+  padding-right: 20px;
+  display: inline-block;
+}
+
+#nav ul a {
+  color: black;
+  padding: 0 7px 1px 11px;
+}
+
+#nav ul a.active, #nav ul a:hover {
+  border-bottom: 1px solid #E30808;
+  margin-bottom: -1px;
+  color: #E30808;
+}
+
+#logo {
+  border: 0;
+  margin-right: 12px;
+  margin-bottom: 25px;
+}
+
+section {
+  border-top: 1px solid #E30808;
+  margin: 1.5em 0;
+}
+
+section.first {
+  border: none;
+  margin-top: 0;
+}
+
+#demo {
+  position: relative;
+}
+
+#demolist {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  z-index: 25;
+}
+
+.yinyang {
+  position: absolute;
+  top: -10px;
+  left: 0; right: 0;
+  margin: auto;
+  display: block;
+  height: 120px;
+}
+
+.actions {
+  margin: 1em 0 0;
+  min-height: 100px;
+  position: relative;
+}
+
+.actionspicture {
+  pointer-events: none;
+  position: absolute;
+  height: 100px;
+  top: 0; left: 0; right: 0;
+}
+
+.actionlink {
+  pointer-events: auto;
+  font-family: arial;
+  font-size: 80%;
+  font-weight: bold;
+  position: absolute;
+  top: 0; bottom: 0;
+  line-height: 1;
+  height: 1em;
+  margin: auto;
+}
+
+.actionlink.download {
+  color: white;
+  right: 50%;
+  margin-right: 13px;
+  text-shadow: -1px 1px 3px #b00, -1px -1px 3px #b00, 1px 0px 3px #b00;
+}
+
+.actionlink.fund {
+  color: #b00;
+  left: 50%;
+  margin-left: 15px;
+}
+
+.actionlink:hover {
+  text-decoration: underline;
+}
+
+.actionlink a {
+  color: inherit;
+}
+
+.actionsleft {
+  float: left;
+}
+
+.actionsright {
+  float: right;
+  text-align: right;
+}
+
+@media screen and (max-width: 800px) {
+  .actions {
+    padding-top: 120px;
+  }
+  .actionsleft, .actionsright {
+    float: none;
+    text-align: left;
+    margin-bottom: 1em;
+  }
+}
+
+th {
+  text-decoration: underline;
+  font-weight: normal;
+  text-align: left;
+}
+
+#features ul {
+  list-style: none;
+  margin: 0 0 1em;
+  padding: 0 0 0 1.2em;
+}
+
+#features li:before {
+  content: "-";
+  width: 1em;
+  display: inline-block;
+  padding: 0;
+  margin: 0;
+  margin-left: -1em;
+}
+
+.rel {
+  margin-bottom: 0;
+}
+.rel-note {
+  margin-top: 0;
+  color: #555;
+}
+
+pre {
+  padding-left: 15px;
+  border-left: 2px solid #ddd;
+}
+
+code {
+  padding: 0 2px;
+}
+
+strong {
+  text-decoration: underline;
+  font-weight: normal;
+}
+
+.field {
+  border: 1px solid #A21313;
+}
diff --git a/www/code/codemirror-5.13.2/doc/internals.html b/www/code/codemirror-5.13.2/doc/internals.html
new file mode 100644
index 000000000..079466f63
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/internals.html
@@ -0,0 +1,504 @@
+
+
+CodeMirror: Internals
+
+
+
+
+
+
+
+

+
+
(Re-) Implementing A Syntax-Highlighting Editor in JavaScript

+
+

+  Topic: JavaScript, code editor implementation

+  Author: Marijn Haverbeke

+  Date: March 2nd 2011 (updated November 13th 2011)
+

+
+
Caution: this text was written briefly after
+version 2 was initially written. It no longer (even including the
+update at the bottom) fully represents the current implementation. I'm
+leaving it here as a historic document. For more up-to-date
+information, look at the entries
+tagged cm-internals
+on my blog.

+
+
This is a followup to
+my Brutal Odyssey to the
+Dark Side of the DOM Tree story. That one describes the
+mind-bending process of implementing (what would become) CodeMirror 1.
+This one describes the internals of CodeMirror 2, a complete rewrite
+and rethink of the old code base. I wanted to give this piece another
+Hunter Thompson copycat subtitle, but somehow that would be out of
+place—the process this time around was one of straightforward
+engineering, requiring no serious mind-bending whatsoever.

+
+
So, what is wrong with CodeMirror 1? I'd estimate, by mailing list
+activity and general search-engine presence, that it has been
+integrated into about a thousand systems by now. The most prominent
+one, since a few weeks,
+being Google
+code's project hosting. It works, and it's being used widely.

+
+
Still, I did not start replacing it because I was bored. CodeMirror
+1 was heavily reliant on designMode
+or contentEditable (depending on the browser). Neither of
+these are well specified (HTML5 tries
+to specify
+their basics), and, more importantly, they tend to be one of the more
+obscure and buggy areas of browser functionality—CodeMirror, by using
+this functionality in a non-typical way, was constantly running up
+against browser bugs. WebKit wouldn't show an empty line at the end of
+the document, and in some releases would suddenly get unbearably slow.
+Firefox would show the cursor in the wrong place. Internet Explorer
+would insist on linkifying everything that looked like a URL or email
+address, a behaviour that can't be turned off. Some bugs I managed to
+work around (which was often a frustrating, painful process), others,
+such as the Firefox cursor placement, I gave up on, and had to tell
+user after user that they were known problems, but not something I
+could help.

+
+
Also, there is the fact that designMode (which seemed
+to be less buggy than contentEditable in Webkit and
+Firefox, and was thus used by CodeMirror 1 in those browsers) requires
+a frame. Frames are another tricky area. It takes some effort to
+prevent getting tripped up by domain restrictions, they don't
+initialize synchronously, behave strangely in response to the back
+button, and, on several browsers, can't be moved around the DOM
+without having them re-initialize. They did provide a very nice way to
+namespace the library, though—CodeMirror 1 could freely pollute the
+namespace inside the frame.

+
+
Finally, working with an editable document means working with
+selection in arbitrary DOM structures. Internet Explorer (8 and
+before) has an utterly different (and awkward) selection API than all
+of the other browsers, and even among the different implementations of
+document.selection, details about how exactly a selection
+is represented vary quite a bit. Add to that the fact that Opera's
+selection support tended to be very buggy until recently, and you can
+imagine why CodeMirror 1 contains 700 lines of selection-handling
+code.

+
+
And that brings us to the main issue with the CodeMirror 1
+code base: The proportion of browser-bug-workarounds to real
+application code was getting dangerously high. By building on top of a
+few dodgy features, I put the system in a vulnerable position—any
+incompatibility and bugginess in these features, I had to paper over
+with my own code. Not only did I have to do some serious stunt-work to
+get it to work on older browsers (as detailed in the
+previous story), things
+also kept breaking in newly released versions, requiring me to come up
+with new scary hacks in order to keep up. This was starting
+to lose its appeal.

+
+

+  
General Approach

+
+
What CodeMirror 2 does is try to sidestep most of the hairy hacks
+that came up in version 1. I owe a lot to the
+ACE editor for inspiration on how to
+approach this.

+
+
I absolutely did not want to be completely reliant on key events to
+generate my input. Every JavaScript programmer knows that key event
+information is horrible and incomplete. Some people (most awesomely
+Mihai Bazon with Ymacs) have been able
+to build more or less functioning editors by directly reading key
+events, but it takes a lot of work (the kind of never-ending, fragile
+work I described earlier), and will never be able to properly support
+things like multi-keystoke international character
+input. [see below for caveat]

+
+
So what I do is focus a hidden textarea, and let the browser
+believe that the user is typing into that. What we show to the user is
+a DOM structure we built to represent his document. If this is updated
+quickly enough, and shows some kind of believable cursor, it feels
+like a real text-input control.

+
+
Another big win is that this DOM representation does not have to
+span the whole document. Some CodeMirror 1 users insisted that they
+needed to put a 30 thousand line XML document into CodeMirror. Putting
+all that into the DOM takes a while, especially since, for some
+reason, an editable DOM tree is slower than a normal one on most
+browsers. If we have full control over what we show, we must only
+ensure that the visible part of the document has been added, and can
+do the rest only when needed. (Fortunately, the onscroll
+event works almost the same on all browsers, and lends itself well to
+displaying things only as they are scrolled into view.)

+

+

+  
Input

+
+
ACE uses its hidden textarea only as a text input shim, and does
+all cursor movement and things like text deletion itself by directly
+handling key events. CodeMirror's way is to let the browser do its
+thing as much as possible, and not, for example, define its own set of
+key bindings. One way to do this would have been to have the whole
+document inside the hidden textarea, and after each key event update
+the display DOM to reflect what's in that textarea.

+
+
That'd be simple, but it is not realistic. For even medium-sized
+document the editor would be constantly munging huge strings, and get
+terribly slow. What CodeMirror 2 does is put the current selection,
+along with an extra line on the top and on the bottom, into the
+textarea.

+
+
This means that the arrow keys (and their ctrl-variations), home,
+end, etcetera, do not have to be handled specially. We just read the
+cursor position in the textarea, and update our cursor to match it.
+Also, copy and paste work pretty much for free, and people get their
+native key bindings, without any special work on my part. For example,
+I have emacs key bindings configured for Chrome and Firefox. There is
+no way for a script to detect this. [no longer the case]

+
+
Of course, since only a small part of the document sits in the
+textarea, keys like page up and ctrl-end won't do the right thing.
+CodeMirror is catching those events and handling them itself.

+

+

+  
Selection

+
+
Getting and setting the selection range of a textarea in modern
+browsers is trivial—you just use the selectionStart
+and selectionEnd properties. On IE you have to do some
+insane stuff with temporary ranges and compensating for the fact that
+moving the selection by a 'character' will treat \r\n as a single
+character, but even there it is possible to build functions that
+reliably set and get the selection range.

+
+
But consider this typical case: When I'm somewhere in my document,
+press shift, and press the up arrow, something gets selected. Then, if
+I, still holding shift, press the up arrow again, the top of my
+selection is adjusted. The selection remembers where its head
+and its anchor are, and moves the head when we shift-move.
+This is a generally accepted property of selections, and done right by
+every editing component built in the past twenty years.

+
+
But not something that the browser selection APIs expose.

+
+
Great. So when someone creates an 'upside-down' selection, the next
+time CodeMirror has to update the textarea, it'll re-create the
+selection as an 'upside-up' selection, with the anchor at the top, and
+the next cursor motion will behave in an unexpected way—our second
+up-arrow press in the example above will not do anything, since it is
+interpreted in exactly the same way as the first.

+
+
No problem. We'll just, ehm, detect that the selection is
+upside-down (you can tell by the way it was created), and then, when
+an upside-down selection is present, and a cursor-moving key is
+pressed in combination with shift, we quickly collapse the selection
+in the textarea to its start, allow the key to take effect, and then
+combine its new head with its old anchor to get the real
+selection.

+
+
In short, scary hacks could not be avoided entirely in CodeMirror
+2.

+
+
And, the observant reader might ask, how do you even know that a
+key combo is a cursor-moving combo, if you claim you support any
+native key bindings? Well, we don't, but we can learn. The editor
+keeps a set known cursor-movement combos (initialized to the
+predictable defaults), and updates this set when it observes that
+pressing a certain key had (only) the effect of moving the cursor.
+This, of course, doesn't work if the first time the key is used was
+for extending an inverted selection, but it works most of the
+time.

+

+

+  
Intelligent Updating

+
+
One thing that always comes up when you have a complicated internal
+state that's reflected in some user-visible external representation
+(in this case, the displayed code and the textarea's content) is
+keeping the two in sync. The naive way is to just update the display
+every time you change your state, but this is not only error prone
+(you'll forget), it also easily leads to duplicate work on big,
+composite operations. Then you start passing around flags indicating
+whether the display should be updated in an attempt to be efficient
+again and, well, at that point you might as well give up completely.

+
+
I did go down that road, but then switched to a much simpler model:
+simply keep track of all the things that have been changed during an
+action, and then, only at the end, use this information to update the
+user-visible display.

+
+
CodeMirror uses a concept of operations, which start by
+calling a specific set-up function that clears the state and end by
+calling another function that reads this state and does the required
+updating. Most event handlers, and all the user-visible methods that
+change state are wrapped like this. There's a method
+called operation that accepts a function, and returns
+another function that wraps the given function as an operation.

+
+
It's trivial to extend this (as CodeMirror does) to detect nesting,
+and, when an operation is started inside an operation, simply
+increment the nesting count, and only do the updating when this count
+reaches zero again.

+
+
If we have a set of changed ranges and know the currently shown
+range, we can (with some awkward code to deal with the fact that
+changes can add and remove lines, so we're dealing with a changing
+coordinate system) construct a map of the ranges that were left
+intact. We can then compare this map with the part of the document
+that's currently visible (based on scroll offset and editor height) to
+determine whether something needs to be updated.

+
+
CodeMirror uses two update algorithms—a full refresh, where it just
+discards the whole part of the DOM that contains the edited text and
+rebuilds it, and a patch algorithm, where it uses the information
+about changed and intact ranges to update only the out-of-date parts
+of the DOM. When more than 30 percent (which is the current heuristic,
+might change) of the lines need to be updated, the full refresh is
+chosen (since it's faster to do than painstakingly finding and
+updating all the changed lines), in the other case it does the
+patching (so that, if you scroll a line or select another character,
+the whole screen doesn't have to be
+re-rendered). [the full-refresh
+algorithm was dropped, it wasn't really faster than the patching
+one]

+
+
All updating uses innerHTML rather than direct DOM
+manipulation, since that still seems to be by far the fastest way to
+build documents. There's a per-line function that combines the
+highlighting, marking, and
+selection info for that line into a snippet of HTML. The patch updater
+uses this to reset individual lines, the refresh updater builds an
+HTML chunk for the whole visible document at once, and then uses a
+single innerHTML update to do the refresh.

+

+

+  
Parsers can be Simple

+
+
When I wrote CodeMirror 1, I
+thought interruptable
+parsers were a hugely scary and complicated thing, and I used a
+bunch of heavyweight abstractions to keep this supposed complexity
+under control: parsers
+were iterators
+that consumed input from another iterator, and used funny
+closure-resetting tricks to copy and resume themselves.

+
+
This made for a rather nice system, in that parsers formed strictly
+separate modules, and could be composed in predictable ways.
+Unfortunately, it was quite slow (stacking three or four iterators on
+top of each other), and extremely intimidating to people not used to a
+functional programming style.

+
+
With a few small changes, however, we can keep all those
+advantages, but simplify the API and make the whole thing less
+indirect and inefficient. CodeMirror
+2's mode API uses explicit state
+objects, and makes the parser/tokenizer a function that simply takes a
+state and a character stream abstraction, advances the stream one
+token, and returns the way the token should be styled. This state may
+be copied, optionally in a mode-defined way, in order to be able to
+continue a parse at a given point. Even someone who's never touched a
+lambda in his life can understand this approach. Additionally, far
+fewer objects are allocated in the course of parsing now.

+
+
The biggest speedup comes from the fact that the parsing no longer
+has to touch the DOM though. In CodeMirror 1, on an older browser, you
+could see the parser work its way through the document,
+managing some twenty lines in each 50-millisecond time slice it got. It
+was reading its input from the DOM, and updating the DOM as it went
+along, which any experienced JavaScript programmer will immediately
+spot as a recipe for slowness. In CodeMirror 2, the parser usually
+finishes the whole document in a single 100-millisecond time slice—it
+manages some 1500 lines during that time on Chrome. All it has to do
+is munge strings, so there is no real reason for it to be slow
+anymore.

+

+

+  
What Gives?

+
+
Given all this, what can you expect from CodeMirror 2?

+
+
    
+
+
  • Small. the base library is
+some 45k when minified
+now, 17k when gzipped. It's smaller than
+its own logo.
    • 
+
+
  • Lightweight. CodeMirror 2 initializes very
+quickly, and does almost no work when it is not focused. This means
+you can treat it almost like a textarea, have multiple instances on a
+page without trouble.
    • 
+
+
  • Huge document support. Since highlighting is
+really fast, and no DOM structure is being built for non-visible
+content, you don't have to worry about locking up your browser when a
+user enters a megabyte-sized document.
    • 
+
+
  • Extended API. Some things kept coming up in the
+mailing list, such as marking pieces of text or lines, which were
+extremely hard to do with CodeMirror 1. The new version has proper
+support for these built in.
    • 
+
+
  • Tab support. Tabs inside editable documents were,
+for some reason, a no-go. At least six different people announced they
+were going to add tab support to CodeMirror 1, none survived (I mean,
+none delivered a working version). CodeMirror 2 no longer removes tabs
+from your document.
    • 
+
+
  • Sane styling. iframe nodes aren't
+really known for respecting document flow. Now that an editor instance
+is a plain div element, it is much easier to size it to
+fit the surrounding elements. You don't even have to make it scroll if
+you do not want to.
    • 
+
+

+
+
On the downside, a CodeMirror 2 instance is not a native
+editable component. Though it does its best to emulate such a
+component as much as possible, there is functionality that browsers
+just do not allow us to hook into. Doing select-all from the context
+menu, for example, is not currently detected by CodeMirror.

+
+
[Updates from November 13th 2011] Recently, I've made
+some changes to the codebase that cause some of the text above to no
+longer be current. I've left the text intact, but added markers at the
+passages that are now inaccurate. The new situation is described
+below.

+

+

+  
Content Representation

+
+
The original implementation of CodeMirror 2 represented the
+document as a flat array of line objects. This worked well—splicing
+arrays will require the part of the array after the splice to be
+moved, but this is basically just a simple memmove of a
+bunch of pointers, so it is cheap even for huge documents.

+
+
However, I recently added line wrapping and code folding (line
+collapsing, basically). Once lines start taking up a non-constant
+amount of vertical space, looking up a line by vertical position
+(which is needed when someone clicks the document, and to determine
+the visible part of the document during scrolling) can only be done
+with a linear scan through the whole array, summing up line heights as
+you go. Seeing how I've been going out of my way to make big documents
+fast, this is not acceptable.

+
+
The new representation is based on a B-tree. The leaves of the tree
+contain arrays of line objects, with a fixed minimum and maximum size,
+and the non-leaf nodes simply hold arrays of child nodes. Each node
+stores both the amount of lines that live below them and the vertical
+space taken up by these lines. This allows the tree to be indexed both
+by line number and by vertical position, and all access has
+logarithmic complexity in relation to the document size.

+
+
I gave line objects and tree nodes parent pointers, to the node
+above them. When a line has to update its height, it can simply walk
+these pointers to the top of the tree, adding or subtracting the
+difference in height from each node it encounters. The parent pointers
+also make it cheaper (in complexity terms, the difference is probably
+tiny in normal-sized documents) to find the current line number when
+given a line object. In the old approach, the whole document array had
+to be searched. Now, we can just walk up the tree and count the sizes
+of the nodes coming before us at each level.

+
+
I chose B-trees, not regular binary trees, mostly because they
+allow for very fast bulk insertions and deletions. When there is a big
+change to a document, it typically involves adding, deleting, or
+replacing a chunk of subsequent lines. In a regular balanced tree, all
+these inserts or deletes would have to be done separately, which could
+be really expensive. In a B-tree, to insert a chunk, you just walk
+down the tree once to find where it should go, insert them all in one
+shot, and then break up the node if needed. This breaking up might
+involve breaking up nodes further up, but only requires a single pass
+back up the tree. For deletion, I'm somewhat lax in keeping things
+balanced—I just collapse nodes into a leaf when their child count goes
+below a given number. This means that there are some weird editing
+patterns that may result in a seriously unbalanced tree, but even such
+an unbalanced tree will perform well, unless you spend a day making
+strangely repeating edits to a really big document.

+

+

+  
Keymaps

+
+
Above, I claimed that directly catching key
+events for things like cursor movement is impractical because it
+requires some browser-specific kludges. I then proceeded to explain
+some awful hacks that were needed to make it
+possible for the selection changes to be detected through the
+textarea. In fact, the second hack is about as bad as the first.

+
+
On top of that, in the presence of user-configurable tab sizes and
+collapsed and wrapped lines, lining up cursor movement in the textarea
+with what's visible on the screen becomes a nightmare. Thus, I've
+decided to move to a model where the textarea's selection is no longer
+depended on.

+
+
So I moved to a model where all cursor movement is handled by my
+own code. This adds support for a goal column, proper interaction of
+cursor movement with collapsed lines, and makes it possible for
+vertical movement to move through wrapped lines properly, instead of
+just treating them like non-wrapped lines.

+
+
The key event handlers now translate the key event into a string,
+something like Ctrl-Home or Shift-Cmd-R, and
+use that string to look up an action to perform. To make keybinding
+customizable, this lookup goes through
+a table, using a scheme that
+allows such tables to be chained together (for example, the default
+Mac bindings fall through to a table named 'emacsy', which defines
+basic Emacs-style bindings like Ctrl-F, and which is also
+used by the custom Emacs bindings).

+
+
A new
+option extraKeys
+allows ad-hoc keybindings to be defined in a much nicer way than what
+was possible with the
+old onKeyEvent
+callback. You simply provide an object mapping key identifiers to
+functions, instead of painstakingly looking at raw key events.

+
+
Built-in commands map to strings, rather than functions, for
+example "goLineUp" is the default action bound to the up
+arrow key. This allows new keymaps to refer to them without
+duplicating any code. New commands can be defined by assigning to
+the CodeMirror.commands object, which maps such commands
+to functions.

+
+
The hidden textarea now only holds the current selection, with no
+extra characters around it. This has a nice advantage: polling for
+input becomes much, much faster. If there's a big selection, this text
+does not have to be read from the textarea every time—when we poll,
+just noticing that something is still selected is enough to tell us
+that no new text was typed.

+
+
The reason that cheap polling is important is that many browsers do
+not fire useful events on IME (input method engine) input, which is
+the thing where people inputting a language like Japanese or Chinese
+use multiple keystrokes to create a character or sequence of
+characters. Most modern browsers fire input when the
+composing is finished, but many don't fire anything when the character
+is updated during composition. So we poll, whenever the
+editor is focused, to provide immediate updates of the display.

+
+

+

diff --git a/www/code/codemirror-5.13.2/doc/logo.png b/www/code/codemirror-5.13.2/doc/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9aabda1d709f565bb115fa083cc16b6d52db64cf
GIT binary patch
literal 9310
zcmWk!Wl$VV6g=D|1b25!aEIUyhr7GGTL{5|1$PMU!Gb&FaCaxTyW6*4U2W~w{MehF
z_g=s5o{3aZl14)&LC@FTctEwWVDw?~{3&X8ah!PRD9*tQT8757ES=R=O
zZIdr2ugtx4l6@a%-%CqPVF44eaQ%2fx0Jpla6f)NKFVjM^Z_h)hKuzjB4sSI@ekEg
z@U#NrAp>;|c$0x9hg?WZTdZG(0VD4>#GX6z>|wuiM$CS;G$FUC%`Yu#T3S`2xx9Q%
z&L>hk-l%{+T9H<*SA=}sbo%%o@Lho^HR{1J(LU%?j7M6P@vF0Z0pn
zRg3c$bb5L^PunUDMRKYs2Bi84p?^h2s-wqmdrz@zp~k4I#jPdj=S+$6^$1(n#c@vV
zQV@AYWo0F0iuwG?$(^c;iwoWx)a709!-19&TMi)>)^tO&r)EX+#@$=$u6%0kebYPc
zJhdwF-;A+6Nv~cvrd5Mk9vYf~d&?L>K|$|Ad8<9vw25-A3Z(NDgczyq)xxNFX3irt
z5&W3H!9k+!9`(QJE||;POE|miR+~Sm6)TtkQ-cj}VANhC(QrgTL%V&q;;Zro-FDY}
zLEOj{mjZVGgd>u4m
z9zF7e&^@tyDqDe64B@zwmmb{Zn8=9D0EkzmV(u^0Er>Me3Q1W@zsY6$umA0>sVZm?
zf(GAr5tO2~04nkJ@wvUbz0JP5-v~N(8$pml|2M|7;cjEJKc2naVlq*V$ErUVu%xCc
zfs#1n{*MfE1l}<8>Gn8IRz?OtB`Ikq$e{Y8Acr;iHY83OaqB8@B8#tYMp?M1xTHiN
zI7wa+cO)-Jl$p=D%D=t+`FM2=o|c+=mO*=?NKfnSwkBw*RJ8!PBhEop&nIA&$mb;v
z`(VuSI$`*;(y|?=VesS!rUgt{Jdt*)`0hZ?G
z7usFYr+DK=vmmf4*I#j$aOU?KF(7dFFyg^IqOV_XZ;56L^zPYvdwU(1ez>LJ;p|HN
z4VWobRPeX^YQ|=%QMp8X`Hn78u&x4ka1N?5=y}S^Blo>WDpAfA7QE<&X|fPi*P!91
zP1%g!{BoS*|03)2@?Zo#sF~owf;%$sj_3DF)yW$ZALRySHTxJ?p2Ot=fq#BIgX)5|XO;LcR_79G0BHnqmaV{@z-l*0V&*FitQ+$n$GKK~(Sm8!dKL(9qB_GBTi@yf$25rWcs(1P9>X)ru?O`26nlrz=f0
zm@U<-rU~O=l$e1aj>uh@$@ff@7IHbdSS0=;!NwcMhud
z53gSK=5Ft3eehCzt=I&`DimK+)jCpbx;}m$z19HbQtn`d)!hQVW?ChL;
zbyKo%9MIsH(Q>--r@-OVua@MI!wIa-jBE9Yw#B6Hdl@SfkOB%&hU2fK`1pfgB~cEi
z>K7acZUFF41c0jUSTU1(EXAar0TlOu9ixo!E{YZ*$|c}u>+__hBK&*hRIDa8Af}Q;
zWDit2MeZN4SZfyUHj}GWt#8A|6Cu@MLU~bqjhe+}#m%DI(CommzwUQ#@%IP8XxgXH
zkyN(SV_iLNCzH9TWd7jqj-)r0;Kso}!idX{4~*c?b&}V(1|!o(&NG`&2I&`ADZUIJ|pBJ69gpMjxo{`=IqPIR49;HZJ)o;WIDAx4o8-
z1j5nrhNlg>pzELyfsea#kffV~rD%Ax^X=p*GhV+t=9NEE
zwGMXJptrZT*>W|aY^89`irs&YC|M#w!f}@{7kC*bUPqjh!Uwy0bsC~_hGjab`^uy}
ztltpI_08Dvm(#}fwt2E&myYl$E+P(Q!cUqD3UxVZSM03`xg;(xj3F4~&-sfCMd~A{
zKqcWr3+}cf1UzhoH@&vk(EDzNAZT}ZqK%}mY#-Nj(O&AtR+xan;967_CN{F;l|~|8
zbv4eSqnd;^x`NQ7i^pBJQWXuEPbA(AiyNG_JNvs^k2SQ48Kr?Gew5?MKFwqKY(F(DdQVId#=h;KNtK-Z_T*+|&{hTo_Dmm~TmWj5{v?&Y`#Q-Eb
zTz&kT>byP|t@F$QR+V?o4xQ)xp3Ohpq{U`hSM0{j5y}#&wUnJ=k1^XyQfGGV`7zm0
zE56Y;?0&vKmsggnf@JGdGPs5f1=AO!H`mBk5|vl*z}R
z*lpQn=>%|W7C2x6OuNW6mFZ4#aq$jO;SZRY@s{oHf#++f@5Odiy7Y#IuOBOL;sdb5rDr#wo^`On0`NwfaORizU;5S`T|a`{+m2KhV!OF2ne
zn)5u+*B7c3=iXT%Iyyc+&gM;Z1*+9%ehzt68mX~f`BMd1@9^Uoo+;_u?+Wkg3K|X|
zjHx*~QxY;V!iLQ-hH3LW{Wn{t=CjfuRg$i^ESx3gzuNLkZD0E0=BB+uR50L5z2_I@
z0CYH%y42$a@fVdzp$8SB%r$@50Z3+R&bl?>tn~Idgp!Uc6LT~!GE$bg@oDPt9dgA|
z)Zx3K0a~`_w(`&$?;ANGV>IlkAOtPLHeJ=_4)Imh6kAU=Ael_$2x%+q9s8$9adapc
z@ZR;|^71uWa}qB9aq`j%@do6JI#;g5gO~kkLO@fV9hIo_EwQ|kO+AI6P%VPG$x%=-
z@5C!jI64WxmL(<%YY`eDXQg`aZFOF5&|6FJU=Oa3e0$`#p1wY+f@)TXyJT_UFBF@h
zm&fbunEXn@wzIX*%ASx7e`1A#zcI}#*00OAaA}0x8_-MYP#IkIi|jhGU7Z~{*Y~X5
z3Bz%wvHe+$Y!UGLy#h-+zuEcix%UM~Ky`&lIGtqNPV4$8-t%@U8wSgDQ_X&PC>YzX
z3~E{1JN?fOkI56WeWg6J@KEE%i6B9%?8D(U|25<-TDdbvw=dRGJ=x+Pzw*;ZBPnm%Q1e{g)fvam7XWvnY_
z`y0C)y*qsiC%B2!CtHWE!`L|+|AvSX;yDQyy+nYrR3nwpYQ
zJZH@bm2-AR0s{?ADlac$
zkx01)laBkr=%@l^j&DXHo$?;5U6S;#=JU>H{Ll9EfOHzrZG8vU#$Rw({7!P;`l4{N
zG@f%v$3a!h-uc>@$S^BZL8p1fpBpb(buJ}6eJJIeClz0mfySxp)sr;X(9p1*+mZQx
z!-#)MRuy}>As`~X-m2E~m7g@|Z
z=1NnAGf&Ig$rmUc%eOqeCP(*^Mb*c>Os6!yZIt|SaB{C9#pri-&IJgJk7N6HT&Wah
z9k2~ZFz|&pG>2etaRG99GsCkF10?k5H=YgX&BM13?U#Rv!fbO-JOx}*c;EOh@qo|r
z_Ve35Jynb$;s
zfuT&*mrEAvtLK5Y$;_@8VTK)M0G9rk15iwC*`mH_Y
zTr=PfTv5ukYR1Rc+8hNU>Mh4i*R!&&r!1IK@N6nQwpM*`S>B?G6*I9&NzcFo9czwO
z+kaz5b9qwTtS0c5r3$9l*|Ip
zP^-oekWvM_v054$w@z9d+*6_vZd-3KQ%$?{!;VcH9!Kh$%pCUVqFY}MjCIzeeTz#*Hqqwvp81OK
z>w5Tar|?+{)Wdf5+Gqw>w8+~-A3=L)=`d4m%3^!p;98rP6--6QoNvdQA%%n&g@t^#
zv?^zShDMby`x6Kd;J*Q$ddy?Eu)?a{5OH(kUWM&y!3RQx>x5e!j9k36&nKs)rb*V7
z)*tK&p$qH(8g{oIsgfK-Ay%0yB$zKClk&(7fSgmtC+!^t&zphF<=^r
zfXnT$+)%DLg|4o_l^Z!y6#b|*7LCUyC#i}xW~t`$c_3g1#GXpZgxxO^OImgjKMJ^H
zmAZ{lZ2Mzgux)N&UT>c(K)z^Lzdzrdn(h5y<8?n!>49^J`K9qU>96{ik|{+vzF)>Z
z#*Hte5ISXIWgtS3I$dl)FX)PvKo8v8g{Z+1L5QP@lsBZA%r7c6nV2*yjW2)IH2dD#
z<~!6?rt7ymcVe1tTyZeBd7bWLI(1R)b@zOIg1CA1pjg%)K7-GTzPwRW^8`QiMpIqC
z#Vxl==J5M0*HfRZ45$P-az3C>LU-ZX`_S*@jr5ER4i3VcFE`rpkes|L)bIQnjfWEVseduN~aJG0f7S$^cFb@LBvA6KZ`~dpI%eGT+_{$sb$t%P3(UDByT#lH|WYvjN*cf
z0b`D{*oIX|&b=(W1r
zq&JVJ8U?0r+~GQsY#yJAzl%+t2IhB1iR0GGTTlUx9YO?z
zAu95t;&6Z;IzQoVSbIa-C^2`YjU#(fc^`)GL!Jug_2mVhllLc(c$sI7RMN53%*;Q0
zuJ>yF_F1QA8YuB;<+S$H+w=aFE1GqWv-6dM6UO1yLjF9Q1{2P1}rE3j*P*0
zIVlSY36*KpkV=K-?D_U7D!(UUVI52t+2xpS%_x^lHTbBJp5JSeUQ@v)0*N}L4*mHE
zEvFkP&(fq7i+qxxpM3KNhjh`Db;Og2UM;f0zL5Jv{lsod+@U)^CH#%m&R_y8ta|m2
zYQXBXI=osepS;
zW2_+-c5}5$jVv_v1(TM&0^HglgzAQI>w21-jw`3oc#pYtZj@9xB8BCd@u
z@Wngwe$o@ezzdf@fR+wc%iNrL0^KVGv%iv?f?{Ib60{b=6IJ>LDz`T#1kV!caeBDQ
zuq6u5&^upyC6mKy+de=Tj*`R?)
z(kA$|$GF>?bDh)pXFZf_@hSgBP3IFM(Az5wTaX!w1_wuV0ZCD^@G~(H(%;{|8Y@1(
z@61ojEV_}wyvM;4Y+aZ3ZZ}I5NCUCswZf24b4epXE?H@-NM
zHNT2_@l_*jG#{IUTs~6Q58po2Ea+KWNEtwD{`cLk+VPw^ZgDr9mb2nU0$gU_F$oAF
zHTCYOp>Y!<2M2pf0s9NuNtsQvN>3c1!O{9?uBk>E8aep`jd?G0K{BiN&;glP)!{V|1@J_|hJ&i%FZv@t`iu~WCNpYixA@}peMe)$3kJHL
zLK-iHvItWVHJ4D#f}vlPOg;AgtJ_9rK&4(=acTBlb{%{z3n-6`y(^8@E*pv&OCoU~
z3wG6*i0|h#`a#7K$5OdY
zijMc=q<&g*+<5S+cd<776F!~5CbT=Dqu>?e&lnD!
z(G94TE2LprS-{rGMuubO<4ad0;@%55pRTgYx4Dp$|Gzsg{VW=H-K1l*wUSKc0QmqR
z$su4@Ia~KBAR8{35!pSMqUt?t(!pb_<Ww
zfah;*u-#flq}%R!tb6?#V;`Au<>vt&jL&cYeWmW|TKE5+1eMf}L96O5?Bka@Z1-5M
z%sz|(k|&l8L%Z6S@*Yw{bWkRUDO$Cr1DIJ5n>$5UdQq^dlQq%_+?AjMu!Z*UwBlq9
zl*bV7*ek-|+bL)XL9tZwL?~mqanj?w{~O85VyBx`4(h{7=f;Q!d%MLoE?}Y2*Vore
zj>FUsVp|cYPD=ceO{DE~)NR5bvBc#M_PsrtVQj#0N$Ep}VdOIkOC=%guEwUbg?=xJ
zZ)iu?wW>?Yr3as}M7D&hIz>=JdKt;YuXlUl2B2-aoD+WVMgJya)d}{%IdJ>O&VUZp
zu38{fsnhglG_)S*%8!pX6InT`{$|4Vfq$CgNAqLIN-f;nf@I|=qZc!=M4532FAV{$
zN`nVFfH{HE#TnR#sv`E6TM~13zvJVBdXa-Id|maKrVR{MU}&-Px0hmM8!!@SKU+Ch
zrB!C_Abonc+*ZgDMGJVV#GJUM$TtIRpd=dS_-4-2BiKwnDn#b5>v&tpX
z+AB6&%40nwtEH|!`;R#sFZg_0@pIMA0D>}r1)bRUL!VA1!$C@>_lm3!W%A?-AB&Xm)~uFywT%$n#=8W
zSc4QS2PcF5l_!JKZn>6P^~$N%R1aX07$IAdoU(Afnaq1wHX(A^zt&25yg|nd@i)^x
zHj23&m@DH#MXhJimqE_F+fQ3gRl1EpTUt>JyWbs29RXB@d2vaxk3JdbvPG)ov0p>@
zk`;cE=mDNSO0@<4=CjTy4Z4oz(F-DN^pc!X`E6C$*dUqLsZ`46@R`5;c8?&~gLSG(
z?T#bBLq|kGsSkL%r0a#s!`b1i%B;>GGR;tzg{nk(0iy=v1;-Xa{Z`R*o54ryh)BRaz
z5J?M`5b%%LpmMR>W#POLL;o^>KrkEsp9SF0-QH7?$QrD>3h1@?Lt{WyhUvn>
z&K{4J$-V9@)oe9ED%EvUmjvdw%!^3)a`!oNO!Dao@JqYcXOdE5
zP~Xs{v8`s31Z?}sq-tuke#*lT#l*Mx?Y7jopM}}thh+oM+9gUPdjWj!@E|D9)8#OZ
zV9-*$YhO1(Og11yY8g!l`2PNZbCCNgDjdcb#DR~x&4}1;T(JH-F-s*&5(*#gzyQkF
zChYYmC>>VN;NeR5;m7^$ZP7aijQ3U;Ues(tjz~~vo)HYPX+ZQIiu#**o
zL!i(O2=(@h-sqdNnYP8gb-?Gx`(yebn_n#fr(qrCD+?ypH)5%_B1HTNeoDv46gar`
z<-rTyM`(v@2M>-;KvJP50NSBeP3ojN^&u(7R~!!^O_ISI2^slcx)_YlQCSHxm+$cC
zXrbSN@KF#`XZ_8wjuK;H8}<)^djB7KXf{L8ZE{pRp0B#Lpcoq*
z)Ltp}I5x)&b@}|y^%qsCX#>M}LqX{=kKOzUY4)T?Lht&pdF>CDJ~wY(Y?2A+HK$%R
zeOO_bJ)oH*qsh9;i!$et<0~rJc4Zdx)?nd_0vk>F`S~q*o=!`3MLHo+rTAgpdXm)g
z6a}kmYdn(D(kqOcIYiI~B)OzC&F5XjFWsg9IQcOBy-oRgz{&o$WqhRTkk?NFCCr^lDm1lJD@v#Qli~ZnEZ$Xji^p29BteJ3I(;JX2>ye%XjYfT!8qfs
zA%}?qr2)g~1wkjqECv7o

literal 0
HcmV?d00001

diff --git a/www/code/codemirror-5.13.2/doc/logo.svg b/www/code/codemirror-5.13.2/doc/logo.svg
new file mode 100644
index 000000000..0aa6323f9
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/logo.svg
@@ -0,0 +1,181 @@
+
+
+
+image/svg+xml
\ No newline at end of file
diff --git a/www/code/codemirror-5.13.2/doc/manual.html b/www/code/codemirror-5.13.2/doc/manual.html
new file mode 100644
index 000000000..9642a11ad
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/manual.html
@@ -0,0 +1,3382 @@
+
+
+CodeMirror: User Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+

+    

+      User manual and reference guide
+      version 5.13.2
+    

+
+    
CodeMirror is a code-editor component that can be embedded in
+    Web pages. The core library provides only the editor
+    component, no accompanying buttons, auto-completion, or other IDE
+    functionality. It does provide a rich API on top of which such
+    functionality can be straightforwardly implemented. See
+    the addons included in the distribution,
+    and the list
+    of externally hosted addons, for reusable
+    implementations of extra features.

+
+    
CodeMirror works with language-specific modes. Modes are
+    JavaScript programs that help color (and optionally indent) text
+    written in a given language. The distribution comes with a number
+    of modes (see the mode/
+    directory), and it isn't hard to write new
+    ones for other languages.

+

+
+

+    
Basic Usage

+
+    
The easiest way to use CodeMirror is to simply load the script
+    and style sheet found under lib/ in the distribution,
+    plus a mode script from one of the mode/ directories.
+    (See the compression helper for an
+    easy way to combine scripts.) For example:

+
+    
<script src="lib/codemirror.js"></script>
+<link rel="stylesheet" href="lib/codemirror.css">
+<script src="mode/javascript/javascript.js"></script>

+
+    
(Alternatively, use a module loader. More
+    about that later.)

+
+    
Having done this, an editor instance can be created like
+    this:

+
+    
var myCodeMirror = CodeMirror(document.body);

+
+    
The editor will be appended to the document body, will start
+    empty, and will use the mode that we loaded. To have more control
+    over the new editor, a configuration object can be passed
+    to CodeMirror as a second
+    argument:

+
+    
var myCodeMirror = CodeMirror(document.body, {
+  value: "function myScript(){return 100;}\n",
+  mode:  "javascript"
+});

+
+    
This will initialize the editor with a piece of code already in
+    it, and explicitly tell it to use the JavaScript mode (which is
+    useful when multiple modes are loaded).
+    See below for a full discussion of the
+    configuration options that CodeMirror accepts.

+
+    
In cases where you don't want to append the editor to an
+    element, and need more control over the way it is inserted, the
+    first argument to the CodeMirror function can also
+    be a function that, when given a DOM element, inserts it into the
+    document somewhere. This could be used to, for example, replace a
+    textarea with a real editor:

+
+    
var myCodeMirror = CodeMirror(function(elt) {
+  myTextArea.parentNode.replaceChild(elt, myTextArea);
+}, {value: myTextArea.value});

+
+    
However, for this use case, which is a common way to use
+    CodeMirror, the library provides a much more powerful
+    shortcut:

+
+    
var myCodeMirror = CodeMirror.fromTextArea(myTextArea);

+
+    
This will, among other things, ensure that the textarea's value
+    is updated with the editor's contents when the form (if it is part
+    of a form) is submitted. See the API
+    reference for a full description of this method.

+
+    
Module loaders

+
+    
The files in the CodeMirror distribution contain shims for
+    loading them (and their dependencies) in AMD or CommonJS
+    environments. If the variables exports
+    and module exist and have type object, CommonJS-style
+    require will be used. If not, but there is a
+    function define with an amd property
+    present, AMD-style (RequireJS) will be used.

+
+    
It is possible to
+    use Browserify or similar
+    tools to statically build modules using CodeMirror. Alternatively,
+    use RequireJS to dynamically
+    load dependencies at runtime. Both of these approaches have the
+    advantage that they don't use the global namespace and can, thus,
+    do things like load multiple versions of CodeMirror alongside each
+    other.

+
+    
Here's a simple example of using RequireJS to load CodeMirror:

+
+    
require([
+  "cm/lib/codemirror", "cm/mode/htmlmixed/htmlmixed"
+], function(CodeMirror) {
+  CodeMirror.fromTextArea(document.getElementById("code"), {
+    lineNumbers: true,
+    mode: "htmlmixed"
+  });
+});

+
+    
It will automatically load the modes that the mixed HTML mode
+    depends on (XML, JavaScript, and CSS). Do not use
+    RequireJS' paths option to configure the path to
+    CodeMirror, since it will break loading submodules through
+    relative paths. Use
+    the packages
+    configuration option instead, as in:

+
+    
require.config({
+  packages: [{
+    name: "codemirror",
+    location: "../path/to/codemirror",
+    main: "lib/codemirror"
+  }]
+});

+
+

+
+

+    
Configuration

+
+    
Both the CodeMirror
+    function and its fromTextArea method take as second
+    (optional) argument an object containing configuration options.
+    Any option not supplied like this will be taken
+    from CodeMirror.defaults, an
+    object containing the default options. You can update this object
+    to change the defaults on your page.

+
+    
Options are not checked in any way, so setting bogus option
+    values is bound to lead to odd errors.

+
+    
These are the supported options:

+
+    

+      
value: string|CodeMirror.Doc

+      
The starting value of the editor. Can be a string, or
+      a document object.

+
+      
mode: string|object

+      
The mode to use. When not given, this will default to the
+      first mode that was loaded. It may be a string, which either
+      simply names the mode or is
+      a MIME type
+      associated with the mode. Alternatively, it may be an object
+      containing configuration options for the mode, with
+      a name property that names the mode (for
+      example {name: "javascript", json: true}). The demo
+      pages for each mode contain information about what configuration
+      parameters the mode supports. You can ask CodeMirror which modes
+      and MIME types have been defined by inspecting
+      the CodeMirror.modes
+      and CodeMirror.mimeModes objects. The first maps
+      mode names to their constructors, and the second maps MIME types
+      to mode specs.

+
+      
lineSeparator: string|null

+      
Explicitly set the line separator for the editor. By default
+      (value null), the document will be split on CRLFs
+      as well as lone CRs and LFs, and a single LF will be used as
+      line separator in all output (such
+      as getValue). When a
+      specific string is given, lines will only be split on that
+      string, and output will, by default, use that same
+      separator.

+
+      
theme: string

+      
The theme to style the editor with. You must make sure the
+      CSS file defining the corresponding .cm-s-[name]
+      styles is loaded (see
+      the theme directory in the
+      distribution). The default is "default", for which
+      colors are included in codemirror.css. It is
+      possible to use multiple theming classes at once—for
+      example "foo bar" will assign both
+      the cm-s-foo and the cm-s-bar classes
+      to the editor.

+
+      
indentUnit: integer

+      
How many spaces a block (whatever that means in the edited
+      language) should be indented. The default is 2.

+
+      
smartIndent: boolean

+      
Whether to use the context-sensitive indentation that the
+      mode provides (or just indent the same as the line before).
+      Defaults to true.

+
+      
tabSize: integer

+      
The width of a tab character. Defaults to 4.

+
+      
indentWithTabs: boolean

+      
Whether, when indenting, the first N*tabSize
+      spaces should be replaced by N tabs. Default is false.

+
+      
electricChars: boolean

+      
Configures whether the editor should re-indent the current
+      line when a character is typed that might change its proper
+      indentation (only works if the mode supports indentation).
+      Default is true.

+
+      
specialChars: RegExp

+      
A regular expression used to determine which characters
+      should be replaced by a
+      special placeholder.
+      Mostly useful for non-printing special characters. The default
+      is /[\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/.

+      
specialCharPlaceholder: function(char) → Element

+      
A function that, given a special character identified by
+      the specialChars
+      option, produces a DOM node that is used to represent the
+      character. By default, a red dot (•)
+      is shown, with a title tooltip to indicate the character code.

+
+      
rtlMoveVisually: boolean

+      
Determines whether horizontal cursor movement through
+      right-to-left (Arabic, Hebrew) text is visual (pressing the left
+      arrow moves the cursor left) or logical (pressing the left arrow
+      moves to the next lower index in the string, which is visually
+      right in right-to-left text). The default is false
+      on Windows, and true on other platforms.

+
+      
keyMap: string

+      
Configures the key map to use. The default
+      is "default", which is the only key map defined
+      in codemirror.js itself. Extra key maps are found in
+      the key map directory. See
+      the section on key maps for more
+      information.

+
+      
extraKeys: object

+      
Can be used to specify extra key bindings for the editor,
+      alongside the ones defined
+      by keyMap. Should be
+      either null, or a valid key map value.

+
+      
lineWrapping: boolean

+      
Whether CodeMirror should scroll or wrap for long lines.
+      Defaults to false (scroll).

+
+      
lineNumbers: boolean

+      
Whether to show line numbers to the left of the editor.

+
+      
firstLineNumber: integer

+      
At which number to start counting lines. Default is 1.

+
+      
lineNumberFormatter: function(line: integer) → string

+      
A function used to format line numbers. The function is
+      passed the line number, and should return a string that will be
+      shown in the gutter.

+
+      
gutters: array<string>

+      
Can be used to add extra gutters (beyond or instead of the
+      line number gutter). Should be an array of CSS class names, each
+      of which defines a width (and optionally a
+      background), and which will be used to draw the background of
+      the gutters. May include
+      the CodeMirror-linenumbers class, in order to
+      explicitly set the position of the line number gutter (it will
+      default to be to the right of all other gutters). These class
+      names are the keys passed
+      to setGutterMarker.

+
+      
fixedGutter: boolean

+      
Determines whether the gutter scrolls along with the content
+      horizontally (false) or whether it stays fixed during horizontal
+      scrolling (true, the default).

+
+      
scrollbarStyle: string

+      
Chooses a scrollbar implementation. The default
+      is "native", showing native scrollbars. The core
+      library also provides the "null" style, which
+      completely hides the
+      scrollbars. Addons can
+      implement additional scrollbar models.

+
+      
coverGutterNextToScrollbar: boolean

+      
When fixedGutter
+      is on, and there is a horizontal scrollbar, by default the
+      gutter will be visible to the left of this scrollbar. If this
+      option is set to true, it will be covered by an element with
+      class CodeMirror-gutter-filler.

+
+      
inputStyle: string

+      
Selects the way CodeMirror handles input and focus. The core
+      library defines the "textarea"
+      and "contenteditable" input models. On mobile
+      browsers, the default is "contenteditable". On
+      desktop browsers, the default is "textarea".
+      Support for IME and screen readers is better in
+      the "contenteditable" model. The intention is to
+      make it the default on modern desktop browsers in the
+      future.

+
+      
readOnly: boolean|string

+      
This disables editing of the editor content by the user. If
+      the special value "nocursor" is given (instead of
+      simply true), focusing of the editor is also
+      disallowed.

+
+      
showCursorWhenSelecting: boolean

+      
Whether the cursor should be drawn when a selection is
+      active. Defaults to false.

+
+      
lineWiseCopyCut: boolean

+      
When enabled, which is the default, doing copy or cut when
+      there is no selection will copy or cut the whole lines that have
+      cursors on them.

+
+      
undoDepth: integer

+      
The maximum number of undo levels that the editor stores.
+      Note that this includes selection change events. Defaults to
+      200.

+
+      
historyEventDelay: integer

+      
The period of inactivity (in milliseconds) that will cause a
+      new history event to be started when typing or deleting.
+      Defaults to 1250.

+
+      
tabindex: integer

+      
The tab
+      index to assign to the editor. If not given, no tab index
+      will be assigned.

+
+      
autofocus: boolean

+      
Can be used to make CodeMirror focus itself on
+      initialization. Defaults to off.
+      When fromTextArea is
+      used, and no explicit value is given for this option, it will be
+      set to true when either the source textarea is focused, or it
+      has an autofocus attribute and no other element is
+      focused.

+    

+
+    
Below this a few more specialized, low-level options are
+    listed. These are only useful in very specific situations, you
+    might want to skip them the first time you read this manual.

+
+    

+      
dragDrop: boolean

+      
Controls whether drag-and-drop is enabled. On by default.

+
+      
allowDropFileTypes: array<string>

+      
When set (default is null) only files whose
+      type is in the array can be dropped into the editor. The strings
+      should be MIME types, and will be checked against
+      the type
+      of the File object as reported by the browser.

+
+      
cursorBlinkRate: number

+      
Half-period in milliseconds used for cursor blinking. The default blink
+      rate is 530ms. By setting this to zero, blinking can be disabled. A
+      negative value hides the cursor entirely.

+
+      
cursorScrollMargin: number

+      
How much extra space to always keep above and below the
+      cursor when approaching the top or bottom of the visible view in
+      a scrollable document. Default is 0.

+
+      
cursorHeight: number

+      
Determines the height of the cursor. Default is 1, meaning
+      it spans the whole height of the line. For some fonts (and by
+      some tastes) a smaller height (for example 0.85),
+      which causes the cursor to not reach all the way to the bottom
+      of the line, looks better

+
+      
resetSelectionOnContextMenu: boolean

+      
Controls whether, when the context menu is opened with a
+      click outside of the current selection, the cursor is moved to
+      the point of the click. Defaults to true.

+
+      
workTime, workDelay: number

+      
Highlighting is done by a pseudo background-thread that will
+      work for workTime milliseconds, and then use
+      timeout to sleep for workDelay milliseconds. The
+      defaults are 200 and 300, you can change these options to make
+      the highlighting more or less aggressive.

+
+      
pollInterval: number

+      
Indicates how quickly CodeMirror should poll its input
+      textarea for changes (when focused). Most input is captured by
+      events, but some things, like IME input on some browsers, don't
+      generate events that allow CodeMirror to properly detect it.
+      Thus, it polls. Default is 100 milliseconds.

+
+      
flattenSpans: boolean

+      
By default, CodeMirror will combine adjacent tokens into a
+      single span if they have the same class. This will result in a
+      simpler DOM tree, and thus perform better. With some kinds of
+      styling (such as rounded corners), this will change the way the
+      document looks. You can set this option to false to disable this
+      behavior.

+
+      
addModeClass: boolean

+      
When enabled (off by default), an extra CSS class will be
+      added to each token, indicating the
+      (inner) mode that produced it, prefixed
+      with "cm-m-". For example, tokens from the XML mode
+      will get the cm-m-xml class.

+
+      
maxHighlightLength: number

+      
When highlighting long lines, in order to stay responsive,
+      the editor will give up and simply style the rest of the line as
+      plain text when it reaches a certain position. The default is
+      10 000. You can set this to Infinity to turn off
+      this behavior.

+
+      
viewportMargin: integer

+      
Specifies the amount of lines that are rendered above and
+      below the part of the document that's currently scrolled into
+      view. This affects the amount of updates needed when scrolling,
+      and the amount of work that such an update does. You should
+      usually leave it at its default, 10. Can be set
+      to Infinity to make sure the whole document is
+      always rendered, and thus the browser's text search works on it.
+      This will have bad effects on performance of big
+      documents.

+    

+

+
+

+    
Events

+
+    
Various CodeMirror-related objects emit events, which allow
+    client code to react to various situations. Handlers for such
+    events can be registered with the on
+    and off methods on the objects
+    that the event fires on. To fire your own events,
+    use CodeMirror.signal(target, name, args...),
+    where target is a non-DOM-node object.

+
+    
An editor instance fires the following events.
+    The instance argument always refers to the editor
+    itself.

+
+    

+      
"change" (instance: CodeMirror, changeObj: object)

+      
Fires every time the content of the editor is changed.
+      The changeObj is a {from, to, text, removed,
+      origin} object containing information about the changes
+      that occurred as second argument. from
+      and to are the positions (in the pre-change
+      coordinate system) where the change started and ended (for
+      example, it might be {ch:0, line:18} if the
+      position is at the beginning of line #19). text is
+      an array of strings representing the text that replaced the
+      changed range (split by line). removed is the text
+      that used to be between from and to,
+      which is overwritten by this change. This event is
+      fired before the end of
+      an operation, before the DOM updates
+      happen.

+
+      
"changes" (instance: CodeMirror, changes: array<object>)

+      
Like the "change"
+      event, but batched per operation,
+      passing an array containing all the changes that happened in the
+      operation. This event is fired after the operation finished, and
+      display changes it makes will trigger a new operation.

+
+      
"beforeChange" (instance: CodeMirror, changeObj: object)

+      
This event is fired before a change is applied, and its
+      handler may choose to modify or cancel the change.
+      The changeObj object
+      has from, to, and text
+      properties, as with
+      the "change" event. It
+      also has a cancel() method, which can be called to
+      cancel the change, and, if the change isn't
+      coming from an undo or redo event, an update(from, to,
+      text) method, which may be used to modify the change.
+      Undo or redo changes can't be modified, because they hold some
+      metainformation for restoring old marked ranges that is only
+      valid for that specific change. All three arguments
+      to update are optional, and can be left off to
+      leave the existing value for that field
+      intact. Note: you may not do anything from
+      a "beforeChange" handler that would cause changes
+      to the document or its visualization. Doing so will, since this
+      handler is called directly from the bowels of the CodeMirror
+      implementation, probably cause the editor to become
+      corrupted.

+
+      
"cursorActivity" (instance: CodeMirror)

+      
Will be fired when the cursor or selection moves, or any
+      change is made to the editor content.

+
+      
"keyHandled" (instance: CodeMirror, name: string, event: Event)

+      
Fired after a key is handled through a
+      key map. name is the name of the handled key (for
+      example "Ctrl-X" or "'q'"),
+      and event is the DOM keydown
+      or keypress event.

+
+      
"inputRead" (instance: CodeMirror, changeObj: object)

+      
Fired whenever new input is read from the hidden textarea
+      (typed or pasted by the user).

+
+      
"electricInput" (instance: CodeMirror, line: integer)

+      
Fired if text input matched the
+      mode's electric patterns,
+      and this caused the line's indentation to change.

+
+      
"beforeSelectionChange" (instance: CodeMirror, obj: {ranges, origin, update})

+      
This event is fired before the selection is moved. Its
+      handler may inspect the set of selection ranges, present as an
+      array of {anchor, head} objects in
+      the ranges property of the obj
+      argument, and optionally change them by calling
+      the update method on this object, passing an array
+      of ranges in the same format. The object also contains
+      an origin property holding the origin string passed
+      to the selection-changing method, if any. Handlers for this
+      event have the same restriction
+      as "beforeChange"
+      handlers — they should not do anything to directly update the
+      state of the editor.

+
+      
"viewportChange" (instance: CodeMirror, from: number, to: number)

+      
Fires whenever the view port of
+      the editor changes (due to scrolling, editing, or any other
+      factor). The from and to arguments
+      give the new start and end of the viewport.

+
+      
"swapDoc" (instance: CodeMirror, oldDoc: Doc)

+      
This is signalled when the editor's document is replaced
+      using the swapDoc
+      method.

+
+      
"gutterClick" (instance: CodeMirror, line: integer, gutter: string, clickEvent: Event)

+      
Fires when the editor gutter (the line-number area) is
+      clicked. Will pass the editor instance as first argument, the
+      (zero-based) number of the line that was clicked as second
+      argument, the CSS class of the gutter that was clicked as third
+      argument, and the raw mousedown event object as
+      fourth argument.

+
+      
"gutterContextMenu" (instance: CodeMirror, line: integer, gutter: string, contextMenu: Event: Event)

+      
Fires when the editor gutter (the line-number area)
+      receives a contextmenu event. Will pass the editor
+      instance as first argument, the (zero-based) number of the line
+      that was clicked as second argument, the CSS class of the
+      gutter that was clicked as third argument, and the raw
+      contextmenu mouse event object as fourth argument.
+      You can preventDefault the event, to signal that
+      CodeMirror should do no further handling.

+
+      
"focus" (instance: CodeMirror)

+      
Fires whenever the editor is focused.

+
+      
"blur" (instance: CodeMirror)

+      
Fires whenever the editor is unfocused.

+
+      
"scroll" (instance: CodeMirror)

+      
Fires when the editor is scrolled.

+
+      
"scrollCursorIntoView" (instance: CodeMirror, event: Event)

+      
Fires when the editor tries to scroll its cursor into view.
+      Can be hooked into to take care of additional scrollable
+      containers around the editor. When the event object has
+      its preventDefault method called, CodeMirror will
+      not itself try to scroll the window.

+
+      
"update" (instance: CodeMirror)

+      
Will be fired whenever CodeMirror updates its DOM display.

+
+      
"renderLine" (instance: CodeMirror, line: LineHandle, element: Element)

+      
Fired whenever a line is (re-)rendered to the DOM. Fired
+      right after the DOM element is built, before it is
+      added to the document. The handler may mess with the style of
+      the resulting element, or add event handlers, but
+      should not try to change the state of the editor.

+
+      
"mousedown",
+      "dblclick", "touchstart", "contextmenu",
+      "keydown", "keypress",
+      "keyup", "cut", "copy", "paste",
+      "dragstart", "dragenter",
+      "dragover", "dragleave",
+      "drop"
+      (instance: CodeMirror, event: Event)

+      
Fired when CodeMirror is handling a DOM event of this type.
+      You can preventDefault the event, or give it a
+      truthy codemirrorIgnore property, to signal that
+      CodeMirror should do no further handling.

+    

+
+    
Document objects (instances
+    of CodeMirror.Doc) emit the
+    following events:

+
+    

+      
"change" (doc: CodeMirror.Doc, changeObj: object)

+      
Fired whenever a change occurs to the
+      document. changeObj has a similar type as the
+      object passed to the
+      editor's "change"
+      event.

+
+      
"beforeChange" (doc: CodeMirror.Doc, change: object)

+      
See the description of the
+      same event on editor instances.

+
+      
"cursorActivity" (doc: CodeMirror.Doc)

+      
Fired whenever the cursor or selection in this document
+      changes.

+
+      
"beforeSelectionChange" (doc: CodeMirror.Doc, selection: {head, anchor})

+      
Equivalent to
+      the event by the same
+      name as fired on editor instances.

+    

+
+    
Line handles (as returned by, for
+    example, getLineHandle)
+    support these events:

+
+    

+      
"delete" ()

+      
Will be fired when the line object is deleted. A line object
+      is associated with the start of the line. Mostly useful
+      when you need to find out when your gutter
+      markers on a given line are removed.

+      
"change" (line: LineHandle, changeObj: object)

+      
Fires when the line's text content is changed in any way
+      (but the line is not deleted outright). The change
+      object is similar to the one passed
+      to change event on the editor
+      object.

+    

+
+    
Marked range handles (CodeMirror.TextMarker), as returned
+    by markText
+    and setBookmark, emit the
+    following events:

+
+    

+      
"beforeCursorEnter" ()

+      
Fired when the cursor enters the marked range. From this
+      event handler, the editor state may be inspected
+      but not modified, with the exception that the range on
+      which the event fires may be cleared.

+      
"clear" (from: {line, ch}, to: {line, ch})

+      
Fired when the range is cleared, either through cursor
+      movement in combination
+      with clearOnEnter
+      or through a call to its clear() method. Will only
+      be fired once per handle. Note that deleting the range through
+      text editing does not fire this event, because an undo action
+      might bring the range back into existence. from
+      and to give the part of the document that the range
+      spanned when it was cleared.

+      
"hide" ()

+      
Fired when the last part of the marker is removed from the
+      document by editing operations.

+      
"unhide" ()

+      
Fired when, after the marker was removed by editing, a undo
+      operation brought the marker back.

+    

+
+    
Line widgets (CodeMirror.LineWidget), returned
+    by addLineWidget, fire
+    these events:

+
+    

+      
"redraw" ()

+      
Fired whenever the editor re-adds the widget to the DOM.
+      This will happen once right after the widget is added (if it is
+      scrolled into view), and then again whenever it is scrolled out
+      of view and back in again, or when changes to the editor options
+      or the line the widget is on require the widget to be
+      redrawn.

+    

+

+
+

+    
Key Maps

+
+    
Key maps are ways to associate keys with functionality. A key map
+    is an object mapping strings that identify the keys to functions
+    that implement their functionality.

+
+    
The CodeMirror distributions comes
+    with Emacs, Vim,
+    and Sublime Text-style keymaps.

+
+    
Keys are identified either by name or by character.
+    The CodeMirror.keyNames object defines names for
+    common keys and associates them with their key codes. Examples of
+    names defined here are Enter, F5,
+    and Q. These can be prefixed
+    with Shift-, Cmd-, Ctrl-,
+    and Alt- to specify a modifier. So for
+    example, Shift-Ctrl-Space would be a valid key
+    identifier.

+
+    
Common example: map the Tab key to insert spaces instead of a tab
+    character.

+
+    
+editor.setOption("extraKeys", {
+  Tab: function(cm) {
+    var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
+    cm.replaceSelection(spaces);
+  }
+});

+
+    
Alternatively, a character can be specified directly by
+    surrounding it in single quotes, for example '$'
+    or 'q'. Due to limitations in the way browsers fire
+    key events, these may not be prefixed with modifiers.

+
+    
Multi-stroke key bindings can be specified
+    by separating the key names by spaces in the property name, for
+    example Ctrl-X Ctrl-V. When a map contains
+    multi-stoke bindings or keys with modifiers that are not specified
+    in the default order (Shift-Cmd-Ctrl-Alt), you must
+    call CodeMirror.normalizeKeyMap on it before it can
+    be used. This function takes a keymap and modifies it to normalize
+    modifier order and properly recognize multi-stroke bindings. It
+    will return the keymap itself.

+
+    
The CodeMirror.keyMap object associates key maps
+    with names. User code and key map definitions can assign extra
+    properties to this object. Anywhere where a key map is expected, a
+    string can be given, which will be looked up in this object. It
+    also contains the "default" key map holding the
+    default bindings.

+
+    
The values of properties in key maps can be either functions of
+    a single argument (the CodeMirror instance), strings, or
+    false. Strings refer
+    to commands, which are described below. If
+    the property is set to false, CodeMirror leaves
+    handling of the key up to the browser. A key handler function may
+    return CodeMirror.Pass to indicate that it has
+    decided not to handle the key, and other handlers (or the default
+    behavior) should be given a turn.

+
+    
Keys mapped to command names that start with the
+    characters "go" or to functions that have a
+    truthy motion property (which should be used for
+    cursor-movement actions) will be fired even when an
+    extra Shift modifier is present (i.e. "Up":
+    "goLineUp" matches both up and shift-up). This is used to
+    easily implement shift-selection.

+
+    
Key maps can defer to each other by defining
+    a fallthrough property. This indicates that when a
+    key is not found in the map itself, one or more other maps should
+    be searched. It can hold either a single key map or an array of
+    key maps.

+
+    
When a key map needs to set something up when it becomes
+    active, or tear something down when deactivated, it can
+    contain attach and/or detach properties,
+    which should hold functions that take the editor instance and the
+    next or previous keymap. Note that this only works for the
+    top-level keymap, not for fallthrough
+    maps or maps added
+    with extraKeys
+    or addKeyMap.

+

+
+

+    
Commands

+
+    
Commands are parameter-less actions that can be performed on an
+    editor. Their main use is for key bindings. Commands are defined by
+    adding properties to the CodeMirror.commands object.
+    A number of common commands are defined by the library itself,
+    most of them used by the default key bindings. The value of a
+    command property must be a function of one argument (an editor
+    instance).

+
+    
Some of the commands below are referenced in the default
+    key map, but not defined by the core library. These are intended to
+    be defined by user code or addons.

+
+    
Commands can also be run with
+    the execCommand
+    method.

+
+    

+      
selectAllCtrl-A (PC), Cmd-A (Mac)

+      
Select the whole content of the editor.

+
+      
singleSelectionEsc

+      
When multiple selections are present, this deselects all but
+      the primary selection.

+
+      
killLineCtrl-K (Mac)

+      
Emacs-style line killing. Deletes the part of the line after
+      the cursor. If that consists only of whitespace, the newline at
+      the end of the line is also deleted.

+
+      
deleteLineCtrl-D (PC), Cmd-D (Mac)

+      
Deletes the whole line under the cursor, including newline at the end.

+
+      
delLineLeft

+      
Delete the part of the line before the cursor.

+
+      
delWrappedLineLeftCmd-Backspace (Mac)

+      
Delete the part of the line from the left side of the visual line the cursor is on to the cursor.

+
+      
delWrappedLineRightCmd-Delete (Mac)

+      
Delete the part of the line from the cursor to the right side of the visual line the cursor is on.

+
+      
undoCtrl-Z (PC), Cmd-Z (Mac)

+      
Undo the last change.

+
+      
redoCtrl-Y (PC), Shift-Cmd-Z (Mac), Cmd-Y (Mac)

+      
Redo the last undone change.

+
+      
undoSelectionCtrl-U (PC), Cmd-U (Mac)

+      
Undo the last change to the selection, or if there are no
+      selection-only changes at the top of the history, undo the last
+      change.

+
+      
redoSelectionAlt-U (PC), Shift-Cmd-U (Mac)

+      
Redo the last change to the selection, or the last text change if
+      no selection changes remain.

+
+      
goDocStartCtrl-Home (PC), Cmd-Up (Mac), Cmd-Home (Mac)

+      
Move the cursor to the start of the document.

+
+      
goDocEndCtrl-End (PC), Cmd-End (Mac), Cmd-Down (Mac)

+      
Move the cursor to the end of the document.

+
+      
goLineStartAlt-Left (PC), Ctrl-A (Mac)

+      
Move the cursor to the start of the line.

+
+      
goLineStartSmartHome

+      
Move to the start of the text on the line, or if we are
+      already there, to the actual start of the line (including
+      whitespace).

+
+      
goLineEndAlt-Right (PC), Ctrl-E (Mac)

+      
Move the cursor to the end of the line.

+
+      
goLineRightCmd-Right (Mac)

+      
Move the cursor to the right side of the visual line it is on.

+
+      
goLineLeftCmd-Left (Mac)

+      
Move the cursor to the left side of the visual line it is on. If
+      this line is wrapped, that may not be the start of the line.

+
+      
goLineLeftSmart

+      
Move the cursor to the left side of the visual line it is
+      on. If that takes it to the start of the line, behave
+      like goLineStartSmart.

+
+      
goLineUpUp, Ctrl-P (Mac)

+      
Move the cursor up one line.

+
+      
goLineDownDown, Ctrl-N (Mac)

+      
Move down one line.

+
+      
goPageUpPageUp, Shift-Ctrl-V (Mac)

+      
Move the cursor up one screen, and scroll up by the same distance.

+
+      
goPageDownPageDown, Ctrl-V (Mac)

+      
Move the cursor down one screen, and scroll down by the same distance.

+
+      
goCharLeftLeft, Ctrl-B (Mac)

+      
Move the cursor one character left, going to the previous line
+      when hitting the start of line.

+
+      
goCharRightRight, Ctrl-F (Mac)

+      
Move the cursor one character right, going to the next line
+      when hitting the end of line.

+
+      
goColumnLeft

+      
Move the cursor one character left, but don't cross line boundaries.

+
+      
goColumnRight

+      
Move the cursor one character right, don't cross line boundaries.

+
+      
goWordLeftAlt-B (Mac)

+      
Move the cursor to the start of the previous word.

+
+      
goWordRightAlt-F (Mac)

+      
Move the cursor to the end of the next word.

+
+      
goGroupLeftCtrl-Left (PC), Alt-Left (Mac)

+      
Move to the left of the group before the cursor. A group is
+      a stretch of word characters, a stretch of punctuation
+      characters, a newline, or a stretch of more than one
+      whitespace character.

+
+      
goGroupRightCtrl-Right (PC), Alt-Right (Mac)

+      
Move to the right of the group after the cursor
+      (see above).

+
+      
delCharBeforeShift-Backspace, Ctrl-H (Mac)

+      
Delete the character before the cursor.

+
+      
delCharAfterDelete, Ctrl-D (Mac)

+      
Delete the character after the cursor.

+
+      
delWordBeforeAlt-Backspace (Mac)

+      
Delete up to the start of the word before the cursor.

+
+      
delWordAfterAlt-D (Mac)

+      
Delete up to the end of the word after the cursor.

+
+      
delGroupBeforeCtrl-Backspace (PC), Alt-Backspace (Mac)

+      
Delete to the left of the group before the cursor.

+
+      
delGroupAfterCtrl-Delete (PC), Ctrl-Alt-Backspace (Mac), Alt-Delete (Mac)

+      
Delete to the start of the group after the cursor.

+
+      
indentAutoShift-Tab

+      
Auto-indent the current line or selection.

+
+      
indentMoreCtrl-] (PC), Cmd-] (Mac)

+      
Indent the current line or selection by one indent unit.

+
+      
indentLessCtrl-[ (PC), Cmd-[ (Mac)

+      
Dedent the current line or selection by one indent unit.

+
+      
insertTab

+      
Insert a tab character at the cursor.

+
+      
insertSoftTab

+      
Insert the amount of spaces that match the width a tab at
+      the cursor position would have.

+
+      
defaultTabTab

+      
If something is selected, indent it by
+      one indent unit. If nothing is
+      selected, insert a tab character.

+
+      
transposeCharsCtrl-T (Mac)

+      
Swap the characters before and after the cursor.

+
+      
newlineAndIndentEnter

+      
Insert a newline and auto-indent the new line.

+
+      
toggleOverwriteInsert

+      
Flip the overwrite flag.

+
+      
saveCtrl-S (PC), Cmd-S (Mac)

+      
Not defined by the core library, only referred to in
+      key maps. Intended to provide an easy way for user code to define
+      a save command.

+
+      
findCtrl-F (PC), Cmd-F (Mac)

+      
findNextCtrl-G (PC), Cmd-G (Mac)

+      
findPrevShift-Ctrl-G (PC), Shift-Cmd-G (Mac)

+      
replaceShift-Ctrl-F (PC), Cmd-Alt-F (Mac)

+      
replaceAllShift-Ctrl-R (PC), Shift-Cmd-Alt-F (Mac)

+      
Not defined by the core library, but defined in
+      the search addon (or custom client
+      addons).

+
+    

+
+

+
+

+    
Customized Styling

+
+    
Up to a certain extent, CodeMirror's look can be changed by
+    modifying style sheet files. The style sheets supplied by modes
+    simply provide the colors for that mode, and can be adapted in a
+    very straightforward way. To style the editor itself, it is
+    possible to alter or override the styles defined
+    in codemirror.css.

+
+    
Some care must be taken there, since a lot of the rules in this
+    file are necessary to have CodeMirror function properly. Adjusting
+    colors should be safe, of course, and with some care a lot of
+    other things can be changed as well. The CSS classes defined in
+    this file serve the following roles:

+
+    

+      
CodeMirror

+      
The outer element of the editor. This should be used for the
+      editor width, height, borders and positioning. Can also be used
+      to set styles that should hold for everything inside the editor
+      (such as font and font size), or to set a background. Setting
+      this class' height style to auto will
+      make the editor resize to fit its
+      content (it is recommended to also set
+      the viewportMargin
+      option to Infinity when doing this.

+
+      
CodeMirror-focused

+      
Whenever the editor is focused, the top element gets this
+      class. This is used to hide the cursor and give the selection a
+      different color when the editor is not focused.

+
+      
CodeMirror-gutters

+      
This is the backdrop for all gutters. Use it to set the
+      default gutter background color, and optionally add a border on
+      the right of the gutters.

+
+      
CodeMirror-linenumbers

+      
Use this for giving a background or width to the line number
+      gutter.

+
+      
CodeMirror-linenumber

+      
Used to style the actual individual line numbers. These
+      won't be children of the CodeMirror-linenumbers
+      (plural) element, but rather will be absolutely positioned to
+      overlay it. Use this to set alignment and text properties for
+      the line numbers.

+
+      
CodeMirror-lines

+      
The visible lines. This is where you specify vertical
+      padding for the editor content.

+
+      
CodeMirror-cursor

+      
The cursor is a block element that is absolutely positioned.
+      You can make it look whichever way you want.

+
+      
CodeMirror-selected

+      
The selection is represented by span elements
+      with this class.

+
+      
CodeMirror-matchingbracket,
+        CodeMirror-nonmatchingbracket

+      
These are used to style matched (or unmatched) brackets.

+    

+
+    
If your page's style sheets do funky things to
+    all div or pre elements (you probably
+    shouldn't do that), you'll have to define rules to cancel these
+    effects out again for elements under the CodeMirror
+    class.

+
+    
Themes are also simply CSS files, which define colors for
+    various syntactic elements. See the files in
+    the theme directory.

+

+
+

+    
Programming API

+
+    
A lot of CodeMirror features are only available through its
+    API. Thus, you need to write code (or
+    use addons) if you want to expose them to
+    your users.

+
+    
Whenever points in the document are represented, the API uses
+    objects with line and ch properties.
+    Both are zero-based. CodeMirror makes sure to 'clip' any positions
+    passed by client code so that they fit inside the document, so you
+    shouldn't worry too much about sanitizing your coordinates. If you
+    give ch a value of null, or don't
+    specify it, it will be replaced with the length of the specified
+    line.

+
+    
Methods prefixed with doc. can, unless otherwise
+    specified, be called both on CodeMirror (editor)
+    instances and CodeMirror.Doc instances. Methods
+    prefixed with cm. are only available
+    on CodeMirror instances.

+
+    
Constructor

+
+    
Constructing an editor instance is done with
+    the CodeMirror(place: Element|fn(Element),
+    ?option: object) constructor. If the place
+    argument is a DOM element, the editor will be appended to it. If
+    it is a function, it will be called, and is expected to place the
+    editor into the document. options may be an element
+    mapping option names to values. The options
+    that it doesn't explicitly specify (or all options, if it is not
+    passed) will be taken
+    from CodeMirror.defaults.

+
+    
Note that the options object passed to the constructor will be
+    mutated when the instance's options
+    are changed, so you shouldn't share such
+    objects between instances.

+
+    
See CodeMirror.fromTextArea
+    for another way to construct an editor instance.

+
+    
Content manipulation methods

+
+    

+      
doc.getValue(?separator: string) → string

+      
Get the current editor content. You can pass it an optional
+      argument to specify the string to be used to separate lines
+      (defaults to "\n").

+      
doc.setValue(content: string)

+      
Set the editor content.

+
+      
doc.getRange(from: {line, ch}, to: {line, ch}, ?separator: string) → string

+      
Get the text between the given points in the editor, which
+      should be {line, ch} objects. An optional third
+      argument can be given to indicate the line separator string to
+      use (defaults to "\n").

+      
doc.replaceRange(replacement: string, from: {line, ch}, to: {line, ch}, ?origin: string)

+      
Replace the part of the document between from
+      and to with the given string. from
+      and to must be {line, ch}
+      objects. to can be left off to simply insert the
+      string at position from. When origin
+      is given, it will be passed on
+      to "change" events, and
+      its first letter will be used to determine whether this change
+      can be merged with previous history events, in the way described
+      for selection origins.

+
+      
doc.getLine(n: integer) → string

+      
Get the content of line n.

+
+      
doc.lineCount() → integer

+      
Get the number of lines in the editor.

+      
doc.firstLine() → integer

+      
Get the first line of the editor. This will
+      usually be zero but for linked sub-views,
+      or documents instantiated with a non-zero
+      first line, it might return other values.

+      
doc.lastLine() → integer

+      
Get the last line of the editor. This will
+      usually be doc.lineCount() - 1,
+      but for linked sub-views,
+      it might return other values.

+
+      
doc.getLineHandle(num: integer) → LineHandle

+      
Fetches the line handle for the given line number.

+      
doc.getLineNumber(handle: LineHandle) → integer

+      
Given a line handle, returns the current position of that
+      line (or null when it is no longer in the
+      document).

+      
doc.eachLine(f: (line: LineHandle))

+      
doc.eachLine(start: integer, end: integer, f: (line: LineHandle))

+      
Iterate over the whole document, or if start
+      and end line numbers are given, the range
+      from start up to (not including) end,
+      and call f for each line, passing the line handle.
+      This is a faster way to visit a range of line handlers than
+      calling getLineHandle
+      for each of them. Note that line handles have
+      a text property containing the line's content (as a
+      string).

+
+      
doc.markClean()

+      
Set the editor content as 'clean', a flag that it will
+      retain until it is edited, and which will be set again when such
+      an edit is undone again. Useful to track whether the content
+      needs to be saved. This function is deprecated in favor
+      of changeGeneration,
+      which allows multiple subsystems to track different notions of
+      cleanness without interfering.

+      
doc.changeGeneration(?closeEvent: boolean) → integer

+      
Returns a number that can later be passed
+      to isClean to test whether
+      any edits were made (and not undone) in the meantime.
+      If closeEvent is true, the current history event
+      will be ‘closed’, meaning it can't be combined with further
+      changes (rapid typing or deleting events are typically
+      combined).

+      
doc.isClean(?generation: integer) → boolean

+      
Returns whether the document is currently clean — not
+      modified since initialization or the last call
+      to markClean if no
+      argument is passed, or since the matching call
+      to changeGeneration
+      if a generation value is given.

+    

+
+    
Cursor and selection methods

+
+    

+      
doc.getSelection(?lineSep: string) → string

+      
Get the currently selected code. Optionally pass a line
+      separator to put between the lines in the output. When multiple
+      selections are present, they are concatenated with instances
+      of lineSep in between.

+      
doc.getSelections(?lineSep: string) → string

+      
Returns an array containing a string for each selection,
+      representing the content of the selections.

+
+      
doc.replaceSelection(replacement: string, ?select: string)

+      
Replace the selection(s) with the given string. By default,
+      the new selection ends up after the inserted text. The
+      optional select argument can be used to change
+      this—passing "around" will cause the new text to be
+      selected, passing "start" will collapse the
+      selection to the start of the inserted text.

+      
doc.replaceSelections(replacements: array<string>, ?select: string)

+      
The length of the given array should be the same as the
+      number of active selections. Replaces the content of the
+      selections with the strings in the array.
+      The select argument works the same as
+      in replaceSelection.

+
+      
doc.getCursor(?start: string) → {line, ch}

+      
Retrieve one end of the primary
+      selection. start is an optional string indicating
+      which end of the selection to return. It may
+      be "from", "to", "head"
+      (the side of the selection that moves when you press
+      shift+arrow), or "anchor" (the fixed side of the
+      selection). Omitting the argument is the same as
+      passing "head". A {line, ch} object
+      will be returned.

+      
doc.listSelections() → array<{anchor, head}>

+      
Retrieves a list of all current selections. These will
+      always be sorted, and never overlap (overlapping selections are
+      merged). Each object in the array contains anchor
+      and head properties referring to {line,
+      ch} objects.

+
+      
doc.somethingSelected() → boolean

+      
Return true if any text is selected.

+      
doc.setCursor(pos: {line, ch}|number, ?ch: number, ?options: object)

+      
Set the cursor position. You can either pass a
+      single {line, ch} object, or the line and the
+      character as two separate parameters. Will replace all
+      selections with a single, empty selection at the given position.
+      The supported options are the same as for setSelection.

+
+      
doc.setSelection(anchor: {line, ch}, ?head: {line, ch}, ?options: object)

+      
Set a single selection range. anchor
+      and head should be {line, ch}
+      objects. head defaults to anchor when
+      not given. These options are supported:
+      

+        
scroll: boolean

+        
Determines whether the selection head should be scrolled
+        into view. Defaults to true.

+        
origin: string

+        
Determines whether the selection history event may be
+        merged with the previous one. When an origin starts with the
+        character +, and the last recorded selection had
+        the same origin and was similar (close
+        in time, both
+        collapsed or both non-collapsed), the new one will replace the
+        old one. When it starts with *, it will always
+        replace the previous event (if that had the same origin).
+        Built-in motion uses the "+move" origin. User input uses the "+input" origin.

+        
bias: number

+        
Determine the direction into which the selection endpoints
+        should be adjusted when they fall inside
+        an atomic range. Can be either -1
+        (backward) or 1 (forward). When not given, the bias will be
+        based on the relative position of the old selection—the editor
+        will try to move further away from that, to prevent getting
+        stuck.

+      

+
+      
doc.setSelections(ranges: array<{anchor, head}>, ?primary: integer, ?options: object)

+      
Sets a new set of selections. There must be at least one
+      selection in the given array. When primary is a
+      number, it determines which selection is the primary one. When
+      it is not given, the primary index is taken from the previous
+      selection, or set to the last range if the previous selection
+      had less ranges than the new one. Supports the same options
+      as setSelection.

+      
doc.addSelection(anchor: {line, ch}, ?head: {line, ch})

+      
Adds a new selection to the existing set of selections, and
+      makes it the primary selection.

+
+      
doc.extendSelection(from: {line, ch}, ?to: {line, ch}, ?options: object)

+      
Similar
+      to setSelection, but
+      will, if shift is held or
+      the extending flag is set, move the
+      head of the selection while leaving the anchor at its current
+      place. to is optional, and can be passed to ensure
+      a region (for example a word or paragraph) will end up selected
+      (in addition to whatever lies between that region and the
+      current anchor). When multiple selections are present, all but
+      the primary selection will be dropped by this method.
+      Supports the same options as setSelection.

+      
doc.extendSelections(heads: array<{line, ch}>, ?options: object)

+      
An equivalent
+      of extendSelection
+      that acts on all selections at once.

+      
doc.extendSelectionsBy(f: function(range: {anchor, head}) → {line, ch}), ?options: object)

+      
Applies the given function to all existing selections, and
+      calls extendSelections
+      on the result.

+      
doc.setExtending(value: boolean)

+      
Sets or clears the 'extending' flag, which acts similar to
+      the shift key, in that it will cause cursor movement and calls
+      to extendSelection
+      to leave the selection anchor in place.

+      
doc.getExtending() → boolean

+      
Get the value of the 'extending' flag.

+
+      
cm.hasFocus() → boolean

+      
Tells you whether the editor currently has focus.

+
+      
cm.findPosH(start: {line, ch}, amount: integer, unit: string, visually: boolean) → {line, ch, ?hitSide: boolean}

+      
Used to find the target position for horizontal cursor
+      motion. start is a {line, ch}
+      object, amount an integer (may be negative),
+      and unit one of the
+      string "char", "column",
+      or "word". Will return a position that is produced
+      by moving amount times the distance specified
+      by unit. When visually is true, motion
+      in right-to-left text will be visual rather than logical. When
+      the motion was clipped by hitting the end or start of the
+      document, the returned value will have a hitSide
+      property set to true.

+      
cm.findPosV(start: {line, ch}, amount: integer, unit: string) → {line, ch, ?hitSide: boolean}

+      
Similar to findPosH,
+      but used for vertical motion. unit may
+      be "line" or "page". The other
+      arguments and the returned value have the same interpretation as
+      they have in findPosH.

+
+      
cm.findWordAt(pos: {line, ch}) → {anchor: {line, ch}, head: {line, ch}}

+      
Returns the start and end of the 'word' (the stretch of
+      letters, whitespace, or punctuation) at the given position.

+    

+
+    
Configuration methods

+
+    

+      
cm.setOption(option: string, value: any)

+      
Change the configuration of the editor. option
+      should the name of an option,
+      and value should be a valid value for that
+      option.

+      
cm.getOption(option: string) → any

+      
Retrieves the current value of the given option for this
+      editor instance.

+
+      
cm.addKeyMap(map: object, bottom: boolean)

+      
Attach an additional key map to the
+      editor. This is mostly useful for addons that need to register
+      some key handlers without trampling on
+      the extraKeys
+      option. Maps added in this way have a higher precedence than
+      the extraKeys
+      and keyMap options,
+      and between them, the maps added earlier have a lower precedence
+      than those added later, unless the bottom argument
+      was passed, in which case they end up below other key maps added
+      with this method.

+      
cm.removeKeyMap(map: object)

+      
Disable a keymap added
+      with addKeyMap. Either
+      pass in the key map object itself, or a string, which will be
+      compared against the name property of the active
+      key maps.

+
+      
cm.addOverlay(mode: string|object, ?options: object)

+      
Enable a highlighting overlay. This is a stateless mini-mode
+      that can be used to add extra highlighting. For example,
+      the search addon uses it to
+      highlight the term that's currently being
+      searched. mode can be a mode
+      spec or a mode object (an object with
+      a token method).
+      The options parameter is optional. If given, it
+      should be an object. Currently, only the opaque
+      option is recognized. This defaults to off, but can be given to
+      allow the overlay styling, when not null, to
+      override the styling of the base mode entirely, instead of the
+      two being applied together.

+      
cm.removeOverlay(mode: string|object)

+      
Pass this the exact value passed for the mode
+      parameter to addOverlay,
+      or a string that corresponds to the name property of
+      that value, to remove an overlay again.

+
+      
cm.on(type: string, func: (...args))

+      
Register an event handler for the given event type (a
+      string) on the editor instance. There is also
+      a CodeMirror.on(object, type, func) version
+      that allows registering of events on any object.

+      
cm.off(type: string, func: (...args))

+      
Remove an event handler on the editor instance. An
+      equivalent CodeMirror.off(object, type,
+      func) also exists.

+    

+
+    
Document management methods

+
+    
Each editor is associated with an instance
+    of CodeMirror.Doc, its document. A document
+    represents the editor content, plus a selection, an undo history,
+    and a mode. A document can only be
+    associated with a single editor at a time. You can create new
+    documents by calling the CodeMirror.Doc(text, mode,
+    firstLineNumber) constructor. The last two arguments are
+    optional and can be used to set a mode for the document and make
+    it start at a line number other than 0, respectively.

+
+    

+      
cm.getDoc() → Doc

+      
Retrieve the currently active document from an editor.

+      
doc.getEditor() → CodeMirror

+      
Retrieve the editor associated with a document. May
+      return null.

+
+      
cm.swapDoc(doc: CodeMirror.Doc) → Doc

+      
Attach a new document to the editor. Returns the old
+      document, which is now no longer associated with an editor.

+
+      
doc.copy(copyHistory: boolean) → Doc

+      
Create an identical copy of the given doc.
+      When copyHistory is true, the history will also be
+      copied. Can not be called directly on an editor.

+
+      
doc.linkedDoc(options: object) → Doc

+      
Create a new document that's linked to the target document.
+      Linked documents will stay in sync (changes to one are also
+      applied to the other) until unlinked.
+      These are the options that are supported:
+        

+          
sharedHist: boolean

+          
When turned on, the linked copy will share an undo
+          history with the original. Thus, something done in one of
+          the two can be undone in the other, and vice versa.

+          
from: integer

+          
to: integer

+          
Can be given to make the new document a subview of the
+          original. Subviews only show a given range of lines. Note
+          that line coordinates inside the subview will be consistent
+          with those of the parent, so that for example a subview
+          starting at line 10 will refer to its first line as line 10,
+          not 0.

+          
mode: string|object

+          
By default, the new document inherits the mode of the
+          parent. This option can be set to
+          a mode spec to give it a
+          different mode.

+        

+      
doc.unlinkDoc(doc: CodeMirror.Doc)

+      
Break the link between two documents. After calling this,
+      changes will no longer propagate between the documents, and, if
+      they had a shared history, the history will become
+      separate.

+      
doc.iterLinkedDocs(function: (doc: CodeMirror.Doc, sharedHist: boolean))

+      
Will call the given function for all documents linked to the
+      target document. It will be passed two arguments, the linked document
+      and a boolean indicating whether that document shares history
+      with the target.

+    

+
+    
History-related methods

+
+    

+      
doc.undo()

+      
Undo one edit (if any undo events are stored).

+      
doc.redo()

+      
Redo one undone edit.

+
+      
doc.undoSelection()

+      
Undo one edit or selection change.

+      
doc.redoSelection()

+      
Redo one undone edit or selection change.

+
+      
doc.historySize() → {undo: integer, redo: integer}

+      
Returns an object with {undo, redo} properties,
+      both of which hold integers, indicating the amount of stored
+      undo and redo operations.

+      
doc.clearHistory()

+      
Clears the editor's undo history.

+      
doc.getHistory() → object

+      
Get a (JSON-serializable) representation of the undo history.

+      
doc.setHistory(history: object)

+      
Replace the editor's undo history with the one provided,
+      which must be a value as returned
+      by getHistory. Note that
+      this will have entirely undefined results if the editor content
+      isn't also the same as it was when getHistory was
+      called.

+    

+
+    
Text-marking methods

+
+    

+      
doc.markText(from: {line, ch}, to: {line, ch}, ?options: object) → TextMarker

+      
Can be used to mark a range of text with a specific CSS
+      class name. from and to should
+      be {line, ch} objects. The options
+      parameter is optional. When given, it should be an object that
+      may contain the following configuration options:
+      

+        
className: string

+        
Assigns a CSS class to the marked stretch of text.

+        
inclusiveLeft: boolean

+        
Determines whether
+        text inserted on the left of the marker will end up inside
+        or outside of it.

+        
inclusiveRight: boolean

+        
Like inclusiveLeft,
+        but for the right side.

+        
atomic: boolean

+        
Atomic ranges act as a single unit when cursor movement is
+        concerned—i.e. it is impossible to place the cursor inside of
+        them. In atomic ranges, inclusiveLeft
+        and inclusiveRight have a different meaning—they
+        will prevent the cursor from being placed respectively
+        directly before and directly after the range.

+        
collapsed: boolean

+        
Collapsed ranges do not show up in the display. Setting a
+        range to be collapsed will automatically make it atomic.

+        
clearOnEnter: boolean

+        
When enabled, will cause the mark to clear itself whenever
+        the cursor enters its range. This is mostly useful for
+        text-replacement widgets that need to 'snap open' when the
+        user tries to edit them. The
+        "clear" event
+        fired on the range handle can be used to be notified when this
+        happens.

+        
clearWhenEmpty: boolean

+        
Determines whether the mark is automatically cleared when
+        it becomes empty. Default is true.

+        
replacedWith: Element

+        
Use a given node to display this range. Implies both
+        collapsed and atomic. The given DOM node must be an
+        inline element (as opposed to a block element).

+        
handleMouseEvents: boolean

+        
When replacedWith is given, this determines
+        whether the editor will capture mouse and drag events
+        occurring in this widget. Default is false—the events will be
+        left alone for the default browser handler, or specific
+        handlers on the widget, to capture.

+        
readOnly: boolean

+        
A read-only span can, as long as it is not cleared, not be
+        modified except by
+        calling setValue to reset
+        the whole document. Note: adding a read-only span
+        currently clears the undo history of the editor, because
+        existing undo events being partially nullified by read-only
+        spans would corrupt the history (in the current
+        implementation).

+        
addToHistory: boolean

+        
When set to true (default is false), adding this marker
+        will create an event in the undo history that can be
+        individually undone (clearing the marker).

+        
startStyle: string
Can be used to specify
+        an extra CSS class to be applied to the leftmost span that
+        is part of the marker.

+        
endStyle: string
Equivalent
+        to startStyle, but for the rightmost span.

+        
css: string

+        
A string of CSS to be applied to the covered text. For example "color: #fe3".

+        
title:
+        string
When given, will give the nodes created
+        for this span a HTML title attribute with the
+        given value.

+        
shared: boolean
When the
+        target document is linked to other
+        documents, you can set shared to true to make the
+        marker appear in all documents. By default, a marker appears
+        only in its target document.

+      

+      The method will return an object that represents the marker
+      (with constructor CodeMirror.TextMarker), which
+      exposes three methods:
+      clear(), to remove the mark,
+      find(), which returns
+      a {from, to} object (both holding document
+      positions), indicating the current position of the marked range,
+      or undefined if the marker is no longer in the
+      document, and finally changed(),
+      which you can call if you've done something that might change
+      the size of the marker (for example changing the content of
+      a replacedWith
+      node), and want to cheaply update the display.

+
+      
doc.setBookmark(pos: {line, ch}, ?options: object) → TextMarker

+      
Inserts a bookmark, a handle that follows the text around it
+      as it is being edited, at the given position. A bookmark has two
+      methods find() and clear(). The first
+      returns the current position of the bookmark, if it is still in
+      the document, and the second explicitly removes the bookmark.
+      The options argument is optional. If given, the following
+      properties are recognized:
+      

+        
widget: Element
Can be used to display a DOM
+        node at the current location of the bookmark (analogous to
+        the replacedWith
+        option to markText).

+        
insertLeft: boolean
By default, text typed
+        when the cursor is on top of the bookmark will end up to the
+        right of the bookmark. Set this option to true to make it go
+        to the left instead.

+        
shared: boolean
See
+        the corresponding option
+        to markText.

+        
handleMouseEvents: boolean

+        
As with markText,
+        this determines whether mouse events on the widget inserted
+        for this bookmark are handled by CodeMirror. The default is
+        false.

+      

+
+      
doc.findMarks(from: {line, ch}, to: {line, ch}) → array<TextMarker>

+      
Returns an array of all the bookmarks and marked ranges
+      found between the given positions.

+      
doc.findMarksAt(pos: {line, ch}) → array<TextMarker>

+      
Returns an array of all the bookmarks and marked ranges
+      present at the given position.

+      
doc.getAllMarks() → array<TextMarker>

+      
Returns an array containing all marked ranges in the document.

+    

+
+    
Widget, gutter, and decoration methods

+
+    

+      
cm.setGutterMarker(line: integer|LineHandle, gutterID: string, value: Element) → LineHandle

+      
Sets the gutter marker for the given gutter (identified by
+      its CSS class, see
+      the gutters option)
+      to the given value. Value can be either null, to
+      clear the marker, or a DOM element, to set it. The DOM element
+      will be shown in the specified gutter next to the specified
+      line.

+
+      
cm.clearGutter(gutterID: string)

+      
Remove all gutter markers in
+      the gutter with the given ID.

+
+      
doc.addLineClass(line: integer|LineHandle, where: string, class: string) → LineHandle

+      
Set a CSS class name for the given line. line
+      can be a number or a line handle. where determines
+      to which element this class should be applied, can can be one
+      of "text" (the text element, which lies in front of
+      the selection), "background" (a background element
+      that will be behind the selection), "gutter" (the
+      line's gutter space), or "wrap" (the wrapper node
+      that wraps all of the line's elements, including gutter
+      elements). class should be the name of the class to
+      apply.

+
+      
doc.removeLineClass(line: integer|LineHandle, where: string, class: string) → LineHandle

+      
Remove a CSS class from a line. line can be a
+      line handle or number. where should be one
+      of "text", "background",
+      or "wrap"
+      (see addLineClass). class
+      can be left off to remove all classes for the specified node, or
+      be a string to remove only a specific class.

+
+      
cm.lineInfo(line: integer|LineHandle) → object

+      
Returns the line number, text content, and marker status of
+      the given line, which can be either a number or a line handle.
+      The returned object has the structure {line, handle, text,
+      gutterMarkers, textClass, bgClass, wrapClass, widgets},
+      where gutterMarkers is an object mapping gutter IDs
+      to marker elements, and widgets is an array
+      of line widgets attached to this
+      line, and the various class properties refer to classes added
+      with addLineClass.

+
+      
cm.addWidget(pos: {line, ch}, node: Element, scrollIntoView: boolean)

+      
Puts node, which should be an absolutely
+      positioned DOM node, into the editor, positioned right below the
+      given {line, ch} position.
+      When scrollIntoView is true, the editor will ensure
+      that the entire node is visible (if possible). To remove the
+      widget again, simply use DOM methods (move it somewhere else, or
+      call removeChild on its parent).

+
+      
doc.addLineWidget(line: integer|LineHandle, node: Element, ?options: object) → LineWidget

+      
Adds a line widget, an element shown below a line, spanning
+      the whole of the editor's width, and moving the lines below it
+      downwards. line should be either an integer or a
+      line handle, and node should be a DOM node, which
+      will be displayed below the given line. options,
+      when given, should be an object that configures the behavior of
+      the widget. The following options are supported (all default to
+      false):
+        

+          
coverGutter: boolean

+          
Whether the widget should cover the gutter.

+          
noHScroll: boolean

+          
Whether the widget should stay fixed in the face of
+          horizontal scrolling.

+          
above: boolean

+          
Causes the widget to be placed above instead of below
+          the text of the line.

+          
handleMouseEvents: boolean

+          
Determines whether the editor will capture mouse and
+          drag events occurring in this widget. Default is false—the
+          events will be left alone for the default browser handler,
+          or specific handlers on the widget, to capture.

+          
insertAt: integer

+          
By default, the widget is added below other widgets for
+          the line. This option can be used to place it at a different
+          position (zero for the top, N to put it after the Nth other
+          widget). Note that this only has effect once, when the
+          widget is created.
+        

+      Note that the widget node will become a descendant of nodes with
+      CodeMirror-specific CSS classes, and those classes might in some
+      cases affect it. This method returns an object that represents
+      the widget placement. It'll have a line property
+      pointing at the line handle that it is associated with, and the following methods:
+        

+          
clear()
Removes the widget.

+          
changed()
Call
+          this if you made some change to the widget's DOM node that
+          might affect its height. It'll force CodeMirror to update
+          the height of the line that contains the widget.

+        

+      

+    

+
+    
Sizing, scrolling and positioning methods

+
+    

+      
cm.setSize(width: number|string, height: number|string)

+      
Programmatically set the size of the editor (overriding the
+      applicable CSS
+      rules). width and height
+      can be either numbers (interpreted as pixels) or CSS units
+      ("100%", for example). You can
+      pass null for either of them to indicate that that
+      dimension should not be changed.

+
+      
cm.scrollTo(x: number, y: number)

+      
Scroll the editor to a given (pixel) position. Both
+      arguments may be left as null
+      or undefined to have no effect.

+      
cm.getScrollInfo() → {left, top, width, height, clientWidth, clientHeight}

+      
Get an {left, top, width, height, clientWidth,
+      clientHeight} object that represents the current scroll
+      position, the size of the scrollable area, and the size of the
+      visible area (minus scrollbars).

+      
cm.scrollIntoView(what: {line, ch}|{left, top, right, bottom}|{from, to}|null, ?margin: number)

+      
Scrolls the given position into view. what may
+      be null to scroll the cursor into view,
+      a {line, ch} position to scroll a character into
+      view, a {left, top, right, bottom} pixel range (in
+      editor-local coordinates), or a range {from, to}
+      containing either two character positions or two pixel squares.
+      The margin parameter is optional. When given, it
+      indicates the amount of vertical pixels around the given area
+      that should be made visible as well.

+
+      
cm.cursorCoords(where: boolean|{line, ch}, mode: string) → {left, top, bottom}

+      
Returns an {left, top, bottom} object
+      containing the coordinates of the cursor position.
+      If mode is "local", they will be
+      relative to the top-left corner of the editable document. If it
+      is "page" or not given, they are relative to the
+      top-left corner of the page. If mode
+      is "window", the coordinates are relative to the
+      top-left corner of the currently visible (scrolled)
+      window. where can be a boolean indicating whether
+      you want the start (true) or the end
+      (false) of the selection, or, if a {line,
+      ch} object is given, it specifies the precise position at
+      which you want to measure.

+      
cm.charCoords(pos: {line, ch}, ?mode: string) → {left, right, top, bottom}

+      
Returns the position and dimensions of an arbitrary
+      character. pos should be a {line, ch}
+      object. This differs from cursorCoords in that
+      it'll give the size of the whole character, rather than just the
+      position that the cursor would have when it would sit at that
+      position.

+      
cm.coordsChar(object: {left, top}, ?mode: string) → {line, ch}

+      
Given an {left, top} object, returns
+      the {line, ch} position that corresponds to it. The
+      optional mode parameter determines relative to what
+      the coordinates are interpreted. It may
+      be "window", "page" (the default),
+      or "local".

+      
cm.lineAtHeight(height: number, ?mode: string) → number

+      
Computes the line at the given pixel
+      height. mode can be one of the same strings
+      that coordsChar
+      accepts.

+      
cm.heightAtLine(line: integer|LineHandle, ?mode: string) → number

+      
Computes the height of the top of a line, in the coordinate
+      system specified by mode
+      (see coordsChar), which
+      defaults to "page". When a line below the bottom of
+      the document is specified, the returned value is the bottom of
+      the last line in the document.

+      
cm.defaultTextHeight() → number

+      
Returns the line height of the default font for the editor.

+      
cm.defaultCharWidth() → number

+      
Returns the pixel width of an 'x' in the default font for
+      the editor. (Note that for non-monospace fonts, this is mostly
+      useless, and even for monospace fonts, non-ascii characters
+      might have a different width).

+
+      
cm.getViewport() → {from: number, to: number}

+      
Returns a {from, to} object indicating the
+      start (inclusive) and end (exclusive) of the currently rendered
+      part of the document. In big documents, when most content is
+      scrolled out of view, CodeMirror will only render the visible
+      part, and a margin around it. See also
+      the viewportChange
+      event.

+
+      
cm.refresh()

+      
If your code does something to change the size of the editor
+      element (window resizes are already listened for), or unhides
+      it, you should probably follow up by calling this method to
+      ensure CodeMirror is still looking as intended. See also
+      the autorefresh addon.

+    

+
+    
Mode, state, and token-related methods

+
+    
When writing language-aware functionality, it can often be
+    useful to hook into the knowledge that the CodeMirror language
+    mode has. See the section on modes for a
+    more detailed description of how these work.

+
+    

+      
doc.getMode() → object

+      
Gets the (outer) mode object for the editor. Note that this
+      is distinct from getOption("mode"), which gives you
+      the mode specification, rather than the resolved, instantiated
+      mode object.

+
+      
cm.getModeAt(pos: {line, ch}) → object

+      
Gets the inner mode at a given position. This will return
+      the same as getMode for
+      simple modes, but will return an inner mode for nesting modes
+      (such as htmlmixed).

+
+      
cm.getTokenAt(pos: {line, ch}, ?precise: boolean) → object

+      
Retrieves information about the token the current mode found
+      before the given position (a {line, ch} object). The
+      returned object has the following properties:
+      

+        
start
The character (on the given line) at which the token starts.

+        
end
The character at which the token ends.

+        
string
The token's string.

+        
type
The token type the mode assigned
+        to the token, such as "keyword"
+        or "comment" (may also be null).

+        
state
The mode's state at the end of this token.

+      

+      If precise is true, the token will be guaranteed to be accurate based on recent edits. If false or
+      not specified, the token will use cached state information, which will be faster but might not be accurate if
+      edits were recently made and highlighting has not yet completed.
+      

+
+      
cm.getLineTokens(line: integer, ?precise: boolean) → array<{start, end, string, type, state}>

+      
This is similar
+      to getTokenAt, but
+      collects all tokens for a given line into an array. It is much
+      cheaper than repeatedly calling getTokenAt, which
+      re-parses the part of the line before the token for every call.

+
+      
cm.getTokenTypeAt(pos: {line, ch}) → string

+      
This is a (much) cheaper version
+      of getTokenAt useful for
+      when you just need the type of the token at a given position,
+      and no other information. Will return null for
+      unstyled tokens, and a string, potentially containing multiple
+      space-separated style names, otherwise.

+
+      
cm.getHelpers(pos: {line, ch}, type: string) → array<helper>

+      
Fetch the set of applicable helper values for the given
+      position. Helpers provide a way to look up functionality
+      appropriate for a mode. The type argument provides
+      the helper namespace (see
+      registerHelper), in
+      which the values will be looked up. When the mode itself has a
+      property that corresponds to the type, that
+      directly determines the keys that are used to look up the helper
+      values (it may be either a single string, or an array of
+      strings). Failing that, the mode's helperType
+      property and finally the mode's name are used.

+      
For example, the JavaScript mode has a
+      property fold containing "brace". When
+      the brace-fold addon is loaded, that defines a
+      helper named brace in the fold
+      namespace. This is then used by
+      the foldcode addon to
+      figure out that it can use that folding function to fold
+      JavaScript code.

+      
When any 'global'
+      helpers are defined for the given namespace, their predicates
+      are called on the current mode and editor, and all those that
+      declare they are applicable will also be added to the array that
+      is returned.

+
+      
cm.getHelper(pos: {line, ch}, type: string) → helper

+      
Returns the first applicable helper value.
+      See getHelpers.

+
+      
cm.getStateAfter(?line: integer, ?precise: boolean) → object

+      
Returns the mode's parser state, if any, at the end of the
+      given line number. If no line number is given, the state at the
+      end of the document is returned. This can be useful for storing
+      parsing errors in the state, or getting other kinds of
+      contextual information for a line. precise is defined
+      as in getTokenAt().

+    

+
+    
Miscellaneous methods

+
+    

+      
cm.operation(func: () → any) → any

+      
CodeMirror internally buffers changes and only updates its
+      DOM structure after it has finished performing some operation.
+      If you need to perform a lot of operations on a CodeMirror
+      instance, you can call this method with a function argument. It
+      will call the function, buffering up all changes, and only doing
+      the expensive update after the function returns. This can be a
+      lot faster. The return value from this method will be the return
+      value of your function.

+
+      
cm.indentLine(line: integer, ?dir: string|integer)

+      
Adjust the indentation of the given line. The second
+      argument (which defaults to "smart") may be one of:
+        

+          
"prev"

+          
Base indentation on the indentation of the previous line.

+          
"smart"

+          
Use the mode's smart indentation if available, behave
+          like "prev" otherwise.

+          
"add"

+          
Increase the indentation of the line by
+          one indent unit.

+          
"subtract"

+          
Reduce the indentation of the line.

+          
<integer>

+          
Add (positive number) or reduce (negative number) the
+          indentation by the given amount of spaces.

+        

+
+      
cm.toggleOverwrite(?value: boolean)

+      
Switches between overwrite and normal insert mode (when not
+      given an argument), or sets the overwrite mode to a specific
+      state (when given an argument).

+
+      
cm.isReadOnly() → boolean

+      
Tells you whether the editor's content can be edited by the
+      user.

+
+      
doc.lineSeparator()

+      
Returns the preferred line separator string for this
+      document, as per the option
+      by the same name. When that option is null, the
+      string "\n" is returned.

+
+      
cm.execCommand(name: string)

+      
Runs the command with the given name on the editor.

+
+      
doc.posFromIndex(index: integer) → {line, ch}

+      
Calculates and returns a {line, ch} object for a
+      zero-based index who's value is relative to the start of the
+      editor's text. If the index is out of range of the text then
+      the returned object is clipped to start or end of the text
+      respectively.

+      
doc.indexFromPos(object: {line, ch}) → integer

+      
The reverse of posFromIndex.

+
+      
cm.focus()

+      
Give the editor focus.

+
+      
cm.getInputField() → Element

+      
Returns the input field for the editor. Will be a textarea
+      or an editable div, depending on the value of
+      the inputStyle
+      option.

+      
cm.getWrapperElement() → Element

+      
Returns the DOM node that represents the editor, and
+      controls its size. Remove this from your tree to delete an
+      editor instance.

+      
cm.getScrollerElement() → Element

+      
Returns the DOM node that is responsible for the scrolling
+      of the editor.

+      
cm.getGutterElement() → Element

+      
Fetches the DOM node that contains the editor gutters.

+    

+
+    
Static properties

+    
The CodeMirror object itself provides
+    several useful properties.

+
+    

+      
CodeMirror.version: string

+      
It contains a string that indicates the version of the
+      library. This is a triple of
+      integers "major.minor.patch",
+      where patch is zero for releases, and something
+      else (usually one) for dev snapshots.

+
+      
CodeMirror.fromTextArea(textArea: TextAreaElement, ?config: object)

+      

+        The method provides another way to initialize an editor. It
+        takes a textarea DOM node as first argument and an optional
+        configuration object as second. It will replace the textarea
+        with a CodeMirror instance, and wire up the form of that
+        textarea (if any) to make sure the editor contents are put
+        into the textarea when the form is submitted. The text in the
+        textarea will provide the content for the editor. A CodeMirror
+        instance created this way has three additional methods:
+        

+          
cm.save()

+          
Copy the content of the editor into the textarea.

+
+          
cm.toTextArea()

+          
Remove the editor, and restore the original textarea (with
+          the editor's current content).

+
+          
cm.getTextArea() → TextAreaElement

+          
Returns the textarea that the instance was based on.

+        

+      

+
+      
CodeMirror.defaults: object

+      
An object containing default values for
+      all options. You can assign to its
+      properties to modify defaults (though this won't affect editors
+      that have already been created).

+
+      
CodeMirror.defineExtension(name: string, value: any)

+      
If you want to define extra methods in terms of the
+      CodeMirror API, it is possible to
+      use defineExtension. This will cause the given
+      value (usually a method) to be added to all CodeMirror instances
+      created from then on.

+
+      
CodeMirror.defineDocExtension(name: string, value: any)

+      
Like defineExtension,
+      but the method will be added to the interface
+      for Doc objects instead.

+
+      
CodeMirror.defineOption(name: string,
+      default: any, updateFunc: function)

+      
Similarly, defineOption can be used to define new options for
+      CodeMirror. The updateFunc will be called with the
+      editor instance and the new value when an editor is initialized,
+      and whenever the option is modified
+      through setOption.

+
+      
CodeMirror.defineInitHook(func: function)

+      
If your extension just needs to run some
+      code whenever a CodeMirror instance is initialized,
+      use CodeMirror.defineInitHook. Give it a function as
+      its only argument, and from then on, that function will be called
+      (with the instance as argument) whenever a new CodeMirror instance
+      is initialized.

+
+      
CodeMirror.registerHelper(type: string, name: string, value: helper)

+      
Registers a helper value with the given name in
+      the given namespace (type). This is used to define
+      functionality that may be looked up by mode. Will create (if it
+      doesn't already exist) a property on the CodeMirror
+      object for the given type, pointing to an object
+      that maps names to values. I.e. after
+      doing CodeMirror.registerHelper("hint", "foo",
+      myFoo), the value CodeMirror.hint.foo will
+      point to myFoo.

+
+      
CodeMirror.registerGlobalHelper(type: string, name: string, predicate: fn(mode, CodeMirror), value: helper)

+      
Acts
+      like registerHelper,
+      but also registers this helper as 'global', meaning that it will
+      be included by getHelpers
+      whenever the given predicate returns true when
+      called with the local mode and editor.

+
+      
CodeMirror.Pos(line: integer, ?ch: integer)

+      
A constructor for the {line, ch} objects that
+      are used to represent positions in editor documents.

+
+      
CodeMirror.changeEnd(change: object) → {line, ch}

+      
Utility function that computes an end position from a change
+      (an object with from, to,
+      and text properties, as passed to
+      various event handlers). The
+      returned position will be the end of the changed
+      range, after the change is applied.

+    

+

+
+

+    
Addons

+
+    
The addon directory in the distribution contains a
+    number of reusable components that implement extra editor
+    functionality (on top of extension functions
+    like defineOption, defineExtension,
+    and registerHelper). In
+    brief, they are:

+
+    

+      
dialog/dialog.js

+      
Provides a very simple way to query users for text input.
+      Adds the openDialog(template, callback, options) →
+      closeFunction method to CodeMirror instances,
+      which can be called with an HTML fragment or a detached DOM
+      node that provides the prompt (should include an input
+      or button tag), and a callback function that is called
+      when the user presses enter. It returns a function closeFunction
+      which, if called, will close the dialog immediately.
+      openDialog takes the following options:
+        

+          
closeOnEnter:

+          
If true, the dialog will be closed when the user presses
+          enter in the input. Defaults to true.

+          
onKeyDown:

+          
An event handler of the signature (event, value, closeFunction)
+          that will be called whenever keydown fires in the
+          dialog's input. If your callback returns true,
+          the dialog will not do any further processing of the event.

+          
onKeyUp:

+          
Same as onKeyDown but for the
+          keyup event.

+          
onInput:

+          
Same as onKeyDown but for the
+          input event.

+          
onClose:

+          
A callback of the signature (dialogInstance)
+          that will be called after the dialog has been closed and
+          removed from the DOM. No return value.

+        

+
+      
Also adds an openNotification(template, options) →
+      closeFunction function that simply shows an HTML
+      fragment as a notification at the top of the editor. It takes a
+      single option: duration, the amount of time after
+      which the notification will be automatically closed. If 
+      duration is zero, the dialog will not be closed automatically.

+
+      
Depends on addon/dialog/dialog.css.

+
+      
search/searchcursor.js

+      
Adds the getSearchCursor(query, start, caseFold) →
+      cursor method to CodeMirror instances, which can be used
+      to implement search/replace functionality. query
+      can be a regular expression or a string (only strings will match
+      across lines—if they contain newlines). start
+      provides the starting position of the search. It can be
+      a {line, ch} object, or can be left off to default
+      to the start of the document. caseFold is only
+      relevant when matching a string. It will cause the search to be
+      case-insensitive. A search cursor has the following methods:
+        

+          
findNext() → boolean

+          
findPrevious() → boolean

+          
Search forward or backward from the current position.
+          The return value indicates whether a match was found. If
+          matching a regular expression, the return value will be the
+          array returned by the match method, in case you
+          want to extract matched groups.

+          
from() → {line, ch}

+          
to() → {line, ch}

+          
These are only valid when the last call
+          to findNext or findPrevious did
+          not return false. They will return {line, ch}
+          objects pointing at the start and end of the match.

+          
replace(text: string, ?origin: string)

+          
Replaces the currently found match with the given text
+          and adjusts the cursor position to reflect the
+          replacement.

+        

+
+      
+      
Implements the search commands. CodeMirror has keys bound to
+      these by default, but will not do anything with them unless an
+      implementation is provided. Depends
+      on searchcursor.js, and will make use
+      of openDialog when
+      available to make prompting for search queries less ugly.

+
+      
search/jump-to-line.js

+      
Implements a jumpToLine command and binding Alt-G to it.
+      Accepts linenumber, +/-linenumber, line:char,
+      scroll% and :linenumber formats.
+      This will make use of openDialog
+      when available to make prompting for line number neater.

+
+      
search/matchesonscrollbar.js

+      
Adds a showMatchesOnScrollbar method to editor
+      instances, which should be given a query (string or regular
+      expression), optionally a case-fold flag (only applicable for
+      strings), and optionally a class name (defaults
+      to CodeMirror-search-match) as arguments. When
+      called, matches of the given query will be displayed on the
+      editor's vertical scrollbar. The method returns an object with
+      a clear method that can be called to remove the
+      matches. Depends on
+      the annotatescrollbar
+      addon, and
+      the matchesonscrollbar.css
+      file provides a default (transparent yellowish) definition of
+      the CSS class applied to the matches. Note that the matches are
+      only perfectly aligned if your scrollbar does not have buttons
+      at the top and bottom. You can use
+      the simplescrollbar
+      addon to make sure of this. If this addon is loaded,
+      the search addon will
+      automatically use it.

+
+      
edit/matchbrackets.js

+      
Defines an option matchBrackets which, when set
+      to true, causes matching brackets to be highlighted whenever the
+      cursor is next to them. It also adds a
+      method matchBrackets that forces this to happen
+      once, and a method findMatchingBracket that can be
+      used to run the bracket-finding algorithm that this uses
+      internally.

+
+      
edit/closebrackets.js

+      
Defines an option autoCloseBrackets that will
+      auto-close brackets and quotes when typed. By default, it'll
+      auto-close ()[]{}''"", but you can pass it a string
+      similar to that (containing pairs of matching characters), or an
+      object with pairs and
+      optionally explode properties to customize
+      it. explode should be a similar string that gives
+      the pairs of characters that, when enter is pressed between
+      them, should have the second character also moved to its own
+      line. Demo here.

+
+      
edit/matchtags.js

+      
Defines an option matchTags that, when enabled,
+      will cause the tags around the cursor to be highlighted (using
+      the CodeMirror-matchingtag class). Also
+      defines
+      a command toMatchingTag,
+      which you can bind a key to in order to jump to the tag matching
+      the one under the cursor. Depends on
+      the addon/fold/xml-fold.js
+      addon. Demo here.

+
+      
edit/trailingspace.js

+      
Adds an option showTrailingSpace which, when
+      enabled, adds the CSS class cm-trailingspace to
+      stretches of whitespace at the end of lines.
+      The demo has a nice
+      squiggly underline style for this class.

+
+      
edit/closetag.js

+      
Defines an autoCloseTags option that will
+      auto-close XML tags when '>' or '/'
+      is typed, and
+      a closeTag command that
+      closes the nearest open tag. Depends on
+      the fold/xml-fold.js addon. See
+      the demo.

+
+      
edit/continuelist.js

+      
Markdown specific. Defines
+      a "newlineAndIndentContinueMarkdownList" command
+      that can be bound to enter to automatically
+      insert the leading characters for continuing a list. See
+      the Markdown mode
+      demo.

+
+      
comment/comment.js

+      
Addon for commenting and uncommenting code. Adds four
+      methods to CodeMirror instances:
+      

+        
toggleComment(from: {line, ch}, to: {line, ch}, ?options: object)

+        
Tries to uncomment the current selection, and if that
+        fails, line-comments it.

+        
lineComment(from: {line, ch}, to: {line, ch}, ?options: object)

+        
Set the lines in the given range to be line comments. Will
+        fall back to blockComment when no line comment
+        style is defined for the mode.

+        
blockComment(from: {line, ch}, to: {line, ch}, ?options: object)

+        
Wrap the code in the given range in a block comment. Will
+        fall back to lineComment when no block comment
+        style is defined for the mode.

+        
uncomment(from: {line, ch}, to: {line, ch}, ?options: object) → boolean

+        
Try to uncomment the given range.
+          Returns true if a comment range was found and
+          removed, false otherwise.

+      

+      The options object accepted by these methods may
+      have the following properties:
+      

+        
blockCommentStart, blockCommentEnd, blockCommentLead, lineComment: string

+        
Override the comment string
+        properties of the mode with custom comment strings.

+        
padding: string

+        
A string that will be inserted after opening and leading
+        markers, and before closing comment markers. Defaults to a
+        single space.

+        
commentBlankLines: boolean

+        
Whether, when adding line comments, to also comment lines
+        that contain only whitespace.

+        
indent: boolean

+        
When adding line comments and this is turned on, it will
+        align the comment block to the current indentation of the
+        first line of the block.

+        
fullLines: boolean

+        
When block commenting, this controls whether the whole
+        lines are indented, or only the precise range that is given.
+        Defaults to true.

+      

+      The addon also defines
+      a toggleComment command,
+      which is a shorthand command for calling
+      toggleComment with no options.

+
+      
fold/foldcode.js

+      
Helps with code folding. Adds a foldCode method
+      to editor instances, which will try to do a code fold starting
+      at the given line, or unfold the fold that is already present.
+      The method takes as first argument the position that should be
+      folded (may be a line number or
+      a Pos), and as second optional
+      argument either a range-finder function, or an options object,
+      supporting the following properties:
+      

+        
rangeFinder: fn(CodeMirror, Pos)

+        
The function that is used to find
+        foldable ranges. If this is not directly passed, it will
+        default to CodeMirror.fold.auto, which
+        uses getHelpers with
+        a "fold" type to find folding functions
+        appropriate for the local mode. There are files in
+        the addon/fold/
+        directory providing CodeMirror.fold.brace, which
+        finds blocks in brace languages (JavaScript, C, Java,
+        etc), CodeMirror.fold.indent, for languages where
+        indentation determines block structure (Python, Haskell),
+        and CodeMirror.fold.xml, for XML-style languages,
+        and CodeMirror.fold.comment, for folding comment
+        blocks.

+        
widget: string|Element

+        
The widget to show for folded ranges. Can be either a
+        string, in which case it'll become a span with
+        class CodeMirror-foldmarker, or a DOM node.

+        
scanUp: boolean

+        
When true (default is false), the addon will try to find
+        foldable ranges on the lines above the current one if there
+        isn't an eligible one on the given line.

+        
minFoldSize: integer

+        
The minimum amount of lines that a fold should span to be
+        accepted. Defaults to 0, which also allows single-line
+        folds.

+      

+      See the demo for an
+      example.

+
+      
fold/foldgutter.js

+      
Provides an option foldGutter, which can be
+      used to create a gutter with markers indicating the blocks that
+      can be folded. Create a gutter using
+      the gutters option,
+      giving it the class CodeMirror-foldgutter or
+      something else if you configure the addon to use a different
+      class, and this addon will show markers next to folded and
+      foldable blocks, and handle clicks in this gutter. Note that
+      CSS styles should be applied to make the gutter, and the fold
+      markers within it, visible. A default set of CSS styles are
+      available in:
+      
+        addon/fold/foldgutter.css
+      .
+      The option
+      can be either set to true, or an object containing
+      the following optional option fields:
+      

+        
gutter: string

+        
The CSS class of the gutter. Defaults
+        to "CodeMirror-foldgutter". You will have to
+        style this yourself to give it a width (and possibly a
+        background). See the default gutter style rules above.

+        
indicatorOpen: string | Element

+        
A CSS class or DOM element to be used as the marker for
+        open, foldable blocks. Defaults
+        to "CodeMirror-foldgutter-open".

+        
indicatorFolded: string | Element

+        
A CSS class or DOM element to be used as the marker for
+        folded blocks. Defaults to "CodeMirror-foldgutter-folded".

+        
rangeFinder: fn(CodeMirror, Pos)

+        
The range-finder function to use when determining whether
+        something can be folded. When not
+        given, CodeMirror.fold.auto
+        will be used as default.

+      

+      The foldOptions editor option can be set to an
+      object to provide an editor-wide default configuration.
+      Demo here.

+
+      
runmode/runmode.js

+      
Can be used to run a CodeMirror mode over text without
+      actually opening an editor instance.
+      See the demo for an example.
+      There are alternate versions of the file available for
+      running stand-alone
+      (without including all of CodeMirror) and
+      for running under
+      node.js (see bin/source-highlight for an example of using the latter).

+
+      
runmode/colorize.js

+      
Provides a convenient way to syntax-highlight code snippets
+      in a webpage. Depends on
+      the runmode addon (or
+      its standalone variant). Provides
+      a CodeMirror.colorize function that can be called
+      with an array (or other array-ish collection) of DOM nodes that
+      represent the code snippets. By default, it'll get
+      all pre tags. Will read the data-lang
+      attribute of these nodes to figure out their language, and
+      syntax-color their content using the relevant CodeMirror mode
+      (you'll have to load the scripts for the relevant modes
+      yourself). A second argument may be provided to give a default
+      mode, used when no language attribute is found for a node. Used
+      in this manual to highlight example code.

+
+      
mode/overlay.js

+      
Mode combinator that can be used to extend a mode with an
+      'overlay' — a secondary mode is run over the stream, along with
+      the base mode, and can color specific pieces of text without
+      interfering with the base mode.
+      Defines CodeMirror.overlayMode, which is used to
+      create such a mode. See this
+      demo for a detailed example.

+
+      
mode/multiplex.js

+      
Mode combinator that can be used to easily 'multiplex'
+      between several modes.
+      Defines CodeMirror.multiplexingMode which, when
+      given as first argument a mode object, and as other arguments
+      any number of {open, close, mode [, delimStyle, innerStyle, parseDelimiters]}
+      objects, will return a mode object that starts parsing using the
+      mode passed as first argument, but will switch to another mode
+      as soon as it encounters a string that occurs in one of
+      the open fields of the passed objects. When in a
+      sub-mode, it will go back to the top mode again when
+      the close string is encountered.
+      Pass "\n" for open or close
+      if you want to switch on a blank line.
+      
  • When delimStyle is specified, it will be the token
+      style returned for the delimiter tokens (as well as
+      [delimStyle]-open on the opening token and
+      [delimStyle]-close on the closing token).
    • 
+      
  • When innerStyle is specified, it will be the token
+      style added for each inner mode token.
    • 
+      
  • When parseDelimiters is true, the content of
+      the delimiters will also be passed to the inner mode.
+      (And delimStyle is ignored.)
 The outer
+      mode will not see the content between the delimiters.
+      See this demo for an
+      example.

+
+      
hint/show-hint.js

+      
Provides a framework for showing autocompletion hints.
+      Defines editor.showHint, which takes an optional
+      options object, and pops up a widget that allows the user to
+      select a completion. Finding hints is done with a hinting
+      functions (the hint option), which is a function
+      that take an editor instance and options object, and return
+      a {list, from, to} object, where list
+      is an array of strings or objects (the completions),
+      and from and to give the start and end
+      of the token that is being completed as {line, ch}
+      objects. An optional selectedHint property (an
+      integer) can be added to the completion object to control the
+      initially selected hint.

+      
If no hinting function is given, the addon will
+      use CodeMirror.hint.auto, which
+      calls getHelpers with
+      the "hint" type to find applicable hinting
+      functions, and tries them one by one. If that fails, it looks
+      for a "hintWords" helper to fetch a list of
+      completable words for the mode, and
+      uses CodeMirror.hint.fromList to complete from
+      those.

+      
When completions aren't simple strings, they should be
+      objects with the following properties:
+      

+        
text: string

+        
The completion text. This is the only required
+        property.

+        
displayText: string

+        
The text that should be displayed in the menu.

+        
className: string

+        
A CSS class name to apply to the completion's line in the
+        menu.

+        
render: fn(Element, self, data)

+        
A method used to create the DOM structure for showing the
+        completion by appending it to its first argument.

+        
hint: fn(CodeMirror, self, data)

+        
A method used to actually apply the completion, instead of
+        the default behavior.

+        
from: {line, ch}

+        
Optional from position that will be used by pick() instead
+        of the global one passed with the full list of completions.

+        
to: {line, ch}

+        
Optional to position that will be used by pick() instead
+        of the global one passed with the full list of completions.

+      

+      The plugin understands the following options (the options object
+      will also be passed along to the hinting function, which may
+      understand additional options):
+      

+        
hint: function

+        
A hinting function, as specified above. It is possible to
+        set the async property on a hinting function to
+        true, in which case it will be called with
+        arguments (cm, callback, ?options), and the
+        completion interface will only be popped up when the hinting
+        function calls the callback, passing it the object holding the
+        completions. By default, hinting only works when there is no
+        selection. You can give a hinting function
+        a supportsSelection property with a truthy value
+        to indicate that it supports selections.

+        
completeSingle: boolean

+        
Determines whether, when only a single completion is
+        available, it is completed without showing the dialog.
+        Defaults to true.

+        
alignWithWord: boolean

+        
Whether the pop-up should be horizontally aligned with the
+        start of the word (true, default), or with the cursor (false).

+        
closeOnUnfocus: boolean

+        
When enabled (which is the default), the pop-up will close
+        when the editor is unfocused.

+        
customKeys: keymap

+        
Allows you to provide a custom key map of keys to be active
+        when the pop-up is active. The handlers will be called with an
+        extra argument, a handle to the completion menu, which
+        has moveFocus(n), setFocus(n), pick(),
+        and close() methods (see the source for details),
+        that can be used to change the focused element, pick the
+        current element or close the menu. Additionally menuSize()
+        can give you access to the size of the current dropdown menu,
+        length give you the number of available completions, and
+        data give you full access to the completion returned by the
+        hinting function.

+        
extraKeys: keymap

+        
Like customKeys above, but the bindings will
+        be added to the set of default bindings, instead of replacing
+        them.

+      

+      The following events will be fired on the completions object
+      during completion:
+      

+        
"shown" ()

+        
Fired when the pop-up is shown.

+        
"select" (completion, Element)

+        
Fired when a completion is selected. Passed the completion
+        value (string or object) and the DOM node that represents it
+        in the menu.

+        
"pick" (completion)

+        
Fired when a completion is picked. Passed the completion value
+        (string or object).

+        
"close" ()

+        
Fired when the completion is finished.

+      

+      This addon depends on styles
+      from addon/hint/show-hint.css. Check
+      out the demo for an
+      example.

+
+      
hint/javascript-hint.js

+      
Defines a simple hinting function for JavaScript
+      (CodeMirror.hint.javascript) and CoffeeScript
+      (CodeMirror.hint.coffeescript) code. This will
+      simply use the JavaScript environment that the editor runs in as
+      a source of information about objects and their properties.

+
+      
hint/xml-hint.js

+      
Defines CodeMirror.hint.xml, which produces
+      hints for XML tagnames, attribute names, and attribute values,
+      guided by a schemaInfo option (a property of the
+      second argument passed to the hinting function, or the third
+      argument passed to CodeMirror.showHint).
The
+      schema info should be an object mapping tag names to information
+      about these tags, with optionally a "!top" property
+      containing a list of the names of valid top-level tags. The
+      values of the properties should be objects with optional
+      properties children (an array of valid child
+      element names, omit to simply allow all tags to appear)
+      and attrs (an object mapping attribute names
+      to null for free-form attributes, and an array of
+      valid values for restricted
+      attributes). Demo
+      here.

+
+      
hint/html-hint.js

+      
Provides schema info to
+      the xml-hint addon for HTML
+      documents. Defines a schema
+      object CodeMirror.htmlSchema that you can pass to
+      as a schemaInfo option, and
+      a CodeMirror.hint.html hinting function that
+      automatically calls CodeMirror.hint.xml with this
+      schema data. See
+      the demo.

+
+      
hint/css-hint.js

+      
A hinting function for CSS, SCSS, or LESS code.
+      Defines CodeMirror.hint.css.

+
+      
hint/anyword-hint.js

+      
A very simple hinting function
+      (CodeMirror.hint.anyword) that simply looks for
+      words in the nearby code and completes to those. Takes two
+      optional options, word, a regular expression that
+      matches words (sequences of one or more character),
+      and range, which defines how many lines the addon
+      should scan when completing (defaults to 500).

+
+      
hint/sql-hint.js

+      
A simple SQL hinter. Defines CodeMirror.hint.sql.
+      Takes two optional options, tables, a object with
+      table names as keys and array of respective column names as values,
+      and defaultTable, a string corresponding to a
+      table name in tables for autocompletion.

+
+      
search/match-highlighter.js

+      
Adds a highlightSelectionMatches option that
+      can be enabled to highlight all instances of a currently
+      selected word. Can be set either to true or to an object
+      containing the following options: minChars, for the
+      minimum amount of selected characters that triggers a highlight
+      (default 2), style, for the style to be used to
+      highlight the matches (default "matchhighlight",
+      which will correspond to CSS
+      class cm-matchhighlight),
+      and showToken which can be set to true
+      or to a regexp matching the characters that make up a word. When
+      enabled, it causes the current word to be highlighted when
+      nothing is selected (defaults to off).
+      Demo here.

+
+      
lint/lint.js

+      
Defines an interface component for showing linting warnings,
+      with pluggable warning sources
+      (see html-lint.js,
+      json-lint.js,
+      javascript-lint.js,
+      coffeescript-lint.js,
+      and css-lint.js
+      in the same directory). Defines a lint option that
+      can be set to an annotation source (for
+      example CodeMirror.lint.javascript), to an options
+      object (in which case the getAnnotations field is
+      used as annotation source), or simply to true. When
+      no annotation source is
+      specified, getHelper with
+      type "lint" is used to find an annotation function.
+      An annotation source function should, when given a document
+      string, an options object, and an editor instance, return an
+      array of {message, severity, from, to} objects
+      representing problems. When the function has
+      an async property with a truthy value, it will be
+      called with an additional second argument, which is a callback
+      to pass the array to. By default, the linter will run
+      (debounced) whenever the document is changed. You can pass
+      a lintOnChange: false option to disable that.
+      Depends on addon/lint/lint.css. A demo can be
+      found here.

+
+      
selection/mark-selection.js

+      
Causes the selected text to be marked with the CSS class
+      CodeMirror-selectedtext when the styleSelectedText option
+      is enabled. Useful to change the colour of the selection (in addition to the background),
+      like in this demo.

+
+      
selection/active-line.js

+      
Defines a styleActiveLine option that, when enabled,
+      gives the wrapper of the active line the class CodeMirror-activeline,
+      adds a background with the class CodeMirror-activeline-background,
+      and adds the class CodeMirror-activeline-gutter to the
+      line's gutter space is enabled. See the
+      demo.

+
+      
selection/selection-pointer.js

+      
Defines a selectionPointer option which you can
+      use to control the mouse cursor appearance when hovering over
+      the selection. It can be set to a string,
+      like "pointer", or to true, in which case
+      the "default" (arrow) cursor will be used. You can
+      see a demo here.

+
+      
mode/loadmode.js

+      
Defines a CodeMirror.requireMode(modename,
+      callback) function that will try to load a given mode and
+      call the callback when it succeeded. You'll have to
+      set CodeMirror.modeURL to a string that mode paths
+      can be constructed from, for
+      example "mode/%N/%N.js"—the %N's will
+      be replaced with the mode name. Also
+      defines CodeMirror.autoLoadMode(instance, mode),
+      which will ensure the given mode is loaded and cause the given
+      editor instance to refresh its mode when the loading
+      succeeded. See the demo.

+
+      
mode/meta.js

+      
Provides meta-information about all the modes in the
+      distribution in a single file.
+      Defines CodeMirror.modeInfo, an array of objects
+      with {name, mime, mode} properties,
+      where name is the human-readable
+      name, mime the MIME type, and mode the
+      name of the mode file that defines this MIME. There are optional
+      properties mimes, which holds an array of MIME
+      types for modes with multiple MIMEs associated,
+      and ext, which holds an array of file extensions
+      associated with this mode. Four convenience
+      functions, CodeMirror.findModeByMIME,
+      CodeMirror.findModeByExtension,
+      CodeMirror.findModeByFileName
+      and CodeMirror.findModeByName are provided, which
+      return such an object given a MIME, extension, file name or mode name
+      string. Note that, for historical reasons, this file resides in the
+      top-level mode directory, not
+      under addon. Demo.

+
+      
comment/continuecomment.js

+      
Adds a continueComments option, which sets whether the
+      editor will make the next line continue a comment when you press Enter
+      inside a comment block. Can be set to a boolean to enable/disable this
+      functionality. Set to a string, it will continue comments using a custom
+      shortcut. Set to an object, it will use the key property for
+      a custom shortcut and the boolean continueLineComment
+      property to determine whether single-line comments should be continued
+      (defaulting to true).

+
+      
display/placeholder.js

+      
Adds a placeholder option that can be used to
+      make content appear in the editor when it is empty and not
+      focused. It can hold either a string or a DOM node. Also gives
+      the editor a CodeMirror-empty CSS class whenever it
+      doesn't contain any text.
+      See the demo.

+
+      
display/fullscreen.js

+      
Defines an option fullScreen that, when set
+      to true, will make the editor full-screen (as in,
+      taking up the whole browser window). Depends
+      on fullscreen.css. Demo
+      here.

+
+      
display/autorefresh.js

+      
This addon can be useful when initializing an editor in a
+      hidden DOM node, in cases where it is difficult to
+      call refresh when the editor
+      becomes visible. It defines an option autoRefresh
+      which you can set to true to ensure that, if the editor wasn't
+      visible on initialization, it will be refreshed the first time
+      it becomes visible. This is done by polling every 250
+      milliseconds (you can pass a value like {delay:
+      500} as the option value to configure this). Note that
+      this addon will only refresh the editor once when it
+      first becomes visible, and won't take care of further restyling
+      and resizing.

+
+      
scroll/simplescrollbars.js

+      
Defines two additional scrollbar
+      models, "simple" and "overlay"
+      (see demo) that can
+      be selected with
+      the scrollbarStyle
+      option. Depends
+      on simplescrollbars.css,
+      which can be further overridden to style your own
+      scrollbars.

+
+      
scroll/annotatescrollbar.js

+      
Provides functionality for showing markers on the scrollbar
+      to call out certain parts of the document. Adds a
+      method annotateScrollbar to editor instances that
+      can be called, with a CSS class name as argument, to create a
+      set of annotations. The method returns an object
+      whose update method can be called with an array
+      of {from: Pos, to: Pos} objects marking the ranges
+      to be highlighted. To detach the annotations, call the
+      object's clear method.

+
+      
display/rulers.js

+      
Adds a rulers option, which can be used to show
+      one or more vertical rulers in the editor. The option, if
+      defined, should be given an array of {column [, className,
+      color, lineStyle, width]} objects or numbers (which
+      indicate a column). The ruler will be displayed at the column
+      indicated by the number or the column property.
+      The className property can be used to assign a
+      custom style to a ruler. Demo
+      here.

+
+      
display/panel.js

+      
Defines an addPanel method for CodeMirror
+      instances, which places a DOM node above or below an editor, and
+      shrinks the editor to make room for the node. The method takes
+      as first argument as DOM node, and as second an optional options
+      object. The Panel object returned by this method
+      has a clear method that is used to remove the
+      panel, and a changed method that can be used to
+      notify the addon when the size of the panel's DOM node has
+      changed.

+      The method accepts the following options:
+      

+        
position : string

+        
Controls the position of the newly added panel. The
+        following values are recognized:
+          

+            
top (default)

+            
Adds the panel at the very top.

+            
after-top

+            
Adds the panel at the bottom of the top panels.

+            
bottom

+            
Adds the panel at the very bottom.

+            
before-bottom

+            
Adds the panel at the top of the bottom panels.

+          

+        

+        
before : Panel

+        
The new panel will be added before the given panel.

+        
after : Panel

+        
The new panel will be added after the given panel.

+        
replace : Panel

+        
The new panel will replace the given panel.

+      

+      When using the after, before or replace options,
+      if the panel doesn't exists or has been removed,
+      the value of the position option will be used as a fallback.
+      

+      A demo of the addon is available here.
+      

+
+      
wrap/hardwrap.js

+      
Addon to perform hard line wrapping/breaking for paragraphs
+      of text. Adds these methods to editor instances:
+        

+          
wrapParagraph(?pos: {line, ch}, ?options: object)

+          
Wraps the paragraph at the given position.
+          If pos is not given, it defaults to the cursor
+          position.

+          
wrapRange(from: {line, ch}, to: {line, ch}, ?options: object)

+          
Wraps the given range as one big paragraph.

+          
wrapParagraphsInRange(from: {line, ch}, to: {line, ch}, ?options: object)

+          
Wraps the paragraphs in (and overlapping with) the
+          given range individually.

+        

+        The following options are recognized:
+        

+          
paragraphStart, paragraphEnd: RegExp

+          
Blank lines are always considered paragraph boundaries.
+          These options can be used to specify a pattern that causes
+          lines to be considered the start or end of a paragraph.

+          
column: number

+          
The column to wrap at. Defaults to 80.

+          
wrapOn: RegExp

+          
A regular expression that matches only those
+          two-character strings that allow wrapping. By default, the
+          addon wraps on whitespace and after dash characters.

+          
killTrailingSpace: boolean

+          
Whether trailing space caused by wrapping should be
+          preserved, or deleted. Defaults to true.

+        

+        A demo of the addon is available here.
+      

+
+      
merge/merge.js

+      
Implements an interface for merging changes, using either a
+      2-way or a 3-way view. The CodeMirror.MergeView
+      constructor takes arguments similar to
+      the CodeMirror
+      constructor, first a node to append the interface to, and then
+      an options object. Options are passed through to the editors
+      inside the view. These extra options are recognized:
+        

+          
origLeft and origRight: string

+          
If given these provide original versions of the
+          document, which will be shown to the left and right of the
+          editor in non-editable CodeMirror instances. The merge
+          interface will highlight changes between the editable
+          document and the original(s). To create a 2-way (as opposed
+          to 3-way) merge view, provide only one of them.

+          
revertButtons: boolean

+          
Determines whether buttons that allow the user to revert
+          changes are shown. Defaults to true.

+          
connect: string

+          
Sets the style used to connect changed chunks of code.
+          By default, connectors are drawn. When this is set
+          to "align", the smaller chunk is padded to
+          align with the bigger chunk instead.

+          
collapseIdentical: boolean|number

+          
When true (default is false), stretches of unchanged
+          text will be collapsed. When a number is given, this
+          indicates the amount of lines to leave visible around such
+          stretches (which defaults to 2).

+          
allowEditingOriginals: boolean

+          
Determines whether the original editor allows editing.
+          Defaults to false.

+          
showDifferences: boolean

+          
When true (the default), changed pieces of text are
+          highlighted.

+        

+        The addon also defines commands "goNextDiff"
+        and "goPrevDiff" to quickly jump to the next
+        changed chunk. Demo
+        here.

+
+      
tern/tern.js

+      
Provides integration with
+      the Tern JavaScript analysis
+      engine, for completion, definition finding, and minor
+      refactoring help. See the demo
+      for a very simple integration. For more involved scenarios, see
+      the comments at the top of
+      the addon and the
+      implementation of the
+      (multi-file) demonstration
+      on the Tern website.

+    

+

+
+

+    
Writing CodeMirror Modes

+
+    
Modes typically consist of a single JavaScript file. This file
+    defines, in the simplest case, a lexer (tokenizer) for your
+    language—a function that takes a character stream as input,
+    advances it past a token, and returns a style for that token. More
+    advanced modes can also handle indentation for the language.

+
+    
This section describes the low-level mode interface. Many modes
+    are written directly against this, since it offers a lot of
+    control, but for a quick mode definition, you might want to use
+    the simple mode addon.

+
+    
The mode script should
+    call CodeMirror.defineMode to
+    register itself with CodeMirror. This function takes two
+    arguments. The first should be the name of the mode, for which you
+    should use a lowercase string, preferably one that is also the
+    name of the files that define the mode (i.e. "xml" is
+    defined in xml.js). The second argument should be a
+    function that, given a CodeMirror configuration object (the thing
+    passed to the CodeMirror function) and an optional
+    mode configuration object (as in
+    the mode option), returns
+    a mode object.

+
+    
Typically, you should use this second argument
+    to defineMode as your module scope function (modes
+    should not leak anything into the global scope!), i.e. write your
+    whole mode inside this function.

+
+    
The main responsibility of a mode script is parsing
+    the content of the editor. Depending on the language and the
+    amount of functionality desired, this can be done in really easy
+    or extremely complicated ways. Some parsers can be stateless,
+    meaning that they look at one element (token) of the code
+    at a time, with no memory of what came before. Most, however, will
+    need to remember something. This is done by using a state
+    object, which is an object that is always passed when
+    reading a token, and which can be mutated by the tokenizer.

+
+    
Modes that use a state must define
+    a startState method on their mode
+    object. This is a function of no arguments that produces a state
+    object to be used at the start of a document.

+
+    
The most important part of a mode object is
+    its token(stream, state) method. All
+    modes must define this method. It should read one token from the
+    stream it is given as an argument, optionally update its state,
+    and return a style string, or null for tokens that do
+    not have to be styled. For your styles, you are encouraged to use
+    the 'standard' names defined in the themes (without
+    the cm- prefix). If that fails, it is also possible
+    to come up with your own and write your own CSS theme file.

+
+    
A typical token string would
+    be "variable" or "comment". Multiple
+    styles can be returned (separated by spaces), for
+    example "string error" for a thing that looks like a
+    string but is invalid somehow (say, missing its closing quote).
+    When a style is prefixed by "line-"
+    or "line-background-", the style will be applied to
+    the whole line, analogous to what
+    the addLineClass method
+    does—styling the "text" in the simple case, and
+    the "background" element
+    when "line-background-" is prefixed.

+
+    
The stream object that's passed
+    to token encapsulates a line of code (tokens may
+    never span lines) and our current position in that line. It has
+    the following API:

+
+    

+      
eol() → boolean

+      
Returns true only if the stream is at the end of the
+      line.

+      
sol() → boolean

+      
Returns true only if the stream is at the start of the
+      line.

+
+      
peek() → string

+      
Returns the next character in the stream without advancing
+      it. Will return a null at the end of the
+      line.

+      
next() → string

+      
Returns the next character in the stream and advances it.
+      Also returns null when no more characters are
+      available.

+
+      
eat(match: string|regexp|function(char: string) → boolean) → string

+      
match can be a character, a regular expression,
+      or a function that takes a character and returns a boolean. If
+      the next character in the stream 'matches' the given argument,
+      it is consumed and returned. Otherwise, undefined
+      is returned.

+      
eatWhile(match: string|regexp|function(char: string) → boolean) → boolean

+      
Repeatedly calls eat with the given argument,
+      until it fails. Returns true if any characters were eaten.

+      
eatSpace() → boolean

+      
Shortcut for eatWhile when matching
+      white-space.

+      
skipToEnd()

+      
Moves the position to the end of the line.

+      
skipTo(ch: string) → boolean

+      
Skips to the next occurrence of the given character, if
+      found on the current line (doesn't advance the stream if the
+      character does not occur on the line). Returns true if the
+      character was found.

+      
match(pattern: string, ?consume: boolean, ?caseFold: boolean) → boolean

+      
match(pattern: regexp, ?consume: boolean) → array<string>

+      
Act like a
+      multi-character eat—if consume is true
+      or not given—or a look-ahead that doesn't update the stream
+      position—if it is false. pattern can be either a
+      string or a regular expression starting with ^.
+      When it is a string, caseFold can be set to true to
+      make the match case-insensitive. When successfully matching a
+      regular expression, the returned value will be the array
+      returned by match, in case you need to extract
+      matched groups.

+
+      
backUp(n: integer)

+      
Backs up the stream n characters. Backing it up
+      further than the start of the current token will cause things to
+      break, so be careful.

+      
column() → integer

+      
Returns the column (taking into account tabs) at which the
+      current token starts.

+      
indentation() → integer

+      
Tells you how far the current line has been indented, in
+      spaces. Corrects for tab characters.

+
+      
current() → string

+      
Get the string between the start of the current token and
+      the current stream position.

+    

+
+    
By default, blank lines are simply skipped when
+    tokenizing a document. For languages that have significant blank
+    lines, you can define
+    a blankLine(state) method on your
+    mode that will get called whenever a blank line is passed over, so
+    that it can update the parser state.

+
+    
Because state object are mutated, and CodeMirror
+    needs to keep valid versions of a state around so that it can
+    restart a parse at any line, copies must be made of state objects.
+    The default algorithm used is that a new state object is created,
+    which gets all the properties of the old object. Any properties
+    which hold arrays get a copy of these arrays (since arrays tend to
+    be used as mutable stacks). When this is not correct, for example
+    because a mode mutates non-array properties of its state object, a
+    mode object should define
+    a copyState method, which is given a
+    state and should return a safe copy of that state.

+
+    
If you want your mode to provide smart indentation
+    (through the indentLine
+    method and the indentAuto
+    and newlineAndIndent commands, to which keys can be
+    bound), you must define
+    an indent(state, textAfter) method
+    on your mode object.

+
+    
The indentation method should inspect the given state object,
+    and optionally the textAfter string, which contains
+    the text on the line that is being indented, and return an
+    integer, the amount of spaces to indent. It should usually take
+    the indentUnit
+    option into account. An indentation method may
+    return CodeMirror.Pass to indicate that it
+    could not come up with a precise indentation.

+
+    
To work well with
+    the commenting addon, a mode may
+    define lineComment (string that
+    starts a line
+    comment), blockCommentStart, blockCommentEnd
+    (strings that start and end block comments),
+    and blockCommentLead (a string to put at the start of
+    continued lines in a block comment). All of these are
+    optional.

+
+    
Finally, a mode may define either
+    an electricChars or an electricInput
+    property, which are used to automatically reindent the line when
+    certain patterns are typed and
+    the electricChars
+    option is enabled. electricChars may be a string, and
+    will trigger a reindent whenever one of the characters in that
+    string are typed. Often, it is more appropriate to
+    use electricInput, which should hold a regular
+    expression, and will trigger indentation when the part of the
+    line before the cursor matches the expression. It should
+    usually end with a $ character, so that it only
+    matches when the indentation-changing pattern was just typed, not when something was
+    typed after the pattern.

+
+    
So, to summarize, a mode must provide
+    a token method, and it may
+    provide startState, copyState,
+    and indent methods. For an example of a trivial mode,
+    see the diff mode, for a more
+    involved example, see the C-like
+    mode.

+
+    
Sometimes, it is useful for modes to nest—to have one
+    mode delegate work to another mode. An example of this kind of
+    mode is the mixed-mode HTML
+    mode. To implement such nesting, it is usually necessary to
+    create mode objects and copy states yourself. To create a mode
+    object, there are CodeMirror.getMode(options,
+    parserConfig), where the first argument is a configuration
+    object as passed to the mode constructor function, and the second
+    argument is a mode specification as in
+    the mode option. To copy a
+    state object, call CodeMirror.copyState(mode, state),
+    where mode is the mode that created the given
+    state.

+
+    
In a nested mode, it is recommended to add an
+    extra method, innerMode which, given
+    a state object, returns a {state, mode} object with
+    the inner mode and its state for the current position. These are
+    used by utility scripts such as the tag
+    closer to get context information. Use
+    the CodeMirror.innerMode helper function to, starting
+    from a mode and a state, recursively walk down to the innermost
+    mode and state.

+
+    
To make indentation work properly in a nested parser, it is
+    advisable to give the startState method of modes that
+    are intended to be nested an optional argument that provides the
+    base indentation for the block of code. The JavaScript and CSS
+    parser do this, for example, to allow JavaScript and CSS code
+    inside the mixed-mode HTML mode to be properly indented.

+
+    
It is possible, and encouraged, to associate
+    your mode, or a certain configuration of your mode, with
+    a MIME type. For
+    example, the JavaScript mode associates itself
+    with text/javascript, and its JSON variant
+    with application/json. To do this,
+    call CodeMirror.defineMIME(mime,
+    modeSpec), where modeSpec can be a string or
+    object specifying a mode, as in
+    the mode option.

+
+    
If a mode specification wants to add some properties to the
+    resulting mode object, typically for use
+    with getHelpers, it may
+    contain a modeProps property, which holds an object.
+    This object's properties will be copied to the actual mode
+    object.

+
+    
Sometimes, it is useful to add or override mode
+    object properties from external code.
+    The CodeMirror.extendMode function
+    can be used to add properties to mode objects produced for a
+    specific mode. Its first argument is the name of the mode, its
+    second an object that specifies the properties that should be
+    added. This is mostly useful to add utilities that can later be
+    looked up through getMode.

+

+
+

+    
VIM Mode API

+
+    
CodeMirror has a robust VIM mode that attempts to faithfully
+    emulate VIM's most useful features. It can be enabled by
+    including keymap/vim.js
+     and setting the keyMap option to
+    "vim".

+
+    
Configuration

+
+    
VIM mode accepts configuration options for customizing
+    behavior at run time. These methods can be called at any time
+    and will affect all existing CodeMirror instances unless
+    specified otherwise. The methods are exposed on the
+    CodeMirror.Vim object.

+
+    

+      
setOption(name: string, value: any, ?cm: CodeMirror, ?cfg: object)

+      
Sets the value of a VIM option. name should
+      be the name of an option. If cfg.scope is not set
+      and cm is provided, then sets the global and
+      instance values of the option. Otherwise, sets either the
+      global or instance value of the option depending on whether
+      cfg.scope is global or
+      local.

+      
getOption(name: string, ?cm: CodeMirror: ?cfg: object)

+      
Gets the current value of a VIM option. If
+      cfg.scope is not set and cm is
+      provided, then gets the instance value of the option, falling
+      back to the global value if not set. If cfg.scope is provided, then gets the global or
+      local value without checking the other.

+
+      
map(lhs: string, rhs: string, ?context: string)

+      
Maps a key sequence to another key sequence. Implements
+      VIM's :map command. To map ; to : in VIM would be
+      :map ; :. That would translate to
+      CodeMirror.Vim.map(';', ':');.
+      The context can be normal,
+      visual, or insert, which correspond
+      to :nmap, :vmap, and
+      :imap
+      respectively.

+
+      
mapCommand(keys: string, type: string, name: string, ?args: object, ?extra: object)

+      
Maps a key sequence to a motion,
+      operator, or action type command.
+      The args object is passed through to the command when it is
+      invoked by the provided key sequence.
+      extras.context can be normal,
+      visual, or insert, to map the key
+      sequence only in the corresponding mode.
+      extras.isEdit is applicable only to actions,
+      determining whether it is recorded for replay for the
+      . single-repeat command.
+    

+
+    
Extending VIM

+
+    
CodeMirror's VIM mode implements a large subset of VIM's core
+    editing functionality. But since there's always more to be
+    desired, there is a set of APIs for extending VIM's
+    functionality. As with the configuration API, the methods are
+    exposed on CodeMirror.Vim and may
+    be called at any time.

+
+    

+      
defineOption(name: string, default: any, type: string, ?aliases: array<string>, ?callback: function (?value: any, ?cm: CodeMirror) → ?any)

+      
Defines a VIM style option and makes it available to the
+      :set command. Type can be boolean or
+      string, used for validation and by
+      :set to determine which syntax to accept. If a
+      callback is passed in, VIM does not store the value of the
+      option itself, but instead uses the callback as a setter/getter. If the
+      first argument to the callback is undefined, then the
+      callback should return the value of the option. Otherwise, it should set
+      instead. Since VIM options have global and instance values, whether a
+      CodeMirror instance is passed in denotes whether the global
+      or local value should be used. Consequently, it's possible for the
+      callback to be called twice for a single setOption or
+      getOption call. Note that right now, VIM does not support
+      defining buffer-local options that do not have global values. If an
+      option should not have a global value, either always ignore the
+      cm parameter in the callback, or always pass in a
+      cfg.scope to setOption and
+      getOption.

+
+      
defineMotion(name: string, fn: function(cm: CodeMirror, head: {line, ch}, ?motionArgs: object}) → {line, ch})

+      
Defines a motion command for VIM. The motion should return
+      the desired result position of the cursor. head
+      is the current position of the cursor. It can differ from
+      cm.getCursor('head') if VIM is in visual mode.
+      motionArgs is the object passed into
+      mapCommand().

+
+      
defineOperator(name: string, fn: function(cm: CodeMirror, ?operatorArgs: object, ranges: array<{anchor, head}>) → ?{line, ch})

+      
Defines an operator command, similar to 
+      defineMotion. ranges is the range
+      of text the operator should operate on. If the cursor should
+      be set to a certain position after the operation finishes, it
+      can return a cursor object.

+
+      
defineAction(name: string, fn: function(cm: CodeMirror, ?actionArgs: object))

+      
Defines an action command, similar to
+      defineMotion. Action commands
+      can have arbitrary behavior, making them more flexible than
+      motions and operators, at the loss of orthogonality.

+
+      
defineEx(name: string, ?prefix: string, fn: function(cm: CodeMirror, ?params: object))

+      
Defines an Ex command, and maps it to :name.
+      If a prefix is provided, it, and any prefixed substring of the
+      name beginning with the prefix can
+      be used to invoke the command. If the prefix is
+      falsy, then name is used as the prefix. 
+      params.argString contains the part of the prompted
+      string after the command name. params.args is
+      params.argString split by whitespace. If the
+      command was prefixed with a
+      line range,
+      params.line and params.lineEnd will
+      be set.
+    

+
+

+
+

+
+
diff --git a/www/code/codemirror-5.13.2/doc/realworld.html b/www/code/codemirror-5.13.2/doc/realworld.html
new file mode 100644
index 000000000..03a67c7d2
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/realworld.html
@@ -0,0 +1,179 @@
+
+
+CodeMirror: Real-world Uses
+
+
+
+
+
+

+
+
CodeMirror real-world uses

+
+    
Create a pull
+    request if you'd like your project to be added to this list.

+
+    
+
+

+
diff --git a/www/code/codemirror-5.13.2/doc/releases.html b/www/code/codemirror-5.13.2/doc/releases.html
new file mode 100644
index 000000000..99306b91c
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/releases.html
@@ -0,0 +1,1238 @@
+
+
+CodeMirror: Release History
+
+
+
+
+
+
+

+
+
Release notes and version history

+
+

+
+  
Version 5.x

+
+  
21-03-2016: Version 5.13.2:

+
+  
    
+    
  • Solves a problem where the gutter would sometimes not extend all the way to the end of the document.
    • 
+  

+
+  
21-03-2016: Version 5.13:

+
+  
+
+  
19-02-2016: Version 5.12:

+
+  
    
+    
  • Vim bindings: Ctrl-Q is now an alias for Ctrl-V.
    • 
+    
  • Vim bindings: The Vim API now exposes an unmap method to unmap bindings.
    • 
+    
  • active-line addon: This addon can now style the active line's gutter.
    • 
+    
  • FCL mode: Newly added.
    • 
+    
  • SQL mode: Now has a Postgresql dialect.
    • 
+    
  • Fix issue where trying to scroll to a horizontal position outside of the document's width could cause the gutter to be positioned incorrectly.
    • 
+    
  • Use absolute, rather than fixed positioning in the context-menu intercept hack, to work around a problem when the editor is inside a transformed parent container.
    • 
+    
  • Solve a problem where the horizontal scrollbar could hide text in Firefox.
    • 
+    
  • Fix a bug that caused phantom scroll space under the text in some situations.
    • 
+    
  • Sublime Text bindings: Bind delete-line to Shift-Ctrl-K on OS X.
    • 
+    
  • Markdown mode: Fix issue where the mode would keep state related to fenced code blocks in an unsafe way, leading to occasional corrupted parses.
    • 
+    
  • Markdown mode: Ignore backslashes in code fragments.
    • 
+    
  • Markdown mode: Use whichever mode is registered as text/html to parse HTML.
    • 
+    
  • Clike mode: Improve indentation of Scala => functions.
    • 
+    
  • Python mode: Improve indentation of bracketed code.
    • 
+    
  • HTMLMixed mode: Support multi-line opening tags for sub-languages (<script>, <style>, etc).
    • 
+    
  • Spreadsheet mode: Fix bug where the mode did not advance the stream when finding a backslash.
    • 
+    
  • XML mode: The mode now takes a matchClosing option to configure whether mismatched closing tags should be highlighted as errors.
    • 
+  

+
+  
20-01-2016: Version 5.11:

+
+  
    
+    
  • New modes: JSX, literate Haskell
    • 
+    
  • The editor now forwards more DOM events: cut, copy, paste, and touchstart. It will also forward mousedown for drag events
    • 
+    
  • Fixes a bug where bookmarks next to collapsed spans were not rendered
    • 
+    
  • The Swift mode now supports auto-indentation
    • 
+    
  • Frontmatters in the YAML frontmatter mode are now optional as intended
    • 
+    
  • Full list of patches
    • 
+  

+
+  
21-12-2015: Version 5.10:

+
+  
+
+  
23-11-2015: Version 5.9:

+
+  
    
+    
  • Improve the way overlay (OS X-style) scrollbars are handled
    • 
+    
  • Make annotatescrollbar and scrollpastend addons work properly together
    • 
+    
  • Make show-hint addon select options on single click by default, move selection to hovered item
    • 
+    
  • Properly fold comments that include block-comment-start markers
    • 
+    
  • Many small language mode fixes
    • 
+    
  • Full list of patches
    • 
+  

+
+  
20-10-2015: Version 5.8:

+
+  
+
+  
20-09-2015: Version 5.7:

+
+  
+
+  
20-08-2015: Version 5.6:

+
+  
    
+    
  • Fix bug where you could paste into a readOnly editor
    • 
+    
  • Show a cursor at the drop location when dragging over the editor
    • 
+    
  • The Rust mode was rewritten to handle modern Rust
    • 
+    
  • The editor and theme CSS was cleaned up. Some selectors are now less specific than before
    • 
+    
  • New theme: abcdef
    • 
+    
  • Lines longer than maxHighlightLength are now less likely to mess up indentation
    • 
+    
  • New addons: autorefresh for refreshing an editor the first time it becomes visible, and html-lint for using HTMLHint
    • 
+    
  • The search addon now recognizes \r and \n in pattern and replacement input
    • 
+    
  • Full list of patches
    • 
+  

+
+  
20-07-2015: Version 5.5:

+
+  
+
+  
25-06-2015: Version 5.4:

+
+  
+
+  
20-05-2015: Version 5.3:

+
+  
+
+  
20-04-2015: Version 5.2:

+
+  
+
+  
23-03-2015: Version 5.1:

+
+  
+
+  
20-02-2015: Version 5.0:

+
+  
    
+    
  • Experimental mobile support (tested on iOS, Android Chrome, stock Android browser)
    • 
+    
  • New option inputStyle to switch between hidden textarea and contenteditable input.
    • 
+    
  • The getInputField
+    method is no longer guaranteed to return a textarea.
    • 
+    
  • Full list of patches.
    • 
+  

+
+

+
+

+
+  
Version 4.x

+
+  
20-02-2015: Version 4.13:

+
+  
+
+  
22-01-2015: Version 4.12:

+
+  
+
+  
9-01-2015: Version 4.11:

+
+  
Unfortunately, 4.10 did not take care of the
+  Firefox scrolling issue entirely. This release adds two more patches
+  to address that.

+
+  
29-12-2014: Version 4.10:

+
+  
Emergency single-patch update to 4.9. Fixes
+  Firefox-specific problem where the cursor could end up behind the
+  horizontal scrollbar.

+
+  
23-12-2014: Version 4.9:

+
+  
+
+  
22-11-2014: Version 4.8:

+
+  
+
+  
20-10-2014: Version 4.7:

+
+  
    
+    
  • Incompatible:
+    The lint addon now passes the
+    editor's value as first argument to asynchronous lint functions,
+    for consistency. The editor is still passed, as fourth
+    argument.
    • 
+    
  • Improved handling of unicode identifiers in modes for
+    languages that support them.
    • 
+    
  • More mode
+    improvements: CoffeeScript
+    (indentation), Verilog
+    (indentation), Scala
+    (indentation, triple-quoted strings),
+    and PHP (interpolated
+    variables in heredoc strings).
    • 
+    
  • New modes: Textile and Tornado templates.
    • 
+    
  • Experimental new way to define modes.
    • 
+    
  • Improvements to the Vim
+    bindings: Arbitrary insert mode key mappings are now possible,
+    and text objects are supported in visual mode.
    • 
+    
  • The mode meta-information file
+    now includes information about file extensions,
+    and helper
+    functions findModeByMIME
+    and findModeByExtension.
    • 
+    
  • New logo!
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
19-09-2014: Version 4.6:

+
+  
+
+  
21-08-2014: Version 4.5:

+
+  
    
+    
  • Fix several serious bugs with horizontal scrolling
    • 
+    
  • New mode: Slim
    • 
+    
  • New command: goLineLeftSmart
    • 
+    
  • More fixes and extensions for the Vim visual block mode
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
21-07-2014: Version 4.4:

+
+  
    
+    
  • Note: Some events might now fire in slightly
+    different order ("change" is still guaranteed to fire
+    before "cursorActivity")
    • 
+    
  • Nested operations in multiple editors are now synced (complete
+    at same time, reducing DOM reflows)
    • 
+    
  • Visual block mode for vim (<C-v>) is nearly complete
    • 
+    
  • New mode: Kotlin
    • 
+    
  • Better multi-selection paste for text copied from multiple CodeMirror selections
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
23-06-2014: Version 4.3:

+
+  
    
+    
  • Several vim bindings
+    improvements: search and exCommand history, global flag
+    for :substitute, :global command.
+    
  • Allow hiding the cursor by
+    setting cursorBlinkRate
+    to a negative value.
    • 
+    
  • Make gutter markers themeable, use this in foldgutter.
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
19-05-2014: Version 4.2:

+
+  
    
+    
  • Fix problem where some modes were broken by the fact that empty tokens were forbidden.
    • 
+    
  • Several fixes to context menu handling.
    • 
+    
  • On undo, scroll change, not cursor, into view.
    • 
+    
  • Rewritten Jade mode.
    • 
+    
  • Various improvements to Shell (support for more syntax) and Python (better indentation) modes.
    • 
+    
  • New mode: Cypher.
    • 
+    
  • New theme: Neo.
    • 
+    
  • Support direct styling options (color, line style, width) in the rulers addon.
    • 
+    
  • Recognize per-editor configuration for the show-hint and foldcode addons.
    • 
+    
  • More intelligent scanning for existing close tags in closetag addon.
    • 
+    
  • In the Vim bindings: Fix bracket matching, support case conversion in visual mode, visual paste, append action.
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
22-04-2014: Version 4.1:

+
+  
    
+    
  • Slightly incompatible:
+    The "cursorActivity"
+    event now fires after all other events for the operation (and only
+    for handlers that were actually registered at the time the
+    activity happened).
    • 
+    
  • New command: insertSoftTab.
    • 
+    
  • New mode: Django.
    • 
+    
  • Improved modes: Verilog (rewritten), Jinja2, Haxe, PHP (string interpolation highlighted), JavaScript (indentation of trailing else, template strings), LiveScript (multi-line strings).
    • 
+    
  • Many small issues from the 3.x→4.x transition were found and fixed.
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
20-03-2014: Version 4.0:

+
+  
This is a new major version of CodeMirror. There
+  are a few incompatible changes in the API. Upgrade
+  with care, and read the upgrading
+  guide.

+
+  
+
+

+
+

+
+  
Version 3.x

+
+  
22-04-2014: Version 3.24:

+
+  
Merges the improvements from 4.1 that could
+  easily be applied to the 3.x code. Also improves the way the editor
+  size is updated when line widgets change.

+
+  
20-03-2014: Version 3.23:

+
+  
    
+    
  • In the XML mode,
+    add brackets style to angle brackets, fix
+    case-sensitivity of tags for HTML.
    • 
+    
  • New mode: Dylan.
    • 
+    
  • Many improvements to the Vim bindings.
    • 
+  

+
+  
21-02-2014: Version 3.22:

+
+  
+
+  
16-01-2014: Version 3.21:

+
+  
    
+    
  • Auto-indenting a block will no longer add trailing whitespace to blank lines.
    • 
+    
  • Marking text has a new option clearWhenEmpty to control auto-removal.
    • 
+    
  • Several bugfixes in the handling of bidirectional text.
    • 
+    
  • The XML and CSS modes were largely rewritten. LESS support was added to the CSS mode.
    • 
+    
  • The OCaml mode was moved to an mllike mode, F# support added.
    • 
+    
  • Make it possible to fetch multiple applicable helper values with getHelpers, and to register helpers matched on predicates with registerGlobalHelper.
    • 
+    
  • New theme pastel-on-dark.
    • 
+    
  • Better ECMAScript 6 support in JavaScript mode.
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
21-11-2013: Version 3.20:

+
+  
+
+  
21-10-2013: Version 3.19:

+
+  
+
+  
23-09-2013: Version 3.18:

+
+  
Emergency release to fix a problem in 3.17
+  where .setOption("lineNumbers", false) would raise an
+  error.

+
+  
23-09-2013: Version 3.17:

+
+  
+
+  
21-08-2013: Version 3.16:

+
+  
+
+  
29-07-2013: Version 3.15:

+
+  
+
+  
20-06-2013: Version 3.14:

+
+  
+
+  
20-05-2013: Version 3.13:

+
+  
+
+  
19-04-2013: Version 3.12:

+
+  
+
+  
20-03-2013: Version 3.11:

+
+  
+
+  
21-02-2013: Version 3.1:

+
+  
+  
+
+  
25-01-2013: Version 3.02:

+
+  
Single-bugfix release. Fixes a problem that
+  prevents CodeMirror instances from being garbage-collected after
+  they become unused.

+
+  
21-01-2013: Version 3.01:

+
+  
+
+  
10-12-2012: Version 3.0:

+
+  
New major version. Only
+  partially backwards-compatible. See
+  the upgrading guide for more
+  information. Changes since release candidate 2:

+
+  
    
+    
  • Rewritten VIM mode.
    • 
+    
  • Fix a few minor scrolling and sizing issues.
    • 
+    
  • Work around Safari segfault when dragging.
    • 
+    
  • Full list of patches.
    • 
+  

+  
+  
20-11-2012: Version 3.0, release candidate 2:

+
+  
    
+    
  • New mode: HTTP.
    • 
+    
  • Improved handling of selection anchor position.
    • 
+    
  • Improve IE performance on longer lines.
    • 
+    
  • Reduce gutter glitches during horiz. scrolling.
    • 
+    
  • Add addKeyMap and removeKeyMap methods.
    • 
+    
  • Rewrite formatting and closetag add-ons.
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
20-11-2012: Version 3.0, release candidate 1:

+
+  
+
+  
22-10-2012: Version 3.0, beta 2:

+
+  
    
+    
  • Fix page-based coordinate computation.
    • 
+    
  • Fix firing of gutterClick event.
    • 
+    
  • Add cursorHeight option.
    • 
+    
  • Fix bi-directional text regression.
    • 
+    
  • Add viewportMargin option.
    • 
+    
  • Directly handle mousewheel events (again, hopefully better).
    • 
+    
  • Make vertical cursor movement more robust (through widgets, big line gaps).
    • 
+    
  • Add flattenSpans option.
    • 
+    
  • Many optimizations. Poor responsiveness should be fixed.
    • 
+    
  • Initialization in hidden state works again.
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
19-09-2012: Version 3.0, beta 1:

+
+  
    
+    
  • Bi-directional text support.
    • 
+    
  • More powerful gutter model.
    • 
+    
  • Support for arbitrary text/widget height.
    • 
+    
  • In-line widgets.
    • 
+    
  • Generalized event handling.
    • 
+  

+
+

+
+

+
+  
Version 2.x

+
+  
21-01-2013: Version 2.38:

+
+  
Integrate some bugfixes, enhancements to the vim keymap, and new
+  modes
+  (D, Sass, APL)
+  from the v3 branch.

+
+  
20-12-2012: Version 2.37:

+
+  
    
+    
  • New mode: SQL (will replace plsql and mysql modes).
    • 
+    
  • Further work on the new VIM mode.
    • 
+    
  • Fix Cmd/Ctrl keys on recent Operas on OS X.
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
20-11-2012: Version 2.36:

+
+  
+
+  
22-10-2012: Version 2.35:

+
+  
    
+    
  • New (sub) mode: TypeScript.
    • 
+    
  • Don't overwrite (insert key) when pasting.
    • 
+    
  • Fix several bugs in markText/undo interaction.
    • 
+    
  • Better indentation of JavaScript code without semicolons.
    • 
+    
  • Add defineInitHook function.
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
19-09-2012: Version 2.34:

+
+  
    
+    
  • New mode: Common Lisp.
    • 
+    
  • Fix right-click select-all on most browsers.
    • 
+    
  • Change the way highlighting happens:
      Saves memory and CPU cycles.
      compareStates is no longer needed.
      onHighlightComplete no longer works.
    • 
+    
  • Integrate mode (Markdown, XQuery, CSS, sTex) tests in central testsuite.
    • 
+    
  • Add a CodeMirror.version property.
    • 
+    
  • More robust handling of nested modes in formatting and closetag plug-ins.
    • 
+    
  • Un/redo now preserves marked text and bookmarks.
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
23-08-2012: Version 2.33:

+
+  
    
+    
  • New mode: Sieve.
    • 
+    
  • New getViewPort and onViewportChange API.
    • 
+    
  • Configurable cursor blink rate.
    • 
+    
  • Make binding a key to false disabling handling (again).
    • 
+    
  • Show non-printing characters as red dots.
    • 
+    
  • More tweaks to the scrolling model.
    • 
+    
  • Expanded testsuite. Basic linter added.
    • 
+    
  • Remove most uses of innerHTML. Remove CodeMirror.htmlEscape.
    • 
+    
  • Full list of patches.
    • 
+  

+
+  
23-07-2012: Version 2.32:

+
+  
Emergency fix for a bug where an editor with
+  line wrapping on IE will break when there is no
+  scrollbar.

+
+  
20-07-2012: Version 2.31:

+
+  
+
+  
22-06-2012: Version 2.3:

+
+  
    
+    
  • New scrollbar implementation. Should flicker less. Changes DOM structure of the editor.
    • 
+    
  • New theme: vibrant-ink.
    • 
+    
  • Many extensions to the VIM keymap (including text objects).
    • 
+    
  • Add mode-multiplexing utility script.
    • 
+    
  • Fix bug where right-click paste works in read-only mode.
    • 
+    
  • Add a getScrollInfo method.
    • 
+    
  • Lots of other fixes.
    • 
+  

+
+  
23-05-2012: Version 2.25:

+
+  
    
+    
  • New mode: Erlang.
    • 
+    
  • Remove xmlpure mode (use xml.js).
    • 
+    
  • Fix line-wrapping in Opera.
    • 
+    
  • Fix X Windows middle-click paste in Chrome.
    • 
+    
  • Fix bug that broke pasting of huge documents.
    • 
+    
  • Fix backspace and tab key repeat in Opera.
    • 
+  

+
+  
23-04-2012: Version 2.24:

+
+  
    
+    
  • Drop support for Internet Explorer 6.
    • 
+    
  • New
+    modes: Shell, Tiki
+    wiki, Pig Latin.
    • 
+    
  • New themes: Ambiance, Blackboard.
    • 
+    
  • More control over drag/drop
+    with dragDrop
+    and onDragEvent
+    options.
    • 
+    
  • Make HTML mode a bit less pedantic.
    • 
+    
  • Add compoundChange API method.
    • 
+    
  • Several fixes in undo history and line hiding.
    • 
+    
  • Remove (broken) support for catchall in key maps,
+    add nofallthrough boolean field instead.
    • 
+  

+
+  
26-03-2012: Version 2.23:

+
+  
    
+    
  • Change default binding for tab [more]
+      
+    
    • 
+    
  • New modes: XQuery and VBScript.
    • 
+    
  • Two new themes: lesser-dark and xq-dark.
    • 
+    
  • Differentiate between background and text styles in setLineClass.
    • 
+    
  • Fix drag-and-drop in IE9+.
    • 
+    
  • Extend charCoords
+    and cursorCoords with a mode argument.
    • 
+    
  • Add autofocus option.
    • 
+    
  • Add findMarksAt method.
    • 
+  

+
+  
27-02-2012: Version 2.22:

+
+  
+
+  
27-01-2012: Version 2.21:

+
+  
    
+    
  • Added LESS, MySQL,
+    Go, and Verilog modes.
    • 
+    
  • Add smartIndent
+    option.
    • 
+    
  • Support a cursor in readOnly-mode.
    • 
+    
  • Support assigning multiple styles to a token.
    • 
+    
  • Use a new approach to drawing the selection.
    • 
+    
  • Add scrollTo method.
    • 
+    
  • Allow undo/redo events to span non-adjacent lines.
    • 
+    
  • Lots and lots of bugfixes.
    • 
+  

+
+  
20-12-2011: Version 2.2:

+
+  
+
+  
21-11-2011: Version 2.18:

+  
Fixes TextMarker.clear, which is broken in 2.17.

+
+  
21-11-2011: Version 2.17:

+  
    
+    
  • Add support for line
+    wrapping and code
+    folding.
    • 
+    
  • Add Github-style Markdown mode.
    • 
+    
  • Add Monokai
+    and Rubyblue themes.
    • 
+    
  • Add setBookmark method.
    • 
+    
  • Move some of the demo code into reusable components
+    under lib/util.
    • 
+    
  • Make screen-coord-finding code faster and more reliable.
    • 
+    
  • Fix drag-and-drop in Firefox.
    • 
+    
  • Improve support for IME.
    • 
+    
  • Speed up content rendering.
    • 
+    
  • Fix browser's built-in search in Webkit.
    • 
+    
  • Make double- and triple-click work in IE.
    • 
+    
  • Various fixes to modes.
    • 
+  

+
+  
27-10-2011: Version 2.16:

+  
    
+    
  • Add Perl, Rust, TiddlyWiki, and Groovy modes.
    • 
+    
  • Dragging text inside the editor now moves, rather than copies.
    • 
+    
  • Add a coordsFromIndex method.
    • 
+    
  • API change: setValue now no longer clears history. Use clearHistory for that.
    • 
+    
  • API change: markText now
+    returns an object with clear and find
+    methods. Marked text is now more robust when edited.
    • 
+    
  • Fix editing code with tabs in Internet Explorer.
    • 
+  

+
+  
26-09-2011: Version 2.15:

+  
Fix bug that snuck into 2.14: Clicking the
+  character that currently has the cursor didn't re-focus the
+  editor.

+
+  
26-09-2011: Version 2.14:

+  
+
+
+  
23-08-2011: Version 2.13:

+  
+
+  
25-07-2011: Version 2.12:

+  
    
+    
  • Add a SPARQL mode.
    • 
+    
  • Fix bug with cursor jumping around in an unfocused editor in IE.
    • 
+    
  • Allow key and mouse events to bubble out of the editor. Ignore widget clicks.
    • 
+    
  • Solve cursor flakiness after undo/redo.
    • 
+    
  • Fix block-reindent ignoring the last few lines.
    • 
+    
  • Fix parsing of multi-line attrs in XML mode.
    • 
+    
  • Use innerHTML for HTML-escaping.
    • 
+    
  • Some fixes to indentation in C-like mode.
    • 
+    
  • Shrink horiz scrollbars when long lines removed.
    • 
+    
  • Fix width feedback loop bug that caused the width of an inner DIV to shrink.
    • 
+  

+
+  
04-07-2011: Version 2.11:

+  
    
+    
  • Add a Scheme mode.
    • 
+    
  • Add a replace method to search cursors, for cursor-preserving replacements.
    • 
+    
  • Make the C-like mode mode more customizable.
    • 
+    
  • Update XML mode to spot mismatched tags.
    • 
+    
  • Add getStateAfter API and compareState mode API methods for finer-grained mode magic.
    • 
+    
  • Add a getScrollerElement API method to manipulate the scrolling DIV.
    • 
+    
  • Fix drag-and-drop for Firefox.
    • 
+    
  • Add a C# configuration for the C-like mode.
    • 
+    
  • Add full-screen editing and mode-changing demos.
    • 
+  

+
+  
07-06-2011: Version 2.1:

+  
Add
+  a theme system
+  (demo). Note that this is not
+  backwards-compatible—you'll have to update your styles and
+  modes!

+
+  
07-06-2011: Version 2.02:

+  
    
+    
  • Add a Lua mode.
    • 
+    
  • Fix reverse-searching for a regexp.
    • 
+    
  • Empty lines can no longer break highlighting.
    • 
+    
  • Rework scrolling model (the outer wrapper no longer does the scrolling).
    • 
+    
  • Solve horizontal jittering on long lines.
    • 
+    
  • Add runmode.js.
    • 
+    
  • Immediately re-highlight text when typing.
    • 
+    
  • Fix problem with 'sticking' horizontal scrollbar.
    • 
+  

+
+  
26-05-2011: Version 2.01:

+  
    
+    
  • Add a Smalltalk mode.
    • 
+    
  • Add a reStructuredText mode.
    • 
+    
  • Add a Python mode.
    • 
+    
  • Add a PL/SQL mode.
    • 
+    
  • coordsChar now works
    • 
+    
  • Fix a problem where onCursorActivity interfered with onChange.
    • 
+    
  • Fix a number of scrolling and mouse-click-position glitches.
    • 
+    
  • Pass information about the changed lines to onChange.
    • 
+    
  • Support cmd-up/down on OS X.
    • 
+    
  • Add triple-click line selection.
    • 
+    
  • Don't handle shift when changing the selection through the API.
    • 
+    
  • Support "nocursor" mode for readOnly option.
    • 
+    
  • Add an onHighlightComplete option.
    • 
+    
  • Fix the context menu for Firefox.
    • 
+  

+
+  
28-03-2011: Version 2.0:

+  
CodeMirror 2 is a complete rewrite that's
+  faster, smaller, simpler to use, and less dependent on browser
+  quirks. See this
+  and this
+  for more information.

+
+  
22-02-2011: Version 2.0 beta 2:

+  
Somewhat more mature API, lots of bugs shaken out.

+
+  
17-02-2011: Version 0.94:

+  
    
+    
  • tabMode: "spaces" was modified slightly (now indents when something is selected).
    • 
+    
  • Fixes a bug that would cause the selection code to break on some IE versions.
    • 
+    
  • Disabling spell-check on WebKit browsers now works.
    • 
+  

+
+  
08-02-2011: Version 2.0 beta 1:

+  
CodeMirror 2 is a complete rewrite of
+  CodeMirror, no longer depending on an editable frame.

+
+  
19-01-2011: Version 0.93:

+  
    
+    
  • Added a Regular Expression parser.
    • 
+    
  • Fixes to the PHP parser.
    • 
+    
  • Support for regular expression in search/replace.
    • 
+    
  • Add save method to instances created with fromTextArea.
    • 
+    
  • Add support for MS T-SQL in the SQL parser.
    • 
+    
  • Support use of CSS classes for highlighting brackets.
    • 
+    
  • Fix yet another hang with line-numbering in hidden editors.
    • 
+  

+

+
+

+
+  
Version 0.x

+
+  
28-03-2011: Version 1.0:

+  
    
+    
  • Fix error when debug history overflows.
    • 
+    
  • Refine handling of C# verbatim strings.
    • 
+    
  • Fix some issues with JavaScript indentation.
    • 
+  

+
+  
17-12-2010: Version 0.92:

+  
    
+    
  • Make CodeMirror work in XHTML documents.
    • 
+    
  • Fix bug in handling of backslashes in Python strings.
    • 
+    
  • The styleNumbers option is now officially
+    supported and documented.
    • 
+    
  • onLineNumberClick option added.
    • 
+    
  • More consistent names onLoad and
+    onCursorActivity callbacks. Old names still work, but
+    are deprecated.
    • 
+    
  • Add a Freemarker mode.
    • 
+  

+
+  
11-11-2010: Version 0.91:

+  
    
+    
  • Adds support for Java.
    • 
+    
  • Small additions to the PHP and SQL parsers.
    • 
+    
  • Work around various Webkit issues.
    • 
+    
  • Fix toTextArea to update the code in the textarea.
    • 
+    
  • Add a noScriptCaching option (hack to ease development).
    • 
+    
  • Make sub-modes of HTML mixed mode configurable.
    • 
+  

+
+  
02-10-2010: Version 0.9:

+  
    
+    
  • Add support for searching backwards.
    • 
+    
  • There are now parsers for Scheme, XQuery, and OmetaJS.
    • 
+    
  • Makes height: "dynamic" more robust.
    • 
+    
  • Fixes bug where paste did not work on OS X.
    • 
+    
  • Add a enterMode and electricChars options to make indentation even more customizable.
    • 
+    
  • Add firstLineNumber option.
    • 
+    
  • Fix bad handling of @media rules by the CSS parser.
    • 
+    
  • Take a new, more robust approach to working around the invisible-last-line bug in WebKit.
    • 
+  

+
+  
22-07-2010: Version 0.8:

+  
    
+    
  • Add a cursorCoords method to find the screen
+    coordinates of the cursor.
    • 
+    
  • A number of fixes and support for more syntax in the PHP parser.
    • 
+    
  • Fix indentation problem with JSON-mode JS parser in Webkit.
    • 
+    
  • Add a minification UI.
    • 
+    
  • Support a height: dynamic mode, where the editor's
+    height will adjust to the size of its content.
    • 
+    
  • Better support for IME input mode.
    • 
+    
  • Fix JavaScript parser getting confused when seeing a no-argument
+    function call.
    • 
+    
  • Have CSS parser see the difference between selectors and other
+    identifiers.
    • 
+    
  • Fix scrolling bug when pasting in a horizontally-scrolled
+    editor.
    • 
+    
  • Support toTextArea method in instances created with
+    fromTextArea.
    • 
+    
  • Work around new Opera cursor bug that causes the cursor to jump
+    when pressing backspace at the end of a line.
    • 
+  

+
+  
27-04-2010: Version
+  0.67:

+  
More consistent page-up/page-down behaviour
+  across browsers. Fix some issues with hidden editors looping forever
+  when line-numbers were enabled. Make PHP parser parse
+  "\\" correctly. Have jumpToLine work on
+  line handles, and add cursorLine function to fetch the
+  line handle where the cursor currently is. Add new
+  setStylesheet function to switch style-sheets in a
+  running editor.

+
+  
01-03-2010: Version
+  0.66:

+  
Adds removeLine method to API.
+  Introduces the PLSQL parser.
+  Marks XML errors by adding (rather than replacing) a CSS class, so
+  that they can be disabled by modifying their style. Fixes several
+  selection bugs, and a number of small glitches.

+
+  
12-11-2009: Version
+  0.65:

+  
Add support for having both line-wrapping and
+  line-numbers turned on, make paren-highlighting style customisable
+  (markParen and unmarkParen config
+  options), work around a selection bug that Opera
+  reintroduced in version 10.

+
+  
23-10-2009: Version
+  0.64:

+  
Solves some issues introduced by the
+  paste-handling changes from the previous release. Adds
+  setSpellcheck, setTextWrapping,
+  setIndentUnit, setUndoDepth,
+  setTabMode, and setLineNumbers to
+  customise a running editor. Introduces an SQL parser. Fixes a few small
+  problems in the Python
+  parser. And, as usual, add workarounds for various newly discovered
+  browser incompatibilities.

+
+  
31-08-2009: Version 0.63:

+  
 Overhaul of paste-handling (less fragile), fixes for several
+  serious IE8 issues (cursor jumping, end-of-document bugs) and a number
+  of small problems.

+
+  
30-05-2009: Version 0.62:

+  
Introduces Python
+  and Lua parsers. Add
+  setParser (on-the-fly mode changing) and
+  clearHistory methods. Make parsing passes time-based
+  instead of lines-based (see the passTime option).

+
+

+

diff --git a/www/code/codemirror-5.13.2/doc/reporting.html b/www/code/codemirror-5.13.2/doc/reporting.html
new file mode 100644
index 000000000..3c582d961
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/reporting.html
@@ -0,0 +1,61 @@
+
+
+CodeMirror: Reporting Bugs
+
+
+
+
+
+

+
+
Reporting bugs effectively

+
+

+
+
So you found a problem in CodeMirror. By all means, report it! Bug
+reports from users are the main drive behind improvements to
+CodeMirror. But first, please read over these points:

+
+
    
+  
  1. CodeMirror is maintained by volunteers. They don't owe you
+  anything, so be polite. Reports with an indignant or belligerent
+  tone tend to be moved to the bottom of the pile.
    2. 
+
+  
  2. Include information about the browser in which the
+  problem occurred. Even if you tested several browsers, and
+  the problem occurred in all of them, mention this fact in the bug
+  report. Also include browser version numbers and the operating
+  system that you're on.
    3. 
+
+  
  3. Mention which release of CodeMirror you're using. Preferably,
+  try also with the current development snapshot, to ensure the
+  problem has not already been fixed.
    4. 
+
+  
  4. Mention very precisely what went wrong. "X is broken" is not a
+  good bug report. What did you expect to happen? What happened
+  instead? Describe the exact steps a maintainer has to take to make
+  the problem occur. We can not fix something that we can not
+  observe.
    5. 
+
+  
  5. If the problem can not be reproduced in any of the demos
+  included in the CodeMirror distribution, please provide an HTML
+  document that demonstrates the problem. The best way to do this is
+  to go to jsbin.com, enter
+  it there, press save, and include the resulting link in your bug
+  report.
    6. 
+

+
+

+
+

diff --git a/www/code/codemirror-5.13.2/doc/upgrade_v2.2.html b/www/code/codemirror-5.13.2/doc/upgrade_v2.2.html
new file mode 100644
index 000000000..3948ce6e5
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/upgrade_v2.2.html
@@ -0,0 +1,96 @@
+
+
+CodeMirror: Version 2.2 upgrade guide
+
+
+
+
+
+

+
+
Upgrading to v2.2

+
+
There are a few things in the 2.2 release that require some care
+when upgrading.

+
+
No more default.css

+
+
The default theme is now included
+in codemirror.css, so
+you do not have to included it separately anymore. (It was tiny, so
+even if you're not using it, the extra data overhead is negligible.)
+
+
Different key customization

+
+
CodeMirror has moved to a system
+where keymaps are used to
+bind behavior to keys. This means custom
+bindings are now possible.

+
+
Three options that influenced key
+behavior, tabMode, enterMode,
+and smartHome, are no longer supported. Instead, you can
+provide custom bindings to influence the way these keys act. This is
+done through the
+new extraKeys
+option, which can hold an object mapping key names to functionality. A
+simple example would be:

+
+
  extraKeys: {
+    "Ctrl-S": function(instance) { saveText(instance.getValue()); },
+    "Ctrl-/": "undo"
+  }

+
+
Keys can be mapped either to functions, which will be given the
+editor instance as argument, or to strings, which are mapped through
+functions through the CodeMirror.commands table, which
+contains all the built-in editing commands, and can be inspected and
+extended by external code.

+
+
By default, the Home key is bound to
+the "goLineStartSmart" command, which moves the cursor to
+the first non-whitespace character on the line. You can set do this to
+make it always go to the very start instead:

+
+
  extraKeys: {"Home": "goLineStart"}

+
+
Similarly, Enter is bound
+to "newlineAndIndent" by default. You can bind it to
+something else to get different behavior. To disable special handling
+completely and only get a newline character inserted, you can bind it
+to false:

+
+
  extraKeys: {"Enter": false}

+
+
The same works for Tab. If you don't want CodeMirror
+to handle it, bind it to false. The default behaviour is
+to indent the current line more ("indentMore" command),
+and indent it less when shift is held ("indentLess").
+There are also "indentAuto" (smart indent)
+and "insertTab" commands provided for alternate
+behaviors. Or you can write your own handler function to do something
+different altogether.

+
+
Tabs

+
+
Handling of tabs changed completely. The display width of tabs can
+now be set with the tabSize option, and tabs can
+be styled by setting CSS rules
+for the cm-tab class.

+
+
The default width for tabs is now 4, as opposed to the 8 that is
+hard-wired into browsers. If you are relying on 8-space tabs, make
+sure you explicitly set tabSize: 8 in your options.

+
+

diff --git a/www/code/codemirror-5.13.2/doc/upgrade_v3.html b/www/code/codemirror-5.13.2/doc/upgrade_v3.html
new file mode 100644
index 000000000..5f94067aa
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/upgrade_v3.html
@@ -0,0 +1,230 @@
+
+
+CodeMirror: Version 3 upgrade guide
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
Upgrading to version 3

+
+
Version 3 does not depart too much from 2.x API, and sites that use
+CodeMirror in a very simple way might be able to upgrade without
+trouble. But it does introduce a number of incompatibilities. Please
+at least skim this text before upgrading.

+
+
Note that version 3 drops full support for Internet
+Explorer 7. The editor will mostly work on that browser, but
+it'll be significantly glitchy.

+
+

+  
DOM structure

+
+
This one is the most likely to cause problems. The internal
+structure of the editor has changed quite a lot, mostly to implement a
+new scrolling model.

+
+
Editor height is now set on the outer wrapper element (CSS
+class CodeMirror), not on the scroller element
+(CodeMirror-scroll).

+
+
Other nodes were moved, dropped, and added. If you have any code
+that makes assumptions about the internal DOM structure of the editor,
+you'll have to re-test it and probably update it to work with v3.

+
+
See the styling section of the
+manual for more information.

+

+

+  
Gutter model

+
+
In CodeMirror 2.x, there was a single gutter, and line markers
+created with setMarker would have to somehow coexist with
+the line numbers (if present). Version 3 allows you to specify an
+array of gutters, by class
+name,
+use setGutterMarker
+to add or remove markers in individual gutters, and clear whole
+gutters
+with clearGutter.
+Gutter markers are now specified as DOM nodes, rather than HTML
+snippets.

+
+
The gutters no longer horizontally scrolls along with the content.
+The fixedGutter option was removed (since it is now the
+only behavior).

+
+
+<style>
+  /* Define a gutter style */
+  .note-gutter { width: 3em; background: cyan; }
+</style>
+<script>
+  // Create an instance with two gutters -- line numbers and notes
+  var cm = new CodeMirror(document.body, {
+    gutters: ["note-gutter", "CodeMirror-linenumbers"],
+    lineNumbers: true
+  });
+  // Add a note to line 0
+  cm.setGutterMarker(0, "note-gutter", document.createTextNode("hi"));
+</script>
+

+

+

+  
Event handling

+
+
Most of the onXYZ options have been removed. The same
+effect is now obtained by calling
+the on method with a string
+identifying the event type. Multiple handlers can now be registered
+(and individually unregistered) for an event, and objects such as line
+handlers now also expose events. See the
+full list here.

+
+
(The onKeyEvent and onDragEvent options,
+which act more as hooks than as event handlers, are still there in
+their old form.)

+
+
+cm.on("change", function(cm, change) {
+  console.log("something changed! (" + change.origin + ")");
+});
+

+

+

+  
markText method arguments

+
+
The markText method
+(which has gained some interesting new features, such as creating
+atomic and read-only spans, or replacing spans with widgets) no longer
+takes the CSS class name as a separate argument, but makes it an
+optional field in the options object instead.

+
+
+// Style first ten lines, and forbid the cursor from entering them
+cm.markText({line: 0, ch: 0}, {line: 10, ch: 0}, {
+  className: "magic-text",
+  inclusiveLeft: true,
+  atomic: true
+});
+

+

+

+  
Line folding

+
+
The interface for hiding lines has been
+removed. markText can
+now be used to do the same in a more flexible and powerful way.

+
+
The folding script has been
+updated to use the new interface, and should now be more robust.

+
+
+// Fold a range, replacing it with the text "??"
+var range = cm.markText({line: 4, ch: 2}, {line: 8, ch: 1}, {
+  replacedWith: document.createTextNode("??"),
+  // Auto-unfold when cursor moves into the range
+  clearOnEnter: true
+});
+// Get notified when auto-unfolding
+CodeMirror.on(range, "clear", function() {
+  console.log("boom");
+});
+

+

+

+  
Line CSS classes

+
+
The setLineClass method has been replaced
+by addLineClass
+and removeLineClass,
+which allow more modular control over the classes attached to a line.

+
+
+var marked = cm.addLineClass(10, "background", "highlighted-line");
+setTimeout(function() {
+  cm.removeLineClass(marked, "background", "highlighted-line");
+});
+

+

+

+  
Position properties

+
+
All methods that take or return objects that represent screen
+positions now use {left, top, bottom, right} properties
+(not always all of them) instead of the {x, y, yBot} used
+by some methods in v2.x.

+
+
Affected methods
+are cursorCoords, charCoords, coordsChar,
+and getScrollInfo.

+

+

+  
Bracket matching no longer in core

+
+
The matchBrackets
+option is no longer defined in the core editor.
+Load addon/edit/matchbrackets.js to enable it.

+

+

+  
Mode management

+
+
The CodeMirror.listModes
+and CodeMirror.listMIMEs functions, used for listing
+defined modes, are gone. You are now encouraged to simply
+inspect CodeMirror.modes (mapping mode names to mode
+constructors) and CodeMirror.mimeModes (mapping MIME
+strings to mode specs).

+

+

+  
New features

+
+
Some more reasons to upgrade to version 3.

+
+
    
+  
  • Bi-directional text support. CodeMirror will now mostly do the
+  right thing when editing Arabic or Hebrew text.
    • 
+  
  • Arbitrary line heights. Using fonts with different heights
+  inside the editor (whether off by one pixel or fifty) is now
+  supported and handled gracefully.
    • 
+  
  • In-line widgets. See the demo
+  and the docs.
    • 
+  
  • Defining custom options
+  with CodeMirror.defineOption.
    • 
+

+

+

+
+
diff --git a/www/code/codemirror-5.13.2/doc/upgrade_v4.html b/www/code/codemirror-5.13.2/doc/upgrade_v4.html
new file mode 100644
index 000000000..09df00ca1
--- /dev/null
+++ b/www/code/codemirror-5.13.2/doc/upgrade_v4.html
@@ -0,0 +1,144 @@
+
+
+CodeMirror: Version 4 upgrade guide
+
+
+
+
+
+
+

+
+
Upgrading to version 4

+
+
CodeMirror 4's interface is very close version 3, but it
+does fix a few awkward details in a backwards-incompatible ways. At
+least skim the text below before upgrading.

+
+
Multiple selections

+
+
The main new feature in version 4 is multiple selections. The
+single-selection variants of methods are still there, but now
+typically act only on the primary selection (usually the last
+one added).

+
+
The exception to this
+is getSelection,
+which will now return the content of all selections
+(separated by newlines, or whatever lineSep parameter you passed
+it).

+
+

+
+
The beforeSelectionChange event

+
+
This event still exists, but the object it is passed has
+a completely new
+interface, because such changes now concern multiple
+selections.

+
+

+
+
replaceSelection's collapsing behavior

+
+
By
+default, replaceSelection
+would leave the newly inserted text selected. This is only rarely what
+you want, and also (slightly) more expensive in the new model, so the
+default was changed to "end", meaning the old behavior
+must be explicitly specified by passing a second argument
+of "around".

+
+

+
+
change event data

+
+
Rather than forcing client code to follow next
+pointers from one change object to the next, the library will now
+simply fire
+multiple "change"
+events. Existing code will probably continue to work unmodified.

+
+

+
+
showIfHidden option to line widgets

+
+
This option, which conceptually caused line widgets to be visible
+even if their line was hidden, was never really well-defined, and was
+buggy from the start. It would be a rather expensive feature, both in
+code complexity and run-time performance, to implement properly. It
+has been dropped entirely in 4.0.

+
+

+
+
Module loaders

+
+
All modules in the CodeMirror distribution are now wrapped in a
+shim function to make them compatible with both AMD
+(requirejs) and CommonJS (as used
+by node
+and browserify) module loaders.
+When neither of these is present, they fall back to simply using the
+global CodeMirror variable.

+
+
If you have a module loader present in your environment, CodeMirror
+will attempt to use it, and you might need to change the way you load
+CodeMirror modules.

+
+

+
+
Mutating shared data structures

+
+
Data structures produced by the library should not be mutated
+unless explicitly allowed, in general. This is slightly more strict in
+4.0 than it was in earlier versions, which copied the position objects
+returned by getCursor
+for nebulous, historic reasons. In 4.0, mutating these
+objects will corrupt your editor's selection.

+
+

+
+
Deprecated interfaces dropped

+
+
A few properties and methods that have been deprecated for a while
+are now gone. Most notably, the onKeyEvent
+and onDragEvent options (use the
+corresponding events instead).

+
+
Two silly methods, which were mostly there to stay close to the 0.x
+API, setLine and removeLine are now gone.
+Use the more
+flexible replaceRange
+method instead.

+
+
The long names for folding and completing functions
+(CodeMirror.braceRangeFinder, CodeMirror.javascriptHint,
+etc) are also gone
+(use CodeMirror.fold.brace, CodeMirror.hint.javascript).

+
+
The className property in the return value
+of getTokenAt, which
+has been superseded by the type property, is also no
+longer present.

+
+

+

diff --git a/www/code/codemirror-5.13.2/doc/yinyang.png b/www/code/codemirror-5.13.2/doc/yinyang.png
new file mode 100644
index 0000000000000000000000000000000000000000..2eafd3f1ca137898ede8c27d0e64d99919bdc1ab
GIT binary patch
literal 4633
zcmV+!66WoRP)02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{01<&nL_t(|+U=cPY#Y~=$Nxhy
zV#HV?X-TGS*&^w9;jhFRrrmgx#ahFz1vCy?kuL#aq!!t?6h%Z81?uLZB43geHDU@V
z+Mp;vst;|SN~%ad0C~-k)9hlmSaX=zPPDc)WGqXTMTJAjrb?Oe-3N*cW$Tk1&I~CX
zfUqS?^p$>dKJU5bQiKrHlFYFz0f02eVNnnYpU(;c7Gg1IX}a*adb1fCv$^nbBg0Ur
zF`=pzaE9keIvT}1$05D+nvTcOcJd?uKugo8)9VXguh#2PZ#E;%afQz<#A3+AVug?I
zT)vD}lL=ayhL)z$$S`Q==;%@#3>UWnOCae;gd_$BF~_o)9vj1Ms}+q511(KMV>Ux;
zwTkiJV2))A4^1)jMuvgDyBivdh1v!zk|aYRB7{O14+gQ*Y=+)$hrwdXeFI?DcrCgJCeg6hO_fEbc`jSeTt%_4{{s
zbQA)kyswm6vdJW70s&0ER}
z6HG1_T6%gU_0>fWEG9f2EX3n5`~7IL*{CfAIK%T~!s|u+4}ZXscizEbB7s{MF084g
zrAn*G1f$!XkA5Ww9dkONu~@LDzh4&6k^`Rd`N*|%=U`}RLW|3V*asg}1nf#${cK+!
z_If;$KhO!k9}^xA8f`Z0zi>g)yjn8A8J;J%91cv~xPeFMv}|sn)nv+>P04-ql+TAT
zpAXLk0x&onRLuaM@Oa4RyYJ%B!h&M5hXXx5*ni;y)CPkrW?S!YU~hka#kE;g;ivZ0
zXJ7w18U5MMkW~;|02mt_#Hh`NY%(e7|J!7<;V8!egy6c>I-HI~NL6ZZIuarO{qoDX
zd@PeuY^7&+M+Yo^ziiR=mF{jlH!y$}my4o>KKu}ib91OBkrQ$@nZzi=Kx?(a5(tP2S+xx}CkwN);9V}s
zeKG*34F()yS%45+qiK>&CQm5}a5kAdHFo9rYb4vK1)f4+1{@;td%_?{ksqC_#*WdpwU{PU!i;O71D
zOR<>bIdUZ+mt~^I&YY<^xOsnk+wGQh4VJ+{WOyFD(@A6je5b#keDUFjH3zrw@c!mE
z$nde&R&@_y_y=Y_@)EB{Bh{Z6+vY7CCaj&SqS!^x-
zw^T|I7UlEKPBbzM+Pq#$bim1AkbH9XEVB3SOZEdb=yZ5K6xvXa)l48zG0<}7#d*o_
zJpQYr1209R8}8uTkcrMFlczp;;|)pS?xAT|S$4w>bj?mDjz%KbQ*<;%ESY0jMQE_b
zV!;uw7crMhTpxVf?H-0&Eh*eX;V>FD39C-8$H8C_4LV&-0tNtMUmpk|n7VLbL#B6K
z6FnOalc?P;N#9gnUgkJ7baa&b{qr1$2*Y4rB;TndKfIL5;C~qgFLKu`t~O{XIf#Q@e?tvKLzZzxY!t*5<{pMDB5KQGzh#p-(0
z+wG#RE32@Iozd+^JQzfV=Sj(cW8e9Xq#clZXc{{@JH-Lq-7TswUZ_wSR;s8Ch7AQ=
zs{&5={UjxEDNvrWAflPhC=75u;L7kkX2W5!X~2{3y(ej4wJoK)v`Mdba~eDw
z4wJq29p5M~Ak%X*LdBO{{1-F^JH;{CAJYDJw+hh#8FRt22;
z^Pgos+F7t7PABH0(bCL(G>T8UyG31(lFjq7yx8r2!o@8EJpJomD`v5g&dyCko*5j>
zeV@o119Hs#D0Q9Vs{zjNJW1TSqnO3cr&9P&nnuj!!a_X0c6yacVbbf(X?_KEeZ;P7
zS4uP%3wD~#%Nq0wo4jI0uVTxsKmfM_0X*w;LT|T2t=FT0rZLZP$O;04PzV#jU`4sWwPJc~tgwx!0&+c9>FqM%ljhmski93mq_oazEmZMT0FdUmVM?RfCig&p{^;m7)gm#=5UqC
z$O;0~3$YloTey3&818Dvc&MfG(ChuXB29E=3v?c?CWn9W6CC9@)amuP`wb{+#aA)N
z)&4zyM}pEsy%oW>wzuOzFoO?;9r8GIx-;cxLuwHC+U!5<^C=##lzFlW05m&x
z)CAn;d_J@|omI8wN(EkbE?-8I%|=m#5c~&4k!pv#k6~~q9Inc>iyd@jcpjq+gX8fy
zl?$?JU_aRG_gC%O#WvM*MKOp90G>HjdUHP0OHGMlm2(KVli+|C$3wqiW%TG8xCWq*}QCq^s<(n_9_Zk#Gae6CVTX
zHzAW8hg%{JJuOFsQ0R$L?J~fI*Iuide7I4hvBP<}X}4pt#P+4zEW4?D6e<;L2}46q
zJow82I~8Gp0|B4wsFT`RP9~mj@J#Ga8qR%C4h)M6}~~@cA?pD7|!+-%`-}&>{3X^xLeaif#
z*9+qsx0SC7xXEUt_LO-+RW(Sn$UR(AZhp*$!^rSFT3jw_(|`fM^uY&;OqtRmo~NqQ
z>tPnDg14`;Q&JNhbGg$|{C?D%Oso3dysUdU
zWrpX;$48DRZcv(-BlZ^s0iz6q$uj13?&;{jQ4uZ6TDwWvWD?h{R+#<%bpfw?K3HS1
zP{-bV7ixv2O=%H_r`GB9IK;BpWipjkcxh^aMZ)}d!s9_>XXmxc7@4~9ahZ))1K=AMW~CG)+r;V{Phe(d-8x;FCl8$RK02?U^0kT0%8-M4|JaUvSU
zvm4yR-`ClRLo5ra&RA!YNyJ<(bPNs_dal+JYBM_)cl!Iu&GYAxRlvm^0MIE2P>X!q
zcX0t^!sEdl%jQ~{mSmU7ghqye(e197)~@D%zgTJyZXX!f@MZzE*$%$XPMjbU9H)rh
zt&TtdEfV!cEiN6$ltNYloD2qW+wI0tj_cZ}_Lc-Vn@pbiTU*=kq5`JlRkANjPI(+~
z{z~_+vFsE3y`uTxLZ!xFxcK77A1lHiPsd_Nh_uzGRJhq>5;q+V9P#-!4Ywq~`2xt%
z_uhk60X@kRRXUY@qe0cE&4%Wlo;AynqMGPp8GHS8a{G^els)K@(icmqy}Z*25CY5K
zV96aARJn(p#$JD&O#St*vi4JJbUOS?JYKPgS}M4}SIu_3(}{E>f@9HWS?x7tPr5ts
zyWdg9Z+=r&bDc@05UaA2{VQtQV{i|#Y*)GODat6r_Fw#>tEsI`R><*C2vb!$%)8h$
z=gso5Xq4JaI#f}>YJ=h8p^rY29rBI-eo<@GQkv#$GKo=!Dck2(1aKbmv8z{QHP@L`
z3cS;aY=!PItQ6dZSPY{!8|qCaQQ?XTxY#GRzx5W>GEMHe%W)WG7{x=*!xcgy{0~jT
z*xM^QTv4Lv)gC>{9>`W?!E1jK+DQ6NwaBpA$f45q(qq7r-M@Fbh!mYRl7fUi2B%i$T26kw*
zvS{-@hJiT{ki}#ZLXeI`F#dxdfDi&pAh6;ogsRivVlg-z)W438ckMiVdedDKV#qkl
z;%{a%CM3L*Fq=x@_PKMo-Peb|GYs_I-8eilLP-TzQVlMa*>ITLId=|suU^F?8S2;?
zoeu3T7mRLqMKn5_O5vW*htGfdQ&1FzwwGUq=~usklwf5ATnu{rhd;#KYu9A!+BDhi
z&@a8psby!E4xUZoy(U2wOUr#E5Vfa0L^qQBBw3
+
+CodeMirror
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+

+  
CodeMirror is a versatile text editor
+  implemented in JavaScript for the browser. It is specialized for
+  editing code, and comes with a number of language modes and addons
+  that implement more advanced editing functionality.

+
+  
A rich programming API and a
+  CSS theming system are
+  available for customizing CodeMirror to fit your application, and
+  extending it with new functionality.

+

+
+

+  
This is CodeMirror

+  

+  

+  
+
+  

+    

+      
+      

+        DOWNLOAD
+      

+      

+        FUND
+      

+    

+    

+      Get the current version: 5.13.

+      You can see the code or

+      read the release notes.

+      There is a minification helper.
+    

+    

+      Software needs maintenance,

+      maintainers need to subsist.

+      Current funding status = 

+      You can help per month or
+      once.
+      

+        
+        
+      

+    

+  

+  
+

+
+

+  
Features

+  
+

+
+

+  
Community

+
+  
CodeMirror is an open-source project shared under
+  an MIT license. It is the editor used in the
+  dev tools for
+  both Firefox
+  and Chrome, Light
+  Table, Adobe
+  Brackets, Bitbucket,
+  and many other projects.

+
+  
Development and bug tracking happens
+  on github
+  (alternate git
+  repository).
+  Please read these
+  pointers before submitting a bug. Use pull requests to submit
+  patches. All contributions must be released under the same MIT
+  license that CodeMirror uses.

+
+  
Discussion around the project is done on
+  a discussion forum.
+  There is also
+  the codemirror-announce
+  list, which is only used for major announcements (such as new
+  versions). If needed, you can
+  contact the maintainer
+  directly. We aim to be an inclusive, welcoming community. To make
+  that explicit, we have
+  a code of
+  conduct that applies to communication around the project.

+
+  
A list of CodeMirror-related software that is not part of the
+  main distribution is maintained
+  on our
+  wiki. Feel free to add your project.

+

+
+

+  
Browser support

+  
The desktop versions of the following browsers,
+  in standards mode (HTML5 <!doctype html>
+  recommended) are supported:

+  
+    
+    
+    
+    
+    
+  
Firefoxversion 4 and up
Chromeany version
Safariversion 5.2 and up
Internet Explorerversion 8 and up
Operaversion 9 and up

+  
Support for modern mobile browsers is experimental. Recent
+  versions of the iOS browser and Chrome on Android should work
+  pretty well.

+

+
+

diff --git a/www/code/codemirror-5.13.2/keymap/emacs.js b/www/code/codemirror-5.13.2/keymap/emacs.js
new file mode 100644
index 000000000..3eec1e576
--- /dev/null
+++ b/www/code/codemirror-5.13.2/keymap/emacs.js
@@ -0,0 +1,412 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+  function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
+
+  // Kill 'ring'
+
+  var killRing = [];
+  function addToRing(str) {
+    killRing.push(str);
+    if (killRing.length > 50) killRing.shift();
+  }
+  function growRingTop(str) {
+    if (!killRing.length) return addToRing(str);
+    killRing[killRing.length - 1] += str;
+  }
+  function getFromRing(n) { return killRing[killRing.length - (n ? Math.min(n, 1) : 1)] || ""; }
+  function popFromRing() { if (killRing.length > 1) killRing.pop(); return getFromRing(); }
+
+  var lastKill = null;
+
+  function kill(cm, from, to, mayGrow, text) {
+    if (text == null) text = cm.getRange(from, to);
+
+    if (mayGrow && lastKill && lastKill.cm == cm && posEq(from, lastKill.pos) && cm.isClean(lastKill.gen))
+      growRingTop(text);
+    else
+      addToRing(text);
+    cm.replaceRange("", from, to, "+delete");
+
+    if (mayGrow) lastKill = {cm: cm, pos: from, gen: cm.changeGeneration()};
+    else lastKill = null;
+  }
+
+  // Boundaries of various units
+
+  function byChar(cm, pos, dir) {
+    return cm.findPosH(pos, dir, "char", true);
+  }
+
+  function byWord(cm, pos, dir) {
+    return cm.findPosH(pos, dir, "word", true);
+  }
+
+  function byLine(cm, pos, dir) {
+    return cm.findPosV(pos, dir, "line", cm.doc.sel.goalColumn);
+  }
+
+  function byPage(cm, pos, dir) {
+    return cm.findPosV(pos, dir, "page", cm.doc.sel.goalColumn);
+  }
+
+  function byParagraph(cm, pos, dir) {
+    var no = pos.line, line = cm.getLine(no);
+    var sawText = /\S/.test(dir < 0 ? line.slice(0, pos.ch) : line.slice(pos.ch));
+    var fst = cm.firstLine(), lst = cm.lastLine();
+    for (;;) {
+      no += dir;
+      if (no < fst || no > lst)
+        return cm.clipPos(Pos(no - dir, dir < 0 ? 0 : null));
+      line = cm.getLine(no);
+      var hasText = /\S/.test(line);
+      if (hasText) sawText = true;
+      else if (sawText) return Pos(no, 0);
+    }
+  }
+
+  function bySentence(cm, pos, dir) {
+    var line = pos.line, ch = pos.ch;
+    var text = cm.getLine(pos.line), sawWord = false;
+    for (;;) {
+      var next = text.charAt(ch + (dir < 0 ? -1 : 0));
+      if (!next) { // End/beginning of line reached
+        if (line == (dir < 0 ? cm.firstLine() : cm.lastLine())) return Pos(line, ch);
+        text = cm.getLine(line + dir);
+        if (!/\S/.test(text)) return Pos(line, ch);
+        line += dir;
+        ch = dir < 0 ? text.length : 0;
+        continue;
+      }
+      if (sawWord && /[!?.]/.test(next)) return Pos(line, ch + (dir > 0 ? 1 : 0));
+      if (!sawWord) sawWord = /\w/.test(next);
+      ch += dir;
+    }
+  }
+
+  function byExpr(cm, pos, dir) {
+    var wrap;
+    if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, true))
+        && wrap.match && (wrap.forward ? 1 : -1) == dir)
+      return dir > 0 ? Pos(wrap.to.line, wrap.to.ch + 1) : wrap.to;
+
+    for (var first = true;; first = false) {
+      var token = cm.getTokenAt(pos);
+      var after = Pos(pos.line, dir < 0 ? token.start : token.end);
+      if (first && dir > 0 && token.end == pos.ch || !/\w/.test(token.string)) {
+        var newPos = cm.findPosH(after, dir, "char");
+        if (posEq(after, newPos)) return pos;
+        else pos = newPos;
+      } else {
+        return after;
+      }
+    }
+  }
+
+  // Prefixes (only crudely supported)
+
+  function getPrefix(cm, precise) {
+    var digits = cm.state.emacsPrefix;
+    if (!digits) return precise ? null : 1;
+    clearPrefix(cm);
+    return digits == "-" ? -1 : Number(digits);
+  }
+
+  function repeated(cmd) {
+    var f = typeof cmd == "string" ? function(cm) { cm.execCommand(cmd); } : cmd;
+    return function(cm) {
+      var prefix = getPrefix(cm);
+      f(cm);
+      for (var i = 1; i < prefix; ++i) f(cm);
+    };
+  }
+
+  function findEnd(cm, pos, by, dir) {
+    var prefix = getPrefix(cm);
+    if (prefix < 0) { dir = -dir; prefix = -prefix; }
+    for (var i = 0; i < prefix; ++i) {
+      var newPos = by(cm, pos, dir);
+      if (posEq(newPos, pos)) break;
+      pos = newPos;
+    }
+    return pos;
+  }
+
+  function move(by, dir) {
+    var f = function(cm) {
+      cm.extendSelection(findEnd(cm, cm.getCursor(), by, dir));
+    };
+    f.motion = true;
+    return f;
+  }
+
+  function killTo(cm, by, dir) {
+    var selections = cm.listSelections(), cursor;
+    var i = selections.length;
+    while (i--) {
+      cursor = selections[i].head;
+      kill(cm, cursor, findEnd(cm, cursor, by, dir), true);
+    }
+  }
+
+  function killRegion(cm) {
+    if (cm.somethingSelected()) {
+      var selections = cm.listSelections(), selection;
+      var i = selections.length;
+      while (i--) {
+        selection = selections[i];
+        kill(cm, selection.anchor, selection.head);
+      }
+      return true;
+    }
+  }
+
+  function addPrefix(cm, digit) {
+    if (cm.state.emacsPrefix) {
+      if (digit != "-") cm.state.emacsPrefix += digit;
+      return;
+    }
+    // Not active yet
+    cm.state.emacsPrefix = digit;
+    cm.on("keyHandled", maybeClearPrefix);
+    cm.on("inputRead", maybeDuplicateInput);
+  }
+
+  var prefixPreservingKeys = {"Alt-G": true, "Ctrl-X": true, "Ctrl-Q": true, "Ctrl-U": true};
+
+  function maybeClearPrefix(cm, arg) {
+    if (!cm.state.emacsPrefixMap && !prefixPreservingKeys.hasOwnProperty(arg))
+      clearPrefix(cm);
+  }
+
+  function clearPrefix(cm) {
+    cm.state.emacsPrefix = null;
+    cm.off("keyHandled", maybeClearPrefix);
+    cm.off("inputRead", maybeDuplicateInput);
+  }
+
+  function maybeDuplicateInput(cm, event) {
+    var dup = getPrefix(cm);
+    if (dup > 1 && event.origin == "+input") {
+      var one = event.text.join("\n"), txt = "";
+      for (var i = 1; i < dup; ++i) txt += one;
+      cm.replaceSelection(txt);
+    }
+  }
+
+  function addPrefixMap(cm) {
+    cm.state.emacsPrefixMap = true;
+    cm.addKeyMap(prefixMap);
+    cm.on("keyHandled", maybeRemovePrefixMap);
+    cm.on("inputRead", maybeRemovePrefixMap);
+  }
+
+  function maybeRemovePrefixMap(cm, arg) {
+    if (typeof arg == "string" && (/^\d$/.test(arg) || arg == "Ctrl-U")) return;
+    cm.removeKeyMap(prefixMap);
+    cm.state.emacsPrefixMap = false;
+    cm.off("keyHandled", maybeRemovePrefixMap);
+    cm.off("inputRead", maybeRemovePrefixMap);
+  }
+
+  // Utilities
+
+  function setMark(cm) {
+    cm.setCursor(cm.getCursor());
+    cm.setExtending(!cm.getExtending());
+    cm.on("change", function() { cm.setExtending(false); });
+  }
+
+  function clearMark(cm) {
+    cm.setExtending(false);
+    cm.setCursor(cm.getCursor());
+  }
+
+  function getInput(cm, msg, f) {
+    if (cm.openDialog)
+      cm.openDialog(msg + ": ", f, {bottom: true});
+    else
+      f(prompt(msg, ""));
+  }
+
+  function operateOnWord(cm, op) {
+    var start = cm.getCursor(), end = cm.findPosH(start, 1, "word");
+    cm.replaceRange(op(cm.getRange(start, end)), start, end);
+    cm.setCursor(end);
+  }
+
+  function toEnclosingExpr(cm) {
+    var pos = cm.getCursor(), line = pos.line, ch = pos.ch;
+    var stack = [];
+    while (line >= cm.firstLine()) {
+      var text = cm.getLine(line);
+      for (var i = ch == null ? text.length : ch; i > 0;) {
+        var ch = text.charAt(--i);
+        if (ch == ")")
+          stack.push("(");
+        else if (ch == "]")
+          stack.push("[");
+        else if (ch == "}")
+          stack.push("{");
+        else if (/[\(\{\[]/.test(ch) && (!stack.length || stack.pop() != ch))
+          return cm.extendSelection(Pos(line, i));
+      }
+      --line; ch = null;
+    }
+  }
+
+  function quit(cm) {
+    cm.execCommand("clearSearch");
+    clearMark(cm);
+  }
+
+  // Actual keymap
+
+  var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({
+    "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
+    "Ctrl-K": repeated(function(cm) {
+      var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
+      var text = cm.getRange(start, end);
+      if (!/\S/.test(text)) {
+        text += "\n";
+        end = Pos(start.line + 1, 0);
+      }
+      kill(cm, start, end, true, text);
+    }),
+    "Alt-W": function(cm) {
+      addToRing(cm.getSelection());
+      clearMark(cm);
+    },
+    "Ctrl-Y": function(cm) {
+      var start = cm.getCursor();
+      cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste");
+      cm.setSelection(start, cm.getCursor());
+    },
+    "Alt-Y": function(cm) {cm.replaceSelection(popFromRing(), "around", "paste");},
+
+    "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
+
+    "Ctrl-F": move(byChar, 1), "Ctrl-B": move(byChar, -1),
+    "Right": move(byChar, 1), "Left": move(byChar, -1),
+    "Ctrl-D": function(cm) { killTo(cm, byChar, 1); },
+    "Delete": function(cm) { killRegion(cm) || killTo(cm, byChar, 1); },
+    "Ctrl-H": function(cm) { killTo(cm, byChar, -1); },
+    "Backspace": function(cm) { killRegion(cm) || killTo(cm, byChar, -1); },
+
+    "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1),
+    "Alt-D": function(cm) { killTo(cm, byWord, 1); },
+    "Alt-Backspace": function(cm) { killTo(cm, byWord, -1); },
+
+    "Ctrl-N": move(byLine, 1), "Ctrl-P": move(byLine, -1),
+    "Down": move(byLine, 1), "Up": move(byLine, -1),
+    "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
+    "End": "goLineEnd", "Home": "goLineStart",
+
+    "Alt-V": move(byPage, -1), "Ctrl-V": move(byPage, 1),
+    "PageUp": move(byPage, -1), "PageDown": move(byPage, 1),
+
+    "Ctrl-Up": move(byParagraph, -1), "Ctrl-Down": move(byParagraph, 1),
+
+    "Alt-A": move(bySentence, -1), "Alt-E": move(bySentence, 1),
+    "Alt-K": function(cm) { killTo(cm, bySentence, 1); },
+
+    "Ctrl-Alt-K": function(cm) { killTo(cm, byExpr, 1); },
+    "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1); },
+    "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1),
+
+    "Shift-Ctrl-Alt-2": function(cm) {
+      var cursor = cm.getCursor();
+      cm.setSelection(findEnd(cm, cursor, byExpr, 1), cursor);
+    },
+    "Ctrl-Alt-T": function(cm) {
+      var leftStart = byExpr(cm, cm.getCursor(), -1), leftEnd = byExpr(cm, leftStart, 1);
+      var rightEnd = byExpr(cm, leftEnd, 1), rightStart = byExpr(cm, rightEnd, -1);
+      cm.replaceRange(cm.getRange(rightStart, rightEnd) + cm.getRange(leftEnd, rightStart) +
+                      cm.getRange(leftStart, leftEnd), leftStart, rightEnd);
+    },
+    "Ctrl-Alt-U": repeated(toEnclosingExpr),
+
+    "Alt-Space": function(cm) {
+      var pos = cm.getCursor(), from = pos.ch, to = pos.ch, text = cm.getLine(pos.line);
+      while (from && /\s/.test(text.charAt(from - 1))) --from;
+      while (to < text.length && /\s/.test(text.charAt(to))) ++to;
+      cm.replaceRange(" ", Pos(pos.line, from), Pos(pos.line, to));
+    },
+    "Ctrl-O": repeated(function(cm) { cm.replaceSelection("\n", "start"); }),
+    "Ctrl-T": repeated(function(cm) {
+      cm.execCommand("transposeChars");
+    }),
+
+    "Alt-C": repeated(function(cm) {
+      operateOnWord(cm, function(w) {
+        var letter = w.search(/\w/);
+        if (letter == -1) return w;
+        return w.slice(0, letter) + w.charAt(letter).toUpperCase() + w.slice(letter + 1).toLowerCase();
+      });
+    }),
+    "Alt-U": repeated(function(cm) {
+      operateOnWord(cm, function(w) { return w.toUpperCase(); });
+    }),
+    "Alt-L": repeated(function(cm) {
+      operateOnWord(cm, function(w) { return w.toLowerCase(); });
+    }),
+
+    "Alt-;": "toggleComment",
+
+    "Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"),
+    "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
+    "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
+    "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace",
+    "Alt-/": "autocomplete",
+    "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto",
+
+    "Alt-G G": function(cm) {
+      var prefix = getPrefix(cm, true);
+      if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1);
+
+      getInput(cm, "Goto line", function(str) {
+        var num;
+        if (str && !isNaN(num = Number(str)) && num == (num|0) && num > 0)
+          cm.setCursor(num - 1);
+      });
+    },
+
+    "Ctrl-X Tab": function(cm) {
+      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
+    },
+    "Ctrl-X Ctrl-X": function(cm) {
+      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
+    },
+    "Ctrl-X Ctrl-S": "save",
+    "Ctrl-X Ctrl-W": "save",
+    "Ctrl-X S": "saveAll",
+    "Ctrl-X F": "open",
+    "Ctrl-X U": repeated("undo"),
+    "Ctrl-X K": "close",
+    "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
+    "Ctrl-X H": "selectAll",
+
+    "Ctrl-Q Tab": repeated("insertTab"),
+    "Ctrl-U": addPrefixMap
+  });
+
+  var prefixMap = {"Ctrl-G": clearPrefix};
+  function regPrefix(d) {
+    prefixMap[d] = function(cm) { addPrefix(cm, d); };
+    keyMap["Ctrl-" + d] = function(cm) { addPrefix(cm, d); };
+    prefixPreservingKeys["Ctrl-" + d] = true;
+  }
+  for (var i = 0; i < 10; ++i) regPrefix(String(i));
+  regPrefix("-");
+});
diff --git a/www/code/codemirror-5.13.2/keymap/sublime.js b/www/code/codemirror-5.13.2/keymap/sublime.js
new file mode 100644
index 000000000..49db3b871
--- /dev/null
+++ b/www/code/codemirror-5.13.2/keymap/sublime.js
@@ -0,0 +1,569 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// A rough approximation of Sublime Text's keybindings
+// Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/edit/matchbrackets"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/edit/matchbrackets"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var map = CodeMirror.keyMap.sublime = {fallthrough: "default"};
+  var cmds = CodeMirror.commands;
+  var Pos = CodeMirror.Pos;
+  var mac = CodeMirror.keyMap["default"] == CodeMirror.keyMap.macDefault;
+  var ctrl = mac ? "Cmd-" : "Ctrl-";
+
+  // This is not exactly Sublime's algorithm. I couldn't make heads or tails of that.
+  function findPosSubword(doc, start, dir) {
+    if (dir < 0 && start.ch == 0) return doc.clipPos(Pos(start.line - 1));
+    var line = doc.getLine(start.line);
+    if (dir > 0 && start.ch >= line.length) return doc.clipPos(Pos(start.line + 1, 0));
+    var state = "start", type;
+    for (var pos = start.ch, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) {
+      var next = line.charAt(dir < 0 ? pos - 1 : pos);
+      var cat = next != "_" && CodeMirror.isWordChar(next) ? "w" : "o";
+      if (cat == "w" && next.toUpperCase() == next) cat = "W";
+      if (state == "start") {
+        if (cat != "o") { state = "in"; type = cat; }
+      } else if (state == "in") {
+        if (type != cat) {
+          if (type == "w" && cat == "W" && dir < 0) pos--;
+          if (type == "W" && cat == "w" && dir > 0) { type = "w"; continue; }
+          break;
+        }
+      }
+    }
+    return Pos(start.line, pos);
+  }
+
+  function moveSubword(cm, dir) {
+    cm.extendSelectionsBy(function(range) {
+      if (cm.display.shift || cm.doc.extend || range.empty())
+        return findPosSubword(cm.doc, range.head, dir);
+      else
+        return dir < 0 ? range.from() : range.to();
+    });
+  }
+
+  cmds[map["Alt-Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
+  cmds[map["Alt-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
+
+  var scrollLineCombo = mac ? "Ctrl-Alt-" : "Ctrl-";
+
+  cmds[map[scrollLineCombo + "Up"] = "scrollLineUp"] = function(cm) {
+    var info = cm.getScrollInfo();
+    if (!cm.somethingSelected()) {
+      var visibleBottomLine = cm.lineAtHeight(info.top + info.clientHeight, "local");
+      if (cm.getCursor().line >= visibleBottomLine)
+        cm.execCommand("goLineUp");
+    }
+    cm.scrollTo(null, info.top - cm.defaultTextHeight());
+  };
+  cmds[map[scrollLineCombo + "Down"] = "scrollLineDown"] = function(cm) {
+    var info = cm.getScrollInfo();
+    if (!cm.somethingSelected()) {
+      var visibleTopLine = cm.lineAtHeight(info.top, "local")+1;
+      if (cm.getCursor().line <= visibleTopLine)
+        cm.execCommand("goLineDown");
+    }
+    cm.scrollTo(null, info.top + cm.defaultTextHeight());
+  };
+
+  cmds[map["Shift-" + ctrl + "L"] = "splitSelectionByLine"] = function(cm) {
+    var ranges = cm.listSelections(), lineRanges = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      for (var line = from.line; line <= to.line; ++line)
+        if (!(to.line > from.line && line == to.line && to.ch == 0))
+          lineRanges.push({anchor: line == from.line ? from : Pos(line, 0),
+                           head: line == to.line ? to : Pos(line)});
+    }
+    cm.setSelections(lineRanges, 0);
+  };
+
+  map["Shift-Tab"] = "indentLess";
+
+  cmds[map["Esc"] = "singleSelectionTop"] = function(cm) {
+    var range = cm.listSelections()[0];
+    cm.setSelection(range.anchor, range.head, {scroll: false});
+  };
+
+  cmds[map[ctrl + "L"] = "selectLine"] = function(cm) {
+    var ranges = cm.listSelections(), extended = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      extended.push({anchor: Pos(range.from().line, 0),
+                     head: Pos(range.to().line + 1, 0)});
+    }
+    cm.setSelections(extended);
+  };
+
+  map["Shift-Ctrl-K"] = "deleteLine";
+
+  function insertLine(cm, above) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
+    cm.operation(function() {
+      var len = cm.listSelections().length, newSelection = [], last = -1;
+      for (var i = 0; i < len; i++) {
+        var head = cm.listSelections()[i].head;
+        if (head.line <= last) continue;
+        var at = Pos(head.line + (above ? 0 : 1), 0);
+        cm.replaceRange("\n", at, null, "+insertLine");
+        cm.indentLine(at.line, null, true);
+        newSelection.push({head: at, anchor: at});
+        last = head.line + 1;
+      }
+      cm.setSelections(newSelection);
+    });
+  }
+
+  cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { return insertLine(cm, false); };
+
+  cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { return insertLine(cm, true); };
+
+  function wordAt(cm, pos) {
+    var start = pos.ch, end = start, line = cm.getLine(pos.line);
+    while (start && CodeMirror.isWordChar(line.charAt(start - 1))) --start;
+    while (end < line.length && CodeMirror.isWordChar(line.charAt(end))) ++end;
+    return {from: Pos(pos.line, start), to: Pos(pos.line, end), word: line.slice(start, end)};
+  }
+
+  cmds[map[ctrl + "D"] = "selectNextOccurrence"] = function(cm) {
+    var from = cm.getCursor("from"), to = cm.getCursor("to");
+    var fullWord = cm.state.sublimeFindFullWord == cm.doc.sel;
+    if (CodeMirror.cmpPos(from, to) == 0) {
+      var word = wordAt(cm, from);
+      if (!word.word) return;
+      cm.setSelection(word.from, word.to);
+      fullWord = true;
+    } else {
+      var text = cm.getRange(from, to);
+      var query = fullWord ? new RegExp("\\b" + text + "\\b") : text;
+      var cur = cm.getSearchCursor(query, to);
+      if (cur.findNext()) {
+        cm.addSelection(cur.from(), cur.to());
+      } else {
+        cur = cm.getSearchCursor(query, Pos(cm.firstLine(), 0));
+        if (cur.findNext())
+          cm.addSelection(cur.from(), cur.to());
+      }
+    }
+    if (fullWord)
+      cm.state.sublimeFindFullWord = cm.doc.sel;
+  };
+
+  var mirror = "(){}[]";
+  function selectBetweenBrackets(cm) {
+    var pos = cm.getCursor(), opening = cm.scanForBracket(pos, -1);
+    if (!opening) return;
+    for (;;) {
+      var closing = cm.scanForBracket(pos, 1);
+      if (!closing) return;
+      if (closing.ch == mirror.charAt(mirror.indexOf(opening.ch) + 1)) {
+        cm.setSelection(Pos(opening.pos.line, opening.pos.ch + 1), closing.pos, false);
+        return true;
+      }
+      pos = Pos(closing.pos.line, closing.pos.ch + 1);
+    }
+  }
+
+  cmds[map["Shift-" + ctrl + "Space"] = "selectScope"] = function(cm) {
+    selectBetweenBrackets(cm) || cm.execCommand("selectAll");
+  };
+  cmds[map["Shift-" + ctrl + "M"] = "selectBetweenBrackets"] = function(cm) {
+    if (!selectBetweenBrackets(cm)) return CodeMirror.Pass;
+  };
+
+  cmds[map[ctrl + "M"] = "goToBracket"] = function(cm) {
+    cm.extendSelectionsBy(function(range) {
+      var next = cm.scanForBracket(range.head, 1);
+      if (next && CodeMirror.cmpPos(next.pos, range.head) != 0) return next.pos;
+      var prev = cm.scanForBracket(range.head, -1);
+      return prev && Pos(prev.pos.line, prev.pos.ch + 1) || range.head;
+    });
+  };
+
+  var swapLineCombo = mac ? "Cmd-Ctrl-" : "Shift-Ctrl-";
+
+  cmds[map[swapLineCombo + "Up"] = "swapLineUp"] = function(cm) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
+    var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1, newSels = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], from = range.from().line - 1, to = range.to().line;
+      newSels.push({anchor: Pos(range.anchor.line - 1, range.anchor.ch),
+                    head: Pos(range.head.line - 1, range.head.ch)});
+      if (range.to().ch == 0 && !range.empty()) --to;
+      if (from > at) linesToMove.push(from, to);
+      else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
+      at = to;
+    }
+    cm.operation(function() {
+      for (var i = 0; i < linesToMove.length; i += 2) {
+        var from = linesToMove[i], to = linesToMove[i + 1];
+        var line = cm.getLine(from);
+        cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
+        if (to > cm.lastLine())
+          cm.replaceRange("\n" + line, Pos(cm.lastLine()), null, "+swapLine");
+        else
+          cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
+      }
+      cm.setSelections(newSels);
+      cm.scrollIntoView();
+    });
+  };
+
+  cmds[map[swapLineCombo + "Down"] = "swapLineDown"] = function(cm) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
+    var ranges = cm.listSelections(), linesToMove = [], at = cm.lastLine() + 1;
+    for (var i = ranges.length - 1; i >= 0; i--) {
+      var range = ranges[i], from = range.to().line + 1, to = range.from().line;
+      if (range.to().ch == 0 && !range.empty()) from--;
+      if (from < at) linesToMove.push(from, to);
+      else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
+      at = to;
+    }
+    cm.operation(function() {
+      for (var i = linesToMove.length - 2; i >= 0; i -= 2) {
+        var from = linesToMove[i], to = linesToMove[i + 1];
+        var line = cm.getLine(from);
+        if (from == cm.lastLine())
+          cm.replaceRange("", Pos(from - 1), Pos(from), "+swapLine");
+        else
+          cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
+        cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
+      }
+      cm.scrollIntoView();
+    });
+  };
+
+  cmds[map[ctrl + "/"] = "toggleCommentIndented"] = function(cm) {
+    cm.toggleComment({ indent: true });
+  }
+
+  cmds[map[ctrl + "J"] = "joinLines"] = function(cm) {
+    var ranges = cm.listSelections(), joined = [];
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i], from = range.from();
+      var start = from.line, end = range.to().line;
+      while (i < ranges.length - 1 && ranges[i + 1].from().line == end)
+        end = ranges[++i].to().line;
+      joined.push({start: start, end: end, anchor: !range.empty() && from});
+    }
+    cm.operation(function() {
+      var offset = 0, ranges = [];
+      for (var i = 0; i < joined.length; i++) {
+        var obj = joined[i];
+        var anchor = obj.anchor && Pos(obj.anchor.line - offset, obj.anchor.ch), head;
+        for (var line = obj.start; line <= obj.end; line++) {
+          var actual = line - offset;
+          if (line == obj.end) head = Pos(actual, cm.getLine(actual).length + 1);
+          if (actual < cm.lastLine()) {
+            cm.replaceRange(" ", Pos(actual), Pos(actual + 1, /^\s*/.exec(cm.getLine(actual + 1))[0].length));
+            ++offset;
+          }
+        }
+        ranges.push({anchor: anchor || head, head: head});
+      }
+      cm.setSelections(ranges, 0);
+    });
+  };
+
+  cmds[map["Shift-" + ctrl + "D"] = "duplicateLine"] = function(cm) {
+    cm.operation(function() {
+      var rangeCount = cm.listSelections().length;
+      for (var i = 0; i < rangeCount; i++) {
+        var range = cm.listSelections()[i];
+        if (range.empty())
+          cm.replaceRange(cm.getLine(range.head.line) + "\n", Pos(range.head.line, 0));
+        else
+          cm.replaceRange(cm.getRange(range.from(), range.to()), range.from());
+      }
+      cm.scrollIntoView();
+    });
+  };
+
+  map[ctrl + "T"] = "transposeChars";
+
+  function sortLines(cm, caseSensitive) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
+    var ranges = cm.listSelections(), toSort = [], selected;
+    for (var i = 0; i < ranges.length; i++) {
+      var range = ranges[i];
+      if (range.empty()) continue;
+      var from = range.from().line, to = range.to().line;
+      while (i < ranges.length - 1 && ranges[i + 1].from().line == to)
+        to = range[++i].to().line;
+      toSort.push(from, to);
+    }
+    if (toSort.length) selected = true;
+    else toSort.push(cm.firstLine(), cm.lastLine());
+
+    cm.operation(function() {
+      var ranges = [];
+      for (var i = 0; i < toSort.length; i += 2) {
+        var from = toSort[i], to = toSort[i + 1];
+        var start = Pos(from, 0), end = Pos(to);
+        var lines = cm.getRange(start, end, false);
+        if (caseSensitive)
+          lines.sort();
+        else
+          lines.sort(function(a, b) {
+            var au = a.toUpperCase(), bu = b.toUpperCase();
+            if (au != bu) { a = au; b = bu; }
+            return a < b ? -1 : a == b ? 0 : 1;
+          });
+        cm.replaceRange(lines, start, end);
+        if (selected) ranges.push({anchor: start, head: end});
+      }
+      if (selected) cm.setSelections(ranges, 0);
+    });
+  }
+
+  cmds[map["F9"] = "sortLines"] = function(cm) { sortLines(cm, true); };
+  cmds[map[ctrl + "F9"] = "sortLinesInsensitive"] = function(cm) { sortLines(cm, false); };
+
+  cmds[map["F2"] = "nextBookmark"] = function(cm) {
+    var marks = cm.state.sublimeBookmarks;
+    if (marks) while (marks.length) {
+      var current = marks.shift();
+      var found = current.find();
+      if (found) {
+        marks.push(current);
+        return cm.setSelection(found.from, found.to);
+      }
+    }
+  };
+
+  cmds[map["Shift-F2"] = "prevBookmark"] = function(cm) {
+    var marks = cm.state.sublimeBookmarks;
+    if (marks) while (marks.length) {
+      marks.unshift(marks.pop());
+      var found = marks[marks.length - 1].find();
+      if (!found)
+        marks.pop();
+      else
+        return cm.setSelection(found.from, found.to);
+    }
+  };
+
+  cmds[map[ctrl + "F2"] = "toggleBookmark"] = function(cm) {
+    var ranges = cm.listSelections();
+    var marks = cm.state.sublimeBookmarks || (cm.state.sublimeBookmarks = []);
+    for (var i = 0; i < ranges.length; i++) {
+      var from = ranges[i].from(), to = ranges[i].to();
+      var found = cm.findMarks(from, to);
+      for (var j = 0; j < found.length; j++) {
+        if (found[j].sublimeBookmark) {
+          found[j].clear();
+          for (var k = 0; k < marks.length; k++)
+            if (marks[k] == found[j])
+              marks.splice(k--, 1);
+          break;
+        }
+      }
+      if (j == found.length)
+        marks.push(cm.markText(from, to, {sublimeBookmark: true, clearWhenEmpty: false}));
+    }
+  };
+
+  cmds[map["Shift-" + ctrl + "F2"] = "clearBookmarks"] = function(cm) {
+    var marks = cm.state.sublimeBookmarks;
+    if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear();
+    marks.length = 0;
+  };
+
+  cmds[map["Alt-F2"] = "selectBookmarks"] = function(cm) {
+    var marks = cm.state.sublimeBookmarks, ranges = [];
+    if (marks) for (var i = 0; i < marks.length; i++) {
+      var found = marks[i].find();
+      if (!found)
+        marks.splice(i--, 0);
+      else
+        ranges.push({anchor: found.from, head: found.to});
+    }
+    if (ranges.length)
+      cm.setSelections(ranges, 0);
+  };
+
+  map["Alt-Q"] = "wrapLines";
+
+  var cK = ctrl + "K ";
+
+  function modifyWordOrSelection(cm, mod) {
+    cm.operation(function() {
+      var ranges = cm.listSelections(), indices = [], replacements = [];
+      for (var i = 0; i < ranges.length; i++) {
+        var range = ranges[i];
+        if (range.empty()) { indices.push(i); replacements.push(""); }
+        else replacements.push(mod(cm.getRange(range.from(), range.to())));
+      }
+      cm.replaceSelections(replacements, "around", "case");
+      for (var i = indices.length - 1, at; i >= 0; i--) {
+        var range = ranges[indices[i]];
+        if (at && CodeMirror.cmpPos(range.head, at) > 0) continue;
+        var word = wordAt(cm, range.head);
+        at = word.from;
+        cm.replaceRange(mod(word.word), word.from, word.to);
+      }
+    });
+  }
+
+  map[cK + ctrl + "Backspace"] = "delLineLeft";
+
+  cmds[map["Backspace"] = "smartBackspace"] = function(cm) {
+    if (cm.somethingSelected()) return CodeMirror.Pass;
+
+    var cursor = cm.getCursor();
+    var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor);
+    var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize"));
+    var indentUnit = cm.getOption("indentUnit");
+
+    if (toStartOfLine && !/\S/.test(toStartOfLine) && column % indentUnit == 0) {
+      var prevIndent = new Pos(cursor.line,
+        CodeMirror.findColumn(toStartOfLine, column - indentUnit, indentUnit));
+
+      // If no smart delete is happening (due to tab sizing) just do a regular delete
+      if (prevIndent.ch == cursor.ch) return CodeMirror.Pass;
+
+      return cm.replaceRange("", prevIndent, cursor, "+delete");
+    } else {
+      return CodeMirror.Pass;
+    }
+  };
+
+  cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {
+    cm.operation(function() {
+      var ranges = cm.listSelections();
+      for (var i = ranges.length - 1; i >= 0; i--)
+        cm.replaceRange("", ranges[i].anchor, Pos(ranges[i].to().line), "+delete");
+      cm.scrollIntoView();
+    });
+  };
+
+  cmds[map[cK + ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
+    modifyWordOrSelection(cm, function(str) { return str.toUpperCase(); });
+  };
+  cmds[map[cK + ctrl + "L"] = "downcaseAtCursor"] = function(cm) {
+    modifyWordOrSelection(cm, function(str) { return str.toLowerCase(); });
+  };
+
+  cmds[map[cK + ctrl + "Space"] = "setSublimeMark"] = function(cm) {
+    if (cm.state.sublimeMark) cm.state.sublimeMark.clear();
+    cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
+  };
+  cmds[map[cK + ctrl + "A"] = "selectToSublimeMark"] = function(cm) {
+    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
+    if (found) cm.setSelection(cm.getCursor(), found);
+  };
+  cmds[map[cK + ctrl + "W"] = "deleteToSublimeMark"] = function(cm) {
+    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
+    if (found) {
+      var from = cm.getCursor(), to = found;
+      if (CodeMirror.cmpPos(from, to) > 0) { var tmp = to; to = from; from = tmp; }
+      cm.state.sublimeKilled = cm.getRange(from, to);
+      cm.replaceRange("", from, to);
+    }
+  };
+  cmds[map[cK + ctrl + "X"] = "swapWithSublimeMark"] = function(cm) {
+    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
+    if (found) {
+      cm.state.sublimeMark.clear();
+      cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
+      cm.setCursor(found);
+    }
+  };
+  cmds[map[cK + ctrl + "Y"] = "sublimeYank"] = function(cm) {
+    if (cm.state.sublimeKilled != null)
+      cm.replaceSelection(cm.state.sublimeKilled, null, "paste");
+  };
+
+  map[cK + ctrl + "G"] = "clearBookmarks";
+  cmds[map[cK + ctrl + "C"] = "showInCenter"] = function(cm) {
+    var pos = cm.cursorCoords(null, "local");
+    cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
+  };
+
+  cmds[map["Shift-Alt-Up"] = "selectLinesUpward"] = function(cm) {
+    cm.operation(function() {
+      var ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        var range = ranges[i];
+        if (range.head.line > cm.firstLine())
+          cm.addSelection(Pos(range.head.line - 1, range.head.ch));
+      }
+    });
+  };
+  cmds[map["Shift-Alt-Down"] = "selectLinesDownward"] = function(cm) {
+    cm.operation(function() {
+      var ranges = cm.listSelections();
+      for (var i = 0; i < ranges.length; i++) {
+        var range = ranges[i];
+        if (range.head.line < cm.lastLine())
+          cm.addSelection(Pos(range.head.line + 1, range.head.ch));
+      }
+    });
+  };
+
+  function getTarget(cm) {
+    var from = cm.getCursor("from"), to = cm.getCursor("to");
+    if (CodeMirror.cmpPos(from, to) == 0) {
+      var word = wordAt(cm, from);
+      if (!word.word) return;
+      from = word.from;
+      to = word.to;
+    }
+    return {from: from, to: to, query: cm.getRange(from, to), word: word};
+  }
+
+  function findAndGoTo(cm, forward) {
+    var target = getTarget(cm);
+    if (!target) return;
+    var query = target.query;
+    var cur = cm.getSearchCursor(query, forward ? target.to : target.from);
+
+    if (forward ? cur.findNext() : cur.findPrevious()) {
+      cm.setSelection(cur.from(), cur.to());
+    } else {
+      cur = cm.getSearchCursor(query, forward ? Pos(cm.firstLine(), 0)
+                                              : cm.clipPos(Pos(cm.lastLine())));
+      if (forward ? cur.findNext() : cur.findPrevious())
+        cm.setSelection(cur.from(), cur.to());
+      else if (target.word)
+        cm.setSelection(target.from, target.to);
+    }
+  };
+  cmds[map[ctrl + "F3"] = "findUnder"] = function(cm) { findAndGoTo(cm, true); };
+  cmds[map["Shift-" + ctrl + "F3"] = "findUnderPrevious"] = function(cm) { findAndGoTo(cm,false); };
+  cmds[map["Alt-F3"] = "findAllUnder"] = function(cm) {
+    var target = getTarget(cm);
+    if (!target) return;
+    var cur = cm.getSearchCursor(target.query);
+    var matches = [];
+    var primaryIndex = -1;
+    while (cur.findNext()) {
+      matches.push({anchor: cur.from(), head: cur.to()});
+      if (cur.from().line <= target.from.line && cur.from().ch <= target.from.ch)
+        primaryIndex++;
+    }
+    cm.setSelections(matches, primaryIndex);
+  };
+
+  map["Shift-" + ctrl + "["] = "fold";
+  map["Shift-" + ctrl + "]"] = "unfold";
+  map[cK + ctrl + "0"] = map[cK + ctrl + "j"] = "unfoldAll";
+
+  map[ctrl + "I"] = "findIncremental";
+  map["Shift-" + ctrl + "I"] = "findIncrementalReverse";
+  map[ctrl + "H"] = "replace";
+  map["F3"] = "findNext";
+  map["Shift-F3"] = "findPrev";
+
+  CodeMirror.normalizeKeyMap(map);
+});
diff --git a/www/code/codemirror-5.13.2/keymap/vim.js b/www/code/codemirror-5.13.2/keymap/vim.js
new file mode 100644
index 000000000..5ed2d9bf7
--- /dev/null
+++ b/www/code/codemirror-5.13.2/keymap/vim.js
@@ -0,0 +1,5066 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/**
+ * Supported keybindings:
+ *   Too many to list. Refer to defaultKeyMap below.
+ *
+ * Supported Ex commands:
+ *   Refer to defaultExCommandMap below.
+ *
+ * Registers: unnamed, -, a-z, A-Z, 0-9
+ *   (Does not respect the special case for number registers when delete
+ *    operator is made with these commands: %, (, ),  , /, ?, n, N, {, } )
+ *   TODO: Implement the remaining registers.
+ *
+ * Marks: a-z, A-Z, and 0-9
+ *   TODO: Implement the remaining special marks. They have more complex
+ *       behavior.
+ *
+ * Events:
+ *  'vim-mode-change' - raised on the editor anytime the current mode changes,
+ *                      Event object: {mode: "visual", subMode: "linewise"}
+ *
+ * Code structure:
+ *  1. Default keymap
+ *  2. Variable declarations and short basic helpers
+ *  3. Instance (External API) implementation
+ *  4. Internal state tracking objects (input state, counter) implementation
+ *     and instanstiation
+ *  5. Key handler (the main command dispatcher) implementation
+ *  6. Motion, operator, and action implementations
+ *  7. Helper functions for the key handler, motions, operators, and actions
+ *  8. Set up Vim to work as a keymap for CodeMirror.
+ *  9. Ex command implementations.
+ */
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"), require("../addon/edit/matchbrackets.js"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog", "../addon/edit/matchbrackets"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  'use strict';
+
+  var defaultKeymap = [
+    // Key to key mapping. This goes first to make it possible to override
+    // existing mappings.
+    { keys: '', type: 'keyToKey', toKeys: 'h' },
+    { keys: '', type: 'keyToKey', toKeys: 'l' },
+    { keys: '', type: 'keyToKey', toKeys: 'k' },
+    { keys: '', type: 'keyToKey', toKeys: 'j' },
+    { keys: '', type: 'keyToKey', toKeys: 'l' },
+    { keys: '', type: 'keyToKey', toKeys: 'h', context: 'normal'},
+    { keys: '', type: 'keyToKey', toKeys: 'W' },
+    { keys: '', type: 'keyToKey', toKeys: 'B', context: 'normal' },
+    { keys: '', type: 'keyToKey', toKeys: 'w' },
+    { keys: '', type: 'keyToKey', toKeys: 'b', context: 'normal' },
+    { keys: '', type: 'keyToKey', toKeys: 'j' },
+    { keys: '', type: 'keyToKey', toKeys: 'k' },
+    { keys: '', type: 'keyToKey', toKeys: '' },
+    { keys: '', type: 'keyToKey', toKeys: '' },
+    { keys: '', type: 'keyToKey', toKeys: '', context: 'insert' },
+    { keys: '', type: 'keyToKey', toKeys: '', context: 'insert' },
+    { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' },
+    { keys: 's', type: 'keyToKey', toKeys: 'c', context: 'visual'},
+    { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' },
+    { keys: 'S', type: 'keyToKey', toKeys: 'VdO', context: 'visual' },
+    { keys: '', type: 'keyToKey', toKeys: '0' },
+    { keys: '', type: 'keyToKey', toKeys: '$' },
+    { keys: '', type: 'keyToKey', toKeys: '' },
+    { keys: '', type: 'keyToKey', toKeys: '' },
+    { keys: '', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
+    // Motions
+    { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'L', type: 'motion', motion: 'moveToBottomLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'h', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }},
+    { keys: 'l', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: 'j', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, linewise: true }},
+    { keys: 'k', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, linewise: true }},
+    { keys: 'gj', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: true }},
+    { keys: 'gk', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: false }},
+    { keys: 'w', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false }},
+    { keys: 'W', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false, bigWord: true }},
+    { keys: 'e', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, inclusive: true }},
+    { keys: 'E', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, bigWord: true, inclusive: true }},
+    { keys: 'b', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }},
+    { keys: 'B', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false, bigWord: true }},
+    { keys: 'ge', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, inclusive: true }},
+    { keys: 'gE', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, bigWord: true, inclusive: true }},
+    { keys: '{', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: false, toJumplist: true }},
+    { keys: '}', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: true, toJumplist: true }},
+    { keys: '', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }},
+    { keys: '', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }},
+    { keys: '', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }},
+    { keys: '', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }},
+    { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
+    { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
+    { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
+    { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }},
+    { keys: '-', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, toFirstChar:true }},
+    { keys: '_', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
+    { keys: '$', type: 'motion', motion: 'moveToEol', motionArgs: { inclusive: true }},
+    { keys: '%', type: 'motion', motion: 'moveToMatchedSymbol', motionArgs: { inclusive: true, toJumplist: true }},
+    { keys: 'f', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: true , inclusive: true }},
+    { keys: 'F', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: false }},
+    { keys: 't', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: true, inclusive: true }},
+    { keys: 'T', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: false }},
+    { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: true }},
+    { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: false }},
+    { keys: '\'', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true, linewise: true}},
+    { keys: '`', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true}},
+    { keys: ']`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
+    { keys: '[`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
+    { keys: ']\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
+    { keys: '[\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
+    // the next two aren't motions but must come before more general motion declarations
+    { keys: ']p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true, matchIndent: true}},
+    { keys: '[p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true, matchIndent: true}},
+    { keys: ']', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: true, toJumplist: true}},
+    { keys: '[', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: false, toJumplist: true}},
+    { keys: '|', type: 'motion', motion: 'moveToColumn'},
+    { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', context:'visual'},
+    { keys: 'O', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
+    // Operators
+    { keys: 'd', type: 'operator', operator: 'delete' },
+    { keys: 'y', type: 'operator', operator: 'yank' },
+    { keys: 'c', type: 'operator', operator: 'change' },
+    { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
+    { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
+    { keys: 'g~', type: 'operator', operator: 'changeCase' },
+    { keys: 'gu', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, isEdit: true },
+    { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true },
+    { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
+    { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
+    // Operator-Motion dual commands
+    { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
+    { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
+    { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'D', type: 'operator', operator: 'delete', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'Y', type: 'operator', operator: 'yank', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'},
+    { keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'},
+    { keys: '', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
+    // Actions
+    { keys: '', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
+    { keys: '', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
+    { keys: '', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }},
+    { keys: '', type: 'action', action: 'scroll', actionArgs: { forward: false, linewise: true }},
+    { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }, context: 'normal' },
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
+    { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' },
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' },
+    { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
+    { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
+    { keys: 'v', type: 'action', action: 'toggleVisualMode' },
+    { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }},
+    { keys: '', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
+    { keys: '', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
+    { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
+    { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
+    { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},
+    { keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }},
+    { keys: 'r', type: 'action', action: 'replace', isEdit: true },
+    { keys: '@', type: 'action', action: 'replayMacro' },
+    { keys: 'q', type: 'action', action: 'enterMacroRecordMode' },
+    // Handle Replace-mode as a special case of insert mode.
+    { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
+    { keys: 'u', type: 'action', action: 'undo', context: 'normal' },
+    { keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true },
+    { keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true },
+    { keys: '', type: 'action', action: 'redo' },
+    { keys: 'm', type: 'action', action: 'setMark' },
+    { keys: '"', type: 'action', action: 'setRegister' },
+    { keys: 'zz', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }},
+    { keys: 'z.', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'zt', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }},
+    { keys: 'z', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }},
+    { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: '.', type: 'action', action: 'repeatLastEdit' },
+    { keys: '', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
+    { keys: '', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
+    // Text object motions
+    { keys: 'a', type: 'motion', motion: 'textObjectManipulation' },
+    { keys: 'i', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }},
+    // Search
+    { keys: '/', type: 'search', searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
+    { keys: '?', type: 'search', searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
+    { keys: '*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
+    { keys: '#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
+    { keys: 'g*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
+    { keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
+    // Ex command
+    { keys: ':', type: 'ex' }
+  ];
+
+  /**
+   * Ex commands
+   * Care must be taken when adding to the default Ex command map. For any
+   * pair of commands that have a shared prefix, at least one of their
+   * shortNames must not match the prefix of the other command.
+   */
+  var defaultExCommandMap = [
+    { name: 'colorscheme', shortName: 'colo' },
+    { name: 'map' },
+    { name: 'imap', shortName: 'im' },
+    { name: 'nmap', shortName: 'nm' },
+    { name: 'vmap', shortName: 'vm' },
+    { name: 'unmap' },
+    { name: 'write', shortName: 'w' },
+    { name: 'undo', shortName: 'u' },
+    { name: 'redo', shortName: 'red' },
+    { name: 'set', shortName: 'se' },
+    { name: 'set', shortName: 'se' },
+    { name: 'setlocal', shortName: 'setl' },
+    { name: 'setglobal', shortName: 'setg' },
+    { name: 'sort', shortName: 'sor' },
+    { name: 'substitute', shortName: 's', possiblyAsync: true },
+    { name: 'nohlsearch', shortName: 'noh' },
+    { name: 'delmarks', shortName: 'delm' },
+    { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
+    { name: 'global', shortName: 'g' }
+  ];
+
+  var Pos = CodeMirror.Pos;
+
+  var Vim = function() {
+    function enterVimMode(cm) {
+      cm.setOption('disableInput', true);
+      cm.setOption('showCursorWhenSelecting', false);
+      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      cm.on('cursorActivity', onCursorActivity);
+      maybeInitVimState(cm);
+      CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
+    }
+
+    function leaveVimMode(cm) {
+      cm.setOption('disableInput', false);
+      cm.off('cursorActivity', onCursorActivity);
+      CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
+      cm.state.vim = null;
+    }
+
+    function detachVimMap(cm, next) {
+      if (this == CodeMirror.keyMap.vim)
+        CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
+
+      if (!next || next.attach != attachVimMap)
+        leaveVimMode(cm, false);
+    }
+    function attachVimMap(cm, prev) {
+      if (this == CodeMirror.keyMap.vim)
+        CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
+
+      if (!prev || prev.attach != attachVimMap)
+        enterVimMode(cm);
+    }
+
+    // Deprecated, simply setting the keymap works again.
+    CodeMirror.defineOption('vimMode', false, function(cm, val, prev) {
+      if (val && cm.getOption("keyMap") != "vim")
+        cm.setOption("keyMap", "vim");
+      else if (!val && prev != CodeMirror.Init && /^vim/.test(cm.getOption("keyMap")))
+        cm.setOption("keyMap", "default");
+    });
+
+    function cmKey(key, cm) {
+      if (!cm) { return undefined; }
+      var vimKey = cmKeyToVimKey(key);
+      if (!vimKey) {
+        return false;
+      }
+      var cmd = CodeMirror.Vim.findKey(cm, vimKey);
+      if (typeof cmd == 'function') {
+        CodeMirror.signal(cm, 'vim-keypress', vimKey);
+      }
+      return cmd;
+    }
+
+    var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'};
+    var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del'};
+    function cmKeyToVimKey(key) {
+      if (key.charAt(0) == '\'') {
+        // Keypress character binding of format "'a'"
+        return key.charAt(1);
+      }
+      var pieces = key.split(/-(?!$)/);
+      var lastPiece = pieces[pieces.length - 1];
+      if (pieces.length == 1 && pieces[0].length == 1) {
+        // No-modifier bindings use literal character bindings above. Skip.
+        return false;
+      } else if (pieces.length == 2 && pieces[0] == 'Shift' && lastPiece.length == 1) {
+        // Ignore Shift+char bindings as they should be handled by literal character.
+        return false;
+      }
+      var hasCharacter = false;
+      for (var i = 0; i < pieces.length; i++) {
+        var piece = pieces[i];
+        if (piece in modifiers) { pieces[i] = modifiers[piece]; }
+        else { hasCharacter = true; }
+        if (piece in specialKeys) { pieces[i] = specialKeys[piece]; }
+      }
+      if (!hasCharacter) {
+        // Vim does not support modifier only keys.
+        return false;
+      }
+      // TODO: Current bindings expect the character to be lower case, but
+      // it looks like vim key notation uses upper case.
+      if (isUpperCase(lastPiece)) {
+        pieces[pieces.length - 1] = lastPiece.toLowerCase();
+      }
+      return '<' + pieces.join('-') + '>';
+    }
+
+    function getOnPasteFn(cm) {
+      var vim = cm.state.vim;
+      if (!vim.onPasteFn) {
+        vim.onPasteFn = function() {
+          if (!vim.insertMode) {
+            cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
+            actions.enterInsertMode(cm, {}, vim);
+          }
+        };
+      }
+      return vim.onPasteFn;
+    }
+
+    var numberRegex = /[\d]/;
+    var wordCharTest = [CodeMirror.isWordChar, function(ch) {
+      return ch && !CodeMirror.isWordChar(ch) && !/\s/.test(ch);
+    }], bigWordCharTest = [function(ch) {
+      return /\S/.test(ch);
+    }];
+    function makeKeyRange(start, size) {
+      var keys = [];
+      for (var i = start; i < start + size; i++) {
+        keys.push(String.fromCharCode(i));
+      }
+      return keys;
+    }
+    var upperCaseAlphabet = makeKeyRange(65, 26);
+    var lowerCaseAlphabet = makeKeyRange(97, 26);
+    var numbers = makeKeyRange(48, 10);
+    var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
+    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']);
+
+    function isLine(cm, line) {
+      return line >= cm.firstLine() && line <= cm.lastLine();
+    }
+    function isLowerCase(k) {
+      return (/^[a-z]$/).test(k);
+    }
+    function isMatchableSymbol(k) {
+      return '()[]{}'.indexOf(k) != -1;
+    }
+    function isNumber(k) {
+      return numberRegex.test(k);
+    }
+    function isUpperCase(k) {
+      return (/^[A-Z]$/).test(k);
+    }
+    function isWhiteSpaceString(k) {
+      return (/^\s*$/).test(k);
+    }
+    function inArray(val, arr) {
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i] == val) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    var options = {};
+    function defineOption(name, defaultValue, type, aliases, callback) {
+      if (defaultValue === undefined && !callback) {
+        throw Error('defaultValue is required unless callback is provided');
+      }
+      if (!type) { type = 'string'; }
+      options[name] = {
+        type: type,
+        defaultValue: defaultValue,
+        callback: callback
+      };
+      if (aliases) {
+        for (var i = 0; i < aliases.length; i++) {
+          options[aliases[i]] = options[name];
+        }
+      }
+      if (defaultValue) {
+        setOption(name, defaultValue);
+      }
+    }
+
+    function setOption(name, value, cm, cfg) {
+      var option = options[name];
+      cfg = cfg || {};
+      var scope = cfg.scope;
+      if (!option) {
+        throw Error('Unknown option: ' + name);
+      }
+      if (option.type == 'boolean') {
+        if (value && value !== true) {
+          throw Error('Invalid argument: ' + name + '=' + value);
+        } else if (value !== false) {
+          // Boolean options are set to true if value is not defined.
+          value = true;
+        }
+      }
+      if (option.callback) {
+        if (scope !== 'local') {
+          option.callback(value, undefined);
+        }
+        if (scope !== 'global' && cm) {
+          option.callback(value, cm);
+        }
+      } else {
+        if (scope !== 'local') {
+          option.value = option.type == 'boolean' ? !!value : value;
+        }
+        if (scope !== 'global' && cm) {
+          cm.state.vim.options[name] = {value: value};
+        }
+      }
+    }
+
+    function getOption(name, cm, cfg) {
+      var option = options[name];
+      cfg = cfg || {};
+      var scope = cfg.scope;
+      if (!option) {
+        throw Error('Unknown option: ' + name);
+      }
+      if (option.callback) {
+        var local = cm && option.callback(undefined, cm);
+        if (scope !== 'global' && local !== undefined) {
+          return local;
+        }
+        if (scope !== 'local') {
+          return option.callback();
+        }
+        return;
+      } else {
+        var local = (scope !== 'global') && (cm && cm.state.vim.options[name]);
+        return (local || (scope !== 'local') && option || {}).value;
+      }
+    }
+
+    defineOption('filetype', undefined, 'string', ['ft'], function(name, cm) {
+      // Option is local. Do nothing for global.
+      if (cm === undefined) {
+        return;
+      }
+      // The 'filetype' option proxies to the CodeMirror 'mode' option.
+      if (name === undefined) {
+        var mode = cm.getOption('mode');
+        return mode == 'null' ? '' : mode;
+      } else {
+        var mode = name == '' ? 'null' : name;
+        cm.setOption('mode', mode);
+      }
+    });
+
+    var createCircularJumpList = function() {
+      var size = 100;
+      var pointer = -1;
+      var head = 0;
+      var tail = 0;
+      var buffer = new Array(size);
+      function add(cm, oldCur, newCur) {
+        var current = pointer % size;
+        var curMark = buffer[current];
+        function useNextSlot(cursor) {
+          var next = ++pointer % size;
+          var trashMark = buffer[next];
+          if (trashMark) {
+            trashMark.clear();
+          }
+          buffer[next] = cm.setBookmark(cursor);
+        }
+        if (curMark) {
+          var markPos = curMark.find();
+          // avoid recording redundant cursor position
+          if (markPos && !cursorEqual(markPos, oldCur)) {
+            useNextSlot(oldCur);
+          }
+        } else {
+          useNextSlot(oldCur);
+        }
+        useNextSlot(newCur);
+        head = pointer;
+        tail = pointer - size + 1;
+        if (tail < 0) {
+          tail = 0;
+        }
+      }
+      function move(cm, offset) {
+        pointer += offset;
+        if (pointer > head) {
+          pointer = head;
+        } else if (pointer < tail) {
+          pointer = tail;
+        }
+        var mark = buffer[(size + pointer) % size];
+        // skip marks that are temporarily removed from text buffer
+        if (mark && !mark.find()) {
+          var inc = offset > 0 ? 1 : -1;
+          var newCur;
+          var oldCur = cm.getCursor();
+          do {
+            pointer += inc;
+            mark = buffer[(size + pointer) % size];
+            // skip marks that are the same as current position
+            if (mark &&
+                (newCur = mark.find()) &&
+                !cursorEqual(oldCur, newCur)) {
+              break;
+            }
+          } while (pointer < head && pointer > tail);
+        }
+        return mark;
+      }
+      return {
+        cachedCursor: undefined, //used for # and * jumps
+        add: add,
+        move: move
+      };
+    };
+
+    // Returns an object to track the changes associated insert mode.  It
+    // clones the object that is passed in, or creates an empty object one if
+    // none is provided.
+    var createInsertModeChanges = function(c) {
+      if (c) {
+        // Copy construction
+        return {
+          changes: c.changes,
+          expectCursorActivityForChange: c.expectCursorActivityForChange
+        };
+      }
+      return {
+        // Change list
+        changes: [],
+        // Set to true on change, false on cursorActivity.
+        expectCursorActivityForChange: false
+      };
+    };
+
+    function MacroModeState() {
+      this.latestRegister = undefined;
+      this.isPlaying = false;
+      this.isRecording = false;
+      this.replaySearchQueries = [];
+      this.onRecordingDone = undefined;
+      this.lastInsertModeChanges = createInsertModeChanges();
+    }
+    MacroModeState.prototype = {
+      exitMacroRecordMode: function() {
+        var macroModeState = vimGlobalState.macroModeState;
+        if (macroModeState.onRecordingDone) {
+          macroModeState.onRecordingDone(); // close dialog
+        }
+        macroModeState.onRecordingDone = undefined;
+        macroModeState.isRecording = false;
+      },
+      enterMacroRecordMode: function(cm, registerName) {
+        var register =
+            vimGlobalState.registerController.getRegister(registerName);
+        if (register) {
+          register.clear();
+          this.latestRegister = registerName;
+          if (cm.openDialog) {
+            this.onRecordingDone = cm.openDialog(
+                '(recording)['+registerName+']', null, {bottom:true});
+          }
+          this.isRecording = true;
+        }
+      }
+    };
+
+    function maybeInitVimState(cm) {
+      if (!cm.state.vim) {
+        // Store instance state in the CodeMirror object.
+        cm.state.vim = {
+          inputState: new InputState(),
+          // Vim's input state that triggered the last edit, used to repeat
+          // motions and operators with '.'.
+          lastEditInputState: undefined,
+          // Vim's action command before the last edit, used to repeat actions
+          // with '.' and insert mode repeat.
+          lastEditActionCommand: undefined,
+          // When using jk for navigation, if you move from a longer line to a
+          // shorter line, the cursor may clip to the end of the shorter line.
+          // If j is pressed again and cursor goes to the next line, the
+          // cursor should go back to its horizontal position on the longer
+          // line if it can. This is to keep track of the horizontal position.
+          lastHPos: -1,
+          // Doing the same with screen-position for gj/gk
+          lastHSPos: -1,
+          // The last motion command run. Cleared if a non-motion command gets
+          // executed in between.
+          lastMotion: null,
+          marks: {},
+          // Mark for rendering fake cursor for visual mode.
+          fakeCursor: null,
+          insertMode: false,
+          // Repeat count for changes made in insert mode, triggered by key
+          // sequences like 3,i. Only exists when insertMode is true.
+          insertModeRepeat: undefined,
+          visualMode: false,
+          // If we are in visual line mode. No effect if visualMode is false.
+          visualLine: false,
+          visualBlock: false,
+          lastSelection: null,
+          lastPastedText: null,
+          sel: {},
+          // Buffer-local/window-local values of vim options.
+          options: {}
+        };
+      }
+      return cm.state.vim;
+    }
+    var vimGlobalState;
+    function resetVimGlobalState() {
+      vimGlobalState = {
+        // The current search query.
+        searchQuery: null,
+        // Whether we are searching backwards.
+        searchIsReversed: false,
+        // Replace part of the last substituted pattern
+        lastSubstituteReplacePart: undefined,
+        jumpList: createCircularJumpList(),
+        macroModeState: new MacroModeState,
+        // Recording latest f, t, F or T motion command.
+        lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
+        registerController: new RegisterController({}),
+        // search history buffer
+        searchHistoryController: new HistoryController({}),
+        // ex Command history buffer
+        exCommandHistoryController : new HistoryController({})
+      };
+      for (var optionName in options) {
+        var option = options[optionName];
+        option.value = option.defaultValue;
+      }
+    }
+
+    var lastInsertModeKeyTimer;
+    var vimApi= {
+      buildKeyMap: function() {
+        // TODO: Convert keymap into dictionary format for fast lookup.
+      },
+      // Testing hook, though it might be useful to expose the register
+      // controller anyways.
+      getRegisterController: function() {
+        return vimGlobalState.registerController;
+      },
+      // Testing hook.
+      resetVimGlobalState_: resetVimGlobalState,
+
+      // Testing hook.
+      getVimGlobalState_: function() {
+        return vimGlobalState;
+      },
+
+      // Testing hook.
+      maybeInitVimState_: maybeInitVimState,
+
+      suppressErrorLogging: false,
+
+      InsertModeKey: InsertModeKey,
+      map: function(lhs, rhs, ctx) {
+        // Add user defined key bindings.
+        exCommandDispatcher.map(lhs, rhs, ctx);
+      },
+      unmap: function(lhs, ctx) {
+        exCommandDispatcher.unmap(lhs, ctx);
+      },
+      // TODO: Expose setOption and getOption as instance methods. Need to decide how to namespace
+      // them, or somehow make them work with the existing CodeMirror setOption/getOption API.
+      setOption: setOption,
+      getOption: getOption,
+      defineOption: defineOption,
+      defineEx: function(name, prefix, func){
+        if (!prefix) {
+          prefix = name;
+        } else if (name.indexOf(prefix) !== 0) {
+          throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered');
+        }
+        exCommands[name]=func;
+        exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
+      },
+      handleKey: function (cm, key, origin) {
+        var command = this.findKey(cm, key, origin);
+        if (typeof command === 'function') {
+          return command();
+        }
+      },
+      /**
+       * This is the outermost function called by CodeMirror, after keys have
+       * been mapped to their Vim equivalents.
+       *
+       * Finds a command based on the key (and cached keys if there is a
+       * multi-key sequence). Returns `undefined` if no key is matched, a noop
+       * function if a partial match is found (multi-key), and a function to
+       * execute the bound command if a a key is matched. The function always
+       * returns true.
+       */
+      findKey: function(cm, key, origin) {
+        var vim = maybeInitVimState(cm);
+        function handleMacroRecording() {
+          var macroModeState = vimGlobalState.macroModeState;
+          if (macroModeState.isRecording) {
+            if (key == 'q') {
+              macroModeState.exitMacroRecordMode();
+              clearInputState(cm);
+              return true;
+            }
+            if (origin != 'mapping') {
+              logKey(macroModeState, key);
+            }
+          }
+        }
+        function handleEsc() {
+          if (key == '') {
+            // Clear input state and get back to normal mode.
+            clearInputState(cm);
+            if (vim.visualMode) {
+              exitVisualMode(cm);
+            } else if (vim.insertMode) {
+              exitInsertMode(cm);
+            }
+            return true;
+          }
+        }
+        function doKeyToKey(keys) {
+          // TODO: prevent infinite recursion.
+          var match;
+          while (keys) {
+            // Pull off one command key, which is either a single character
+            // or a special sequence wrapped in '<' and '>', e.g. ''.
+            match = (/<\w+-.+?>|<\w+>|./).exec(keys);
+            key = match[0];
+            keys = keys.substring(match.index + key.length);
+            CodeMirror.Vim.handleKey(cm, key, 'mapping');
+          }
+        }
+
+        function handleKeyInsertMode() {
+          if (handleEsc()) { return true; }
+          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
+          var keysAreChars = key.length == 1;
+          var match = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
+          // Need to check all key substrings in insert mode.
+          while (keys.length > 1 && match.type != 'full') {
+            var keys = vim.inputState.keyBuffer = keys.slice(1);
+            var thisMatch = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
+            if (thisMatch.type != 'none') { match = thisMatch; }
+          }
+          if (match.type == 'none') { clearInputState(cm); return false; }
+          else if (match.type == 'partial') {
+            if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
+            lastInsertModeKeyTimer = window.setTimeout(
+              function() { if (vim.insertMode && vim.inputState.keyBuffer) { clearInputState(cm); } },
+              getOption('insertModeEscKeysTimeout'));
+            return !keysAreChars;
+          }
+
+          if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
+          if (keysAreChars) {
+            var here = cm.getCursor();
+            cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
+          }
+          clearInputState(cm);
+          return match.command;
+        }
+
+        function handleKeyNonInsertMode() {
+          if (handleMacroRecording() || handleEsc()) { return true; };
+
+          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
+          if (/^[1-9]\d*$/.test(keys)) { return true; }
+
+          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+          if (!keysMatcher) { clearInputState(cm); return false; }
+          var context = vim.visualMode ? 'visual' :
+                                         'normal';
+          var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context);
+          if (match.type == 'none') { clearInputState(cm); return false; }
+          else if (match.type == 'partial') { return true; }
+
+          vim.inputState.keyBuffer = '';
+          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+          if (keysMatcher[1] && keysMatcher[1] != '0') {
+            vim.inputState.pushRepeatDigit(keysMatcher[1]);
+          }
+          return match.command;
+        }
+
+        var command;
+        if (vim.insertMode) { command = handleKeyInsertMode(); }
+        else { command = handleKeyNonInsertMode(); }
+        if (command === false) {
+          return undefined;
+        } else if (command === true) {
+          // TODO: Look into using CodeMirror's multi-key handling.
+          // Return no-op since we are caching the key. Counts as handled, but
+          // don't want act on it just yet.
+          return function() {};
+        } else {
+          return function() {
+            return cm.operation(function() {
+              cm.curOp.isVimOp = true;
+              try {
+                if (command.type == 'keyToKey') {
+                  doKeyToKey(command.toKeys);
+                } else {
+                  commandDispatcher.processCommand(cm, vim, command);
+                }
+              } catch (e) {
+                // clear VIM state in case it's in a bad state.
+                cm.state.vim = undefined;
+                maybeInitVimState(cm);
+                if (!CodeMirror.Vim.suppressErrorLogging) {
+                  console['log'](e);
+                }
+                throw e;
+              }
+              return true;
+            });
+          };
+        }
+      },
+      handleEx: function(cm, input) {
+        exCommandDispatcher.processCommand(cm, input);
+      },
+
+      defineMotion: defineMotion,
+      defineAction: defineAction,
+      defineOperator: defineOperator,
+      mapCommand: mapCommand,
+      _mapCommand: _mapCommand,
+
+      defineRegister: defineRegister,
+
+      exitVisualMode: exitVisualMode,
+      exitInsertMode: exitInsertMode
+    };
+
+    // Represents the current input state.
+    function InputState() {
+      this.prefixRepeat = [];
+      this.motionRepeat = [];
+
+      this.operator = null;
+      this.operatorArgs = null;
+      this.motion = null;
+      this.motionArgs = null;
+      this.keyBuffer = []; // For matching multi-key commands.
+      this.registerName = null; // Defaults to the unnamed register.
+    }
+    InputState.prototype.pushRepeatDigit = function(n) {
+      if (!this.operator) {
+        this.prefixRepeat = this.prefixRepeat.concat(n);
+      } else {
+        this.motionRepeat = this.motionRepeat.concat(n);
+      }
+    };
+    InputState.prototype.getRepeat = function() {
+      var repeat = 0;
+      if (this.prefixRepeat.length > 0 || this.motionRepeat.length > 0) {
+        repeat = 1;
+        if (this.prefixRepeat.length > 0) {
+          repeat *= parseInt(this.prefixRepeat.join(''), 10);
+        }
+        if (this.motionRepeat.length > 0) {
+          repeat *= parseInt(this.motionRepeat.join(''), 10);
+        }
+      }
+      return repeat;
+    };
+
+    function clearInputState(cm, reason) {
+      cm.state.vim.inputState = new InputState();
+      CodeMirror.signal(cm, 'vim-command-done', reason);
+    }
+
+    /*
+     * Register stores information about copy and paste registers.  Besides
+     * text, a register must store whether it is linewise (i.e., when it is
+     * pasted, should it insert itself into a new line, or should the text be
+     * inserted at the cursor position.)
+     */
+    function Register(text, linewise, blockwise) {
+      this.clear();
+      this.keyBuffer = [text || ''];
+      this.insertModeChanges = [];
+      this.searchQueries = [];
+      this.linewise = !!linewise;
+      this.blockwise = !!blockwise;
+    }
+    Register.prototype = {
+      setText: function(text, linewise, blockwise) {
+        this.keyBuffer = [text || ''];
+        this.linewise = !!linewise;
+        this.blockwise = !!blockwise;
+      },
+      pushText: function(text, linewise) {
+        // if this register has ever been set to linewise, use linewise.
+        if (linewise) {
+          if (!this.linewise) {
+            this.keyBuffer.push('\n');
+          }
+          this.linewise = true;
+        }
+        this.keyBuffer.push(text);
+      },
+      pushInsertModeChanges: function(changes) {
+        this.insertModeChanges.push(createInsertModeChanges(changes));
+      },
+      pushSearchQuery: function(query) {
+        this.searchQueries.push(query);
+      },
+      clear: function() {
+        this.keyBuffer = [];
+        this.insertModeChanges = [];
+        this.searchQueries = [];
+        this.linewise = false;
+      },
+      toString: function() {
+        return this.keyBuffer.join('');
+      }
+    };
+
+    /**
+     * Defines an external register.
+     *
+     * The name should be a single character that will be used to reference the register.
+     * The register should support setText, pushText, clear, and toString(). See Register
+     * for a reference implementation.
+     */
+    function defineRegister(name, register) {
+      var registers = vimGlobalState.registerController.registers[name];
+      if (!name || name.length != 1) {
+        throw Error('Register name must be 1 character');
+      }
+      if (registers[name]) {
+        throw Error('Register already defined ' + name);
+      }
+      registers[name] = register;
+      validRegisters.push(name);
+    }
+
+    /*
+     * vim registers allow you to keep many independent copy and paste buffers.
+     * See http://usevim.com/2012/04/13/registers/ for an introduction.
+     *
+     * RegisterController keeps the state of all the registers.  An initial
+     * state may be passed in.  The unnamed register '"' will always be
+     * overridden.
+     */
+    function RegisterController(registers) {
+      this.registers = registers;
+      this.unnamedRegister = registers['"'] = new Register();
+      registers['.'] = new Register();
+      registers[':'] = new Register();
+      registers['/'] = new Register();
+    }
+    RegisterController.prototype = {
+      pushText: function(registerName, operator, text, linewise, blockwise) {
+        if (linewise && text.charAt(0) == '\n') {
+          text = text.slice(1) + '\n';
+        }
+        if (linewise && text.charAt(text.length - 1) !== '\n'){
+          text += '\n';
+        }
+        // Lowercase and uppercase registers refer to the same register.
+        // Uppercase just means append.
+        var register = this.isValidRegister(registerName) ?
+            this.getRegister(registerName) : null;
+        // if no register/an invalid register was specified, things go to the
+        // default registers
+        if (!register) {
+          switch (operator) {
+            case 'yank':
+              // The 0 register contains the text from the most recent yank.
+              this.registers['0'] = new Register(text, linewise, blockwise);
+              break;
+            case 'delete':
+            case 'change':
+              if (text.indexOf('\n') == -1) {
+                // Delete less than 1 line. Update the small delete register.
+                this.registers['-'] = new Register(text, linewise);
+              } else {
+                // Shift down the contents of the numbered registers and put the
+                // deleted text into register 1.
+                this.shiftNumericRegisters_();
+                this.registers['1'] = new Register(text, linewise);
+              }
+              break;
+          }
+          // Make sure the unnamed register is set to what just happened
+          this.unnamedRegister.setText(text, linewise, blockwise);
+          return;
+        }
+
+        // If we've gotten to this point, we've actually specified a register
+        var append = isUpperCase(registerName);
+        if (append) {
+          register.pushText(text, linewise);
+        } else {
+          register.setText(text, linewise, blockwise);
+        }
+        // The unnamed register always has the same value as the last used
+        // register.
+        this.unnamedRegister.setText(register.toString(), linewise);
+      },
+      // Gets the register named @name.  If one of @name doesn't already exist,
+      // create it.  If @name is invalid, return the unnamedRegister.
+      getRegister: function(name) {
+        if (!this.isValidRegister(name)) {
+          return this.unnamedRegister;
+        }
+        name = name.toLowerCase();
+        if (!this.registers[name]) {
+          this.registers[name] = new Register();
+        }
+        return this.registers[name];
+      },
+      isValidRegister: function(name) {
+        return name && inArray(name, validRegisters);
+      },
+      shiftNumericRegisters_: function() {
+        for (var i = 9; i >= 2; i--) {
+          this.registers[i] = this.getRegister('' + (i - 1));
+        }
+      }
+    };
+    function HistoryController() {
+        this.historyBuffer = [];
+        this.iterator;
+        this.initialPrefix = null;
+    }
+    HistoryController.prototype = {
+      // the input argument here acts a user entered prefix for a small time
+      // until we start autocompletion in which case it is the autocompleted.
+      nextMatch: function (input, up) {
+        var historyBuffer = this.historyBuffer;
+        var dir = up ? -1 : 1;
+        if (this.initialPrefix === null) this.initialPrefix = input;
+        for (var i = this.iterator + dir; up ? i >= 0 : i < historyBuffer.length; i+= dir) {
+          var element = historyBuffer[i];
+          for (var j = 0; j <= element.length; j++) {
+            if (this.initialPrefix == element.substring(0, j)) {
+              this.iterator = i;
+              return element;
+            }
+          }
+        }
+        // should return the user input in case we reach the end of buffer.
+        if (i >= historyBuffer.length) {
+          this.iterator = historyBuffer.length;
+          return this.initialPrefix;
+        }
+        // return the last autocompleted query or exCommand as it is.
+        if (i < 0 ) return input;
+      },
+      pushInput: function(input) {
+        var index = this.historyBuffer.indexOf(input);
+        if (index > -1) this.historyBuffer.splice(index, 1);
+        if (input.length) this.historyBuffer.push(input);
+      },
+      reset: function() {
+        this.initialPrefix = null;
+        this.iterator = this.historyBuffer.length;
+      }
+    };
+    var commandDispatcher = {
+      matchCommand: function(keys, keyMap, inputState, context) {
+        var matches = commandMatches(keys, keyMap, context, inputState);
+        if (!matches.full && !matches.partial) {
+          return {type: 'none'};
+        } else if (!matches.full && matches.partial) {
+          return {type: 'partial'};
+        }
+
+        var bestMatch;
+        for (var i = 0; i < matches.full.length; i++) {
+          var match = matches.full[i];
+          if (!bestMatch) {
+            bestMatch = match;
+          }
+        }
+        if (bestMatch.keys.slice(-11) == '') {
+          inputState.selectedCharacter = lastChar(keys);
+        }
+        return {type: 'full', command: bestMatch};
+      },
+      processCommand: function(cm, vim, command) {
+        vim.inputState.repeatOverride = command.repeatOverride;
+        switch (command.type) {
+          case 'motion':
+            this.processMotion(cm, vim, command);
+            break;
+          case 'operator':
+            this.processOperator(cm, vim, command);
+            break;
+          case 'operatorMotion':
+            this.processOperatorMotion(cm, vim, command);
+            break;
+          case 'action':
+            this.processAction(cm, vim, command);
+            break;
+          case 'search':
+            this.processSearch(cm, vim, command);
+            break;
+          case 'ex':
+          case 'keyToEx':
+            this.processEx(cm, vim, command);
+            break;
+          default:
+            break;
+        }
+      },
+      processMotion: function(cm, vim, command) {
+        vim.inputState.motion = command.motion;
+        vim.inputState.motionArgs = copyArgs(command.motionArgs);
+        this.evalInput(cm, vim);
+      },
+      processOperator: function(cm, vim, command) {
+        var inputState = vim.inputState;
+        if (inputState.operator) {
+          if (inputState.operator == command.operator) {
+            // Typing an operator twice like 'dd' makes the operator operate
+            // linewise
+            inputState.motion = 'expandToLine';
+            inputState.motionArgs = { linewise: true };
+            this.evalInput(cm, vim);
+            return;
+          } else {
+            // 2 different operators in a row doesn't make sense.
+            clearInputState(cm);
+          }
+        }
+        inputState.operator = command.operator;
+        inputState.operatorArgs = copyArgs(command.operatorArgs);
+        if (vim.visualMode) {
+          // Operating on a selection in visual mode. We don't need a motion.
+          this.evalInput(cm, vim);
+        }
+      },
+      processOperatorMotion: function(cm, vim, command) {
+        var visualMode = vim.visualMode;
+        var operatorMotionArgs = copyArgs(command.operatorMotionArgs);
+        if (operatorMotionArgs) {
+          // Operator motions may have special behavior in visual mode.
+          if (visualMode && operatorMotionArgs.visualLine) {
+            vim.visualLine = true;
+          }
+        }
+        this.processOperator(cm, vim, command);
+        if (!visualMode) {
+          this.processMotion(cm, vim, command);
+        }
+      },
+      processAction: function(cm, vim, command) {
+        var inputState = vim.inputState;
+        var repeat = inputState.getRepeat();
+        var repeatIsExplicit = !!repeat;
+        var actionArgs = copyArgs(command.actionArgs) || {};
+        if (inputState.selectedCharacter) {
+          actionArgs.selectedCharacter = inputState.selectedCharacter;
+        }
+        // Actions may or may not have motions and operators. Do these first.
+        if (command.operator) {
+          this.processOperator(cm, vim, command);
+        }
+        if (command.motion) {
+          this.processMotion(cm, vim, command);
+        }
+        if (command.motion || command.operator) {
+          this.evalInput(cm, vim);
+        }
+        actionArgs.repeat = repeat || 1;
+        actionArgs.repeatIsExplicit = repeatIsExplicit;
+        actionArgs.registerName = inputState.registerName;
+        clearInputState(cm);
+        vim.lastMotion = null;
+        if (command.isEdit) {
+          this.recordLastEdit(vim, inputState, command);
+        }
+        actions[command.action](cm, actionArgs, vim);
+      },
+      processSearch: function(cm, vim, command) {
+        if (!cm.getSearchCursor) {
+          // Search depends on SearchCursor.
+          return;
+        }
+        var forward = command.searchArgs.forward;
+        var wholeWordOnly = command.searchArgs.wholeWordOnly;
+        getSearchState(cm).setReversed(!forward);
+        var promptPrefix = (forward) ? '/' : '?';
+        var originalQuery = getSearchState(cm).getQuery();
+        var originalScrollPos = cm.getScrollInfo();
+        function handleQuery(query, ignoreCase, smartCase) {
+          vimGlobalState.searchHistoryController.pushInput(query);
+          vimGlobalState.searchHistoryController.reset();
+          try {
+            updateSearchQuery(cm, query, ignoreCase, smartCase);
+          } catch (e) {
+            showConfirm(cm, 'Invalid regex: ' + query);
+            clearInputState(cm);
+            return;
+          }
+          commandDispatcher.processMotion(cm, vim, {
+            type: 'motion',
+            motion: 'findNext',
+            motionArgs: { forward: true, toJumplist: command.searchArgs.toJumplist }
+          });
+        }
+        function onPromptClose(query) {
+          cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
+          handleQuery(query, true /** ignoreCase */, true /** smartCase */);
+          var macroModeState = vimGlobalState.macroModeState;
+          if (macroModeState.isRecording) {
+            logSearchQuery(macroModeState, query);
+          }
+        }
+        function onPromptKeyUp(e, query, close) {
+          var keyName = CodeMirror.keyName(e), up;
+          if (keyName == 'Up' || keyName == 'Down') {
+            up = keyName == 'Up' ? true : false;
+            query = vimGlobalState.searchHistoryController.nextMatch(query, up) || '';
+            close(query);
+          } else {
+            if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
+              vimGlobalState.searchHistoryController.reset();
+          }
+          var parsedQuery;
+          try {
+            parsedQuery = updateSearchQuery(cm, query,
+                true /** ignoreCase */, true /** smartCase */);
+          } catch (e) {
+            // Swallow bad regexes for incremental search.
+          }
+          if (parsedQuery) {
+            cm.scrollIntoView(findNext(cm, !forward, parsedQuery), 30);
+          } else {
+            clearSearchHighlight(cm);
+            cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
+          }
+        }
+        function onPromptKeyDown(e, query, close) {
+          var keyName = CodeMirror.keyName(e);
+          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
+              (keyName == 'Backspace' && query == '')) {
+            vimGlobalState.searchHistoryController.pushInput(query);
+            vimGlobalState.searchHistoryController.reset();
+            updateSearchQuery(cm, originalQuery);
+            clearSearchHighlight(cm);
+            cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
+            CodeMirror.e_stop(e);
+            clearInputState(cm);
+            close();
+            cm.focus();
+          } else if (keyName == 'Ctrl-U') {
+            // Ctrl-U clears input.
+            CodeMirror.e_stop(e);
+            close('');
+          }
+        }
+        switch (command.searchArgs.querySrc) {
+          case 'prompt':
+            var macroModeState = vimGlobalState.macroModeState;
+            if (macroModeState.isPlaying) {
+              var query = macroModeState.replaySearchQueries.shift();
+              handleQuery(query, true /** ignoreCase */, false /** smartCase */);
+            } else {
+              showPrompt(cm, {
+                  onClose: onPromptClose,
+                  prefix: promptPrefix,
+                  desc: searchPromptDesc,
+                  onKeyUp: onPromptKeyUp,
+                  onKeyDown: onPromptKeyDown
+              });
+            }
+            break;
+          case 'wordUnderCursor':
+            var word = expandWordUnderCursor(cm, false /** inclusive */,
+                true /** forward */, false /** bigWord */,
+                true /** noSymbol */);
+            var isKeyword = true;
+            if (!word) {
+              word = expandWordUnderCursor(cm, false /** inclusive */,
+                  true /** forward */, false /** bigWord */,
+                  false /** noSymbol */);
+              isKeyword = false;
+            }
+            if (!word) {
+              return;
+            }
+            var query = cm.getLine(word.start.line).substring(word.start.ch,
+                word.end.ch);
+            if (isKeyword && wholeWordOnly) {
+                query = '\\b' + query + '\\b';
+            } else {
+              query = escapeRegex(query);
+            }
+
+            // cachedCursor is used to save the old position of the cursor
+            // when * or # causes vim to seek for the nearest word and shift
+            // the cursor before entering the motion.
+            vimGlobalState.jumpList.cachedCursor = cm.getCursor();
+            cm.setCursor(word.start);
+
+            handleQuery(query, true /** ignoreCase */, false /** smartCase */);
+            break;
+        }
+      },
+      processEx: function(cm, vim, command) {
+        function onPromptClose(input) {
+          // Give the prompt some time to close so that if processCommand shows
+          // an error, the elements don't overlap.
+          vimGlobalState.exCommandHistoryController.pushInput(input);
+          vimGlobalState.exCommandHistoryController.reset();
+          exCommandDispatcher.processCommand(cm, input);
+        }
+        function onPromptKeyDown(e, input, close) {
+          var keyName = CodeMirror.keyName(e), up;
+          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
+              (keyName == 'Backspace' && input == '')) {
+            vimGlobalState.exCommandHistoryController.pushInput(input);
+            vimGlobalState.exCommandHistoryController.reset();
+            CodeMirror.e_stop(e);
+            clearInputState(cm);
+            close();
+            cm.focus();
+          }
+          if (keyName == 'Up' || keyName == 'Down') {
+            up = keyName == 'Up' ? true : false;
+            input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || '';
+            close(input);
+          } else if (keyName == 'Ctrl-U') {
+            // Ctrl-U clears input.
+            CodeMirror.e_stop(e);
+            close('');
+          } else {
+            if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
+              vimGlobalState.exCommandHistoryController.reset();
+          }
+        }
+        if (command.type == 'keyToEx') {
+          // Handle user defined Ex to Ex mappings
+          exCommandDispatcher.processCommand(cm, command.exArgs.input);
+        } else {
+          if (vim.visualMode) {
+            showPrompt(cm, { onClose: onPromptClose, prefix: ':', value: '\'<,\'>',
+                onKeyDown: onPromptKeyDown});
+          } else {
+            showPrompt(cm, { onClose: onPromptClose, prefix: ':',
+                onKeyDown: onPromptKeyDown});
+          }
+        }
+      },
+      evalInput: function(cm, vim) {
+        // If the motion comand is set, execute both the operator and motion.
+        // Otherwise return.
+        var inputState = vim.inputState;
+        var motion = inputState.motion;
+        var motionArgs = inputState.motionArgs || {};
+        var operator = inputState.operator;
+        var operatorArgs = inputState.operatorArgs || {};
+        var registerName = inputState.registerName;
+        var sel = vim.sel;
+        // TODO: Make sure cm and vim selections are identical outside visual mode.
+        var origHead = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.head): cm.getCursor('head'));
+        var origAnchor = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.anchor) : cm.getCursor('anchor'));
+        var oldHead = copyCursor(origHead);
+        var oldAnchor = copyCursor(origAnchor);
+        var newHead, newAnchor;
+        var repeat;
+        if (operator) {
+          this.recordLastEdit(vim, inputState);
+        }
+        if (inputState.repeatOverride !== undefined) {
+          // If repeatOverride is specified, that takes precedence over the
+          // input state's repeat. Used by Ex mode and can be user defined.
+          repeat = inputState.repeatOverride;
+        } else {
+          repeat = inputState.getRepeat();
+        }
+        if (repeat > 0 && motionArgs.explicitRepeat) {
+          motionArgs.repeatIsExplicit = true;
+        } else if (motionArgs.noRepeat ||
+            (!motionArgs.explicitRepeat && repeat === 0)) {
+          repeat = 1;
+          motionArgs.repeatIsExplicit = false;
+        }
+        if (inputState.selectedCharacter) {
+          // If there is a character input, stick it in all of the arg arrays.
+          motionArgs.selectedCharacter = operatorArgs.selectedCharacter =
+              inputState.selectedCharacter;
+        }
+        motionArgs.repeat = repeat;
+        clearInputState(cm);
+        if (motion) {
+          var motionResult = motions[motion](cm, origHead, motionArgs, vim);
+          vim.lastMotion = motions[motion];
+          if (!motionResult) {
+            return;
+          }
+          if (motionArgs.toJumplist) {
+            var jumpList = vimGlobalState.jumpList;
+            // if the current motion is # or *, use cachedCursor
+            var cachedCursor = jumpList.cachedCursor;
+            if (cachedCursor) {
+              recordJumpPosition(cm, cachedCursor, motionResult);
+              delete jumpList.cachedCursor;
+            } else {
+              recordJumpPosition(cm, origHead, motionResult);
+            }
+          }
+          if (motionResult instanceof Array) {
+            newAnchor = motionResult[0];
+            newHead = motionResult[1];
+          } else {
+            newHead = motionResult;
+          }
+          // TODO: Handle null returns from motion commands better.
+          if (!newHead) {
+            newHead = copyCursor(origHead);
+          }
+          if (vim.visualMode) {
+            if (!(vim.visualBlock && newHead.ch === Infinity)) {
+              newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
+            }
+            if (newAnchor) {
+              newAnchor = clipCursorToContent(cm, newAnchor, true);
+            }
+            newAnchor = newAnchor || oldAnchor;
+            sel.anchor = newAnchor;
+            sel.head = newHead;
+            updateCmSelection(cm);
+            updateMark(cm, vim, '<',
+                cursorIsBefore(newAnchor, newHead) ? newAnchor
+                    : newHead);
+            updateMark(cm, vim, '>',
+                cursorIsBefore(newAnchor, newHead) ? newHead
+                    : newAnchor);
+          } else if (!operator) {
+            newHead = clipCursorToContent(cm, newHead);
+            cm.setCursor(newHead.line, newHead.ch);
+          }
+        }
+        if (operator) {
+          if (operatorArgs.lastSel) {
+            // Replaying a visual mode operation
+            newAnchor = oldAnchor;
+            var lastSel = operatorArgs.lastSel;
+            var lineOffset = Math.abs(lastSel.head.line - lastSel.anchor.line);
+            var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch);
+            if (lastSel.visualLine) {
+              // Linewise Visual mode: The same number of lines.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+            } else if (lastSel.visualBlock) {
+              // Blockwise Visual mode: The same number of lines and columns.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
+            } else if (lastSel.head.line == lastSel.anchor.line) {
+              // Normal Visual mode within one line: The same number of characters.
+              newHead = Pos(oldAnchor.line, oldAnchor.ch + chOffset);
+            } else {
+              // Normal Visual mode with several lines: The same number of lines, in the
+              // last line the same number of characters as in the last line the last time.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+            }
+            vim.visualMode = true;
+            vim.visualLine = lastSel.visualLine;
+            vim.visualBlock = lastSel.visualBlock;
+            sel = vim.sel = {
+              anchor: newAnchor,
+              head: newHead
+            };
+            updateCmSelection(cm);
+          } else if (vim.visualMode) {
+            operatorArgs.lastSel = {
+              anchor: copyCursor(sel.anchor),
+              head: copyCursor(sel.head),
+              visualBlock: vim.visualBlock,
+              visualLine: vim.visualLine
+            };
+          }
+          var curStart, curEnd, linewise, mode;
+          var cmSel;
+          if (vim.visualMode) {
+            // Init visual op
+            curStart = cursorMin(sel.head, sel.anchor);
+            curEnd = cursorMax(sel.head, sel.anchor);
+            linewise = vim.visualLine || operatorArgs.linewise;
+            mode = vim.visualBlock ? 'block' :
+                   linewise ? 'line' :
+                   'char';
+            cmSel = makeCmSelection(cm, {
+              anchor: curStart,
+              head: curEnd
+            }, mode);
+            if (linewise) {
+              var ranges = cmSel.ranges;
+              if (mode == 'block') {
+                // Linewise operators in visual block mode extend to end of line
+                for (var i = 0; i < ranges.length; i++) {
+                  ranges[i].head.ch = lineLength(cm, ranges[i].head.line);
+                }
+              } else if (mode == 'line') {
+                ranges[0].head = Pos(ranges[0].head.line + 1, 0);
+              }
+            }
+          } else {
+            // Init motion op
+            curStart = copyCursor(newAnchor || oldAnchor);
+            curEnd = copyCursor(newHead || oldHead);
+            if (cursorIsBefore(curEnd, curStart)) {
+              var tmp = curStart;
+              curStart = curEnd;
+              curEnd = tmp;
+            }
+            linewise = motionArgs.linewise || operatorArgs.linewise;
+            if (linewise) {
+              // Expand selection to entire line.
+              expandSelectionToLine(cm, curStart, curEnd);
+            } else if (motionArgs.forward) {
+              // Clip to trailing newlines only if the motion goes forward.
+              clipToLine(cm, curStart, curEnd);
+            }
+            mode = 'char';
+            var exclusive = !motionArgs.inclusive || linewise;
+            cmSel = makeCmSelection(cm, {
+              anchor: curStart,
+              head: curEnd
+            }, mode, exclusive);
+          }
+          cm.setSelections(cmSel.ranges, cmSel.primary);
+          vim.lastMotion = null;
+          operatorArgs.repeat = repeat; // For indent in visual mode.
+          operatorArgs.registerName = registerName;
+          // Keep track of linewise as it affects how paste and change behave.
+          operatorArgs.linewise = linewise;
+          var operatorMoveTo = operators[operator](
+            cm, operatorArgs, cmSel.ranges, oldAnchor, newHead);
+          if (vim.visualMode) {
+            exitVisualMode(cm, operatorMoveTo != null);
+          }
+          if (operatorMoveTo) {
+            cm.setCursor(operatorMoveTo);
+          }
+        }
+      },
+      recordLastEdit: function(vim, inputState, actionCommand) {
+        var macroModeState = vimGlobalState.macroModeState;
+        if (macroModeState.isPlaying) { return; }
+        vim.lastEditInputState = inputState;
+        vim.lastEditActionCommand = actionCommand;
+        macroModeState.lastInsertModeChanges.changes = [];
+        macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false;
+      }
+    };
+
+    /**
+     * typedef {Object{line:number,ch:number}} Cursor An object containing the
+     *     position of the cursor.
+     */
+    // All of the functions below return Cursor objects.
+    var motions = {
+      moveToTopLine: function(cm, _head, motionArgs) {
+        var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
+        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+      },
+      moveToMiddleLine: function(cm) {
+        var range = getUserVisibleLines(cm);
+        var line = Math.floor((range.top + range.bottom) * 0.5);
+        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+      },
+      moveToBottomLine: function(cm, _head, motionArgs) {
+        var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
+        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+      },
+      expandToLine: function(_cm, head, motionArgs) {
+        // Expands forward to end of line, and then to next line if repeat is
+        // >1. Does not handle backward motion!
+        var cur = head;
+        return Pos(cur.line + motionArgs.repeat - 1, Infinity);
+      },
+      findNext: function(cm, _head, motionArgs) {
+        var state = getSearchState(cm);
+        var query = state.getQuery();
+        if (!query) {
+          return;
+        }
+        var prev = !motionArgs.forward;
+        // If search is initiated with ? instead of /, negate direction.
+        prev = (state.isReversed()) ? !prev : prev;
+        highlightSearchMatches(cm, query);
+        return findNext(cm, prev/** prev */, query, motionArgs.repeat);
+      },
+      goToMark: function(cm, _head, motionArgs, vim) {
+        var mark = vim.marks[motionArgs.selectedCharacter];
+        if (mark) {
+          var pos = mark.find();
+          return motionArgs.linewise ? { line: pos.line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(pos.line)) } : pos;
+        }
+        return null;
+      },
+      moveToOtherHighlightedEnd: function(cm, _head, motionArgs, vim) {
+        if (vim.visualBlock && motionArgs.sameLine) {
+          var sel = vim.sel;
+          return [
+            clipCursorToContent(cm, Pos(sel.anchor.line, sel.head.ch)),
+            clipCursorToContent(cm, Pos(sel.head.line, sel.anchor.ch))
+          ];
+        } else {
+          return ([vim.sel.head, vim.sel.anchor]);
+        }
+      },
+      jumpToMark: function(cm, head, motionArgs, vim) {
+        var best = head;
+        for (var i = 0; i < motionArgs.repeat; i++) {
+          var cursor = best;
+          for (var key in vim.marks) {
+            if (!isLowerCase(key)) {
+              continue;
+            }
+            var mark = vim.marks[key].find();
+            var isWrongDirection = (motionArgs.forward) ?
+              cursorIsBefore(mark, cursor) : cursorIsBefore(cursor, mark);
+
+            if (isWrongDirection) {
+              continue;
+            }
+            if (motionArgs.linewise && (mark.line == cursor.line)) {
+              continue;
+            }
+
+            var equal = cursorEqual(cursor, best);
+            var between = (motionArgs.forward) ?
+              cursorIsBetween(cursor, mark, best) :
+              cursorIsBetween(best, mark, cursor);
+
+            if (equal || between) {
+              best = mark;
+            }
+          }
+        }
+
+        if (motionArgs.linewise) {
+          // Vim places the cursor on the first non-whitespace character of
+          // the line if there is one, else it places the cursor at the end
+          // of the line, regardless of whether a mark was found.
+          best = Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line)));
+        }
+        return best;
+      },
+      moveByCharacters: function(_cm, head, motionArgs) {
+        var cur = head;
+        var repeat = motionArgs.repeat;
+        var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
+        return Pos(cur.line, ch);
+      },
+      moveByLines: function(cm, head, motionArgs, vim) {
+        var cur = head;
+        var endCh = cur.ch;
+        // Depending what our last motion was, we may want to do different
+        // things. If our last motion was moving vertically, we want to
+        // preserve the HPos from our last horizontal move.  If our last motion
+        // was going to the end of a line, moving vertically we should go to
+        // the end of the line, etc.
+        switch (vim.lastMotion) {
+          case this.moveByLines:
+          case this.moveByDisplayLines:
+          case this.moveByScroll:
+          case this.moveToColumn:
+          case this.moveToEol:
+            endCh = vim.lastHPos;
+            break;
+          default:
+            vim.lastHPos = endCh;
+        }
+        var repeat = motionArgs.repeat+(motionArgs.repeatOffset||0);
+        var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
+        var first = cm.firstLine();
+        var last = cm.lastLine();
+        // Vim go to line begin or line end when cursor at first/last line and
+        // move to previous/next line is triggered.
+        if (line < first && cur.line == first){
+          return this.moveToStartOfLine(cm, head, motionArgs, vim);
+        }else if (line > last && cur.line == last){
+            return this.moveToEol(cm, head, motionArgs, vim);
+        }
+        if (motionArgs.toFirstChar){
+          endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
+          vim.lastHPos = endCh;
+        }
+        vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left;
+        return Pos(line, endCh);
+      },
+      moveByDisplayLines: function(cm, head, motionArgs, vim) {
+        var cur = head;
+        switch (vim.lastMotion) {
+          case this.moveByDisplayLines:
+          case this.moveByScroll:
+          case this.moveByLines:
+          case this.moveToColumn:
+          case this.moveToEol:
+            break;
+          default:
+            vim.lastHSPos = cm.charCoords(cur,'div').left;
+        }
+        var repeat = motionArgs.repeat;
+        var res=cm.findPosV(cur,(motionArgs.forward ? repeat : -repeat),'line',vim.lastHSPos);
+        if (res.hitSide) {
+          if (motionArgs.forward) {
+            var lastCharCoords = cm.charCoords(res, 'div');
+            var goalCoords = { top: lastCharCoords.top + 8, left: vim.lastHSPos };
+            var res = cm.coordsChar(goalCoords, 'div');
+          } else {
+            var resCoords = cm.charCoords(Pos(cm.firstLine(), 0), 'div');
+            resCoords.left = vim.lastHSPos;
+            res = cm.coordsChar(resCoords, 'div');
+          }
+        }
+        vim.lastHPos = res.ch;
+        return res;
+      },
+      moveByPage: function(cm, head, motionArgs) {
+        // CodeMirror only exposes functions that move the cursor page down, so
+        // doing this bad hack to move the cursor and move it back. evalInput
+        // will move the cursor to where it should be in the end.
+        var curStart = head;
+        var repeat = motionArgs.repeat;
+        return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
+      },
+      moveByParagraph: function(cm, head, motionArgs) {
+        var dir = motionArgs.forward ? 1 : -1;
+        return findParagraph(cm, head, motionArgs.repeat, dir);
+      },
+      moveByScroll: function(cm, head, motionArgs, vim) {
+        var scrollbox = cm.getScrollInfo();
+        var curEnd = null;
+        var repeat = motionArgs.repeat;
+        if (!repeat) {
+          repeat = scrollbox.clientHeight / (2 * cm.defaultTextHeight());
+        }
+        var orig = cm.charCoords(head, 'local');
+        motionArgs.repeat = repeat;
+        var curEnd = motions.moveByDisplayLines(cm, head, motionArgs, vim);
+        if (!curEnd) {
+          return null;
+        }
+        var dest = cm.charCoords(curEnd, 'local');
+        cm.scrollTo(null, scrollbox.top + dest.top - orig.top);
+        return curEnd;
+      },
+      moveByWords: function(cm, head, motionArgs) {
+        return moveToWord(cm, head, motionArgs.repeat, !!motionArgs.forward,
+            !!motionArgs.wordEnd, !!motionArgs.bigWord);
+      },
+      moveTillCharacter: function(cm, _head, motionArgs) {
+        var repeat = motionArgs.repeat;
+        var curEnd = moveToCharacter(cm, repeat, motionArgs.forward,
+            motionArgs.selectedCharacter);
+        var increment = motionArgs.forward ? -1 : 1;
+        recordLastCharacterSearch(increment, motionArgs);
+        if (!curEnd) return null;
+        curEnd.ch += increment;
+        return curEnd;
+      },
+      moveToCharacter: function(cm, head, motionArgs) {
+        var repeat = motionArgs.repeat;
+        recordLastCharacterSearch(0, motionArgs);
+        return moveToCharacter(cm, repeat, motionArgs.forward,
+            motionArgs.selectedCharacter) || head;
+      },
+      moveToSymbol: function(cm, head, motionArgs) {
+        var repeat = motionArgs.repeat;
+        return findSymbol(cm, repeat, motionArgs.forward,
+            motionArgs.selectedCharacter) || head;
+      },
+      moveToColumn: function(cm, head, motionArgs, vim) {
+        var repeat = motionArgs.repeat;
+        // repeat is equivalent to which column we want to move to!
+        vim.lastHPos = repeat - 1;
+        vim.lastHSPos = cm.charCoords(head,'div').left;
+        return moveToColumn(cm, repeat);
+      },
+      moveToEol: function(cm, head, motionArgs, vim) {
+        var cur = head;
+        vim.lastHPos = Infinity;
+        var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
+        var end=cm.clipPos(retval);
+        end.ch--;
+        vim.lastHSPos = cm.charCoords(end,'div').left;
+        return retval;
+      },
+      moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
+        // Go to the start of the line where the text begins, or the end for
+        // whitespace-only lines
+        var cursor = head;
+        return Pos(cursor.line,
+                   findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
+      },
+      moveToMatchedSymbol: function(cm, head) {
+        var cursor = head;
+        var line = cursor.line;
+        var ch = cursor.ch;
+        var lineText = cm.getLine(line);
+        var symbol;
+        do {
+          symbol = lineText.charAt(ch++);
+          if (symbol && isMatchableSymbol(symbol)) {
+            var style = cm.getTokenTypeAt(Pos(line, ch));
+            if (style !== "string" && style !== "comment") {
+              break;
+            }
+          }
+        } while (symbol);
+        if (symbol) {
+          var matched = cm.findMatchingBracket(Pos(line, ch));
+          return matched.to;
+        } else {
+          return cursor;
+        }
+      },
+      moveToStartOfLine: function(_cm, head) {
+        return Pos(head.line, 0);
+      },
+      moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) {
+        var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
+        if (motionArgs.repeatIsExplicit) {
+          lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
+        }
+        return Pos(lineNum,
+                   findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
+      },
+      textObjectManipulation: function(cm, head, motionArgs, vim) {
+        // TODO: lots of possible exceptions that can be thrown here. Try da(
+        //     outside of a () block.
+
+        // TODO: adding <> >< to this map doesn't work, presumably because
+        // they're operators
+        var mirroredPairs = {'(': ')', ')': '(',
+                             '{': '}', '}': '{',
+                             '[': ']', ']': '['};
+        var selfPaired = {'\'': true, '"': true};
+
+        var character = motionArgs.selectedCharacter;
+        // 'b' refers to  '()' block.
+        // 'B' refers to  '{}' block.
+        if (character == 'b') {
+          character = '(';
+        } else if (character == 'B') {
+          character = '{';
+        }
+
+        // Inclusive is the difference between a and i
+        // TODO: Instead of using the additional text object map to perform text
+        //     object operations, merge the map into the defaultKeyMap and use
+        //     motionArgs to define behavior. Define separate entries for 'aw',
+        //     'iw', 'a[', 'i[', etc.
+        var inclusive = !motionArgs.textObjectInner;
+
+        var tmp;
+        if (mirroredPairs[character]) {
+          tmp = selectCompanionObject(cm, head, character, inclusive);
+        } else if (selfPaired[character]) {
+          tmp = findBeginningAndEnd(cm, head, character, inclusive);
+        } else if (character === 'W') {
+          tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
+                                                     true /** bigWord */);
+        } else if (character === 'w') {
+          tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
+                                                     false /** bigWord */);
+        } else if (character === 'p') {
+          tmp = findParagraph(cm, head, motionArgs.repeat, 0, inclusive);
+          motionArgs.linewise = true;
+          if (vim.visualMode) {
+            if (!vim.visualLine) { vim.visualLine = true; }
+          } else {
+            var operatorArgs = vim.inputState.operatorArgs;
+            if (operatorArgs) { operatorArgs.linewise = true; }
+            tmp.end.line--;
+          }
+        } else {
+          // No text object defined for this, don't move.
+          return null;
+        }
+
+        if (!cm.state.vim.visualMode) {
+          return [tmp.start, tmp.end];
+        } else {
+          return expandSelection(cm, tmp.start, tmp.end);
+        }
+      },
+
+      repeatLastCharacterSearch: function(cm, head, motionArgs) {
+        var lastSearch = vimGlobalState.lastChararacterSearch;
+        var repeat = motionArgs.repeat;
+        var forward = motionArgs.forward === lastSearch.forward;
+        var increment = (lastSearch.increment ? 1 : 0) * (forward ? -1 : 1);
+        cm.moveH(-increment, 'char');
+        motionArgs.inclusive = forward ? true : false;
+        var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter);
+        if (!curEnd) {
+          cm.moveH(increment, 'char');
+          return head;
+        }
+        curEnd.ch += increment;
+        return curEnd;
+      }
+    };
+
+    function defineMotion(name, fn) {
+      motions[name] = fn;
+    }
+
+    function fillArray(val, times) {
+      var arr = [];
+      for (var i = 0; i < times; i++) {
+        arr.push(val);
+      }
+      return arr;
+    }
+    /**
+     * An operator acts on a text selection. It receives the list of selections
+     * as input. The corresponding CodeMirror selection is guaranteed to
+    * match the input selection.
+     */
+    var operators = {
+      change: function(cm, args, ranges) {
+        var finalHead, text;
+        var vim = cm.state.vim;
+        vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock;
+        if (!vim.visualMode) {
+          var anchor = ranges[0].anchor,
+              head = ranges[0].head;
+          text = cm.getRange(anchor, head);
+          var lastState = vim.lastEditInputState || {};
+          if (lastState.motion == "moveByWords" && !isWhiteSpaceString(text)) {
+            // Exclude trailing whitespace if the range is not all whitespace.
+            var match = (/\s+$/).exec(text);
+            if (match && lastState.motionArgs && lastState.motionArgs.forward) {
+              head = offsetCursor(head, 0, - match[0].length);
+              text = text.slice(0, - match[0].length);
+            }
+          }
+          var prevLineEnd = new Pos(anchor.line - 1, Number.MAX_VALUE);
+          var wasLastLine = cm.firstLine() == cm.lastLine();
+          if (head.line > cm.lastLine() && args.linewise && !wasLastLine) {
+            cm.replaceRange('', prevLineEnd, head);
+          } else {
+            cm.replaceRange('', anchor, head);
+          }
+          if (args.linewise) {
+            // Push the next line back down, if there is a next line.
+            if (!wasLastLine) {
+              cm.setCursor(prevLineEnd);
+              CodeMirror.commands.newlineAndIndent(cm);
+            }
+            // make sure cursor ends up at the end of the line.
+            anchor.ch = Number.MAX_VALUE;
+          }
+          finalHead = anchor;
+        } else {
+          text = cm.getSelection();
+          var replacement = fillArray('', ranges.length);
+          cm.replaceSelections(replacement);
+          finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
+        }
+        vimGlobalState.registerController.pushText(
+            args.registerName, 'change', text,
+            args.linewise, ranges.length > 1);
+        actions.enterInsertMode(cm, {head: finalHead}, cm.state.vim);
+      },
+      // delete is a javascript keyword.
+      'delete': function(cm, args, ranges) {
+        var finalHead, text;
+        var vim = cm.state.vim;
+        if (!vim.visualBlock) {
+          var anchor = ranges[0].anchor,
+              head = ranges[0].head;
+          if (args.linewise &&
+              head.line != cm.firstLine() &&
+              anchor.line == cm.lastLine() &&
+              anchor.line == head.line - 1) {
+            // Special case for dd on last line (and first line).
+            if (anchor.line == cm.firstLine()) {
+              anchor.ch = 0;
+            } else {
+              anchor = Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
+            }
+          }
+          text = cm.getRange(anchor, head);
+          cm.replaceRange('', anchor, head);
+          finalHead = anchor;
+          if (args.linewise) {
+            finalHead = motions.moveToFirstNonWhiteSpaceCharacter(cm, anchor);
+          }
+        } else {
+          text = cm.getSelection();
+          var replacement = fillArray('', ranges.length);
+          cm.replaceSelections(replacement);
+          finalHead = ranges[0].anchor;
+        }
+        vimGlobalState.registerController.pushText(
+            args.registerName, 'delete', text,
+            args.linewise, vim.visualBlock);
+        return clipCursorToContent(cm, finalHead);
+      },
+      indent: function(cm, args, ranges) {
+        var vim = cm.state.vim;
+        var startLine = ranges[0].anchor.line;
+        var endLine = vim.visualBlock ?
+          ranges[ranges.length - 1].anchor.line :
+          ranges[0].head.line;
+        // In visual mode, n> shifts the selection right n times, instead of
+        // shifting n lines right once.
+        var repeat = (vim.visualMode) ? args.repeat : 1;
+        if (args.linewise) {
+          // The only way to delete a newline is to delete until the start of
+          // the next line, so in linewise mode evalInput will include the next
+          // line. We don't want this in indent, so we go back a line.
+          endLine--;
+        }
+        for (var i = startLine; i <= endLine; i++) {
+          for (var j = 0; j < repeat; j++) {
+            cm.indentLine(i, args.indentRight);
+          }
+        }
+        return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
+      },
+      changeCase: function(cm, args, ranges, oldAnchor, newHead) {
+        var selections = cm.getSelections();
+        var swapped = [];
+        var toLower = args.toLower;
+        for (var j = 0; j < selections.length; j++) {
+          var toSwap = selections[j];
+          var text = '';
+          if (toLower === true) {
+            text = toSwap.toLowerCase();
+          } else if (toLower === false) {
+            text = toSwap.toUpperCase();
+          } else {
+            for (var i = 0; i < toSwap.length; i++) {
+              var character = toSwap.charAt(i);
+              text += isUpperCase(character) ? character.toLowerCase() :
+                  character.toUpperCase();
+            }
+          }
+          swapped.push(text);
+        }
+        cm.replaceSelections(swapped);
+        if (args.shouldMoveCursor){
+          return newHead;
+        } else if (!cm.state.vim.visualMode && args.linewise && ranges[0].anchor.line + 1 == ranges[0].head.line) {
+          return motions.moveToFirstNonWhiteSpaceCharacter(cm, oldAnchor);
+        } else if (args.linewise){
+          return oldAnchor;
+        } else {
+          return cursorMin(ranges[0].anchor, ranges[0].head);
+        }
+      },
+      yank: function(cm, args, ranges, oldAnchor) {
+        var vim = cm.state.vim;
+        var text = cm.getSelection();
+        var endPos = vim.visualMode
+          ? cursorMin(vim.sel.anchor, vim.sel.head, ranges[0].head, ranges[0].anchor)
+          : oldAnchor;
+        vimGlobalState.registerController.pushText(
+            args.registerName, 'yank',
+            text, args.linewise, vim.visualBlock);
+        return endPos;
+      }
+    };
+
+    function defineOperator(name, fn) {
+      operators[name] = fn;
+    }
+
+    var actions = {
+      jumpListWalk: function(cm, actionArgs, vim) {
+        if (vim.visualMode) {
+          return;
+        }
+        var repeat = actionArgs.repeat;
+        var forward = actionArgs.forward;
+        var jumpList = vimGlobalState.jumpList;
+
+        var mark = jumpList.move(cm, forward ? repeat : -repeat);
+        var markPos = mark ? mark.find() : undefined;
+        markPos = markPos ? markPos : cm.getCursor();
+        cm.setCursor(markPos);
+      },
+      scroll: function(cm, actionArgs, vim) {
+        if (vim.visualMode) {
+          return;
+        }
+        var repeat = actionArgs.repeat || 1;
+        var lineHeight = cm.defaultTextHeight();
+        var top = cm.getScrollInfo().top;
+        var delta = lineHeight * repeat;
+        var newPos = actionArgs.forward ? top + delta : top - delta;
+        var cursor = copyCursor(cm.getCursor());
+        var cursorCoords = cm.charCoords(cursor, 'local');
+        if (actionArgs.forward) {
+          if (newPos > cursorCoords.top) {
+             cursor.line += (newPos - cursorCoords.top) / lineHeight;
+             cursor.line = Math.ceil(cursor.line);
+             cm.setCursor(cursor);
+             cursorCoords = cm.charCoords(cursor, 'local');
+             cm.scrollTo(null, cursorCoords.top);
+          } else {
+             // Cursor stays within bounds.  Just reposition the scroll window.
+             cm.scrollTo(null, newPos);
+          }
+        } else {
+          var newBottom = newPos + cm.getScrollInfo().clientHeight;
+          if (newBottom < cursorCoords.bottom) {
+             cursor.line -= (cursorCoords.bottom - newBottom) / lineHeight;
+             cursor.line = Math.floor(cursor.line);
+             cm.setCursor(cursor);
+             cursorCoords = cm.charCoords(cursor, 'local');
+             cm.scrollTo(
+                 null, cursorCoords.bottom - cm.getScrollInfo().clientHeight);
+          } else {
+             // Cursor stays within bounds.  Just reposition the scroll window.
+             cm.scrollTo(null, newPos);
+          }
+        }
+      },
+      scrollToCursor: function(cm, actionArgs) {
+        var lineNum = cm.getCursor().line;
+        var charCoords = cm.charCoords(Pos(lineNum, 0), 'local');
+        var height = cm.getScrollInfo().clientHeight;
+        var y = charCoords.top;
+        var lineHeight = charCoords.bottom - y;
+        switch (actionArgs.position) {
+          case 'center': y = y - (height / 2) + lineHeight;
+            break;
+          case 'bottom': y = y - height + lineHeight;
+            break;
+        }
+        cm.scrollTo(null, y);
+      },
+      replayMacro: function(cm, actionArgs, vim) {
+        var registerName = actionArgs.selectedCharacter;
+        var repeat = actionArgs.repeat;
+        var macroModeState = vimGlobalState.macroModeState;
+        if (registerName == '@') {
+          registerName = macroModeState.latestRegister;
+        }
+        while(repeat--){
+          executeMacroRegister(cm, vim, macroModeState, registerName);
+        }
+      },
+      enterMacroRecordMode: function(cm, actionArgs) {
+        var macroModeState = vimGlobalState.macroModeState;
+        var registerName = actionArgs.selectedCharacter;
+        macroModeState.enterMacroRecordMode(cm, registerName);
+      },
+      enterInsertMode: function(cm, actionArgs, vim) {
+        if (cm.getOption('readOnly')) { return; }
+        vim.insertMode = true;
+        vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
+        var insertAt = (actionArgs) ? actionArgs.insertAt : null;
+        var sel = vim.sel;
+        var head = actionArgs.head || cm.getCursor('head');
+        var height = cm.listSelections().length;
+        if (insertAt == 'eol') {
+          head = Pos(head.line, lineLength(cm, head.line));
+        } else if (insertAt == 'charAfter') {
+          head = offsetCursor(head, 0, 1);
+        } else if (insertAt == 'firstNonBlank') {
+          head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
+        } else if (insertAt == 'startOfSelectedArea') {
+          if (!vim.visualBlock) {
+            if (sel.head.line < sel.anchor.line) {
+              head = sel.head;
+            } else {
+              head = Pos(sel.anchor.line, 0);
+            }
+          } else {
+            head = Pos(
+                Math.min(sel.head.line, sel.anchor.line),
+                Math.min(sel.head.ch, sel.anchor.ch));
+            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
+          }
+        } else if (insertAt == 'endOfSelectedArea') {
+          if (!vim.visualBlock) {
+            if (sel.head.line >= sel.anchor.line) {
+              head = offsetCursor(sel.head, 0, 1);
+            } else {
+              head = Pos(sel.anchor.line, 0);
+            }
+          } else {
+            head = Pos(
+                Math.min(sel.head.line, sel.anchor.line),
+                Math.max(sel.head.ch + 1, sel.anchor.ch));
+            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
+          }
+        } else if (insertAt == 'inplace') {
+          if (vim.visualMode){
+            return;
+          }
+        }
+        cm.setOption('keyMap', 'vim-insert');
+        cm.setOption('disableInput', false);
+        if (actionArgs && actionArgs.replace) {
+          // Handle Replace-mode as a special case of insert mode.
+          cm.toggleOverwrite(true);
+          cm.setOption('keyMap', 'vim-replace');
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
+        } else {
+          cm.setOption('keyMap', 'vim-insert');
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
+        }
+        if (!vimGlobalState.macroModeState.isPlaying) {
+          // Only record if not replaying.
+          cm.on('change', onChange);
+          CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
+        }
+        if (vim.visualMode) {
+          exitVisualMode(cm);
+        }
+        selectForInsert(cm, head, height);
+      },
+      toggleVisualMode: function(cm, actionArgs, vim) {
+        var repeat = actionArgs.repeat;
+        var anchor = cm.getCursor();
+        var head;
+        // TODO: The repeat should actually select number of characters/lines
+        //     equal to the repeat times the size of the previous visual
+        //     operation.
+        if (!vim.visualMode) {
+          // Entering visual mode
+          vim.visualMode = true;
+          vim.visualLine = !!actionArgs.linewise;
+          vim.visualBlock = !!actionArgs.blockwise;
+          head = clipCursorToContent(
+              cm, Pos(anchor.line, anchor.ch + repeat - 1),
+              true /** includeLineBreak */);
+          vim.sel = {
+            anchor: anchor,
+            head: head
+          };
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
+          updateCmSelection(cm);
+          updateMark(cm, vim, '<', cursorMin(anchor, head));
+          updateMark(cm, vim, '>', cursorMax(anchor, head));
+        } else if (vim.visualLine ^ actionArgs.linewise ||
+            vim.visualBlock ^ actionArgs.blockwise) {
+          // Toggling between modes
+          vim.visualLine = !!actionArgs.linewise;
+          vim.visualBlock = !!actionArgs.blockwise;
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
+          updateCmSelection(cm);
+        } else {
+          exitVisualMode(cm);
+        }
+      },
+      reselectLastSelection: function(cm, _actionArgs, vim) {
+        var lastSelection = vim.lastSelection;
+        if (vim.visualMode) {
+          updateLastSelection(cm, vim);
+        }
+        if (lastSelection) {
+          var anchor = lastSelection.anchorMark.find();
+          var head = lastSelection.headMark.find();
+          if (!anchor || !head) {
+            // If the marks have been destroyed due to edits, do nothing.
+            return;
+          }
+          vim.sel = {
+            anchor: anchor,
+            head: head
+          };
+          vim.visualMode = true;
+          vim.visualLine = lastSelection.visualLine;
+          vim.visualBlock = lastSelection.visualBlock;
+          updateCmSelection(cm);
+          updateMark(cm, vim, '<', cursorMin(anchor, head));
+          updateMark(cm, vim, '>', cursorMax(anchor, head));
+          CodeMirror.signal(cm, 'vim-mode-change', {
+            mode: 'visual',
+            subMode: vim.visualLine ? 'linewise' :
+                     vim.visualBlock ? 'blockwise' : ''});
+        }
+      },
+      joinLines: function(cm, actionArgs, vim) {
+        var curStart, curEnd;
+        if (vim.visualMode) {
+          curStart = cm.getCursor('anchor');
+          curEnd = cm.getCursor('head');
+          if (cursorIsBefore(curEnd, curStart)) {
+            var tmp = curEnd;
+            curEnd = curStart;
+            curStart = tmp;
+          }
+          curEnd.ch = lineLength(cm, curEnd.line) - 1;
+        } else {
+          // Repeat is the number of lines to join. Minimum 2 lines.
+          var repeat = Math.max(actionArgs.repeat, 2);
+          curStart = cm.getCursor();
+          curEnd = clipCursorToContent(cm, Pos(curStart.line + repeat - 1,
+                                               Infinity));
+        }
+        var finalCh = 0;
+        for (var i = curStart.line; i < curEnd.line; i++) {
+          finalCh = lineLength(cm, curStart.line);
+          var tmp = Pos(curStart.line + 1,
+                        lineLength(cm, curStart.line + 1));
+          var text = cm.getRange(curStart, tmp);
+          text = text.replace(/\n\s*/g, ' ');
+          cm.replaceRange(text, curStart, tmp);
+        }
+        var curFinalPos = Pos(curStart.line, finalCh);
+        if (vim.visualMode) {
+          exitVisualMode(cm, false);
+        }
+        cm.setCursor(curFinalPos);
+      },
+      newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
+        vim.insertMode = true;
+        var insertAt = copyCursor(cm.getCursor());
+        if (insertAt.line === cm.firstLine() && !actionArgs.after) {
+          // Special case for inserting newline before start of document.
+          cm.replaceRange('\n', Pos(cm.firstLine(), 0));
+          cm.setCursor(cm.firstLine(), 0);
+        } else {
+          insertAt.line = (actionArgs.after) ? insertAt.line :
+              insertAt.line - 1;
+          insertAt.ch = lineLength(cm, insertAt.line);
+          cm.setCursor(insertAt);
+          var newlineFn = CodeMirror.commands.newlineAndIndentContinueComment ||
+              CodeMirror.commands.newlineAndIndent;
+          newlineFn(cm);
+        }
+        this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
+      },
+      paste: function(cm, actionArgs, vim) {
+        var cur = copyCursor(cm.getCursor());
+        var register = vimGlobalState.registerController.getRegister(
+            actionArgs.registerName);
+        var text = register.toString();
+        if (!text) {
+          return;
+        }
+        if (actionArgs.matchIndent) {
+          var tabSize = cm.getOption("tabSize");
+          // length that considers tabs and tabSize
+          var whitespaceLength = function(str) {
+            var tabs = (str.split("\t").length - 1);
+            var spaces = (str.split(" ").length - 1);
+            return tabs * tabSize + spaces * 1;
+          };
+          var currentLine = cm.getLine(cm.getCursor().line);
+          var indent = whitespaceLength(currentLine.match(/^\s*/)[0]);
+          // chomp last newline b/c don't want it to match /^\s*/gm
+          var chompedText = text.replace(/\n$/, '');
+          var wasChomped = text !== chompedText;
+          var firstIndent = whitespaceLength(text.match(/^\s*/)[0]);
+          var text = chompedText.replace(/^\s*/gm, function(wspace) {
+            var newIndent = indent + (whitespaceLength(wspace) - firstIndent);
+            if (newIndent < 0) {
+              return "";
+            }
+            else if (cm.getOption("indentWithTabs")) {
+              var quotient = Math.floor(newIndent / tabSize);
+              return Array(quotient + 1).join('\t');
+            }
+            else {
+              return Array(newIndent + 1).join(' ');
+            }
+          });
+          text += wasChomped ? "\n" : "";
+        }
+        if (actionArgs.repeat > 1) {
+          var text = Array(actionArgs.repeat + 1).join(text);
+        }
+        var linewise = register.linewise;
+        var blockwise = register.blockwise;
+        if (linewise) {
+          if(vim.visualMode) {
+            text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
+          } else if (actionArgs.after) {
+            // Move the newline at the end to the start instead, and paste just
+            // before the newline character of the line we are on right now.
+            text = '\n' + text.slice(0, text.length - 1);
+            cur.ch = lineLength(cm, cur.line);
+          } else {
+            cur.ch = 0;
+          }
+        } else {
+          if (blockwise) {
+            text = text.split('\n');
+            for (var i = 0; i < text.length; i++) {
+              text[i] = (text[i] == '') ? ' ' : text[i];
+            }
+          }
+          cur.ch += actionArgs.after ? 1 : 0;
+        }
+        var curPosFinal;
+        var idx;
+        if (vim.visualMode) {
+          //  save the pasted text for reselection if the need arises
+          vim.lastPastedText = text;
+          var lastSelectionCurEnd;
+          var selectedArea = getSelectedAreaRange(cm, vim);
+          var selectionStart = selectedArea[0];
+          var selectionEnd = selectedArea[1];
+          var selectedText = cm.getSelection();
+          var selections = cm.listSelections();
+          var emptyStrings = new Array(selections.length).join('1').split('1');
+          // save the curEnd marker before it get cleared due to cm.replaceRange.
+          if (vim.lastSelection) {
+            lastSelectionCurEnd = vim.lastSelection.headMark.find();
+          }
+          // push the previously selected text to unnamed register
+          vimGlobalState.registerController.unnamedRegister.setText(selectedText);
+          if (blockwise) {
+            // first delete the selected text
+            cm.replaceSelections(emptyStrings);
+            // Set new selections as per the block length of the yanked text
+            selectionEnd = Pos(selectionStart.line + text.length-1, selectionStart.ch);
+            cm.setCursor(selectionStart);
+            selectBlock(cm, selectionEnd);
+            cm.replaceSelections(text);
+            curPosFinal = selectionStart;
+          } else if (vim.visualBlock) {
+            cm.replaceSelections(emptyStrings);
+            cm.setCursor(selectionStart);
+            cm.replaceRange(text, selectionStart, selectionStart);
+            curPosFinal = selectionStart;
+          } else {
+            cm.replaceRange(text, selectionStart, selectionEnd);
+            curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
+          }
+          // restore the the curEnd marker
+          if(lastSelectionCurEnd) {
+            vim.lastSelection.headMark = cm.setBookmark(lastSelectionCurEnd);
+          }
+          if (linewise) {
+            curPosFinal.ch=0;
+          }
+        } else {
+          if (blockwise) {
+            cm.setCursor(cur);
+            for (var i = 0; i < text.length; i++) {
+              var line = cur.line+i;
+              if (line > cm.lastLine()) {
+                cm.replaceRange('\n',  Pos(line, 0));
+              }
+              var lastCh = lineLength(cm, line);
+              if (lastCh < cur.ch) {
+                extendLineToColumn(cm, line, cur.ch);
+              }
+            }
+            cm.setCursor(cur);
+            selectBlock(cm, Pos(cur.line + text.length-1, cur.ch));
+            cm.replaceSelections(text);
+            curPosFinal = cur;
+          } else {
+            cm.replaceRange(text, cur);
+            // Now fine tune the cursor to where we want it.
+            if (linewise && actionArgs.after) {
+              curPosFinal = Pos(
+              cur.line + 1,
+              findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
+            } else if (linewise && !actionArgs.after) {
+              curPosFinal = Pos(
+                cur.line,
+                findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
+            } else if (!linewise && actionArgs.after) {
+              idx = cm.indexFromPos(cur);
+              curPosFinal = cm.posFromIndex(idx + text.length - 1);
+            } else {
+              idx = cm.indexFromPos(cur);
+              curPosFinal = cm.posFromIndex(idx + text.length);
+            }
+          }
+        }
+        if (vim.visualMode) {
+          exitVisualMode(cm, false);
+        }
+        cm.setCursor(curPosFinal);
+      },
+      undo: function(cm, actionArgs) {
+        cm.operation(function() {
+          repeatFn(cm, CodeMirror.commands.undo, actionArgs.repeat)();
+          cm.setCursor(cm.getCursor('anchor'));
+        });
+      },
+      redo: function(cm, actionArgs) {
+        repeatFn(cm, CodeMirror.commands.redo, actionArgs.repeat)();
+      },
+      setRegister: function(_cm, actionArgs, vim) {
+        vim.inputState.registerName = actionArgs.selectedCharacter;
+      },
+      setMark: function(cm, actionArgs, vim) {
+        var markName = actionArgs.selectedCharacter;
+        updateMark(cm, vim, markName, cm.getCursor());
+      },
+      replace: function(cm, actionArgs, vim) {
+        var replaceWith = actionArgs.selectedCharacter;
+        var curStart = cm.getCursor();
+        var replaceTo;
+        var curEnd;
+        var selections = cm.listSelections();
+        if (vim.visualMode) {
+          curStart = cm.getCursor('start');
+          curEnd = cm.getCursor('end');
+        } else {
+          var line = cm.getLine(curStart.line);
+          replaceTo = curStart.ch + actionArgs.repeat;
+          if (replaceTo > line.length) {
+            replaceTo=line.length;
+          }
+          curEnd = Pos(curStart.line, replaceTo);
+        }
+        if (replaceWith=='\n') {
+          if (!vim.visualMode) cm.replaceRange('', curStart, curEnd);
+          // special case, where vim help says to replace by just one line-break
+          (CodeMirror.commands.newlineAndIndentContinueComment || CodeMirror.commands.newlineAndIndent)(cm);
+        } else {
+          var replaceWithStr = cm.getRange(curStart, curEnd);
+          //replace all characters in range by selected, but keep linebreaks
+          replaceWithStr = replaceWithStr.replace(/[^\n]/g, replaceWith);
+          if (vim.visualBlock) {
+            // Tabs are split in visua block before replacing
+            var spaces = new Array(cm.getOption("tabSize")+1).join(' ');
+            replaceWithStr = cm.getSelection();
+            replaceWithStr = replaceWithStr.replace(/\t/g, spaces).replace(/[^\n]/g, replaceWith).split('\n');
+            cm.replaceSelections(replaceWithStr);
+          } else {
+            cm.replaceRange(replaceWithStr, curStart, curEnd);
+          }
+          if (vim.visualMode) {
+            curStart = cursorIsBefore(selections[0].anchor, selections[0].head) ?
+                         selections[0].anchor : selections[0].head;
+            cm.setCursor(curStart);
+            exitVisualMode(cm, false);
+          } else {
+            cm.setCursor(offsetCursor(curEnd, 0, -1));
+          }
+        }
+      },
+      incrementNumberToken: function(cm, actionArgs) {
+        var cur = cm.getCursor();
+        var lineStr = cm.getLine(cur.line);
+        var re = /-?\d+/g;
+        var match;
+        var start;
+        var end;
+        var numberStr;
+        var token;
+        while ((match = re.exec(lineStr)) !== null) {
+          token = match[0];
+          start = match.index;
+          end = start + token.length;
+          if (cur.ch < end)break;
+        }
+        if (!actionArgs.backtrack && (end <= cur.ch))return;
+        if (token) {
+          var increment = actionArgs.increase ? 1 : -1;
+          var number = parseInt(token) + (increment * actionArgs.repeat);
+          var from = Pos(cur.line, start);
+          var to = Pos(cur.line, end);
+          numberStr = number.toString();
+          cm.replaceRange(numberStr, from, to);
+        } else {
+          return;
+        }
+        cm.setCursor(Pos(cur.line, start + numberStr.length - 1));
+      },
+      repeatLastEdit: function(cm, actionArgs, vim) {
+        var lastEditInputState = vim.lastEditInputState;
+        if (!lastEditInputState) { return; }
+        var repeat = actionArgs.repeat;
+        if (repeat && actionArgs.repeatIsExplicit) {
+          vim.lastEditInputState.repeatOverride = repeat;
+        } else {
+          repeat = vim.lastEditInputState.repeatOverride || repeat;
+        }
+        repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
+      },
+      exitInsertMode: exitInsertMode
+    };
+
+    function defineAction(name, fn) {
+      actions[name] = fn;
+    }
+
+    /*
+     * Below are miscellaneous utility functions used by vim.js
+     */
+
+    /**
+     * Clips cursor to ensure that line is within the buffer's range
+     * If includeLineBreak is true, then allow cur.ch == lineLength.
+     */
+    function clipCursorToContent(cm, cur, includeLineBreak) {
+      var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() );
+      var maxCh = lineLength(cm, line) - 1;
+      maxCh = (includeLineBreak) ? maxCh + 1 : maxCh;
+      var ch = Math.min(Math.max(0, cur.ch), maxCh);
+      return Pos(line, ch);
+    }
+    function copyArgs(args) {
+      var ret = {};
+      for (var prop in args) {
+        if (args.hasOwnProperty(prop)) {
+          ret[prop] = args[prop];
+        }
+      }
+      return ret;
+    }
+    function offsetCursor(cur, offsetLine, offsetCh) {
+      if (typeof offsetLine === 'object') {
+        offsetCh = offsetLine.ch;
+        offsetLine = offsetLine.line;
+      }
+      return Pos(cur.line + offsetLine, cur.ch + offsetCh);
+    }
+    function getOffset(anchor, head) {
+      return {
+        line: head.line - anchor.line,
+        ch: head.line - anchor.line
+      };
+    }
+    function commandMatches(keys, keyMap, context, inputState) {
+      // Partial matches are not applied. They inform the key handler
+      // that the current key sequence is a subsequence of a valid key
+      // sequence, so that the key buffer is not cleared.
+      var match, partial = [], full = [];
+      for (var i = 0; i < keyMap.length; i++) {
+        var command = keyMap[i];
+        if (context == 'insert' && command.context != 'insert' ||
+            command.context && command.context != context ||
+            inputState.operator && command.type == 'action' ||
+            !(match = commandMatch(keys, command.keys))) { continue; }
+        if (match == 'partial') { partial.push(command); }
+        if (match == 'full') { full.push(command); }
+      }
+      return {
+        partial: partial.length && partial,
+        full: full.length && full
+      };
+    }
+    function commandMatch(pressed, mapped) {
+      if (mapped.slice(-11) == '') {
+        // Last character matches anything.
+        var prefixLen = mapped.length - 11;
+        var pressedPrefix = pressed.slice(0, prefixLen);
+        var mappedPrefix = mapped.slice(0, prefixLen);
+        return pressedPrefix == mappedPrefix && pressed.length > prefixLen ? 'full' :
+               mappedPrefix.indexOf(pressedPrefix) == 0 ? 'partial' : false;
+      } else {
+        return pressed == mapped ? 'full' :
+               mapped.indexOf(pressed) == 0 ? 'partial' : false;
+      }
+    }
+    function lastChar(keys) {
+      var match = /^.*(<[\w\-]+>)$/.exec(keys);
+      var selectedCharacter = match ? match[1] : keys.slice(-1);
+      if (selectedCharacter.length > 1){
+        switch(selectedCharacter){
+          case '':
+            selectedCharacter='\n';
+            break;
+          case '':
+            selectedCharacter=' ';
+            break;
+          default:
+            break;
+        }
+      }
+      return selectedCharacter;
+    }
+    function repeatFn(cm, fn, repeat) {
+      return function() {
+        for (var i = 0; i < repeat; i++) {
+          fn(cm);
+        }
+      };
+    }
+    function copyCursor(cur) {
+      return Pos(cur.line, cur.ch);
+    }
+    function cursorEqual(cur1, cur2) {
+      return cur1.ch == cur2.ch && cur1.line == cur2.line;
+    }
+    function cursorIsBefore(cur1, cur2) {
+      if (cur1.line < cur2.line) {
+        return true;
+      }
+      if (cur1.line == cur2.line && cur1.ch < cur2.ch) {
+        return true;
+      }
+      return false;
+    }
+    function cursorMin(cur1, cur2) {
+      if (arguments.length > 2) {
+        cur2 = cursorMin.apply(undefined, Array.prototype.slice.call(arguments, 1));
+      }
+      return cursorIsBefore(cur1, cur2) ? cur1 : cur2;
+    }
+    function cursorMax(cur1, cur2) {
+      if (arguments.length > 2) {
+        cur2 = cursorMax.apply(undefined, Array.prototype.slice.call(arguments, 1));
+      }
+      return cursorIsBefore(cur1, cur2) ? cur2 : cur1;
+    }
+    function cursorIsBetween(cur1, cur2, cur3) {
+      // returns true if cur2 is between cur1 and cur3.
+      var cur1before2 = cursorIsBefore(cur1, cur2);
+      var cur2before3 = cursorIsBefore(cur2, cur3);
+      return cur1before2 && cur2before3;
+    }
+    function lineLength(cm, lineNum) {
+      return cm.getLine(lineNum).length;
+    }
+    function trim(s) {
+      if (s.trim) {
+        return s.trim();
+      }
+      return s.replace(/^\s+|\s+$/g, '');
+    }
+    function escapeRegex(s) {
+      return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
+    }
+    function extendLineToColumn(cm, lineNum, column) {
+      var endCh = lineLength(cm, lineNum);
+      var spaces = new Array(column-endCh+1).join(' ');
+      cm.setCursor(Pos(lineNum, endCh));
+      cm.replaceRange(spaces, cm.getCursor());
+    }
+    // This functions selects a rectangular block
+    // of text with selectionEnd as any of its corner
+    // Height of block:
+    // Difference in selectionEnd.line and first/last selection.line
+    // Width of the block:
+    // Distance between selectionEnd.ch and any(first considered here) selection.ch
+    function selectBlock(cm, selectionEnd) {
+      var selections = [], ranges = cm.listSelections();
+      var head = copyCursor(cm.clipPos(selectionEnd));
+      var isClipped = !cursorEqual(selectionEnd, head);
+      var curHead = cm.getCursor('head');
+      var primIndex = getIndex(ranges, curHead);
+      var wasClipped = cursorEqual(ranges[primIndex].head, ranges[primIndex].anchor);
+      var max = ranges.length - 1;
+      var index = max - primIndex > primIndex ? max : 0;
+      var base = ranges[index].anchor;
+
+      var firstLine = Math.min(base.line, head.line);
+      var lastLine = Math.max(base.line, head.line);
+      var baseCh = base.ch, headCh = head.ch;
+
+      var dir = ranges[index].head.ch - baseCh;
+      var newDir = headCh - baseCh;
+      if (dir > 0 && newDir <= 0) {
+        baseCh++;
+        if (!isClipped) { headCh--; }
+      } else if (dir < 0 && newDir >= 0) {
+        baseCh--;
+        if (!wasClipped) { headCh++; }
+      } else if (dir < 0 && newDir == -1) {
+        baseCh--;
+        headCh++;
+      }
+      for (var line = firstLine; line <= lastLine; line++) {
+        var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
+        selections.push(range);
+      }
+      primIndex = head.line == lastLine ? selections.length - 1 : 0;
+      cm.setSelections(selections);
+      selectionEnd.ch = headCh;
+      base.ch = baseCh;
+      return base;
+    }
+    function selectForInsert(cm, head, height) {
+      var sel = [];
+      for (var i = 0; i < height; i++) {
+        var lineHead = offsetCursor(head, i, 0);
+        sel.push({anchor: lineHead, head: lineHead});
+      }
+      cm.setSelections(sel, 0);
+    }
+    // getIndex returns the index of the cursor in the selections.
+    function getIndex(ranges, cursor, end) {
+      for (var i = 0; i < ranges.length; i++) {
+        var atAnchor = end != 'head' && cursorEqual(ranges[i].anchor, cursor);
+        var atHead = end != 'anchor' && cursorEqual(ranges[i].head, cursor);
+        if (atAnchor || atHead) {
+          return i;
+        }
+      }
+      return -1;
+    }
+    function getSelectedAreaRange(cm, vim) {
+      var lastSelection = vim.lastSelection;
+      var getCurrentSelectedAreaRange = function() {
+        var selections = cm.listSelections();
+        var start =  selections[0];
+        var end = selections[selections.length-1];
+        var selectionStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
+        var selectionEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
+        return [selectionStart, selectionEnd];
+      };
+      var getLastSelectedAreaRange = function() {
+        var selectionStart = cm.getCursor();
+        var selectionEnd = cm.getCursor();
+        var block = lastSelection.visualBlock;
+        if (block) {
+          var width = block.width;
+          var height = block.height;
+          selectionEnd = Pos(selectionStart.line + height, selectionStart.ch + width);
+          var selections = [];
+          // selectBlock creates a 'proper' rectangular block.
+          // We do not want that in all cases, so we manually set selections.
+          for (var i = selectionStart.line; i < selectionEnd.line; i++) {
+            var anchor = Pos(i, selectionStart.ch);
+            var head = Pos(i, selectionEnd.ch);
+            var range = {anchor: anchor, head: head};
+            selections.push(range);
+          }
+          cm.setSelections(selections);
+        } else {
+          var start = lastSelection.anchorMark.find();
+          var end = lastSelection.headMark.find();
+          var line = end.line - start.line;
+          var ch = end.ch - start.ch;
+          selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
+          if (lastSelection.visualLine) {
+            selectionStart = Pos(selectionStart.line, 0);
+            selectionEnd = Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
+          }
+          cm.setSelection(selectionStart, selectionEnd);
+        }
+        return [selectionStart, selectionEnd];
+      };
+      if (!vim.visualMode) {
+      // In case of replaying the action.
+        return getLastSelectedAreaRange();
+      } else {
+        return getCurrentSelectedAreaRange();
+      }
+    }
+    // Updates the previous selection with the current selection's values. This
+    // should only be called in visual mode.
+    function updateLastSelection(cm, vim) {
+      var anchor = vim.sel.anchor;
+      var head = vim.sel.head;
+      // To accommodate the effect of lastPastedText in the last selection
+      if (vim.lastPastedText) {
+        head = cm.posFromIndex(cm.indexFromPos(anchor) + vim.lastPastedText.length);
+        vim.lastPastedText = null;
+      }
+      vim.lastSelection = {'anchorMark': cm.setBookmark(anchor),
+                           'headMark': cm.setBookmark(head),
+                           'anchor': copyCursor(anchor),
+                           'head': copyCursor(head),
+                           'visualMode': vim.visualMode,
+                           'visualLine': vim.visualLine,
+                           'visualBlock': vim.visualBlock};
+    }
+    function expandSelection(cm, start, end) {
+      var sel = cm.state.vim.sel;
+      var head = sel.head;
+      var anchor = sel.anchor;
+      var tmp;
+      if (cursorIsBefore(end, start)) {
+        tmp = end;
+        end = start;
+        start = tmp;
+      }
+      if (cursorIsBefore(head, anchor)) {
+        head = cursorMin(start, head);
+        anchor = cursorMax(anchor, end);
+      } else {
+        anchor = cursorMin(start, anchor);
+        head = cursorMax(head, end);
+        head = offsetCursor(head, 0, -1);
+        if (head.ch == -1 && head.line != cm.firstLine()) {
+          head = Pos(head.line - 1, lineLength(cm, head.line - 1));
+        }
+      }
+      return [anchor, head];
+    }
+    /**
+     * Updates the CodeMirror selection to match the provided vim selection.
+     * If no arguments are given, it uses the current vim selection state.
+     */
+    function updateCmSelection(cm, sel, mode) {
+      var vim = cm.state.vim;
+      sel = sel || vim.sel;
+      var mode = mode ||
+        vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char';
+      var cmSel = makeCmSelection(cm, sel, mode);
+      cm.setSelections(cmSel.ranges, cmSel.primary);
+      updateFakeCursor(cm);
+    }
+    function makeCmSelection(cm, sel, mode, exclusive) {
+      var head = copyCursor(sel.head);
+      var anchor = copyCursor(sel.anchor);
+      if (mode == 'char') {
+        var headOffset = !exclusive && !cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
+        var anchorOffset = cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
+        head = offsetCursor(sel.head, 0, headOffset);
+        anchor = offsetCursor(sel.anchor, 0, anchorOffset);
+        return {
+          ranges: [{anchor: anchor, head: head}],
+          primary: 0
+        };
+      } else if (mode == 'line') {
+        if (!cursorIsBefore(sel.head, sel.anchor)) {
+          anchor.ch = 0;
+
+          var lastLine = cm.lastLine();
+          if (head.line > lastLine) {
+            head.line = lastLine;
+          }
+          head.ch = lineLength(cm, head.line);
+        } else {
+          head.ch = 0;
+          anchor.ch = lineLength(cm, anchor.line);
+        }
+        return {
+          ranges: [{anchor: anchor, head: head}],
+          primary: 0
+        };
+      } else if (mode == 'block') {
+        var top = Math.min(anchor.line, head.line),
+            left = Math.min(anchor.ch, head.ch),
+            bottom = Math.max(anchor.line, head.line),
+            right = Math.max(anchor.ch, head.ch) + 1;
+        var height = bottom - top + 1;
+        var primary = head.line == top ? 0 : height - 1;
+        var ranges = [];
+        for (var i = 0; i < height; i++) {
+          ranges.push({
+            anchor: Pos(top + i, left),
+            head: Pos(top + i, right)
+          });
+        }
+        return {
+          ranges: ranges,
+          primary: primary
+        };
+      }
+    }
+    function getHead(cm) {
+      var cur = cm.getCursor('head');
+      if (cm.getSelection().length == 1) {
+        // Small corner case when only 1 character is selected. The "real"
+        // head is the left of head and anchor.
+        cur = cursorMin(cur, cm.getCursor('anchor'));
+      }
+      return cur;
+    }
+
+    /**
+     * If moveHead is set to false, the CodeMirror selection will not be
+     * touched. The caller assumes the responsibility of putting the cursor
+    * in the right place.
+     */
+    function exitVisualMode(cm, moveHead) {
+      var vim = cm.state.vim;
+      if (moveHead !== false) {
+        cm.setCursor(clipCursorToContent(cm, vim.sel.head));
+      }
+      updateLastSelection(cm, vim);
+      vim.visualMode = false;
+      vim.visualLine = false;
+      vim.visualBlock = false;
+      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      if (vim.fakeCursor) {
+        vim.fakeCursor.clear();
+      }
+    }
+
+    // Remove any trailing newlines from the selection. For
+    // example, with the caret at the start of the last word on the line,
+    // 'dw' should word, but not the newline, while 'w' should advance the
+    // caret to the first character of the next line.
+    function clipToLine(cm, curStart, curEnd) {
+      var selection = cm.getRange(curStart, curEnd);
+      // Only clip if the selection ends with trailing newline + whitespace
+      if (/\n\s*$/.test(selection)) {
+        var lines = selection.split('\n');
+        // We know this is all whitepsace.
+        lines.pop();
+
+        // Cases:
+        // 1. Last word is an empty line - do not clip the trailing '\n'
+        // 2. Last word is not an empty line - clip the trailing '\n'
+        var line;
+        // Find the line containing the last word, and clip all whitespace up
+        // to it.
+        for (var line = lines.pop(); lines.length > 0 && line && isWhiteSpaceString(line); line = lines.pop()) {
+          curEnd.line--;
+          curEnd.ch = 0;
+        }
+        // If the last word is not an empty line, clip an additional newline
+        if (line) {
+          curEnd.line--;
+          curEnd.ch = lineLength(cm, curEnd.line);
+        } else {
+          curEnd.ch = 0;
+        }
+      }
+    }
+
+    // Expand the selection to line ends.
+    function expandSelectionToLine(_cm, curStart, curEnd) {
+      curStart.ch = 0;
+      curEnd.ch = 0;
+      curEnd.line++;
+    }
+
+    function findFirstNonWhiteSpaceCharacter(text) {
+      if (!text) {
+        return 0;
+      }
+      var firstNonWS = text.search(/\S/);
+      return firstNonWS == -1 ? text.length : firstNonWS;
+    }
+
+    function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) {
+      var cur = getHead(cm);
+      var line = cm.getLine(cur.line);
+      var idx = cur.ch;
+
+      // Seek to first word or non-whitespace character, depending on if
+      // noSymbol is true.
+      var test = noSymbol ? wordCharTest[0] : bigWordCharTest [0];
+      while (!test(line.charAt(idx))) {
+        idx++;
+        if (idx >= line.length) { return null; }
+      }
+
+      if (bigWord) {
+        test = bigWordCharTest[0];
+      } else {
+        test = wordCharTest[0];
+        if (!test(line.charAt(idx))) {
+          test = wordCharTest[1];
+        }
+      }
+
+      var end = idx, start = idx;
+      while (test(line.charAt(end)) && end < line.length) { end++; }
+      while (test(line.charAt(start)) && start >= 0) { start--; }
+      start++;
+
+      if (inclusive) {
+        // If present, include all whitespace after word.
+        // Otherwise, include all whitespace before word, except indentation.
+        var wordEnd = end;
+        while (/\s/.test(line.charAt(end)) && end < line.length) { end++; }
+        if (wordEnd == end) {
+          var wordStart = start;
+          while (/\s/.test(line.charAt(start - 1)) && start > 0) { start--; }
+          if (!start) { start = wordStart; }
+        }
+      }
+      return { start: Pos(cur.line, start), end: Pos(cur.line, end) };
+    }
+
+    function recordJumpPosition(cm, oldCur, newCur) {
+      if (!cursorEqual(oldCur, newCur)) {
+        vimGlobalState.jumpList.add(cm, oldCur, newCur);
+      }
+    }
+
+    function recordLastCharacterSearch(increment, args) {
+        vimGlobalState.lastChararacterSearch.increment = increment;
+        vimGlobalState.lastChararacterSearch.forward = args.forward;
+        vimGlobalState.lastChararacterSearch.selectedCharacter = args.selectedCharacter;
+    }
+
+    var symbolToMode = {
+        '(': 'bracket', ')': 'bracket', '{': 'bracket', '}': 'bracket',
+        '[': 'section', ']': 'section',
+        '*': 'comment', '/': 'comment',
+        'm': 'method', 'M': 'method',
+        '#': 'preprocess'
+    };
+    var findSymbolModes = {
+      bracket: {
+        isComplete: function(state) {
+          if (state.nextCh === state.symb) {
+            state.depth++;
+            if (state.depth >= 1)return true;
+          } else if (state.nextCh === state.reverseSymb) {
+            state.depth--;
+          }
+          return false;
+        }
+      },
+      section: {
+        init: function(state) {
+          state.curMoveThrough = true;
+          state.symb = (state.forward ? ']' : '[') === state.symb ? '{' : '}';
+        },
+        isComplete: function(state) {
+          return state.index === 0 && state.nextCh === state.symb;
+        }
+      },
+      comment: {
+        isComplete: function(state) {
+          var found = state.lastCh === '*' && state.nextCh === '/';
+          state.lastCh = state.nextCh;
+          return found;
+        }
+      },
+      // TODO: The original Vim implementation only operates on level 1 and 2.
+      // The current implementation doesn't check for code block level and
+      // therefore it operates on any levels.
+      method: {
+        init: function(state) {
+          state.symb = (state.symb === 'm' ? '{' : '}');
+          state.reverseSymb = state.symb === '{' ? '}' : '{';
+        },
+        isComplete: function(state) {
+          if (state.nextCh === state.symb)return true;
+          return false;
+        }
+      },
+      preprocess: {
+        init: function(state) {
+          state.index = 0;
+        },
+        isComplete: function(state) {
+          if (state.nextCh === '#') {
+            var token = state.lineText.match(/#(\w+)/)[1];
+            if (token === 'endif') {
+              if (state.forward && state.depth === 0) {
+                return true;
+              }
+              state.depth++;
+            } else if (token === 'if') {
+              if (!state.forward && state.depth === 0) {
+                return true;
+              }
+              state.depth--;
+            }
+            if (token === 'else' && state.depth === 0)return true;
+          }
+          return false;
+        }
+      }
+    };
+    function findSymbol(cm, repeat, forward, symb) {
+      var cur = copyCursor(cm.getCursor());
+      var increment = forward ? 1 : -1;
+      var endLine = forward ? cm.lineCount() : -1;
+      var curCh = cur.ch;
+      var line = cur.line;
+      var lineText = cm.getLine(line);
+      var state = {
+        lineText: lineText,
+        nextCh: lineText.charAt(curCh),
+        lastCh: null,
+        index: curCh,
+        symb: symb,
+        reverseSymb: (forward ?  { ')': '(', '}': '{' } : { '(': ')', '{': '}' })[symb],
+        forward: forward,
+        depth: 0,
+        curMoveThrough: false
+      };
+      var mode = symbolToMode[symb];
+      if (!mode)return cur;
+      var init = findSymbolModes[mode].init;
+      var isComplete = findSymbolModes[mode].isComplete;
+      if (init) { init(state); }
+      while (line !== endLine && repeat) {
+        state.index += increment;
+        state.nextCh = state.lineText.charAt(state.index);
+        if (!state.nextCh) {
+          line += increment;
+          state.lineText = cm.getLine(line) || '';
+          if (increment > 0) {
+            state.index = 0;
+          } else {
+            var lineLen = state.lineText.length;
+            state.index = (lineLen > 0) ? (lineLen-1) : 0;
+          }
+          state.nextCh = state.lineText.charAt(state.index);
+        }
+        if (isComplete(state)) {
+          cur.line = line;
+          cur.ch = state.index;
+          repeat--;
+        }
+      }
+      if (state.nextCh || state.curMoveThrough) {
+        return Pos(line, state.index);
+      }
+      return cur;
+    }
+
+    /**
+     * Returns the boundaries of the next word. If the cursor in the middle of
+     * the word, then returns the boundaries of the current word, starting at
+     * the cursor. If the cursor is at the start/end of a word, and we are going
+     * forward/backward, respectively, find the boundaries of the next word.
+     *
+     * @param {CodeMirror} cm CodeMirror object.
+     * @param {Cursor} cur The cursor position.
+     * @param {boolean} forward True to search forward. False to search
+     *     backward.
+     * @param {boolean} bigWord True if punctuation count as part of the word.
+     *     False if only [a-zA-Z0-9] characters count as part of the word.
+     * @param {boolean} emptyLineIsWord True if empty lines should be treated
+     *     as words.
+     * @return {Object{from:number, to:number, line: number}} The boundaries of
+     *     the word, or null if there are no more words.
+     */
+    function findWord(cm, cur, forward, bigWord, emptyLineIsWord) {
+      var lineNum = cur.line;
+      var pos = cur.ch;
+      var line = cm.getLine(lineNum);
+      var dir = forward ? 1 : -1;
+      var charTests = bigWord ? bigWordCharTest: wordCharTest;
+
+      if (emptyLineIsWord && line == '') {
+        lineNum += dir;
+        line = cm.getLine(lineNum);
+        if (!isLine(cm, lineNum)) {
+          return null;
+        }
+        pos = (forward) ? 0 : line.length;
+      }
+
+      while (true) {
+        if (emptyLineIsWord && line == '') {
+          return { from: 0, to: 0, line: lineNum };
+        }
+        var stop = (dir > 0) ? line.length : -1;
+        var wordStart = stop, wordEnd = stop;
+        // Find bounds of next word.
+        while (pos != stop) {
+          var foundWord = false;
+          for (var i = 0; i < charTests.length && !foundWord; ++i) {
+            if (charTests[i](line.charAt(pos))) {
+              wordStart = pos;
+              // Advance to end of word.
+              while (pos != stop && charTests[i](line.charAt(pos))) {
+                pos += dir;
+              }
+              wordEnd = pos;
+              foundWord = wordStart != wordEnd;
+              if (wordStart == cur.ch && lineNum == cur.line &&
+                  wordEnd == wordStart + dir) {
+                // We started at the end of a word. Find the next one.
+                continue;
+              } else {
+                return {
+                  from: Math.min(wordStart, wordEnd + 1),
+                  to: Math.max(wordStart, wordEnd),
+                  line: lineNum };
+              }
+            }
+          }
+          if (!foundWord) {
+            pos += dir;
+          }
+        }
+        // Advance to next/prev line.
+        lineNum += dir;
+        if (!isLine(cm, lineNum)) {
+          return null;
+        }
+        line = cm.getLine(lineNum);
+        pos = (dir > 0) ? 0 : line.length;
+      }
+      // Should never get here.
+      throw new Error('The impossible happened.');
+    }
+
+    /**
+     * @param {CodeMirror} cm CodeMirror object.
+     * @param {Pos} cur The position to start from.
+     * @param {int} repeat Number of words to move past.
+     * @param {boolean} forward True to search forward. False to search
+     *     backward.
+     * @param {boolean} wordEnd True to move to end of word. False to move to
+     *     beginning of word.
+     * @param {boolean} bigWord True if punctuation count as part of the word.
+     *     False if only alphabet characters count as part of the word.
+     * @return {Cursor} The position the cursor should move to.
+     */
+    function moveToWord(cm, cur, repeat, forward, wordEnd, bigWord) {
+      var curStart = copyCursor(cur);
+      var words = [];
+      if (forward && !wordEnd || !forward && wordEnd) {
+        repeat++;
+      }
+      // For 'e', empty lines are not considered words, go figure.
+      var emptyLineIsWord = !(forward && wordEnd);
+      for (var i = 0; i < repeat; i++) {
+        var word = findWord(cm, cur, forward, bigWord, emptyLineIsWord);
+        if (!word) {
+          var eodCh = lineLength(cm, cm.lastLine());
+          words.push(forward
+              ? {line: cm.lastLine(), from: eodCh, to: eodCh}
+              : {line: 0, from: 0, to: 0});
+          break;
+        }
+        words.push(word);
+        cur = Pos(word.line, forward ? (word.to - 1) : word.from);
+      }
+      var shortCircuit = words.length != repeat;
+      var firstWord = words[0];
+      var lastWord = words.pop();
+      if (forward && !wordEnd) {
+        // w
+        if (!shortCircuit && (firstWord.from != curStart.ch || firstWord.line != curStart.line)) {
+          // We did not start in the middle of a word. Discard the extra word at the end.
+          lastWord = words.pop();
+        }
+        return Pos(lastWord.line, lastWord.from);
+      } else if (forward && wordEnd) {
+        return Pos(lastWord.line, lastWord.to - 1);
+      } else if (!forward && wordEnd) {
+        // ge
+        if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) {
+          // We did not start in the middle of a word. Discard the extra word at the end.
+          lastWord = words.pop();
+        }
+        return Pos(lastWord.line, lastWord.to);
+      } else {
+        // b
+        return Pos(lastWord.line, lastWord.from);
+      }
+    }
+
+    function moveToCharacter(cm, repeat, forward, character) {
+      var cur = cm.getCursor();
+      var start = cur.ch;
+      var idx;
+      for (var i = 0; i < repeat; i ++) {
+        var line = cm.getLine(cur.line);
+        idx = charIdxInLine(start, line, character, forward, true);
+        if (idx == -1) {
+          return null;
+        }
+        start = idx;
+      }
+      return Pos(cm.getCursor().line, idx);
+    }
+
+    function moveToColumn(cm, repeat) {
+      // repeat is always >= 1, so repeat - 1 always corresponds
+      // to the column we want to go to.
+      var line = cm.getCursor().line;
+      return clipCursorToContent(cm, Pos(line, repeat - 1));
+    }
+
+    function updateMark(cm, vim, markName, pos) {
+      if (!inArray(markName, validMarks)) {
+        return;
+      }
+      if (vim.marks[markName]) {
+        vim.marks[markName].clear();
+      }
+      vim.marks[markName] = cm.setBookmark(pos);
+    }
+
+    function charIdxInLine(start, line, character, forward, includeChar) {
+      // Search for char in line.
+      // motion_options: {forward, includeChar}
+      // If includeChar = true, include it too.
+      // If forward = true, search forward, else search backwards.
+      // If char is not found on this line, do nothing
+      var idx;
+      if (forward) {
+        idx = line.indexOf(character, start + 1);
+        if (idx != -1 && !includeChar) {
+          idx -= 1;
+        }
+      } else {
+        idx = line.lastIndexOf(character, start - 1);
+        if (idx != -1 && !includeChar) {
+          idx += 1;
+        }
+      }
+      return idx;
+    }
+
+    function findParagraph(cm, head, repeat, dir, inclusive) {
+      var line = head.line;
+      var min = cm.firstLine();
+      var max = cm.lastLine();
+      var start, end, i = line;
+      function isEmpty(i) { return !cm.getLine(i); }
+      function isBoundary(i, dir, any) {
+        if (any) { return isEmpty(i) != isEmpty(i + dir); }
+        return !isEmpty(i) && isEmpty(i + dir);
+      }
+      if (dir) {
+        while (min <= i && i <= max && repeat > 0) {
+          if (isBoundary(i, dir)) { repeat--; }
+          i += dir;
+        }
+        return new Pos(i, 0);
+      }
+
+      var vim = cm.state.vim;
+      if (vim.visualLine && isBoundary(line, 1, true)) {
+        var anchor = vim.sel.anchor;
+        if (isBoundary(anchor.line, -1, true)) {
+          if (!inclusive || anchor.line != line) {
+            line += 1;
+          }
+        }
+      }
+      var startState = isEmpty(line);
+      for (i = line; i <= max && repeat; i++) {
+        if (isBoundary(i, 1, true)) {
+          if (!inclusive || isEmpty(i) != startState) {
+            repeat--;
+          }
+        }
+      }
+      end = new Pos(i, 0);
+      // select boundary before paragraph for the last one
+      if (i > max && !startState) { startState = true; }
+      else { inclusive = false; }
+      for (i = line; i > min; i--) {
+        if (!inclusive || isEmpty(i) == startState || i == line) {
+          if (isBoundary(i, -1, true)) { break; }
+        }
+      }
+      start = new Pos(i, 0);
+      return { start: start, end: end };
+    }
+
+    // TODO: perhaps this finagling of start and end positions belonds
+    // in codmirror/replaceRange?
+    function selectCompanionObject(cm, head, symb, inclusive) {
+      var cur = head, start, end;
+
+      var bracketRegexp = ({
+        '(': /[()]/, ')': /[()]/,
+        '[': /[[\]]/, ']': /[[\]]/,
+        '{': /[{}]/, '}': /[{}]/})[symb];
+      var openSym = ({
+        '(': '(', ')': '(',
+        '[': '[', ']': '[',
+        '{': '{', '}': '{'})[symb];
+      var curChar = cm.getLine(cur.line).charAt(cur.ch);
+      // Due to the behavior of scanForBracket, we need to add an offset if the
+      // cursor is on a matching open bracket.
+      var offset = curChar === openSym ? 1 : 0;
+
+      start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, null, {'bracketRegex': bracketRegexp});
+      end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, null, {'bracketRegex': bracketRegexp});
+
+      if (!start || !end) {
+        return { start: cur, end: cur };
+      }
+
+      start = start.pos;
+      end = end.pos;
+
+      if ((start.line == end.line && start.ch > end.ch)
+          || (start.line > end.line)) {
+        var tmp = start;
+        start = end;
+        end = tmp;
+      }
+
+      if (inclusive) {
+        end.ch += 1;
+      } else {
+        start.ch += 1;
+      }
+
+      return { start: start, end: end };
+    }
+
+    // Takes in a symbol and a cursor and tries to simulate text objects that
+    // have identical opening and closing symbols
+    // TODO support across multiple lines
+    function findBeginningAndEnd(cm, head, symb, inclusive) {
+      var cur = copyCursor(head);
+      var line = cm.getLine(cur.line);
+      var chars = line.split('');
+      var start, end, i, len;
+      var firstIndex = chars.indexOf(symb);
+
+      // the decision tree is to always look backwards for the beginning first,
+      // but if the cursor is in front of the first instance of the symb,
+      // then move the cursor forward
+      if (cur.ch < firstIndex) {
+        cur.ch = firstIndex;
+        // Why is this line even here???
+        // cm.setCursor(cur.line, firstIndex+1);
+      }
+      // otherwise if the cursor is currently on the closing symbol
+      else if (firstIndex < cur.ch && chars[cur.ch] == symb) {
+        end = cur.ch; // assign end to the current cursor
+        --cur.ch; // make sure to look backwards
+      }
+
+      // if we're currently on the symbol, we've got a start
+      if (chars[cur.ch] == symb && !end) {
+        start = cur.ch + 1; // assign start to ahead of the cursor
+      } else {
+        // go backwards to find the start
+        for (i = cur.ch; i > -1 && !start; i--) {
+          if (chars[i] == symb) {
+            start = i + 1;
+          }
+        }
+      }
+
+      // look forwards for the end symbol
+      if (start && !end) {
+        for (i = start, len = chars.length; i < len && !end; i++) {
+          if (chars[i] == symb) {
+            end = i;
+          }
+        }
+      }
+
+      // nothing found
+      if (!start || !end) {
+        return { start: cur, end: cur };
+      }
+
+      // include the symbols
+      if (inclusive) {
+        --start; ++end;
+      }
+
+      return {
+        start: Pos(cur.line, start),
+        end: Pos(cur.line, end)
+      };
+    }
+
+    // Search functions
+    defineOption('pcre', true, 'boolean');
+    function SearchState() {}
+    SearchState.prototype = {
+      getQuery: function() {
+        return vimGlobalState.query;
+      },
+      setQuery: function(query) {
+        vimGlobalState.query = query;
+      },
+      getOverlay: function() {
+        return this.searchOverlay;
+      },
+      setOverlay: function(overlay) {
+        this.searchOverlay = overlay;
+      },
+      isReversed: function() {
+        return vimGlobalState.isReversed;
+      },
+      setReversed: function(reversed) {
+        vimGlobalState.isReversed = reversed;
+      },
+      getScrollbarAnnotate: function() {
+        return this.annotate;
+      },
+      setScrollbarAnnotate: function(annotate) {
+        this.annotate = annotate;
+      }
+    };
+    function getSearchState(cm) {
+      var vim = cm.state.vim;
+      return vim.searchState_ || (vim.searchState_ = new SearchState());
+    }
+    function dialog(cm, template, shortText, onClose, options) {
+      if (cm.openDialog) {
+        cm.openDialog(template, onClose, { bottom: true, value: options.value,
+            onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
+            selectValueOnOpen: false});
+      }
+      else {
+        onClose(prompt(shortText, ''));
+      }
+    }
+    function splitBySlash(argString) {
+      var slashes = findUnescapedSlashes(argString) || [];
+      if (!slashes.length) return [];
+      var tokens = [];
+      // in case of strings like foo/bar
+      if (slashes[0] !== 0) return;
+      for (var i = 0; i < slashes.length; i++) {
+        if (typeof slashes[i] == 'number')
+          tokens.push(argString.substring(slashes[i] + 1, slashes[i+1]));
+      }
+      return tokens;
+    }
+
+    function findUnescapedSlashes(str) {
+      var escapeNextChar = false;
+      var slashes = [];
+      for (var i = 0; i < str.length; i++) {
+        var c = str.charAt(i);
+        if (!escapeNextChar && c == '/') {
+          slashes.push(i);
+        }
+        escapeNextChar = !escapeNextChar && (c == '\\');
+      }
+      return slashes;
+    }
+
+    // Translates a search string from ex (vim) syntax into javascript form.
+    function translateRegex(str) {
+      // When these match, add a '\' if unescaped or remove one if escaped.
+      var specials = '|(){';
+      // Remove, but never add, a '\' for these.
+      var unescape = '}';
+      var escapeNextChar = false;
+      var out = [];
+      for (var i = -1; i < str.length; i++) {
+        var c = str.charAt(i) || '';
+        var n = str.charAt(i+1) || '';
+        var specialComesNext = (n && specials.indexOf(n) != -1);
+        if (escapeNextChar) {
+          if (c !== '\\' || !specialComesNext) {
+            out.push(c);
+          }
+          escapeNextChar = false;
+        } else {
+          if (c === '\\') {
+            escapeNextChar = true;
+            // Treat the unescape list as special for removing, but not adding '\'.
+            if (n && unescape.indexOf(n) != -1) {
+              specialComesNext = true;
+            }
+            // Not passing this test means removing a '\'.
+            if (!specialComesNext || n === '\\') {
+              out.push(c);
+            }
+          } else {
+            out.push(c);
+            if (specialComesNext && n !== '\\') {
+              out.push('\\');
+            }
+          }
+        }
+      }
+      return out.join('');
+    }
+
+    // Translates the replace part of a search and replace from ex (vim) syntax into
+    // javascript form.  Similar to translateRegex, but additionally fixes back references
+    // (translates '\[0..9]' to '$[0..9]') and follows different rules for escaping '$'.
+    var charUnescapes = {'\\n': '\n', '\\r': '\r', '\\t': '\t'};
+    function translateRegexReplace(str) {
+      var escapeNextChar = false;
+      var out = [];
+      for (var i = -1; i < str.length; i++) {
+        var c = str.charAt(i) || '';
+        var n = str.charAt(i+1) || '';
+        if (charUnescapes[c + n]) {
+          out.push(charUnescapes[c+n]);
+          i++;
+        } else if (escapeNextChar) {
+          // At any point in the loop, escapeNextChar is true if the previous
+          // character was a '\' and was not escaped.
+          out.push(c);
+          escapeNextChar = false;
+        } else {
+          if (c === '\\') {
+            escapeNextChar = true;
+            if ((isNumber(n) || n === '$')) {
+              out.push('$');
+            } else if (n !== '/' && n !== '\\') {
+              out.push('\\');
+            }
+          } else {
+            if (c === '$') {
+              out.push('$');
+            }
+            out.push(c);
+            if (n === '/') {
+              out.push('\\');
+            }
+          }
+        }
+      }
+      return out.join('');
+    }
+
+    // Unescape \ and / in the replace part, for PCRE mode.
+    var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t'};
+    function unescapeRegexReplace(str) {
+      var stream = new CodeMirror.StringStream(str);
+      var output = [];
+      while (!stream.eol()) {
+        // Search for \.
+        while (stream.peek() && stream.peek() != '\\') {
+          output.push(stream.next());
+        }
+        var matched = false;
+        for (var matcher in unescapes) {
+          if (stream.match(matcher, true)) {
+            matched = true;
+            output.push(unescapes[matcher]);
+            break;
+          }
+        }
+        if (!matched) {
+          // Don't change anything
+          output.push(stream.next());
+        }
+      }
+      return output.join('');
+    }
+
+    /**
+     * Extract the regular expression from the query and return a Regexp object.
+     * Returns null if the query is blank.
+     * If ignoreCase is passed in, the Regexp object will have the 'i' flag set.
+     * If smartCase is passed in, and the query contains upper case letters,
+     *   then ignoreCase is overridden, and the 'i' flag will not be set.
+     * If the query contains the /i in the flag part of the regular expression,
+     *   then both ignoreCase and smartCase are ignored, and 'i' will be passed
+     *   through to the Regex object.
+     */
+    function parseQuery(query, ignoreCase, smartCase) {
+      // First update the last search register
+      var lastSearchRegister = vimGlobalState.registerController.getRegister('/');
+      lastSearchRegister.setText(query);
+      // Check if the query is already a regex.
+      if (query instanceof RegExp) { return query; }
+      // First try to extract regex + flags from the input. If no flags found,
+      // extract just the regex. IE does not accept flags directly defined in
+      // the regex string in the form /regex/flags
+      var slashes = findUnescapedSlashes(query);
+      var regexPart;
+      var forceIgnoreCase;
+      if (!slashes.length) {
+        // Query looks like 'regexp'
+        regexPart = query;
+      } else {
+        // Query looks like 'regexp/...'
+        regexPart = query.substring(0, slashes[0]);
+        var flagsPart = query.substring(slashes[0]);
+        forceIgnoreCase = (flagsPart.indexOf('i') != -1);
+      }
+      if (!regexPart) {
+        return null;
+      }
+      if (!getOption('pcre')) {
+        regexPart = translateRegex(regexPart);
+      }
+      if (smartCase) {
+        ignoreCase = (/^[^A-Z]*$/).test(regexPart);
+      }
+      var regexp = new RegExp(regexPart,
+          (ignoreCase || forceIgnoreCase) ? 'i' : undefined);
+      return regexp;
+    }
+    function showConfirm(cm, text) {
+      if (cm.openNotification) {
+        cm.openNotification('' + text + '',
+                            {bottom: true, duration: 5000});
+      } else {
+        alert(text);
+      }
+    }
+    function makePrompt(prefix, desc) {
+      var raw = '';
+      if (prefix) {
+        raw += '' + prefix + '';
+      }
+      raw += ' ' +
+          '';
+      if (desc) {
+        raw += '';
+        raw += desc;
+        raw += '';
+      }
+      return raw;
+    }
+    var searchPromptDesc = '(Javascript regexp)';
+    function showPrompt(cm, options) {
+      var shortText = (options.prefix || '') + ' ' + (options.desc || '');
+      var prompt = makePrompt(options.prefix, options.desc);
+      dialog(cm, prompt, shortText, options.onClose, options);
+    }
+    function regexEqual(r1, r2) {
+      if (r1 instanceof RegExp && r2 instanceof RegExp) {
+          var props = ['global', 'multiline', 'ignoreCase', 'source'];
+          for (var i = 0; i < props.length; i++) {
+              var prop = props[i];
+              if (r1[prop] !== r2[prop]) {
+                  return false;
+              }
+          }
+          return true;
+      }
+      return false;
+    }
+    // Returns true if the query is valid.
+    function updateSearchQuery(cm, rawQuery, ignoreCase, smartCase) {
+      if (!rawQuery) {
+        return;
+      }
+      var state = getSearchState(cm);
+      var query = parseQuery(rawQuery, !!ignoreCase, !!smartCase);
+      if (!query) {
+        return;
+      }
+      highlightSearchMatches(cm, query);
+      if (regexEqual(query, state.getQuery())) {
+        return query;
+      }
+      state.setQuery(query);
+      return query;
+    }
+    function searchOverlay(query) {
+      if (query.source.charAt(0) == '^') {
+        var matchSol = true;
+      }
+      return {
+        token: function(stream) {
+          if (matchSol && !stream.sol()) {
+            stream.skipToEnd();
+            return;
+          }
+          var match = stream.match(query, false);
+          if (match) {
+            if (match[0].length == 0) {
+              // Matched empty string, skip to next.
+              stream.next();
+              return 'searching';
+            }
+            if (!stream.sol()) {
+              // Backtrack 1 to match \b
+              stream.backUp(1);
+              if (!query.exec(stream.next() + match[0])) {
+                stream.next();
+                return null;
+              }
+            }
+            stream.match(query);
+            return 'searching';
+          }
+          while (!stream.eol()) {
+            stream.next();
+            if (stream.match(query, false)) break;
+          }
+        },
+        query: query
+      };
+    }
+    function highlightSearchMatches(cm, query) {
+      var searchState = getSearchState(cm);
+      var overlay = searchState.getOverlay();
+      if (!overlay || query != overlay.query) {
+        if (overlay) {
+          cm.removeOverlay(overlay);
+        }
+        overlay = searchOverlay(query);
+        cm.addOverlay(overlay);
+        if (cm.showMatchesOnScrollbar) {
+          if (searchState.getScrollbarAnnotate()) {
+            searchState.getScrollbarAnnotate().clear();
+          }
+          searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query));
+        }
+        searchState.setOverlay(overlay);
+      }
+    }
+    function findNext(cm, prev, query, repeat) {
+      if (repeat === undefined) { repeat = 1; }
+      return cm.operation(function() {
+        var pos = cm.getCursor();
+        var cursor = cm.getSearchCursor(query, pos);
+        for (var i = 0; i < repeat; i++) {
+          var found = cursor.find(prev);
+          if (i == 0 && found && cursorEqual(cursor.from(), pos)) { found = cursor.find(prev); }
+          if (!found) {
+            // SearchCursor may have returned null because it hit EOF, wrap
+            // around and try again.
+            cursor = cm.getSearchCursor(query,
+                (prev) ? Pos(cm.lastLine()) : Pos(cm.firstLine(), 0) );
+            if (!cursor.find(prev)) {
+              return;
+            }
+          }
+        }
+        return cursor.from();
+      });
+    }
+    function clearSearchHighlight(cm) {
+      var state = getSearchState(cm);
+      cm.removeOverlay(getSearchState(cm).getOverlay());
+      state.setOverlay(null);
+      if (state.getScrollbarAnnotate()) {
+        state.getScrollbarAnnotate().clear();
+        state.setScrollbarAnnotate(null);
+      }
+    }
+    /**
+     * Check if pos is in the specified range, INCLUSIVE.
+     * Range can be specified with 1 or 2 arguments.
+     * If the first range argument is an array, treat it as an array of line
+     * numbers. Match pos against any of the lines.
+     * If the first range argument is a number,
+     *   if there is only 1 range argument, check if pos has the same line
+     *       number
+     *   if there are 2 range arguments, then check if pos is in between the two
+     *       range arguments.
+     */
+    function isInRange(pos, start, end) {
+      if (typeof pos != 'number') {
+        // Assume it is a cursor position. Get the line number.
+        pos = pos.line;
+      }
+      if (start instanceof Array) {
+        return inArray(pos, start);
+      } else {
+        if (end) {
+          return (pos >= start && pos <= end);
+        } else {
+          return pos == start;
+        }
+      }
+    }
+    function getUserVisibleLines(cm) {
+      var scrollInfo = cm.getScrollInfo();
+      var occludeToleranceTop = 6;
+      var occludeToleranceBottom = 10;
+      var from = cm.coordsChar({left:0, top: occludeToleranceTop + scrollInfo.top}, 'local');
+      var bottomY = scrollInfo.clientHeight - occludeToleranceBottom + scrollInfo.top;
+      var to = cm.coordsChar({left:0, top: bottomY}, 'local');
+      return {top: from.line, bottom: to.line};
+    }
+
+    var ExCommandDispatcher = function() {
+      this.buildCommandMap_();
+    };
+    ExCommandDispatcher.prototype = {
+      processCommand: function(cm, input, opt_params) {
+        var that = this;
+        cm.operation(function () {
+          cm.curOp.isVimOp = true;
+          that._processCommand(cm, input, opt_params);
+        });
+      },
+      _processCommand: function(cm, input, opt_params) {
+        var vim = cm.state.vim;
+        var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
+        var previousCommand = commandHistoryRegister.toString();
+        if (vim.visualMode) {
+          exitVisualMode(cm);
+        }
+        var inputStream = new CodeMirror.StringStream(input);
+        // update ": with the latest command whether valid or invalid
+        commandHistoryRegister.setText(input);
+        var params = opt_params || {};
+        params.input = input;
+        try {
+          this.parseInput_(cm, inputStream, params);
+        } catch(e) {
+          showConfirm(cm, e);
+          throw e;
+        }
+        var command;
+        var commandName;
+        if (!params.commandName) {
+          // If only a line range is defined, move to the line.
+          if (params.line !== undefined) {
+            commandName = 'move';
+          }
+        } else {
+          command = this.matchCommand_(params.commandName);
+          if (command) {
+            commandName = command.name;
+            if (command.excludeFromCommandHistory) {
+              commandHistoryRegister.setText(previousCommand);
+            }
+            this.parseCommandArgs_(inputStream, params, command);
+            if (command.type == 'exToKey') {
+              // Handle Ex to Key mapping.
+              for (var i = 0; i < command.toKeys.length; i++) {
+                CodeMirror.Vim.handleKey(cm, command.toKeys[i], 'mapping');
+              }
+              return;
+            } else if (command.type == 'exToEx') {
+              // Handle Ex to Ex mapping.
+              this.processCommand(cm, command.toInput);
+              return;
+            }
+          }
+        }
+        if (!commandName) {
+          showConfirm(cm, 'Not an editor command ":' + input + '"');
+          return;
+        }
+        try {
+          exCommands[commandName](cm, params);
+          // Possibly asynchronous commands (e.g. substitute, which might have a
+          // user confirmation), are responsible for calling the callback when
+          // done. All others have it taken care of for them here.
+          if ((!command || !command.possiblyAsync) && params.callback) {
+            params.callback();
+          }
+        } catch(e) {
+          showConfirm(cm, e);
+          throw e;
+        }
+      },
+      parseInput_: function(cm, inputStream, result) {
+        inputStream.eatWhile(':');
+        // Parse range.
+        if (inputStream.eat('%')) {
+          result.line = cm.firstLine();
+          result.lineEnd = cm.lastLine();
+        } else {
+          result.line = this.parseLineSpec_(cm, inputStream);
+          if (result.line !== undefined && inputStream.eat(',')) {
+            result.lineEnd = this.parseLineSpec_(cm, inputStream);
+          }
+        }
+
+        // Parse command name.
+        var commandMatch = inputStream.match(/^(\w+)/);
+        if (commandMatch) {
+          result.commandName = commandMatch[1];
+        } else {
+          result.commandName = inputStream.match(/.*/)[0];
+        }
+
+        return result;
+      },
+      parseLineSpec_: function(cm, inputStream) {
+        var numberMatch = inputStream.match(/^(\d+)/);
+        if (numberMatch) {
+          return parseInt(numberMatch[1], 10) - 1;
+        }
+        switch (inputStream.next()) {
+          case '.':
+            return cm.getCursor().line;
+          case '$':
+            return cm.lastLine();
+          case '\'':
+            var mark = cm.state.vim.marks[inputStream.next()];
+            if (mark && mark.find()) {
+              return mark.find().line;
+            }
+            throw new Error('Mark not set');
+          default:
+            inputStream.backUp(1);
+            return undefined;
+        }
+      },
+      parseCommandArgs_: function(inputStream, params, command) {
+        if (inputStream.eol()) {
+          return;
+        }
+        params.argString = inputStream.match(/.*/)[0];
+        // Parse command-line arguments
+        var delim = command.argDelimiter || /\s+/;
+        var args = trim(params.argString).split(delim);
+        if (args.length && args[0]) {
+          params.args = args;
+        }
+      },
+      matchCommand_: function(commandName) {
+        // Return the command in the command map that matches the shortest
+        // prefix of the passed in command name. The match is guaranteed to be
+        // unambiguous if the defaultExCommandMap's shortNames are set up
+        // correctly. (see @code{defaultExCommandMap}).
+        for (var i = commandName.length; i > 0; i--) {
+          var prefix = commandName.substring(0, i);
+          if (this.commandMap_[prefix]) {
+            var command = this.commandMap_[prefix];
+            if (command.name.indexOf(commandName) === 0) {
+              return command;
+            }
+          }
+        }
+        return null;
+      },
+      buildCommandMap_: function() {
+        this.commandMap_ = {};
+        for (var i = 0; i < defaultExCommandMap.length; i++) {
+          var command = defaultExCommandMap[i];
+          var key = command.shortName || command.name;
+          this.commandMap_[key] = command;
+        }
+      },
+      map: function(lhs, rhs, ctx) {
+        if (lhs != ':' && lhs.charAt(0) == ':') {
+          if (ctx) { throw Error('Mode not supported for ex mappings'); }
+          var commandName = lhs.substring(1);
+          if (rhs != ':' && rhs.charAt(0) == ':') {
+            // Ex to Ex mapping
+            this.commandMap_[commandName] = {
+              name: commandName,
+              type: 'exToEx',
+              toInput: rhs.substring(1),
+              user: true
+            };
+          } else {
+            // Ex to key mapping
+            this.commandMap_[commandName] = {
+              name: commandName,
+              type: 'exToKey',
+              toKeys: rhs,
+              user: true
+            };
+          }
+        } else {
+          if (rhs != ':' && rhs.charAt(0) == ':') {
+            // Key to Ex mapping.
+            var mapping = {
+              keys: lhs,
+              type: 'keyToEx',
+              exArgs: { input: rhs.substring(1) },
+              user: true};
+            if (ctx) { mapping.context = ctx; }
+            defaultKeymap.unshift(mapping);
+          } else {
+            // Key to key mapping
+            var mapping = {
+              keys: lhs,
+              type: 'keyToKey',
+              toKeys: rhs,
+              user: true
+            };
+            if (ctx) { mapping.context = ctx; }
+            defaultKeymap.unshift(mapping);
+          }
+        }
+      },
+      unmap: function(lhs, ctx) {
+        if (lhs != ':' && lhs.charAt(0) == ':') {
+          // Ex to Ex or Ex to key mapping
+          if (ctx) { throw Error('Mode not supported for ex mappings'); }
+          var commandName = lhs.substring(1);
+          if (this.commandMap_[commandName] && this.commandMap_[commandName].user) {
+            delete this.commandMap_[commandName];
+            return;
+          }
+        } else {
+          // Key to Ex or key to key mapping
+          var keys = lhs;
+          for (var i = 0; i < defaultKeymap.length; i++) {
+            if (keys == defaultKeymap[i].keys
+                && defaultKeymap[i].context === ctx
+                && defaultKeymap[i].user) {
+              defaultKeymap.splice(i, 1);
+              return;
+            }
+          }
+        }
+        throw Error('No such mapping.');
+      }
+    };
+
+    var exCommands = {
+      colorscheme: function(cm, params) {
+        if (!params.args || params.args.length < 1) {
+          showConfirm(cm, cm.getOption('theme'));
+          return;
+        }
+        cm.setOption('theme', params.args[0]);
+      },
+      map: function(cm, params, ctx) {
+        var mapArgs = params.args;
+        if (!mapArgs || mapArgs.length < 2) {
+          if (cm) {
+            showConfirm(cm, 'Invalid mapping: ' + params.input);
+          }
+          return;
+        }
+        exCommandDispatcher.map(mapArgs[0], mapArgs[1], ctx);
+      },
+      imap: function(cm, params) { this.map(cm, params, 'insert'); },
+      nmap: function(cm, params) { this.map(cm, params, 'normal'); },
+      vmap: function(cm, params) { this.map(cm, params, 'visual'); },
+      unmap: function(cm, params, ctx) {
+        var mapArgs = params.args;
+        if (!mapArgs || mapArgs.length < 1) {
+          if (cm) {
+            showConfirm(cm, 'No such mapping: ' + params.input);
+          }
+          return;
+        }
+        exCommandDispatcher.unmap(mapArgs[0], ctx);
+      },
+      move: function(cm, params) {
+        commandDispatcher.processCommand(cm, cm.state.vim, {
+            type: 'motion',
+            motion: 'moveToLineOrEdgeOfDocument',
+            motionArgs: { forward: false, explicitRepeat: true,
+              linewise: true },
+            repeatOverride: params.line+1});
+      },
+      set: function(cm, params) {
+        var setArgs = params.args;
+        // Options passed through to the setOption/getOption calls. May be passed in by the
+        // local/global versions of the set command
+        var setCfg = params.setCfg || {};
+        if (!setArgs || setArgs.length < 1) {
+          if (cm) {
+            showConfirm(cm, 'Invalid mapping: ' + params.input);
+          }
+          return;
+        }
+        var expr = setArgs[0].split('=');
+        var optionName = expr[0];
+        var value = expr[1];
+        var forceGet = false;
+
+        if (optionName.charAt(optionName.length - 1) == '?') {
+          // If post-fixed with ?, then the set is actually a get.
+          if (value) { throw Error('Trailing characters: ' + params.argString); }
+          optionName = optionName.substring(0, optionName.length - 1);
+          forceGet = true;
+        }
+        if (value === undefined && optionName.substring(0, 2) == 'no') {
+          // To set boolean options to false, the option name is prefixed with
+          // 'no'.
+          optionName = optionName.substring(2);
+          value = false;
+        }
+
+        var optionIsBoolean = options[optionName] && options[optionName].type == 'boolean';
+        if (optionIsBoolean && value == undefined) {
+          // Calling set with a boolean option sets it to true.
+          value = true;
+        }
+        // If no value is provided, then we assume this is a get.
+        if (!optionIsBoolean && value === undefined || forceGet) {
+          var oldValue = getOption(optionName, cm, setCfg);
+          if (oldValue === true || oldValue === false) {
+            showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
+          } else {
+            showConfirm(cm, '  ' + optionName + '=' + oldValue);
+          }
+        } else {
+          setOption(optionName, value, cm, setCfg);
+        }
+      },
+      setlocal: function (cm, params) {
+        // setCfg is passed through to setOption
+        params.setCfg = {scope: 'local'};
+        this.set(cm, params);
+      },
+      setglobal: function (cm, params) {
+        // setCfg is passed through to setOption
+        params.setCfg = {scope: 'global'};
+        this.set(cm, params);
+      },
+      registers: function(cm, params) {
+        var regArgs = params.args;
+        var registers = vimGlobalState.registerController.registers;
+        var regInfo = '----------Registers----------

';
+        if (!regArgs) {
+          for (var registerName in registers) {
+            var text = registers[registerName].toString();
+            if (text.length) {
+              regInfo += '"' + registerName + '    ' + text + '
';
+            }
+          }
+        } else {
+          var registerName;
+          regArgs = regArgs.join('');
+          for (var i = 0; i < regArgs.length; i++) {
+            registerName = regArgs.charAt(i);
+            if (!vimGlobalState.registerController.isValidRegister(registerName)) {
+              continue;
+            }
+            var register = registers[registerName] || new Register();
+            regInfo += '"' + registerName + '    ' + register.toString() + '
';
+          }
+        }
+        showConfirm(cm, regInfo);
+      },
+      sort: function(cm, params) {
+        var reverse, ignoreCase, unique, number;
+        function parseArgs() {
+          if (params.argString) {
+            var args = new CodeMirror.StringStream(params.argString);
+            if (args.eat('!')) { reverse = true; }
+            if (args.eol()) { return; }
+            if (!args.eatSpace()) { return 'Invalid arguments'; }
+            var opts = args.match(/[a-z]+/);
+            if (opts) {
+              opts = opts[0];
+              ignoreCase = opts.indexOf('i') != -1;
+              unique = opts.indexOf('u') != -1;
+              var decimal = opts.indexOf('d') != -1 && 1;
+              var hex = opts.indexOf('x') != -1 && 1;
+              var octal = opts.indexOf('o') != -1 && 1;
+              if (decimal + hex + octal > 1) { return 'Invalid arguments'; }
+              number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
+            }
+            if (args.match(/\/.*\//)) { return 'patterns not supported'; }
+          }
+        }
+        var err = parseArgs();
+        if (err) {
+          showConfirm(cm, err + ': ' + params.argString);
+          return;
+        }
+        var lineStart = params.line || cm.firstLine();
+        var lineEnd = params.lineEnd || params.line || cm.lastLine();
+        if (lineStart == lineEnd) { return; }
+        var curStart = Pos(lineStart, 0);
+        var curEnd = Pos(lineEnd, lineLength(cm, lineEnd));
+        var text = cm.getRange(curStart, curEnd).split('\n');
+        var numberRegex = (number == 'decimal') ? /(-?)([\d]+)/ :
+           (number == 'hex') ? /(-?)(?:0x)?([0-9a-f]+)/i :
+           (number == 'octal') ? /([0-7]+)/ : null;
+        var radix = (number == 'decimal') ? 10 : (number == 'hex') ? 16 : (number == 'octal') ? 8 : null;
+        var numPart = [], textPart = [];
+        if (number) {
+          for (var i = 0; i < text.length; i++) {
+            if (numberRegex.exec(text[i])) {
+              numPart.push(text[i]);
+            } else {
+              textPart.push(text[i]);
+            }
+          }
+        } else {
+          textPart = text;
+        }
+        function compareFn(a, b) {
+          if (reverse) { var tmp; tmp = a; a = b; b = tmp; }
+          if (ignoreCase) { a = a.toLowerCase(); b = b.toLowerCase(); }
+          var anum = number && numberRegex.exec(a);
+          var bnum = number && numberRegex.exec(b);
+          if (!anum) { return a < b ? -1 : 1; }
+          anum = parseInt((anum[1] + anum[2]).toLowerCase(), radix);
+          bnum = parseInt((bnum[1] + bnum[2]).toLowerCase(), radix);
+          return anum - bnum;
+        }
+        numPart.sort(compareFn);
+        textPart.sort(compareFn);
+        text = (!reverse) ? textPart.concat(numPart) : numPart.concat(textPart);
+        if (unique) { // Remove duplicate lines
+          var textOld = text;
+          var lastLine;
+          text = [];
+          for (var i = 0; i < textOld.length; i++) {
+            if (textOld[i] != lastLine) {
+              text.push(textOld[i]);
+            }
+            lastLine = textOld[i];
+          }
+        }
+        cm.replaceRange(text.join('\n'), curStart, curEnd);
+      },
+      global: function(cm, params) {
+        // a global command is of the form
+        // :[range]g/pattern/[cmd]
+        // argString holds the string /pattern/[cmd]
+        var argString = params.argString;
+        if (!argString) {
+          showConfirm(cm, 'Regular Expression missing from global');
+          return;
+        }
+        // range is specified here
+        var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
+        var lineEnd = params.lineEnd || params.line || cm.lastLine();
+        // get the tokens from argString
+        var tokens = splitBySlash(argString);
+        var regexPart = argString, cmd;
+        if (tokens.length) {
+          regexPart = tokens[0];
+          cmd = tokens.slice(1, tokens.length).join('/');
+        }
+        if (regexPart) {
+          // If regex part is empty, then use the previous query. Otherwise
+          // use the regex part as the new query.
+          try {
+           updateSearchQuery(cm, regexPart, true /** ignoreCase */,
+             true /** smartCase */);
+          } catch (e) {
+           showConfirm(cm, 'Invalid regex: ' + regexPart);
+           return;
+          }
+        }
+        // now that we have the regexPart, search for regex matches in the
+        // specified range of lines
+        var query = getSearchState(cm).getQuery();
+        var matchedLines = [], content = '';
+        for (var i = lineStart; i <= lineEnd; i++) {
+          var matched = query.test(cm.getLine(i));
+          if (matched) {
+            matchedLines.push(i+1);
+            content+= cm.getLine(i) + '
';
+          }
+        }
+        // if there is no [cmd], just display the list of matched lines
+        if (!cmd) {
+          showConfirm(cm, content);
+          return;
+        }
+        var index = 0;
+        var nextCommand = function() {
+          if (index < matchedLines.length) {
+            var command = matchedLines[index] + cmd;
+            exCommandDispatcher.processCommand(cm, command, {
+              callback: nextCommand
+            });
+          }
+          index++;
+        };
+        nextCommand();
+      },
+      substitute: function(cm, params) {
+        if (!cm.getSearchCursor) {
+          throw new Error('Search feature not available. Requires searchcursor.js or ' +
+              'any other getSearchCursor implementation.');
+        }
+        var argString = params.argString;
+        var tokens = argString ? splitBySlash(argString) : [];
+        var regexPart, replacePart = '', trailing, flagsPart, count;
+        var confirm = false; // Whether to confirm each replace.
+        var global = false; // True to replace all instances on a line, false to replace only 1.
+        if (tokens.length) {
+          regexPart = tokens[0];
+          replacePart = tokens[1];
+          if (replacePart !== undefined) {
+            if (getOption('pcre')) {
+              replacePart = unescapeRegexReplace(replacePart);
+            } else {
+              replacePart = translateRegexReplace(replacePart);
+            }
+            vimGlobalState.lastSubstituteReplacePart = replacePart;
+          }
+          trailing = tokens[2] ? tokens[2].split(' ') : [];
+        } else {
+          // either the argString is empty or its of the form ' hello/world'
+          // actually splitBySlash returns a list of tokens
+          // only if the string starts with a '/'
+          if (argString && argString.length) {
+            showConfirm(cm, 'Substitutions should be of the form ' +
+                ':s/pattern/replace/');
+            return;
+          }
+        }
+        // After the 3rd slash, we can have flags followed by a space followed
+        // by count.
+        if (trailing) {
+          flagsPart = trailing[0];
+          count = parseInt(trailing[1]);
+          if (flagsPart) {
+            if (flagsPart.indexOf('c') != -1) {
+              confirm = true;
+              flagsPart.replace('c', '');
+            }
+            if (flagsPart.indexOf('g') != -1) {
+              global = true;
+              flagsPart.replace('g', '');
+            }
+            regexPart = regexPart + '/' + flagsPart;
+          }
+        }
+        if (regexPart) {
+          // If regex part is empty, then use the previous query. Otherwise use
+          // the regex part as the new query.
+          try {
+            updateSearchQuery(cm, regexPart, true /** ignoreCase */,
+              true /** smartCase */);
+          } catch (e) {
+            showConfirm(cm, 'Invalid regex: ' + regexPart);
+            return;
+          }
+        }
+        replacePart = replacePart || vimGlobalState.lastSubstituteReplacePart;
+        if (replacePart === undefined) {
+          showConfirm(cm, 'No previous substitute regular expression');
+          return;
+        }
+        var state = getSearchState(cm);
+        var query = state.getQuery();
+        var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
+        var lineEnd = params.lineEnd || lineStart;
+        if (lineStart == cm.firstLine() && lineEnd == cm.lastLine()) {
+          lineEnd = Infinity;
+        }
+        if (count) {
+          lineStart = lineEnd;
+          lineEnd = lineStart + count - 1;
+        }
+        var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
+        var cursor = cm.getSearchCursor(query, startPos);
+        doReplace(cm, confirm, global, lineStart, lineEnd, cursor, query, replacePart, params.callback);
+      },
+      redo: CodeMirror.commands.redo,
+      undo: CodeMirror.commands.undo,
+      write: function(cm) {
+        if (CodeMirror.commands.save) {
+          // If a save command is defined, call it.
+          CodeMirror.commands.save(cm);
+        } else {
+          // Saves to text area if no save command is defined.
+          cm.save();
+        }
+      },
+      nohlsearch: function(cm) {
+        clearSearchHighlight(cm);
+      },
+      delmarks: function(cm, params) {
+        if (!params.argString || !trim(params.argString)) {
+          showConfirm(cm, 'Argument required');
+          return;
+        }
+
+        var state = cm.state.vim;
+        var stream = new CodeMirror.StringStream(trim(params.argString));
+        while (!stream.eol()) {
+          stream.eatSpace();
+
+          // Record the streams position at the beginning of the loop for use
+          // in error messages.
+          var count = stream.pos;
+
+          if (!stream.match(/[a-zA-Z]/, false)) {
+            showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
+            return;
+          }
+
+          var sym = stream.next();
+          // Check if this symbol is part of a range
+          if (stream.match('-', true)) {
+            // This symbol is part of a range.
+
+            // The range must terminate at an alphabetic character.
+            if (!stream.match(/[a-zA-Z]/, false)) {
+              showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
+              return;
+            }
+
+            var startMark = sym;
+            var finishMark = stream.next();
+            // The range must terminate at an alphabetic character which
+            // shares the same case as the start of the range.
+            if (isLowerCase(startMark) && isLowerCase(finishMark) ||
+                isUpperCase(startMark) && isUpperCase(finishMark)) {
+              var start = startMark.charCodeAt(0);
+              var finish = finishMark.charCodeAt(0);
+              if (start >= finish) {
+                showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
+                return;
+              }
+
+              // Because marks are always ASCII values, and we have
+              // determined that they are the same case, we can use
+              // their char codes to iterate through the defined range.
+              for (var j = 0; j <= finish - start; j++) {
+                var mark = String.fromCharCode(start + j);
+                delete state.marks[mark];
+              }
+            } else {
+              showConfirm(cm, 'Invalid argument: ' + startMark + '-');
+              return;
+            }
+          } else {
+            // This symbol is a valid mark, and is not part of a range.
+            delete state.marks[sym];
+          }
+        }
+      }
+    };
+
+    var exCommandDispatcher = new ExCommandDispatcher();
+
+    /**
+    * @param {CodeMirror} cm CodeMirror instance we are in.
+    * @param {boolean} confirm Whether to confirm each replace.
+    * @param {Cursor} lineStart Line to start replacing from.
+    * @param {Cursor} lineEnd Line to stop replacing at.
+    * @param {RegExp} query Query for performing matches with.
+    * @param {string} replaceWith Text to replace matches with. May contain $1,
+    *     $2, etc for replacing captured groups using Javascript replace.
+    * @param {function()} callback A callback for when the replace is done.
+    */
+    function doReplace(cm, confirm, global, lineStart, lineEnd, searchCursor, query,
+        replaceWith, callback) {
+      // Set up all the functions.
+      cm.state.vim.exMode = true;
+      var done = false;
+      var lastPos = searchCursor.from();
+      function replaceAll() {
+        cm.operation(function() {
+          while (!done) {
+            replace();
+            next();
+          }
+          stop();
+        });
+      }
+      function replace() {
+        var text = cm.getRange(searchCursor.from(), searchCursor.to());
+        var newText = text.replace(query, replaceWith);
+        searchCursor.replace(newText);
+      }
+      function next() {
+        // The below only loops to skip over multiple occurrences on the same
+        // line when 'global' is not true.
+        while(searchCursor.findNext() &&
+              isInRange(searchCursor.from(), lineStart, lineEnd)) {
+          if (!global && lastPos && searchCursor.from().line == lastPos.line) {
+            continue;
+          }
+          cm.scrollIntoView(searchCursor.from(), 30);
+          cm.setSelection(searchCursor.from(), searchCursor.to());
+          lastPos = searchCursor.from();
+          done = false;
+          return;
+        }
+        done = true;
+      }
+      function stop(close) {
+        if (close) { close(); }
+        cm.focus();
+        if (lastPos) {
+          cm.setCursor(lastPos);
+          var vim = cm.state.vim;
+          vim.exMode = false;
+          vim.lastHPos = vim.lastHSPos = lastPos.ch;
+        }
+        if (callback) { callback(); }
+      }
+      function onPromptKeyDown(e, _value, close) {
+        // Swallow all keys.
+        CodeMirror.e_stop(e);
+        var keyName = CodeMirror.keyName(e);
+        switch (keyName) {
+          case 'Y':
+            replace(); next(); break;
+          case 'N':
+            next(); break;
+          case 'A':
+            // replaceAll contains a call to close of its own. We don't want it
+            // to fire too early or multiple times.
+            var savedCallback = callback;
+            callback = undefined;
+            cm.operation(replaceAll);
+            callback = savedCallback;
+            break;
+          case 'L':
+            replace();
+            // fall through and exit.
+          case 'Q':
+          case 'Esc':
+          case 'Ctrl-C':
+          case 'Ctrl-[':
+            stop(close);
+            break;
+        }
+        if (done) { stop(close); }
+        return true;
+      }
+
+      // Actually do replace.
+      next();
+      if (done) {
+        showConfirm(cm, 'No matches for ' + query.source);
+        return;
+      }
+      if (!confirm) {
+        replaceAll();
+        if (callback) { callback(); };
+        return;
+      }
+      showPrompt(cm, {
+        prefix: 'replace with ' + replaceWith + ' (y/n/a/q/l)',
+        onKeyDown: onPromptKeyDown
+      });
+    }
+
+    CodeMirror.keyMap.vim = {
+      attach: attachVimMap,
+      detach: detachVimMap,
+      call: cmKey
+    };
+
+    function exitInsertMode(cm) {
+      var vim = cm.state.vim;
+      var macroModeState = vimGlobalState.macroModeState;
+      var insertModeChangeRegister = vimGlobalState.registerController.getRegister('.');
+      var isPlaying = macroModeState.isPlaying;
+      var lastChange = macroModeState.lastInsertModeChanges;
+      // In case of visual block, the insertModeChanges are not saved as a
+      // single word, so we convert them to a single word
+      // so as to update the ". register as expected in real vim.
+      var text = [];
+      if (!isPlaying) {
+        var selLength = lastChange.inVisualBlock ? vim.lastSelection.visualBlock.height : 1;
+        var changes = lastChange.changes;
+        var text = [];
+        var i = 0;
+        // In case of multiple selections in blockwise visual,
+        // the inserted text, for example: 'foo', is stored as
+        // 'f', 'f', InsertModeKey 'o', 'o', 'o', 'o'. (if you have a block with 2 lines).
+        // We push the contents of the changes array as per the following:
+        // 1. In case of InsertModeKey, just increment by 1.
+        // 2. In case of a character, jump by selLength (2 in the example).
+        while (i < changes.length) {
+          // This loop will convert 'ffoooo' to 'foo'.
+          text.push(changes[i]);
+          if (changes[i] instanceof InsertModeKey) {
+             i++;
+          } else {
+             i+= selLength;
+          }
+        }
+        lastChange.changes = text;
+        cm.off('change', onChange);
+        CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
+      }
+      if (!isPlaying && vim.insertModeRepeat > 1) {
+        // Perform insert mode repeat for commands like 3,a and 3,o.
+        repeatLastEdit(cm, vim, vim.insertModeRepeat - 1,
+            true /** repeatForInsert */);
+        vim.lastEditInputState.repeatOverride = vim.insertModeRepeat;
+      }
+      delete vim.insertModeRepeat;
+      vim.insertMode = false;
+      cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1);
+      cm.setOption('keyMap', 'vim');
+      cm.setOption('disableInput', true);
+      cm.toggleOverwrite(false); // exit replace mode if we were in it.
+      // update the ". register before exiting insert mode
+      insertModeChangeRegister.setText(lastChange.changes.join(''));
+      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      if (macroModeState.isRecording) {
+        logInsertModeChange(macroModeState);
+      }
+    }
+
+    function _mapCommand(command) {
+      defaultKeymap.unshift(command);
+    }
+
+    function mapCommand(keys, type, name, args, extra) {
+      var command = {keys: keys, type: type};
+      command[type] = name;
+      command[type + "Args"] = args;
+      for (var key in extra)
+        command[key] = extra[key];
+      _mapCommand(command);
+    }
+
+    // The timeout in milliseconds for the two-character ESC keymap should be
+    // adjusted according to your typing speed to prevent false positives.
+    defineOption('insertModeEscKeysTimeout', 200, 'number');
+
+    CodeMirror.keyMap['vim-insert'] = {
+      // TODO: override navigation keys so that Esc will cancel automatic
+      // indentation from o, O, i_
+      'Ctrl-N': 'autocomplete',
+      'Ctrl-P': 'autocomplete',
+      'Enter': function(cm) {
+        var fn = CodeMirror.commands.newlineAndIndentContinueComment ||
+            CodeMirror.commands.newlineAndIndent;
+        fn(cm);
+      },
+      fallthrough: ['default'],
+      attach: attachVimMap,
+      detach: detachVimMap,
+      call: cmKey
+    };
+
+    CodeMirror.keyMap['vim-replace'] = {
+      'Backspace': 'goCharLeft',
+      fallthrough: ['vim-insert'],
+      attach: attachVimMap,
+      detach: detachVimMap,
+      call: cmKey
+    };
+
+    function executeMacroRegister(cm, vim, macroModeState, registerName) {
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      if (registerName == ':') {
+        // Read-only register containing last Ex command.
+        if (register.keyBuffer[0]) {
+          exCommandDispatcher.processCommand(cm, register.keyBuffer[0]);
+        }
+        macroModeState.isPlaying = false;
+        return;
+      }
+      var keyBuffer = register.keyBuffer;
+      var imc = 0;
+      macroModeState.isPlaying = true;
+      macroModeState.replaySearchQueries = register.searchQueries.slice(0);
+      for (var i = 0; i < keyBuffer.length; i++) {
+        var text = keyBuffer[i];
+        var match, key;
+        while (text) {
+          // Pull off one command key, which is either a single character
+          // or a special sequence wrapped in '<' and '>', e.g. ''.
+          match = (/<\w+-.+?>|<\w+>|./).exec(text);
+          key = match[0];
+          text = text.substring(match.index + key.length);
+          CodeMirror.Vim.handleKey(cm, key, 'macro');
+          if (vim.insertMode) {
+            var changes = register.insertModeChanges[imc++].changes;
+            vimGlobalState.macroModeState.lastInsertModeChanges.changes =
+                changes;
+            repeatInsertModeChanges(cm, changes, 1);
+            exitInsertMode(cm);
+          }
+        }
+      };
+      macroModeState.isPlaying = false;
+    }
+
+    function logKey(macroModeState, key) {
+      if (macroModeState.isPlaying) { return; }
+      var registerName = macroModeState.latestRegister;
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      if (register) {
+        register.pushText(key);
+      }
+    }
+
+    function logInsertModeChange(macroModeState) {
+      if (macroModeState.isPlaying) { return; }
+      var registerName = macroModeState.latestRegister;
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      if (register && register.pushInsertModeChanges) {
+        register.pushInsertModeChanges(macroModeState.lastInsertModeChanges);
+      }
+    }
+
+    function logSearchQuery(macroModeState, query) {
+      if (macroModeState.isPlaying) { return; }
+      var registerName = macroModeState.latestRegister;
+      var register = vimGlobalState.registerController.getRegister(registerName);
+      if (register && register.pushSearchQuery) {
+        register.pushSearchQuery(query);
+      }
+    }
+
+    /**
+     * Listens for changes made in insert mode.
+     * Should only be active in insert mode.
+     */
+    function onChange(_cm, changeObj) {
+      var macroModeState = vimGlobalState.macroModeState;
+      var lastChange = macroModeState.lastInsertModeChanges;
+      if (!macroModeState.isPlaying) {
+        while(changeObj) {
+          lastChange.expectCursorActivityForChange = true;
+          if (changeObj.origin == '+input' || changeObj.origin == 'paste'
+              || changeObj.origin === undefined /* only in testing */) {
+            var text = changeObj.text.join('\n');
+            lastChange.changes.push(text);
+          }
+          // Change objects may be chained with next.
+          changeObj = changeObj.next;
+        }
+      }
+    }
+
+    /**
+    * Listens for any kind of cursor activity on CodeMirror.
+    */
+    function onCursorActivity(cm) {
+      var vim = cm.state.vim;
+      if (vim.insertMode) {
+        // Tracking cursor activity in insert mode (for macro support).
+        var macroModeState = vimGlobalState.macroModeState;
+        if (macroModeState.isPlaying) { return; }
+        var lastChange = macroModeState.lastInsertModeChanges;
+        if (lastChange.expectCursorActivityForChange) {
+          lastChange.expectCursorActivityForChange = false;
+        } else {
+          // Cursor moved outside the context of an edit. Reset the change.
+          lastChange.changes = [];
+        }
+      } else if (!cm.curOp.isVimOp) {
+        handleExternalSelection(cm, vim);
+      }
+      if (vim.visualMode) {
+        updateFakeCursor(cm);
+      }
+    }
+    function updateFakeCursor(cm) {
+      var vim = cm.state.vim;
+      var from = clipCursorToContent(cm, copyCursor(vim.sel.head));
+      var to = offsetCursor(from, 0, 1);
+      if (vim.fakeCursor) {
+        vim.fakeCursor.clear();
+      }
+      vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
+    }
+    function handleExternalSelection(cm, vim) {
+      var anchor = cm.getCursor('anchor');
+      var head = cm.getCursor('head');
+      // Enter or exit visual mode to match mouse selection.
+      if (vim.visualMode && !cm.somethingSelected()) {
+        exitVisualMode(cm, false);
+      } else if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
+        vim.visualMode = true;
+        vim.visualLine = false;
+        CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
+      }
+      if (vim.visualMode) {
+        // Bind CodeMirror selection model to vim selection model.
+        // Mouse selections are considered visual characterwise.
+        var headOffset = !cursorIsBefore(head, anchor) ? -1 : 0;
+        var anchorOffset = cursorIsBefore(head, anchor) ? -1 : 0;
+        head = offsetCursor(head, 0, headOffset);
+        anchor = offsetCursor(anchor, 0, anchorOffset);
+        vim.sel = {
+          anchor: anchor,
+          head: head
+        };
+        updateMark(cm, vim, '<', cursorMin(head, anchor));
+        updateMark(cm, vim, '>', cursorMax(head, anchor));
+      } else if (!vim.insertMode) {
+        // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
+        vim.lastHPos = cm.getCursor().ch;
+      }
+    }
+
+    /** Wrapper for special keys pressed in insert mode */
+    function InsertModeKey(keyName) {
+      this.keyName = keyName;
+    }
+
+    /**
+    * Handles raw key down events from the text area.
+    * - Should only be active in insert mode.
+    * - For recording deletes in insert mode.
+    */
+    function onKeyEventTargetKeyDown(e) {
+      var macroModeState = vimGlobalState.macroModeState;
+      var lastChange = macroModeState.lastInsertModeChanges;
+      var keyName = CodeMirror.keyName(e);
+      if (!keyName) { return; }
+      function onKeyFound() {
+        lastChange.changes.push(new InsertModeKey(keyName));
+        return true;
+      }
+      if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
+        CodeMirror.lookupKey(keyName, 'vim-insert', onKeyFound);
+      }
+    }
+
+    /**
+     * Repeats the last edit, which includes exactly 1 command and at most 1
+     * insert. Operator and motion commands are read from lastEditInputState,
+     * while action commands are read from lastEditActionCommand.
+     *
+     * If repeatForInsert is true, then the function was called by
+     * exitInsertMode to repeat the insert mode changes the user just made. The
+     * corresponding enterInsertMode call was made with a count.
+     */
+    function repeatLastEdit(cm, vim, repeat, repeatForInsert) {
+      var macroModeState = vimGlobalState.macroModeState;
+      macroModeState.isPlaying = true;
+      var isAction = !!vim.lastEditActionCommand;
+      var cachedInputState = vim.inputState;
+      function repeatCommand() {
+        if (isAction) {
+          commandDispatcher.processAction(cm, vim, vim.lastEditActionCommand);
+        } else {
+          commandDispatcher.evalInput(cm, vim);
+        }
+      }
+      function repeatInsert(repeat) {
+        if (macroModeState.lastInsertModeChanges.changes.length > 0) {
+          // For some reason, repeat cw in desktop VIM does not repeat
+          // insert mode changes. Will conform to that behavior.
+          repeat = !vim.lastEditActionCommand ? 1 : repeat;
+          var changeObject = macroModeState.lastInsertModeChanges;
+          repeatInsertModeChanges(cm, changeObject.changes, repeat);
+        }
+      }
+      vim.inputState = vim.lastEditInputState;
+      if (isAction && vim.lastEditActionCommand.interlaceInsertRepeat) {
+        // o and O repeat have to be interlaced with insert repeats so that the
+        // insertions appear on separate lines instead of the last line.
+        for (var i = 0; i < repeat; i++) {
+          repeatCommand();
+          repeatInsert(1);
+        }
+      } else {
+        if (!repeatForInsert) {
+          // Hack to get the cursor to end up at the right place. If I is
+          // repeated in insert mode repeat, cursor will be 1 insert
+          // change set left of where it should be.
+          repeatCommand();
+        }
+        repeatInsert(repeat);
+      }
+      vim.inputState = cachedInputState;
+      if (vim.insertMode && !repeatForInsert) {
+        // Don't exit insert mode twice. If repeatForInsert is set, then we
+        // were called by an exitInsertMode call lower on the stack.
+        exitInsertMode(cm);
+      }
+      macroModeState.isPlaying = false;
+    };
+
+    function repeatInsertModeChanges(cm, changes, repeat) {
+      function keyHandler(binding) {
+        if (typeof binding == 'string') {
+          CodeMirror.commands[binding](cm);
+        } else {
+          binding(cm);
+        }
+        return true;
+      }
+      var head = cm.getCursor('head');
+      var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock;
+      if (inVisualBlock) {
+        // Set up block selection again for repeating the changes.
+        var vim = cm.state.vim;
+        var lastSel = vim.lastSelection;
+        var offset = getOffset(lastSel.anchor, lastSel.head);
+        selectForInsert(cm, head, offset.line + 1);
+        repeat = cm.listSelections().length;
+        cm.setCursor(head);
+      }
+      for (var i = 0; i < repeat; i++) {
+        if (inVisualBlock) {
+          cm.setCursor(offsetCursor(head, i, 0));
+        }
+        for (var j = 0; j < changes.length; j++) {
+          var change = changes[j];
+          if (change instanceof InsertModeKey) {
+            CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
+          } else {
+            var cur = cm.getCursor();
+            cm.replaceRange(change, cur, cur);
+          }
+        }
+      }
+      if (inVisualBlock) {
+        cm.setCursor(offsetCursor(head, 0, 1));
+      }
+    }
+
+    resetVimGlobalState();
+    return vimApi;
+  };
+  // Initialize Vim and make it available as an API.
+  CodeMirror.Vim = Vim();
+});
diff --git a/www/code/codemirror.css b/www/code/codemirror-5.13.2/lib/codemirror.css
similarity index 97%
rename from www/code/codemirror.css
rename to www/code/codemirror-5.13.2/lib/codemirror.css
index 3543523e6..1cf66a9fa 100644
--- a/www/code/codemirror.css
+++ b/www/code/codemirror-5.13.2/lib/codemirror.css
@@ -165,7 +165,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actuall scrolling happens, thus preventing shaking and
+   before actual scrolling happens, thus preventing shaking and
    flickering artifacts. */
 .CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
   position: absolute;
@@ -191,12 +191,14 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-gutters {
   position: absolute; left: 0; top: 0;
+  min-height: 100%;
   z-index: 3;
 }
 .CodeMirror-gutter {
   white-space: normal;
   height: 100%;
   display: inline-block;
+  vertical-align: top;
   margin-bottom: -30px;
   /* Hack to make IE7 behave */
   *zoom:1;
@@ -244,6 +246,8 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   position: relative;
   overflow: visible;
   -webkit-tap-highlight-color: transparent;
+  -webkit-font-variant-ligatures: none;
+  font-variant-ligatures: none;
 }
 .CodeMirror-wrap pre {
   word-wrap: break-word;
diff --git a/www/code/codemirror.js b/www/code/codemirror-5.13.2/lib/codemirror.js
similarity index 97%
rename from www/code/codemirror.js
rename to www/code/codemirror-5.13.2/lib/codemirror.js
index c6f9af859..ec49e3a33 100644
--- a/www/code/codemirror.js
+++ b/www/code/codemirror-5.13.2/lib/codemirror.js
@@ -13,7 +13,7 @@
   else if (typeof define == "function" && define.amd) // AMD
     return define([], mod);
   else // Plain browser env
-    this.CodeMirror = mod();
+    (this || window).CodeMirror = mod();
 })(function() {
   "use strict";
 
@@ -21,27 +21,29 @@
 
   // Kludges for bugs and behavior differences that can't be feature
   // detected are enabled based on userAgent etc sniffing.
+  var userAgent = navigator.userAgent;
+  var platform = navigator.platform;
 
-  var gecko = /gecko\/\d/i.test(navigator.userAgent);
-  var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
-  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent);
+  var gecko = /gecko\/\d/i.test(userAgent);
+  var ie_upto10 = /MSIE \d/.test(userAgent);
+  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
   var ie = ie_upto10 || ie_11up;
   var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
-  var webkit = /WebKit\//.test(navigator.userAgent);
-  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
-  var chrome = /Chrome\//.test(navigator.userAgent);
-  var presto = /Opera\//.test(navigator.userAgent);
+  var webkit = /WebKit\//.test(userAgent);
+  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);
+  var chrome = /Chrome\//.test(userAgent);
+  var presto = /Opera\//.test(userAgent);
   var safari = /Apple Computer/.test(navigator.vendor);
-  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
-  var phantom = /PhantomJS/.test(navigator.userAgent);
+  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);
+  var phantom = /PhantomJS/.test(userAgent);
 
-  var ios = /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent);
+  var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
   // This is woefully incomplete. Suggestions for alternative methods welcome.
-  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent);
-  var mac = ios || /Mac/.test(navigator.platform);
-  var windows = /win/i.test(navigator.platform);
+  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
+  var mac = ios || /Mac/.test(platform);
+  var windows = /win/i.test(platform);
 
-  var presto_version = presto && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
+  var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
   if (presto_version) presto_version = Number(presto_version[1]);
   if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
   // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
@@ -408,7 +410,7 @@
       if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
     });
 
-    this.checkedOverlay = false;
+    this.checkedZeroWidth = false;
     // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
     if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
   }
@@ -443,29 +445,43 @@
         this.horiz.firstChild.style.width = "0";
       }
 
-      if (!this.checkedOverlay && measure.clientHeight > 0) {
-        if (sWidth == 0) this.overlayHack();
-        this.checkedOverlay = true;
+      if (!this.checkedZeroWidth && measure.clientHeight > 0) {
+        if (sWidth == 0) this.zeroWidthHack();
+        this.checkedZeroWidth = true;
       }
 
       return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
     },
     setScrollLeft: function(pos) {
       if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
+      if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz);
     },
     setScrollTop: function(pos) {
       if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
+      if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert);
     },
-    overlayHack: function() {
+    zeroWidthHack: function() {
       var w = mac && !mac_geMountainLion ? "12px" : "18px";
-      this.horiz.style.minHeight = this.vert.style.minWidth = w;
-      var self = this;
-      var barMouseDown = function(e) {
-        if (e_target(e) != self.vert && e_target(e) != self.horiz)
-          operation(self.cm, onMouseDown)(e);
-      };
-      on(this.vert, "mousedown", barMouseDown);
-      on(this.horiz, "mousedown", barMouseDown);
+      this.horiz.style.height = this.vert.style.width = w;
+      this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none";
+      this.disableHoriz = new Delayed;
+      this.disableVert = new Delayed;
+    },
+    enableZeroWidthBar: function(bar, delay) {
+      bar.style.pointerEvents = "auto";
+      function maybeDisable() {
+        // To find out whether the scrollbar is still visible, we
+        // check whether the element under the pixel in the bottom
+        // left corner of the scrollbar box is the scrollbar box
+        // itself (when the bar is still visible) or its filler child
+        // (when the bar is hidden). If it is still visible, we keep
+        // it enabled, if it's hidden, we disable pointer events.
+        var box = bar.getBoundingClientRect();
+        var elt = document.elementFromPoint(box.left + 1, box.bottom - 1);
+        if (elt != bar) bar.style.pointerEvents = "none";
+        else delay.set(1000, maybeDisable);
+      }
+      delay.set(1000, maybeDisable);
     },
     clear: function() {
       var parent = this.horiz.parentNode;
@@ -527,6 +543,7 @@
 
     d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
     d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
+    d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"
 
     if (sizes.right && sizes.bottom) {
       d.scrollbarFiller.style.display = "block";
@@ -730,6 +747,7 @@
 
   function postUpdateDisplay(cm, update) {
     var viewport = update.viewport;
+
     for (var first = true;; first = false) {
       if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
         // Clip forced viewport to actual scrollable area.
@@ -745,8 +763,8 @@
       updateHeightsInViewport(cm);
       var barMeasure = measureForScrollbars(cm);
       updateSelection(cm);
-      setDocumentHeight(cm, barMeasure);
       updateScrollbars(cm, barMeasure);
+      setDocumentHeight(cm, barMeasure);
     }
 
     update.signal(cm, "update", cm);
@@ -763,17 +781,16 @@
       postUpdateDisplay(cm, update);
       var barMeasure = measureForScrollbars(cm);
       updateSelection(cm);
-      setDocumentHeight(cm, barMeasure);
       updateScrollbars(cm, barMeasure);
+      setDocumentHeight(cm, barMeasure);
       update.finish();
     }
   }
 
   function setDocumentHeight(cm, measure) {
     cm.display.sizer.style.minHeight = measure.docHeight + "px";
-    var total = measure.docHeight + cm.display.barHeight;
-    cm.display.heightForcer.style.top = total + "px";
-    cm.display.gutters.style.height = Math.max(total + scrollGap(cm), measure.clientHeight) + "px";
+    cm.display.heightForcer.style.top = measure.docHeight + "px";
+    cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";
   }
 
   // Read the actual heights of the rendered lines, and update their
@@ -807,7 +824,7 @@
   // given line.
   function updateWidgetHeight(line) {
     if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
-      line.widgets[i].height = line.widgets[i].node.offsetHeight;
+      line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight;
   }
 
   // Do a bulk-read of the DOM positions and sizes needed to draw the
@@ -1078,10 +1095,6 @@
     if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
   }
 
-  function isReadOnly(cm) {
-    return cm.options.readOnly || cm.doc.cantEdit;
-  }
-
   // This will be set to an array of strings when copying, so that,
   // when pasting, we know what kind of selections the copied text
   // was made out of.
@@ -1136,7 +1149,7 @@
     var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
     if (pasted) {
       e.preventDefault();
-      if (!isReadOnly(cm) && !cm.options.disableInput)
+      if (!cm.isReadOnly() && !cm.options.disableInput)
         runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
       return true;
     }
@@ -1239,13 +1252,14 @@
       });
 
       on(te, "paste", function(e) {
-        if (handlePaste(e, cm)) return true;
+        if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
 
         cm.state.pasteIncoming = true;
         input.fastPoll();
       });
 
       function prepareCopyCut(e) {
+        if (signalDOMEvent(cm, e)) return
         if (cm.somethingSelected()) {
           lastCopied = cm.getSelections();
           if (input.inaccurateSelection) {
@@ -1273,7 +1287,7 @@
       on(te, "copy", prepareCopyCut);
 
       on(display.scroller, "paste", function(e) {
-        if (eventInWidget(display, e)) return;
+        if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return;
         cm.state.pasteIncoming = true;
         input.focus();
       });
@@ -1407,7 +1421,7 @@
       // in which case reading its value would be expensive.
       if (this.contextMenuPending || !cm.state.focused ||
           (hasSelection(input) && !prevInput && !this.composing) ||
-          isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
+          cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
         return false;
 
       var text = input.value;
@@ -1469,10 +1483,11 @@
       if (reset && cm.doc.sel.contains(pos) == -1)
         operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
 
-      var oldCSS = te.style.cssText;
-      input.wrapper.style.position = "absolute";
-      te.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
-        "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
+      var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;
+      input.wrapper.style.cssText = "position: absolute"
+      var wrapperBox = input.wrapper.getBoundingClientRect()
+      te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) +
+        "px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " +
         (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
         "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
       if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
@@ -1503,7 +1518,7 @@
       }
       function rehide() {
         input.contextMenuPending = false;
-        input.wrapper.style.position = "relative";
+        input.wrapper.style.cssText = oldWrapperCSS
         te.style.cssText = oldCSS;
         if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
 
@@ -1558,7 +1573,9 @@
       var div = input.div = display.lineDiv;
       disableBrowserMagic(div);
 
-      on(div, "paste", function(e) { handlePaste(e, cm); })
+      on(div, "paste", function(e) {
+        if (!signalDOMEvent(cm, e)) handlePaste(e, cm);
+      })
 
       on(div, "compositionstart", function(e) {
         var data = e.data;
@@ -1596,11 +1613,12 @@
 
       on(div, "input", function() {
         if (input.composing) return;
-        if (isReadOnly(cm) || !input.pollContent())
+        if (cm.isReadOnly() || !input.pollContent())
           runInOp(input.cm, function() {regChange(cm);});
       });
 
       function onCopyCut(e) {
+        if (signalDOMEvent(cm, e)) return
         if (cm.somethingSelected()) {
           lastCopied = cm.getSelections();
           if (e.type == "cut") cm.replaceSelection("", null, "cut");
@@ -1676,8 +1694,13 @@
       try { var rng = range(start.node, start.offset, end.offset, end.node); }
       catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
       if (rng) {
-        sel.removeAllRanges();
-        sel.addRange(rng);
+        if (!gecko && this.cm.state.focused) {
+          sel.collapse(start.node, start.offset);
+          if (!rng.collapsed) sel.addRange(rng);
+        } else {
+          sel.removeAllRanges();
+          sel.addRange(rng);
+        }
         if (old && sel.anchorNode == null) sel.addRange(old);
         else if (gecko) this.startGracePeriod();
       }
@@ -1821,7 +1844,7 @@
       this.div.focus();
     },
     applyComposition: function(composing) {
-      if (isReadOnly(this.cm))
+      if (this.cm.isReadOnly())
         operation(this.cm, regChange)(this.cm)
       else if (composing.data && composing.data != composing.startData)
         operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
@@ -1833,7 +1856,7 @@
 
     onKeyPress: function(e) {
       e.preventDefault();
-      if (!isReadOnly(this.cm))
+      if (!this.cm.isReadOnly())
         operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
     },
 
@@ -2138,7 +2161,7 @@
 
   // Give beforeSelectionChange handlers a change to influence a
   // selection update.
-  function filterSelectionChange(doc, sel) {
+  function filterSelectionChange(doc, sel, options) {
     var obj = {
       ranges: sel.ranges,
       update: function(ranges) {
@@ -2146,7 +2169,8 @@
         for (var i = 0; i < ranges.length; i++)
           this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
                                      clipPos(doc, ranges[i].head));
-      }
+      },
+      origin: options && options.origin
     };
     signal(doc, "beforeSelectionChange", doc, obj);
     if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
@@ -2172,7 +2196,7 @@
 
   function setSelectionNoUndo(doc, sel, options) {
     if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
-      sel = filterSelectionChange(doc, sel);
+      sel = filterSelectionChange(doc, sel, options);
 
     var bias = options && options.bias ||
       (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
@@ -2206,8 +2230,9 @@
     var out;
     for (var i = 0; i < sel.ranges.length; i++) {
       var range = sel.ranges[i];
-      var newAnchor = skipAtomic(doc, range.anchor, bias, mayClear);
-      var newHead = skipAtomic(doc, range.head, bias, mayClear);
+      var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];
+      var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);
+      var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear);
       if (out || newAnchor != range.anchor || newHead != range.head) {
         if (!out) out = sel.ranges.slice(0, i);
         out[i] = new Range(newAnchor, newHead);
@@ -2216,54 +2241,61 @@
     return out ? normalizeSelection(out, sel.primIndex) : sel;
   }
 
-  // Ensure a given position is not inside an atomic range.
-  function skipAtomic(doc, pos, bias, mayClear) {
-    var flipped = false, curPos = pos;
-    var dir = bias || 1;
-    doc.cantEdit = false;
-    search: for (;;) {
-      var line = getLine(doc, curPos.line);
-      if (line.markedSpans) {
-        for (var i = 0; i < line.markedSpans.length; ++i) {
-          var sp = line.markedSpans[i], m = sp.marker;
-          if ((sp.from == null || (m.inclusiveLeft ? sp.from <= curPos.ch : sp.from < curPos.ch)) &&
-              (sp.to == null || (m.inclusiveRight ? sp.to >= curPos.ch : sp.to > curPos.ch))) {
-            if (mayClear) {
-              signal(m, "beforeCursorEnter");
-              if (m.explicitlyCleared) {
-                if (!line.markedSpans) break;
-                else {--i; continue;}
-              }
-            }
-            if (!m.atomic) continue;
-            var newPos = m.find(dir < 0 ? -1 : 1);
-            if (cmp(newPos, curPos) == 0) {
-              newPos.ch += dir;
-              if (newPos.ch < 0) {
-                if (newPos.line > doc.first) newPos = clipPos(doc, Pos(newPos.line - 1));
-                else newPos = null;
-              } else if (newPos.ch > line.text.length) {
-                if (newPos.line < doc.first + doc.size - 1) newPos = Pos(newPos.line + 1, 0);
-                else newPos = null;
-              }
-              if (!newPos) {
-                if (flipped) {
-                  // Driven in a corner -- no valid cursor position found at all
-                  // -- try again *with* clearing, if we didn't already
-                  if (!mayClear) return skipAtomic(doc, pos, bias, true);
-                  // Otherwise, turn off editing until further notice, and return the start of the doc
-                  doc.cantEdit = true;
-                  return Pos(doc.first, 0);
-                }
-                flipped = true; newPos = pos; dir = -dir;
-              }
-            }
-            curPos = newPos;
-            continue search;
+  function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
+    var line = getLine(doc, pos.line);
+    if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
+      var sp = line.markedSpans[i], m = sp.marker;
+      if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+          (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+        if (mayClear) {
+          signal(m, "beforeCursorEnter");
+          if (m.explicitlyCleared) {
+            if (!line.markedSpans) break;
+            else {--i; continue;}
           }
         }
+        if (!m.atomic) continue;
+
+        if (oldPos) {
+          var near = m.find(dir < 0 ? 1 : -1), diff;
+          if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
+            near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null);
+          if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
+            return skipAtomicInner(doc, near, pos, dir, mayClear);
+        }
+
+        var far = m.find(dir < 0 ? -1 : 1);
+        if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
+          far = movePos(doc, far, dir, far.line == pos.line ? line : null);
+        return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null;
       }
-      return curPos;
+    }
+    return pos;
+  }
+
+  // Ensure a given position is not inside an atomic range.
+  function skipAtomic(doc, pos, oldPos, bias, mayClear) {
+    var dir = bias || 1;
+    var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
+        skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true));
+    if (!found) {
+      doc.cantEdit = true;
+      return Pos(doc.first, 0);
+    }
+    return found;
+  }
+
+  function movePos(doc, pos, dir, line) {
+    if (dir < 0 && pos.ch == 0) {
+      if (pos.line > doc.first) return clipPos(doc, Pos(pos.line - 1));
+      else return null;
+    } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
+      if (pos.line < doc.first + doc.size - 1) return Pos(pos.line + 1, 0);
+      else return null;
+    } else {
+      return new Pos(pos.line, pos.ch + dir);
     }
   }
 
@@ -2281,6 +2313,7 @@
     for (var i = 0; i < doc.sel.ranges.length; i++) {
       if (primary === false && i == doc.sel.primIndex) continue;
       var range = doc.sel.ranges[i];
+      if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue;
       var collapsed = range.empty();
       if (collapsed || cm.options.showCursorWhenSelecting)
         drawSelectionCursor(cm, range.head, curFragment);
@@ -3082,16 +3115,17 @@
 
     if (op.preparedSelection)
       cm.display.input.showSelection(op.preparedSelection);
-    if (op.updatedDisplay)
-      setDocumentHeight(cm, op.barMeasure);
     if (op.updatedDisplay || op.startHeight != cm.doc.height)
       updateScrollbars(cm, op.barMeasure);
+    if (op.updatedDisplay)
+      setDocumentHeight(cm, op.barMeasure);
 
     if (op.selectionChanged) restartBlink(cm);
 
     if (cm.state.focused && op.updateInput)
       cm.display.input.reset(op.typing);
-    if (op.focus && op.focus == activeElt()) ensureFocus(op.cm);
+    if (op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus()))
+      ensureFocus(op.cm);
   }
 
   function endOperation_finish(op) {
@@ -3110,7 +3144,7 @@
       display.scroller.scrollTop = doc.scrollTop;
     }
     if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
-      doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - displayWidth(cm), op.scrollLeft));
+      doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
       display.scrollbars.setScrollLeft(doc.scrollLeft);
       display.scroller.scrollLeft = doc.scrollLeft;
       alignHorizontally(cm);
@@ -3406,7 +3440,7 @@
       return dx * dx + dy * dy > 20 * 20;
     }
     on(d.scroller, "touchstart", function(e) {
-      if (!isMouseLikeTouchEvent(e)) {
+      if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
         clearTimeout(touchFinished);
         var now = +new Date;
         d.activeTouch = {start: now, moved: false,
@@ -3461,7 +3495,7 @@
       over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
       start: function(e){onDragStart(cm, e);},
       drop: operation(cm, onDrop),
-      leave: function() {clearDragCursor(cm);}
+      leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }}
     };
 
     var inp = d.input.getField();
@@ -3535,7 +3569,7 @@
   // not interfere with, such as a scrollbar or widget.
   function onMouseDown(e) {
     var cm = this, display = cm.display;
-    if (display.activeTouch && display.input.supportsTouch() || signalDOMEvent(cm, e)) return;
+    if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return;
     display.shift = e.shiftKey;
 
     if (eventInWidget(display, e)) {
@@ -3591,7 +3625,7 @@
     }
 
     var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
-    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
+    if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
         type == "single" && (contained = sel.contains(start)) > -1 &&
         (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
         (cmp(contained.to(), start) > 0 || start.xRel < 0))
@@ -3776,7 +3810,7 @@
 
   // Determines whether an event happened in the gutter, and fires the
   // handlers for the corresponding event.
-  function gutterEvent(cm, e, type, prevent, signalfn) {
+  function gutterEvent(cm, e, type, prevent) {
     try { var mX = e.clientX, mY = e.clientY; }
     catch(e) { return false; }
     if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false;
@@ -3793,14 +3827,14 @@
       if (g && g.getBoundingClientRect().right >= mX) {
         var line = lineAtHeight(cm.doc, mY);
         var gutter = cm.options.gutters[i];
-        signalfn(cm, type, cm, line, gutter, e);
+        signal(cm, type, cm, line, gutter, e);
         return e_defaultPrevented(e);
       }
     }
   }
 
   function clickInGutter(cm, e) {
-    return gutterEvent(cm, e, "gutterClick", true, signalLater);
+    return gutterEvent(cm, e, "gutterClick", true);
   }
 
   // Kludge to work around strange IE behavior where it'll sometimes
@@ -3815,15 +3849,21 @@
     e_preventDefault(e);
     if (ie) lastDrop = +new Date;
     var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
-    if (!pos || isReadOnly(cm)) return;
+    if (!pos || cm.isReadOnly()) return;
     // Might be a file drop, in which case we simply extract the text
     // and insert it.
     if (files && files.length && window.FileReader && window.File) {
       var n = files.length, text = Array(n), read = 0;
       var loadFile = function(file, i) {
+        if (cm.options.allowDropFileTypes &&
+            indexOf(cm.options.allowDropFileTypes, file.type) == -1)
+          return;
+
         var reader = new FileReader;
         reader.onload = operation(cm, function() {
-          text[i] = reader.result;
+          var content = reader.result;
+          if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = "";
+          text[i] = content;
           if (++read == n) {
             pos = clipPos(cm.doc, pos);
             var change = {from: pos, to: pos,
@@ -3965,8 +4005,9 @@
 
     var display = cm.display, scroll = display.scroller;
     // Quit if there's nothing to scroll here
-    if (!(dx && scroll.scrollWidth > scroll.clientWidth ||
-          dy && scroll.scrollHeight > scroll.clientHeight)) return;
+    var canScrollX = scroll.scrollWidth > scroll.clientWidth;
+    var canScrollY = scroll.scrollHeight > scroll.clientHeight;
+    if (!(dx && canScrollX || dy && canScrollY)) return;
 
     // Webkit browsers on OS X abort momentum scrolls when the target
     // of the scroll event is removed from the scrollable element.
@@ -3990,10 +4031,15 @@
     // scrolling entirely here. It'll be slightly off from native, but
     // better than glitching out.
     if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
-      if (dy)
+      if (dy && canScrollY)
         setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
       setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
-      e_preventDefault(e);
+      // Only prevent default scrolling if vertical scrolling is
+      // actually possible. Otherwise, it causes vertical scroll
+      // jitter on OSX trackpads when deltaX is small and deltaY
+      // is large (issue #3579)
+      if (!dy || (dy && canScrollY))
+        e_preventDefault(e);
       display.wheelStartX = null; // Abort measurement, if in progress
       return;
     }
@@ -4042,7 +4088,7 @@
     cm.display.input.ensurePolled();
     var prevShift = cm.display.shift, done = false;
     try {
-      if (isReadOnly(cm)) cm.state.suppressEdits = true;
+      if (cm.isReadOnly()) cm.state.suppressEdits = true;
       if (dropShift) cm.display.shift = false;
       done = bound(cm) != Pass;
     } finally {
@@ -4221,12 +4267,13 @@
   // right-click take effect on it.
   function onContextMenu(cm, e) {
     if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
+    if (signalDOMEvent(cm, e, "contextmenu")) return;
     cm.display.input.onContextMenu(e);
   }
 
   function contextMenuInGutter(cm, e) {
     if (!hasHandler(cm, "gutterContextMenu")) return false;
-    return gutterEvent(cm, e, "gutterContextMenu", false, signal);
+    return gutterEvent(cm, e, "gutterContextMenu", false);
   }
 
   // UPDATING
@@ -4774,10 +4821,9 @@
   function findPosH(doc, pos, dir, unit, visually) {
     var line = pos.line, ch = pos.ch, origDir = dir;
     var lineObj = getLine(doc, line);
-    var possible = true;
     function findNextLine() {
       var l = line + dir;
-      if (l < doc.first || l >= doc.first + doc.size) return (possible = false);
+      if (l < doc.first || l >= doc.first + doc.size) return false
       line = l;
       return lineObj = getLine(doc, l);
     }
@@ -4787,14 +4833,16 @@
         if (!boundToLine && findNextLine()) {
           if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
           else ch = dir < 0 ? lineObj.text.length : 0;
-        } else return (possible = false);
+        } else return false
       } else ch = next;
       return true;
     }
 
-    if (unit == "char") moveOnce();
-    else if (unit == "column") moveOnce(true);
-    else if (unit == "word" || unit == "group") {
+    if (unit == "char") {
+      moveOnce()
+    } else if (unit == "column") {
+      moveOnce(true)
+    } else if (unit == "word" || unit == "group") {
       var sawType = null, group = unit == "group";
       var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
       for (var first = true;; first = false) {
@@ -4814,8 +4862,8 @@
         if (dir > 0 && !moveOnce(!first)) break;
       }
     }
-    var result = skipAtomic(doc, Pos(line, ch), origDir, true);
-    if (!possible) result.hitSide = true;
+    var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true);
+    if (!cmp(pos, result)) result.hitSide = true;
     return result;
   }
 
@@ -5202,6 +5250,7 @@
       signal(this, "overwriteToggle", this, this.state.overwrite);
     },
     hasFocus: function() { return this.display.input.getField() == activeElt(); },
+    isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit); },
 
     scrollTo: methodOp(function(x, y) {
       if (x != null || y != null) resolveScrollToPos(this);
@@ -5404,6 +5453,7 @@
   });
   option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
   option("dragDrop", true, dragDropChanged);
+  option("allowDropFileTypes", null);
 
   option("cursorBlinkRate", 530);
   option("cursorScrollMargin", 0);
@@ -5708,8 +5758,8 @@
           var range = cm.listSelections()[i];
           cm.replaceRange(cm.doc.lineSeparator(), range.anchor, range.head, "+input");
           cm.indentLine(range.from().line + 1, null, true);
-          ensureCursorVisible(cm);
         }
+        ensureCursorVisible(cm);
       });
     },
     toggleOverwrite: function(cm) {cm.toggleOverwrite();}
@@ -6637,7 +6687,7 @@
         parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
       removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
     }
-    return widget.height = widget.node.offsetHeight;
+    return widget.height = widget.node.parentNode.offsetHeight;
   }
 
   function addLineWidget(doc, handle, node, options) {
@@ -7047,7 +7097,7 @@
       if (nextChange == pos) { // Update current marker set
         spanStyle = spanEndStyle = spanStartStyle = title = css = "";
         collapsed = null; nextChange = Infinity;
-        var foundBookmarks = [];
+        var foundBookmarks = [], endStyles
         for (var j = 0; j < spans.length; ++j) {
           var sp = spans[j], m = sp.marker;
           if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
@@ -7058,9 +7108,9 @@
               spanEndStyle = "";
             }
             if (m.className) spanStyle += " " + m.className;
-            if (m.css) css = m.css;
+            if (m.css) css = (css ? css + ";" : "") + m.css;
             if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
-            if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
+            if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to)
             if (m.title && !title) title = m.title;
             if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
               collapsed = sp;
@@ -7068,14 +7118,17 @@
             nextChange = sp.from;
           }
         }
+        if (endStyles) for (var j = 0; j < endStyles.length; j += 2)
+          if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j]
+
+        if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j)
+          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
         if (collapsed && (collapsed.from || 0) == pos) {
           buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
                              collapsed.marker, collapsed.from == null);
           if (collapsed.to == null) return;
           if (collapsed.to == pos) collapsed = false;
         }
-        if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)
-          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
       }
       if (pos >= len) break;
 
@@ -7327,6 +7380,7 @@
     this.id = ++nextDocId;
     this.modeOption = mode;
     this.lineSep = lineSep;
+    this.extend = false;
 
     if (typeof text == "string") text = this.splitLines(text);
     updateDoc(this, {from: start, to: start, text: text});
@@ -7414,10 +7468,11 @@
       extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
     }),
     extendSelections: docMethodOp(function(heads, options) {
-      extendSelections(this, clipPosArray(this, heads, options));
+      extendSelections(this, clipPosArray(this, heads), options);
     }),
     extendSelectionsBy: docMethodOp(function(f, options) {
-      extendSelections(this, map(this.sel.ranges, f), options);
+      var heads = map(this.sel.ranges, f);
+      extendSelections(this, clipPosArray(this, heads), options);
     }),
     setSelections: docMethodOp(function(ranges, primary, options) {
       if (!ranges.length) return;
@@ -7542,7 +7597,7 @@
     removeLineWidget: function(widget) { widget.clear(); },
 
     markText: function(from, to, options) {
-      return markText(this, clipPos(this, from), clipPos(this, to), options, "range");
+      return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range");
     },
     setBookmark: function(pos, options) {
       var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
@@ -7570,9 +7625,9 @@
         var spans = line.markedSpans;
         if (spans) for (var i = 0; i < spans.length; i++) {
           var span = spans[i];
-          if (!(lineNo == from.line && from.ch > span.to ||
-                span.from == null && lineNo != from.line||
-                lineNo == to.line && span.from > to.ch) &&
+          if (!(span.to != null && lineNo == from.line && from.ch > span.to ||
+                span.from == null && lineNo != from.line ||
+                span.from != null && lineNo == to.line && span.from > to.ch) &&
               (!filter || filter(span.marker)))
             found.push(span.marker.parent || span.marker);
         }
@@ -8103,24 +8158,30 @@
     }
   };
 
+  var noHandlers = []
+  function getHandlers(emitter, type, copy) {
+    var arr = emitter._handlers && emitter._handlers[type]
+    if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers
+    else return arr || noHandlers
+  }
+
   var off = CodeMirror.off = function(emitter, type, f) {
     if (emitter.removeEventListener)
       emitter.removeEventListener(type, f, false);
     else if (emitter.detachEvent)
       emitter.detachEvent("on" + type, f);
     else {
-      var arr = emitter._handlers && emitter._handlers[type];
-      if (!arr) return;
-      for (var i = 0; i < arr.length; ++i)
-        if (arr[i] == f) { arr.splice(i, 1); break; }
+      var handlers = getHandlers(emitter, type, false)
+      for (var i = 0; i < handlers.length; ++i)
+        if (handlers[i] == f) { handlers.splice(i, 1); break; }
     }
   };
 
   var signal = CodeMirror.signal = function(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
+    var handlers = getHandlers(emitter, type, true)
+    if (!handlers.length) return;
     var args = Array.prototype.slice.call(arguments, 2);
-    for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args);
+    for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args);
   };
 
   var orphanDelayedCallbacks = null;
@@ -8133,8 +8194,8 @@
   // them to be executed when the last operation ends, or, if no
   // operation is active, when a timeout fires.
   function signalLater(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
+    var arr = getHandlers(emitter, type, false)
+    if (!arr.length) return;
     var args = Array.prototype.slice.call(arguments, 2), list;
     if (operationGroup) {
       list = operationGroup.delayedCallbacks;
@@ -8174,8 +8235,7 @@
   }
 
   function hasHandler(emitter, type) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    return arr && arr.length > 0;
+    return getHandlers(emitter, type).length > 0
   }
 
   // Add on and off methods to a constructor's prototype, to make
@@ -8829,7 +8889,7 @@
 
   // THE END
 
-  CodeMirror.version = "5.7.0";
+  CodeMirror.version = "5.13.2";
 
   return CodeMirror;
 });
diff --git a/www/code/mode/apl/apl.js b/www/code/codemirror-5.13.2/mode/apl/apl.js
similarity index 100%
rename from www/code/mode/apl/apl.js
rename to www/code/codemirror-5.13.2/mode/apl/apl.js
diff --git a/www/code/mode/apl/index.html b/www/code/codemirror-5.13.2/mode/apl/index.html
similarity index 100%
rename from www/code/mode/apl/index.html
rename to www/code/codemirror-5.13.2/mode/apl/index.html
diff --git a/www/code/mode/asciiarmor/asciiarmor.js b/www/code/codemirror-5.13.2/mode/asciiarmor/asciiarmor.js
similarity index 100%
rename from www/code/mode/asciiarmor/asciiarmor.js
rename to www/code/codemirror-5.13.2/mode/asciiarmor/asciiarmor.js
diff --git a/www/code/mode/asciiarmor/index.html b/www/code/codemirror-5.13.2/mode/asciiarmor/index.html
similarity index 100%
rename from www/code/mode/asciiarmor/index.html
rename to www/code/codemirror-5.13.2/mode/asciiarmor/index.html
diff --git a/www/code/mode/asn.1/asn.1.js b/www/code/codemirror-5.13.2/mode/asn.1/asn.1.js
similarity index 100%
rename from www/code/mode/asn.1/asn.1.js
rename to www/code/codemirror-5.13.2/mode/asn.1/asn.1.js
diff --git a/www/code/mode/asn.1/index.html b/www/code/codemirror-5.13.2/mode/asn.1/index.html
similarity index 98%
rename from www/code/mode/asn.1/index.html
rename to www/code/codemirror-5.13.2/mode/asn.1/index.html
index 8346f8e50..699fd4473 100644
--- a/www/code/mode/asn.1/index.html
+++ b/www/code/codemirror-5.13.2/mode/asn.1/index.html
@@ -1,4 +1,4 @@
-
+
 
 CodeMirror: ASN.1 mode
 
@@ -73,6 +73,5 @@
     
The development of this mode has been sponsored by Ericsson
     .

     
Coded by Asmelash Tsegay Gebretsadkan 

-    
 
 
diff --git a/www/code/mode/asterisk/asterisk.js b/www/code/codemirror-5.13.2/mode/asterisk/asterisk.js
similarity index 100%
rename from www/code/mode/asterisk/asterisk.js
rename to www/code/codemirror-5.13.2/mode/asterisk/asterisk.js
diff --git a/www/code/mode/asterisk/index.html b/www/code/codemirror-5.13.2/mode/asterisk/index.html
similarity index 100%
rename from www/code/mode/asterisk/index.html
rename to www/code/codemirror-5.13.2/mode/asterisk/index.html
diff --git a/www/code/mode/brainfuck/brainfuck.js b/www/code/codemirror-5.13.2/mode/brainfuck/brainfuck.js
similarity index 100%
rename from www/code/mode/brainfuck/brainfuck.js
rename to www/code/codemirror-5.13.2/mode/brainfuck/brainfuck.js
diff --git a/www/code/mode/brainfuck/index.html b/www/code/codemirror-5.13.2/mode/brainfuck/index.html
similarity index 100%
rename from www/code/mode/brainfuck/index.html
rename to www/code/codemirror-5.13.2/mode/brainfuck/index.html
diff --git a/www/code/mode/clike/clike.js b/www/code/codemirror-5.13.2/mode/clike/clike.js
similarity index 70%
rename from www/code/mode/clike/clike.js
rename to www/code/codemirror-5.13.2/mode/clike/clike.js
index 50f1ea734..34d3a5afd 100644
--- a/www/code/mode/clike/clike.js
+++ b/www/code/codemirror-5.13.2/mode/clike/clike.js
@@ -11,6 +11,42 @@
 })(function(CodeMirror) {
 "use strict";
 
+function Context(indented, column, type, align, prev) {
+  this.indented = indented;
+  this.column = column;
+  this.type = type;
+  this.align = align;
+  this.prev = prev;
+}
+function isStatement(type) {
+  return type == "statement" || type == "switchstatement" || type == "namespace";
+}
+function pushContext(state, col, type) {
+  var indent = state.indented;
+  if (state.context && isStatement(state.context.type) && !isStatement(type))
+    indent = state.context.indented;
+  return state.context = new Context(indent, col, type, null, state.context);
+}
+function popContext(state) {
+  var t = state.context.type;
+  if (t == ")" || t == "]" || t == "}")
+    state.indented = state.context.indented;
+  return state.context = state.context.prev;
+}
+
+function typeBefore(stream, state) {
+  if (state.prevToken == "variable" || state.prevToken == "variable-3") return true;
+  if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, stream.start))) return true;
+}
+
+function isTopScope(context) {
+  for (;;) {
+    if (!context || context.type == "top") return true;
+    if (context.type == "}" && context.prev.type != "namespace") return false;
+    context = context.prev;
+  }
+}
+
 CodeMirror.defineMode("clike", function(config, parserConfig) {
   var indentUnit = config.indentUnit,
       statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
@@ -25,8 +61,12 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       multiLineStrings = parserConfig.multiLineStrings,
       indentStatements = parserConfig.indentStatements !== false,
       indentSwitch = parserConfig.indentSwitch !== false,
-      namespaceSeparator = parserConfig.namespaceSeparator;
-  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
+      namespaceSeparator = parserConfig.namespaceSeparator,
+      isPunctuationChar = parserConfig.isPunctuationChar || /[\[\]{}\(\),;\:\.]/,
+      numberStart = parserConfig.numberStart || /[\d\.]/,
+      number = parserConfig.number || /^(?:0x[a-f\d]+|0b[01]+|(?:\d+\.?\d*|\.\d+)(?:e[-+]?\d+)?)(u|ll?|l|f)?/i,
+      isOperatorChar = parserConfig.isOperatorChar || /[+\-*&%=<>!?|\/]/,
+      endStatement = parserConfig.endStatement || /^[;:,]$/;
 
   var curPunc, isDefKeyword;
 
@@ -40,13 +80,14 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       state.tokenize = tokenString(ch);
       return state.tokenize(stream, state);
     }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
+    if (isPunctuationChar.test(ch)) {
       curPunc = ch;
       return null;
     }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
+    if (numberStart.test(ch)) {
+      stream.backUp(1)
+      if (stream.match(number)) return "number"
+      stream.next()
     }
     if (ch == "/") {
       if (stream.eat("*")) {
@@ -59,7 +100,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       }
     }
     if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
+      while (!stream.match(/^\/[\/*]/, false) && stream.eat(isOperatorChar)) {}
       return "operator";
     }
     stream.eatWhile(/[\w\$_\xa1-\uffff]/);
@@ -67,17 +108,17 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       stream.eatWhile(/[\w\$_\xa1-\uffff]/);
 
     var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      if (defKeywords.propertyIsEnumerable(cur)) isDefKeyword = true;
+    if (contains(keywords, cur)) {
+      if (contains(blockKeywords, cur)) curPunc = "newstatement";
+      if (contains(defKeywords, cur)) isDefKeyword = true;
       return "keyword";
     }
-    if (types.propertyIsEnumerable(cur)) return "variable-3";
-    if (builtin.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
+    if (contains(types, cur)) return "variable-3";
+    if (contains(builtin, cur)) {
+      if (contains(blockKeywords, cur)) curPunc = "newstatement";
       return "builtin";
     }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    if (contains(atoms, cur)) return "atom";
     return "variable";
   }
 
@@ -106,42 +147,6 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     return "comment";
   }
 
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function isStatement(type) {
-    return type == "statement" || type == "switchstatement" || type == "namespace";
-  }
-  function pushContext(state, col, type) {
-    var indent = state.indented;
-    if (state.context && isStatement(state.context.type) && !isStatement(type))
-      indent = state.context.indented;
-    return state.context = new Context(indent, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  function typeBefore(stream, state) {
-    if (state.prevToken == "variable" || state.prevToken == "variable-3") return true;
-    if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, stream.start))) return true;
-  }
-
-  function isTopScope(context) {
-    for (;;) {
-      if (!context || context.type == "top") return true;
-      if (context.type == "}" && context.prev.type != "namespace") return false;
-      context = context.prev;
-    }
-  }
-
   // Interface
 
   return {
@@ -168,8 +173,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (style == "comment" || style == "meta") return style;
       if (ctx.align == null) ctx.align = true;
 
-      if ((curPunc == ";" || curPunc == ":" || curPunc == ","))
-        while (isStatement(state.context.type)) popContext(state);
+      if (endStatement.test(curPunc)) while (isStatement(state.context.type)) popContext(state);
       else if (curPunc == "{") pushContext(state, stream.column(), "}");
       else if (curPunc == "[") pushContext(state, stream.column(), "]");
       else if (curPunc == "(") pushContext(state, stream.column(), ")");
@@ -212,8 +216,16 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
       var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
       if (isStatement(ctx.type) && firstChar == "}") ctx = ctx.prev;
+      if (hooks.indent) {
+        var hook = hooks.indent(state, ctx, textAfter);
+        if (typeof hook == "number") return hook
+      }
       var closing = firstChar == ctx.type;
       var switchBlock = ctx.prev && ctx.prev.type == "switchstatement";
+      if (parserConfig.allmanIndentation && /[{(]/.test(firstChar)) {
+        while (ctx.type != "top" && ctx.type != "}") ctx = ctx.prev
+        return ctx.indented
+      }
       if (isStatement(ctx.type))
         return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
       if (ctx.align && (!dontAlignCalls || ctx.type != ")"))
@@ -238,27 +250,30 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
     return obj;
   }
+  function contains(words, word) {
+    if (typeof words === "function") {
+      return words(word);
+    } else {
+      return words.propertyIsEnumerable(word);
+    }
+  }
   var cKeywords = "auto if break case register continue return default do sizeof " +
-    "static else struct switch extern typedef float union for " +
-    "goto while enum const volatile";
+    "static else struct switch extern typedef union for goto while enum const volatile";
   var cTypes = "int long char short double float unsigned signed void size_t ptrdiff_t";
 
   function cppHook(stream, state) {
-    if (!state.startOfLine) return false;
-    for (;;) {
-      if (stream.skipTo("\\")) {
-        stream.next();
-        if (stream.eol()) {
-          state.tokenize = cppHook;
-          break;
-        }
-      } else {
-        stream.skipToEnd();
-        state.tokenize = null;
-        break;
+    if (!state.startOfLine) return false
+    for (var ch, next = null; ch = stream.peek();) {
+      if (ch == "\\" && stream.match(/^.$/)) {
+        next = cppHook
+        break
+      } else if (ch == "/" && stream.match(/^\/[\/\*]/, false)) {
+        break
       }
+      stream.next()
     }
-    return "meta";
+    state.tokenize = next
+    return "meta"
   }
 
   function pointerHook(_stream, state) {
@@ -413,6 +428,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     defKeywords: words("class interface package enum"),
     typeFirstDefinitions: true,
     atoms: words("true false null"),
+    endStatement: /^[;:]$/,
     hooks: {
       "@": function(stream) {
         stream.eatWhile(/[\w\$_]/);
@@ -468,7 +484,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     keywords: words(
 
       /* scala */
-      "abstract case catch class def do else extends false final finally for forSome if " +
+      "abstract case catch class def do else extends final finally for forSome if " +
       "implicit import lazy match new null object override package private protected return " +
       "sealed super this throw trait try type val var while with yield _ : = => <- <: " +
       "<% >: # @ " +
@@ -481,7 +497,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     ),
     types: words(
       "AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either " +
-      "Enumeration Equiv Error Exception Fractional Function IndexedSeq Integral Iterable " +
+      "Enumeration Equiv Error Exception Fractional Function IndexedSeq Int Integral Iterable " +
       "Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering " +
       "Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder " +
       "StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector " +
@@ -511,6 +527,68 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
       "'": function(stream) {
         stream.eatWhile(/[\w\$_\xa1-\uffff]/);
         return "atom";
+      },
+      "=": function(stream, state) {
+        var cx = state.context
+        if (cx.type == "}" && cx.align && stream.eat(">")) {
+          state.context = new Context(cx.indented, cx.column, cx.type, null, cx.prev)
+          return "operator"
+        } else {
+          return false
+        }
+      }
+    },
+    modeProps: {closeBrackets: {triples: '"'}}
+  });
+
+  function tokenKotlinString(tripleString){
+    return function (stream, state) {
+      var escaped = false, next, end = false;
+      while (!stream.eol()) {
+        if (!tripleString && !escaped && stream.match('"') ) {end = true; break;}
+        if (tripleString && stream.match('"""')) {end = true; break;}
+        next = stream.next();
+        if(!escaped && next == "$" && stream.match('{'))
+          stream.skipTo("}");
+        escaped = !escaped && next == "\\" && !tripleString;
+      }
+      if (end || !tripleString)
+        state.tokenize = null;
+      return "string";
+    }
+  }
+
+  def("text/x-kotlin", {
+    name: "clike",
+    keywords: words(
+      /*keywords*/
+      "package as typealias class interface this super val " +
+      "var fun for is in This throw return " +
+      "break continue object if else while do try when !in !is as? " +
+
+      /*soft keywords*/
+      "file import where by get set abstract enum open inner override private public internal " +
+      "protected catch finally out final vararg reified dynamic companion constructor init " +
+      "sealed field property receiver param sparam lateinit data inline noinline tailrec " +
+      "external annotation crossinline const operator infix"
+    ),
+    types: words(
+      /* package java.lang */
+      "Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable " +
+      "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " +
+      "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
+      "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
+    ),
+    intendSwitch: false,
+    indentStatements: false,
+    multiLineStrings: true,
+    blockKeywords: words("catch class do else finally for if where try while enum"),
+    defKeywords: words("class val var object package interface fun"),
+    atoms: words("true false null this"),
+    hooks: {
+      '"': function(stream, state) {
+        state.tokenize = tokenKotlinString(stream.match('""'));
+        return state.tokenize(stream, state);
       }
     },
     modeProps: {closeBrackets: {triples: '"'}}
@@ -598,7 +676,10 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         stream.eatWhile(/[\w\$]/);
         return "keyword";
       },
-      "#": cppHook
+      "#": cppHook,
+      indent: function(_state, ctx, textAfter) {
+        if (ctx.type == "statement" && /^@\w/.test(textAfter)) return ctx.indented
+      }
     },
     modeProps: {fold: "brace"}
   });
@@ -616,4 +697,85 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {fold: ["brace", "include"]}
   });
 
+  // Ceylon Strings need to deal with interpolation
+  var stringTokenizer = null;
+  function tokenCeylonString(type) {
+    return function(stream, state) {
+      var escaped = false, next, end = false;
+      while (!stream.eol()) {
+        if (!escaped && stream.match('"') &&
+              (type == "single" || stream.match('""'))) {
+          end = true;
+          break;
+        }
+        if (!escaped && stream.match('``')) {
+          stringTokenizer = tokenCeylonString(type);
+          end = true;
+          break;
+        }
+        next = stream.next();
+        escaped = type == "single" && !escaped && next == "\\";
+      }
+      if (end)
+          state.tokenize = null;
+      return "string";
+    }
+  }
+
+  def("text/x-ceylon", {
+    name: "clike",
+    keywords: words("abstracts alias assembly assert assign break case catch class continue dynamic else" +
+                    " exists extends finally for function given if import in interface is let module new" +
+                    " nonempty object of out outer package return satisfies super switch then this throw" +
+                    " try value void while"),
+    types: function(word) {
+        // In Ceylon all identifiers that start with an uppercase are types
+        var first = word.charAt(0);
+        return (first === first.toUpperCase() && first !== first.toLowerCase());
+    },
+    blockKeywords: words("case catch class dynamic else finally for function if interface module new object switch try while"),
+    defKeywords: words("class dynamic function interface module object package value"),
+    builtin: words("abstract actual aliased annotation by default deprecated doc final formal late license" +
+                   " native optional sealed see serializable shared suppressWarnings tagged throws variable"),
+    isPunctuationChar: /[\[\]{}\(\),;\:\.`]/,
+    isOperatorChar: /[+\-*&%=<>!?|^~:\/]/,
+    numberStart: /[\d#$]/,
+    number: /^(?:#[\da-fA-F_]+|\$[01_]+|[\d_]+[kMGTPmunpf]?|[\d_]+\.[\d_]+(?:[eE][-+]?\d+|[kMGTPmunpf]|)|)/i,
+    multiLineStrings: true,
+    typeFirstDefinitions: true,
+    atoms: words("true false null larger smaller equal empty finished"),
+    indentSwitch: false,
+    styleDefs: false,
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_]/);
+        return "meta";
+      },
+      '"': function(stream, state) {
+          state.tokenize = tokenCeylonString(stream.match('""') ? "triple" : "single");
+          return state.tokenize(stream, state);
+        },
+      '`': function(stream, state) {
+          if (!stringTokenizer || !stream.match('`')) return false;
+          state.tokenize = stringTokenizer;
+          stringTokenizer = null;
+          return state.tokenize(stream, state);
+        },
+      "'": function(stream) {
+        stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+        return "atom";
+      },
+      token: function(_stream, state, style) {
+          if ((style == "variable" || style == "variable-3") &&
+              state.prevToken == ".") {
+            return "variable-2";
+          }
+        }
+    },
+    modeProps: {
+        fold: ["brace", "import"],
+        closeBrackets: {triples: '"'}
+    }
+  });
+
 });
diff --git a/www/code/mode/clike/index.html b/www/code/codemirror-5.13.2/mode/clike/index.html
similarity index 65%
rename from www/code/mode/clike/index.html
rename to www/code/codemirror-5.13.2/mode/clike/index.html
index 226c6ce84..45c670ae5 100644
--- a/www/code/mode/clike/index.html
+++ b/www/code/codemirror-5.13.2/mode/clike/index.html
@@ -206,6 +206,103 @@ object FilterTest extends App {
 }
 
 
+
Kotlin mode

+
+

+
+
Ceylon mode

+
+

+
     
@@ -247,6 +354,7 @@ object FilterTest extends App {
     (Java), text/x-csharp (C#),
     text/x-objectivec (Objective-C),
     text/x-scala (Scala), text/x-vertex
-    and x-shader/x-fragment (shader programs),
-    text/x-squirrel (Squirrel).

+    x-shader/x-fragment (shader programs),
+    text/x-squirrel (Squirrel) and
+    text/x-ceylon (Ceylon)

 
diff --git a/www/code/mode/clike/scala.html b/www/code/codemirror-5.13.2/mode/clike/scala.html
similarity index 100%
rename from www/code/mode/clike/scala.html
rename to www/code/codemirror-5.13.2/mode/clike/scala.html
diff --git a/www/code/mode/clike/test.js b/www/code/codemirror-5.13.2/mode/clike/test.js
similarity index 83%
rename from www/code/mode/clike/test.js
rename to www/code/codemirror-5.13.2/mode/clike/test.js
index c84d22e18..c26003266 100644
--- a/www/code/mode/clike/test.js
+++ b/www/code/codemirror-5.13.2/mode/clike/test.js
@@ -31,6 +31,15 @@
      "    [variable x][operator ++];",
      "[keyword return];");
 
+  MT("preprocessor",
+     "[meta #define FOO 3]",
+     "[variable-3 int] [variable foo];",
+     "[meta #define BAR\\]",
+     "[meta 4]",
+     "[variable-3 unsigned] [variable-3 int] [variable bar] [operator =] [number 8];",
+     "[meta #include  ][comment // comment]")
+
+
   var mode_cpp = CodeMirror.getMode({indentUnit: 2}, "text/x-c++src");
   function MTCPP(name) { test.mode(name, mode_cpp, Array.prototype.slice.call(arguments, 1)); }
 
diff --git a/www/code/mode/clojure/clojure.js b/www/code/codemirror-5.13.2/mode/clojure/clojure.js
similarity index 96%
rename from www/code/mode/clojure/clojure.js
rename to www/code/codemirror-5.13.2/mode/clojure/clojure.js
index d531022a2..cd8129f75 100644
--- a/www/code/mode/clojure/clojure.js
+++ b/www/code/codemirror-5.13.2/mode/clojure/clojure.js
@@ -59,7 +59,8 @@ CodeMirror.defineMode("clojure", function (options) {
         sign: /[+-]/,
         exponent: /e/i,
         keyword_char: /[^\s\(\[\;\)\]]/,
-        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/
+        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/,
+        block_indent: /^(?:def|with)[^\/]+$|\/(?:def|with)/
     };
 
     function stateStack(indent, type, prev) { // represents a state stack object
@@ -96,6 +97,9 @@ CodeMirror.defineMode("clojure", function (options) {
             if ( '.' == stream.peek() ) {
                 stream.eat('.');
                 stream.eatWhile(tests.digit);
+            } else if ('/' == stream.peek() ) {
+                stream.eat('/');
+                stream.eatWhile(tests.digit);
             }
 
             if ( stream.eat(tests.exponent) ) {
@@ -139,7 +143,7 @@ CodeMirror.defineMode("clojure", function (options) {
             }
 
             // skip spaces
-            if (stream.eatSpace()) {
+            if (state.mode != "string" && stream.eatSpace()) {
                 return null;
             }
             var returnType = null;
@@ -187,7 +191,7 @@ CodeMirror.defineMode("clojure", function (options) {
                         }
 
                         if (keyWord.length > 0 && (indentKeys.propertyIsEnumerable(keyWord) ||
-                                                   /^(?:def|with)/.test(keyWord))) { // indent-word
+                                                   tests.block_indent.test(keyWord))) { // indent-word
                             pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
                         } else { // non-indent word
                             // we continue eating the spaces
@@ -240,5 +244,7 @@ CodeMirror.defineMode("clojure", function (options) {
 });
 
 CodeMirror.defineMIME("text/x-clojure", "clojure");
+CodeMirror.defineMIME("text/x-clojurescript", "clojure");
+CodeMirror.defineMIME("application/edn", "clojure");
 
 });
diff --git a/www/code/mode/clojure/index.html b/www/code/codemirror-5.13.2/mode/clojure/index.html
similarity index 97%
rename from www/code/mode/clojure/index.html
rename to www/code/codemirror-5.13.2/mode/clojure/index.html
index 3ecf4c486..81294bc14 100644
--- a/www/code/mode/clojure/index.html
+++ b/www/code/codemirror-5.13.2/mode/clojure/index.html
@@ -78,6 +78,9 @@
          \tab \return \backspace
          \u1000 \uAaAa \u9F9F)
 
+;; Let's play with numbers
+(+ 1 -1 1/2 -1/2 -0.5 0.5)
+
 
     
+
+
+
+
+
+
+

+
Crystal mode

+

+
+
+
MIME types defined: text/x-crystal.

+

diff --git a/www/code/mode/css/css.js b/www/code/codemirror-5.13.2/mode/css/css.js
similarity index 96%
rename from www/code/mode/css/css.js
rename to www/code/codemirror-5.13.2/mode/css/css.js
index 730085039..e9656e3dc 100644
--- a/www/code/mode/css/css.js
+++ b/www/code/codemirror-5.13.2/mode/css/css.js
@@ -12,9 +12,8 @@
 "use strict";
 
 CodeMirror.defineMode("css", function(config, parserConfig) {
-  var provided = parserConfig;
+  var inline = parserConfig.inline
   if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
-  parserConfig.inline = provided.inline;
 
   var indentUnit = config.indentUnit,
       tokenHooks = parserConfig.tokenHooks,
@@ -228,7 +227,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     if (type == "}" || type == "{") return popAndPass(type, stream, state);
     if (type == "(") return pushContext(state, stream, "parens");
 
-    if (type == "hash" && !/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
+    if (type == "hash" && !/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(stream.current())) {
       override += " error";
     } else if (type == "word") {
       wordAsValue(stream);
@@ -275,6 +274,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     if (type == "}" || type == ";") return popAndPass(type, stream, state);
     if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
 
+    if (type == "interpolation") return pushContext(state, stream, "interpolation");
+
     if (type == "word") {
       var word = stream.current().toLowerCase();
       if (word == "only" || word == "not" || word == "and" || word == "or")
@@ -366,9 +367,9 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
   return {
     startState: function(base) {
       return {tokenize: null,
-              state: parserConfig.inline ? "block" : "top",
+              state: inline ? "block" : "top",
               stateArg: null,
-              context: new Context(parserConfig.inline ? "block" : "top", base || 0, null)};
+              context: new Context(inline ? "block" : "top", base || 0, null)};
     },
 
     token: function(stream, state) {
@@ -451,8 +452,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "animation-direction", "animation-duration", "animation-fill-mode",
     "animation-iteration-count", "animation-name", "animation-play-state",
     "animation-timing-function", "appearance", "azimuth", "backface-visibility",
-    "background", "background-attachment", "background-clip", "background-color",
-    "background-image", "background-origin", "background-position",
+    "background", "background-attachment", "background-blend-mode", "background-clip",
+    "background-color", "background-image", "background-origin", "background-position",
     "background-repeat", "background-size", "baseline-shift", "binding",
     "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
     "bookmark-target", "border", "border-bottom", "border-bottom-color",
@@ -596,11 +597,12 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
     "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
     "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
-    "col-resize", "collapse", "column", "column-reverse", "compact", "condensed", "contain", "content",
+    "col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",
+    "compact", "condensed", "contain", "content",
     "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
-    "cross", "crosshair", "currentcolor", "cursive", "cyclic", "dashed", "decimal",
+    "cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
     "decimal-leading-zero", "default", "default-button", "destination-atop",
-    "destination-in", "destination-out", "destination-over", "devanagari",
+    "destination-in", "destination-out", "destination-over", "devanagari", "difference",
     "disc", "discard", "disclosure-closed", "disclosure-open", "document",
     "dot-dash", "dot-dot-dash",
     "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
@@ -611,23 +613,23 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
     "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
     "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
-    "ethiopic-numeric", "ew-resize", "expanded", "extends", "extra-condensed",
+    "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed",
     "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
     "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
-    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew",
+    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew",
     "help", "hidden", "hide", "higher", "highlight", "highlighttext",
-    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "icon", "ignore",
+    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "icon", "ignore",
     "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
     "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
     "inline-block", "inline-flex", "inline-table", "inset", "inside", "intrinsic", "invert",
     "italic", "japanese-formal", "japanese-informal", "justify", "kannada",
     "katakana", "katakana-iroha", "keep-all", "khmer",
     "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal",
-    "landscape", "lao", "large", "larger", "left", "level", "lighter",
+    "landscape", "lao", "large", "larger", "left", "level", "lighter", "lighten",
     "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem",
     "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
     "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
-    "lower-roman", "lowercase", "ltr", "malayalam", "match", "matrix", "matrix3d",
+    "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "match", "matrix", "matrix3d",
     "media-controls-background", "media-current-time-display",
     "media-fullscreen-button", "media-mute-button", "media-play-button",
     "media-return-to-realtime-button", "media-rewind-button",
@@ -636,7 +638,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "media-volume-slider-container", "media-volume-sliderthumb", "medium",
     "menu", "menulist", "menulist-button", "menulist-text",
     "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
-    "mix", "mongolian", "monospace", "move", "multiple", "myanmar", "n-resize",
+    "mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize",
     "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
     "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
@@ -650,7 +652,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
     "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
     "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
-    "s-resize", "sans-serif", "scale", "scale3d", "scaleX", "scaleY", "scaleZ",
+    "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
     "scroll", "scrollbar", "se-resize", "searchfield",
     "searchfield-cancel-button", "searchfield-decoration",
     "searchfield-results-button", "searchfield-results-decoration",
@@ -658,7 +660,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "simp-chinese-formal", "simp-chinese-informal", "single",
     "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
-    "small", "small-caps", "small-caption", "smaller", "solid", "somali",
+    "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
     "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
     "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
     "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table",
diff --git a/www/code/mode/css/gss.html b/www/code/codemirror-5.13.2/mode/css/gss.html
similarity index 100%
rename from www/code/mode/css/gss.html
rename to www/code/codemirror-5.13.2/mode/css/gss.html
diff --git a/www/code/mode/css/gss_test.js b/www/code/codemirror-5.13.2/mode/css/gss_test.js
similarity index 100%
rename from www/code/mode/css/gss_test.js
rename to www/code/codemirror-5.13.2/mode/css/gss_test.js
diff --git a/www/code/mode/css/index.html b/www/code/codemirror-5.13.2/mode/css/index.html
similarity index 100%
rename from www/code/mode/css/index.html
rename to www/code/codemirror-5.13.2/mode/css/index.html
diff --git a/www/code/mode/css/less.html b/www/code/codemirror-5.13.2/mode/css/less.html
similarity index 100%
rename from www/code/mode/css/less.html
rename to www/code/codemirror-5.13.2/mode/css/less.html
diff --git a/www/code/mode/css/less_test.js b/www/code/codemirror-5.13.2/mode/css/less_test.js
similarity index 91%
rename from www/code/mode/css/less_test.js
rename to www/code/codemirror-5.13.2/mode/css/less_test.js
index 7b77f5848..dd821558b 100644
--- a/www/code/mode/css/less_test.js
+++ b/www/code/codemirror-5.13.2/mode/css/less_test.js
@@ -26,10 +26,10 @@
 
   MT("mixin",
      "[qualifier .mixin] ([variable dark]; [variable-2 @color]) {",
-     "  [property color]: [variable darken]([variable-2 @color], [number 10%]);",
+     "  [property color]: [atom darken]([variable-2 @color], [number 10%]);",
      "}",
      "[qualifier .mixin] ([variable light]; [variable-2 @color]) {",
-     "  [property color]: [variable lighten]([variable-2 @color], [number 10%]);",
+     "  [property color]: [atom lighten]([variable-2 @color], [number 10%]);",
      "}",
      "[qualifier .mixin] ([variable-2 @_]; [variable-2 @color]) {",
      "  [property display]: [atom block];",
diff --git a/www/code/mode/css/scss.html b/www/code/codemirror-5.13.2/mode/css/scss.html
similarity index 100%
rename from www/code/mode/css/scss.html
rename to www/code/codemirror-5.13.2/mode/css/scss.html
diff --git a/www/code/mode/css/scss_test.js b/www/code/codemirror-5.13.2/mode/css/scss_test.js
similarity index 97%
rename from www/code/mode/css/scss_test.js
rename to www/code/codemirror-5.13.2/mode/css/scss_test.js
index 26c226a1e..785921b39 100644
--- a/www/code/mode/css/scss_test.js
+++ b/www/code/codemirror-5.13.2/mode/css/scss_test.js
@@ -95,7 +95,7 @@
 
   MT('indent_parentheses',
      "[tag foo] {",
-     "  [property color]: [variable darken]([variable-2 $blue],",
+     "  [property color]: [atom darken]([variable-2 $blue],",
      "    [number 9%]);",
      "}");
 
diff --git a/www/code/mode/css/test.js b/www/code/codemirror-5.13.2/mode/css/test.js
similarity index 96%
rename from www/code/mode/css/test.js
rename to www/code/codemirror-5.13.2/mode/css/test.js
index 60f9c837f..7a496fb09 100644
--- a/www/code/mode/css/test.js
+++ b/www/code/codemirror-5.13.2/mode/css/test.js
@@ -55,11 +55,17 @@
   MT("tagColorHex3",
      "[tag foo] { [property background]: [atom #fff]; }");
 
+  MT("tagColorHex4",
+     "[tag foo] { [property background]: [atom #ffff]; }");
+
   MT("tagColorHex6",
      "[tag foo] { [property background]: [atom #ffffff]; }");
 
-  MT("tagColorHex4",
-     "[tag foo] { [property background]: [atom&error #ffff]; }");
+  MT("tagColorHex8",
+     "[tag foo] { [property background]: [atom #ffffffff]; }");
+
+  MT("tagColorHex5Invalid",
+     "[tag foo] { [property background]: [atom&error #fffff]; }");
 
   MT("tagColorHexInvalid",
      "[tag foo] { [property background]: [atom&error #ffg]; }");
diff --git a/www/code/mode/cypher/cypher.js b/www/code/codemirror-5.13.2/mode/cypher/cypher.js
similarity index 86%
rename from www/code/mode/cypher/cypher.js
rename to www/code/codemirror-5.13.2/mode/cypher/cypher.js
index 79048b440..107e4f6d2 100644
--- a/www/code/mode/cypher/cypher.js
+++ b/www/code/codemirror-5.13.2/mode/cypher/cypher.js
@@ -60,9 +60,9 @@
     };
     var indentUnit = config.indentUnit;
     var curPunc;
-    var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
-    var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor", "like", "ilike", "exists"]);
-    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
+    var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "reverse", "right", "round", "rtrim", "shortestPath", "sign", "sin", "size", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "toString", "trim", "type", "upper"]);
+    var preds = wordRegexp(["all", "and", "any", "contains", "exists", "has", "in", "none", "not", "or", "single", "xor"]);
+    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "detach", "distinct", "drop", "else", "end", "ends", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "starts", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
     var operatorChars = /[*+\-<>=&|~%^]/;
 
     return {
diff --git a/www/code/mode/cypher/index.html b/www/code/codemirror-5.13.2/mode/cypher/index.html
similarity index 100%
rename from www/code/mode/cypher/index.html
rename to www/code/codemirror-5.13.2/mode/cypher/index.html
diff --git a/www/code/mode/d/d.js b/www/code/codemirror-5.13.2/mode/d/d.js
similarity index 100%
rename from www/code/mode/d/d.js
rename to www/code/codemirror-5.13.2/mode/d/d.js
diff --git a/www/code/mode/d/index.html b/www/code/codemirror-5.13.2/mode/d/index.html
similarity index 100%
rename from www/code/mode/d/index.html
rename to www/code/codemirror-5.13.2/mode/d/index.html
diff --git a/www/code/codemirror-5.13.2/mode/dart/dart.js b/www/code/codemirror-5.13.2/mode/dart/dart.js
new file mode 100644
index 000000000..8d383a95e
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/dart/dart.js
@@ -0,0 +1,157 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../clike/clike"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../clike/clike"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var keywords = ("this super static final const abstract class extends external factory " +
+    "implements get native operator set typedef with enum throw rethrow " +
+    "assert break case continue default in return new deferred async await " +
+    "try catch finally do else for if switch while import library export " +
+    "part of show hide is as").split(" ");
+  var blockKeywords = "try catch finally do else for if switch while".split(" ");
+  var atoms = "true false null".split(" ");
+  var builtins = "void bool num int double dynamic var String".split(" ");
+
+  function set(words) {
+    var obj = {};
+    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
+    return obj;
+  }
+
+  function pushInterpolationStack(state) {
+    (state.interpolationStack || (state.interpolationStack = [])).push(state.tokenize);
+  }
+
+  function popInterpolationStack(state) {
+    return (state.interpolationStack || (state.interpolationStack = [])).pop();
+  }
+
+  function sizeInterpolationStack(state) {
+    return state.interpolationStack ? state.interpolationStack.length : 0;
+  }
+
+  CodeMirror.defineMIME("application/dart", {
+    name: "clike",
+    keywords: set(keywords),
+    blockKeywords: set(blockKeywords),
+    builtin: set(builtins),
+    atoms: set(atoms),
+    hooks: {
+      "@": function(stream) {
+        stream.eatWhile(/[\w\$_\.]/);
+        return "meta";
+      },
+
+      // custom string handling to deal with triple-quoted strings and string interpolation
+      "'": function(stream, state) {
+        return tokenString("'", stream, state, false);
+      },
+      "\"": function(stream, state) {
+        return tokenString("\"", stream, state, false);
+      },
+      "r": function(stream, state) {
+        var peek = stream.peek();
+        if (peek == "'" || peek == "\"") {
+          return tokenString(stream.next(), stream, state, true);
+        }
+        return false;
+      },
+
+      "}": function(_stream, state) {
+        // "}" is end of interpolation, if interpolation stack is non-empty
+        if (sizeInterpolationStack(state) > 0) {
+          state.tokenize = popInterpolationStack(state);
+          return null;
+        }
+        return false;
+      },
+
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false
+        state.tokenize = tokenNestedComment(1)
+        return state.tokenize(stream, state)
+      }
+    }
+  });
+
+  function tokenString(quote, stream, state, raw) {
+    var tripleQuoted = false;
+    if (stream.eat(quote)) {
+      if (stream.eat(quote)) tripleQuoted = true;
+      else return "string"; //empty string
+    }
+    function tokenStringHelper(stream, state) {
+      var escaped = false;
+      while (!stream.eol()) {
+        if (!raw && !escaped && stream.peek() == "$") {
+          pushInterpolationStack(state);
+          state.tokenize = tokenInterpolation;
+          return "string";
+        }
+        var next = stream.next();
+        if (next == quote && !escaped && (!tripleQuoted || stream.match(quote + quote))) {
+          state.tokenize = null;
+          break;
+        }
+        escaped = !raw && !escaped && next == "\\";
+      }
+      return "string";
+    }
+    state.tokenize = tokenStringHelper;
+    return tokenStringHelper(stream, state);
+  }
+
+  function tokenInterpolation(stream, state) {
+    stream.eat("$");
+    if (stream.eat("{")) {
+      // let clike handle the content of ${...},
+      // we take over again when "}" appears (see hooks).
+      state.tokenize = null;
+    } else {
+      state.tokenize = tokenInterpolationIdentifier;
+    }
+    return null;
+  }
+
+  function tokenInterpolationIdentifier(stream, state) {
+    stream.eatWhile(/[\w_]/);
+    state.tokenize = popInterpolationStack(state);
+    return "variable";
+  }
+
+  function tokenNestedComment(depth) {
+    return function (stream, state) {
+      var ch
+      while (ch = stream.next()) {
+        if (ch == "*" && stream.eat("/")) {
+          if (depth == 1) {
+            state.tokenize = null
+            break
+          } else {
+            state.tokenize = tokenNestedComment(depth - 1)
+            return state.tokenize(stream, state)
+          }
+        } else if (ch == "/" && stream.eat("*")) {
+          state.tokenize = tokenNestedComment(depth + 1)
+          return state.tokenize(stream, state)
+        }
+      }
+      return "comment"
+    }
+  }
+
+  CodeMirror.registerHelper("hintWords", "application/dart", keywords.concat(atoms).concat(builtins));
+
+  // This is needed to make loading through meta.js work.
+  CodeMirror.defineMode("dart", function(conf) {
+    return CodeMirror.getMode(conf, "application/dart");
+  }, "clike");
+});
diff --git a/www/code/mode/dart/index.html b/www/code/codemirror-5.13.2/mode/dart/index.html
similarity index 100%
rename from www/code/mode/dart/index.html
rename to www/code/codemirror-5.13.2/mode/dart/index.html
diff --git a/www/code/mode/diff/diff.js b/www/code/codemirror-5.13.2/mode/diff/diff.js
similarity index 100%
rename from www/code/mode/diff/diff.js
rename to www/code/codemirror-5.13.2/mode/diff/diff.js
diff --git a/www/code/mode/diff/index.html b/www/code/codemirror-5.13.2/mode/diff/index.html
similarity index 100%
rename from www/code/mode/diff/index.html
rename to www/code/codemirror-5.13.2/mode/diff/index.html
diff --git a/www/code/mode/django/django.js b/www/code/codemirror-5.13.2/mode/django/django.js
similarity index 90%
rename from www/code/mode/django/django.js
rename to www/code/codemirror-5.13.2/mode/django/django.js
index 2f08b0631..a8a7d8311 100644
--- a/www/code/mode/django/django.js
+++ b/www/code/codemirror-5.13.2/mode/django/django.js
@@ -14,14 +14,14 @@
   "use strict";
 
   CodeMirror.defineMode("django:inner", function() {
-    var keywords = ["block", "endblock", "for", "endfor", "true", "false",
-                    "loop", "none", "self", "super", "if", "endif", "as",
-                    "else", "import", "with", "endwith", "without", "context", "ifequal", "endifequal",
-                    "ifnotequal", "endifnotequal", "extends", "include", "load", "comment",
-                    "endcomment", "empty", "url", "static", "trans", "blocktrans", "now", "regroup",
-                    "lorem", "ifchanged", "endifchanged", "firstof", "debug", "cycle", "csrf_token",
-                    "autoescape", "endautoescape", "spaceless", "ssi", "templatetag",
-                    "verbatim", "endverbatim", "widthratio"],
+    var keywords = ["block", "endblock", "for", "endfor", "true", "false", "filter", "endfilter",
+                    "loop", "none", "self", "super", "if", "elif", "endif", "as", "else", "import",
+                    "with", "endwith", "without", "context", "ifequal", "endifequal", "ifnotequal",
+                    "endifnotequal", "extends", "include", "load", "comment", "endcomment",
+                    "empty", "url", "static", "trans", "blocktrans", "endblocktrans", "now",
+                    "regroup", "lorem", "ifchanged", "endifchanged", "firstof", "debug", "cycle",
+                    "csrf_token", "autoescape", "endautoescape", "spaceless", "endspaceless",
+                    "ssi", "templatetag", "verbatim", "endverbatim", "widthratio"],
         filters = ["add", "addslashes", "capfirst", "center", "cut", "date",
                    "default", "default_if_none", "dictsort",
                    "dictsortreversed", "divisibleby", "escape", "escapejs",
@@ -35,11 +35,13 @@
                    "truncatechars_html", "truncatewords", "truncatewords_html",
                    "unordered_list", "upper", "urlencode", "urlize",
                    "urlizetrunc", "wordcount", "wordwrap", "yesno"],
-        operators = ["==", "!=", "<", ">", "<=", ">=", "in", "not", "or", "and"];
+        operators = ["==", "!=", "<", ">", "<=", ">="],
+        wordOperators = ["in", "not", "or", "and"];
 
     keywords = new RegExp("^\\b(" + keywords.join("|") + ")\\b");
     filters = new RegExp("^\\b(" + filters.join("|") + ")\\b");
     operators = new RegExp("^\\b(" + operators.join("|") + ")\\b");
+    wordOperators = new RegExp("^\\b(" + wordOperators.join("|") + ")\\b");
 
     // We have to return "null" instead of null, in order to avoid string
     // styling as the default, when using Django templates inside HTML
@@ -59,7 +61,7 @@
 
       // Ignore completely any stream series that do not match the
       // Django template opening tags.
-      while (stream.next() != null && !stream.match("{{", false) && !stream.match("{%", false)) {}
+      while (stream.next() != null && !stream.match(/\{[{%#]/, false)) {}
       return null;
     }
 
@@ -270,6 +272,11 @@
         return "operator";
       }
 
+      // Attempt to match a word operator
+      if (stream.match(wordOperators)) {
+        return "keyword";
+      }
+
       // Attempt to match a keyword
       var keywordMatch = stream.match(keywords);
       if (keywordMatch) {
@@ -310,9 +317,8 @@
 
     // Mark everything as comment inside the tag and the tag itself.
     function inComment (stream, state) {
-      if (stream.match("#}")) {
-        state.tokenize = tokenBase;
-      }
+      if (stream.match(/^.*?#\}/)) state.tokenize = tokenBase
+      else stream.skipToEnd()
       return "comment";
     }
 
diff --git a/www/code/mode/django/index.html b/www/code/codemirror-5.13.2/mode/django/index.html
similarity index 100%
rename from www/code/mode/django/index.html
rename to www/code/codemirror-5.13.2/mode/django/index.html
diff --git a/www/code/mode/dockerfile/dockerfile.js b/www/code/codemirror-5.13.2/mode/dockerfile/dockerfile.js
similarity index 100%
rename from www/code/mode/dockerfile/dockerfile.js
rename to www/code/codemirror-5.13.2/mode/dockerfile/dockerfile.js
diff --git a/www/code/mode/dockerfile/index.html b/www/code/codemirror-5.13.2/mode/dockerfile/index.html
similarity index 100%
rename from www/code/mode/dockerfile/index.html
rename to www/code/codemirror-5.13.2/mode/dockerfile/index.html
diff --git a/www/code/mode/dtd/dtd.js b/www/code/codemirror-5.13.2/mode/dtd/dtd.js
similarity index 100%
rename from www/code/mode/dtd/dtd.js
rename to www/code/codemirror-5.13.2/mode/dtd/dtd.js
diff --git a/www/code/mode/dtd/index.html b/www/code/codemirror-5.13.2/mode/dtd/index.html
similarity index 100%
rename from www/code/mode/dtd/index.html
rename to www/code/codemirror-5.13.2/mode/dtd/index.html
diff --git a/www/code/mode/dylan/dylan.js b/www/code/codemirror-5.13.2/mode/dylan/dylan.js
similarity index 80%
rename from www/code/mode/dylan/dylan.js
rename to www/code/codemirror-5.13.2/mode/dylan/dylan.js
index 85f0166c1..1b46bc828 100644
--- a/www/code/mode/dylan/dylan.js
+++ b/www/code/codemirror-5.13.2/mode/dylan/dylan.js
@@ -169,15 +169,16 @@ CodeMirror.defineMode("dylan", function(_config) {
       } else if (stream.eat("/")) {
         stream.skipToEnd();
         return "comment";
-      } else {
-        stream.skipTo(" ");
-        return "operator";
       }
+      stream.backUp(1);
     }
     // Decimal
-    else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:\.\d*)?(?:e[+\-]?\d+)?/);
-      return "number";
+    else if (/[+\-\d\.]/.test(ch)) {
+      if (stream.match(/^[+-]?[0-9]*\.[0-9]*([esdx][+-]?[0-9]+)?/i) ||
+          stream.match(/^[+-]?[0-9]+([esdx][+-]?[0-9]+)/i) ||
+          stream.match(/^[+-]?\d+/)) {
+        return "number";
+      }
     }
     // Hash
     else if (ch == "#") {
@@ -186,7 +187,7 @@ CodeMirror.defineMode("dylan", function(_config) {
       ch = stream.peek();
       if (ch == '"') {
         stream.next();
-        return chain(stream, state, tokenString('"', "string-2"));
+        return chain(stream, state, tokenString('"', "string"));
       }
       // Binary number
       else if (ch == "b") {
@@ -206,11 +207,51 @@ CodeMirror.defineMode("dylan", function(_config) {
         stream.eatWhile(/[0-7]/);
         return "number";
       }
+      // Token concatenation in macros
+      else if (ch == '#') {
+        stream.next();
+        return "punctuation";
+      }
+      // Sequence literals
+      else if ((ch == '[') || (ch == '(')) {
+        stream.next();
+        return "bracket";
       // Hash symbol
-      else {
+      } else if (stream.match(/f|t|all-keys|include|key|next|rest/i)) {
+        return "atom";
+      } else {
         stream.eatWhile(/[-a-zA-Z]/);
-        return "keyword";
+        return "error";
+      }
+    } else if (ch == "~") {
+      stream.next();
+      ch = stream.peek();
+      if (ch == "=") {
+        stream.next();
+        ch = stream.peek();
+        if (ch == "=") {
+          stream.next();
+          return "operator";
+        }
+        return "operator";
       }
+      return "operator";
+    } else if (ch == ":") {
+      stream.next();
+      ch = stream.peek();
+      if (ch == "=") {
+        stream.next();
+        return "operator";
+      } else if (ch == ":") {
+        stream.next();
+        return "punctuation";
+      }
+    } else if ("[](){}".indexOf(ch) != -1) {
+      stream.next();
+      return "bracket";
+    } else if (".,".indexOf(ch) != -1) {
+      stream.next();
+      return "punctuation";
     } else if (stream.match("end")) {
       return "keyword";
     }
@@ -223,6 +264,10 @@ CodeMirror.defineMode("dylan", function(_config) {
           return patternStyles[name];
       }
     }
+    if (/[+\-*\/^=<>&|]/.test(ch)) {
+      stream.next();
+      return "operator";
+    }
     if (stream.match("define")) {
       return "def";
     } else {
@@ -240,29 +285,37 @@ CodeMirror.defineMode("dylan", function(_config) {
   }
 
   function tokenComment(stream, state) {
-    var maybeEnd = false,
-    ch;
+    var maybeEnd = false, maybeNested = false, nestedCount = 0, ch;
     while ((ch = stream.next())) {
       if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
+        if (nestedCount > 0) {
+          nestedCount--;
+        } else {
+          state.tokenize = tokenBase;
+          break;
+        }
+      } else if (ch == "*" && maybeNested) {
+        nestedCount++;
       }
       maybeEnd = (ch == "*");
+      maybeNested = (ch == "/");
     }
     return "comment";
   }
 
   function tokenString(quote, style) {
     return function(stream, state) {
-      var next, end = false;
+      var escaped = false, next, end = false;
       while ((next = stream.next()) != null) {
-        if (next == quote) {
+        if (next == quote && !escaped) {
           end = true;
           break;
         }
+        escaped = !escaped && next == "\\";
       }
-      if (end)
+      if (end || !escaped) {
         state.tokenize = tokenBase;
+      }
       return style;
     };
   }
diff --git a/www/code/mode/dylan/index.html b/www/code/codemirror-5.13.2/mode/dylan/index.html
similarity index 100%
rename from www/code/mode/dylan/index.html
rename to www/code/codemirror-5.13.2/mode/dylan/index.html
diff --git a/www/code/codemirror-5.13.2/mode/dylan/test.js b/www/code/codemirror-5.13.2/mode/dylan/test.js
new file mode 100644
index 000000000..bf25be27e
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/dylan/test.js
@@ -0,0 +1,88 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "dylan");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT('comments',
+     '[comment // This is a line comment]',
+     '[comment /* This is a block comment */]',
+     '[comment /* This is a multi]',
+     '[comment line comment]',
+     '[comment */]',
+     '[comment /* And this is a /*]',
+     '[comment /* nested */ comment */]');
+
+  MT('unary_operators',
+     '[operator -][variable a]',
+     '[operator -] [variable a]',
+     '[operator ~][variable a]',
+     '[operator ~] [variable a]');
+
+  MT('binary_operators',
+     '[variable a] [operator +] [variable b]',
+     '[variable a] [operator -] [variable b]',
+     '[variable a] [operator *] [variable b]',
+     '[variable a] [operator /] [variable b]',
+     '[variable a] [operator ^] [variable b]',
+     '[variable a] [operator =] [variable b]',
+     '[variable a] [operator ==] [variable b]',
+     '[variable a] [operator ~=] [variable b]',
+     '[variable a] [operator ~==] [variable b]',
+     '[variable a] [operator <] [variable b]',
+     '[variable a] [operator <=] [variable b]',
+     '[variable a] [operator >] [variable b]',
+     '[variable a] [operator >=] [variable b]',
+     '[variable a] [operator &] [variable b]',
+     '[variable a] [operator |] [variable b]',
+     '[variable a] [operator :=] [variable b]');
+
+  MT('integers',
+     '[number 1]',
+     '[number 123]',
+     '[number -123]',
+     '[number +456]',
+     '[number #b010]',
+     '[number #o073]',
+     '[number #xabcDEF123]');
+
+  MT('floats',
+     '[number .3]',
+     '[number -1.]',
+     '[number -2.335]',
+     '[number +3.78d1]',
+     '[number 3.78s-1]',
+     '[number -3.32e+5]');
+
+  MT('characters_and_strings',
+     "[string 'a']",
+     "[string '\\\\'']",
+     '[string ""]',
+     '[string "a"]',
+     '[string "abc def"]',
+     '[string "More escaped characters: \\\\\\\\ \\\\a \\\\b \\\\e \\\\f \\\\n \\\\r \\\\t \\\\0 ..."]');
+
+  MT('brackets',
+     '[bracket #[[]]]',
+     '[bracket #()]',
+     '[bracket #(][number 1][bracket )]',
+     '[bracket [[][number 1][punctuation ,] [number 3][bracket ]]]',
+     '[bracket ()]',
+     '[bracket {}]',
+     '[keyword if] [bracket (][variable foo][bracket )]',
+     '[bracket (][number 1][bracket )]',
+     '[bracket [[][number 1][bracket ]]]');
+
+  MT('hash_words',
+     '[punctuation ##]',
+     '[atom #f]', '[atom #F]',
+     '[atom #t]', '[atom #T]',
+     '[atom #all-keys]',
+     '[atom #include]',
+     '[atom #key]',
+     '[atom #next]',
+     '[atom #rest]',
+     '[string #"foo"]',
+     '[error #invalid]');
+})();
diff --git a/www/code/mode/ebnf/ebnf.js b/www/code/codemirror-5.13.2/mode/ebnf/ebnf.js
similarity index 100%
rename from www/code/mode/ebnf/ebnf.js
rename to www/code/codemirror-5.13.2/mode/ebnf/ebnf.js
diff --git a/www/code/mode/ebnf/index.html b/www/code/codemirror-5.13.2/mode/ebnf/index.html
similarity index 100%
rename from www/code/mode/ebnf/index.html
rename to www/code/codemirror-5.13.2/mode/ebnf/index.html
diff --git a/www/code/mode/ecl/ecl.js b/www/code/codemirror-5.13.2/mode/ecl/ecl.js
similarity index 100%
rename from www/code/mode/ecl/ecl.js
rename to www/code/codemirror-5.13.2/mode/ecl/ecl.js
diff --git a/www/code/mode/ecl/index.html b/www/code/codemirror-5.13.2/mode/ecl/index.html
similarity index 100%
rename from www/code/mode/ecl/index.html
rename to www/code/codemirror-5.13.2/mode/ecl/index.html
diff --git a/www/code/mode/eiffel/eiffel.js b/www/code/codemirror-5.13.2/mode/eiffel/eiffel.js
similarity index 100%
rename from www/code/mode/eiffel/eiffel.js
rename to www/code/codemirror-5.13.2/mode/eiffel/eiffel.js
diff --git a/www/code/mode/eiffel/index.html b/www/code/codemirror-5.13.2/mode/eiffel/index.html
similarity index 100%
rename from www/code/mode/eiffel/index.html
rename to www/code/codemirror-5.13.2/mode/eiffel/index.html
diff --git a/www/code/mode/elm/elm.js b/www/code/codemirror-5.13.2/mode/elm/elm.js
similarity index 100%
rename from www/code/mode/elm/elm.js
rename to www/code/codemirror-5.13.2/mode/elm/elm.js
diff --git a/www/code/mode/elm/index.html b/www/code/codemirror-5.13.2/mode/elm/index.html
similarity index 100%
rename from www/code/mode/elm/index.html
rename to www/code/codemirror-5.13.2/mode/elm/index.html
diff --git a/www/code/mode/erlang/erlang.js b/www/code/codemirror-5.13.2/mode/erlang/erlang.js
similarity index 100%
rename from www/code/mode/erlang/erlang.js
rename to www/code/codemirror-5.13.2/mode/erlang/erlang.js
diff --git a/www/code/mode/erlang/index.html b/www/code/codemirror-5.13.2/mode/erlang/index.html
similarity index 100%
rename from www/code/mode/erlang/index.html
rename to www/code/codemirror-5.13.2/mode/erlang/index.html
diff --git a/www/code/mode/factor/factor.js b/www/code/codemirror-5.13.2/mode/factor/factor.js
similarity index 100%
rename from www/code/mode/factor/factor.js
rename to www/code/codemirror-5.13.2/mode/factor/factor.js
diff --git a/www/code/mode/factor/index.html b/www/code/codemirror-5.13.2/mode/factor/index.html
similarity index 100%
rename from www/code/mode/factor/index.html
rename to www/code/codemirror-5.13.2/mode/factor/index.html
diff --git a/www/code/codemirror-5.13.2/mode/fcl/fcl.js b/www/code/codemirror-5.13.2/mode/fcl/fcl.js
new file mode 100644
index 000000000..518116976
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/fcl/fcl.js
@@ -0,0 +1,173 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("fcl", function(config) {
+  var indentUnit = config.indentUnit;
+
+  var keywords = {
+      "term": true,
+      "method": true, "accu": true,
+      "rule": true, "then": true, "is": true, "and": true, "or": true,
+      "if": true, "default": true
+  };
+
+  var start_blocks = {
+      "var_input": true,
+      "var_output": true,
+      "fuzzify": true,
+      "defuzzify": true,
+      "function_block": true,
+      "ruleblock": true
+  };
+
+  var end_blocks = {
+      "end_ruleblock": true,
+      "end_defuzzify": true,
+      "end_function_block": true,
+      "end_fuzzify": true,
+      "end_var": true
+  };
+
+  var atoms = {
+      "true": true, "false": true, "nan": true,
+      "real": true, "min": true, "max": true, "cog": true, "cogs": true
+  };
+
+  var isOperatorChar = /[+\-*&^%:=<>!|\/]/;
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+
+    if (/[\d\.]/.test(ch)) {
+      if (ch == ".") {
+        stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
+      } else if (ch == "0") {
+        stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
+      } else {
+        stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
+      }
+      return "number";
+    }
+
+    if (ch == "/" || ch == "(") {
+      if (stream.eat("*")) {
+        state.tokenize = tokenComment;
+        return tokenComment(stream, state);
+      }
+      if (stream.eat("/")) {
+        stream.skipToEnd();
+        return "comment";
+      }
+    }
+    if (isOperatorChar.test(ch)) {
+      stream.eatWhile(isOperatorChar);
+      return "operator";
+    }
+    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
+
+    var cur = stream.current().toLowerCase();
+    if (keywords.propertyIsEnumerable(cur) ||
+        start_blocks.propertyIsEnumerable(cur) ||
+        end_blocks.propertyIsEnumerable(cur)) {
+      return "keyword";
+    }
+    if (atoms.propertyIsEnumerable(cur)) return "atom";
+    return "variable";
+  }
+
+
+  function tokenComment(stream, state) {
+    var maybeEnd = false, ch;
+    while (ch = stream.next()) {
+      if ((ch == "/" || ch == ")") && maybeEnd) {
+        state.tokenize = tokenBase;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return "comment";
+  }
+
+  function Context(indented, column, type, align, prev) {
+    this.indented = indented;
+    this.column = column;
+    this.type = type;
+    this.align = align;
+    this.prev = prev;
+  }
+
+  function pushContext(state, col, type) {
+    return state.context = new Context(state.indented, col, type, null, state.context);
+  }
+
+  function popContext(state) {
+    if (!state.context.prev) return;
+    var t = state.context.type;
+    if (t == "end_block")
+      state.indented = state.context.indented;
+    return state.context = state.context.prev;
+  }
+
+  // Interface
+
+  return {
+    startState: function(basecolumn) {
+      return {
+        tokenize: null,
+        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
+        indented: 0,
+        startOfLine: true
+      };
+    },
+
+    token: function(stream, state) {
+        var ctx = state.context;
+        if (stream.sol()) {
+            if (ctx.align == null) ctx.align = false;
+            state.indented = stream.indentation();
+            state.startOfLine = true;
+        }
+        if (stream.eatSpace()) return null;
+
+        var style = (state.tokenize || tokenBase)(stream, state);
+        if (style == "comment") return style;
+        if (ctx.align == null) ctx.align = true;
+
+        var cur = stream.current().toLowerCase();
+
+        if (start_blocks.propertyIsEnumerable(cur)) pushContext(state, stream.column(), "end_block");
+        else if (end_blocks.propertyIsEnumerable(cur))  popContext(state);
+
+        state.startOfLine = false;
+        return style;
+    },
+
+    indent: function(state, textAfter) {
+      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
+      var ctx = state.context;
+
+      var closing = end_blocks.propertyIsEnumerable(textAfter);
+      if (ctx.align) return ctx.column + (closing ? 0 : 1);
+      else return ctx.indented + (closing ? 0 : indentUnit);
+    },
+
+    electricChars: "ryk",
+    fold: "brace",
+    blockCommentStart: "(*",
+    blockCommentEnd: "*)",
+    lineComment: "//"
+  };
+});
+
+CodeMirror.defineMIME("text/x-fcl", "fcl");
+});
diff --git a/www/code/codemirror-5.13.2/mode/fcl/index.html b/www/code/codemirror-5.13.2/mode/fcl/index.html
new file mode 100644
index 000000000..3c18d0b3c
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/fcl/index.html
@@ -0,0 +1,108 @@
+
+
+CodeMirror: FCL mode
+
+
+
+
+
+
+
+
+
+
+
+

+
FCL mode

+

+
+    
+
+    
MIME type: text/x-fcl

+  

diff --git a/www/code/mode/forth/forth.js b/www/code/codemirror-5.13.2/mode/forth/forth.js
similarity index 100%
rename from www/code/mode/forth/forth.js
rename to www/code/codemirror-5.13.2/mode/forth/forth.js
diff --git a/www/code/mode/forth/index.html b/www/code/codemirror-5.13.2/mode/forth/index.html
similarity index 100%
rename from www/code/mode/forth/index.html
rename to www/code/codemirror-5.13.2/mode/forth/index.html
diff --git a/www/code/mode/fortran/fortran.js b/www/code/codemirror-5.13.2/mode/fortran/fortran.js
similarity index 100%
rename from www/code/mode/fortran/fortran.js
rename to www/code/codemirror-5.13.2/mode/fortran/fortran.js
diff --git a/www/code/mode/fortran/index.html b/www/code/codemirror-5.13.2/mode/fortran/index.html
similarity index 100%
rename from www/code/mode/fortran/index.html
rename to www/code/codemirror-5.13.2/mode/fortran/index.html
diff --git a/www/code/mode/gas/gas.js b/www/code/codemirror-5.13.2/mode/gas/gas.js
similarity index 100%
rename from www/code/mode/gas/gas.js
rename to www/code/codemirror-5.13.2/mode/gas/gas.js
diff --git a/www/code/mode/gas/index.html b/www/code/codemirror-5.13.2/mode/gas/index.html
similarity index 100%
rename from www/code/mode/gas/index.html
rename to www/code/codemirror-5.13.2/mode/gas/index.html
diff --git a/www/code/mode/gfm/gfm.js b/www/code/codemirror-5.13.2/mode/gfm/gfm.js
similarity index 100%
rename from www/code/mode/gfm/gfm.js
rename to www/code/codemirror-5.13.2/mode/gfm/gfm.js
diff --git a/www/code/mode/gfm/index.html b/www/code/codemirror-5.13.2/mode/gfm/index.html
similarity index 100%
rename from www/code/mode/gfm/index.html
rename to www/code/codemirror-5.13.2/mode/gfm/index.html
diff --git a/www/code/mode/gfm/test.js b/www/code/codemirror-5.13.2/mode/gfm/test.js
similarity index 100%
rename from www/code/mode/gfm/test.js
rename to www/code/codemirror-5.13.2/mode/gfm/test.js
diff --git a/www/code/mode/gherkin/gherkin.js b/www/code/codemirror-5.13.2/mode/gherkin/gherkin.js
similarity index 100%
rename from www/code/mode/gherkin/gherkin.js
rename to www/code/codemirror-5.13.2/mode/gherkin/gherkin.js
diff --git a/www/code/mode/gherkin/index.html b/www/code/codemirror-5.13.2/mode/gherkin/index.html
similarity index 100%
rename from www/code/mode/gherkin/index.html
rename to www/code/codemirror-5.13.2/mode/gherkin/index.html
diff --git a/www/code/mode/go/go.js b/www/code/codemirror-5.13.2/mode/go/go.js
similarity index 100%
rename from www/code/mode/go/go.js
rename to www/code/codemirror-5.13.2/mode/go/go.js
diff --git a/www/code/mode/go/index.html b/www/code/codemirror-5.13.2/mode/go/index.html
similarity index 100%
rename from www/code/mode/go/index.html
rename to www/code/codemirror-5.13.2/mode/go/index.html
diff --git a/www/code/mode/groovy/groovy.js b/www/code/codemirror-5.13.2/mode/groovy/groovy.js
similarity index 100%
rename from www/code/mode/groovy/groovy.js
rename to www/code/codemirror-5.13.2/mode/groovy/groovy.js
diff --git a/www/code/mode/groovy/index.html b/www/code/codemirror-5.13.2/mode/groovy/index.html
similarity index 100%
rename from www/code/mode/groovy/index.html
rename to www/code/codemirror-5.13.2/mode/groovy/index.html
diff --git a/www/code/mode/haml/haml.js b/www/code/codemirror-5.13.2/mode/haml/haml.js
similarity index 97%
rename from www/code/mode/haml/haml.js
rename to www/code/codemirror-5.13.2/mode/haml/haml.js
index 8fe63b020..03ce83355 100644
--- a/www/code/mode/haml/haml.js
+++ b/www/code/codemirror-5.13.2/mode/haml/haml.js
@@ -85,8 +85,10 @@
           state.tokenize = rubyInQuote(")");
           return state.tokenize(stream, state);
         } else if (ch == "{") {
-          state.tokenize = rubyInQuote("}");
-          return state.tokenize(stream, state);
+          if (!stream.match(/^\{%.*/)) {
+            state.tokenize = rubyInQuote("}");
+            return state.tokenize(stream, state);
+          }
         }
       }
 
diff --git a/www/code/mode/haml/index.html b/www/code/codemirror-5.13.2/mode/haml/index.html
similarity index 100%
rename from www/code/mode/haml/index.html
rename to www/code/codemirror-5.13.2/mode/haml/index.html
diff --git a/www/code/mode/haml/test.js b/www/code/codemirror-5.13.2/mode/haml/test.js
similarity index 100%
rename from www/code/mode/haml/test.js
rename to www/code/codemirror-5.13.2/mode/haml/test.js
diff --git a/www/code/mode/handlebars/handlebars.js b/www/code/codemirror-5.13.2/mode/handlebars/handlebars.js
similarity index 67%
rename from www/code/mode/handlebars/handlebars.js
rename to www/code/codemirror-5.13.2/mode/handlebars/handlebars.js
index 40dfea42a..2174e5384 100644
--- a/www/code/mode/handlebars/handlebars.js
+++ b/www/code/codemirror-5.13.2/mode/handlebars/handlebars.js
@@ -3,15 +3,15 @@
 
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"), require("../../addon/mode/multiplex"));
   else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
+    define(["../../lib/codemirror", "../../addon/mode/simple", "../../addon/mode/multiplex"], mod);
   else // Plain browser env
     mod(CodeMirror);
 })(function(CodeMirror) {
   "use strict";
 
-  CodeMirror.defineSimpleMode("handlebars", {
+  CodeMirror.defineSimpleMode("handlebars-tags", {
     start: [
       { regex: /\{\{!--/, push: "dash_comment", token: "comment" },
       { regex: /\{\{!/,   push: "comment", token: "comment" },
@@ -21,8 +21,8 @@
       { regex: /\}\}/, pop: true, token: "tag" },
 
       // Double and single quotes
-      { regex: /"(?:[^\\]|\\.)*?"/, token: "string" },
-      { regex: /'(?:[^\\]|\\.)*?'/, token: "string" },
+      { regex: /"(?:[^\\"]|\\.)*"?/, token: "string" },
+      { regex: /'(?:[^\\']|\\.)*'?/, token: "string" },
 
       // Handlebars keywords
       { regex: />|[#\/]([A-Za-z_]\w*)/, token: "keyword" },
@@ -49,5 +49,14 @@
     ]
   });
 
+  CodeMirror.defineMode("handlebars", function(config, parserConfig) {
+    var handlebars = CodeMirror.getMode(config, "handlebars-tags");
+    if (!parserConfig || !parserConfig.base) return handlebars;
+    return CodeMirror.multiplexingMode(
+      CodeMirror.getMode(config, parserConfig.base),
+      {open: "{{", close: "}}", mode: handlebars, parseDelimiters: true}
+    );
+  });
+
   CodeMirror.defineMIME("text/x-handlebars-template", "handlebars");
 });
diff --git a/www/code/mode/handlebars/index.html b/www/code/codemirror-5.13.2/mode/handlebars/index.html
similarity index 84%
rename from www/code/mode/handlebars/index.html
rename to www/code/codemirror-5.13.2/mode/handlebars/index.html
index beaef87a1..b1bfad1ca 100644
--- a/www/code/mode/handlebars/index.html
+++ b/www/code/codemirror-5.13.2/mode/handlebars/index.html
@@ -61,23 +61,19 @@
 
 
     
-    
-
+    
     
Handlebars syntax highlighting for CodeMirror.

 
     
MIME types defined: text/x-handlebars-template

+
+    
Supported options: base to set the mode to
+    wrap. For example, use

+    
mode: {name: "handlebars", base: "text/html"}

+    
to highlight an HTML template.

 
diff --git a/www/code/codemirror-5.13.2/mode/haskell-literate/haskell-literate.js b/www/code/codemirror-5.13.2/mode/haskell-literate/haskell-literate.js
new file mode 100644
index 000000000..906415b4c
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/haskell-literate/haskell-literate.js
@@ -0,0 +1,43 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function (mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../haskell/haskell"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../haskell/haskell"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function (CodeMirror) {
+  "use strict"
+
+  CodeMirror.defineMode("haskell-literate", function (config, parserConfig) {
+    var baseMode = CodeMirror.getMode(config, (parserConfig && parserConfig.base) || "haskell")
+
+    return {
+      startState: function () {
+        return {
+          inCode: false,
+          baseState: CodeMirror.startState(baseMode)
+        }
+      },
+      token: function (stream, state) {
+        if (stream.sol()) {
+          if (state.inCode = stream.eat(">"))
+            return "meta"
+        }
+        if (state.inCode) {
+          return baseMode.token(stream, state.baseState)
+        } else {
+          stream.skipToEnd()
+          return "comment"
+        }
+      },
+      innerMode: function (state) {
+        return state.inCode ? {state: state.baseState, mode: baseMode} : null
+      }
+    }
+  }, "haskell")
+
+  CodeMirror.defineMIME("text/x-literate-haskell", "haskell-literate")
+});
diff --git a/www/code/codemirror-5.13.2/mode/haskell-literate/index.html b/www/code/codemirror-5.13.2/mode/haskell-literate/index.html
new file mode 100644
index 000000000..8c9bc60d1
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/haskell-literate/index.html
@@ -0,0 +1,282 @@
+
+
+CodeMirror: Haskell-literate mode
+
+
+
+
+
+
+
+
+
+
+

+  
Haskell literate mode

+  

+    
+  

+
+  
MIME types
+  defined: text/x-literate-haskell.

+
+  
Parser configuration parameters recognized: base to
+  set the base mode (defaults to "haskell").

+
+  
+
+

diff --git a/www/code/mode/haskell/haskell.js b/www/code/codemirror-5.13.2/mode/haskell/haskell.js
similarity index 100%
rename from www/code/mode/haskell/haskell.js
rename to www/code/codemirror-5.13.2/mode/haskell/haskell.js
diff --git a/www/code/mode/haskell/index.html b/www/code/codemirror-5.13.2/mode/haskell/index.html
similarity index 100%
rename from www/code/mode/haskell/index.html
rename to www/code/codemirror-5.13.2/mode/haskell/index.html
diff --git a/www/code/mode/haxe/haxe.js b/www/code/codemirror-5.13.2/mode/haxe/haxe.js
similarity index 97%
rename from www/code/mode/haxe/haxe.js
rename to www/code/codemirror-5.13.2/mode/haxe/haxe.js
index 73cd6213a..a9573dd71 100644
--- a/www/code/mode/haxe/haxe.js
+++ b/www/code/codemirror-5.13.2/mode/haxe/haxe.js
@@ -191,13 +191,20 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
     pass.apply(null, arguments);
     return true;
   }
+  function inList(name, list) {
+    for (var v = list; v; v = v.next)
+      if (v.name == name) return true;
+    return false;
+  }
   function register(varname) {
     var state = cx.state;
     if (state.context) {
       cx.marked = "def";
-      for (var v = state.localVars; v; v = v.next)
-        if (v.name == varname) return;
+      if (inList(varname, state.localVars)) return;
       state.localVars = {name: varname, next: state.localVars};
+    } else if (state.globalVars) {
+      if (inList(varname, state.globalVars)) return;
+      state.globalVars = {name: varname, next: state.globalVars};
     }
   }
 
@@ -380,11 +387,10 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
   }
 
   // Interface
-
   return {
     startState: function(basecolumn) {
       var defaulttypes = ["Int", "Float", "String", "Void", "Std", "Bool", "Dynamic", "Array"];
-      return {
+      var state = {
         tokenize: haxeTokenBase,
         reAllowed: true,
         kwAllowed: true,
@@ -395,6 +401,9 @@ CodeMirror.defineMode("haxe", function(config, parserConfig) {
         context: parserConfig.localVars && {vars: parserConfig.localVars},
         indented: 0
       };
+      if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
+        state.globalVars = parserConfig.globalVars;
+      return state;
     },
 
     token: function(stream, state) {
diff --git a/www/code/mode/haxe/index.html b/www/code/codemirror-5.13.2/mode/haxe/index.html
similarity index 100%
rename from www/code/mode/haxe/index.html
rename to www/code/codemirror-5.13.2/mode/haxe/index.html
diff --git a/www/code/mode/htmlembedded/htmlembedded.js b/www/code/codemirror-5.13.2/mode/htmlembedded/htmlembedded.js
similarity index 100%
rename from www/code/mode/htmlembedded/htmlembedded.js
rename to www/code/codemirror-5.13.2/mode/htmlembedded/htmlembedded.js
diff --git a/www/code/mode/htmlembedded/index.html b/www/code/codemirror-5.13.2/mode/htmlembedded/index.html
similarity index 100%
rename from www/code/mode/htmlembedded/index.html
rename to www/code/codemirror-5.13.2/mode/htmlembedded/index.html
diff --git a/www/code/mode/htmlmixed/htmlmixed.js b/www/code/codemirror-5.13.2/mode/htmlmixed/htmlmixed.js
similarity index 76%
rename from www/code/mode/htmlmixed/htmlmixed.js
rename to www/code/codemirror-5.13.2/mode/htmlmixed/htmlmixed.js
index 670fd62bf..6574fbd56 100644
--- a/www/code/mode/htmlmixed/htmlmixed.js
+++ b/www/code/codemirror-5.13.2/mode/htmlmixed/htmlmixed.js
@@ -44,13 +44,9 @@
     return attrRegexpCache[attr] = new RegExp("\\s+" + attr + "\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*");
   }
 
-  function getAttrValue(stream, attr) {
-    var pos = stream.pos, match;
-    while (pos >= 0 && stream.string.charAt(pos) !== "<") pos--;
-    if (pos < 0) return pos;
-    if (match = stream.string.slice(pos, stream.pos).match(getAttrRegexp(attr)))
-      return match[2];
-    return "";
+  function getAttrValue(text, attr) {
+    var match = text.match(getAttrRegexp(attr))
+    return match ? match[2] : ""
   }
 
   function getTagRegexp(tagName, anchored) {
@@ -66,10 +62,10 @@
     }
   }
 
-  function findMatchingMode(tagInfo, stream) {
+  function findMatchingMode(tagInfo, tagText) {
     for (var i = 0; i < tagInfo.length; i++) {
       var spec = tagInfo[i];
-      if (!spec[0] || spec[1].test(getAttrValue(stream, spec[0]))) return spec[2];
+      if (!spec[0] || spec[1].test(getAttrValue(tagText, spec[0]))) return spec[2];
     }
   }
 
@@ -89,15 +85,17 @@
       tags.script.unshift(["type", configScript[i].matches, configScript[i].mode])
 
     function html(stream, state) {
-      var tagName = state.htmlState.tagName;
-      var tagInfo = tagName && tags[tagName.toLowerCase()];
-
-      var style = htmlMode.token(stream, state.htmlState), modeSpec;
-
-      if (tagInfo && /\btag\b/.test(style) && stream.current() === ">" &&
-          (modeSpec = findMatchingMode(tagInfo, stream))) {
-        var mode = CodeMirror.getMode(config, modeSpec);
-        var endTagA = getTagRegexp(tagName, true), endTag = getTagRegexp(tagName, false);
+      var style = htmlMode.token(stream, state.htmlState), tag = /\btag\b/.test(style), tagName
+      if (tag && !/[<>\s\/]/.test(stream.current()) &&
+          (tagName = state.htmlState.tagName && state.htmlState.tagName.toLowerCase()) &&
+          tags.hasOwnProperty(tagName)) {
+        state.inTag = tagName + " "
+      } else if (state.inTag && tag && />$/.test(stream.current())) {
+        var inTag = /^([\S]+) (.*)/.exec(state.inTag)
+        state.inTag = null
+        var modeSpec = stream.current() == ">" && findMatchingMode(tags[inTag[1]], inTag[2])
+        var mode = CodeMirror.getMode(config, modeSpec)
+        var endTagA = getTagRegexp(inTag[1], true), endTag = getTagRegexp(inTag[1], false);
         state.token = function (stream, state) {
           if (stream.match(endTagA, false)) {
             state.token = html;
@@ -108,6 +106,9 @@
         };
         state.localMode = mode;
         state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, ""));
+      } else if (state.inTag) {
+        state.inTag += stream.current()
+        if (stream.eol()) state.inTag += " "
       }
       return style;
     };
@@ -115,7 +116,7 @@
     return {
       startState: function () {
         var state = htmlMode.startState();
-        return {token: html, localMode: null, localState: null, htmlState: state};
+        return {token: html, inTag: null, localMode: null, localState: null, htmlState: state};
       },
 
       copyState: function (state) {
@@ -123,7 +124,8 @@
         if (state.localState) {
           local = CodeMirror.copyState(state.localMode, state.localState);
         }
-        return {token: state.token, localMode: state.localMode, localState: local,
+        return {token: state.token, inTag: state.inTag,
+                localMode: state.localMode, localState: local,
                 htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
       },
 
diff --git a/www/code/mode/htmlmixed/index.html b/www/code/codemirror-5.13.2/mode/htmlmixed/index.html
similarity index 100%
rename from www/code/mode/htmlmixed/index.html
rename to www/code/codemirror-5.13.2/mode/htmlmixed/index.html
diff --git a/www/code/mode/http/http.js b/www/code/codemirror-5.13.2/mode/http/http.js
similarity index 100%
rename from www/code/mode/http/http.js
rename to www/code/codemirror-5.13.2/mode/http/http.js
diff --git a/www/code/mode/http/index.html b/www/code/codemirror-5.13.2/mode/http/index.html
similarity index 100%
rename from www/code/mode/http/index.html
rename to www/code/codemirror-5.13.2/mode/http/index.html
diff --git a/www/code/mode/idl/idl.js b/www/code/codemirror-5.13.2/mode/idl/idl.js
similarity index 100%
rename from www/code/mode/idl/idl.js
rename to www/code/codemirror-5.13.2/mode/idl/idl.js
diff --git a/www/code/mode/idl/index.html b/www/code/codemirror-5.13.2/mode/idl/index.html
similarity index 100%
rename from www/code/mode/idl/index.html
rename to www/code/codemirror-5.13.2/mode/idl/index.html
diff --git a/www/code/mode/index.html b/www/code/codemirror-5.13.2/mode/index.html
similarity index 92%
rename from www/code/mode/index.html
rename to www/code/codemirror-5.13.2/mode/index.html
index f63e83684..5e77655bf 100644
--- a/www/code/mode/index.html
+++ b/www/code/codemirror-5.13.2/mode/index.html
@@ -35,12 +35,14 @@ option.

       
  • Asterisk dialplan
    • 
       
  • Brainfuck
    • 
       
  • C, C++, C#
    • 
+      
  • Ceylon
    • 
       
  • Clojure
    • 
       
  • Closure Stylesheets (GSS)
    • 
       
  • CMake
    • 
       
  • COBOL
    • 
       
  • CoffeeScript
    • 
       
  • Common Lisp
    • 
+      
  • Crystal
    • 
       
  • CSS
    • 
       
  • Cypher
    • 
       
  • Cython
    • 
@@ -57,6 +59,7 @@ option.
    
       
  • Elm
    • 
       
  • Erlang
    • 
       
  • Factor
    • 
+      
  • FCL
    • 
       
  • Forth
    • 
       
  • Fortran
    • 
       
  • F#
    • 
@@ -66,7 +69,7 @@ option.
    
       
  • Groovy
    • 
       
  • HAML
    • 
       
  • Handlebars
    • 
-      
  • Haskell
    • 
+      
  • Haskell (Literate)
    • 
       
  • Haxe
    • 
       
  • HTML embedded (JSP, ASP.NET)
    • 
       
  • HTML mixed-mode
    • 
@@ -74,7 +77,7 @@ option.
    
       
  • IDL
    • 
       
  • Java
    • 
       
  • Jade
    • 
-      
  • JavaScript
    • 
+      
  • JavaScript (JSX)
    • 
       
  • Jinja2
    • 
       
  • Julia
    • 
       
  • Kotlin
    • 
@@ -85,8 +88,10 @@ option.
    
       
  • Mathematica
    • 
       
  • mIRC
    • 
       
  • Modelica
    • 
+      
  • MscGen
    • 
       
  • MUMPS
    • 
       
  • Nginx
    • 
+      
  • NSIS
    • 
       
  • NTriples
    • 
       
  • Objective C
    • 
       
  • OCaml
    • 
@@ -99,6 +104,7 @@ option.
    
       
  • PHP
    • 
       
  • Pig Latin
    • 
       
  • Properties files
    • 
+      
  • ProtoBuf
    • 
       
  • Puppet
    • 
       
  • Python
    • 
       
  • Q
    • 
@@ -145,6 +151,7 @@ option.
    
       
  • XML/HTML
    • 
       
  • XQuery
    • 
       
  • YAML
    • 
+      
  • YAML frontmatter
    • 
       
  • Z80
    • 
     
   
diff --git a/www/code/mode/jade/index.html b/www/code/codemirror-5.13.2/mode/jade/index.html
similarity index 100%
rename from www/code/mode/jade/index.html
rename to www/code/codemirror-5.13.2/mode/jade/index.html
diff --git a/www/code/mode/jade/jade.js b/www/code/codemirror-5.13.2/mode/jade/jade.js
similarity index 99%
rename from www/code/mode/jade/jade.js
rename to www/code/codemirror-5.13.2/mode/jade/jade.js
index 96fadb19e..1db069a90 100644
--- a/www/code/mode/jade/jade.js
+++ b/www/code/codemirror-5.13.2/mode/jade/jade.js
@@ -74,7 +74,7 @@ CodeMirror.defineMode('jade', function (config) {
     res.javaScriptArguments = this.javaScriptArguments;
     res.javaScriptArgumentsDepth = this.javaScriptArgumentsDepth;
     res.isInterpolating = this.isInterpolating;
-    res.interpolationNesting = this.intpolationNesting;
+    res.interpolationNesting = this.interpolationNesting;
 
     res.jsState = CodeMirror.copyState(jsMode, this.jsState);
 
@@ -167,7 +167,7 @@ CodeMirror.defineMode('jade', function (config) {
         if (state.interpolationNesting < 0) {
           stream.next();
           state.isInterpolating = false;
-          return 'puncutation';
+          return 'punctuation';
         }
       } else if (stream.peek() === '{') {
         state.interpolationNesting++;
@@ -583,7 +583,7 @@ CodeMirror.defineMode('jade', function (config) {
     copyState: copyState,
     token: nextToken
   };
-});
+}, 'javascript', 'css', 'htmlmixed');
 
 CodeMirror.defineMIME('text/x-jade', 'jade');
 
diff --git a/www/code/mode/javascript/index.html b/www/code/codemirror-5.13.2/mode/javascript/index.html
similarity index 100%
rename from www/code/mode/javascript/index.html
rename to www/code/codemirror-5.13.2/mode/javascript/index.html
diff --git a/www/code/mode/javascript/javascript.js b/www/code/codemirror-5.13.2/mode/javascript/javascript.js
similarity index 91%
rename from www/code/mode/javascript/javascript.js
rename to www/code/codemirror-5.13.2/mode/javascript/javascript.js
index 032c20759..fa5721d5d 100644
--- a/www/code/mode/javascript/javascript.js
+++ b/www/code/codemirror-5.13.2/mode/javascript/javascript.js
@@ -13,6 +13,11 @@
 })(function(CodeMirror) {
 "use strict";
 
+function expressionAllowed(stream, state, backUp) {
+  return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
+    (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
+}
+
 CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var statementIndent = parserConfig.statementIndent;
@@ -30,14 +35,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     var jsKeywords = {
       "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C, "debugger": C,
+      "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "throw": C, "debugger": C,
       "var": kw("var"), "const": kw("var"), "let": kw("var"),
-      "async": kw("async"), "function": kw("function"), "catch": kw("catch"),
+      "function": kw("function"), "catch": kw("catch"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
       "in": operator, "typeof": operator, "instanceof": operator,
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
       "this": kw("this"), "class": kw("class"), "super": kw("atom"),
-      "await": C, "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
+      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
     };
 
     // Extend the 'normal' keywords with the TypeScript language extensions
@@ -45,18 +50,23 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       var type = {type: "variable", style: "variable-3"};
       var tsKeywords = {
         // object-like things
-        "interface": kw("interface"),
-        "extends": kw("extends"),
-        "constructor": kw("constructor"),
+        "interface": kw("class"),
+        "implements": C,
+        "namespace": C,
+        "module": kw("module"),
+        "enum": kw("module"),
 
         // scope modifiers
-        "public": kw("public"),
-        "private": kw("private"),
-        "protected": kw("protected"),
-        "static": kw("static"),
+        "public": kw("modifier"),
+        "private": kw("modifier"),
+        "protected": kw("modifier"),
+        "abstract": kw("modifier"),
+
+        // operators
+        "as": operator,
 
         // types
-        "string": type, "number": type, "bool": type, "any": type
+        "string": type, "number": type, "boolean": type, "any": type
       };
 
       for (var attr in tsKeywords) {
@@ -121,8 +131,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (stream.eat("/")) {
         stream.skipToEnd();
         return ret("comment", "comment");
-      } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
-               state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
+      } else if (expressionAllowed(stream, state, 1)) {
         readRegexp(stream);
         stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
         return ret("regexp", "string-2");
@@ -281,8 +290,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return false;
     }
     var state = cx.state;
+    cx.marked = "def";
     if (state.context) {
-      cx.marked = "def";
       if (inList(state.localVars)) return;
       state.localVars = {name: varname, next: state.localVars};
     } else {
@@ -356,6 +365,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "class") return cont(pushlex("form"), className, poplex);
     if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
     if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
+    if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
   function expression(type) {
@@ -373,14 +383,14 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
     if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
-    if (type == "async") return cont(expression);
     if (type == "function") return cont(functiondef, maybeop);
     if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
     if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
     if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
-    if (type == "quasi") { return pass(quasi, maybeop); }
+    if (type == "quasi") return pass(quasi, maybeop);
+    if (type == "new") return cont(maybeTarget(noComma));
     return cont();
   }
   function maybeexpression(type) {
@@ -431,6 +441,18 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     findFatArrow(cx.stream, cx.state);
     return pass(type == "{" ? statement : expressionNoComma);
   }
+  function maybeTarget(noComma) {
+    return function(type) {
+      if (type == ".") return cont(noComma ? targetNoComma : target);
+      else return pass(noComma ? expressionNoComma : expression);
+    };
+  }
+  function target(_, value) {
+    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorComma); }
+  }
+  function targetNoComma(_, value) {
+    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorNoComma); }
+  }
   function maybelabel(type) {
     if (type == ":") return cont(poplex, statement);
     return pass(maybeoperatorComma, expect(";"), poplex);
@@ -439,9 +461,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {cx.marked = "property"; return cont();}
   }
   function objprop(type, value) {
-    if (type == "async") {
-      return cont(objprop);
-    } else if (type == "variable" || cx.style == "keyword") {
+    if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property";
       if (value == "get" || value == "set") return cont(getterSetter);
       return cont(afterprop);
@@ -450,8 +470,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(afterprop);
     } else if (type == "jsonld-keyword") {
       return cont(afterprop);
+    } else if (type == "modifier") {
+      return cont(objprop)
     } else if (type == "[") {
       return cont(expression, expect("]"), afterprop);
+    } else if (type == "spread") {
+      return cont(expression);
     }
   }
   function getterSetter(type) {
@@ -500,7 +524,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     return pass(pattern, maybetype, maybeAssign, vardefCont);
   }
   function pattern(type, value) {
+    if (type == "modifier") return cont(pattern)
     if (type == "variable") { register(value); return cont(); }
+    if (type == "spread") return cont(pattern);
     if (type == "[") return contCommasep(pattern, "]");
     if (type == "{") return contCommasep(proppattern, "}");
   }
@@ -510,6 +536,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(maybeAssign);
     }
     if (type == "variable") cx.marked = "property";
+    if (type == "spread") return cont(pattern);
+    if (type == "}") return pass();
     return cont(expect(":"), pattern, maybeAssign);
   }
   function maybeAssign(_type, value) {
@@ -632,7 +660,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
         localVars: parserConfig.localVars,
         context: parserConfig.localVars && {vars: parserConfig.localVars},
-        indented: 0
+        indented: basecolumn || 0
       };
       if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
         state.globalVars = parserConfig.globalVars;
@@ -688,7 +716,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     helperType: jsonMode ? "json" : "javascript",
     jsonldMode: jsonldMode,
-    jsonMode: jsonMode
+    jsonMode: jsonMode,
+
+    expressionAllowed: expressionAllowed,
+    skipExpression: function(state) {
+      var top = state.cc[state.cc.length - 1]
+      if (top == expression || top == expressionNoComma) state.cc.pop()
+    }
   };
 });
 
diff --git a/www/code/mode/javascript/json-ld.html b/www/code/codemirror-5.13.2/mode/javascript/json-ld.html
similarity index 100%
rename from www/code/mode/javascript/json-ld.html
rename to www/code/codemirror-5.13.2/mode/javascript/json-ld.html
diff --git a/www/code/mode/javascript/test.js b/www/code/codemirror-5.13.2/mode/javascript/test.js
similarity index 76%
rename from www/code/mode/javascript/test.js
rename to www/code/codemirror-5.13.2/mode/javascript/test.js
index 452de5fd6..cb43d0894 100644
--- a/www/code/mode/javascript/test.js
+++ b/www/code/codemirror-5.13.2/mode/javascript/test.js
@@ -6,7 +6,7 @@
   function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
 
   MT("locals",
-     "[keyword function] [variable foo]([def a], [def b]) { [keyword var] [def c] [operator =] [number 10]; [keyword return] [variable-2 a] [operator +] [variable-2 c] [operator +] [variable d]; }");
+     "[keyword function] [def foo]([def a], [def b]) { [keyword var] [def c] [operator =] [number 10]; [keyword return] [variable-2 a] [operator +] [variable-2 c] [operator +] [variable d]; }");
 
   MT("comma-and-binop",
      "[keyword function](){ [keyword var] [def x] [operator =] [number 1] [operator +] [number 2], [def y]; }");
@@ -17,8 +17,12 @@
      "  [[[variable-2 c], [variable y] ]] [operator =] [variable-2 c];",
      "})();");
 
+  MT("destructure_trailing_comma",
+    "[keyword let] {[def a], [def b],} [operator =] [variable foo];",
+    "[keyword let] [def c];"); // Parser still in good state?
+
   MT("class_body",
-     "[keyword class] [variable Foo] {",
+     "[keyword class] [def Foo] {",
      "  [property constructor]() {}",
      "  [property sayName]() {",
      "    [keyword return] [string-2 `foo${][variable foo][string-2 }oo`];",
@@ -26,7 +30,7 @@
      "}");
 
   MT("class",
-     "[keyword class] [variable Point] [keyword extends] [variable SuperThing] {",
+     "[keyword class] [def Point] [keyword extends] [variable SuperThing] {",
      "  [property get] [property prop]() { [keyword return] [number 24]; }",
      "  [property constructor]([def x], [def y]) {",
      "    [keyword super]([string 'something']);",
@@ -35,44 +39,44 @@
      "}");
 
   MT("import",
-     "[keyword function] [variable foo]() {",
+     "[keyword function] [def foo]() {",
      "  [keyword import] [def $] [keyword from] [string 'jquery'];",
      "  [keyword import] { [def encrypt], [def decrypt] } [keyword from] [string 'crypto'];",
      "}");
 
   MT("const",
-     "[keyword function] [variable f]() {",
+     "[keyword function] [def f]() {",
      "  [keyword const] [[ [def a], [def b] ]] [operator =] [[ [number 1], [number 2] ]];",
      "}");
 
   MT("for/of",
-     "[keyword for]([keyword let] [variable of] [keyword of] [variable something]) {}");
+     "[keyword for]([keyword let] [def of] [keyword of] [variable something]) {}");
 
   MT("generator",
-     "[keyword function*] [variable repeat]([def n]) {",
+     "[keyword function*] [def repeat]([def n]) {",
      "  [keyword for]([keyword var] [def i] [operator =] [number 0]; [variable-2 i] [operator <] [variable-2 n]; [operator ++][variable-2 i])",
      "    [keyword yield] [variable-2 i];",
      "}");
 
   MT("quotedStringAddition",
-     "[keyword let] [variable f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");
+     "[keyword let] [def f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");
 
   MT("quotedFatArrow",
-     "[keyword let] [variable f] [operator =] [variable a] [operator +] [string '=>'] [operator +] [variable c];");
+     "[keyword let] [def f] [operator =] [variable a] [operator +] [string '=>'] [operator +] [variable c];");
 
   MT("fatArrow",
      "[variable array].[property filter]([def a] [operator =>] [variable-2 a] [operator +] [number 1]);",
      "[variable a];", // No longer in scope
-     "[keyword let] [variable f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",
+     "[keyword let] [def f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",
      "[variable c];");
 
   MT("spread",
-     "[keyword function] [variable f]([def a], [meta ...][def b]) {",
+     "[keyword function] [def f]([def a], [meta ...][def b]) {",
      "  [variable something]([variable-2 a], [meta ...][variable-2 b]);",
      "}");
 
   MT("comprehension",
-     "[keyword function] [variable f]() {",
+     "[keyword function] [def f]() {",
      "  [[([variable x] [operator +] [number 1]) [keyword for] ([keyword var] [def x] [keyword in] [variable y]) [keyword if] [variable pred]([variable-2 x]) ]];",
      "  ([variable u] [keyword for] ([keyword var] [def u] [keyword of] [variable generateValues]()) [keyword if] ([variable-2 u].[property color] [operator ===] [string 'blue']));",
      "}");
@@ -84,7 +88,7 @@
      "[variable x] [operator =] [string-2 `fofdlakj${][variable x] [operator +] [string-2 `foo`] [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");
 
   MT("indent_statement",
-     "[keyword var] [variable x] [operator =] [number 10]",
+     "[keyword var] [def x] [operator =] [number 10]",
      "[variable x] [operator +=] [variable y] [operator +]",
      "  [atom Infinity]",
      "[keyword debugger];");
@@ -105,14 +109,14 @@
      "}");
 
   MT("indent_for",
-     "[keyword for] ([keyword var] [variable i] [operator =] [number 0];",
+     "[keyword for] ([keyword var] [def i] [operator =] [number 0];",
      "     [variable i] [operator <] [number 100];",
      "     [variable i][operator ++])",
      "  [variable doSomething]([variable i]);",
      "[keyword debugger];");
 
   MT("indent_c_style",
-     "[keyword function] [variable foo]()",
+     "[keyword function] [def foo]()",
      "{",
      "  [keyword debugger];",
      "}");
@@ -140,24 +144,32 @@
      "[number 2];");
 
   MT("multilinestring",
-     "[keyword var] [variable x] [operator =] [string 'foo\\]",
+     "[keyword var] [def x] [operator =] [string 'foo\\]",
      "[string bar'];");
 
   MT("scary_regexp",
      "[string-2 /foo[[/]]bar/];");
 
   MT("indent_strange_array",
-     "[keyword var] [variable x] [operator =] [[",
+     "[keyword var] [def x] [operator =] [[",
      "  [number 1],,",
      "  [number 2],",
      "]];",
      "[number 10];");
 
   MT("param_default",
-     "[keyword function] [variable foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",
+     "[keyword function] [def foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",
      "  [keyword return] [variable-2 x];",
      "}");
 
+  MT("new_target",
+     "[keyword function] [def F]([def target]) {",
+     "  [keyword if] ([variable-2 target] [operator &&] [keyword new].[keyword target].[property name]) {",
+     "    [keyword return] [keyword new]",
+     "      .[keyword target];",
+     "  }",
+     "}");
+
   var jsonld_mode = CodeMirror.getMode(
     {indentUnit: 2},
     {name: "javascript", jsonld: true}
diff --git a/www/code/mode/javascript/typescript.html b/www/code/codemirror-5.13.2/mode/javascript/typescript.html
similarity index 100%
rename from www/code/mode/javascript/typescript.html
rename to www/code/codemirror-5.13.2/mode/javascript/typescript.html
diff --git a/www/code/mode/jinja2/index.html b/www/code/codemirror-5.13.2/mode/jinja2/index.html
similarity index 100%
rename from www/code/mode/jinja2/index.html
rename to www/code/codemirror-5.13.2/mode/jinja2/index.html
diff --git a/www/code/mode/jinja2/jinja2.js b/www/code/codemirror-5.13.2/mode/jinja2/jinja2.js
similarity index 100%
rename from www/code/mode/jinja2/jinja2.js
rename to www/code/codemirror-5.13.2/mode/jinja2/jinja2.js
diff --git a/www/code/codemirror-5.13.2/mode/jsx/index.html b/www/code/codemirror-5.13.2/mode/jsx/index.html
new file mode 100644
index 000000000..cb51edb36
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/jsx/index.html
@@ -0,0 +1,89 @@
+
+
+CodeMirror: JSX mode
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    JSX mode
    
+
+
    
+
+
+
+
    JSX Mode for React's
+JavaScript syntax extension.
    
+
+
    MIME types defined: text/jsx.
    
+
+
    
diff --git a/www/code/codemirror-5.13.2/mode/jsx/jsx.js b/www/code/codemirror-5.13.2/mode/jsx/jsx.js
new file mode 100644
index 000000000..aff01b8d3
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/jsx/jsx.js
@@ -0,0 +1,147 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function(CodeMirror) {
+  "use strict"
+
+  // Depth means the amount of open braces in JS context, in XML
+  // context 0 means not in tag, 1 means in tag, and 2 means in tag
+  // and js block comment.
+  function Context(state, mode, depth, prev) {
+    this.state = state; this.mode = mode; this.depth = depth; this.prev = prev
+  }
+
+  function copyContext(context) {
+    return new Context(CodeMirror.copyState(context.mode, context.state),
+                       context.mode,
+                       context.depth,
+                       context.prev && copyContext(context.prev))
+  }
+
+  CodeMirror.defineMode("jsx", function(config, modeConfig) {
+    var xmlMode = CodeMirror.getMode(config, {name: "xml", allowMissing: true, multilineTagIndentPastTag: false})
+    var jsMode = CodeMirror.getMode(config, modeConfig && modeConfig.base || "javascript")
+
+    function flatXMLIndent(state) {
+      var tagName = state.tagName
+      state.tagName = null
+      var result = xmlMode.indent(state, "")
+      state.tagName = tagName
+      return result
+    }
+
+    function token(stream, state) {
+      if (state.context.mode == xmlMode)
+        return xmlToken(stream, state, state.context)
+      else
+        return jsToken(stream, state, state.context)
+    }
+
+    function xmlToken(stream, state, cx) {
+      if (cx.depth == 2) { // Inside a JS /* */ comment
+        if (stream.match(/^.*?\*\//)) cx.depth = 1
+        else stream.skipToEnd()
+        return "comment"
+      }
+
+      if (stream.peek() == "{") {
+        xmlMode.skipAttribute(cx.state)
+
+        var indent = flatXMLIndent(cx.state), xmlContext = cx.state.context
+        // If JS starts on same line as tag
+        if (xmlContext && stream.match(/^[^>]*>\s*$/, false)) {
+          while (xmlContext.prev && !xmlContext.startOfLine)
+            xmlContext = xmlContext.prev
+          // If tag starts the line, use XML indentation level
+          if (xmlContext.startOfLine) indent -= config.indentUnit
+          // Else use JS indentation level
+          else if (cx.prev.state.lexical) indent = cx.prev.state.lexical.indented
+        // Else if inside of tag
+        } else if (cx.depth == 1) {
+          indent += config.indentUnit
+        }
+
+        state.context = new Context(CodeMirror.startState(jsMode, indent),
+                                    jsMode, 0, state.context)
+        return null
+      }
+
+      if (cx.depth == 1) { // Inside of tag
+        if (stream.peek() == "<") { // Tag inside of tag
+          xmlMode.skipAttribute(cx.state)
+          state.context = new Context(CodeMirror.startState(xmlMode, flatXMLIndent(cx.state)),
+                                      xmlMode, 0, state.context)
+          return null
+        } else if (stream.match("//")) {
+          stream.skipToEnd()
+          return "comment"
+        } else if (stream.match("/*")) {
+          cx.depth = 2
+          return token(stream, state)
+        }
+      }
+
+      var style = xmlMode.token(stream, cx.state), cur = stream.current(), stop
+      if (/\btag\b/.test(style)) {
+        if (/>$/.test(cur)) {
+          if (cx.state.context) cx.depth = 0
+          else state.context = state.context.prev
+        } else if (/^ -1) {
+        stream.backUp(cur.length - stop)
+      }
+      return style
+    }
+
+    function jsToken(stream, state, cx) {
+      if (stream.peek() == "<" && jsMode.expressionAllowed(stream, cx.state)) {
+        jsMode.skipExpression(cx.state)
+        state.context = new Context(CodeMirror.startState(xmlMode, jsMode.indent(cx.state, "")),
+                                    xmlMode, 0, state.context)
+        return null
+      }
+
+      var style = jsMode.token(stream, cx.state)
+      if (!style && cx.depth != null) {
+        var cur = stream.current()
+        if (cur == "{") {
+          cx.depth++
+        } else if (cur == "}") {
+          if (--cx.depth == 0) state.context = state.context.prev
+        }
+      }
+      return style
+    }
+
+    return {
+      startState: function() {
+        return {context: new Context(CodeMirror.startState(jsMode), jsMode)}
+      },
+
+      copyState: function(state) {
+        return {context: copyContext(state.context)}
+      },
+
+      token: token,
+
+      indent: function(state, textAfter, fullLine) {
+        return state.context.mode.indent(state.context.state, textAfter, fullLine)
+      },
+
+      innerMode: function(state) {
+        return state.context
+      }
+    }
+  }, "xml", "javascript")
+
+  CodeMirror.defineMIME("text/jsx", "jsx")
+});
diff --git a/www/code/codemirror-5.13.2/mode/jsx/test.js b/www/code/codemirror-5.13.2/mode/jsx/test.js
new file mode 100644
index 000000000..c54a8b24c
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/jsx/test.js
@@ -0,0 +1,69 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "jsx")
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)) }
+
+  MT("selfclose",
+     "[keyword var] [def x] [operator =] [bracket&tag <] [tag foo] [bracket&tag />] [operator +] [number 1];")
+
+  MT("openclose",
+     "([bracket&tag <][tag foo][bracket&tag >]hello [atom &][bracket&tag ][operator ++])")
+
+  MT("attr",
+     "([bracket&tag <][tag foo] [attribute abc]=[string 'value'][bracket&tag >]hello [atom &][bracket&tag ][operator ++])")
+
+  MT("braced_attr",
+     "([bracket&tag <][tag foo] [attribute abc]={[number 10]}[bracket&tag >]hello [atom &][bracket&tag ][operator ++])")
+
+  MT("braced_text",
+     "([bracket&tag <][tag foo][bracket&tag >]hello {[number 10]} [atom &][bracket&tag ][operator ++])")
+
+  MT("nested_tag",
+     "([bracket&tag <][tag foo][bracket&tag ><][tag bar][bracket&tag >][operator ++])")
+
+  MT("nested_jsx",
+     "[keyword return] (",
+     "  [bracket&tag <][tag foo][bracket&tag >]",
+     "    say {[number 1] [operator +] [bracket&tag <][tag bar] [attribute attr]={[number 10]}[bracket&tag />]}!",
+     "  [bracket&tag ][operator ++]",
+     ")")
+
+  MT("preserve_js_context",
+     "[variable x] [operator =] [string-2 `quasi${][bracket&tag <][tag foo][bracket&tag />][string-2 }quoted`]")
+
+  MT("line_comment",
+     "([bracket&tag <][tag foo] [comment // hello]",
+     "   [bracket&tag >][operator ++])")
+
+  MT("line_comment_not_in_tag",
+     "([bracket&tag <][tag foo][bracket&tag >] // hello",
+     "  [bracket&tag ][operator ++])")
+
+  MT("block_comment",
+     "([bracket&tag <][tag foo] [comment /* hello]",
+     "[comment    line 2]",
+     "[comment    line 3 */] [bracket&tag >][operator ++])")
+
+  MT("block_comment_not_in_tag",
+     "([bracket&tag <][tag foo][bracket&tag >]/* hello",
+     "    line 2",
+     "    line 3 */ [bracket&tag ][operator ++])")
+
+  MT("missing_attr",
+     "([bracket&tag <][tag foo] [attribute selected][bracket&tag />][operator ++])")
+
+  MT("indent_js",
+     "([bracket&tag <][tag foo][bracket&tag >]",
+     "    [bracket&tag <][tag bar] [attribute baz]={[keyword function]() {",
+     "        [keyword return] [number 10]",
+     "      }}[bracket&tag />]",
+     "  [bracket&tag ])")
+
+  MT("spread",
+     "([bracket&tag <][tag foo] [attribute bar]={[meta ...][variable baz] [operator /][number 2]}[bracket&tag />])")
+
+  MT("tag_attribute",
+     "([bracket&tag <][tag foo] [attribute bar]=[bracket&tag <][tag foo][bracket&tag />/>][operator ++])")
+})()
diff --git a/www/code/mode/julia/index.html b/www/code/codemirror-5.13.2/mode/julia/index.html
similarity index 100%
rename from www/code/mode/julia/index.html
rename to www/code/codemirror-5.13.2/mode/julia/index.html
diff --git a/www/code/codemirror-5.13.2/mode/julia/julia.js b/www/code/codemirror-5.13.2/mode/julia/julia.js
new file mode 100644
index 000000000..004de4431
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/julia/julia.js
@@ -0,0 +1,392 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("julia", function(_conf, parserConf) {
+  var ERRORCLASS = 'error';
+
+  function wordRegexp(words, end) {
+    if (typeof end === 'undefined') { end = "\\b"; }
+    return new RegExp("^((" + words.join(")|(") + "))" + end);
+  }
+
+  var octChar = "\\\\[0-7]{1,3}";
+  var hexChar = "\\\\x[A-Fa-f0-9]{1,2}";
+  var specialChar = "\\\\[abfnrtv0%?'\"\\\\]";
+  var singleChar = "([^\\u0027\\u005C\\uD800-\\uDFFF]|[\\uD800-\\uDFFF][\\uDC00-\\uDFFF])";
+  var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b(?!\()|[\u2208\u2209](?!\()/;
+  var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
+  var identifiers = parserConf.identifiers || /^[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
+  var charsList = [octChar, hexChar, specialChar, singleChar];
+  var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch", "do"];
+  var blockClosers = ["end", "else", "elseif", "catch", "finally"];
+  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype'];
+  var builtinList = ['true', 'false', 'nothing', 'NaN', 'Inf'];
+
+  //var stringPrefixes = new RegExp("^[br]?('|\")")
+  var stringPrefixes = /^(`|"{3}|([brv]?"))/;
+  var chars = wordRegexp(charsList, "'");
+  var keywords = wordRegexp(keywordList);
+  var builtins = wordRegexp(builtinList);
+  var openers = wordRegexp(blockOpeners);
+  var closers = wordRegexp(blockClosers);
+  var macro = /^@[_A-Za-z][\w]*/;
+  var symbol = /^:[_A-Za-z\u00A1-\uFFFF][\w\u00A1-\uFFFF]*!*/;
+  var typeAnnotation = /^::[^,;"{()=$\s]+({[^}]*}+)*/;
+
+  function inArray(state) {
+    var ch = currentScope(state);
+    if (ch == '[') {
+      return true;
+    }
+    return false;
+  }
+
+  function currentScope(state) {
+    if (state.scopes.length == 0) {
+      return null;
+    }
+    return state.scopes[state.scopes.length - 1];
+  }
+
+  // tokenizers
+  function tokenBase(stream, state) {
+    // Handle multiline comments
+    if (stream.match(/^#=/, false)) {
+      state.tokenize = tokenComment;
+      return state.tokenize(stream, state);
+    }
+
+    // Handle scope changes
+    var leavingExpr = state.leavingExpr;
+    if (stream.sol()) {
+      leavingExpr = false;
+    }
+    state.leavingExpr = false;
+    if (leavingExpr) {
+      if (stream.match(/^'+/)) {
+        return 'operator';
+      }
+    }
+
+    if (stream.match(/^\.{2,3}/)) {
+      return 'operator';
+    }
+
+    if (stream.eatSpace()) {
+      return null;
+    }
+
+    var ch = stream.peek();
+
+    // Handle single line comments
+    if (ch === '#') {
+      stream.skipToEnd();
+      return 'comment';
+    }
+
+    if (ch === '[') {
+      state.scopes.push('[');
+    }
+
+    if (ch === '(') {
+      state.scopes.push('(');
+    }
+
+    var scope = currentScope(state);
+
+    if (scope == '[' && ch === ']') {
+      state.scopes.pop();
+      state.leavingExpr = true;
+    }
+
+    if (scope == '(' && ch === ')') {
+      state.scopes.pop();
+      state.leavingExpr = true;
+    }
+
+    var match;
+    if (!inArray(state) && (match=stream.match(openers, false))) {
+      state.scopes.push(match);
+    }
+
+    if (!inArray(state) && stream.match(closers, false)) {
+      state.scopes.pop();
+    }
+
+    if (inArray(state)) {
+      if (state.lastToken == 'end' && stream.match(/^:/)) {
+        return 'operator';
+      }
+      if (stream.match(/^end/)) {
+        return 'number';
+      }
+    }
+
+    if (stream.match(/^=>/)) {
+      return 'operator';
+    }
+
+    // Handle Number Literals
+    if (stream.match(/^[0-9\.]/, false)) {
+      var imMatcher = RegExp(/^im\b/);
+      var numberLiteral = false;
+      // Floats
+      if (stream.match(/^\d*\.(?!\.)\d*([Eef][\+\-]?\d+)?/i)) { numberLiteral = true; }
+      if (stream.match(/^\d+\.(?!\.)\d*/)) { numberLiteral = true; }
+      if (stream.match(/^\.\d+/)) { numberLiteral = true; }
+      if (stream.match(/^0x\.[0-9a-f]+p[\+\-]?\d+/i)) { numberLiteral = true; }
+      // Integers
+      if (stream.match(/^0x[0-9a-f]+/i)) { numberLiteral = true; } // Hex
+      if (stream.match(/^0b[01]+/i)) { numberLiteral = true; } // Binary
+      if (stream.match(/^0o[0-7]+/i)) { numberLiteral = true; } // Octal
+      if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) { numberLiteral = true; } // Decimal
+      // Zero by itself with no other piece of number.
+      if (stream.match(/^0(?![\dx])/i)) { numberLiteral = true; }
+      if (numberLiteral) {
+          // Integer literals may be "long"
+          stream.match(imMatcher);
+          state.leavingExpr = true;
+          return 'number';
+      }
+    }
+
+    if (stream.match(/^<:/)) {
+      return 'operator';
+    }
+
+    if (stream.match(typeAnnotation)) {
+      return 'builtin';
+    }
+
+    // Handle symbols
+    if (!leavingExpr && stream.match(symbol) || stream.match(/:\./)) {
+      return 'builtin';
+    }
+
+    // Handle parametric types
+    if (stream.match(/^{[^}]*}(?=\()/)) {
+      return 'builtin';
+    }
+
+    // Handle operators and Delimiters
+    if (stream.match(operators)) {
+      return 'operator';
+    }
+
+    // Handle Chars
+    if (stream.match(/^'/)) {
+      state.tokenize = tokenChar;
+      return state.tokenize(stream, state);
+    }
+
+    // Handle Strings
+    if (stream.match(stringPrefixes)) {
+      state.tokenize = tokenStringFactory(stream.current());
+      return state.tokenize(stream, state);
+    }
+
+    if (stream.match(macro)) {
+      return 'meta';
+    }
+
+    if (stream.match(delimiters)) {
+      return null;
+    }
+
+    if (stream.match(keywords)) {
+      return 'keyword';
+    }
+
+    if (stream.match(builtins)) {
+      return 'builtin';
+    }
+
+    var isDefinition = state.isDefinition ||
+                       state.lastToken == 'function' ||
+                       state.lastToken == 'macro' ||
+                       state.lastToken == 'type' ||
+                       state.lastToken == 'immutable';
+
+    if (stream.match(identifiers)) {
+      if (isDefinition) {
+        if (stream.peek() === '.') {
+          state.isDefinition = true;
+          return 'variable';
+        }
+        state.isDefinition = false;
+        return 'def';
+      }
+      if (stream.match(/^({[^}]*})*\(/, false)) {
+        return callOrDef(stream, state);
+      }
+      state.leavingExpr = true;
+      return 'variable';
+    }
+
+    // Handle non-detected items
+    stream.next();
+    return ERRORCLASS;
+  }
+
+  function callOrDef(stream, state) {
+    var match = stream.match(/^(\(\s*)/);
+    if (match) {
+      if (state.firstParenPos < 0)
+        state.firstParenPos = state.scopes.length;
+      state.scopes.push('(');
+      state.charsAdvanced += match[1].length;
+    }
+    if (currentScope(state) == '(' && stream.match(/^\)/)) {
+      state.scopes.pop();
+      state.charsAdvanced += 1;
+      if (state.scopes.length <= state.firstParenPos) {
+        var isDefinition = stream.match(/^\s*?=(?!=)/, false);
+        stream.backUp(state.charsAdvanced);
+        state.firstParenPos = -1;
+        state.charsAdvanced = 0;
+        if (isDefinition)
+          return 'def';
+        return 'builtin';
+      }
+    }
+    // Unfortunately javascript does not support multiline strings, so we have
+    // to undo anything done upto here if a function call or definition splits
+    // over two or more lines.
+    if (stream.match(/^$/g, false)) {
+      stream.backUp(state.charsAdvanced);
+      while (state.scopes.length > state.firstParenPos)
+        state.scopes.pop();
+      state.firstParenPos = -1;
+      state.charsAdvanced = 0;
+      return 'builtin';
+    }
+    state.charsAdvanced += stream.match(/^([^()]*)/)[1].length;
+    return callOrDef(stream, state);
+  }
+
+  function tokenComment(stream, state) {
+    if (stream.match(/^#=/)) {
+      state.weakScopes++;
+    }
+    if (!stream.match(/.*?(?=(#=|=#))/)) {
+      stream.skipToEnd();
+    }
+    if (stream.match(/^=#/)) {
+      state.weakScopes--;
+      if (state.weakScopes == 0)
+        state.tokenize = tokenBase;
+    }
+    return 'comment';
+  }
+
+  function tokenChar(stream, state) {
+    var isChar = false, match;
+    if (stream.match(chars)) {
+      isChar = true;
+    } else if (match = stream.match(/\\u([a-f0-9]{1,4})(?=')/i)) {
+      var value = parseInt(match[1], 16);
+      if (value <= 55295 || value >= 57344) { // (U+0,U+D7FF), (U+E000,U+FFFF)
+        isChar = true;
+        stream.next();
+      }
+    } else if (match = stream.match(/\\U([A-Fa-f0-9]{5,8})(?=')/)) {
+      var value = parseInt(match[1], 16);
+      if (value <= 1114111) { // U+10FFFF
+        isChar = true;
+        stream.next();
+      }
+    }
+    if (isChar) {
+      state.leavingExpr = true;
+      state.tokenize = tokenBase;
+      return 'string';
+    }
+    if (!stream.match(/^[^']+(?=')/)) { stream.skipToEnd(); }
+    if (stream.match(/^'/)) { state.tokenize = tokenBase; }
+    return ERRORCLASS;
+  }
+
+  function tokenStringFactory(delimiter) {
+    while ('bruv'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
+      delimiter = delimiter.substr(1);
+    }
+    var OUTCLASS = 'string';
+
+    function tokenString(stream, state) {
+      while (!stream.eol()) {
+        stream.eatWhile(/[^"\\]/);
+        if (stream.eat('\\')) {
+            stream.next();
+        } else if (stream.match(delimiter)) {
+            state.tokenize = tokenBase;
+            state.leavingExpr = true;
+            return OUTCLASS;
+        } else {
+            stream.eat(/["]/);
+        }
+      }
+      return OUTCLASS;
+    }
+    tokenString.isString = true;
+    return tokenString;
+  }
+
+  var external = {
+    startState: function() {
+      return {
+        tokenize: tokenBase,
+        scopes: [],
+        weakScopes: 0,
+        lastToken: null,
+        leavingExpr: false,
+        isDefinition: false,
+        charsAdvanced: 0,
+        firstParenPos: -1
+      };
+    },
+
+    token: function(stream, state) {
+      var style = state.tokenize(stream, state);
+      var current = stream.current();
+
+      if (current && style) {
+        state.lastToken = current;
+      }
+
+      // Handle '.' connected identifiers
+      if (current === '.') {
+        style = stream.match(identifiers, false) || stream.match(macro, false) ||
+                stream.match(/\(/, false) ? 'operator' : ERRORCLASS;
+      }
+      return style;
+    },
+
+    indent: function(state, textAfter) {
+      var delta = 0;
+      if (textAfter == "]" || textAfter == ")" || textAfter == "end" || textAfter == "else" || textAfter == "elseif" || textAfter == "catch" || textAfter == "finally") {
+        delta = -1;
+      }
+      return (state.scopes.length + delta) * _conf.indentUnit;
+    },
+
+    electricInput: /(end|else(if)?|catch|finally)$/,
+    lineComment: "#",
+    fold: "indent"
+  };
+  return external;
+});
+
+
+CodeMirror.defineMIME("text/x-julia", "julia");
+
+});
diff --git a/www/code/mode/livescript/index.html b/www/code/codemirror-5.13.2/mode/livescript/index.html
similarity index 100%
rename from www/code/mode/livescript/index.html
rename to www/code/codemirror-5.13.2/mode/livescript/index.html
diff --git a/www/code/mode/livescript/livescript.js b/www/code/codemirror-5.13.2/mode/livescript/livescript.js
similarity index 100%
rename from www/code/mode/livescript/livescript.js
rename to www/code/codemirror-5.13.2/mode/livescript/livescript.js
diff --git a/www/code/mode/lua/index.html b/www/code/codemirror-5.13.2/mode/lua/index.html
similarity index 100%
rename from www/code/mode/lua/index.html
rename to www/code/codemirror-5.13.2/mode/lua/index.html
diff --git a/www/code/mode/lua/lua.js b/www/code/codemirror-5.13.2/mode/lua/lua.js
similarity index 100%
rename from www/code/mode/lua/lua.js
rename to www/code/codemirror-5.13.2/mode/lua/lua.js
diff --git a/www/code/mode/markdown/index.html b/www/code/codemirror-5.13.2/mode/markdown/index.html
similarity index 100%
rename from www/code/mode/markdown/index.html
rename to www/code/codemirror-5.13.2/mode/markdown/index.html
diff --git a/www/code/mode/markdown/markdown.js b/www/code/codemirror-5.13.2/mode/markdown/markdown.js
similarity index 83%
rename from www/code/mode/markdown/markdown.js
rename to www/code/codemirror-5.13.2/mode/markdown/markdown.js
index 9d4036818..a6942b39c 100644
--- a/www/code/mode/markdown/markdown.js
+++ b/www/code/codemirror-5.13.2/mode/markdown/markdown.js
@@ -13,8 +13,8 @@
 
 CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
-  var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
-  var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? {name: "xml", htmlMode: true} : "text/plain");
+  var htmlMode = CodeMirror.getMode(cmCfg, "text/html");
+  var htmlModeMissing = htmlMode.name == "null"
 
   function getMode(name) {
     if (CodeMirror.findModeByName) {
@@ -51,24 +51,34 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   if (modeCfg.strikethrough === undefined)
     modeCfg.strikethrough = false;
 
-  var codeDepth = 0;
-
-  var header   = 'header'
-  ,   code     = 'comment'
-  ,   quote    = 'quote'
-  ,   list1    = 'variable-2'
-  ,   list2    = 'variable-3'
-  ,   list3    = 'keyword'
-  ,   hr       = 'hr'
-  ,   image    = 'tag'
-  ,   formatting = 'formatting'
-  ,   linkinline = 'link'
-  ,   linkemail = 'link'
-  ,   linktext = 'link'
-  ,   linkhref = 'string'
-  ,   em       = 'em'
-  ,   strong   = 'strong'
-  ,   strikethrough = 'strikethrough';
+  // Allow token types to be overridden by user-provided token types.
+  if (modeCfg.tokenTypeOverrides === undefined)
+    modeCfg.tokenTypeOverrides = {};
+
+  var tokenTypes = {
+    header: "header",
+    code: "comment",
+    quote: "quote",
+    list1: "variable-2",
+    list2: "variable-3",
+    list3: "keyword",
+    hr: "hr",
+    image: "tag",
+    formatting: "formatting",
+    linkInline: "link",
+    linkEmail: "link",
+    linkText: "link",
+    linkHref: "string",
+    em: "em",
+    strong: "strong",
+    strikethrough: "strikethrough"
+  };
+
+  for (var tokenType in tokenTypes) {
+    if (tokenTypes.hasOwnProperty(tokenType) && modeCfg.tokenTypeOverrides[tokenType]) {
+      tokenTypes[tokenType] = modeCfg.tokenTypeOverrides[tokenType];
+    }
+  }
 
   var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/
   ,   ulRE = /^[*\-+]\s+/
@@ -109,7 +119,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.quote = 0;
     // Reset state.indentedCode
     state.indentedCode = false;
-    if (!htmlFound && state.f == htmlBlock) {
+    if (htmlModeMissing && state.f == htmlBlock) {
       state.f = inlineNormal;
       state.block = blockNormal;
     }
@@ -139,10 +149,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         state.list = null;
       } else if (state.indentation > 0) {
         state.list = null;
-        state.listDepth = Math.floor(state.indentation / 4);
       } else { // No longer a list
         state.list = false;
-        state.listDepth = 0;
       }
     }
 
@@ -152,7 +160,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) {
         state.indentation -= 4;
         state.indentedCode = true;
-        return code;
+        return tokenTypes.code;
       } else {
         return null;
       }
@@ -178,7 +186,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return switchInline(stream, state, footnoteLink);
     } else if (stream.match(hrRE, true)) {
       state.hr = true;
-      return hr;
+      return tokenTypes.hr;
     } else if ((lineIsEmpty(state.prevLine) || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
       var listType = null;
       if (stream.match(ulRE, true)) {
@@ -189,7 +197,17 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       }
       state.indentation = stream.column() + stream.current().length;
       state.list = true;
-      state.listDepth++;
+
+      // While this list item's marker's indentation
+      // is less than the deepest list item's content's indentation,
+      // pop the deepest list item indentation off the stack.
+      while (state.listStack && stream.column() < state.listStack[state.listStack.length - 1]) {
+        state.listStack.pop();
+      }
+
+      // Add this list item's content's indentation to the stack
+      state.listStack.push(state.indentation);
+
       if (modeCfg.taskLists && stream.match(taskListRE, false)) {
         state.taskList = true;
       }
@@ -203,7 +221,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       if (state.localMode) state.localState = state.localMode.startState();
       state.f = state.block = local;
       if (modeCfg.highlightFormatting) state.formatting = "code-block";
-      state.code = true;
+      state.code = -1
       return getType(state);
     }
 
@@ -212,18 +230,21 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
   function htmlBlock(stream, state) {
     var style = htmlMode.token(stream, state.htmlState);
-    if ((htmlFound && state.htmlState.tagStart === null &&
-         (!state.htmlState.context && state.htmlState.tokenize.isInText)) ||
-        (state.md_inside && stream.current().indexOf(">") > -1)) {
-      state.f = inlineNormal;
-      state.block = blockNormal;
-      state.htmlState = null;
+    if (!htmlModeMissing) {
+      var inner = CodeMirror.innerMode(htmlMode, state.htmlState)
+      if ((inner.mode.name == "xml" && inner.state.tagStart === null &&
+           (!inner.state.context && inner.state.tokenize.isInText)) ||
+          (state.md_inside && stream.current().indexOf(">") > -1)) {
+        state.f = inlineNormal;
+        state.block = blockNormal;
+        state.htmlState = null;
+      }
     }
     return style;
   }
 
   function local(stream, state) {
-    if (stream.sol() && state.fencedChars && stream.match(state.fencedChars, false)) {
+    if (state.fencedChars && stream.match(state.fencedChars, false)) {
       state.localMode = state.localState = null;
       state.f = state.block = leavingLocal;
       return null;
@@ -231,7 +252,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return state.localMode.token(stream, state.localState);
     } else {
       stream.skipToEnd();
-      return code;
+      return tokenTypes.code;
     }
   }
 
@@ -241,9 +262,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     state.f = inlineNormal;
     state.fencedChars = null;
     if (modeCfg.highlightFormatting) state.formatting = "code-block";
-    state.code = true;
+    state.code = 1
     var returnType = getType(state);
-    state.code = false;
+    state.code = 0
     return returnType;
   }
 
@@ -252,22 +273,22 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     var styles = [];
 
     if (state.formatting) {
-      styles.push(formatting);
+      styles.push(tokenTypes.formatting);
 
       if (typeof state.formatting === "string") state.formatting = [state.formatting];
 
       for (var i = 0; i < state.formatting.length; i++) {
-        styles.push(formatting + "-" + state.formatting[i]);
+        styles.push(tokenTypes.formatting + "-" + state.formatting[i]);
 
         if (state.formatting[i] === "header") {
-          styles.push(formatting + "-" + state.formatting[i] + "-" + state.header);
+          styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.header);
         }
 
         // Add `formatting-quote` and `formatting-quote-#` for blockquotes
         // Add `error` instead if the maximum blockquote nesting depth is passed
         if (state.formatting[i] === "quote") {
           if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
-            styles.push(formatting + "-" + state.formatting[i] + "-" + state.quote);
+            styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.quote);
           } else {
             styles.push("error");
           }
@@ -285,38 +306,36 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     }
 
     if (state.linkHref) {
-      styles.push(linkhref, "url");
+      styles.push(tokenTypes.linkHref, "url");
     } else { // Only apply inline styles to non-url text
-      if (state.strong) { styles.push(strong); }
-      if (state.em) { styles.push(em); }
-      if (state.strikethrough) { styles.push(strikethrough); }
-
-      if (state.linkText) { styles.push(linktext); }
-
-      if (state.code) { styles.push(code); }
+      if (state.strong) { styles.push(tokenTypes.strong); }
+      if (state.em) { styles.push(tokenTypes.em); }
+      if (state.strikethrough) { styles.push(tokenTypes.strikethrough); }
+      if (state.linkText) { styles.push(tokenTypes.linkText); }
+      if (state.code) { styles.push(tokenTypes.code); }
     }
 
-    if (state.header) { styles.push(header); styles.push(header + "-" + state.header); }
+    if (state.header) { styles.push(tokenTypes.header, tokenTypes.header + "-" + state.header); }
 
     if (state.quote) {
-      styles.push(quote);
+      styles.push(tokenTypes.quote);
 
       // Add `quote-#` where the maximum for `#` is modeCfg.maxBlockquoteDepth
       if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
-        styles.push(quote + "-" + state.quote);
+        styles.push(tokenTypes.quote + "-" + state.quote);
       } else {
-        styles.push(quote + "-" + modeCfg.maxBlockquoteDepth);
+        styles.push(tokenTypes.quote + "-" + modeCfg.maxBlockquoteDepth);
       }
     }
 
     if (state.list !== false) {
-      var listMod = (state.listDepth - 1) % 3;
+      var listMod = (state.listStack.length - 1) % 3;
       if (!listMod) {
-        styles.push(list1);
+        styles.push(tokenTypes.list1);
       } else if (listMod === 1) {
-        styles.push(list2);
+        styles.push(tokenTypes.list2);
       } else {
-        styles.push(list3);
+        styles.push(tokenTypes.list3);
       }
     }
 
@@ -368,14 +387,6 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
     var ch = stream.next();
 
-    if (ch === '\\') {
-      stream.next();
-      if (modeCfg.highlightFormatting) {
-        var type = getType(state);
-        return type ? type + " formatting-escape" : "formatting-escape";
-      }
-    }
-
     // Matches link titles present on next line
     if (state.linkTitle) {
       state.linkTitle = false;
@@ -386,7 +397,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
       var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh;
       if (stream.match(new RegExp(regex), true)) {
-        return linkhref;
+        return tokenTypes.linkHref;
       }
     }
 
@@ -394,30 +405,36 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
     if (ch === '`') {
       var previousFormatting = state.formatting;
       if (modeCfg.highlightFormatting) state.formatting = "code";
-      var t = getType(state);
-      var before = stream.pos;
       stream.eatWhile('`');
-      var difference = 1 + stream.pos - before;
-      if (!state.code) {
-        codeDepth = difference;
-        state.code = true;
-        return getType(state);
+      var count = stream.current().length
+      if (state.code == 0) {
+        state.code = count
+        return getType(state)
+      } else if (count == state.code) { // Must be exact
+        var t = getType(state)
+        state.code = 0
+        return t
       } else {
-        if (difference === codeDepth) { // Must be exact
-          state.code = false;
-          return t;
-        }
-        state.formatting = previousFormatting;
-        return getType(state);
+        state.formatting = previousFormatting
+        return getType(state)
       }
     } else if (state.code) {
       return getType(state);
     }
 
+    if (ch === '\\') {
+      stream.next();
+      if (modeCfg.highlightFormatting) {
+        var type = getType(state);
+        var formattingEscape = tokenTypes.formatting + "-escape";
+        return type ? type + " " + formattingEscape : formattingEscape;
+      }
+    }
+
     if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
       stream.match(/\[[^\]]*\]/);
       state.inline = state.f = linkHref;
-      return image;
+      return tokenTypes.image;
     }
 
     if (ch === '[' && stream.match(/.*\](\(.*\)| ?\[.*\])/, false)) {
@@ -443,7 +460,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       } else {
         type = "";
       }
-      return type + linkinline;
+      return type + tokenTypes.linkInline;
     }
 
     if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) {
@@ -455,7 +472,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       } else {
         type = "";
       }
-      return type + linkemail;
+      return type + tokenTypes.linkEmail;
     }
 
     if (ch === '<' && stream.match(/^(!--|\w)/, false)) {
@@ -564,12 +581,12 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       } else {
         type = "";
       }
-      return type + linkinline;
+      return type + tokenTypes.linkInline;
     }
 
     stream.match(/^[^>]+/, true);
 
-    return linkinline;
+    return tokenTypes.linkInline;
   }
 
   function linkHref(stream, state) {
@@ -609,7 +626,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
   }
 
   function footnoteLink(stream, state) {
-    if (stream.match(/^[^\]]*\]:/, false)) {
+    if (stream.match(/^([^\]\\]|\\.)*\]:/, false)) {
       state.f = footnoteLinkInside;
       stream.next(); // Consume [
       if (modeCfg.highlightFormatting) state.formatting = "link";
@@ -628,9 +645,9 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       return returnType;
     }
 
-    stream.match(/^[^\]]+/, true);
+    stream.match(/^([^\]\\]|\\.)+/, true);
 
-    return linktext;
+    return tokenTypes.linkText;
   }
 
   function footnoteUrl(stream, state) {
@@ -647,7 +664,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
       stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
     }
     state.f = state.inline = inlineNormal;
-    return linkhref + " url";
+    return tokenTypes.linkHref + " url";
   }
 
   var savedInlineRE = [];
@@ -681,13 +698,14 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         linkText: false,
         linkHref: false,
         linkTitle: false,
+        code: 0,
         em: false,
         strong: false,
         header: 0,
         hr: false,
         taskList: false,
         list: false,
-        listDepth: 0,
+        listStack: [],
         quote: 0,
         trailingSpace: 0,
         trailingSpaceNewLine: false,
@@ -701,7 +719,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         f: s.f,
 
         prevLine: s.prevLine,
-        thisLine: s.this,
+        thisLine: s.thisLine,
 
         block: s.block,
         htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState),
@@ -722,7 +740,7 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
         hr: s.hr,
         taskList: s.taskList,
         list: s.list,
-        listDepth: s.listDepth,
+        listStack: s.listStack.slice(0),
         quote: s.quote,
         indentedCode: s.indentedCode,
         trailingSpace: s.trailingSpace,
@@ -762,11 +780,8 @@ CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
 
         state.f = state.block;
         var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
-        var difference = Math.floor((indentation - state.indentation) / 4) * 4;
-        if (difference > 4) difference = 4;
-        var adjustedIndentation = state.indentation + difference;
-        state.indentationDiff = adjustedIndentation - state.indentation;
-        state.indentation = adjustedIndentation;
+        state.indentationDiff = Math.min(indentation - state.indentation, 4);
+        state.indentation = state.indentation + state.indentationDiff;
         if (indentation > 0) return null;
       }
       return state.f(stream, state);
diff --git a/www/code/mode/markdown/test.js b/www/code/codemirror-5.13.2/mode/markdown/test.js
similarity index 83%
rename from www/code/mode/markdown/test.js
rename to www/code/codemirror-5.13.2/mode/markdown/test.js
index 78b6c685a..a48d15310 100644
--- a/www/code/mode/markdown/test.js
+++ b/www/code/codemirror-5.13.2/mode/markdown/test.js
@@ -10,6 +10,35 @@
   function AtxNoSpaceTest(name) { test.mode(name, modeAtxNoSpace, Array.prototype.slice.call(arguments, 1)); }
   var modeFenced = CodeMirror.getMode({tabSize: 4}, {name: "markdown", fencedCodeBlocks: true});
   function FencedTest(name) { test.mode(name, modeFenced, Array.prototype.slice.call(arguments, 1)); }
+  var modeOverrideClasses = CodeMirror.getMode({tabsize: 4}, {
+    name: "markdown",
+    strikethrough: true,
+    tokenTypeOverrides: {
+      "header" : "override-header",
+      "code" : "override-code",
+      "quote" : "override-quote",
+      "list1" : "override-list1",
+      "list2" : "override-list2",
+      "list3" : "override-list3",
+      "hr" : "override-hr",
+      "image" : "override-image",
+      "linkInline" : "override-link-inline",
+      "linkEmail" : "override-link-email",
+      "linkText" : "override-link-text",
+      "linkHref" : "override-link-href",
+      "em" : "override-em",
+      "strong" : "override-strong",
+      "strikethrough" : "override-strikethrough"
+  }});
+  function TokenTypeOverrideTest(name) { test.mode(name, modeOverrideClasses, Array.prototype.slice.call(arguments, 1)); }
+  var modeFormattingOverride = CodeMirror.getMode({tabsize: 4}, {
+    name: "markdown",
+    highlightFormatting: true,
+    tokenTypeOverrides: {
+      "formatting" : "override-formatting"
+  }});
+  function FormatTokenTypeOverrideTest(name) { test.mode(name, modeFormattingOverride, Array.prototype.slice.call(arguments, 1)); }
+
 
   FT("formatting_emAsterisk",
      "[em&formatting&formatting-em *][em foo][em&formatting&formatting-em *]");
@@ -423,6 +452,18 @@
      "",
      "hello");
 
+  MT("listCommonMarkIndentationCode",
+     "[variable-2 * Code blocks also affect]",
+     "  [variable-3 * The next level starts where the contents start.]",
+     "   [variable-3 *    Anything less than that will keep the item on the same level.]",
+     "       [variable-3 * Each list item can indent the first level further and further.]",
+     "  [variable-3 * For the most part, this makes sense while writing a list.]",
+     "    [keyword * This means two items with same indentation can be different levels.]",
+     "     [keyword *  Each level has an indent requirement that can change between items.]",
+     "       [keyword * A list item that meets this will be part of the next level.]",
+     "   [variable-3 * Otherwise, it will be part of the level where it does meet this.]",
+     " [variable-2 * World]");
+
   // Blockquote
   MT("blockquote",
      "[variable-2 * foo]",
@@ -667,6 +708,15 @@
      "[link [[foo]]:] [string&url http://example.com/]",
      "(bar\" hello");
 
+  MT("labelEscape",
+     "[link [[foo \\]] ]]:] [string&url http://example.com/]");
+
+  MT("labelEscapeColon",
+     "[link [[foo \\]]: bar]]:] [string&url http://example.com/]");
+
+  MT("labelEscapeEnd",
+     "[[foo\\]]: http://example.com/");
+
   MT("linkWeb",
      "[link ] foo");
 
@@ -774,6 +824,76 @@
      "\\",
      "[em *foo*]");
 
+  // Class override tests
+  TokenTypeOverrideTest("overrideHeader1",
+    "[override-header&override-header-1 # Foo]");
+
+  TokenTypeOverrideTest("overrideHeader2",
+    "[override-header&override-header-2 ## Foo]");
+
+  TokenTypeOverrideTest("overrideHeader3",
+    "[override-header&override-header-3 ### Foo]");
+
+  TokenTypeOverrideTest("overrideHeader4",
+    "[override-header&override-header-4 #### Foo]");
+
+  TokenTypeOverrideTest("overrideHeader5",
+    "[override-header&override-header-5 ##### Foo]");
+
+  TokenTypeOverrideTest("overrideHeader6",
+    "[override-header&override-header-6 ###### Foo]");
+
+  TokenTypeOverrideTest("overrideCode",
+    "[override-code `foo`]");
+
+  TokenTypeOverrideTest("overrideCodeBlock",
+    "[override-code ```]",
+    "[override-code foo]",
+    "[override-code ```]");
+
+  TokenTypeOverrideTest("overrideQuote",
+    "[override-quote&override-quote-1 > foo]",
+    "[override-quote&override-quote-1 > bar]");
+
+  TokenTypeOverrideTest("overrideQuoteNested",
+    "[override-quote&override-quote-1 > foo]",
+    "[override-quote&override-quote-1 >][override-quote&override-quote-2 > bar]",
+    "[override-quote&override-quote-1 >][override-quote&override-quote-2 >][override-quote&override-quote-3 > baz]");
+
+  TokenTypeOverrideTest("overrideLists",
+    "[override-list1 - foo]",
+    "",
+    "    [override-list2 + bar]",
+    "",
+    "        [override-list3 * baz]",
+    "",
+    "            [override-list1 1. qux]",
+    "",
+    "                [override-list2 - quux]");
+
+  TokenTypeOverrideTest("overrideHr",
+    "[override-hr * * *]");
+
+  TokenTypeOverrideTest("overrideImage",
+    "[override-image ![[foo]]][override-link-href&url (http://example.com/)]")
+
+  TokenTypeOverrideTest("overrideLinkText",
+    "[override-link-text [[foo]]][override-link-href&url (http://example.com)]");
+
+  TokenTypeOverrideTest("overrideLinkEmailAndInline",
+    "[override-link-email <][override-link-inline foo@example.com>]");
+
+  TokenTypeOverrideTest("overrideEm",
+    "[override-em *foo*]");
+
+  TokenTypeOverrideTest("overrideStrong",
+    "[override-strong **foo**]");
+
+  TokenTypeOverrideTest("overrideStrikethrough",
+    "[override-strikethrough ~~foo~~]");
+
+  FormatTokenTypeOverrideTest("overrideFormatting",
+    "[override-formatting-escape \\*]");
 
   // Tests to make sure GFM-specific things aren't getting through
 
diff --git a/www/code/mode/mathematica/index.html b/www/code/codemirror-5.13.2/mode/mathematica/index.html
similarity index 100%
rename from www/code/mode/mathematica/index.html
rename to www/code/codemirror-5.13.2/mode/mathematica/index.html
diff --git a/www/code/mode/mathematica/mathematica.js b/www/code/codemirror-5.13.2/mode/mathematica/mathematica.js
similarity index 100%
rename from www/code/mode/mathematica/mathematica.js
rename to www/code/codemirror-5.13.2/mode/mathematica/mathematica.js
diff --git a/www/code/mode/meta.js b/www/code/codemirror-5.13.2/mode/meta.js
similarity index 92%
rename from www/code/mode/meta.js
rename to www/code/codemirror-5.13.2/mode/meta.js
index 3a14dfc58..3cb9de21e 100644
--- a/www/code/mode/meta.js
+++ b/www/code/codemirror-5.13.2/mode/meta.js
@@ -21,13 +21,15 @@
     {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
     {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
     {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
-    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
+    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
+    {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
     {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
     {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
     {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
     {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
     {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
     {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
+    {name: "Crystal", mime: "text/x-crystal", mode: "crystal", ext: ["cr"]},
     {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
     {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
     {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
@@ -39,12 +41,14 @@
     {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
     {name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
     {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
+    {name: "edn", mime: "application/edn", mode: "clojure", ext: ["edn"]},
     {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
     {name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
     {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
     {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
     {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
     {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
+    {name: "FCL", mime: "text/x-fcl", mode: "fcl"},
     {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
     {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
     {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
@@ -52,9 +56,10 @@
     {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
     {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
     {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
-    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy"]},
+    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"]},
     {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
     {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
+    {name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},
     {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
     {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
     {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
@@ -68,9 +73,10 @@
      mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
     {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
     {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
+    {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
     {name: "Jinja2", mime: "null", mode: "jinja2"},
     {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
-    {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ["kt"]},
+    {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
     {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
     {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
     {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
@@ -79,10 +85,11 @@
     {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
     {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
     {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
-    {name: "MUMPS", mime: "text/x-mumps", mode: "mumps"},
+    {name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
     {name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
     {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
     {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
+    {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
     {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
     {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]},
     {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
@@ -96,6 +103,7 @@
     {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
     {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
     {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
+    {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
     {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
     {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
     {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
@@ -109,7 +117,7 @@
     {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
     {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
     {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
-    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"]},
+    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
     {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
     {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
     {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
@@ -121,7 +129,6 @@
     {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
     {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
     {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
-    {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
     {name: "sTeX", mime: "text/x-stex", mode: "stex"},
     {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
     {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
@@ -131,7 +138,7 @@
     {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
     {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
     {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
-    {name: "troff", mime: "troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
+    {name: "troff", mime: "text/troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
     {name: "TTCN", mime: "text/x-ttcn", mode: "ttcn", ext: ["ttcn", "ttcn3", "ttcnpp"]},
     {name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
     {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
diff --git a/www/code/mode/mirc/index.html b/www/code/codemirror-5.13.2/mode/mirc/index.html
similarity index 100%
rename from www/code/mode/mirc/index.html
rename to www/code/codemirror-5.13.2/mode/mirc/index.html
diff --git a/www/code/mode/mirc/mirc.js b/www/code/codemirror-5.13.2/mode/mirc/mirc.js
similarity index 100%
rename from www/code/mode/mirc/mirc.js
rename to www/code/codemirror-5.13.2/mode/mirc/mirc.js
diff --git a/www/code/mode/mllike/index.html b/www/code/codemirror-5.13.2/mode/mllike/index.html
similarity index 100%
rename from www/code/mode/mllike/index.html
rename to www/code/codemirror-5.13.2/mode/mllike/index.html
diff --git a/www/code/mode/mllike/mllike.js b/www/code/codemirror-5.13.2/mode/mllike/mllike.js
similarity index 100%
rename from www/code/mode/mllike/mllike.js
rename to www/code/codemirror-5.13.2/mode/mllike/mllike.js
diff --git a/www/code/mode/modelica/index.html b/www/code/codemirror-5.13.2/mode/modelica/index.html
similarity index 100%
rename from www/code/mode/modelica/index.html
rename to www/code/codemirror-5.13.2/mode/modelica/index.html
diff --git a/www/code/mode/modelica/modelica.js b/www/code/codemirror-5.13.2/mode/modelica/modelica.js
similarity index 100%
rename from www/code/mode/modelica/modelica.js
rename to www/code/codemirror-5.13.2/mode/modelica/modelica.js
diff --git a/www/code/codemirror-5.13.2/mode/mscgen/index.html b/www/code/codemirror-5.13.2/mode/mscgen/index.html
new file mode 100644
index 000000000..8c28ee620
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/mscgen/index.html
@@ -0,0 +1,151 @@
+
+
+CodeMirror: MscGen mode
+
+
+
+
+
+
+
+
+
+
    
+
    MscGen mode
    
+
+
    
+
+
    Xù mode
    
+
+
    
+
+
    MsGenny mode
    
+
    
+
+    
    
+      Simple mode for highlighting MscGen and two derived sequence
+      chart languages.
+    
    
+
+    
+
+    
    MIME types defined:
+      text/x-mscgen
+      text/x-xu
+      text/x-msgenny
+    
    
+
+
    
diff --git a/www/code/mode/mscgen/mscgen.js b/www/code/codemirror-5.13.2/mode/mscgen/mscgen.js
similarity index 98%
rename from www/code/mode/mscgen/mscgen.js
rename to www/code/codemirror-5.13.2/mode/mscgen/mscgen.js
index 3cf4eb089..d61b47065 100644
--- a/www/code/mode/mscgen/mscgen.js
+++ b/www/code/codemirror-5.13.2/mode/mscgen/mscgen.js
@@ -69,11 +69,11 @@
   CodeMirror.defineMIME("text/x-msgenny", {name: "mscgen", language: "msgenny"});
 
   function wordRegexpBoundary(pWords) {
-    return new RegExp("\\b((" + pWords.join(")|(") + "))\\b", "i");
+    return new RegExp("\\b(" + pWords.join("|") + ")\\b", "i");
   }
 
   function wordRegexp(pWords) {
-    return new RegExp("((" + pWords.join(")|(") + "))", "i");
+    return new RegExp("(" + pWords.join("|") + ")", "i");
   }
 
   function startStateFn() {
diff --git a/www/code/mode/mscgen/mscgen_test.js b/www/code/codemirror-5.13.2/mode/mscgen/mscgen_test.js
similarity index 100%
rename from www/code/mode/mscgen/mscgen_test.js
rename to www/code/codemirror-5.13.2/mode/mscgen/mscgen_test.js
diff --git a/www/code/mode/mscgen/msgenny_test.js b/www/code/codemirror-5.13.2/mode/mscgen/msgenny_test.js
similarity index 100%
rename from www/code/mode/mscgen/msgenny_test.js
rename to www/code/codemirror-5.13.2/mode/mscgen/msgenny_test.js
diff --git a/www/code/mode/mscgen/xu_test.js b/www/code/codemirror-5.13.2/mode/mscgen/xu_test.js
similarity index 100%
rename from www/code/mode/mscgen/xu_test.js
rename to www/code/codemirror-5.13.2/mode/mscgen/xu_test.js
diff --git a/www/code/mode/mumps/index.html b/www/code/codemirror-5.13.2/mode/mumps/index.html
similarity index 98%
rename from www/code/mode/mumps/index.html
rename to www/code/codemirror-5.13.2/mode/mumps/index.html
index bd1f69aef..b1f92c213 100644
--- a/www/code/mode/mumps/index.html
+++ b/www/code/codemirror-5.13.2/mode/mumps/index.html
@@ -1,4 +1,4 @@
-
+
 
 CodeMirror: MUMPS mode
 
@@ -73,7 +73,7 @@ SET2() ;EF. Return error code (also called from XUSRB)
  IF '$LENGTH($PIECE(XUSER(1),U,2)) QUIT 21 ;p419, p434
  Q 0
  ;
-  
+  
     
+
+
+
+
+
+
+
    
+
    NSIS mode
    
+
+
+
+
+
+
+
    MIME types defined: text/x-nsis.
    
+
    
\ No newline at end of file
diff --git a/www/code/codemirror-5.13.2/mode/nsis/nsis.js b/www/code/codemirror-5.13.2/mode/nsis/nsis.js
new file mode 100644
index 000000000..172207c5a
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/nsis/nsis.js
@@ -0,0 +1,95 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Author: Jan T. Sott (http://github.com/idleberg)
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineSimpleMode("nsis",{
+  start:[
+    // Numbers
+    {regex: /(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/, token: "number"},
+
+    // Strings
+    { regex: /"(?:[^\\"]|\\.)*"?/, token: "string" },
+    { regex: /'(?:[^\\']|\\.)*'?/, token: "string" },
+    { regex: /`(?:[^\\`]|\\.)*`?/, token: "string" },
+
+    // Compile Time Commands
+    {regex: /(?:\!(include|addincludedir|addplugindir|appendfile|cd|delfile|echo|error|execute|packhdr|finalize|getdllversion|system|tempfile|warning|verbose|define|undef|insertmacro|makensis|searchparse|searchreplace))\b/, token: "keyword"},
+
+    // Conditional Compilation
+    {regex: /(?:\!(if(?:n?def)?|ifmacron?def|macro))\b/, token: "keyword", indent: true},
+    {regex: /(?:\!(else|endif|macroend))\b/, token: "keyword", dedent: true},
+
+    // Runtime Commands
+    {regex: /\b(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|IntCmp|IntCmpU|IntFmt|IntOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetPluginUnload|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegStr|WriteUninstaller|XPStyle)\b/, token: "keyword"},
+    {regex: /\b(?:Function|PageEx|Section(?:Group)?)\b/, token: "keyword", indent: true},
+    {regex: /\b(?:(Function|PageEx|Section(?:Group)?)End)\b/, token: "keyword", dedent: true},
+
+    // Command Options
+    {regex: /\b(?:ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HIDDEN|HKCC|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDD_DIR|IDD_INST|IDD_INSTFILES|IDD_LICENSE|IDD_SELCOM|IDD_UNINST|IDD_VERIFY|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|MB_YESNOCANCEL|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SW_HIDE|SW_SHOWDEFAULT|SW_SHOWMAXIMIZED|SW_SHOWMINIMIZED|SW_SHOWNORMAL|SYSTEM|TEMPORARY)\b/, token: "atom"},
+    {regex: /\b(?:admin|all|auto|both|bottom|bzip2|components|current|custom|directory|force|hide|highest|ifdiff|ifnewer|instfiles|lastused|leave|left|license|listonly|lzma|nevershow|none|normal|notset|right|show|silent|silentlog|textonly|top|try|un\.components|un\.custom|un\.directory|un\.instfiles|un\.license|uninstConfirm|user|Win10|Win7|Win8|WinVista|zlib)\b/, token: "builtin"},
+
+    // LogicLib.nsh
+    {regex: /\$\{(?:And(?:If(?:Not)?|Unless)|Break|Case(?:Else)?|Continue|Default|Do(?:Until|While)?|Else(?:If(?:Not)?|Unless)?|End(?:If|Select|Switch)|Exit(?:Do|For|While)|For(?:Each)?|If(?:Cmd|Not(?:Then)?|Then)?|Loop(?:Until|While)?|Or(?:If(?:Not)?|Unless)|Select|Switch|Unless|While)\}/, token: "variable-2", indent: true},
+
+    // FileFunc.nsh
+    {regex: /\$\{(?:BannerTrimPath|DirState|DriveSpace|Get(BaseName|Drives|ExeName|ExePath|FileAttributes|FileExt|FileName|FileVersion|Options|OptionsS|Parameters|Parent|Root|Size|Time)|Locate|RefreshShellIcons)\}/, token: "variable-2", dedent: true},
+
+    // Memento.nsh
+    {regex: /\$\{(?:Memento(?:Section(?:Done|End|Restore|Save)?|UnselectedSection))\}/, token: "variable-2", dedent: true},
+
+    // TextFunc.nsh
+    {regex: /\$\{(?:Config(?:Read|ReadS|Write|WriteS)|File(?:Join|ReadFromEnd|Recode)|Line(?:Find|Read|Sum)|Text(?:Compare|CompareS)|TrimNewLines)\}/, token: "variable-2", dedent: true},
+
+    // WinVer.nsh
+    {regex: /\$\{(?:(?:At(?:Least|Most)|Is)(?:ServicePack|Win(?:7|8|10|95|98|200(?:0|3|8(?:R2)?)|ME|NT4|Vista|XP))|Is(?:NT|Server))\}/, token: "variable", dedent: true},
+
+    // WordFunc.nsh
+    {regex: /\$\{(?:StrFilterS?|Version(?:Compare|Convert)|Word(?:AddS?|Find(?:(?:2|3)X)?S?|InsertS?|ReplaceS?))\}/, token: "variable-2", dedent: true},
+
+    // x64.nsh
+    {regex: /\$\{(?:RunningX64)\}/, token: "variable", dedent: true},
+    {regex: /\$\{(?:Disable|Enable)X64FSRedirection\}/, token: "variable-2", dedent: true},
+
+    // Line Comment
+    {regex: /(#|;).*/, token: "comment"},
+
+    // Block Comment
+    {regex: /\/\*/, token: "comment", next: "comment"},
+
+    // Operator
+    {regex: /[-+\/*=<>!]+/, token: "operator"},
+
+    // Variable
+    {regex: /\$[\w]+/, token: "variable"},
+
+    // Constant
+    {regex: /\${[\w]+}/,token: "variable-2"},
+
+    // Language String
+    {regex: /\$\([\w]+\)/,token: "variable-3"}
+  ],
+  comment: [
+    {regex: /.*?\*\//, token: "comment", next: "start"},
+    {regex: /.*/, token: "comment"}
+  ],
+  meta: {
+    electricInput: /^\s*((Function|PageEx|Section|Section(Group)?)End|(\!(endif|macroend))|\$\{(End(If|Unless|While)|Loop(Until)|Next)\})$/,
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    lineComment: ["#", ";"]
+  }
+});
+
+CodeMirror.defineMIME("text/x-nsis", "nsis");
+});
diff --git a/www/code/mode/ntriples/index.html b/www/code/codemirror-5.13.2/mode/ntriples/index.html
similarity index 100%
rename from www/code/mode/ntriples/index.html
rename to www/code/codemirror-5.13.2/mode/ntriples/index.html
diff --git a/www/code/mode/ntriples/ntriples.js b/www/code/codemirror-5.13.2/mode/ntriples/ntriples.js
similarity index 100%
rename from www/code/mode/ntriples/ntriples.js
rename to www/code/codemirror-5.13.2/mode/ntriples/ntriples.js
diff --git a/www/code/mode/octave/index.html b/www/code/codemirror-5.13.2/mode/octave/index.html
similarity index 100%
rename from www/code/mode/octave/index.html
rename to www/code/codemirror-5.13.2/mode/octave/index.html
diff --git a/www/code/mode/octave/octave.js b/www/code/codemirror-5.13.2/mode/octave/octave.js
similarity index 100%
rename from www/code/mode/octave/octave.js
rename to www/code/codemirror-5.13.2/mode/octave/octave.js
diff --git a/www/code/mode/oz/index.html b/www/code/codemirror-5.13.2/mode/oz/index.html
similarity index 100%
rename from www/code/mode/oz/index.html
rename to www/code/codemirror-5.13.2/mode/oz/index.html
diff --git a/www/code/mode/oz/oz.js b/www/code/codemirror-5.13.2/mode/oz/oz.js
similarity index 100%
rename from www/code/mode/oz/oz.js
rename to www/code/codemirror-5.13.2/mode/oz/oz.js
diff --git a/www/code/mode/pascal/index.html b/www/code/codemirror-5.13.2/mode/pascal/index.html
similarity index 100%
rename from www/code/mode/pascal/index.html
rename to www/code/codemirror-5.13.2/mode/pascal/index.html
diff --git a/www/code/mode/pascal/pascal.js b/www/code/codemirror-5.13.2/mode/pascal/pascal.js
similarity index 100%
rename from www/code/mode/pascal/pascal.js
rename to www/code/codemirror-5.13.2/mode/pascal/pascal.js
diff --git a/www/code/mode/pegjs/index.html b/www/code/codemirror-5.13.2/mode/pegjs/index.html
similarity index 100%
rename from www/code/mode/pegjs/index.html
rename to www/code/codemirror-5.13.2/mode/pegjs/index.html
diff --git a/www/code/mode/pegjs/pegjs.js b/www/code/codemirror-5.13.2/mode/pegjs/pegjs.js
similarity index 100%
rename from www/code/mode/pegjs/pegjs.js
rename to www/code/codemirror-5.13.2/mode/pegjs/pegjs.js
diff --git a/www/code/mode/perl/index.html b/www/code/codemirror-5.13.2/mode/perl/index.html
similarity index 100%
rename from www/code/mode/perl/index.html
rename to www/code/codemirror-5.13.2/mode/perl/index.html
diff --git a/www/code/mode/perl/perl.js b/www/code/codemirror-5.13.2/mode/perl/perl.js
similarity index 100%
rename from www/code/mode/perl/perl.js
rename to www/code/codemirror-5.13.2/mode/perl/perl.js
diff --git a/www/code/mode/php/index.html b/www/code/codemirror-5.13.2/mode/php/index.html
similarity index 100%
rename from www/code/mode/php/index.html
rename to www/code/codemirror-5.13.2/mode/php/index.html
diff --git a/www/code/mode/php/php.js b/www/code/codemirror-5.13.2/mode/php/php.js
similarity index 100%
rename from www/code/mode/php/php.js
rename to www/code/codemirror-5.13.2/mode/php/php.js
diff --git a/www/code/mode/php/test.js b/www/code/codemirror-5.13.2/mode/php/test.js
similarity index 100%
rename from www/code/mode/php/test.js
rename to www/code/codemirror-5.13.2/mode/php/test.js
diff --git a/www/code/mode/pig/index.html b/www/code/codemirror-5.13.2/mode/pig/index.html
similarity index 98%
rename from www/code/mode/pig/index.html
rename to www/code/codemirror-5.13.2/mode/pig/index.html
index 984c9a183..ea77f7044 100644
--- a/www/code/mode/pig/index.html
+++ b/www/code/codemirror-5.13.2/mode/pig/index.html
@@ -1,5 +1,4 @@
-
-
+
 CodeMirror: Pig Latin mode
 
 
@@ -51,5 +50,4 @@ STORE c INTO "\path\to\output";
 
     
    MIME type defined: text/x-pig
     (PIG code)
-
 
diff --git a/www/code/mode/pig/pig.js b/www/code/codemirror-5.13.2/mode/pig/pig.js
similarity index 100%
rename from www/code/mode/pig/pig.js
rename to www/code/codemirror-5.13.2/mode/pig/pig.js
diff --git a/www/code/mode/properties/index.html b/www/code/codemirror-5.13.2/mode/properties/index.html
similarity index 100%
rename from www/code/mode/properties/index.html
rename to www/code/codemirror-5.13.2/mode/properties/index.html
diff --git a/www/code/mode/properties/properties.js b/www/code/codemirror-5.13.2/mode/properties/properties.js
similarity index 100%
rename from www/code/mode/properties/properties.js
rename to www/code/codemirror-5.13.2/mode/properties/properties.js
diff --git a/www/code/codemirror-5.13.2/mode/protobuf/index.html b/www/code/codemirror-5.13.2/mode/protobuf/index.html
new file mode 100644
index 000000000..cfe7b9dcd
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/protobuf/index.html
@@ -0,0 +1,64 @@
+
+
+CodeMirror: ProtoBuf mode
+
+
+
+
+
+
+
+
    
+
+
    
+
    ProtoBuf mode
    
+
    
+    
+
+    
    MIME types defined: text/x-protobuf.
    
+
+  
    
diff --git a/www/code/codemirror-5.13.2/mode/protobuf/protobuf.js b/www/code/codemirror-5.13.2/mode/protobuf/protobuf.js
new file mode 100644
index 000000000..bcae276e8
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/protobuf/protobuf.js
@@ -0,0 +1,68 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  function wordRegexp(words) {
+    return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
+  };
+
+  var keywordArray = [
+    "package", "message", "import", "syntax",
+    "required", "optional", "repeated", "reserved", "default", "extensions", "packed",
+    "bool", "bytes", "double", "enum", "float", "string",
+    "int32", "int64", "uint32", "uint64", "sint32", "sint64", "fixed32", "fixed64", "sfixed32", "sfixed64"
+  ];
+  var keywords = wordRegexp(keywordArray);
+
+  CodeMirror.registerHelper("hintWords", "protobuf", keywordArray);
+
+  var identifiers = new RegExp("^[_A-Za-z\xa1-\uffff][_A-Za-z0-9\xa1-\uffff]*");
+
+  function tokenBase(stream) {
+    // whitespaces
+    if (stream.eatSpace()) return null;
+
+    // Handle one line Comments
+    if (stream.match("//")) {
+      stream.skipToEnd();
+      return "comment";
+    }
+
+    // Handle Number Literals
+    if (stream.match(/^[0-9\.+-]/, false)) {
+      if (stream.match(/^[+-]?0x[0-9a-fA-F]+/))
+        return "number";
+      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/))
+        return "number";
+      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?/))
+        return "number";
+    }
+
+    // Handle Strings
+    if (stream.match(/^"([^"]|(""))*"/)) { return "string"; }
+    if (stream.match(/^'([^']|(''))*'/)) { return "string"; }
+
+    // Handle words
+    if (stream.match(keywords)) { return "keyword"; }
+    if (stream.match(identifiers)) { return "variable"; } ;
+
+    // Handle non-detected items
+    stream.next();
+    return null;
+  };
+
+  CodeMirror.defineMode("protobuf", function() {
+    return {token: tokenBase};
+  });
+
+  CodeMirror.defineMIME("text/x-protobuf", "protobuf");
+});
diff --git a/www/code/mode/puppet/index.html b/www/code/codemirror-5.13.2/mode/puppet/index.html
similarity index 100%
rename from www/code/mode/puppet/index.html
rename to www/code/codemirror-5.13.2/mode/puppet/index.html
diff --git a/www/code/mode/puppet/puppet.js b/www/code/codemirror-5.13.2/mode/puppet/puppet.js
similarity index 100%
rename from www/code/mode/puppet/puppet.js
rename to www/code/codemirror-5.13.2/mode/puppet/puppet.js
diff --git a/www/code/mode/python/index.html b/www/code/codemirror-5.13.2/mode/python/index.html
similarity index 100%
rename from www/code/mode/python/index.html
rename to www/code/codemirror-5.13.2/mode/python/index.html
diff --git a/www/code/mode/python/python.js b/www/code/codemirror-5.13.2/mode/python/python.js
similarity index 78%
rename from www/code/mode/python/python.js
rename to www/code/codemirror-5.13.2/mode/python/python.js
index e5a09719b..196b026c6 100644
--- a/www/code/mode/python/python.js
+++ b/www/code/codemirror-5.13.2/mode/python/python.js
@@ -48,29 +48,29 @@
   CodeMirror.defineMode("python", function(conf, parserConf) {
     var ERRORCLASS = "error";
 
-    var singleDelimiters = parserConf.singleDelimiters || new RegExp("^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]");
-    var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
-    var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
-    var tripleDelimiters = parserConf.tripleDelimiters || new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
+    var singleDelimiters = parserConf.singleDelimiters || /^[\(\)\[\]\{\}@,:`=;\.]/;
+    var doubleOperators = parserConf.doubleOperators || /^([!<>]==|<>|<<|>>|\/\/|\*\*)/;
+    var doubleDelimiters = parserConf.doubleDelimiters || /^(\+=|\-=|\*=|%=|\/=|&=|\|=|\^=)/;
+    var tripleDelimiters = parserConf.tripleDelimiters || /^(\/\/=|>>=|<<=|\*\*=)/;
 
-    if (parserConf.version && parseInt(parserConf.version, 10) == 3){
+    if (parserConf.version && parseInt(parserConf.version, 10) == 3) {
         // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
-        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!@]");
-        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*");
+        var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!@]/;
+        var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*/;
     } else {
-        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
-        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
+        var singleOperators = parserConf.singleOperators || /^[\+\-\*\/%&|\^~<>!]/;
+        var identifiers = parserConf.identifiers|| /^[_A-Za-z][_A-Za-z0-9]*/;
     }
 
     var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
 
     var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
-    if(parserConf.extra_keywords != undefined){
+    if (parserConf.extra_keywords != undefined)
       myKeywords = myKeywords.concat(parserConf.extra_keywords);
-    }
-    if(parserConf.extra_builtins != undefined){
+
+    if (parserConf.extra_builtins != undefined)
       myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
-    }
+
     if (parserConf.version && parseInt(parserConf.version, 10) == 3) {
       myKeywords = myKeywords.concat(py3.keywords);
       myBuiltins = myBuiltins.concat(py3.builtins);
@@ -85,13 +85,14 @@
 
     // tokenizers
     function tokenBase(stream, state) {
+      if (stream.sol()) state.indent = stream.indentation()
       // Handle scope changes
       if (stream.sol() && top(state).type == "py") {
         var scopeOffset = top(state).offset;
         if (stream.eatSpace()) {
           var lineOffset = stream.indentation();
           if (lineOffset > scopeOffset)
-            pushScope(stream, state, "py");
+            pushPyScope(state);
           else if (lineOffset < scopeOffset && dedent(stream, state))
             state.errorToken = true;
           return null;
@@ -160,13 +161,16 @@
 
       // Handle operators and Delimiters
       if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters))
-        return null;
+        return "punctuation";
 
       if (stream.match(doubleOperators) || stream.match(singleOperators))
         return "operator";
 
       if (stream.match(singleDelimiters))
-        return null;
+        return "punctuation";
+
+      if (state.lastToken == "." && stream.match(identifiers))
+        return "property";
 
       if (stream.match(keywords) || stream.match(wordOperators))
         return "keyword";
@@ -221,16 +225,18 @@
       return tokenString;
     }
 
-    function pushScope(stream, state, type) {
-      var offset = 0, align = null;
-      if (type == "py") {
-        while (top(state).type != "py")
-          state.scopes.pop();
-      }
-      offset = top(state).offset + (type == "py" ? conf.indentUnit : hangingIndent);
-      if (type != "py" && !stream.match(/^(\s|#.*)*$/, false))
-        align = stream.column() + 1;
-      state.scopes.push({offset: offset, type: type, align: align});
+    function pushPyScope(state) {
+      while (top(state).type != "py") state.scopes.pop()
+      state.scopes.push({offset: top(state).offset + conf.indentUnit,
+                         type: "py",
+                         align: null})
+    }
+
+    function pushBracketScope(stream, state, type) {
+      var align = stream.match(/^([\s\[\{\(]|#.*)*$/, false) ? null : stream.column() + 1
+      state.scopes.push({offset: state.indent + hangingIndent,
+                         type: type,
+                         align: align})
     }
 
     function dedent(stream, state) {
@@ -246,28 +252,16 @@
       var style = state.tokenize(stream, state);
       var current = stream.current();
 
-      // Handle '.' connected identifiers
-      if (current == ".") {
-        style = stream.match(identifiers, false) ? null : ERRORCLASS;
-        if (style == null && state.lastStyle == "meta") {
-          // Apply 'meta' style to '.' connected identifiers when
-          // appropriate.
-          style = "meta";
-        }
-        return style;
-      }
-
       // Handle decorators
-      if (current == "@"){
-        if(parserConf.version && parseInt(parserConf.version, 10) == 3){
-            return stream.match(identifiers, false) ? "meta" : "operator";
-        } else {
-            return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
-        }
+      if (current == "@") {
+        if (parserConf.version && parseInt(parserConf.version, 10) == 3)
+          return stream.match(identifiers, false) ? "meta" : "operator";
+        else
+          return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
       }
 
       if ((style == "variable" || style == "builtin")
-          && state.lastStyle == "meta")
+          && state.lastToken == "meta")
         style = "meta";
 
       // Handle scope changes.
@@ -276,15 +270,15 @@
 
       if (current == "lambda") state.lambda = true;
       if (current == ":" && !state.lambda && top(state).type == "py")
-        pushScope(stream, state, "py");
+        pushPyScope(state);
 
       var delimiter_index = current.length == 1 ? "[({".indexOf(current) : -1;
       if (delimiter_index != -1)
-        pushScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
+        pushBracketScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
 
       delimiter_index = "])}".indexOf(current);
       if (delimiter_index != -1) {
-        if (top(state).type == current) state.scopes.pop();
+        if (top(state).type == current) state.indent = state.scopes.pop().offset - hangingIndent
         else return ERRORCLASS;
       }
       if (state.dedent > 0 && stream.eol() && top(state).type == "py") {
@@ -300,7 +294,7 @@
         return {
           tokenize: tokenBase,
           scopes: [{offset: basecolumn || 0, type: "py", align: null}],
-          lastStyle: null,
+          indent: basecolumn || 0,
           lastToken: null,
           lambda: false,
           dedent: 0
@@ -312,11 +306,9 @@
         if (addErr) state.errorToken = false;
         var style = tokenLexer(stream, state);
 
-        state.lastStyle = style;
-
-        var current = stream.current();
-        if (current && style)
-          state.lastToken = current;
+        if (style && style != "comment")
+          state.lastToken = (style == "keyword" || style == "punctuation") ? stream.current() : style;
+        if (style == "punctuation") style = null;
 
         if (stream.eol() && state.lambda)
           state.lambda = false;
@@ -327,16 +319,14 @@
         if (state.tokenize != tokenBase)
           return state.tokenize.isString ? CodeMirror.Pass : 0;
 
-        var scope = top(state);
-        var closing = textAfter && textAfter.charAt(0) == scope.type;
+        var scope = top(state), closing = scope.type == textAfter.charAt(0)
         if (scope.align != null)
-          return scope.align - (closing ? 1 : 0);
-        else if (closing && state.scopes.length > 1)
-          return state.scopes[state.scopes.length - 2].offset;
+          return scope.align - (closing ? 1 : 0)
         else
-          return scope.offset;
+          return scope.offset - (closing ? hangingIndent : 0)
       },
 
+      electricInput: /^\s*[\}\]\)]$/,
       closeBrackets: {triples: "'\""},
       lineComment: "#",
       fold: "indent"
diff --git a/www/code/mode/q/index.html b/www/code/codemirror-5.13.2/mode/q/index.html
similarity index 100%
rename from www/code/mode/q/index.html
rename to www/code/codemirror-5.13.2/mode/q/index.html
diff --git a/www/code/mode/q/q.js b/www/code/codemirror-5.13.2/mode/q/q.js
similarity index 100%
rename from www/code/mode/q/q.js
rename to www/code/codemirror-5.13.2/mode/q/q.js
diff --git a/www/code/mode/r/index.html b/www/code/codemirror-5.13.2/mode/r/index.html
similarity index 100%
rename from www/code/mode/r/index.html
rename to www/code/codemirror-5.13.2/mode/r/index.html
diff --git a/www/code/mode/r/r.js b/www/code/codemirror-5.13.2/mode/r/r.js
similarity index 99%
rename from www/code/mode/r/r.js
rename to www/code/codemirror-5.13.2/mode/r/r.js
index 1ab4a9565..d41d1c54c 100644
--- a/www/code/mode/r/r.js
+++ b/www/code/codemirror-5.13.2/mode/r/r.js
@@ -11,6 +11,8 @@
 })(function(CodeMirror) {
 "use strict";
 
+CodeMirror.registerHelper("wordChars", "r", /[\w.]/);
+
 CodeMirror.defineMode("r", function(config) {
   function wordObj(str) {
     var words = str.split(" "), res = {};
diff --git a/www/code/mode/rpm/changes/index.html b/www/code/codemirror-5.13.2/mode/rpm/changes/index.html
similarity index 100%
rename from www/code/mode/rpm/changes/index.html
rename to www/code/codemirror-5.13.2/mode/rpm/changes/index.html
diff --git a/www/code/mode/rpm/index.html b/www/code/codemirror-5.13.2/mode/rpm/index.html
similarity index 100%
rename from www/code/mode/rpm/index.html
rename to www/code/codemirror-5.13.2/mode/rpm/index.html
diff --git a/www/code/mode/rpm/rpm.js b/www/code/codemirror-5.13.2/mode/rpm/rpm.js
similarity index 80%
rename from www/code/mode/rpm/rpm.js
rename to www/code/codemirror-5.13.2/mode/rpm/rpm.js
index 3bb7cd2f6..87cde591a 100644
--- a/www/code/mode/rpm/rpm.js
+++ b/www/code/codemirror-5.13.2/mode/rpm/rpm.js
@@ -34,10 +34,10 @@ CodeMirror.defineMIME("text/x-rpm-changes", "rpm-changes");
 // Quick and dirty spec file highlighting
 
 CodeMirror.defineMode("rpm-spec", function() {
-  var arch = /^(i386|i586|i686|x86_64|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
+  var arch = /^(i386|i586|i686|x86_64|ppc64le|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
 
-  var preamble = /^(Name|Version|Release|License|Summary|Url|Group|Source|BuildArch|BuildRequires|BuildRoot|AutoReqProv|Provides|Requires(\(\w+\))?|Obsoletes|Conflicts|Recommends|Source\d*|Patch\d*|ExclusiveArch|NoSource|Supplements):/;
-  var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preinstall|preun|postinstall|postun|pre|post|triggerin|triggerun|pretrans|posttrans|verifyscript|check|triggerpostun|triggerprein|trigger)/;
+  var preamble = /^[a-zA-Z0-9()]+:/;
+  var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preinstall|preun|postinstall|postun|pretrans|posttrans|pre|post|triggerin|triggerun|verifyscript|check|triggerpostun|triggerprein|trigger)/;
   var control_flow_complex = /^%(ifnarch|ifarch|if)/; // rpm control flow macros
   var control_flow_simple = /^%(else|endif)/; // rpm control flow macros
   var operators = /^(\!|\?|\<\=|\<|\>\=|\>|\=\=|\&\&|\|\|)/; // operators in control flow macros
@@ -55,8 +55,8 @@ CodeMirror.defineMode("rpm-spec", function() {
       if (ch == "#") { stream.skipToEnd(); return "comment"; }
 
       if (stream.sol()) {
-        if (stream.match(preamble)) { return "preamble"; }
-        if (stream.match(section)) { return "section"; }
+        if (stream.match(preamble)) { return "header"; }
+        if (stream.match(section)) { return "atom"; }
       }
 
       if (stream.match(/^\$\w+/)) { return "def"; } // Variables like '$RPM_BUILD_ROOT'
@@ -73,21 +73,29 @@ CodeMirror.defineMode("rpm-spec", function() {
         if (stream.eol()) { state.controlFlow = false; }
       }
 
-      if (stream.match(arch)) { return "number"; }
+      if (stream.match(arch)) {
+        if (stream.eol()) { state.controlFlow = false; }
+        return "number";
+      }
 
       // Macros like '%make_install' or '%attr(0775,root,root)'
       if (stream.match(/^%[\w]+/)) {
         if (stream.match(/^\(/)) { state.macroParameters = true; }
-        return "macro";
+        return "keyword";
       }
       if (state.macroParameters) {
         if (stream.match(/^\d+/)) { return "number";}
         if (stream.match(/^\)/)) {
           state.macroParameters = false;
-          return "macro";
+          return "keyword";
         }
       }
-      if (stream.match(/^%\{\??[\w \-]+\}/)) { return "macro"; } // Macros like '%{defined fedora}'
+
+      // Macros like '%{defined fedora}'
+      if (stream.match(/^%\{\??[\w \-\:\!]+\}/)) {
+        if (stream.eol()) { state.controlFlow = false; }
+        return "def";
+      }
 
       //TODO: Include bash script sub-parser (CodeMirror supports that)
       stream.next();
diff --git a/www/code/mode/rst/index.html b/www/code/codemirror-5.13.2/mode/rst/index.html
similarity index 100%
rename from www/code/mode/rst/index.html
rename to www/code/codemirror-5.13.2/mode/rst/index.html
diff --git a/www/code/mode/rst/rst.js b/www/code/codemirror-5.13.2/mode/rst/rst.js
similarity index 100%
rename from www/code/mode/rst/rst.js
rename to www/code/codemirror-5.13.2/mode/rst/rst.js
diff --git a/www/code/mode/ruby/index.html b/www/code/codemirror-5.13.2/mode/ruby/index.html
similarity index 100%
rename from www/code/mode/ruby/index.html
rename to www/code/codemirror-5.13.2/mode/ruby/index.html
diff --git a/www/code/mode/ruby/ruby.js b/www/code/codemirror-5.13.2/mode/ruby/ruby.js
similarity index 99%
rename from www/code/mode/ruby/ruby.js
rename to www/code/codemirror-5.13.2/mode/ruby/ruby.js
index 089a971d4..10cad8d9f 100644
--- a/www/code/mode/ruby/ruby.js
+++ b/www/code/codemirror-5.13.2/mode/ruby/ruby.js
@@ -275,7 +275,7 @@ CodeMirror.defineMode("ruby", function(config) {
         (state.continuedLine ? config.indentUnit : 0);
     },
 
-    electricChars: "}de", // enD and rescuE
+    electricInput: /^\s*(?:end|rescue|\})$/,
     lineComment: "#"
   };
 });
diff --git a/www/code/mode/ruby/test.js b/www/code/codemirror-5.13.2/mode/ruby/test.js
similarity index 100%
rename from www/code/mode/ruby/test.js
rename to www/code/codemirror-5.13.2/mode/ruby/test.js
diff --git a/www/code/mode/rust/index.html b/www/code/codemirror-5.13.2/mode/rust/index.html
similarity index 100%
rename from www/code/mode/rust/index.html
rename to www/code/codemirror-5.13.2/mode/rust/index.html
diff --git a/www/code/mode/rust/rust.js b/www/code/codemirror-5.13.2/mode/rust/rust.js
similarity index 82%
rename from www/code/mode/rust/rust.js
rename to www/code/codemirror-5.13.2/mode/rust/rust.js
index 1ce0c01ee..8558b53fe 100644
--- a/www/code/mode/rust/rust.js
+++ b/www/code/codemirror-5.13.2/mode/rust/rust.js
@@ -12,11 +12,12 @@
 "use strict";
 
 CodeMirror.defineSimpleMode("rust",{
-  start:[
+  start: [
     // string and byte string
-    {regex: /b?"(?:[^\\]|\\.)*?"/, token: "string"},
+    {regex: /b?"/, token: "string", next: "string"},
     // raw string and raw byte string
-    {regex: /(b?r)(#*)(".*?)("\2)/, token: ["string", "string", "string", "string"]},
+    {regex: /b?r"/, token: "string", next: "string_raw"},
+    {regex: /b?r#+"/, token: "string", next: "string_raw_hash"},
     // character
     {regex: /'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/, token: "string-2"},
     // byte
@@ -39,6 +40,18 @@ CodeMirror.defineSimpleMode("rust",{
     {regex: /[\{\[\(]/, indent: true},
     {regex: /[\}\]\)]/, dedent: true}
   ],
+  string: [
+    {regex: /"/, token: "string", next: "start"},
+    {regex: /(?:[^\\"]|\\(?:.|$))*/, token: "string"}
+  ],
+  string_raw: [
+    {regex: /"/, token: "string", next: "start"},
+    {regex: /[^"]*/, token: "string"}
+  ],
+  string_raw_hash: [
+    {regex: /"#+/, token: "string", next: "start"},
+    {regex: /(?:[^"]|"(?!#))*/, token: "string"}
+  ],
   comment: [
     {regex: /.*?\*\//, token: "comment", next: "start"},
     {regex: /.*/, token: "comment"}
diff --git a/www/code/mode/rust/test.js b/www/code/codemirror-5.13.2/mode/rust/test.js
similarity index 96%
rename from www/code/mode/rust/test.js
rename to www/code/codemirror-5.13.2/mode/rust/test.js
index 1a3c6e720..eb256c47e 100644
--- a/www/code/mode/rust/test.js
+++ b/www/code/codemirror-5.13.2/mode/rust/test.js
@@ -26,7 +26,6 @@
      '[string "\\"foo\\""]',
      '[string r#""foo""#]',
      '[string "foo #\\"# bar"]',
-     '[string r##"foo #"# bar"##]',
 
      '[string b"foo"]',
      '[string br"foo"]',
diff --git a/www/code/mode/sass/index.html b/www/code/codemirror-5.13.2/mode/sass/index.html
similarity index 100%
rename from www/code/mode/sass/index.html
rename to www/code/codemirror-5.13.2/mode/sass/index.html
diff --git a/www/code/mode/sass/sass.js b/www/code/codemirror-5.13.2/mode/sass/sass.js
similarity index 100%
rename from www/code/mode/sass/sass.js
rename to www/code/codemirror-5.13.2/mode/sass/sass.js
diff --git a/www/code/mode/scheme/index.html b/www/code/codemirror-5.13.2/mode/scheme/index.html
similarity index 100%
rename from www/code/mode/scheme/index.html
rename to www/code/codemirror-5.13.2/mode/scheme/index.html
diff --git a/www/code/mode/scheme/scheme.js b/www/code/codemirror-5.13.2/mode/scheme/scheme.js
similarity index 100%
rename from www/code/mode/scheme/scheme.js
rename to www/code/codemirror-5.13.2/mode/scheme/scheme.js
diff --git a/www/code/mode/shell/index.html b/www/code/codemirror-5.13.2/mode/shell/index.html
similarity index 100%
rename from www/code/mode/shell/index.html
rename to www/code/codemirror-5.13.2/mode/shell/index.html
diff --git a/www/code/mode/shell/shell.js b/www/code/codemirror-5.13.2/mode/shell/shell.js
similarity index 100%
rename from www/code/mode/shell/shell.js
rename to www/code/codemirror-5.13.2/mode/shell/shell.js
diff --git a/www/code/mode/shell/test.js b/www/code/codemirror-5.13.2/mode/shell/test.js
similarity index 100%
rename from www/code/mode/shell/test.js
rename to www/code/codemirror-5.13.2/mode/shell/test.js
diff --git a/www/code/mode/sieve/index.html b/www/code/codemirror-5.13.2/mode/sieve/index.html
similarity index 100%
rename from www/code/mode/sieve/index.html
rename to www/code/codemirror-5.13.2/mode/sieve/index.html
diff --git a/www/code/mode/sieve/sieve.js b/www/code/codemirror-5.13.2/mode/sieve/sieve.js
similarity index 100%
rename from www/code/mode/sieve/sieve.js
rename to www/code/codemirror-5.13.2/mode/sieve/sieve.js
diff --git a/www/code/mode/slim/index.html b/www/code/codemirror-5.13.2/mode/slim/index.html
similarity index 100%
rename from www/code/mode/slim/index.html
rename to www/code/codemirror-5.13.2/mode/slim/index.html
diff --git a/www/code/mode/slim/slim.js b/www/code/codemirror-5.13.2/mode/slim/slim.js
similarity index 100%
rename from www/code/mode/slim/slim.js
rename to www/code/codemirror-5.13.2/mode/slim/slim.js
diff --git a/www/code/mode/slim/test.js b/www/code/codemirror-5.13.2/mode/slim/test.js
similarity index 100%
rename from www/code/mode/slim/test.js
rename to www/code/codemirror-5.13.2/mode/slim/test.js
diff --git a/www/code/mode/smalltalk/index.html b/www/code/codemirror-5.13.2/mode/smalltalk/index.html
similarity index 100%
rename from www/code/mode/smalltalk/index.html
rename to www/code/codemirror-5.13.2/mode/smalltalk/index.html
diff --git a/www/code/mode/smalltalk/smalltalk.js b/www/code/codemirror-5.13.2/mode/smalltalk/smalltalk.js
similarity index 100%
rename from www/code/mode/smalltalk/smalltalk.js
rename to www/code/codemirror-5.13.2/mode/smalltalk/smalltalk.js
diff --git a/www/code/mode/smarty/index.html b/www/code/codemirror-5.13.2/mode/smarty/index.html
similarity index 100%
rename from www/code/mode/smarty/index.html
rename to www/code/codemirror-5.13.2/mode/smarty/index.html
diff --git a/www/code/mode/smarty/smarty.js b/www/code/codemirror-5.13.2/mode/smarty/smarty.js
similarity index 100%
rename from www/code/mode/smarty/smarty.js
rename to www/code/codemirror-5.13.2/mode/smarty/smarty.js
diff --git a/www/code/mode/solr/index.html b/www/code/codemirror-5.13.2/mode/solr/index.html
similarity index 100%
rename from www/code/mode/solr/index.html
rename to www/code/codemirror-5.13.2/mode/solr/index.html
diff --git a/www/code/mode/solr/solr.js b/www/code/codemirror-5.13.2/mode/solr/solr.js
similarity index 100%
rename from www/code/mode/solr/solr.js
rename to www/code/codemirror-5.13.2/mode/solr/solr.js
diff --git a/www/code/mode/soy/index.html b/www/code/codemirror-5.13.2/mode/soy/index.html
similarity index 100%
rename from www/code/mode/soy/index.html
rename to www/code/codemirror-5.13.2/mode/soy/index.html
diff --git a/www/code/mode/soy/soy.js b/www/code/codemirror-5.13.2/mode/soy/soy.js
similarity index 100%
rename from www/code/mode/soy/soy.js
rename to www/code/codemirror-5.13.2/mode/soy/soy.js
diff --git a/www/code/mode/sparql/index.html b/www/code/codemirror-5.13.2/mode/sparql/index.html
similarity index 100%
rename from www/code/mode/sparql/index.html
rename to www/code/codemirror-5.13.2/mode/sparql/index.html
diff --git a/www/code/mode/sparql/sparql.js b/www/code/codemirror-5.13.2/mode/sparql/sparql.js
similarity index 96%
rename from www/code/mode/sparql/sparql.js
rename to www/code/codemirror-5.13.2/mode/sparql/sparql.js
index bbf8a76a0..90b08e18f 100644
--- a/www/code/mode/sparql/sparql.js
+++ b/www/code/codemirror-5.13.2/mode/sparql/sparql.js
@@ -135,7 +135,11 @@ CodeMirror.defineMode("sparql", function(config) {
       else if (curPunc == "{") pushContext(state, "}", stream.column());
       else if (/[\]\}\)]/.test(curPunc)) {
         while (state.context && state.context.type == "pattern") popContext(state);
-        if (state.context && curPunc == state.context.type) popContext(state);
+        if (state.context && curPunc == state.context.type) {
+          popContext(state);
+          if (curPunc == "}" && state.context && state.context.type == "pattern")
+            popContext(state);
+        }
       }
       else if (curPunc == "." && state.context && state.context.type == "pattern") popContext(state);
       else if (/atom|string|variable/.test(style) && state.context) {
@@ -165,7 +169,9 @@ CodeMirror.defineMode("sparql", function(config) {
         return context.col + (closing ? 0 : 1);
       else
         return context.indent + (closing ? 0 : indentUnit);
-    }
+    },
+
+    lineComment: "#"
   };
 });
 
diff --git a/www/code/mode/spreadsheet/index.html b/www/code/codemirror-5.13.2/mode/spreadsheet/index.html
similarity index 100%
rename from www/code/mode/spreadsheet/index.html
rename to www/code/codemirror-5.13.2/mode/spreadsheet/index.html
diff --git a/www/code/mode/spreadsheet/spreadsheet.js b/www/code/codemirror-5.13.2/mode/spreadsheet/spreadsheet.js
similarity index 97%
rename from www/code/mode/spreadsheet/spreadsheet.js
rename to www/code/codemirror-5.13.2/mode/spreadsheet/spreadsheet.js
index 6fab00fdd..222f29766 100644
--- a/www/code/mode/spreadsheet/spreadsheet.js
+++ b/www/code/codemirror-5.13.2/mode/spreadsheet/spreadsheet.js
@@ -70,7 +70,10 @@
           return "operator";
         case "\\":
           if (stream.match(/\\[a-z]+/)) return "string-2";
-          else return null;
+          else {
+            stream.next();
+            return "atom";
+          }
         case ".":
         case ",":
         case ";":
diff --git a/www/code/mode/sql/index.html b/www/code/codemirror-5.13.2/mode/sql/index.html
similarity index 97%
rename from www/code/mode/sql/index.html
rename to www/code/codemirror-5.13.2/mode/sql/index.html
index a0d8d9e1b..7ea4b6934 100644
--- a/www/code/mode/sql/index.html
+++ b/www/code/codemirror-5.13.2/mode/sql/index.html
@@ -57,6 +57,7 @@ SELECT SQL_NO_CACHE DISTINCT
             text/x-plsql,
             text/x-mssql,
             text/x-hive.
+            text/x-pgsql.
         
    
 
-    
    The XML mode supports two configuration parameters:
    
+    
    The XML mode supports these configuration parameters:
    
     
    
       
    htmlMode (boolean)
    
       
    This switches the mode to parse HTML instead of XML. This
       means attributes do not have to be quoted, and some elements
       (such as br) do not require a closing tag.
    
+      
    matchClosing (boolean)
    
+      
    Controls whether the mode checks that close tags match the
+      corresponding opening tag, and highlights mismatches as errors.
+      Defaults to true.
    
       
    alignCDATA (boolean)
    
       
    Setting this to true will force the opening tag of CDATA
       blocks to not be indented.
    
diff --git a/www/code/mode/xml/test.js b/www/code/codemirror-5.13.2/mode/xml/test.js
similarity index 100%
rename from www/code/mode/xml/test.js
rename to www/code/codemirror-5.13.2/mode/xml/test.js
diff --git a/www/code/mode/xml/xml.js b/www/code/codemirror-5.13.2/mode/xml/xml.js
similarity index 70%
rename from www/code/mode/xml/xml.js
rename to www/code/codemirror-5.13.2/mode/xml/xml.js
index 5ad21720f..f987a3a3c 100644
--- a/www/code/mode/xml/xml.js
+++ b/www/code/codemirror-5.13.2/mode/xml/xml.js
@@ -11,54 +11,56 @@
 })(function(CodeMirror) {
 "use strict";
 
-CodeMirror.defineMode("xml", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1;
-  var multilineTagIndentPastTag = parserConfig.multilineTagIndentPastTag;
-  if (multilineTagIndentPastTag == null) multilineTagIndentPastTag = true;
+var htmlConfig = {
+  autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
+                    'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
+                    'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
+                    'track': true, 'wbr': true, 'menuitem': true},
+  implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
+                     'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
+                     'th': true, 'tr': true},
+  contextGrabbers: {
+    'dd': {'dd': true, 'dt': true},
+    'dt': {'dd': true, 'dt': true},
+    'li': {'li': true},
+    'option': {'option': true, 'optgroup': true},
+    'optgroup': {'optgroup': true},
+    'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
+          'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
+          'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
+          'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
+          'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
+    'rp': {'rp': true, 'rt': true},
+    'rt': {'rp': true, 'rt': true},
+    'tbody': {'tbody': true, 'tfoot': true},
+    'td': {'td': true, 'th': true},
+    'tfoot': {'tbody': true},
+    'th': {'td': true, 'th': true},
+    'thead': {'tbody': true, 'tfoot': true},
+    'tr': {'tr': true}
+  },
+  doNotIndent: {"pre": true},
+  allowUnquoted: true,
+  allowMissing: true,
+  caseFold: true
+}
 
-  var Kludges = parserConfig.htmlMode ? {
-    autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
-                      'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
-                      'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
-                      'track': true, 'wbr': true, 'menuitem': true},
-    implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
-                       'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
-                       'th': true, 'tr': true},
-    contextGrabbers: {
-      'dd': {'dd': true, 'dt': true},
-      'dt': {'dd': true, 'dt': true},
-      'li': {'li': true},
-      'option': {'option': true, 'optgroup': true},
-      'optgroup': {'optgroup': true},
-      'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
-            'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
-            'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
-            'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
-            'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
-      'rp': {'rp': true, 'rt': true},
-      'rt': {'rp': true, 'rt': true},
-      'tbody': {'tbody': true, 'tfoot': true},
-      'td': {'td': true, 'th': true},
-      'tfoot': {'tbody': true},
-      'th': {'td': true, 'th': true},
-      'thead': {'tbody': true, 'tfoot': true},
-      'tr': {'tr': true}
-    },
-    doNotIndent: {"pre": true},
-    allowUnquoted: true,
-    allowMissing: true,
-    caseFold: true
-  } : {
-    autoSelfClosers: {},
-    implicitlyClosed: {},
-    contextGrabbers: {},
-    doNotIndent: {},
-    allowUnquoted: false,
-    allowMissing: false,
-    caseFold: false
-  };
-  var alignCDATA = parserConfig.alignCDATA;
+var xmlConfig = {
+  autoSelfClosers: {},
+  implicitlyClosed: {},
+  contextGrabbers: {},
+  doNotIndent: {},
+  allowUnquoted: false,
+  allowMissing: false,
+  caseFold: false
+}
+
+CodeMirror.defineMode("xml", function(editorConf, config_) {
+  var indentUnit = editorConf.indentUnit
+  var config = {}
+  var defaults = config_.htmlMode ? htmlConfig : xmlConfig
+  for (var prop in defaults) config[prop] = defaults[prop]
+  for (var prop in config_) config[prop] = config_[prop]
 
   // Return variables for tokenizers
   var type, setStyle;
@@ -188,7 +190,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     this.tagName = tagName;
     this.indent = state.indented;
     this.startOfLine = startOfLine;
-    if (Kludges.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
+    if (config.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
       this.noIndent = true;
   }
   function popContext(state) {
@@ -201,8 +203,8 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         return;
       }
       parentTagName = state.context.tagName;
-      if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
-          !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
+      if (!config.contextGrabbers.hasOwnProperty(parentTagName) ||
+          !config.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
         return;
       }
       popContext(state);
@@ -233,9 +235,9 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
     if (type == "word") {
       var tagName = stream.current();
       if (state.context && state.context.tagName != tagName &&
-          Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName))
+          config.implicitlyClosed.hasOwnProperty(state.context.tagName))
         popContext(state);
-      if (state.context && state.context.tagName == tagName) {
+      if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) {
         setStyle = "tag";
         return closeState;
       } else {
@@ -269,7 +271,7 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
       var tagName = state.tagName, tagStart = state.tagStart;
       state.tagName = state.tagStart = null;
       if (type == "selfcloseTag" ||
-          Kludges.autoSelfClosers.hasOwnProperty(tagName)) {
+          config.autoSelfClosers.hasOwnProperty(tagName)) {
         maybePopContext(state, tagName);
       } else {
         maybePopContext(state, tagName);
@@ -282,12 +284,12 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   }
   function attrEqState(type, stream, state) {
     if (type == "equals") return attrValueState;
-    if (!Kludges.allowMissing) setStyle = "error";
+    if (!config.allowMissing) setStyle = "error";
     return attrState(type, stream, state);
   }
   function attrValueState(type, stream, state) {
     if (type == "string") return attrContinuedState;
-    if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return attrState;}
+    if (type == "word" && config.allowUnquoted) {setStyle = "string"; return attrState;}
     setStyle = "error";
     return attrState(type, stream, state);
   }
@@ -297,12 +299,14 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
   }
 
   return {
-    startState: function() {
-      return {tokenize: inText,
-              state: baseState,
-              indented: 0,
-              tagName: null, tagStart: null,
-              context: null};
+    startState: function(baseIndent) {
+      var state = {tokenize: inText,
+                   state: baseState,
+                   indented: baseIndent || 0,
+                   tagName: null, tagStart: null,
+                   context: null}
+      if (baseIndent != null) state.baseIndent = baseIndent
+      return state
     },
 
     token: function(stream, state) {
@@ -335,19 +339,19 @@ CodeMirror.defineMode("xml", function(config, parserConfig) {
         return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
       // Indent the starts of attribute names.
       if (state.tagName) {
-        if (multilineTagIndentPastTag)
+        if (config.multilineTagIndentPastTag !== false)
           return state.tagStart + state.tagName.length + 2;
         else
-          return state.tagStart + indentUnit * multilineTagIndentFactor;
+          return state.tagStart + indentUnit * (config.multilineTagIndentFactor || 1);
       }
-      if (alignCDATA && /$/,
     blockCommentStart: "",
 
-    configuration: parserConfig.htmlMode ? "html" : "xml",
-    helperType: parserConfig.htmlMode ? "html" : "xml"
+    configuration: config.htmlMode ? "html" : "xml",
+    helperType: config.htmlMode ? "html" : "xml",
+
+    skipAttribute: function(state) {
+      if (state.state == attrValueState)
+        state.state = attrState
+    }
   };
 });
 
diff --git a/www/code/mode/xquery/index.html b/www/code/codemirror-5.13.2/mode/xquery/index.html
similarity index 100%
rename from www/code/mode/xquery/index.html
rename to www/code/codemirror-5.13.2/mode/xquery/index.html
diff --git a/www/code/mode/xquery/test.js b/www/code/codemirror-5.13.2/mode/xquery/test.js
similarity index 100%
rename from www/code/mode/xquery/test.js
rename to www/code/codemirror-5.13.2/mode/xquery/test.js
diff --git a/www/code/mode/xquery/xquery.js b/www/code/codemirror-5.13.2/mode/xquery/xquery.js
similarity index 100%
rename from www/code/mode/xquery/xquery.js
rename to www/code/codemirror-5.13.2/mode/xquery/xquery.js
diff --git a/www/code/codemirror-5.13.2/mode/yaml-frontmatter/index.html b/www/code/codemirror-5.13.2/mode/yaml-frontmatter/index.html
new file mode 100644
index 000000000..30bed2f85
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/yaml-frontmatter/index.html
@@ -0,0 +1,121 @@
+
+
+CodeMirror: YAML front matter mode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+
    YAML front matter mode
    
+
    
+
+
    Defines a mode that parses
+a YAML frontmatter
+at the start of a file, switching to a base mode at the end of that.
+Takes a mode configuration option base to configure the
+base mode, which defaults to "gfm".
    
+
+    
+
+  
    
diff --git a/www/code/codemirror-5.13.2/mode/yaml-frontmatter/yaml-frontmatter.js b/www/code/codemirror-5.13.2/mode/yaml-frontmatter/yaml-frontmatter.js
new file mode 100644
index 000000000..5f4977237
--- /dev/null
+++ b/www/code/codemirror-5.13.2/mode/yaml-frontmatter/yaml-frontmatter.js
@@ -0,0 +1,68 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function (mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../yaml/yaml"))
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../yaml/yaml"], mod)
+  else // Plain browser env
+    mod(CodeMirror)
+})(function (CodeMirror) {
+
+  var START = 0, FRONTMATTER = 1, BODY = 2
+
+  // a mixed mode for Markdown text with an optional YAML front matter
+  CodeMirror.defineMode("yaml-frontmatter", function (config, parserConfig) {
+    var yamlMode = CodeMirror.getMode(config, "yaml")
+    var innerMode = CodeMirror.getMode(config, parserConfig && parserConfig.base || "gfm")
+
+    function curMode(state) {
+      return state.state == BODY ? innerMode : yamlMode
+    }
+
+    return {
+      startState: function () {
+        return {
+          state: START,
+          inner: CodeMirror.startState(yamlMode)
+        }
+      },
+      copyState: function (state) {
+        return {
+          state: state.state,
+          inner: CodeMirror.copyState(curMode(state), state.inner)
+        }
+      },
+      token: function (stream, state) {
+        if (state.state == START) {
+          if (stream.match(/---/, false)) {
+            state.state = FRONTMATTER
+            return yamlMode.token(stream, state.inner)
+          } else {
+            state.state = BODY
+            state.inner = CodeMirror.startState(innerMode)
+            return innerMode.token(stream, state.inner)
+          }
+        } else if (state.state == FRONTMATTER) {
+          var end = stream.sol() && stream.match(/---/, false)
+          var style = yamlMode.token(stream, state.inner)
+          if (end) {
+            state.state = BODY
+            state.inner = CodeMirror.startState(innerMode)
+          }
+          return style
+        } else {
+          return innerMode.token(stream, state.inner)
+        }
+      },
+      innerMode: function (state) {
+        return {mode: curMode(state), state: state.inner}
+      },
+      blankLine: function (state) {
+        var mode = curMode(state)
+        if (mode.blankLine) return mode.blankLine(state.inner)
+      }
+    }
+  })
+});
diff --git a/www/code/mode/yaml/index.html b/www/code/codemirror-5.13.2/mode/yaml/index.html
similarity index 100%
rename from www/code/mode/yaml/index.html
rename to www/code/codemirror-5.13.2/mode/yaml/index.html
diff --git a/www/code/mode/yaml/yaml.js b/www/code/codemirror-5.13.2/mode/yaml/yaml.js
similarity index 100%
rename from www/code/mode/yaml/yaml.js
rename to www/code/codemirror-5.13.2/mode/yaml/yaml.js
diff --git a/www/code/mode/z80/index.html b/www/code/codemirror-5.13.2/mode/z80/index.html
similarity index 100%
rename from www/code/mode/z80/index.html
rename to www/code/codemirror-5.13.2/mode/z80/index.html
diff --git a/www/code/mode/z80/z80.js b/www/code/codemirror-5.13.2/mode/z80/z80.js
similarity index 100%
rename from www/code/mode/z80/z80.js
rename to www/code/codemirror-5.13.2/mode/z80/z80.js
diff --git a/www/code/codemirror-5.13.2/package.json b/www/code/codemirror-5.13.2/package.json
new file mode 100644
index 000000000..7440fd5b3
--- /dev/null
+++ b/www/code/codemirror-5.13.2/package.json
@@ -0,0 +1,28 @@
+{
+    "name": "codemirror",
+    "version":"5.13.2",
+    "main": "lib/codemirror.js",
+    "description": "In-browser code editing made bearable",
+    "license": "MIT",
+    "directories": {"lib": "./lib"},
+    "scripts": {
+      "test": "node ./test/run.js",
+      "lint": "bin/lint"
+    },
+    "devDependencies": {"node-static": "0.6.0",
+                        "phantomjs": "1.9.2-5",
+                        "blint": ">=0.1.1"},
+    "bugs": "http://github.com/codemirror/CodeMirror/issues",
+    "keywords": ["JavaScript", "CodeMirror", "Editor"],
+    "homepage": "http://codemirror.net",
+    "maintainers":[{"name": "Marijn Haverbeke",
+                    "email": "marijnh@gmail.com",
+                    "web": "http://marijnhaverbeke.nl"}],
+    "repository": {"type": "git",
+                   "url": "https://github.com/codemirror/CodeMirror.git"},
+    "jspm": {
+      "directories": {},
+      "dependencies": {},
+      "devDependencies": {}
+    }
+}
diff --git a/www/code/codemirror-5.13.2/test/comment_test.js b/www/code/codemirror-5.13.2/test/comment_test.js
new file mode 100644
index 000000000..26e474493
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/comment_test.js
@@ -0,0 +1,100 @@
+namespace = "comment_";
+
+(function() {
+  function test(name, mode, run, before, after) {
+    return testCM(name, function(cm) {
+      run(cm);
+      eq(cm.getValue(), after);
+    }, {value: before, mode: mode});
+  }
+
+  var simpleProg = "function foo() {\n  return bar;\n}";
+  var inlineBlock = "foo(/* bar */ true);";
+  var inlineBlocks = "foo(/* bar */ true, /* baz */ false);";
+  var multiLineInlineBlock = ["above();", "foo(/* bar */ true);", "below();"];
+
+  test("block", "javascript", function(cm) {
+    cm.blockComment(Pos(0, 3), Pos(3, 0), {blockCommentLead: " *"});
+  }, simpleProg + "\n", "/* function foo() {\n *   return bar;\n * }\n */");
+
+  test("blockToggle", "javascript", function(cm) {
+    cm.blockComment(Pos(0, 3), Pos(2, 0), {blockCommentLead: " *"});
+    cm.uncomment(Pos(0, 3), Pos(2, 0), {blockCommentLead: " *"});
+  }, simpleProg, simpleProg);
+
+  test("blockToggle2", "javascript", function(cm) {
+    cm.setCursor({line: 0, ch: 7 /* inside the block comment */});
+    cm.execCommand("toggleComment");
+  }, inlineBlock, "foo(bar true);");
+
+  // This test should work but currently fails.
+  // test("blockToggle3", "javascript", function(cm) {
+  //   cm.setCursor({line: 0, ch: 7 /* inside the first block comment */});
+  //   cm.execCommand("toggleComment");
+  // }, inlineBlocks, "foo(bar true, /* baz */ false);");
+
+  test("line", "javascript", function(cm) {
+    cm.lineComment(Pos(1, 1), Pos(1, 1));
+  }, simpleProg, "function foo() {\n//   return bar;\n}");
+
+  test("lineToggle", "javascript", function(cm) {
+    cm.lineComment(Pos(0, 0), Pos(2, 1));
+    cm.uncomment(Pos(0, 0), Pos(2, 1));
+  }, simpleProg, simpleProg);
+
+  test("fallbackToBlock", "css", function(cm) {
+    cm.lineComment(Pos(0, 0), Pos(2, 1));
+  }, "html {\n  border: none;\n}", "/* html {\n  border: none;\n} */");
+
+  test("fallbackToLine", "ruby", function(cm) {
+    cm.blockComment(Pos(0, 0), Pos(1));
+  }, "def blah()\n  return hah\n", "# def blah()\n#   return hah\n");
+
+  test("ignoreExternalBlockComments", "javascript", function(cm) {
+    cm.execCommand("toggleComment");
+  }, inlineBlocks, "// " + inlineBlocks);
+
+  test("ignoreExternalBlockComments2", "javascript", function(cm) {
+    cm.setCursor({line: 0, ch: null /* eol */});
+    cm.execCommand("toggleComment");
+  }, inlineBlocks, "// " + inlineBlocks);
+
+  test("ignoreExternalBlockCommentsMultiLineAbove", "javascript", function(cm) {
+    cm.setSelection({line: 0, ch: 0}, {line: 1, ch: 1});
+    cm.execCommand("toggleComment");
+  }, multiLineInlineBlock.join("\n"), ["// " + multiLineInlineBlock[0],
+                                       "// " + multiLineInlineBlock[1],
+                                       multiLineInlineBlock[2]].join("\n"));
+
+  test("ignoreExternalBlockCommentsMultiLineBelow", "javascript", function(cm) {
+    cm.setSelection({line: 1, ch: 13 /* after end of block comment */}, {line: 2, ch: 1});
+    cm.execCommand("toggleComment");
+  }, multiLineInlineBlock.join("\n"), [multiLineInlineBlock[0],
+                                       "// " + multiLineInlineBlock[1],
+                                       "// " + multiLineInlineBlock[2]].join("\n"));
+
+  test("commentRange", "javascript", function(cm) {
+    cm.blockComment(Pos(1, 2), Pos(1, 13), {fullLines: false});
+  }, simpleProg, "function foo() {\n  /*return bar;*/\n}");
+
+  test("indented", "javascript", function(cm) {
+    cm.lineComment(Pos(1, 0), Pos(2), {indent: true});
+  }, simpleProg, "function foo() {\n//   return bar;\n// }");
+
+  test("singleEmptyLine", "javascript", function(cm) {
+    cm.setCursor(1);
+    cm.execCommand("toggleComment");
+  }, "a;\n\nb;", "a;\n// \nb;");
+
+  test("dontMessWithStrings", "javascript", function(cm) {
+    cm.execCommand("toggleComment");
+  }, "console.log(\"/*string*/\");", "// console.log(\"/*string*/\");");
+
+  test("dontMessWithStrings2", "javascript", function(cm) {
+    cm.execCommand("toggleComment");
+  }, "console.log(\"// string\");", "// console.log(\"// string\");");
+
+  test("dontMessWithStrings3", "javascript", function(cm) {
+    cm.execCommand("toggleComment");
+  }, "// console.log(\"// string\");", "console.log(\"// string\");");
+})();
diff --git a/www/code/codemirror-5.13.2/test/doc_test.js b/www/code/codemirror-5.13.2/test/doc_test.js
new file mode 100644
index 000000000..5f242f658
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/doc_test.js
@@ -0,0 +1,371 @@
+(function() {
+  // A minilanguage for instantiating linked CodeMirror instances and Docs
+  function instantiateSpec(spec, place, opts) {
+    var names = {}, pos = 0, l = spec.length, editors = [];
+    while (spec) {
+      var m = spec.match(/^(\w+)(\*?)(?:='([^\']*)'|<(~?)(\w+)(?:\/(\d+)-(\d+))?)\s*/);
+      var name = m[1], isDoc = m[2], cur;
+      if (m[3]) {
+        cur = isDoc ? CodeMirror.Doc(m[3]) : CodeMirror(place, clone(opts, {value: m[3]}));
+      } else {
+        var other = m[5];
+        if (!names.hasOwnProperty(other)) {
+          names[other] = editors.length;
+          editors.push(CodeMirror(place, opts));
+        }
+        var doc = editors[names[other]].linkedDoc({
+          sharedHist: !m[4],
+          from: m[6] ? Number(m[6]) : null,
+          to: m[7] ? Number(m[7]) : null
+        });
+        cur = isDoc ? doc : CodeMirror(place, clone(opts, {value: doc}));
+      }
+      names[name] = editors.length;
+      editors.push(cur);
+      spec = spec.slice(m[0].length);
+    }
+    return editors;
+  }
+
+  function clone(obj, props) {
+    if (!obj) return;
+    clone.prototype = obj;
+    var inst = new clone();
+    if (props) for (var n in props) if (props.hasOwnProperty(n))
+      inst[n] = props[n];
+    return inst;
+  }
+
+  function eqAll(val) {
+    var end = arguments.length, msg = null;
+    if (typeof arguments[end-1] == "string")
+      msg = arguments[--end];
+    if (i == end) throw new Error("No editors provided to eqAll");
+    for (var i = 1; i < end; ++i)
+      eq(arguments[i].getValue(), val, msg)
+  }
+
+  function testDoc(name, spec, run, opts, expectFail) {
+    if (!opts) opts = {};
+
+    return test("doc_" + name, function() {
+      var place = document.getElementById("testground");
+      var editors = instantiateSpec(spec, place, opts);
+      var successful = false;
+
+      try {
+        run.apply(null, editors);
+        successful = true;
+      } finally {
+        if (!successful || verbose) {
+          place.style.visibility = "visible";
+        } else {
+          for (var i = 0; i < editors.length; ++i)
+            if (editors[i] instanceof CodeMirror)
+              place.removeChild(editors[i].getWrapperElement());
+        }
+      }
+    }, expectFail);
+  }
+
+  var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
+
+  function testBasic(a, b) {
+    eqAll("x", a, b);
+    a.setValue("hey");
+    eqAll("hey", a, b);
+    b.setValue("wow");
+    eqAll("wow", a, b);
+    a.replaceRange("u\nv\nw", Pos(0, 3));
+    b.replaceRange("i", Pos(0, 4));
+    b.replaceRange("j", Pos(2, 1));
+    eqAll("wowui\nv\nwj", a, b);
+  }
+
+  testDoc("basic", "A='x' B 0, "not at left");
+    is(pos.top > 0, "not at top");
+  });
+
+  testDoc("copyDoc", "A='u'", function(a) {
+    var copy = a.getDoc().copy(true);
+    a.setValue("foo");
+    copy.setValue("bar");
+    var old = a.swapDoc(copy);
+    eq(a.getValue(), "bar");
+    a.undo();
+    eq(a.getValue(), "u");
+    a.swapDoc(old);
+    eq(a.getValue(), "foo");
+    eq(old.historySize().undo, 1);
+    eq(old.copy(false).historySize().undo, 0);
+  });
+
+  testDoc("docKeepsMode", "A='1+1'", function(a) {
+    var other = CodeMirror.Doc("hi", "text/x-markdown");
+    a.setOption("mode", "text/javascript");
+    var old = a.swapDoc(other);
+    eq(a.getOption("mode"), "text/x-markdown");
+    eq(a.getMode().name, "markdown");
+    a.swapDoc(old);
+    eq(a.getOption("mode"), "text/javascript");
+    eq(a.getMode().name, "javascript");
+  });
+
+  testDoc("subview", "A='1\n2\n3\n4\n5' B<~A/1-3", function(a, b) {
+    eq(b.getValue(), "2\n3");
+    eq(b.firstLine(), 1);
+    b.setCursor(Pos(4));
+    eqPos(b.getCursor(), Pos(2, 1));
+    a.replaceRange("-1\n0\n", Pos(0, 0));
+    eq(b.firstLine(), 3);
+    eqPos(b.getCursor(), Pos(4, 1));
+    a.undo();
+    eqPos(b.getCursor(), Pos(2, 1));
+    b.replaceRange("oyoy\n", Pos(2, 0));
+    eq(a.getValue(), "1\n2\noyoy\n3\n4\n5");
+    b.undo();
+    eq(a.getValue(), "1\n2\n3\n4\n5");
+  });
+
+  testDoc("subviewEditOnBoundary", "A='11\n22\n33\n44\n55' B<~A/1-4", function(a, b) {
+    a.replaceRange("x\nyy\nz", Pos(0, 1), Pos(2, 1));
+    eq(b.firstLine(), 2);
+    eq(b.lineCount(), 2);
+    eq(b.getValue(), "z3\n44");
+    a.replaceRange("q\nrr\ns", Pos(3, 1), Pos(4, 1));
+    eq(b.firstLine(), 2);
+    eq(b.getValue(), "z3\n4q");
+    eq(a.getValue(), "1x\nyy\nz3\n4q\nrr\ns5");
+    a.execCommand("selectAll");
+    a.replaceSelection("!");
+    eqAll("!", a, b);
+  });
+
+
+  testDoc("sharedMarker", "A='ab\ncd\nef\ngh' B 500){
+        totalTime = 0;
+        delay = 50;
+      }
+      setTimeout(function(){step(i + 1);}, delay);
+    } else { // Quit tests
+      running = false;
+      return null;
+    }
+  }
+  step(0);
+}
+
+function label(str, msg) {
+  if (msg) return str + " (" + msg + ")";
+  return str;
+}
+function eq(a, b, msg) {
+  if (a != b) throw new Failure(label(a + " != " + b, msg));
+}
+function near(a, b, margin, msg) {
+  if (Math.abs(a - b) > margin)
+    throw new Failure(label(a + " is not close to " + b + " (" + margin + ")", msg));
+}
+function eqPos(a, b, msg) {
+  function str(p) { return "{line:" + p.line + ",ch:" + p.ch + "}"; }
+  if (a == b) return;
+  if (a == null) throw new Failure(label("comparing null to " + str(b), msg));
+  if (b == null) throw new Failure(label("comparing " + str(a) + " to null", msg));
+  if (a.line != b.line || a.ch != b.ch) throw new Failure(label(str(a) + " != " + str(b), msg));
+}
+function is(a, msg) {
+  if (!a) throw new Failure(label("assertion failed", msg));
+}
+
+function countTests() {
+  if (!filters.length) return tests.length;
+  var sum = 0;
+  for (var i = 0; i < tests.length; ++i) {
+    var name = tests[i].name;
+    for (var j = 0; j < filters.length; j++) {
+      if (name.match(filters[j])) {
+        ++sum;
+        break;
+      }
+    }
+  }
+  return sum;
+}
+
+function parseTestFilter(s) {
+  if (/_\*$/.test(s)) return new RegExp("^" + s.slice(0, s.length - 2), "i");
+  else return new RegExp(s, "i");
+}
diff --git a/www/code/codemirror-5.13.2/test/emacs_test.js b/www/code/codemirror-5.13.2/test/emacs_test.js
new file mode 100644
index 000000000..124575c72
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/emacs_test.js
@@ -0,0 +1,147 @@
+(function() {
+  "use strict";
+
+  var Pos = CodeMirror.Pos;
+  namespace = "emacs_";
+
+  var eventCache = {};
+  function fakeEvent(keyName) {
+    var event = eventCache[key];
+    if (event) return event;
+
+    var ctrl, shift, alt;
+    var key = keyName.replace(/\w+-/g, function(type) {
+      if (type == "Ctrl-") ctrl = true;
+      else if (type == "Alt-") alt = true;
+      else if (type == "Shift-") shift = true;
+      return "";
+    });
+    var code;
+    for (var c in CodeMirror.keyNames)
+      if (CodeMirror.keyNames[c] == key) { code = c; break; }
+    if (code == null) throw new Error("Unknown key: " + key);
+
+    return eventCache[keyName] = {
+      type: "keydown", keyCode: code, ctrlKey: ctrl, shiftKey: shift, altKey: alt,
+      preventDefault: function(){}, stopPropagation: function(){}
+    };
+  }
+
+  function sim(name, start /*, actions... */) {
+    var keys = Array.prototype.slice.call(arguments, 2);
+    testCM(name, function(cm) {
+      for (var i = 0; i < keys.length; ++i) {
+        var cur = keys[i];
+        if (cur instanceof Pos) cm.setCursor(cur);
+        else if (cur.call) cur(cm);
+        else cm.triggerOnKeyDown(fakeEvent(cur));
+      }
+    }, {keyMap: "emacs", value: start, mode: "javascript"});
+  }
+
+  function at(line, ch) { return function(cm) { eqPos(cm.getCursor(), Pos(line, ch)); }; }
+  function txt(str) { return function(cm) { eq(cm.getValue(), str); }; }
+
+  sim("motionHSimple", "abc", "Ctrl-F", "Ctrl-F", "Ctrl-B", at(0, 1));
+  sim("motionHMulti", "abcde",
+      "Ctrl-4", "Ctrl-F", at(0, 4), "Ctrl--", "Ctrl-2", "Ctrl-F", at(0, 2),
+      "Ctrl-5", "Ctrl-B", at(0, 0));
+
+  sim("motionHWord", "abc. def ghi",
+      "Alt-F", at(0, 3), "Alt-F", at(0, 8),
+      "Ctrl-B", "Alt-B", at(0, 5), "Alt-B", at(0, 0));
+  sim("motionHWordMulti", "abc. def ghi ",
+      "Ctrl-3", "Alt-F", at(0, 12), "Ctrl-2", "Alt-B", at(0, 5),
+      "Ctrl--", "Alt-B", at(0, 8));
+
+  sim("motionVSimple", "a\nb\nc\n", "Ctrl-N", "Ctrl-N", "Ctrl-P", at(1, 0));
+  sim("motionVMulti", "a\nb\nc\nd\ne\n",
+      "Ctrl-2", "Ctrl-N", at(2, 0), "Ctrl-F", "Ctrl--", "Ctrl-N", at(1, 1),
+      "Ctrl--", "Ctrl-3", "Ctrl-P", at(4, 1));
+
+  sim("killYank", "abc\ndef\nghi",
+      "Ctrl-F", "Ctrl-Space", "Ctrl-N", "Ctrl-N", "Ctrl-W", "Ctrl-E", "Ctrl-Y",
+      txt("ahibc\ndef\ng"));
+  sim("killRing", "abcdef",
+      "Ctrl-Space", "Ctrl-F", "Ctrl-W", "Ctrl-Space", "Ctrl-F", "Ctrl-W",
+      "Ctrl-Y", "Alt-Y",
+      txt("acdef"));
+  sim("copyYank", "abcd",
+      "Ctrl-Space", "Ctrl-E", "Alt-W", "Ctrl-Y",
+      txt("abcdabcd"));
+
+  sim("killLineSimple", "foo\nbar", "Ctrl-F", "Ctrl-K", txt("f\nbar"));
+  sim("killLineEmptyLine", "foo\n  \nbar", "Ctrl-N", "Ctrl-K", txt("foo\nbar"));
+  sim("killLineMulti", "foo\nbar\nbaz",
+      "Ctrl-F", "Ctrl-F", "Ctrl-K", "Ctrl-K", "Ctrl-K", "Ctrl-A", "Ctrl-Y",
+      txt("o\nbarfo\nbaz"));
+
+  sim("moveByParagraph", "abc\ndef\n\n\nhij\nklm\n\n",
+      "Ctrl-F", "Ctrl-Down", at(2, 0), "Ctrl-Down", at(6, 0),
+      "Ctrl-N", "Ctrl-Up", at(3, 0), "Ctrl-Up", at(0, 0),
+      Pos(1, 2), "Ctrl-Down", at(2, 0), Pos(4, 2), "Ctrl-Up", at(3, 0));
+  sim("moveByParagraphMulti", "abc\n\ndef\n\nhij\n\nklm",
+      "Ctrl-U", "2", "Ctrl-Down", at(3, 0),
+      "Shift-Alt-.", "Ctrl-3", "Ctrl-Up", at(1, 0));
+
+  sim("moveBySentence", "sentence one! sentence\ntwo\n\nparagraph two",
+      "Alt-E", at(0, 13), "Alt-E", at(1, 3), "Ctrl-F", "Alt-A", at(0, 13));
+
+  sim("moveByExpr", "function foo(a, b) {}",
+      "Ctrl-Alt-F", at(0, 8), "Ctrl-Alt-F", at(0, 12), "Ctrl-Alt-F", at(0, 18),
+      "Ctrl-Alt-B", at(0, 12), "Ctrl-Alt-B", at(0, 9));
+  sim("moveByExprMulti", "foo bar baz bug",
+      "Ctrl-2", "Ctrl-Alt-F", at(0, 7),
+      "Ctrl--", "Ctrl-Alt-F", at(0, 4),
+      "Ctrl--", "Ctrl-2", "Ctrl-Alt-B", at(0, 11));
+  sim("delExpr", "var x = [\n  a,\n  b\n  c\n];",
+      Pos(0, 8), "Ctrl-Alt-K", txt("var x = ;"), "Ctrl-/",
+      Pos(4, 1), "Ctrl-Alt-Backspace", txt("var x = ;"));
+  sim("delExprMulti", "foo bar baz",
+      "Ctrl-2", "Ctrl-Alt-K", txt(" baz"),
+      "Ctrl-/", "Ctrl-E", "Ctrl-2", "Ctrl-Alt-Backspace", txt("foo "));
+
+  sim("justOneSpace", "hi      bye  ",
+      Pos(0, 4), "Alt-Space", txt("hi bye  "),
+      Pos(0, 4), "Alt-Space", txt("hi b ye  "),
+      "Ctrl-A", "Alt-Space", "Ctrl-E", "Alt-Space", txt(" hi b ye "));
+
+  sim("openLine", "foo bar", "Alt-F", "Ctrl-O", txt("foo\n bar"))
+
+  sim("transposeChar", "abcd\ne",
+      "Ctrl-F", "Ctrl-T", "Ctrl-T", txt("bcad\ne"), at(0, 3),
+      "Ctrl-F", "Ctrl-T", "Ctrl-T", "Ctrl-T", txt("bcda\ne"), at(0, 4),
+      "Ctrl-F", "Ctrl-T", txt("bcde\na"), at(1, 0));
+
+  sim("manipWordCase", "foo BAR bAZ",
+      "Alt-C", "Alt-L", "Alt-U", txt("Foo bar BAZ"),
+      "Ctrl-A", "Alt-U", "Alt-L", "Alt-C", txt("FOO bar Baz"));
+  sim("manipWordCaseMulti", "foo Bar bAz",
+      "Ctrl-2", "Alt-U", txt("FOO BAR bAz"),
+      "Ctrl-A", "Ctrl-3", "Alt-C", txt("Foo Bar Baz"));
+
+  sim("upExpr", "foo {\n  bar[];\n  baz(blah);\n}",
+      Pos(2, 7), "Ctrl-Alt-U", at(2, 5), "Ctrl-Alt-U", at(0, 4));
+  sim("transposeExpr", "do foo[bar] dah",
+      Pos(0, 6), "Ctrl-Alt-T", txt("do [bar]foo dah"));
+
+  sim("clearMark", "abcde", Pos(0, 2), "Ctrl-Space", "Ctrl-F", "Ctrl-F",
+      "Ctrl-G", "Ctrl-W", txt("abcde"));
+
+  sim("delRegion", "abcde", "Ctrl-Space", "Ctrl-F", "Ctrl-F", "Delete", txt("cde"));
+  sim("backspaceRegion", "abcde", "Ctrl-Space", "Ctrl-F", "Ctrl-F", "Backspace", txt("cde"));
+
+  testCM("save", function(cm) {
+    var saved = false;
+    CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };
+    cm.triggerOnKeyDown(fakeEvent("Ctrl-X"));
+    cm.triggerOnKeyDown(fakeEvent("Ctrl-S"));
+    is(saved, "hi");
+  }, {value: "hi", keyMap: "emacs"});
+
+  testCM("gotoInvalidLineFloat", function(cm) {
+    cm.openDialog = function(_, cb) { cb("2.2"); };
+    cm.triggerOnKeyDown(fakeEvent("Alt-G"));
+    cm.triggerOnKeyDown(fakeEvent("G"));
+  }, {value: "1\n2\n3\n4", keyMap: "emacs"});
+})();
diff --git a/www/code/codemirror-5.13.2/test/index.html b/www/code/codemirror-5.13.2/test/index.html
new file mode 100644
index 000000000..5f8ebadc1
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/index.html
@@ -0,0 +1,253 @@
+
+
+
+CodeMirror: Test Suite
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    
+  
    Test Suite
    
+
+    
    A limited set of programmatic sanity tests for CodeMirror.
    
+
+    
    
+      
    Ran 0 of 0 tests
    
+    
    
+    
    Please enable JavaScript...
    
+    
    
+
+    
    
+
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+
    
diff --git a/www/code/codemirror-5.13.2/test/lint.js b/www/code/codemirror-5.13.2/test/lint.js
new file mode 100644
index 000000000..35777562e
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/lint.js
@@ -0,0 +1,11 @@
+var blint = require("blint");
+
+["mode", "lib", "addon", "keymap"].forEach(function(dir) {
+  blint.checkDir(dir, {
+    browser: true,
+    allowedGlobals: ["CodeMirror", "define", "test", "requirejs"],
+    blob: "// CodeMirror, copyright (c) by Marijn Haverbeke and others\n// Distributed under an MIT license: http:\/\/codemirror.net\/LICENSE\n\n"
+  });
+});
+
+module.exports = {ok: blint.success()};
diff --git a/www/code/codemirror-5.13.2/test/mode_test.css b/www/code/codemirror-5.13.2/test/mode_test.css
new file mode 100644
index 000000000..f83271b4e
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/mode_test.css
@@ -0,0 +1,23 @@
+.mt-output .mt-token {
+  border: 1px solid #ddd;
+  white-space: pre;
+  font-family: "Consolas", monospace;
+  text-align: center;
+}
+
+.mt-output .mt-style {
+  font-size: x-small;
+}
+
+.mt-output .mt-state {
+  font-size: x-small;
+  vertical-align: top;
+}
+
+.mt-output .mt-state-row {
+  display: none;
+}
+
+.mt-state-unhide .mt-output .mt-state-row {
+  display: table-row;
+}
diff --git a/www/code/codemirror-5.13.2/test/mode_test.js b/www/code/codemirror-5.13.2/test/mode_test.js
new file mode 100644
index 000000000..0aed50f7d
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/mode_test.js
@@ -0,0 +1,192 @@
+/**
+ * Helper to test CodeMirror highlighting modes. It pretty prints output of the
+ * highlighter and can check against expected styles.
+ *
+ * Mode tests are registered by calling test.mode(testName, mode,
+ * tokens), where mode is a mode object as returned by
+ * CodeMirror.getMode, and tokens is an array of lines that make up
+ * the test.
+ *
+ * These lines are strings, in which styled stretches of code are
+ * enclosed in brackets `[]`, and prefixed by their style. For
+ * example, `[keyword if]`. Brackets in the code itself must be
+ * duplicated to prevent them from being interpreted as token
+ * boundaries. For example `a[[i]]` for `a[i]`. If a token has
+ * multiple styles, the styles must be separated by ampersands, for
+ * example `[tag&error ]`.
+ *
+ * See the test.js files in the css, markdown, gfm, and stex mode
+ * directories for examples.
+ */
+(function() {
+  function findSingle(str, pos, ch) {
+    for (;;) {
+      var found = str.indexOf(ch, pos);
+      if (found == -1) return null;
+      if (str.charAt(found + 1) != ch) return found;
+      pos = found + 2;
+    }
+  }
+
+  var styleName = /[\w&-_]+/g;
+  function parseTokens(strs) {
+    var tokens = [], plain = "";
+    for (var i = 0; i < strs.length; ++i) {
+      if (i) plain += "\n";
+      var str = strs[i], pos = 0;
+      while (pos < str.length) {
+        var style = null, text;
+        if (str.charAt(pos) == "[" && str.charAt(pos+1) != "[") {
+          styleName.lastIndex = pos + 1;
+          var m = styleName.exec(str);
+          style = m[0].replace(/&/g, " ");
+          var textStart = pos + style.length + 2;
+          var end = findSingle(str, textStart, "]");
+          if (end == null) throw new Error("Unterminated token at " + pos + " in '" + str + "'" + style);
+          text = str.slice(textStart, end);
+          pos = end + 1;
+        } else {
+          var end = findSingle(str, pos, "[");
+          if (end == null) end = str.length;
+          text = str.slice(pos, end);
+          pos = end;
+        }
+        text = text.replace(/\[\[|\]\]/g, function(s) {return s.charAt(0);});
+        tokens.push({style: style, text: text});
+        plain += text;
+      }
+    }
+    return {tokens: tokens, plain: plain};
+  }
+
+  test.mode = function(name, mode, tokens, modeName) {
+    var data = parseTokens(tokens);
+    return test((modeName || mode.name) + "_" + name, function() {
+      return compare(data.plain, data.tokens, mode);
+    });
+  };
+
+  function esc(str) {
+    return str.replace('&', '&').replace('<', '<').replace(/>/g, ">").replace(/"/g, """).replace(/'/g, "'");
+;
+  }
+
+  function compare(text, expected, mode) {
+
+    var expectedOutput = [];
+    for (var i = 0; i < expected.length; ++i) {
+      var sty = expected[i].style;
+      if (sty && sty.indexOf(" ")) sty = sty.split(' ').sort().join(' ');
+      expectedOutput.push({style: sty, text: expected[i].text});
+    }
+
+    var observedOutput = highlight(text, mode);
+
+    var s = "";
+    var diff = highlightOutputsDifferent(expectedOutput, observedOutput);
+    if (diff != null) {
+      s += '
    ';
+      s +=   '
    ' + esc(text) + '
    ';
+      s +=   '
    ';
+      s += 'expected:';
+      s +=   prettyPrintOutputTable(expectedOutput, diff);
+      s += 'observed: [display states]';
+      s +=   prettyPrintOutputTable(observedOutput, diff);
+      s +=   '
    ';
+      s += '
    ';
+    }
+    if (observedOutput.indentFailures) {
+      for (var i = 0; i < observedOutput.indentFailures.length; i++)
+        s += "
    " + esc(observedOutput.indentFailures[i]) + "
    ";
+    }
+    if (s) throw new Failure(s);
+  }
+
+  function stringify(obj) {
+    function replacer(key, obj) {
+      if (typeof obj == "function") {
+        var m = obj.toString().match(/function\s*[^\s(]*/);
+        return m ? m[0] : "function";
+      }
+      return obj;
+    }
+    if (window.JSON && JSON.stringify)
+      return JSON.stringify(obj, replacer, 2);
+    return "[unsupported]";  // Fail safely if no native JSON.
+  }
+
+  function highlight(string, mode) {
+    var state = mode.startState();
+
+    var lines = string.replace(/\r\n/g,'\n').split('\n');
+    var st = [], pos = 0;
+    for (var i = 0; i < lines.length; ++i) {
+      var line = lines[i], newLine = true;
+      if (mode.indent) {
+        var ws = line.match(/^\s*/)[0];
+        var indent = mode.indent(state, line.slice(ws.length));
+        if (indent != CodeMirror.Pass && indent != ws.length)
+          (st.indentFailures || (st.indentFailures = [])).push(
+            "Indentation of line " + (i + 1) + " is " + indent + " (expected " + ws.length + ")");
+      }
+      var stream = new CodeMirror.StringStream(line);
+      if (line == "" && mode.blankLine) mode.blankLine(state);
+      /* Start copied code from CodeMirror.highlight */
+      while (!stream.eol()) {
+        for (var j = 0; j < 10 && stream.start >= stream.pos; j++)
+          var compare = mode.token(stream, state);
+        if (j == 10)
+          throw new Failure("Failed to advance the stream." + stream.string + " " + stream.pos);
+        var substr = stream.current();
+        if (compare && compare.indexOf(" ") > -1) compare = compare.split(' ').sort().join(' ');
+        stream.start = stream.pos;
+        if (pos && st[pos-1].style == compare && !newLine) {
+          st[pos-1].text += substr;
+        } else if (substr) {
+          st[pos++] = {style: compare, text: substr, state: stringify(state)};
+        }
+        // Give up when line is ridiculously long
+        if (stream.pos > 5000) {
+          st[pos++] = {style: null, text: this.text.slice(stream.pos)};
+          break;
+        }
+        newLine = false;
+      }
+    }
+
+    return st;
+  }
+
+  function highlightOutputsDifferent(o1, o2) {
+    var minLen = Math.min(o1.length, o2.length);
+    for (var i = 0; i < minLen; ++i)
+      if (o1[i].style != o2[i].style || o1[i].text != o2[i].text) return i;
+    if (o1.length > minLen || o2.length > minLen) return minLen;
+  }
+
+  function prettyPrintOutputTable(output, diffAt) {
+    var s = '';
+    s += '';
+    for (var i = 0; i < output.length; ++i) {
+      var style = output[i].style, val = output[i].text;
+      s +=
+      '';
+    }
+    s += '';
+    for (var i = 0; i < output.length; ++i) {
+      s += '';
+    }
+    if(output[0].state) {
+      s += '';
+      for (var i = 0; i < output.length; ++i) {
+        s += '';
+      }
+    }
+    s += '
    ' +
+        '' +
+        esc(val.replace(/ /g,'\xb7')) +  // · MIDDLE DOT
+        '' +
+        '
    ' + (output[i].style || null) + '
    ' + esc(output[i].state) + '
    ';
+    return s;
+  }
+})();
diff --git a/www/code/codemirror-5.13.2/test/multi_test.js b/www/code/codemirror-5.13.2/test/multi_test.js
new file mode 100644
index 000000000..a8e760d27
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/multi_test.js
@@ -0,0 +1,285 @@
+(function() {
+  namespace = "multi_";
+
+  function hasSelections(cm) {
+    var sels = cm.listSelections();
+    var given = (arguments.length - 1) / 4;
+    if (sels.length != given)
+      throw new Failure("expected " + given + " selections, found " + sels.length);
+    for (var i = 0, p = 1; i < given; i++, p += 4) {
+      var anchor = Pos(arguments[p], arguments[p + 1]);
+      var head = Pos(arguments[p + 2], arguments[p + 3]);
+      eqPos(sels[i].anchor, anchor, "anchor of selection " + i);
+      eqPos(sels[i].head, head, "head of selection " + i);
+    }
+  }
+  function hasCursors(cm) {
+    var sels = cm.listSelections();
+    var given = (arguments.length - 1) / 2;
+    if (sels.length != given)
+      throw new Failure("expected " + given + " selections, found " + sels.length);
+    for (var i = 0, p = 1; i < given; i++, p += 2) {
+      eqPos(sels[i].anchor, sels[i].head, "something selected for " + i);
+      var head = Pos(arguments[p], arguments[p + 1]);
+      eqPos(sels[i].head, head, "selection " + i);
+    }
+  }
+
+  testCM("getSelection", function(cm) {
+    select(cm, {anchor: Pos(0, 0), head: Pos(1, 2)}, {anchor: Pos(2, 2), head: Pos(2, 0)});
+    eq(cm.getSelection(), "1234\n56\n90");
+    eq(cm.getSelection(false).join("|"), "1234|56|90");
+    eq(cm.getSelections().join("|"), "1234\n56|90");
+  }, {value: "1234\n5678\n90"});
+
+  testCM("setSelection", function(cm) {
+    select(cm, Pos(3, 0), Pos(0, 0), {anchor: Pos(2, 5), head: Pos(1, 0)});
+    hasSelections(cm, 0, 0, 0, 0,
+                  2, 5, 1, 0,
+                  3, 0, 3, 0);
+    cm.setSelection(Pos(1, 2), Pos(1, 1));
+    hasSelections(cm, 1, 2, 1, 1);
+    select(cm, {anchor: Pos(1, 1), head: Pos(2, 4)},
+           {anchor: Pos(0, 0), head: Pos(1, 3)},
+           Pos(3, 0), Pos(2, 2));
+    hasSelections(cm, 0, 0, 2, 4,
+                  3, 0, 3, 0);
+    cm.setSelections([{anchor: Pos(0, 1), head: Pos(0, 2)},
+                      {anchor: Pos(1, 1), head: Pos(1, 2)},
+                      {anchor: Pos(2, 1), head: Pos(2, 2)}], 1);
+    eqPos(cm.getCursor("head"), Pos(1, 2));
+    eqPos(cm.getCursor("anchor"), Pos(1, 1));
+    eqPos(cm.getCursor("from"), Pos(1, 1));
+    eqPos(cm.getCursor("to"), Pos(1, 2));
+    cm.setCursor(Pos(1, 1));
+    hasCursors(cm, 1, 1);
+  }, {value: "abcde\nabcde\nabcde\n"});
+
+  testCM("somethingSelected", function(cm) {
+    select(cm, Pos(0, 1), {anchor: Pos(0, 3), head: Pos(0, 5)});
+    eq(cm.somethingSelected(), true);
+    select(cm, Pos(0, 1), Pos(0, 3), Pos(0, 5));
+    eq(cm.somethingSelected(), false);
+  }, {value: "123456789"});
+
+  testCM("extendSelection", function(cm) {
+    select(cm, Pos(0, 1), Pos(1, 1), Pos(2, 1));
+    cm.setExtending(true);
+    cm.extendSelections([Pos(0, 2), Pos(1, 0), Pos(2, 3)]);
+    hasSelections(cm, 0, 1, 0, 2,
+                  1, 1, 1, 0,
+                  2, 1, 2, 3);
+    cm.extendSelection(Pos(2, 4), Pos(2, 0));
+    hasSelections(cm, 2, 4, 2, 0);
+  }, {value: "1234\n1234\n1234"});
+
+  testCM("addSelection", function(cm) {
+    select(cm, Pos(0, 1), Pos(1, 1));
+    cm.addSelection(Pos(0, 0), Pos(0, 4));
+    hasSelections(cm, 0, 0, 0, 4,
+                  1, 1, 1, 1);
+    cm.addSelection(Pos(2, 2));
+    hasSelections(cm, 0, 0, 0, 4,
+                  1, 1, 1, 1,
+                  2, 2, 2, 2);
+  }, {value: "1234\n1234\n1234"});
+
+  testCM("replaceSelection", function(cm) {
+    var selections = [{anchor: Pos(0, 0), head: Pos(0, 1)},
+                      {anchor: Pos(0, 2), head: Pos(0, 3)},
+                      {anchor: Pos(0, 4), head: Pos(0, 5)},
+                      {anchor: Pos(2, 1), head: Pos(2, 4)},
+                      {anchor: Pos(2, 5), head: Pos(2, 6)}];
+    var val = "123456\n123456\n123456";
+    cm.setValue(val);
+    cm.setSelections(selections);
+    cm.replaceSelection("ab", "around");
+    eq(cm.getValue(), "ab2ab4ab6\n123456\n1ab5ab");
+    hasSelections(cm, 0, 0, 0, 2,
+                  0, 3, 0, 5,
+                  0, 6, 0, 8,
+                  2, 1, 2, 3,
+                  2, 4, 2, 6);
+    cm.setValue(val);
+    cm.setSelections(selections);
+    cm.replaceSelection("", "around");
+    eq(cm.getValue(), "246\n123456\n15");
+    hasSelections(cm, 0, 0, 0, 0,
+                  0, 1, 0, 1,
+                  0, 2, 0, 2,
+                  2, 1, 2, 1,
+                  2, 2, 2, 2);
+    cm.setValue(val);
+    cm.setSelections(selections);
+    cm.replaceSelection("X\nY\nZ", "around");
+    hasSelections(cm, 0, 0, 2, 1,
+                  2, 2, 4, 1,
+                  4, 2, 6, 1,
+                  8, 1, 10, 1,
+                  10, 2, 12, 1);
+    cm.replaceSelection("a", "around");
+    hasSelections(cm, 0, 0, 0, 1,
+                  0, 2, 0, 3,
+                  0, 4, 0, 5,
+                  2, 1, 2, 2,
+                  2, 3, 2, 4);
+    cm.replaceSelection("xy", "start");
+    hasSelections(cm, 0, 0, 0, 0,
+                  0, 3, 0, 3,
+                  0, 6, 0, 6,
+                  2, 1, 2, 1,
+                  2, 4, 2, 4);
+    cm.replaceSelection("z\nf");
+    hasSelections(cm, 1, 1, 1, 1,
+                  2, 1, 2, 1,
+                  3, 1, 3, 1,
+                  6, 1, 6, 1,
+                  7, 1, 7, 1);
+    eq(cm.getValue(), "z\nfxy2z\nfxy4z\nfxy6\n123456\n1z\nfxy5z\nfxy");
+  });
+
+  function select(cm) {
+    var sels = [];
+    for (var i = 1; i < arguments.length; i++) {
+      var arg = arguments[i];
+      if (arg.head) sels.push(arg);
+      else sels.push({head: arg, anchor: arg});
+    }
+    cm.setSelections(sels, sels.length - 1);
+  }
+
+  testCM("indentSelection", function(cm) {
+    select(cm, Pos(0, 1), Pos(1, 1));
+    cm.indentSelection(4);
+    eq(cm.getValue(), "    foo\n    bar\nbaz");
+
+    select(cm, Pos(0, 2), Pos(0, 3), Pos(0, 4));
+    cm.indentSelection(-2);
+    eq(cm.getValue(), "  foo\n    bar\nbaz");
+
+    select(cm, {anchor: Pos(0, 0), head: Pos(1, 2)},
+           {anchor: Pos(1, 3), head: Pos(2, 0)});
+    cm.indentSelection(-2);
+    eq(cm.getValue(), "foo\n  bar\nbaz");
+  }, {value: "foo\nbar\nbaz"});
+
+  testCM("killLine", function(cm) {
+    select(cm, Pos(0, 1), Pos(0, 2), Pos(1, 1));
+    cm.execCommand("killLine");
+    eq(cm.getValue(), "f\nb\nbaz");
+    cm.execCommand("killLine");
+    eq(cm.getValue(), "fbbaz");
+    cm.setValue("foo\nbar\nbaz");
+    select(cm, Pos(0, 1), {anchor: Pos(0, 2), head: Pos(2, 1)});
+    cm.execCommand("killLine");
+    eq(cm.getValue(), "faz");
+  }, {value: "foo\nbar\nbaz"});
+
+  testCM("deleteLine", function(cm) {
+    select(cm, Pos(0, 0),
+           {head: Pos(0, 1), anchor: Pos(2, 0)},
+           Pos(4, 0));
+    cm.execCommand("deleteLine");
+    eq(cm.getValue(), "4\n6\n7");
+    select(cm, Pos(2, 1));
+    cm.execCommand("deleteLine");
+    eq(cm.getValue(), "4\n6\n");
+  }, {value: "1\n2\n3\n4\n5\n6\n7"});
+
+  testCM("deleteH", function(cm) {
+    select(cm, Pos(0, 4), {anchor: Pos(1, 4), head: Pos(1, 5)});
+    cm.execCommand("delWordAfter");
+    eq(cm.getValue(), "foo bar baz\nabc ef ghi\n");
+    cm.execCommand("delWordAfter");
+    eq(cm.getValue(), "foo  baz\nabc  ghi\n");
+    cm.execCommand("delCharBefore");
+    cm.execCommand("delCharBefore");
+    eq(cm.getValue(), "fo baz\nab ghi\n");
+    select(cm, Pos(0, 3), Pos(0, 4), Pos(0, 5));
+    cm.execCommand("delWordAfter");
+    eq(cm.getValue(), "fo \nab ghi\n");
+  }, {value: "foo bar baz\nabc def ghi\n"});
+
+  testCM("goLineStart", function(cm) {
+    select(cm, Pos(0, 2), Pos(0, 3), Pos(1, 1));
+    cm.execCommand("goLineStart");
+    hasCursors(cm, 0, 0, 1, 0);
+    select(cm, Pos(1, 1), Pos(0, 1));
+    cm.setExtending(true);
+    cm.execCommand("goLineStart");
+    hasSelections(cm, 0, 1, 0, 0,
+                  1, 1, 1, 0);
+  }, {value: "foo\nbar\nbaz"});
+
+  testCM("moveV", function(cm) {
+    select(cm, Pos(0, 2), Pos(1, 2));
+    cm.execCommand("goLineDown");
+    hasCursors(cm, 1, 2, 2, 2);
+    cm.execCommand("goLineUp");
+    hasCursors(cm, 0, 2, 1, 2);
+    cm.execCommand("goLineUp");
+    hasCursors(cm, 0, 0, 0, 2);
+    cm.execCommand("goLineUp");
+    hasCursors(cm, 0, 0);
+    select(cm, Pos(0, 2), Pos(1, 2));
+    cm.setExtending(true);
+    cm.execCommand("goLineDown");
+    hasSelections(cm, 0, 2, 2, 2);
+  }, {value: "12345\n12345\n12345"});
+
+  testCM("moveH", function(cm) {
+    select(cm, Pos(0, 1), Pos(0, 3), Pos(0, 5), Pos(2, 3));
+    cm.execCommand("goCharRight");
+    hasCursors(cm, 0, 2, 0, 4, 1, 0, 2, 4);
+    cm.execCommand("goCharLeft");
+    hasCursors(cm, 0, 1, 0, 3, 0, 5, 2, 3);
+    for (var i = 0; i < 15; i++)
+      cm.execCommand("goCharRight");
+    hasCursors(cm, 2, 4, 2, 5);
+  }, {value: "12345\n12345\n12345"});
+
+  testCM("newlineAndIndent", function(cm) {
+    select(cm, Pos(0, 5), Pos(1, 5));
+    cm.execCommand("newlineAndIndent");
+    hasCursors(cm, 1, 2, 3, 2);
+    eq(cm.getValue(), "x = [\n  1];\ny = [\n  2];");
+    cm.undo();
+    eq(cm.getValue(), "x = [1];\ny = [2];");
+    hasCursors(cm, 0, 5, 1, 5);
+    select(cm, Pos(0, 5), Pos(0, 6));
+    cm.execCommand("newlineAndIndent");
+    hasCursors(cm, 1, 2, 2, 0);
+    eq(cm.getValue(), "x = [\n  1\n];\ny = [2];");
+  }, {value: "x = [1];\ny = [2];", mode: "javascript"});
+
+  testCM("goDocStartEnd", function(cm) {
+    select(cm, Pos(0, 1), Pos(1, 1));
+    cm.execCommand("goDocStart");
+    hasCursors(cm, 0, 0);
+    select(cm, Pos(0, 1), Pos(1, 1));
+    cm.execCommand("goDocEnd");
+    hasCursors(cm, 1, 3);
+    select(cm, Pos(0, 1), Pos(1, 1));
+    cm.setExtending(true);
+    cm.execCommand("goDocEnd");
+    hasSelections(cm, 1, 1, 1, 3);
+  }, {value: "abc\ndef"});
+
+  testCM("selectionHistory", function(cm) {
+    for (var i = 0; i < 3; ++i)
+      cm.addSelection(Pos(0, i * 2), Pos(0, i * 2 + 1));
+    cm.execCommand("undoSelection");
+    eq(cm.getSelection(), "1\n2");
+    cm.execCommand("undoSelection");
+    eq(cm.getSelection(), "1");
+    cm.execCommand("undoSelection");
+    eq(cm.getSelection(), "");
+    eqPos(cm.getCursor(), Pos(0, 0));
+    cm.execCommand("redoSelection");
+    eq(cm.getSelection(), "1");
+    cm.execCommand("redoSelection");
+    eq(cm.getSelection(), "1\n2");
+    cm.execCommand("redoSelection");
+    eq(cm.getSelection(), "1\n2\n3");
+  }, {value: "1 2 3"});
+})();
diff --git a/www/code/codemirror-5.13.2/test/phantom_driver.js b/www/code/codemirror-5.13.2/test/phantom_driver.js
new file mode 100644
index 000000000..dbad08db6
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/phantom_driver.js
@@ -0,0 +1,31 @@
+var page = require('webpage').create();
+
+page.open("http://localhost:3000/test/index.html", function (status) {
+  if (status != "success") {
+    console.log("page couldn't be loaded successfully");
+    phantom.exit(1);
+  }
+  waitFor(function () {
+    return page.evaluate(function () {
+      var output = document.getElementById('status');
+      if (!output) { return false; }
+      return (/^(\d+ failures?|all passed)/i).test(output.innerText);
+    });
+  }, function () {
+    var failed = page.evaluate(function () { return window.failed; });
+    var output = page.evaluate(function () {
+      return document.getElementById('output').innerText + "\n" +
+        document.getElementById('status').innerText;
+    });
+    console.log(output);
+    phantom.exit(failed > 0 ? 1 : 0);
+  });
+});
+
+function waitFor (test, cb) {
+  if (test()) {
+    cb();
+  } else {
+    setTimeout(function () { waitFor(test, cb); }, 250);
+  }
+}
diff --git a/www/code/codemirror-5.13.2/test/run.js b/www/code/codemirror-5.13.2/test/run.js
new file mode 100644
index 000000000..24b835c37
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/run.js
@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+
+var ok = require("./lint").ok;
+
+var files = new (require('node-static').Server)();
+
+var server = require('http').createServer(function (req, res) {
+  req.addListener('end', function () {
+    files.serve(req, res, function (err/*, result */) {
+      if (err) {
+        console.error(err);
+        process.exit(1);
+      }
+    });
+  }).resume();
+}).addListener('error', function (err) {
+  throw err;
+}).listen(3000, function () {
+  var childProcess = require('child_process');
+  var phantomjs = require("phantomjs");
+  var childArgs = [
+    require("path").join(__dirname, 'phantom_driver.js')
+  ];
+  childProcess.execFile(phantomjs.path, childArgs, function (err, stdout, stderr) {
+    server.close();
+    console.log(stdout);
+    if (err) console.error(err);
+    if (stderr) console.error(stderr);
+    process.exit(err || stderr || !ok ? 1 : 0);
+  });
+});
diff --git a/www/code/codemirror-5.13.2/test/scroll_test.js b/www/code/codemirror-5.13.2/test/scroll_test.js
new file mode 100644
index 000000000..55aac78eb
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/scroll_test.js
@@ -0,0 +1,115 @@
+(function() {
+  "use strict";
+
+  namespace = "scroll_";
+
+  testCM("bars_hidden", function(cm) {
+    for (var i = 0;; i++) {
+      var wrapBox = cm.getWrapperElement().getBoundingClientRect();
+      var scrollBox = cm.getScrollerElement().getBoundingClientRect();
+      is(wrapBox.bottom < scrollBox.bottom - 10);
+      is(wrapBox.right < scrollBox.right - 10);
+      if (i == 1) break;
+      cm.getWrapperElement().style.height = "auto";
+      cm.refresh();
+    }
+  });
+  
+  function barH(cm) { return byClassName(cm.getWrapperElement(), "CodeMirror-hscrollbar")[0]; }
+  function barV(cm) { return byClassName(cm.getWrapperElement(), "CodeMirror-vscrollbar")[0]; }
+
+  function displayBottom(cm, scrollbar) {
+    if (scrollbar && cm.display.scroller.offsetHeight > cm.display.scroller.clientHeight)
+      return barH(cm).getBoundingClientRect().top;
+    else
+      return cm.getWrapperElement().getBoundingClientRect().bottom - 1;
+  }
+
+  function displayRight(cm, scrollbar) {
+    if (scrollbar && cm.display.scroller.offsetWidth > cm.display.scroller.clientWidth)
+      return barV(cm).getBoundingClientRect().left;
+    else
+      return cm.getWrapperElement().getBoundingClientRect().right - 1;
+  }
+
+  function testMovedownFixed(cm, hScroll) {
+    cm.setSize("100px", "100px");
+    if (hScroll) cm.setValue(new Array(100).join("x"));
+    var bottom = displayBottom(cm, hScroll);
+    for (var i = 0; i < 30; i++) {
+      cm.replaceSelection("x\n");
+      var cursorBottom = cm.cursorCoords(null, "window").bottom;
+      is(cursorBottom <= bottom);
+    }
+    is(cursorBottom >= bottom - 5);
+  }
+
+  testCM("movedown_fixed", function(cm) {testMovedownFixed(cm, false);});
+  testCM("movedown_hscroll_fixed", function(cm) {testMovedownFixed(cm, true);});
+
+  function testMovedownResize(cm, hScroll) {
+    cm.getWrapperElement().style.height = "auto";
+    if (hScroll) cm.setValue(new Array(100).join("x"));
+    cm.refresh();
+    for (var i = 0; i < 30; i++) {
+      cm.replaceSelection("x\n");
+      var bottom = displayBottom(cm, hScroll);
+      var cursorBottom = cm.cursorCoords(null, "window").bottom;
+      is(cursorBottom <= bottom);
+      is(cursorBottom >= bottom - 5);
+    }
+  }
+
+  testCM("movedown_resize", function(cm) {testMovedownResize(cm, false);});
+  testCM("movedown_hscroll_resize", function(cm) {testMovedownResize(cm, true);});
+
+  function testMoveright(cm, wrap, scroll) {
+    cm.setSize("100px", "100px");
+    if (wrap) cm.setOption("lineWrapping", true);
+    if (scroll) {
+      cm.setValue("\n" + new Array(100).join("x\n"));
+      cm.setCursor(Pos(0, 0));
+    }
+    var right = displayRight(cm, scroll);
+    for (var i = 0; i < 10; i++) {
+      cm.replaceSelection("xxxxxxxxxx");
+      var cursorRight = cm.cursorCoords(null, "window").right;
+      is(cursorRight < right);
+    }
+    if (!wrap) is(cursorRight > right - 20);
+  }
+
+  testCM("moveright", function(cm) {testMoveright(cm, false, false);});
+  testCM("moveright_wrap", function(cm) {testMoveright(cm, true, false);});
+  testCM("moveright_scroll", function(cm) {testMoveright(cm, false, true);});
+  testCM("moveright_scroll_wrap", function(cm) {testMoveright(cm, true, true);});
+
+  testCM("suddenly_wide", function(cm) {
+    addDoc(cm, 100, 100);
+    cm.replaceSelection(new Array(600).join("l ") + "\n");
+    cm.execCommand("goLineUp");
+    cm.execCommand("goLineEnd");
+    is(barH(cm).scrollLeft > cm.getScrollerElement().scrollLeft - 1);
+  });
+
+  testCM("wrap_changes_height", function(cm) {
+    var line = new Array(20).join("a ") + "\n";
+    cm.setValue(new Array(20).join(line));
+    var box = cm.getWrapperElement().getBoundingClientRect();
+    cm.setSize(cm.cursorCoords(Pos(0), "window").right - box.left + 2,
+               cm.cursorCoords(Pos(19, 0), "window").bottom - box.top + 2);
+    cm.setCursor(Pos(19, 0));
+    cm.replaceSelection("\n");
+    is(cm.cursorCoords(null, "window").bottom < displayBottom(cm, false));
+  }, {lineWrapping: true});
+
+  testCM("height_auto_with_gutter_expect_no_scroll_after_line_delete", function(cm) {
+    cm.setSize(null, "auto");
+    cm.setValue("x\n");
+    cm.execCommand("goDocEnd");
+    cm.execCommand("delCharBefore");
+    eq(cm.getScrollInfo().top, 0);
+    cm.scrollTo(null, 10);
+    is(cm.getScrollInfo().top < 5);
+  }, {lineNumbers: true});
+})();
diff --git a/www/code/codemirror-5.13.2/test/search_test.js b/www/code/codemirror-5.13.2/test/search_test.js
new file mode 100644
index 000000000..04a1e685a
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/search_test.js
@@ -0,0 +1,62 @@
+(function() {
+  "use strict";
+
+  function test(name) {
+    var text = Array.prototype.slice.call(arguments, 1, arguments.length - 1).join("\n");
+    var body = arguments[arguments.length - 1];
+    return window.test("search_" + name, function() {
+      body(new CodeMirror.Doc(text));
+    });
+  }
+
+  function run(doc, query, insensitive) {
+    var cursor = doc.getSearchCursor(query, null, insensitive);
+    for (var i = 3; i < arguments.length; i += 4) {
+      var found = cursor.findNext();
+      is(found, "not enough results (forward)");
+      eqPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, forward, " + (i - 3) / 4);
+      eqPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, forward, " + (i - 3) / 4);
+    }
+    is(!cursor.findNext(), "too many matches (forward)");
+    for (var i = arguments.length - 4; i >= 3; i -= 4) {
+      var found = cursor.findPrevious();
+      is(found, "not enough results (backwards)");
+      eqPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, backwards, " + (i - 3) / 4);
+      eqPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, backwards, " + (i - 3) / 4);
+    }
+    is(!cursor.findPrevious(), "too many matches (backwards)");
+  }
+
+  test("simple", "abcdefg", "abcdefg", function(doc) {
+    run(doc, "cde", false, 0, 2, 0, 5, 1, 2, 1, 5);
+  });
+
+  test("multiline", "hallo", "goodbye", function(doc) {
+    run(doc, "llo\ngoo", false, 0, 2, 1, 3);
+    run(doc, "blah\nhall", false);
+    run(doc, "bye\neye", false);
+  });
+
+  test("regexp", "abcde", "abcde", function(doc) {
+    run(doc, /bcd/, false, 0, 1, 0, 4, 1, 1, 1, 4);
+    run(doc, /BCD/, false);
+    run(doc, /BCD/i, false, 0, 1, 0, 4, 1, 1, 1, 4);
+  });
+
+  test("insensitive", "hallo", "HALLO", "oink", "hAllO", function(doc) {
+    run(doc, "All", false, 3, 1, 3, 4);
+    run(doc, "All", true, 0, 1, 0, 4, 1, 1, 1, 4, 3, 1, 3, 4);
+  });
+
+  test("multilineInsensitive", "zie ginds komT", "De Stoomboot", "uit Spanje weer aan", function(doc) {
+    run(doc, "komt\nde stoomboot\nuit", false);
+    run(doc, "komt\nde stoomboot\nuit", true, 0, 10, 2, 3);
+    run(doc, "kOMt\ndE stOOmboot\nuiT", true, 0, 10, 2, 3);
+  });
+
+  test("expandingCaseFold", "İİ İİ", "uu uu", function(doc) {
+    if (phantom) return; // A Phantom bug makes this hang
+    run(doc, "", true, 0, 8, 0, 12, 1, 8, 1, 12);
+    run(doc, "İİ", true, 0, 3, 0, 5, 0, 6, 0, 8);
+  });
+})();
diff --git a/www/code/codemirror-5.13.2/test/sql-hint-test.js b/www/code/codemirror-5.13.2/test/sql-hint-test.js
new file mode 100644
index 000000000..39f2172e1
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/sql-hint-test.js
@@ -0,0 +1,189 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var Pos = CodeMirror.Pos;
+
+  var simpleTables = {
+    "users": ["name", "score", "birthDate"],
+    "xcountries": ["name", "population", "size"]
+  };
+
+  var schemaTables = {
+    "schema.users": ["name", "score", "birthDate"],
+    "schema.countries": ["name", "population", "size"]
+  };
+
+  var displayTextTables = [{
+    text: "mytable",
+    displayText: "mytable | The main table",
+    columns: [{text: "id", displayText: "id | Unique ID"},
+              {text: "name", displayText: "name | The name"}]
+  }];
+
+  namespace = "sql-hint_";
+
+  function test(name, spec) {
+    testCM(name, function(cm) {
+      cm.setValue(spec.value);
+      cm.setCursor(spec.cursor);
+      var completion = CodeMirror.hint.sql(cm, {tables: spec.tables});
+      if (!deepCompare(completion.list, spec.list))
+        throw new Failure("Wrong completion results " + JSON.stringify(completion.list) + " vs " + JSON.stringify(spec.list));
+      eqPos(completion.from, spec.from);
+      eqPos(completion.to, spec.to);
+    }, {
+      value: spec.value,
+      mode: "text/x-mysql"
+    });
+  }
+
+  test("keywords", {
+    value: "SEL",
+    cursor: Pos(0, 3),
+    list: ["SELECT"],
+    from: Pos(0, 0),
+    to: Pos(0, 3)
+  });
+
+  test("from", {
+    value: "SELECT * fr",
+    cursor: Pos(0, 11),
+    list: ["FROM"],
+    from: Pos(0, 9),
+    to: Pos(0, 11)
+  });
+
+  test("table", {
+    value: "SELECT xc",
+    cursor: Pos(0, 9),
+    tables: simpleTables,
+    list: ["xcountries"],
+    from: Pos(0, 7),
+    to: Pos(0, 9)
+  });
+
+  test("columns", {
+    value: "SELECT users.",
+    cursor: Pos(0, 13),
+    tables: simpleTables,
+    list: ["users.name", "users.score", "users.birthDate"],
+    from: Pos(0, 7),
+    to: Pos(0, 13)
+  });
+
+  test("singlecolumn", {
+    value: "SELECT users.na",
+    cursor: Pos(0, 15),
+    tables: simpleTables,
+    list: ["users.name"],
+    from: Pos(0, 7),
+    to: Pos(0, 15)
+  });
+
+  test("quoted", {
+    value: "SELECT `users`.`na",
+    cursor: Pos(0, 18),
+    tables: simpleTables,
+    list: ["`users`.`name`"],
+    from: Pos(0, 7),
+    to: Pos(0, 18)
+  });
+
+  test("quotedcolumn", {
+    value: "SELECT users.`na",
+    cursor: Pos(0, 16),
+    tables: simpleTables,
+    list: ["`users`.`name`"],
+    from: Pos(0, 7),
+    to: Pos(0, 16)
+  });
+
+  test("schema", {
+    value: "SELECT schem",
+    cursor: Pos(0, 12),
+    tables: schemaTables,
+    list: ["schema.users", "schema.countries",
+           "SCHEMA", "SCHEMA_NAME", "SCHEMAS"],
+    from: Pos(0, 7),
+    to: Pos(0, 12)
+  });
+
+  test("schemaquoted", {
+    value: "SELECT `sch",
+    cursor: Pos(0, 11),
+    tables: schemaTables,
+    list: ["`schema`.`users`", "`schema`.`countries`"],
+    from: Pos(0, 7),
+    to: Pos(0, 11)
+  });
+
+  test("schemacolumn", {
+    value: "SELECT schema.users.",
+    cursor: Pos(0, 20),
+    tables: schemaTables,
+    list: ["schema.users.name",
+           "schema.users.score",
+           "schema.users.birthDate"],
+    from: Pos(0, 7),
+    to: Pos(0, 20)
+  });
+
+  test("schemacolumnquoted", {
+    value: "SELECT `schema`.`users`.",
+    cursor: Pos(0, 24),
+    tables: schemaTables,
+    list: ["`schema`.`users`.`name`",
+           "`schema`.`users`.`score`",
+           "`schema`.`users`.`birthDate`"],
+    from: Pos(0, 7),
+    to: Pos(0, 24)
+  });
+
+  test("displayText_table", {
+    value: "SELECT myt",
+    cursor: Pos(0, 10),
+    tables: displayTextTables,
+    list: displayTextTables,
+    from: Pos(0, 7),
+    to: Pos(0, 10)
+  });
+
+  test("displayText_column", {
+    value: "SELECT mytable.",
+    cursor: Pos(0, 15),
+    tables: displayTextTables,
+    list: [{text: "mytable.id", displayText: "id | Unique ID"},
+           {text: "mytable.name", displayText: "name | The name"}],
+    from: Pos(0, 7),
+    to: Pos(0, 15)
+  });
+
+  test("alias_complete", {
+    value: "SELECT t. FROM users t",
+    cursor: Pos(0, 9),
+    tables: simpleTables,
+    list: ["t.name", "t.score", "t.birthDate"],
+    from: Pos(0, 7),
+    to: Pos(0, 9)
+  });
+
+  test("alias_complete_with_displayText", {
+    value: "SELECT t. FROM mytable t",
+    cursor: Pos(0, 9),
+    tables: displayTextTables,
+    list: [{text: "t.id", displayText: "id | Unique ID"},
+           {text: "t.name", displayText: "name | The name"}],
+    from: Pos(0, 7),
+    to: Pos(0, 9)
+  })
+
+  function deepCompare(a, b) {
+    if (!a || typeof a != "object")
+      return a === b;
+    if (!b || typeof b != "object")
+      return false;
+    for (var prop in a) if (!deepCompare(a[prop], b[prop])) return false;
+    return true;
+  }
+})();
diff --git a/www/code/codemirror-5.13.2/test/sublime_test.js b/www/code/codemirror-5.13.2/test/sublime_test.js
new file mode 100644
index 000000000..c93e041b8
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/sublime_test.js
@@ -0,0 +1,303 @@
+(function() {
+  "use strict";
+  
+  var Pos = CodeMirror.Pos;
+  namespace = "sublime_";
+
+  function stTest(name) {
+    var actions = Array.prototype.slice.call(arguments, 1);
+    testCM(name, function(cm) {
+      for (var i = 0; i < actions.length; i++) {
+        var action = actions[i];
+        if (typeof action == "string" && i == 0)
+          cm.setValue(action);
+        else if (typeof action == "string")
+          cm.execCommand(action);
+        else if (action instanceof Pos)
+          cm.setCursor(action);
+        else
+          action(cm);
+      }
+    });
+  }
+
+  function at(line, ch, msg) {
+    return function(cm) {
+      eq(cm.listSelections().length, 1);
+      eqPos(cm.getCursor("head"), Pos(line, ch), msg);
+      eqPos(cm.getCursor("anchor"), Pos(line, ch), msg);
+    };
+  }
+
+  function val(content, msg) {
+    return function(cm) { eq(cm.getValue(), content, msg); };
+  }
+
+  function argsToRanges(args) {
+    if (args.length % 4) throw new Error("Wrong number of arguments for ranges.");
+    var ranges = [];
+    for (var i = 0; i < args.length; i += 4)
+      ranges.push({anchor: Pos(args[i], args[i + 1]),
+                   head: Pos(args[i + 2], args[i + 3])});
+    return ranges;
+  }
+
+  function setSel() {
+    var ranges = argsToRanges(arguments);
+    return function(cm) { cm.setSelections(ranges, 0); };
+  }
+
+  function hasSel() {
+    var ranges = argsToRanges(arguments);
+    return function(cm) {
+      var sels = cm.listSelections();
+      if (sels.length != ranges.length)
+        throw new Failure("Expected " + ranges.length + " selections, but found " + sels.length);
+      for (var i = 0; i < sels.length; i++) {
+        eqPos(sels[i].anchor, ranges[i].anchor, "anchor " + i);
+        eqPos(sels[i].head, ranges[i].head, "head " + i);
+      }
+    };
+  }
+
+  stTest("bySubword", "the foo_bar DooDahBah \n a",
+         "goSubwordLeft", at(0, 0),
+         "goSubwordRight", at(0, 3),
+         "goSubwordRight", at(0, 7),
+         "goSubwordRight", at(0, 11),
+         "goSubwordRight", at(0, 15),
+         "goSubwordRight", at(0, 18),
+         "goSubwordRight", at(0, 21),
+         "goSubwordRight", at(0, 22),
+         "goSubwordRight", at(1, 0),
+         "goSubwordRight", at(1, 2),
+         "goSubwordRight", at(1, 2),
+         "goSubwordLeft", at(1, 1),
+         "goSubwordLeft", at(1, 0),
+         "goSubwordLeft", at(0, 22),
+         "goSubwordLeft", at(0, 18),
+         "goSubwordLeft", at(0, 15),
+         "goSubwordLeft", at(0, 12),
+         "goSubwordLeft", at(0, 8),
+         "goSubwordLeft", at(0, 4),
+         "goSubwordLeft", at(0, 0));
+
+  stTest("splitSelectionByLine", "abc\ndef\nghi",
+         setSel(0, 1, 2, 2),
+         "splitSelectionByLine",
+         hasSel(0, 1, 0, 3,
+                1, 0, 1, 3,
+                2, 0, 2, 2));
+
+  stTest("splitSelectionByLineMulti", "abc\ndef\nghi\njkl",
+         setSel(0, 1, 1, 1,
+                1, 2, 3, 2,
+                3, 3, 3, 3),
+         "splitSelectionByLine",
+         hasSel(0, 1, 0, 3,
+                1, 0, 1, 1,
+                1, 2, 1, 3,
+                2, 0, 2, 3,
+                3, 0, 3, 2,
+                3, 3, 3, 3));
+
+  stTest("selectLine", "abc\ndef\nghi",
+         setSel(0, 1, 0, 1,
+                2, 0, 2, 1),
+         "selectLine",
+         hasSel(0, 0, 1, 0,
+                2, 0, 2, 3),
+         setSel(0, 1, 1, 0),
+         "selectLine",
+         hasSel(0, 0, 2, 0));
+
+  stTest("insertLineAfter", "abcde\nfghijkl\nmn",
+         setSel(0, 1, 0, 1,
+                0, 3, 0, 3,
+                1, 2, 1, 2,
+                1, 3, 1, 5), "insertLineAfter",
+         hasSel(1, 0, 1, 0,
+                3, 0, 3, 0), val("abcde\n\nfghijkl\n\nmn"));
+
+  stTest("insertLineBefore", "abcde\nfghijkl\nmn",
+         setSel(0, 1, 0, 1,
+                0, 3, 0, 3,
+                1, 2, 1, 2,
+                1, 3, 1, 5), "insertLineBefore",
+         hasSel(0, 0, 0, 0,
+                2, 0, 2, 0), val("\nabcde\n\nfghijkl\nmn"));
+
+  stTest("selectNextOccurrence", "a foo bar\nfoobar foo",
+         setSel(0, 2, 0, 5),
+         "selectNextOccurrence", hasSel(0, 2, 0, 5,
+                                        1, 0, 1, 3),
+         "selectNextOccurrence", hasSel(0, 2, 0, 5,
+                                        1, 0, 1, 3,
+                                        1, 7, 1, 10),
+         "selectNextOccurrence", hasSel(0, 2, 0, 5,
+                                        1, 0, 1, 3,
+                                        1, 7, 1, 10),
+         Pos(0, 3), "selectNextOccurrence", hasSel(0, 2, 0, 5),
+        "selectNextOccurrence", hasSel(0, 2, 0, 5,
+                                       1, 7, 1, 10),
+         setSel(0, 6, 0, 9),
+         "selectNextOccurrence", hasSel(0, 6, 0, 9,
+                                        1, 3, 1, 6));
+
+  stTest("selectScope", "foo(a) {\n  bar[1, 2];\n}",
+         "selectScope", hasSel(0, 0, 2, 1),
+         Pos(0, 4), "selectScope", hasSel(0, 4, 0, 5),
+         Pos(0, 5), "selectScope", hasSel(0, 4, 0, 5),
+         Pos(0, 6), "selectScope", hasSel(0, 0, 2, 1),
+         Pos(0, 8), "selectScope", hasSel(0, 8, 2, 0),
+         Pos(1, 2), "selectScope", hasSel(0, 8, 2, 0),
+         Pos(1, 6), "selectScope", hasSel(1, 6, 1, 10),
+         Pos(1, 9), "selectScope", hasSel(1, 6, 1, 10));
+
+  stTest("goToBracket", "foo(a) {\n  bar[1, 2];\n}",
+         Pos(0, 0), "goToBracket", at(0, 0),
+         Pos(0, 4), "goToBracket", at(0, 5), "goToBracket", at(0, 4),
+         Pos(0, 8), "goToBracket", at(2, 0), "goToBracket", at(0, 8),
+         Pos(1, 2), "goToBracket", at(2, 0),
+         Pos(1, 7), "goToBracket", at(1, 10), "goToBracket", at(1, 6));
+
+  stTest("swapLine", "1\n2\n3---\n4\n5",
+         "swapLineDown", val("2\n1\n3---\n4\n5"),
+         "swapLineUp", val("1\n2\n3---\n4\n5"),
+         "swapLineUp", val("1\n2\n3---\n4\n5"),
+         Pos(4, 1), "swapLineDown", val("1\n2\n3---\n4\n5"),
+         setSel(0, 1, 0, 1,
+                1, 0, 2, 0,
+                2, 2, 2, 2),
+         "swapLineDown", val("4\n1\n2\n3---\n5"),
+         hasSel(1, 1, 1, 1,
+                2, 0, 3, 0,
+                3, 2, 3, 2),
+         "swapLineUp", val("1\n2\n3---\n4\n5"),
+         hasSel(0, 1, 0, 1,
+                1, 0, 2, 0,
+                2, 2, 2, 2));
+
+  stTest("swapLineEmptyBottomSel", "1\n2\n3",
+         setSel(0, 1, 1, 0),
+         "swapLineDown", val("2\n1\n3"), hasSel(1, 1, 2, 0),
+         "swapLineUp", val("1\n2\n3"), hasSel(0, 1, 1, 0),
+         "swapLineUp", val("1\n2\n3"), hasSel(0, 0, 0, 0));
+
+  stTest("swapLineUpFromEnd", "a\nb\nc",
+         Pos(2, 1), "swapLineUp",
+         hasSel(1, 1, 1, 1), val("a\nc\nb"));
+
+  stTest("joinLines", "abc\ndef\nghi\njkl",
+         "joinLines", val("abc def\nghi\njkl"), at(0, 4),
+         "undo",
+         setSel(0, 2, 1, 1), "joinLines",
+         val("abc def ghi\njkl"), hasSel(0, 2, 0, 8),
+         "undo",
+         setSel(0, 1, 0, 1,
+                1, 1, 1, 1,
+                3, 1, 3, 1), "joinLines",
+         val("abc def ghi\njkl"), hasSel(0, 4, 0, 4,
+                                         0, 8, 0, 8,
+                                         1, 3, 1, 3));
+
+  stTest("duplicateLine", "abc\ndef\nghi",
+         Pos(1, 0), "duplicateLine", val("abc\ndef\ndef\nghi"), at(2, 0),
+         "undo",
+         setSel(0, 1, 0, 1,
+                1, 1, 1, 1,
+                2, 1, 2, 1), "duplicateLine",
+         val("abc\nabc\ndef\ndef\nghi\nghi"), hasSel(1, 1, 1, 1,
+                                                     3, 1, 3, 1,
+                                                     5, 1, 5, 1));
+  stTest("duplicateLineSelection", "abcdef",
+         setSel(0, 1, 0, 1,
+                0, 2, 0, 4,
+                0, 5, 0, 5),
+         "duplicateLine",
+         val("abcdef\nabcdcdef\nabcdcdef"), hasSel(2, 1, 2, 1,
+                                                   2, 4, 2, 6,
+                                                   2, 7, 2, 7));
+
+  stTest("selectLinesUpward", "123\n345\n789\n012",
+         setSel(0, 1, 0, 1,
+                1, 1, 1, 3,
+                2, 0, 2, 0,
+                3, 0, 3, 0),
+         "selectLinesUpward",
+         hasSel(0, 1, 0, 1,
+                0, 3, 0, 3,
+                1, 0, 1, 0,
+                1, 1, 1, 3,
+                2, 0, 2, 0,
+                3, 0, 3, 0));
+
+  stTest("selectLinesDownward", "123\n345\n789\n012",
+         setSel(0, 1, 0, 1,
+                1, 1, 1, 3,
+                2, 0, 2, 0,
+                3, 0, 3, 0),
+         "selectLinesDownward",
+         hasSel(0, 1, 0, 1,
+                1, 1, 1, 3,
+                2, 0, 2, 0,
+                2, 3, 2, 3,
+                3, 0, 3, 0));
+
+  stTest("sortLines", "c\nb\na\nC\nB\nA",
+         "sortLines", val("A\nB\nC\na\nb\nc"),
+         "undo",
+         setSel(0, 0, 2, 0,
+                3, 0, 5, 0),
+         "sortLines", val("a\nb\nc\nA\nB\nC"),
+         hasSel(0, 0, 2, 1,
+                3, 0, 5, 1),
+         "undo",
+         setSel(1, 0, 4, 0), "sortLinesInsensitive", val("c\na\nB\nb\nC\nA"));
+
+  stTest("bookmarks", "abc\ndef\nghi\njkl",
+         Pos(0, 1), "toggleBookmark",
+         setSel(1, 1, 1, 2), "toggleBookmark",
+         setSel(2, 1, 2, 2), "toggleBookmark",
+         "nextBookmark", hasSel(0, 1, 0, 1),
+         "nextBookmark", hasSel(1, 1, 1, 2),
+         "nextBookmark", hasSel(2, 1, 2, 2),
+         "prevBookmark", hasSel(1, 1, 1, 2),
+         "prevBookmark", hasSel(0, 1, 0, 1),
+         "prevBookmark", hasSel(2, 1, 2, 2),
+         "prevBookmark", hasSel(1, 1, 1, 2),
+         "toggleBookmark",
+         "prevBookmark", hasSel(2, 1, 2, 2),
+         "prevBookmark", hasSel(0, 1, 0, 1),
+         "selectBookmarks", hasSel(0, 1, 0, 1,
+                                   2, 1, 2, 2),
+         "clearBookmarks",
+         Pos(0, 0), "selectBookmarks", at(0, 0));
+
+  stTest("upAndDowncaseAtCursor", "abc\ndef  x\nghI",
+         setSel(0, 1, 0, 3,
+                1, 1, 1, 1,
+                1, 4, 1, 4), "upcaseAtCursor",
+         val("aBC\nDEF  x\nghI"), hasSel(0, 1, 0, 3,
+                                         1, 3, 1, 3,
+                                         1, 4, 1, 4),
+         "downcaseAtCursor",
+         val("abc\ndef  x\nghI"), hasSel(0, 1, 0, 3,
+                                         1, 3, 1, 3,
+                                         1, 4, 1, 4));
+
+  stTest("mark", "abc\ndef\nghi",
+         Pos(1, 1), "setSublimeMark",
+         Pos(2, 1), "selectToSublimeMark", hasSel(2, 1, 1, 1),
+         Pos(0, 1), "swapWithSublimeMark", at(1, 1), "swapWithSublimeMark", at(0, 1),
+         "deleteToSublimeMark", val("aef\nghi"),
+         "sublimeYank", val("abc\ndef\nghi"), at(1, 1));
+
+  stTest("findUnder", "foo foobar  a",
+         "findUnder", hasSel(0, 4, 0, 7),
+         "findUnder", hasSel(0, 0, 0, 3),
+         "findUnderPrevious", hasSel(0, 4, 0, 7),
+         "findUnderPrevious", hasSel(0, 0, 0, 3),
+         Pos(0, 4), "findUnder", hasSel(0, 4, 0, 10),
+         Pos(0, 11), "findUnder", hasSel(0, 11, 0, 11));
+})();
diff --git a/www/code/codemirror-5.13.2/test/test.js b/www/code/codemirror-5.13.2/test/test.js
new file mode 100644
index 000000000..82ee231e3
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/test.js
@@ -0,0 +1,2151 @@
+var Pos = CodeMirror.Pos;
+
+CodeMirror.defaults.rtlMoveVisually = true;
+
+function forEach(arr, f) {
+  for (var i = 0, e = arr.length; i < e; ++i) f(arr[i], i);
+}
+
+function addDoc(cm, width, height) {
+  var content = [], line = "";
+  for (var i = 0; i < width; ++i) line += "x";
+  for (var i = 0; i < height; ++i) content.push(line);
+  cm.setValue(content.join("\n"));
+}
+
+function byClassName(elt, cls) {
+  if (elt.getElementsByClassName) return elt.getElementsByClassName(cls);
+  var found = [], re = new RegExp("\\b" + cls + "\\b");
+  function search(elt) {
+    if (elt.nodeType == 3) return;
+    if (re.test(elt.className)) found.push(elt);
+    for (var i = 0, e = elt.childNodes.length; i < e; ++i)
+      search(elt.childNodes[i]);
+  }
+  search(elt);
+  return found;
+}
+
+var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
+var ie_lt9 = /MSIE [1-8]\b/.test(navigator.userAgent);
+var mac = /Mac/.test(navigator.platform);
+var phantom = /PhantomJS/.test(navigator.userAgent);
+var opera = /Opera\/\./.test(navigator.userAgent);
+var opera_version = opera && navigator.userAgent.match(/Version\/(\d+\.\d+)/);
+if (opera_version) opera_version = Number(opera_version);
+var opera_lt10 = opera && (!opera_version || opera_version < 10);
+
+namespace = "core_";
+
+test("core_fromTextArea", function() {
+  var te = document.getElementById("code");
+  te.value = "CONTENT";
+  var cm = CodeMirror.fromTextArea(te);
+  is(!te.offsetHeight);
+  eq(cm.getValue(), "CONTENT");
+  cm.setValue("foo\nbar");
+  eq(cm.getValue(), "foo\nbar");
+  cm.save();
+  is(/^foo\r?\nbar$/.test(te.value));
+  cm.setValue("xxx");
+  cm.toTextArea();
+  is(te.offsetHeight);
+  eq(te.value, "xxx");
+});
+
+testCM("getRange", function(cm) {
+  eq(cm.getLine(0), "1234");
+  eq(cm.getLine(1), "5678");
+  eq(cm.getLine(2), null);
+  eq(cm.getLine(-1), null);
+  eq(cm.getRange(Pos(0, 0), Pos(0, 3)), "123");
+  eq(cm.getRange(Pos(0, -1), Pos(0, 200)), "1234");
+  eq(cm.getRange(Pos(0, 2), Pos(1, 2)), "34\n56");
+  eq(cm.getRange(Pos(1, 2), Pos(100, 0)), "78");
+}, {value: "1234\n5678"});
+
+testCM("replaceRange", function(cm) {
+  eq(cm.getValue(), "");
+  cm.replaceRange("foo\n", Pos(0, 0));
+  eq(cm.getValue(), "foo\n");
+  cm.replaceRange("a\nb", Pos(0, 1));
+  eq(cm.getValue(), "fa\nboo\n");
+  eq(cm.lineCount(), 3);
+  cm.replaceRange("xyzzy", Pos(0, 0), Pos(1, 1));
+  eq(cm.getValue(), "xyzzyoo\n");
+  cm.replaceRange("abc", Pos(0, 0), Pos(10, 0));
+  eq(cm.getValue(), "abc");
+  eq(cm.lineCount(), 1);
+});
+
+testCM("selection", function(cm) {
+  cm.setSelection(Pos(0, 4), Pos(2, 2));
+  is(cm.somethingSelected());
+  eq(cm.getSelection(), "11\n222222\n33");
+  eqPos(cm.getCursor(false), Pos(2, 2));
+  eqPos(cm.getCursor(true), Pos(0, 4));
+  cm.setSelection(Pos(1, 0));
+  is(!cm.somethingSelected());
+  eq(cm.getSelection(), "");
+  eqPos(cm.getCursor(true), Pos(1, 0));
+  cm.replaceSelection("abc", "around");
+  eq(cm.getSelection(), "abc");
+  eq(cm.getValue(), "111111\nabc222222\n333333");
+  cm.replaceSelection("def", "end");
+  eq(cm.getSelection(), "");
+  eqPos(cm.getCursor(true), Pos(1, 3));
+  cm.setCursor(Pos(2, 1));
+  eqPos(cm.getCursor(true), Pos(2, 1));
+  cm.setCursor(1, 2);
+  eqPos(cm.getCursor(true), Pos(1, 2));
+}, {value: "111111\n222222\n333333"});
+
+testCM("extendSelection", function(cm) {
+  cm.setExtending(true);
+  addDoc(cm, 10, 10);
+  cm.setSelection(Pos(3, 5));
+  eqPos(cm.getCursor("head"), Pos(3, 5));
+  eqPos(cm.getCursor("anchor"), Pos(3, 5));
+  cm.setSelection(Pos(2, 5), Pos(5, 5));
+  eqPos(cm.getCursor("head"), Pos(5, 5));
+  eqPos(cm.getCursor("anchor"), Pos(2, 5));
+  eqPos(cm.getCursor("start"), Pos(2, 5));
+  eqPos(cm.getCursor("end"), Pos(5, 5));
+  cm.setSelection(Pos(5, 5), Pos(2, 5));
+  eqPos(cm.getCursor("head"), Pos(2, 5));
+  eqPos(cm.getCursor("anchor"), Pos(5, 5));
+  eqPos(cm.getCursor("start"), Pos(2, 5));
+  eqPos(cm.getCursor("end"), Pos(5, 5));
+  cm.extendSelection(Pos(3, 2));
+  eqPos(cm.getCursor("head"), Pos(3, 2));
+  eqPos(cm.getCursor("anchor"), Pos(5, 5));
+  cm.extendSelection(Pos(6, 2));
+  eqPos(cm.getCursor("head"), Pos(6, 2));
+  eqPos(cm.getCursor("anchor"), Pos(5, 5));
+  cm.extendSelection(Pos(6, 3), Pos(6, 4));
+  eqPos(cm.getCursor("head"), Pos(6, 4));
+  eqPos(cm.getCursor("anchor"), Pos(5, 5));
+  cm.extendSelection(Pos(0, 3), Pos(0, 4));
+  eqPos(cm.getCursor("head"), Pos(0, 3));
+  eqPos(cm.getCursor("anchor"), Pos(5, 5));
+  cm.extendSelection(Pos(4, 5), Pos(6, 5));
+  eqPos(cm.getCursor("head"), Pos(6, 5));
+  eqPos(cm.getCursor("anchor"), Pos(4, 5));
+  cm.setExtending(false);
+  cm.extendSelection(Pos(0, 3), Pos(0, 4));
+  eqPos(cm.getCursor("head"), Pos(0, 3));
+  eqPos(cm.getCursor("anchor"), Pos(0, 4));
+});
+
+testCM("lines", function(cm) {
+  eq(cm.getLine(0), "111111");
+  eq(cm.getLine(1), "222222");
+  eq(cm.getLine(-1), null);
+  cm.replaceRange("", Pos(1, 0), Pos(2, 0))
+  cm.replaceRange("abc", Pos(1, 0), Pos(1));
+  eq(cm.getValue(), "111111\nabc");
+}, {value: "111111\n222222\n333333"});
+
+testCM("indent", function(cm) {
+  cm.indentLine(1);
+  eq(cm.getLine(1), "   blah();");
+  cm.setOption("indentUnit", 8);
+  cm.indentLine(1);
+  eq(cm.getLine(1), "\tblah();");
+  cm.setOption("indentUnit", 10);
+  cm.setOption("tabSize", 4);
+  cm.indentLine(1);
+  eq(cm.getLine(1), "\t\t  blah();");
+}, {value: "if (x) {\nblah();\n}", indentUnit: 3, indentWithTabs: true, tabSize: 8});
+
+testCM("indentByNumber", function(cm) {
+  cm.indentLine(0, 2);
+  eq(cm.getLine(0), "  foo");
+  cm.indentLine(0, -200);
+  eq(cm.getLine(0), "foo");
+  cm.setSelection(Pos(0, 0), Pos(1, 2));
+  cm.indentSelection(3);
+  eq(cm.getValue(), "   foo\n   bar\nbaz");
+}, {value: "foo\nbar\nbaz"});
+
+test("core_defaults", function() {
+  var defsCopy = {}, defs = CodeMirror.defaults;
+  for (var opt in defs) defsCopy[opt] = defs[opt];
+  defs.indentUnit = 5;
+  defs.value = "uu";
+  defs.indentWithTabs = true;
+  defs.tabindex = 55;
+  var place = document.getElementById("testground"), cm = CodeMirror(place);
+  try {
+    eq(cm.getOption("indentUnit"), 5);
+    cm.setOption("indentUnit", 10);
+    eq(defs.indentUnit, 5);
+    eq(cm.getValue(), "uu");
+    eq(cm.getOption("indentWithTabs"), true);
+    eq(cm.getInputField().tabIndex, 55);
+  }
+  finally {
+    for (var opt in defsCopy) defs[opt] = defsCopy[opt];
+    place.removeChild(cm.getWrapperElement());
+  }
+});
+
+testCM("lineInfo", function(cm) {
+  eq(cm.lineInfo(-1), null);
+  var mark = document.createElement("span");
+  var lh = cm.setGutterMarker(1, "FOO", mark);
+  var info = cm.lineInfo(1);
+  eq(info.text, "222222");
+  eq(info.gutterMarkers.FOO, mark);
+  eq(info.line, 1);
+  eq(cm.lineInfo(2).gutterMarkers, null);
+  cm.setGutterMarker(lh, "FOO", null);
+  eq(cm.lineInfo(1).gutterMarkers, null);
+  cm.setGutterMarker(1, "FOO", mark);
+  cm.setGutterMarker(0, "FOO", mark);
+  cm.clearGutter("FOO");
+  eq(cm.lineInfo(0).gutterMarkers, null);
+  eq(cm.lineInfo(1).gutterMarkers, null);
+}, {value: "111111\n222222\n333333"});
+
+testCM("coords", function(cm) {
+  cm.setSize(null, 100);
+  addDoc(cm, 32, 200);
+  var top = cm.charCoords(Pos(0, 0));
+  var bot = cm.charCoords(Pos(200, 30));
+  is(top.left < bot.left);
+  is(top.top < bot.top);
+  is(top.top < top.bottom);
+  cm.scrollTo(null, 100);
+  var top2 = cm.charCoords(Pos(0, 0));
+  is(top.top > top2.top);
+  eq(top.left, top2.left);
+});
+
+testCM("coordsChar", function(cm) {
+  addDoc(cm, 35, 70);
+  for (var i = 0; i < 2; ++i) {
+    var sys = i ? "local" : "page";
+    for (var ch = 0; ch <= 35; ch += 5) {
+      for (var line = 0; line < 70; line += 5) {
+        cm.setCursor(line, ch);
+        var coords = cm.charCoords(Pos(line, ch), sys);
+        var pos = cm.coordsChar({left: coords.left + 1, top: coords.top + 1}, sys);
+        eqPos(pos, Pos(line, ch));
+      }
+    }
+  }
+}, {lineNumbers: true});
+
+testCM("posFromIndex", function(cm) {
+  cm.setValue(
+    "This function should\n" +
+    "convert a zero based index\n" +
+    "to line and ch."
+  );
+
+  var examples = [
+    { index: -1, line: 0, ch: 0  }, // <- Tests clipping
+    { index: 0,  line: 0, ch: 0  },
+    { index: 10, line: 0, ch: 10 },
+    { index: 39, line: 1, ch: 18 },
+    { index: 55, line: 2, ch: 7  },
+    { index: 63, line: 2, ch: 15 },
+    { index: 64, line: 2, ch: 15 }  // <- Tests clipping
+  ];
+
+  for (var i = 0; i < examples.length; i++) {
+    var example = examples[i];
+    var pos = cm.posFromIndex(example.index);
+    eq(pos.line, example.line);
+    eq(pos.ch, example.ch);
+    if (example.index >= 0 && example.index < 64)
+      eq(cm.indexFromPos(pos), example.index);
+  }
+});
+
+testCM("undo", function(cm) {
+  cm.replaceRange("def", Pos(0, 0), Pos(0));
+  eq(cm.historySize().undo, 1);
+  cm.undo();
+  eq(cm.getValue(), "abc");
+  eq(cm.historySize().undo, 0);
+  eq(cm.historySize().redo, 1);
+  cm.redo();
+  eq(cm.getValue(), "def");
+  eq(cm.historySize().undo, 1);
+  eq(cm.historySize().redo, 0);
+  cm.setValue("1\n\n\n2");
+  cm.clearHistory();
+  eq(cm.historySize().undo, 0);
+  for (var i = 0; i < 20; ++i) {
+    cm.replaceRange("a", Pos(0, 0));
+    cm.replaceRange("b", Pos(3, 0));
+  }
+  eq(cm.historySize().undo, 40);
+  for (var i = 0; i < 40; ++i)
+    cm.undo();
+  eq(cm.historySize().redo, 40);
+  eq(cm.getValue(), "1\n\n\n2");
+}, {value: "abc"});
+
+testCM("undoDepth", function(cm) {
+  cm.replaceRange("d", Pos(0));
+  cm.replaceRange("e", Pos(0));
+  cm.replaceRange("f", Pos(0));
+  cm.undo(); cm.undo(); cm.undo();
+  eq(cm.getValue(), "abcd");
+}, {value: "abc", undoDepth: 4});
+
+testCM("undoDoesntClearValue", function(cm) {
+  cm.undo();
+  eq(cm.getValue(), "x");
+}, {value: "x"});
+
+testCM("undoMultiLine", function(cm) {
+  cm.operation(function() {
+    cm.replaceRange("x", Pos(0, 0));
+    cm.replaceRange("y", Pos(1, 0));
+  });
+  cm.undo();
+  eq(cm.getValue(), "abc\ndef\nghi");
+  cm.operation(function() {
+    cm.replaceRange("y", Pos(1, 0));
+    cm.replaceRange("x", Pos(0, 0));
+  });
+  cm.undo();
+  eq(cm.getValue(), "abc\ndef\nghi");
+  cm.operation(function() {
+    cm.replaceRange("y", Pos(2, 0));
+    cm.replaceRange("x", Pos(1, 0));
+    cm.replaceRange("z", Pos(2, 0));
+  });
+  cm.undo();
+  eq(cm.getValue(), "abc\ndef\nghi", 3);
+}, {value: "abc\ndef\nghi"});
+
+testCM("undoComposite", function(cm) {
+  cm.replaceRange("y", Pos(1));
+  cm.operation(function() {
+    cm.replaceRange("x", Pos(0));
+    cm.replaceRange("z", Pos(2));
+  });
+  eq(cm.getValue(), "ax\nby\ncz\n");
+  cm.undo();
+  eq(cm.getValue(), "a\nby\nc\n");
+  cm.undo();
+  eq(cm.getValue(), "a\nb\nc\n");
+  cm.redo(); cm.redo();
+  eq(cm.getValue(), "ax\nby\ncz\n");
+}, {value: "a\nb\nc\n"});
+
+testCM("undoSelection", function(cm) {
+  cm.setSelection(Pos(0, 2), Pos(0, 4));
+  cm.replaceSelection("");
+  cm.setCursor(Pos(1, 0));
+  cm.undo();
+  eqPos(cm.getCursor(true), Pos(0, 2));
+  eqPos(cm.getCursor(false), Pos(0, 4));
+  cm.setCursor(Pos(1, 0));
+  cm.redo();
+  eqPos(cm.getCursor(true), Pos(0, 2));
+  eqPos(cm.getCursor(false), Pos(0, 2));
+}, {value: "abcdefgh\n"});
+
+testCM("undoSelectionAsBefore", function(cm) {
+  cm.replaceSelection("abc", "around");
+  cm.undo();
+  cm.redo();
+  eq(cm.getSelection(), "abc");
+});
+
+testCM("selectionChangeConfusesHistory", function(cm) {
+  cm.replaceSelection("abc", null, "dontmerge");
+  cm.operation(function() {
+    cm.setCursor(Pos(0, 0));
+    cm.replaceSelection("abc", null, "dontmerge");
+  });
+  eq(cm.historySize().undo, 2);
+});
+
+testCM("markTextSingleLine", function(cm) {
+  forEach([{a: 0, b: 1, c: "", f: 2, t: 5},
+           {a: 0, b: 4, c: "", f: 0, t: 2},
+           {a: 1, b: 2, c: "x", f: 3, t: 6},
+           {a: 4, b: 5, c: "", f: 3, t: 5},
+           {a: 4, b: 5, c: "xx", f: 3, t: 7},
+           {a: 2, b: 5, c: "", f: 2, t: 3},
+           {a: 2, b: 5, c: "abcd", f: 6, t: 7},
+           {a: 2, b: 6, c: "x", f: null, t: null},
+           {a: 3, b: 6, c: "", f: null, t: null},
+           {a: 0, b: 9, c: "hallo", f: null, t: null},
+           {a: 4, b: 6, c: "x", f: 3, t: 4},
+           {a: 4, b: 8, c: "", f: 3, t: 4},
+           {a: 6, b: 6, c: "a", f: 3, t: 6},
+           {a: 8, b: 9, c: "", f: 3, t: 6}], function(test) {
+    cm.setValue("1234567890");
+    var r = cm.markText(Pos(0, 3), Pos(0, 6), {className: "foo"});
+    cm.replaceRange(test.c, Pos(0, test.a), Pos(0, test.b));
+    var f = r.find();
+    eq(f && f.from.ch, test.f); eq(f && f.to.ch, test.t);
+  });
+});
+
+testCM("markTextMultiLine", function(cm) {
+  function p(v) { return v && Pos(v[0], v[1]); }
+  forEach([{a: [0, 0], b: [0, 5], c: "", f: [0, 0], t: [2, 5]},
+           {a: [0, 0], b: [0, 5], c: "foo\n", f: [1, 0], t: [3, 5]},
+           {a: [0, 1], b: [0, 10], c: "", f: [0, 1], t: [2, 5]},
+           {a: [0, 5], b: [0, 6], c: "x", f: [0, 6], t: [2, 5]},
+           {a: [0, 0], b: [1, 0], c: "", f: [0, 0], t: [1, 5]},
+           {a: [0, 6], b: [2, 4], c: "", f: [0, 5], t: [0, 7]},
+           {a: [0, 6], b: [2, 4], c: "aa", f: [0, 5], t: [0, 9]},
+           {a: [1, 2], b: [1, 8], c: "", f: [0, 5], t: [2, 5]},
+           {a: [0, 5], b: [2, 5], c: "xx", f: null, t: null},
+           {a: [0, 0], b: [2, 10], c: "x", f: null, t: null},
+           {a: [1, 5], b: [2, 5], c: "", f: [0, 5], t: [1, 5]},
+           {a: [2, 0], b: [2, 3], c: "", f: [0, 5], t: [2, 2]},
+           {a: [2, 5], b: [3, 0], c: "a\nb", f: [0, 5], t: [2, 5]},
+           {a: [2, 3], b: [3, 0], c: "x", f: [0, 5], t: [2, 3]},
+           {a: [1, 1], b: [1, 9], c: "1\n2\n3", f: [0, 5], t: [4, 5]}], function(test) {
+    cm.setValue("aaaaaaaaaa\nbbbbbbbbbb\ncccccccccc\ndddddddd\n");
+    var r = cm.markText(Pos(0, 5), Pos(2, 5),
+                        {className: "CodeMirror-matchingbracket"});
+    cm.replaceRange(test.c, p(test.a), p(test.b));
+    var f = r.find();
+    eqPos(f && f.from, p(test.f)); eqPos(f && f.to, p(test.t));
+  });
+});
+
+testCM("markTextUndo", function(cm) {
+  var marker1, marker2, bookmark;
+  marker1 = cm.markText(Pos(0, 1), Pos(0, 3),
+                        {className: "CodeMirror-matchingbracket"});
+  marker2 = cm.markText(Pos(0, 0), Pos(2, 1),
+                        {className: "CodeMirror-matchingbracket"});
+  bookmark = cm.setBookmark(Pos(1, 5));
+  cm.operation(function(){
+    cm.replaceRange("foo", Pos(0, 2));
+    cm.replaceRange("bar\nbaz\nbug\n", Pos(2, 0), Pos(3, 0));
+  });
+  var v1 = cm.getValue();
+  cm.setValue("");
+  eq(marker1.find(), null); eq(marker2.find(), null); eq(bookmark.find(), null);
+  cm.undo();
+  eqPos(bookmark.find(), Pos(1, 5), "still there");
+  cm.undo();
+  var m1Pos = marker1.find(), m2Pos = marker2.find();
+  eqPos(m1Pos.from, Pos(0, 1)); eqPos(m1Pos.to, Pos(0, 3));
+  eqPos(m2Pos.from, Pos(0, 0)); eqPos(m2Pos.to, Pos(2, 1));
+  eqPos(bookmark.find(), Pos(1, 5));
+  cm.redo(); cm.redo();
+  eq(bookmark.find(), null);
+  cm.undo();
+  eqPos(bookmark.find(), Pos(1, 5));
+  eq(cm.getValue(), v1);
+}, {value: "1234\n56789\n00\n"});
+
+testCM("markTextStayGone", function(cm) {
+  var m1 = cm.markText(Pos(0, 0), Pos(0, 1));
+  cm.replaceRange("hi", Pos(0, 2));
+  m1.clear();
+  cm.undo();
+  eq(m1.find(), null);
+}, {value: "hello"});
+
+testCM("markTextAllowEmpty", function(cm) {
+  var m1 = cm.markText(Pos(0, 1), Pos(0, 2), {clearWhenEmpty: false});
+  is(m1.find());
+  cm.replaceRange("x", Pos(0, 0));
+  is(m1.find());
+  cm.replaceRange("y", Pos(0, 2));
+  is(m1.find());
+  cm.replaceRange("z", Pos(0, 3), Pos(0, 4));
+  is(!m1.find());
+  var m2 = cm.markText(Pos(0, 1), Pos(0, 2), {clearWhenEmpty: false,
+                                              inclusiveLeft: true,
+                                              inclusiveRight: true});
+  cm.replaceRange("q", Pos(0, 1), Pos(0, 2));
+  is(m2.find());
+  cm.replaceRange("", Pos(0, 0), Pos(0, 3));
+  is(!m2.find());
+  var m3 = cm.markText(Pos(0, 1), Pos(0, 1), {clearWhenEmpty: false});
+  cm.replaceRange("a", Pos(0, 3));
+  is(m3.find());
+  cm.replaceRange("b", Pos(0, 1));
+  is(!m3.find());
+}, {value: "abcde"});
+
+testCM("markTextStacked", function(cm) {
+  var m1 = cm.markText(Pos(0, 0), Pos(0, 0), {clearWhenEmpty: false});
+  var m2 = cm.markText(Pos(0, 0), Pos(0, 0), {clearWhenEmpty: false});
+  cm.replaceRange("B", Pos(0, 1));
+  is(m1.find() && m2.find());
+}, {value: "A"});
+
+testCM("undoPreservesNewMarks", function(cm) {
+  cm.markText(Pos(0, 3), Pos(0, 4));
+  cm.markText(Pos(1, 1), Pos(1, 3));
+  cm.replaceRange("", Pos(0, 3), Pos(3, 1));
+  var mBefore = cm.markText(Pos(0, 0), Pos(0, 1));
+  var mAfter = cm.markText(Pos(0, 5), Pos(0, 6));
+  var mAround = cm.markText(Pos(0, 2), Pos(0, 4));
+  cm.undo();
+  eqPos(mBefore.find().from, Pos(0, 0));
+  eqPos(mBefore.find().to, Pos(0, 1));
+  eqPos(mAfter.find().from, Pos(3, 3));
+  eqPos(mAfter.find().to, Pos(3, 4));
+  eqPos(mAround.find().from, Pos(0, 2));
+  eqPos(mAround.find().to, Pos(3, 2));
+  var found = cm.findMarksAt(Pos(2, 2));
+  eq(found.length, 1);
+  eq(found[0], mAround);
+}, {value: "aaaa\nbbbb\ncccc\ndddd"});
+
+testCM("markClearBetween", function(cm) {
+  cm.setValue("aaa\nbbb\nccc\nddd\n");
+  cm.markText(Pos(0, 0), Pos(2));
+  cm.replaceRange("aaa\nbbb\nccc", Pos(0, 0), Pos(2));
+  eq(cm.findMarksAt(Pos(1, 1)).length, 0);
+});
+
+testCM("findMarksMiddle", function(cm) {
+  var mark = cm.markText(Pos(1, 1), Pos(3, 1));
+  var found = cm.findMarks(Pos(2, 1), Pos(2, 2));
+  eq(found.length, 1);
+  eq(found[0], mark);
+}, {value: "line 0\nline 1\nline 2\nline 3"});
+
+testCM("deleteSpanCollapsedInclusiveLeft", function(cm) {
+  var from = Pos(1, 0), to = Pos(1, 1);
+  var m = cm.markText(from, to, {collapsed: true, inclusiveLeft: true});
+  // Delete collapsed span.
+  cm.replaceRange("", from, to);
+}, {value: "abc\nX\ndef"});
+
+testCM("markTextCSS", function(cm) {
+  function present() {
+    var spans = cm.display.lineDiv.getElementsByTagName("span");
+    for (var i = 0; i < spans.length; i++)
+      if (spans[i].style.color == "cyan" && span[i].textContent == "cdefg") return true;
+  }
+  var m = cm.markText(Pos(0, 2), Pos(0, 6), {css: "color: cyan"});
+  m.clear();
+  is(!present());
+}, {value: "abcdefgh"});
+
+testCM("bookmark", function(cm) {
+  function p(v) { return v && Pos(v[0], v[1]); }
+  forEach([{a: [1, 0], b: [1, 1], c: "", d: [1, 4]},
+           {a: [1, 1], b: [1, 1], c: "xx", d: [1, 7]},
+           {a: [1, 4], b: [1, 5], c: "ab", d: [1, 6]},
+           {a: [1, 4], b: [1, 6], c: "", d: null},
+           {a: [1, 5], b: [1, 6], c: "abc", d: [1, 5]},
+           {a: [1, 6], b: [1, 8], c: "", d: [1, 5]},
+           {a: [1, 4], b: [1, 4], c: "\n\n", d: [3, 1]},
+           {bm: [1, 9], a: [1, 1], b: [1, 1], c: "\n", d: [2, 8]}], function(test) {
+    cm.setValue("1234567890\n1234567890\n1234567890");
+    var b = cm.setBookmark(p(test.bm) || Pos(1, 5));
+    cm.replaceRange(test.c, p(test.a), p(test.b));
+    eqPos(b.find(), p(test.d));
+  });
+});
+
+testCM("bookmarkInsertLeft", function(cm) {
+  var br = cm.setBookmark(Pos(0, 2), {insertLeft: false});
+  var bl = cm.setBookmark(Pos(0, 2), {insertLeft: true});
+  cm.setCursor(Pos(0, 2));
+  cm.replaceSelection("hi");
+  eqPos(br.find(), Pos(0, 2));
+  eqPos(bl.find(), Pos(0, 4));
+  cm.replaceRange("", Pos(0, 4), Pos(0, 5));
+  cm.replaceRange("", Pos(0, 2), Pos(0, 4));
+  cm.replaceRange("", Pos(0, 1), Pos(0, 2));
+  // Verify that deleting next to bookmarks doesn't kill them
+  eqPos(br.find(), Pos(0, 1));
+  eqPos(bl.find(), Pos(0, 1));
+}, {value: "abcdef"});
+
+testCM("bookmarkCursor", function(cm) {
+  var pos01 = cm.cursorCoords(Pos(0, 1)), pos11 = cm.cursorCoords(Pos(1, 1)),
+      pos20 = cm.cursorCoords(Pos(2, 0)), pos30 = cm.cursorCoords(Pos(3, 0)),
+      pos41 = cm.cursorCoords(Pos(4, 1));
+  cm.setBookmark(Pos(0, 1), {widget: document.createTextNode("←"), insertLeft: true});
+  cm.setBookmark(Pos(2, 0), {widget: document.createTextNode("←"), insertLeft: true});
+  cm.setBookmark(Pos(1, 1), {widget: document.createTextNode("→")});
+  cm.setBookmark(Pos(3, 0), {widget: document.createTextNode("→")});
+  var new01 = cm.cursorCoords(Pos(0, 1)), new11 = cm.cursorCoords(Pos(1, 1)),
+      new20 = cm.cursorCoords(Pos(2, 0)), new30 = cm.cursorCoords(Pos(3, 0));
+  near(new01.left, pos01.left, 1);
+  near(new01.top, pos01.top, 1);
+  is(new11.left > pos11.left, "at right, middle of line");
+  near(new11.top == pos11.top, 1);
+  near(new20.left, pos20.left, 1);
+  near(new20.top, pos20.top, 1);
+  is(new30.left > pos30.left, "at right, empty line");
+  near(new30.top, pos30, 1);
+  cm.setBookmark(Pos(4, 0), {widget: document.createTextNode("→")});
+  is(cm.cursorCoords(Pos(4, 1)).left > pos41.left, "single-char bug");
+}, {value: "foo\nbar\n\n\nx\ny"});
+
+testCM("multiBookmarkCursor", function(cm) {
+  if (phantom) return;
+  var ms = [], m;
+  function add(insertLeft) {
+    for (var i = 0; i < 3; ++i) {
+      var node = document.createElement("span");
+      node.innerHTML = "X";
+      ms.push(cm.setBookmark(Pos(0, 1), {widget: node, insertLeft: insertLeft}));
+    }
+  }
+  var base1 = cm.cursorCoords(Pos(0, 1)).left, base4 = cm.cursorCoords(Pos(0, 4)).left;
+  add(true);
+  near(base1, cm.cursorCoords(Pos(0, 1)).left, 1);
+  while (m = ms.pop()) m.clear();
+  add(false);
+  near(base4, cm.cursorCoords(Pos(0, 1)).left, 1);
+}, {value: "abcdefg"});
+
+testCM("getAllMarks", function(cm) {
+  addDoc(cm, 10, 10);
+  var m1 = cm.setBookmark(Pos(0, 2));
+  var m2 = cm.markText(Pos(0, 2), Pos(3, 2));
+  var m3 = cm.markText(Pos(1, 2), Pos(1, 8));
+  var m4 = cm.markText(Pos(8, 0), Pos(9, 0));
+  eq(cm.getAllMarks().length, 4);
+  m1.clear();
+  m3.clear();
+  eq(cm.getAllMarks().length, 2);
+});
+
+testCM("setValueClears", function(cm) {
+  cm.addLineClass(0, "wrap", "foo");
+  var mark = cm.markText(Pos(0, 0), Pos(1, 1), {inclusiveLeft: true, inclusiveRight: true});
+  cm.setValue("foo");
+  is(!cm.lineInfo(0).wrapClass);
+  is(!mark.find());
+}, {value: "a\nb"});
+
+testCM("bug577", function(cm) {
+  cm.setValue("a\nb");
+  cm.clearHistory();
+  cm.setValue("fooooo");
+  cm.undo();
+});
+
+testCM("scrollSnap", function(cm) {
+  cm.setSize(100, 100);
+  addDoc(cm, 200, 200);
+  cm.setCursor(Pos(100, 180));
+  var info = cm.getScrollInfo();
+  is(info.left > 0 && info.top > 0);
+  cm.setCursor(Pos(0, 0));
+  info = cm.getScrollInfo();
+  is(info.left == 0 && info.top == 0, "scrolled clean to top");
+  cm.setCursor(Pos(100, 180));
+  cm.setCursor(Pos(199, 0));
+  info = cm.getScrollInfo();
+  is(info.left == 0 && info.top + 2 > info.height - cm.getScrollerElement().clientHeight, "scrolled clean to bottom");
+});
+
+testCM("scrollIntoView", function(cm) {
+  if (phantom) return;
+  var outer = cm.getWrapperElement().getBoundingClientRect();
+  function test(line, ch, msg) {
+    var pos = Pos(line, ch);
+    cm.scrollIntoView(pos);
+    var box = cm.charCoords(pos, "window");
+    is(box.left >= outer.left, msg + " (left)");
+    is(box.right <= outer.right, msg + " (right)");
+    is(box.top >= outer.top, msg + " (top)");
+    is(box.bottom <= outer.bottom, msg + " (bottom)");
+  }
+  addDoc(cm, 200, 200);
+  test(199, 199, "bottom right");
+  test(0, 0, "top left");
+  test(100, 100, "center");
+  test(199, 0, "bottom left");
+  test(0, 199, "top right");
+  test(100, 100, "center again");
+});
+
+testCM("scrollBackAndForth", function(cm) {
+  addDoc(cm, 1, 200);
+  cm.operation(function() {
+    cm.scrollIntoView(Pos(199, 0));
+    cm.scrollIntoView(Pos(4, 0));
+  });
+  is(cm.getScrollInfo().top > 0);
+});
+
+testCM("selectAllNoScroll", function(cm) {
+  addDoc(cm, 1, 200);
+  cm.execCommand("selectAll");
+  eq(cm.getScrollInfo().top, 0);
+  cm.setCursor(199);
+  cm.execCommand("selectAll");
+  is(cm.getScrollInfo().top > 0);
+});
+
+testCM("selectionPos", function(cm) {
+  if (phantom || cm.getOption("inputStyle") != "textarea") return;
+  cm.setSize(100, 100);
+  addDoc(cm, 200, 100);
+  cm.setSelection(Pos(1, 100), Pos(98, 100));
+  var lineWidth = cm.charCoords(Pos(0, 200), "local").left;
+  var lineHeight = (cm.charCoords(Pos(99)).top - cm.charCoords(Pos(0)).top) / 100;
+  cm.scrollTo(0, 0);
+  var selElt = byClassName(cm.getWrapperElement(), "CodeMirror-selected");
+  var outer = cm.getWrapperElement().getBoundingClientRect();
+  var sawMiddle, sawTop, sawBottom;
+  for (var i = 0, e = selElt.length; i < e; ++i) {
+    var box = selElt[i].getBoundingClientRect();
+    var atLeft = box.left - outer.left < 30;
+    var width = box.right - box.left;
+    var atRight = box.right - outer.left > .8 * lineWidth;
+    if (atLeft && atRight) {
+      sawMiddle = true;
+      is(box.bottom - box.top > 90 * lineHeight, "middle high");
+      is(width > .9 * lineWidth, "middle wide");
+    } else {
+      is(width > .4 * lineWidth, "top/bot wide enough");
+      is(width < .6 * lineWidth, "top/bot slim enough");
+      if (atLeft) {
+        sawBottom = true;
+        is(box.top - outer.top > 96 * lineHeight, "bot below");
+      } else if (atRight) {
+        sawTop = true;
+        is(box.top - outer.top < 2.1 * lineHeight, "top above");
+      }
+    }
+  }
+  is(sawTop && sawBottom && sawMiddle, "all parts");
+}, null);
+
+testCM("restoreHistory", function(cm) {
+  cm.setValue("abc\ndef");
+  cm.replaceRange("hello", Pos(1, 0), Pos(1));
+  cm.replaceRange("goop", Pos(0, 0), Pos(0));
+  cm.undo();
+  var storedVal = cm.getValue(), storedHist = cm.getHistory();
+  if (window.JSON) storedHist = JSON.parse(JSON.stringify(storedHist));
+  eq(storedVal, "abc\nhello");
+  cm.setValue("");
+  cm.clearHistory();
+  eq(cm.historySize().undo, 0);
+  cm.setValue(storedVal);
+  cm.setHistory(storedHist);
+  cm.redo();
+  eq(cm.getValue(), "goop\nhello");
+  cm.undo(); cm.undo();
+  eq(cm.getValue(), "abc\ndef");
+});
+
+testCM("doubleScrollbar", function(cm) {
+  var dummy = document.body.appendChild(document.createElement("p"));
+  dummy.style.cssText = "height: 50px; overflow: scroll; width: 50px";
+  var scrollbarWidth = dummy.offsetWidth + 1 - dummy.clientWidth;
+  document.body.removeChild(dummy);
+  if (scrollbarWidth < 2) return;
+  cm.setSize(null, 100);
+  addDoc(cm, 1, 300);
+  var wrap = cm.getWrapperElement();
+  is(wrap.offsetWidth - byClassName(wrap, "CodeMirror-lines")[0].offsetWidth <= scrollbarWidth * 1.5);
+});
+
+testCM("weirdLinebreaks", function(cm) {
+  cm.setValue("foo\nbar\rbaz\r\nquux\n\rplop");
+  is(cm.getValue(), "foo\nbar\nbaz\nquux\n\nplop");
+  is(cm.lineCount(), 6);
+  cm.setValue("\n\n");
+  is(cm.lineCount(), 3);
+});
+
+testCM("setSize", function(cm) {
+  cm.setSize(100, 100);
+  var wrap = cm.getWrapperElement();
+  is(wrap.offsetWidth, 100);
+  is(wrap.offsetHeight, 100);
+  cm.setSize("100%", "3em");
+  is(wrap.style.width, "100%");
+  is(wrap.style.height, "3em");
+  cm.setSize(null, 40);
+  is(wrap.style.width, "100%");
+  is(wrap.style.height, "40px");
+});
+
+function foldLines(cm, start, end, autoClear) {
+  return cm.markText(Pos(start, 0), Pos(end - 1), {
+    inclusiveLeft: true,
+    inclusiveRight: true,
+    collapsed: true,
+    clearOnEnter: autoClear
+  });
+}
+
+testCM("collapsedLines", function(cm) {
+  addDoc(cm, 4, 10);
+  var range = foldLines(cm, 4, 5), cleared = 0;
+  CodeMirror.on(range, "clear", function() {cleared++;});
+  cm.setCursor(Pos(3, 0));
+  CodeMirror.commands.goLineDown(cm);
+  eqPos(cm.getCursor(), Pos(5, 0));
+  cm.replaceRange("abcdefg", Pos(3, 0), Pos(3));
+  cm.setCursor(Pos(3, 6));
+  CodeMirror.commands.goLineDown(cm);
+  eqPos(cm.getCursor(), Pos(5, 4));
+  cm.replaceRange("ab", Pos(3, 0), Pos(3));
+  cm.setCursor(Pos(3, 2));
+  CodeMirror.commands.goLineDown(cm);
+  eqPos(cm.getCursor(), Pos(5, 2));
+  cm.operation(function() {range.clear(); range.clear();});
+  eq(cleared, 1);
+});
+
+testCM("collapsedRangeCoordsChar", function(cm) {
+  var pos_1_3 = cm.charCoords(Pos(1, 3));
+  pos_1_3.left += 2; pos_1_3.top += 2;
+  var opts = {collapsed: true, inclusiveLeft: true, inclusiveRight: true};
+  var m1 = cm.markText(Pos(0, 0), Pos(2, 0), opts);
+  eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
+  m1.clear();
+  var m1 = cm.markText(Pos(0, 0), Pos(1, 1), {collapsed: true, inclusiveLeft: true});
+  var m2 = cm.markText(Pos(1, 1), Pos(2, 0), {collapsed: true, inclusiveRight: true});
+  eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
+  m1.clear(); m2.clear();
+  var m1 = cm.markText(Pos(0, 0), Pos(1, 6), opts);
+  eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
+}, {value: "123456\nabcdef\nghijkl\nmnopqr\n"});
+
+testCM("collapsedRangeBetweenLinesSelected", function(cm) {
+  if (cm.getOption("inputStyle") != "textarea") return;
+  var widget = document.createElement("span");
+  widget.textContent = "\u2194";
+  cm.markText(Pos(0, 3), Pos(1, 0), {replacedWith: widget});
+  cm.setSelection(Pos(0, 3), Pos(1, 0));
+  var selElts = byClassName(cm.getWrapperElement(), "CodeMirror-selected");
+  for (var i = 0, w = 0; i < selElts.length; i++)
+    w += selElts[i].offsetWidth;
+  is(w > 0);
+}, {value: "one\ntwo"});
+
+testCM("randomCollapsedRanges", function(cm) {
+  addDoc(cm, 20, 500);
+  cm.operation(function() {
+    for (var i = 0; i < 200; i++) {
+      var start = Pos(Math.floor(Math.random() * 500), Math.floor(Math.random() * 20));
+      if (i % 4)
+        try { cm.markText(start, Pos(start.line + 2, 1), {collapsed: true}); }
+        catch(e) { if (!/overlapping/.test(String(e))) throw e; }
+      else
+        cm.markText(start, Pos(start.line, start.ch + 4), {"className": "foo"});
+    }
+  });
+});
+
+testCM("hiddenLinesAutoUnfold", function(cm) {
+  var range = foldLines(cm, 1, 3, true), cleared = 0;
+  CodeMirror.on(range, "clear", function() {cleared++;});
+  cm.setCursor(Pos(3, 0));
+  eq(cleared, 0);
+  cm.execCommand("goCharLeft");
+  eq(cleared, 1);
+  range = foldLines(cm, 1, 3, true);
+  CodeMirror.on(range, "clear", function() {cleared++;});
+  eqPos(cm.getCursor(), Pos(3, 0));
+  cm.setCursor(Pos(0, 3));
+  cm.execCommand("goCharRight");
+  eq(cleared, 2);
+}, {value: "abc\ndef\nghi\njkl"});
+
+testCM("hiddenLinesSelectAll", function(cm) {  // Issue #484
+  addDoc(cm, 4, 20);
+  foldLines(cm, 0, 10);
+  foldLines(cm, 11, 20);
+  CodeMirror.commands.selectAll(cm);
+  eqPos(cm.getCursor(true), Pos(10, 0));
+  eqPos(cm.getCursor(false), Pos(10, 4));
+});
+
+
+testCM("everythingFolded", function(cm) {
+  addDoc(cm, 2, 2);
+  function enterPress() {
+    cm.triggerOnKeyDown({type: "keydown", keyCode: 13, preventDefault: function(){}, stopPropagation: function(){}});
+  }
+  var fold = foldLines(cm, 0, 2);
+  enterPress();
+  eq(cm.getValue(), "xx\nxx");
+  fold.clear();
+  fold = foldLines(cm, 0, 2, true);
+  eq(fold.find(), null);
+  enterPress();
+  eq(cm.getValue(), "\nxx\nxx");
+});
+
+testCM("structuredFold", function(cm) {
+  if (phantom) return;
+  addDoc(cm, 4, 8);
+  var range = cm.markText(Pos(1, 2), Pos(6, 2), {
+    replacedWith: document.createTextNode("Q")
+  });
+  cm.setCursor(0, 3);
+  CodeMirror.commands.goLineDown(cm);
+  eqPos(cm.getCursor(), Pos(6, 2));
+  CodeMirror.commands.goCharLeft(cm);
+  eqPos(cm.getCursor(), Pos(1, 2));
+  CodeMirror.commands.delCharAfter(cm);
+  eq(cm.getValue(), "xxxx\nxxxx\nxxxx");
+  addDoc(cm, 4, 8);
+  range = cm.markText(Pos(1, 2), Pos(6, 2), {
+    replacedWith: document.createTextNode("M"),
+    clearOnEnter: true
+  });
+  var cleared = 0;
+  CodeMirror.on(range, "clear", function(){++cleared;});
+  cm.setCursor(0, 3);
+  CodeMirror.commands.goLineDown(cm);
+  eqPos(cm.getCursor(), Pos(6, 2));
+  CodeMirror.commands.goCharLeft(cm);
+  eqPos(cm.getCursor(), Pos(6, 1));
+  eq(cleared, 1);
+  range.clear();
+  eq(cleared, 1);
+  range = cm.markText(Pos(1, 2), Pos(6, 2), {
+    replacedWith: document.createTextNode("Q"),
+    clearOnEnter: true
+  });
+  range.clear();
+  cm.setCursor(1, 2);
+  CodeMirror.commands.goCharRight(cm);
+  eqPos(cm.getCursor(), Pos(1, 3));
+  range = cm.markText(Pos(2, 0), Pos(4, 4), {
+    replacedWith: document.createTextNode("M")
+  });
+  cm.setCursor(1, 0);
+  CodeMirror.commands.goLineDown(cm);
+  eqPos(cm.getCursor(), Pos(2, 0));
+}, null);
+
+testCM("nestedFold", function(cm) {
+  addDoc(cm, 10, 3);
+  function fold(ll, cl, lr, cr) {
+    return cm.markText(Pos(ll, cl), Pos(lr, cr), {collapsed: true});
+  }
+  var inner1 = fold(0, 6, 1, 3), inner2 = fold(0, 2, 1, 8), outer = fold(0, 1, 2, 3), inner0 = fold(0, 5, 0, 6);
+  cm.setCursor(0, 1);
+  CodeMirror.commands.goCharRight(cm);
+  eqPos(cm.getCursor(), Pos(2, 3));
+  inner0.clear();
+  CodeMirror.commands.goCharLeft(cm);
+  eqPos(cm.getCursor(), Pos(0, 1));
+  outer.clear();
+  CodeMirror.commands.goCharRight(cm);
+  eqPos(cm.getCursor(), Pos(0, 2));
+  CodeMirror.commands.goCharRight(cm);
+  eqPos(cm.getCursor(), Pos(1, 8));
+  inner2.clear();
+  CodeMirror.commands.goCharLeft(cm);
+  eqPos(cm.getCursor(), Pos(1, 7));
+  cm.setCursor(0, 5);
+  CodeMirror.commands.goCharRight(cm);
+  eqPos(cm.getCursor(), Pos(0, 6));
+  CodeMirror.commands.goCharRight(cm);
+  eqPos(cm.getCursor(), Pos(1, 3));
+});
+
+testCM("badNestedFold", function(cm) {
+  addDoc(cm, 4, 4);
+  cm.markText(Pos(0, 2), Pos(3, 2), {collapsed: true});
+  var caught;
+  try {cm.markText(Pos(0, 1), Pos(0, 3), {collapsed: true});}
+  catch(e) {caught = e;}
+  is(caught instanceof Error, "no error");
+  is(/overlap/i.test(caught.message), "wrong error");
+});
+
+testCM("nestedFoldOnSide", function(cm) {
+  var m1 = cm.markText(Pos(0, 1), Pos(2, 1), {collapsed: true, inclusiveRight: true});
+  var m2 = cm.markText(Pos(0, 1), Pos(0, 2), {collapsed: true});
+  cm.markText(Pos(0, 1), Pos(0, 2), {collapsed: true}).clear();
+  try { cm.markText(Pos(0, 1), Pos(0, 2), {collapsed: true, inclusiveLeft: true}); }
+  catch(e) { var caught = e; }
+  is(caught && /overlap/i.test(caught.message));
+  var m3 = cm.markText(Pos(2, 0), Pos(2, 1), {collapsed: true});
+  var m4 = cm.markText(Pos(2, 0), Pos(2, 1), {collapse: true, inclusiveRight: true});
+  m1.clear(); m4.clear();
+  m1 = cm.markText(Pos(0, 1), Pos(2, 1), {collapsed: true});
+  cm.markText(Pos(2, 0), Pos(2, 1), {collapsed: true}).clear();
+  try { cm.markText(Pos(2, 0), Pos(2, 1), {collapsed: true, inclusiveRight: true}); }
+  catch(e) { var caught = e; }
+  is(caught && /overlap/i.test(caught.message));
+}, {value: "ab\ncd\ef"});
+
+testCM("editInFold", function(cm) {
+  addDoc(cm, 4, 6);
+  var m = cm.markText(Pos(1, 2), Pos(3, 2), {collapsed: true});
+  cm.replaceRange("", Pos(0, 0), Pos(1, 3));
+  cm.replaceRange("", Pos(2, 1), Pos(3, 3));
+  cm.replaceRange("a\nb\nc\nd", Pos(0, 1), Pos(1, 0));
+  cm.cursorCoords(Pos(0, 0));
+});
+
+testCM("wrappingInlineWidget", function(cm) {
+  cm.setSize("11em");
+  var w = document.createElement("span");
+  w.style.color = "red";
+  w.innerHTML = "one two three four";
+  cm.markText(Pos(0, 6), Pos(0, 9), {replacedWith: w});
+  var cur0 = cm.cursorCoords(Pos(0, 0)), cur1 = cm.cursorCoords(Pos(0, 10));
+  is(cur0.top < cur1.top);
+  is(cur0.bottom < cur1.bottom);
+  var curL = cm.cursorCoords(Pos(0, 6)), curR = cm.cursorCoords(Pos(0, 9));
+  eq(curL.top, cur0.top);
+  eq(curL.bottom, cur0.bottom);
+  eq(curR.top, cur1.top);
+  eq(curR.bottom, cur1.bottom);
+  cm.replaceRange("", Pos(0, 9), Pos(0));
+  curR = cm.cursorCoords(Pos(0, 9));
+  if (phantom) return;
+  eq(curR.top, cur1.top);
+  eq(curR.bottom, cur1.bottom);
+}, {value: "1 2 3 xxx 4", lineWrapping: true});
+
+testCM("showEmptyWidgetSpan", function(cm) {
+  var marker = cm.markText(Pos(0, 2), Pos(0, 2), {
+    clearWhenEmpty: false,
+    replacedWith: document.createTextNode("X")
+  });
+  eq(cm.display.view[0].text.textContent, "abXc");
+}, {value: "abc"});
+
+testCM("changedInlineWidget", function(cm) {
+  cm.setSize("10em");
+  var w = document.createElement("span");
+  w.innerHTML = "x";
+  var m = cm.markText(Pos(0, 4), Pos(0, 5), {replacedWith: w});
+  w.innerHTML = "and now the widget is really really long all of a sudden and a scrollbar is needed";
+  m.changed();
+  var hScroll = byClassName(cm.getWrapperElement(), "CodeMirror-hscrollbar")[0];
+  is(hScroll.scrollWidth > hScroll.clientWidth);
+}, {value: "hello there"});
+
+testCM("changedBookmark", function(cm) {
+  cm.setSize("10em");
+  var w = document.createElement("span");
+  w.innerHTML = "x";
+  var m = cm.setBookmark(Pos(0, 4), {widget: w});
+  w.innerHTML = "and now the widget is really really long all of a sudden and a scrollbar is needed";
+  m.changed();
+  var hScroll = byClassName(cm.getWrapperElement(), "CodeMirror-hscrollbar")[0];
+  is(hScroll.scrollWidth > hScroll.clientWidth);
+}, {value: "abcdefg"});
+
+testCM("inlineWidget", function(cm) {
+  var w = cm.setBookmark(Pos(0, 2), {widget: document.createTextNode("uu")});
+  cm.setCursor(0, 2);
+  CodeMirror.commands.goLineDown(cm);
+  eqPos(cm.getCursor(), Pos(1, 4));
+  cm.setCursor(0, 2);
+  cm.replaceSelection("hi");
+  eqPos(w.find(), Pos(0, 2));
+  cm.setCursor(0, 1);
+  cm.replaceSelection("ay");
+  eqPos(w.find(), Pos(0, 4));
+  eq(cm.getLine(0), "uayuhiuu");
+}, {value: "uuuu\nuuuuuu"});
+
+testCM("wrappingAndResizing", function(cm) {
+  cm.setSize(null, "auto");
+  cm.setOption("lineWrapping", true);
+  var wrap = cm.getWrapperElement(), h0 = wrap.offsetHeight;
+  var doc = "xxx xxx xxx xxx xxx";
+  cm.setValue(doc);
+  for (var step = 10, w = cm.charCoords(Pos(0, 18), "div").right;; w += step) {
+    cm.setSize(w);
+    if (wrap.offsetHeight <= h0 * (opera_lt10 ? 1.2 : 1.5)) {
+      if (step == 10) { w -= 10; step = 1; }
+      else break;
+    }
+  }
+  // Ensure that putting the cursor at the end of the maximally long
+  // line doesn't cause wrapping to happen.
+  cm.setCursor(Pos(0, doc.length));
+  eq(wrap.offsetHeight, h0);
+  cm.replaceSelection("x");
+  is(wrap.offsetHeight > h0, "wrapping happens");
+  // Now add a max-height and, in a document consisting of
+  // almost-wrapped lines, go over it so that a scrollbar appears.
+  cm.setValue(doc + "\n" + doc + "\n");
+  cm.getScrollerElement().style.maxHeight = "100px";
+  cm.replaceRange("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n!\n", Pos(2, 0));
+  forEach([Pos(0, doc.length), Pos(0, doc.length - 1),
+           Pos(0, 0), Pos(1, doc.length), Pos(1, doc.length - 1)],
+          function(pos) {
+    var coords = cm.charCoords(pos);
+    eqPos(pos, cm.coordsChar({left: coords.left + 2, top: coords.top + 5}));
+  });
+}, null, ie_lt8);
+
+testCM("measureEndOfLine", function(cm) {
+  cm.setSize(null, "auto");
+  var inner = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild;
+  var lh = inner.offsetHeight;
+  for (var step = 10, w = cm.charCoords(Pos(0, 7), "div").right;; w += step) {
+    cm.setSize(w);
+    if (inner.offsetHeight < 2.5 * lh) {
+      if (step == 10) { w -= 10; step = 1; }
+      else break;
+    }
+  }
+  cm.setValue(cm.getValue() + "\n\n");
+  var endPos = cm.charCoords(Pos(0, 18), "local");
+  is(endPos.top > lh * .8, "not at top");
+  is(endPos.left > w - 20, "not at right");
+  endPos = cm.charCoords(Pos(0, 18));
+  eqPos(cm.coordsChar({left: endPos.left, top: endPos.top + 5}), Pos(0, 18));
+}, {mode: "text/html", value: "", lineWrapping: true}, ie_lt8 || opera_lt10);
+
+testCM("scrollVerticallyAndHorizontally", function(cm) {
+  if (cm.getOption("inputStyle") != "textarea") return;
+  cm.setSize(100, 100);
+  addDoc(cm, 40, 40);
+  cm.setCursor(39);
+  var wrap = cm.getWrapperElement(), bar = byClassName(wrap, "CodeMirror-vscrollbar")[0];
+  is(bar.offsetHeight < wrap.offsetHeight, "vertical scrollbar limited by horizontal one");
+  var cursorBox = byClassName(wrap, "CodeMirror-cursor")[0].getBoundingClientRect();
+  var editorBox = wrap.getBoundingClientRect();
+  is(cursorBox.bottom < editorBox.top + cm.getScrollerElement().clientHeight,
+     "bottom line visible");
+}, {lineNumbers: true});
+
+testCM("moveVstuck", function(cm) {
+  var lines = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild, h0 = lines.offsetHeight;
+  var val = "fooooooooooooooooooooooooo baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar\n";
+  cm.setValue(val);
+  for (var w = cm.charCoords(Pos(0, 26), "div").right * 2.8;; w += 5) {
+    cm.setSize(w);
+    if (lines.offsetHeight <= 3.5 * h0) break;
+  }
+  cm.setCursor(Pos(0, val.length - 1));
+  cm.moveV(-1, "line");
+  eqPos(cm.getCursor(), Pos(0, 26));
+}, {lineWrapping: true}, ie_lt8 || opera_lt10);
+
+testCM("collapseOnMove", function(cm) {
+  cm.setSelection(Pos(0, 1), Pos(2, 4));
+  cm.execCommand("goLineUp");
+  is(!cm.somethingSelected());
+  eqPos(cm.getCursor(), Pos(0, 1));
+  cm.setSelection(Pos(0, 1), Pos(2, 4));
+  cm.execCommand("goPageDown");
+  is(!cm.somethingSelected());
+  eqPos(cm.getCursor(), Pos(2, 4));
+  cm.execCommand("goLineUp");
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(0, 4));
+  cm.setSelection(Pos(0, 1), Pos(2, 4));
+  cm.execCommand("goCharLeft");
+  is(!cm.somethingSelected());
+  eqPos(cm.getCursor(), Pos(0, 1));
+}, {value: "aaaaa\nb\nccccc"});
+
+testCM("clickTab", function(cm) {
+  var p0 = cm.charCoords(Pos(0, 0));
+  eqPos(cm.coordsChar({left: p0.left + 5, top: p0.top + 5}), Pos(0, 0));
+  eqPos(cm.coordsChar({left: p0.right - 5, top: p0.top + 5}), Pos(0, 1));
+}, {value: "\t\n\n", lineWrapping: true, tabSize: 8});
+
+testCM("verticalScroll", function(cm) {
+  cm.setSize(100, 200);
+  cm.setValue("foo\nbar\nbaz\n");
+  var sc = cm.getScrollerElement(), baseWidth = sc.scrollWidth;
+  cm.replaceRange("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah", Pos(0, 0), Pos(0));
+  is(sc.scrollWidth > baseWidth, "scrollbar present");
+  cm.replaceRange("foo", Pos(0, 0), Pos(0));
+  if (!phantom) eq(sc.scrollWidth, baseWidth, "scrollbar gone");
+  cm.replaceRange("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah", Pos(0, 0), Pos(0));
+  cm.replaceRange("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbh", Pos(1, 0), Pos(1));
+  is(sc.scrollWidth > baseWidth, "present again");
+  var curWidth = sc.scrollWidth;
+  cm.replaceRange("foo", Pos(0, 0), Pos(0));
+  is(sc.scrollWidth < curWidth, "scrollbar smaller");
+  is(sc.scrollWidth > baseWidth, "but still present");
+});
+
+testCM("extraKeys", function(cm) {
+  var outcome;
+  function fakeKey(expected, code, props) {
+    if (typeof code == "string") code = code.charCodeAt(0);
+    var e = {type: "keydown", keyCode: code, preventDefault: function(){}, stopPropagation: function(){}};
+    if (props) for (var n in props) e[n] = props[n];
+    outcome = null;
+    cm.triggerOnKeyDown(e);
+    eq(outcome, expected);
+  }
+  CodeMirror.commands.testCommand = function() {outcome = "tc";};
+  CodeMirror.commands.goTestCommand = function() {outcome = "gtc";};
+  cm.setOption("extraKeys", {"Shift-X": function() {outcome = "sx";},
+                             "X": function() {outcome = "x";},
+                             "Ctrl-Alt-U": function() {outcome = "cau";},
+                             "End": "testCommand",
+                             "Home": "goTestCommand",
+                             "Tab": false});
+  fakeKey(null, "U");
+  fakeKey("cau", "U", {ctrlKey: true, altKey: true});
+  fakeKey(null, "U", {shiftKey: true, ctrlKey: true, altKey: true});
+  fakeKey("x", "X");
+  fakeKey("sx", "X", {shiftKey: true});
+  fakeKey("tc", 35);
+  fakeKey(null, 35, {shiftKey: true});
+  fakeKey("gtc", 36);
+  fakeKey("gtc", 36, {shiftKey: true});
+  fakeKey(null, 9);
+}, null, window.opera && mac);
+
+testCM("wordMovementCommands", function(cm) {
+  cm.execCommand("goWordLeft");
+  eqPos(cm.getCursor(), Pos(0, 0));
+  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), Pos(0, 7));
+  cm.execCommand("goWordLeft");
+  eqPos(cm.getCursor(), Pos(0, 5));
+  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), Pos(0, 12));
+  cm.execCommand("goWordLeft");
+  eqPos(cm.getCursor(), Pos(0, 9));
+  cm.execCommand("goWordRight"); cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), Pos(0, 24));
+  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), Pos(1, 9));
+  cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), Pos(1, 13));
+  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
+  eqPos(cm.getCursor(), Pos(2, 0));
+}, {value: "this is (the) firstline.\na foo12\u00e9\u00f8\u00d7bar\n"});
+
+testCM("groupMovementCommands", function(cm) {
+  cm.execCommand("goGroupLeft");
+  eqPos(cm.getCursor(), Pos(0, 0));
+  cm.execCommand("goGroupRight");
+  eqPos(cm.getCursor(), Pos(0, 4));
+  cm.execCommand("goGroupRight");
+  eqPos(cm.getCursor(), Pos(0, 7));
+  cm.execCommand("goGroupRight");
+  eqPos(cm.getCursor(), Pos(0, 10));
+  cm.execCommand("goGroupLeft");
+  eqPos(cm.getCursor(), Pos(0, 7));
+  cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight");
+  eqPos(cm.getCursor(), Pos(0, 15));
+  cm.setCursor(Pos(0, 17));
+  cm.execCommand("goGroupLeft");
+  eqPos(cm.getCursor(), Pos(0, 16));
+  cm.execCommand("goGroupLeft");
+  eqPos(cm.getCursor(), Pos(0, 14));
+  cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight");
+  eqPos(cm.getCursor(), Pos(0, 20));
+  cm.execCommand("goGroupRight");
+  eqPos(cm.getCursor(), Pos(1, 0));
+  cm.execCommand("goGroupRight");
+  eqPos(cm.getCursor(), Pos(1, 2));
+  cm.execCommand("goGroupRight");
+  eqPos(cm.getCursor(), Pos(1, 5));
+  cm.execCommand("goGroupLeft"); cm.execCommand("goGroupLeft");
+  eqPos(cm.getCursor(), Pos(1, 0));
+  cm.execCommand("goGroupLeft");
+  eqPos(cm.getCursor(), Pos(0, 20));
+  cm.execCommand("goGroupLeft");
+  eqPos(cm.getCursor(), Pos(0, 16));
+}, {value: "booo ba---quux. ffff\n  abc d"});
+
+testCM("groupsAndWhitespace", function(cm) {
+  var positions = [Pos(0, 0), Pos(0, 2), Pos(0, 5), Pos(0, 9), Pos(0, 11),
+                   Pos(1, 0), Pos(1, 2), Pos(1, 5)];
+  for (var i = 1; i < positions.length; i++) {
+    cm.execCommand("goGroupRight");
+    eqPos(cm.getCursor(), positions[i]);
+  }
+  for (var i = positions.length - 2; i >= 0; i--) {
+    cm.execCommand("goGroupLeft");
+    eqPos(cm.getCursor(), i == 2 ? Pos(0, 6) : positions[i]);
+  }
+}, {value: "  foo +++  \n  bar"});
+
+testCM("charMovementCommands", function(cm) {
+  cm.execCommand("goCharLeft"); cm.execCommand("goColumnLeft");
+  eqPos(cm.getCursor(), Pos(0, 0));
+  cm.execCommand("goCharRight"); cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), Pos(0, 2));
+  cm.setCursor(Pos(1, 0));
+  cm.execCommand("goColumnLeft");
+  eqPos(cm.getCursor(), Pos(1, 0));
+  cm.execCommand("goCharLeft");
+  eqPos(cm.getCursor(), Pos(0, 5));
+  cm.execCommand("goColumnRight");
+  eqPos(cm.getCursor(), Pos(0, 5));
+  cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), Pos(1, 0));
+  cm.execCommand("goLineEnd");
+  eqPos(cm.getCursor(), Pos(1, 5));
+  cm.execCommand("goLineStartSmart");
+  eqPos(cm.getCursor(), Pos(1, 1));
+  cm.execCommand("goLineStartSmart");
+  eqPos(cm.getCursor(), Pos(1, 0));
+  cm.setCursor(Pos(2, 0));
+  cm.execCommand("goCharRight"); cm.execCommand("goColumnRight");
+  eqPos(cm.getCursor(), Pos(2, 0));
+}, {value: "line1\n ine2\n"});
+
+testCM("verticalMovementCommands", function(cm) {
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(0, 0));
+  cm.execCommand("goLineDown");
+  if (!phantom) // This fails in PhantomJS, though not in a real Webkit
+    eqPos(cm.getCursor(), Pos(1, 0));
+  cm.setCursor(Pos(1, 12));
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(2, 5));
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(3, 0));
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(2, 5));
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(1, 12));
+  cm.execCommand("goPageDown");
+  eqPos(cm.getCursor(), Pos(5, 0));
+  cm.execCommand("goPageDown"); cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(5, 0));
+  cm.execCommand("goPageUp");
+  eqPos(cm.getCursor(), Pos(0, 0));
+}, {value: "line1\nlong long line2\nline3\n\nline5\n"});
+
+testCM("verticalMovementCommandsWrapping", function(cm) {
+  cm.setSize(120);
+  cm.setCursor(Pos(0, 5));
+  cm.execCommand("goLineDown");
+  eq(cm.getCursor().line, 0);
+  is(cm.getCursor().ch > 5, "moved beyond wrap");
+  for (var i = 0; ; ++i) {
+    is(i < 20, "no endless loop");
+    cm.execCommand("goLineDown");
+    var cur = cm.getCursor();
+    if (cur.line == 1) eq(cur.ch, 5);
+    if (cur.line == 2) { eq(cur.ch, 1); break; }
+  }
+}, {value: "a very long line that wraps around somehow so that we can test cursor movement\nshortone\nk",
+    lineWrapping: true});
+
+testCM("rtlMovement", function(cm) {
+  if (cm.getOption("inputStyle") != "textarea") return;
+  forEach(["خحج", "خحabcخحج", "abخحخحجcd", "abخde", "abخح2342خ1حج", "خ1ح2خح3حxج",
+           "خحcd", "1خحcd", "abcdeح1ج", "خمرحبها مها!", "foobarر", "خ ة ق",
+           "", "يتم السحب في 05 فبراير 2014"], function(line) {
+    var inv = line.charCodeAt(0) > 128;
+    cm.setValue(line + "\n"); cm.execCommand(inv ? "goLineEnd" : "goLineStart");
+    var cursors = byClassName(cm.getWrapperElement(), "CodeMirror-cursors")[0];
+    var cursor = cursors.firstChild;
+    var prevX = cursor.offsetLeft, prevY = cursor.offsetTop;
+    for (var i = 0; i <= line.length; ++i) {
+      cm.execCommand("goCharRight");
+      cursor = cursors.firstChild;
+      if (i == line.length) is(cursor.offsetTop > prevY, "next line");
+      else is(cursor.offsetLeft > prevX, "moved right");
+      prevX = cursor.offsetLeft; prevY = cursor.offsetTop;
+    }
+    cm.setCursor(0, 0); cm.execCommand(inv ? "goLineStart" : "goLineEnd");
+    prevX = cursors.firstChild.offsetLeft;
+    for (var i = 0; i < line.length; ++i) {
+      cm.execCommand("goCharLeft");
+      cursor = cursors.firstChild;
+      is(cursor.offsetLeft < prevX, "moved left");
+      prevX = cursor.offsetLeft;
+    }
+  });
+}, null, ie_lt9);
+
+// Verify that updating a line clears its bidi ordering
+testCM("bidiUpdate", function(cm) {
+  cm.setCursor(Pos(0, 2));
+  cm.replaceSelection("خحج", "start");
+  cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), Pos(0, 4));
+}, {value: "abcd\n"});
+
+testCM("movebyTextUnit", function(cm) {
+  cm.setValue("בְּרֵאשִ\nééé́\n");
+  cm.execCommand("goLineEnd");
+  for (var i = 0; i < 4; ++i) cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), Pos(0, 0));
+  cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), Pos(1, 0));
+  cm.execCommand("goCharRight");
+  cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), Pos(1, 4));
+  cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), Pos(1, 7));
+});
+
+testCM("lineChangeEvents", function(cm) {
+  addDoc(cm, 3, 5);
+  var log = [], want = ["ch 0", "ch 1", "del 2", "ch 0", "ch 0", "del 1", "del 3", "del 4"];
+  for (var i = 0; i < 5; ++i) {
+    CodeMirror.on(cm.getLineHandle(i), "delete", function(i) {
+      return function() {log.push("del " + i);};
+    }(i));
+    CodeMirror.on(cm.getLineHandle(i), "change", function(i) {
+      return function() {log.push("ch " + i);};
+    }(i));
+  }
+  cm.replaceRange("x", Pos(0, 1));
+  cm.replaceRange("xy", Pos(1, 1), Pos(2));
+  cm.replaceRange("foo\nbar", Pos(0, 1));
+  cm.replaceRange("", Pos(0, 0), Pos(cm.lineCount()));
+  eq(log.length, want.length, "same length");
+  for (var i = 0; i < log.length; ++i)
+    eq(log[i], want[i]);
+});
+
+testCM("scrollEntirelyToRight", function(cm) {
+  if (phantom || cm.getOption("inputStyle") != "textarea") return;
+  addDoc(cm, 500, 2);
+  cm.setCursor(Pos(0, 500));
+  var wrap = cm.getWrapperElement(), cur = byClassName(wrap, "CodeMirror-cursor")[0];
+  is(wrap.getBoundingClientRect().right > cur.getBoundingClientRect().left);
+});
+
+testCM("lineWidgets", function(cm) {
+  addDoc(cm, 500, 3);
+  var last = cm.charCoords(Pos(2, 0));
+  var node = document.createElement("div");
+  node.innerHTML = "hi";
+  var widget = cm.addLineWidget(1, node);
+  is(last.top < cm.charCoords(Pos(2, 0)).top, "took up space");
+  cm.setCursor(Pos(1, 1));
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(2, 1));
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(1, 1));
+});
+
+testCM("lineWidgetFocus", function(cm) {
+  var place = document.getElementById("testground");
+  place.className = "offscreen";
+  try {
+    addDoc(cm, 500, 10);
+    var node = document.createElement("input");
+    var widget = cm.addLineWidget(1, node);
+    node.focus();
+    eq(document.activeElement, node);
+    cm.replaceRange("new stuff", Pos(1, 0));
+    eq(document.activeElement, node);
+  } finally {
+    place.className = "";
+  }
+});
+
+testCM("lineWidgetCautiousRedraw", function(cm) {
+  var node = document.createElement("div");
+  node.innerHTML = "hahah";
+  var w = cm.addLineWidget(0, node);
+  var redrawn = false;
+  w.on("redraw", function() { redrawn = true; });
+  cm.replaceSelection("0");
+  is(!redrawn);
+}, {value: "123\n456"});
+
+
+var knownScrollbarWidth;
+function scrollbarWidth(measure) {
+  if (knownScrollbarWidth != null) return knownScrollbarWidth;
+  var div = document.createElement('div');
+  div.style.cssText = "width: 50px; height: 50px; overflow-x: scroll";
+  document.body.appendChild(div);
+  knownScrollbarWidth = div.offsetHeight - div.clientHeight;
+  document.body.removeChild(div);
+  return knownScrollbarWidth || 0;
+}
+
+testCM("lineWidgetChanged", function(cm) {
+  addDoc(cm, 2, 300);
+  var halfScrollbarWidth = scrollbarWidth(cm.display.measure)/2;
+  cm.setOption('lineNumbers', true);
+  cm.setSize(600, cm.defaultTextHeight() * 50);
+  cm.scrollTo(null, cm.heightAtLine(125, "local"));
+
+  var expectedWidgetHeight = 60;
+  var expectedLinesInWidget = 3;
+  function w() {
+    var node = document.createElement("div");
+    // we use these children with just under half width of the line to check measurements are made with correct width
+    // when placed in the measure div.
+    // If the widget is measured at a width much narrower than it is displayed at, the underHalf children will span two lines and break the test.
+    // If the widget is measured at a width much wider than it is displayed at, the overHalf children will combine and break the test.
+    // Note that this test only checks widgets where coverGutter is true, because these require extra styling to get the width right.
+    // It may also be worthwhile to check this for non-coverGutter widgets.
+    // Visually:
+    // Good:
+    // | ------------- display width ------------- |
+    // | ------- widget-width when measured ------ |
+    // | | -- under-half -- | | -- under-half -- | | 
+    // | | --- over-half --- |                     |
+    // | | --- over-half --- |                     |
+    // Height: measured as 3 lines, same as it will be when actually displayed
+
+    // Bad (too narrow):
+    // | ------------- display width ------------- |
+    // | ------ widget-width when measured ----- |  < -- uh oh
+    // | | -- under-half -- |                    |
+    // | | -- under-half -- |                    |  < -- when measured, shoved to next line
+    // | | --- over-half --- |                   |
+    // | | --- over-half --- |                   |
+    // Height: measured as 4 lines, more than expected . Will be displayed as 3 lines!
+
+    // Bad (too wide):
+    // | ------------- display width ------------- |
+    // | -------- widget-width when measured ------- | < -- uh oh
+    // | | -- under-half -- | | -- under-half -- |   | 
+    // | | --- over-half --- | | --- over-half --- | | < -- when measured, combined on one line
+    // Height: measured as 2 lines, less than expected. Will be displayed as 3 lines!
+
+    var barelyUnderHalfWidthHtml = '
    ';
+    var barelyOverHalfWidthHtml = '
    ';
+    node.innerHTML = new Array(3).join(barelyUnderHalfWidthHtml) + new Array(3).join(barelyOverHalfWidthHtml);
+    node.style.cssText = "background: yellow;font-size:0;line-height: " + (expectedWidgetHeight/expectedLinesInWidget) + "px;";
+    return node;
+  }
+  var info0 = cm.getScrollInfo();
+  var w0 = cm.addLineWidget(0, w(), { coverGutter: true });
+  var w150 = cm.addLineWidget(150, w(), { coverGutter: true });
+  var w300 = cm.addLineWidget(300, w(), { coverGutter: true });
+  var info1 = cm.getScrollInfo();
+  eq(info0.height + (3 * expectedWidgetHeight), info1.height);
+  eq(info0.top + expectedWidgetHeight, info1.top);
+  expectedWidgetHeight = 12;
+  w0.node.style.lineHeight = w150.node.style.lineHeight = w300.node.style.lineHeight = (expectedWidgetHeight/expectedLinesInWidget) + "px";
+  w0.changed(); w150.changed(); w300.changed();
+  var info2 = cm.getScrollInfo();
+  eq(info0.height + (3 * expectedWidgetHeight), info2.height);
+  eq(info0.top + expectedWidgetHeight, info2.top);
+});
+
+testCM("getLineNumber", function(cm) {
+  addDoc(cm, 2, 20);
+  var h1 = cm.getLineHandle(1);
+  eq(cm.getLineNumber(h1), 1);
+  cm.replaceRange("hi\nbye\n", Pos(0, 0));
+  eq(cm.getLineNumber(h1), 3);
+  cm.setValue("");
+  eq(cm.getLineNumber(h1), null);
+});
+
+testCM("jumpTheGap", function(cm) {
+  if (phantom) return;
+  var longLine = "abcdef ghiklmnop qrstuvw xyz ";
+  longLine += longLine; longLine += longLine; longLine += longLine;
+  cm.replaceRange(longLine, Pos(2, 0), Pos(2));
+  cm.setSize("200px", null);
+  cm.getWrapperElement().style.lineHeight = 2;
+  cm.refresh();
+  cm.setCursor(Pos(0, 1));
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(1, 1));
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(2, 1));
+  cm.execCommand("goLineDown");
+  eq(cm.getCursor().line, 2);
+  is(cm.getCursor().ch > 1);
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(2, 1));
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(1, 1));
+  var node = document.createElement("div");
+  node.innerHTML = "hi"; node.style.height = "30px";
+  cm.addLineWidget(0, node);
+  cm.addLineWidget(1, node.cloneNode(true), {above: true});
+  cm.setCursor(Pos(0, 2));
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(1, 2));
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(0, 2));
+}, {lineWrapping: true, value: "abc\ndef\nghi\njkl\n"});
+
+testCM("addLineClass", function(cm) {
+  function cls(line, text, bg, wrap, gutter) {
+    var i = cm.lineInfo(line);
+    eq(i.textClass, text);
+    eq(i.bgClass, bg);
+    eq(i.wrapClass, wrap);
+    if (typeof i.handle.gutterClass !== 'undefined') {
+        eq(i.handle.gutterClass, gutter);
+    }
+  }
+  cm.addLineClass(0, "text", "foo");
+  cm.addLineClass(0, "text", "bar");
+  cm.addLineClass(1, "background", "baz");
+  cm.addLineClass(1, "wrap", "foo");
+  cm.addLineClass(1, "gutter", "gutter-class");
+  cls(0, "foo bar", null, null, null);
+  cls(1, null, "baz", "foo", "gutter-class");
+  var lines = cm.display.lineDiv;
+  eq(byClassName(lines, "foo").length, 2);
+  eq(byClassName(lines, "bar").length, 1);
+  eq(byClassName(lines, "baz").length, 1);
+  eq(byClassName(lines, "gutter-class").length, 2); // Gutter classes are reflected in 2 nodes
+  cm.removeLineClass(0, "text", "foo");
+  cls(0, "bar", null, null, null);
+  cm.removeLineClass(0, "text", "foo");
+  cls(0, "bar", null, null, null);
+  cm.removeLineClass(0, "text", "bar");
+  cls(0, null, null, null);
+
+  cm.addLineClass(1, "wrap", "quux");
+  cls(1, null, "baz", "foo quux", "gutter-class");
+  cm.removeLineClass(1, "wrap");
+  cls(1, null, "baz", null, "gutter-class");
+  cm.removeLineClass(1, "gutter", "gutter-class");
+  eq(byClassName(lines, "gutter-class").length, 0);
+  cls(1, null, "baz", null, null);
+
+  cm.addLineClass(1, "gutter", "gutter-class");
+  cls(1, null, "baz", null, "gutter-class");
+  cm.removeLineClass(1, "gutter", "gutter-class");
+  cls(1, null, "baz", null, null);
+
+}, {value: "hohoho\n", lineNumbers: true});
+
+testCM("atomicMarker", function(cm) {
+  addDoc(cm, 10, 10);
+  function atom(ll, cl, lr, cr, li, ri) {
+    return cm.markText(Pos(ll, cl), Pos(lr, cr),
+                       {atomic: true, inclusiveLeft: li, inclusiveRight: ri});
+  }
+  var m = atom(0, 1, 0, 5);
+  cm.setCursor(Pos(0, 1));
+  cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), Pos(0, 5));
+  cm.execCommand("goCharLeft");
+  eqPos(cm.getCursor(), Pos(0, 1));
+  m.clear();
+  m = atom(0, 0, 0, 5, true);
+  eqPos(cm.getCursor(), Pos(0, 5), "pushed out");
+  cm.execCommand("goCharLeft");
+  eqPos(cm.getCursor(), Pos(0, 5));
+  m.clear();
+  m = atom(8, 4, 9, 10, false, true);
+  cm.setCursor(Pos(9, 8));
+  eqPos(cm.getCursor(), Pos(8, 4), "set");
+  cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), Pos(8, 4), "char right");
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(8, 4), "line down");
+  cm.execCommand("goCharLeft");
+  eqPos(cm.getCursor(), Pos(8, 3));
+  m.clear();
+  m = atom(1, 1, 3, 8);
+  cm.setCursor(Pos(0, 0));
+  cm.setCursor(Pos(2, 0));
+  eqPos(cm.getCursor(), Pos(3, 8));
+  cm.execCommand("goCharLeft");
+  eqPos(cm.getCursor(), Pos(1, 1));
+  cm.execCommand("goCharRight");
+  eqPos(cm.getCursor(), Pos(3, 8));
+  cm.execCommand("goLineUp");
+  eqPos(cm.getCursor(), Pos(1, 1));
+  cm.execCommand("goLineDown");
+  eqPos(cm.getCursor(), Pos(3, 8));
+  cm.execCommand("delCharBefore");
+  eq(cm.getValue().length, 80, "del chunk");
+  m = atom(3, 0, 5, 5);
+  cm.setCursor(Pos(3, 0));
+  cm.execCommand("delWordAfter");
+  eq(cm.getValue().length, 53, "del chunk");
+});
+
+testCM("selectionBias", function(cm) {
+  cm.markText(Pos(0, 1), Pos(0, 3), {atomic: true});
+  cm.setCursor(Pos(0, 2));
+  eqPos(cm.getCursor(), Pos(0, 1));
+  cm.setCursor(Pos(0, 2));
+  eqPos(cm.getCursor(), Pos(0, 3));
+  cm.setCursor(Pos(0, 2));
+  eqPos(cm.getCursor(), Pos(0, 1));
+  cm.setCursor(Pos(0, 2), null, {bias: -1});
+  eqPos(cm.getCursor(), Pos(0, 1));
+  cm.setCursor(Pos(0, 4));
+  cm.setCursor(Pos(0, 2), null, {bias: 1});
+  eqPos(cm.getCursor(), Pos(0, 3));
+}, {value: "12345"});
+
+testCM("selectionHomeEnd", function(cm) {
+  cm.markText(Pos(1, 0), Pos(1, 1), {atomic: true, inclusiveLeft: true});
+  cm.markText(Pos(1, 3), Pos(1, 4), {atomic: true, inclusiveRight: true});
+  cm.setCursor(Pos(1, 2));
+  cm.execCommand("goLineStart");
+  eqPos(cm.getCursor(), Pos(1, 1));
+  cm.execCommand("goLineEnd");
+  eqPos(cm.getCursor(), Pos(1, 3));
+}, {value: "ab\ncdef\ngh"});
+
+testCM("readOnlyMarker", function(cm) {
+  function mark(ll, cl, lr, cr, at) {
+    return cm.markText(Pos(ll, cl), Pos(lr, cr),
+                       {readOnly: true, atomic: at});
+  }
+  var m = mark(0, 1, 0, 4);
+  cm.setCursor(Pos(0, 2));
+  cm.replaceSelection("hi", "end");
+  eqPos(cm.getCursor(), Pos(0, 2));
+  eq(cm.getLine(0), "abcde");
+  cm.execCommand("selectAll");
+  cm.replaceSelection("oops", "around");
+  eq(cm.getValue(), "oopsbcd");
+  cm.undo();
+  eqPos(m.find().from, Pos(0, 1));
+  eqPos(m.find().to, Pos(0, 4));
+  m.clear();
+  cm.setCursor(Pos(0, 2));
+  cm.replaceSelection("hi", "around");
+  eq(cm.getLine(0), "abhicde");
+  eqPos(cm.getCursor(), Pos(0, 4));
+  m = mark(0, 2, 2, 2, true);
+  cm.setSelection(Pos(1, 1), Pos(2, 4));
+  cm.replaceSelection("t", "end");
+  eqPos(cm.getCursor(), Pos(2, 3));
+  eq(cm.getLine(2), "klto");
+  cm.execCommand("goCharLeft");
+  cm.execCommand("goCharLeft");
+  eqPos(cm.getCursor(), Pos(0, 2));
+  cm.setSelection(Pos(0, 1), Pos(0, 3));
+  cm.replaceSelection("xx", "around");
+  eqPos(cm.getCursor(), Pos(0, 3));
+  eq(cm.getLine(0), "axxhicde");
+}, {value: "abcde\nfghij\nklmno\n"});
+
+testCM("dirtyBit", function(cm) {
+  eq(cm.isClean(), true);
+  cm.replaceSelection("boo", null, "test");
+  eq(cm.isClean(), false);
+  cm.undo();
+  eq(cm.isClean(), true);
+  cm.replaceSelection("boo", null, "test");
+  cm.replaceSelection("baz", null, "test");
+  cm.undo();
+  eq(cm.isClean(), false);
+  cm.markClean();
+  eq(cm.isClean(), true);
+  cm.undo();
+  eq(cm.isClean(), false);
+  cm.redo();
+  eq(cm.isClean(), true);
+});
+
+testCM("changeGeneration", function(cm) {
+  cm.replaceSelection("x");
+  var softGen = cm.changeGeneration();
+  cm.replaceSelection("x");
+  cm.undo();
+  eq(cm.getValue(), "");
+  is(!cm.isClean(softGen));
+  cm.replaceSelection("x");
+  var hardGen = cm.changeGeneration(true);
+  cm.replaceSelection("x");
+  cm.undo();
+  eq(cm.getValue(), "x");
+  is(cm.isClean(hardGen));
+});
+
+testCM("addKeyMap", function(cm) {
+  function sendKey(code) {
+    cm.triggerOnKeyDown({type: "keydown", keyCode: code,
+                         preventDefault: function(){}, stopPropagation: function(){}});
+  }
+
+  sendKey(39);
+  eqPos(cm.getCursor(), Pos(0, 1));
+  var test = 0;
+  var map1 = {Right: function() { ++test; }}, map2 = {Right: function() { test += 10; }}
+  cm.addKeyMap(map1);
+  sendKey(39);
+  eqPos(cm.getCursor(), Pos(0, 1));
+  eq(test, 1);
+  cm.addKeyMap(map2, true);
+  sendKey(39);
+  eq(test, 2);
+  cm.removeKeyMap(map1);
+  sendKey(39);
+  eq(test, 12);
+  cm.removeKeyMap(map2);
+  sendKey(39);
+  eq(test, 12);
+  eqPos(cm.getCursor(), Pos(0, 2));
+  cm.addKeyMap({Right: function() { test = 55; }, name: "mymap"});
+  sendKey(39);
+  eq(test, 55);
+  cm.removeKeyMap("mymap");
+  sendKey(39);
+  eqPos(cm.getCursor(), Pos(0, 3));
+}, {value: "abc"});
+
+testCM("findPosH", function(cm) {
+  forEach([{from: Pos(0, 0), to: Pos(0, 1), by: 1},
+           {from: Pos(0, 0), to: Pos(0, 0), by: -1, hitSide: true},
+           {from: Pos(0, 0), to: Pos(0, 4), by: 1, unit: "word"},
+           {from: Pos(0, 0), to: Pos(0, 8), by: 2, unit: "word"},
+           {from: Pos(0, 0), to: Pos(2, 0), by: 20, unit: "word", hitSide: true},
+           {from: Pos(0, 7), to: Pos(0, 5), by: -1, unit: "word"},
+           {from: Pos(0, 4), to: Pos(0, 8), by: 1, unit: "word"},
+           {from: Pos(1, 0), to: Pos(1, 18), by: 3, unit: "word"},
+           {from: Pos(1, 22), to: Pos(1, 5), by: -3, unit: "word"},
+           {from: Pos(1, 15), to: Pos(1, 10), by: -5},
+           {from: Pos(1, 15), to: Pos(1, 10), by: -5, unit: "column"},
+           {from: Pos(1, 15), to: Pos(1, 0), by: -50, unit: "column", hitSide: true},
+           {from: Pos(1, 15), to: Pos(1, 24), by: 50, unit: "column", hitSide: true},
+           {from: Pos(1, 15), to: Pos(2, 0), by: 50, hitSide: true}], function(t) {
+    var r = cm.findPosH(t.from, t.by, t.unit || "char");
+    eqPos(r, t.to);
+    eq(!!r.hitSide, !!t.hitSide);
+  });
+}, {value: "line one\nline two.something.other\n"});
+
+testCM("beforeChange", function(cm) {
+  cm.on("beforeChange", function(cm, change) {
+    var text = [];
+    for (var i = 0; i < change.text.length; ++i)
+      text.push(change.text[i].replace(/\s/g, "_"));
+    change.update(null, null, text);
+  });
+  cm.setValue("hello, i am a\nnew document\n");
+  eq(cm.getValue(), "hello,_i_am_a\nnew_document\n");
+  CodeMirror.on(cm.getDoc(), "beforeChange", function(doc, change) {
+    if (change.from.line == 0) change.cancel();
+  });
+  cm.setValue("oops"); // Canceled
+  eq(cm.getValue(), "hello,_i_am_a\nnew_document\n");
+  cm.replaceRange("hey hey hey", Pos(1, 0), Pos(2, 0));
+  eq(cm.getValue(), "hello,_i_am_a\nhey_hey_hey");
+}, {value: "abcdefghijk"});
+
+testCM("beforeChangeUndo", function(cm) {
+  cm.replaceRange("hi", Pos(0, 0), Pos(0));
+  cm.replaceRange("bye", Pos(0, 0), Pos(0));
+  eq(cm.historySize().undo, 2);
+  cm.on("beforeChange", function(cm, change) {
+    is(!change.update);
+    change.cancel();
+  });
+  cm.undo();
+  eq(cm.historySize().undo, 0);
+  eq(cm.getValue(), "bye\ntwo");
+}, {value: "one\ntwo"});
+
+testCM("beforeSelectionChange", function(cm) {
+  function notAtEnd(cm, pos) {
+    var len = cm.getLine(pos.line).length;
+    if (!len || pos.ch == len) return Pos(pos.line, pos.ch - 1);
+    return pos;
+  }
+  cm.on("beforeSelectionChange", function(cm, obj) {
+    obj.update([{anchor: notAtEnd(cm, obj.ranges[0].anchor),
+                 head: notAtEnd(cm, obj.ranges[0].head)}]);
+  });
+
+  addDoc(cm, 10, 10);
+  cm.execCommand("goLineEnd");
+  eqPos(cm.getCursor(), Pos(0, 9));
+  cm.execCommand("selectAll");
+  eqPos(cm.getCursor("start"), Pos(0, 0));
+  eqPos(cm.getCursor("end"), Pos(9, 9));
+});
+
+testCM("change_removedText", function(cm) {
+  cm.setValue("abc\ndef");
+
+  var removedText = [];
+  cm.on("change", function(cm, change) {
+    removedText.push(change.removed);
+  });
+
+  cm.operation(function() {
+    cm.replaceRange("xyz", Pos(0, 0), Pos(1,1));
+    cm.replaceRange("123", Pos(0,0));
+  });
+
+  eq(removedText.length, 2);
+  eq(removedText[0].join("\n"), "abc\nd");
+  eq(removedText[1].join("\n"), "");
+
+  var removedText = [];
+  cm.undo();
+  eq(removedText.length, 2);
+  eq(removedText[0].join("\n"), "123");
+  eq(removedText[1].join("\n"), "xyz");
+
+  var removedText = [];
+  cm.redo();
+  eq(removedText.length, 2);
+  eq(removedText[0].join("\n"), "abc\nd");
+  eq(removedText[1].join("\n"), "");
+});
+
+testCM("lineStyleFromMode", function(cm) {
+  CodeMirror.defineMode("test_mode", function() {
+    return {token: function(stream) {
+      if (stream.match(/^\[[^\]]*\]/)) return "  line-brackets  ";
+      if (stream.match(/^\([^\)]*\)/)) return "  line-background-parens  ";
+      if (stream.match(/^<[^>]*>/)) return "  span  line-line  line-background-bg  ";
+      stream.match(/^\s+|^\S+/);
+    }};
+  });
+  cm.setOption("mode", "test_mode");
+  var bracketElts = byClassName(cm.getWrapperElement(), "brackets");
+  eq(bracketElts.length, 1, "brackets count");
+  eq(bracketElts[0].nodeName, "PRE");
+  is(!/brackets.*brackets/.test(bracketElts[0].className));
+  var parenElts = byClassName(cm.getWrapperElement(), "parens");
+  eq(parenElts.length, 1, "parens count");
+  eq(parenElts[0].nodeName, "DIV");
+  is(!/parens.*parens/.test(parenElts[0].className));
+  eq(parenElts[0].parentElement.nodeName, "DIV");
+
+  eq(byClassName(cm.getWrapperElement(), "bg").length, 1);
+  eq(byClassName(cm.getWrapperElement(), "line").length, 1);
+  var spanElts = byClassName(cm.getWrapperElement(), "cm-span");
+  eq(spanElts.length, 2);
+  is(/^\s*cm-span\s*$/.test(spanElts[0].className));
+}, {value: "line1: [br] [br]\nline2: (par) (par)\nline3:  "});
+
+testCM("lineStyleFromBlankLine", function(cm) {
+  CodeMirror.defineMode("lineStyleFromBlankLine_mode", function() {
+    return {token: function(stream) { stream.skipToEnd(); return "comment"; },
+            blankLine: function() { return "line-blank"; }};
+  });
+  cm.setOption("mode", "lineStyleFromBlankLine_mode");
+  var blankElts = byClassName(cm.getWrapperElement(), "blank");
+  eq(blankElts.length, 1);
+  eq(blankElts[0].nodeName, "PRE");
+  cm.replaceRange("x", Pos(1, 0));
+  blankElts = byClassName(cm.getWrapperElement(), "blank");
+  eq(blankElts.length, 0);
+}, {value: "foo\n\nbar"});
+
+CodeMirror.registerHelper("xxx", "a", "A");
+CodeMirror.registerHelper("xxx", "b", "B");
+CodeMirror.defineMode("yyy", function() {
+  return {
+    token: function(stream) { stream.skipToEnd(); },
+    xxx: ["a", "b", "q"]
+  };
+});
+CodeMirror.registerGlobalHelper("xxx", "c", function(m) { return m.enableC; }, "C");
+
+testCM("helpers", function(cm) {
+  cm.setOption("mode", "yyy");
+  eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "A/B");
+  cm.setOption("mode", {name: "yyy", modeProps: {xxx: "b", enableC: true}});
+  eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "B/C");
+  cm.setOption("mode", "javascript");
+  eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "");
+});
+
+testCM("selectionHistory", function(cm) {
+  for (var i = 0; i < 3; i++) {
+    cm.setExtending(true);
+    cm.execCommand("goCharRight");
+    cm.setExtending(false);
+    cm.execCommand("goCharRight");
+    cm.execCommand("goCharRight");
+  }
+  cm.execCommand("undoSelection");
+  eq(cm.getSelection(), "c");
+  cm.execCommand("undoSelection");
+  eq(cm.getSelection(), "");
+  eqPos(cm.getCursor(), Pos(0, 4));
+  cm.execCommand("undoSelection");
+  eq(cm.getSelection(), "b");
+  cm.execCommand("redoSelection");
+  eq(cm.getSelection(), "");
+  eqPos(cm.getCursor(), Pos(0, 4));
+  cm.execCommand("redoSelection");
+  eq(cm.getSelection(), "c");
+  cm.execCommand("redoSelection");
+  eq(cm.getSelection(), "");
+  eqPos(cm.getCursor(), Pos(0, 6));
+}, {value: "a b c d"});
+
+testCM("selectionChangeReducesRedo", function(cm) {
+  cm.replaceSelection("X");
+  cm.execCommand("goCharRight");
+  cm.undoSelection();
+  cm.execCommand("selectAll");
+  cm.undoSelection();
+  eq(cm.getValue(), "Xabc");
+  eqPos(cm.getCursor(), Pos(0, 1));
+  cm.undoSelection();
+  eq(cm.getValue(), "abc");
+}, {value: "abc"});
+
+testCM("selectionHistoryNonOverlapping", function(cm) {
+  cm.setSelection(Pos(0, 0), Pos(0, 1));
+  cm.setSelection(Pos(0, 2), Pos(0, 3));
+  cm.execCommand("undoSelection");
+  eqPos(cm.getCursor("anchor"), Pos(0, 0));
+  eqPos(cm.getCursor("head"), Pos(0, 1));
+}, {value: "1234"});
+
+testCM("cursorMotionSplitsHistory", function(cm) {
+  cm.replaceSelection("a");
+  cm.execCommand("goCharRight");
+  cm.replaceSelection("b");
+  cm.replaceSelection("c");
+  cm.undo();
+  eq(cm.getValue(), "a1234");
+  eqPos(cm.getCursor(), Pos(0, 2));
+  cm.undo();
+  eq(cm.getValue(), "1234");
+  eqPos(cm.getCursor(), Pos(0, 0));
+}, {value: "1234"});
+
+testCM("selChangeInOperationDoesNotSplit", function(cm) {
+  for (var i = 0; i < 4; i++) {
+    cm.operation(function() {
+      cm.replaceSelection("x");
+      cm.setCursor(Pos(0, cm.getCursor().ch - 1));
+    });
+  }
+  eqPos(cm.getCursor(), Pos(0, 0));
+  eq(cm.getValue(), "xxxxa");
+  cm.undo();
+  eq(cm.getValue(), "a");
+}, {value: "a"});
+
+testCM("alwaysMergeSelEventWithChangeOrigin", function(cm) {
+  cm.replaceSelection("U", null, "foo");
+  cm.setSelection(Pos(0, 0), Pos(0, 1), {origin: "foo"});
+  cm.undoSelection();
+  eq(cm.getValue(), "a");
+  cm.replaceSelection("V", null, "foo");
+  cm.setSelection(Pos(0, 0), Pos(0, 1), {origin: "bar"});
+  cm.undoSelection();
+  eq(cm.getValue(), "Va");
+}, {value: "a"});
+
+testCM("getTokenAt", function(cm) {
+  var tokPlus = cm.getTokenAt(Pos(0, 2));
+  eq(tokPlus.type, "operator");
+  eq(tokPlus.string, "+");
+  var toks = cm.getLineTokens(0);
+  eq(toks.length, 3);
+  forEach([["number", "1"], ["operator", "+"], ["number", "2"]], function(expect, i) {
+    eq(toks[i].type, expect[0]);
+    eq(toks[i].string, expect[1]);
+  });
+}, {value: "1+2", mode: "javascript"});
+
+testCM("getTokenTypeAt", function(cm) {
+  eq(cm.getTokenTypeAt(Pos(0, 0)), "number");
+  eq(cm.getTokenTypeAt(Pos(0, 6)), "string");
+  cm.addOverlay({
+    token: function(stream) {
+      if (stream.match("foo")) return "foo";
+      else stream.next();
+    }
+  });
+  eq(byClassName(cm.getWrapperElement(), "cm-foo").length, 1);
+  eq(cm.getTokenTypeAt(Pos(0, 6)), "string");
+}, {value: "1 + 'foo'", mode: "javascript"});
+
+testCM("resizeLineWidget", function(cm) {
+  addDoc(cm, 200, 3);
+  var widget = document.createElement("pre");
+  widget.innerHTML = "imwidget";
+  widget.style.background = "yellow";
+  cm.addLineWidget(1, widget, {noHScroll: true});
+  cm.setSize(40);
+  is(widget.parentNode.offsetWidth < 42);
+});
+
+testCM("combinedOperations", function(cm) {
+  var place = document.getElementById("testground");
+  var other = CodeMirror(place, {value: "123"});
+  try {
+    cm.operation(function() {
+      cm.addLineClass(0, "wrap", "foo");
+      other.addLineClass(0, "wrap", "foo");
+    });
+    eq(byClassName(cm.getWrapperElement(), "foo").length, 1);
+    eq(byClassName(other.getWrapperElement(), "foo").length, 1);
+    cm.operation(function() {
+      cm.removeLineClass(0, "wrap", "foo");
+      other.removeLineClass(0, "wrap", "foo");
+    });
+    eq(byClassName(cm.getWrapperElement(), "foo").length, 0);
+    eq(byClassName(other.getWrapperElement(), "foo").length, 0);
+  } finally {
+    place.removeChild(other.getWrapperElement());
+  }
+}, {value: "abc"});
+
+testCM("eventOrder", function(cm) {
+  var seen = [];
+  cm.on("change", function() {
+    if (!seen.length) cm.replaceSelection(".");
+    seen.push("change");
+  });
+  cm.on("cursorActivity", function() {
+    cm.replaceSelection("!");
+    seen.push("activity");
+  });
+  cm.replaceSelection("/");
+  eq(seen.join(","), "change,change,activity,change");
+});
+
+testCM("splitSpaces_nonspecial", function(cm) {
+  eq(byClassName(cm.getWrapperElement(), "cm-invalidchar").length, 0);
+}, {
+  specialChars: /[\u00a0]/,
+  value: "spaces ->            <- between"
+});
+
+test("core_rmClass", function() {
+  var node = document.createElement("div");
+  node.className = "foo-bar baz-quux yadda";
+  CodeMirror.rmClass(node, "quux");
+  eq(node.className, "foo-bar baz-quux yadda");
+  CodeMirror.rmClass(node, "baz-quux");
+  eq(node.className, "foo-bar yadda");
+  CodeMirror.rmClass(node, "yadda");
+  eq(node.className, "foo-bar");
+  CodeMirror.rmClass(node, "foo-bar");
+  eq(node.className, "");
+  node.className = " foo ";
+  CodeMirror.rmClass(node, "foo");
+  eq(node.className, "");
+});
+
+test("core_addClass", function() {
+  var node = document.createElement("div");
+  CodeMirror.addClass(node, "a");
+  eq(node.className, "a");
+  CodeMirror.addClass(node, "a");
+  eq(node.className, "a");
+  CodeMirror.addClass(node, "b");
+  eq(node.className, "a b");
+  CodeMirror.addClass(node, "a");
+  CodeMirror.addClass(node, "b");
+  eq(node.className, "a b");
+});
+
+testCM("lineSeparator", function(cm) {
+  eq(cm.lineCount(), 3);
+  eq(cm.getLine(1), "bar\r");
+  eq(cm.getLine(2), "baz\rquux");
+  cm.setOption("lineSeparator", "\r");
+  eq(cm.lineCount(), 5);
+  eq(cm.getLine(4), "quux");
+  eq(cm.getValue(), "foo\rbar\r\rbaz\rquux");
+  eq(cm.getValue("\n"), "foo\nbar\n\nbaz\nquux");
+  cm.setOption("lineSeparator", null);
+  cm.setValue("foo\nbar\r\nbaz\rquux");
+  eq(cm.lineCount(), 4);
+}, {value: "foo\nbar\r\nbaz\rquux",
+    lineSeparator: "\n"});
diff --git a/www/code/codemirror-5.13.2/test/vim_test.js b/www/code/codemirror-5.13.2/test/vim_test.js
new file mode 100644
index 000000000..7080c3062
--- /dev/null
+++ b/www/code/codemirror-5.13.2/test/vim_test.js
@@ -0,0 +1,4003 @@
+CodeMirror.Vim.suppressErrorLogging = true;
+
+var code = '' +
+' wOrd1 (#%\n' +
+' word3] \n' +
+'aopop pop 0 1 2 3 4\n' +
+' (a) [b] {c} \n' +
+'int getchar(void) {\n' +
+'  static char buf[BUFSIZ];\n' +
+'  static char *bufp = buf;\n' +
+'  if (n == 0) {  /* buffer is empty */\n' +
+'    n = read(0, buf, sizeof buf);\n' +
+'    bufp = buf;\n' +
+'  }\n' +
+'\n' +
+'  return (--n >= 0) ? (unsigned char) *bufp++ : EOF;\n' +
+' \n' +
+'}\n';
+
+var lines = (function() {
+  lineText = code.split('\n');
+  var ret = [];
+  for (var i = 0; i < lineText.length; i++) {
+    ret[i] = {
+      line: i,
+      length: lineText[i].length,
+      lineText: lineText[i],
+      textStart: /^\s*/.exec(lineText[i])[0].length
+    };
+  }
+  return ret;
+})();
+var endOfDocument = makeCursor(lines.length - 1,
+    lines[lines.length - 1].length);
+var wordLine = lines[0];
+var bigWordLine = lines[1];
+var charLine = lines[2];
+var bracesLine = lines[3];
+var seekBraceLine = lines[4];
+
+var word1 = {
+  start: { line: wordLine.line, ch: 1 },
+  end: { line: wordLine.line, ch: 5 }
+};
+var word2 = {
+  start: { line: wordLine.line, ch: word1.end.ch + 2 },
+  end: { line: wordLine.line, ch: word1.end.ch + 4 }
+};
+var word3 = {
+  start: { line: bigWordLine.line, ch: 1 },
+  end: { line: bigWordLine.line, ch: 5 }
+};
+var bigWord1 = word1;
+var bigWord2 = word2;
+var bigWord3 = {
+  start: { line: bigWordLine.line, ch: 1 },
+  end: { line: bigWordLine.line, ch: 7 }
+};
+var bigWord4 = {
+  start: { line: bigWordLine.line, ch: bigWord1.end.ch + 3 },
+  end: { line: bigWordLine.line, ch: bigWord1.end.ch + 7 }
+};
+
+var oChars = [ { line: charLine.line, ch: 1 },
+    { line: charLine.line, ch: 3 },
+    { line: charLine.line, ch: 7 } ];
+var pChars = [ { line: charLine.line, ch: 2 },
+    { line: charLine.line, ch: 4 },
+    { line: charLine.line, ch: 6 },
+    { line: charLine.line, ch: 8 } ];
+var numChars = [ { line: charLine.line, ch: 10 },
+    { line: charLine.line, ch: 12 },
+    { line: charLine.line, ch: 14 },
+    { line: charLine.line, ch: 16 },
+    { line: charLine.line, ch: 18 }];
+var parens1 = {
+  start: { line: bracesLine.line, ch: 1 },
+  end: { line: bracesLine.line, ch: 3 }
+};
+var squares1 = {
+  start: { line: bracesLine.line, ch: 5 },
+  end: { line: bracesLine.line, ch: 7 }
+};
+var curlys1 = {
+  start: { line: bracesLine.line, ch: 9 },
+  end: { line: bracesLine.line, ch: 11 }
+};
+var seekOutside = {
+  start: { line: seekBraceLine.line, ch: 1 },
+  end: { line: seekBraceLine.line, ch: 16 }
+};
+var seekInside = {
+  start: { line: seekBraceLine.line, ch: 14 },
+  end: { line: seekBraceLine.line, ch: 11 }
+};
+
+function copyCursor(cur) {
+  return { ch: cur.ch, line: cur.line };
+}
+
+function forEach(arr, func) {
+  for (var i = 0; i < arr.length; i++) {
+    func(arr[i], i, arr);
+  }
+}
+
+function testVim(name, run, opts, expectedFail) {
+  var vimOpts = {
+    lineNumbers: true,
+    vimMode: true,
+    showCursorWhenSelecting: true,
+    value: code
+  };
+  for (var prop in opts) {
+    if (opts.hasOwnProperty(prop)) {
+      vimOpts[prop] = opts[prop];
+    }
+  }
+  return test('vim_' + name, function() {
+    var place = document.getElementById("testground");
+    var cm = CodeMirror(place, vimOpts);
+    var vim = CodeMirror.Vim.maybeInitVimState_(cm);
+
+    function doKeysFn(cm) {
+      return function(args) {
+        if (args instanceof Array) {
+          arguments = args;
+        }
+        for (var i = 0; i < arguments.length; i++) {
+          CodeMirror.Vim.handleKey(cm, arguments[i]);
+        }
+      }
+    }
+    function doInsertModeKeysFn(cm) {
+      return function(args) {
+        if (args instanceof Array) { arguments = args; }
+        function executeHandler(handler) {
+          if (typeof handler == 'string') {
+            CodeMirror.commands[handler](cm);
+          } else {
+            handler(cm);
+          }
+          return true;
+        }
+        for (var i = 0; i < arguments.length; i++) {
+          var key = arguments[i];
+          // Find key in keymap and handle.
+          var handled = CodeMirror.lookupKey(key, 'vim-insert', executeHandler);
+          // Record for insert mode.
+          if (handled == "handled" && cm.state.vim.insertMode && arguments[i] != 'Esc') {
+            var lastChange = CodeMirror.Vim.getVimGlobalState_().macroModeState.lastInsertModeChanges;
+            if (lastChange) {
+              lastChange.changes.push(new CodeMirror.Vim.InsertModeKey(key));
+            }
+          }
+        }
+      }
+    }
+    function doExFn(cm) {
+      return function(command) {
+        cm.openDialog = helpers.fakeOpenDialog(command);
+        helpers.doKeys(':');
+      }
+    }
+    function assertCursorAtFn(cm) {
+      return function(line, ch) {
+        var pos;
+        if (ch == null && typeof line.line == 'number') {
+          pos = line;
+        } else {
+          pos = makeCursor(line, ch);
+        }
+        eqPos(pos, cm.getCursor());
+      }
+    }
+    function fakeOpenDialog(result) {
+      return function(text, callback) {
+        return callback(result);
+      }
+    }
+    function fakeOpenNotification(matcher) {
+      return function(text) {
+        matcher(text);
+      }
+    }
+    var helpers = {
+      doKeys: doKeysFn(cm),
+      // Warning: Only emulates keymap events, not character insertions. Use
+      // replaceRange to simulate character insertions.
+      // Keys are in CodeMirror format, NOT vim format.
+      doInsertModeKeys: doInsertModeKeysFn(cm),
+      doEx: doExFn(cm),
+      assertCursorAt: assertCursorAtFn(cm),
+      fakeOpenDialog: fakeOpenDialog,
+      fakeOpenNotification: fakeOpenNotification,
+      getRegisterController: function() {
+        return CodeMirror.Vim.getRegisterController();
+      }
+    }
+    CodeMirror.Vim.resetVimGlobalState_();
+    var successful = false;
+    var savedOpenNotification = cm.openNotification;
+    var savedOpenDialog = cm.openDialog;
+    try {
+      run(cm, vim, helpers);
+      successful = true;
+    } finally {
+      cm.openNotification = savedOpenNotification;
+      cm.openDialog = savedOpenDialog;
+      if (!successful || verbose) {
+        place.style.visibility = "visible";
+      } else {
+        place.removeChild(cm.getWrapperElement());
+      }
+    }
+  }, expectedFail);
+};
+testVim('qq@q', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'q', 'l', 'l', 'q');
+  helpers.assertCursorAt(0,2);
+  helpers.doKeys('@', 'q');
+  helpers.assertCursorAt(0,4);
+}, { value: '            '});
+testVim('@@', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'q', 'l', 'l', 'q');
+  helpers.assertCursorAt(0,2);
+  helpers.doKeys('@', 'q');
+  helpers.assertCursorAt(0,4);
+  helpers.doKeys('@', '@');
+  helpers.assertCursorAt(0,6);
+}, { value: '            '});
+var jumplistScene = ''+
+  'word\n'+
+  '(word)\n'+
+  '{word\n'+
+  'word.\n'+
+  '\n'+
+  'word search\n'+
+  '}word\n'+
+  'word\n'+
+  'word\n';
+function testJumplist(name, keys, endPos, startPos, dialog) {
+  endPos = makeCursor(endPos[0], endPos[1]);
+  startPos = makeCursor(startPos[0], startPos[1]);
+  testVim(name, function(cm, vim, helpers) {
+    CodeMirror.Vim.resetVimGlobalState_();
+    if(dialog)cm.openDialog = helpers.fakeOpenDialog('word');
+    cm.setCursor(startPos);
+    helpers.doKeys.apply(null, keys);
+    helpers.assertCursorAt(endPos);
+  }, {value: jumplistScene});
+};
+testJumplist('jumplist_H', ['H', ''], [5,2], [5,2]);
+testJumplist('jumplist_M', ['M', ''], [2,2], [2,2]);
+testJumplist('jumplist_L', ['L', ''], [2,2], [2,2]);
+testJumplist('jumplist_[[', ['[', '[', ''], [5,2], [5,2]);
+testJumplist('jumplist_]]', [']', ']', ''], [2,2], [2,2]);
+testJumplist('jumplist_G', ['G', ''], [5,2], [5,2]);
+testJumplist('jumplist_gg', ['g', 'g', ''], [5,2], [5,2]);
+testJumplist('jumplist_%', ['%', ''], [1,5], [1,5]);
+testJumplist('jumplist_{', ['{', ''], [1,5], [1,5]);
+testJumplist('jumplist_}', ['}', ''], [1,5], [1,5]);
+testJumplist('jumplist_\'', ['m', 'a', 'h', '\'', 'a', 'h', ''], [1,0], [1,5]);
+testJumplist('jumplist_`', ['m', 'a', 'h', '`', 'a', 'h', ''], [1,5], [1,5]);
+testJumplist('jumplist_*_cachedCursor', ['*', ''], [1,3], [1,3]);
+testJumplist('jumplist_#_cachedCursor', ['#', ''], [1,3], [1,3]);
+testJumplist('jumplist_n', ['#', 'n', ''], [1,1], [2,3]);
+testJumplist('jumplist_N', ['#', 'N', ''], [1,1], [2,3]);
+testJumplist('jumplist_repeat_', ['*', '*', '*', '3', ''], [2,3], [2,3]);
+testJumplist('jumplist_repeat_', ['*', '*', '*', '3', '', '2', ''], [5,0], [2,3]);
+testJumplist('jumplist_repeated_motion', ['3', '*', ''], [2,3], [2,3]);
+testJumplist('jumplist_/', ['/', ''], [2,3], [2,3], 'dialog');
+testJumplist('jumplist_?', ['?', ''], [2,3], [2,3], 'dialog');
+testJumplist('jumplist_skip_delted_mark',
+             ['*', 'n', 'n', 'k', 'd', 'k', '', '', ''],
+             [0,2], [0,2]);
+testJumplist('jumplist_skip_delted_mark',
+             ['*', 'n', 'n', 'k', 'd', 'k', '', '', ''],
+             [1,0], [0,2]);
+
+/**
+ * @param name Name of the test
+ * @param keys An array of keys or a string with a single key to simulate.
+ * @param endPos The expected end position of the cursor.
+ * @param startPos The position the cursor should start at, defaults to 0, 0.
+ */
+function testMotion(name, keys, endPos, startPos) {
+  testVim(name, function(cm, vim, helpers) {
+    if (!startPos) {
+      startPos = { line: 0, ch: 0 };
+    }
+    cm.setCursor(startPos);
+    helpers.doKeys(keys);
+    helpers.assertCursorAt(endPos);
+  });
+};
+
+function makeCursor(line, ch) {
+  return { line: line, ch: ch };
+};
+
+function offsetCursor(cur, offsetLine, offsetCh) {
+  return { line: cur.line + offsetLine, ch: cur.ch + offsetCh };
+};
+
+// Motion tests
+testMotion('|', '|', makeCursor(0, 0), makeCursor(0,4));
+testMotion('|_repeat', ['3', '|'], makeCursor(0, 2), makeCursor(0,4));
+testMotion('h', 'h', makeCursor(0, 0), word1.start);
+testMotion('h_repeat', ['3', 'h'], offsetCursor(word1.end, 0, -3), word1.end);
+testMotion('l', 'l', makeCursor(0, 1));
+testMotion('l_repeat', ['2', 'l'], makeCursor(0, 2));
+testMotion('j', 'j', offsetCursor(word1.end, 1, 0), word1.end);
+testMotion('j_repeat', ['2', 'j'], offsetCursor(word1.end, 2, 0), word1.end);
+testMotion('j_repeat_clip', ['1000', 'j'], endOfDocument);
+testMotion('k', 'k', offsetCursor(word3.end, -1, 0), word3.end);
+testMotion('k_repeat', ['2', 'k'], makeCursor(0, 4), makeCursor(2, 4));
+testMotion('k_repeat_clip', ['1000', 'k'], makeCursor(0, 4), makeCursor(2, 4));
+testMotion('w', 'w', word1.start);
+testMotion('w_multiple_newlines_no_space', 'w', makeCursor(12, 2), makeCursor(11, 2));
+testMotion('w_multiple_newlines_with_space', 'w', makeCursor(14, 0), makeCursor(12, 51));
+testMotion('w_repeat', ['2', 'w'], word2.start);
+testMotion('w_wrap', ['w'], word3.start, word2.start);
+testMotion('w_endOfDocument', 'w', endOfDocument, endOfDocument);
+testMotion('w_start_to_end', ['1000', 'w'], endOfDocument, makeCursor(0, 0));
+testMotion('W', 'W', bigWord1.start);
+testMotion('W_repeat', ['2', 'W'], bigWord3.start, bigWord1.start);
+testMotion('e', 'e', word1.end);
+testMotion('e_repeat', ['2', 'e'], word2.end);
+testMotion('e_wrap', 'e', word3.end, word2.end);
+testMotion('e_endOfDocument', 'e', endOfDocument, endOfDocument);
+testMotion('e_start_to_end', ['1000', 'e'], endOfDocument, makeCursor(0, 0));
+testMotion('b', 'b', word3.start, word3.end);
+testMotion('b_repeat', ['2', 'b'], word2.start, word3.end);
+testMotion('b_wrap', 'b', word2.start, word3.start);
+testMotion('b_startOfDocument', 'b', makeCursor(0, 0), makeCursor(0, 0));
+testMotion('b_end_to_start', ['1000', 'b'], makeCursor(0, 0), endOfDocument);
+testMotion('ge', ['g', 'e'], word2.end, word3.end);
+testMotion('ge_repeat', ['2', 'g', 'e'], word1.end, word3.start);
+testMotion('ge_wrap', ['g', 'e'], word2.end, word3.start);
+testMotion('ge_startOfDocument', ['g', 'e'], makeCursor(0, 0),
+    makeCursor(0, 0));
+testMotion('ge_end_to_start', ['1000', 'g', 'e'], makeCursor(0, 0), endOfDocument);
+testMotion('gg', ['g', 'g'], makeCursor(lines[0].line, lines[0].textStart),
+    makeCursor(3, 1));
+testMotion('gg_repeat', ['3', 'g', 'g'],
+    makeCursor(lines[2].line, lines[2].textStart));
+testMotion('G', 'G',
+    makeCursor(lines[lines.length - 1].line, lines[lines.length - 1].textStart),
+    makeCursor(3, 1));
+testMotion('G_repeat', ['3', 'G'], makeCursor(lines[2].line,
+    lines[2].textStart));
+// TODO: Make the test code long enough to test Ctrl-F and Ctrl-B.
+testMotion('0', '0', makeCursor(0, 0), makeCursor(0, 8));
+testMotion('^', '^', makeCursor(0, lines[0].textStart), makeCursor(0, 8));
+testMotion('+', '+', makeCursor(1, lines[1].textStart), makeCursor(0, 8));
+testMotion('-', '-', makeCursor(0, lines[0].textStart), makeCursor(1, 4));
+testMotion('_', ['6','_'], makeCursor(5, lines[5].textStart), makeCursor(0, 8));
+testMotion('$', '$', makeCursor(0, lines[0].length - 1), makeCursor(0, 1));
+testMotion('$_repeat', ['2', '$'], makeCursor(1, lines[1].length - 1),
+    makeCursor(0, 3));
+testMotion('f', ['f', 'p'], pChars[0], makeCursor(charLine.line, 0));
+testMotion('f_repeat', ['2', 'f', 'p'], pChars[2], pChars[0]);
+testMotion('f_num', ['f', '2'], numChars[2], makeCursor(charLine.line, 0));
+testMotion('t', ['t','p'], offsetCursor(pChars[0], 0, -1),
+    makeCursor(charLine.line, 0));
+testMotion('t_repeat', ['2', 't', 'p'], offsetCursor(pChars[2], 0, -1),
+    pChars[0]);
+testMotion('F', ['F', 'p'], pChars[0], pChars[1]);
+testMotion('F_repeat', ['2', 'F', 'p'], pChars[0], pChars[2]);
+testMotion('T', ['T', 'p'], offsetCursor(pChars[0], 0, 1), pChars[1]);
+testMotion('T_repeat', ['2', 'T', 'p'], offsetCursor(pChars[0], 0, 1), pChars[2]);
+testMotion('%_parens', ['%'], parens1.end, parens1.start);
+testMotion('%_squares', ['%'], squares1.end, squares1.start);
+testMotion('%_braces', ['%'], curlys1.end, curlys1.start);
+testMotion('%_seek_outside', ['%'], seekOutside.end, seekOutside.start);
+testMotion('%_seek_inside', ['%'], seekInside.end, seekInside.start);
+testVim('%_seek_skip', function(cm, vim, helpers) {
+  cm.setCursor(0,0);
+  helpers.doKeys(['%']);
+  helpers.assertCursorAt(0,9);
+}, {value:'01234"("()'});
+testVim('%_skip_string', function(cm, vim, helpers) {
+  cm.setCursor(0,0);
+  helpers.doKeys(['%']);
+  helpers.assertCursorAt(0,4);
+  cm.setCursor(0,2);
+  helpers.doKeys(['%']);
+  helpers.assertCursorAt(0,0);
+}, {value:'(")")'});
+testVim('%_skip_comment', function(cm, vim, helpers) {
+  cm.setCursor(0,0);
+  helpers.doKeys(['%']);
+  helpers.assertCursorAt(0,6);
+  cm.setCursor(0,3);
+  helpers.doKeys(['%']);
+  helpers.assertCursorAt(0,0);
+}, {value:'(/*)*/)'});
+// Make sure that moving down after going to the end of a line always leaves you
+// at the end of a line, but preserves the offset in other cases
+testVim('Changing lines after Eol operation', function(cm, vim, helpers) {
+  cm.setCursor(0,0);
+  helpers.doKeys(['$']);
+  helpers.doKeys(['j']);
+  // After moving to Eol and then down, we should be at Eol of line 2
+  helpers.assertCursorAt({ line: 1, ch: lines[1].length - 1 });
+  helpers.doKeys(['j']);
+  // After moving down, we should be at Eol of line 3
+  helpers.assertCursorAt({ line: 2, ch: lines[2].length - 1 });
+  helpers.doKeys(['h']);
+  helpers.doKeys(['j']);
+  // After moving back one space and then down, since line 4 is shorter than line 2, we should
+  // be at Eol of line 2 - 1
+  helpers.assertCursorAt({ line: 3, ch: lines[3].length - 1 });
+  helpers.doKeys(['j']);
+  helpers.doKeys(['j']);
+  // After moving down again, since line 3 has enough characters, we should be back to the
+  // same place we were at on line 1
+  helpers.assertCursorAt({ line: 5, ch: lines[2].length - 2 });
+});
+//making sure gj and gk recover from clipping
+testVim('gj_gk_clipping', function(cm,vim,helpers){
+  cm.setCursor(0, 1);
+  helpers.doKeys('g','j','g','j');
+  helpers.assertCursorAt(2, 1);
+  helpers.doKeys('g','k','g','k');
+  helpers.assertCursorAt(0, 1);
+},{value: 'line 1\n\nline 2'});
+//testing a mix of j/k and gj/gk
+testVim('j_k_and_gj_gk', function(cm,vim,helpers){
+  cm.setSize(120);
+  cm.setCursor(0, 0);
+  //go to the last character on the first line
+  helpers.doKeys('$');
+  //move up/down on the column within the wrapped line
+  //side-effect: cursor is not locked to eol anymore
+  helpers.doKeys('g','k');
+  var cur=cm.getCursor();
+  eq(cur.line,0);
+  is((cur.ch<176),'gk didn\'t move cursor back (1)');
+  helpers.doKeys('g','j');
+  helpers.assertCursorAt(0, 176);
+  //should move to character 177 on line 2 (j/k preserve character index within line)
+  helpers.doKeys('j');
+  //due to different line wrapping, the cursor can be on a different screen-x now
+  //gj and gk preserve screen-x on movement, much like moveV
+  helpers.doKeys('3','g','k');
+  cur=cm.getCursor();
+  eq(cur.line,1);
+  is((cur.ch<176),'gk didn\'t move cursor back (2)');
+  helpers.doKeys('g','j','2','g','j');
+  //should return to the same character-index
+  helpers.doKeys('k');
+  helpers.assertCursorAt(0, 176);
+},{ lineWrapping:true, value: 'This line is intentially long to test movement of gj and gk over wrapped lines. I will start on the end of this line, then make a step up and back to set the origin for j and k.\nThis line is supposed to be even longer than the previous. I will jump here and make another wiggle with gj and gk, before I jump back to the line above. Both wiggles should not change my cursor\'s target character but both j/k and gj/gk change each other\'s reference position.'});
+testVim('gj_gk', function(cm, vim, helpers) {
+  if (phantom) return;
+  cm.setSize(120);
+  // Test top of document edge case.
+  cm.setCursor(0, 4);
+  helpers.doKeys('g', 'j');
+  helpers.doKeys('10', 'g', 'k');
+  helpers.assertCursorAt(0, 4);
+
+  // Test moving down preserves column position.
+  helpers.doKeys('g', 'j');
+  var pos1 = cm.getCursor();
+  var expectedPos2 = { line: 0, ch: (pos1.ch - 4) * 2 + 4};
+  helpers.doKeys('g', 'j');
+  helpers.assertCursorAt(expectedPos2);
+
+  // Move to the last character
+  cm.setCursor(0, 0);
+  // Move left to reset HSPos
+  helpers.doKeys('h');
+  // Test bottom of document edge case.
+  helpers.doKeys('100', 'g', 'j');
+  var endingPos = cm.getCursor();
+  is(endingPos != 0, 'gj should not be on wrapped line 0');
+  var topLeftCharCoords = cm.charCoords(makeCursor(0, 0));
+  var endingCharCoords = cm.charCoords(endingPos);
+  is(topLeftCharCoords.left == endingCharCoords.left, 'gj should end up on column 0');
+},{ lineNumbers: false, lineWrapping:true, value: 'Thislineisintentiallylongtotestmovementofgjandgkoverwrappedlines.' });
+testVim('}', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('}');
+  helpers.assertCursorAt(1, 0);
+  cm.setCursor(0, 0);
+  helpers.doKeys('2', '}');
+  helpers.assertCursorAt(4, 0);
+  cm.setCursor(0, 0);
+  helpers.doKeys('6', '}');
+  helpers.assertCursorAt(5, 0);
+}, { value: 'a\n\nb\nc\n\nd' });
+testVim('{', function(cm, vim, helpers) {
+  cm.setCursor(5, 0);
+  helpers.doKeys('{');
+  helpers.assertCursorAt(4, 0);
+  cm.setCursor(5, 0);
+  helpers.doKeys('2', '{');
+  helpers.assertCursorAt(1, 0);
+  cm.setCursor(5, 0);
+  helpers.doKeys('6', '{');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'a\n\nb\nc\n\nd' });
+testVim('paragraph_motions', function(cm, vim, helpers) {
+  cm.setCursor(10, 0);
+  helpers.doKeys('{');
+  helpers.assertCursorAt(4, 0);
+  helpers.doKeys('{');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('2', '}');
+  helpers.assertCursorAt(7, 0);
+  helpers.doKeys('2', '}');
+  helpers.assertCursorAt(16, 0);
+
+  cm.setCursor(9, 0);
+  helpers.doKeys('}');
+  helpers.assertCursorAt(14, 0);
+
+  cm.setCursor(6, 0);
+  helpers.doKeys('}');
+  helpers.assertCursorAt(7, 0);
+
+  // ip inside empty space
+  cm.setCursor(10, 0);
+  helpers.doKeys('v', 'i', 'p');
+  eqPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqPos(Pos(12, 0), cm.getCursor('head'));
+  helpers.doKeys('i', 'p');
+  eqPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqPos(Pos(13, 1), cm.getCursor('head'));
+  helpers.doKeys('2', 'i', 'p');
+  eqPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqPos(Pos(16, 1), cm.getCursor('head'));
+
+  // should switch to visualLine mode
+  cm.setCursor(14, 0);
+  helpers.doKeys('', 'v', 'i', 'p');
+  helpers.assertCursorAt(14, 0);
+
+  cm.setCursor(14, 0);
+  helpers.doKeys('', 'V', 'i', 'p');
+  eqPos(Pos(16, 1), cm.getCursor('head'));
+
+  // ap inside empty space
+  cm.setCursor(10, 0);
+  helpers.doKeys('', 'v', 'a', 'p');
+  eqPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqPos(Pos(13, 1), cm.getCursor('head'));
+  helpers.doKeys('a', 'p');
+  eqPos(Pos(7, 0), cm.getCursor('anchor'));
+  eqPos(Pos(16, 1), cm.getCursor('head'));
+
+  cm.setCursor(13, 0);
+  helpers.doKeys('v', 'a', 'p');
+  eqPos(Pos(13, 0), cm.getCursor('anchor'));
+  eqPos(Pos(14, 0), cm.getCursor('head'));
+
+  cm.setCursor(16, 0);
+  helpers.doKeys('v', 'a', 'p');
+  eqPos(Pos(14, 0), cm.getCursor('anchor'));
+  eqPos(Pos(16, 1), cm.getCursor('head'));
+
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', 'a', 'p');
+  eqPos(Pos(0, 0), cm.getCursor('anchor'));
+  eqPos(Pos(4, 0), cm.getCursor('head'));
+
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'i', 'p');
+  var register = helpers.getRegisterController().getRegister();
+  eq('a\na\n', register.toString());
+  is(register.linewise);
+  helpers.doKeys('3', 'j', 'p');
+  helpers.doKeys('y', 'i', 'p');
+  is(register.linewise);
+  eq('b\na\na\nc\n', register.toString());
+}, { value: 'a\na\n\n\n\nb\nc\n\n\n\n\n\n\nd\n\ne\nf' });
+
+// Operator tests
+testVim('dl', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 0);
+  cm.setCursor(curStart);
+  helpers.doKeys('d', 'l');
+  eq('word1 ', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq(' ', register.toString());
+  is(!register.linewise);
+  eqPos(curStart, cm.getCursor());
+}, { value: ' word1 ' });
+testVim('dl_eol', function(cm, vim, helpers) {
+  cm.setCursor(0, 6);
+  helpers.doKeys('d', 'l');
+  eq(' word1', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq(' ', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 5);
+}, { value: ' word1 ' });
+testVim('dl_repeat', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 0);
+  cm.setCursor(curStart);
+  helpers.doKeys('2', 'd', 'l');
+  eq('ord1 ', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq(' w', register.toString());
+  is(!register.linewise);
+  eqPos(curStart, cm.getCursor());
+}, { value: ' word1 ' });
+testVim('dh', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 3);
+  cm.setCursor(curStart);
+  helpers.doKeys('d', 'h');
+  eq(' wrd1 ', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('o', register.toString());
+  is(!register.linewise);
+  eqPos(offsetCursor(curStart, 0 , -1), cm.getCursor());
+}, { value: ' word1 ' });
+testVim('dj', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 3);
+  cm.setCursor(curStart);
+  helpers.doKeys('d', 'j');
+  eq(' word3', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq(' word1\nword2\n', register.toString());
+  is(register.linewise);
+  helpers.assertCursorAt(0, 1);
+}, { value: ' word1\nword2\n word3' });
+testVim('dj_end_of_document', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 3);
+  cm.setCursor(curStart);
+  helpers.doKeys('d', 'j');
+  eq('', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq(' word1 \n', register.toString());
+  is(register.linewise);
+  helpers.assertCursorAt(0, 0);
+}, { value: ' word1 ' });
+testVim('dk', function(cm, vim, helpers) {
+  var curStart = makeCursor(1, 3);
+  cm.setCursor(curStart);
+  helpers.doKeys('d', 'k');
+  eq(' word3', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq(' word1\nword2\n', register.toString());
+  is(register.linewise);
+  helpers.assertCursorAt(0, 1);
+}, { value: ' word1\nword2\n word3' });
+testVim('dk_start_of_document', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 3);
+  cm.setCursor(curStart);
+  helpers.doKeys('d', 'k');
+  eq('', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq(' word1 \n', register.toString());
+  is(register.linewise);
+  helpers.assertCursorAt(0, 0);
+}, { value: ' word1 ' });
+testVim('dw_space', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 0);
+  cm.setCursor(curStart);
+  helpers.doKeys('d', 'w');
+  eq('word1 ', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq(' ', register.toString());
+  is(!register.linewise);
+  eqPos(curStart, cm.getCursor());
+}, { value: ' word1 ' });
+testVim('dw_word', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 1);
+  cm.setCursor(curStart);
+  helpers.doKeys('d', 'w');
+  eq(' word2', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word1 ', register.toString());
+  is(!register.linewise);
+  eqPos(curStart, cm.getCursor());
+}, { value: ' word1 word2' });
+testVim('dw_unicode_word', function(cm, vim, helpers) {
+  helpers.doKeys('d', 'w');
+  eq(cm.getValue().length, 10);
+  helpers.doKeys('d', 'w');
+  eq(cm.getValue().length, 6);
+  helpers.doKeys('d', 'w');
+  eq(cm.getValue().length, 5);
+  helpers.doKeys('d', 'e');
+  eq(cm.getValue().length, 2);
+}, { value: '  \u0562\u0561\u0580\u0587\xbbe\xb5g  ' });
+testVim('dw_only_word', function(cm, vim, helpers) {
+  // Test that if there is only 1 word left, dw deletes till the end of the
+  // line.
+  cm.setCursor(0, 1);
+  helpers.doKeys('d', 'w');
+  eq(' ', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word1 ', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 0);
+}, { value: ' word1 ' });
+testVim('dw_eol', function(cm, vim, helpers) {
+  // Assert that dw does not delete the newline if last word to delete is at end
+  // of line.
+  cm.setCursor(0, 1);
+  helpers.doKeys('d', 'w');
+  eq(' \nword2', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word1', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 0);
+}, { value: ' word1\nword2' });
+testVim('dw_eol_with_multiple_newlines', function(cm, vim, helpers) {
+  // Assert that dw does not delete the newline if last word to delete is at end
+  // of line and it is followed by multiple newlines.
+  cm.setCursor(0, 1);
+  helpers.doKeys('d', 'w');
+  eq(' \n\nword2', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word1', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 0);
+}, { value: ' word1\n\nword2' });
+testVim('dw_empty_line_followed_by_whitespace', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('  \nword', cm.getValue());
+}, { value: '\n  \nword' });
+testVim('dw_empty_line_followed_by_word', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('word', cm.getValue());
+}, { value: '\nword' });
+testVim('dw_empty_line_followed_by_empty_line', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('\n', cm.getValue());
+}, { value: '\n\n' });
+testVim('dw_whitespace_followed_by_whitespace', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('\n   \n', cm.getValue());
+}, { value: '  \n   \n' });
+testVim('dw_whitespace_followed_by_empty_line', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('\n\n', cm.getValue());
+}, { value: '  \n\n' });
+testVim('dw_word_whitespace_word', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'w');
+  eq('\n   \nword2', cm.getValue());
+}, { value: 'word1\n   \nword2'})
+testVim('dw_end_of_document', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('d', 'w');
+  eq('\nab', cm.getValue());
+}, { value: '\nabc' });
+testVim('dw_repeat', function(cm, vim, helpers) {
+  // Assert that dw does delete newline if it should go to the next line, and
+  // that repeat works properly.
+  cm.setCursor(0, 1);
+  helpers.doKeys('d', '2', 'w');
+  eq(' ', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word1\nword2', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 0);
+}, { value: ' word1\nword2' });
+testVim('de_word_start_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'e');
+  eq('\n\n', cm.getValue());
+}, { value: 'word\n\n' });
+testVim('de_word_end_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  helpers.doKeys('d', 'e');
+  eq('wor', cm.getValue());
+}, { value: 'word\n\n\n' });
+testVim('de_whitespace_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'e');
+  eq('', cm.getValue());
+}, { value: '   \n\n\n' });
+testVim('de_end_of_document', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('d', 'e');
+  eq('\nab', cm.getValue());
+}, { value: '\nabc' });
+testVim('db_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('d', 'b');
+  eq('\n\n', cm.getValue());
+}, { value: '\n\n\n' });
+testVim('db_word_start_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('d', 'b');
+  eq('\nword', cm.getValue());
+}, { value: '\n\nword' });
+testVim('db_word_end_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(2, 3);
+  helpers.doKeys('d', 'b');
+  eq('\n\nd', cm.getValue());
+}, { value: '\n\nword' });
+testVim('db_whitespace_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('d', 'b');
+  eq('', cm.getValue());
+}, { value: '\n   \n' });
+testVim('db_start_of_document', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'b');
+  eq('abc\n', cm.getValue());
+}, { value: 'abc\n' });
+testVim('dge_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doKeys('d', 'g', 'e');
+  // Note: In real VIM the result should be '', but it's not quite consistent,
+  // since 2 newlines are deleted. But in the similar case of word\n\n, only
+  // 1 newline is deleted. We'll diverge from VIM's behavior since it's much
+  // easier this way.
+  eq('\n', cm.getValue());
+}, { value: '\n\n' });
+testVim('dge_word_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doKeys('d', 'g', 'e');
+  eq('wor\n', cm.getValue());
+}, { value: 'word\n\n'});
+testVim('dge_whitespace_and_empty_lines', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('d', 'g', 'e');
+  eq('', cm.getValue());
+}, { value: '\n  \n' });
+testVim('dge_start_of_document', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', 'g', 'e');
+  eq('bc\n', cm.getValue());
+}, { value: 'abc\n' });
+testVim('d_inclusive', function(cm, vim, helpers) {
+  // Assert that when inclusive is set, the character the cursor is on gets
+  // deleted too.
+  var curStart = makeCursor(0, 1);
+  cm.setCursor(curStart);
+  helpers.doKeys('d', 'e');
+  eq('  ', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word1', register.toString());
+  is(!register.linewise);
+  eqPos(curStart, cm.getCursor());
+}, { value: ' word1 ' });
+testVim('d_reverse', function(cm, vim, helpers) {
+  // Test that deleting in reverse works.
+  cm.setCursor(1, 0);
+  helpers.doKeys('d', 'b');
+  eq(' word2 ', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word1\n', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 1);
+}, { value: ' word1\nword2 ' });
+testVim('dd', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
+    { line: 1, ch: 0 });
+  var expectedLineCount = cm.lineCount() - 1;
+  helpers.doKeys('d', 'd');
+  eq(expectedLineCount, cm.lineCount());
+  var register = helpers.getRegisterController().getRegister();
+  eq(expectedBuffer, register.toString());
+  is(register.linewise);
+  helpers.assertCursorAt(0, lines[1].textStart);
+});
+testVim('dd_prefix_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
+    { line: 2, ch: 0 });
+  var expectedLineCount = cm.lineCount() - 2;
+  helpers.doKeys('2', 'd', 'd');
+  eq(expectedLineCount, cm.lineCount());
+  var register = helpers.getRegisterController().getRegister();
+  eq(expectedBuffer, register.toString());
+  is(register.linewise);
+  helpers.assertCursorAt(0, lines[2].textStart);
+});
+testVim('dd_motion_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
+    { line: 2, ch: 0 });
+  var expectedLineCount = cm.lineCount() - 2;
+  helpers.doKeys('d', '2', 'd');
+  eq(expectedLineCount, cm.lineCount());
+  var register = helpers.getRegisterController().getRegister();
+  eq(expectedBuffer, register.toString());
+  is(register.linewise);
+  helpers.assertCursorAt(0, lines[2].textStart);
+});
+testVim('dd_multiply_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
+    { line: 6, ch: 0 });
+  var expectedLineCount = cm.lineCount() - 6;
+  helpers.doKeys('2', 'd', '3', 'd');
+  eq(expectedLineCount, cm.lineCount());
+  var register = helpers.getRegisterController().getRegister();
+  eq(expectedBuffer, register.toString());
+  is(register.linewise);
+  helpers.assertCursorAt(0, lines[6].textStart);
+});
+testVim('dd_lastline', function(cm, vim, helpers) {
+  cm.setCursor(cm.lineCount(), 0);
+  var expectedLineCount = cm.lineCount() - 1;
+  helpers.doKeys('d', 'd');
+  eq(expectedLineCount, cm.lineCount());
+  helpers.assertCursorAt(cm.lineCount() - 1, 0);
+});
+testVim('dd_only_line', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  var expectedRegister = cm.getValue() + "\n";
+  helpers.doKeys('d','d');
+  eq(1, cm.lineCount());
+  eq('', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq(expectedRegister, register.toString());
+}, { value: "thisistheonlyline" });
+// Yank commands should behave the exact same as d commands, expect that nothing
+// gets deleted.
+testVim('yw_repeat', function(cm, vim, helpers) {
+  // Assert that yw does yank newline if it should go to the next line, and
+  // that repeat works properly.
+  var curStart = makeCursor(0, 1);
+  cm.setCursor(curStart);
+  helpers.doKeys('y', '2', 'w');
+  eq(' word1\nword2', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word1\nword2', register.toString());
+  is(!register.linewise);
+  eqPos(curStart, cm.getCursor());
+}, { value: ' word1\nword2' });
+testVim('yy_multiply_repeat', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 3);
+  cm.setCursor(curStart);
+  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
+    { line: 6, ch: 0 });
+  var expectedLineCount = cm.lineCount();
+  helpers.doKeys('2', 'y', '3', 'y');
+  eq(expectedLineCount, cm.lineCount());
+  var register = helpers.getRegisterController().getRegister();
+  eq(expectedBuffer, register.toString());
+  is(register.linewise);
+  eqPos(curStart, cm.getCursor());
+});
+// Change commands behave like d commands except that it also enters insert
+// mode. In addition, when the change is linewise, an additional newline is
+// inserted so that insert mode starts on that line.
+testVim('cw', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('c', '2', 'w');
+  eq(' word3', cm.getValue());
+  helpers.assertCursorAt(0, 0);
+}, { value: 'word1 word2 word3'});
+testVim('cw_repeat', function(cm, vim, helpers) {
+  // Assert that cw does delete newline if it should go to the next line, and
+  // that repeat works properly.
+  var curStart = makeCursor(0, 1);
+  cm.setCursor(curStart);
+  helpers.doKeys('c', '2', 'w');
+  eq(' ', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('word1\nword2', register.toString());
+  is(!register.linewise);
+  eqPos(curStart, cm.getCursor());
+  eq('vim-insert', cm.getOption('keyMap'));
+}, { value: ' word1\nword2' });
+testVim('cc_multiply_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
+    { line: 6, ch: 0 });
+  var expectedLineCount = cm.lineCount() - 5;
+  helpers.doKeys('2', 'c', '3', 'c');
+  eq(expectedLineCount, cm.lineCount());
+  var register = helpers.getRegisterController().getRegister();
+  eq(expectedBuffer, register.toString());
+  is(register.linewise);
+  eq('vim-insert', cm.getOption('keyMap'));
+});
+testVim('ct', function(cm, vim, helpers) {
+  cm.setCursor(0, 9);
+  helpers.doKeys('c', 't', 'w');
+  eq('  word1  word3', cm.getValue());
+  helpers.doKeys('', 'c', '|');
+  eq(' word3', cm.getValue());
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('', '2', 'u', 'w', 'h');
+  helpers.doKeys('c', '2', 'g', 'e');
+  eq('  wordword3', cm.getValue());
+}, { value: '  word1  word2  word3'});
+testVim('cc_should_not_append_to_document', function(cm, vim, helpers) {
+  var expectedLineCount = cm.lineCount();
+  cm.setCursor(cm.lastLine(), 0);
+  helpers.doKeys('c', 'c');
+  eq(expectedLineCount, cm.lineCount());
+});
+function fillArray(val, times) {
+  var arr = [];
+  for (var i = 0; i < times; i++) {
+    arr.push(val);
+  }
+  return arr;
+}
+testVim('c_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('', '2', 'j', 'l', 'l', 'l', 'c');
+  var replacement = fillArray('hello', 3);
+  cm.replaceSelections(replacement);
+  eq('1hello\n5hello\nahellofg', cm.getValue());
+  helpers.doKeys('');
+  cm.setCursor(2, 3);
+  helpers.doKeys('', '2', 'k', 'h', 'C');
+  replacement = fillArray('world', 3);
+  cm.replaceSelections(replacement);
+  eq('1hworld\n5hworld\nahworld', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+testVim('c_visual_block_replay', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('', '2', 'j', 'l', 'c');
+  var replacement = fillArray('fo', 3);
+  cm.replaceSelections(replacement);
+  eq('1fo4\n5fo8\nafodefg', cm.getValue());
+  helpers.doKeys('');
+  cm.setCursor(0, 0);
+  helpers.doKeys('.');
+  eq('foo4\nfoo8\nfoodefg', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+
+testVim('d_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('', '2', 'j', 'l', 'l', 'l', 'd');
+  eq('1\n5\nafg', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+testVim('D_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('', '2', 'j', 'l', 'D');
+  eq('1\n5\na', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+
+testVim('s_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('', '2', 'j', 'l', 'l', 'l', 's');
+  var replacement = fillArray('hello{', 3);
+  cm.replaceSelections(replacement);
+  eq('1hello{\n5hello{\nahello{fg\n', cm.getValue());
+  helpers.doKeys('');
+  cm.setCursor(2, 3);
+  helpers.doKeys('', '1', 'k', 'h', 'S');
+  replacement = fillArray('world', 1);
+  cm.replaceSelections(replacement);
+  eq('1hello{\n  world\n', cm.getValue());
+}, {value: '1234\n5678\nabcdefg\n'});
+
+// Swapcase commands edit in place and do not modify registers.
+testVim('g~w_repeat', function(cm, vim, helpers) {
+  // Assert that dw does delete newline if it should go to the next line, and
+  // that repeat works properly.
+  var curStart = makeCursor(0, 1);
+  cm.setCursor(curStart);
+  helpers.doKeys('g', '~', '2', 'w');
+  eq(' WORD1\nWORD2', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('', register.toString());
+  is(!register.linewise);
+  eqPos(curStart, cm.getCursor());
+}, { value: ' word1\nword2' });
+testVim('g~g~', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 3);
+  cm.setCursor(curStart);
+  var expectedLineCount = cm.lineCount();
+  var expectedValue = cm.getValue().toUpperCase();
+  helpers.doKeys('2', 'g', '~', '3', 'g', '~');
+  eq(expectedValue, cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('', register.toString());
+  is(!register.linewise);
+  eqPos(curStart, cm.getCursor());
+}, { value: ' word1\nword2\nword3\nword4\nword5\nword6' });
+testVim('gu_and_gU', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 7);
+  var value = cm.getValue();
+  cm.setCursor(curStart);
+  helpers.doKeys('2', 'g', 'U', 'w');
+  eq(cm.getValue(), 'wa wb xX WC wd');
+  eqPos(curStart, cm.getCursor());
+  helpers.doKeys('2', 'g', 'u', 'w');
+  eq(cm.getValue(), value);
+
+  helpers.doKeys('2', 'g', 'U', 'B');
+  eq(cm.getValue(), 'wa WB Xx wc wd');
+  eqPos(makeCursor(0, 3), cm.getCursor());
+
+  cm.setCursor(makeCursor(0, 4));
+  helpers.doKeys('g', 'u', 'i', 'w');
+  eq(cm.getValue(), 'wa wb Xx wc wd');
+  eqPos(makeCursor(0, 3), cm.getCursor());
+
+  // TODO: support gUgU guu
+  // eqPos(makeCursor(0, 0), cm.getCursor());
+
+  var register = helpers.getRegisterController().getRegister();
+  eq('', register.toString());
+  is(!register.linewise);
+}, { value: 'wa wb xx wc wd' });
+testVim('visual_block_~', function(cm, vim, helpers) {
+  cm.setCursor(1, 1);
+  helpers.doKeys('', 'l', 'l', 'j', '~');
+  helpers.assertCursorAt(1, 1);
+  eq('hello\nwoRLd\naBCDe', cm.getValue());
+  cm.setCursor(2, 0);
+  helpers.doKeys('v', 'l', 'l', '~');
+  helpers.assertCursorAt(2, 0);
+  eq('hello\nwoRLd\nAbcDe', cm.getValue());
+},{value: 'hello\nwOrld\nabcde' });
+testVim('._swapCase_visualBlock', function(cm, vim, helpers) {
+  helpers.doKeys('', 'j', 'j', 'l', '~');
+  cm.setCursor(0, 3);
+  helpers.doKeys('.');
+  eq('HelLO\nWorLd\nAbcdE', cm.getValue());
+},{value: 'hEllo\nwOrlD\naBcDe' });
+testVim('._delete_visualBlock', function(cm, vim, helpers) {
+  helpers.doKeys('', 'j', 'x');
+  eq('ive\ne\nsome\nsugar', cm.getValue());
+  helpers.doKeys('.');
+  eq('ve\n\nsome\nsugar', cm.getValue());
+  helpers.doKeys('j', 'j', '.');
+  eq('ve\n\nome\nugar', cm.getValue());
+  helpers.doKeys('u', '', '.');
+  eq('ve\n\nme\ngar', cm.getValue());
+},{value: 'give\nme\nsome\nsugar' });
+testVim('>{motion}', function(cm, vim, helpers) {
+  cm.setCursor(1, 3);
+  var expectedLineCount = cm.lineCount();
+  var expectedValue = '   word1\n  word2\nword3 ';
+  helpers.doKeys('>', 'k');
+  eq(expectedValue, cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 3);
+}, { value: ' word1\nword2\nword3 ', indentUnit: 2 });
+testVim('>>', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  var expectedLineCount = cm.lineCount();
+  var expectedValue = '   word1\n  word2\nword3 ';
+  helpers.doKeys('2', '>', '>');
+  eq(expectedValue, cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 3);
+}, { value: ' word1\nword2\nword3 ', indentUnit: 2 });
+testVim('<{motion}', function(cm, vim, helpers) {
+  cm.setCursor(1, 3);
+  var expectedLineCount = cm.lineCount();
+  var expectedValue = ' word1\nword2\nword3 ';
+  helpers.doKeys('<', 'k');
+  eq(expectedValue, cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 1);
+}, { value: '   word1\n  word2\nword3 ', indentUnit: 2 });
+testVim('<<', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  var expectedLineCount = cm.lineCount();
+  var expectedValue = ' word1\nword2\nword3 ';
+  helpers.doKeys('2', '<', '<');
+  eq(expectedValue, cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 1);
+}, { value: '   word1\n  word2\nword3 ', indentUnit: 2 });
+
+// Edit tests
+function testEdit(name, before, pos, edit, after) {
+  return testVim(name, function(cm, vim, helpers) {
+             var ch = before.search(pos)
+             var line = before.substring(0, ch).split('\n').length - 1;
+             if (line) {
+               ch = before.substring(0, ch).split('\n').pop().length;
+             }
+             cm.setCursor(line, ch);
+             helpers.doKeys.apply(this, edit.split(''));
+             eq(after, cm.getValue());
+           }, {value: before});
+}
+
+// These Delete tests effectively cover word-wise Change, Visual & Yank.
+// Tabs are used as differentiated whitespace to catch edge cases.
+// Normal word:
+testEdit('diw_mid_spc', 'foo \tbAr\t baz', /A/, 'diw', 'foo \t\t baz');
+testEdit('daw_mid_spc', 'foo \tbAr\t baz', /A/, 'daw', 'foo \tbaz');
+testEdit('diw_mid_punct', 'foo \tbAr.\t baz', /A/, 'diw', 'foo \t.\t baz');
+testEdit('daw_mid_punct', 'foo \tbAr.\t baz', /A/, 'daw', 'foo.\t baz');
+testEdit('diw_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'diw', 'foo \t,.\t baz');
+testEdit('daw_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'daw', 'foo \t,.\t baz');
+testEdit('diw_start_spc', 'bAr \tbaz', /A/, 'diw', ' \tbaz');
+testEdit('daw_start_spc', 'bAr \tbaz', /A/, 'daw', 'baz');
+testEdit('diw_start_punct', 'bAr. \tbaz', /A/, 'diw', '. \tbaz');
+testEdit('daw_start_punct', 'bAr. \tbaz', /A/, 'daw', '. \tbaz');
+testEdit('diw_end_spc', 'foo \tbAr', /A/, 'diw', 'foo \t');
+testEdit('daw_end_spc', 'foo \tbAr', /A/, 'daw', 'foo');
+testEdit('diw_end_punct', 'foo \tbAr.', /A/, 'diw', 'foo \t.');
+testEdit('daw_end_punct', 'foo \tbAr.', /A/, 'daw', 'foo.');
+// Big word:
+testEdit('diW_mid_spc', 'foo \tbAr\t baz', /A/, 'diW', 'foo \t\t baz');
+testEdit('daW_mid_spc', 'foo \tbAr\t baz', /A/, 'daW', 'foo \tbaz');
+testEdit('diW_mid_punct', 'foo \tbAr.\t baz', /A/, 'diW', 'foo \t\t baz');
+testEdit('daW_mid_punct', 'foo \tbAr.\t baz', /A/, 'daW', 'foo \tbaz');
+testEdit('diW_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'diW', 'foo \t\t baz');
+testEdit('daW_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'daW', 'foo \tbaz');
+testEdit('diW_start_spc', 'bAr\t baz', /A/, 'diW', '\t baz');
+testEdit('daW_start_spc', 'bAr\t baz', /A/, 'daW', 'baz');
+testEdit('diW_start_punct', 'bAr.\t baz', /A/, 'diW', '\t baz');
+testEdit('daW_start_punct', 'bAr.\t baz', /A/, 'daW', 'baz');
+testEdit('diW_end_spc', 'foo \tbAr', /A/, 'diW', 'foo \t');
+testEdit('daW_end_spc', 'foo \tbAr', /A/, 'daW', 'foo');
+testEdit('diW_end_punct', 'foo \tbAr.', /A/, 'diW', 'foo \t');
+testEdit('daW_end_punct', 'foo \tbAr.', /A/, 'daW', 'foo');
+// Deleting text objects
+//    Open and close on same line
+testEdit('di(_open_spc', 'foo (bAr) baz', /\(/, 'di(', 'foo () baz');
+testEdit('di)_open_spc', 'foo (bAr) baz', /\(/, 'di)', 'foo () baz');
+testEdit('dib_open_spc', 'foo (bAr) baz', /\(/, 'dib', 'foo () baz');
+testEdit('da(_open_spc', 'foo (bAr) baz', /\(/, 'da(', 'foo  baz');
+testEdit('da)_open_spc', 'foo (bAr) baz', /\(/, 'da)', 'foo  baz');
+
+testEdit('di(_middle_spc', 'foo (bAr) baz', /A/, 'di(', 'foo () baz');
+testEdit('di)_middle_spc', 'foo (bAr) baz', /A/, 'di)', 'foo () baz');
+testEdit('da(_middle_spc', 'foo (bAr) baz', /A/, 'da(', 'foo  baz');
+testEdit('da)_middle_spc', 'foo (bAr) baz', /A/, 'da)', 'foo  baz');
+
+testEdit('di(_close_spc', 'foo (bAr) baz', /\)/, 'di(', 'foo () baz');
+testEdit('di)_close_spc', 'foo (bAr) baz', /\)/, 'di)', 'foo () baz');
+testEdit('da(_close_spc', 'foo (bAr) baz', /\)/, 'da(', 'foo  baz');
+testEdit('da)_close_spc', 'foo (bAr) baz', /\)/, 'da)', 'foo  baz');
+
+//  delete around and inner b.
+testEdit('dab_on_(_should_delete_around_()block', 'o( in(abc) )', /\(a/, 'dab', 'o( in )');
+
+//  delete around and inner B.
+testEdit('daB_on_{_should_delete_around_{}block', 'o{ in{abc} }', /{a/, 'daB', 'o{ in }');
+testEdit('diB_on_{_should_delete_inner_{}block', 'o{ in{abc} }', /{a/, 'diB', 'o{ in{} }');
+
+testEdit('da{_on_{_should_delete_inner_block', 'o{ in{abc} }', /{a/, 'da{', 'o{ in }');
+testEdit('di[_on_(_should_not_delete', 'foo (bAr) baz', /\(/, 'di[', 'foo (bAr) baz');
+testEdit('di[_on_)_should_not_delete', 'foo (bAr) baz', /\)/, 'di[', 'foo (bAr) baz');
+testEdit('da[_on_(_should_not_delete', 'foo (bAr) baz', /\(/, 'da[', 'foo (bAr) baz');
+testEdit('da[_on_)_should_not_delete', 'foo (bAr) baz', /\)/, 'da[', 'foo (bAr) baz');
+testMotion('di(_outside_should_stay', ['d', 'i', '('], { line: 0, ch: 0}, { line: 0, ch: 0});
+
+//  Open and close on different lines, equally indented
+testEdit('di{_middle_spc', 'a{\n\tbar\n}b', /r/, 'di{', 'a{}b');
+testEdit('di}_middle_spc', 'a{\n\tbar\n}b', /r/, 'di}', 'a{}b');
+testEdit('da{_middle_spc', 'a{\n\tbar\n}b', /r/, 'da{', 'ab');
+testEdit('da}_middle_spc', 'a{\n\tbar\n}b', /r/, 'da}', 'ab');
+testEdit('daB_middle_spc', 'a{\n\tbar\n}b', /r/, 'daB', 'ab');
+
+// open and close on diff lines, open indented less than close
+testEdit('di{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di{', 'a{}b');
+testEdit('di}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di}', 'a{}b');
+testEdit('da{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da{', 'ab');
+testEdit('da}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da}', 'ab');
+
+// open and close on diff lines, open indented more than close
+testEdit('di[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di[', 'a\t[]b');
+testEdit('di]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di]', 'a\t[]b');
+testEdit('da[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da[', 'a\tb');
+testEdit('da]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da]', 'a\tb');
+
+function testSelection(name, before, pos, keys, sel) {
+  return testVim(name, function(cm, vim, helpers) {
+             var ch = before.search(pos)
+             var line = before.substring(0, ch).split('\n').length - 1;
+             if (line) {
+               ch = before.substring(0, ch).split('\n').pop().length;
+             }
+             cm.setCursor(line, ch);
+             helpers.doKeys.apply(this, keys.split(''));
+             eq(sel, cm.getSelection());
+           }, {value: before});
+}
+testSelection('viw_middle_spc', 'foo \tbAr\t baz', /A/, 'viw', 'bAr');
+testSelection('vaw_middle_spc', 'foo \tbAr\t baz', /A/, 'vaw', 'bAr\t ');
+testSelection('viw_middle_punct', 'foo \tbAr,\t baz', /A/, 'viw', 'bAr');
+testSelection('vaW_middle_punct', 'foo \tbAr,\t baz', /A/, 'vaW', 'bAr,\t ');
+testSelection('viw_start_spc', 'foo \tbAr\t baz', /b/, 'viw', 'bAr');
+testSelection('viw_end_spc', 'foo \tbAr\t baz', /r/, 'viw', 'bAr');
+testSelection('viw_eol', 'foo \tbAr', /r/, 'viw', 'bAr');
+testSelection('vi{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'vi{', '\n\tbar\n\t');
+testSelection('va{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'va{', '{\n\tbar\n\t}');
+
+testVim('mouse_select', function(cm, vim, helpers) {
+  cm.setSelection(Pos(0, 2), Pos(0, 4), {origin: '*mouse'});
+  is(cm.state.vim.visualMode);
+  is(!cm.state.vim.visualLine);
+  is(!cm.state.vim.visualBlock);
+  helpers.doKeys('');
+  is(!cm.somethingSelected());
+  helpers.doKeys('g', 'v');
+  eq('cd', cm.getSelection());
+}, {value: 'abcdef'});
+
+// Operator-motion tests
+testVim('D', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  helpers.doKeys('D');
+  eq(' wo\nword2\n word3', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('rd1', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 2);
+}, { value: ' word1\nword2\n word3' });
+testVim('C', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 3);
+  cm.setCursor(curStart);
+  helpers.doKeys('C');
+  eq(' wo\nword2\n word3', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('rd1', register.toString());
+  is(!register.linewise);
+  eqPos(curStart, cm.getCursor());
+  eq('vim-insert', cm.getOption('keyMap'));
+}, { value: ' word1\nword2\n word3' });
+testVim('Y', function(cm, vim, helpers) {
+  var curStart = makeCursor(0, 3);
+  cm.setCursor(curStart);
+  helpers.doKeys('Y');
+  eq(' word1\nword2\n word3', cm.getValue());
+  var register = helpers.getRegisterController().getRegister();
+  eq('rd1', register.toString());
+  is(!register.linewise);
+  helpers.assertCursorAt(0, 3);
+}, { value: ' word1\nword2\n word3' });
+testVim('~', function(cm, vim, helpers) {
+  helpers.doKeys('3', '~');
+  eq('ABCdefg', cm.getValue());
+  helpers.assertCursorAt(0, 3);
+}, { value: 'abcdefg' });
+
+// Action tests
+testVim('ctrl-a', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('');
+  eq('-9', cm.getValue());
+  helpers.assertCursorAt(0, 1);
+  helpers.doKeys('2','');
+  eq('-7', cm.getValue());
+}, {value: '-10'});
+testVim('ctrl-x', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('');
+  eq('-1', cm.getValue());
+  helpers.assertCursorAt(0, 1);
+  helpers.doKeys('2','');
+  eq('-3', cm.getValue());
+}, {value: '0'});
+testVim('/ search forward', function(cm, vim, helpers) {
+  forEach(['', ''], function(key) {
+    cm.setCursor(0, 0);
+    helpers.doKeys(key);
+    helpers.assertCursorAt(0, 5);
+    helpers.doKeys('l');
+    helpers.doKeys(key);
+    helpers.assertCursorAt(0, 10);
+    cm.setCursor(0, 11);
+    helpers.doKeys(key);
+    helpers.assertCursorAt(0, 11);
+  });
+}, {value: '__jmp1 jmp2 jmp'});
+testVim('a', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('a');
+  helpers.assertCursorAt(0, 2);
+  eq('vim-insert', cm.getOption('keyMap'));
+});
+testVim('a_eol', function(cm, vim, helpers) {
+  cm.setCursor(0, lines[0].length - 1);
+  helpers.doKeys('a');
+  helpers.assertCursorAt(0, lines[0].length);
+  eq('vim-insert', cm.getOption('keyMap'));
+});
+testVim('A_endOfSelectedArea', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', 'j', 'l');
+  helpers.doKeys('A');
+  helpers.assertCursorAt(1, 2);
+  eq('vim-insert', cm.getOption('keyMap'));
+}, {value: 'foo\nbar'});
+testVim('i', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('i');
+  helpers.assertCursorAt(0, 1);
+  eq('vim-insert', cm.getOption('keyMap'));
+});
+testVim('i_repeat', function(cm, vim, helpers) {
+  helpers.doKeys('3', 'i');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('');
+  eq('testtesttest', cm.getValue());
+  helpers.assertCursorAt(0, 11);
+}, { value: '' });
+testVim('i_repeat_delete', function(cm, vim, helpers) {
+  cm.setCursor(0, 4);
+  helpers.doKeys('2', 'i');
+  cm.replaceRange('z', cm.getCursor());
+  helpers.doInsertModeKeys('Backspace', 'Backspace');
+  helpers.doKeys('');
+  eq('abe', cm.getValue());
+  helpers.assertCursorAt(0, 1);
+}, { value: 'abcde' });
+testVim('A', function(cm, vim, helpers) {
+  helpers.doKeys('A');
+  helpers.assertCursorAt(0, lines[0].length);
+  eq('vim-insert', cm.getOption('keyMap'));
+});
+testVim('A_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('', '2', 'j', 'l', 'l', 'A');
+  var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
+  replacement.pop();
+  cm.replaceSelections(replacement);
+  eq('testhello\nmehello\npleahellose', cm.getValue());
+  helpers.doKeys('');
+  cm.setCursor(0, 0);
+  helpers.doKeys('.');
+  // TODO this doesn't work yet
+  // eq('teshellothello\nme hello hello\nplehelloahellose', cm.getValue());
+}, {value: 'test\nme\nplease'});
+testVim('I', function(cm, vim, helpers) {
+  cm.setCursor(0, 4);
+  helpers.doKeys('I');
+  helpers.assertCursorAt(0, lines[0].textStart);
+  eq('vim-insert', cm.getOption('keyMap'));
+});
+testVim('I_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('3', 'I');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('');
+  eq('testtesttestblah', cm.getValue());
+  helpers.assertCursorAt(0, 11);
+}, { value: 'blah' });
+testVim('I_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('', '2', 'j', 'l', 'l', 'I');
+  var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
+  replacement.pop();
+  cm.replaceSelections(replacement);
+  eq('hellotest\nhellome\nhelloplease', cm.getValue());
+}, {value: 'test\nme\nplease'});
+testVim('o', function(cm, vim, helpers) {
+  cm.setCursor(0, 4);
+  helpers.doKeys('o');
+  eq('word1\n\nword2', cm.getValue());
+  helpers.assertCursorAt(1, 0);
+  eq('vim-insert', cm.getOption('keyMap'));
+}, { value: 'word1\nword2' });
+testVim('o_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('3', 'o');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('');
+  eq('\ntest\ntest\ntest', cm.getValue());
+  helpers.assertCursorAt(3, 3);
+}, { value: '' });
+testVim('O', function(cm, vim, helpers) {
+  cm.setCursor(0, 4);
+  helpers.doKeys('O');
+  eq('\nword1\nword2', cm.getValue());
+  helpers.assertCursorAt(0, 0);
+  eq('vim-insert', cm.getOption('keyMap'));
+}, { value: 'word1\nword2' });
+testVim('J', function(cm, vim, helpers) {
+  cm.setCursor(0, 4);
+  helpers.doKeys('J');
+  var expectedValue = 'word1  word2\nword3\n word4';
+  eq(expectedValue, cm.getValue());
+  helpers.assertCursorAt(0, expectedValue.indexOf('word2') - 1);
+}, { value: 'word1 \n    word2\nword3\n word4' });
+testVim('J_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 4);
+  helpers.doKeys('3', 'J');
+  var expectedValue = 'word1  word2 word3\n word4';
+  eq(expectedValue, cm.getValue());
+  helpers.assertCursorAt(0, expectedValue.indexOf('word3') - 1);
+}, { value: 'word1 \n    word2\nword3\n word4' });
+testVim('p', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.getRegisterController().pushText('"', 'yank', 'abc\ndef', false);
+  helpers.doKeys('p');
+  eq('__abc\ndef_', cm.getValue());
+  helpers.assertCursorAt(1, 2);
+}, { value: '___' });
+testVim('p_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.getRegisterController().getRegister('a').setText('abc\ndef', false);
+  helpers.doKeys('"', 'a', 'p');
+  eq('__abc\ndef_', cm.getValue());
+  helpers.assertCursorAt(1, 2);
+}, { value: '___' });
+testVim('p_wrong_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.getRegisterController().getRegister('a').setText('abc\ndef', false);
+  helpers.doKeys('p');
+  eq('___', cm.getValue());
+  helpers.assertCursorAt(0, 1);
+}, { value: '___' });
+testVim('p_line', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.getRegisterController().pushText('"', 'yank', '  a\nd\n', true);
+  helpers.doKeys('2', 'p');
+  eq('___\n  a\nd\n  a\nd', cm.getValue());
+  helpers.assertCursorAt(1, 2);
+}, { value: '___' });
+testVim('p_lastline', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.getRegisterController().pushText('"', 'yank', '  a\nd', true);
+  helpers.doKeys('2', 'p');
+  eq('___\n  a\nd\n  a\nd', cm.getValue());
+  helpers.assertCursorAt(1, 2);
+}, { value: '___' });
+testVim(']p_first_indent_is_smaller', function(cm, vim, helpers) {
+  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
+  helpers.doKeys(']', 'p');
+  eq('  ___\n  abc\n    def', cm.getValue());
+}, { value: '  ___' });
+testVim(']p_first_indent_is_larger', function(cm, vim, helpers) {
+  helpers.getRegisterController().pushText('"', 'yank', '    abc\n  def\n', true);
+  helpers.doKeys(']', 'p');
+  eq('  ___\n  abc\ndef', cm.getValue());
+}, { value: '  ___' });
+testVim(']p_with_tab_indents', function(cm, vim, helpers) {
+  helpers.getRegisterController().pushText('"', 'yank', '\t\tabc\n\t\t\tdef\n', true);
+  helpers.doKeys(']', 'p');
+  eq('\t___\n\tabc\n\t\tdef', cm.getValue());
+}, { value: '\t___', indentWithTabs: true});
+testVim(']p_with_spaces_translated_to_tabs', function(cm, vim, helpers) {
+  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
+  helpers.doKeys(']', 'p');
+  eq('\t___\n\tabc\n\t\tdef', cm.getValue());
+}, { value: '\t___', indentWithTabs: true, tabSize: 2 });
+testVim('[p', function(cm, vim, helpers) {
+  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
+  helpers.doKeys('[', 'p');
+  eq('  abc\n    def\n  ___', cm.getValue());
+}, { value: '  ___' });
+testVim('P', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.getRegisterController().pushText('"', 'yank', 'abc\ndef', false);
+  helpers.doKeys('P');
+  eq('_abc\ndef__', cm.getValue());
+  helpers.assertCursorAt(1, 3);
+}, { value: '___' });
+testVim('P_line', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.getRegisterController().pushText('"', 'yank', '  a\nd\n', true);
+  helpers.doKeys('2', 'P');
+  eq('  a\nd\n  a\nd\n___', cm.getValue());
+  helpers.assertCursorAt(0, 2);
+}, { value: '___' });
+testVim('r', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('3', 'r', 'u');
+  eq('wuuuet\nanother', cm.getValue(),'3r failed');
+  helpers.assertCursorAt(0, 3);
+  cm.setCursor(0, 4);
+  helpers.doKeys('v', 'j', 'h', 'r', '');
+  eq('wuuu  \n    her', cm.getValue(),'Replacing selection by space-characters failed');
+}, { value: 'wordet\nanother' });
+testVim('r_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(2, 3);
+  helpers.doKeys('', 'k', 'k', 'h', 'h', 'r', 'l');
+  eq('1lll\n5lll\nalllefg', cm.getValue());
+  helpers.doKeys('', 'l', 'j', 'r', '');
+  eq('1  l\n5  l\nalllefg', cm.getValue());
+  cm.setCursor(2, 0);
+  helpers.doKeys('o');
+  helpers.doKeys('');
+  cm.replaceRange('\t\t', cm.getCursor());
+  helpers.doKeys('', 'h', 'h', 'r', 'r');
+  eq('1  l\n5  l\nalllefg\nrrrrrrrr', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+testVim('R', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('R');
+  helpers.assertCursorAt(0, 1);
+  eq('vim-replace', cm.getOption('keyMap'));
+  is(cm.state.overwrite, 'Setting overwrite state failed');
+});
+testVim('mark', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 't');
+  cm.setCursor(0, 0);
+  helpers.doKeys('`', 't');
+  helpers.assertCursorAt(2, 2);
+  cm.setCursor(2, 0);
+  cm.replaceRange('   h', cm.getCursor());
+  cm.setCursor(0, 0);
+  helpers.doKeys('\'', 't');
+  helpers.assertCursorAt(2, 3);
+});
+testVim('jumpToMark_next', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 't');
+  cm.setCursor(0, 0);
+  helpers.doKeys(']', '`');
+  helpers.assertCursorAt(2, 2);
+  cm.setCursor(0, 0);
+  helpers.doKeys(']', '\'');
+  helpers.assertCursorAt(2, 0);
+});
+testVim('jumpToMark_next_repeat', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(3, 2);
+  helpers.doKeys('m', 'b');
+  cm.setCursor(4, 2);
+  helpers.doKeys('m', 'c');
+  cm.setCursor(0, 0);
+  helpers.doKeys('2', ']', '`');
+  helpers.assertCursorAt(3, 2);
+  cm.setCursor(0, 0);
+  helpers.doKeys('2', ']', '\'');
+  helpers.assertCursorAt(3, 1);
+});
+testVim('jumpToMark_next_sameline', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(2, 4);
+  helpers.doKeys('m', 'b');
+  cm.setCursor(2, 2);
+  helpers.doKeys(']', '`');
+  helpers.assertCursorAt(2, 4);
+});
+testVim('jumpToMark_next_onlyprev', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(4, 0);
+  helpers.doKeys(']', '`');
+  helpers.assertCursorAt(4, 0);
+});
+testVim('jumpToMark_next_nomark', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  helpers.doKeys(']', '`');
+  helpers.assertCursorAt(2, 2);
+  helpers.doKeys(']', '\'');
+  helpers.assertCursorAt(2, 0);
+});
+testVim('jumpToMark_next_linewise_over', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(3, 4);
+  helpers.doKeys('m', 'b');
+  cm.setCursor(2, 1);
+  helpers.doKeys(']', '\'');
+  helpers.assertCursorAt(3, 1);
+});
+testVim('jumpToMark_next_action', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 't');
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', ']', '`');
+  helpers.assertCursorAt(0, 0);
+  var actual = cm.getLine(0);
+  var expected = 'pop pop 0 1 2 3 4';
+  eq(actual, expected, "Deleting while jumping to the next mark failed.");
+});
+testVim('jumpToMark_next_line_action', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 't');
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', ']', '\'');
+  helpers.assertCursorAt(0, 1);
+  var actual = cm.getLine(0);
+  var expected = ' (a) [b] {c} '
+  eq(actual, expected, "Deleting while jumping to the next mark line failed.");
+});
+testVim('jumpToMark_prev', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 't');
+  cm.setCursor(4, 0);
+  helpers.doKeys('[', '`');
+  helpers.assertCursorAt(2, 2);
+  cm.setCursor(4, 0);
+  helpers.doKeys('[', '\'');
+  helpers.assertCursorAt(2, 0);
+});
+testVim('jumpToMark_prev_repeat', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(3, 2);
+  helpers.doKeys('m', 'b');
+  cm.setCursor(4, 2);
+  helpers.doKeys('m', 'c');
+  cm.setCursor(5, 0);
+  helpers.doKeys('2', '[', '`');
+  helpers.assertCursorAt(3, 2);
+  cm.setCursor(5, 0);
+  helpers.doKeys('2', '[', '\'');
+  helpers.assertCursorAt(3, 1);
+});
+testVim('jumpToMark_prev_sameline', function(cm, vim, helpers) {
+  cm.setCursor(2, 0);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(2, 4);
+  helpers.doKeys('m', 'b');
+  cm.setCursor(2, 2);
+  helpers.doKeys('[', '`');
+  helpers.assertCursorAt(2, 0);
+});
+testVim('jumpToMark_prev_onlynext', function(cm, vim, helpers) {
+  cm.setCursor(4, 4);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(2, 0);
+  helpers.doKeys('[', '`');
+  helpers.assertCursorAt(2, 0);
+});
+testVim('jumpToMark_prev_nomark', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  helpers.doKeys('[', '`');
+  helpers.assertCursorAt(2, 2);
+  helpers.doKeys('[', '\'');
+  helpers.assertCursorAt(2, 0);
+});
+testVim('jumpToMark_prev_linewise_over', function(cm, vim, helpers) {
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(3, 4);
+  helpers.doKeys('m', 'b');
+  cm.setCursor(3, 6);
+  helpers.doKeys('[', '\'');
+  helpers.assertCursorAt(2, 0);
+});
+testVim('delmark_single', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('m', 't');
+  helpers.doEx('delmarks t');
+  cm.setCursor(0, 0);
+  helpers.doKeys('`', 't');
+  helpers.assertCursorAt(0, 0);
+});
+testVim('delmark_range', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 'b');
+  cm.setCursor(3, 2);
+  helpers.doKeys('m', 'c');
+  cm.setCursor(4, 2);
+  helpers.doKeys('m', 'd');
+  cm.setCursor(5, 2);
+  helpers.doKeys('m', 'e');
+  helpers.doEx('delmarks b-d');
+  cm.setCursor(0, 0);
+  helpers.doKeys('`', 'a');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'b');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'c');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'd');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'e');
+  helpers.assertCursorAt(5, 2);
+});
+testVim('delmark_multi', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 'b');
+  cm.setCursor(3, 2);
+  helpers.doKeys('m', 'c');
+  cm.setCursor(4, 2);
+  helpers.doKeys('m', 'd');
+  cm.setCursor(5, 2);
+  helpers.doKeys('m', 'e');
+  helpers.doEx('delmarks bcd');
+  cm.setCursor(0, 0);
+  helpers.doKeys('`', 'a');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'b');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'c');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'd');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'e');
+  helpers.assertCursorAt(5, 2);
+});
+testVim('delmark_multi_space', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 'b');
+  cm.setCursor(3, 2);
+  helpers.doKeys('m', 'c');
+  cm.setCursor(4, 2);
+  helpers.doKeys('m', 'd');
+  cm.setCursor(5, 2);
+  helpers.doKeys('m', 'e');
+  helpers.doEx('delmarks b c d');
+  cm.setCursor(0, 0);
+  helpers.doKeys('`', 'a');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'b');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'c');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'd');
+  helpers.assertCursorAt(1, 2);
+  helpers.doKeys('`', 'e');
+  helpers.assertCursorAt(5, 2);
+});
+testVim('delmark_all', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('m', 'a');
+  cm.setCursor(2, 2);
+  helpers.doKeys('m', 'b');
+  cm.setCursor(3, 2);
+  helpers.doKeys('m', 'c');
+  cm.setCursor(4, 2);
+  helpers.doKeys('m', 'd');
+  cm.setCursor(5, 2);
+  helpers.doKeys('m', 'e');
+  helpers.doEx('delmarks a b-de');
+  cm.setCursor(0, 0);
+  helpers.doKeys('`', 'a');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('`', 'b');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('`', 'c');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('`', 'd');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('`', 'e');
+  helpers.assertCursorAt(0, 0);
+});
+testVim('visual', function(cm, vim, helpers) {
+  helpers.doKeys('l', 'v', 'l', 'l');
+  helpers.assertCursorAt(0, 4);
+  eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
+  helpers.doKeys('d');
+  eq('15', cm.getValue());
+}, { value: '12345' });
+testVim('visual_yank', function(cm, vim, helpers) {
+  helpers.doKeys('v', '3', 'l', 'y');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('p');
+  eq('aa te test for yank', cm.getValue());
+}, { value: 'a test for yank' })
+testVim('visual_w', function(cm, vim, helpers) {
+  helpers.doKeys('v', 'w');
+  eq(cm.getSelection(), 'motion t');
+}, { value: 'motion test'});
+testVim('visual_initial_selection', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('v');
+  cm.getSelection('n');
+}, { value: 'init'});
+testVim('visual_crossover_left', function(cm, vim, helpers) {
+  cm.setCursor(0, 2);
+  helpers.doKeys('v', 'l', 'h', 'h');
+  cm.getSelection('ro');
+}, { value: 'cross'});
+testVim('visual_crossover_left', function(cm, vim, helpers) {
+  cm.setCursor(0, 2);
+  helpers.doKeys('v', 'h', 'l', 'l');
+  cm.getSelection('os');
+}, { value: 'cross'});
+testVim('visual_crossover_up', function(cm, vim, helpers) {
+  cm.setCursor(3, 2);
+  helpers.doKeys('v', 'j', 'k', 'k');
+  eqPos(Pos(2, 2), cm.getCursor('head'));
+  eqPos(Pos(3, 3), cm.getCursor('anchor'));
+  helpers.doKeys('k');
+  eqPos(Pos(1, 2), cm.getCursor('head'));
+  eqPos(Pos(3, 3), cm.getCursor('anchor'));
+}, { value: 'cross\ncross\ncross\ncross\ncross\n'});
+testVim('visual_crossover_down', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('v', 'k', 'j', 'j');
+  eqPos(Pos(2, 3), cm.getCursor('head'));
+  eqPos(Pos(1, 2), cm.getCursor('anchor'));
+  helpers.doKeys('j');
+  eqPos(Pos(3, 3), cm.getCursor('head'));
+  eqPos(Pos(1, 2), cm.getCursor('anchor'));
+}, { value: 'cross\ncross\ncross\ncross\ncross\n'});
+testVim('visual_exit', function(cm, vim, helpers) {
+  helpers.doKeys('', 'l', 'j', 'j', '');
+  eqPos(cm.getCursor('anchor'), cm.getCursor('head'));
+  eq(vim.visualMode, false);
+}, { value: 'hello\nworld\nfoo' });
+testVim('visual_line', function(cm, vim, helpers) {
+  helpers.doKeys('l', 'V', 'l', 'j', 'j', 'd');
+  eq(' 4\n 5', cm.getValue());
+}, { value: ' 1\n 2\n 3\n 4\n 5' });
+testVim('visual_block_move_to_eol', function(cm, vim, helpers) {
+  // moveToEol should move all block cursors to end of line
+  cm.setCursor(0, 0);
+  helpers.doKeys('', 'G', '$');
+  var selections = cm.getSelections().join();
+  eq('123,45,6', selections);
+  // Checks that with cursor at Infinity, finding words backwards still works.
+  helpers.doKeys('2', 'k', 'b');
+  selections = cm.getSelections().join();
+  eq('1', selections);
+}, {value: '123\n45\n6'});
+testVim('visual_block_different_line_lengths', function(cm, vim, helpers) {
+  // test the block selection with lines of different length
+  // i.e. extending the selection
+  // till the end of the longest line.
+  helpers.doKeys('', 'l', 'j', 'j', '6', 'l', 'd');
+  helpers.doKeys('d', 'd', 'd', 'd');
+  eq('', cm.getValue());
+}, {value: '1234\n5678\nabcdefg'});
+testVim('visual_block_truncate_on_short_line', function(cm, vim, helpers) {
+  // check for left side selection in case
+  // of moving up to a shorter line.
+  cm.replaceRange('', cm.getCursor());
+  cm.setCursor(3, 4);
+  helpers.doKeys('', 'l', 'k', 'k', 'd');
+  eq('hello world\n{\ntis\nsa!', cm.getValue());
+}, {value: 'hello world\n{\nthis is\nsparta!'});
+testVim('visual_block_corners', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('', '2', 'l', 'k');
+  // circle around the anchor
+  // and check the selections
+  var selections = cm.getSelections();
+  eq('345891', selections.join(''));
+  helpers.doKeys('4', 'h');
+  selections = cm.getSelections();
+  eq('123678', selections.join(''));
+  helpers.doKeys('j', 'j');
+  selections = cm.getSelections();
+  eq('678abc', selections.join(''));
+  helpers.doKeys('4', 'l');
+  selections = cm.getSelections();
+  eq('891cde', selections.join(''));
+}, {value: '12345\n67891\nabcde'});
+testVim('visual_block_mode_switch', function(cm, vim, helpers) {
+  // switch between visual modes
+  cm.setCursor(1, 1);
+  // blockwise to characterwise visual
+  helpers.doKeys('', 'j', 'l', 'v');
+  selections = cm.getSelections();
+  eq('7891\nabc', selections.join(''));
+  // characterwise to blockwise
+  helpers.doKeys('');
+  selections = cm.getSelections();
+  eq('78bc', selections.join(''));
+  // blockwise to linewise visual
+  helpers.doKeys('V');
+  selections = cm.getSelections();
+  eq('67891\nabcde', selections.join(''));
+}, {value: '12345\n67891\nabcde'});
+testVim('visual_block_crossing_short_line', function(cm, vim, helpers) {
+  // visual block with long and short lines
+  cm.setCursor(0, 3);
+  helpers.doKeys('', 'j', 'j', 'j');
+  var selections = cm.getSelections().join();
+  eq('4,,d,b', selections);
+  helpers.doKeys('3', 'k');
+  selections = cm.getSelections().join();
+  eq('4', selections);
+  helpers.doKeys('5', 'j', 'k');
+  selections = cm.getSelections().join("");
+  eq(10, selections.length);
+}, {value: '123456\n78\nabcdefg\nfoobar\n}\n'});
+testVim('visual_block_curPos_on_exit', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('', '3' , 'l', '');
+  eqPos(makeCursor(0, 3), cm.getCursor());
+  helpers.doKeys('h', '', '2' , 'j' ,'3' , 'l');
+  eq(cm.getSelections().join(), "3456,,cdef");
+  helpers.doKeys('4' , 'h');
+  eq(cm.getSelections().join(), "23,8,bc");
+  helpers.doKeys('2' , 'l');
+  eq(cm.getSelections().join(), "34,,cd");
+}, {value: '123456\n78\nabcdefg\nfoobar'});
+
+testVim('visual_marks', function(cm, vim, helpers) {
+  helpers.doKeys('l', 'v', 'l', 'l', 'j', 'j', 'v');
+  // Test visual mode marks
+  cm.setCursor(2, 1);
+  helpers.doKeys('\'', '<');
+  helpers.assertCursorAt(0, 1);
+  helpers.doKeys('\'', '>');
+  helpers.assertCursorAt(2, 0);
+});
+testVim('visual_join', function(cm, vim, helpers) {
+  helpers.doKeys('l', 'V', 'l', 'j', 'j', 'J');
+  eq(' 1 2 3\n 4\n 5', cm.getValue());
+  is(!vim.visualMode);
+}, { value: ' 1\n 2\n 3\n 4\n 5' });
+testVim('visual_join_2', function(cm, vim, helpers) {
+  helpers.doKeys('G', 'V', 'g', 'g', 'J');
+  eq('1 2 3 4 5 6 ', cm.getValue());
+  is(!vim.visualMode);
+}, { value: '1\n2\n3\n4\n5\n6\n'});
+testVim('visual_blank', function(cm, vim, helpers) {
+  helpers.doKeys('v', 'k');
+  eq(vim.visualMode, true);
+}, { value: '\n' });
+testVim('reselect_visual', function(cm, vim, helpers) {
+  helpers.doKeys('l', 'v', 'l', 'l', 'l', 'y', 'g', 'v');
+  helpers.assertCursorAt(0, 5);
+  eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
+  helpers.doKeys('v');
+  cm.setCursor(1, 0);
+  helpers.doKeys('v', 'l', 'l', 'p');
+  eq('123456\n2345\nbar', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('g', 'v');
+  // here the fake cursor is at (1, 3)
+  helpers.assertCursorAt(1, 4);
+  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
+  helpers.doKeys('v');
+  cm.setCursor(2, 0);
+  helpers.doKeys('v', 'l', 'l', 'g', 'v');
+  helpers.assertCursorAt(1, 4);
+  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
+  helpers.doKeys('g', 'v');
+  helpers.assertCursorAt(2, 3);
+  eqPos(makeCursor(2, 0), cm.getCursor('anchor'));
+  eq('123456\n2345\nbar', cm.getValue());
+}, { value: '123456\nfoo\nbar' });
+testVim('reselect_visual_line', function(cm, vim, helpers) {
+  helpers.doKeys('l', 'V', 'j', 'j', 'V', 'g', 'v', 'd');
+  eq('foo\nand\nbar', cm.getValue());
+  cm.setCursor(1, 0);
+  helpers.doKeys('V', 'y', 'j');
+  helpers.doKeys('V', 'p' , 'g', 'v', 'd');
+  eq('foo\nand', cm.getValue());
+}, { value: 'hello\nthis\nis\nfoo\nand\nbar' });
+testVim('reselect_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(1, 2);
+  helpers.doKeys('', 'k', 'h', '');
+  cm.setCursor(2, 1);
+  helpers.doKeys('v', 'l', 'g', 'v');
+  eqPos(Pos(1, 2), vim.sel.anchor);
+  eqPos(Pos(0, 1), vim.sel.head);
+  // Ensure selection is done with visual block mode rather than one
+  // continuous range.
+  eq(cm.getSelections().join(''), '23oo')
+  helpers.doKeys('g', 'v');
+  eqPos(Pos(2, 1), vim.sel.anchor);
+  eqPos(Pos(2, 2), vim.sel.head);
+  helpers.doKeys('');
+  // Ensure selection of deleted range
+  cm.setCursor(1, 1);
+  helpers.doKeys('v', '', 'j', 'd', 'g', 'v');
+  eq(cm.getSelections().join(''), 'or');
+}, { value: '123456\nfoo\nbar' });
+testVim('s_normal', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('s');
+  helpers.doKeys('');
+  eq('ac', cm.getValue());
+}, { value: 'abc'});
+testVim('s_visual', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('v', 's');
+  helpers.doKeys('');
+  helpers.assertCursorAt(0, 0);
+  eq('ac', cm.getValue());
+}, { value: 'abc'});
+testVim('o_visual', function(cm, vim, helpers) {
+  cm.setCursor(0,0);
+  helpers.doKeys('v','l','l','l','o');
+  helpers.assertCursorAt(0,0);
+  helpers.doKeys('v','v','j','j','j','o');
+  helpers.assertCursorAt(0,0);
+  helpers.doKeys('O');
+  helpers.doKeys('l','l')
+  helpers.assertCursorAt(3, 3);
+  helpers.doKeys('d');
+  eq('p',cm.getValue());
+}, { value: 'abcd\nefgh\nijkl\nmnop'});
+testVim('o_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('','3','j','l','l', 'o');
+  eqPos(Pos(3, 3), vim.sel.anchor);
+  eqPos(Pos(0, 1), vim.sel.head);
+  helpers.doKeys('O');
+  eqPos(Pos(3, 1), vim.sel.anchor);
+  eqPos(Pos(0, 3), vim.sel.head);
+  helpers.doKeys('o');
+  eqPos(Pos(0, 3), vim.sel.anchor);
+  eqPos(Pos(3, 1), vim.sel.head);
+}, { value: 'abcd\nefgh\nijkl\nmnop'});
+testVim('changeCase_visual', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', 'l', 'l');
+  helpers.doKeys('U');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('v', 'l', 'l');
+  helpers.doKeys('u');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('l', 'l', 'l', '.');
+  helpers.assertCursorAt(0, 3);
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', 'v', 'j', 'U', 'q');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('j', '@', 'a');
+  helpers.assertCursorAt(1, 0);
+  cm.setCursor(3, 0);
+  helpers.doKeys('V', 'U', 'j', '.');
+  eq('ABCDEF\nGHIJKL\nMnopq\nSHORT LINE\nLONG LINE OF TEXT', cm.getValue());
+}, { value: 'abcdef\nghijkl\nmnopq\nshort line\nlong line of text'});
+testVim('changeCase_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(2, 1);
+  helpers.doKeys('', 'k', 'k', 'h', 'U');
+  eq('ABcdef\nGHijkl\nMNopq\nfoo', cm.getValue());
+  cm.setCursor(0, 2);
+  helpers.doKeys('.');
+  eq('ABCDef\nGHIJkl\nMNOPq\nfoo', cm.getValue());
+  // check when last line is shorter.
+  cm.setCursor(2, 2);
+  helpers.doKeys('.');
+  eq('ABCDef\nGHIJkl\nMNOPq\nfoO', cm.getValue());
+}, { value: 'abcdef\nghijkl\nmnopq\nfoo'});
+testVim('visual_paste', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', 'l', 'l', 'y');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('3', 'l', 'j', 'v', 'l', 'p');
+  helpers.assertCursorAt(1, 5);
+  eq('this is a\nunithitest for visual paste', cm.getValue());
+  cm.setCursor(0, 0);
+  // in case of pasting whole line
+  helpers.doKeys('y', 'y');
+  cm.setCursor(1, 6);
+  helpers.doKeys('v', 'l', 'l', 'l', 'p');
+  helpers.assertCursorAt(2, 0);
+  eq('this is a\nunithi\nthis is a\n for visual paste', cm.getValue());
+}, { value: 'this is a\nunit test for visual paste'});
+
+// This checks the contents of the register used to paste the text
+testVim('v_paste_from_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'w');
+  cm.setCursor(1, 0);
+  helpers.doKeys('v', 'p');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+register/.test(text));
+  });
+}, { value: 'register contents\nare not erased'});
+testVim('S_normal', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('j', 'S');
+  helpers.doKeys('');
+  helpers.assertCursorAt(1, 1);
+  eq('aa{\n  \ncc', cm.getValue());
+  helpers.doKeys('j', 'S');
+  eq('aa{\n  \n  ', cm.getValue());
+  helpers.assertCursorAt(2, 2);
+  helpers.doKeys('');
+  helpers.doKeys('d', 'd', 'd', 'd');
+  helpers.assertCursorAt(0, 0);
+  helpers.doKeys('S');
+  is(vim.insertMode);
+  eq('', cm.getValue());
+}, { value: 'aa{\nbb\ncc'});
+testVim('blockwise_paste', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('', '3', 'j', 'l', 'y');
+  cm.setCursor(0, 2);
+  // paste one char after the current cursor position
+  helpers.doKeys('p');
+  eq('helhelo\nworwold\nfoofo\nbarba', cm.getValue());
+  cm.setCursor(0, 0);
+  helpers.doKeys('v', '4', 'l', 'y');
+  cm.setCursor(0, 0);
+  helpers.doKeys('', '3', 'j', 'p');
+  eq('helheelhelo\norwold\noofo\narba', cm.getValue());
+}, { value: 'hello\nworld\nfoo\nbar'});
+testVim('blockwise_paste_long/short_line', function(cm, vim, helpers) {
+  // extend short lines in case of different line lengths.
+  cm.setCursor(0, 0);
+  helpers.doKeys('', 'j', 'j', 'y');
+  cm.setCursor(0, 3);
+  helpers.doKeys('p');
+  eq('hellho\nfoo f\nbar b', cm.getValue());
+}, { value: 'hello\nfoo\nbar'});
+testVim('blockwise_paste_cut_paste', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('', '2', 'j', 'x');
+  cm.setCursor(0, 0);
+  helpers.doKeys('P');
+  eq('cut\nand\npaste\nme', cm.getValue());
+}, { value: 'cut\nand\npaste\nme'});
+testVim('blockwise_paste_from_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('', '2', 'j', '"', 'a', 'y');
+  cm.setCursor(0, 3);
+  helpers.doKeys('"', 'a', 'p');
+  eq('foobfar\nhellho\nworlwd', cm.getValue());
+}, { value: 'foobar\nhello\nworld'});
+testVim('blockwise_paste_last_line', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('', '2', 'j', 'l', 'y');
+  cm.setCursor(3, 0);
+  helpers.doKeys('p');
+  eq('cut\nand\npaste\nmcue\n an\n pa', cm.getValue());
+}, { value: 'cut\nand\npaste\nme'});
+
+testVim('S_visual', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('v', 'j', 'S');
+  helpers.doKeys('');
+  helpers.assertCursorAt(0, 0);
+  eq('\ncc', cm.getValue());
+}, { value: 'aa\nbb\ncc'});
+
+testVim('d_/', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('2', 'd', '/');
+  helpers.assertCursorAt(0, 0);
+  eq('match \n next', cm.getValue());
+  cm.openDialog = helpers.fakeOpenDialog('2');
+  helpers.doKeys('d', ':');
+  // TODO eq(' next', cm.getValue());
+}, { value: 'text match match \n next' });
+testVim('/ and n/N', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(0, 11);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 6);
+  helpers.doKeys('N');
+  helpers.assertCursorAt(0, 11);
+
+  cm.setCursor(0, 0);
+  helpers.doKeys('2', '/');
+  helpers.assertCursorAt(1, 6);
+}, { value: 'match nope match \n nope Match' });
+testVim('/_case', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('Match');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(1, 6);
+}, { value: 'match nope match \n nope Match' });
+testVim('/_2_pcre', function(cm, vim, helpers) {
+  CodeMirror.Vim.setOption('pcre', true);
+  cm.openDialog = helpers.fakeOpenDialog('(word){2}');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(1, 9);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(2, 1);
+}, { value: 'word\n another wordword\n wordwordword\n' });
+testVim('/_2_nopcre', function(cm, vim, helpers) {
+  CodeMirror.Vim.setOption('pcre', false);
+  cm.openDialog = helpers.fakeOpenDialog('\\(word\\)\\{2}');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(1, 9);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(2, 1);
+}, { value: 'word\n another wordword\n wordwordword\n' });
+testVim('/_nongreedy', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('aa');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa aa \n a aa'});
+testVim('?_nongreedy', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('aa');
+  helpers.doKeys('?');
+  helpers.assertCursorAt(1, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa aa \n a aa'});
+testVim('/_greedy', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('a+');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 1);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa aa \n a aa'});
+testVim('?_greedy', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('a+');
+  helpers.doKeys('?');
+  helpers.assertCursorAt(1, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 1);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa aa \n a aa'});
+testVim('/_greedy_0_or_more', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('a*');
+  helpers.doKeys('/');
+  helpers.assertCursorAt(0, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 5);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 0);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 1);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa  aa\n aa'});
+testVim('?_greedy_0_or_more', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('a*');
+  helpers.doKeys('?');
+  helpers.assertCursorAt(1, 1);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(1, 0);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 5);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 3);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 0);
+}, { value: 'aaa  aa\n aa'});
+testVim('? and n/N', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('?');
+  helpers.assertCursorAt(1, 6);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 11);
+  helpers.doKeys('N');
+  helpers.assertCursorAt(1, 6);
+
+  cm.setCursor(0, 0);
+  helpers.doKeys('2', '?');
+  helpers.assertCursorAt(0, 11);
+}, { value: 'match nope match \n nope Match' });
+testVim('*', function(cm, vim, helpers) {
+  cm.setCursor(0, 9);
+  helpers.doKeys('*');
+  helpers.assertCursorAt(0, 22);
+
+  cm.setCursor(0, 9);
+  helpers.doKeys('2', '*');
+  helpers.assertCursorAt(1, 8);
+}, { value: 'nomatch match nomatch match \nnomatch Match' });
+testVim('*_no_word', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('*');
+  helpers.assertCursorAt(0, 0);
+}, { value: ' \n match \n' });
+testVim('*_symbol', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('*');
+  helpers.assertCursorAt(1, 0);
+}, { value: ' /}\n/} match \n' });
+testVim('#', function(cm, vim, helpers) {
+  cm.setCursor(0, 9);
+  helpers.doKeys('#');
+  helpers.assertCursorAt(1, 8);
+
+  cm.setCursor(0, 9);
+  helpers.doKeys('2', '#');
+  helpers.assertCursorAt(0, 22);
+}, { value: 'nomatch match nomatch match \nnomatch Match' });
+testVim('*_seek', function(cm, vim, helpers) {
+  // Should skip over space and symbols.
+  cm.setCursor(0, 3);
+  helpers.doKeys('*');
+  helpers.assertCursorAt(0, 22);
+}, { value: '    :=  match nomatch match \nnomatch Match' });
+testVim('#', function(cm, vim, helpers) {
+  // Should skip over space and symbols.
+  cm.setCursor(0, 3);
+  helpers.doKeys('#');
+  helpers.assertCursorAt(1, 8);
+}, { value: '    :=  match nomatch match \nnomatch Match' });
+testVim('g*', function(cm, vim, helpers) {
+  cm.setCursor(0, 8);
+  helpers.doKeys('g', '*');
+  helpers.assertCursorAt(0, 18);
+  cm.setCursor(0, 8);
+  helpers.doKeys('3', 'g', '*');
+  helpers.assertCursorAt(1, 8);
+}, { value: 'matches match alsoMatch\nmatchme matching' });
+testVim('g#', function(cm, vim, helpers) {
+  cm.setCursor(0, 8);
+  helpers.doKeys('g', '#');
+  helpers.assertCursorAt(0, 0);
+  cm.setCursor(0, 8);
+  helpers.doKeys('3', 'g', '#');
+  helpers.assertCursorAt(1, 0);
+}, { value: 'matches match alsoMatch\nmatchme matching' });
+testVim('macro_insert', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', '0', 'i');
+  cm.replaceRange('foo', cm.getCursor());
+  helpers.doKeys('');
+  helpers.doKeys('q', '@', 'a');
+  eq('foofoo', cm.getValue());
+}, { value: ''});
+testVim('macro_insert_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', '$', 'a');
+  cm.replaceRange('larry.', cm.getCursor());
+  helpers.doKeys('');
+  helpers.doKeys('a');
+  cm.replaceRange('curly.', cm.getCursor());
+  helpers.doKeys('');
+  helpers.doKeys('q');
+  helpers.doKeys('a');
+  cm.replaceRange('moe.', cm.getCursor());
+  helpers.doKeys('');
+  helpers.doKeys('@', 'a');
+  // At this point, the most recent edit should be the 2nd insert change
+  // inside the macro, i.e. "curly.".
+  helpers.doKeys('.');
+  eq('larry.curly.moe.larry.curly.curly.', cm.getValue());
+}, { value: ''});
+testVim('macro_space', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('', '');
+  helpers.assertCursorAt(0, 2);
+  helpers.doKeys('q', 'a', '', '', 'q');
+  helpers.assertCursorAt(0, 4);
+  helpers.doKeys('@', 'a');
+  helpers.assertCursorAt(0, 6);
+  helpers.doKeys('@', 'a');
+  helpers.assertCursorAt(0, 8);
+}, { value: 'one line of text.'});
+testVim('macro_t_search', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', 't', 'e', 'q');
+  helpers.assertCursorAt(0, 1);
+  helpers.doKeys('l', '@', 'a');
+  helpers.assertCursorAt(0, 6);
+  helpers.doKeys('l', ';');
+  helpers.assertCursorAt(0, 12);
+}, { value: 'one line of text.'});
+testVim('macro_f_search', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'b', 'f', 'e', 'q');
+  helpers.assertCursorAt(0, 2);
+  helpers.doKeys('@', 'b');
+  helpers.assertCursorAt(0, 7);
+  helpers.doKeys(';');
+  helpers.assertCursorAt(0, 13);
+}, { value: 'one line of text.'});
+testVim('macro_slash_search', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'c');
+  cm.openDialog = helpers.fakeOpenDialog('e');
+  helpers.doKeys('/', 'q');
+  helpers.assertCursorAt(0, 2);
+  helpers.doKeys('@', 'c');
+  helpers.assertCursorAt(0, 7);
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 13);
+}, { value: 'one line of text.'});
+testVim('macro_multislash_search', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'd');
+  cm.openDialog = helpers.fakeOpenDialog('e');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('t');
+  helpers.doKeys('/', 'q');
+  helpers.assertCursorAt(0, 12);
+  helpers.doKeys('@', 'd');
+  helpers.assertCursorAt(0, 15);
+}, { value: 'one line of text to rule them all.'});
+testVim('macro_last_ex_command_register', function (cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doEx('s/a/b');
+  helpers.doKeys('2', '@', ':');
+  eq('bbbaa', cm.getValue());
+  helpers.assertCursorAt(0, 2);
+}, { value: 'aaaaa'});
+testVim('macro_parens', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'z', 'i');
+  cm.replaceRange('(', cm.getCursor());
+  helpers.doKeys('');
+  helpers.doKeys('e', 'a');
+  cm.replaceRange(')', cm.getCursor());
+  helpers.doKeys('');
+  helpers.doKeys('q');
+  helpers.doKeys('w', '@', 'z');
+  helpers.doKeys('w', '@', 'z');
+  eq('(see) (spot) (run)', cm.getValue());
+}, { value: 'see spot run'});
+testVim('macro_overwrite', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'z', '0', 'i');
+  cm.replaceRange('I ', cm.getCursor());
+  helpers.doKeys('');
+  helpers.doKeys('q');
+  helpers.doKeys('e');
+  // Now replace the macro with something else.
+  helpers.doKeys('q', 'z', 'a');
+  cm.replaceRange('.', cm.getCursor());
+  helpers.doKeys('');
+  helpers.doKeys('q');
+  helpers.doKeys('e', '@', 'z');
+  helpers.doKeys('e', '@', 'z');
+  eq('I see. spot. run.', cm.getValue());
+}, { value: 'see spot run'});
+testVim('macro_search_f', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', 'f', ' ');
+  helpers.assertCursorAt(0,3);
+  helpers.doKeys('q', '0');
+  helpers.assertCursorAt(0,0);
+  helpers.doKeys('@', 'a');
+  helpers.assertCursorAt(0,3);
+}, { value: 'The quick brown fox jumped over the lazy dog.'});
+testVim('macro_search_2f', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', '2', 'f', ' ');
+  helpers.assertCursorAt(0,9);
+  helpers.doKeys('q', '0');
+  helpers.assertCursorAt(0,0);
+  helpers.doKeys('@', 'a');
+  helpers.assertCursorAt(0,9);
+}, { value: 'The quick brown fox jumped over the lazy dog.'});
+testVim('yank_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'y');
+  helpers.doKeys('j', '"', 'b', 'y', 'y');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+foo/.test(text));
+    is(/b\s+bar/.test(text));
+  });
+  helpers.doKeys(':');
+}, { value: 'foo\nbar'});
+testVim('yank_visual_block', function(cm, vim, helpers) {
+  cm.setCursor(0, 1);
+  helpers.doKeys('', 'l', 'j', '"', 'a', 'y');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+oo\nar/.test(text));
+  });
+  helpers.doKeys(':');
+}, { value: 'foo\nbar'});
+testVim('yank_append_line_to_line_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'y');
+  helpers.doKeys('j', '"', 'A', 'y', 'y');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+foo\nbar/.test(text));
+    is(/"\s+foo\nbar/.test(text));
+  });
+  helpers.doKeys(':');
+}, { value: 'foo\nbar'});
+testVim('yank_append_word_to_word_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'w');
+  helpers.doKeys('j', '"', 'A', 'y', 'w');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+foobar/.test(text));
+    is(/"\s+foobar/.test(text));
+  });
+  helpers.doKeys(':');
+}, { value: 'foo\nbar'});
+testVim('yank_append_line_to_word_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'w');
+  helpers.doKeys('j', '"', 'A', 'y', 'y');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+foo\nbar/.test(text));
+    is(/"\s+foo\nbar/.test(text));
+  });
+  helpers.doKeys(':');
+}, { value: 'foo\nbar'});
+testVim('yank_append_word_to_line_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('"', 'a', 'y', 'y');
+  helpers.doKeys('j', '"', 'A', 'y', 'w');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+foo\nbar/.test(text));
+    is(/"\s+foo\nbar/.test(text));
+  });
+  helpers.doKeys(':');
+}, { value: 'foo\nbar'});
+testVim('macro_register', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('q', 'a', 'i');
+  cm.replaceRange('gangnam', cm.getCursor());
+  helpers.doKeys('');
+  helpers.doKeys('q');
+  helpers.doKeys('q', 'b', 'o');
+  cm.replaceRange('style', cm.getCursor());
+  helpers.doKeys('');
+  helpers.doKeys('q');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/a\s+i/.test(text));
+    is(/b\s+o/.test(text));
+  });
+  helpers.doKeys(':');
+}, { value: ''});
+testVim('._register', function(cm,vim,helpers) {
+  cm.setCursor(0,0);
+  helpers.doKeys('i');
+  cm.replaceRange('foo',cm.getCursor());
+  helpers.doKeys('');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/\.\s+foo/.test(text));
+  });
+  helpers.doKeys(':');
+}, {value: ''});
+testVim(':_register', function(cm,vim,helpers) {
+  helpers.doEx('bar');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/:\s+bar/.test(text));
+  });
+  helpers.doKeys(':');
+}, {value: ''});
+testVim('search_register_escape', function(cm, vim, helpers) {
+  // Check that the register is restored if the user escapes rather than confirms.
+  cm.openDialog = helpers.fakeOpenDialog('waldo');
+  helpers.doKeys('/');
+  var onKeyDown;
+  var onKeyUp;
+  var KEYCODES = {
+    f: 70,
+    o: 79,
+    Esc: 27
+  };
+  cm.openDialog = function(template, callback, options) {
+    onKeyDown = options.onKeyDown;
+    onKeyUp = options.onKeyUp;
+  };
+  var close = function() {};
+  helpers.doKeys('/');
+  // Fake some keyboard events coming in.
+  onKeyDown({keyCode: KEYCODES.f}, '', close);
+  onKeyUp({keyCode: KEYCODES.f}, '', close);
+  onKeyDown({keyCode: KEYCODES.o}, 'f', close);
+  onKeyUp({keyCode: KEYCODES.o}, 'f', close);
+  onKeyDown({keyCode: KEYCODES.o}, 'fo', close);
+  onKeyUp({keyCode: KEYCODES.o}, 'fo', close);
+  onKeyDown({keyCode: KEYCODES.Esc}, 'foo', close);
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/waldo/.test(text));
+    is(!/foo/.test(text));
+  });
+  helpers.doKeys(':');
+}, {value: ''});
+testVim('search_register', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('foo');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    is(/\/\s+foo/.test(text));
+  });
+  helpers.doKeys(':');
+}, {value: ''});
+testVim('search_history', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('this');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('checks');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('search');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('history');
+  helpers.doKeys('/');
+  cm.openDialog = helpers.fakeOpenDialog('checks');
+  helpers.doKeys('/');
+  var onKeyDown;
+  var onKeyUp;
+  var query = '';
+  var keyCodes = {
+    Up: 38,
+    Down: 40
+  };
+  cm.openDialog = function(template, callback, options) {
+    onKeyUp = options.onKeyUp;
+    onKeyDown = options.onKeyDown;
+  };
+  var close = function(newVal) {
+    if (typeof newVal == 'string') query = newVal;
+  }
+  helpers.doKeys('/');
+  onKeyDown({keyCode: keyCodes.Up}, query, close);
+  onKeyUp({keyCode: keyCodes.Up}, query, close);
+  eq(query, 'checks');
+  onKeyDown({keyCode: keyCodes.Up}, query, close);
+  onKeyUp({keyCode: keyCodes.Up}, query, close);
+  eq(query, 'history');
+  onKeyDown({keyCode: keyCodes.Up}, query, close);
+  onKeyUp({keyCode: keyCodes.Up}, query, close);
+  eq(query, 'search');
+  onKeyDown({keyCode: keyCodes.Up}, query, close);
+  onKeyUp({keyCode: keyCodes.Up}, query, close);
+  eq(query, 'this');
+  onKeyDown({keyCode: keyCodes.Down}, query, close);
+  onKeyUp({keyCode: keyCodes.Down}, query, close);
+  eq(query, 'search');
+}, {value: ''});
+testVim('exCommand_history', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('registers');
+  helpers.doKeys(':');
+  cm.openDialog = helpers.fakeOpenDialog('sort');
+  helpers.doKeys(':');
+  cm.openDialog = helpers.fakeOpenDialog('map');
+  helpers.doKeys(':');
+  cm.openDialog = helpers.fakeOpenDialog('invalid');
+  helpers.doKeys(':');
+  var onKeyDown;
+  var onKeyUp;
+  var input = '';
+  var keyCodes = {
+    Up: 38,
+    Down: 40,
+    s: 115
+  };
+  cm.openDialog = function(template, callback, options) {
+    onKeyUp = options.onKeyUp;
+    onKeyDown = options.onKeyDown;
+  };
+  var close = function(newVal) {
+    if (typeof newVal == 'string') input = newVal;
+  }
+  helpers.doKeys(':');
+  onKeyDown({keyCode: keyCodes.Up}, input, close);
+  eq(input, 'invalid');
+  onKeyDown({keyCode: keyCodes.Up}, input, close);
+  eq(input, 'map');
+  onKeyDown({keyCode: keyCodes.Up}, input, close);
+  eq(input, 'sort');
+  onKeyDown({keyCode: keyCodes.Up}, input, close);
+  eq(input, 'registers');
+  onKeyDown({keyCode: keyCodes.s}, '', close);
+  input = 's';
+  onKeyDown({keyCode: keyCodes.Up}, input, close);
+  eq(input, 'sort');
+}, {value: ''});
+testVim('search_clear', function(cm, vim, helpers) {
+  var onKeyDown;
+  var input = '';
+  var keyCodes = {
+    Ctrl: 17,
+    u: 85
+  };
+  cm.openDialog = function(template, callback, options) {
+    onKeyDown = options.onKeyDown;
+  };
+  var close = function(newVal) {
+    if (typeof newVal == 'string') input = newVal;
+  }
+  helpers.doKeys('/');
+  input = 'foo';
+  onKeyDown({keyCode: keyCodes.Ctrl}, input, close);
+  onKeyDown({keyCode: keyCodes.u, ctrlKey: true}, input, close);
+  eq(input, '');
+});
+testVim('exCommand_clear', function(cm, vim, helpers) {
+  var onKeyDown;
+  var input = '';
+  var keyCodes = {
+    Ctrl: 17,
+    u: 85
+  };
+  cm.openDialog = function(template, callback, options) {
+    onKeyDown = options.onKeyDown;
+  };
+  var close = function(newVal) {
+    if (typeof newVal == 'string') input = newVal;
+  }
+  helpers.doKeys(':');
+  input = 'foo';
+  onKeyDown({keyCode: keyCodes.Ctrl}, input, close);
+  onKeyDown({keyCode: keyCodes.u, ctrlKey: true}, input, close);
+  eq(input, '');
+});
+testVim('.', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('2', 'd', 'w');
+  helpers.doKeys('.');
+  eq('5 6', cm.getValue());
+}, { value: '1 2 3 4 5 6'});
+testVim('._repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('2', 'd', 'w');
+  helpers.doKeys('3', '.');
+  eq('6', cm.getValue());
+}, { value: '1 2 3 4 5 6'});
+testVim('._insert', function(cm, vim, helpers) {
+  helpers.doKeys('i');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('');
+  helpers.doKeys('.');
+  eq('testestt', cm.getValue());
+  helpers.assertCursorAt(0, 6);
+}, { value: ''});
+testVim('._insert_repeat', function(cm, vim, helpers) {
+  helpers.doKeys('i');
+  cm.replaceRange('test', cm.getCursor());
+  cm.setCursor(0, 4);
+  helpers.doKeys('');
+  helpers.doKeys('2', '.');
+  eq('testesttestt', cm.getValue());
+  helpers.assertCursorAt(0, 10);
+}, { value: ''});
+testVim('._repeat_insert', function(cm, vim, helpers) {
+  helpers.doKeys('3', 'i');
+  cm.replaceRange('te', cm.getCursor());
+  cm.setCursor(0, 2);
+  helpers.doKeys('');
+  helpers.doKeys('.');
+  eq('tetettetetee', cm.getValue());
+  helpers.assertCursorAt(0, 10);
+}, { value: ''});
+testVim('._insert_o', function(cm, vim, helpers) {
+  helpers.doKeys('o');
+  cm.replaceRange('z', cm.getCursor());
+  cm.setCursor(1, 1);
+  helpers.doKeys('');
+  helpers.doKeys('.');
+  eq('\nz\nz', cm.getValue());
+  helpers.assertCursorAt(2, 0);
+}, { value: ''});
+testVim('._insert_o_repeat', function(cm, vim, helpers) {
+  helpers.doKeys('o');
+  cm.replaceRange('z', cm.getCursor());
+  helpers.doKeys('');
+  cm.setCursor(1, 0);
+  helpers.doKeys('2', '.');
+  eq('\nz\nz\nz', cm.getValue());
+  helpers.assertCursorAt(3, 0);
+}, { value: ''});
+testVim('._insert_o_indent', function(cm, vim, helpers) {
+  helpers.doKeys('o');
+  cm.replaceRange('z', cm.getCursor());
+  helpers.doKeys('');
+  cm.setCursor(1, 2);
+  helpers.doKeys('.');
+  eq('{\n  z\n  z', cm.getValue());
+  helpers.assertCursorAt(2, 2);
+}, { value: '{'});
+testVim('._insert_cw', function(cm, vim, helpers) {
+  helpers.doKeys('c', 'w');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('');
+  cm.setCursor(0, 3);
+  helpers.doKeys('2', 'l');
+  helpers.doKeys('.');
+  eq('test test word3', cm.getValue());
+  helpers.assertCursorAt(0, 8);
+}, { value: 'word1 word2 word3' });
+testVim('._insert_cw_repeat', function(cm, vim, helpers) {
+  // For some reason, repeat cw in desktop VIM will does not repeat insert mode
+  // changes. Will conform to that behavior.
+  helpers.doKeys('c', 'w');
+  cm.replaceRange('test', cm.getCursor());
+  helpers.doKeys('');
+  cm.setCursor(0, 4);
+  helpers.doKeys('l');
+  helpers.doKeys('2', '.');
+  eq('test test', cm.getValue());
+  helpers.assertCursorAt(0, 8);
+}, { value: 'word1 word2 word3' });
+testVim('._delete', function(cm, vim, helpers) {
+  cm.setCursor(0, 5);
+  helpers.doKeys('i');
+  helpers.doInsertModeKeys('Backspace');
+  helpers.doKeys('');
+  helpers.doKeys('.');
+  eq('zace', cm.getValue());
+  helpers.assertCursorAt(0, 1);
+}, { value: 'zabcde'});
+testVim('._delete_repeat', function(cm, vim, helpers) {
+  cm.setCursor(0, 6);
+  helpers.doKeys('i');
+  helpers.doInsertModeKeys('Backspace');
+  helpers.doKeys('');
+  helpers.doKeys('2', '.');
+  eq('zzce', cm.getValue());
+  helpers.assertCursorAt(0, 1);
+}, { value: 'zzabcde'});
+testVim('._visual_>', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('V', 'j', '>');
+  cm.setCursor(2, 0)
+  helpers.doKeys('.');
+  eq('  1\n  2\n  3\n  4', cm.getValue());
+  helpers.assertCursorAt(2, 2);
+}, { value: '1\n2\n3\n4'});
+testVim('f;', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('f', 'x');
+  helpers.doKeys(';');
+  helpers.doKeys('2', ';');
+  eq(9, cm.getCursor().ch);
+}, { value: '01x3xx678x'});
+testVim('F;', function(cm, vim, helpers) {
+  cm.setCursor(0, 8);
+  helpers.doKeys('F', 'x');
+  helpers.doKeys(';');
+  helpers.doKeys('2', ';');
+  eq(2, cm.getCursor().ch);
+}, { value: '01x3xx6x8x'});
+testVim('t;', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('t', 'x');
+  helpers.doKeys(';');
+  helpers.doKeys('2', ';');
+  eq(8, cm.getCursor().ch);
+}, { value: '01x3xx678x'});
+testVim('T;', function(cm, vim, helpers) {
+  cm.setCursor(0, 9);
+  helpers.doKeys('T', 'x');
+  helpers.doKeys(';');
+  helpers.doKeys('2', ';');
+  eq(2, cm.getCursor().ch);
+}, { value: '0xx3xx678x'});
+testVim('f,', function(cm, vim, helpers) {
+  cm.setCursor(0, 6);
+  helpers.doKeys('f', 'x');
+  helpers.doKeys(',');
+  helpers.doKeys('2', ',');
+  eq(2, cm.getCursor().ch);
+}, { value: '01x3xx678x'});
+testVim('F,', function(cm, vim, helpers) {
+  cm.setCursor(0, 3);
+  helpers.doKeys('F', 'x');
+  helpers.doKeys(',');
+  helpers.doKeys('2', ',');
+  eq(9, cm.getCursor().ch);
+}, { value: '01x3xx678x'});
+testVim('t,', function(cm, vim, helpers) {
+  cm.setCursor(0, 6);
+  helpers.doKeys('t', 'x');
+  helpers.doKeys(',');
+  helpers.doKeys('2', ',');
+  eq(3, cm.getCursor().ch);
+}, { value: '01x3xx678x'});
+testVim('T,', function(cm, vim, helpers) {
+  cm.setCursor(0, 4);
+  helpers.doKeys('T', 'x');
+  helpers.doKeys(',');
+  helpers.doKeys('2', ',');
+  eq(8, cm.getCursor().ch);
+}, { value: '01x3xx67xx'});
+testVim('fd,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('f', '4');
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', ';');
+  eq('56789', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 9);
+  helpers.doKeys('d', ',');
+  eq('01239', cm.getValue());
+}, { value: '0123456789'});
+testVim('Fd,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 9);
+  helpers.doKeys('F', '4');
+  cm.setCursor(0, 9);
+  helpers.doKeys('d', ';');
+  eq('01239', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', ',');
+  eq('56789', cm.getValue());
+}, { value: '0123456789'});
+testVim('td,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('t', '4');
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', ';');
+  eq('456789', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 9);
+  helpers.doKeys('d', ',');
+  eq('012349', cm.getValue());
+}, { value: '0123456789'});
+testVim('Td,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 9);
+  helpers.doKeys('T', '4');
+  cm.setCursor(0, 9);
+  helpers.doKeys('d', ';');
+  eq('012349', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 0);
+  helpers.doKeys('d', ',');
+  eq('456789', cm.getValue());
+}, { value: '0123456789'});
+testVim('fc,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('f', '4');
+  cm.setCursor(0, 0);
+  helpers.doKeys('c', ';', '');
+  eq('56789', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 9);
+  helpers.doKeys('c', ',');
+  eq('01239', cm.getValue());
+}, { value: '0123456789'});
+testVim('Fc,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 9);
+  helpers.doKeys('F', '4');
+  cm.setCursor(0, 9);
+  helpers.doKeys('c', ';', '');
+  eq('01239', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 0);
+  helpers.doKeys('c', ',');
+  eq('56789', cm.getValue());
+}, { value: '0123456789'});
+testVim('tc,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('t', '4');
+  cm.setCursor(0, 0);
+  helpers.doKeys('c', ';', '');
+  eq('456789', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 9);
+  helpers.doKeys('c', ',');
+  eq('012349', cm.getValue());
+}, { value: '0123456789'});
+testVim('Tc,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 9);
+  helpers.doKeys('T', '4');
+  cm.setCursor(0, 9);
+  helpers.doKeys('c', ';', '');
+  eq('012349', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 0);
+  helpers.doKeys('c', ',');
+  eq('456789', cm.getValue());
+}, { value: '0123456789'});
+testVim('fy,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('f', '4');
+  cm.setCursor(0, 0);
+  helpers.doKeys('y', ';', 'P');
+  eq('012340123456789', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 9);
+  helpers.doKeys('y', ',', 'P');
+  eq('012345678456789', cm.getValue());
+}, { value: '0123456789'});
+testVim('Fy,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 9);
+  helpers.doKeys('F', '4');
+  cm.setCursor(0, 9);
+  helpers.doKeys('y', ';', 'p');
+  eq('012345678945678', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 0);
+  helpers.doKeys('y', ',', 'P');
+  eq('012340123456789', cm.getValue());
+}, { value: '0123456789'});
+testVim('ty,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys('t', '4');
+  cm.setCursor(0, 0);
+  helpers.doKeys('y', ';', 'P');
+  eq('01230123456789', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 9);
+  helpers.doKeys('y', ',', 'p');
+  eq('01234567895678', cm.getValue());
+}, { value: '0123456789'});
+testVim('Ty,;', function(cm, vim, helpers) {
+  cm.setCursor(0, 9);
+  helpers.doKeys('T', '4');
+  cm.setCursor(0, 9);
+  helpers.doKeys('y', ';', 'p');
+  eq('01234567895678', cm.getValue());
+  helpers.doKeys('u');
+  cm.setCursor(0, 0);
+  helpers.doKeys('y', ',', 'P');
+  eq('01230123456789', cm.getValue());
+}, { value: '0123456789'});
+testVim('HML', function(cm, vim, helpers) {
+  var lines = 35;
+  var textHeight = cm.defaultTextHeight();
+  cm.setSize(600, lines*textHeight);
+  cm.setCursor(120, 0);
+  helpers.doKeys('H');
+  helpers.assertCursorAt(86, 2);
+  helpers.doKeys('L');
+  helpers.assertCursorAt(120, 4);
+  helpers.doKeys('M');
+  helpers.assertCursorAt(103,4);
+}, { value: (function(){
+  var lines = new Array(100);
+  var upper = '  xx\n';
+  var lower = '    xx\n';
+  upper = lines.join(upper);
+  lower = lines.join(lower);
+  return upper + lower;
+})()});
+
+var zVals = [];
+forEach(['zb','zz','zt','z-','z.','z'], function(e, idx){
+  var lineNum = 250;
+  var lines = 35;
+  testVim(e, function(cm, vim, helpers) {
+    var k1 = e[0];
+    var k2 = e.substring(1);
+    var textHeight = cm.defaultTextHeight();
+    cm.setSize(600, lines*textHeight);
+    cm.setCursor(lineNum, 0);
+    helpers.doKeys(k1, k2);
+    zVals[idx] = cm.getScrollInfo().top;
+  }, { value: (function(){
+    return new Array(500).join('\n');
+  })()});
+});
+testVim('zb_to_bottom', function(cm, vim, helpers){
+  var lineNum = 250;
+  cm.setSize(600, 35*cm.defaultTextHeight());
+  cm.setCursor(lineNum, 0);
+  helpers.doKeys('z', 'b');
+  var scrollInfo = cm.getScrollInfo();
+  eq(scrollInfo.top + scrollInfo.clientHeight, cm.charCoords(Pos(lineNum, 0), 'local').bottom);
+}, { value: (function(){
+  return new Array(500).join('\n');
+})()});
+testVim('zt_to_top', function(cm, vim, helpers){
+  var lineNum = 250;
+  cm.setSize(600, 35*cm.defaultTextHeight());
+  cm.setCursor(lineNum, 0);
+  helpers.doKeys('z', 't');
+  eq(cm.getScrollInfo().top, cm.charCoords(Pos(lineNum, 0), 'local').top);
+}, { value: (function(){
+  return new Array(500).join('\n');
+})()});
+testVim('zb', function(cm, vim, helpers){
+  eq(zVals[2], zVals[5]);
+});
+
+var moveTillCharacterSandbox =
+  'The quick brown fox \n';
+testVim('moveTillCharacter', function(cm, vim, helpers){
+  cm.setCursor(0, 0);
+  // Search for the 'q'.
+  cm.openDialog = helpers.fakeOpenDialog('q');
+  helpers.doKeys('/');
+  eq(4, cm.getCursor().ch);
+  // Jump to just before the first o in the list.
+  helpers.doKeys('t');
+  helpers.doKeys('o');
+  eq('The quick brown fox \n', cm.getValue());
+  // Delete that one character.
+  helpers.doKeys('d');
+  helpers.doKeys('t');
+  helpers.doKeys('o');
+  eq('The quick bown fox \n', cm.getValue());
+  // Delete everything until the next 'o'.
+  helpers.doKeys('.');
+  eq('The quick box \n', cm.getValue());
+  // An unmatched character should have no effect.
+  helpers.doKeys('d');
+  helpers.doKeys('t');
+  helpers.doKeys('q');
+  eq('The quick box \n', cm.getValue());
+  // Matches should only be possible on single lines.
+  helpers.doKeys('d');
+  helpers.doKeys('t');
+  helpers.doKeys('z');
+  eq('The quick box \n', cm.getValue());
+  // After all that, the search for 'q' should still be active, so the 'N' command
+  // can run it again in reverse. Use that to delete everything back to the 'q'.
+  helpers.doKeys('d');
+  helpers.doKeys('N');
+  eq('The ox \n', cm.getValue());
+  eq(4, cm.getCursor().ch);
+}, { value: moveTillCharacterSandbox});
+testVim('searchForPipe', function(cm, vim, helpers){
+  CodeMirror.Vim.setOption('pcre', false);
+  cm.setCursor(0, 0);
+  // Search for the '|'.
+  cm.openDialog = helpers.fakeOpenDialog('|');
+  helpers.doKeys('/');
+  eq(4, cm.getCursor().ch);
+}, { value: 'this|that'});
+
+
+var scrollMotionSandbox =
+  '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n';
+testVim('scrollMotion', function(cm, vim, helpers){
+  var prevCursor, prevScrollInfo;
+  cm.setCursor(0, 0);
+  // ctrl-y at the top of the file should have no effect.
+  helpers.doKeys('');
+  eq(0, cm.getCursor().line);
+  prevScrollInfo = cm.getScrollInfo();
+  helpers.doKeys('');
+  eq(1, cm.getCursor().line);
+  is(prevScrollInfo.top < cm.getScrollInfo().top);
+  // Jump to the end of the sandbox.
+  cm.setCursor(1000, 0);
+  prevCursor = cm.getCursor();
+  // ctrl-e at the bottom of the file should have no effect.
+  helpers.doKeys('');
+  eq(prevCursor.line, cm.getCursor().line);
+  prevScrollInfo = cm.getScrollInfo();
+  helpers.doKeys('');
+  eq(prevCursor.line - 1, cm.getCursor().line, "Y");
+  is(prevScrollInfo.top > cm.getScrollInfo().top);
+}, { value: scrollMotionSandbox});
+
+var squareBracketMotionSandbox = ''+
+  '({\n'+//0
+  '  ({\n'+//11
+  '  /*comment {\n'+//2
+  '            */(\n'+//3
+  '#else                \n'+//4
+  '  /*       )\n'+//5
+  '#if        }\n'+//6
+  '  )}*/\n'+//7
+  ')}\n'+//8
+  '{}\n'+//9
+  '#else {{\n'+//10
+  '{}\n'+//11
+  '}\n'+//12
+  '{\n'+//13
+  '#endif\n'+//14
+  '}\n'+//15
+  '}\n'+//16
+  '#else';//17
+testVim('[[, ]]', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys(']', ']');
+  helpers.assertCursorAt(9,0);
+  helpers.doKeys('2', ']', ']');
+  helpers.assertCursorAt(13,0);
+  helpers.doKeys(']', ']');
+  helpers.assertCursorAt(17,0);
+  helpers.doKeys('[', '[');
+  helpers.assertCursorAt(13,0);
+  helpers.doKeys('2', '[', '[');
+  helpers.assertCursorAt(9,0);
+  helpers.doKeys('[', '[');
+  helpers.assertCursorAt(0,0);
+}, { value: squareBracketMotionSandbox});
+testVim('[], ][', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doKeys(']', '[');
+  helpers.assertCursorAt(12,0);
+  helpers.doKeys('2', ']', '[');
+  helpers.assertCursorAt(16,0);
+  helpers.doKeys(']', '[');
+  helpers.assertCursorAt(17,0);
+  helpers.doKeys('[', ']');
+  helpers.assertCursorAt(16,0);
+  helpers.doKeys('2', '[', ']');
+  helpers.assertCursorAt(12,0);
+  helpers.doKeys('[', ']');
+  helpers.assertCursorAt(0,0);
+}, { value: squareBracketMotionSandbox});
+testVim('[{, ]}', function(cm, vim, helpers) {
+  cm.setCursor(4, 10);
+  helpers.doKeys('[', '{');
+  helpers.assertCursorAt(2,12);
+  helpers.doKeys('2', '[', '{');
+  helpers.assertCursorAt(0,1);
+  cm.setCursor(4, 10);
+  helpers.doKeys(']', '}');
+  helpers.assertCursorAt(6,11);
+  helpers.doKeys('2', ']', '}');
+  helpers.assertCursorAt(8,1);
+  cm.setCursor(0,1);
+  helpers.doKeys(']', '}');
+  helpers.assertCursorAt(8,1);
+  helpers.doKeys('[', '{');
+  helpers.assertCursorAt(0,1);
+}, { value: squareBracketMotionSandbox});
+testVim('[(, ])', function(cm, vim, helpers) {
+  cm.setCursor(4, 10);
+  helpers.doKeys('[', '(');
+  helpers.assertCursorAt(3,14);
+  helpers.doKeys('2', '[', '(');
+  helpers.assertCursorAt(0,0);
+  cm.setCursor(4, 10);
+  helpers.doKeys(']', ')');
+  helpers.assertCursorAt(5,11);
+  helpers.doKeys('2', ']', ')');
+  helpers.assertCursorAt(8,0);
+  helpers.doKeys('[', '(');
+  helpers.assertCursorAt(0,0);
+  helpers.doKeys(']', ')');
+  helpers.assertCursorAt(8,0);
+}, { value: squareBracketMotionSandbox});
+testVim('[*, ]*, [/, ]/', function(cm, vim, helpers) {
+  forEach(['*', '/'], function(key){
+    cm.setCursor(7, 0);
+    helpers.doKeys('2', '[', key);
+    helpers.assertCursorAt(2,2);
+    helpers.doKeys('2', ']', key);
+    helpers.assertCursorAt(7,5);
+  });
+}, { value: squareBracketMotionSandbox});
+testVim('[#, ]#', function(cm, vim, helpers) {
+  cm.setCursor(10, 3);
+  helpers.doKeys('2', '[', '#');
+  helpers.assertCursorAt(4,0);
+  helpers.doKeys('5', ']', '#');
+  helpers.assertCursorAt(17,0);
+  cm.setCursor(10, 3);
+  helpers.doKeys(']', '#');
+  helpers.assertCursorAt(14,0);
+}, { value: squareBracketMotionSandbox});
+testVim('[m, ]m, [M, ]M', function(cm, vim, helpers) {
+  cm.setCursor(11, 0);
+  helpers.doKeys('[', 'm');
+  helpers.assertCursorAt(10,7);
+  helpers.doKeys('4', '[', 'm');
+  helpers.assertCursorAt(1,3);
+  helpers.doKeys('5', ']', 'm');
+  helpers.assertCursorAt(11,0);
+  helpers.doKeys('[', 'M');
+  helpers.assertCursorAt(9,1);
+  helpers.doKeys('3', ']', 'M');
+  helpers.assertCursorAt(15,0);
+  helpers.doKeys('5', '[', 'M');
+  helpers.assertCursorAt(7,3);
+}, { value: squareBracketMotionSandbox});
+
+// Ex mode tests
+testVim('ex_go_to_line', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doEx('4');
+  helpers.assertCursorAt(3, 0);
+}, { value: 'a\nb\nc\nd\ne\n'});
+testVim('ex_write', function(cm, vim, helpers) {
+  var tmp = CodeMirror.commands.save;
+  var written;
+  var actualCm;
+  CodeMirror.commands.save = function(cm) {
+    written = true;
+    actualCm = cm;
+  };
+  // Test that w, wr, wri ... write all trigger :write.
+  var command = 'write';
+  for (var i = 1; i < command.length; i++) {
+    written = false;
+    actualCm = null;
+    helpers.doEx(command.substring(0, i));
+    eq(written, true);
+    eq(actualCm, cm);
+  }
+  CodeMirror.commands.save = tmp;
+});
+testVim('ex_sort', function(cm, vim, helpers) {
+  helpers.doEx('sort');
+  eq('Z\na\nb\nc\nd', cm.getValue());
+}, { value: 'b\nZ\nd\nc\na'});
+testVim('ex_sort_reverse', function(cm, vim, helpers) {
+  helpers.doEx('sort!');
+  eq('d\nc\nb\na', cm.getValue());
+}, { value: 'b\nd\nc\na'});
+testVim('ex_sort_range', function(cm, vim, helpers) {
+  helpers.doEx('2,3sort');
+  eq('b\nc\nd\na', cm.getValue());
+}, { value: 'b\nd\nc\na'});
+testVim('ex_sort_oneline', function(cm, vim, helpers) {
+  helpers.doEx('2sort');
+  // Expect no change.
+  eq('b\nd\nc\na', cm.getValue());
+}, { value: 'b\nd\nc\na'});
+testVim('ex_sort_ignoreCase', function(cm, vim, helpers) {
+  helpers.doEx('sort i');
+  eq('a\nb\nc\nd\nZ', cm.getValue());
+}, { value: 'b\nZ\nd\nc\na'});
+testVim('ex_sort_unique', function(cm, vim, helpers) {
+  helpers.doEx('sort u');
+  eq('Z\na\nb\nc\nd', cm.getValue());
+}, { value: 'b\nZ\na\na\nd\na\nc\na'});
+testVim('ex_sort_decimal', function(cm, vim, helpers) {
+  helpers.doEx('sort d');
+  eq('d3\n s5\n6\n.9', cm.getValue());
+}, { value: '6\nd3\n s5\n.9'});
+testVim('ex_sort_decimal_negative', function(cm, vim, helpers) {
+  helpers.doEx('sort d');
+  eq('z-9\nd3\n s5\n6\n.9', cm.getValue());
+}, { value: '6\nd3\n s5\n.9\nz-9'});
+testVim('ex_sort_decimal_reverse', function(cm, vim, helpers) {
+  helpers.doEx('sort! d');
+  eq('.9\n6\n s5\nd3', cm.getValue());
+}, { value: '6\nd3\n s5\n.9'});
+testVim('ex_sort_hex', function(cm, vim, helpers) {
+  helpers.doEx('sort x');
+  eq(' s5\n6\n.9\n&0xB\nd3', cm.getValue());
+}, { value: '6\nd3\n s5\n&0xB\n.9'});
+testVim('ex_sort_octal', function(cm, vim, helpers) {
+  helpers.doEx('sort o');
+  eq('.8\n.9\nd3\n s5\n6', cm.getValue());
+}, { value: '6\nd3\n s5\n.9\n.8'});
+testVim('ex_sort_decimal_mixed', function(cm, vim, helpers) {
+  helpers.doEx('sort d');
+  eq('y\nz\nc1\nb2\na3', cm.getValue());
+}, { value: 'a3\nz\nc1\ny\nb2'});
+testVim('ex_sort_decimal_mixed_reverse', function(cm, vim, helpers) {
+  helpers.doEx('sort! d');
+  eq('a3\nb2\nc1\nz\ny', cm.getValue());
+}, { value: 'a3\nz\nc1\ny\nb2'});
+testVim('ex_sort_patterns_not_supported', function(cm, vim, helpers) {
+  var notified = false;
+  cm.openNotification = helpers.fakeOpenNotification(function(text) {
+    notified = /patterns not supported/.test(text);
+  });
+  helpers.doEx('sort /abc/');
+  is(notified, 'No notification.');
+});
+// test for :global command
+testVim('ex_global', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  helpers.doEx('g/one/s//two');
+  eq('two two\n two two\n two two', cm.getValue());
+  helpers.doEx('1,2g/two/s//one');
+  eq('one one\n one one\n two two', cm.getValue());
+}, {value: 'one one\n one one\n one one'});
+testVim('ex_global_confirm', function(cm, vim, helpers) {
+  cm.setCursor(0, 0);
+  var onKeyDown;
+  var openDialogSave = cm.openDialog;
+  var KEYCODES = {
+    a: 65,
+    n: 78,
+    q: 81,
+    y: 89
+  };
+  // Intercept the ex command, 'global'
+  cm.openDialog = function(template, callback, options) {
+    // Intercept the prompt for the embedded ex command, 'substitute'
+    cm.openDialog = function(template, callback, options) {
+      onKeyDown = options.onKeyDown;
+    };
+    callback('g/one/s//two/gc');
+  };
+  helpers.doKeys(':');
+  var close = function() {};
+  onKeyDown({keyCode: KEYCODES.n}, '', close);
+  onKeyDown({keyCode: KEYCODES.y}, '', close);
+  onKeyDown({keyCode: KEYCODES.a}, '', close);
+  onKeyDown({keyCode: KEYCODES.q}, '', close);
+  onKeyDown({keyCode: KEYCODES.y}, '', close);
+  eq('one two\n two two\n one one\n two one\n one one', cm.getValue());
+}, {value: 'one one\n one one\n one one\n one one\n one one'});
+// Basic substitute tests.
+testVim('ex_substitute_same_line', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('s/one/two/g');
+  eq('one one\n two two', cm.getValue());
+}, { value: 'one one\n one one'});
+testVim('ex_substitute_full_file', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('%s/one/two/g');
+  eq('two two\n two two', cm.getValue());
+}, { value: 'one one\n one one'});
+testVim('ex_substitute_input_range', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  helpers.doEx('1,3s/\\d/0/g');
+  eq('0\n0\n0\n4', cm.getValue());
+}, { value: '1\n2\n3\n4' });
+testVim('ex_substitute_visual_range', function(cm, vim, helpers) {
+  cm.setCursor(1, 0);
+  // Set last visual mode selection marks '< and '> at lines 2 and 4
+  helpers.doKeys('V', '2', 'j', 'v');
+  helpers.doEx('\'<,\'>s/\\d/0/g');
+  eq('1\n0\n0\n0\n5', cm.getValue());
+}, { value: '1\n2\n3\n4\n5' });
+testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
+  // If the query is empty, use last query.
+  cm.setCursor(1, 0);
+  cm.openDialog = helpers.fakeOpenDialog('1');
+  helpers.doKeys('/');
+  helpers.doEx('s//b/g');
+  eq('abb ab2 ab3', cm.getValue());
+}, { value: 'a11 a12 a13' });
+testVim('ex_substitute_javascript', function(cm, vim, helpers) {
+  CodeMirror.Vim.setOption('pcre', false);
+  cm.setCursor(1, 0);
+  // Throw all the things that javascript likes to treat as special values
+  // into the replace part. All should be literal (this is VIM).
+  helpers.doEx('s/\\(\\d+\\)/$$ $\' $` $& \\1/g')
+  eq('a $$ $\' $` $& 0 b', cm.getValue());
+}, { value: 'a 0 b' });
+testVim('ex_substitute_empty_arguments', function(cm,vim,helpers) {
+  cm.setCursor(0, 0);
+  helpers.doEx('s/a/b/g');
+  cm.setCursor(1, 0);
+  helpers.doEx('s');
+  eq('b b\nb a', cm.getValue());
+}, {value: 'a a\na a'});
+
+// More complex substitute tests that test both pcre and nopcre options.
+function testSubstitute(name, options) {
+  testVim(name + '_pcre', function(cm, vim, helpers) {
+    cm.setCursor(1, 0);
+    CodeMirror.Vim.setOption('pcre', true);
+    helpers.doEx(options.expr);
+    eq(options.expectedValue, cm.getValue());
+  }, options);
+  // If no noPcreExpr is defined, assume that it's the same as the expr.
+  var noPcreExpr = options.noPcreExpr ? options.noPcreExpr : options.expr;
+  testVim(name + '_nopcre', function(cm, vim, helpers) {
+    cm.setCursor(1, 0);
+    CodeMirror.Vim.setOption('pcre', false);
+    helpers.doEx(noPcreExpr);
+    eq(options.expectedValue, cm.getValue());
+  }, options);
+}
+testSubstitute('ex_substitute_capture', {
+  value: 'a11 a12 a13',
+  expectedValue: 'a1111 a1212 a1313',
+  // $n is a backreference
+  expr: 's/(\\d+)/$1$1/g',
+  // \n is a backreference.
+  noPcreExpr: 's/\\(\\d+\\)/\\1\\1/g'});
+testSubstitute('ex_substitute_capture2', {
+  value: 'a 0 b',
+  expectedValue: 'a $00 b',
+  expr: 's/(\\d+)/$$$1$1/g',
+  noPcreExpr: 's/\\(\\d+\\)/$\\1\\1/g'});
+testSubstitute('ex_substitute_nocapture', {
+  value: 'a11 a12 a13',
+  expectedValue: 'a$1$1 a$1$1 a$1$1',
+  expr: 's/(\\d+)/$$1$$1/g',
+  noPcreExpr: 's/\\(\\d+\\)/$1$1/g'});
+testSubstitute('ex_substitute_nocapture2', {
+  value: 'a 0 b',
+  expectedValue: 'a $10 b',
+  expr: 's/(\\d+)/$$1$1/g',
+  noPcreExpr: 's/\\(\\d+\\)/\\$1\\1/g'});
+testSubstitute('ex_substitute_nocapture', {
+  value: 'a b c',
+  expectedValue: 'a $ c',
+  expr: 's/b/$$/',
+  noPcreExpr: 's/b/$/'});
+testSubstitute('ex_substitute_slash_regex', {
+  value: 'one/two \n three/four',
+  expectedValue: 'one|two \n three|four',
+  expr: '%s/\\//|'});
+testSubstitute('ex_substitute_pipe_regex', {
+  value: 'one|two \n three|four',
+  expectedValue: 'one,two \n three,four',
+  expr: '%s/\\|/,/',
+  noPcreExpr: '%s/|/,/'});
+testSubstitute('ex_substitute_or_regex', {
+  value: 'one|two \n three|four',
+  expectedValue: 'ana|twa \n thraa|faar',
+  expr: '%s/o|e|u/a/g',
+  noPcreExpr: '%s/o\\|e\\|u/a/g'});
+testSubstitute('ex_substitute_or_word_regex', {
+  value: 'one|two \n three|four',
+  expectedValue: 'five|five \n three|four',
+  expr: '%s/(one|two)/five/g',
+  noPcreExpr: '%s/\\(one\\|two\\)/five/g'});
+testSubstitute('ex_substitute_backslashslash_regex', {
+  value: 'one\\two \n three\\four',
+  expectedValue: 'one,two \n three,four',
+  expr: '%s/\\\\/,'});
+testSubstitute('ex_substitute_slash_replacement', {
+  value: 'one,two \n three,four',
+  expectedValue: 'one/two \n three/four',
+  expr: '%s/,/\\/'});
+testSubstitute('ex_substitute_backslash_replacement', {
+  value: 'one,two \n three,four',
+  expectedValue: 'one\\two \n three\\four',
+  expr: '%s/,/\\\\/g'});
+testSubstitute('ex_substitute_multibackslash_replacement', {
+  value: 'one,two \n three,four',
+  expectedValue: 'one\\\\\\\\two \n three\\\\\\\\four', // 2*8 backslashes.
+  expr: '%s/,/\\\\\\\\\\\\\\\\/g'}); // 16 backslashes.
+testSubstitute('ex_substitute_newline_replacement', {
+  value: 'one,two \n three,four',
+  expectedValue: 'one\ntwo \n three\nfour',
+  expr: '%s/,/\\n/g'});
+testSubstitute('ex_substitute_braces_word', {
+  value: 'ababab abb ab{2}',
+  expectedValue: 'ab abb ab{2}',
+  expr: '%s/(ab){2}//g',
+  noPcreExpr: '%s/\\(ab\\)\\{2\\}//g'});
+testSubstitute('ex_substitute_braces_range', {
+  value: 'a aa aaa aaaa',
+  expectedValue: 'a   a',
+  expr: '%s/a{2,3}//g',
+  noPcreExpr: '%s/a\\{2,3\\}//g'});
+testSubstitute('ex_substitute_braces_literal', {
+  value: 'ababab abb ab{2}',
+  expectedValue: 'ababab abb ',
+  expr: '%s/ab\\{2\\}//g',
+  noPcreExpr: '%s/ab{2}//g'});
+testSubstitute('ex_substitute_braces_char', {
+  value: 'ababab abb ab{2}',
+  expectedValue: 'ababab  ab{2}',
+  expr: '%s/ab{2}//g',
+  noPcreExpr: '%s/ab\\{2\\}//g'});
+testSubstitute('ex_substitute_braces_no_escape', {
+  value: 'ababab abb ab{2}',
+  expectedValue: 'ababab  ab{2}',
+  expr: '%s/ab{2}//g',
+  noPcreExpr: '%s/ab\\{2}//g'});
+testSubstitute('ex_substitute_count', {
+  value: '1\n2\n3\n4',
+  expectedValue: '1\n0\n0\n4',
+  expr: 's/\\d/0/i 2'});
+testSubstitute('ex_substitute_count_with_range', {
+  value: '1\n2\n3\n4',
+  expectedValue: '1\n2\n0\n0',
+  expr: '1,3s/\\d/0/ 3'});
+testSubstitute('ex_substitute_not_global', {
+  value: 'aaa\nbaa\ncaa',
+  expectedValue: 'xaa\nbxa\ncxa',
+  expr: '%s/a/x/'});
+function testSubstituteConfirm(name, command, initialValue, expectedValue, keys, finalPos) {
+  testVim(name, function(cm, vim, helpers) {
+    var savedOpenDialog = cm.openDialog;
+    var savedKeyName = CodeMirror.keyName;
+    var onKeyDown;
+    var recordedCallback;
+    var closed = true; // Start out closed, set false on second openDialog.
+    function close() {
+      closed = true;
+    }
+    // First openDialog should save callback.
+    cm.openDialog = function(template, callback, options) {
+      recordedCallback = callback;
+    }
+    // Do first openDialog.
+    helpers.doKeys(':');
+    // Second openDialog should save keyDown handler.
+    cm.openDialog = function(template, callback, options) {
+      onKeyDown = options.onKeyDown;
+      closed = false;
+    };
+    // Return the command to Vim and trigger second openDialog.
+    recordedCallback(command);
+    // The event should really use keyCode, but here just mock it out and use
+    // key and replace keyName to just return key.
+    CodeMirror.keyName = function (e) { return e.key; }
+    keys = keys.toUpperCase();
+    for (var i = 0; i < keys.length; i++) {
+      is(!closed);
+      onKeyDown({ key: keys.charAt(i) }, '', close);
+    }
+    try {
+      eq(expectedValue, cm.getValue());
+      helpers.assertCursorAt(finalPos);
+      is(closed);
+    } catch(e) {
+      throw e
+    } finally {
+      // Restore overriden functions.
+      CodeMirror.keyName = savedKeyName;
+      cm.openDialog = savedOpenDialog;
+    }
+  }, { value: initialValue });
+};
+testSubstituteConfirm('ex_substitute_confirm_emptydoc',
+    '%s/x/b/c', '', '', '', makeCursor(0, 0));
+testSubstituteConfirm('ex_substitute_confirm_nomatch',
+    '%s/x/b/c', 'ba a\nbab', 'ba a\nbab', '', makeCursor(0, 0));
+testSubstituteConfirm('ex_substitute_confirm_accept',
+    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'yyy', makeCursor(1, 1));
+testSubstituteConfirm('ex_substitute_confirm_random_keys',
+    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'ysdkywerty', makeCursor(1, 1));
+testSubstituteConfirm('ex_substitute_confirm_some',
+    '%s/a/b/cg', 'ba a\nbab', 'bb a\nbbb', 'yny', makeCursor(1, 1));
+testSubstituteConfirm('ex_substitute_confirm_all',
+    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'a', makeCursor(1, 1));
+testSubstituteConfirm('ex_substitute_confirm_accept_then_all',
+    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'ya', makeCursor(1, 1));
+testSubstituteConfirm('ex_substitute_confirm_quit',
+    '%s/a/b/cg', 'ba a\nbab', 'bb a\nbab', 'yq', makeCursor(0, 3));
+testSubstituteConfirm('ex_substitute_confirm_last',
+    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
+testSubstituteConfirm('ex_substitute_confirm_oneline',
+    '1s/a/b/cg', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
+testSubstituteConfirm('ex_substitute_confirm_range_accept',
+    '1,2s/a/b/cg', 'aa\na \na\na', 'bb\nb \na\na', 'yyy', makeCursor(1, 0));
+testSubstituteConfirm('ex_substitute_confirm_range_some',
+    '1,3s/a/b/cg', 'aa\na \na\na', 'ba\nb \nb\na', 'ynyy', makeCursor(2, 0));
+testSubstituteConfirm('ex_substitute_confirm_range_all',
+    '1,3s/a/b/cg', 'aa\na \na\na', 'bb\nb \nb\na', 'a', makeCursor(2, 0));
+testSubstituteConfirm('ex_substitute_confirm_range_last',
+    '1,3s/a/b/cg', 'aa\na \na\na', 'bb\nb \na\na', 'yyl', makeCursor(1, 0));
+//:noh should clear highlighting of search-results but allow to resume search through n
+testVim('ex_noh_clearSearchHighlight', function(cm, vim, helpers) {
+  cm.openDialog = helpers.fakeOpenDialog('match');
+  helpers.doKeys('?');
+  helpers.doEx('noh');
+  eq(vim.searchState_.getOverlay(),null,'match-highlighting wasn\'t cleared');
+  helpers.doKeys('n');
+  helpers.assertCursorAt(0, 11,'can\'t resume search after clearing highlighting');
+}, { value: 'match nope match \n nope Match' });
+testVim('set_boolean', function(cm, vim, helpers) {
+  CodeMirror.Vim.defineOption('testoption', true, 'boolean');
+  // Test default value is set.
+  is(CodeMirror.Vim.getOption('testoption'));
+  try {
+    // Test fail to set to non-boolean
+    CodeMirror.Vim.setOption('testoption', '5');
+    fail();
+  } catch (expected) {};
+  // Test setOption
+  CodeMirror.Vim.setOption('testoption', false);
+  is(!CodeMirror.Vim.getOption('testoption'));
+});
+testVim('ex_set_boolean', function(cm, vim, helpers) {
+  CodeMirror.Vim.defineOption('testoption', true, 'boolean');
+  // Test default value is set.
+  is(CodeMirror.Vim.getOption('testoption'));
+  try {
+    // Test fail to set to non-boolean
+    helpers.doEx('set testoption=22');
+    fail();
+  } catch (expected) {};
+  // Test setOption
+  helpers.doEx('set notestoption');
+  is(!CodeMirror.Vim.getOption('testoption'));
+});
+testVim('set_string', function(cm, vim, helpers) {
+  CodeMirror.Vim.defineOption('testoption', 'a', 'string');
+  // Test default value is set.
+  eq('a', CodeMirror.Vim.getOption('testoption'));
+  try {
+    // Test fail to set non-string.
+    CodeMirror.Vim.setOption('testoption', true);
+    fail();
+  } catch (expected) {};
+  try {
+    // Test fail to set 'notestoption'
+    CodeMirror.Vim.setOption('notestoption', 'b');
+    fail();
+  } catch (expected) {};
+  // Test setOption
+  CodeMirror.Vim.setOption('testoption', 'c');
+  eq('c', CodeMirror.Vim.getOption('testoption'));
+});
+testVim('ex_set_string', function(cm, vim, helpers) {
+  CodeMirror.Vim.defineOption('testopt', 'a', 'string');
+  // Test default value is set.
+  eq('a', CodeMirror.Vim.getOption('testopt'));
+  try {
+    // Test fail to set 'notestopt'
+    helpers.doEx('set notestopt=b');
+    fail();
+  } catch (expected) {};
+  // Test setOption
+  helpers.doEx('set testopt=c')
+  eq('c', CodeMirror.Vim.getOption('testopt'));
+  helpers.doEx('set testopt=c')
+  eq('c', CodeMirror.Vim.getOption('testopt', cm)); //local || global
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'})); // local
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'})); // global
+  eq('c', CodeMirror.Vim.getOption('testopt')); // global
+  // Test setOption global
+  helpers.doEx('setg testopt=d')
+  eq('c', CodeMirror.Vim.getOption('testopt', cm));
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
+  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
+  eq('d', CodeMirror.Vim.getOption('testopt'));
+  // Test setOption local
+  helpers.doEx('setl testopt=e')
+  eq('e', CodeMirror.Vim.getOption('testopt', cm));
+  eq('e', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
+  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
+  eq('d', CodeMirror.Vim.getOption('testopt'));
+});
+testVim('ex_set_callback', function(cm, vim, helpers) {
+  var global;
+
+  function cb(val, cm, cfg) {
+    if (val === undefined) {
+      // Getter
+      if (cm) {
+        return cm._local;
+      } else {
+        return global;
+      }
+    } else {
+      // Setter
+      if (cm) {
+        cm._local = val;
+      } else {
+        global = val;
+      }
+    }
+  }
+
+  CodeMirror.Vim.defineOption('testopt', 'a', 'string', cb);
+  // Test default value is set.
+  eq('a', CodeMirror.Vim.getOption('testopt'));
+  try {
+    // Test fail to set 'notestopt'
+    helpers.doEx('set notestopt=b');
+    fail();
+  } catch (expected) {};
+  // Test setOption (Identical to the string tests, but via callback instead)
+  helpers.doEx('set testopt=c')
+  eq('c', CodeMirror.Vim.getOption('testopt', cm)); //local || global
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'})); // local
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'})); // global
+  eq('c', CodeMirror.Vim.getOption('testopt')); // global
+  // Test setOption global
+  helpers.doEx('setg testopt=d')
+  eq('c', CodeMirror.Vim.getOption('testopt', cm));
+  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
+  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
+  eq('d', CodeMirror.Vim.getOption('testopt'));
+  // Test setOption local
+  helpers.doEx('setl testopt=e')
+  eq('e', CodeMirror.Vim.getOption('testopt', cm));
+  eq('e', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
+  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
+  eq('d', CodeMirror.Vim.getOption('testopt'));
+})
+testVim('ex_set_filetype', function(cm, vim, helpers) {
+  CodeMirror.defineMode('test_mode', function() {
+    return {token: function(stream) {
+      stream.match(/^\s+|^\S+/);
+    }};
+  });
+  CodeMirror.defineMode('test_mode_2', function() {
+    return {token: function(stream) {
+      stream.match(/^\s+|^\S+/);
+    }};
+  });
+  // Test mode is set.
+  helpers.doEx('set filetype=test_mode');
+  eq('test_mode', cm.getMode().name);
+  // Test 'ft' alias also sets mode.
+  helpers.doEx('set ft=test_mode_2');
+  eq('test_mode_2', cm.getMode().name);
+});
+testVim('ex_set_filetype_null', function(cm, vim, helpers) {
+  CodeMirror.defineMode('test_mode', function() {
+    return {token: function(stream) {
+      stream.match(/^\s+|^\S+/);
+    }};
+  });
+  cm.setOption('mode', 'test_mode');
+  // Test mode is set to null.
+  helpers.doEx('set filetype=');
+  eq('null', cm.getMode().name);
+});
+// TODO: Reset key maps after each test.
+testVim('ex_map_key2key', function(cm, vim, helpers) {
+  helpers.doEx('map a x');
+  helpers.doKeys('a');
+  helpers.assertCursorAt(0, 0);
+  eq('bc', cm.getValue());
+}, { value: 'abc' });
+testVim('ex_unmap_key2key', function(cm, vim, helpers) {
+  helpers.doEx('unmap a');
+  helpers.doKeys('a');
+  eq('vim-insert', cm.getOption('keyMap'));
+}, { value: 'abc' });
+testVim('ex_unmap_key2key_does_not_remove_default', function(cm, vim, helpers) {
+  try {
+    helpers.doEx('unmap a');
+    fail();
+  } catch (expected) {}
+  helpers.doKeys('a');
+  eq('vim-insert', cm.getOption('keyMap'));
+}, { value: 'abc' });
+testVim('ex_map_key2key_to_colon', function(cm, vim, helpers) {
+  helpers.doEx('map ; :');
+  var dialogOpened = false;
+  cm.openDialog = function() {
+    dialogOpened = true;
+  }
+  helpers.doKeys(';');
+  eq(dialogOpened, true);
+});
+testVim('ex_map_ex2key:', function(cm, vim, helpers) {
+  helpers.doEx('map :del x');
+  helpers.doEx('del');
+  helpers.assertCursorAt(0, 0);
+  eq('bc', cm.getValue());
+}, { value: 'abc' });
+testVim('ex_map_ex2ex', function(cm, vim, helpers) {
+  helpers.doEx('map :del :w');
+  var tmp = CodeMirror.commands.save;
+  var written = false;
+  var actualCm;
+  CodeMirror.commands.save = function(cm) {
+    written = true;
+    actualCm = cm;
+  };
+  helpers.doEx('del');
+  CodeMirror.commands.save = tmp;
+  eq(written, true);
+  eq(actualCm, cm);
+});
+testVim('ex_map_key2ex', function(cm, vim, helpers) {
+  helpers.doEx('map a :w');
+  var tmp = CodeMirror.commands.save;
+  var written = false;
+  var actualCm;
+  CodeMirror.commands.save = function(cm) {
+    written = true;
+    actualCm = cm;
+  };
+  helpers.doKeys('a');
+  CodeMirror.commands.save = tmp;
+  eq(written, true);
+  eq(actualCm, cm);
+});
+testVim('ex_map_key2key_visual_api', function(cm, vim, helpers) {
+  CodeMirror.Vim.map('b', ':w', 'visual');
+  var tmp = CodeMirror.commands.save;
+  var written = false;
+  var actualCm;
+  CodeMirror.commands.save = function(cm) {
+    written = true;
+    actualCm = cm;
+  };
+  // Mapping should not work in normal mode.
+  helpers.doKeys('b');
+  eq(written, false);
+  // Mapping should work in visual mode.
+  helpers.doKeys('v', 'b');
+  eq(written, true);
+  eq(actualCm, cm);
+
+  CodeMirror.commands.save = tmp;
+});
+testVim('ex_imap', function(cm, vim, helpers) {
+  CodeMirror.Vim.map('jk', '', 'insert');
+  helpers.doKeys('i');
+  is(vim.insertMode);
+  helpers.doKeys('j', 'k');
+  is(!vim.insertMode);
+});
+testVim('ex_unmap_api', function(cm, vim, helpers) {
+  CodeMirror.Vim.map('', 'gg', 'normal');
+  is(CodeMirror.Vim.handleKey(cm, "", "normal"), "Alt-X key is mapped");
+  CodeMirror.Vim.unmap("", "normal");
+  is(!CodeMirror.Vim.handleKey(cm, "", "normal"), "Alt-X key is unmapped");
+});
+
+// Testing registration of functions as ex-commands and mapping to -keys
+testVim('ex_api_test', function(cm, vim, helpers) {
+  var res=false;
+  var val='from';
+  CodeMirror.Vim.defineEx('extest','ext',function(cm,params){
+    if(params.args)val=params.args[0];
+    else res=true;
+  });
+  helpers.doEx(':ext to');
+  eq(val,'to','Defining ex-command failed');
+  CodeMirror.Vim.map('',':ext');
+  helpers.doKeys('','');
+  is(res,'Mapping to key failed');
+});
+// For now, this test needs to be last because it messes up : for future tests.
+testVim('ex_map_key2key_from_colon', function(cm, vim, helpers) {
+  helpers.doEx('map : x');
+  helpers.doKeys(':');
+  helpers.assertCursorAt(0, 0);
+  eq('bc', cm.getValue());
+}, { value: 'abc' });
+
+// Test event handlers
+testVim('beforeSelectionChange', function(cm, vim, helpers) {
+  cm.setCursor(0, 100);
+  eqPos(cm.getCursor('head'), cm.getCursor('anchor'));
+}, { value: 'abc' });
+
+
diff --git a/www/code/codemirror-5.13.2/theme/3024-day.css b/www/code/codemirror-5.13.2/theme/3024-day.css
new file mode 100644
index 000000000..713265530
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/3024-day.css
@@ -0,0 +1,41 @@
+/*
+
+    Name:       3024 day
+    Author:     Jan T. Sott (http://github.com/idleberg)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-3024-day.CodeMirror { background: #f7f7f7; color: #3a3432; }
+.cm-s-3024-day div.CodeMirror-selected { background: #d6d5d4; }
+
+.cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
+.cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }
+
+.cm-s-3024-day .CodeMirror-gutters { background: #f7f7f7; border-right: 0px; }
+.cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
+.cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
+.cm-s-3024-day .CodeMirror-linenumber { color: #807d7c; }
+
+.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855; }
+
+.cm-s-3024-day span.cm-comment { color: #cdab53; }
+.cm-s-3024-day span.cm-atom { color: #a16a94; }
+.cm-s-3024-day span.cm-number { color: #a16a94; }
+
+.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute { color: #01a252; }
+.cm-s-3024-day span.cm-keyword { color: #db2d20; }
+.cm-s-3024-day span.cm-string { color: #fded02; }
+
+.cm-s-3024-day span.cm-variable { color: #01a252; }
+.cm-s-3024-day span.cm-variable-2 { color: #01a0e4; }
+.cm-s-3024-day span.cm-def { color: #e8bbd0; }
+.cm-s-3024-day span.cm-bracket { color: #3a3432; }
+.cm-s-3024-day span.cm-tag { color: #db2d20; }
+.cm-s-3024-day span.cm-link { color: #a16a94; }
+.cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
+
+.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }
diff --git a/www/code/codemirror-5.13.2/theme/3024-night.css b/www/code/codemirror-5.13.2/theme/3024-night.css
new file mode 100644
index 000000000..adc5900ad
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/3024-night.css
@@ -0,0 +1,39 @@
+/*
+
+    Name:       3024 night
+    Author:     Jan T. Sott (http://github.com/idleberg)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-3024-night.CodeMirror { background: #090300; color: #d6d5d4; }
+.cm-s-3024-night div.CodeMirror-selected { background: #3a3432; }
+.cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
+.cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
+.cm-s-3024-night .CodeMirror-gutters { background: #090300; border-right: 0px; }
+.cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
+.cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
+.cm-s-3024-night .CodeMirror-linenumber { color: #5c5855; }
+
+.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c; }
+
+.cm-s-3024-night span.cm-comment { color: #cdab53; }
+.cm-s-3024-night span.cm-atom { color: #a16a94; }
+.cm-s-3024-night span.cm-number { color: #a16a94; }
+
+.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute { color: #01a252; }
+.cm-s-3024-night span.cm-keyword { color: #db2d20; }
+.cm-s-3024-night span.cm-string { color: #fded02; }
+
+.cm-s-3024-night span.cm-variable { color: #01a252; }
+.cm-s-3024-night span.cm-variable-2 { color: #01a0e4; }
+.cm-s-3024-night span.cm-def { color: #e8bbd0; }
+.cm-s-3024-night span.cm-bracket { color: #d6d5d4; }
+.cm-s-3024-night span.cm-tag { color: #db2d20; }
+.cm-s-3024-night span.cm-link { color: #a16a94; }
+.cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
+
+.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
+.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/abcdef.css b/www/code/codemirror-5.13.2/theme/abcdef.css
new file mode 100644
index 000000000..7f9d78870
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/abcdef.css
@@ -0,0 +1,32 @@
+.cm-s-abcdef.CodeMirror { background: #0f0f0f; color: #defdef; }
+.cm-s-abcdef div.CodeMirror-selected { background: #515151; }
+.cm-s-abcdef .CodeMirror-line::selection, .cm-s-abcdef .CodeMirror-line > span::selection, .cm-s-abcdef .CodeMirror-line > span > span::selection { background: rgba(56, 56, 56, 0.99); }
+.cm-s-abcdef .CodeMirror-line::-moz-selection, .cm-s-abcdef .CodeMirror-line > span::-moz-selection, .cm-s-abcdef .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 56, 56, 0.99); }
+.cm-s-abcdef .CodeMirror-gutters { background: #555; border-right: 2px solid #314151; }
+.cm-s-abcdef .CodeMirror-guttermarker { color: #222; }
+.cm-s-abcdef .CodeMirror-guttermarker-subtle { color: azure; }
+.cm-s-abcdef .CodeMirror-linenumber { color: #FFFFFF; }
+.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00; }
+
+.cm-s-abcdef span.cm-keyword { color: darkgoldenrod; font-weight: bold; }
+.cm-s-abcdef span.cm-atom { color: #77F; }
+.cm-s-abcdef span.cm-number { color: violet; }
+.cm-s-abcdef span.cm-def { color: #fffabc; }
+.cm-s-abcdef span.cm-variable { color: #abcdef; }
+.cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
+.cm-s-abcdef span.cm-variable-3 { color: #def; }
+.cm-s-abcdef span.cm-property { color: #fedcba; }
+.cm-s-abcdef span.cm-operator { color: #ff0; }
+.cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
+.cm-s-abcdef span.cm-string { color: #2b4; }
+.cm-s-abcdef span.cm-meta { color: #C9F; }
+.cm-s-abcdef span.cm-qualifier { color: #FFF700; }
+.cm-s-abcdef span.cm-builtin { color: #30aabc; }
+.cm-s-abcdef span.cm-bracket { color: #8a8a8a; }
+.cm-s-abcdef span.cm-tag { color: #FFDD44; }
+.cm-s-abcdef span.cm-attribute { color: #DDFF00; }
+.cm-s-abcdef span.cm-error { color: #FF0000; }
+.cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
+.cm-s-abcdef span.cm-link { color: blueviolet; }
+
+.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }
diff --git a/www/code/codemirror-5.13.2/theme/ambiance-mobile.css b/www/code/codemirror-5.13.2/theme/ambiance-mobile.css
new file mode 100644
index 000000000..88d332e1a
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/ambiance-mobile.css
@@ -0,0 +1,5 @@
+.cm-s-ambiance.CodeMirror {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
diff --git a/www/code/codemirror-5.13.2/theme/ambiance.css b/www/code/codemirror-5.13.2/theme/ambiance.css
new file mode 100644
index 000000000..bce344649
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/ambiance.css
@@ -0,0 +1,74 @@
+/* ambiance theme for codemirror */
+
+/* Color scheme */
+
+.cm-s-ambiance .cm-header { color: blue; }
+.cm-s-ambiance .cm-quote { color: #24C2C7; }
+
+.cm-s-ambiance .cm-keyword { color: #cda869; }
+.cm-s-ambiance .cm-atom { color: #CF7EA9; }
+.cm-s-ambiance .cm-number { color: #78CF8A; }
+.cm-s-ambiance .cm-def { color: #aac6e3; }
+.cm-s-ambiance .cm-variable { color: #ffb795; }
+.cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
+.cm-s-ambiance .cm-variable-3 { color: #faded3; }
+.cm-s-ambiance .cm-property { color: #eed1b3; }
+.cm-s-ambiance .cm-operator { color: #fa8d6a; }
+.cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
+.cm-s-ambiance .cm-string { color: #8f9d6a; }
+.cm-s-ambiance .cm-string-2 { color: #9d937c; }
+.cm-s-ambiance .cm-meta { color: #D2A8A1; }
+.cm-s-ambiance .cm-qualifier { color: yellow; }
+.cm-s-ambiance .cm-builtin { color: #9999cc; }
+.cm-s-ambiance .cm-bracket { color: #24C2C7; }
+.cm-s-ambiance .cm-tag { color: #fee4ff; }
+.cm-s-ambiance .cm-attribute { color: #9B859D; }
+.cm-s-ambiance .cm-hr { color: pink; }
+.cm-s-ambiance .cm-link { color: #F4C20B; }
+.cm-s-ambiance .cm-special { color: #FF9D00; }
+.cm-s-ambiance .cm-error { color: #AF2018; }
+
+.cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
+.cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
+
+.cm-s-ambiance div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
+.cm-s-ambiance.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance .CodeMirror-line::selection, .cm-s-ambiance .CodeMirror-line > span::selection, .cm-s-ambiance .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-ambiance .CodeMirror-line::-moz-selection, .cm-s-ambiance .CodeMirror-line > span::-moz-selection, .cm-s-ambiance .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+
+/* Editor styling */
+
+.cm-s-ambiance.CodeMirror {
+  line-height: 1.40em;
+  color: #E6E1DC;
+  background-color: #202020;
+  -webkit-box-shadow: inset 0 0 10px black;
+  -moz-box-shadow: inset 0 0 10px black;
+  box-shadow: inset 0 0 10px black;
+}
+
+.cm-s-ambiance .CodeMirror-gutters {
+  background: #3D3D3D;
+  border-right: 1px solid #4D4D4D;
+  box-shadow: 0 10px 20px black;
+}
+
+.cm-s-ambiance .CodeMirror-linenumber {
+  text-shadow: 0px 1px 1px #4d4d4d;
+  color: #111;
+  padding: 0 5px;
+}
+
+.cm-s-ambiance .CodeMirror-guttermarker { color: #aaa; }
+.cm-s-ambiance .CodeMirror-guttermarker-subtle { color: #111; }
+
+.cm-s-ambiance .CodeMirror-cursor { border-left: 1px solid #7991E8; }
+
+.cm-s-ambiance .CodeMirror-activeline-background {
+  background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
+}
+
+.cm-s-ambiance.CodeMirror,
+.cm-s-ambiance .CodeMirror-gutters {
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
+}
diff --git a/www/code/codemirror-5.13.2/theme/base16-dark.css b/www/code/codemirror-5.13.2/theme/base16-dark.css
new file mode 100644
index 000000000..026a81689
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/base16-dark.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Base16 Default Dark
+    Author:     Chris Kempson (http://chriskempson.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-base16-dark.CodeMirror { background: #151515; color: #e0e0e0; }
+.cm-s-base16-dark div.CodeMirror-selected { background: #303030; }
+.cm-s-base16-dark .CodeMirror-line::selection, .cm-s-base16-dark .CodeMirror-line > span::selection, .cm-s-base16-dark .CodeMirror-line > span > span::selection { background: rgba(48, 48, 48, .99); }
+.cm-s-base16-dark .CodeMirror-line::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(48, 48, 48, .99); }
+.cm-s-base16-dark .CodeMirror-gutters { background: #151515; border-right: 0px; }
+.cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
+.cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
+.cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
+.cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0; }
+
+.cm-s-base16-dark span.cm-comment { color: #8f5536; }
+.cm-s-base16-dark span.cm-atom { color: #aa759f; }
+.cm-s-base16-dark span.cm-number { color: #aa759f; }
+
+.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute { color: #90a959; }
+.cm-s-base16-dark span.cm-keyword { color: #ac4142; }
+.cm-s-base16-dark span.cm-string { color: #f4bf75; }
+
+.cm-s-base16-dark span.cm-variable { color: #90a959; }
+.cm-s-base16-dark span.cm-variable-2 { color: #6a9fb5; }
+.cm-s-base16-dark span.cm-def { color: #d28445; }
+.cm-s-base16-dark span.cm-bracket { color: #e0e0e0; }
+.cm-s-base16-dark span.cm-tag { color: #ac4142; }
+.cm-s-base16-dark span.cm-link { color: #aa759f; }
+.cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
+
+.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
+.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/base16-light.css b/www/code/codemirror-5.13.2/theme/base16-light.css
new file mode 100644
index 000000000..474e0ca9d
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/base16-light.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Base16 Default Light
+    Author:     Chris Kempson (http://chriskempson.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-base16-light.CodeMirror { background: #f5f5f5; color: #202020; }
+.cm-s-base16-light div.CodeMirror-selected { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-line::selection, .cm-s-base16-light .CodeMirror-line > span::selection, .cm-s-base16-light .CodeMirror-line > span > span::selection { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-line::-moz-selection, .cm-s-base16-light .CodeMirror-line > span::-moz-selection, .cm-s-base16-light .CodeMirror-line > span > span::-moz-selection { background: #e0e0e0; }
+.cm-s-base16-light .CodeMirror-gutters { background: #f5f5f5; border-right: 0px; }
+.cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
+.cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
+.cm-s-base16-light .CodeMirror-linenumber { color: #b0b0b0; }
+.cm-s-base16-light .CodeMirror-cursor { border-left: 1px solid #505050; }
+
+.cm-s-base16-light span.cm-comment { color: #8f5536; }
+.cm-s-base16-light span.cm-atom { color: #aa759f; }
+.cm-s-base16-light span.cm-number { color: #aa759f; }
+
+.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute { color: #90a959; }
+.cm-s-base16-light span.cm-keyword { color: #ac4142; }
+.cm-s-base16-light span.cm-string { color: #f4bf75; }
+
+.cm-s-base16-light span.cm-variable { color: #90a959; }
+.cm-s-base16-light span.cm-variable-2 { color: #6a9fb5; }
+.cm-s-base16-light span.cm-def { color: #d28445; }
+.cm-s-base16-light span.cm-bracket { color: #202020; }
+.cm-s-base16-light span.cm-tag { color: #ac4142; }
+.cm-s-base16-light span.cm-link { color: #aa759f; }
+.cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
+
+.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
+.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/bespin.css b/www/code/codemirror-5.13.2/theme/bespin.css
new file mode 100644
index 000000000..60913ba93
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/bespin.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Bespin
+    Author:     Mozilla / Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-bespin.CodeMirror {background: #28211c; color: #9d9b97;}
+.cm-s-bespin div.CodeMirror-selected {background: #36312e !important;}
+.cm-s-bespin .CodeMirror-gutters {background: #28211c; border-right: 0px;}
+.cm-s-bespin .CodeMirror-linenumber {color: #666666;}
+.cm-s-bespin .CodeMirror-cursor {border-left: 1px solid #797977 !important;}
+
+.cm-s-bespin span.cm-comment {color: #937121;}
+.cm-s-bespin span.cm-atom {color: #9b859d;}
+.cm-s-bespin span.cm-number {color: #9b859d;}
+
+.cm-s-bespin span.cm-property, .cm-s-bespin span.cm-attribute {color: #54be0d;}
+.cm-s-bespin span.cm-keyword {color: #cf6a4c;}
+.cm-s-bespin span.cm-string {color: #f9ee98;}
+
+.cm-s-bespin span.cm-variable {color: #54be0d;}
+.cm-s-bespin span.cm-variable-2 {color: #5ea6ea;}
+.cm-s-bespin span.cm-def {color: #cf7d34;}
+.cm-s-bespin span.cm-error {background: #cf6a4c; color: #797977;}
+.cm-s-bespin span.cm-bracket {color: #9d9b97;}
+.cm-s-bespin span.cm-tag {color: #cf6a4c;}
+.cm-s-bespin span.cm-link {color: #9b859d;}
+
+.cm-s-bespin .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-bespin .CodeMirror-activeline-background { background: #404040; }
diff --git a/www/code/codemirror-5.13.2/theme/blackboard.css b/www/code/codemirror-5.13.2/theme/blackboard.css
new file mode 100644
index 000000000..b6eaedb18
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/blackboard.css
@@ -0,0 +1,32 @@
+/* Port of TextMate's Blackboard theme */
+
+.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
+.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
+.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
+.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
+.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
+.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
+.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
+.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
+
+.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
+.cm-s-blackboard .cm-atom { color: #D8FA3C; }
+.cm-s-blackboard .cm-number { color: #D8FA3C; }
+.cm-s-blackboard .cm-def { color: #8DA6CE; }
+.cm-s-blackboard .cm-variable { color: #FF6400; }
+.cm-s-blackboard .cm-operator { color: #FBDE2D; }
+.cm-s-blackboard .cm-comment { color: #AEAEAE; }
+.cm-s-blackboard .cm-string { color: #61CE3C; }
+.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
+.cm-s-blackboard .cm-meta { color: #D8FA3C; }
+.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
+.cm-s-blackboard .cm-tag { color: #8DA6CE; }
+.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
+.cm-s-blackboard .cm-header { color: #FF6400; }
+.cm-s-blackboard .cm-hr { color: #AEAEAE; }
+.cm-s-blackboard .cm-link { color: #8DA6CE; }
+.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
+
+.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
+.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/cobalt.css b/www/code/codemirror-5.13.2/theme/cobalt.css
new file mode 100644
index 000000000..d88223ed8
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/cobalt.css
@@ -0,0 +1,25 @@
+.cm-s-cobalt.CodeMirror { background: #002240; color: white; }
+.cm-s-cobalt div.CodeMirror-selected { background: #b36539; }
+.cm-s-cobalt .CodeMirror-line::selection, .cm-s-cobalt .CodeMirror-line > span::selection, .cm-s-cobalt .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt .CodeMirror-line::-moz-selection, .cm-s-cobalt .CodeMirror-line > span::-moz-selection, .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
+.cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
+.cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-cobalt span.cm-comment { color: #08f; }
+.cm-s-cobalt span.cm-atom { color: #845dc4; }
+.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; }
+.cm-s-cobalt span.cm-keyword { color: #ffee80; }
+.cm-s-cobalt span.cm-string { color: #3ad900; }
+.cm-s-cobalt span.cm-meta { color: #ff9d00; }
+.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
+.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
+.cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
+.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
+.cm-s-cobalt span.cm-link { color: #845dc4; }
+.cm-s-cobalt span.cm-error { color: #9d1e15; }
+
+.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
+.cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/colorforth.css b/www/code/codemirror-5.13.2/theme/colorforth.css
new file mode 100644
index 000000000..606899f30
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/colorforth.css
@@ -0,0 +1,33 @@
+.cm-s-colorforth.CodeMirror { background: #000000; color: #f8f8f8; }
+.cm-s-colorforth .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-colorforth .CodeMirror-guttermarker { color: #FFBD40; }
+.cm-s-colorforth .CodeMirror-guttermarker-subtle { color: #78846f; }
+.cm-s-colorforth .CodeMirror-linenumber { color: #bababa; }
+.cm-s-colorforth .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-colorforth span.cm-comment     { color: #ededed; }
+.cm-s-colorforth span.cm-def         { color: #ff1c1c; font-weight:bold; }
+.cm-s-colorforth span.cm-keyword     { color: #ffd900; }
+.cm-s-colorforth span.cm-builtin     { color: #00d95a; }
+.cm-s-colorforth span.cm-variable    { color: #73ff00; }
+.cm-s-colorforth span.cm-string      { color: #007bff; }
+.cm-s-colorforth span.cm-number      { color: #00c4ff; }
+.cm-s-colorforth span.cm-atom        { color: #606060; }
+
+.cm-s-colorforth span.cm-variable-2  { color: #EEE; }
+.cm-s-colorforth span.cm-variable-3  { color: #DDD; }
+.cm-s-colorforth span.cm-property    {}
+.cm-s-colorforth span.cm-operator    {}
+
+.cm-s-colorforth span.cm-meta        { color: yellow; }
+.cm-s-colorforth span.cm-qualifier   { color: #FFF700; }
+.cm-s-colorforth span.cm-bracket     { color: #cc7; }
+.cm-s-colorforth span.cm-tag         { color: #FFBD40; }
+.cm-s-colorforth span.cm-attribute   { color: #FFF700; }
+.cm-s-colorforth span.cm-error       { color: #f00; }
+
+.cm-s-colorforth div.CodeMirror-selected { background: #333d53; }
+
+.cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
+
+.cm-s-colorforth .CodeMirror-activeline-background { background: #253540; }
diff --git a/www/code/codemirror-5.13.2/theme/dracula.css b/www/code/codemirror-5.13.2/theme/dracula.css
new file mode 100644
index 000000000..57f979ae6
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/dracula.css
@@ -0,0 +1,41 @@
+/*
+
+    Name:       dracula
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original dracula color scheme by Zeno Rocha (https://github.com/zenorocha/dracula-theme)
+
+*/
+
+
+.cm-s-dracula.CodeMirror, .cm-s-dracula .CodeMirror-gutters {
+  background-color: #282a36 !important;
+  color: #f8f8f2 !important;
+  border: none;
+}
+.cm-s-dracula .CodeMirror-gutters { color: #282a36; }
+.cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
+.cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
+.cm-s-dracula.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-dracula span.cm-comment { color: #6272a4; }
+.cm-s-dracula span.cm-string, .cm-s-dracula span.cm-string-2 { color: #f1fa8c; }
+.cm-s-dracula span.cm-number { color: #bd93f9; }
+.cm-s-dracula span.cm-variable { color: #50fa7b; }
+.cm-s-dracula span.cm-variable-2 { color: white; }
+.cm-s-dracula span.cm-def { color: #ffb86c; }
+.cm-s-dracula span.cm-keyword { color: #ff79c6; }
+.cm-s-dracula span.cm-operator { color: #ff79c6; }
+.cm-s-dracula span.cm-keyword { color: #ff79c6; }
+.cm-s-dracula span.cm-atom { color: #bd93f9; }
+.cm-s-dracula span.cm-meta { color: #f8f8f2; }
+.cm-s-dracula span.cm-tag { color: #ff79c6; }
+.cm-s-dracula span.cm-attribute { color: #50fa7b; }
+.cm-s-dracula span.cm-qualifier { color: #50fa7b; }
+.cm-s-dracula span.cm-property { color: #66d9ef; }
+.cm-s-dracula span.cm-builtin { color: #50fa7b; }
+.cm-s-dracula span.cm-variable-3 { color: #50fa7b; }
+
+.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
+.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/eclipse.css b/www/code/codemirror-5.13.2/theme/eclipse.css
new file mode 100644
index 000000000..1bde460e9
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/eclipse.css
@@ -0,0 +1,23 @@
+.cm-s-eclipse span.cm-meta { color: #FF1717; }
+.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
+.cm-s-eclipse span.cm-atom { color: #219; }
+.cm-s-eclipse span.cm-number { color: #164; }
+.cm-s-eclipse span.cm-def { color: #00f; }
+.cm-s-eclipse span.cm-variable { color: black; }
+.cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
+.cm-s-eclipse span.cm-variable-3 { color: #0000C0; }
+.cm-s-eclipse span.cm-property { color: black; }
+.cm-s-eclipse span.cm-operator { color: black; }
+.cm-s-eclipse span.cm-comment { color: #3F7F5F; }
+.cm-s-eclipse span.cm-string { color: #2A00FF; }
+.cm-s-eclipse span.cm-string-2 { color: #f50; }
+.cm-s-eclipse span.cm-qualifier { color: #555; }
+.cm-s-eclipse span.cm-builtin { color: #30a; }
+.cm-s-eclipse span.cm-bracket { color: #cc7; }
+.cm-s-eclipse span.cm-tag { color: #170; }
+.cm-s-eclipse span.cm-attribute { color: #00c; }
+.cm-s-eclipse span.cm-link { color: #219; }
+.cm-s-eclipse span.cm-error { color: #f00; }
+
+.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/www/code/codemirror-5.13.2/theme/elegant.css b/www/code/codemirror-5.13.2/theme/elegant.css
new file mode 100644
index 000000000..45b3ea655
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/elegant.css
@@ -0,0 +1,13 @@
+.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom { color: #762; }
+.cm-s-elegant span.cm-comment { color: #262; font-style: italic; line-height: 1em; }
+.cm-s-elegant span.cm-meta { color: #555; font-style: italic; line-height: 1em; }
+.cm-s-elegant span.cm-variable { color: black; }
+.cm-s-elegant span.cm-variable-2 { color: #b11; }
+.cm-s-elegant span.cm-qualifier { color: #555; }
+.cm-s-elegant span.cm-keyword { color: #730; }
+.cm-s-elegant span.cm-builtin { color: #30a; }
+.cm-s-elegant span.cm-link { color: #762; }
+.cm-s-elegant span.cm-error { background-color: #fdd; }
+
+.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/www/code/codemirror-5.13.2/theme/erlang-dark.css b/www/code/codemirror-5.13.2/theme/erlang-dark.css
new file mode 100644
index 000000000..65fe4814c
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/erlang-dark.css
@@ -0,0 +1,34 @@
+.cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
+.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539; }
+.cm-s-erlang-dark .CodeMirror-line::selection, .cm-s-erlang-dark .CodeMirror-line > span::selection, .cm-s-erlang-dark .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
+.cm-s-erlang-dark .CodeMirror-line::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
+.cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
+.cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
+.cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
+.cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
+.cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
+.cm-s-erlang-dark span.cm-builtin    { color: #eaa; }
+.cm-s-erlang-dark span.cm-comment    { color: #77f; }
+.cm-s-erlang-dark span.cm-def        { color: #e7a; }
+.cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
+.cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
+.cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
+.cm-s-erlang-dark span.cm-operator   { color: #d55; }
+.cm-s-erlang-dark span.cm-property   { color: #ccc; }
+.cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
+.cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
+.cm-s-erlang-dark span.cm-string     { color: #3ad900; }
+.cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
+.cm-s-erlang-dark span.cm-tag        { color: #9effff; }
+.cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
+.cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
+.cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
+.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
+
+.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
+.cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/hopscotch.css b/www/code/codemirror-5.13.2/theme/hopscotch.css
new file mode 100644
index 000000000..7d05431bd
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/hopscotch.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Hopscotch
+    Author:     Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-hopscotch.CodeMirror {background: #322931; color: #d5d3d5;}
+.cm-s-hopscotch div.CodeMirror-selected {background: #433b42 !important;}
+.cm-s-hopscotch .CodeMirror-gutters {background: #322931; border-right: 0px;}
+.cm-s-hopscotch .CodeMirror-linenumber {color: #797379;}
+.cm-s-hopscotch .CodeMirror-cursor {border-left: 1px solid #989498 !important;}
+
+.cm-s-hopscotch span.cm-comment {color: #b33508;}
+.cm-s-hopscotch span.cm-atom {color: #c85e7c;}
+.cm-s-hopscotch span.cm-number {color: #c85e7c;}
+
+.cm-s-hopscotch span.cm-property, .cm-s-hopscotch span.cm-attribute {color: #8fc13e;}
+.cm-s-hopscotch span.cm-keyword {color: #dd464c;}
+.cm-s-hopscotch span.cm-string {color: #fdcc59;}
+
+.cm-s-hopscotch span.cm-variable {color: #8fc13e;}
+.cm-s-hopscotch span.cm-variable-2 {color: #1290bf;}
+.cm-s-hopscotch span.cm-def {color: #fd8b19;}
+.cm-s-hopscotch span.cm-error {background: #dd464c; color: #989498;}
+.cm-s-hopscotch span.cm-bracket {color: #d5d3d5;}
+.cm-s-hopscotch span.cm-tag {color: #dd464c;}
+.cm-s-hopscotch span.cm-link {color: #c85e7c;}
+
+.cm-s-hopscotch .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-hopscotch .CodeMirror-activeline-background { background: #302020; }
diff --git a/www/code/codemirror-5.13.2/theme/icecoder.css b/www/code/codemirror-5.13.2/theme/icecoder.css
new file mode 100644
index 000000000..d70d26e82
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/icecoder.css
@@ -0,0 +1,43 @@
+/*
+ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
+*/
+
+.cm-s-icecoder { color: #666; background: #141612; }
+
+.cm-s-icecoder span.cm-keyword { color: #eee; font-weight:bold; }  /* off-white 1 */
+.cm-s-icecoder span.cm-atom { color: #e1c76e; }                    /* yellow */
+.cm-s-icecoder span.cm-number { color: #6cb5d9; }                  /* blue */
+.cm-s-icecoder span.cm-def { color: #b9ca4a; }                     /* green */
+
+.cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
+.cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
+.cm-s-icecoder span.cm-variable-3 { color: #f9602c; }              /* orange */
+
+.cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
+.cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
+.cm-s-icecoder span.cm-comment { color: #97a3aa; }                 /* grey-blue */
+
+.cm-s-icecoder span.cm-string { color: #b9ca4a; }                  /* green */
+.cm-s-icecoder span.cm-string-2 { color: #6cb5d9; }                /* blue */
+
+.cm-s-icecoder span.cm-meta { color: #555; }                       /* grey */
+
+.cm-s-icecoder span.cm-qualifier { color: #555; }                  /* grey */
+.cm-s-icecoder span.cm-builtin { color: #214e7b; }                 /* bright blue */
+.cm-s-icecoder span.cm-bracket { color: #cc7; }                    /* grey-yellow */
+
+.cm-s-icecoder span.cm-tag { color: #e8e8e8; }                     /* off-white 2 */
+.cm-s-icecoder span.cm-attribute { color: #099; }                  /* teal */
+
+.cm-s-icecoder span.cm-header { color: #6a0d6a; }                  /* purple-pink */
+.cm-s-icecoder span.cm-quote { color: #186718; }                   /* dark green */
+.cm-s-icecoder span.cm-hr { color: #888; }                         /* mid-grey */
+.cm-s-icecoder span.cm-link { color: #e1c76e; }                    /* yellow */
+.cm-s-icecoder span.cm-error { color: #d00; }                      /* red */
+
+.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-icecoder div.CodeMirror-selected { color: #fff; background: #037; }
+.cm-s-icecoder .CodeMirror-gutters { background: #141612; min-width: 41px; border-right: 0; }
+.cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
+.cm-s-icecoder .CodeMirror-matchingbracket { border: 1px solid grey; color: black !important; }
+.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }
\ No newline at end of file
diff --git a/www/code/codemirror-5.13.2/theme/isotope.css b/www/code/codemirror-5.13.2/theme/isotope.css
new file mode 100644
index 000000000..d0d6263cf
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/isotope.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Isotope
+    Author:     David Desandro / Jan T. Sott
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-isotope.CodeMirror {background: #000000; color: #e0e0e0;}
+.cm-s-isotope div.CodeMirror-selected {background: #404040 !important;}
+.cm-s-isotope .CodeMirror-gutters {background: #000000; border-right: 0px;}
+.cm-s-isotope .CodeMirror-linenumber {color: #808080;}
+.cm-s-isotope .CodeMirror-cursor {border-left: 1px solid #c0c0c0 !important;}
+
+.cm-s-isotope span.cm-comment {color: #3300ff;}
+.cm-s-isotope span.cm-atom {color: #cc00ff;}
+.cm-s-isotope span.cm-number {color: #cc00ff;}
+
+.cm-s-isotope span.cm-property, .cm-s-isotope span.cm-attribute {color: #33ff00;}
+.cm-s-isotope span.cm-keyword {color: #ff0000;}
+.cm-s-isotope span.cm-string {color: #ff0099;}
+
+.cm-s-isotope span.cm-variable {color: #33ff00;}
+.cm-s-isotope span.cm-variable-2 {color: #0066ff;}
+.cm-s-isotope span.cm-def {color: #ff9900;}
+.cm-s-isotope span.cm-error {background: #ff0000; color: #c0c0c0;}
+.cm-s-isotope span.cm-bracket {color: #e0e0e0;}
+.cm-s-isotope span.cm-tag {color: #ff0000;}
+.cm-s-isotope span.cm-link {color: #cc00ff;}
+
+.cm-s-isotope .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-isotope .CodeMirror-activeline-background { background: #202020; }
diff --git a/www/code/codemirror-5.13.2/theme/lesser-dark.css b/www/code/codemirror-5.13.2/theme/lesser-dark.css
new file mode 100644
index 000000000..690c183d7
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/lesser-dark.css
@@ -0,0 +1,47 @@
+/*
+http://lesscss.org/ dark theme
+Ported to CodeMirror by Peter Kroon
+*/
+.cm-s-lesser-dark {
+  line-height: 1.3em;
+}
+.cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
+.cm-s-lesser-dark div.CodeMirror-selected { background: #45443B; } /* 33322B*/
+.cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
+.cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
+.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
+
+.cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
+
+.cm-s-lesser-dark .CodeMirror-gutters { background: #262626; border-right:1px solid #aaa; }
+.cm-s-lesser-dark .CodeMirror-guttermarker { color: #599eff; }
+.cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
+
+.cm-s-lesser-dark span.cm-header { color: #a0a; }
+.cm-s-lesser-dark span.cm-quote { color: #090; }
+.cm-s-lesser-dark span.cm-keyword { color: #599eff; }
+.cm-s-lesser-dark span.cm-atom { color: #C2B470; }
+.cm-s-lesser-dark span.cm-number { color: #B35E4D; }
+.cm-s-lesser-dark span.cm-def { color: white; }
+.cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
+.cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
+.cm-s-lesser-dark span.cm-variable-3 { color: white; }
+.cm-s-lesser-dark span.cm-property { color: #92A75C; }
+.cm-s-lesser-dark span.cm-operator { color: #92A75C; }
+.cm-s-lesser-dark span.cm-comment { color: #666; }
+.cm-s-lesser-dark span.cm-string { color: #BCD279; }
+.cm-s-lesser-dark span.cm-string-2 { color: #f50; }
+.cm-s-lesser-dark span.cm-meta { color: #738C73; }
+.cm-s-lesser-dark span.cm-qualifier { color: #555; }
+.cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
+.cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
+.cm-s-lesser-dark span.cm-tag { color: #669199; }
+.cm-s-lesser-dark span.cm-attribute { color: #00c; }
+.cm-s-lesser-dark span.cm-hr { color: #999; }
+.cm-s-lesser-dark span.cm-link { color: #00c; }
+.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
+
+.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
+.cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/liquibyte.css b/www/code/codemirror-5.13.2/theme/liquibyte.css
new file mode 100644
index 000000000..9db8bde73
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/liquibyte.css
@@ -0,0 +1,95 @@
+.cm-s-liquibyte.CodeMirror {
+	background-color: #000;
+	color: #fff;
+	line-height: 1.2em;
+	font-size: 1em;
+}
+.cm-s-liquibyte .CodeMirror-focused .cm-matchhighlight {
+	text-decoration: underline;
+	text-decoration-color: #0f0;
+	text-decoration-style: wavy;
+}
+.cm-s-liquibyte .cm-trailingspace {
+	text-decoration: line-through;
+	text-decoration-color: #f00;
+	text-decoration-style: dotted;
+}
+.cm-s-liquibyte .cm-tab {
+	text-decoration: line-through;
+	text-decoration-color: #404040;
+	text-decoration-style: dotted;
+}
+.cm-s-liquibyte .CodeMirror-gutters { background-color: #262626; border-right: 1px solid #505050; padding-right: 0.8em; }
+.cm-s-liquibyte .CodeMirror-gutter-elt div { font-size: 1.2em; }
+.cm-s-liquibyte .CodeMirror-guttermarker {  }
+.cm-s-liquibyte .CodeMirror-guttermarker-subtle {  }
+.cm-s-liquibyte .CodeMirror-linenumber { color: #606060; padding-left: 0; }
+.cm-s-liquibyte .CodeMirror-cursor { border-left: 1px solid #eee; }
+
+.cm-s-liquibyte span.cm-comment     { color: #008000; }
+.cm-s-liquibyte span.cm-def         { color: #ffaf40; font-weight: bold; }
+.cm-s-liquibyte span.cm-keyword     { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-builtin     { color: #ffaf40; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable    { color: #5967ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-string      { color: #ff8000; }
+.cm-s-liquibyte span.cm-number      { color: #0f0; font-weight: bold; }
+.cm-s-liquibyte span.cm-atom        { color: #bf3030; font-weight: bold; }
+
+.cm-s-liquibyte span.cm-variable-2  { color: #007f7f; font-weight: bold; }
+.cm-s-liquibyte span.cm-variable-3  { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
+.cm-s-liquibyte span.cm-operator    { color: #fff; }
+
+.cm-s-liquibyte span.cm-meta        { color: #0f0; }
+.cm-s-liquibyte span.cm-qualifier   { color: #fff700; font-weight: bold; }
+.cm-s-liquibyte span.cm-bracket     { color: #cc7; }
+.cm-s-liquibyte span.cm-tag         { color: #ff0; font-weight: bold; }
+.cm-s-liquibyte span.cm-attribute   { color: #c080ff; font-weight: bold; }
+.cm-s-liquibyte span.cm-error       { color: #f00; }
+
+.cm-s-liquibyte div.CodeMirror-selected { background-color: rgba(255, 0, 0, 0.25); }
+
+.cm-s-liquibyte span.cm-compilation { background-color: rgba(255, 255, 255, 0.12); }
+
+.cm-s-liquibyte .CodeMirror-activeline-background { background-color: rgba(0, 255, 0, 0.15); }
+
+/* Default styles for common addons */
+.cm-s-liquibyte .CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
+.cm-s-liquibyte .CodeMirror span.CodeMirror-nonmatchingbracket { color: #f00; font-weight: bold; }
+.CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
+/* Scrollbars */
+/* Simple */
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div:hover, div.CodeMirror-simplescroll-vertical div:hover {
+	background-color: rgba(80, 80, 80, .7);
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div, div.CodeMirror-simplescroll-vertical div {
+	background-color: rgba(80, 80, 80, .3);
+	border: 1px solid #404040;
+	border-radius: 5px;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-vertical div {
+	border-top: 1px solid #404040;
+	border-bottom: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal div {
+	border-left: 1px solid #404040;
+	border-right: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-vertical {
+	background-color: #262626;
+}
+.cm-s-liquibyte div.CodeMirror-simplescroll-horizontal {
+	background-color: #262626;
+	border-top: 1px solid #404040;
+}
+/* Overlay */
+.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div, div.CodeMirror-overlayscroll-vertical div {
+	background-color: #404040;
+	border-radius: 5px;
+}
+.cm-s-liquibyte div.CodeMirror-overlayscroll-vertical div {
+	border: 1px solid #404040;
+}
+.cm-s-liquibyte div.CodeMirror-overlayscroll-horizontal div {
+	border: 1px solid #404040;
+}
diff --git a/www/code/codemirror-5.13.2/theme/material.css b/www/code/codemirror-5.13.2/theme/material.css
new file mode 100644
index 000000000..91ed6cef2
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/material.css
@@ -0,0 +1,53 @@
+/*
+
+    Name:       material
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original material color scheme by Mattia Astorino (https://github.com/equinusocio/material-theme)
+
+*/
+
+.cm-s-material {
+  background-color: #263238;
+  color: rgba(233, 237, 237, 1);
+}
+.cm-s-material .CodeMirror-gutters {
+  background: #263238;
+  color: rgb(83,127,126);
+  border: none;
+}
+.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); }
+.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+.cm-s-material div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
+.cm-s-material.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+
+.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); }
+.cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
+.cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
+.cm-s-material .cm-variable-2 { color: #80CBC4; }
+.cm-s-material .cm-variable-3 { color: #82B1FF; }
+.cm-s-material .cm-builtin { color: #DECB6B; }
+.cm-s-material .cm-atom { color: #F77669; }
+.cm-s-material .cm-number { color: #F77669; }
+.cm-s-material .cm-def { color: rgba(233, 237, 237, 1); }
+.cm-s-material .cm-string { color: #C3E88D; }
+.cm-s-material .cm-string-2 { color: #80CBC4; }
+.cm-s-material .cm-comment { color: #546E7A; }
+.cm-s-material .cm-variable { color: #82B1FF; }
+.cm-s-material .cm-tag { color: #80CBC4; }
+.cm-s-material .cm-meta { color: #80CBC4; }
+.cm-s-material .cm-attribute { color: #FFCB6B; }
+.cm-s-material .cm-property { color: #80CBAE; }
+.cm-s-material .cm-qualifier { color: #DECB6B; }
+.cm-s-material .cm-variable-3 { color: #DECB6B; }
+.cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
+.cm-s-material .cm-error {
+  color: rgba(255, 255, 255, 1.0);
+  background-color: #EC5F67;
+}
+.cm-s-material .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/www/code/codemirror-5.13.2/theme/mbo.css b/www/code/codemirror-5.13.2/theme/mbo.css
new file mode 100644
index 000000000..e164fcf42
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/mbo.css
@@ -0,0 +1,37 @@
+/****************************************************************/
+/*   Based on mbonaci's Brackets mbo theme                      */
+/*   https://github.com/mbonaci/global/blob/master/Mbo.tmTheme  */
+/*   Create your own: http://tmtheme-editor.herokuapp.com       */
+/****************************************************************/
+
+.cm-s-mbo.CodeMirror { background: #2c2c2c; color: #ffffec; }
+.cm-s-mbo div.CodeMirror-selected { background: #716C62; }
+.cm-s-mbo .CodeMirror-line::selection, .cm-s-mbo .CodeMirror-line > span::selection, .cm-s-mbo .CodeMirror-line > span > span::selection { background: rgba(113, 108, 98, .99); }
+.cm-s-mbo .CodeMirror-line::-moz-selection, .cm-s-mbo .CodeMirror-line > span::-moz-selection, .cm-s-mbo .CodeMirror-line > span > span::-moz-selection { background: rgba(113, 108, 98, .99); }
+.cm-s-mbo .CodeMirror-gutters { background: #4e4e4e; border-right: 0px; }
+.cm-s-mbo .CodeMirror-guttermarker { color: white; }
+.cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
+.cm-s-mbo .CodeMirror-linenumber { color: #dadada; }
+.cm-s-mbo .CodeMirror-cursor { border-left: 1px solid #ffffec; }
+
+.cm-s-mbo span.cm-comment { color: #95958a; }
+.cm-s-mbo span.cm-atom { color: #00a8c6; }
+.cm-s-mbo span.cm-number { color: #00a8c6; }
+
+.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute { color: #9ddfe9; }
+.cm-s-mbo span.cm-keyword { color: #ffb928; }
+.cm-s-mbo span.cm-string { color: #ffcf6c; }
+.cm-s-mbo span.cm-string.cm-property { color: #ffffec; }
+
+.cm-s-mbo span.cm-variable { color: #ffffec; }
+.cm-s-mbo span.cm-variable-2 { color: #00a8c6; }
+.cm-s-mbo span.cm-def { color: #ffffec; }
+.cm-s-mbo span.cm-bracket { color: #fffffc; font-weight: bold; }
+.cm-s-mbo span.cm-tag { color: #9ddfe9; }
+.cm-s-mbo span.cm-link { color: #f54b07; }
+.cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
+.cm-s-mbo span.cm-qualifier { color: #ffffec; }
+
+.cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
+.cm-s-mbo .CodeMirror-matchingbracket { color: #ffb928 !important; }
+.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
diff --git a/www/code/codemirror-5.13.2/theme/mdn-like.css b/www/code/codemirror-5.13.2/theme/mdn-like.css
new file mode 100644
index 000000000..f325d4500
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/mdn-like.css
@@ -0,0 +1,46 @@
+/*
+  MDN-LIKE Theme - Mozilla
+  Ported to CodeMirror by Peter Kroon 
+  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
+  GitHub: @peterkroon
+
+  The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation
+
+*/
+.cm-s-mdn-like.CodeMirror { color: #999; background-color: #fff; }
+.cm-s-mdn-like div.CodeMirror-selected { background: #cfc; }
+.cm-s-mdn-like .CodeMirror-line::selection, .cm-s-mdn-like .CodeMirror-line > span::selection, .cm-s-mdn-like .CodeMirror-line > span > span::selection { background: #cfc; }
+.cm-s-mdn-like .CodeMirror-line::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span > span::-moz-selection { background: #cfc; }
+
+.cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
+.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; padding-left: 8px; }
+.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
+
+.cm-s-mdn-like .cm-keyword { color: #6262FF; }
+.cm-s-mdn-like .cm-atom { color: #F90; }
+.cm-s-mdn-like .cm-number { color:  #ca7841; }
+.cm-s-mdn-like .cm-def { color: #8DA6CE; }
+.cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; }
+.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def { color: #07a; }
+
+.cm-s-mdn-like .cm-variable { color: #07a; }
+.cm-s-mdn-like .cm-property { color: #905; }
+.cm-s-mdn-like .cm-qualifier { color: #690; }
+
+.cm-s-mdn-like .cm-operator { color: #cda869; }
+.cm-s-mdn-like .cm-comment { color:#777; font-weight:normal; }
+.cm-s-mdn-like .cm-string { color:#07a; font-style:italic; }
+.cm-s-mdn-like .cm-string-2 { color:#bd6b18; } /*?*/
+.cm-s-mdn-like .cm-meta { color: #000; } /*?*/
+.cm-s-mdn-like .cm-builtin { color: #9B7536; } /*?*/
+.cm-s-mdn-like .cm-tag { color: #997643; }
+.cm-s-mdn-like .cm-attribute { color: #d6bb6d; } /*?*/
+.cm-s-mdn-like .cm-header { color: #FF6400; }
+.cm-s-mdn-like .cm-hr { color: #AEAEAE; }
+.cm-s-mdn-like .cm-link { color:#ad9361; font-style:italic; text-decoration:none; }
+.cm-s-mdn-like .cm-error { border-bottom: 1px solid red; }
+
+div.cm-s-mdn-like .CodeMirror-activeline-background { background: #efefff; }
+div.cm-s-mdn-like span.CodeMirror-matchingbracket { outline:1px solid grey; color: inherit; }
+
+.cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=); }
diff --git a/www/code/codemirror-5.13.2/theme/midnight.css b/www/code/codemirror-5.13.2/theme/midnight.css
new file mode 100644
index 000000000..e41f10560
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/midnight.css
@@ -0,0 +1,45 @@
+/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
+
+/**/
+.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949; }
+.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
+
+/**/
+.cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
+
+.cm-s-midnight.CodeMirror {
+    background: #0F192A;
+    color: #D1EDFF;
+}
+
+.cm-s-midnight.CodeMirror { border-top: 1px solid black; border-bottom: 1px solid black; }
+
+.cm-s-midnight div.CodeMirror-selected { background: #314D67; }
+.cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
+.cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
+.cm-s-midnight .CodeMirror-gutters { background: #0F192A; border-right: 1px solid; }
+.cm-s-midnight .CodeMirror-guttermarker { color: white; }
+.cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-midnight .CodeMirror-linenumber { color: #D0D0D0; }
+.cm-s-midnight .CodeMirror-cursor { border-left: 1px solid #F8F8F0; }
+
+.cm-s-midnight span.cm-comment { color: #428BDD; }
+.cm-s-midnight span.cm-atom { color: #AE81FF; }
+.cm-s-midnight span.cm-number { color: #D1EDFF; }
+
+.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute { color: #A6E22E; }
+.cm-s-midnight span.cm-keyword { color: #E83737; }
+.cm-s-midnight span.cm-string { color: #1DC116; }
+
+.cm-s-midnight span.cm-variable { color: #FFAA3E; }
+.cm-s-midnight span.cm-variable-2 { color: #FFAA3E; }
+.cm-s-midnight span.cm-def { color: #4DD; }
+.cm-s-midnight span.cm-bracket { color: #D1EDFF; }
+.cm-s-midnight span.cm-tag { color: #449; }
+.cm-s-midnight span.cm-link { color: #AE81FF; }
+.cm-s-midnight span.cm-error { background: #F92672; color: #F8F8F0; }
+
+.cm-s-midnight .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/www/code/codemirror-5.13.2/theme/monokai.css b/www/code/codemirror-5.13.2/theme/monokai.css
new file mode 100644
index 000000000..7c8a4c5d0
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/monokai.css
@@ -0,0 +1,36 @@
+/* Based on Sublime Text's Monokai theme */
+
+.cm-s-monokai.CodeMirror { background: #272822; color: #f8f8f2; }
+.cm-s-monokai div.CodeMirror-selected { background: #49483E; }
+.cm-s-monokai .CodeMirror-line::selection, .cm-s-monokai .CodeMirror-line > span::selection, .cm-s-monokai .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
+.cm-s-monokai .CodeMirror-line::-moz-selection, .cm-s-monokai .CodeMirror-line > span::-moz-selection, .cm-s-monokai .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
+.cm-s-monokai .CodeMirror-gutters { background: #272822; border-right: 0px; }
+.cm-s-monokai .CodeMirror-guttermarker { color: white; }
+.cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-monokai .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+
+.cm-s-monokai span.cm-comment { color: #75715e; }
+.cm-s-monokai span.cm-atom { color: #ae81ff; }
+.cm-s-monokai span.cm-number { color: #ae81ff; }
+
+.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute { color: #a6e22e; }
+.cm-s-monokai span.cm-keyword { color: #f92672; }
+.cm-s-monokai span.cm-builtin { color: #66d9ef; }
+.cm-s-monokai span.cm-string { color: #e6db74; }
+
+.cm-s-monokai span.cm-variable { color: #f8f8f2; }
+.cm-s-monokai span.cm-variable-2 { color: #9effff; }
+.cm-s-monokai span.cm-variable-3 { color: #66d9ef; }
+.cm-s-monokai span.cm-def { color: #fd971f; }
+.cm-s-monokai span.cm-bracket { color: #f8f8f2; }
+.cm-s-monokai span.cm-tag { color: #f92672; }
+.cm-s-monokai span.cm-header { color: #ae81ff; }
+.cm-s-monokai span.cm-link { color: #ae81ff; }
+.cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
+
+.cm-s-monokai .CodeMirror-activeline-background { background: #373831; }
+.cm-s-monokai .CodeMirror-matchingbracket {
+  text-decoration: underline;
+  color: white !important;
+}
diff --git a/www/code/codemirror-5.13.2/theme/neat.css b/www/code/codemirror-5.13.2/theme/neat.css
new file mode 100644
index 000000000..4267b1a37
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/neat.css
@@ -0,0 +1,12 @@
+.cm-s-neat span.cm-comment { color: #a86; }
+.cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; }
+.cm-s-neat span.cm-string { color: #a22; }
+.cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; }
+.cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
+.cm-s-neat span.cm-variable { color: black; }
+.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
+.cm-s-neat span.cm-meta { color: #555; }
+.cm-s-neat span.cm-link { color: #3a3; }
+
+.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/www/code/codemirror-5.13.2/theme/neo.css b/www/code/codemirror-5.13.2/theme/neo.css
new file mode 100644
index 000000000..b28d5c65f
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/neo.css
@@ -0,0 +1,43 @@
+/* neo theme for codemirror */
+
+/* Color scheme */
+
+.cm-s-neo.CodeMirror {
+  background-color:#ffffff;
+  color:#2e383c;
+  line-height:1.4375;
+}
+.cm-s-neo .cm-comment { color:#75787b; }
+.cm-s-neo .cm-keyword, .cm-s-neo .cm-property { color:#1d75b3; }
+.cm-s-neo .cm-atom,.cm-s-neo .cm-number { color:#75438a; }
+.cm-s-neo .cm-node,.cm-s-neo .cm-tag { color:#9c3328; }
+.cm-s-neo .cm-string { color:#b35e14; }
+.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier { color:#047d65; }
+
+
+/* Editor styling */
+
+.cm-s-neo pre {
+  padding:0;
+}
+
+.cm-s-neo .CodeMirror-gutters {
+  border:none;
+  border-right:10px solid transparent;
+  background-color:transparent;
+}
+
+.cm-s-neo .CodeMirror-linenumber {
+  padding:0;
+  color:#e0e2e5;
+}
+
+.cm-s-neo .CodeMirror-guttermarker { color: #1d75b3; }
+.cm-s-neo .CodeMirror-guttermarker-subtle { color: #e0e2e5; }
+
+.cm-s-neo .CodeMirror-cursor {
+  width: auto;
+  border: 0;
+  background: rgba(155,157,162,0.37);
+  z-index: 1;
+}
diff --git a/www/code/codemirror-5.13.2/theme/night.css b/www/code/codemirror-5.13.2/theme/night.css
new file mode 100644
index 000000000..fd4e56193
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/night.css
@@ -0,0 +1,27 @@
+/* Loosely based on the Midnight Textmate theme */
+
+.cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
+.cm-s-night div.CodeMirror-selected { background: #447; }
+.cm-s-night .CodeMirror-line::selection, .cm-s-night .CodeMirror-line > span::selection, .cm-s-night .CodeMirror-line > span > span::selection { background: rgba(68, 68, 119, .99); }
+.cm-s-night .CodeMirror-line::-moz-selection, .cm-s-night .CodeMirror-line > span::-moz-selection, .cm-s-night .CodeMirror-line > span > span::-moz-selection { background: rgba(68, 68, 119, .99); }
+.cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-night .CodeMirror-guttermarker { color: white; }
+.cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
+.cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
+.cm-s-night .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-night span.cm-comment { color: #8900d1; }
+.cm-s-night span.cm-atom { color: #845dc4; }
+.cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; }
+.cm-s-night span.cm-keyword { color: #599eff; }
+.cm-s-night span.cm-string { color: #37f14a; }
+.cm-s-night span.cm-meta { color: #7678e2; }
+.cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
+.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
+.cm-s-night span.cm-bracket { color: #8da6ce; }
+.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
+.cm-s-night span.cm-link { color: #845dc4; }
+.cm-s-night span.cm-error { color: #9d1e15; }
+
+.cm-s-night .CodeMirror-activeline-background { background: #1C005A; }
+.cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/paraiso-dark.css b/www/code/codemirror-5.13.2/theme/paraiso-dark.css
new file mode 100644
index 000000000..aa9d207e6
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/paraiso-dark.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Paraíso (Dark)
+    Author:     Jan T. Sott
+
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
+    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
+
+*/
+
+.cm-s-paraiso-dark.CodeMirror { background: #2f1e2e; color: #b9b6b0; }
+.cm-s-paraiso-dark div.CodeMirror-selected { background: #41323f; }
+.cm-s-paraiso-dark .CodeMirror-line::selection, .cm-s-paraiso-dark .CodeMirror-line > span::selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::selection { background: rgba(65, 50, 63, .99); }
+.cm-s-paraiso-dark .CodeMirror-line::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(65, 50, 63, .99); }
+.cm-s-paraiso-dark .CodeMirror-gutters { background: #2f1e2e; border-right: 0px; }
+.cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
+.cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
+.cm-s-paraiso-dark .CodeMirror-linenumber { color: #776e71; }
+.cm-s-paraiso-dark .CodeMirror-cursor { border-left: 1px solid #8d8687; }
+
+.cm-s-paraiso-dark span.cm-comment { color: #e96ba8; }
+.cm-s-paraiso-dark span.cm-atom { color: #815ba4; }
+.cm-s-paraiso-dark span.cm-number { color: #815ba4; }
+
+.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute { color: #48b685; }
+.cm-s-paraiso-dark span.cm-keyword { color: #ef6155; }
+.cm-s-paraiso-dark span.cm-string { color: #fec418; }
+
+.cm-s-paraiso-dark span.cm-variable { color: #48b685; }
+.cm-s-paraiso-dark span.cm-variable-2 { color: #06b6ef; }
+.cm-s-paraiso-dark span.cm-def { color: #f99b15; }
+.cm-s-paraiso-dark span.cm-bracket { color: #b9b6b0; }
+.cm-s-paraiso-dark span.cm-tag { color: #ef6155; }
+.cm-s-paraiso-dark span.cm-link { color: #815ba4; }
+.cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
+
+.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A; }
+.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/paraiso-light.css b/www/code/codemirror-5.13.2/theme/paraiso-light.css
new file mode 100644
index 000000000..ae0c755f8
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/paraiso-light.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Paraíso (Light)
+    Author:     Jan T. Sott
+
+    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
+    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
+
+*/
+
+.cm-s-paraiso-light.CodeMirror { background: #e7e9db; color: #41323f; }
+.cm-s-paraiso-light div.CodeMirror-selected { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-line::selection, .cm-s-paraiso-light .CodeMirror-line > span::selection, .cm-s-paraiso-light .CodeMirror-line > span > span::selection { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-line::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span > span::-moz-selection { background: #b9b6b0; }
+.cm-s-paraiso-light .CodeMirror-gutters { background: #e7e9db; border-right: 0px; }
+.cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
+.cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
+.cm-s-paraiso-light .CodeMirror-linenumber { color: #8d8687; }
+.cm-s-paraiso-light .CodeMirror-cursor { border-left: 1px solid #776e71; }
+
+.cm-s-paraiso-light span.cm-comment { color: #e96ba8; }
+.cm-s-paraiso-light span.cm-atom { color: #815ba4; }
+.cm-s-paraiso-light span.cm-number { color: #815ba4; }
+
+.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute { color: #48b685; }
+.cm-s-paraiso-light span.cm-keyword { color: #ef6155; }
+.cm-s-paraiso-light span.cm-string { color: #fec418; }
+
+.cm-s-paraiso-light span.cm-variable { color: #48b685; }
+.cm-s-paraiso-light span.cm-variable-2 { color: #06b6ef; }
+.cm-s-paraiso-light span.cm-def { color: #f99b15; }
+.cm-s-paraiso-light span.cm-bracket { color: #41323f; }
+.cm-s-paraiso-light span.cm-tag { color: #ef6155; }
+.cm-s-paraiso-light span.cm-link { color: #815ba4; }
+.cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
+
+.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4; }
+.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/pastel-on-dark.css b/www/code/codemirror-5.13.2/theme/pastel-on-dark.css
new file mode 100644
index 000000000..719750920
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/pastel-on-dark.css
@@ -0,0 +1,53 @@
+/**
+ * Pastel On Dark theme ported from ACE editor
+ * @license MIT
+ * @copyright AtomicPages LLC 2014
+ * @author Dennis Thompson, AtomicPages LLC
+ * @version 1.1
+ * @source https://github.com/atomicpages/codemirror-pastel-on-dark-theme
+ */
+
+.cm-s-pastel-on-dark.CodeMirror {
+	background: #2c2827;
+	color: #8F938F;
+	line-height: 1.5;
+	font-size: 14px;
+}
+.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2); }
+.cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }
+.cm-s-pastel-on-dark .CodeMirror-line::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(221,240,255,0.2); }
+
+.cm-s-pastel-on-dark .CodeMirror-gutters {
+	background: #34302f;
+	border-right: 0px;
+	padding: 0 3px;
+}
+.cm-s-pastel-on-dark .CodeMirror-guttermarker { color: white; }
+.cm-s-pastel-on-dark .CodeMirror-guttermarker-subtle { color: #8F938F; }
+.cm-s-pastel-on-dark .CodeMirror-linenumber { color: #8F938F; }
+.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
+.cm-s-pastel-on-dark span.cm-comment { color: #A6C6FF; }
+.cm-s-pastel-on-dark span.cm-atom { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-number { color: #CCCCCC; }
+.cm-s-pastel-on-dark span.cm-property { color: #8F938F; }
+.cm-s-pastel-on-dark span.cm-attribute { color: #a6e22e; }
+.cm-s-pastel-on-dark span.cm-keyword { color: #AEB2F8; }
+.cm-s-pastel-on-dark span.cm-string { color: #66A968; }
+.cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
+.cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
+.cm-s-pastel-on-dark span.cm-variable-3 { color: #DE8E30; }
+.cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
+.cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
+.cm-s-pastel-on-dark span.cm-tag { color: #C1C144; }
+.cm-s-pastel-on-dark span.cm-link { color: #ae81ff; }
+.cm-s-pastel-on-dark span.cm-qualifier,.cm-s-pastel-on-dark span.cm-builtin { color: #C1C144; }
+.cm-s-pastel-on-dark span.cm-error {
+	background: #757aD8;
+	color: #f8f8f0;
+}
+.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031); }
+.cm-s-pastel-on-dark .CodeMirror-matchingbracket {
+	border: 1px solid rgba(255,255,255,0.25);
+	color: #8F938F !important;
+	margin: -1px -1px 0 -1px;
+}
diff --git a/www/code/codemirror-5.13.2/theme/railscasts.css b/www/code/codemirror-5.13.2/theme/railscasts.css
new file mode 100644
index 000000000..aeff0449d
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/railscasts.css
@@ -0,0 +1,34 @@
+/*
+
+    Name:       Railscasts
+    Author:     Ryan Bates (http://railscasts.com)
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-railscasts.CodeMirror {background: #2b2b2b; color: #f4f1ed;}
+.cm-s-railscasts div.CodeMirror-selected {background: #272935 !important;}
+.cm-s-railscasts .CodeMirror-gutters {background: #2b2b2b; border-right: 0px;}
+.cm-s-railscasts .CodeMirror-linenumber {color: #5a647e;}
+.cm-s-railscasts .CodeMirror-cursor {border-left: 1px solid #d4cfc9 !important;}
+
+.cm-s-railscasts span.cm-comment {color: #bc9458;}
+.cm-s-railscasts span.cm-atom {color: #b6b3eb;}
+.cm-s-railscasts span.cm-number {color: #b6b3eb;}
+
+.cm-s-railscasts span.cm-property, .cm-s-railscasts span.cm-attribute {color: #a5c261;}
+.cm-s-railscasts span.cm-keyword {color: #da4939;}
+.cm-s-railscasts span.cm-string {color: #ffc66d;}
+
+.cm-s-railscasts span.cm-variable {color: #a5c261;}
+.cm-s-railscasts span.cm-variable-2 {color: #6d9cbe;}
+.cm-s-railscasts span.cm-def {color: #cc7833;}
+.cm-s-railscasts span.cm-error {background: #da4939; color: #d4cfc9;}
+.cm-s-railscasts span.cm-bracket {color: #f4f1ed;}
+.cm-s-railscasts span.cm-tag {color: #da4939;}
+.cm-s-railscasts span.cm-link {color: #b6b3eb;}
+
+.cm-s-railscasts .CodeMirror-matchingbracket { text-decoration: underline; color: white !important;}
+.cm-s-railscasts .CodeMirror-activeline-background { background: #303040; }
diff --git a/www/code/codemirror-5.13.2/theme/rubyblue.css b/www/code/codemirror-5.13.2/theme/rubyblue.css
new file mode 100644
index 000000000..76d33e779
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/rubyblue.css
@@ -0,0 +1,25 @@
+.cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
+.cm-s-rubyblue div.CodeMirror-selected { background: #38566F; }
+.cm-s-rubyblue .CodeMirror-line::selection, .cm-s-rubyblue .CodeMirror-line > span::selection, .cm-s-rubyblue .CodeMirror-line > span > span::selection { background: rgba(56, 86, 111, 0.99); }
+.cm-s-rubyblue .CodeMirror-line::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 86, 111, 0.99); }
+.cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
+.cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
+.cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
+.cm-s-rubyblue .CodeMirror-linenumber { color: white; }
+.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
+.cm-s-rubyblue span.cm-atom { color: #F4C20B; }
+.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
+.cm-s-rubyblue span.cm-keyword { color: #F0F; }
+.cm-s-rubyblue span.cm-string { color: #F08047; }
+.cm-s-rubyblue span.cm-meta { color: #F0F; }
+.cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
+.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
+.cm-s-rubyblue span.cm-bracket { color: #F0F; }
+.cm-s-rubyblue span.cm-link { color: #F4C20B; }
+.cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
+.cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
+.cm-s-rubyblue span.cm-error { color: #AF2018; }
+
+.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047; }
diff --git a/www/code/codemirror-5.13.2/theme/seti.css b/www/code/codemirror-5.13.2/theme/seti.css
new file mode 100644
index 000000000..6632d3fc7
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/seti.css
@@ -0,0 +1,44 @@
+/*
+
+    Name:       seti
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original seti color scheme by Jesse Weed (https://github.com/jesseweed/seti-syntax)
+
+*/
+
+
+.cm-s-seti.CodeMirror {
+  background-color: #151718 !important;
+  color: #CFD2D1 !important;
+  border: none;
+}
+.cm-s-seti .CodeMirror-gutters {
+  color: #404b53;
+  background-color: #0E1112;
+  border: none;
+}
+.cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
+.cm-s-seti .CodeMirror-linenumber { color: #6D8A88; }
+.cm-s-seti.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
+.cm-s-seti span.cm-comment { color: #41535b; }
+.cm-s-seti span.cm-string, .cm-s-seti span.cm-string-2 { color: #55b5db; }
+.cm-s-seti span.cm-number { color: #cd3f45; }
+.cm-s-seti span.cm-variable { color: #55b5db; }
+.cm-s-seti span.cm-variable-2 { color: #a074c4; }
+.cm-s-seti span.cm-def { color: #55b5db; }
+.cm-s-seti span.cm-keyword { color: #ff79c6; }
+.cm-s-seti span.cm-operator { color: #9fca56; }
+.cm-s-seti span.cm-keyword { color: #e6cd69; }
+.cm-s-seti span.cm-atom { color: #cd3f45; }
+.cm-s-seti span.cm-meta { color: #55b5db; }
+.cm-s-seti span.cm-tag { color: #55b5db; }
+.cm-s-seti span.cm-attribute { color: #9fca56; }
+.cm-s-seti span.cm-qualifier { color: #9fca56; }
+.cm-s-seti span.cm-property { color: #a074c4; }
+.cm-s-seti span.cm-variable-3 { color: #9fca56; }
+.cm-s-seti span.cm-builtin { color: #9fca56; }
+.cm-s-seti .CodeMirror-activeline-background { background: #101213; }
+.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/solarized.css b/www/code/codemirror-5.13.2/theme/solarized.css
new file mode 100644
index 000000000..7882c9376
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/solarized.css
@@ -0,0 +1,163 @@
+/*
+Solarized theme for code-mirror
+http://ethanschoonover.com/solarized
+*/
+
+/*
+Solarized color pallet
+http://ethanschoonover.com/solarized/img/solarized-palette.png
+*/
+
+.solarized.base03 { color: #002b36; }
+.solarized.base02 { color: #073642; }
+.solarized.base01 { color: #586e75; }
+.solarized.base00 { color: #657b83; }
+.solarized.base0 { color: #839496; }
+.solarized.base1 { color: #93a1a1; }
+.solarized.base2 { color: #eee8d5; }
+.solarized.base3  { color: #fdf6e3; }
+.solarized.solar-yellow  { color: #b58900; }
+.solarized.solar-orange  { color: #cb4b16; }
+.solarized.solar-red { color: #dc322f; }
+.solarized.solar-magenta { color: #d33682; }
+.solarized.solar-violet  { color: #6c71c4; }
+.solarized.solar-blue { color: #268bd2; }
+.solarized.solar-cyan { color: #2aa198; }
+.solarized.solar-green { color: #859900; }
+
+/* Color scheme for code-mirror */
+
+.cm-s-solarized {
+  line-height: 1.45em;
+  color-profile: sRGB;
+  rendering-intent: auto;
+}
+.cm-s-solarized.cm-s-dark {
+  color: #839496;
+  background-color:  #002b36;
+  text-shadow: #002b36 0 1px;
+}
+.cm-s-solarized.cm-s-light {
+  background-color: #fdf6e3;
+  color: #657b83;
+  text-shadow: #eee8d5 0 1px;
+}
+
+.cm-s-solarized .CodeMirror-widget {
+  text-shadow: none;
+}
+
+.cm-s-solarized .cm-header { color: #586e75; }
+.cm-s-solarized .cm-quote { color: #93a1a1; }
+
+.cm-s-solarized .cm-keyword { color: #cb4b16; }
+.cm-s-solarized .cm-atom { color: #d33682; }
+.cm-s-solarized .cm-number { color: #d33682; }
+.cm-s-solarized .cm-def { color: #2aa198; }
+
+.cm-s-solarized .cm-variable { color: #839496; }
+.cm-s-solarized .cm-variable-2 { color: #b58900; }
+.cm-s-solarized .cm-variable-3 { color: #6c71c4; }
+
+.cm-s-solarized .cm-property { color: #2aa198; }
+.cm-s-solarized .cm-operator { color: #6c71c4; }
+
+.cm-s-solarized .cm-comment { color: #586e75; font-style:italic; }
+
+.cm-s-solarized .cm-string { color: #859900; }
+.cm-s-solarized .cm-string-2 { color: #b58900; }
+
+.cm-s-solarized .cm-meta { color: #859900; }
+.cm-s-solarized .cm-qualifier { color: #b58900; }
+.cm-s-solarized .cm-builtin { color: #d33682; }
+.cm-s-solarized .cm-bracket { color: #cb4b16; }
+.cm-s-solarized .CodeMirror-matchingbracket { color: #859900; }
+.cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
+.cm-s-solarized .cm-tag { color: #93a1a1; }
+.cm-s-solarized .cm-attribute { color: #2aa198; }
+.cm-s-solarized .cm-hr {
+  color: transparent;
+  border-top: 1px solid #586e75;
+  display: block;
+}
+.cm-s-solarized .cm-link { color: #93a1a1; cursor: pointer; }
+.cm-s-solarized .cm-special { color: #6c71c4; }
+.cm-s-solarized .cm-em {
+  color: #999;
+  text-decoration: underline;
+  text-decoration-style: dotted;
+}
+.cm-s-solarized .cm-strong { color: #eee; }
+.cm-s-solarized .cm-error,
+.cm-s-solarized .cm-invalidchar {
+  color: #586e75;
+  border-bottom: 1px dotted #dc322f;
+}
+
+.cm-s-solarized.cm-s-dark div.CodeMirror-selected { background: #073642; }
+.cm-s-solarized.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
+.cm-s-solarized.cm-s-dark .CodeMirror-line::-moz-selection, .cm-s-dark .CodeMirror-line > span::-moz-selection, .cm-s-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(7, 54, 66, 0.99); }
+
+.cm-s-solarized.cm-s-light div.CodeMirror-selected { background: #eee8d5; }
+.cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
+.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
+
+/* Editor styling */
+
+
+
+/* Little shadow on the view-port of the buffer view */
+.cm-s-solarized.CodeMirror {
+  -moz-box-shadow: inset 7px 0 12px -6px #000;
+  -webkit-box-shadow: inset 7px 0 12px -6px #000;
+  box-shadow: inset 7px 0 12px -6px #000;
+}
+
+/* Gutter border and some shadow from it  */
+.cm-s-solarized .CodeMirror-gutters {
+  border-right: 1px solid;
+}
+
+/* Gutter colors and line number styling based of color scheme (dark / light) */
+
+/* Dark */
+.cm-s-solarized.cm-s-dark .CodeMirror-gutters {
+  background-color:  #002b36;
+  border-color: #00232c;
+}
+
+.cm-s-solarized.cm-s-dark .CodeMirror-linenumber {
+  text-shadow: #021014 0 -1px;
+}
+
+/* Light */
+.cm-s-solarized.cm-s-light .CodeMirror-gutters {
+  background-color: #fdf6e3;
+  border-color: #eee8d5;
+}
+
+/* Common */
+.cm-s-solarized .CodeMirror-linenumber {
+  color: #586e75;
+  padding: 0 5px;
+}
+.cm-s-solarized .CodeMirror-guttermarker-subtle { color: #586e75; }
+.cm-s-solarized.cm-s-dark .CodeMirror-guttermarker { color: #ddd; }
+.cm-s-solarized.cm-s-light .CodeMirror-guttermarker { color: #cb4b16; }
+
+.cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text {
+  color: #586e75;
+}
+
+.cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
+
+/*
+Active line. Negative margin compensates left padding of the text in the
+view-port
+*/
+.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
+  background: rgba(255, 255, 255, 0.10);
+}
+.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.10);
+}
diff --git a/www/code/codemirror-5.13.2/theme/the-matrix.css b/www/code/codemirror-5.13.2/theme/the-matrix.css
new file mode 100644
index 000000000..3912a8dbd
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/the-matrix.css
@@ -0,0 +1,30 @@
+.cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
+.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D; }
+.cm-s-the-matrix .CodeMirror-line::selection, .cm-s-the-matrix .CodeMirror-line > span::selection, .cm-s-the-matrix .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-the-matrix .CodeMirror-line::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
+.cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
+.cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
+.cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
+.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00; }
+
+.cm-s-the-matrix span.cm-keyword { color: #008803; font-weight: bold; }
+.cm-s-the-matrix span.cm-atom { color: #3FF; }
+.cm-s-the-matrix span.cm-number { color: #FFB94F; }
+.cm-s-the-matrix span.cm-def { color: #99C; }
+.cm-s-the-matrix span.cm-variable { color: #F6C; }
+.cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
+.cm-s-the-matrix span.cm-variable-3 { color: #96F; }
+.cm-s-the-matrix span.cm-property { color: #62FFA0; }
+.cm-s-the-matrix span.cm-operator { color: #999; }
+.cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
+.cm-s-the-matrix span.cm-string { color: #39C; }
+.cm-s-the-matrix span.cm-meta { color: #C9F; }
+.cm-s-the-matrix span.cm-qualifier { color: #FFF700; }
+.cm-s-the-matrix span.cm-builtin { color: #30a; }
+.cm-s-the-matrix span.cm-bracket { color: #cc7; }
+.cm-s-the-matrix span.cm-tag { color: #FFBD40; }
+.cm-s-the-matrix span.cm-attribute { color: #FFF700; }
+.cm-s-the-matrix span.cm-error { color: #FF0000; }
+
+.cm-s-the-matrix .CodeMirror-activeline-background { background: #040; }
diff --git a/www/code/codemirror-5.13.2/theme/tomorrow-night-bright.css b/www/code/codemirror-5.13.2/theme/tomorrow-night-bright.css
new file mode 100644
index 000000000..b6dd4a927
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/tomorrow-night-bright.css
@@ -0,0 +1,35 @@
+/*
+
+    Name:       Tomorrow Night - Bright
+    Author:     Chris Kempson
+
+    Port done by Gerard Braad 
+
+*/
+
+.cm-s-tomorrow-night-bright.CodeMirror { background: #000000; color: #eaeaea; }
+.cm-s-tomorrow-night-bright div.CodeMirror-selected { background: #424242; }
+.cm-s-tomorrow-night-bright .CodeMirror-gutters { background: #000000; border-right: 0px; }
+.cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
+.cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-tomorrow-night-bright .CodeMirror-linenumber { color: #424242; }
+.cm-s-tomorrow-night-bright .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
+
+.cm-s-tomorrow-night-bright span.cm-comment { color: #d27b53; }
+.cm-s-tomorrow-night-bright span.cm-atom { color: #a16a94; }
+.cm-s-tomorrow-night-bright span.cm-number { color: #a16a94; }
+
+.cm-s-tomorrow-night-bright span.cm-property, .cm-s-tomorrow-night-bright span.cm-attribute { color: #99cc99; }
+.cm-s-tomorrow-night-bright span.cm-keyword { color: #d54e53; }
+.cm-s-tomorrow-night-bright span.cm-string { color: #e7c547; }
+
+.cm-s-tomorrow-night-bright span.cm-variable { color: #b9ca4a; }
+.cm-s-tomorrow-night-bright span.cm-variable-2 { color: #7aa6da; }
+.cm-s-tomorrow-night-bright span.cm-def { color: #e78c45; }
+.cm-s-tomorrow-night-bright span.cm-bracket { color: #eaeaea; }
+.cm-s-tomorrow-night-bright span.cm-tag { color: #d54e53; }
+.cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
+.cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
+
+.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a; }
+.cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/tomorrow-night-eighties.css b/www/code/codemirror-5.13.2/theme/tomorrow-night-eighties.css
new file mode 100644
index 000000000..2a9debc32
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/tomorrow-night-eighties.css
@@ -0,0 +1,38 @@
+/*
+
+    Name:       Tomorrow Night - Eighties
+    Author:     Chris Kempson
+
+    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
+    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
+
+*/
+
+.cm-s-tomorrow-night-eighties.CodeMirror { background: #000000; color: #CCCCCC; }
+.cm-s-tomorrow-night-eighties div.CodeMirror-selected { background: #2D2D2D; }
+.cm-s-tomorrow-night-eighties .CodeMirror-line::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-tomorrow-night-eighties .CodeMirror-line::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
+.cm-s-tomorrow-night-eighties .CodeMirror-gutters { background: #000000; border-right: 0px; }
+.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
+.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
+.cm-s-tomorrow-night-eighties .CodeMirror-linenumber { color: #515151; }
+.cm-s-tomorrow-night-eighties .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
+
+.cm-s-tomorrow-night-eighties span.cm-comment { color: #d27b53; }
+.cm-s-tomorrow-night-eighties span.cm-atom { color: #a16a94; }
+.cm-s-tomorrow-night-eighties span.cm-number { color: #a16a94; }
+
+.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute { color: #99cc99; }
+.cm-s-tomorrow-night-eighties span.cm-keyword { color: #f2777a; }
+.cm-s-tomorrow-night-eighties span.cm-string { color: #ffcc66; }
+
+.cm-s-tomorrow-night-eighties span.cm-variable { color: #99cc99; }
+.cm-s-tomorrow-night-eighties span.cm-variable-2 { color: #6699cc; }
+.cm-s-tomorrow-night-eighties span.cm-def { color: #f99157; }
+.cm-s-tomorrow-night-eighties span.cm-bracket { color: #CCCCCC; }
+.cm-s-tomorrow-night-eighties span.cm-tag { color: #f2777a; }
+.cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
+.cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
+
+.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600; }
+.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/ttcn.css b/www/code/codemirror-5.13.2/theme/ttcn.css
new file mode 100644
index 000000000..b3d465645
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/ttcn.css
@@ -0,0 +1,64 @@
+.cm-s-ttcn .cm-quote { color: #090; }
+.cm-s-ttcn .cm-negative { color: #d44; }
+.cm-s-ttcn .cm-positive { color: #292; }
+.cm-s-ttcn .cm-header, .cm-strong { font-weight: bold; }
+.cm-s-ttcn .cm-em { font-style: italic; }
+.cm-s-ttcn .cm-link { text-decoration: underline; }
+.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
+.cm-s-ttcn .cm-header { color: #00f; font-weight: bold; }
+
+.cm-s-ttcn .cm-atom { color: #219; }
+.cm-s-ttcn .cm-attribute { color: #00c; }
+.cm-s-ttcn .cm-bracket { color: #997; }
+.cm-s-ttcn .cm-comment { color: #333333; }
+.cm-s-ttcn .cm-def { color: #00f; }
+.cm-s-ttcn .cm-em { font-style: italic; }
+.cm-s-ttcn .cm-error { color: #f00; }
+.cm-s-ttcn .cm-hr { color: #999; }
+.cm-s-ttcn .cm-invalidchar { color: #f00; }
+.cm-s-ttcn .cm-keyword { font-weight:bold; }
+.cm-s-ttcn .cm-link { color: #00c; text-decoration: underline; }
+.cm-s-ttcn .cm-meta { color: #555; }
+.cm-s-ttcn .cm-negative { color: #d44; }
+.cm-s-ttcn .cm-positive { color: #292; }
+.cm-s-ttcn .cm-qualifier { color: #555; }
+.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
+.cm-s-ttcn .cm-string { color: #006400; }
+.cm-s-ttcn .cm-string-2 { color: #f50; }
+.cm-s-ttcn .cm-strong { font-weight: bold; }
+.cm-s-ttcn .cm-tag { color: #170; }
+.cm-s-ttcn .cm-variable { color: #8B2252; }
+.cm-s-ttcn .cm-variable-2 { color: #05a; }
+.cm-s-ttcn .cm-variable-3 { color: #085; }
+
+.cm-s-ttcn .cm-invalidchar { color: #f00; }
+
+/* ASN */
+.cm-s-ttcn .cm-accessTypes,
+.cm-s-ttcn .cm-compareTypes { color: #27408B; }
+.cm-s-ttcn .cm-cmipVerbs { color: #8B2252; }
+.cm-s-ttcn .cm-modifier { color:#D2691E; }
+.cm-s-ttcn .cm-status { color:#8B4545; }
+.cm-s-ttcn .cm-storage { color:#A020F0; }
+.cm-s-ttcn .cm-tags { color:#006400; }
+
+/* CFG */
+.cm-s-ttcn .cm-externalCommands { color: #8B4545; font-weight:bold; }
+.cm-s-ttcn .cm-fileNCtrlMaskOptions,
+.cm-s-ttcn .cm-sectionTitle { color: #2E8B57; font-weight:bold; }
+
+/* TTCN */
+.cm-s-ttcn .cm-booleanConsts,
+.cm-s-ttcn .cm-otherConsts,
+.cm-s-ttcn .cm-verdictConsts { color: #006400; }
+.cm-s-ttcn .cm-configOps,
+.cm-s-ttcn .cm-functionOps,
+.cm-s-ttcn .cm-portOps,
+.cm-s-ttcn .cm-sutOps,
+.cm-s-ttcn .cm-timerOps,
+.cm-s-ttcn .cm-verdictOps { color: #0000FF; }
+.cm-s-ttcn .cm-preprocessor,
+.cm-s-ttcn .cm-templateMatch,
+.cm-s-ttcn .cm-ttcn3Macros { color: #27408B; }
+.cm-s-ttcn .cm-types { color: #A52A2A; font-weight:bold; }
+.cm-s-ttcn .cm-visibilityModifiers { font-weight:bold; }
diff --git a/www/code/codemirror-5.13.2/theme/twilight.css b/www/code/codemirror-5.13.2/theme/twilight.css
new file mode 100644
index 000000000..d342b899f
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/twilight.css
@@ -0,0 +1,32 @@
+.cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
+.cm-s-twilight div.CodeMirror-selected { background: #323232; } /**/
+.cm-s-twilight .CodeMirror-line::selection, .cm-s-twilight .CodeMirror-line > span::selection, .cm-s-twilight .CodeMirror-line > span > span::selection { background: rgba(50, 50, 50, 0.99); }
+.cm-s-twilight .CodeMirror-line::-moz-selection, .cm-s-twilight .CodeMirror-line > span::-moz-selection, .cm-s-twilight .CodeMirror-line > span > span::-moz-selection { background: rgba(50, 50, 50, 0.99); }
+
+.cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
+.cm-s-twilight .CodeMirror-guttermarker { color: white; }
+.cm-s-twilight .CodeMirror-guttermarker-subtle { color: #aaa; }
+.cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
+.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-twilight .cm-keyword { color: #f9ee98; } /**/
+.cm-s-twilight .cm-atom { color: #FC0; }
+.cm-s-twilight .cm-number { color:  #ca7841; } /**/
+.cm-s-twilight .cm-def { color: #8DA6CE; }
+.cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
+.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def { color: #607392; } /**/
+.cm-s-twilight .cm-operator { color: #cda869; } /**/
+.cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
+.cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
+.cm-s-twilight .cm-string-2 { color:#bd6b18; } /*?*/
+.cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
+.cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
+.cm-s-twilight .cm-tag { color: #997643; } /**/
+.cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
+.cm-s-twilight .cm-header { color: #FF6400; }
+.cm-s-twilight .cm-hr { color: #AEAEAE; }
+.cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
+.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
+
+.cm-s-twilight .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/vibrant-ink.css b/www/code/codemirror-5.13.2/theme/vibrant-ink.css
new file mode 100644
index 000000000..ac4ec6d87
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/vibrant-ink.css
@@ -0,0 +1,34 @@
+/* Taken from the popular Visual Studio Vibrant Ink Schema */
+
+.cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
+.cm-s-vibrant-ink div.CodeMirror-selected { background: #35493c; }
+.cm-s-vibrant-ink .CodeMirror-line::selection, .cm-s-vibrant-ink .CodeMirror-line > span::selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::selection { background: rgba(53, 73, 60, 0.99); }
+.cm-s-vibrant-ink .CodeMirror-line::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::-moz-selection { background: rgba(53, 73, 60, 0.99); }
+
+.cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
+.cm-s-vibrant-ink .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
+.cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
+.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-vibrant-ink .cm-keyword { color: #CC7832; }
+.cm-s-vibrant-ink .cm-atom { color: #FC0; }
+.cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
+.cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
+.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
+.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D; }
+.cm-s-vibrant-ink .cm-operator { color: #888; }
+.cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
+.cm-s-vibrant-ink .cm-string { color:  #A5C25C; }
+.cm-s-vibrant-ink .cm-string-2 { color: red; }
+.cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
+.cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
+.cm-s-vibrant-ink .cm-header { color: #FF6400; }
+.cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
+.cm-s-vibrant-ink .cm-link { color: blue; }
+.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
+
+.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/xq-dark.css b/www/code/codemirror-5.13.2/theme/xq-dark.css
new file mode 100644
index 000000000..e3bd960bb
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/xq-dark.css
@@ -0,0 +1,53 @@
+/*
+Copyright (C) 2011 by MarkLogic Corporation
+Author: Mike Brevoort 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+.cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
+.cm-s-xq-dark div.CodeMirror-selected { background: #27007A; }
+.cm-s-xq-dark .CodeMirror-line::selection, .cm-s-xq-dark .CodeMirror-line > span::selection, .cm-s-xq-dark .CodeMirror-line > span > span::selection { background: rgba(39, 0, 122, 0.99); }
+.cm-s-xq-dark .CodeMirror-line::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 0, 122, 0.99); }
+.cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
+.cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }
+.cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
+.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white; }
+
+.cm-s-xq-dark span.cm-keyword { color: #FFBD40; }
+.cm-s-xq-dark span.cm-atom { color: #6C8CD5; }
+.cm-s-xq-dark span.cm-number { color: #164; }
+.cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
+.cm-s-xq-dark span.cm-variable { color: #FFF; }
+.cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
+.cm-s-xq-dark span.cm-variable-3 { color: #DDD; }
+.cm-s-xq-dark span.cm-property {}
+.cm-s-xq-dark span.cm-operator {}
+.cm-s-xq-dark span.cm-comment { color: gray; }
+.cm-s-xq-dark span.cm-string { color: #9FEE00; }
+.cm-s-xq-dark span.cm-meta { color: yellow; }
+.cm-s-xq-dark span.cm-qualifier { color: #FFF700; }
+.cm-s-xq-dark span.cm-builtin { color: #30a; }
+.cm-s-xq-dark span.cm-bracket { color: #cc7; }
+.cm-s-xq-dark span.cm-tag { color: #FFBD40; }
+.cm-s-xq-dark span.cm-attribute { color: #FFF700; }
+.cm-s-xq-dark span.cm-error { color: #f00; }
+
+.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E; }
+.cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.13.2/theme/xq-light.css b/www/code/codemirror-5.13.2/theme/xq-light.css
new file mode 100644
index 000000000..8d2fcb667
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/xq-light.css
@@ -0,0 +1,43 @@
+/*
+Copyright (C) 2011 by MarkLogic Corporation
+Author: Mike Brevoort 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+.cm-s-xq-light span.cm-keyword { line-height: 1em; font-weight: bold; color: #5A5CAD; }
+.cm-s-xq-light span.cm-atom { color: #6C8CD5; }
+.cm-s-xq-light span.cm-number { color: #164; }
+.cm-s-xq-light span.cm-def { text-decoration:underline; }
+.cm-s-xq-light span.cm-variable { color: black; }
+.cm-s-xq-light span.cm-variable-2 { color:black; }
+.cm-s-xq-light span.cm-variable-3 { color: black; }
+.cm-s-xq-light span.cm-property {}
+.cm-s-xq-light span.cm-operator {}
+.cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
+.cm-s-xq-light span.cm-string { color: red; }
+.cm-s-xq-light span.cm-meta { color: yellow; }
+.cm-s-xq-light span.cm-qualifier { color: grey; }
+.cm-s-xq-light span.cm-builtin { color: #7EA656; }
+.cm-s-xq-light span.cm-bracket { color: #cc7; }
+.cm-s-xq-light span.cm-tag { color: #3F7F7F; }
+.cm-s-xq-light span.cm-attribute { color: #7F007F; }
+.cm-s-xq-light span.cm-error { color: #f00; }
+
+.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff; }
+.cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }
diff --git a/www/code/codemirror-5.13.2/theme/yeti.css b/www/code/codemirror-5.13.2/theme/yeti.css
new file mode 100644
index 000000000..c70d4d214
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/yeti.css
@@ -0,0 +1,44 @@
+/*
+
+    Name:       yeti
+    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
+
+    Original yeti color scheme by Jesse Weed (https://github.com/jesseweed/yeti-syntax)
+
+*/
+
+
+.cm-s-yeti.CodeMirror {
+  background-color: #ECEAE8 !important;
+  color: #d1c9c0 !important;
+  border: none;
+}
+
+.cm-s-yeti .CodeMirror-gutters {
+  color: #adaba6;
+  background-color: #E5E1DB;
+  border: none;
+}
+.cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0; }
+.cm-s-yeti .CodeMirror-linenumber { color: #adaba6; }
+.cm-s-yeti.CodeMirror-focused div.CodeMirror-selected { background: #DCD8D2; }
+.cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection { background: #DCD8D2; }
+.cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection { background: #DCD8D2; }
+.cm-s-yeti span.cm-comment { color: #d4c8be; }
+.cm-s-yeti span.cm-string, .cm-s-yeti span.cm-string-2 { color: #96c0d8; }
+.cm-s-yeti span.cm-number { color: #a074c4; }
+.cm-s-yeti span.cm-variable { color: #55b5db; }
+.cm-s-yeti span.cm-variable-2 { color: #a074c4; }
+.cm-s-yeti span.cm-def { color: #55b5db; }
+.cm-s-yeti span.cm-operator { color: #9fb96e; }
+.cm-s-yeti span.cm-keyword { color: #9fb96e; }
+.cm-s-yeti span.cm-atom { color: #a074c4; }
+.cm-s-yeti span.cm-meta { color: #96c0d8; }
+.cm-s-yeti span.cm-tag { color: #96c0d8; }
+.cm-s-yeti span.cm-attribute { color: #9fb96e; }
+.cm-s-yeti span.cm-qualifier { color: #96c0d8; }
+.cm-s-yeti span.cm-property { color: #a074c4; }
+.cm-s-yeti span.cm-builtin { color: #a074c4; }
+.cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
+.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
+.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }
diff --git a/www/code/codemirror-5.13.2/theme/zenburn.css b/www/code/codemirror-5.13.2/theme/zenburn.css
new file mode 100644
index 000000000..781c40aca
--- /dev/null
+++ b/www/code/codemirror-5.13.2/theme/zenburn.css
@@ -0,0 +1,37 @@
+/**
+ * "
+ *  Using Zenburn color palette from the Emacs Zenburn Theme
+ *  https://github.com/bbatsov/zenburn-emacs/blob/master/zenburn-theme.el
+ *
+ *  Also using parts of https://github.com/xavi/coderay-lighttable-theme
+ * "
+ * From: https://github.com/wisenomad/zenburn-lighttable-theme/blob/master/zenburn.css
+ */
+
+.cm-s-zenburn .CodeMirror-gutters { background: #3f3f3f !important; }
+.cm-s-zenburn .CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded { color: #999; }
+.cm-s-zenburn .CodeMirror-cursor { border-left: 1px solid white; }
+.cm-s-zenburn { background-color: #3f3f3f; color: #dcdccc; }
+.cm-s-zenburn span.cm-builtin { color: #dcdccc; font-weight: bold; }
+.cm-s-zenburn span.cm-comment { color: #7f9f7f; }
+.cm-s-zenburn span.cm-keyword { color: #f0dfaf; font-weight: bold; }
+.cm-s-zenburn span.cm-atom { color: #bfebbf; }
+.cm-s-zenburn span.cm-def { color: #dcdccc; }
+.cm-s-zenburn span.cm-variable { color: #dfaf8f; }
+.cm-s-zenburn span.cm-variable-2 { color: #dcdccc; }
+.cm-s-zenburn span.cm-string { color: #cc9393; }
+.cm-s-zenburn span.cm-string-2 { color: #cc9393; }
+.cm-s-zenburn span.cm-number { color: #dcdccc; }
+.cm-s-zenburn span.cm-tag { color: #93e0e3; }
+.cm-s-zenburn span.cm-property { color: #dfaf8f; }
+.cm-s-zenburn span.cm-attribute { color: #dfaf8f; }
+.cm-s-zenburn span.cm-qualifier { color: #7cb8bb; }
+.cm-s-zenburn span.cm-meta { color: #f0dfaf; }
+.cm-s-zenburn span.cm-header { color: #f0efd0; }
+.cm-s-zenburn span.cm-operator { color: #f0efd0; }
+.cm-s-zenburn span.CodeMirror-matchingbracket { box-sizing: border-box; background: transparent; border-bottom: 1px solid; }
+.cm-s-zenburn span.CodeMirror-nonmatchingbracket { border-bottom: 1px solid; background: none; }
+.cm-s-zenburn .CodeMirror-activeline { background: #000000; }
+.cm-s-zenburn .CodeMirror-activeline-background { background: #000000; }
+.cm-s-zenburn div.CodeMirror-selected { background: #545454; }
+.cm-s-zenburn .CodeMirror-focused div.CodeMirror-selected { background: #4f4f4f; }
diff --git a/www/code/inner.html b/www/code/inner.html
index bc9cdbed5..c031930ae 100644
--- a/www/code/inner.html
+++ b/www/code/inner.html
@@ -3,25 +3,25 @@
 
     
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-
-
-
    
-
    Kotlin mode
    
-
-
-
    
-
-    
-    
    Mode for Kotlin (http://kotlin.jetbrains.org/)
    
-    
    Developed by Hadi Hariri (https://github.com/hhariri).
    
-    
    MIME type defined: text/x-kotlin.
    
-
    
diff --git a/www/code/mode/kotlin/kotlin.js b/www/code/mode/kotlin/kotlin.js
deleted file mode 100644
index e9a6a94e6..000000000
--- a/www/code/mode/kotlin/kotlin.js
+++ /dev/null
@@ -1,284 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("kotlin", function (config, parserConfig) {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  var multiLineStrings = parserConfig.multiLineStrings;
-
-  var keywords = words(
-          "package continue return object while break class data trait interface throw super" +
-          " when type this else This try val var fun for is in if do as true false null get set");
-  var softKeywords = words("import" +
-      " where by get set abstract enum open annotation override private public internal" +
-      " protected catch out vararg inline finally final ref");
-  var blockKeywords = words("catch class do else finally for if where try while enum");
-  var atoms = words("null true false this");
-
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'") {
-      return startString(ch, stream, state);
-    }
-    // Wildcard import w/o trailing semicolon (import smth.*)
-    if (ch == "." && stream.eat("*")) {
-      return "word";
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      if (stream.eat(/eE/)) {
-        stream.eat(/\+\-/);
-        stream.eatWhile(/\d/);
-      }
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize.push(tokenComment);
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      if (expectExpression(state.lastToken)) {
-        return startString(ch, stream, state);
-      }
-    }
-    // Commented
-    if (ch == "-" && stream.eat(">")) {
-      curPunc = "->";
-      return null;
-    }
-    if (/[\-+*&%=<>!?|\/~]/.test(ch)) {
-      stream.eatWhile(/[\-+*&%=<>|~]/);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-
-    var cur = stream.current();
-    if (atoms.propertyIsEnumerable(cur)) {
-      return "atom";
-    }
-    if (softKeywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "softKeyword";
-    }
-
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "keyword";
-    }
-    return "word";
-  }
-
-  tokenBase.isBase = true;
-
-  function startString(quote, stream, state) {
-    var tripleQuoted = false;
-    if (quote != "/" && stream.eat(quote)) {
-      if (stream.eat(quote)) tripleQuoted = true;
-      else return "string";
-    }
-    function t(stream, state) {
-      var escaped = false, next, end = !tripleQuoted;
-
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-          if (!tripleQuoted) {
-            break;
-          }
-          if (stream.match(quote + quote)) {
-            end = true;
-            break;
-          }
-        }
-
-        if (quote == '"' && next == "$" && !escaped && stream.eat("{")) {
-          state.tokenize.push(tokenBaseUntilBrace());
-          return "string";
-        }
-
-        if (next == "$" && !escaped && !stream.eat(" ")) {
-          state.tokenize.push(tokenBaseUntilSpace());
-          return "string";
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (multiLineStrings)
-        state.tokenize.push(t);
-      if (end) state.tokenize.pop();
-      return "string";
-    }
-
-    state.tokenize.push(t);
-    return t(stream, state);
-  }
-
-  function tokenBaseUntilBrace() {
-    var depth = 1;
-
-    function t(stream, state) {
-      if (stream.peek() == "}") {
-        depth--;
-        if (depth == 0) {
-          state.tokenize.pop();
-          return state.tokenize[state.tokenize.length - 1](stream, state);
-        }
-      } else if (stream.peek() == "{") {
-        depth++;
-      }
-      return tokenBase(stream, state);
-    }
-
-    t.isBase = true;
-    return t;
-  }
-
-  function tokenBaseUntilSpace() {
-    function t(stream, state) {
-      if (stream.eat(/[\w]/)) {
-        var isWord = stream.eatWhile(/[\w]/);
-        if (isWord) {
-          state.tokenize.pop();
-          return "word";
-        }
-      }
-      state.tokenize.pop();
-      return "string";
-    }
-
-    t.isBase = true;
-    return t;
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize.pop();
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function expectExpression(last) {
-    return !last || last == "operator" || last == "->" || /[\.\[\{\(,;:]/.test(last) ||
-        last == "newstatement" || last == "keyword" || last == "proplabel";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-
-  function pushContext(state, col, type) {
-    return state.context = new Context(state.indented, col, type, null, state.context);
-  }
-
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function (basecolumn) {
-      return {
-        tokenize: [tokenBase],
-        context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true,
-        lastToken: null
-      };
-    },
-
-    token: function (stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-        // Automatic semicolon insertion
-        if (ctx.type == "statement" && !expectExpression(state.lastToken)) {
-          popContext(state);
-          ctx = state.context;
-        }
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = state.tokenize[state.tokenize.length - 1](stream, state);
-      if (style == "comment") return style;
-      if (ctx.align == null) ctx.align = true;
-      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
-      // Handle indentation for {x -> \n ... }
-      else if (curPunc == "->" && ctx.type == "statement" && ctx.prev.type == "}") {
-        popContext(state);
-        state.context.align = false;
-      }
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
-        pushContext(state, stream.column(), "statement");
-      state.startOfLine = false;
-      state.lastToken = curPunc || style;
-      return style;
-    },
-
-    indent: function (state, textAfter) {
-      if (!state.tokenize[state.tokenize.length - 1].isBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
-      if (ctx.type == "statement" && !expectExpression(state.lastToken)) ctx = ctx.prev;
-      var closing = firstChar == ctx.type;
-      if (ctx.type == "statement") {
-        return ctx.indented + (firstChar == "{" ? 0 : config.indentUnit);
-      }
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : config.indentUnit);
-    },
-
-    closeBrackets: {triples: "'\""},
-    electricChars: "{}",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//"
-  };
-});
-
-CodeMirror.defineMIME("text/x-kotlin", "kotlin");
-
-});
diff --git a/www/code/mode/mscgen/index.html b/www/code/mode/mscgen/index.html
deleted file mode 100644
index 0517825fb..000000000
--- a/www/code/mode/mscgen/index.html
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-CodeMirror: Oz mode
-
-
-
-
-
-
-
-
-
-
    
-
    MscGen mode
    
-
-
    
-
-    
-
-    
    MIME types defined: text/x-mscgen
    
-
    
diff --git a/www/code/mode/mscgen/index_msgenny.html b/www/code/mode/mscgen/index_msgenny.html
deleted file mode 100644
index 1664f3051..000000000
--- a/www/code/mode/mscgen/index_msgenny.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-  
-    
-    CodeMirror: msgenny mode
-    
-    
-    
-    
-  
-  
-    
    CodeMirror: msgenny mode
    
-
-
    
-
-    
-
-    
    MIME types defined: text/x-msgenny
    
-  
-
diff --git a/www/code/mode/mscgen/index_xu.html b/www/code/mode/mscgen/index_xu.html
deleted file mode 100644
index 2f7bf9ec0..000000000
--- a/www/code/mode/mscgen/index_xu.html
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-  
-    
-    CodeMirror: xu mode
-    
-    
-    
-    
-  
-  
-    
    CodeMirror: xù mode
    
-
-
    
-
-    
-
-    
    MIME types defined: text/x-xu
    
-  
-
diff --git a/www/code/mode/swift/swift.js b/www/code/mode/swift/swift.js
deleted file mode 100644
index cf784feff..000000000
--- a/www/code/mode/swift/swift.js
+++ /dev/null
@@ -1,203 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Swift mode created by Michael Kaminsky https://github.com/mkaminsky11
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object")
-    mod(require("../../lib/codemirror"))
-  else if (typeof define == "function" && define.amd)
-    define(["../../lib/codemirror"], mod)
-  else
-    mod(CodeMirror)
-})(function(CodeMirror) {
-  "use strict"
-
-  function trim(str) { return /^\s*(.*?)\s*$/.exec(str)[1] }
-
-  var separators = [" ","\\\+","\\\-","\\\(","\\\)","\\\*","/",":","\\\?","\\\<","\\\>"," ","\\\."]
-  var tokens = new RegExp(separators.join("|"),"g")
-
-  function getWord(string, pos) {
-    var index = -1, count = 1
-    var words = string.split(tokens)
-    for (var i = 0; i < words.length; i++) {
-      for(var j = 1; j <= words[i].length; j++) {
-        if (count==pos) index = i
-        count++
-      }
-      count++
-    }
-    var ret = ["", ""]
-    if (pos == 0) {
-      ret[1] = words[0]
-      ret[0] = null
-    } else {
-      ret[1] = words[index]
-      ret[0] = words[index-1]
-    }
-    return ret
-  }
-
-  CodeMirror.defineMode("swift", function() {
-    var keywords=["var","let","class","deinit","enum","extension","func","import","init","let","protocol","static","struct","subscript","typealias","var","as","dynamicType","is","new","super","self","Self","Type","__COLUMN__","__FILE__","__FUNCTION__","__LINE__","break","case","continue","default","do","else","fallthrough","if","in","for","return","switch","where","while","associativity","didSet","get","infix","inout","left","mutating","none","nonmutating","operator","override","postfix","precedence","prefix","right","set","unowned","unowned(safe)","unowned(unsafe)","weak","willSet"]
-    var commonConstants=["Infinity","NaN","undefined","null","true","false","on","off","yes","no","nil","null","this","super"]
-    var types=["String","bool","int","string","double","Double","Int","Float","float","public","private","extension"]
-    var numbers=["0","1","2","3","4","5","6","7","8","9"]
-    var operators=["+","-","/","*","%","=","|","&","<",">"]
-    var punc=[";",",",".","(",")","{","}","[","]"]
-    var delimiters=/^(?:[()\[\]{},:`=;]|\.\.?\.?)/
-    var identifiers=/^[_A-Za-z$][_A-Za-z$0-9]*/
-    var properties=/^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/
-    var regexPrefixes=/^(\/{3}|\/)/
-
-    return {
-      startState: function() {
-        return {
-          prev: false,
-          string: false,
-          escape: false,
-          inner: false,
-          comment: false,
-          num_left: 0,
-          num_right: 0,
-          doubleString: false,
-          singleString: false
-        }
-      },
-      token: function(stream, state) {
-        if (stream.eatSpace()) return null
-
-        var ch = stream.next()
-        if (state.string) {
-          if (state.escape) {
-            state.escape = false
-            return "string"
-          } else {
-            if ((ch == "\"" && (state.doubleString && !state.singleString) ||
-                 (ch == "'" && (!state.doubleString && state.singleString))) &&
-                !state.escape) {
-              state.string = false
-              state.doubleString = false
-              state.singleString = false
-              return "string"
-            } else if (ch == "\\" && stream.peek() == "(") {
-              state.inner = true
-              state.string = false
-              return "keyword"
-            } else if (ch == "\\" && stream.peek() != "(") {
-              state.escape = true
-              state.string = true
-              return "string"
-            } else {
-              return "string"
-            }
-          }
-        } else if (state.comment) {
-          if (ch == "*" && stream.peek() == "/") {
-            state.prev = "*"
-            return "comment"
-          } else if (ch == "/" && state.prev == "*") {
-            state.prev = false
-            state.comment = false
-            return "comment"
-          }
-          return "comment"
-        } else {
-          if (ch == "/") {
-            if (stream.peek() == "/") {
-              stream.skipToEnd()
-              return "comment"
-            }
-            if (stream.peek() == "*") {
-              state.comment = true
-              return "comment"
-            }
-          }
-          if (ch == "(" && state.inner) {
-            state.num_left++
-            return null
-          }
-          if (ch == ")" && state.inner) {
-            state.num_right++
-            if (state.num_left == state.num_right) {
-              state.inner=false
-              state.string=true
-            }
-            return null
-          }
-
-          var ret = getWord(stream.string, stream.pos)
-          var the_word = ret[1]
-          var prev_word = ret[0]
-
-          if (operators.indexOf(ch + "") > -1) return "operator"
-          if (punc.indexOf(ch) > -1) return "punctuation"
-
-          if (typeof the_word != "undefined") {
-            the_word = trim(the_word)
-            if (typeof prev_word != "undefined") prev_word = trim(prev_word)
-            if (the_word.charAt(0) == "#") return null
-
-            if (types.indexOf(the_word) > -1) return "def"
-            if (commonConstants.indexOf(the_word) > -1) return "atom"
-            if (numbers.indexOf(the_word) > -1) return "number"
-
-            if ((numbers.indexOf(the_word.charAt(0) + "") > -1 ||
-                 operators.indexOf(the_word.charAt(0) + "") > -1) &&
-                numbers.indexOf(ch) > -1) {
-              return "number"
-            }
-
-            if (keywords.indexOf(the_word) > -1 ||
-                keywords.indexOf(the_word.split(tokens)[0]) > -1)
-              return "keyword"
-            if (keywords.indexOf(prev_word) > -1) return "def"
-          }
-          if (ch == '"' && !state.doubleString) {
-            state.string = true
-            state.doubleString = true
-            return "string"
-          }
-          if (ch == "'" && !state.singleString) {
-            state.string = true
-            state.singleString = true
-            return "string"
-          }
-          if (ch == "(" && state.inner)
-            state.num_left++
-          if (ch == ")" && state.inner) {
-            state.num_right++
-            if (state.num_left == state.num_right) {
-              state.inner = false
-              state.string = true
-            }
-            return null
-          }
-          if (stream.match(/^-?[0-9\.]/, false)) {
-            if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i) ||
-                stream.match(/^-?\d+\.\d*/) ||
-                stream.match(/^-?\.\d+/)) {
-              if (stream.peek() == ".") stream.backUp(1)
-              return "number"
-            }
-            if (stream.match(/^-?0x[0-9a-f]+/i) ||
-                stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/) ||
-                stream.match(/^-?0(?![\dx])/i))
-              return "number"
-          }
-          if (stream.match(regexPrefixes)) {
-            if (stream.current()!="/" || stream.match(/^.*\//,false)) return "string"
-            else stream.backUp(1)
-          }
-          if (stream.match(delimiters)) return "punctuation"
-          if (stream.match(identifiers)) return "variable"
-          if (stream.match(properties)) return "property"
-          return "variable"
-        }
-      }
-    }
-  })
-
-  CodeMirror.defineMIME("text/x-swift","swift")
-})
diff --git a/www/code/rt_codemirror.js b/www/code/rt_codemirror.js
index 7135651ae..1e3b61ea3 100644
--- a/www/code/rt_codemirror.js
+++ b/www/code/rt_codemirror.js
@@ -309,7 +309,6 @@ define([
             var incomingPatch = function () {
                 if (isErrorState || initializing) { return; }
                 var textAreaVal = $(textArea).val();
-                                console.log($(textArea).val());
                 userDocBeforePatch = userDocBeforePatch || textAreaVal;
                 if (userDocBeforePatch !== textAreaVal) {
                   //error(false, "userDocBeforePatch !== textAreaVal");
@@ -346,7 +345,8 @@ define([
                 }
                 $(textArea).val(newValue);
                 userDocBeforePatch = newValue;
-                cmEditor.setValue(newValue);
+                cmEditor.setCursor({line:0, ch:0});
+                try { cmEditor.setValue(newValue); } catch (err) { console.error(err); }
                 if(newCursor) {
                   cmEditor.setCursor(newCursor);
                 }
diff --git a/www/code/toolbar.js b/www/code/toolbar.js
index 8871833ff..ea0afa9c8 100644
--- a/www/code/toolbar.js
+++ b/www/code/toolbar.js
@@ -123,19 +123,6 @@ define([
         return $container.find('#'+id)[0];
     };
 
-    var getOtherUsers = function(myUserName, userList) {
-      var i = 0;
-      var list = '';
-      userList.forEach(function(user) {
-        if(user !== myUserName) {
-          if(i === 0) list = ' : ';
-          list += user + ', ';
-          i++;
-        }
-      });
-      return (i > 0) ? list.slice(0, -2) : list;
-    }
-
     var updateUserList = function (myUserName, listElement, userList) {
         var meIdx = userList.indexOf(myUserName);
         if (meIdx === -1) {
@@ -143,11 +130,11 @@ define([
             return;
         }
         if (userList.length === 1) {
-            listElement.innerHTML = Messages.editingAlone;
+            listElement.textContent = Messages.editingAlone;
         } else if (userList.length === 2) {
-            listElement.innerHTML = Messages.editingWithOneOtherPerson + getOtherUsers(myUserName, userList);
+            listElement.textContent = Messages.editingWithOneOtherPerson;
         } else {
-            listElement.innerHTML = Messages.editingWith + ' ' + (userList.length - 1) + ' ' + Messages.otherPeople + getOtherUsers(myUserName, userList);
+            listElement.textContent = Messages.editingWith + ' ' + (userList.length - 1) + ' ' + Messages.otherPeople;
         }
     };
 

From 360fee9febdfcc172cb656cb4d0ccd4a7d63dbfb Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Mon, 11 Apr 2016 17:58:30 +0200
Subject: [PATCH 046/257] Fix a new cursor error with Codepad

---
 www/code/rt_codemirror.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/code/rt_codemirror.js b/www/code/rt_codemirror.js
index 1e3b61ea3..08b0d625e 100644
--- a/www/code/rt_codemirror.js
+++ b/www/code/rt_codemirror.js
@@ -173,8 +173,8 @@ define([
           newCursor.ch = removedTextColumnIndex;
         }
       }
-      else if(cursor.line === removedTextLineNumber && cursor.ch > removedTextLineNumber) {
-        newCursor.ch -= Math.min(length, cursor.ch-removedTextLineNumber);
+      else if(cursor.line === removedTextLineNumber && cursor.ch > removedTextColumnIndex) {
+        newCursor.ch -= Math.min(length, cursor.ch-removedTextColumnIndex);
       }
       return newCursor;
     };
@@ -327,7 +327,8 @@ define([
                 var oldCursorCMEnd = cmEditor.getCursor('to');
                 var newCursor;
                 var newSelection;
-                if(oldCursorCMStart !== oldCursorCMEnd) { // Selection
+                if(oldCursorCMStart.line !== oldCursorCMEnd.line
+                    && oldCursorCMStart.ch !== oldCursorCMEnd.ch) { // Selection
                     if (op.toRemove > 0) {
                         newSelection = [transformCursorCMRemove(oldValue, oldCursorCMStart, op.offset, op.toRemove), transformCursorCMRemove(oldValue, oldCursorCMEnd, op.offset, op.toRemove)];
                     }

From 94e57e4a2641e491531198c9a2a3ebec648145d2 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 14:21:31 +0200
Subject: [PATCH 047/257] update location of text-patcher.js

---
 www/common/realtime-input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 908d20110..d417dfbc0 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -20,7 +20,7 @@ define([
     '/common/netflux-client.js',
     '/common/crypto.js',
     '/common/toolbar.js',
-    '/_socket/text-patcher.js',
+    '/common/TextPatcher.js',
     '/common/es6-promise.min.js',
     '/common/chainpad.js',
     '/bower_components/jquery/dist/jquery.min.js',

From e6ab03164cee5e4a5f0c61e76b219424286d50df Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 14:34:47 +0200
Subject: [PATCH 048/257] import TypingTests.js and expose at the console

RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
---
 www/pad/main.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index b5f43e722..b29c4d8ac 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -8,10 +8,11 @@ define([
     '/common/toolbar.js',
     '/common/cursor.js',
     '/common/json-ot.js',
+    '/common/TypingTests.js',
     '/bower_components/diff-dom/diffDOM.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT) {
+], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest) {
     var $ = window.jQuery;
     var ifrw = $('#pad-iframe')[0].contentWindow;
     var Ckeditor; // to be initialized later...
@@ -328,6 +329,17 @@ define([
             inner.addEventListener('keydown', cursor.brFix);
 
             editor.on('change', propogate);
+
+            // export the typing tests to the window.
+            // call like `test = easyTest()`
+            // terminate the test like `test.cancel()`
+            var easyTest = window.easyTest = function () {
+                cursor.update();
+                var start = cursor.Range.start;
+                var test = TypingTest.testInput(inner, start.el, start.offset, propogate);
+                propogate();
+                return test;
+            };
         });
     };
 

From 07fdeebe17929e3f1feb74940cf2d401474983a1 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 14:50:32 +0200
Subject: [PATCH 049/257] LogStore.js : JSHint compliance and slight reformat

---
 storage/LogStore.js | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/storage/LogStore.js b/storage/LogStore.js
index 4f1b7ad6f..d588c82f5 100644
--- a/storage/LogStore.js
+++ b/storage/LogStore.js
@@ -1,20 +1,18 @@
-    var Fs = require("fs");
+var Fs = require("fs");
 
-    var message = function(file, msg) {
-        file.write(msg+"\n");
-    }
+var message = function(file, msg) {
+    file.write(msg+"\n");
+};
 
-    var create = module.exports.create = function(filePath, backingStore) {
+var create = module.exports.create = function(filePath, backingStore) {
 
-        var file = Fs.createWriteStream(filePath, {flags: 'a+'});
+    var file = Fs.createWriteStream(filePath, {flags: 'a+'});
 
-        return {
-            message: function(channel, msg, callback) {
-                message(file, msg);
-                backingStore.message(channel, msg, callback);
-            },
-            getMessages: backingStore.getMessages
-        }
-
-    }
-    
+    return {
+        message: function(channel, msg, callback) {
+            message(file, msg);
+            backingStore.message(channel, msg, callback);
+        },
+        getMessages: backingStore.getMessages
+    };
+};

From 5cead3fad336fda4058735e92af43e06da4de383 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 14:51:06 +0200
Subject: [PATCH 050/257] add missing semicolons to TextPatcher.js

---
 www/common/TextPatcher.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/common/TextPatcher.js b/www/common/TextPatcher.js
index 87cefa9dc..66858826d 100644
--- a/www/common/TextPatcher.js
+++ b/www/common/TextPatcher.js
@@ -40,7 +40,7 @@ var diff = function (oldval, newval) {
         toInsert: toInsert,
         toRemove: toRemove
     };
-}
+};
 
 /*  patch accepts a realtime facade and an operation (which might be falsey)
     it applies the operation to the realtime as components (remove/insert)
@@ -94,7 +94,7 @@ var create = function(config) {
 
     // *** remote -> local changes
     ctx.onPatch(function(pos, length) {
-        content = ctx.getUserDoc()
+        content = ctx.getUserDoc();
     });
 
     // propogate()

From 3b8238ef3b62a6f988afd497ab27da4dbab90789 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 14:51:32 +0200
Subject: [PATCH 051/257] add missing semicolons to pad/main.js

jshint compliance
---
 www/pad/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index b29c4d8ac..7e2e594f5 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -156,7 +156,7 @@ define([
             var createChangeName = function(id, $container) {
                 var buttonElmt = $container.find('#'+id)[0];
                 buttonElmt.addEventListener("click", function() {
-                   var newName = prompt("Change your name :", myUserName)
+                   var newName = window.prompt("Change your name :", myUserName);
                    if (newName && newName.trim()) {
                        var myUserNameTemp = newName.trim();
                        if(newName.trim().length > 32) {

From 06a3b63923e309b7ad2f8ead02e0583cd3cac334 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 14:58:24 +0200
Subject: [PATCH 052/257] jshint compliance for toolbar.js

---
 www/common/toolbar.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 6b6323684..942fb586d 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -134,20 +134,20 @@ define([
           var data = (userData) ? (userData[user] || null) : null;
           var userName = (data) ? data.name : null;
           if(userName) {
-            if(i === 0) list = ' : ';
+            if(i === 0) { list = ' : '; }
             list += userName + ', ';
             i++;
           }
         }
       });
       return (i > 0) ? list.slice(0, -2) : list;
-    }
+    };
 
     var createChangeName = function($container, userList, buttonID) {
         var id = uid();
         userList.innerHTML = 'Change name';
         return $container.find('#'+id)[0];
-    }
+    };
 
     var updateUserList = function (myUserName, listElement, userList, userData) {
         var meIdx = userList.indexOf(myUserName);
@@ -241,7 +241,7 @@ define([
             userData = newUserData;
           }
           updateUserList(myUserName, userListElement, users, userData);
-        }
+        };
 
         var ks = function () {
             if (connected) { kickSpinner(spinner, false); }

From 793149a608f62432cb2cf030c13678c56d9ee65e Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 15:00:46 +0200
Subject: [PATCH 053/257] json-ot.js : jshint compliance

---
 www/common/json-ot.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/common/json-ot.js b/www/common/json-ot.js
index 98e1af4ec..d8d75b7b6 100644
--- a/www/common/json-ot.js
+++ b/www/common/json-ot.js
@@ -5,15 +5,16 @@ define([
     var JsonOT = {};
 
     var validate = JsonOT.validate = function (text, toTransform, transformBy) {
+        var resultOp, text2, text3;
         try {
             // text = O (mutual common ancestor)
             // toTransform = A (the first incoming operation)
             // transformBy = B (the second incoming operation)
             // threeway merge (0, A, B)
 
-            var resultOp = ChainPad.Operation.transform0(text, toTransform, transformBy);
-            var text2 = ChainPad.Operation.apply(transformBy, text);
-            var text3 = ChainPad.Operation.apply(resultOp, text2);
+            resultOp = ChainPad.Operation.transform0(text, toTransform, transformBy);
+            text2 = ChainPad.Operation.apply(transformBy, text);
+            text3 = ChainPad.Operation.apply(resultOp, text2);
             try {
                 JSON.parse(text3);
                 return resultOp;
@@ -35,8 +36,7 @@ define([
             }
         } catch (x) {
             console.error(x);
-            console.error(e);
-            var info = window.REALTIME_MODULE.ot_applyError = {
+            window.REALTIME_MODULE.ot_applyError = {
                 type: 'resultParseError',
                 resultOp: resultOp,
 
@@ -46,7 +46,7 @@ define([
                 text1: text,
                 text2: text2,
                 text3: text3,
-                error: e
+                error: x
             };
             console.log('Debugging info available at `window.REALTIME_MODULE.ot_applyError`');
         }

From 9f9cd8d8cd32f5118c06f7094c464d72fc888047 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 15:07:05 +0200
Subject: [PATCH 054/257] realtime-input.js : fixes for jshint compliance

---
 www/common/realtime-input.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index d417dfbc0..949c1ee37 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see .
  */
-window.Reflect = { has: (x,y) => { return (y in x); } };
+window.Reflect = { has: function (x,y) { return (y in x); } };
 define([
     '/common/messages.js',
     '/common/netflux-client.js',
@@ -130,7 +130,10 @@ define([
 
             var hc = (wc && wc.history_keeper) ? wc.history_keeper : null;
             if(wc && (msg === 0 || msg === '0')) {
+                // FIXME onReady is defined below, so JSHINT complains
+                /* jshint ignore:start */
                 onReady(wc, network);
+                /* jshint ignore:end */
                 return;
             }
             else if (peer === hc){
@@ -255,7 +258,7 @@ define([
                     realtime: realtime
                 });
             }
-        }
+        };
 
         var onOpen = function(wc, network) {
             channel = wc.id;
@@ -314,10 +317,10 @@ define([
         var findChannelById = function(webChannels, channelId) {
           var webChannel;
           webChannels.forEach(function(chan) {
-            if(chan.id == channelId) { webChannel = chan; return;}
+            if(chan.id === channelId) { webChannel = chan; return;}
           });
           return webChannel;
-        }
+        };
 
         // Connect to the WebSocket channel
         Netflux.connect(websocketUrl).then(function(network) {
@@ -331,7 +334,7 @@ define([
                 onOpen(wc, network);
             }, function(error) {
                 console.error(error);
-            })
+            });
         }, function(error) {
             warn(error);
         });

From a25152d1b685681625f171dba83836b03a68e4c5 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 15:07:31 +0200
Subject: [PATCH 055/257] ignore external files and anything relying on es6

---
 .jshintignore | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.jshintignore b/.jshintignore
index b34fb0d40..3780e2719 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,6 +1,6 @@
 node_modules/
 www/bower_components/
-www/code/codemirror-5.7/
+www/code/codemirror*
 www/code/mode/
 www/code/codemirror.js
 www/pad/rangy.js
@@ -12,5 +12,14 @@ storage/kad.js
 www/common/otaml.js
 www/common/diffDOM.js
 www/common/netflux.js
+
+www/padrtc
+www/common/netflux-client.js
+www/common/es6-promise.min.js
+www/_pad
+
+NetFluxWebsocketSrv.js
 NetFluxWebsocketServer.js
 WebRTCSrv.js
+
+www/assert/hyperscript.js

From ca94d30386217c2d6865e1e1660cfcead60457f9 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 15:35:07 +0200
Subject: [PATCH 056/257] detect falsey operations in OT and ignore them

---
 www/common/json-ot.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/www/common/json-ot.js b/www/common/json-ot.js
index d8d75b7b6..a785d524c 100644
--- a/www/common/json-ot.js
+++ b/www/common/json-ot.js
@@ -4,6 +4,9 @@ define([
     var ChainPad = window.ChainPad;
     var JsonOT = {};
 
+/*  FIXME
+    resultOp after transform0() might be null, in which case you should return null
+    because it is simply a transformation which yields a "do nothing" operation */
     var validate = JsonOT.validate = function (text, toTransform, transformBy) {
         var resultOp, text2, text3;
         try {
@@ -13,6 +16,11 @@ define([
             // threeway merge (0, A, B)
 
             resultOp = ChainPad.Operation.transform0(text, toTransform, transformBy);
+
+            /*  if after operational transform we find that no op is necessary
+                return null to ignore this patch */
+            if (!resultOp) { return null; }
+
             text2 = ChainPad.Operation.apply(transformBy, text);
             text3 = ChainPad.Operation.apply(resultOp, text2);
             try {

From a0999d1d2b60a4cb8e13bcec4b403878d806c8b3 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 15:36:03 +0200
Subject: [PATCH 057/257] add a comment about why hashes are being stubbed

---
 www/pad/main.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/www/pad/main.js b/www/pad/main.js
index 7e2e594f5..e2e400cf2 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -45,6 +45,11 @@ define([
     };
 
     var andThen = function (Ckeditor) {
+        /*  This is turned off because we prefer that the channel name
+            be chosen by the server, not generated by the client.
+
+            We still need a key, so we use genKey()
+        */
         // $(window).on('hashchange', function() {
             // window.location.reload();
         // });

From 9f45ccb2d96c6dba4ff994fbda27f289f7d66292 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 16:47:30 +0200
Subject: [PATCH 058/257] use console.error for stack traces

---
 www/common/netflux-client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/netflux-client.js b/www/common/netflux-client.js
index 38c6bf44b..902abb483 100644
--- a/www/common/netflux-client.js
+++ b/www/common/netflux-client.js
@@ -151,7 +151,7 @@ const onMessage = (ctx, evt) => {
             handlers = chan._.onMessage;
         }
         handlers.forEach((h) => {
-            try { h(msg[4], msg[1]); } catch (e) { console.log(e.stack); }
+            try { h(msg[4], msg[1]); } catch (e) { console.error(e); }
         });
     }
 

From f75c246029e543ae26bb4bceb27198e3b6cf4896 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 17:17:14 +0200
Subject: [PATCH 059/257] remove dead code from pad/main.js

---
 www/pad/main.js | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index e2e400cf2..1465681ae 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -181,13 +181,6 @@ define([
 
             // apply patches, and try not to lose the cursor in the process!
             var applyHjson = function (shjson) {
-                // var hjson = JSON.parse(shjson);
-                // var peerUserList = hjson[hjson.length-1];
-                // if(peerUserList.metadata) {
-                  // var userData = peerUserList.metadata;
-                  // addToUserList(userData);
-                  // delete hjson[hjson.length-1];
-                // }
                 var userDocStateDom = hjsonToDom(JSON.parse(shjson));
                 userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf
                 var patch = (DD).diff(inner, userDocStateDom);
@@ -296,8 +289,6 @@ define([
                 return hj;
             };
 
-            // $textarea.val(JSON.stringify(Convert.dom.to.hjson(inner)));
-
             /*  It's incredibly important that you assign 'rti.onLocal'
                 It's used inside of realtimeInput to make sure that all changes
                 make it into chainpad.
@@ -307,16 +298,14 @@ define([
                 the code less extensible.
             */
             var propogate = rti.onLocal = function () {
-                /*  if the problem were a matter of external patches being
-                    applied while a local patch were in progress, then we would
-                    expect to be able to check and find
-                    'module.localChangeInProgress' with a non-zero value while
-                    we were applying a remote change.
-                */
+                // serialize your DOM into an object
                 var hjson = Hyperjson.fromDOM(inner, isNotMagicLine, brFilter);
+
+                // append the userlist to the hyperjson structure
                 if(Object.keys(myData).length > 0) {
                     hjson[hjson.length] = {metadata: userList};
                 }
+                // stringify the json and send it into chainpad
                 var shjson = JSON.stringify(hjson);
                 if (!rti.patchText(shjson)) {
                     return;

From 19cd991dba679112c9b75166f2891f0a3cfa3780 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 12 Apr 2016 17:29:20 +0200
Subject: [PATCH 060/257] trim dead code, comment, very minor optimizations

---
 www/common/realtime-input.js | 156 +++++++++++++++++------------------
 1 file changed, 76 insertions(+), 80 deletions(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 949c1ee37..bf173263d 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -89,15 +89,12 @@ define([
 
         var allMessages = [];
         var initializing = true;
-        var recoverableErrorCount = 0;
+        var recoverableErrorCount = 0; // unused
         var toReturn = {};
         var messagesHistory = [];
         var chainpadAdapter = {};
         var realtime;
 
-        // define this in case it gets called before the rest of our stuff is ready.
-        var onEvent = toReturn.onEvent = function (newText) { };
-
         var parseMessage = function (msg) {
             var res ={};
             // two or more? use a for
@@ -122,67 +119,66 @@ define([
                 content.length + ':' + content;
         };
 
-        var whoami = new RegExp(userName.replace(/[\/\+]/g, function (c) {
-            return '\\' +c;
-        }));
+        var userList = {
+            onChange : function() {},
+            users: []
+        };
 
-        var onMessage = function(peer, msg, wc, network) {
+        var onJoining = function(peer) {
+            if(peer.length !== 32) { return; }
+            var list = userList.users;
+            var index = list.indexOf(peer);
+            if(index === -1) {
+                userList.users.push(peer);
+            }
+            userList.onChange();
+        };
+
+        var onReady = function(wc, network) {
+            if(config.onInit) {
+                config.onInit({
+                    myID: wc.myID,
+                    realtime: realtime,
+                    getLag: network.getLag,
+                    userList: userList
+                });
+            }
+            // Trigger onJoining with our own Cryptpad username to tell the toolbar that we are synced
+            onJoining(wc.myID);
 
+            // we're fully synced
+            initializing = false;
+
+            // execute an onReady callback if one was supplied
+            if (config.onReady) {
+                config.onReady({
+                    realtime: realtime
+                });
+            }
+        };
+
+        var onMessage = function(peer, msg, wc, network) {
+            // unpack the history keeper from the webchannel
             var hc = (wc && wc.history_keeper) ? wc.history_keeper : null;
+
             if(wc && (msg === 0 || msg === '0')) {
-                // FIXME onReady is defined below, so JSHINT complains
-                /* jshint ignore:start */
                 onReady(wc, network);
-                /* jshint ignore:end */
                 return;
             }
-            else if (peer === hc){
+            if (peer === hc){
+                // if the peer is the 'history keeper', extract their message
                 msg = JSON.parse(msg)[4];
             }
             var message = chainpadAdapter.msgIn(peer, msg);
 
             verbose(message);
             allMessages.push(message);
-            // if (!initializing) {
-                // if (toReturn.onLocal) {
-                    // toReturn.onLocal();
-                // }
-            // }
-            realtime.message(message);
-            if (/\[5,/.test(message)) { verbose("pong"); }
-
-            if (!initializing) {
-                if (/\[2,/.test(message)) {
-                    //verbose("Got a patch");
-                    if (whoami.test(message)) {
-                        //verbose("Received own message");
-                    } else {
-                        //verbose("Received remote message");
-                        // obviously this is only going to get called if
-                        if (config.onRemote) {
-                            config.onRemote({
-                                realtime: realtime
-                            });
-                        }
-                    }
-                }
-            }
-        };
 
-        var userList = {
-          onChange : function() {},
-          users: []
-        };
-        var onJoining = function(peer) {
-          if(peer.length !== 32) { return; }
-          var list = userList.users;
-          var index = list.indexOf(peer);
-          if(index === -1) {
-            userList.users.push(peer);
-          }
-          userList.onChange();
+            // pass the message into Chainpad
+            realtime.message(message);
         };
 
+        // update UI components to show that one of the other peers has left
         var onLeaving = function(peer) {
           var list = userList.users;
           var index = list.indexOf(peer);
@@ -192,6 +188,7 @@ define([
           userList.onChange();
         };
 
+        // shim between chainpad and netflux
         chainpadAdapter = {
             msgIn : function(peerId, msg) {
                 var parsed = parseMessage(msg);
@@ -223,10 +220,6 @@ define([
             }
         };
 
-        var options = {
-          key: ''
-        };
-
         var createRealtime = function(chan) {
             return ChainPad.create(userName,
                                         passwd,
@@ -237,28 +230,6 @@ define([
                                         });
         };
 
-        var onReady = function(wc, network) {
-            if(config.onInit) {
-                config.onInit({
-                    myID: wc.myID,
-                    realtime: realtime,
-                    getLag: network.getLag,
-                    userList: userList
-                });
-            }
-            // Trigger onJoining with our own Cryptpad username to tell the toolbar that we are synced
-            onJoining(wc.myID);
-
-            // we're fully synced
-            initializing = false;
-
-            // execute an onReady callback if one was supplied
-            if (config.onReady) {
-                config.onReady({
-                    realtime: realtime
-                });
-            }
-        };
 
         var onOpen = function(wc, network) {
             channel = wc.id;
@@ -283,6 +254,13 @@ define([
             // Open a Chainpad session
             realtime = createRealtime();
 
+            toReturn.onEvent = function (newText) {
+                // assert to show that we're not out of sync
+                if (realtime.getUserDoc() !== newText) {
+                    warn("realtime.getUserDoc() !== newText");
+                }
+            };
+
             // Sending a message...
             realtime.onMessage(function(message) {
                 // Filter messages sent by Chainpad to make it compatible with Netflux
@@ -298,6 +276,14 @@ define([
                 }
             });
 
+            realtime.onPatch(function () {
+                if (config.onRemote) {
+                    config.onRemote({
+                        realtime: realtime
+                    });
+                }
+            });
+
             // Get the channel history
             var hc;
             wc.members.forEach(function (p) { 
@@ -315,21 +301,31 @@ define([
         };
 
         var findChannelById = function(webChannels, channelId) {
-          var webChannel;
-          webChannels.forEach(function(chan) {
-            if(chan.id === channelId) { webChannel = chan; return;}
-          });
-          return webChannel;
+            var webChannel;
+
+            // Array.some terminates once a truthy value is returned
+            // best case is faster than forEach, though webchannel arrays seem
+            // to consistently have a length of 1
+            webChannels.some(function(chan) {
+                if(chan.id === channelId) { webChannel = chan; return true;}
+            });
+            return webChannel;
         };
 
         // Connect to the WebSocket channel
         Netflux.connect(websocketUrl).then(function(network) {
+            // 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
                 var wchan = findChannelById(network.webChannels, channel);
                 if(wchan) {
                   onMessage(sender, msg, wchan, network);
                 }
             });
+
+            // join the netflux network, promise to handle opening of the channel
             network.join(channel || null).then(function(wc) {
                 onOpen(wc, network);
             }, function(error) {

From 468827daddefc4eb69c9f34d5423eefc22bab45e Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 13 Apr 2016 16:10:38 +0200
Subject: [PATCH 061/257] newest tests

---
 www/assert/index.html | 10 ++++++
 www/assert/main.js    | 73 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/www/assert/index.html b/www/assert/index.html
index 5feebf5ae..0ba42e3af 100644
--- a/www/assert/index.html
+++ b/www/assert/index.html
@@ -4,6 +4,16 @@
     
     
     
+
+
+    
+
 
 
 
diff --git a/www/assert/main.js b/www/assert/main.js
index f8c4f7ce1..05172555f 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -10,11 +10,17 @@ define([
     window.TextPatcher = TextPatcher;
 
     var assertions = 0;
+    var failed = false;
+    var failedOn;
+    var failMessage;
 
     var assert = function (test, msg) {
         if (test()) {
             assertions++;
         } else {
+            failed = true;
+            failedOn = assertions;
+            failMessage = msg;
             throw new Error(msg || '');
         }
     };
@@ -43,8 +49,69 @@ define([
         }, "Round trip serialization introduced artifacts.");
     };
 
-    roundTrip($('#target')[0]);
-    roundTrip($('#widget')[0]);
+    [   '#target',
+        '#widget',
+    ].forEach(function (sel) {
+        roundTrip($(sel)[0]);
+    });
 
-    console.log("%s test%s passed", assertions, assertions === 1? '':'s');
+    var strungJSON = function (orig) {
+        var result;
+        assert(function () {
+            result = JSON.stringify(JSON.parse(orig));
+            return result === orig;
+        }, "expected result (" + result + ") to equal original (" + orig + ")");
+    };
+
+    [   '{"border":"1","style":{"width":"500px"}}',
+        '{"style":{"width":"500px"},"border":"1"}',
+    ].forEach(function (orig) {
+        strungJSON(orig);
+    });
+
+    /*  TODO Test how browsers handle weird elements
+        like "_moz-resizing":"true"
+
+        and anything else you can think of.
+
+        Start with Hyperjson, turn it into a DOM and come back
+    */
+
+
+    // report successes
+
+    var swap = function (str, dict) {
+        return str.replace(/\{\{(.*?)\}\}/g, function (all, key) {
+            return dict[key] || all;
+        });
+    };
+
+    var multiline = function (f) {
+        var str;
+        f.toString().replace(/\/\*(.*)\*\\/g, function (all, out) {
+            str = out;
+        });
+        return str;
+    };
+
+    $("body").html(function (i, val) {
+        var dict = {
+            previous: val,
+            passedAssertions: assertions,
+            plural: (assertions === 1? '' : 's'),
+        };
+
+        var SUCCESS = swap(multiline(function(){/*
+
    {{passedAssertions}} test{{plural}} passed.
    
+
+{{previous}}
+        */}), dict);
+
+        var FAILURE = swap(
+
+
+        return report;
+    });
+
+    console.log(report);
 });

From 698338b49aec2f11993b4e92110d2f6851bf3760 Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 13 Apr 2016 16:43:59 +0200
Subject: [PATCH 062/257] Use canonical serializer for json serialization

---
 bower.json          |  3 ++-
 www/_socket/main.js | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/bower.json b/bower.json
index ec66645b9..cd96b4d24 100644
--- a/bower.json
+++ b/bower.json
@@ -28,6 +28,7 @@
     "reconnectingWebsocket": "",
     "diff-dom": "https://github.com/fiduswriter/diffDOM.git#6fdb82c8a4f2096c07c129797a313fe13769e094",
     "marked": "~0.3.5",
-    "rangy": "rangy-release#~1.3.0"
+    "rangy": "rangy-release#~1.3.0",
+    "json.sortify": "~2.1.0"
   }
 }
diff --git a/www/_socket/main.js b/www/_socket/main.js
index 67bfaff89..33cf3a65c 100644
--- a/www/_socket/main.js
+++ b/www/_socket/main.js
@@ -1,3 +1,4 @@
+require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/messages.js',
@@ -9,15 +10,20 @@ define([
     '/common/cursor.js',
     '/common/json-ot.js',
     '/common/TypingTests.js',
+    'json.sortify',
     '/bower_components/diff-dom/diffDOM.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest) {
+], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest, JSONSortify) {
     var $ = window.jQuery;
     var ifrw = $('#pad-iframe')[0].contentWindow;
     var Ckeditor; // to be initialized later...
     var DiffDom = window.diffDOM;
 
+    var stringify = function (obj) {
+        return JSONSortify(obj);
+    };
+
     window.Hyperjson = Hyperjson;
 
     var hjsonToDom = function (H) {
@@ -165,7 +171,7 @@ define([
                 doc: inner,
 
                 // provide initialstate...
-                initialState: JSON.stringify(Hyperjson
+                initialState: stringify(Hyperjson
                     .fromDOM(inner, isNotMagicLine)) || '{}',
 
                 // really basic operational transform
@@ -221,7 +227,7 @@ define([
                 // build a dom from HJSON, diff, and patch the editor
                 applyHjson(shjson);
 
-                var shjson2 = JSON.stringify(Hyperjson.fromDOM(inner));
+                var shjson2 = stringify(Hyperjson.fromDOM(inner));
                 if (shjson2 !== shjson) {
                     console.error("shjson2 !== shjson");
                     module.realtimeInput.patchText(shjson2);
@@ -270,7 +276,7 @@ define([
                 the code less extensible.
             */
             var propogate = rti.onLocal = function () {
-                var shjson = JSON.stringify(Hyperjson.fromDOM(inner, isNotMagicLine, brFilter));
+                var shjson = stringify(Hyperjson.fromDOM(inner, isNotMagicLine, brFilter));
                 if (!rti.patchText(shjson)) {
                     return;
                 }

From 9683fd9aeca0c5d17dc23bc07005bbbf76bd96b5 Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Wed, 13 Apr 2016 16:46:31 +0200
Subject: [PATCH 063/257] Always serialize the DOM in one way.

---
 www/pad/main.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 1465681ae..5d2b168d7 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -44,6 +44,16 @@ define([
         return true;
     };
 
+    /* catch `type="_moz"` before it goes over the wire */
+    var brFilter = function (hj) {
+        if (hj[1].type === '_moz') { hj[1].type = undefined; }
+        return hj;
+    };
+
+    var stringifyDOM = function (dom) {
+        return JSON.stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter));
+    };
+
     var andThen = function (Ckeditor) {
         /*  This is turned off because we prefer that the channel name
             be chosen by the server, not generated by the client.
@@ -189,7 +199,7 @@ define([
 
             var realtimeOptions = {
                 // provide initialstate...
-                initialState: JSON.stringify(Hyperjson.fromDOM(inner, isNotMagicLine)),
+                initialState: stringifyDOM(inner) || '{}',
 
                 // the websocket URL
                 websocketURL: Config.websocketURL,
@@ -241,8 +251,7 @@ define([
                 // Build a new stringified Chainpad hyperjson without metadata to compare with the one build from the dom
                 shjson = JSON.stringify(hjson);
 
-                var hjson2 = Hyperjson.fromDOM(inner);
-                var shjson2 = JSON.stringify(hjson2);
+                var shjson2 = stringifyDOM(inner);
                 if (shjson2 !== shjson) {
                     console.error("shjson2 !== shjson");
                     module.realtimeInput.patchText(shjson2);
@@ -283,12 +292,6 @@ define([
 
             var rti = module.realtimeInput = realtimeInput.start(realtimeOptions);
 
-            /* catch `type="_moz"` before it goes over the wire */
-            var brFilter = function (hj) {
-                if (hj[1].type === '_moz') { hj[1].type = undefined; }
-                return hj;
-            };
-
             /*  It's incredibly important that you assign 'rti.onLocal'
                 It's used inside of realtimeInput to make sure that all changes
                 make it into chainpad.

From 319f5b95f7e33f42184a0f48e1cd44a163a8b977 Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 13 Apr 2016 16:43:59 +0200
Subject: [PATCH 064/257] Use canonical serializer for json serialization

---
 bower.json          |  3 ++-
 www/_socket/main.js | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bower.json b/bower.json
index ec66645b9..cd96b4d24 100644
--- a/bower.json
+++ b/bower.json
@@ -28,6 +28,7 @@
     "reconnectingWebsocket": "",
     "diff-dom": "https://github.com/fiduswriter/diffDOM.git#6fdb82c8a4f2096c07c129797a313fe13769e094",
     "marked": "~0.3.5",
-    "rangy": "rangy-release#~1.3.0"
+    "rangy": "rangy-release#~1.3.0",
+    "json.sortify": "~2.1.0"
   }
 }
diff --git a/www/_socket/main.js b/www/_socket/main.js
index 042bd3c20..73831ac71 100644
--- a/www/_socket/main.js
+++ b/www/_socket/main.js
@@ -1,3 +1,4 @@
+require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/messages.js',
@@ -9,15 +10,20 @@ define([
     '/common/cursor.js',
     '/common/json-ot.js',
     '/common/TypingTests.js',
+    'json.sortify',
     '/bower_components/diff-dom/diffDOM.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest) {
+], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest, JSONSortify) {
     var $ = window.jQuery;
     var ifrw = $('#pad-iframe')[0].contentWindow;
     var Ckeditor; // to be initialized later...
     var DiffDom = window.diffDOM;
 
+    var stringify = function (obj) {
+        return JSONSortify(obj);
+    };
+
     window.Hyperjson = Hyperjson;
 
     var hjsonToDom = function (H) {
@@ -52,7 +58,7 @@ define([
     };
 
     var stringifyDOM = function (dom) {
-        return JSON.stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter));
+        return stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter));
     };
 
     var andThen = function (Ckeditor) {
@@ -233,7 +239,6 @@ define([
                 applyHjson(shjson);
 
                 var shjson2 = stringifyDOM(inner);
-
                 if (shjson2 !== shjson) {
                     console.error("shjson2 !== shjson");
                     module.realtimeInput.patchText(shjson2);

From ecc41d14af455837ce704c6b2ed2d5d9a57ed535 Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Wed, 13 Apr 2016 17:46:41 +0200
Subject: [PATCH 065/257] Use canonical serializer for json serialization

---
 www/_socket/main.js |  2 +-
 www/pad/main.js     | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/www/_socket/main.js b/www/_socket/main.js
index 73831ac71..c93eb82e0 100644
--- a/www/_socket/main.js
+++ b/www/_socket/main.js
@@ -189,7 +189,7 @@ define([
                 // reject patch if it results in invalid JSON
                 transformFunction : JsonOT.validate,
 
-                websocketURL: Config.websocketURL,
+                websocketURL: Config.websocketURL+'_old',
 
                 // username
                 userName: userName,
diff --git a/www/pad/main.js b/www/pad/main.js
index 5d2b168d7..91b9d009c 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -1,3 +1,4 @@
+require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/messages.js',
@@ -9,14 +10,19 @@ define([
     '/common/cursor.js',
     '/common/json-ot.js',
     '/common/TypingTests.js',
+    'json.sortify',
     '/bower_components/diff-dom/diffDOM.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest) {
+], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest, JSONSortify) {
     var $ = window.jQuery;
     var ifrw = $('#pad-iframe')[0].contentWindow;
     var Ckeditor; // to be initialized later...
     var DiffDom = window.diffDOM;
+    
+    var stringify = function (obj) {
+        return JSONSortify(obj);
+    };
 
     window.Toolbar = Toolbar;
     window.Hyperjson = Hyperjson;
@@ -51,7 +57,7 @@ define([
     };
 
     var stringifyDOM = function (dom) {
-        return JSON.stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter));
+        return stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter));
     };
 
     var andThen = function (Ckeditor) {
@@ -249,7 +255,7 @@ define([
                 applyHjson(shjson);
 
                 // Build a new stringified Chainpad hyperjson without metadata to compare with the one build from the dom
-                shjson = JSON.stringify(hjson);
+                shjson = stringify(hjson);
 
                 var shjson2 = stringifyDOM(inner);
                 if (shjson2 !== shjson) {
@@ -309,7 +315,7 @@ define([
                     hjson[hjson.length] = {metadata: userList};
                 }
                 // stringify the json and send it into chainpad
-                var shjson = JSON.stringify(hjson);
+                var shjson = stringify(hjson);
                 if (!rti.patchText(shjson)) {
                     return;
                 }

From feaae609ad6463ba1d4e29f303c80db8c4c7ddf9 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 14 Apr 2016 10:48:25 +0200
Subject: [PATCH 066/257] fix broken path for padrtc

---
 www/padrtc/realtime-input.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/padrtc/realtime-input.js b/www/padrtc/realtime-input.js
index af0f22a1d..ae2f8c72c 100644
--- a/www/padrtc/realtime-input.js
+++ b/www/padrtc/realtime-input.js
@@ -20,7 +20,7 @@ define([
     '/padrtc/netflux.js',
     '/common/crypto.js',
     '/common/toolbar.js',
-    '/_socket/text-patcher.js',
+    '/common/TextPatcher.js',
     '/common/es6-promise.min.js',
     '/common/chainpad.js',
     '/bower_components/jquery/dist/jquery.min.js',

From b12a01e08f925769f1b2bcbac4a23a739f24e558 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 14 Apr 2016 12:16:10 +0200
Subject: [PATCH 067/257] report test results on the page, not in the console

---
 www/assert/index.html | 10 +++++-
 www/assert/main.js    | 73 ++++++++++++++++++++++++++++++++-----------
 2 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/www/assert/index.html b/www/assert/index.html
index 0ba42e3af..68c995f68 100644
--- a/www/assert/index.html
+++ b/www/assert/index.html
@@ -9,9 +9,17 @@
     
 
 
diff --git a/www/assert/main.js b/www/assert/main.js
index 05172555f..0ffea44e6 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -12,17 +12,28 @@ define([
     var assertions = 0;
     var failed = false;
     var failedOn;
-    var failMessage;
+    var failMessages = [];
+
+    var ASSERTS = [];
+    var runASSERTS = function () {
+        ASSERTS.forEach(function (f, index) {
+            f(index);
+        });
+    };
 
     var assert = function (test, msg) {
-        if (test()) {
-            assertions++;
-        } else {
-            failed = true;
-            failedOn = assertions;
-            failMessage = msg;
-            throw new Error(msg || '');
-        }
+        ASSERTS.push(function (i) {
+            if (test()) {
+                assertions++;
+            } else {
+                failed = true;
+                failedOn = assertions;
+                failMessages.push({
+                    test: i,
+                    message: msg
+                });
+            }
+        });
     };
 
     var $body = $('body');
@@ -69,6 +80,8 @@ define([
         strungJSON(orig);
     });
 
+    //assert(function () { }, "this is expected to fail");
+
     /*  TODO Test how browsers handle weird elements
         like "_moz-resizing":"true"
 
@@ -77,41 +90,63 @@ define([
         Start with Hyperjson, turn it into a DOM and come back
     */
 
-
-    // report successes
-
     var swap = function (str, dict) {
         return str.replace(/\{\{(.*?)\}\}/g, function (all, key) {
-            return dict[key] || all;
+            return typeof dict[key] !== 'undefined'? dict[key] : all;
         });
     };
 
     var multiline = function (f) {
         var str;
-        f.toString().replace(/\/\*(.*)\*\\/g, function (all, out) {
+        f.toString().replace(/\/\*([\s\S]*)\*\//g, function (all, out) {
             str = out;
         });
-        return str;
+        return str || '';
     };
 
+    var formatFailures = function () {
+        var template = multiline(function () { /*
+
    +Failed on test number {{test}} with error:
+> "{{message}}"
+
    
+
    
+
+*/});
+        return failMessages.map(function (obj) {
+            console.log(obj);
+            return swap(template, obj);
+        }).join("\n");
+    };
+
+    runASSERTS();
+
     $("body").html(function (i, val) {
         var dict = {
             previous: val,
+            totalAssertions: ASSERTS.length,
             passedAssertions: assertions,
             plural: (assertions === 1? '' : 's'),
+            failMessages: formatFailures()
         };
 
         var SUCCESS = swap(multiline(function(){/*
-
    {{passedAssertions}} test{{plural}} passed.
    
+
    {{passedAssertions}} / {{totalAssertions}} test{{plural}} passed.
+
+{{failMessages}}
+
+
    
+
 
 {{previous}}
         */}), dict);
 
-        var FAILURE = swap(
-
+        var report = SUCCESS;
 
         return report;
     });
 
-    console.log(report);
+    var $report = $('.report');
+    $report.addClass(failed?'failure':'success');
+
 });

From 6884b0890ac0e3e4378de438cd02cc9f02a1cf61 Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Thu, 14 Apr 2016 12:24:17 +0200
Subject: [PATCH 068/257] Fix the typong tests not working properly

---
 www/common/TypingTests.js    |  2 +-
 www/common/netflux-client.js |  2 +-
 www/pad/main.js              | 50 ++++++++++++++++++++++++++++--------
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/www/common/TypingTests.js b/www/common/TypingTests.js
index af09c72c8..16db8c0d5 100644
--- a/www/common/TypingTests.js
+++ b/www/common/TypingTests.js
@@ -33,7 +33,7 @@ define(function () {
         interval = setRandomizedInterval(function () {
             cb();
             try {
-                el.replaceData(j, 0, input.charAt(i));
+                el.replaceData(Math.min(j, el.length), 0, input.charAt(i));
             } catch (err) {
                 errors++;
                 if (errors >= max_errors) {
diff --git a/www/common/netflux-client.js b/www/common/netflux-client.js
index 902abb483..455b07c5b 100644
--- a/www/common/netflux-client.js
+++ b/www/common/netflux-client.js
@@ -133,7 +133,7 @@ const onMessage = (ctx, evt) => {
         return;
     }
     if (msg[2] === 'PING') {
-        msg[1] = 'PONG';
+        msg[2] = 'PONG';
         ctx.ws.send(JSON.stringify(msg));
         return;
     }
diff --git a/www/pad/main.js b/www/pad/main.js
index 91b9d009c..59c9de2ae 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -32,7 +32,8 @@ define([
     };
 
     var module = window.REALTIME_MODULE = {
-        localChangeInProgress: 0
+        Hyperjson: Hyperjson,
+        Hyperscript: Hyperscript
     };
 
     var userName = Crypto.rand64(8),
@@ -104,8 +105,7 @@ define([
             var cursor = window.cursor = Cursor(inner);
 
             var setEditable = function (bool) {
-                inner.setAttribute('contenteditable',
-                    (typeof (bool) !== 'undefined'? bool : true));
+                inner.setAttribute('contenteditable', bool);
             };
 
             // don't let the user edit until the pad is ready
@@ -113,25 +113,53 @@ define([
 
             var diffOptions = {
                 preDiffApply: function (info) {
-                    /*  Don't remove local instances of the magicline plugin */
+                    /* DiffDOM will filter out magicline plugin elements
+                        in practice this will make it impossible to use it
+                        while someone else is typing, which could be annoying.
+
+                        we should check when such an element is going to be
+                        removed, and prevent that from happening. */
                     if (info.node && info.node.tagName === 'SPAN' &&
-                        info.node.getAttribute('contentEditable') === 'false') {
-                        return true;
+                        info.node.getAttribute('contentEditable') === "false") {
+                        // it seems to be a magicline plugin element...
+                        if (info.diff.action === 'removeElement') {
+                            // and you're about to remove it...
+                            // this probably isn't what you want
+
+                            /*
+                                I have never seen this in the console, but the
+                                magic line is still getting removed on remote
+                                edits. This suggests that it's getting removed
+                                by something other than diffDom.
+                            */
+                            console.log("preventing removal of the magic line!");
+
+                            // return true to prevent diff application
+                            return true;
+                        }
                     }
 
+                    // no use trying to recover the cursor if it doesn't exist
                     if (!cursor.exists()) { return; }
+
+                    /*  frame is either 0, 1, 2, or 3, depending on which
+                        cursor frames were affected: none, first, last, or both
+                    */
                     var frame = info.frame = cursor.inNode(info.node);
+
                     if (!frame) { return; }
-                    if (typeof info.diff.oldValue === 'string' &&
-                        typeof info.diff.newValue === 'string') {
-                        var pushes = cursor.pushDelta(info.diff.oldValue,
-                            info.diff.newValue);
+
+                    if (typeof info.diff.oldValue === 'string' && typeof info.diff.newValue === 'string') {
+                        var pushes = cursor.pushDelta(info.diff.oldValue, info.diff.newValue);
+
                         if (frame & 1) {
+                            // push cursor start if necessary
                             if (pushes.commonStart < cursor.Range.start.offset) {
                                 cursor.Range.start.offset += pushes.delta;
                             }
                         }
                         if (frame & 2) {
+                            // push cursor end if necessary
                             if (pushes.commonStart < cursor.Range.end.offset) {
                                 cursor.Range.end.offset += pushes.delta;
                             }
@@ -143,7 +171,7 @@ define([
                         if (info.node) {
                             if (info.frame & 1) { cursor.fixStart(info.node); }
                             if (info.frame & 2) { cursor.fixEnd(info.node); }
-                        } else { console.log("info.node did not exist"); }
+                        } else { console.error("info.node did not exist"); }
 
                         var sel = cursor.makeSelection();
                         var range = cursor.makeRange();

From 4af987a2a2e49fc6e56d2a88af382353c27e1fe0 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 14 Apr 2016 12:36:25 +0200
Subject: [PATCH 069/257] point to correct toolbar.js

---
 www/p/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/p/main.js b/www/p/main.js
index 73831ac71..9fe61c0bd 100644
--- a/www/p/main.js
+++ b/www/p/main.js
@@ -6,7 +6,7 @@ define([
     '/common/RealtimeTextSocket.js',
     '/common/hyperjson.js',
     '/common/hyperscript.js',
-    '/_socket/toolbar.js',
+    '/p/toolbar.js',
     '/common/cursor.js',
     '/common/json-ot.js',
     '/common/TypingTests.js',

From be09a1808d1c136f1bb2bb0f35659df41d57a2e8 Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Thu, 14 Apr 2016 14:46:42 +0200
Subject: [PATCH 070/257] Remove old code from realtime-input

---
 www/common/netflux-client.js |  4 ++--
 www/common/realtime-input.js | 35 +----------------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/www/common/netflux-client.js b/www/common/netflux-client.js
index 455b07c5b..e6567229a 100644
--- a/www/common/netflux-client.js
+++ b/www/common/netflux-client.js
@@ -4,7 +4,7 @@ define(() => {
 const MAX_LAG_BEFORE_PING = 15000;
 const MAX_LAG_BEFORE_DISCONNECT = 30000;
 const PING_CYCLE = 5000;
-const REQUEST_TIMEOUT = 5000;
+const REQUEST_TIMEOUT = 30000;
 
 const now = () => new Date().getTime();
 
@@ -205,7 +205,7 @@ const connect = (websocketURL) => {
             const req = ctx.requests[id];
             if (now() - req.time > REQUEST_TIMEOUT) {
                 delete ctx.requests[id];
-                req.reject({ type: 'TIMEOUT', message: 'waited ' + now() - req.time + 'ms' });
+                if(typeof req.reject === "function") { req.reject({ type: 'TIMEOUT', message: 'waited ' + now() - req.time + 'ms' }); }
             }
         }
     }, 5000);
diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index bf173263d..3fd00231d 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -14,17 +14,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see .
  */
-window.Reflect = { has: function (x,y) { return (y in x); } };
 define([
     '/common/messages.js',
     '/common/netflux-client.js',
     '/common/crypto.js',
-    '/common/toolbar.js',
     '/common/TextPatcher.js',
     '/common/es6-promise.min.js',
     '/common/chainpad.js',
     '/bower_components/jquery/dist/jquery.min.js',
-], function (Messages, Netflux, Crypto, Toolbar, TextPatcher) {
+], function (Messages, Netflux, Crypto, TextPatcher) {
     var $ = window.jQuery;
     var ChainPad = window.ChainPad;
     var PARANOIA = true;
@@ -41,37 +39,6 @@ define([
         verbose = function (x) { console.log(x); };
     verbose = function () {}; // comment out to enable verbose logging
 
-    // ------------------ 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 getParameterByName = function (name, url) {
-        if (!url) { url = window.location.href; }
-        name = name.replace(/[\[\]]/g, "\\$&");
-        var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
-            results = regex.exec(url);
-        if (!results) { return null; }
-        if (!results[2]) { return ''; }
-        return decodeURIComponent(results[2].replace(/\+/g, " "));
-    };
-
     var start = module.exports.start =
         function (config)
     {

From c32045d7d039fdb6147c15f7e28236246fa298ac Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Thu, 14 Apr 2016 15:30:42 +0200
Subject: [PATCH 071/257] Fix an issue with missing characters when several
 users were typing at the same time

---
 www/common/hyperjson.js      | 7 -------
 www/common/realtime-input.js | 8 ++++++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/www/common/hyperjson.js b/www/common/hyperjson.js
index 27bee7cee..ff04a0da9 100644
--- a/www/common/hyperjson.js
+++ b/www/common/hyperjson.js
@@ -52,13 +52,6 @@ define([], function () {
         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){
         if(!el.tagName && el.nodeType === Node.TEXT_NODE){
             return el.textContent;
diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 3fd00231d..437d5fb48 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -141,6 +141,11 @@ define([
             verbose(message);
             allMessages.push(message);
 
+            if (!initializing) {
+                if (toReturn.onLocal) {
+                    toReturn.onLocal();
+                }
+            }
             // pass the message into Chainpad
             realtime.message(message);
         };
@@ -167,6 +172,7 @@ define([
                     messagesHistory.push(decryptedMsg);
                     return decryptedMsg;
                 } catch (err) {
+                    console.error(err);
                     return message;
                 }
 
@@ -283,8 +289,6 @@ define([
         Netflux.connect(websocketUrl).then(function(network) {
             // 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
                 var wchan = findChannelById(network.webChannels, channel);
                 if(wchan) {

From d62e9fc1c9b62b378eb2a95800e90ece7d638edc Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 14 Apr 2016 15:41:02 +0200
Subject: [PATCH 072/257] add a missing semicolon

---
 www/common/TextPatcher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/TextPatcher.js b/www/common/TextPatcher.js
index 98ccea65a..c554e7363 100644
--- a/www/common/TextPatcher.js
+++ b/www/common/TextPatcher.js
@@ -81,7 +81,7 @@ var log = function (text, op) {
 */
 var applyChange = function(ctx, oldval, newval, logging) {
     var op = diff(oldval, newval);
-    if (logging) { log(oldval, op) }
+    if (logging) { log(oldval, op); }
     patch(ctx, op);
 };
 

From 69e8e182837b9e949bdf6b04c524c13137be7522 Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Thu, 14 Apr 2016 16:10:08 +0200
Subject: [PATCH 073/257] Remove the pipe character in the hash

---
 www/common/realtime-input.js | 4 ++--
 www/pad/main.js              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 437d5fb48..5bcbaf8b3 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -197,7 +197,7 @@ define([
             return ChainPad.create(userName,
                                         passwd,
                                         channel,
-                                        config.initialState || {},
+                                        config.initialState || '',
                                         {
                                         transformFunction: config.transformFunction
                                         });
@@ -206,7 +206,7 @@ define([
 
         var onOpen = function(wc, network) {
             channel = wc.id;
-            window.location.hash = channel + '|' + chanKey;
+            window.location.hash = channel + chanKey;
 
             // Add the existing peers in the userList
             wc.members.forEach(onJoining);
diff --git a/www/pad/main.js b/www/pad/main.js
index 59c9de2ae..9429e552c 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -80,7 +80,7 @@ define([
         else {
             var hash = window.location.hash.substring(1);
             channel = hash.substr(0,32);
-            key = hash.substr(33);
+            key = hash.substr(32);
         }
 
         var fixThings = false;

From 41e635b2e56ee09464118c0d5f6d6900261aaaf5 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 14 Apr 2016 16:27:34 +0200
Subject: [PATCH 074/257] realtime-input.js : turn on logging

---
 www/common/realtime-input.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 5bcbaf8b3..ed665e9e3 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -267,7 +267,8 @@ define([
 
 
             toReturn.patchText = TextPatcher.create({
-                realtime: realtime
+                realtime: realtime,
+                logging: true
             });
 
             realtime.start();

From 13dc77b7f645c5999d2a2705d2fbcf5f8de8dff9 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 15 Apr 2016 18:16:54 +0200
Subject: [PATCH 075/257] remove commented line

---
 www/common/RealtimeTextSocket.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/common/RealtimeTextSocket.js b/www/common/RealtimeTextSocket.js
index 4821ce454..944d7f84a 100644
--- a/www/common/RealtimeTextSocket.js
+++ b/www/common/RealtimeTextSocket.js
@@ -209,7 +209,6 @@ define([
                 if (config.onRemote) {
                     config.onRemote({
                         realtime: realtime
-                        //realtime.getUserDoc()
                     });
                 }
             });

From 92d89f6cac2416c2d8b22c79637faf5969b4214d Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 15 Apr 2016 18:17:45 +0200
Subject: [PATCH 076/257] start to factor sharejs into two modules

---
 www/common/RealtimeTextarea.js | 213 +++++++++++++++++++++++++++++++++
 www/text/main.js               |   2 +-
 2 files changed, 214 insertions(+), 1 deletion(-)
 create mode 100644 www/common/RealtimeTextarea.js

diff --git a/www/common/RealtimeTextarea.js b/www/common/RealtimeTextarea.js
new file mode 100644
index 000000000..96be72529
--- /dev/null
+++ b/www/common/RealtimeTextarea.js
@@ -0,0 +1,213 @@
+/*
+ * 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 .
+ */
+define([
+    '/common/messages.js',
+    '/bower_components/reconnectingWebsocket/reconnecting-websocket.js',
+    '/common/crypto.js',
+    '/common/TextPatcher.js',
+    '/common/chainpad.js',
+    '/bower_components/jquery/dist/jquery.min.js',
+], function (Messages, ReconnectingWebSocket, Crypto, TextPatcher) {
+    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 warn = function (x) { console.error(x); };
+
+    /* websocket stuff */
+    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;
+        }
+    };
+
+    // TODO before removing websocket implementation
+    // bind abort to onLeaving
+    var abort = function (socket, realtime) {
+        realtime.abort();
+        try { socket._socket.close(); } catch (e) { warn(e); }
+    };
+
+    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;
+    };
+    /* end websocket stuff */
+
+    var start = module.exports.start = function (config) { 
+        var websocketUrl = config.websocketURL;
+        var userName = config.userName;
+        var channel = config.channel;
+        var cryptKey = config.cryptKey;
+        var passwd = 'y';
+
+        var toReturn = {};
+
+        var socket = makeWebsocket(websocketUrl);
+
+        var allMessages = [];
+        var isErrorState = false;
+        var initializing = true;
+        var recoverableErrorCount = 0;
+
+        socket.onOpen.push(function (evt) {
+            var realtime = socket.realtime = ChainPad.create(userName,
+                                passwd,
+                                channel,
+                                config.initialState || '',
+                                {
+                                    transformFunction: config.transformFunction
+                                });
+
+            if (config.onInit) {
+                // extend as you wish
+                config.onInit({
+                    realtime: realtime
+                });
+            }
+
+            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.
+                initializing = false;
+
+                // execute an onReady callback if one was supplied
+                // pass an object so we can extend this later
+                if (config.onReady) {
+                    // extend as you wish
+                    config.onReady({
+                        userList: userList,
+                        realtime: realtime
+                    });
+                }
+            });
+
+            // when you receive a message...
+            socket.onMessage.push(function (evt) {
+                if (isErrorState) { return; }
+
+                var message = Crypto.decrypt(evt.data, cryptKey);
+                allMessages.push(message);
+
+                // super important step that avoids us having
+                // the 'backspace bug'
+                if (toReturn.onLocal) {
+                    toReturn.onLocal();
+                }
+
+                realtime.message(message);
+            });
+
+            // when you receive a patch
+            realtime.onPatch(function () {
+                if (config.onRemote) {
+                    config.onRemote({
+                        realtime: realtime
+                    });
+                }
+            });
+
+            // 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);
+                }
+            });
+
+            var socketChecker = setInterval(function () {
+                if (checkSocket(socket)) {
+                    warn("Socket disconnected!");
+
+                    recoverableErrorCount += 1;
+
+                    if (recoverableErrorCount >= MAX_RECOVERABLE_ERRORS) {
+                        warn("Giving up!");
+                        abort(socket, realtime);
+                        if (config.onAbort) {
+                            config.onAbort({
+                                realtime: realtime
+                            });
+                        }
+                        if (socketChecker) { clearInterval(socketChecker); }
+                    }
+                }
+            },200);
+
+            // TODO implement callbacks and replace sharejs entirely
+            toReturn.patchText = TextPatcher.create({
+                realtime: realtime,
+                logging: true
+            });
+
+            realtime.start();
+        });
+        return toReturn;
+    };
+    return module.exports;
+});
diff --git a/www/text/main.js b/www/text/main.js
index db753e8a7..65f654cf8 100644
--- a/www/text/main.js
+++ b/www/text/main.js
@@ -1,6 +1,6 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
+    '/common/realtime-textarea.js',
     '/common/messages.js',
     '/common/crypto.js',
     '/bower_components/jquery/dist/jquery.min.js',

From d3c2c901b609e3dc5b49048d800909eea06c5111 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sun, 17 Apr 2016 14:02:45 +0200
Subject: [PATCH 077/257] implement cursor transformation in a common library

---
 www/common/TextPatcher.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/www/common/TextPatcher.js b/www/common/TextPatcher.js
index c554e7363..c5720a53d 100644
--- a/www/common/TextPatcher.js
+++ b/www/common/TextPatcher.js
@@ -85,6 +85,20 @@ var applyChange = function(ctx, oldval, newval, logging) {
     patch(ctx, op);
 };
 
+var transformCursor = function (cursor, op) {
+    var pos = op.offset;
+    var remove = op.toRemove;
+    var insert = op.toInsert.length;
+    if (typeof cursor === 'undefined') { return; }
+    if (typeof remove === 'number' && pos < cursor) {
+        cursor -= Math.min(remove, cursor - pos);
+    }
+    if (typeof insert === 'number' && pos < cursor) {
+        cursor += insert;
+    }
+    return cursor;
+};
+
 var create = function(config) {
     var ctx = config.realtime;
     var logging = config.logging;
@@ -116,6 +130,7 @@ return {
     diff: diff, // diff two strings
     patch: patch, // apply an operation to a chainpad's realtime facade
     log: log, // print the components of an operation
+    transformCursor: transformCursor, // transform the position of a cursor
     applyChange: applyChange // a convenient wrapper around diff/log/patch
 };
 });

From 4a41575e6ddb731ebba1935c1ea89f0f36373798 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sun, 17 Apr 2016 14:05:05 +0200
Subject: [PATCH 078/257] accept onLocal in config

---
 www/common/RealtimeTextarea.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/www/common/RealtimeTextarea.js b/www/common/RealtimeTextarea.js
index 96be72529..bbfcecce5 100644
--- a/www/common/RealtimeTextarea.js
+++ b/www/common/RealtimeTextarea.js
@@ -94,6 +94,7 @@ define([
     /* end websocket stuff */
 
     var start = module.exports.start = function (config) { 
+
         var websocketUrl = config.websocketURL;
         var userName = config.userName;
         var channel = config.channel;
@@ -153,8 +154,8 @@ define([
 
                 // super important step that avoids us having
                 // the 'backspace bug'
-                if (toReturn.onLocal) {
-                    toReturn.onLocal();
+                if (config.onLocal) {
+                    config.onLocal();
                 }
 
                 realtime.message(message);

From cb979844f6ac82108327d81983470512ac52e4be Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sun, 17 Apr 2016 14:06:30 +0200
Subject: [PATCH 079/257] implement text patching at application layer

---
 www/common/RealtimeTextarea.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/www/common/RealtimeTextarea.js b/www/common/RealtimeTextarea.js
index bbfcecce5..ee9fcdeb8 100644
--- a/www/common/RealtimeTextarea.js
+++ b/www/common/RealtimeTextarea.js
@@ -18,10 +18,9 @@ define([
     '/common/messages.js',
     '/bower_components/reconnectingWebsocket/reconnecting-websocket.js',
     '/common/crypto.js',
-    '/common/TextPatcher.js',
     '/common/chainpad.js',
     '/bower_components/jquery/dist/jquery.min.js',
-], function (Messages, ReconnectingWebSocket, Crypto, TextPatcher) {
+], function (Messages, ReconnectingWebSocket, Crypto) {
     var $ = window.jQuery;
     var ChainPad = window.ChainPad;
     var PARANOIA = true;
@@ -200,12 +199,6 @@ define([
                 }
             },200);
 
-            // TODO implement callbacks and replace sharejs entirely
-            toReturn.patchText = TextPatcher.create({
-                realtime: realtime,
-                logging: true
-            });
-
             realtime.start();
         });
         return toReturn;

From 41276fffb5d813dce1a8a9b631dd4a415b9b91f2 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sun, 17 Apr 2016 14:15:34 +0200
Subject: [PATCH 080/257] repair /text/ application, conform to new API

---
 www/text/main.js | 50 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 7 deletions(-)

diff --git a/www/text/main.js b/www/text/main.js
index 65f654cf8..0143a0f10 100644
--- a/www/text/main.js
+++ b/www/text/main.js
@@ -1,11 +1,12 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-textarea.js',
+    '/common/RealtimeTextarea.js',
     '/common/messages.js',
     '/common/crypto.js',
+    '/common/TextPatcher.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Realtime, Messages, Crypto) { 
+], function (Config, Realtime, Messages, Crypto, TextPatcher) { 
     var $ = window.jQuery;
     $(window).on('hashchange', function() {
         window.location.reload();
@@ -15,28 +16,58 @@ define([
         return;
     }
 
+    var module = window.APP = {};
     var key = Crypto.parseKey(window.location.hash.substring(1));
     var initializing = true;
     var $textarea = $('textarea');
 
-    var config = {
+    var config = module.config = {
         textarea: $textarea[0],
-        websocketURL: Config.websocketURL,
+        websocketURL: Config.websocketURL + '_old',
         userName: Crypto.rand64(8),
         channel: key.channel,
         cryptKey: key.cryptKey
     };
 
+    var setEditable = function (bool) { $textarea.attr('disabled', !bool); };
+    var canonicalize = function (text) { return text.replace(/\r\n/g, '\n'); };
+
+    setEditable(false);
+
     var onInit = config.onInit = function (info) { };
 
-    var onRemote = config.onRemote = function (contents) {
+    var onRemote = config.onRemote = function (info) {
         if (initializing) { return; }
-        // TODO...
+        var userDoc = module.realtime.getUserDoc();
+        var content = canonicalize($textarea.val());
+
+        var op = TextPatcher.diff(content, userDoc);
+        var elem = $textarea[0];
+
+        var selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
+            return TextPatcher.transformCursor(elem[attr], op);
+        });
+
+        $textarea.val(userDoc);
+        elem.selectionStart = selects[0];
+        elem.selectionEnd = selects[1];
+    };
+
+    var onLocal = config.onLocal = function () {
+        if (initializing) { return; }
+        module.patchText(canonicalize($textarea.val()));
     };
 
     var onReady = config.onReady = function (info) {
+        var realtime = module.realtime = info.realtime;
+        module.patchText = TextPatcher.create({
+            realtime: realtime
+        });
+
+        $textarea.val(realtime.getUserDoc());
+
+        setEditable(true);
         initializing = false;
-        $textarea.attr('disabled', false);
     };
 
     var onAbort = config.onAbort = function (info) {
@@ -45,4 +76,9 @@ define([
     };
 
     var rt = Realtime.start(config);
+
+    ['cut', 'paste', 'change', 'keyup', 'keydown', 'select', 'textInput']
+        .forEach(function (evt) {
+            $textarea.on(evt, onLocal);
+        });
 });

From 7c4b334ad3ac3bf009e68d67cac12845149778a6 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sun, 17 Apr 2016 20:04:49 +0200
Subject: [PATCH 081/257] here's a canvas app!

---
 www/canvas/index.html |  73 ++++++++++++++++++++++++++++
 www/canvas/main.js    | 108 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 181 insertions(+)
 create mode 100644 www/canvas/index.html
 create mode 100644 www/canvas/main.js

diff --git a/www/canvas/index.html b/www/canvas/index.html
new file mode 100644
index 000000000..850524185
--- /dev/null
+++ b/www/canvas/index.html
@@ -0,0 +1,73 @@
+
+
+
+    
+    
+    
+    
+
+
+
+     
+
+    
    Welcome to CryptCanvas!
    
+    
    Zero Knowledge Realtime Collaborative Canvas Editing
    
+
+    
    
+        
+        
+        
     
    
+    
    
+
+
+
+
+
diff --git a/www/canvas/main.js b/www/canvas/main.js
new file mode 100644
index 000000000..ce0336002
--- /dev/null
+++ b/www/canvas/main.js
@@ -0,0 +1,108 @@
+require.config({ paths: {
+    'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify'
+}});
+
+define([
+    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    '/common/RealtimeTextarea.js',
+    '/common/messages.js',
+    '/common/crypto.js',
+    '/common/TextPatcher.js',
+    '/bower_components/fabric.js/dist/fabric.min.js',
+    'json.sortify',
+    '/bower_components/jquery/dist/jquery.min.js',
+    '/customize/pad.js'
+], function (Config, Realtime, Messages, Crypto, TextPatcher, Fabric, JSONSortify) { 
+    var module = window.APP = { };
+    var $ = module.$ = window.jQuery;
+    var Fabric = module.Fabric = window.fabric;
+
+    $(window).on('hashchange', function() {
+        window.location.reload();
+    });
+    if (window.location.href.indexOf('#') === -1) {
+        window.location.href = window.location.href + '#' + Crypto.genKey();
+        return;
+    }
+
+    /* Initialize Fabric */
+    var canvas = module.canvas = new Fabric.Canvas('canvas');
+    var $canvas = $('canvas');
+
+    var $width = $('#width');
+    var updateBrushWidth = function () {
+        canvas.freeDrawingBrush.width = Number($width.val());
+    };
+    updateBrushWidth();
+
+    $width.on('change', updateBrushWidth);
+
+    var palette = ['red', 'blue', 'green', 'white', 'black', 'purple', 'gray'];
+    var $colors = $('#colors');
+    $colors.html(function (i, val) {
+        return palette.map(function (c) {
+                return "";
+            }).join("");
+    });
+
+    $('.palette').on('click', function () {
+        var color = $(this).css('background-color');
+        canvas.freeDrawingBrush.color = color;
+    });
+
+    var setEditable = function (bool) {
+        canvas.isDrawingMode = bool;
+        $canvas.css('border-color', bool? 'black': 'red');
+    };
+
+    var key = Crypto.parseKey(window.location.hash.substring(1));
+    var initializing = true;
+
+    var config = module.config = {
+        websocketURL: Config.websocketURL + '_old',
+        userName: Crypto.rand64(8),
+        channel: key.channel,
+        cryptKey: key.cryptKey
+    };
+
+    var onInit = config.onInit = function (info) { };
+
+    var onRemote = config.onRemote = function () {
+        if (initializing) { return; }
+        var userDoc = module.realtime.getUserDoc();
+        canvas.loadFromJSON(userDoc);
+        canvas.renderAll();
+    };
+
+    var onLocal = config.onLocal = function () {
+        if (initializing) { return; }
+        var content = JSONSortify(canvas.toDatalessJSON());
+        module.patchText(content);
+    };
+
+    var onReady = config.onReady = function (info) {
+        var realtime = module.realtime = info.realtime;
+        module.patchText = TextPatcher.create({
+            realtime: realtime
+        });
+
+        setEditable(true);
+        initializing = false;
+        onRemote();
+    };
+
+    var onAbort = config.onAbort = function (info) {
+        setEditable(false);
+        window.alert("Server Connection Lost");
+    };
+
+    var rt = Realtime.start(config);
+
+    canvas.on('mouse:up', onLocal);
+
+    $('#clear').on('click', function () {
+        canvas.clear();
+    });
+
+
+});

From cc1814544d7a8be34f83e46ea732cc5fbb7a74cd Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sun, 17 Apr 2016 20:05:40 +0200
Subject: [PATCH 082/257] install fabricjs

---
 bower.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index cd96b4d24..6883d1107 100644
--- a/bower.json
+++ b/bower.json
@@ -29,6 +29,7 @@
     "diff-dom": "https://github.com/fiduswriter/diffDOM.git#6fdb82c8a4f2096c07c129797a313fe13769e094",
     "marked": "~0.3.5",
     "rangy": "rangy-release#~1.3.0",
-    "json.sortify": "~2.1.0"
+    "json.sortify": "~2.1.0",
+    "fabric.js": "fabric#~1.6.0"
   }
 }

From 5ce158d2e28867a7a7697a8bfaccdb873ff539d8 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sun, 17 Apr 2016 20:21:19 +0200
Subject: [PATCH 083/257] add more colors

---
 www/canvas/index.html | 9 +++++++--
 www/canvas/main.js    | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/www/canvas/index.html b/www/canvas/index.html
index 850524185..7555bbd9c 100644
--- a/www/canvas/index.html
+++ b/www/canvas/index.html
@@ -37,6 +37,9 @@
             border: 3px solid black;
             padding: 5px;
         }
+        #copy {
+            padding-left: 75px;
+        }
         span.palette {
             height: 50px;
             width: 50px;
@@ -58,8 +61,10 @@
 
      
 
-    
    Welcome to CryptCanvas!
    
-    
    Zero Knowledge Realtime Collaborative Canvas Editing
    
+    
    
+        
    Welcome to CryptCanvas!
    
+        
    Zero Knowledge Realtime Collaborative Canvas Editing
    
+    
    
 
     
    
         
diff --git a/www/canvas/main.js b/www/canvas/main.js
index ce0336002..be716b200 100644
--- a/www/canvas/main.js
+++ b/www/canvas/main.js
@@ -37,7 +37,8 @@ define([
 
     $width.on('change', updateBrushWidth);
 
-    var palette = ['red', 'blue', 'green', 'white', 'black', 'purple', 'gray'];
+    var palette = ['red', 'blue', 'green', 'white', 'black', 'purple',
+        'gray', 'beige', 'brown', 'cyan', 'darkcyan', 'gold', 'yellow', 'pink'];
     var $colors = $('#colors');
     $colors.html(function (i, val) {
         return palette.map(function (c) {

From f2db6b83ebbce0fef5dfd68b447f979d8d3b2521 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 18 Apr 2016 16:40:44 +0200
Subject: [PATCH 084/257] better sizing for palette options

---
 www/canvas/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/canvas/index.html b/www/canvas/index.html
index 7555bbd9c..6d3dbf6d4 100644
--- a/www/canvas/index.html
+++ b/www/canvas/index.html
@@ -41,8 +41,8 @@
             padding-left: 75px;
         }
         span.palette {
-            height: 50px;
-            width: 50px;
+            height: 4vw;
+            width: 4vw;
             display: inline-block;
             margin: 5px;
             border: 2px solid black;

From bafdd588dd74435120b3480c4ab5a1554b8d92df Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 18 Apr 2016 17:14:00 +0200
Subject: [PATCH 085/257] fix /hack/ to not require sharejs textarea

---
 www/hack/main.js | 65 +++++++++++++++++++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 17 deletions(-)

diff --git a/www/hack/main.js b/www/hack/main.js
index d63aadbfa..8805a3169 100644
--- a/www/hack/main.js
+++ b/www/hack/main.js
@@ -1,12 +1,10 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/messages.js',
+    '/common/RealtimeTextarea.js',
     '/common/crypto.js',
-    '/common/cursor.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-    '/customize/pad.js'
-], function (Config, Realtime, Messages, Crypto, Cursor) { 
+    '/common/TextPatcher.js',
+    '/bower_components/jquery/dist/jquery.min.js'
+], function (Config, Realtime, Crypto, TextPatcher) {
     var $ = window.jQuery;
     $(window).on('hashchange', function() {
         window.location.reload();
@@ -21,6 +19,8 @@ define([
     var $textarea = $('textarea'),
         $run = $('#run');
 
+    var module = {};
+
     /*
         onRemote
         onInit
@@ -31,7 +31,7 @@ define([
 
     var config = {
         textarea: $textarea[0],
-        websocketURL: Config.websocketURL,
+        websocketURL: Config.websocketURL + '_old',
         webrtcURL: Config.webrtcURL,
         userName: Crypto.rand64(8),
         channel: key.channel,
@@ -39,29 +39,56 @@ define([
     };
     var initializing = true;
 
-    $textarea.attr('disabled', true);
+    var setEditable = function (bool) { $textarea.attr('disabled', !bool); };
+    var canonicalize = function (text) { return text.replace(/\r\n/g, '\n'); };
+
+    setEditable(false);
 
     var onInit = config.onInit = function (info) { };
 
-    var onRemote = config.onRemote = function (contents) {
+    var onRemote = config.onRemote = function (info) {
         if (initializing) { return; }
+
+        var userDoc = info.realtime.getUserDoc();
+        var current = canonicalize($textarea.val());
+
+        var op = TextPatcher.diff(current, userDoc);
+
+        var elem = $textarea[0];
+
+        var selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
+            return TextPatcher.transformCursor(elem[attr], op);
+        });
+
+        $textarea.val(userDoc);
+        elem.selectionStart = selects[0];
+        elem.selectionEnd = selects[1];
+
         // TODO do something on external messages
         // http://webdesign.tutsplus.com/tutorials/how-to-display-update-notifications-in-the-browser-tab--cms-23458
     };
 
     var onReady = config.onReady = function (info) {
+        module.patchText = TextPatcher.create({
+            realtime: info.realtime
+        //    logging: true
+        });
         initializing = false;
-        $textarea.attr('disabled', false);
+        setEditable(true);
+        $textarea.val(info.realtime.getUserDoc());
     };
 
     var onAbort = config.onAbort = function (info) {
-        $textarea.attr('disabled', true);
+        setEditable(false);
         window.alert("Server Connection Lost");
     };
 
-    var rt = window.rt = Realtime.start(config);
+    var onLocal = config.onLocal = function () {
+        if (initializing) { return; }
+        module.patchText(canonicalize($textarea.val()));
+    };
 
-    var cursor = Cursor($textarea[0]);
+    var rt = window.rt = Realtime.start(config);
 
     var splice = function (str, index, chars) {
         var count = chars.length;
@@ -98,7 +125,9 @@ define([
         // track when control keys are released
     });
 
+    //$textarea.on('change', onLocal);
     $textarea.on('keypress', function (e) {
+        onLocal();
         switch (e.key) {
             case 'Tab':
                 // insert a tab wherever the cursor is...
@@ -118,16 +147,18 @@ define([
                 // simulate a keypress so the event goes through..
                 // prevent default behaviour for tab
                 e.preventDefault();
-                rt.bumpSharejs();
+
+                onLocal();
                 break;
             default:
                 break;
         }
     });
 
-    $textarea.on('change', function () {
-        rt.bumpSharejs();
-    });
+    ['cut', 'paste', 'change', 'keyup', 'keydown', 'select', 'textInput']
+        .forEach(function (evt) {
+            $textarea.on(evt, onLocal);
+        });
 
     $run.click(function (e) {
         e.preventDefault();

From 7ca5f47d02047f737a6aa3ad1c9b65d88d12441c Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 18 Apr 2016 17:31:37 +0200
Subject: [PATCH 086/257] remove multitest pad since it offers no significant
 benefit

---
 www/multitest/index.html | 40 ----------------------------------------
 www/multitest/main.js    | 32 --------------------------------
 2 files changed, 72 deletions(-)
 delete mode 100644 www/multitest/index.html
 delete mode 100644 www/multitest/main.js

diff --git a/www/multitest/index.html b/www/multitest/index.html
deleted file mode 100644
index 5459a8cdb..000000000
--- a/www/multitest/index.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-    
-    
-    
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-
-
diff --git a/www/multitest/main.js b/www/multitest/main.js
deleted file mode 100644
index 30d36508c..000000000
--- a/www/multitest/main.js
+++ /dev/null
@@ -1,32 +0,0 @@
-define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/messages.js',
-    '/common/crypto.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-    '/customize/pad.js'
-], function (Config, Realtime, Messages, Crypto) { 
-    var $ = window.jQuery;
-    $(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 rts = $('textarea').toArray().map(function (e, i) {
-        var config = {
-            textarea: e,
-            websocketURL: Config.websocketURL,
-            userName: Crypto.rand64(8),
-            channel: key.channel,
-            cryptKey: key.cryptKey
-        };
-
-        var rt = Realtime.start(config);
-        return rt;
-    });
-});

From df22c246c46447309a00993d93361c4313949344 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 10:10:26 +0200
Subject: [PATCH 087/257] serialize text nodes correctly

---
 www/assert/hyperjson.js | 3 ++-
 www/assert/index.html   | 7 ++++++-
 www/assert/main.js      | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/www/assert/hyperjson.js b/www/assert/hyperjson.js
index 90edb0616..9a363bb79 100644
--- a/www/assert/hyperjson.js
+++ b/www/assert/hyperjson.js
@@ -24,7 +24,8 @@ define([], function () {
                     return callOnHyperJSON(child, cb);
                 } else if (typeof (child) === 'string') {
                     // string nodes have leading and trailing quotes
-                    return child.replace(/(^"|"$)/g,"");
+                    // don't strip them!
+                    return child; //child.replace(/(^"|"$)/g,"");
                 } else {
                     // the above branches should cover all methods
                     // if we hit this, there is a problem
diff --git a/www/assert/index.html b/www/assert/index.html
index 68c995f68..e271750f5 100644
--- a/www/assert/index.html
+++ b/www/assert/index.html
@@ -32,12 +32,17 @@
 
 
    pewpewpew
    
 
+
    Test 1
    
+
    paragraph text
    
+
+
    "pewpewpew"
    
+
 
    
 
 
    Test 2
    
 
    XWiki Macros
    
 
 
-
    Here is a macro
    
+
    Here is a macro
    
 
 
    
diff --git a/www/assert/main.js b/www/assert/main.js
index 0ffea44e6..c215cf28e 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -46,14 +46,15 @@ define([
             var success = cloned.outerHTML === target.outerHTML;
 
             if (!success) {
+                var op = TextPatcher.diff(target.outerHTML, cloned.outerHTML);
                 window.DEBUG = {
                     error: "Expected equality between A and B",
                     A: target.outerHTML,
                     B: cloned.outerHTML,
-                    target: target,
-                    diff: TextPatcher.diff(target.outerHTML, cloned.outerHTML)
+                    diff: op
                 };
                 console.log(JSON.stringify(window.DEBUG, null, 2));
+                TextPatcher.log(op);
             }
 
             return success;
@@ -62,6 +63,7 @@ define([
 
     [   '#target',
         '#widget',
+        '#quot',
     ].forEach(function (sel) {
         roundTrip($(sel)[0]);
     });

From 06786b6e02a0f1696985142a5fac20e604adb09c Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 10:37:20 +0200
Subject: [PATCH 088/257] Remove redundant declaration

---
 www/canvas/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/canvas/main.js b/www/canvas/main.js
index be716b200..f81035c45 100644
--- a/www/canvas/main.js
+++ b/www/canvas/main.js
@@ -15,7 +15,7 @@ define([
 ], function (Config, Realtime, Messages, Crypto, TextPatcher, Fabric, JSONSortify) { 
     var module = window.APP = { };
     var $ = module.$ = window.jQuery;
-    var Fabric = module.Fabric = window.fabric;
+    module.Fabric = window.fabric;
 
     $(window).on('hashchange', function() {
         window.location.reload();

From 1c7954ed51cb5045b146510a315a5b0a2c8df786 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 12:13:04 +0200
Subject: [PATCH 089/257] Grab Fabric off of the window

---
 www/canvas/main.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/canvas/main.js b/www/canvas/main.js
index f81035c45..f25b64ecb 100644
--- a/www/canvas/main.js
+++ b/www/canvas/main.js
@@ -8,14 +8,14 @@ define([
     '/common/messages.js',
     '/common/crypto.js',
     '/common/TextPatcher.js',
-    '/bower_components/fabric.js/dist/fabric.min.js',
     'json.sortify',
+    '/bower_components/fabric.js/dist/fabric.min.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Realtime, Messages, Crypto, TextPatcher, Fabric, JSONSortify) { 
+], function (Config, Realtime, Messages, Crypto, TextPatcher, JSONSortify) {
     var module = window.APP = { };
     var $ = module.$ = window.jQuery;
-    module.Fabric = window.fabric;
+    var Fabric = module.Fabric = window.fabric;
 
     $(window).on('hashchange', function() {
         window.location.reload();

From b83fb7b823b3bb065b17b4159933061c479fef55 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 12:29:16 +0200
Subject: [PATCH 090/257] improve brFix logic

stop exporting functions which we wish to deprecate
---
 www/common/cursor.js | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/www/common/cursor.js b/www/common/cursor.js
index 8eff84374..38163bcec 100644
--- a/www/common/cursor.js
+++ b/www/common/cursor.js
@@ -27,8 +27,9 @@ define([
             }
         };
 
+        // TODO deprecate
         // assumes a negative index
-        var seekLeft = cursor.seekLeft = function (el, delta, current) {
+        var seekLeft /* = cursor.seekLeft*/ = function (el, delta, current) {
             var textLength;
             var previous;
 
@@ -67,8 +68,9 @@ define([
             };
         };
 
+        // TODO deprecate
         // seekRight assumes a positive delta
-        var seekRight = cursor.seekRight = function (el, delta, current) {
+        var seekRight = /* cursor.seekRight = */ function (el, delta, current) {
             var textLength;
             var previous;
 
@@ -107,7 +109,8 @@ define([
             };
         };
 
-        var seekToDelta = cursor.seekToDelta = function (el, delta, current) {
+        // TODO deprecate
+        var seekToDelta = /* cursor.seekToDelta = */ function (el, delta, current) {
             var result = null;
             if (el) {
                 if (delta < 0)  {
@@ -136,10 +139,9 @@ define([
             verbose("cursor.update");
             root = root || inner;
             sel = sel || Rangy.getSelection(root);
-            if (!sel.rangeCount) {
-                error('[cursor.update] no ranges found');
-                return;
-            }
+
+            // if the root element has no focus, there will be no range
+            if (!sel.rangeCount) { return; }
             var range = sel.getRangeAt(0);
 
             // Big R Range is caught in closure, and maintains persistent state
@@ -149,19 +151,6 @@ define([
             });
         };
 
-        /*  0 -> neither is lost
-            1 -> start is lost
-            2 -> end is lost
-            3 -> both are lost */
-        /*  sometimes the selection gets dropped and this doesn't realize it
-            figure out why (TODO FIXME) */
-        var isLost = cursor.isLost = function () {
-            var state = ['start', 'end'].map(function (pos, i) {
-                return Tree.contains(Range[pos].el, inner)? 0 : i + 1;
-            });
-            return state[0] | state[1];
-        };
-
         var exists = cursor.exists = function () {
             return (Range.start.el?1:0) | (Range.end.el?2:0);
         };
@@ -239,7 +228,8 @@ define([
             }
         };
 
-        var pushDelta = cursor.pushDelta = function (oldVal, newVal, offset) {
+        // TODO deprecate
+        var pushDelta = /* cursor.pushDelta =*/ function (oldVal, newVal, offset) {
             if (oldVal === newVal) { return; }
             var commonStart = 0;
             while (oldVal.charAt(commonStart) === newVal.charAt(commonStart)) {
@@ -274,6 +264,7 @@ define([
         };
 
         /* getLength assumes that both nodes exist inside of the active editor.  */
+        // unused currently
         var getLength = cursor.getLength = function () {
             if (Range.start.el === Range.end.el) {
                 if (Range.start.offset === Range.end.offset) { return 0; }
@@ -315,7 +306,9 @@ define([
             }
         };
 
-        cursor.delta = function (delta1, delta2) {
+        // previously used for testing
+        // TODO deprecate
+        var delta = /* cursor.delta = */ function (delta1, delta2) {
             var sel = Rangy.getSelection(inner);
             delta2 = (typeof delta2 !== 'undefined') ? delta2 : delta1;
 
@@ -381,8 +374,10 @@ define([
 
             if (start.el === end.el && start.offset === end.offset) {
                 if (start.el.tagName === 'BR') {
-                    // get the parent element, which ought to be a P.
-                    var P = start.el.parentNode;
+                    var br = start.el;
+
+                    var P = (Tree.indexOfNode(br) === 0 ?
+                        br.parentNode: br.previousSibling);
 
                     [cursor.fixStart, cursor.fixEnd].forEach(function (f) {
                         f(P, 0);

From e357549eda284f84c8e65bd4964775ef3cb9e272 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 14:01:21 +0200
Subject: [PATCH 091/257] push browser fights into an array for inspection

---
 www/p/main.js | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/www/p/main.js b/www/p/main.js
index d6b9f5a28..07f4e255e 100644
--- a/www/p/main.js
+++ b/www/p/main.js
@@ -11,10 +11,11 @@ define([
     '/common/json-ot.js',
     '/common/TypingTests.js',
     'json.sortify',
+    '/common/TextPatcher.js',
     '/bower_components/diff-dom/diffDOM.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest, JSONSortify) {
+], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest, JSONSortify, TextPatcher) {
     var $ = window.jQuery;
     var ifrw = $('#pad-iframe')[0].contentWindow;
     var Ckeditor; // to be initialized later...
@@ -35,7 +36,9 @@ define([
 
     var module = window.REALTIME_MODULE = {
         Hyperjson: Hyperjson,
-        Hyperscript: Hyperscript
+        Hyperscript: Hyperscript,
+        logFights: true,
+        fights: [],
     };
 
     var isNotMagicLine = function (el) {
@@ -92,8 +95,6 @@ define([
             var inner = window.inner = documentBody;
             var cursor = window.cursor = Cursor(inner);
 
-
-
             var setEditable = function (bool) {
                 // careful about putting attributes onto the DOM
                 // they get put into the chain, and you can have trouble
@@ -240,8 +241,28 @@ define([
 
                 var shjson2 = stringifyDOM(inner);
                 if (shjson2 !== shjson) {
+                    /* the client's browser made changes when pushing content
+                       into the dom */
                     console.error("shjson2 !== shjson");
+                    // push those changes back over the wire
                     module.realtimeInput.patchText(shjson2);
+
+                    /*  pushing back over the wire is necessary, but it can
+                        result in a feedback loop, which we call a browser
+                        fight */
+                    if (module.logFights) {
+                        // what changed?
+                        var op = TextPatcher.diff(shjson, shjson2);
+                        // log the changes
+                        TextPatcher.log(shjson, op);
+
+                        var sop = JSON.stringify(op);
+
+                        if (module.fights.indexOf(sop) === -1) {
+                            module.fights.push(sop);
+                            console.log("Found a new type of browser disagreement");
+                        }
+                    }
                 }
             };
 

From 103bb69daab064c2f58b82b661bb1cefe1ebded9 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 14:12:32 +0200
Subject: [PATCH 092/257] move custom hyperscript into common

---
 www/assert/hyperscript.js | 400 --------------------------------------
 www/common/hyperscript.js |   5 +-
 2 files changed, 4 insertions(+), 401 deletions(-)
 delete mode 100644 www/assert/hyperscript.js

diff --git a/www/assert/hyperscript.js b/www/assert/hyperscript.js
deleted file mode 100644
index 52282dcfc..000000000
--- a/www/assert/hyperscript.js
+++ /dev/null
@@ -1,400 +0,0 @@
-define([], function () {
-    var Hyperscript;
-
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o
- * Available under the MIT License
- * ECMAScript compliant, uniform cross-browser split method
- */
-
-/**
- * Splits a string into an array of strings using a regex or string separator. Matches of the
- * separator are not included in the result array. However, if `separator` is a regex that contains
- * capturing groups, backreferences are spliced into the result each time `separator` is matched.
- * Fixes browser bugs compared to the native `String.prototype.split` and can be used reliably
- * cross-browser.
- * @param {String} str String to split.
- * @param {RegExp|String} separator Regex or string to use for separating the string.
- * @param {Number} [limit] Maximum number of items to include in the result array.
- * @returns {Array} Array of substrings.
- * @example
- *
- * // Basic use
- * split('a b c d', ' ');
- * // -> ['a', 'b', 'c', 'd']
- *
- * // With limit
- * split('a b c d', ' ', 2);
- * // -> ['a', 'b']
- *
- * // Backreferences in result array
- * split('..word1 word2..', /([a-z]+)(\d+)/i);
- * // -> ['..', 'word', '1', ' ', 'word', '2', '..']
- */
-module.exports = (function split(undef) {
-
-  var nativeSplit = String.prototype.split,
-    compliantExecNpcg = /()??/.exec("")[1] === undef,
-    // NPCG: nonparticipating capturing group
-    self;
-
-  self = function(str, separator, limit) {
-    // If `separator` is not a regex, use `nativeSplit`
-    if (Object.prototype.toString.call(separator) !== "[object RegExp]") {
-      return nativeSplit.call(str, separator, limit);
-    }
-    var output = [],
-      flags = (separator.ignoreCase ? "i" : "") + (separator.multiline ? "m" : "") + (separator.extended ? "x" : "") + // Proposed for ES6
-      (separator.sticky ? "y" : ""),
-      // Firefox 3+
-      lastLastIndex = 0,
-      // Make `global` and avoid `lastIndex` issues by working with a copy
-      separator = new RegExp(separator.source, flags + "g"),
-      separator2, match, lastIndex, lastLength;
-    str += ""; // Type-convert
-    if (!compliantExecNpcg) {
-      // Doesn't need flags gy, but they don't hurt
-      separator2 = new RegExp("^" + separator.source + "$(?!\\s)", flags);
-    }
-    /* Values for `limit`, per the spec:
-     * If undefined: 4294967295 // Math.pow(2, 32) - 1
-     * If 0, Infinity, or NaN: 0
-     * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
-     * If negative number: 4294967296 - Math.floor(Math.abs(limit))
-     * If other: Type-convert, then use the above rules
-     */
-    limit = limit === undef ? -1 >>> 0 : // Math.pow(2, 32) - 1
-    limit >>> 0; // ToUint32(limit)
-    while (match = separator.exec(str)) {
-      // `separator.lastIndex` is not reliable cross-browser
-      lastIndex = match.index + match[0].length;
-      if (lastIndex > lastLastIndex) {
-        output.push(str.slice(lastLastIndex, match.index));
-        // Fix browsers whose `exec` methods don't consistently return `undefined` for
-        // nonparticipating capturing groups
-        if (!compliantExecNpcg && match.length > 1) {
-          match[0].replace(separator2, function() {
-            for (var i = 1; i < arguments.length - 2; i++) {
-              if (arguments[i] === undef) {
-                match[i] = undef;
-              }
-            }
-          });
-        }
-        if (match.length > 1 && match.index < str.length) {
-          Array.prototype.push.apply(output, match.slice(1));
-        }
-        lastLength = match[0].length;
-        lastLastIndex = lastIndex;
-        if (output.length >= limit) {
-          break;
-        }
-      }
-      if (separator.lastIndex === match.index) {
-        separator.lastIndex++; // Avoid an infinite loop
-      }
-    }
-    if (lastLastIndex === str.length) {
-      if (lastLength || !separator.test("")) {
-        output.push("");
-      }
-    } else {
-      output.push(str.slice(lastLastIndex));
-    }
-    return output.length > limit ? output.slice(0, limit) : output;
-  };
-
-  return self;
-})();
-
-},{}],3:[function(require,module,exports){
-// contains, add, remove, toggle
-var indexof = require('indexof')
-
-module.exports = ClassList
-
-function ClassList(elem) {
-    var cl = elem.classList
-
-    if (cl) {
-        return cl
-    }
-
-    var classList = {
-        add: add
-        , remove: remove
-        , contains: contains
-        , toggle: toggle
-        , toString: $toString
-        , length: 0
-        , item: item
-    }
-
-    return classList
-
-    function add(token) {
-        var list = getTokens()
-        if (indexof(list, token) > -1) {
-            return
-        }
-        list.push(token)
-        setTokens(list)
-    }
-
-    function remove(token) {
-        var list = getTokens()
-            , index = indexof(list, token)
-
-        if (index === -1) {
-            return
-        }
-
-        list.splice(index, 1)
-        setTokens(list)
-    }
-
-    function contains(token) {
-        return indexof(getTokens(), token) > -1
-    }
-
-    function toggle(token) {
-        if (contains(token)) {
-            remove(token)
-            return false
-        } else {
-            add(token)
-            return true
-        }
-    }
-
-    function $toString() {
-        return elem.className
-    }
-
-    function item(index) {
-        var tokens = getTokens()
-        return tokens[index] || null
-    }
-
-    function getTokens() {
-        var className = elem.className
-
-        return filter(className.split(" "), isTruthy)
-    }
-
-    function setTokens(list) {
-        var length = list.length
-
-        elem.className = list.join(" ")
-        classList.length = length
-
-        for (var i = 0; i < list.length; i++) {
-            classList[i] = list[i]
-        }
-
-        delete list[length]
-    }
-}
-
-function filter (arr, fn) {
-    var ret = []
-    for (var i = 0; i < arr.length; i++) {
-        if (fn(arr[i])) ret.push(arr[i])
-    }
-    return ret
-}
-
-function isTruthy(value) {
-    return !!value
-}
-
-},{"indexof":4}],4:[function(require,module,exports){
-
-var indexOf = [].indexOf;
-
-module.exports = function(arr, obj){
-  if (indexOf) return arr.indexOf(obj);
-  for (var i = 0; i < arr.length; ++i) {
-    if (arr[i] === obj) return i;
-  }
-  return -1;
-};
-},{}],5:[function(require,module,exports){
-var h = require("./index.js");
-
-module.exports = h;
-
-/*
-$(function () {
-
-    var newDoc = h('p', 
-
-        h('ul', 'bang bang bang'.split(/\s/).map(function (word) {
-            return h('li', word);
-        }))
-    );
-    $('body').html(newDoc.outerHTML);
-});
-
-*/
-
-},{"./index.js":1}],6:[function(require,module,exports){
-
-},{}]},{},[5]);
-
-    return Hyperscript;
-});
diff --git a/www/common/hyperscript.js b/www/common/hyperscript.js
index 73e66b032..52282dcfc 100644
--- a/www/common/hyperscript.js
+++ b/www/common/hyperscript.js
@@ -98,7 +98,10 @@ function context () {
           } else if (k.substr(0, 5) === "data-") {
             e.setAttribute(k, l[k])
           } else {
-            e[k] = l[k]
+            e.setAttribute(k, l[k])
+            if (e.getAttribute(k) !== l[k]) {
+              e[k] = l[k]
+            }
           }
         }
       } else if ('function' === typeof l) {

From 3598c9309818ad466e2c4e4ddb51edaff16aa042 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 14:14:06 +0200
Subject: [PATCH 093/257] move new hyperjson into common

---
 www/assert/hyperjson.js | 125 ----------------------------------------
 www/common/hyperjson.js |  18 +-----
 2 files changed, 2 insertions(+), 141 deletions(-)
 delete mode 100644 www/assert/hyperjson.js

diff --git a/www/assert/hyperjson.js b/www/assert/hyperjson.js
deleted file mode 100644
index 9a363bb79..000000000
--- a/www/assert/hyperjson.js
+++ /dev/null
@@ -1,125 +0,0 @@
-define([], function () {
-    // this makes recursing a lot simpler
-    var isArray = function (A) {
-        return Object.prototype.toString.call(A)==='[object Array]';
-    };
-
-    var parseStyle = function(el){
-      var style = el.style;
-      var output = {};
-      for (var i = 0; i < style.length; ++i) {
-        var item = style.item(i);
-        output[item] = style[item];
-      }
-      return output;
-    };
-
-    var callOnHyperJSON = function (hj, cb) {
-        var children;
-
-        if (hj && hj[2]) {
-            children = hj[2].map(function (child) {
-                if (isArray(child)) {
-                    // if the child is an array, recurse
-                    return callOnHyperJSON(child, cb);
-                } else if (typeof (child) === 'string') {
-                    // string nodes have leading and trailing quotes
-                    // don't strip them!
-                    return child; //child.replace(/(^"|"$)/g,"");
-                } else {
-                    // the above branches should cover all methods
-                    // if we hit this, there is a problem
-                    throw new Error();
-                }
-            });
-        } else {
-            children = [];
-        }
-        // this should return the top level element of your new DOM
-        return cb(hj[0], hj[1], children);
-    };
-
-    var classify = function (token) {
-        return '.' + token.trim();
-    };
-
-    var isValidClass = function (x) {
-        if (x && /\S/.test(x)) {
-            return true;
-        }
-    };
-
-    var isTruthy = function (x) {
-        return x;
-    };
-
-    var DOM2HyperJSON = function(el, predicate, filter){
-        if(!el.tagName && el.nodeType === Node.TEXT_NODE){
-            return el.textContent;
-        }
-        if(!el.attributes){
-          return;
-        }
-        if (predicate) {
-            if (!predicate(el)) {
-                // shortcircuit
-                return;
-            }
-        }
-
-        var attributes = {};
-
-        var i = 0;
-        for(;i < el.attributes.length; i++){
-          var attr = el.attributes[i];
-          if(attr.name && attr.value){
-            if(attr.name === "style"){
-              attributes.style = parseStyle(el);
-            }
-            else{
-              attributes[attr.name] = attr.value;
-            }
-          }
-        }
-
-        // this should never be longer than three elements
-        var result = [];
-
-        // get the element type, id, and classes of the element
-        // and push them to the result array
-        var sel = el.tagName;
-
-        if(attributes.id){
-            // we don't have to do much to validate IDs because the browser
-            // will only permit one id to exist
-            // unless we come across a strange browser in the wild
-          sel = sel +'#'+ attributes.id;
-          delete attributes.id;
-        }
-        result.push(sel);
-
-        // second element of the array is the element attributes
-        result.push(attributes);
-
-        // third element of the array is an array of child nodes
-        var children = [];
-
-        // js hint complains if we use 'var' here
-        i = 0;
-        for(; i < el.childNodes.length; i++){
-            children.push(DOM2HyperJSON(el.childNodes[i], predicate, filter));
-        }
-        result.push(children.filter(isTruthy));
-
-        if (filter) {
-            return filter(result);
-        } else {
-            return result;
-        }
-    };
-
-    return {
-        fromDOM: DOM2HyperJSON,
-        callOn: callOnHyperJSON
-    };
-});
diff --git a/www/common/hyperjson.js b/www/common/hyperjson.js
index ff04a0da9..9a363bb79 100644
--- a/www/common/hyperjson.js
+++ b/www/common/hyperjson.js
@@ -24,7 +24,8 @@ define([], function () {
                     return callOnHyperJSON(child, cb);
                 } else if (typeof (child) === 'string') {
                     // string nodes have leading and trailing quotes
-                    return child.replace(/(^"|"$)/g,"");
+                    // don't strip them!
+                    return child; //child.replace(/(^"|"$)/g,"");
                 } else {
                     // the above branches should cover all methods
                     // if we hit this, there is a problem
@@ -95,21 +96,6 @@ define([], function () {
           sel = sel +'#'+ attributes.id;
           delete attributes.id;
         }
-        if(attributes.class){
-            // actually parse out classes so that we produce a valid selector
-            // string. leading or trailing spaces would have caused it to choke
-            // these are really common in generated html
-            /* TODO this can be done with RegExps alone, and it will be faster
-                but this works and is a little less error prone, albeit slower
-                come back and speed it up when it comes time to optimize */
-          sel = sel + attributes.class
-            .split(/\s+/g)
-            .filter(isValidClass)
-            .map(classify)
-            .join('')
-            .replace(/\.\./g, '.');
-          delete attributes.class;
-        }
         result.push(sel);
 
         // second element of the array is the element attributes

From 1639c5b099f70fd4856c632a929ce9c2763eece4 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 14:14:44 +0200
Subject: [PATCH 094/257] use hyperscript and hyperjson from common

---
 www/assert/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/assert/main.js b/www/assert/main.js
index c215cf28e..6fe063385 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -1,7 +1,7 @@
 define([
     '/bower_components/jquery/dist/jquery.min.js',
-    '/assert/hyperjson.js', // serializing classes as an attribute
-    '/assert/hyperscript.js', // using setAttribute
+    '/common/hyperjson.js', // serializing classes as an attribute
+    '/common/hyperscript.js', // using setAttribute
     '/common/TextPatcher.js'
 ], function (jQuery, Hyperjson, Hyperscript, TextPatcher) {
     var $ = window.jQuery;

From 010566d3c34d9adeb860f965b86e7937fefa09ad Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 14:20:34 +0200
Subject: [PATCH 095/257] pushDelta was mistakenly deprecated. restored.

---
 www/common/cursor.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/common/cursor.js b/www/common/cursor.js
index 38163bcec..1e7ae9a36 100644
--- a/www/common/cursor.js
+++ b/www/common/cursor.js
@@ -228,8 +228,7 @@ define([
             }
         };
 
-        // TODO deprecate
-        var pushDelta = /* cursor.pushDelta =*/ function (oldVal, newVal, offset) {
+        var pushDelta = cursor.pushDelta = function (oldVal, newVal, offset) {
             if (oldVal === newVal) { return; }
             var commonStart = 0;
             while (oldVal.charAt(commonStart) === newVal.charAt(commonStart)) {

From 5db487db3fcda00a0634ca58a2dd8f6f4e9c86ed Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 14:26:56 +0200
Subject: [PATCH 096/257] remove old pad entirely

hyperjson version is considered a strict improvement
---
 www/_pad/errorbox.js         |   93 -
 www/_pad/html-patcher.js     |  483 -----
 www/_pad/index.html          |   26 -
 www/_pad/inner.html          |   12 -
 www/_pad/main.js             |   58 -
 www/_pad/rangy.js            | 3738 ----------------------------------
 www/_pad/realtime-wysiwyg.js |  395 ----
 7 files changed, 4805 deletions(-)
 delete mode 100644 www/_pad/errorbox.js
 delete mode 100644 www/_pad/html-patcher.js
 delete mode 100644 www/_pad/index.html
 delete mode 100644 www/_pad/inner.html
 delete mode 100644 www/_pad/main.js
 delete mode 100644 www/_pad/rangy.js
 delete mode 100644 www/_pad/realtime-wysiwyg.js

diff --git a/www/_pad/errorbox.js b/www/_pad/errorbox.js
deleted file mode 100644
index f93096271..000000000
--- a/www/_pad/errorbox.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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 .
- */
-require.config({
-    'shim': {
-        '/bower_components/modalBox/modalBox-min.js': [
-            '/bower_components/jquery/dist/jquery.min.js'
-        ],
-    }
-});
-define([
-    '/common/messages.js',
-    '/bower_components/modalBox/modalBox-min.js'
-], function (Messages) {
-    var $ = window.jQuery;
-
-    var STYLE = [
-        ''
-    ].join('');
-
-    var CONTENT = [
-        '
    ',
-        '
    ',
-        '
    '
-    ].join('');
-
-    var ERROR_ADDITIONAL = [
-        '
    ',
-        '',
-        '',
-    ].join('');    
-
-    var showError = function (errorType, docHtml, moreInfo) {
-        $('body').append('
    ');
-        var $modalbox = $('.modalBox');
-        $modalbox.append(CONTENT + STYLE);
-
-        $modalbox.find('.errorType').text(Messages['errorBox_errorType_' + errorType]);
-        $modalbox.find('.errorExplanation').text(Messages['errorBox_errorExplanation_' + errorType]);
-        if (moreInfo) {
-            $modalbox.append(ERROR_ADDITIONAL);
-            $modalbox.find('.errorMoreExplanation').text(Messages.errorBox_moreExplanation);
-            $modalbox.find('.errorData').text(Messages['errorBox_' + errorType]);
-        }
-
-        $modalbox.modalBox({
-            onClose: function () { $('.modalBox').remove(); }
-        });
-        $('.iw-modalOverlay').css({'z-index':10000});
-    };
-
-    return {
-        show: showError
-    };
-});
diff --git a/www/_pad/html-patcher.js b/www/_pad/html-patcher.js
deleted file mode 100644
index d36552d85..000000000
--- a/www/_pad/html-patcher.js
+++ /dev/null
@@ -1,483 +0,0 @@
-/*
- * 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 .
- */
-define([
-    '/bower_components/jquery/dist/jquery.min.js',
-    '/common/otaml.js'
-], function () {
-
-    var $ = window.jQuery;
-    var Otaml = window.Otaml;
-    var module = { exports: {} };
-    var PARANOIA = true;
-
-    var debug = function (x) { };
-    debug = function (x) { console.log(x); };
-
-    var getNextSiblingDeep = function (node, parent)
-    {
-        if (node.firstChild) { return node.firstChild; }
-        do {
-            if (node.nextSibling) { return node.nextSibling; }
-            node = node.parentNode;
-        } while (node && node !== parent);
-    };
-
-    var getOuterHTML = function (node)
-    {
-        var html = node.outerHTML;
-        if (html) { return html; }
-        if (node.parentNode && node.parentNode.childNodes.length === 1) {
-            return node.parentNode.innerHTML;
-        }
-        var div = document.createElement('div');
-        div.appendChild(node.cloneNode(true));
-        return div.innerHTML;
-    };
-
-    var nodeFromHTML = function (html)
-    {
-        var e = document.createElement('div');
-        e.innerHTML = html;
-        return e.childNodes[0];
-    };
-
-    var getInnerHTML = function (node)
-    {
-        var html = node.innerHTML;
-        if (html) { return html; }
-        var outerHTML = getOuterHTML(node);
-        var tw = Otaml.tagWidth(outerHTML);
-        if (!tw) { return outerHTML; }
-        return outerHTML.substring(tw, outerHTML.lastIndexOf('';
-            if (PARANOIA && spanHTML !== span.outerHTML) { throw new Error(); }
-
-            node.parentNode.insertBefore(span, node);
-            var newDocText = getInnerHTML(dom);
-            idx = newDocText.lastIndexOf(spanHTML);
-            if (idx === -1 || idx !== newDocText.indexOf(spanHTML)) { throw new Error(); }
-            node.parentNode.removeChild(span);
-
-            if (PARANOIA && getInnerHTML(dom) !== docText) { throw new Error(); }
-        }
-
-        if (PARANOIA && docText.indexOf(content, idx) !== idx) { throw new Error(); }
-        return idx;
-    };
-
-    var patchString = module.exports.patchString = function (oldString, offset, toRemove, toInsert)
-    {
-        return oldString.substring(0, offset) + toInsert + oldString.substring(offset + toRemove);
-    };
-
-    var getNodeAtOffset = function (docText, offset, dom)
-    {
-        if (PARANOIA && dom.childNodes.length && docText !== dom.innerHTML) { throw new Error(); }
-        if (offset < 0) { throw new Error(); }
-
-        var idx = 0;
-        for (var i = 0; i < dom.childNodes.length; i++) {
-            var childOuterHTML = getOuterHTML(dom.childNodes[i]);
-            if (PARANOIA && docText.indexOf(childOuterHTML, idx) !== idx) { throw new Error(); }
-            if (i === 0 && idx >= offset) {
-                return { node: dom, pos: 0 };
-            }
-            if (idx + childOuterHTML.length > offset) {
-                var childInnerHTML = childOuterHTML;
-                var tw = Otaml.tagWidth(childOuterHTML);
-                if (tw) {
-                    childInnerHTML = childOuterHTML.substring(tw, childOuterHTML.lastIndexOf(' docText.length) { throw new Error(); }
-            var beforeOffset = docText.substring(0, offset);
-            if (beforeOffset.indexOf('&') > -1) {
-                var tn = nodeFromHTML(beforeOffset);
-                offset = tn.data.length;
-            }
-        } else {
-            offset = 0;
-        }
-
-        return { node: dom, pos: offset };
-    };
-
-    var relocatedPositionInNode = function (newNode, oldNode, offset)
-    {
-        if (newNode.nodeName !== '#text' || oldNode.nodeName !== '#text' || offset === 0) {
-            offset = 0;
-        } else if (oldNode.data === newNode.data) {
-            // fallthrough
-        } else if (offset > newNode.length) {
-            offset = newNode.length;
-        } else if (oldNode.data.substring(0, offset) === newNode.data.substring(0, offset)) {
-            // keep same offset and fall through
-        } else {
-            var rOffset = oldNode.length - offset;
-            if (oldNode.data.substring(offset) ===
-                newNode.data.substring(newNode.length - rOffset))
-            {
-                offset = newNode.length - rOffset;
-            } else {
-                offset = 0;
-            }
-        }
-        return { node: newNode, pos: offset };
-    };
-
-    var pushNode = function (list, node) {
-        if (node.nodeName === '#text') {
-            list.push.apply(list, node.data.split(''));
-        } else {
-            list.push('#' + node.nodeName);
-        }
-    };
-
-    var getChildPath = function (parent) {
-        var out = [];
-        for (var next = parent; next; next = getNextSiblingDeep(next, parent)) {
-            pushNode(out, next);
-        }
-        return out;
-    };
-
-    var tryFromBeginning = function (oldPath, newPath) {
-        for (var i = 0; i < oldPath.length; i++) {
-            if (oldPath[i] !== newPath[i]) { return i; }
-        }
-        return oldPath.length;
-    };
-
-    var tryFromEnd = function (oldPath, newPath) {
-        for (var i = 1; i <= oldPath.length; i++) {
-            if (oldPath[oldPath.length - i] !== newPath[newPath.length - i]) {
-                return false;
-            }
-        }
-        return true;
-    };
-
-    /**
-     * returns 2 arrays (before and after).
-     * before is string representations (see nodeId()) of all nodes before the target
-     * node and after is representations of all nodes which follow.
-     */
-    var getNodePaths = function (parent, node) {
-        var before = [];
-        var next = parent;
-        for (; next && next !== node; next = getNextSiblingDeep(next, parent)) {
-            pushNode(before, next);
-        }
-
-        if (next !== node) { throw new Error(); }
-
-        var after = [];
-        next = getNextSiblingDeep(next, parent);
-        for (; next; next = getNextSiblingDeep(next, parent)) {
-            pushNode(after, next);
-        }
-
-        return { before: before, after: after };
-    };
-
-    var nodeAtIndex = function (parent, idx) {
-        var node = parent;
-        for (var i = 0; i < idx; i++) {
-            if (node.nodeName === '#text') {
-                if (i + node.data.length > idx) { return node; }
-                i += node.data.length - 1;
-            }
-            node = getNextSiblingDeep(node);
-        }
-        return node;
-    };
-
-    var getRelocatedPosition = function (newParent, oldParent, oldNode, oldOffset, origText, op)
-    {
-        var newPath = getChildPath(newParent);
-        if (newPath.length === 1) {
-            return { node: null, pos: 0 };
-        }
-        var oldPaths = getNodePaths(oldParent, oldNode);
-
-        var idx = -1;
-        var fromBeginning = tryFromBeginning(oldPaths.before, newPath);
-        if (fromBeginning === oldPaths.before.length) {
-            idx = oldPaths.before.length;
-        } else if (tryFromEnd(oldPaths.after, newPath)) {
-            idx = (newPath.length - oldPaths.after.length - 1);
-        } else {
-            idx = fromBeginning;
-            var id = 'relocate-' + String(Math.random()).substring(2);
-            $(document.body).append('');
-            $('#'+id).val(JSON.stringify([origText, op, newPath, getChildPath(oldParent), oldPaths]));
-        }
-
-        var out = nodeAtIndex(newParent, idx);
-        return relocatedPositionInNode(out, oldNode, oldOffset);
-    };
-
-    // We can't create a real range until the new parent is installed in the document
-    // but we need the old range to be in the document so we can do comparisons
-    // so create a "pseudo" range instead.
-    var getRelocatedPseudoRange = function (newParent, oldParent, range, origText, op)
-    {
-        if (!range.startContainer) {
-            throw new Error();
-        }
-        if (!newParent) { throw new Error(); }
-
-        // Copy because tinkering in the dom messes up the original range.
-        var startContainer = range.startContainer;
-        var startOffset = range.startOffset;
-        var endContainer = range.endContainer;
-        var endOffset = range.endOffset;
-
-        var newStart =
-            getRelocatedPosition(newParent, oldParent, startContainer, startOffset, origText, op);
-
-        if (!newStart.node) {
-            // there is probably nothing left of the document so just clear the selection.
-            endContainer = null;
-        }
-
-        var newEnd = { node: newStart.node, pos: newStart.pos };
-        if (endContainer) {
-            if (endContainer !== startContainer) {
-                newEnd = getRelocatedPosition(newParent, oldParent, endContainer, endOffset, origText, op);
-            } else if (endOffset !== startOffset) {
-                newEnd = {
-                    node: newStart.node,
-                    pos: relocatedPositionInNode(newStart.node, endContainer, endOffset).pos
-                };
-            } else {
-                newEnd = { node: newStart.node, pos: newStart.pos };
-            }
-        }
-
-        return { start: newStart, end: newEnd };
-    };
-
-    var replaceAllChildren = function (parent, newParent)
-    {
-        var c;
-        while ((c = parent.firstChild)) {
-            parent.removeChild(c);
-        }
-        while ((c = newParent.firstChild)) {
-            newParent.removeChild(c);
-            parent.appendChild(c);
-        }
-    };
-
-    var isAncestorOf = function (maybeDecendent, maybeAncestor) {
-        while ((maybeDecendent = maybeDecendent.parentNode)) {
-            if (maybeDecendent === maybeAncestor) { return true; }
-        }
-        return false;
-    };
-
-    var getSelectedRange = function (rangy, ifrWindow, selection) {
-        selection = selection || rangy.getSelection(ifrWindow);
-        if (selection.rangeCount === 0) {
-            return;
-        }
-        var range = selection.getRangeAt(0);
-        range.backward = (selection.rangeCount === 1 && selection.isBackward());
-        if (!range.startContainer) {
-            throw new Error();
-        }
-
-        // Occasionally, some browsers *cough* firefox *cough* will attach the range to something
-        // which has been used in the past but is nolonger part of the dom...
-        if (range.startContainer &&
-            isAncestorOf(range.startContainer, ifrWindow.document))
-        {
-            return range;
-        }
-
-        return;
-    };
-
-    var applyHTMLOp = function (docText, op, dom, rangy, ifrWindow)
-    {
-        var parent = getNodeAtOffset(docText, op.offset, dom).node;
-        var htmlToRemove = docText.substring(op.offset, op.offset + op.toRemove);
-
-        var parentInnerHTML;
-        var indexOfInnerHTML;
-        var localOffset;
-        for (;;) {
-            for (;;) {
-                parentInnerHTML = parent.innerHTML;
-                if (typeof(parentInnerHTML) !== 'undefined'
-                    && parentInnerHTML.indexOf(htmlToRemove) !== -1)
-                {
-                    break;
-                }
-                if (parent === dom || !(parent = parent.parentNode)) { throw new Error(); }
-            }
-
-            var indexOfOuterHTML = 0;
-            var tw = 0;
-            if (parent !== dom) {
-                indexOfOuterHTML = offsetOfNodeOuterHTML(docText, parent, dom, ifrWindow);
-                tw = Otaml.tagWidth(docText.substring(indexOfOuterHTML));
-            }
-            indexOfInnerHTML = indexOfOuterHTML + tw;
-
-            localOffset = op.offset - indexOfInnerHTML;
-
-            if (localOffset >= 0 && localOffset + op.toRemove <= parentInnerHTML.length) {
-                break;
-            }
-
-            parent = parent.parentNode;
-            if (!parent) { throw new Error(); }
-        }
-
-        if (PARANOIA &&
-            docText.substr(indexOfInnerHTML, parentInnerHTML.length) !== parentInnerHTML)
-        {
-            throw new Error();
-        }
-
-        var newParentInnerHTML =
-            patchString(parentInnerHTML, localOffset, op.toRemove, op.toInsert);
-
-        // Create a temp container for holding the children of the parent node.
-        // Once we've identified the new range, we'll return the nodes to the
-        // original parent. This is because parent might be the  and we
-        // don't want to destroy all of our event listeners.
-        var babysitter = ifrWindow.document.createElement('div');
-        // give it a uid so that we can prove later that it's not in the document,
-        // see getSelectedRange()
-        babysitter.setAttribute('id', uniqueId());
-        babysitter.innerHTML = newParentInnerHTML;
-
-        var range = getSelectedRange(rangy, ifrWindow);
-
-        // doesn't intersect at all
-        if (!range || !range.containsNode(parent, true)) {
-            replaceAllChildren(parent, babysitter);
-            return;
-        }
-
-        var pseudoRange = getRelocatedPseudoRange(babysitter, parent, range, rangy);
-        range.detach();
-        replaceAllChildren(parent, babysitter);
-        if (pseudoRange.start.node) {
-            var selection = rangy.getSelection(ifrWindow);
-            var newRange = rangy.createRange();
-            newRange.setStart(pseudoRange.start.node, pseudoRange.start.pos);
-            newRange.setEnd(pseudoRange.end.node, pseudoRange.end.pos);
-            selection.setSingleRange(newRange);
-        }
-        return;
-    };
-
-    var applyHTMLOpHammer = function (docText, op, dom, rangy, ifrWindow)
-    {
-        var newDocText = patchString(docText, op.offset, op.toRemove, op.toInsert);
-        var babysitter = ifrWindow.document.createElement('body');
-        // give it a uid so that we can prove later that it's not in the document,
-        // see getSelectedRange()
-        babysitter.setAttribute('id', uniqueId());
-        babysitter.innerHTML = newDocText;
-
-        var range = getSelectedRange(rangy, ifrWindow);
-
-        // doesn't intersect at all
-        if (!range) {
-            replaceAllChildren(dom, babysitter);
-            return;
-        }
-
-        var pseudoRange = getRelocatedPseudoRange(babysitter, dom, range, docText, op);
-        range.detach();
-        replaceAllChildren(dom, babysitter);
-        if (pseudoRange.start.node) {
-            var selection = rangy.getSelection(ifrWindow);
-            var newRange = rangy.createRange();
-            newRange.setStart(pseudoRange.start.node, pseudoRange.start.pos);
-            newRange.setEnd(pseudoRange.end.node, pseudoRange.end.pos);
-            selection.setSingleRange(newRange);
-        }
-        return;
-    };
-
-    /* Return whether the selection range has been "dirtied" and needs to be reloaded. */
-    var applyOp = module.exports.applyOp = function (docText, op, dom, rangy, ifrWindow)
-    {
-        if (PARANOIA && docText !== getInnerHTML(dom)) { throw new Error(); }
-
-        if (op.offset + op.toRemove > docText.length) {
-            throw new Error();
-        }
-        try {
-            applyHTMLOpHammer(docText, op, dom, rangy, ifrWindow);
-            var result = patchString(docText, op.offset, op.toRemove, op.toInsert);
-            var innerHTML = getInnerHTML(dom);
-            if (result !== innerHTML) {
-                $(document.body).append('');
-                $(document.body).append('');
-                var SEP = '\n\n\n\n\n\n\n\n\n\n';
-                $('#statebox').val(docText + SEP + result + SEP + innerHTML);
-                var diff = Otaml.makeTextOperation(result, innerHTML);
-                $('#errorbox').val(JSON.stringify(op) + '\n' + JSON.stringify(diff));
-                throw new Error();
-            }
-        } catch (err) {
-            if (PARANOIA) { console.log(err.stack); }
-            // The big hammer
-            dom.innerHTML = patchString(docText, op.offset, op.toRemove, op.toInsert);
-        }
-    };
-
-    return module.exports;
-});
diff --git a/www/_pad/index.html b/www/_pad/index.html
deleted file mode 100644
index 685f73398..000000000
--- a/www/_pad/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-    
-    
-    
-
-
-    
-
-
-
diff --git a/www/_pad/inner.html b/www/_pad/inner.html
deleted file mode 100644
index bf79dcd0d..000000000
--- a/www/_pad/inner.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-    
-    
-    
-
-
-    
-
-
-
diff --git a/www/_pad/main.js b/www/_pad/main.js
deleted file mode 100644
index 6925d4150..000000000
--- a/www/_pad/main.js
+++ /dev/null
@@ -1,58 +0,0 @@
-define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/pad/realtime-wysiwyg.js',
-    '/common/messages.js',
-    '/common/crypto.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-    '/customize/pad.js'
-], function (Config, RTWysiwyg, Messages, Crypto) {
-    var $ = window.jQuery;
-    var ifrw = $('#pad-iframe')[0].contentWindow;
-    var Ckeditor = ifrw.CKEDITOR;
-
-    var andThen = function (Ckeditor) {
-        $(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 editor = Ckeditor.replace('editor1', {
-            removeButtons: 'Source,Maximize',
-            // magicline plugin inserts html crap into the document which is not part of the
-            // document itself and causes problems when it's sent across the wire and reflected back
-            removePlugins: 'magicline,resize'
-        });
-        editor.on('instanceReady', function () {
-            editor.execCommand('maximize');
-
-            // (contenteditable) iframe in an iframe
-            ifrw.$('iframe')[0].contentDocument.body.innerHTML = Messages.initialState;
-
-            var rtw =
-                RTWysiwyg.start(ifrw, // window
-                                Config.websocketURL, // websocketUrl
-                                Crypto.rand64(8), // userName
-                                key.channel, // channel
-                                key.cryptKey); // cryptKey
-            editor.on('change', function () { rtw.onEvent(); });
-        });
-        window.editor = editor;
-        window.RTWysiwyg = RTWysiwyg;
-    };
-
-    var interval = 100;
-    var first = function () {
-        Ckeditor = ifrw.CKEDITOR;
-        if (Ckeditor) {
-            andThen(Ckeditor);
-        } else {
-            console.log("Ckeditor was not defined. Trying again in %sms",interval);
-            setTimeout(first, interval);
-        }
-    };
-
-    $(first);
-});
diff --git a/www/_pad/rangy.js b/www/_pad/rangy.js
deleted file mode 100644
index 513046e89..000000000
--- a/www/_pad/rangy.js
+++ /dev/null
@@ -1,3738 +0,0 @@
-/**
- * Rangy, a cross-browser JavaScript range and selection library
- * http://code.google.com/p/rangy/
- *
- * Copyright 2013, Tim Down
- * Licensed under the MIT license.
- * Version: 1.3alpha.804
- * Build date: 8 December 2013
- */
-
-(function(global) {
-    var amdSupported = (typeof global.define == "function" && global.define.amd);
-
-    var OBJECT = "object", FUNCTION = "function", UNDEFINED = "undefined";
-
-    // Minimal set of properties required for DOM Level 2 Range compliance. Comparison constants such as START_TO_START
-    // are omitted because ranges in KHTML do not have them but otherwise work perfectly well. See issue 113.
-    var domRangeProperties = ["startContainer", "startOffset", "endContainer", "endOffset", "collapsed",
-        "commonAncestorContainer"];
-
-    // Minimal set of methods required for DOM Level 2 Range compliance
-    var domRangeMethods = ["setStart", "setStartBefore", "setStartAfter", "setEnd", "setEndBefore",
-        "setEndAfter", "collapse", "selectNode", "selectNodeContents", "compareBoundaryPoints", "deleteContents",
-        "extractContents", "cloneContents", "insertNode", "surroundContents", "cloneRange", "toString", "detach"];
-
-    var textRangeProperties = ["boundingHeight", "boundingLeft", "boundingTop", "boundingWidth", "htmlText", "text"];
-
-    // Subset of TextRange's full set of methods that we're interested in
-    var textRangeMethods = ["collapse", "compareEndPoints", "duplicate", "moveToElementText", "parentElement", "select",
-        "setEndPoint", "getBoundingClientRect"];
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Trio of functions taken from Peter Michaux's article:
-    // http://peter.michaux.ca/articles/feature-detection-state-of-the-art-browser-scripting
-    function isHostMethod(o, p) {
-        var t = typeof o[p];
-        return t == FUNCTION || (!!(t == OBJECT && o[p])) || t == "unknown";
-    }
-
-    function isHostObject(o, p) {
-        return !!(typeof o[p] == OBJECT && o[p]);
-    }
-
-    function isHostProperty(o, p) {
-        return typeof o[p] != UNDEFINED;
-    }
-
-    // Creates a convenience function to save verbose repeated calls to tests functions
-    function createMultiplePropertyTest(testFunc) {
-        return function(o, props) {
-            var i = props.length;
-            while (i--) {
-                if (!testFunc(o, props[i])) {
-                    return false;
-                }
-            }
-            return true;
-        };
-    }
-
-    // Next trio of functions are a convenience to save verbose repeated calls to previous two functions
-    var areHostMethods = createMultiplePropertyTest(isHostMethod);
-    var areHostObjects = createMultiplePropertyTest(isHostObject);
-    var areHostProperties = createMultiplePropertyTest(isHostProperty);
-
-    function isTextRange(range) {
-        return range && areHostMethods(range, textRangeMethods) && areHostProperties(range, textRangeProperties);
-    }
-
-    function getBody(doc) {
-        return isHostObject(doc, "body") ? doc.body : doc.getElementsByTagName("body")[0];
-    }
-
-    var modules = {};
-
-    var api = {
-        version: "1.3alpha.804",
-        initialized: false,
-        supported: true,
-
-        util: {
-            isHostMethod: isHostMethod,
-            isHostObject: isHostObject,
-            isHostProperty: isHostProperty,
-            areHostMethods: areHostMethods,
-            areHostObjects: areHostObjects,
-            areHostProperties: areHostProperties,
-            isTextRange: isTextRange,
-            getBody: getBody
-        },
-
-        features: {},
-
-        modules: modules,
-        config: {
-            alertOnFail: true,
-            alertOnWarn: false,
-            preferTextRange: false
-        }
-    };
-
-    function consoleLog(msg) {
-        if (isHostObject(window, "console") && isHostMethod(window.console, "log")) {
-            window.console.log(msg);
-        }
-    }
-
-    function alertOrLog(msg, shouldAlert) {
-        if (shouldAlert) {
-            window.alert(msg);
-        } else  {
-            consoleLog(msg);
-        }
-    }
-
-    function fail(reason) {
-        api.initialized = true;
-        api.supported = false;
-        alertOrLog("Rangy is not supported on this page in your browser. Reason: " + reason, api.config.alertOnFail);
-    }
-
-    api.fail = fail;
-
-    function warn(msg) {
-        alertOrLog("Rangy warning: " + msg, api.config.alertOnWarn);
-    }
-
-    api.warn = warn;
-
-    // Add utility extend() method
-    if ({}.hasOwnProperty) {
-        api.util.extend = function(obj, props, deep) {
-            var o, p;
-            for (var i in props) {
-                if (props.hasOwnProperty(i)) {
-                    o = obj[i];
-                    p = props[i];
-                    //if (deep) alert([o !== null, typeof o == "object", p !== null, typeof p == "object"])
-                    if (deep && o !== null && typeof o == "object" && p !== null && typeof p == "object") {
-                        api.util.extend(o, p, true);
-                    }
-                    obj[i] = p;
-                }
-            }
-            return obj;
-        };
-    } else {
-        fail("hasOwnProperty not supported");
-    }
-
-    // Test whether Array.prototype.slice can be relied on for NodeLists and use an alternative toArray() if not
-    (function() {
-        var el = document.createElement("div");
-        el.appendChild(document.createElement("span"));
-        var slice = [].slice;
-        var toArray;
-        try {
-            if (slice.call(el.childNodes, 0)[0].nodeType == 1) {
-                toArray = function(arrayLike) {
-                    return slice.call(arrayLike, 0);
-                };
-            }
-        } catch (e) {}
-
-        if (!toArray) {
-            toArray = function(arrayLike) {
-                var arr = [];
-                for (var i = 0, len = arrayLike.length; i < len; ++i) {
-                    arr[i] = arrayLike[i];
-                }
-                return arr;
-            };
-        }
-
-        api.util.toArray = toArray;
-    })();
-
-
-    // Very simple event handler wrapper function that doesn't attempt to solve issues such as "this" handling or
-    // normalization of event properties
-    var addListener;
-    if (isHostMethod(document, "addEventListener")) {
-        addListener = function(obj, eventType, listener) {
-            obj.addEventListener(eventType, listener, false);
-        };
-    } else if (isHostMethod(document, "attachEvent")) {
-        addListener = function(obj, eventType, listener) {
-            obj.attachEvent("on" + eventType, listener);
-        };
-    } else {
-        fail("Document does not have required addEventListener or attachEvent method");
-    }
-
-    api.util.addListener = addListener;
-
-    var initListeners = [];
-
-    function getErrorDesc(ex) {
-        return ex.message || ex.description || String(ex);
-    }
-
-    // Initialization
-    function init() {
-        if (api.initialized) {
-            return;
-        }
-        var testRange;
-        var implementsDomRange = false, implementsTextRange = false;
-
-        // First, perform basic feature tests
-
-        if (isHostMethod(document, "createRange")) {
-            testRange = document.createRange();
-            if (areHostMethods(testRange, domRangeMethods) && areHostProperties(testRange, domRangeProperties)) {
-                implementsDomRange = true;
-            }
-            testRange.detach();
-        }
-
-        var body = getBody(document);
-        if (!body || body.nodeName.toLowerCase() != "body") {
-            fail("No body element found");
-            return;
-        }
-
-        if (body && isHostMethod(body, "createTextRange")) {
-            testRange = body.createTextRange();
-            if (isTextRange(testRange)) {
-                implementsTextRange = true;
-            }
-        }
-
-        if (!implementsDomRange && !implementsTextRange) {
-            fail("Neither Range nor TextRange are available");
-            return;
-        }
-
-        api.initialized = true;
-        api.features = {
-            implementsDomRange: implementsDomRange,
-            implementsTextRange: implementsTextRange
-        };
-
-        // Initialize modules
-        var module, errorMessage;
-        for (var moduleName in modules) {
-            if ( (module = modules[moduleName]) instanceof Module ) {
-                module.init(module, api);
-            }
-        }
-
-        // Call init listeners
-        for (var i = 0, len = initListeners.length; i < len; ++i) {
-            try {
-                initListeners[i](api);
-            } catch (ex) {
-                errorMessage = "Rangy init listener threw an exception. Continuing. Detail: " + getErrorDesc(ex);
-                consoleLog(errorMessage);
-            }
-        }
-    }
-
-    // Allow external scripts to initialize this library in case it's loaded after the document has loaded
-    api.init = init;
-
-    // Execute listener immediately if already initialized
-    api.addInitListener = function(listener) {
-        if (api.initialized) {
-            listener(api);
-        } else {
-            initListeners.push(listener);
-        }
-    };
-
-    var createMissingNativeApiListeners = [];
-
-    api.addCreateMissingNativeApiListener = function(listener) {
-        createMissingNativeApiListeners.push(listener);
-    };
-
-    function createMissingNativeApi(win) {
-        win = win || window;
-        init();
-
-        // Notify listeners
-        for (var i = 0, len = createMissingNativeApiListeners.length; i < len; ++i) {
-            createMissingNativeApiListeners[i](win);
-        }
-    }
-
-    api.createMissingNativeApi = createMissingNativeApi;
-
-    function Module(name, dependencies, initializer) {
-        this.name = name;
-        this.dependencies = dependencies;
-        this.initialized = false;
-        this.supported = false;
-        this.initializer = initializer;
-    }
-
-    Module.prototype = {
-        init: function(api) {
-            var requiredModuleNames = this.dependencies || [];
-            for (var i = 0, len = requiredModuleNames.length, requiredModule, moduleName; i < len; ++i) {
-                moduleName = requiredModuleNames[i];
-
-                requiredModule = modules[moduleName];
-                if (!requiredModule || !(requiredModule instanceof Module)) {
-                    throw new Error("required module '" + moduleName + "' not found");
-                }
-
-                requiredModule.init();
-
-                if (!requiredModule.supported) {
-                    throw new Error("required module '" + moduleName + "' not supported");
-                }
-            }
-            
-            // Now run initializer
-            this.initializer(this)
-        },
-        
-        fail: function(reason) {
-            this.initialized = true;
-            this.supported = false;
-            throw new Error("Module '" + this.name + "' failed to load: " + reason);
-        },
-
-        warn: function(msg) {
-            api.warn("Module " + this.name + ": " + msg);
-        },
-
-        deprecationNotice: function(deprecated, replacement) {
-            api.warn("DEPRECATED: " + deprecated + " in module " + this.name + "is deprecated. Please use "
-                + replacement + " instead");
-        },
-
-        createError: function(msg) {
-            return new Error("Error in Rangy " + this.name + " module: " + msg);
-        }
-    };
-    
-    function createModule(isCore, name, dependencies, initFunc) {
-        var newModule = new Module(name, dependencies, function(module) {
-            if (!module.initialized) {
-                module.initialized = true;
-                try {
-                    initFunc(api, module);
-                    module.supported = true;
-                } catch (ex) {
-                    var errorMessage = "Module '" + name + "' failed to load: " + getErrorDesc(ex);
-                    consoleLog(errorMessage);
-                }
-            }
-        });
-        modules[name] = newModule;
-        
-/*
-        // Add module AMD support
-        if (!isCore && amdSupported) {
-            global.define(["rangy-core"], function(rangy) {
-                
-            });
-        }
-*/
-    }
-
-    api.createModule = function(name) {
-        // Allow 2 or 3 arguments (second argument is an optional array of dependencies)
-        var initFunc, dependencies;
-        if (arguments.length == 2) {
-            initFunc = arguments[1];
-            dependencies = [];
-        } else {
-            initFunc = arguments[2];
-            dependencies = arguments[1];
-        }
-        createModule(false, name, dependencies, initFunc);
-    };
-
-    api.createCoreModule = function(name, dependencies, initFunc) {
-        createModule(true, name, dependencies, initFunc);
-    };
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Ensure rangy.rangePrototype and rangy.selectionPrototype are available immediately
-
-    function RangePrototype() {}
-    api.RangePrototype = RangePrototype;
-    api.rangePrototype = new RangePrototype();
-
-    function SelectionPrototype() {}
-    api.selectionPrototype = new SelectionPrototype();
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Wait for document to load before running tests
-
-    var docReady = false;
-
-    var loadHandler = function(e) {
-        if (!docReady) {
-            docReady = true;
-            if (!api.initialized) {
-                init();
-            }
-        }
-    };
-
-    // Test whether we have window and document objects that we will need
-    if (typeof window == UNDEFINED) {
-        fail("No window found");
-        return;
-    }
-    if (typeof document == UNDEFINED) {
-        fail("No document found");
-        return;
-    }
-
-    if (isHostMethod(document, "addEventListener")) {
-        document.addEventListener("DOMContentLoaded", loadHandler, false);
-    }
-
-    // Add a fallback in case the DOMContentLoaded event isn't supported
-    addListener(window, "load", loadHandler);
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-    
-    // AMD, for those who like this kind of thing
-
-    if (amdSupported) {
-        // AMD. Register as an anonymous module.
-        global.define(function() {
-            api.amd = true;
-            return api;
-        });
-    }
-    
-    // Create a "rangy" property of the global object in any case. Other Rangy modules (which use Rangy's own simple
-    // module system) rely on the existence of this global property
-    global.rangy = api;
-})(this);    
-
-rangy.createCoreModule("DomUtil", [], function(api, module) {
-    var UNDEF = "undefined";
-    var util = api.util;
-
-    // Perform feature tests
-    if (!util.areHostMethods(document, ["createDocumentFragment", "createElement", "createTextNode"])) {
-        module.fail("document missing a Node creation method");
-    }
-
-    if (!util.isHostMethod(document, "getElementsByTagName")) {
-        module.fail("document missing getElementsByTagName method");
-    }
-
-    var el = document.createElement("div");
-    if (!util.areHostMethods(el, ["insertBefore", "appendChild", "cloneNode"] ||
-            !util.areHostObjects(el, ["previousSibling", "nextSibling", "childNodes", "parentNode"]))) {
-        module.fail("Incomplete Element implementation");
-    }
-
-    // innerHTML is required for Range's createContextualFragment method
-    if (!util.isHostProperty(el, "innerHTML")) {
-        module.fail("Element is missing innerHTML property");
-    }
-
-    var textNode = document.createTextNode("test");
-    if (!util.areHostMethods(textNode, ["splitText", "deleteData", "insertData", "appendData", "cloneNode"] ||
-            !util.areHostObjects(el, ["previousSibling", "nextSibling", "childNodes", "parentNode"]) ||
-            !util.areHostProperties(textNode, ["data"]))) {
-        module.fail("Incomplete Text Node implementation");
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Removed use of indexOf because of a bizarre bug in Opera that is thrown in one of the Acid3 tests. I haven't been
-    // able to replicate it outside of the test. The bug is that indexOf returns -1 when called on an Array that
-    // contains just the document as a single element and the value searched for is the document.
-    var arrayContains = /*Array.prototype.indexOf ?
-        function(arr, val) {
-            return arr.indexOf(val) > -1;
-        }:*/
-
-        function(arr, val) {
-            var i = arr.length;
-            while (i--) {
-                if (arr[i] === val) {
-                    return true;
-                }
-            }
-            return false;
-        };
-
-    // Opera 11 puts HTML elements in the null namespace, it seems, and IE 7 has undefined namespaceURI
-    function isHtmlNamespace(node) {
-        var ns;
-        return typeof node.namespaceURI == UNDEF || ((ns = node.namespaceURI) === null || ns == "http://www.w3.org/1999/xhtml");
-    }
-
-    function parentElement(node) {
-        var parent = node.parentNode;
-        return (parent.nodeType == 1) ? parent : null;
-    }
-
-    function getNodeIndex(node) {
-        var i = 0;
-        while( (node = node.previousSibling) ) {
-            ++i;
-        }
-        return i;
-    }
-
-    function getNodeLength(node) {
-        switch (node.nodeType) {
-            case 7:
-            case 10:
-                return 0;
-            case 3:
-            case 8:
-                return node.length;
-            default:
-                return node.childNodes.length;
-        }
-    }
-
-    function getCommonAncestor(node1, node2) {
-        var ancestors = [], n;
-        for (n = node1; n; n = n.parentNode) {
-            ancestors.push(n);
-        }
-
-        for (n = node2; n; n = n.parentNode) {
-            if (arrayContains(ancestors, n)) {
-                return n;
-            }
-        }
-
-        return null;
-    }
-
-    function isAncestorOf(ancestor, descendant, selfIsAncestor) {
-        var n = selfIsAncestor ? descendant : descendant.parentNode;
-        while (n) {
-            if (n === ancestor) {
-                return true;
-            } else {
-                n = n.parentNode;
-            }
-        }
-        return false;
-    }
-
-    function isOrIsAncestorOf(ancestor, descendant) {
-        return isAncestorOf(ancestor, descendant, true);
-    }
-
-    function getClosestAncestorIn(node, ancestor, selfIsAncestor) {
-        var p, n = selfIsAncestor ? node : node.parentNode;
-        while (n) {
-            p = n.parentNode;
-            if (p === ancestor) {
-                return n;
-            }
-            n = p;
-        }
-        return null;
-    }
-
-    function isCharacterDataNode(node) {
-        var t = node.nodeType;
-        return t == 3 || t == 4 || t == 8 ; // Text, CDataSection or Comment
-    }
-
-    function isTextOrCommentNode(node) {
-        if (!node) {
-            return false;
-        }
-        var t = node.nodeType;
-        return t == 3 || t == 8 ; // Text or Comment
-    }
-
-    function insertAfter(node, precedingNode) {
-        var nextNode = precedingNode.nextSibling, parent = precedingNode.parentNode;
-        if (nextNode) {
-            parent.insertBefore(node, nextNode);
-        } else {
-            parent.appendChild(node);
-        }
-        return node;
-    }
-
-    // Note that we cannot use splitText() because it is bugridden in IE 9.
-    function splitDataNode(node, index, positionsToPreserve) {
-        var newNode = node.cloneNode(false);
-        newNode.deleteData(0, index);
-        node.deleteData(index, node.length - index);
-        insertAfter(newNode, node);
-
-        // Preserve positions
-        if (positionsToPreserve) {
-            for (var i = 0, position; position = positionsToPreserve[i++]; ) {
-                // Handle case where position was inside the portion of node after the split point
-                if (position.node == node && position.offset > index) {
-                    position.node = newNode;
-                    position.offset -= index;
-                }
-                // Handle the case where the position is a node offset within node's parent
-                else if (position.node == node.parentNode && position.offset > getNodeIndex(node)) {
-                    ++position.offset;
-                }
-            }
-        }
-        return newNode;
-    }
-
-    function getDocument(node) {
-        if (node.nodeType == 9) {
-            return node;
-        } else if (typeof node.ownerDocument != UNDEF) {
-            return node.ownerDocument;
-        } else if (typeof node.document != UNDEF) {
-            return node.document;
-        } else if (node.parentNode) {
-            return getDocument(node.parentNode);
-        } else {
-            throw module.createError("getDocument: no document found for node");
-        }
-    }
-
-    function getWindow(node) {
-        var doc = getDocument(node);
-        if (typeof doc.defaultView != UNDEF) {
-            return doc.defaultView;
-        } else if (typeof doc.parentWindow != UNDEF) {
-            return doc.parentWindow;
-        } else {
-            throw module.createError("Cannot get a window object for node");
-        }
-    }
-
-    function getIframeDocument(iframeEl) {
-        if (typeof iframeEl.contentDocument != UNDEF) {
-            return iframeEl.contentDocument;
-        } else if (typeof iframeEl.contentWindow != UNDEF) {
-            return iframeEl.contentWindow.document;
-        } else {
-            throw module.createError("getIframeDocument: No Document object found for iframe element");
-        }
-    }
-
-    function getIframeWindow(iframeEl) {
-        if (typeof iframeEl.contentWindow != UNDEF) {
-            return iframeEl.contentWindow;
-        } else if (typeof iframeEl.contentDocument != UNDEF) {
-            return iframeEl.contentDocument.defaultView;
-        } else {
-            throw module.createError("getIframeWindow: No Window object found for iframe element");
-        }
-    }
-
-    // This looks bad. Is it worth it?
-    function isWindow(obj) {
-        return obj && util.isHostMethod(obj, "setTimeout") && util.isHostObject(obj, "document");
-    }
-
-    function getContentDocument(obj, module, methodName) {
-        var doc;
-
-        if (!obj) {
-            doc = document;
-        }
-
-        // Test if a DOM node has been passed and obtain a document object for it if so
-        else if (util.isHostProperty(obj, "nodeType")) {
-            doc = (obj.nodeType == 1 && obj.tagName.toLowerCase() == "iframe")
-                ? getIframeDocument(obj) : getDocument(obj);
-        }
-
-        // Test if the doc parameter appears to be a Window object
-        else if (isWindow(obj)) {
-            doc = obj.document;
-        }
-
-        if (!doc) {
-            throw module.createError(methodName + "(): Parameter must be a Window object or DOM node");
-        }
-
-        return doc;
-    }
-
-    function getRootContainer(node) {
-        var parent;
-        while ( (parent = node.parentNode) ) {
-            node = parent;
-        }
-        return node;
-    }
-
-    function comparePoints(nodeA, offsetA, nodeB, offsetB) {
-        // See http://www.w3.org/TR/DOM-Level-2-Traversal-Range/ranges.html#Level-2-Range-Comparing
-        var nodeC, root, childA, childB, n;
-        if (nodeA == nodeB) {
-            // Case 1: nodes are the same
-            return offsetA === offsetB ? 0 : (offsetA < offsetB) ? -1 : 1;
-        } else if ( (nodeC = getClosestAncestorIn(nodeB, nodeA, true)) ) {
-            // Case 2: node C (container B or an ancestor) is a child node of A
-            return offsetA <= getNodeIndex(nodeC) ? -1 : 1;
-        } else if ( (nodeC = getClosestAncestorIn(nodeA, nodeB, true)) ) {
-            // Case 3: node C (container A or an ancestor) is a child node of B
-            return getNodeIndex(nodeC) < offsetB  ? -1 : 1;
-        } else {
-            root = getCommonAncestor(nodeA, nodeB);
-            if (!root) {
-                throw new Error("comparePoints error: nodes have no common ancestor");
-            }
-
-            // Case 4: containers are siblings or descendants of siblings
-            childA = (nodeA === root) ? root : getClosestAncestorIn(nodeA, root, true);
-            childB = (nodeB === root) ? root : getClosestAncestorIn(nodeB, root, true);
-
-            if (childA === childB) {
-                // This shouldn't be possible
-                throw module.createError("comparePoints got to case 4 and childA and childB are the same!");
-            } else {
-                n = root.firstChild;
-                while (n) {
-                    if (n === childA) {
-                        return -1;
-                    } else if (n === childB) {
-                        return 1;
-                    }
-                    n = n.nextSibling;
-                }
-            }
-        }
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Test for IE's crash (IE 6/7) or exception (IE >= 8) when a reference to garbage-collected text node is queried
-    var crashyTextNodes = false;
-
-    function isBrokenNode(node) {
-        try {
-            node.parentNode;
-            return false;
-        } catch (e) {
-            return true;
-        }
-    }
-
-    (function() {
-        var el = document.createElement("b");
-        el.innerHTML = "1";
-        var textNode = el.firstChild;
-        el.innerHTML = "
    ";
-        crashyTextNodes = isBrokenNode(textNode);
-
-        api.features.crashyTextNodes = crashyTextNodes;
-    })();
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    function inspectNode(node) {
-        if (!node) {
-            return "[No node]";
-        }
-        if (crashyTextNodes && isBrokenNode(node)) {
-            return "[Broken node]";
-        }
-        if (isCharacterDataNode(node)) {
-            return '"' + node.data + '"';
-        }
-        if (node.nodeType == 1) {
-            var idAttr = node.id ? ' id="' + node.id + '"' : "";
-            return "<" + node.nodeName + idAttr + ">[" + getNodeIndex(node) + "][" + node.childNodes.length + "][" + (node.innerHTML || "[innerHTML not supported]").slice(0, 25) + "]";
-        }
-        return node.nodeName;
-    }
-
-    function fragmentFromNodeChildren(node) {
-        var fragment = getDocument(node).createDocumentFragment(), child;
-        while ( (child = node.firstChild) ) {
-            fragment.appendChild(child);
-        }
-        return fragment;
-    }
-
-    var getComputedStyleProperty;
-    if (typeof window.getComputedStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName) {
-            return getWindow(el).getComputedStyle(el, null)[propName];
-        };
-    } else if (typeof document.documentElement.currentStyle != UNDEF) {
-        getComputedStyleProperty = function(el, propName) {
-            return el.currentStyle[propName];
-        };
-    } else {
-        module.fail("No means of obtaining computed style properties found");
-    }
-
-    function NodeIterator(root) {
-        this.root = root;
-        this._next = root;
-    }
-
-    NodeIterator.prototype = {
-        _current: null,
-
-        hasNext: function() {
-            return !!this._next;
-        },
-
-        next: function() {
-            var n = this._current = this._next;
-            var child, next;
-            if (this._current) {
-                child = n.firstChild;
-                if (child) {
-                    this._next = child;
-                } else {
-                    next = null;
-                    while ((n !== this.root) && !(next = n.nextSibling)) {
-                        n = n.parentNode;
-                    }
-                    this._next = next;
-                }
-            }
-            return this._current;
-        },
-
-        detach: function() {
-            this._current = this._next = this.root = null;
-        }
-    };
-
-    function createIterator(root) {
-        return new NodeIterator(root);
-    }
-
-    function DomPosition(node, offset) {
-        this.node = node;
-        this.offset = offset;
-    }
-
-    DomPosition.prototype = {
-        equals: function(pos) {
-            return !!pos && this.node === pos.node && this.offset == pos.offset;
-        },
-
-        inspect: function() {
-            return "[DomPosition(" + inspectNode(this.node) + ":" + this.offset + ")]";
-        },
-
-        toString: function() {
-            return this.inspect();
-        }
-    };
-
-    function DOMException(codeName) {
-        this.code = this[codeName];
-        this.codeName = codeName;
-        this.message = "DOMException: " + this.codeName;
-    }
-
-    DOMException.prototype = {
-        INDEX_SIZE_ERR: 1,
-        HIERARCHY_REQUEST_ERR: 3,
-        WRONG_DOCUMENT_ERR: 4,
-        NO_MODIFICATION_ALLOWED_ERR: 7,
-        NOT_FOUND_ERR: 8,
-        NOT_SUPPORTED_ERR: 9,
-        INVALID_STATE_ERR: 11
-    };
-
-    DOMException.prototype.toString = function() {
-        return this.message;
-    };
-
-    api.dom = {
-        arrayContains: arrayContains,
-        isHtmlNamespace: isHtmlNamespace,
-        parentElement: parentElement,
-        getNodeIndex: getNodeIndex,
-        getNodeLength: getNodeLength,
-        getCommonAncestor: getCommonAncestor,
-        isAncestorOf: isAncestorOf,
-        isOrIsAncestorOf: isOrIsAncestorOf,
-        getClosestAncestorIn: getClosestAncestorIn,
-        isCharacterDataNode: isCharacterDataNode,
-        isTextOrCommentNode: isTextOrCommentNode,
-        insertAfter: insertAfter,
-        splitDataNode: splitDataNode,
-        getDocument: getDocument,
-        getWindow: getWindow,
-        getIframeWindow: getIframeWindow,
-        getIframeDocument: getIframeDocument,
-        getBody: util.getBody,
-        isWindow: isWindow,
-        getContentDocument: getContentDocument,
-        getRootContainer: getRootContainer,
-        comparePoints: comparePoints,
-        isBrokenNode: isBrokenNode,
-        inspectNode: inspectNode,
-        getComputedStyleProperty: getComputedStyleProperty,
-        fragmentFromNodeChildren: fragmentFromNodeChildren,
-        createIterator: createIterator,
-        DomPosition: DomPosition
-    };
-
-    api.DOMException = DOMException;
-});
-rangy.createCoreModule("DomRange", ["DomUtil"], function(api, module) {
-    var dom = api.dom;
-    var util = api.util;
-    var DomPosition = dom.DomPosition;
-    var DOMException = api.DOMException;
-
-    var isCharacterDataNode = dom.isCharacterDataNode;
-    var getNodeIndex = dom.getNodeIndex;
-    var isOrIsAncestorOf = dom.isOrIsAncestorOf;
-    var getDocument = dom.getDocument;
-    var comparePoints = dom.comparePoints;
-    var splitDataNode = dom.splitDataNode;
-    var getClosestAncestorIn = dom.getClosestAncestorIn;
-    var getNodeLength = dom.getNodeLength;
-    var arrayContains = dom.arrayContains;
-    var getRootContainer = dom.getRootContainer;
-    var crashyTextNodes = api.features.crashyTextNodes;
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Utility functions
-
-    function isNonTextPartiallySelected(node, range) {
-        return (node.nodeType != 3) &&
-               (isOrIsAncestorOf(node, range.startContainer) || isOrIsAncestorOf(node, range.endContainer));
-    }
-
-    function getRangeDocument(range) {
-        return range.document || getDocument(range.startContainer);
-    }
-
-    function getBoundaryBeforeNode(node) {
-        return new DomPosition(node.parentNode, getNodeIndex(node));
-    }
-
-    function getBoundaryAfterNode(node) {
-        return new DomPosition(node.parentNode, getNodeIndex(node) + 1);
-    }
-
-    function insertNodeAtPosition(node, n, o) {
-        var firstNodeInserted = node.nodeType == 11 ? node.firstChild : node;
-        if (isCharacterDataNode(n)) {
-            if (o == n.length) {
-                dom.insertAfter(node, n);
-            } else {
-                n.parentNode.insertBefore(node, o == 0 ? n : splitDataNode(n, o));
-            }
-        } else if (o >= n.childNodes.length) {
-            n.appendChild(node);
-        } else {
-            n.insertBefore(node, n.childNodes[o]);
-        }
-        return firstNodeInserted;
-    }
-
-    function rangesIntersect(rangeA, rangeB, touchingIsIntersecting) {
-        assertRangeValid(rangeA);
-        assertRangeValid(rangeB);
-
-        if (getRangeDocument(rangeB) != getRangeDocument(rangeA)) {
-            throw new DOMException("WRONG_DOCUMENT_ERR");
-        }
-
-        var startComparison = comparePoints(rangeA.startContainer, rangeA.startOffset, rangeB.endContainer, rangeB.endOffset),
-            endComparison = comparePoints(rangeA.endContainer, rangeA.endOffset, rangeB.startContainer, rangeB.startOffset);
-
-        return touchingIsIntersecting ? startComparison <= 0 && endComparison >= 0 : startComparison < 0 && endComparison > 0;
-    }
-
-    function cloneSubtree(iterator) {
-        var partiallySelected;
-        for (var node, frag = getRangeDocument(iterator.range).createDocumentFragment(), subIterator; node = iterator.next(); ) {
-            partiallySelected = iterator.isPartiallySelectedSubtree();
-            node = node.cloneNode(!partiallySelected);
-            if (partiallySelected) {
-                subIterator = iterator.getSubtreeIterator();
-                node.appendChild(cloneSubtree(subIterator));
-                subIterator.detach(true);
-            }
-
-            if (node.nodeType == 10) { // DocumentType
-                throw new DOMException("HIERARCHY_REQUEST_ERR");
-            }
-            frag.appendChild(node);
-        }
-        return frag;
-    }
-
-    function iterateSubtree(rangeIterator, func, iteratorState) {
-        var it, n;
-        iteratorState = iteratorState || { stop: false };
-        for (var node, subRangeIterator; node = rangeIterator.next(); ) {
-            if (rangeIterator.isPartiallySelectedSubtree()) {
-                if (func(node) === false) {
-                    iteratorState.stop = true;
-                    return;
-                } else {
-                    // The node is partially selected by the Range, so we can use a new RangeIterator on the portion of
-                    // the node selected by the Range.
-                    subRangeIterator = rangeIterator.getSubtreeIterator();
-                    iterateSubtree(subRangeIterator, func, iteratorState);
-                    subRangeIterator.detach(true);
-                    if (iteratorState.stop) {
-                        return;
-                    }
-                }
-            } else {
-                // The whole node is selected, so we can use efficient DOM iteration to iterate over the node and its
-                // descendants
-                it = dom.createIterator(node);
-                while ( (n = it.next()) ) {
-                    if (func(n) === false) {
-                        iteratorState.stop = true;
-                        return;
-                    }
-                }
-            }
-        }
-    }
-
-    function deleteSubtree(iterator) {
-        var subIterator;
-        while (iterator.next()) {
-            if (iterator.isPartiallySelectedSubtree()) {
-                subIterator = iterator.getSubtreeIterator();
-                deleteSubtree(subIterator);
-                subIterator.detach(true);
-            } else {
-                iterator.remove();
-            }
-        }
-    }
-
-    function extractSubtree(iterator) {
-        for (var node, frag = getRangeDocument(iterator.range).createDocumentFragment(), subIterator; node = iterator.next(); ) {
-
-            if (iterator.isPartiallySelectedSubtree()) {
-                node = node.cloneNode(false);
-                subIterator = iterator.getSubtreeIterator();
-                node.appendChild(extractSubtree(subIterator));
-                subIterator.detach(true);
-            } else {
-                iterator.remove();
-            }
-            if (node.nodeType == 10) { // DocumentType
-                throw new DOMException("HIERARCHY_REQUEST_ERR");
-            }
-            frag.appendChild(node);
-        }
-        return frag;
-    }
-
-    function getNodesInRange(range, nodeTypes, filter) {
-        var filterNodeTypes = !!(nodeTypes && nodeTypes.length), regex;
-        var filterExists = !!filter;
-        if (filterNodeTypes) {
-            regex = new RegExp("^(" + nodeTypes.join("|") + ")$");
-        }
-
-        var nodes = [];
-        iterateSubtree(new RangeIterator(range, false), function(node) {
-            if (filterNodeTypes && !regex.test(node.nodeType)) {
-                return;
-            }
-            if (filterExists && !filter(node)) {
-                return;
-            }
-            // Don't include a boundary container if it is a character data node and the range does not contain any
-            // of its character data. See issue 190.
-            var sc = range.startContainer;
-            if (node == sc && isCharacterDataNode(sc) && range.startOffset == sc.length) {
-                return;
-            }
-
-            var ec = range.endContainer;
-            if (node == ec && isCharacterDataNode(ec) && range.endOffset == 0) {
-                return;
-            }
-
-            nodes.push(node);
-        });
-        return nodes;
-    }
-
-    function inspect(range) {
-        var name = (typeof range.getName == "undefined") ? "Range" : range.getName();
-        return "[" + name + "(" + dom.inspectNode(range.startContainer) + ":" + range.startOffset + ", " +
-                dom.inspectNode(range.endContainer) + ":" + range.endOffset + ")]";
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // RangeIterator code partially borrows from IERange by Tim Ryan (http://github.com/timcameronryan/IERange)
-
-    function RangeIterator(range, clonePartiallySelectedTextNodes) {
-        this.range = range;
-        this.clonePartiallySelectedTextNodes = clonePartiallySelectedTextNodes;
-
-
-        if (!range.collapsed) {
-            this.sc = range.startContainer;
-            this.so = range.startOffset;
-            this.ec = range.endContainer;
-            this.eo = range.endOffset;
-            var root = range.commonAncestorContainer;
-
-            if (this.sc === this.ec && isCharacterDataNode(this.sc)) {
-                this.isSingleCharacterDataNode = true;
-                this._first = this._last = this._next = this.sc;
-            } else {
-                this._first = this._next = (this.sc === root && !isCharacterDataNode(this.sc)) ?
-                    this.sc.childNodes[this.so] : getClosestAncestorIn(this.sc, root, true);
-                this._last = (this.ec === root && !isCharacterDataNode(this.ec)) ?
-                    this.ec.childNodes[this.eo - 1] : getClosestAncestorIn(this.ec, root, true);
-            }
-        }
-    }
-
-    RangeIterator.prototype = {
-        _current: null,
-        _next: null,
-        _first: null,
-        _last: null,
-        isSingleCharacterDataNode: false,
-
-        reset: function() {
-            this._current = null;
-            this._next = this._first;
-        },
-
-        hasNext: function() {
-            return !!this._next;
-        },
-
-        next: function() {
-            // Move to next node
-            var current = this._current = this._next;
-            if (current) {
-                this._next = (current !== this._last) ? current.nextSibling : null;
-
-                // Check for partially selected text nodes
-                if (isCharacterDataNode(current) && this.clonePartiallySelectedTextNodes) {
-                    if (current === this.ec) {
-                        (current = current.cloneNode(true)).deleteData(this.eo, current.length - this.eo);
-                    }
-                    if (this._current === this.sc) {
-                        (current = current.cloneNode(true)).deleteData(0, this.so);
-                    }
-                }
-            }
-
-            return current;
-        },
-
-        remove: function() {
-            var current = this._current, start, end;
-
-            if (isCharacterDataNode(current) && (current === this.sc || current === this.ec)) {
-                start = (current === this.sc) ? this.so : 0;
-                end = (current === this.ec) ? this.eo : current.length;
-                if (start != end) {
-                    current.deleteData(start, end - start);
-                }
-            } else {
-                if (current.parentNode) {
-                    current.parentNode.removeChild(current);
-                } else {
-                }
-            }
-        },
-
-        // Checks if the current node is partially selected
-        isPartiallySelectedSubtree: function() {
-            var current = this._current;
-            return isNonTextPartiallySelected(current, this.range);
-        },
-
-        getSubtreeIterator: function() {
-            var subRange;
-            if (this.isSingleCharacterDataNode) {
-                subRange = this.range.cloneRange();
-                subRange.collapse(false);
-            } else {
-                subRange = new Range(getRangeDocument(this.range));
-                var current = this._current;
-                var startContainer = current, startOffset = 0, endContainer = current, endOffset = getNodeLength(current);
-
-                if (isOrIsAncestorOf(current, this.sc)) {
-                    startContainer = this.sc;
-                    startOffset = this.so;
-                }
-                if (isOrIsAncestorOf(current, this.ec)) {
-                    endContainer = this.ec;
-                    endOffset = this.eo;
-                }
-
-                updateBoundaries(subRange, startContainer, startOffset, endContainer, endOffset);
-            }
-            return new RangeIterator(subRange, this.clonePartiallySelectedTextNodes);
-        },
-
-        detach: function(detachRange) {
-            if (detachRange) {
-                this.range.detach();
-            }
-            this.range = this._current = this._next = this._first = this._last = this.sc = this.so = this.ec = this.eo = null;
-        }
-    };
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Exceptions
-
-    function RangeException(codeName) {
-        this.code = this[codeName];
-        this.codeName = codeName;
-        this.message = "RangeException: " + this.codeName;
-    }
-
-    RangeException.prototype = {
-        BAD_BOUNDARYPOINTS_ERR: 1,
-        INVALID_NODE_TYPE_ERR: 2
-    };
-
-    RangeException.prototype.toString = function() {
-        return this.message;
-    };
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    var beforeAfterNodeTypes = [1, 3, 4, 5, 7, 8, 10];
-    var rootContainerNodeTypes = [2, 9, 11];
-    var readonlyNodeTypes = [5, 6, 10, 12];
-    var insertableNodeTypes = [1, 3, 4, 5, 7, 8, 10, 11];
-    var surroundNodeTypes = [1, 3, 4, 5, 7, 8];
-
-    function createAncestorFinder(nodeTypes) {
-        return function(node, selfIsAncestor) {
-            var t, n = selfIsAncestor ? node : node.parentNode;
-            while (n) {
-                t = n.nodeType;
-                if (arrayContains(nodeTypes, t)) {
-                    return n;
-                }
-                n = n.parentNode;
-            }
-            return null;
-        };
-    }
-
-    var getDocumentOrFragmentContainer = createAncestorFinder( [9, 11] );
-    var getReadonlyAncestor = createAncestorFinder(readonlyNodeTypes);
-    var getDocTypeNotationEntityAncestor = createAncestorFinder( [6, 10, 12] );
-
-    function assertNoDocTypeNotationEntityAncestor(node, allowSelf) {
-        if (getDocTypeNotationEntityAncestor(node, allowSelf)) {
-            throw new RangeException("INVALID_NODE_TYPE_ERR");
-        }
-    }
-
-    function assertNotDetached(range) {
-        if (!range.startContainer) {
-            throw new DOMException("INVALID_STATE_ERR");
-        }
-    }
-
-    function assertValidNodeType(node, invalidTypes) {
-        if (!arrayContains(invalidTypes, node.nodeType)) {
-            throw new RangeException("INVALID_NODE_TYPE_ERR");
-        }
-    }
-
-    function assertValidOffset(node, offset) {
-        if (offset < 0 || offset > (isCharacterDataNode(node) ? node.length : node.childNodes.length)) {
-            throw new DOMException("INDEX_SIZE_ERR");
-        }
-    }
-
-    function assertSameDocumentOrFragment(node1, node2) {
-        if (getDocumentOrFragmentContainer(node1, true) !== getDocumentOrFragmentContainer(node2, true)) {
-            throw new DOMException("WRONG_DOCUMENT_ERR");
-        }
-    }
-
-    function assertNodeNotReadOnly(node) {
-        if (getReadonlyAncestor(node, true)) {
-            throw new DOMException("NO_MODIFICATION_ALLOWED_ERR");
-        }
-    }
-
-    function assertNode(node, codeName) {
-        if (!node) {
-            throw new DOMException(codeName);
-        }
-    }
-
-    function isOrphan(node) {
-        return (crashyTextNodes && dom.isBrokenNode(node)) ||
-            !arrayContains(rootContainerNodeTypes, node.nodeType) && !getDocumentOrFragmentContainer(node, true);
-    }
-
-    function isValidOffset(node, offset) {
-        return offset <= (isCharacterDataNode(node) ? node.length : node.childNodes.length);
-    }
-
-    function isRangeValid(range) {
-        return (!!range.startContainer && !!range.endContainer
-                && !isOrphan(range.startContainer)
-                && !isOrphan(range.endContainer)
-                && isValidOffset(range.startContainer, range.startOffset)
-                && isValidOffset(range.endContainer, range.endOffset));
-    }
-
-    function assertRangeValid(range) {
-        assertNotDetached(range);
-        if (!isRangeValid(range)) {
-            throw new Error("Range error: Range is no longer valid after DOM mutation (" + range.inspect() + ")");
-        }
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Test the browser's innerHTML support to decide how to implement createContextualFragment
-    var styleEl = document.createElement("style");
-    var htmlParsingConforms = false;
-    try {
-        styleEl.innerHTML = "x";
-        htmlParsingConforms = (styleEl.firstChild.nodeType == 3); // Opera incorrectly creates an element node
-    } catch (e) {
-        // IE 6 and 7 throw
-    }
-
-    api.features.htmlParsingConforms = htmlParsingConforms;
-
-    var createContextualFragment = htmlParsingConforms ?
-
-        // Implementation as per HTML parsing spec, trusting in the browser's implementation of innerHTML. See
-        // discussion and base code for this implementation at issue 67.
-        // Spec: http://html5.org/specs/dom-parsing.html#extensions-to-the-range-interface
-        // Thanks to Aleks Williams.
-        function(fragmentStr) {
-            // "Let node the context object's start's node."
-            var node = this.startContainer;
-            var doc = getDocument(node);
-
-            // "If the context object's start's node is null, raise an INVALID_STATE_ERR
-            // exception and abort these steps."
-            if (!node) {
-                throw new DOMException("INVALID_STATE_ERR");
-            }
-
-            // "Let element be as follows, depending on node's interface:"
-            // Document, Document Fragment: null
-            var el = null;
-
-            // "Element: node"
-            if (node.nodeType == 1) {
-                el = node;
-
-            // "Text, Comment: node's parentElement"
-            } else if (isCharacterDataNode(node)) {
-                el = dom.parentElement(node);
-            }
-
-            // "If either element is null or element's ownerDocument is an HTML document
-            // and element's local name is "html" and element's namespace is the HTML
-            // namespace"
-            if (el === null || (
-                el.nodeName == "HTML"
-                && dom.isHtmlNamespace(getDocument(el).documentElement)
-                && dom.isHtmlNamespace(el)
-            )) {
-
-            // "let element be a new Element with "body" as its local name and the HTML
-            // namespace as its namespace.""
-                el = doc.createElement("body");
-            } else {
-                el = el.cloneNode(false);
-            }
-
-            // "If the node's document is an HTML document: Invoke the HTML fragment parsing algorithm."
-            // "If the node's document is an XML document: Invoke the XML fragment parsing algorithm."
-            // "In either case, the algorithm must be invoked with fragment as the input
-            // and element as the context element."
-            el.innerHTML = fragmentStr;
-
-            // "If this raises an exception, then abort these steps. Otherwise, let new
-            // children be the nodes returned."
-
-            // "Let fragment be a new DocumentFragment."
-            // "Append all new children to fragment."
-            // "Return fragment."
-            return dom.fragmentFromNodeChildren(el);
-        } :
-
-        // In this case, innerHTML cannot be trusted, so fall back to a simpler, non-conformant implementation that
-        // previous versions of Rangy used (with the exception of using a body element rather than a div)
-        function(fragmentStr) {
-            assertNotDetached(this);
-            var doc = getRangeDocument(this);
-            var el = doc.createElement("body");
-            el.innerHTML = fragmentStr;
-
-            return dom.fragmentFromNodeChildren(el);
-        };
-
-    function splitRangeBoundaries(range, positionsToPreserve) {
-        assertRangeValid(range);
-
-        var sc = range.startContainer, so = range.startOffset, ec = range.endContainer, eo = range.endOffset;
-        var startEndSame = (sc === ec);
-
-        if (isCharacterDataNode(ec) && eo > 0 && eo < ec.length) {
-            splitDataNode(ec, eo, positionsToPreserve);
-        }
-
-        if (isCharacterDataNode(sc) && so > 0 && so < sc.length) {
-            sc = splitDataNode(sc, so, positionsToPreserve);
-            if (startEndSame) {
-                eo -= so;
-                ec = sc;
-            } else if (ec == sc.parentNode && eo >= getNodeIndex(sc)) {
-                eo++;
-            }
-            so = 0;
-        }
-        range.setStartAndEnd(sc, so, ec, eo);
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    var rangeProperties = ["startContainer", "startOffset", "endContainer", "endOffset", "collapsed",
-        "commonAncestorContainer"];
-
-    var s2s = 0, s2e = 1, e2e = 2, e2s = 3;
-    var n_b = 0, n_a = 1, n_b_a = 2, n_i = 3;
-
-    util.extend(api.rangePrototype, {
-        compareBoundaryPoints: function(how, range) {
-            assertRangeValid(this);
-            assertSameDocumentOrFragment(this.startContainer, range.startContainer);
-
-            var nodeA, offsetA, nodeB, offsetB;
-            var prefixA = (how == e2s || how == s2s) ? "start" : "end";
-            var prefixB = (how == s2e || how == s2s) ? "start" : "end";
-            nodeA = this[prefixA + "Container"];
-            offsetA = this[prefixA + "Offset"];
-            nodeB = range[prefixB + "Container"];
-            offsetB = range[prefixB + "Offset"];
-            return comparePoints(nodeA, offsetA, nodeB, offsetB);
-        },
-
-        insertNode: function(node) {
-            assertRangeValid(this);
-            assertValidNodeType(node, insertableNodeTypes);
-            assertNodeNotReadOnly(this.startContainer);
-
-            if (isOrIsAncestorOf(node, this.startContainer)) {
-                throw new DOMException("HIERARCHY_REQUEST_ERR");
-            }
-
-            // No check for whether the container of the start of the Range is of a type that does not allow
-            // children of the type of node: the browser's DOM implementation should do this for us when we attempt
-            // to add the node
-
-            var firstNodeInserted = insertNodeAtPosition(node, this.startContainer, this.startOffset);
-            this.setStartBefore(firstNodeInserted);
-        },
-
-        cloneContents: function() {
-            assertRangeValid(this);
-
-            var clone, frag;
-            if (this.collapsed) {
-                return getRangeDocument(this).createDocumentFragment();
-            } else {
-                if (this.startContainer === this.endContainer && isCharacterDataNode(this.startContainer)) {
-                    clone = this.startContainer.cloneNode(true);
-                    clone.data = clone.data.slice(this.startOffset, this.endOffset);
-                    frag = getRangeDocument(this).createDocumentFragment();
-                    frag.appendChild(clone);
-                    return frag;
-                } else {
-                    var iterator = new RangeIterator(this, true);
-                    clone = cloneSubtree(iterator);
-                    iterator.detach();
-                }
-                return clone;
-            }
-        },
-
-        canSurroundContents: function() {
-            assertRangeValid(this);
-            assertNodeNotReadOnly(this.startContainer);
-            assertNodeNotReadOnly(this.endContainer);
-
-            // Check if the contents can be surrounded. Specifically, this means whether the range partially selects
-            // no non-text nodes.
-            var iterator = new RangeIterator(this, true);
-            var boundariesInvalid = (iterator._first && (isNonTextPartiallySelected(iterator._first, this)) ||
-                    (iterator._last && isNonTextPartiallySelected(iterator._last, this)));
-            iterator.detach();
-            return !boundariesInvalid;
-        },
-
-        surroundContents: function(node) {
-            assertValidNodeType(node, surroundNodeTypes);
-
-            if (!this.canSurroundContents()) {
-                throw new RangeException("BAD_BOUNDARYPOINTS_ERR");
-            }
-
-            // Extract the contents
-            var content = this.extractContents();
-
-            // Clear the children of the node
-            if (node.hasChildNodes()) {
-                while (node.lastChild) {
-                    node.removeChild(node.lastChild);
-                }
-            }
-
-            // Insert the new node and add the extracted contents
-            insertNodeAtPosition(node, this.startContainer, this.startOffset);
-            node.appendChild(content);
-
-            this.selectNode(node);
-        },
-
-        cloneRange: function() {
-            assertRangeValid(this);
-            var range = new Range(getRangeDocument(this));
-            var i = rangeProperties.length, prop;
-            while (i--) {
-                prop = rangeProperties[i];
-                range[prop] = this[prop];
-            }
-            return range;
-        },
-
-        toString: function() {
-            assertRangeValid(this);
-            var sc = this.startContainer;
-            if (sc === this.endContainer && isCharacterDataNode(sc)) {
-                return (sc.nodeType == 3 || sc.nodeType == 4) ? sc.data.slice(this.startOffset, this.endOffset) : "";
-            } else {
-                var textParts = [], iterator = new RangeIterator(this, true);
-                iterateSubtree(iterator, function(node) {
-                    // Accept only text or CDATA nodes, not comments
-                    if (node.nodeType == 3 || node.nodeType == 4) {
-                        textParts.push(node.data);
-                    }
-                });
-                iterator.detach();
-                return textParts.join("");
-            }
-        },
-
-        // The methods below are all non-standard. The following batch were introduced by Mozilla but have since
-        // been removed from Mozilla.
-
-        compareNode: function(node) {
-            assertRangeValid(this);
-
-            var parent = node.parentNode;
-            var nodeIndex = getNodeIndex(node);
-
-            if (!parent) {
-                throw new DOMException("NOT_FOUND_ERR");
-            }
-
-            var startComparison = this.comparePoint(parent, nodeIndex),
-                endComparison = this.comparePoint(parent, nodeIndex + 1);
-
-            if (startComparison < 0) { // Node starts before
-                return (endComparison > 0) ? n_b_a : n_b;
-            } else {
-                return (endComparison > 0) ? n_a : n_i;
-            }
-        },
-
-        comparePoint: function(node, offset) {
-            assertRangeValid(this);
-            assertNode(node, "HIERARCHY_REQUEST_ERR");
-            assertSameDocumentOrFragment(node, this.startContainer);
-
-            if (comparePoints(node, offset, this.startContainer, this.startOffset) < 0) {
-                return -1;
-            } else if (comparePoints(node, offset, this.endContainer, this.endOffset) > 0) {
-                return 1;
-            }
-            return 0;
-        },
-
-        createContextualFragment: createContextualFragment,
-
-        toHtml: function() {
-            assertRangeValid(this);
-            var container = this.commonAncestorContainer.parentNode.cloneNode(false);
-            container.appendChild(this.cloneContents());
-            return container.innerHTML;
-        },
-
-        // touchingIsIntersecting determines whether this method considers a node that borders a range intersects
-        // with it (as in WebKit) or not (as in Gecko pre-1.9, and the default)
-        intersectsNode: function(node, touchingIsIntersecting) {
-            assertRangeValid(this);
-            assertNode(node, "NOT_FOUND_ERR");
-            if (getDocument(node) !== getRangeDocument(this)) {
-                return false;
-            }
-
-            var parent = node.parentNode, offset = getNodeIndex(node);
-            assertNode(parent, "NOT_FOUND_ERR");
-
-            var startComparison = comparePoints(parent, offset, this.endContainer, this.endOffset),
-                endComparison = comparePoints(parent, offset + 1, this.startContainer, this.startOffset);
-
-            return touchingIsIntersecting ? startComparison <= 0 && endComparison >= 0 : startComparison < 0 && endComparison > 0;
-        },
-
-        isPointInRange: function(node, offset) {
-            assertRangeValid(this);
-            assertNode(node, "HIERARCHY_REQUEST_ERR");
-            assertSameDocumentOrFragment(node, this.startContainer);
-
-            return (comparePoints(node, offset, this.startContainer, this.startOffset) >= 0) &&
-                   (comparePoints(node, offset, this.endContainer, this.endOffset) <= 0);
-        },
-
-        // The methods below are non-standard and invented by me.
-
-        // Sharing a boundary start-to-end or end-to-start does not count as intersection.
-        intersectsRange: function(range) {
-            return rangesIntersect(this, range, false);
-        },
-
-        // Sharing a boundary start-to-end or end-to-start does count as intersection.
-        intersectsOrTouchesRange: function(range) {
-            return rangesIntersect(this, range, true);
-        },
-
-        intersection: function(range) {
-            if (this.intersectsRange(range)) {
-                var startComparison = comparePoints(this.startContainer, this.startOffset, range.startContainer, range.startOffset),
-                    endComparison = comparePoints(this.endContainer, this.endOffset, range.endContainer, range.endOffset);
-
-                var intersectionRange = this.cloneRange();
-                if (startComparison == -1) {
-                    intersectionRange.setStart(range.startContainer, range.startOffset);
-                }
-                if (endComparison == 1) {
-                    intersectionRange.setEnd(range.endContainer, range.endOffset);
-                }
-                return intersectionRange;
-            }
-            return null;
-        },
-
-        union: function(range) {
-            if (this.intersectsOrTouchesRange(range)) {
-                var unionRange = this.cloneRange();
-                if (comparePoints(range.startContainer, range.startOffset, this.startContainer, this.startOffset) == -1) {
-                    unionRange.setStart(range.startContainer, range.startOffset);
-                }
-                if (comparePoints(range.endContainer, range.endOffset, this.endContainer, this.endOffset) == 1) {
-                    unionRange.setEnd(range.endContainer, range.endOffset);
-                }
-                return unionRange;
-            } else {
-                throw new RangeException("Ranges do not intersect");
-            }
-        },
-
-        containsNode: function(node, allowPartial) {
-            if (allowPartial) {
-                return this.intersectsNode(node, false);
-            } else {
-                return this.compareNode(node) == n_i;
-            }
-        },
-
-        containsNodeContents: function(node) {
-            return this.comparePoint(node, 0) >= 0 && this.comparePoint(node, getNodeLength(node)) <= 0;
-        },
-
-        containsRange: function(range) {
-            var intersection = this.intersection(range);
-            return intersection !== null && range.equals(intersection);
-        },
-
-        containsNodeText: function(node) {
-            var nodeRange = this.cloneRange();
-            nodeRange.selectNode(node);
-            var textNodes = nodeRange.getNodes([3]);
-            if (textNodes.length > 0) {
-                nodeRange.setStart(textNodes[0], 0);
-                var lastTextNode = textNodes.pop();
-                nodeRange.setEnd(lastTextNode, lastTextNode.length);
-                var contains = this.containsRange(nodeRange);
-                nodeRange.detach();
-                return contains;
-            } else {
-                return this.containsNodeContents(node);
-            }
-        },
-
-        getNodes: function(nodeTypes, filter) {
-            assertRangeValid(this);
-            return getNodesInRange(this, nodeTypes, filter);
-        },
-
-        getDocument: function() {
-            return getRangeDocument(this);
-        },
-
-        collapseBefore: function(node) {
-            assertNotDetached(this);
-
-            this.setEndBefore(node);
-            this.collapse(false);
-        },
-
-        collapseAfter: function(node) {
-            assertNotDetached(this);
-
-            this.setStartAfter(node);
-            this.collapse(true);
-        },
-        
-        getBookmark: function(containerNode) {
-            var doc = getRangeDocument(this);
-            var preSelectionRange = api.createRange(doc);
-            containerNode = containerNode || dom.getBody(doc);
-            preSelectionRange.selectNodeContents(containerNode);
-            var range = this.intersection(preSelectionRange);
-            var start = 0, end = 0;
-            if (range) {
-                preSelectionRange.setEnd(range.startContainer, range.startOffset);
-                start = preSelectionRange.toString().length;
-                end = start + range.toString().length;
-                preSelectionRange.detach();
-            }
-
-            return {
-                start: start,
-                end: end,
-                containerNode: containerNode
-            };
-        },
-        
-        moveToBookmark: function(bookmark) {
-            var containerNode = bookmark.containerNode;
-            var charIndex = 0;
-            this.setStart(containerNode, 0);
-            this.collapse(true);
-            var nodeStack = [containerNode], node, foundStart = false, stop = false;
-            var nextCharIndex, i, childNodes;
-
-            while (!stop && (node = nodeStack.pop())) {
-                if (node.nodeType == 3) {
-                    nextCharIndex = charIndex + node.length;
-                    if (!foundStart && bookmark.start >= charIndex && bookmark.start <= nextCharIndex) {
-                        this.setStart(node, bookmark.start - charIndex);
-                        foundStart = true;
-                    }
-                    if (foundStart && bookmark.end >= charIndex && bookmark.end <= nextCharIndex) {
-                        this.setEnd(node, bookmark.end - charIndex);
-                        stop = true;
-                    }
-                    charIndex = nextCharIndex;
-                } else {
-                    childNodes = node.childNodes;
-                    i = childNodes.length;
-                    while (i--) {
-                        nodeStack.push(childNodes[i]);
-                    }
-                }
-            }
-        },
-
-        getName: function() {
-            return "DomRange";
-        },
-
-        equals: function(range) {
-            return Range.rangesEqual(this, range);
-        },
-
-        isValid: function() {
-            return isRangeValid(this);
-        },
-        
-        inspect: function() {
-            return inspect(this);
-        }
-    });
-
-    function copyComparisonConstantsToObject(obj) {
-        obj.START_TO_START = s2s;
-        obj.START_TO_END = s2e;
-        obj.END_TO_END = e2e;
-        obj.END_TO_START = e2s;
-
-        obj.NODE_BEFORE = n_b;
-        obj.NODE_AFTER = n_a;
-        obj.NODE_BEFORE_AND_AFTER = n_b_a;
-        obj.NODE_INSIDE = n_i;
-    }
-
-    function copyComparisonConstants(constructor) {
-        copyComparisonConstantsToObject(constructor);
-        copyComparisonConstantsToObject(constructor.prototype);
-    }
-
-    function createRangeContentRemover(remover, boundaryUpdater) {
-        return function() {
-            assertRangeValid(this);
-
-            var sc = this.startContainer, so = this.startOffset, root = this.commonAncestorContainer;
-
-            var iterator = new RangeIterator(this, true);
-
-            // Work out where to position the range after content removal
-            var node, boundary;
-            if (sc !== root) {
-                node = getClosestAncestorIn(sc, root, true);
-                boundary = getBoundaryAfterNode(node);
-                sc = boundary.node;
-                so = boundary.offset;
-            }
-
-            // Check none of the range is read-only
-            iterateSubtree(iterator, assertNodeNotReadOnly);
-
-            iterator.reset();
-
-            // Remove the content
-            var returnValue = remover(iterator);
-            iterator.detach();
-
-            // Move to the new position
-            boundaryUpdater(this, sc, so, sc, so);
-
-            return returnValue;
-        };
-    }
-
-    function createPrototypeRange(constructor, boundaryUpdater, detacher) {
-        function createBeforeAfterNodeSetter(isBefore, isStart) {
-            return function(node) {
-                assertNotDetached(this);
-                assertValidNodeType(node, beforeAfterNodeTypes);
-                assertValidNodeType(getRootContainer(node), rootContainerNodeTypes);
-
-                var boundary = (isBefore ? getBoundaryBeforeNode : getBoundaryAfterNode)(node);
-                (isStart ? setRangeStart : setRangeEnd)(this, boundary.node, boundary.offset);
-            };
-        }
-
-        function setRangeStart(range, node, offset) {
-            var ec = range.endContainer, eo = range.endOffset;
-            if (node !== range.startContainer || offset !== range.startOffset) {
-                // Check the root containers of the range and the new boundary, and also check whether the new boundary
-                // is after the current end. In either case, collapse the range to the new position
-                if (getRootContainer(node) != getRootContainer(ec) || comparePoints(node, offset, ec, eo) == 1) {
-                    ec = node;
-                    eo = offset;
-                }
-                boundaryUpdater(range, node, offset, ec, eo);
-            }
-        }
-
-        function setRangeEnd(range, node, offset) {
-            var sc = range.startContainer, so = range.startOffset;
-            if (node !== range.endContainer || offset !== range.endOffset) {
-                // Check the root containers of the range and the new boundary, and also check whether the new boundary
-                // is after the current end. In either case, collapse the range to the new position
-                if (getRootContainer(node) != getRootContainer(sc) || comparePoints(node, offset, sc, so) == -1) {
-                    sc = node;
-                    so = offset;
-                }
-                boundaryUpdater(range, sc, so, node, offset);
-            }
-        }
-
-        // Set up inheritance
-        var F = function() {};
-        F.prototype = api.rangePrototype;
-        constructor.prototype = new F();
-
-        util.extend(constructor.prototype, {
-            setStart: function(node, offset) {
-                assertNotDetached(this);
-                assertNoDocTypeNotationEntityAncestor(node, true);
-                assertValidOffset(node, offset);
-
-                setRangeStart(this, node, offset);
-            },
-
-            setEnd: function(node, offset) {
-                assertNotDetached(this);
-                assertNoDocTypeNotationEntityAncestor(node, true);
-                assertValidOffset(node, offset);
-
-                setRangeEnd(this, node, offset);
-            },
-
-            /**
-             * Convenience method to set a range's start and end boundaries. Overloaded as follows:
-             * - Two parameters (node, offset) creates a collapsed range at that position
-             * - Three parameters (node, startOffset, endOffset) creates a range contained with node starting at
-             *   startOffset and ending at endOffset
-             * - Four parameters (startNode, startOffset, endNode, endOffset) creates a range starting at startOffset in
-             *   startNode and ending at endOffset in endNode
-             */
-            setStartAndEnd: function() {
-                assertNotDetached(this);
-
-                var args = arguments;
-                var sc = args[0], so = args[1], ec = sc, eo = so;
-
-                switch (args.length) {
-                    case 3:
-                        eo = args[2];
-                        break;
-                    case 4:
-                        ec = args[2];
-                        eo = args[3];
-                        break;
-                }
-
-                boundaryUpdater(this, sc, so, ec, eo);
-            },
-            
-            setBoundary: function(node, offset, isStart) {
-                this["set" + (isStart ? "Start" : "End")](node, offset);
-            },
-
-            setStartBefore: createBeforeAfterNodeSetter(true, true),
-            setStartAfter: createBeforeAfterNodeSetter(false, true),
-            setEndBefore: createBeforeAfterNodeSetter(true, false),
-            setEndAfter: createBeforeAfterNodeSetter(false, false),
-
-            collapse: function(isStart) {
-                assertRangeValid(this);
-                if (isStart) {
-                    boundaryUpdater(this, this.startContainer, this.startOffset, this.startContainer, this.startOffset);
-                } else {
-                    boundaryUpdater(this, this.endContainer, this.endOffset, this.endContainer, this.endOffset);
-                }
-            },
-
-            selectNodeContents: function(node) {
-                assertNotDetached(this);
-                assertNoDocTypeNotationEntityAncestor(node, true);
-
-                boundaryUpdater(this, node, 0, node, getNodeLength(node));
-            },
-
-            selectNode: function(node) {
-                assertNotDetached(this);
-                assertNoDocTypeNotationEntityAncestor(node, false);
-                assertValidNodeType(node, beforeAfterNodeTypes);
-
-                var start = getBoundaryBeforeNode(node), end = getBoundaryAfterNode(node);
-                boundaryUpdater(this, start.node, start.offset, end.node, end.offset);
-            },
-
-            extractContents: createRangeContentRemover(extractSubtree, boundaryUpdater),
-
-            deleteContents: createRangeContentRemover(deleteSubtree, boundaryUpdater),
-
-            canSurroundContents: function() {
-                assertRangeValid(this);
-                assertNodeNotReadOnly(this.startContainer);
-                assertNodeNotReadOnly(this.endContainer);
-
-                // Check if the contents can be surrounded. Specifically, this means whether the range partially selects
-                // no non-text nodes.
-                var iterator = new RangeIterator(this, true);
-                var boundariesInvalid = (iterator._first && (isNonTextPartiallySelected(iterator._first, this)) ||
-                        (iterator._last && isNonTextPartiallySelected(iterator._last, this)));
-                iterator.detach();
-                return !boundariesInvalid;
-            },
-
-            detach: function() {
-                detacher(this);
-            },
-
-            splitBoundaries: function() {
-                splitRangeBoundaries(this);
-            },
-
-            splitBoundariesPreservingPositions: function(positionsToPreserve) {
-                splitRangeBoundaries(this, positionsToPreserve);
-            },
-
-            normalizeBoundaries: function() {
-                assertRangeValid(this);
-
-                var sc = this.startContainer, so = this.startOffset, ec = this.endContainer, eo = this.endOffset;
-
-                var mergeForward = function(node) {
-                    var sibling = node.nextSibling;
-                    if (sibling && sibling.nodeType == node.nodeType) {
-                        ec = node;
-                        eo = node.length;
-                        node.appendData(sibling.data);
-                        sibling.parentNode.removeChild(sibling);
-                    }
-                };
-
-                var mergeBackward = function(node) {
-                    var sibling = node.previousSibling;
-                    if (sibling && sibling.nodeType == node.nodeType) {
-                        sc = node;
-                        var nodeLength = node.length;
-                        so = sibling.length;
-                        node.insertData(0, sibling.data);
-                        sibling.parentNode.removeChild(sibling);
-                        if (sc == ec) {
-                            eo += so;
-                            ec = sc;
-                        } else if (ec == node.parentNode) {
-                            var nodeIndex = getNodeIndex(node);
-                            if (eo == nodeIndex) {
-                                ec = node;
-                                eo = nodeLength;
-                            } else if (eo > nodeIndex) {
-                                eo--;
-                            }
-                        }
-                    }
-                };
-
-                var normalizeStart = true;
-
-                if (isCharacterDataNode(ec)) {
-                    if (ec.length == eo) {
-                        mergeForward(ec);
-                    }
-                } else {
-                    if (eo > 0) {
-                        var endNode = ec.childNodes[eo - 1];
-                        if (endNode && isCharacterDataNode(endNode)) {
-                            mergeForward(endNode);
-                        }
-                    }
-                    normalizeStart = !this.collapsed;
-                }
-
-                if (normalizeStart) {
-                    if (isCharacterDataNode(sc)) {
-                        if (so == 0) {
-                            mergeBackward(sc);
-                        }
-                    } else {
-                        if (so < sc.childNodes.length) {
-                            var startNode = sc.childNodes[so];
-                            if (startNode && isCharacterDataNode(startNode)) {
-                                mergeBackward(startNode);
-                            }
-                        }
-                    }
-                } else {
-                    sc = ec;
-                    so = eo;
-                }
-
-                boundaryUpdater(this, sc, so, ec, eo);
-            },
-
-            collapseToPoint: function(node, offset) {
-                assertNotDetached(this);
-                assertNoDocTypeNotationEntityAncestor(node, true);
-                assertValidOffset(node, offset);
-                this.setStartAndEnd(node, offset);
-            }
-        });
-
-        copyComparisonConstants(constructor);
-    }
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    // Updates commonAncestorContainer and collapsed after boundary change
-    function updateCollapsedAndCommonAncestor(range) {
-        range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset);
-        range.commonAncestorContainer = range.collapsed ?
-            range.startContainer : dom.getCommonAncestor(range.startContainer, range.endContainer);
-    }
-
-    function updateBoundaries(range, startContainer, startOffset, endContainer, endOffset) {
-        range.startContainer = startContainer;
-        range.startOffset = startOffset;
-        range.endContainer = endContainer;
-        range.endOffset = endOffset;
-        range.document = dom.getDocument(startContainer);
-
-        updateCollapsedAndCommonAncestor(range);
-    }
-
-    function detach(range) {
-        assertNotDetached(range);
-        range.startContainer = range.startOffset = range.endContainer = range.endOffset = range.document = null;
-        range.collapsed = range.commonAncestorContainer = null;
-    }
-
-    function Range(doc) {
-        this.startContainer = doc;
-        this.startOffset = 0;
-        this.endContainer = doc;
-        this.endOffset = 0;
-        this.document = doc;
-        updateCollapsedAndCommonAncestor(this);
-    }
-
-    createPrototypeRange(Range, updateBoundaries, detach);
-
-    util.extend(Range, {
-        rangeProperties: rangeProperties,
-        RangeIterator: RangeIterator,
-        copyComparisonConstants: copyComparisonConstants,
-        createPrototypeRange: createPrototypeRange,
-        inspect: inspect,
-        getRangeDocument: getRangeDocument,
-        rangesEqual: function(r1, r2) {
-            return r1.startContainer === r2.startContainer &&
-                r1.startOffset === r2.startOffset &&
-                r1.endContainer === r2.endContainer &&
-                r1.endOffset === r2.endOffset;
-        }
-    });
-
-    api.DomRange = Range;
-    api.RangeException = RangeException;
-});
-rangy.createCoreModule("WrappedRange", ["DomRange"], function(api, module) {
-    var WrappedRange, WrappedTextRange;
-    var dom = api.dom;
-    var util = api.util;
-    var DomPosition = dom.DomPosition;
-    var DomRange = api.DomRange;
-    var getBody = dom.getBody;
-    var getContentDocument = dom.getContentDocument;
-    var isCharacterDataNode = dom.isCharacterDataNode;
-
-
-    /*----------------------------------------------------------------------------------------------------------------*/
-
-    if (api.features.implementsDomRange) {
-        // This is a wrapper around the browser's native DOM Range. It has two aims:
-        // - Provide workarounds for specific browser bugs
-        // - provide convenient extensions, which are inherited from Rangy's DomRange
-
-        (function() {
-            var rangeProto;
-            var rangeProperties = DomRange.rangeProperties;
-
-            function updateRangeProperties(range) {
-                var i = rangeProperties.length, prop;
-                while (i--) {
-                    prop = rangeProperties[i];
-                    range[prop] = range.nativeRange[prop];
-                }
-                // Fix for broken collapsed property in IE 9.
-                range.collapsed = (range.startContainer === range.endContainer && range.startOffset === range.endOffset);
-            }
-
-            function updateNativeRange(range, startContainer, startOffset, endContainer, endOffset) {
-                var startMoved = (range.startContainer !== startContainer || range.startOffset != startOffset);
-                var endMoved = (range.endContainer !== endContainer || range.endOffset != endOffset);
-                var nativeRangeDifferent = !range.equals(range.nativeRange);
-
-                // Always set both boundaries for the benefit of IE9 (see issue 35)
-                if (startMoved || endMoved || nativeRangeDifferent) {
-                    range.setEnd(endContainer, endOffset);
-                    range.setStart(startContainer, startOffset);
-                }
-            }
-
-            function detach(range) {
-                range.nativeRange.detach();
-                range.detached = true;
-                var i = rangeProperties.length;
-                while (i--) {
-                    range[ rangeProperties[i] ] = null;
-                }
-            }
-
-            var createBeforeAfterNodeSetter;
-
-            WrappedRange = function(range) {
-                if (!range) {
-                    throw module.createError("WrappedRange: Range must be specified");
-                }
-                this.nativeRange = range;
-                updateRangeProperties(this);
-            };
-
-            DomRange.createPrototypeRange(WrappedRange, updateNativeRange, detach);
-
-            rangeProto = WrappedRange.prototype;
-
-            rangeProto.selectNode = function(node) {
-                this.nativeRange.selectNode(node);
-                updateRangeProperties(this);
-            };
-
-            rangeProto.cloneContents = function() {
-                return this.nativeRange.cloneContents();
-            };
-
-            // Due to a long-standing Firefox bug that I have not been able to find a reliable way to detect,
-            // insertNode() is never delegated to the native range.
-
-            rangeProto.surroundContents = function(node) {
-                this.nativeRange.surroundContents(node);
-                updateRangeProperties(this);
-            };
-
-            rangeProto.collapse = function(isStart) {
-                this.nativeRange.collapse(isStart);
-                updateRangeProperties(this);
-            };
-
-            rangeProto.cloneRange = function() {
-                return new WrappedRange(this.nativeRange.cloneRange());
-            };
-
-            rangeProto.refresh = function() {
-                updateRangeProperties(this);
-            };
-
-            rangeProto.toString = function() {
-                return this.nativeRange.toString();
-            };
-
-            // Create test range and node for feature detection
-
-            var testTextNode = document.createTextNode("test");
-            getBody(document).appendChild(testTextNode);
-            var range = document.createRange();
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Test for Firefox 2 bug that prevents moving the start of a Range to a point after its current end and
-            // correct for it
-
-            range.setStart(testTextNode, 0);
-            range.setEnd(testTextNode, 0);
-
-            try {
-                range.setStart(testTextNode, 1);
-
-                rangeProto.setStart = function(node, offset) {
-                    this.nativeRange.setStart(node, offset);
-                    updateRangeProperties(this);
-                };
-
-                rangeProto.setEnd = function(node, offset) {
-                    this.nativeRange.setEnd(node, offset);
-                    updateRangeProperties(this);
-                };
-
-                createBeforeAfterNodeSetter = function(name) {
-                    return function(node) {
-                        this.nativeRange[name](node);
-                        updateRangeProperties(this);
-                    };
-                };
-
-            } catch(ex) {
-
-                rangeProto.setStart = function(node, offset) {
-                    try {
-                        this.nativeRange.setStart(node, offset);
-                    } catch (ex) {
-                        this.nativeRange.setEnd(node, offset);
-                        this.nativeRange.setStart(node, offset);
-                    }
-                    updateRangeProperties(this);
-                };
-
-                rangeProto.setEnd = function(node, offset) {
-                    try {
-                        this.nativeRange.setEnd(node, offset);
-                    } catch (ex) {
-                        this.nativeRange.setStart(node, offset);
-                        this.nativeRange.setEnd(node, offset);
-                    }
-                    updateRangeProperties(this);
-                };
-
-                createBeforeAfterNodeSetter = function(name, oppositeName) {
-                    return function(node) {
-                        try {
-                            this.nativeRange[name](node);
-                        } catch (ex) {
-                            this.nativeRange[oppositeName](node);
-                            this.nativeRange[name](node);
-                        }
-                        updateRangeProperties(this);
-                    };
-                };
-            }
-
-            rangeProto.setStartBefore = createBeforeAfterNodeSetter("setStartBefore", "setEndBefore");
-            rangeProto.setStartAfter = createBeforeAfterNodeSetter("setStartAfter", "setEndAfter");
-            rangeProto.setEndBefore = createBeforeAfterNodeSetter("setEndBefore", "setStartBefore");
-            rangeProto.setEndAfter = createBeforeAfterNodeSetter("setEndAfter", "setStartAfter");
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Always use DOM4-compliant selectNodeContents implementation: it's simpler and less code than testing
-            // whether the native implementation can be trusted
-            rangeProto.selectNodeContents = function(node) {
-                this.setStartAndEnd(node, 0, dom.getNodeLength(node));
-            };
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Test for and correct WebKit bug that has the behaviour of compareBoundaryPoints round the wrong way for
-            // constants START_TO_END and END_TO_START: https://bugs.webkit.org/show_bug.cgi?id=20738
-
-            range.selectNodeContents(testTextNode);
-            range.setEnd(testTextNode, 3);
-
-            var range2 = document.createRange();
-            range2.selectNodeContents(testTextNode);
-            range2.setEnd(testTextNode, 4);
-            range2.setStart(testTextNode, 2);
-
-            if (range.compareBoundaryPoints(range.START_TO_END, range2) == -1 &&
-                    range.compareBoundaryPoints(range.END_TO_START, range2) == 1) {
-                // This is the wrong way round, so correct for it
-
-                rangeProto.compareBoundaryPoints = function(type, range) {
-                    range = range.nativeRange || range;
-                    if (type == range.START_TO_END) {
-                        type = range.END_TO_START;
-                    } else if (type == range.END_TO_START) {
-                        type = range.START_TO_END;
-                    }
-                    return this.nativeRange.compareBoundaryPoints(type, range);
-                };
-            } else {
-                rangeProto.compareBoundaryPoints = function(type, range) {
-                    return this.nativeRange.compareBoundaryPoints(type, range.nativeRange || range);
-                };
-            }
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Test for IE 9 deleteContents() and extractContents() bug and correct it. See issue 107.
-
-            var el = document.createElement("div");
-            el.innerHTML = "123";
-            var textNode = el.firstChild;
-            var body = getBody(document);
-            body.appendChild(el);
-
-            range.setStart(textNode, 1);
-            range.setEnd(textNode, 2);
-            range.deleteContents();
-
-            if (textNode.data == "13") {
-                // Behaviour is correct per DOM4 Range so wrap the browser's implementation of deleteContents() and
-                // extractContents()
-                rangeProto.deleteContents = function() {
-                    this.nativeRange.deleteContents();
-                    updateRangeProperties(this);
-                };
-
-                rangeProto.extractContents = function() {
-                    var frag = this.nativeRange.extractContents();
-                    updateRangeProperties(this);
-                    return frag;
-                };
-            } else {
-            }
-
-            body.removeChild(el);
-            body = null;
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Test for existence of createContextualFragment and delegate to it if it exists
-            if (util.isHostMethod(range, "createContextualFragment")) {
-                rangeProto.createContextualFragment = function(fragmentStr) {
-                    return this.nativeRange.createContextualFragment(fragmentStr);
-                };
-            }
-
-            /*--------------------------------------------------------------------------------------------------------*/
-
-            // Clean up
-            getBody(document).removeChild(testTextNode);
-            range.detach();
-            range2.detach();
-
-            rangeProto.getName = function() {
-                return "WrappedRange";
-            };
-
-            api.WrappedRange = WrappedRange;
-
-            api.createNativeRange = function(doc) {
-                doc = getContentDocument(doc, module, "createNativeRange");
-                return doc.createRange();
-            };
-        })();
-    }
-    
-    if (api.features.implementsTextRange) {
-        /*
-        This is a workaround for a bug where IE returns the wrong container element from the TextRange's parentElement()
-        method. For example, in the following (where pipes denote the selection boundaries):
-
-        
    • | a 
    •  b |
    
-
-        var range = document.selection.createRange();
-        alert(range.parentElement().id); // Should alert "ul" but alerts "b"
-
-        This method returns the common ancestor node of the following:
-        - the parentElement() of the textRange
-        - the parentElement() of the textRange after calling collapse(true)
-        - the parentElement() of the textRange after calling collapse(false)
-        */
-        var getTextRangeContainerElement = function(textRange) {
-            var parentEl = textRange.parentElement();
-            var range = textRange.duplicate();
-            range.collapse(true);
-            var startEl = range.parentElement();
-            range = textRange.duplicate();
-            range.collapse(false);
-            var endEl = range.parentElement();
-            var startEndContainer = (startEl == endEl) ? startEl : dom.getCommonAncestor(startEl, endEl);
-
-            return startEndContainer == parentEl ? startEndContainer : dom.getCommonAncestor(parentEl, startEndContainer);
-        };
-
-        var textRangeIsCollapsed = function(textRange) {
-            return textRange.compareEndPoints("StartToEnd", textRange) == 0;
-        };
-
-        // Gets the boundary of a TextRange expressed as a node and an offset within that node. This function started out as
-        // an improved version of code found in Tim Cameron Ryan's IERange (http://code.google.com/p/ierange/) but has
-        // grown, fixing problems with line breaks in preformatted text, adding workaround for IE TextRange bugs, handling
-        // for inputs and images, plus optimizations.
-        var getTextRangeBoundaryPosition = function(textRange, wholeRangeContainerElement, isStart, isCollapsed, startInfo) {
-            var workingRange = textRange.duplicate();
-            workingRange.collapse(isStart);
-            var containerElement = workingRange.parentElement();
-
-            // Sometimes collapsing a TextRange that's at the start of a text node can move it into the previous node, so
-            // check for that
-            if (!dom.isOrIsAncestorOf(wholeRangeContainerElement, containerElement)) {
-                containerElement = wholeRangeContainerElement;
-            }
-
-
-            // Deal with nodes that cannot "contain rich HTML markup". In practice, this means form inputs, images and
-            // similar. See http://msdn.microsoft.com/en-us/library/aa703950%28VS.85%29.aspx
-            if (!containerElement.canHaveHTML) {
-                var pos = new DomPosition(containerElement.parentNode, dom.getNodeIndex(containerElement));
-                return {
-                    boundaryPosition: pos,
-                    nodeInfo: {
-                        nodeIndex: pos.offset,
-                        containerElement: pos.node
-                    }
-                };
-            }
-
-            var workingNode = dom.getDocument(containerElement).createElement("span");
-
-            // Workaround for HTML5 Shiv's insane violation of document.createElement(). See Rangy issue 104 and HTML5
-            // Shiv issue 64: https://github.com/aFarkas/html5shiv/issues/64
-            if (workingNode.parentNode) {
-                workingNode.parentNode.removeChild(workingNode);
-            }
-
-            var comparison, workingComparisonType = isStart ? "StartToStart" : "StartToEnd";
-            var previousNode, nextNode, boundaryPosition, boundaryNode;
-            var start = (startInfo && startInfo.containerElement == containerElement) ? startInfo.nodeIndex : 0;
-            var childNodeCount = containerElement.childNodes.length;
-            var end = childNodeCount;
-
-            // Check end first. Code within the loop assumes that the endth child node of the container is definitely
-            // after the range boundary.
-            var nodeIndex = end;
-
-            while (true) {
-                if (nodeIndex == childNodeCount) {
-                    containerElement.appendChild(workingNode);
-                } else {
-                    containerElement.insertBefore(workingNode, containerElement.childNodes[nodeIndex]);
-                }
-                workingRange.moveToElementText(workingNode);
-                comparison = workingRange.compareEndPoints(workingComparisonType, textRange);
-                if (comparison == 0 || start == end) {
-                    break;
-                } else if (comparison == -1) {
-                    if (end == start + 1) {
-                        // We know the endth child node is after the range boundary, so we must be done.
-                        break;
-                    } else {
-                        start = nodeIndex;
-                    }
-                } else {
-                    end = (end == start + 1) ? start : nodeIndex;
-                }
-                nodeIndex = Math.floor((start + end) / 2);
-                containerElement.removeChild(workingNode);
-            }
-
-
-            // We've now reached or gone past the boundary of the text range we're interested in
-            // so have identified the node we want
-            boundaryNode = workingNode.nextSibling;
-
-            if (comparison == -1 && boundaryNode && isCharacterDataNode(boundaryNode)) {
-                // This is a character data node (text, comment, cdata). The working range is collapsed at the start of the
-                // node containing the text range's boundary, so we move the end of the working range to the boundary point
-                // and measure the length of its text to get the boundary's offset within the node.
-                workingRange.setEndPoint(isStart ? "EndToStart" : "EndToEnd", textRange);
-
-                var offset;
-
-                if (/[\r\n]/.test(boundaryNode.data)) {
-                    /*
-                    For the particular case of a boundary within a text node containing rendered line breaks (within a 
    -                    element, for example), we need a slightly complicated approach to get the boundary's offset in IE. The
-                    facts:
-                    
-                    - Each line break is represented as \r in the text node's data/nodeValue properties
-                    - Each line break is represented as \r\n in the TextRange's 'text' property
-                    - The 'text' property of the TextRange does not contain trailing line breaks
-                    
-                    To get round the problem presented by the final fact above, we can use the fact that TextRange's
-                    moveStart() and moveEnd() methods return the actual number of characters moved, which is not necessarily
-                    the same as the number of characters it was instructed to move. The simplest approach is to use this to
-                    store the characters moved when moving both the start and end of the range to the start of the document
-                    body and subtracting the start offset from the end offset (the "move-negative-gazillion" method).
-                    However, this is extremely slow when the document is large and the range is near the end of it. Clearly
-                    doing the mirror image (i.e. moving the range boundaries to the end of the document) has the same
-                    problem.
-                    
-                    Another approach that works is to use moveStart() to move the start boundary of the range up to the end
-                    boundary one character at a time and incrementing a counter with the value returned by the moveStart()
-                    call. However, the check for whether the start boundary has reached the end boundary is expensive, so
-                    this method is slow (although unlike "move-negative-gazillion" is largely unaffected by the location of
-                    the range within the document).
-                    
-                    The method below is a hybrid of the two methods above. It uses the fact that a string containing the
-                    TextRange's 'text' property with each \r\n converted to a single \r character cannot be longer than the
-                    text of the TextRange, so the start of the range is moved that length initially and then a character at
-                    a time to make up for any trailing line breaks not contained in the 'text' property. This has good
-                    performance in most situations compared to the previous two methods.
-                    */
-                    var tempRange = workingRange.duplicate();
-                    var rangeLength = tempRange.text.replace(/\r\n/g, "\r").length;
-
-                    offset = tempRange.moveStart("character", rangeLength);
-                    while ( (comparison = tempRange.compareEndPoints("StartToEnd", tempRange)) == -1) {
-                        offset++;
-                        tempRange.moveStart("character", 1);
-                    }
-                } else {
-                    offset = workingRange.text.length;
-                }
-                boundaryPosition = new DomPosition(boundaryNode, offset);
-            } else {
-
-                // If the boundary immediately follows a character data node and this is the end boundary, we should favour
-                // a position within that, and likewise for a start boundary preceding a character data node
-                previousNode = (isCollapsed || !isStart) && workingNode.previousSibling;
-                nextNode = (isCollapsed || isStart) && workingNode.nextSibling;
-                if (nextNode && isCharacterDataNode(nextNode)) {
-                    boundaryPosition = new DomPosition(nextNode, 0);
-                } else if (previousNode && isCharacterDataNode(previousNode)) {
-                    boundaryPosition = new DomPosition(previousNode, previousNode.data.length);
-                } else {
-                    boundaryPosition = new DomPosition(containerElement, dom.getNodeIndex(workingNode));
-                }
-            }
-
-            // Clean up
-            workingNode.parentNode.removeChild(workingNode);
-
-            return {
-                boundaryPosition: boundaryPosition,
-                nodeInfo: {
-                    nodeIndex: nodeIndex,
-                    containerElement: containerElement
-                }
-            };
-        };
-
-        // Returns a TextRange representing the boundary of a TextRange expressed as a node and an offset within that node.
-        // This function started out as an optimized version of code found in Tim Cameron Ryan's IERange
-        // (http://code.google.com/p/ierange/)
-        var createBoundaryTextRange = function(boundaryPosition, isStart) {
-            var boundaryNode, boundaryParent, boundaryOffset = boundaryPosition.offset;
-            var doc = dom.getDocument(boundaryPosition.node);
-            var workingNode, childNodes, workingRange = getBody(doc).createTextRange();
-            var nodeIsDataNode = isCharacterDataNode(boundaryPosition.node);
-
-            if (nodeIsDataNode) {
-                boundaryNode = boundaryPosition.node;
-                boundaryParent = boundaryNode.parentNode;
-            } else {
-                childNodes = boundaryPosition.node.childNodes;
-                boundaryNode = (boundaryOffset < childNodes.length) ? childNodes[boundaryOffset] : null;
-                boundaryParent = boundaryPosition.node;
-            }
-
-            // Position the range immediately before the node containing the boundary
-            workingNode = doc.createElement("span");
-
-            // Making the working element non-empty element persuades IE to consider the TextRange boundary to be within the
-            // element rather than immediately before or after it
-            workingNode.innerHTML = "&#feff;";
-
-            // insertBefore is supposed to work like appendChild if the second parameter is null. However, a bug report
-            // for IERange suggests that it can crash the browser: http://code.google.com/p/ierange/issues/detail?id=12
-            if (boundaryNode) {
-                boundaryParent.insertBefore(workingNode, boundaryNode);
-            } else {
-                boundaryParent.appendChild(workingNode);
-            }
-
-            workingRange.moveToElementText(workingNode);
-            workingRange.collapse(!isStart);
-
-            // Clean up
-            boundaryParent.removeChild(workingNode);
-
-            // Move the working range to the text offset, if required
-            if (nodeIsDataNode) {
-                workingRange[isStart ? "moveStart" : "moveEnd"]("character", boundaryOffset);
-            }
-
-            return workingRange;
-        };
-
-        /*------------------------------------------------------------------------------------------------------------*/
-
-        // This is a wrapper around a TextRange, providing full DOM Range functionality using rangy's DomRange as a
-        // prototype
-
-        WrappedTextRange = function(textRange) {
-            this.textRange = textRange;
-            this.refresh();
-        };
-
-        WrappedTextRange.prototype = new DomRange(document);
-
-        WrappedTextRange.prototype.refresh = function() {
-            var start, end, startBoundary;
-
-            // TextRange's parentElement() method cannot be trusted. getTextRangeContainerElement() works around that.
-            var rangeContainerElement = getTextRangeContainerElement(this.textRange);
-
-            if (textRangeIsCollapsed(this.textRange)) {
-                end = start = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, true,
-                    true).boundaryPosition;
-            } else {
-                startBoundary = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, true, false);
-                start = startBoundary.boundaryPosition;
-
-                // An optimization used here is that if the start and end boundaries have the same parent element, the
-                // search scope for the end boundary can be limited to exclude the portion of the element that precedes
-                // the start boundary
-                end = getTextRangeBoundaryPosition(this.textRange, rangeContainerElement, false, false,
-                    startBoundary.nodeInfo).boundaryPosition;
-            }
-
-            this.setStart(start.node, start.offset);
-            this.setEnd(end.node, end.offset);
-        };
-
-        WrappedTextRange.prototype.getName = function() {
-            return "WrappedTextRange";
-        };
-
-        DomRange.copyComparisonConstants(WrappedTextRange);
-
-        WrappedTextRange.rangeToTextRange = function(range) {
-            if (range.collapsed) {
-                return createBoundaryTextRange(new DomPosition(range.startContainer, range.startOffset), true);
-            } else {
-                var startRange = createBoundaryTextRange(new DomPosition(range.startContainer, range.startOffset), true);
-                var endRange = createBoundaryTextRange(new DomPosition(range.endContainer, range.endOffset), false);
-                var textRange = getBody( DomRange.getRangeDocument(range) ).createTextRange();
-                textRange.setEndPoint("StartToStart", startRange);
-                textRange.setEndPoint("EndToEnd", endRange);
-                return textRange;
-            }
-        };
-
-        api.WrappedTextRange = WrappedTextRange;
-
-        // IE 9 and above have both implementations and Rangy makes both available. The next few lines sets which
-        // implementation to use by default.
-        if (!api.features.implementsDomRange || api.config.preferTextRange) {
-            // Add WrappedTextRange as the Range property of the global object to allow expression like Range.END_TO_END to work
-            var globalObj = (function() { return this; })();
-            if (typeof globalObj.Range == "undefined") {
-                globalObj.Range = WrappedTextRange;
-            }
-
-            api.createNativeRange = function(doc) {
-                doc = getContentDocument(doc, module, "createNativeRange");
-                return getBody(doc).createTextRange();
-            };
-
-            api.WrappedRange = WrappedTextRange;
-        }
-    }
-
-    api.createRange = function(doc) {
-        doc = getContentDocument(doc, module, "createRange");
-        return new api.WrappedRange(api.createNativeRange(doc));
-    };
-
-    api.createRangyRange = function(doc) {
-        doc = getContentDocument(doc, module, "createRangyRange");
-        return new DomRange(doc);
-    };
-
-    api.createIframeRange = function(iframeEl) {
-        module.deprecationNotice("createIframeRange()", "createRange(iframeEl)");
-        return api.createRange(iframeEl);
-    };
-
-    api.createIframeRangyRange = function(iframeEl) {
-        module.deprecationNotice("createIframeRangyRange()", "createRangyRange(iframeEl)");
-        return api.createRangyRange(iframeEl);
-    };
-
-    api.addCreateMissingNativeApiListener(function(win) {
-        var doc = win.document;
-        if (typeof doc.createRange == "undefined") {
-            doc.createRange = function() {
-                return api.createRange(doc);
-            };
-        }
-        doc = win = null;
-    });
-});
-// This module creates a selection object wrapper that conforms as closely as possible to the Selection specification
-// in the HTML Editing spec (http://dvcs.w3.org/hg/editing/raw-file/tip/editing.html#selections)
-rangy.createCoreModule("WrappedSelection", ["DomRange", "WrappedRange"], function(api, module) {
-    api.config.checkSelectionRanges = true;
-
-    var BOOLEAN = "boolean";
-    var NUMBER = "number";
-    var dom = api.dom;
-    var util = api.util;
-    var isHostMethod = util.isHostMethod;
-    var DomRange = api.DomRange;
-    var WrappedRange = api.WrappedRange;
-    var DOMException = api.DOMException;
-    var DomPosition = dom.DomPosition;
-    var getNativeSelection;
-    var selectionIsCollapsed;
-    var features = api.features;
-    var CONTROL = "Control";
-    var getDocument = dom.getDocument;
-    var getBody = dom.getBody;
-    var rangesEqual = DomRange.rangesEqual;
-
-
-    // Utility function to support direction parameters in the API that may be a string ("backward" or "forward") or a
-    // Boolean (true for backwards).
-    function isDirectionBackward(dir) {
-        return (typeof dir == "string") ? /^backward(s)?$/i.test(dir) : !!dir;
-    }
-
-    function getWindow(win, methodName) {
-        if (!win) {
-            return window;
-        } else if (dom.isWindow(win)) {
-            return win;
-        } else if (win instanceof WrappedSelection) {
-            return win.win;
-        } else {
-            var doc = dom.getContentDocument(win, module, methodName);
-            return dom.getWindow(doc);
-        }
-    }
-
-    function getWinSelection(winParam) {
-        return getWindow(winParam, "getWinSelection").getSelection();
-    }
-
-    function getDocSelection(winParam) {
-        return getWindow(winParam, "getDocSelection").document.selection;
-    }
-    
-    function winSelectionIsBackward(sel) {
-        var backward = false;
-        if (sel.anchorNode) {
-            backward = (dom.comparePoints(sel.anchorNode, sel.anchorOffset, sel.focusNode, sel.focusOffset) == 1);
-        }
-        return backward;
-    }
-
-    // Test for the Range/TextRange and Selection features required
-    // Test for ability to retrieve selection
-    var implementsWinGetSelection = isHostMethod(window, "getSelection"),
-        implementsDocSelection = util.isHostObject(document, "selection");
-
-    features.implementsWinGetSelection = implementsWinGetSelection;
-    features.implementsDocSelection = implementsDocSelection;
-
-    var useDocumentSelection = implementsDocSelection && (!implementsWinGetSelection || api.config.preferTextRange);
-
-    if (useDocumentSelection) {
-        getNativeSelection = getDocSelection;
-        api.isSelectionValid = function(winParam) {
-            var doc = getWindow(winParam, "isSelectionValid").document, nativeSel = doc.selection;
-
-            // Check whether the selection TextRange is actually contained within the correct document
-            return (nativeSel.type != "None" || getDocument(nativeSel.createRange().parentElement()) == doc);
-        };
-    } else if (implementsWinGetSelection) {
-        getNativeSelection = getWinSelection;
-        api.isSelectionValid = function() {
-            return true;
-        };
-    } else {
-        module.fail("Neither document.selection or window.getSelection() detected.");
-    }
-
-    api.getNativeSelection = getNativeSelection;
-
-    var testSelection = getNativeSelection();
-    var testRange = api.createNativeRange(document);
-    var body = getBody(document);
-
-    // Obtaining a range from a selection
-    var selectionHasAnchorAndFocus = util.areHostProperties(testSelection,
-        ["anchorNode", "focusNode", "anchorOffset", "focusOffset"]);
-
-    features.selectionHasAnchorAndFocus = selectionHasAnchorAndFocus;
-
-    // Test for existence of native selection extend() method
-    var selectionHasExtend = isHostMethod(testSelection, "extend");
-    features.selectionHasExtend = selectionHasExtend;
-    
-    // Test if rangeCount exists
-    var selectionHasRangeCount = (typeof testSelection.rangeCount == NUMBER);
-    features.selectionHasRangeCount = selectionHasRangeCount;
-
-    var selectionSupportsMultipleRanges = false;
-    var collapsedNonEditableSelectionsSupported = true;
-
-    var addRangeBackwardToNative = selectionHasExtend ?
-        function(nativeSelection, range) {
-            var doc = DomRange.getRangeDocument(range);
-            var endRange = api.createRange(doc);
-            endRange.collapseToPoint(range.endContainer, range.endOffset);
-            nativeSelection.addRange(getNativeRange(endRange));
-            nativeSelection.extend(range.startContainer, range.startOffset);
-        } : null;
-
-    if (util.areHostMethods(testSelection, ["addRange", "getRangeAt", "removeAllRanges"]) &&
-            typeof testSelection.rangeCount == NUMBER && features.implementsDomRange) {
-
-        (function() {
-            // Previously an iframe was used but this caused problems in some circumstances in IE, so tests are
-            // performed on the current document's selection. See issue 109.
-
-            // Note also that if a selection previously existed, it is wiped by these tests. This should usually be fine
-            // because initialization usually happens when the document loads, but could be a problem for a script that
-            // loads and initializes Rangy later. If anyone complains, code could be added to save and restore the
-            // selection.
-            var sel = window.getSelection();
-            if (sel) {
-                // Store the current selection
-                var originalSelectionRangeCount = sel.rangeCount;
-                var selectionHasMultipleRanges = (originalSelectionRangeCount > 1);
-                var originalSelectionRanges = [];
-                var originalSelectionBackward = winSelectionIsBackward(sel); 
-                for (var i = 0; i < originalSelectionRangeCount; ++i) {
-                    originalSelectionRanges[i] = sel.getRangeAt(i);
-                }
-                
-                // Create some test elements
-                var body = getBody(document);
-                var testEl = body.appendChild( document.createElement("div") );
-                testEl.contentEditable = "false";
-                var textNode = testEl.appendChild( document.createTextNode("\u00a0\u00a0\u00a0") );
-
-                // Test whether the native selection will allow a collapsed selection within a non-editable element
-                var r1 = document.createRange();
-
-                r1.setStart(textNode, 1);
-                r1.collapse(true);
-                sel.addRange(r1);
-                collapsedNonEditableSelectionsSupported = (sel.rangeCount == 1);
-                sel.removeAllRanges();
-
-                // Test whether the native selection is capable of supporting multiple ranges
-                if (!selectionHasMultipleRanges) {
-                    var r2 = r1.cloneRange();
-                    r1.setStart(textNode, 0);
-                    r2.setEnd(textNode, 3);
-                    r2.setStart(textNode, 2);
-                    sel.addRange(r1);
-                    sel.addRange(r2);
-
-                    selectionSupportsMultipleRanges = (sel.rangeCount == 2);
-                    r2.detach();
-                }
-
-                // Clean up
-                body.removeChild(testEl);
-                sel.removeAllRanges();
-                r1.detach();
-
-                for (i = 0; i < originalSelectionRangeCount; ++i) {
-                    if (i == 0 && originalSelectionBackward) {
-                        if (addRangeBackwardToNative) {
-                            addRangeBackwardToNative(sel, originalSelectionRanges[i]);
-                        } else {
-                            api.warn("Rangy initialization: original selection was backwards but selection has been restored forwards because browser does not support Selection.extend");
-                            sel.addRange(originalSelectionRanges[i])
-                        }
-                    } else {
-                        sel.addRange(originalSelectionRanges[i])
-                    }
-                }
-            }
-        })();
-    }
-
-    features.selectionSupportsMultipleRanges = selectionSupportsMultipleRanges;
-    features.collapsedNonEditableSelectionsSupported = collapsedNonEditableSelectionsSupported;
-
-    // ControlRanges
-    var implementsControlRange = false, testControlRange;
-
-    if (body && isHostMethod(body, "createControlRange")) {
-        testControlRange = body.createControlRange();
-        if (util.areHostProperties(testControlRange, ["item", "add"])) {
-            implementsControlRange = true;
-        }
-    }
-    features.implementsControlRange = implementsControlRange;
-
-    // Selection collapsedness
-    if (selectionHasAnchorAndFocus) {
-        selectionIsCollapsed = function(sel) {
-            return sel.anchorNode === sel.focusNode && sel.anchorOffset === sel.focusOffset;
-        };
-    } else {
-        selectionIsCollapsed = function(sel) {
-            return sel.rangeCount ? sel.getRangeAt(sel.rangeCount - 1).collapsed : false;
-        };
-    }
-
-    function updateAnchorAndFocusFromRange(sel, range, backward) {
-        var anchorPrefix = backward ? "end" : "start", focusPrefix = backward ? "start" : "end";
-        sel.anchorNode = range[anchorPrefix + "Container"];
-        sel.anchorOffset = range[anchorPrefix + "Offset"];
-        sel.focusNode = range[focusPrefix + "Container"];
-        sel.focusOffset = range[focusPrefix + "Offset"];
-    }
-
-    function updateAnchorAndFocusFromNativeSelection(sel) {
-        var nativeSel = sel.nativeSelection;
-        sel.anchorNode = nativeSel.anchorNode;
-        sel.anchorOffset = nativeSel.anchorOffset;
-        sel.focusNode = nativeSel.focusNode;
-        sel.focusOffset = nativeSel.focusOffset;
-    }
-
-    function updateEmptySelection(sel) {
-        sel.anchorNode = sel.focusNode = null;
-        sel.anchorOffset = sel.focusOffset = 0;
-        sel.rangeCount = 0;
-        sel.isCollapsed = true;
-        sel._ranges.length = 0;
-    }
-
-    function getNativeRange(range) {
-        var nativeRange;
-        if (range instanceof DomRange) {
-            nativeRange = api.createNativeRange(range.getDocument());
-            nativeRange.setEnd(range.endContainer, range.endOffset);
-            nativeRange.setStart(range.startContainer, range.startOffset);
-        } else if (range instanceof WrappedRange) {
-            nativeRange = range.nativeRange;
-        } else if (features.implementsDomRange && (range instanceof dom.getWindow(range.startContainer).Range)) {
-            nativeRange = range;
-        }
-        return nativeRange;
-    }
-
-    function rangeContainsSingleElement(rangeNodes) {
-        if (!rangeNodes.length || rangeNodes[0].nodeType != 1) {
-            return false;
-        }
-        for (var i = 1, len = rangeNodes.length; i < len; ++i) {
-            if (!dom.isAncestorOf(rangeNodes[0], rangeNodes[i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    function getSingleElementFromRange(range) {
-        var nodes = range.getNodes();
-        if (!rangeContainsSingleElement(nodes)) {
-            throw module.createError("getSingleElementFromRange: range " + range.inspect() + " did not consist of a single element");
-        }
-        return nodes[0];
-    }
-
-    // Simple, quick test which only needs to distinguish between a TextRange and a ControlRange
-    function isTextRange(range) {
-        return !!range && typeof range.text != "undefined";
-    }
-
-    function updateFromTextRange(sel, range) {
-        // Create a Range from the selected TextRange
-        var wrappedRange = new WrappedRange(range);
-        sel._ranges = [wrappedRange];
-
-        updateAnchorAndFocusFromRange(sel, wrappedRange, false);
-        sel.rangeCount = 1;
-        sel.isCollapsed = wrappedRange.collapsed;
-    }
-
-    function updateControlSelection(sel) {
-        // Update the wrapped selection based on what's now in the native selection
-        sel._ranges.length = 0;
-        if (sel.docSelection.type == "None") {
-            updateEmptySelection(sel);
-        } else {
-            var controlRange = sel.docSelection.createRange();
-            if (isTextRange(controlRange)) {
-                // This case (where the selection type is "Control" and calling createRange() on the selection returns
-                // a TextRange) can happen in IE 9. It happens, for example, when all elements in the selected
-                // ControlRange have been removed from the ControlRange and removed from the document.
-                updateFromTextRange(sel, controlRange);
-            } else {
-                sel.rangeCount = controlRange.length;
-                var range, doc = getDocument(controlRange.item(0));
-                for (var i = 0; i < sel.rangeCount; ++i) {
-                    range = api.createRange(doc);
-                    range.selectNode(controlRange.item(i));
-                    sel._ranges.push(range);
-                }
-                sel.isCollapsed = sel.rangeCount == 1 && sel._ranges[0].collapsed;
-                updateAnchorAndFocusFromRange(sel, sel._ranges[sel.rangeCount - 1], false);
-            }
-        }
-    }
-
-    function addRangeToControlSelection(sel, range) {
-        var controlRange = sel.docSelection.createRange();
-        var rangeElement = getSingleElementFromRange(range);
-
-        // Create a new ControlRange containing all the elements in the selected ControlRange plus the element
-        // contained by the supplied range
-        var doc = getDocument(controlRange.item(0));
-        var newControlRange = getBody(doc).createControlRange();
-        for (var i = 0, len = controlRange.length; i < len; ++i) {
-            newControlRange.add(controlRange.item(i));
-        }
-        try {
-            newControlRange.add(rangeElement);
-        } catch (ex) {
-            throw module.createError("addRange(): Element within the specified Range could not be added to control selection (does it have layout?)");
-        }
-        newControlRange.select();
-
-        // Update the wrapped selection based on what's now in the native selection
-        updateControlSelection(sel);
-    }
-
-    var getSelectionRangeAt;
-
-    if (isHostMethod(testSelection, "getRangeAt")) {
-        // try/catch is present because getRangeAt() must have thrown an error in some browser and some situation.
-        // Unfortunately, I didn't write a comment about the specifics and am now scared to take it out. Let that be a
-        // lesson to us all, especially me.
-        getSelectionRangeAt = function(sel, index) {
-            try {
-                return sel.getRangeAt(index);
-            } catch (ex) {
-                return null;
-            }
-        };
-    } else if (selectionHasAnchorAndFocus) {
-        getSelectionRangeAt = function(sel) {
-            var doc = getDocument(sel.anchorNode);
-            var range = api.createRange(doc);
-            range.setStartAndEnd(sel.anchorNode, sel.anchorOffset, sel.focusNode, sel.focusOffset);
-
-            // Handle the case when the selection was selected backwards (from the end to the start in the
-            // document)
-            if (range.collapsed !== this.isCollapsed) {
-                range.setStartAndEnd(sel.focusNode, sel.focusOffset, sel.anchorNode, sel.anchorOffset);
-            }
-
-            return range;
-        };
-    }
-
-    function WrappedSelection(selection, docSelection, win) {
-        this.nativeSelection = selection;
-        this.docSelection = docSelection;
-        this._ranges = [];
-        this.win = win;
-        this.refresh();
-    }
-
-    WrappedSelection.prototype = api.selectionPrototype;
-
-    function deleteProperties(sel) {
-        sel.win = sel.anchorNode = sel.focusNode = sel._ranges = null;
-        sel.rangeCount = sel.anchorOffset = sel.focusOffset = 0;
-        sel.detached = true;
-    }
-
-    var cachedRangySelections = [];
-
-    function actOnCachedSelection(win, action) {
-        var i = cachedRangySelections.length, cached, sel;
-        while (i--) {
-            cached = cachedRangySelections[i];
-            sel = cached.selection;
-            if (action == "deleteAll") {
-                deleteProperties(sel);
-            } else if (cached.win == win) {
-                if (action == "delete") {
-                    cachedRangySelections.splice(i, 1);
-                    return true;
-                } else {
-                    return sel;
-                }
-            }
-        }
-        if (action == "deleteAll") {
-            cachedRangySelections.length = 0;
-        }
-        return null;
-    }
-
-    var getSelection = function(win) {
-        // Check if the parameter is a Rangy Selection object
-        if (win && win instanceof WrappedSelection) {
-            win.refresh();
-            return win;
-        }
-
-        win = getWindow(win, "getNativeSelection");
-
-        var sel = actOnCachedSelection(win);
-        var nativeSel = getNativeSelection(win), docSel = implementsDocSelection ? getDocSelection(win) : null;
-        if (sel) {
-            sel.nativeSelection = nativeSel;
-            sel.docSelection = docSel;
-            sel.refresh();
-        } else {
-            sel = new WrappedSelection(nativeSel, docSel, win);
-            cachedRangySelections.push( { win: win, selection: sel } );
-        }
-        return sel;
-    };
-
-    api.getSelection = getSelection;
-
-    api.getIframeSelection = function(iframeEl) {
-        module.deprecationNotice("getIframeSelection()", "getSelection(iframeEl)");
-        return api.getSelection(dom.getIframeWindow(iframeEl));
-    };
-
-    var selProto = WrappedSelection.prototype;
-
-    function createControlSelection(sel, ranges) {
-        // Ensure that the selection becomes of type "Control"
-        var doc = getDocument(ranges[0].startContainer);
-        var controlRange = getBody(doc).createControlRange();
-        for (var i = 0, el, len = ranges.length; i < len; ++i) {
-            el = getSingleElementFromRange(ranges[i]);
-            try {
-                controlRange.add(el);
-            } catch (ex) {
-                throw module.createError("setRanges(): Element within one of the specified Ranges could not be added to control selection (does it have layout?)");
-            }
-        }
-        controlRange.select();
-
-        // Update the wrapped selection based on what's now in the native selection
-        updateControlSelection(sel);
-    }
-
-    // Selecting a range
-    if (!useDocumentSelection && selectionHasAnchorAndFocus && util.areHostMethods(testSelection, ["removeAllRanges", "addRange"])) {
-        selProto.removeAllRanges = function() {
-            this.nativeSelection.removeAllRanges();
-            updateEmptySelection(this);
-        };
-
-        var addRangeBackward = function(sel, range) {
-            addRangeBackwardToNative(sel.nativeSelection, range);
-            sel.refresh();
-        };
-
-        if (selectionHasRangeCount) {
-            selProto.addRange = function(range, direction) {
-                if (implementsControlRange && implementsDocSelection && this.docSelection.type == CONTROL) {
-                    addRangeToControlSelection(this, range);
-                } else {
-                    if (isDirectionBackward(direction) && selectionHasExtend) {
-                        addRangeBackward(this, range);
-                    } else {
-                        var previousRangeCount;
-                        if (selectionSupportsMultipleRanges) {
-                            previousRangeCount = this.rangeCount;
-                        } else {
-                            this.removeAllRanges();
-                            previousRangeCount = 0;
-                        }
-                        // Clone the native range so that changing the selected range does not affect the selection.
-                        // This is contrary to the spec but is the only way to achieve consistency between browsers. See
-                        // issue 80.
-                        this.nativeSelection.addRange(getNativeRange(range).cloneRange());
-
-                        // Check whether adding the range was successful
-                        this.rangeCount = this.nativeSelection.rangeCount;
-
-                        if (this.rangeCount == previousRangeCount + 1) {
-                            // The range was added successfully
-
-                            // Check whether the range that we added to the selection is reflected in the last range extracted from
-                            // the selection
-                            if (api.config.checkSelectionRanges) {
-                                var nativeRange = getSelectionRangeAt(this.nativeSelection, this.rangeCount - 1);
-                                if (nativeRange && !rangesEqual(nativeRange, range)) {
-                                    // Happens in WebKit with, for example, a selection placed at the start of a text node
-                                    range = new WrappedRange(nativeRange);
-                                }
-                            }
-                            this._ranges[this.rangeCount - 1] = range;
-                            updateAnchorAndFocusFromRange(this, range, selectionIsBackward(this.nativeSelection));
-                            this.isCollapsed = selectionIsCollapsed(this);
-                        } else {
-                            // The range was not added successfully. The simplest thing is to refresh
-                            this.refresh();
-                        }
-                    }
-                }
-            };
-        } else {
-            selProto.addRange = function(range, direction) {
-                if (isDirectionBackward(direction) && selectionHasExtend) {
-                    addRangeBackward(this, range);
-                } else {
-                    this.nativeSelection.addRange(getNativeRange(range));
-                    this.refresh();
-                }
-            };
-        }
-
-        selProto.setRanges = function(ranges) {
-            if (implementsControlRange && ranges.length > 1) {
-                createControlSelection(this, ranges);
-            } else {
-                this.removeAllRanges();
-                for (var i = 0, len = ranges.length; i < len; ++i) {
-                    this.addRange(ranges[i]);
-                }
-            }
-        };
-    } else if (isHostMethod(testSelection, "empty") && isHostMethod(testRange, "select") &&
-               implementsControlRange && useDocumentSelection) {
-
-        selProto.removeAllRanges = function() {
-            // Added try/catch as fix for issue #21
-            try {
-                this.docSelection.empty();
-
-                // Check for empty() not working (issue #24)
-                if (this.docSelection.type != "None") {
-                    // Work around failure to empty a control selection by instead selecting a TextRange and then
-                    // calling empty()
-                    var doc;
-                    if (this.anchorNode) {
-                        doc = getDocument(this.anchorNode);
-                    } else if (this.docSelection.type == CONTROL) {
-                        var controlRange = this.docSelection.createRange();
-                        if (controlRange.length) {
-                            doc = getDocument( controlRange.item(0) );
-                        }
-                    }
-                    if (doc) {
-                        var textRange = getBody(doc).createTextRange();
-                        textRange.select();
-                        this.docSelection.empty();
-                    }
-                }
-            } catch(ex) {}
-            updateEmptySelection(this);
-        };
-
-        selProto.addRange = function(range) {
-            if (this.docSelection.type == CONTROL) {
-                addRangeToControlSelection(this, range);
-            } else {
-                api.WrappedTextRange.rangeToTextRange(range).select();
-                this._ranges[0] = range;
-                this.rangeCount = 1;
-                this.isCollapsed = this._ranges[0].collapsed;
-                updateAnchorAndFocusFromRange(this, range, false);
-            }
-        };
-
-        selProto.setRanges = function(ranges) {
-            this.removeAllRanges();
-            var rangeCount = ranges.length;
-            if (rangeCount > 1) {
-                createControlSelection(this, ranges);
-            } else if (rangeCount) {
-                this.addRange(ranges[0]);
-            }
-        };
-    } else {
-        module.fail("No means of selecting a Range or TextRange was found");
-        return false;
-    }
-
-    selProto.getRangeAt = function(index) {
-        if (index < 0 || index >= this.rangeCount) {
-            throw new DOMException("INDEX_SIZE_ERR");
-        } else {
-            // Clone the range to preserve selection-range independence. See issue 80.
-            return this._ranges[index].cloneRange();
-        }
-    };
-
-    var refreshSelection;
-
-    if (useDocumentSelection) {
-        refreshSelection = function(sel) {
-            var range;
-            if (api.isSelectionValid(sel.win)) {
-                range = sel.docSelection.createRange();
-            } else {
-                range = getBody(sel.win.document).createTextRange();
-                range.collapse(true);
-            }
-
-            if (sel.docSelection.type == CONTROL) {
-                updateControlSelection(sel);
-            } else if (isTextRange(range)) {
-                updateFromTextRange(sel, range);
-            } else {
-                updateEmptySelection(sel);
-            }
-        };
-    } else if (isHostMethod(testSelection, "getRangeAt") && typeof testSelection.rangeCount == NUMBER) {
-        refreshSelection = function(sel) {
-            if (implementsControlRange && implementsDocSelection && sel.docSelection.type == CONTROL) {
-                updateControlSelection(sel);
-            } else {
-                sel._ranges.length = sel.rangeCount = sel.nativeSelection.rangeCount;
-                if (sel.rangeCount) {
-                    for (var i = 0, len = sel.rangeCount; i < len; ++i) {
-                        sel._ranges[i] = new api.WrappedRange(sel.nativeSelection.getRangeAt(i));
-                    }
-                    updateAnchorAndFocusFromRange(sel, sel._ranges[sel.rangeCount - 1], selectionIsBackward(sel.nativeSelection));
-                    sel.isCollapsed = selectionIsCollapsed(sel);
-                } else {
-                    updateEmptySelection(sel);
-                }
-            }
-        };
-    } else if (selectionHasAnchorAndFocus && typeof testSelection.isCollapsed == BOOLEAN && typeof testRange.collapsed == BOOLEAN && features.implementsDomRange) {
-        refreshSelection = function(sel) {
-            var range, nativeSel = sel.nativeSelection;
-            if (nativeSel.anchorNode) {
-                range = getSelectionRangeAt(nativeSel, 0);
-                sel._ranges = [range];
-                sel.rangeCount = 1;
-                updateAnchorAndFocusFromNativeSelection(sel);
-                sel.isCollapsed = selectionIsCollapsed(sel);
-            } else {
-                updateEmptySelection(sel);
-            }
-        };
-    } else {
-        module.fail("No means of obtaining a Range or TextRange from the user's selection was found");
-        return false;
-    }
-
-    selProto.refresh = function(checkForChanges) {
-        var oldRanges = checkForChanges ? this._ranges.slice(0) : null;
-        var oldAnchorNode = this.anchorNode, oldAnchorOffset = this.anchorOffset;
-
-        refreshSelection(this);
-        if (checkForChanges) {
-            // Check the range count first
-            var i = oldRanges.length;
-            if (i != this._ranges.length) {
-                return true;
-            }
-
-            // Now check the direction. Checking the anchor position is the same is enough since we're checking all the
-            // ranges after this
-            if (this.anchorNode != oldAnchorNode || this.anchorOffset != oldAnchorOffset) {
-                return true;
-            }
-
-            // Finally, compare each range in turn
-            while (i--) {
-                if (!rangesEqual(oldRanges[i], this._ranges[i])) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    };
-
-    // Removal of a single range
-    var removeRangeManually = function(sel, range) {
-        var ranges = sel.getAllRanges();
-        sel.removeAllRanges();
-        for (var i = 0, len = ranges.length; i < len; ++i) {
-            if (!rangesEqual(range, ranges[i])) {
-                sel.addRange(ranges[i]);
-            }
-        }
-        if (!sel.rangeCount) {
-            updateEmptySelection(sel);
-        }
-    };
-
-    if (implementsControlRange) {
-        selProto.removeRange = function(range) {
-            if (this.docSelection.type == CONTROL) {
-                var controlRange = this.docSelection.createRange();
-                var rangeElement = getSingleElementFromRange(range);
-
-                // Create a new ControlRange containing all the elements in the selected ControlRange minus the
-                // element contained by the supplied range
-                var doc = getDocument(controlRange.item(0));
-                var newControlRange = getBody(doc).createControlRange();
-                var el, removed = false;
-                for (var i = 0, len = controlRange.length; i < len; ++i) {
-                    el = controlRange.item(i);
-                    if (el !== rangeElement || removed) {
-                        newControlRange.add(controlRange.item(i));
-                    } else {
-                        removed = true;
-                    }
-                }
-                newControlRange.select();
-
-                // Update the wrapped selection based on what's now in the native selection
-                updateControlSelection(this);
-            } else {
-                removeRangeManually(this, range);
-            }
-        };
-    } else {
-        selProto.removeRange = function(range) {
-            removeRangeManually(this, range);
-        };
-    }
-
-    // Detecting if a selection is backward
-    var selectionIsBackward;
-    if (!useDocumentSelection && selectionHasAnchorAndFocus && features.implementsDomRange) {
-        selectionIsBackward = winSelectionIsBackward;
-
-        selProto.isBackward = function() {
-            return selectionIsBackward(this);
-        };
-    } else {
-        selectionIsBackward = selProto.isBackward = function() {
-            return false;
-        };
-    }
-
-    // Create an alias for backwards compatibility. From 1.3, everything is "backward" rather than "backwards"
-    selProto.isBackwards = selProto.isBackward;
-
-    // Selection stringifier
-    // This is conformant to the old HTML5 selections draft spec but differs from WebKit and Mozilla's implementation.
-    // The current spec does not yet define this method.
-    selProto.toString = function() {
-        var rangeTexts = [];
-        for (var i = 0, len = this.rangeCount; i < len; ++i) {
-            rangeTexts[i] = "" + this._ranges[i];
-        }
-        return rangeTexts.join("");
-    };
-
-    function assertNodeInSameDocument(sel, node) {
-        if (sel.win.document != getDocument(node)) {
-            throw new DOMException("WRONG_DOCUMENT_ERR");
-        }
-    }
-
-    // No current browser conforms fully to the spec for this method, so Rangy's own method is always used
-    selProto.collapse = function(node, offset) {
-        assertNodeInSameDocument(this, node);
-        var range = api.createRange(node);
-        range.collapseToPoint(node, offset);
-        this.setSingleRange(range);
-        this.isCollapsed = true;
-    };
-
-    selProto.collapseToStart = function() {
-        if (this.rangeCount) {
-            var range = this._ranges[0];
-            this.collapse(range.startContainer, range.startOffset);
-        } else {
-            throw new DOMException("INVALID_STATE_ERR");
-        }
-    };
-
-    selProto.collapseToEnd = function() {
-        if (this.rangeCount) {
-            var range = this._ranges[this.rangeCount - 1];
-            this.collapse(range.endContainer, range.endOffset);
-        } else {
-            throw new DOMException("INVALID_STATE_ERR");
-        }
-    };
-
-    // The spec is very specific on how selectAllChildren should be implemented so the native implementation is
-    // never used by Rangy.
-    selProto.selectAllChildren = function(node) {
-        assertNodeInSameDocument(this, node);
-        var range = api.createRange(node);
-        range.selectNodeContents(node);
-        this.setSingleRange(range);
-    };
-
-    selProto.deleteFromDocument = function() {
-        // Sepcial behaviour required for IE's control selections
-        if (implementsControlRange && implementsDocSelection && this.docSelection.type == CONTROL) {
-            var controlRange = this.docSelection.createRange();
-            var element;
-            while (controlRange.length) {
-                element = controlRange.item(0);
-                controlRange.remove(element);
-                element.parentNode.removeChild(element);
-            }
-            this.refresh();
-        } else if (this.rangeCount) {
-            var ranges = this.getAllRanges();
-            if (ranges.length) {
-                this.removeAllRanges();
-                for (var i = 0, len = ranges.length; i < len; ++i) {
-                    ranges[i].deleteContents();
-                }
-                // The spec says nothing about what the selection should contain after calling deleteContents on each
-                // range. Firefox moves the selection to where the final selected range was, so we emulate that
-                this.addRange(ranges[len - 1]);
-            }
-        }
-    };
-
-    // The following are non-standard extensions
-    selProto.eachRange = function(func, returnValue) {
-        for (var i = 0, len = this._ranges.length; i < len; ++i) {
-            if ( func( this.getRangeAt(i) ) ) {
-                return returnValue;
-            }
-        }
-    };
-
-    selProto.getAllRanges = function() {
-        var ranges = [];
-        this.eachRange(function(range) {
-            ranges.push(range);
-        });
-        return ranges;
-    };
-
-    selProto.setSingleRange = function(range, direction) {
-        this.removeAllRanges();
-        this.addRange(range, direction);
-    };
-
-    selProto.callMethodOnEachRange = function(methodName, params) {
-        var results = [];
-        this.eachRange( function(range) {
-            results.push( range[methodName].apply(range, params) );
-        } );
-        return results;
-    };
-    
-    function createStartOrEndSetter(isStart) {
-        return function(node, offset) {
-            var range;
-            if (this.rangeCount) {
-                range = this.getRangeAt(0);
-                range["set" + (isStart ? "Start" : "End")](node, offset);
-            } else {
-                range = api.createRange(this.win.document);
-                range.setStartAndEnd(node, offset);
-            }
-            this.setSingleRange(range, this.isBackward());
-        };
-    }
-
-    selProto.setStart = createStartOrEndSetter(true);
-    selProto.setEnd = createStartOrEndSetter(false);
-    
-    // Add select() method to Range prototype. Any existing selection will be removed.
-    api.rangePrototype.select = function(direction) {
-        getSelection( this.getDocument() ).setSingleRange(this, direction);
-    };
-
-    selProto.changeEachRange = function(func) {
-        var ranges = [];
-        var backward = this.isBackward();
-
-        this.eachRange(function(range) {
-            func(range);
-            ranges.push(range);
-        });
-
-        this.removeAllRanges();
-        if (backward && ranges.length == 1) {
-            this.addRange(ranges[0], "backward");
-        } else {
-            this.setRanges(ranges);
-        }
-    };
-
-    selProto.containsNode = function(node, allowPartial) {
-        return this.eachRange( function(range) {
-            return range.containsNode(node, allowPartial);
-        }, true );
-    };
-
-    selProto.getBookmark = function(containerNode) {
-        return {
-            backward: this.isBackward(),
-            rangeBookmarks: this.callMethodOnEachRange("getBookmark", [containerNode])
-        };
-    };
-
-    selProto.moveToBookmark = function(bookmark) {
-        var selRanges = [];
-        for (var i = 0, rangeBookmark, range; rangeBookmark = bookmark.rangeBookmarks[i++]; ) {
-            range = api.createRange(this.win);
-            range.moveToBookmark(rangeBookmark);
-            selRanges.push(range);
-        }
-        if (bookmark.backward) {
-            this.setSingleRange(selRanges[0], "backward");
-        } else {
-            this.setRanges(selRanges);
-        }
-    };
-
-    selProto.toHtml = function() {
-        return this.callMethodOnEachRange("toHtml").join("");
-    };
-
-    function inspect(sel) {
-        var rangeInspects = [];
-        var anchor = new DomPosition(sel.anchorNode, sel.anchorOffset);
-        var focus = new DomPosition(sel.focusNode, sel.focusOffset);
-        var name = (typeof sel.getName == "function") ? sel.getName() : "Selection";
-
-        if (typeof sel.rangeCount != "undefined") {
-            for (var i = 0, len = sel.rangeCount; i < len; ++i) {
-                rangeInspects[i] = DomRange.inspect(sel.getRangeAt(i));
-            }
-        }
-        return "[" + name + "(Ranges: " + rangeInspects.join(", ") +
-                ")(anchor: " + anchor.inspect() + ", focus: " + focus.inspect() + "]";
-    }
-
-    selProto.getName = function() {
-        return "WrappedSelection";
-    };
-
-    selProto.inspect = function() {
-        return inspect(this);
-    };
-
-    selProto.detach = function() {
-        actOnCachedSelection(this.win, "delete");
-        deleteProperties(this);
-    };
-
-    WrappedSelection.detachAll = function() {
-        actOnCachedSelection(null, "deleteAll");
-    };
-
-    WrappedSelection.inspect = inspect;
-    WrappedSelection.isDirectionBackward = isDirectionBackward;
-
-    api.Selection = WrappedSelection;
-
-    api.selectionPrototype = selProto;
-
-    api.addCreateMissingNativeApiListener(function(win) {
-        if (typeof win.getSelection == "undefined") {
-            win.getSelection = function() {
-                return getSelection(win);
-            };
-        }
-        win = null;
-    });
-});
diff --git a/www/_pad/realtime-wysiwyg.js b/www/_pad/realtime-wysiwyg.js
deleted file mode 100644
index 2b35ef0a8..000000000
--- a/www/_pad/realtime-wysiwyg.js
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * 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 .
- */
-define([
-    '/pad/html-patcher.js',
-    '/pad/errorbox.js',
-    '/common/messages.js',
-    '/bower_components/reconnectingWebsocket/reconnecting-websocket.js',
-    '/common/crypto.js',
-    '/common/toolbar.js',
-    '/pad/rangy.js',
-    '/common/chainpad.js',
-    '/common/otaml.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-], function (HTMLPatcher, ErrorBox, Messages, ReconnectingWebSocket, Crypto, Toolbar) {
-
-window.ErrorBox = ErrorBox;
-
-    var $ = window.jQuery;
-    var Rangy = window.rangy;
-    Rangy.init();
-    var ChainPad = window.ChainPad;
-    var Otaml = window.Otaml;
-
-    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;
-
-    // ------------------ 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 (wysiwygDiv, docBody, onEvent, unbind)
-    {
-        bindEvents(docBody,
-                   ['textInput', 'keydown', 'keyup', 'select', 'cut', 'paste'],
-                   onEvent,
-                   unbind);
-        bindEvents(wysiwygDiv,
-                   ['mousedown','mouseup','click'],
-                   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);
-    };
-
-    var abort = function (socket, realtime) {
-        realtime.abort();
-        realtime.toolbar.failed();
-        try { socket._socket.close(); } catch (e) { }
-    };
-
-    var createDebugInfo = function (cause, realtime, docHTML, allMessages) {
-        return JSON.stringify({
-            cause: cause,
-            realtimeUserDoc: realtime.getUserDoc(),
-            realtimeAuthDoc: realtime.getAuthDoc(),
-            docHTML: docHTML,
-            allMessages: allMessages,
-        });
-    };
-
-    var handleError = function (socket, realtime, err, docHTML, allMessages) {
-        var internalError = createDebugInfo(err, realtime, docHTML, allMessages);
-        abort(socket, realtime);
-        ErrorBox.show('error', docHTML, internalError);
-    };
-
-    var getDocHTML = function (doc) {
-        return doc.body.innerHTML;
-    };
-
-    var makeHTMLOperation = function (oldval, newval) {
-        try {
-            var op = Otaml.makeHTMLOperation(oldval, newval);
-
-            if (PARANOIA && op) {
-                // simulate running the patch.
-                var res = HTMLPatcher.patchString(oldval, op.offset, op.toRemove, op.toInsert);
-                if (res !== newval) {
-                    console.log(op);
-                    console.log(oldval);
-                    console.log(newval);
-                    console.log(res);
-                    throw new Error();
-                }
-
-                // check matching bracket count
-                // TODO(cjd): this can fail even if the patch is valid because of brackets in
-                //            html attributes.
-                var removeText = oldval.substring(op.offset, op.offset + op.toRemove);
-                if (((removeText).match(//g) || []).length)
-                {
-                    throw new Error();
-                }
-
-                if (((op.toInsert).match(//g) || []).length)
-                {
-                    throw new Error();
-                }
-            }
-
-            return op;
-
-        } catch (e) {
-            if (PARANOIA) {
-                $(document.body).append('');
-                $('#makeOperationErr').val(oldval + '\n\n\n\n\n\n\n\n\n\n' + newval);
-                console.log(e.stack);
-            }
-            return {
-                offset: 0,
-                toRemove: oldval.length,
-                toInsert: newval
-            };
-        }
-    };
-
-    // chrome sometimes generates invalid html but it corrects it the next time around.
-    var fixChrome = function (docText, doc, contentWindow) {
-        for (var i = 0; i < 10; i++) {
-            var docElem = doc.createElement('div');
-            docElem.innerHTML = docText;
-            var newDocText = docElem.innerHTML;
-            var fixChromeOp = makeHTMLOperation(docText, newDocText);
-            if (!fixChromeOp) { return docText; }
-            HTMLPatcher.applyOp(docText,
-                                fixChromeOp,
-                                doc.body,
-                                Rangy,
-                                contentWindow);
-            docText = getDocHTML(doc);
-            if (newDocText === docText) { return docText; }
-        }
-        throw new Error();
-    };
-
-    var fixSafari_STATE_OUTSIDE = 0;
-    var fixSafari_STATE_IN_TAG =  1;
-    var fixSafari_STATE_IN_ATTR = 2;
-    var fixSafari_HTML_ENTITIES_REGEX = /('|"|<|>|<|>)/g;
-
-    var fixSafari = function (html) {
-        var state = fixSafari_STATE_OUTSIDE;
-        return html.replace(fixSafari_HTML_ENTITIES_REGEX, function (x) {
-            switch (state) {
-                case fixSafari_STATE_OUTSIDE: {
-                    if (x === '<') { state = fixSafari_STATE_IN_TAG; }
-                    return x;
-                }
-                case fixSafari_STATE_IN_TAG: {
-                    switch (x) {
-                        case '"': state = fixSafari_STATE_IN_ATTR; break;
-                        case '>': state = fixSafari_STATE_OUTSIDE; break;
-                        case "'": throw new Error("single quoted attribute");
-                    }
-                    return x;
-                }
-                case fixSafari_STATE_IN_ATTR: {
-                    switch (x) {
-                        case '<': return '<';
-                        case '>': return '>';
-                        case '"': state = fixSafari_STATE_IN_TAG; break;
-                    }
-                    return x;
-                }
-            }
-            throw new Error();
-        });
-    };
-
-    var getFixedDocText = function (doc, ifrWindow) {
-        var docText = getDocHTML(doc);
-        docText = fixChrome(docText, doc, ifrWindow);
-        docText = fixSafari(docText);
-        return docText;
-    };
-
-    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) { 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 (window, websocketUrl, userName, channel, cryptKey)
-    {
-        var passwd = 'y';
-        var wysiwygDiv = window.document.getElementById('cke_1_contents');
-        var ifr = wysiwygDiv.getElementsByTagName('iframe')[0];
-        var doc = ifr.contentWindow.document;
-        var socket = makeWebsocket(websocketUrl);
-        var onEvent = function () { };
-
-        var allMessages = [];
-        var isErrorState = false;
-        var initializing = true;
-        var recoverableErrorCount = 0;
-        var error = function (recoverable, err) {
-console.log(new Error().stack);
-            console.log('error: ' + err.stack);
-            if (recoverable && recoverableErrorCount++ < MAX_RECOVERABLE_ERRORS) { return; }
-            var realtime = socket.realtime;
-            var docHtml = getDocHTML(doc);
-            isErrorState = true;
-            handleError(socket, realtime, err, docHtml, allMessages);
-        };
-        var attempt = function (func) {
-            return function () {
-                var e;
-                try { return func.apply(func, arguments); } catch (ee) { e = ee; }
-                if (e) {
-                    console.log(e.stack);
-                    error(true, e);
-                }
-            };
-        };
-        var checkSocket = function () {
-            if (isSocketDisconnected(socket, socket.realtime) && !socket.intentionallyClosing) {
-                //isErrorState = true;
-                //abort(socket, socket.realtime);
-                //ErrorBox.show('disconnected', getDocHTML(doc));
-                return true;
-            }
-            return false;
-        };
-
-        socket.onOpen.push(function (evt) {
-            if (!initializing) {
-                socket.realtime.start();
-                return;
-            }
-
-            var realtime = socket.realtime =
-                ChainPad.create(userName,
-                                passwd,
-                                channel,
-                                getDocHTML(doc),
-                                { transformFunction: Otaml.transform });
-
-            var toolbar = realtime.toolbar =
-                Toolbar.create(window.$('#cke_1_toolbox'), userName, realtime);
-
-            onEvent = function () {
-                if (isErrorState) { return; }
-                if (initializing) { return; }
-
-                var oldDocText = realtime.getUserDoc();
-                var docText = getFixedDocText(doc, ifr.contentWindow);
-                var op = attempt(Otaml.makeTextOperation)(oldDocText, docText);
-
-                if (!op) { return; }
-
-                if (op.toRemove > 0) {
-                    attempt(realtime.remove)(op.offset, op.toRemove);
-                }
-                if (op.toInsert.length > 0) {
-                    attempt(realtime.insert)(op.offset, op.toInsert);
-                }
-
-                if (realtime.getUserDoc() !== docText) {
-                    error(false, 'realtime.getUserDoc() !== docText');
-                }
-            };
-var now = function () { return new Date().getTime(); };
-            var userDocBeforePatch;
-            var incomingPatch = function () {
-                if (isErrorState || initializing) { return; }
-                console.log("before patch " + now());
-                userDocBeforePatch = userDocBeforePatch || getFixedDocText(doc, ifr.contentWindow);
-                if (PARANOIA && userDocBeforePatch !== getFixedDocText(doc, ifr.contentWindow)) {
-                    error(false, "userDocBeforePatch !== getFixedDocText(doc, ifr.contentWindow)");
-                }
-                var op = attempt(makeHTMLOperation)(userDocBeforePatch, realtime.getUserDoc());
-                if (!op) { return; }
-                attempt(HTMLPatcher.applyOp)(
-                    userDocBeforePatch, op, doc.body, Rangy, ifr.contentWindow);
-                console.log("after patch " + now());
-            };
-
-            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.
-                initializing = false;
-                incomingPatch();
-            });
-
-            socket.onMessage.push(function (evt) {
-                if (isErrorState) { return; }
-                var message = Crypto.decrypt(evt.data, cryptKey);
-                allMessages.push(message);
-                if (!initializing) {
-                    if (PARANOIA) { onEvent(); }
-                    userDocBeforePatch = realtime.getUserDoc();
-                }
-                realtime.message(message);
-            });
-            realtime.onMessage(function (message) {
-                if (isErrorState) { return; }
-                message = Crypto.encrypt(message, cryptKey);
-                try {
-                    socket.send(message);
-                } catch (e) {
-                    error(true, e.stack);
-                }
-            });
-
-            realtime.onPatch(incomingPatch);
-
-            bindAllEvents(wysiwygDiv, doc.body, onEvent, false);
-
-            setInterval(function () {
-                if (isErrorState || checkSocket()) {
-                    toolbar.reconnecting();
-                }
-            }, 200);
-
-            realtime.start();
-            toolbar.connected();
-
-            //console.log('started');
-        });
-        return {
-            onEvent: function () { onEvent(); }
-        };
-    };
-
-    return module.exports;
-});

From 3fb1d0ed2ba22d5e4ce742e20f4e5539a5944fa1 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 15 Apr 2016 18:17:58 +0200
Subject: [PATCH 097/257] Write a document detailing system architecture

---
 ARCHITECTURE.md | 247 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 247 insertions(+)
 create mode 100644 ARCHITECTURE.md

diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
new file mode 100644
index 000000000..419a8773f
--- /dev/null
+++ b/ARCHITECTURE.md
@@ -0,0 +1,247 @@
+So you want to write a realtime collaborative application?
+
+This guide will focus on applications which require **multiple clients** to **collaboratively construct a single authoratative document**.
+
+[XWiki-Labs](https://labs.xwiki.com/) has published an open source suite (called [Cryptpad](https://github.com/xwiki-labs/cryptpad)) of collaborative editors  which employ end to end encryption.
+This guide will refer to the techniques used in the prototypes developed therein.
+
+Let's start with an overview of the components involved.
+
+## Consensus
+
+The difficulty in writing a _realtime application_ is in reconciling the fact that it is impossible for two events separated by some distance to interact instantaneously.
+
+Such an application will require clients to agree on a protocol by which they can resolve disputes such that upon receiving each others' messages they are able to construct the same document.
+
+Suppose Alice and Bob are working on the same text document at the same time.
+They each begin with a document in an agreed upon state, which will be referred to as **O**.
+
+Alice makes a change **a** to **O**, while Bob makes a change **b** to to **O**.
+
+What do they do next?
+
+1. They each review their documents before and after their revisions and determine what has changed, this is called a **diff**
+2. They formulate these changes into a form which encapsulates the minimum amount of information required to update a previously agreed upon document to their current state. This is called a **patch*
+3. They serialize their patch into a form which can be transferred across whatever medium they are using to communicate. This is called a **message**
+
+In order to produce the same document while having received each others messages in different orders, they must use an algorithm known as [Operational Transformation](https://en.wikipedia.org/wiki/Operational_transformation).
+
+The short explanation is that when messages are received out of order, the client must determine two things:
+
+1. What state was the document in when the conflicting edit was made? If the two events are a part of a timeline which has diverged, what is their common ancestor? This can be thought of as **O[n]**
+2. If both operations **a** and **b** were intended to transform **O[n]** to **O[n+1]**, how can **a** be transformed such that it modifies **O[n]** after **b**, taking into account **b**'s effect.
+
+If two operations are capable of being resolved, then one of them effectively becomes **O[n+1]**, while the other becomes **O[n+2]**.
+For the purposes of the document, it doesn't matter which becomes which, it must be possible for either transformation to be valid.
+
+The research team at XWiki Labs created and continues to maintain a Javascript library called [Chainpad](https://github.com/xwiki-contrib/chainpad "Realtime Collaborative Editor Algorithm based on Nakamoto Blockchains") which simplifies this process, and provides a few guarantees about how differences will be resolved.
+
+The algorithm is based on Nakamoto Blockchains, a construct popularized by Bitcoin, and now a growing number of other cryptocurrencies.
+The core datatype is considered a [CRDT](https://en.wikipedia.org/wiki/Conflict-free_replicated_data_type "Conflict-free Replicated Data Type).
+CRDTs are also also employed by the popular source control managements software [Git](https://en.wikipedia.org/wiki/Git_%28software%29).
+
+Each patch references the [SHA-256 Hash](https://en.wikipedia.org/wiki/Secure_Hash_Algorithm "Secure Hashing Algorithms") of the previous state of the document.
+The availability of these hashes make it possible for clients to independently verify the authenticity of a patch, and validate that a patch can successfully be applied to a document at a particular point within its history.
+Patches which are determined to be invalid are rejected.
+
+At present, Chainpad can only be used for determining consensus on text documents.
+Its patches consist of **Operations** which consist of:
+
+1. an offset from the start of the document where changes are to be applied
+2. a number of characters to remove
+3. a string of characters to insert
+
+This means that the list of possible operations is very small, which is important as a matrix of transformations is a square.
+
+As an author of a particular application, it is your responsibility to use Chainpad correctly.
+You provide the diffing, patching logic, and interface rendering logic, and Chainpad will provide an API for retrieving the agreed upon document from the blockchain.
+
+A particularly useful property of Chainpad's algorithm is that consensus can be reached without requiring a central authority.
+Since clients alone can determine what they agree on, whatever services are responsible for delivering and storing messages can be ignorant of the content of their messages.
+
+This means that using chainpad, clients can collaborate in realtime while using end to end encryption, provided each client has a pre-shared key.
+
+## Datastore
+
+While it's possible for messages to propogate using a [gossip protocol](https://en.wikipedia.org/wiki/Gossip_protocol) and therefore not rely on havinga centralized service for storing messages, it's possible for the members of a gossip network to [Netsplit](https://en.wikipedia.org/wiki/Netsplit).
+Chainpad currently has no mechanism for resolving such an event.
+
+If a member of a session disconnects (as defined by not responding to a ping with a pong in a specified timeframe) any revisions that they make to their version of a document will be ignored.
+When all connected members of a document have received and integrated a patch into their document, that patch can be considered to be a part of the **Authoratative Document**.
+
+The simplest way to guarantee that all clients within a session have the same document is to require that they all retrieve their messages from a single entity which is responsible for compiling a history of messages which are received in a particular order, and for distributing those messages in the same order.
+
+Chainpad can handle out of order messages, but it performs best when its messages are delivered in the order of their hash references.
+
+By architecting your system such that all clients send to a server which then relays to other clients, you guarantee that a particular chain of patches is consistent between the participants of your session.
+
+Cryptpad is capable of using a variety of data stores.
+Which data store your instance employs can be [easily configured](https://github.com/xwiki-labs/cryptpad/blob/master/config.js.dist).
+
+You simply need to write an adaptor which conforms to a simple API.
+The documentation for writing such an adaptor, and the complete list of implemented adaptors, is available [here](https://github.com/xwiki-labs/cryptpad/tree/master/storage).
+
+Whether you decide to use a single server, or distribute messages across a network of entities, the body which stores the **Authoratative Document** will be referred to as the **History Keeper** for the purposes of this guide.
+
+## Transport
+
+Cryptpad was initially written to use [websockets](https://en.wikipedia.org/wiki/WebSocket) for transportation of messages.
+
+Since a relay server is indispensable in this model, that server doubles as the **History Keeper**, and implements a datastore.
+
+Provided Chainpad's requirements are fulfilled, however, there are alternative models that we can employ.
+
+1. we must inform the realtime session whether a client is still in the session for the purposes of determining the **Authoratative Document**
+2. we must guarantee that any client can retrieve the complete history of the chain at any given time
+3. we must guarantee that a client has knowledge of the **Authoratative Document** before we attempt to process any of their messages
+
+[Netflux](https://github.com/xwiki-labs/netflux "JavaScript client side API based on WebRTC & WebSocket") is an API which is being developed as a part of the [OpenPaaS::ng Project](http://ng.open-paas.org/).
+It provides an abstraction over transportation details, and ensures that the above requirements can be met.
+
+It provides a notion of **WebChannels**, to which a client can send a message.
+The API guarantees that the client's message will be delivered to all members of that channel, and that they will receive an acknowledge that their message has been distributed.
+
+This high level API can be implemented using Websockets, [WebRTC](https://webrtc.org/), and any new transport capable of providing the same guarantees.
+This is, of course, not limited to functioning in the context of the web.
+
+We are able to abstract away the actual topology of the network such that it can accommodate multiple servers.
+
+Aside from providing a generic interface for connecting with other clients, the Netflux API allows for any member of the session to act as the **History Keeper**.
+We explored this methodology by implementing another Realtime CKEditor prototype which communicates over WebRTC and places the burden of storing messages on one of the participating clients (typically the first to join the session).
+
+## Interface
+
+The interface which your application will expose to its users can vary widely.
+Different interfaces are likely to present different difficulties.
+Nevertheless, there are several themes which are common to many applications.
+
+### Cursor Correction
+
+If an interface is interactive, which they typically are, then the user will likely be able to select a particular area.
+
+If the interface is a plain text editor, maintaining the location of the cursor while updating the contents of the editor is not especially difficult.
+The process involves checking where the user's selection is located (possibly a start and end), determining whether the changes to the document occurred before or after those points, and updating the selection boundaries if necessary.
+
+If the interface is a WYSIWYG editor, maintaining the location of the cursor is more difficult, as the number of characters changed in the authoratative document does not correspond directly to the number of characters which the user perceives.
+It is the application developers' responsibility to infer from the new content where the cursor should be, and to render the modified content in such a way that it does not disrupt user experience.
+In the process of developing its [Realtime CKEditor](https://cryptpad.fr) XWiki Labs discovered that many of the [existing Javascript libraries](https://github.com/Matt-Esch/virtual-dom) for updating a **DOM** are very destructive, and replace elements completely once a difference is detected within the tree (when scanning left to right).
+
+After testing several options, we ended up using a patched version of [**DiffDOM**](https://github.com/fiduswriter/diffDOM).
+Its diffing algorithm is _mostly correct_, but it lacks a move operation, namely, it determine that when the text of a paragraph gets bolded, that the textNode within the P should be moved into a STRONG element, with that STRONG element placed within the P.
+As such, there are difficulties with applying styles to large portions of the document while someone is editing within that section.
+
+On the whole, however, contentEditable documents avoid many of the problems that a text editor faces with its rendering cycle.
+DOM selections consist of a start and an end, which themselves consist of a reference to an element and an offset within that element.
+Provided you can avoid redrawing DOM elements unnecessarily, unless a modification to the DOM directly affects an element, the cursor will not be affected.
+
+### Canonicalization
+
+Not all browsers represent the content of an interface the same way.
+Typically this isn't an issue, as a browser only has to work with data that it generated itself.
+
+When you try to synchronize data between two clients, they can fall into cycles where each client repeatedly tries to force another browser to accept its own representation.
+Some browsers will accept certain changes, even though they wouldn't generate those representations themselves.
+Some browsers will immediately correct the representation and fall into an endless loop which is only limited in speed by the fact that it has to travel over the network for each iteration.
+
+![Browser Wars](/assets/browser_wars_by_shoze.jpg)
+
+In the case of a text editor which uses a textarea element for a user interface, some browsers represent line breaks with `\n`, while other use `\r\n`.
+This is easy to fix, since all browsers seem to tolerate the `\r` being stripped.
+We can **canonicalize** the content, or put it into [Canonical Form](https://en.wikipedia.org/wiki/Canonical_form).
+
+This is probably the most unpredictable part of developing a realtime application, as you won't notice how a browser changes content until you try it in a realtime session.
+The easiest way to handle this is to limit the type of clients you support.
+Since we can only support editors which support our transport system, we eliminate any browser that doesn't support Websockets.
+Most modern browsers are fairly simple.
+
+For our contentEditable realtime app (with CKEditor), we decided to use an intermediary representation of the DOM rather than trying to synchronize the outerHTML of the document.
+We created a representation that we called **[HyperJSON](https://github.com/xwiki-labs/hyperjson)**.
+HyperJSON can be created from any DOM element, and is easily serializable since it is a subset of JSON.
+HyperJSON specifies the complete structure of the DOM, including attributes that elements may have.
+
+Our HyperJSON module also provides a function which recursively applies a callback to HyperJSON, and returns the result.
+Our function was inspired by [**dom2hscript**](https://github.com/AkeemMcLennon/dom2hscript), which transforms a DOM into the equivalent [**Hyperscript**](https://github.com/dominictarr/hyperscript).
+Our `Hyperjson.callOn` function accepts **Hyperscript** as a second argument, and uses its functionality to transform our serialized DOM back into an actual DOM element.
+
+Locally, if a client attempts to update their interface, they will serialize their content into a string form to be inserted into Chainpad.
+If a string comparison does not return `true`, then it will perform a diff and send its changes over the wire.
+The problem with this when serializing a DOM is that an element which possesses attributes can be serialized in several ways.
+
+Consider the HTML snippet: `
    pewpew
    `.
+When converted into HyperJSON, it will consist of a string identifying the type of element, the attributes of that node in a map, and a list of the element's child elements.
+
+The problem here is that maps have undefined behaviour with regard to the ordering of their keys.
+Thus, the map of style attributes can serialize as either `{"border":"1px solid white","color":"red"}` or `{"color":"red","border":"1px solid white"}`.
+This is easily solved by sorting the attributes into a deterministic order.
+
+We used [JSON.sortify](https://github.com/ThomasR/JSON.sortify) to define a canonical form when serializing our HyperJSON.
+Since everything else but the maps in the HyperJSON structure is already deterministic, this provides a simple way to prevent one cause of browser fights.
+
+### filtering local elements
+
+Depending on your interface, you may find that there are other elements or attributes which may only have a valid meaning in certain environments.
+We have encountered [Bogus BRs](https://bugzilla.mozilla.org/show_bug.cgi?id=911201), which some browsers insert for the purpose of making empty P tags selectable in contentEditable elements.
+In Firefox, these manifest as `
    `.
+Some browsers will drop this attribute, resulting in bad merges, or cycles of modifications to the DOM.
+
+Other times, the problem isn't in a browser's internal representation, but in the fact that some additional feature of your application functions by modifying the content itself.
+We found that this was the case with CKEditor's [MagicLine Plugin](http://docs.ckeditor.com/#!/guide/dev_magicline), which inserts SPAN elements into the DOM to expose a clickable surface to the user.
+
+To deal with this issue, we implemented functionality for ignoring elements and modifying the output of our HyperJSON serializer while recursing over the DOM.
+Depending on your use case, you may have to implement your own serializer.
+
+We found that having the capacity to filter elements using optional functions supplied at runtime was a very flexible system.
+Since our goal at XWiki labs is to research new technology as well as provide tools for improving [our company's core product](http://www.xwiki.org/xwiki/bin/view/Main/WebHome), we wanted a technique that could easily be extended to suit our diverse userbase's requirements.
+
+## Encryption
+
+Of all the components explained in this document, encryption is the only optional technique when building a realtime collaborative editor.
+As mentioned above, it's an option you can freely exploit when using chainpad, since your datastore and transport system do not require any knowledge of your document's content.
+
+That isn't to say that there are no tradeoffs when keeping that information from your server, indeed, there are several challenges.
+
+### Our Encryption Scheme
+
+The encryption scheme employed by Cryptpad is a [symmetric encryption](https://en.wikipedia.org/wiki/Symmetric-key_algorithm) which utilizes a single [pre-shared-key](https://en.wikipedia.org/wiki/Pre-shared_key) known by all participants.
+
+Encryption is complex, and poorly understood by the majority of those who use it on a daily basis.
+Pre-shared-keys are among the weakest possible cryptographic tools available today, however, few if any other encryption schemes scale to any number of users.
+
+For our purposes, we would like our application to offerthe benefits of encryption without being any more difficult to use.
+Since the method of collaborating on any web resource typically involves sharing the URL, we use the hash of the URl to share the pre-shared-key.
+Anything in a URL which follows a `#` is not sent to the server, meaning that our web app will store your users' messages without ever knowing their content.
+
+Any users who would like to rely on the properties of this scheme should understand that anyone who can read their URL can access the same document.
+For this reason, a document's contents are only as secure as the method used to share the URL.
+
+### How Encryption limits our application
+
+It's important to understand that encryption is not a great cause of difficulty, rather, once encryption is involved it can generally be assumed that users will expect their content to be treated as sensitive.
+This rules out many features which assume that a **History Keeper** can intervene in the session.
+
+#### Limitations
+
+It is possible for a client to send junk patches.
+These patches should be rejected by the other clients, however, since the **History Keeper** does not know what the contents of the messages are, they cannot choose to reject bogus patches.
+As a result, these patches are irrevocably added to the document's chain.
+Whenever a client joins Realtime Collaborative session, they must download the full history of the session before participating.
+This means that malicious client can fill a channel with junk messages with no repercussions.
+
+This long sync time is a factor even if none of the clients can be considered **Bad Actors**, a session need only have a large number of patches.
+This is particularly troublesome for clients using devices which have difficulty _syncing the chain_, as well as those which lose their connections frequently.
+We do not yet have an implementation which allows clients to avoid resyncing documents which they have previously edited, though we could exploit the [LocalStorage API](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage).
+
+We have built realtime editors for use cases which preclude the use of encryption, notably within XWiki.
+Since the purpose of the platform is to share information, preventing the document from being read directly from the server would be counterproductive.
+
+For this purpose, we have employed a scheme wherein the first user in a realtime session fetches the latest state of a document from the server in a complete form.
+Additional users must sync the chain of messages in order to participate, however, they are still able to save in the manner native to XWiki.
+
+When the final user leaves the realtime collaborative session, the history is deleted, and the same process is started over the next time a user attempts to edit using the realtime functionality.
+
+A session could still have difficulty with very large chains, however, in practice sessions rarely last long enough for it to become a noticeable problem.
+
+
+## Conclusion
+
+

From 2b9d9ada8bf00ce1e0ab32c6df255f0cdf731334 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 15 Apr 2016 18:19:46 +0200
Subject: [PATCH 098/257] Add a working picture

---
 ARCHITECTURE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index 419a8773f..b1d2515f1 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -143,7 +143,7 @@ When you try to synchronize data between two clients, they can fall into cycles
 Some browsers will accept certain changes, even though they wouldn't generate those representations themselves.
 Some browsers will immediately correct the representation and fall into an endless loop which is only limited in speed by the fact that it has to travel over the network for each iteration.
 
-![Browser Wars](/assets/browser_wars_by_shoze.jpg)
+![Browser Wars](http://media02.hongkiat.com/battle-of-browsers-artworks/browser-wars.jpg)
 
 In the case of a text editor which uses a textarea element for a user interface, some browsers represent line breaks with `\n`, while other use `\r\n`.
 This is easy to fix, since all browsers seem to tolerate the `\r` being stripped.

From e68dd31a53b8658fb5922529408e181ff5c05082 Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 20 Apr 2016 14:38:15 +0200
Subject: [PATCH 099/257] Fix #19 by adding a lock to level db connector

---
 storage/lvl.js | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/storage/lvl.js b/storage/lvl.js
index 1ddfbe97c..0f233178e 100644
--- a/storage/lvl.js
+++ b/storage/lvl.js
@@ -17,13 +17,25 @@ var getIndex = function(db, cName, cb) {
 
 var insert = function (db, channelName, content, cb) {
     var index;
-    nThen(function (waitFor) {
-        getIndex(db, channelName, waitFor(function (i) { index = i+1; }));
-    }).nThen(function (waitFor) {
-        db.put(channelName+'=>'+index, content, waitFor(function (e) { if (e) { throw e; } }));
-    }).nThen(function (waitFor) {
-        db.put(channelName+'=>index', ''+index, waitFor(function (e) { if (e) { throw e; } }));
-    }).nThen(cb);
+    var doIt = function () {
+        db.locked = true;
+        nThen(function (waitFor) {
+            getIndex(db, channelName, waitFor(function (i) { index = i+1; }));
+        }).nThen(function (waitFor) {
+            db.put(channelName+'=>'+index, content, waitFor(function (e) { if (e) { throw e; } }));
+        }).nThen(function (waitFor) {
+            db.put(channelName+'=>index', ''+index, waitFor(function (e) { if (e) { throw e; } }));
+        }).nThen(function (waitFor) {
+            db.locked = false;
+            if (!db.queue.length) { return; }
+            db.queue.shift()();
+        }).nThen(cb);
+    };
+    if (db.locked) {
+        db.queue.push(doIt);
+    } else {
+        doIt();
+    }
 };
 
 var getMessages = function (db, channelName, msgHandler) {
@@ -44,6 +56,8 @@ var getMessages = function (db, channelName, msgHandler) {
 
 module.exports.create = function (conf, cb) {
     var db = Level(conf.levelPath || './test.level.db');
+    db.locked = false;
+    db.queue = [];
     cb({
         message: function (channelName, content, cb) {
             insert(db, channelName, content, cb);

From 11961b4f1df6fffc9d4d14bdde66371cfb9891d8 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 14:50:56 +0200
Subject: [PATCH 100/257] export stringifyDOM to REALTIME_MODULE

---
 www/p/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/p/main.js b/www/p/main.js
index 07f4e255e..307bc979d 100644
--- a/www/p/main.js
+++ b/www/p/main.js
@@ -60,7 +60,7 @@ define([
         return hj;
     };
 
-    var stringifyDOM = function (dom) {
+    var stringifyDOM = module.stringifyDOM = function (dom) {
         return stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter));
     };
 

From cdf02ac72506490005c807cf1248f10090ba6683 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 15:00:21 +0200
Subject: [PATCH 101/257] remove input pad

---
 www/input/index.html | 34 ----------------------------------
 www/input/main.js    | 40 ----------------------------------------
 2 files changed, 74 deletions(-)
 delete mode 100644 www/input/index.html
 delete mode 100644 www/input/main.js

diff --git a/www/input/index.html b/www/input/index.html
deleted file mode 100644
index 76b2ccbd4..000000000
--- a/www/input/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-    
-    
-    
-
-
-    
-
-
-
diff --git a/www/input/main.js b/www/input/main.js
deleted file mode 100644
index c61e312f2..000000000
--- a/www/input/main.js
+++ /dev/null
@@ -1,40 +0,0 @@
-define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/messages.js',
-    '/common/crypto.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-    '/customize/pad.js'
-], function (Config,
-    RTText, // RTText
-    Messages,
-    Crypto) {
-
-    var $ = window.jQuery;
-
-    var $textarea = $('input');
-
-    $(window).on('hashchange', function() {
-        window.location.reload();
-    });
-    if (window.location.href.indexOf('#') === -1) {
-        window.location.href = window.location.href + '#' + Crypto.genKey();
-        return;
-    }
-
-    var initialState = Messages.initialState;
-
-    $textarea.val(initialState);
-
-    var key = Crypto.parseKey(window.location.hash.substring(1));
-
-    var config = {
-        textarea: $textarea[0],
-        websocketURL: Config.websocketURL,
-        userName: Crypto.rand64(8),
-        channel: key.channel,
-        cryptKey: key.cryptKey
-    };
-
-    var rttext = RTText.start(config);
-});

From 06b464c5246c59cab1ce31ba571a78946ad9dc74 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 15:04:43 +0200
Subject: [PATCH 102/257] move sheet/ to .git

---
 www/sheet/index.html |  29 ---------
 www/sheet/inner.html |  36 -----------
 www/sheet/main.js    | 138 -------------------------------------------
 3 files changed, 203 deletions(-)
 delete mode 100644 www/sheet/index.html
 delete mode 100644 www/sheet/inner.html
 delete mode 100644 www/sheet/main.js

diff --git a/www/sheet/index.html b/www/sheet/index.html
deleted file mode 100644
index e32ca87cd..000000000
--- a/www/sheet/index.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-    
-    
-    
-
-
-    
-    
-
-
diff --git a/www/sheet/inner.html b/www/sheet/inner.html
deleted file mode 100644
index 3b07cddea..000000000
--- a/www/sheet/inner.html
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-    
-    
-    
-    
-    
-    jQuery.sheet - The Ajax Spreadsheet DTS Lazy Loading
-    
-    
-    
-    
-
-
-    
    
-
-
diff --git a/www/sheet/main.js b/www/sheet/main.js
deleted file mode 100644
index 4b6f7fcd6..000000000
--- a/www/sheet/main.js
+++ /dev/null
@@ -1,138 +0,0 @@
-define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/messages.js',
-    '/common/crypto.js',
-    '/common/toolbar.js',
-    '/common/chainpad.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-    '/common/otaml.js',
-    '/customize/sheet.js'
-], function (Config, Messages, Crypto, Toolbar) {
-    var $ = window.jQuery;
-    var ChainPad = window.ChainPad;
-    var Otaml = window.Otaml;
-
-    var module = { exports: {} };
-
-    var sheetToJson = function (ifrWindow) {
-        var xx = ifrWindow.sh[0].jS;
-        var m = [];
-        for (var i = 0; i < xx.spreadsheets.length; i++) {
-          m[i]=[];
-          var sheet = xx.spreadsheets[i];
-          for (var j = 1; j < sheet.length; j++) {
-            m[i][j]=[];
-            var row = sheet[j];
-            for (var k = 1; k < row.length; k++) {
-              var col = row[k];
-              m[i][j][k] = { value: col.value, formula: col.formula };
-            }
-          }
-        }
-        return m;
-    };
-
-    var jsonToSheet = function (ifrWindow, json) {
-        var xx = ifrWindow.sh[0].jS;
-        for (var i = 0; i < xx.spreadsheets.length; i++) {
-          var sheet = xx.spreadsheets[i];
-          for (var j = 1; j < sheet.length; j++) {
-            var row = sheet[j];
-            for (var k = 1; k < row.length; k++) {
-              var col = row[k];
-              var jcol = json[i][j][k];
-              if (jcol.value === col.value && jcol.formula === col.formula) { continue; }
-              col.value = jcol.value;
-              col.formula = jcol.formula;
-              col.displayValue();
-            }
-          }
-        }
-    };
-
-    var applyChange = function(ctx, oldval, newval) {
-      if (oldval === newval) {
-          return;
-      }
-
-      var commonStart = 0;
-      while (oldval.charAt(commonStart) === newval.charAt(commonStart)) {
-        commonStart++;
-      }
-
-      var commonEnd = 0;
-      while (oldval.charAt(oldval.length - 1 - commonEnd) === newval.charAt(newval.length - 1 - commonEnd) &&
-          commonEnd + commonStart < oldval.length && commonEnd + commonStart < newval.length) {
-        commonEnd++;
-      }
-
-      if (oldval.length !== commonStart + commonEnd) {
-        ctx.remove(commonStart, oldval.length - commonStart - commonEnd);
-      }
-      if (newval.length !== commonStart + commonEnd) {
-        ctx.insert(commonStart, newval.slice(commonStart, newval.length - commonEnd));
-      }
-    };
-
-    $(function () {
-
-        if (window.location.href.indexOf('#') === -1) {
-            window.location.href = window.location.href + '#' + Crypto.genKey();
-        }
-        $(window).on('hashchange', function() {
-            window.location.reload();
-        });
-
-        var $sheetJson = $('#sheet-json');
-        var ifrw = $('iframe')[0].contentWindow;
-        var sheetEvent = function (realtime) {
-            var sheetJson = JSON.stringify(sheetToJson(ifrw));
-            applyChange(realtime, realtime.getUserDoc(), sheetJson);
-            $sheetJson.text(sheetJson);
-        };
-
-        var eventPending = false;
-        var realtimeEvent = function (realtime) {
-            if (eventPending) { return; }
-            eventPending = true;
-            setTimeout(function () {
-                eventPending = false;
-                try{
-                    var data = window.data = realtime.getUserDoc();
-                    $sheetJson.text(data);
-                    var json = JSON.parse(data);
-                    jsonToSheet(ifrw, json);
-                }catch(e) { console.log(e.stack); }
-            }, 0);
-        };
-
-        var key = Crypto.parseKey(window.location.hash.substring(1));
-        var myUserName = Crypto.rand64(8);
-
-        var socket = new WebSocket(Config.websocketURL);
-        socket.onopen = function () {
-            var realtime = ChainPad.create(
-                myUserName, 'x', key.channel, '', { transformFunction: Otaml.transform });
-            socket.onmessage = function (evt) {
-                var message = Crypto.decrypt(evt.data, key.cryptKey);
-                realtime.message(message);
-            };
-            realtime.onMessage(function (message) {
-                message = Crypto.encrypt(message, key.cryptKey);
-                try {
-                    socket.send(message);
-                } catch (e) {
-                    console.log(e.stack);
-                }
-            });
-            ifrw.sh.on('sheetCellEdited', function () { sheetEvent(realtime); });
-            sheetEvent(realtime);
-            realtime.onPatch(function () { realtimeEvent(realtime); });
-
-            ifrw.$('.jSTitle').html('');
-            Toolbar.create(ifrw.$('.jSTitle'), myUserName, realtime);
-
-            realtime.start();
-        };
-    });
-});

From ae039b0551f080dbacc43f9822a2a0555940e5dd Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 16:00:28 +0200
Subject: [PATCH 103/257] remove NetFlux server prototype

---
 NetFluxWebsocketServer.js | 189 --------------------------------------
 1 file changed, 189 deletions(-)
 delete mode 100644 NetFluxWebsocketServer.js

diff --git a/NetFluxWebsocketServer.js b/NetFluxWebsocketServer.js
deleted file mode 100644
index 005cdcc6b..000000000
--- a/NetFluxWebsocketServer.js
+++ /dev/null
@@ -1,189 +0,0 @@
-;(function () { 'use strict';
-let Crypto = require('crypto');
-let WebSocket = require('ws');
-let LogStore = require('./storage/LogStore');
-
-let LAG_MAX_BEFORE_DISCONNECT = 30000;
-let LAG_MAX_BEFORE_PING = 15000;
-let HISTORY_KEEPER_ID = "_HISTORY_KEEPER_";
-
-let dropUser;
-
-let now = function () { return (new Date()).getTime(); };
-
-let sendMsg = function (ctx, user, msg) {
-    try {
-        console.log('<' + JSON.stringify(msg));
-        user.socket.send(JSON.stringify(msg));
-    } catch (e) {
-        console.log(e.stack);
-        dropUser(ctx, user);
-    }
-};
-
-let sendChannelMessage = function (ctx, channel, msgStruct) {
-    msgStruct.unshift(0);
-    channel.forEach(function (user) { sendMsg(ctx, user, msgStruct); });
-    if (msgStruct[2] === 'MSG') {
-        ctx.store.message(channel.id, JSON.stringify(msgStruct), function () { });
-    }
-};
-
-dropUser = function (ctx, user) {
-    if (user.socket.readyState !== WebSocket.CLOSING
-        && user.socket.readyState !== WebSocket.CLOSED)
-    {
-        try {
-            user.socket.close();
-        } catch (e) {
-            console.log("Failed to disconnect ["+user.id+"], attempting to terminate");
-            try {
-                user.socket.terminate();
-            } catch (ee) {
-                console.log("Failed to terminate ["+user.id+"]  *shrug*");
-            }
-        }
-    }
-    delete ctx.users[user.id];
-    Object.keys(ctx.channels).forEach(function (chanName) {
-        let chan = ctx.channels[chanName];
-        let idx = chan.indexOf(user);
-        if (idx < 0) { return; }
-        console.log("Removing ["+user.id+"] from channel ["+chanName+"]");
-        chan.splice(idx, 1);
-        if (chan.length === 0) {
-            console.log("Removing empty channel ["+chanName+"]");
-            delete ctx.channels[chanName];
-        } else {
-            sendChannelMessage(ctx, chan, [user.id, 'LEAVE', chanName, 'Quit: [ dropUser() ]']);
-        }
-    });
-};
-
-let getHistory = function (ctx, channelName, handler) {
-    ctx.store.getMessages(channelName, function (msgStr) { handler(JSON.parse(msgStr)); });
-};
-
-let randName = function () { return Crypto.randomBytes(16).toString('hex'); };
-
-let handleMessage = function (ctx, user, msg) {
-    let json = JSON.parse(msg);
-    let seq = json.shift();
-    let cmd = json[0];
-    let obj = json[1];
-
-    user.timeOfLastMessage = now();
-    user.pingOutstanding = false;
-
-    if (cmd === 'JOIN') {
-        /*if (obj && obj.length !== 32) {
-            sendMsg(ctx, user, [seq, 'ERROR', 'ENOENT', obj]);
-            return;
-        }*/
-        let chanName = obj || randName();
-        let chan = ctx.channels[chanName] = ctx.channels[chanName] || [];
-        chan.id = chanName;
-        sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'JOIN', chanName]);
-        chan.forEach(function (u) { sendMsg(ctx, user, [0, u.id, 'JOIN', chanName]); });
-        chan.push(user);
-        sendChannelMessage(ctx, chan, [user.id, 'JOIN', chanName]);
-        return;
-    }
-    if (cmd === 'MSG') {
-        if (obj === HISTORY_KEEPER_ID) {
-            let parsed;
-            try { parsed = JSON.parse(json[2]); } catch (err) { return; }
-            if (parsed[0] === 'GET_HISTORY') {
-                console.log('getHistory ' + parsed[1]);
-                getHistory(ctx, parsed[1], function (msg) {
-                    sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)]);
-                });
-                sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, 0]);
-            }
-            return;
-        }
-        if (obj && !ctx.channels[obj] && !ctx.users[obj]) {
-            sendMsg(ctx, user, [seq, 'ERROR', 'ENOENT', obj]);
-            return;
-        }
-        let target;
-        json.unshift(user.id);
-        if ((target = ctx.channels[obj])) {
-            sendChannelMessage(ctx, target, json);
-            return;
-        }
-        if ((target = ctx.users[obj])) {
-            json.unshift(0);
-            sendMsg(ctx, target, json);
-            return;
-        }
-    }
-    if (cmd === 'LEAVE') {
-        let err;
-        let chan;
-        let idx;
-        if (!obj) { err = 'EINVAL'; }
-        if (!err && !(chan = ctx.channels[obj])) { err = 'ENOENT'; }
-        if (!err && (idx = chan.indexOf(user)) === -1) { err = 'NOT_IN_CHAN'; }
-        if (err) {
-            sendMsg(ctx, user, [seq, 'ERROR', err]);
-            return;
-        }
-        json.unshift(user.id);
-        sendChannelMessage(ctx, chan, [user.id, 'LEAVE', chan.id]);
-        chan.splice(idx, 1);
-    }
-    if (cmd === 'PING') {
-        sendMsg(ctx, user, [seq, 'PONG', obj]);
-        return;
-    }
-};
-
-let run = module.exports.run = function (storage, socketServer) {
-    let ctx = {
-        users: {},
-        channels: {},
-        store: LogStore.create('messages.log', storage)
-    };
-    setInterval(function () {
-        Object.keys(ctx.users).forEach(function (userId) {
-            let u = ctx.users[userId];
-            if (now() - u.timeOfLastMessage > LAG_MAX_BEFORE_DISCONNECT) {
-                dropUser(ctx, u);
-            } else if (!u.pingOutstanding && now() - u.timeOfLastMessage > LAG_MAX_BEFORE_PING) {
-                sendMsg(ctx, u, [0, 'PING', now()]);
-                u.pingOutstanding = true;
-            }
-        });
-    }, 5000);
-    socketServer.on('connection', function(socket) {
-        if(socket.upgradeReq.url !== '/cryptpad_websocket') { return; }
-        let conn = socket.upgradeReq.connection;
-        let user = {
-            addr: conn.remoteAddress + '|' + conn.remotePort,
-            socket: socket,
-            id: randName(),
-            timeOfLastMessage: now(),
-            pingOutstanding: false
-        };
-        ctx.users[user.id] = user;
-        sendMsg(ctx, user, [0, 'IDENT', user.id]);
-        socket.on('message', function(message) {
-            console.log('>'+message);
-            try {
-                handleMessage(ctx, user, message);
-            } catch (e) {
-                console.log(e.stack);
-                dropUser(ctx, user);
-            }
-        });
-        socket.on('close', function (evt) {
-            for (let userId in ctx.users) {
-                if (ctx.users[userId].socket === socket) {
-                    dropUser(ctx, ctx.users[userId]);
-                }
-            }
-        });
-    });
-};
-}());

From a9fba2cbabb21f3c8725246166c31f0994df756c Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 20 Apr 2016 18:08:01 +0200
Subject: [PATCH 104/257] Ok lets try some automated testing!

---
 .travis.yml  | 17 +++++++++++++++--
 package.json |  3 ++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ef74d46b2..21eb513b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,19 @@ branches:
   only:
       - master
       - diffdom
+      - beta
+      - netflux
       node_js:
-        - "0.12"
-
+        - "4.2.1"
+before_script:
+  - cp config.js.dist
+  - npm install
+  - npm install bower
+  - ./node_modules/bower/bin/bower install
+  - node ./server.js &
+  - sleep 2
+addons:
+  sauce_connect:
+    username: "cjdelisle"
+    access_key:
+      secure: "pgGh8YGXLPq6fpdwwK2jnjRtwXPbVWQ/HIFvwX7E6HBpzxxcF2edE8sCdonWW9TP2LQisZFmVLqoSnZWMnjBr2CBAMKMFvaHQDJDQCo4v3BXkID7KgqyKmNcwW+FPfSJ5MxNBro8/GE/awkhZzJLYGUTS5zi/gVuIUwdi6cHI8s="
diff --git a/package.json b/package.json
index ccc7b682b..387a5df98 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
     "nthen": "~0.1.0"
   },
   "devDependencies": {
-    "jshint": "~2.9.1"
+    "jshint": "~2.9.1",
+    "selenium-webdriver": "^2.53.1"
   },
   "scripts": {
       "lint": "jshint --config .jshintrc --exclude-path .jshintignore ."

From cf4601281bd033f18abb1977d85a3182e6a61e0d Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 20 Apr 2016 18:10:20 +0200
Subject: [PATCH 105/257] make .travis.yml look valid

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 21eb513b4..f6ce8001b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language: node_js
 branches:
   only:
-      - master
-      - diffdom
-      - beta
-      - netflux
-      node_js:
-        - "4.2.1"
+    - master
+    - diffdom
+    - beta
+    - netflux
+node_js:
+  - "4.2.1"
 before_script:
   - cp config.js.dist
   - npm install

From b16e53505ffacc5504b14b0fb08765d8e77a605a Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 20 Apr 2016 18:13:55 +0200
Subject: [PATCH 106/257] It's good to say where the target of your copy
 command is

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f6ce8001b..69e9cb72d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ branches:
 node_js:
   - "4.2.1"
 before_script:
-  - cp config.js.dist
+  - cp config.js.dist config.js
   - npm install
   - npm install bower
   - ./node_modules/bower/bin/bower install

From 9498937b43157cad8db9bb7028850ffdbcb7c412 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 18:15:17 +0200
Subject: [PATCH 107/257] add a FIXME to the assert page

tests were failing (unnecessarily) on Chrome
---
 www/assert/main.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/www/assert/main.js b/www/assert/main.js
index 6fe063385..840cdbe29 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -1,9 +1,11 @@
+require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/bower_components/jquery/dist/jquery.min.js',
     '/common/hyperjson.js', // serializing classes as an attribute
     '/common/hyperscript.js', // using setAttribute
-    '/common/TextPatcher.js'
-], function (jQuery, Hyperjson, Hyperscript, TextPatcher) {
+    '/common/TextPatcher.js',
+    'json.sortify',
+], function (jQuery, Hyperjson, Hyperscript, TextPatcher, JSONSortify) {
     var $ = window.jQuery;
     window.Hyperjson = Hyperjson;
     window.Hyperscript = Hyperscript;
@@ -38,6 +40,10 @@ define([
 
     var $body = $('body');
 
+    /*  FIXME
+        Chrome reorganizes your HTML such that id and class are in a opposite
+        orders. We need to do an equality check on the hyperjson, outerHTML
+        differences are not informative. */
     var roundTrip = function (target) {
         assert(function () {
             var hjson = Hyperjson.fromDOM(target);

From 1d70335228f1eae7656b9515394ce093259b9ad2 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 18:27:20 +0200
Subject: [PATCH 108/257] provide all callbacks before starting

---
 www/common/RealtimeTextSocket.js |  4 ++--
 www/p/main.js                    | 28 +++++++++-------------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/www/common/RealtimeTextSocket.js b/www/common/RealtimeTextSocket.js
index 944d7f84a..28012cce8 100644
--- a/www/common/RealtimeTextSocket.js
+++ b/www/common/RealtimeTextSocket.js
@@ -222,8 +222,8 @@ define([
                 verbose(message);
                 allMessages.push(message);
                 if (!initializing) {
-                    if (toReturn.onLocal) {
-                        toReturn.onLocal();
+                    if (config.onLocal) {
+                        config.onLocal();
                     }
                 }
                 realtime.message(message);
diff --git a/www/p/main.js b/www/p/main.js
index 307bc979d..31313b6c7 100644
--- a/www/p/main.js
+++ b/www/p/main.js
@@ -291,25 +291,14 @@ define([
                 toolbar.failed();
             };
 
-            var rti = module.realtimeInput = realtimeInput.start(realtimeOptions);
-
-
-            /*  It's incredibly important that you assign 'rti.onLocal'
-                It's used inside of realtimeInput to make sure that all changes
-                make it into chainpad.
-
-                It's being assigned this way because it can't be passed in, and
-                and can't be easily returned from realtime input without making
-                the code less extensible.
-            */
-            var propogate = rti.onLocal = function () {
+            var onLocal = realtimeOptions.onLocal = function () {
+                if (initializing) { return; }
                 var shjson = stringifyDOM(inner);
-                if (!rti.patchText(shjson)) {
-                    return;
-                }
-                rti.onEvent(shjson);
+                rti.patchText(shjson);
             };
 
+            var rti = module.realtimeInput = realtimeInput.start(realtimeOptions);
+
             /* hitting enter makes a new line, but places the cursor inside
                 of the 
     instead of the 
    . This makes it such that you
                 cannot type until you click, which is rather unnacceptable.
@@ -322,12 +311,13 @@ define([
             var easyTest = window.easyTest = function () {
                 cursor.update();
                 var start = cursor.Range.start;
-                var test = TypingTest.testInput(inner, start.el, start.offset, propogate);
-                propogate();
+                var test = TypingTest.testInput(inner, start.el, start.offset, onLocal);
+                // why twice?
+                onLocale();
                 return test;
             };
 
-            editor.on('change', propogate);
+            editor.on('change', onLocal);
         });
     };
 

From 0769e50414aa91b66f1488dc4dfb59f03e7a28fe Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 20 Apr 2016 18:56:18 +0200
Subject: [PATCH 109/257] move TextPatcher to highest application layer

---
 www/common/realtime-input.js | 27 ++++++++----------
 www/pad/main.js              | 55 +++++++++++++++++++-----------------
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index ed665e9e3..ed982580e 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -18,11 +18,10 @@ define([
     '/common/messages.js',
     '/common/netflux-client.js',
     '/common/crypto.js',
-    '/common/TextPatcher.js',
     '/common/es6-promise.min.js',
     '/common/chainpad.js',
     '/bower_components/jquery/dist/jquery.min.js',
-], function (Messages, Netflux, Crypto, TextPatcher) {
+], function (Messages, Netflux, Crypto) {
     var $ = window.jQuery;
     var ChainPad = window.ChainPad;
     var PARANOIA = true;
@@ -117,6 +116,7 @@ define([
             initializing = false;
 
             // execute an onReady callback if one was supplied
+            // FIXME this should be once the chain has synced
             if (config.onReady) {
                 config.onReady({
                     realtime: realtime
@@ -227,13 +227,6 @@ define([
             // Open a Chainpad session
             realtime = createRealtime();
 
-            toReturn.onEvent = function (newText) {
-                // assert to show that we're not out of sync
-                if (realtime.getUserDoc() !== newText) {
-                    warn("realtime.getUserDoc() !== newText");
-                }
-            };
-
             // Sending a message...
             realtime.onMessage(function(message) {
                 // Filter messages sent by Chainpad to make it compatible with Netflux
@@ -265,12 +258,6 @@ define([
             wc.history_keeper = hc;
             if (hc) { network.sendto(hc, JSON.stringify(['GET_HISTORY', wc.id])); }
 
-
-            toReturn.patchText = TextPatcher.create({
-                realtime: realtime,
-                logging: true
-            });
-
             realtime.start();
         };
 
@@ -290,6 +277,16 @@ define([
         Netflux.connect(websocketUrl).then(function(network) {
             // pass messages that come out of netflux into our local handler
 
+            network.on('disconnect', function (evt) {
+                // TODO also abort if Netflux times out
+                // that will be managed in Netflux-client.js
+                if (config.onAbort) {
+                    config.onAbort({
+                        reason: evt.reason
+                    });
+                }
+            });
+
             network.on('message', function (msg, sender) { // Direct message
                 var wchan = findChannelById(network.webChannels, channel);
                 if(wchan) {
diff --git a/www/pad/main.js b/www/pad/main.js
index 9429e552c..901fce1c5 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -11,15 +11,18 @@ define([
     '/common/json-ot.js',
     '/common/TypingTests.js',
     'json.sortify',
+    '/common/TextPatcher.js',
     '/bower_components/diff-dom/diffDOM.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest, JSONSortify) {
+], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript,
+    Toolbar, Cursor, JsonOT, TypingTest, JSONSortify, TextPatcher) {
+
     var $ = window.jQuery;
     var ifrw = $('#pad-iframe')[0].contentWindow;
     var Ckeditor; // to be initialized later...
     var DiffDom = window.diffDOM;
-    
+
     var stringify = function (obj) {
         return JSONSortify(obj);
     };
@@ -288,7 +291,7 @@ define([
                 var shjson2 = stringifyDOM(inner);
                 if (shjson2 !== shjson) {
                     console.error("shjson2 !== shjson");
-                    module.realtimeInput.patchText(shjson2);
+                    module.patchText(shjson2);
                 }
             };
 
@@ -304,12 +307,21 @@ define([
                 /* TODO handle disconnects and such*/
             };
 
+            // this should only ever get called once, when the chain syncs
             var onReady = realtimeOptions.onReady = function (info) {
-                console.log("Unlocking editor");
-                initializing = false;
-                setEditable(true);
+                module.patchText = TextPatcher.create({
+                    realtime: info.realtime,
+                    logging: false,
+                });
+
+                module.realtime = info.realtime;
+
                 var shjson = info.realtime.getUserDoc();
                 applyHjson(shjson);
+
+                console.log("Unlocking editor");
+                setEditable(true);
+                initializing = false;
             };
 
             var onAbort = realtimeOptions.onAbort = function (info) {
@@ -320,21 +332,9 @@ define([
                 toolbar.failed();
             };
 
+            var onLocal = realtimeOptions.onLocal = function () {
+                if (initializing) { return; }
 
-
-
-
-            var rti = module.realtimeInput = realtimeInput.start(realtimeOptions);
-
-            /*  It's incredibly important that you assign 'rti.onLocal'
-                It's used inside of realtimeInput to make sure that all changes
-                make it into chainpad.
-
-                It's being assigned this way because it can't be passed in, and
-                and can't be easily returned from realtime input without making
-                the code less extensible.
-            */
-            var propogate = rti.onLocal = function () {
                 // serialize your DOM into an object
                 var hjson = Hyperjson.fromDOM(inner, isNotMagicLine, brFilter);
 
@@ -344,12 +344,15 @@ define([
                 }
                 // stringify the json and send it into chainpad
                 var shjson = stringify(hjson);
-                if (!rti.patchText(shjson)) {
-                    return;
+                module.patchText(shjson);
+
+                if (module.realtime.getUserDoc() !== shjson) {
+                    console.error("realtime.getUserDoc() !== shjson");
                 }
-                rti.onEvent(shjson);
             };
 
+            var rti = module.realtimeInput = realtimeInput.start(realtimeOptions);
+
             /* hitting enter makes a new line, but places the cursor inside
                 of the 
     instead of the 
    . This makes it such that you
                 cannot type until you click, which is rather unnacceptable.
@@ -359,7 +362,7 @@ define([
                 the first such keypress will not be inserted into the P. */
             inner.addEventListener('keydown', cursor.brFix);
 
-            editor.on('change', propogate);
+            editor.on('change', onLocal);
 
             // export the typing tests to the window.
             // call like `test = easyTest()`
@@ -367,8 +370,8 @@ define([
             var easyTest = window.easyTest = function () {
                 cursor.update();
                 var start = cursor.Range.start;
-                var test = TypingTest.testInput(inner, start.el, start.offset, propogate);
-                propogate();
+                var test = TypingTest.testInput(inner, start.el, start.offset, onLocal);
+                onLocal();
                 return test;
             };
         });

From 2a0b3a007d0daada3438897c76898a86d9f485b8 Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 20 Apr 2016 18:58:02 +0200
Subject: [PATCH 110/257] Added testing and auto-testing with selenium

---
 .gitignore      |  1 +
 TestSelenium.js | 30 ++++++++++++++++++++++++++++++
 package.json    |  3 ++-
 readme.md       |  9 ++++++++-
 4 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 TestSelenium.js

diff --git a/.gitignore b/.gitignore
index e4c4f537c..2d0cd09d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ customization
 *.db
 /customize/
 messages.log
+.DS_Store
diff --git a/TestSelenium.js b/TestSelenium.js
new file mode 100644
index 000000000..55fb2a438
--- /dev/null
+++ b/TestSelenium.js
@@ -0,0 +1,30 @@
+'use strict';
+const WebDriver = require("selenium-webdriver");
+
+let driver;
+if (process.env.SAUCE_USERNAME != undefined) {
+    driver = new WebDriver.Builder().usingServer(
+        'http://'+ process.env.SAUCE_USERNAME+':'+process.env.SAUCE_ACCESS_KEY+'@ondemand.saucelabs.com:80/wd/hub'
+    ).withCapabilities({
+        "tunnel-identifier": process.env.TRAVIS_JOB_NUMBER,
+        "build": process.env.TRAVIS_BUILD_NUMBER,
+        "username": process.env.SAUCE_USERNAME,
+        "accessKey": process.env.SAUCE_ACCESS_KEY,
+        "browserName": "chrome"
+    }).build();
+} else {
+    driver = new WebDriver.Builder().withCapabilities({ browserName: "chrome" }).build();
+}
+
+driver.get('http://localhost:3000/assert/');
+const report = driver.wait(WebDriver.until.elementLocated(WebDriver.By.className("report")), 5000);
+report.getAttribute("class").then(function (cls) {
+    driver.quit();
+    if (!cls) {
+        throw new Error("cls is null");
+    } else if (cls.indexOf("failure") !== -1) {
+        throw new Error("cls contains the word failure");
+    } else if (cls.indexOf("success") === -1) {
+        throw new Error("cls does not contain the word success");
+    }
+});
diff --git a/package.json b/package.json
index 387a5df98..bed5b49ba 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "selenium-webdriver": "^2.53.1"
   },
   "scripts": {
-      "lint": "jshint --config .jshintrc --exclude-path .jshintignore ."
+      "lint": "jshint --config .jshintrc --exclude-path .jshintignore .",
+      "test": "node TestSelenium.js"
   }
 }
diff --git a/readme.md b/readme.md
index af024b64d..d3a2868fa 100644
--- a/readme.md
+++ b/readme.md
@@ -25,7 +25,7 @@ To install:
     npm install -g bower ## if necessary
     bower install
 
-    ## copy config.js.dist to config.js 
+    ## copy config.js.dist to config.js
     cp config.js.dist config.js
 
     ## modify configuration to use your own mongodb instance
@@ -67,6 +67,13 @@ rm -rf ./cryptpad.db
 
 If you are using the mongodb adaptor, [drop the relevant collection](https://docs.mongodb.org/manual/reference/method/db.collection.drop/#db.collection.drop).
 
+## Testing
+
+To test CryptPad, go to http://your.server:3000/assert/
+
+You can use WebDriver to run this test automatically by running TestSelenium.js but you will need chromedriver installed.
+If you use Mac, you can `brew install chromedriver`.
+
 ## Security
 
 CryptPad is *private*, not *anonymous*. Privacy protects your data, anonymity protects you.

From 8709311a7eaefe89d0752ebf1fabacb18e3b755f Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 20 Apr 2016 19:18:31 +0200
Subject: [PATCH 111/257] Lets try running with multiple types of browsers

---
 .travis.yml     | 4 ++++
 TestSelenium.js | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 69e9cb72d..9f36eb562 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,8 @@
 language: node_js
+env:
+  matrix:
+    - "TEST_SUITE=saucelabs BROWSER='firefox:19:Windows 2012'"
+    - "TEST_SUITE=saucelabs BROWSER='chrome::Windows 2008'"
 branches:
   only:
     - master
diff --git a/TestSelenium.js b/TestSelenium.js
index 55fb2a438..ece344cd2 100644
--- a/TestSelenium.js
+++ b/TestSelenium.js
@@ -3,6 +3,7 @@ const WebDriver = require("selenium-webdriver");
 
 let driver;
 if (process.env.SAUCE_USERNAME != undefined) {
+    const browserArray = process.env.BROWSER.split(':');
     driver = new WebDriver.Builder().usingServer(
         'http://'+ process.env.SAUCE_USERNAME+':'+process.env.SAUCE_ACCESS_KEY+'@ondemand.saucelabs.com:80/wd/hub'
     ).withCapabilities({
@@ -10,8 +11,7 @@ if (process.env.SAUCE_USERNAME != undefined) {
         "build": process.env.TRAVIS_BUILD_NUMBER,
         "username": process.env.SAUCE_USERNAME,
         "accessKey": process.env.SAUCE_ACCESS_KEY,
-        "browserName": "chrome"
-    }).build();
+    }).forBrowser(browserArray[0], browserArray[1], browserArray[2]).build();
 } else {
     driver = new WebDriver.Builder().withCapabilities({ browserName: "chrome" }).build();
 }

From 2d7309b04f2276ff6c9bd341ec4faf59d1136581 Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 20 Apr 2016 20:16:51 +0200
Subject: [PATCH 112/257] minor refactoring and hopefully we will be able to
 get the actual links to the tests on SauceLabs

---
 .travis.yml     |  5 +++--
 TestSelenium.js | 50 +++++++++++++++++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9f36eb562..e9021b45b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: node_js
 env:
   matrix:
-    - "TEST_SUITE=saucelabs BROWSER='firefox:19:Windows 2012'"
-    - "TEST_SUITE=saucelabs BROWSER='chrome::Windows 2008'"
+    - "BROWSER='firefox:19:Windows 2012'"
+    - "BROWSER='chrome::Windows 2008'"
 branches:
   only:
     - master
@@ -12,6 +12,7 @@ branches:
 node_js:
   - "4.2.1"
 before_script:
+  - npm run-script lint
   - cp config.js.dist config.js
   - npm install
   - npm install bower
diff --git a/TestSelenium.js b/TestSelenium.js
index ece344cd2..cac4ffe66 100644
--- a/TestSelenium.js
+++ b/TestSelenium.js
@@ -1,14 +1,15 @@
-'use strict';
-const WebDriver = require("selenium-webdriver");
+/* global process */
+var WebDriver = require("selenium-webdriver");
+var Http = require("http");
 
-let driver;
-if (process.env.SAUCE_USERNAME != undefined) {
-    const browserArray = process.env.BROWSER.split(':');
+var driver;
+if (process.env.SAUCE_USERNAME !== undefined) {
+    var browserArray = process.env.BROWSER.split(':');
     driver = new WebDriver.Builder().usingServer(
         'http://'+ process.env.SAUCE_USERNAME+':'+process.env.SAUCE_ACCESS_KEY+'@ondemand.saucelabs.com:80/wd/hub'
     ).withCapabilities({
         "tunnel-identifier": process.env.TRAVIS_JOB_NUMBER,
-        "build": process.env.TRAVIS_BUILD_NUMBER,
+        "build": process.env.TRAVIS_JOB_NUMBER,
         "username": process.env.SAUCE_USERNAME,
         "accessKey": process.env.SAUCE_ACCESS_KEY,
     }).forBrowser(browserArray[0], browserArray[1], browserArray[2]).build();
@@ -16,15 +17,36 @@ if (process.env.SAUCE_USERNAME != undefined) {
     driver = new WebDriver.Builder().withCapabilities({ browserName: "chrome" }).build();
 }
 
+var logSauceLink = function (cb) {
+    Http.request("https://saucelabs.com/rest/v1.1/" + process.env.SAUCE_USERNAME +
+            "/jobs?auto_only=true&full=true&limit=50&subaccounts=true", function (resp) {
+        var str = '';
+        resp.on('data', function (chunk) { str += chunk; });
+        resp.on('end', function () {
+            JSON.parse(str).jobs.forEach(function (j) {
+                var banner = new Array(80).join('=');
+                if (j.build === process.env.TRAVIS_JOB_NUMBER) {
+                    console.log("\n\n\n" + banner);
+                    console.log("SauceLabs Link: " + j.video_url.replace(/\/video\.flv$/), '');
+                    console.log(banner + "\n\n\n");
+                }
+            });
+            cb();
+        });
+    });
+};
+
 driver.get('http://localhost:3000/assert/');
-const report = driver.wait(WebDriver.until.elementLocated(WebDriver.By.className("report")), 5000);
+var report = driver.wait(WebDriver.until.elementLocated(WebDriver.By.className("report")), 5000);
 report.getAttribute("class").then(function (cls) {
     driver.quit();
-    if (!cls) {
-        throw new Error("cls is null");
-    } else if (cls.indexOf("failure") !== -1) {
-        throw new Error("cls contains the word failure");
-    } else if (cls.indexOf("success") === -1) {
-        throw new Error("cls does not contain the word success");
-    }
+    logSauceLink(function () {
+        if (!cls) {
+            throw new Error("cls is null");
+        } else if (cls.indexOf("failure") !== -1) {
+            throw new Error("cls contains the word failure");
+        } else if (cls.indexOf("success") === -1) {
+            throw new Error("cls does not contain the word success");
+        }
+    });
 });

From eadca92e98b2d933e6a25b9d11280e118fda0d3b Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 20 Apr 2016 20:20:29 +0200
Subject: [PATCH 113/257] don't repeat travis calling npm install but do use
 https for https urls

---
 .travis.yml     | 1 -
 TestSelenium.js | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e9021b45b..bc9ee71df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ node_js:
 before_script:
   - npm run-script lint
   - cp config.js.dist config.js
-  - npm install
   - npm install bower
   - ./node_modules/bower/bin/bower install
   - node ./server.js &
diff --git a/TestSelenium.js b/TestSelenium.js
index cac4ffe66..87566622f 100644
--- a/TestSelenium.js
+++ b/TestSelenium.js
@@ -1,6 +1,6 @@
 /* global process */
 var WebDriver = require("selenium-webdriver");
-var Http = require("http");
+var Https = require("https");
 
 var driver;
 if (process.env.SAUCE_USERNAME !== undefined) {
@@ -18,7 +18,7 @@ if (process.env.SAUCE_USERNAME !== undefined) {
 }
 
 var logSauceLink = function (cb) {
-    Http.request("https://saucelabs.com/rest/v1.1/" + process.env.SAUCE_USERNAME +
+    Https.request("https://saucelabs.com/rest/v1.1/" + process.env.SAUCE_USERNAME +
             "/jobs?auto_only=true&full=true&limit=50&subaccounts=true", function (resp) {
         var str = '';
         resp.on('data', function (chunk) { str += chunk; });

From e8eb677b0bb00afd6858e59e1a5ac0b56cfd2b5d Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 20 Apr 2016 20:25:30 +0200
Subject: [PATCH 114/257] debugging on the CI

---
 TestSelenium.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TestSelenium.js b/TestSelenium.js
index 87566622f..85a0575f5 100644
--- a/TestSelenium.js
+++ b/TestSelenium.js
@@ -31,6 +31,7 @@ var logSauceLink = function (cb) {
                     console.log(banner + "\n\n\n");
                 }
             });
+            console.log(str);
             cb();
         });
     });

From 2cab588d06ec710bd80095835f6eaf0fe0a86fa6 Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Wed, 20 Apr 2016 20:37:48 +0200
Subject: [PATCH 115/257] Remove the request to SauceLab's broken rest API
 which seems to explode when you hit it while a job is ongoing

---
 TestSelenium.js | 37 +++++++------------------------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/TestSelenium.js b/TestSelenium.js
index 85a0575f5..2195e9ce6 100644
--- a/TestSelenium.js
+++ b/TestSelenium.js
@@ -1,6 +1,5 @@
 /* global process */
 var WebDriver = require("selenium-webdriver");
-var Https = require("https");
 
 var driver;
 if (process.env.SAUCE_USERNAME !== undefined) {
@@ -17,37 +16,15 @@ if (process.env.SAUCE_USERNAME !== undefined) {
     driver = new WebDriver.Builder().withCapabilities({ browserName: "chrome" }).build();
 }
 
-var logSauceLink = function (cb) {
-    Https.request("https://saucelabs.com/rest/v1.1/" + process.env.SAUCE_USERNAME +
-            "/jobs?auto_only=true&full=true&limit=50&subaccounts=true", function (resp) {
-        var str = '';
-        resp.on('data', function (chunk) { str += chunk; });
-        resp.on('end', function () {
-            JSON.parse(str).jobs.forEach(function (j) {
-                var banner = new Array(80).join('=');
-                if (j.build === process.env.TRAVIS_JOB_NUMBER) {
-                    console.log("\n\n\n" + banner);
-                    console.log("SauceLabs Link: " + j.video_url.replace(/\/video\.flv$/), '');
-                    console.log(banner + "\n\n\n");
-                }
-            });
-            console.log(str);
-            cb();
-        });
-    });
-};
-
 driver.get('http://localhost:3000/assert/');
 var report = driver.wait(WebDriver.until.elementLocated(WebDriver.By.className("report")), 5000);
 report.getAttribute("class").then(function (cls) {
     driver.quit();
-    logSauceLink(function () {
-        if (!cls) {
-            throw new Error("cls is null");
-        } else if (cls.indexOf("failure") !== -1) {
-            throw new Error("cls contains the word failure");
-        } else if (cls.indexOf("success") === -1) {
-            throw new Error("cls does not contain the word success");
-        }
-    });
+    if (!cls) {
+        throw new Error("cls is null");
+    } else if (cls.indexOf("failure") !== -1) {
+        throw new Error("cls contains the word failure");
+    } else if (cls.indexOf("success") === -1) {
+        throw new Error("cls does not contain the word success");
+    }
 });

From 9efcc443cd516b1487ab033c793dfb33285b5b5c Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 12:16:11 +0200
Subject: [PATCH 116/257] add 'format' to TextPatcher's API

---
 www/common/TextPatcher.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/www/common/TextPatcher.js b/www/common/TextPatcher.js
index c5720a53d..f815fbc97 100644
--- a/www/common/TextPatcher.js
+++ b/www/common/TextPatcher.js
@@ -54,6 +54,15 @@ var patch = function (ctx, op) {
     if (op.toInsert) { ctx.insert(op.offset, op.toInsert); }
 };
 
+/*  format has the same signature as log, but doesn't log to the console
+    use it to get the pretty version of a diff */
+var format = function (text, op) {
+    return op?{
+        insert: op.toInsert,
+        remove: text.slice(op.offset, op.offset + op.toRemove)
+    }: { insert: '', remove: '' };
+};
+
 /*  log accepts a string and an operation, and prints an object to the console
     the object will display the content which is to be removed, and the content
     which will be inserted in its place.
@@ -62,10 +71,7 @@ var patch = function (ctx, op) {
 */
 var log = function (text, op) {
     if (!op) { return; }
-    console.log({
-        insert: op.toInsert,
-        remove: text.slice(op.offset, op.offset + op.toRemove)
-    });
+    console.log(format(text, op));
 };
 
 /* applyChange takes:
@@ -129,8 +135,9 @@ return {
     create: create, // create a TextPatcher object
     diff: diff, // diff two strings
     patch: patch, // apply an operation to a chainpad's realtime facade
+    format: format,
     log: log, // print the components of an operation
     transformCursor: transformCursor, // transform the position of a cursor
-    applyChange: applyChange // a convenient wrapper around diff/log/patch
+    applyChange: applyChange, // a convenient wrapper around diff/log/patch
 };
 });

From 980ff8a0ca31b4c16050243a1bba2526f98dd43c Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 12:16:48 +0200
Subject: [PATCH 117/257] Fix a test that was failing on chrome

it failed for reasons which are irrelevant to our application
---
 www/assert/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/assert/index.html b/www/assert/index.html
index e271750f5..ea6628bd8 100644
--- a/www/assert/index.html
+++ b/www/assert/index.html
@@ -30,7 +30,7 @@
 
    Test 1
    
 
    class strings
    
 
-
    pewpewpew
    
+
    pewpewpew
    
 
 
    Test 1
    
 
    paragraph text
    

From a18c793f986dec96de29039f14f2a65417cbb642 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 14:53:53 +0200
Subject: [PATCH 118/257] use latest hyperjson

---
 www/common/hyperjson.js | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/www/common/hyperjson.js b/www/common/hyperjson.js
index 9a363bb79..b9dc87b9b 100644
--- a/www/common/hyperjson.js
+++ b/www/common/hyperjson.js
@@ -4,16 +4,6 @@ define([], function () {
         return Object.prototype.toString.call(A)==='[object Array]';
     };
 
-    var parseStyle = function(el){
-      var style = el.style;
-      var output = {};
-      for (var i = 0; i < style.length; ++i) {
-        var item = style.item(i);
-        output[item] = style[item];
-      }
-      return output;
-    };
-
     var callOnHyperJSON = function (hj, cb) {
         var children;
 
@@ -23,9 +13,7 @@ define([], function () {
                     // if the child is an array, recurse
                     return callOnHyperJSON(child, cb);
                 } else if (typeof (child) === 'string') {
-                    // string nodes have leading and trailing quotes
-                    // don't strip them!
-                    return child; //child.replace(/(^"|"$)/g,"");
+                    return child;
                 } else {
                     // the above branches should cover all methods
                     // if we hit this, there is a problem
@@ -39,16 +27,6 @@ define([], function () {
         return cb(hj[0], hj[1], children);
     };
 
-    var classify = function (token) {
-        return '.' + token.trim();
-    };
-
-    var isValidClass = function (x) {
-        if (x && /\S/.test(x)) {
-            return true;
-        }
-    };
-
     var isTruthy = function (x) {
         return x;
     };
@@ -71,15 +49,10 @@ define([], function () {
 
         var i = 0;
         for(;i < el.attributes.length; i++){
-          var attr = el.attributes[i];
-          if(attr.name && attr.value){
-            if(attr.name === "style"){
-              attributes.style = parseStyle(el);
-            }
-            else{
-              attributes[attr.name] = attr.value;
+            var attr = el.attributes[i];
+            if(attr.name && attr.value){
+                attributes[attr.name] = attr.value;
             }
-          }
         }
 
         // this should never be longer than three elements

From 4d44661f3be0c4321706f483c7fc59a45913d91e Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 15:05:41 +0200
Subject: [PATCH 119/257] more correct tests

---
 www/assert/main.js | 116 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 98 insertions(+), 18 deletions(-)

diff --git a/www/assert/main.js b/www/assert/main.js
index 6fe063385..2b8a1de16 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -1,13 +1,21 @@
+require.config({
+    paths: {
+        'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify'
+    }
+});
+
 define([
     '/bower_components/jquery/dist/jquery.min.js',
     '/common/hyperjson.js', // serializing classes as an attribute
     '/common/hyperscript.js', // using setAttribute
-    '/common/TextPatcher.js'
-], function (jQuery, Hyperjson, Hyperscript, TextPatcher) {
+    '/common/TextPatcher.js',
+    'json.sortify',
+], function (jQuery, Hyperjson, Hyperscript, TextPatcher, Sortify) {
     var $ = window.jQuery;
     window.Hyperjson = Hyperjson;
     window.Hyperscript = Hyperscript;
     window.TextPatcher = TextPatcher;
+    window.Sortify = Sortify;
 
     var assertions = 0;
     var failed = false;
@@ -23,14 +31,16 @@ define([
 
     var assert = function (test, msg) {
         ASSERTS.push(function (i) {
-            if (test()) {
+            var returned = test();
+            if (returned === true) {
                 assertions++;
             } else {
                 failed = true;
                 failedOn = assertions;
                 failMessages.push({
                     test: i,
-                    message: msg
+                    message: msg,
+                    output: returned,
                 });
             }
         });
@@ -38,7 +48,69 @@ define([
 
     var $body = $('body');
 
-    var roundTrip = function (target) {
+    var HJSON_list = [
+        '["DIV#target",{},[["P#bang",{"class":" alice bob charlie has.dot"},["pewpewpew"]]]]',
+
+        '["DIV#quot",{},[["P",{},["\\"pewpewpew\\""]]]]',
+
+        '["DIV#widget",{},[["DIV",{"class":"cke_widget_wrapper cke_widget_block","contenteditable":"false","data-cke-display-name":"macro:velocity","data-cke-filter":"off","data-cke-widget-id":"0","data-cke-widget-wrapper":"1","tabindex":"-1"},[["DIV",{"class":"macro cke_widget_element","data-cke-widget-data":"%7B%22classes%22%3A%7B%22macro%22%3A1%7D%7D","data-cke-widget-keep-attr":"0","data-cke-widget-upcasted":"1","data-macro":"startmacro:velocity|-||-|Here is a macro","data-widget":"xwiki-macro"},[["P",{},["Here is a macro"]]]],["SPAN",{"class":"cke_reset cke_widget_drag_handler_container","style":"background: rgba(220, 220, 220, 0.5) url(\\"/customize/cryptofist_small.png\\") repeat scroll 0% 0%; top: -15px; left: 0px; display: block;"},[["IMG",{"class":"cke_reset cke_widget_drag_handler","data-cke-widget-drag-handler":"1","height":"15","src":"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw==","title":"Click and drag to move","width":"15"},[]]]]]]]]',
+
+    ];
+
+    var elementFilter = function () {
+        // pass everything
+        return true;
+    };
+
+    var attributeFilter = function (h) {
+        // don't filter anything
+        return h;
+    };
+
+    var HJSON_equal = function (shjson) {
+        assert(function () {
+            // parse your stringified Hyperjson
+            var hjson;
+
+            try {
+                hjson = JSON.parse(shjson);
+            } catch (e) {
+                console.log(e);
+                return false;
+            }
+
+            // turn it into a DOM
+            var DOM = Hyperjson.callOn(hjson, Hyperscript);
+
+            // turn it back into stringified Hyperjson, but apply filters
+            var shjson2 = Sortify(Hyperjson.fromDOM(DOM, elementFilter, attributeFilter));
+
+            var success = shjson === shjson2;
+
+            var op = TextPatcher.diff(shjson, shjson2);
+            //console.log(TextPatcher.format(shjson, op));
+
+            var diff = TextPatcher.format(shjson, op);
+
+            if (success) {
+                return true;
+            } else {
+                return  '

    insert: ' + diff.insert + '

    ' +
+                        'remove: ' + diff.remove + '

    ';
+            }
+        },  "expected hyperjson equality");
+    };
+
+    HJSON_list.map(HJSON_equal);
+
+    /*  FIXME
+        This test is not correct. It passes in Firefox, but fails in Chrome,
+        even though for our purposes the produced code is valid. Passing
+        `
    ` through the function yields
+        `
    `. This is the same element, but string
+        equality is not a correct metric.  */
+    var roundTrip = function (sel) {
+        var target = $(sel)[0];
         assert(function () {
             var hjson = Hyperjson.fromDOM(target);
             var cloned = Hyperjson.callOn(hjson, Hyperscript);
@@ -53,20 +125,22 @@ define([
                     B: cloned.outerHTML,
                     diff: op
                 };
-                console.log(JSON.stringify(window.DEBUG, null, 2));
-                TextPatcher.log(op);
+                //console.log(JSON.stringify(window.DEBUG, null, 2));
+                console.log("DIFF:");
+                TextPatcher.log(target.outerHTML, op);
             }
 
             return success;
         }, "Round trip serialization introduced artifacts.");
     };
 
-    [   '#target',
-        '#widget',
+    var HTML_list = [
+        '#target',
+        '#widget', // fails in Firefox 19?
         '#quot',
-    ].forEach(function (sel) {
-        roundTrip($(sel)[0]);
-    });
+    ];
+
+    HTML_list.forEach(roundTrip);
 
     var strungJSON = function (orig) {
         var result;
@@ -77,7 +151,7 @@ define([
     };
 
     [   '{"border":"1","style":{"width":"500px"}}',
-        '{"style":{"width":"500px"},"border":"1"}',
+        '{"style":"width: 500px;","border":"1"}',
     ].forEach(function (orig) {
         strungJSON(orig);
     });
@@ -104,14 +178,20 @@ define([
             str = out;
         });
         return str || '';
-    };
+        };
 
     var formatFailures = function () {
         var template = multiline(function () { /*
-
    -Failed on test number {{test}} with error:
-> "{{message}}"
-
    
+
    
+Failed on test number {{test}} with error message:
+"{{message}}" 
+
+
    
+
    
+The test returned:
+{{output}}
+
    
+
 
    
 
 */});

From ffbd428b8785ff4df0c477cda95d3bb581fa692a Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 15:06:03 +0200
Subject: [PATCH 120/257] better logging of browser fights

---
 www/p/main.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/www/p/main.js b/www/p/main.js
index 307bc979d..b2306aff2 100644
--- a/www/p/main.js
+++ b/www/p/main.js
@@ -255,12 +255,18 @@ define([
                         var op = TextPatcher.diff(shjson, shjson2);
                         // log the changes
                         TextPatcher.log(shjson, op);
+                        var sop = JSON.stringify(TextPatcher.format(shjson, op));
 
-                        var sop = JSON.stringify(op);
-
-                        if (module.fights.indexOf(sop) === -1) {
+                        var index = module.fights.indexOf(sop);
+                        if (index === -1) {
                             module.fights.push(sop);
                             console.log("Found a new type of browser disagreement");
+                            console.log("You can inspect the list in your " +
+                                "console at `REALTIME_MODULE.fights`");
+                            console.log(module.fights);
+                        } else {
+                            console.log("Encountered a known browser disagreement: " +
+                                "available at `REALTIME_MODULE.fights[%s]`", index);
                         }
                     }
                 }

From 565fb1d186d3946cbfada712fc26fcc516b040b1 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 15:40:29 +0200
Subject: [PATCH 121/257] include small snippets for preventing browser fights

---
 www/p/main.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/www/p/main.js b/www/p/main.js
index b2306aff2..89b6bef8c 100644
--- a/www/p/main.js
+++ b/www/p/main.js
@@ -60,6 +60,20 @@ define([
         return hj;
     };
 
+    /*  TODO integrate into flow to prevent browser fights over style */
+    var setStyle = function (elem, newStyleAttr) {
+        elem.setAttribute("data-chainpad-origstyle", newStyleAttr);
+        elem.setAttribute("style", newStyleAttr);
+        elem.setAttribute("data-chainpad-styleclone", elem.getAttribute("style"));
+    };
+
+    /*  TODO integrate into flow to prevent browser fights over style */
+    var getStyle = function (elem) {
+        var st = elem.getAttribute("style");
+        if (elem.getAttribute("data-chainpad-styleclone") !== st) { return st; }
+        return elem.getAttribute("data-chainpad-origstyle");
+    };
+
     var stringifyDOM = module.stringifyDOM = function (dom) {
         return stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter));
     };

From 04f6299938f11bf01f0f4ed19efc65517d1304e7 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 15:44:56 +0200
Subject: [PATCH 122/257] reconcile differences with netflux

---
 www/assert/main.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/www/assert/main.js b/www/assert/main.js
index 2b8a1de16..27223752d 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -1,9 +1,4 @@
-require.config({
-    paths: {
-        'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify'
-    }
-});
-
+require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/bower_components/jquery/dist/jquery.min.js',
     '/common/hyperjson.js', // serializing classes as an attribute
@@ -184,7 +179,7 @@ define([
         var template = multiline(function () { /*
 
    
 Failed on test number {{test}} with error message:
-"{{message}}" 
+"{{message}}"
 
 
    
 
    

From a527024a8c4efe4e32d42c85d97cbc8ad786a287 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 15:51:04 +0200
Subject: [PATCH 123/257] start on realtime form prototype

---
 www/form/index.html | 46 ++++++++++++++++++++++++++
 www/form/main.js    | 80 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 www/form/index.html
 create mode 100644 www/form/main.js

diff --git a/www/form/index.html b/www/form/index.html
new file mode 100644
index 000000000..aa5a39fc6
--- /dev/null
+++ b/www/form/index.html
@@ -0,0 +1,46 @@
+
+
+
+    
+    
+    
+    
+
+
+
+    
    
+        
    
+        
    
+
+        One
    
+        Two
    
+        Three
    
+
+        Checkbox One
    
+        Checkbox Two
    
+
+        Number
    
+
+        Ranges
    
+
+         Dropdowns
    
+
+        
    
+
+    
    
+
+
+
+
diff --git a/www/form/main.js b/www/form/main.js
new file mode 100644
index 000000000..ce756275e
--- /dev/null
+++ b/www/form/main.js
@@ -0,0 +1,80 @@
+define([
+    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    '/common/RealtimeTextarea.js',
+    '/common/messages.js',
+    '/common/crypto.js',
+    '/common/TextPatcher.js',
+    '/bower_components/jquery/dist/jquery.min.js',
+    '/customize/pad.js'
+], function (Config, Realtime, Messages, Crypto, TextPatcher) { 
+    var $ = window.jQuery;
+    $(window).on('hashchange', function() {
+        window.location.reload();
+    });
+    if (window.location.href.indexOf('#') === -1) {
+        window.location.href = window.location.href + '#' + Crypto.genKey();
+        return;
+    }
+
+    var module = window.APP = {};
+    var key = Crypto.parseKey(window.location.hash.substring(1));
+    var initializing = true;
+
+    /* elements that we need to listen to */
+    /*
+        * text
+        * password
+        * radio
+        * checkbox
+        * number
+        * range
+        * select
+        * textarea
+    */
+
+    var $textarea = $('textarea');
+
+    var config = module.config = {
+        websocketURL: Config.websocketURL + '_old',
+        userName: Crypto.rand64(8),
+        channel: key.channel,
+        cryptKey: key.cryptKey
+    };
+
+    var setEditable = function (bool) {/* allow editing */};
+    var canonicalize = function (text) {/* canonicalize all the things */};
+
+    setEditable(false);
+
+    var onInit = config.onInit = function (info) { };
+
+    var onRemote = config.onRemote = function (info) {
+        if (initializing) { return; }
+        /* integrate remote changes */
+    };
+
+    var onLocal = config.onLocal = function () {
+        if (initializing) { return; }
+        /* serialize local changes */
+    };
+
+    var onReady = config.onReady = function (info) {
+        var realtime = module.realtime = info.realtime;
+
+        // create your patcher
+        module.patchText = TextPatcher.create({
+            realtime: realtime
+        });
+
+        // get ready
+
+        setEditable(true);
+        initializing = false;
+    };
+
+    var onAbort = config.onAbort = function (info) {};
+
+    var rt = Realtime.start(config);
+
+    // bind to events...
+});

From ce69062b7cf156c87bf8e4a3f1d704d4035b44f8 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 17:01:21 +0200
Subject: [PATCH 124/257] implement callback for getMessages

---
 storage/lvl.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/storage/lvl.js b/storage/lvl.js
index 0f233178e..0f3954968 100644
--- a/storage/lvl.js
+++ b/storage/lvl.js
@@ -38,7 +38,7 @@ var insert = function (db, channelName, content, cb) {
     }
 };
 
-var getMessages = function (db, channelName, msgHandler) {
+var getMessages = function (db, channelName, msgHandler, cb) {
     var index;
     nThen(function (waitFor) {
         getIndex(db, channelName, waitFor(function (i) { index = i; }));
@@ -48,6 +48,7 @@ var getMessages = function (db, channelName, msgHandler) {
                 if (e) { throw e; }
                 msgHandler(out);
                 if (i < index) { again(i+1); }
+                else if (cb) { cb(); }
             }));
         };
         if (index > -1) { again(0); }
@@ -62,8 +63,8 @@ module.exports.create = function (conf, cb) {
         message: function (channelName, content, cb) {
             insert(db, channelName, content, cb);
         },
-        getMessages: function (channelName, msgHandler) {
-            getMessages(db, channelName, msgHandler);
+        getMessages: function (channelName, msgHandler, cb) {
+            getMessages(db, channelName, msgHandler, cb);
         }
     });
 };

From 7a02d85ec50c1eaa53824c95a19a4d4dcea7c0a4 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 17:02:54 +0200
Subject: [PATCH 125/257] Netflux server mustn't send a zero message until the
 history is synced

---
 NetfluxWebsocketSrv.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index d2f5f0fb9..93aac0d0e 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -66,8 +66,8 @@ dropUser = function (ctx, user) {
     });
 };
 
-const getHistory = function (ctx, channelName, handler) {
-    ctx.store.getMessages(channelName, function (msgStr) { handler(JSON.parse(msgStr)); });
+const getHistory = function (ctx, channelName, handler, cb) {
+    ctx.store.getMessages(channelName, function (msgStr) { handler(JSON.parse(msgStr)); }, cb);
 };
 
 const randName = function () { return Crypto.randomBytes(16).toString('hex'); };
@@ -105,8 +105,9 @@ const handleMessage = function (ctx, user, msg) {
             if (parsed[0] === 'GET_HISTORY') {
                 getHistory(ctx, parsed[1], function (msg) {
                     sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)]);
+                }, function () {
+                    sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, 0]);
                 });
-                sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, 0]);
             }
             return;
         }

From 86bbc1501788af382996864ada2586baef476041 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 17:14:59 +0200
Subject: [PATCH 126/257] document modified storage API

---
 storage/README.md | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/storage/README.md b/storage/README.md
index eedcc8ba3..3c854d00c 100644
--- a/storage/README.md
+++ b/storage/README.md
@@ -21,21 +21,26 @@ That function must accept two arguments:
 
 ## Methods
 
-### message(channelName, content, callback)
+### message(channelName, content, handler)
 
 When Cryptpad receives a message, it saves it into its datastore using its equivalent of a table for its channel name, and then relays the message to every other client which is participating in the same channel.
 
-Relaying logic exists outside of the storage module, you simply need to store the message then execute the callback on success.
+Relaying logic exists outside of the storage module, you simply need to store the message then execute the handler on success.
 
-### getMessages(channelName, callback)
+### getMessages(channelName, handler, callback)
 
 When a new client joins, they request the entire history of messages for a particular channel.
 This method retreives those messages, and delivers them in order.
 
-In theory, it should be possible for Chainpad to make sense of out of order messages, however, this has not yet been implemented.
-In practice, out of order messages make your clientside application likely to fail.
+In practice, out of order messages make your clientside application more likely to fail, however, they are generally tolerated.
 As a channel accumulates a greater number of messages, the likelihood of the application receiving them in the wrong order becomes greater.
-This results in older sessions becoming less reliable
+This results in older sessions becoming less reliable.
+
+This function accepts the name of the channel in which the user is interested, the handler for each message, and the callback to be executed when the last message has been fetched and handled.
+
+**Note**, the callback is a new addition to this API.
+It is only implemented within the leveldb adaptor, making our latest code incompatible with the other back ends.
+While we migrate to our new Netflux API, only the leveldb adaptor will be supported.
 
 ## Documenting your adaptor
 

From 4f426651ad15b32c32cb26a376f14f1cc75b66ea Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 17:41:50 +0200
Subject: [PATCH 127/257] remove TextPatcher from RealtimeTextSocket

---
 www/common/RealtimeTextSocket.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/www/common/RealtimeTextSocket.js b/www/common/RealtimeTextSocket.js
index 28012cce8..cdbeb1d8d 100644
--- a/www/common/RealtimeTextSocket.js
+++ b/www/common/RealtimeTextSocket.js
@@ -18,10 +18,9 @@ define([
     '/common/messages.js',
     '/bower_components/reconnectingWebsocket/reconnecting-websocket.js',
     '/common/crypto.js',
-    '/common/TextPatcher.js',
     '/common/chainpad.js',
     '/bower_components/jquery/dist/jquery.min.js',
-], function (Messages, ReconnectingWebSocket, Crypto, TextPatcher) {
+], function (Messages, ReconnectingWebSocket, Crypto) {
     var $ = window.jQuery;
     var ChainPad = window.ChainPad;
     var PARANOIA = true;
@@ -262,11 +261,6 @@ define([
                 } // it's working as expected, continue
             }, 200);
 
-            toReturn.patchText = TextPatcher.create({
-                realtime: realtime,
-                logging: true
-            });
-
             realtime.start();
             debug('started');
         });

From 80fb5e1e21c62c03bcd0224db6709095215f8aba Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 17:59:30 +0200
Subject: [PATCH 128/257] don't rely on RealtimeSocket exporting textPatcher

---
 www/p/main.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/www/p/main.js b/www/p/main.js
index 1c9fd19f9..023f9b9f1 100644
--- a/www/p/main.js
+++ b/www/p/main.js
@@ -259,7 +259,7 @@ define([
                        into the dom */
                     console.error("shjson2 !== shjson");
                     // push those changes back over the wire
-                    module.realtimeInput.patchText(shjson2);
+                    module.patchText(shjson2);
 
                     /*  pushing back over the wire is necessary, but it can
                         result in a feedback loop, which we call a browser
@@ -294,13 +294,17 @@ define([
             };
 
             var onReady = realtimeOptions.onReady = function (info) {
-                console.log("Unlocking editor");
-                initializing = false;
-                setEditable(true);
-
                 var shjson = info.realtime.getUserDoc();
 
+                module.patchText = TextPatcher.create({
+                    realtime: info.realtime,
+                    logging: true,
+                });
+
                 applyHjson(shjson);
+                console.log("Unlocking editor");
+                setEditable(true);
+                initializing = false;
             };
 
             var onAbort = realtimeOptions.onAbort = function (info) {
@@ -314,7 +318,7 @@ define([
             var onLocal = realtimeOptions.onLocal = function () {
                 if (initializing) { return; }
                 var shjson = stringifyDOM(inner);
-                rti.patchText(shjson);
+                module.patchText(shjson);
             };
 
             var rti = module.realtimeInput = realtimeInput.start(realtimeOptions);
@@ -333,7 +337,7 @@ define([
                 var start = cursor.Range.start;
                 var test = TypingTest.testInput(inner, start.el, start.offset, onLocal);
                 // why twice?
-                onLocale();
+                onLocal();
                 return test;
             };
 

From d576fdc88621cc6be122bc5aff496aedd4826ffe Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 19:03:22 +0200
Subject: [PATCH 129/257] fix bug where empty channels failed

---
 storage/lvl.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/storage/lvl.js b/storage/lvl.js
index 0f3954968..ff6713a0c 100644
--- a/storage/lvl.js
+++ b/storage/lvl.js
@@ -41,7 +41,9 @@ var insert = function (db, channelName, content, cb) {
 var getMessages = function (db, channelName, msgHandler, cb) {
     var index;
     nThen(function (waitFor) {
-        getIndex(db, channelName, waitFor(function (i) { index = i; }));
+        getIndex(db, channelName, waitFor(function (i) {
+            index = i;
+        }));
     }).nThen(function (waitFor) {
         var again = function (i) {
             db.get(channelName + '=>' + i, waitFor(function (e, out) {
@@ -52,6 +54,7 @@ var getMessages = function (db, channelName, msgHandler, cb) {
             }));
         };
         if (index > -1) { again(0); }
+        else if (cb) { cb(); }
     });
 };
 

From 5f4825f3a05f026634bb84afb260ebb6bcfe1d7f Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 19:03:50 +0200
Subject: [PATCH 130/257] don't change the hash from realtime input

let applications handle that logic
---
 www/common/realtime-input.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index ed982580e..7e818f8ae 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -101,14 +101,6 @@ define([
         };
 
         var onReady = function(wc, network) {
-            if(config.onInit) {
-                config.onInit({
-                    myID: wc.myID,
-                    realtime: realtime,
-                    getLag: network.getLag,
-                    userList: userList
-                });
-            }
             // Trigger onJoining with our own Cryptpad username to tell the toolbar that we are synced
             onJoining(wc.myID);
 
@@ -206,7 +198,6 @@ define([
 
         var onOpen = function(wc, network) {
             channel = wc.id;
-            window.location.hash = channel + chanKey;
 
             // Add the existing peers in the userList
             wc.members.forEach(onJoining);
@@ -218,7 +209,6 @@ define([
             wc.on('join', onJoining);
             wc.on('leave', onLeaving);
 
-
             if(config.setMyID) {
                 config.setMyID({
                     myID: wc.myID
@@ -227,6 +217,18 @@ define([
             // Open a Chainpad session
             realtime = createRealtime();
 
+            if(config.onInit) {
+                config.onInit({
+                    myID: wc.myID,
+                    realtime: realtime,
+                    getLag: network.getLag,
+                    userList: userList,
+
+                    // channel
+                    channel: channel,
+                });
+            }
+
             // Sending a message...
             realtime.onMessage(function(message) {
                 // Filter messages sent by Chainpad to make it compatible with Netflux

From cce50390a07bfeb550c530fff8ae3cf6e14f3be2 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 21 Apr 2016 19:04:15 +0200
Subject: [PATCH 131/257] don't depend on library to set hash

---
 www/pad/main.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 901fce1c5..c535b678b 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -107,7 +107,7 @@ define([
             var inner = window.inner = documentBody;
             var cursor = window.cursor = Cursor(inner);
 
-            var setEditable = function (bool) {
+            var setEditable = module.setEditable = function (bool) {
                 inner.setAttribute('contenteditable', bool);
             };
 
@@ -304,7 +304,9 @@ define([
                 };
                 toolbar = info.realtime.toolbar = Toolbar.create($bar, info.myID, info.realtime, info.getLag, info.userList, config);
                 createChangeName('cryptpad-changeName', $bar);
-                /* TODO handle disconnects and such*/
+
+                // set the hash
+                window.location.hash = info.channel + key;
             };
 
             // this should only ever get called once, when the chain syncs

From bbdc9da85391d07d1c4e5db0fbde127a3db7a980 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 22 Apr 2016 08:19:28 +0200
Subject: [PATCH 132/257] delete duplicated file

---
 www/common/RealtimeTextarea.js | 207 ---------------------------------
 1 file changed, 207 deletions(-)
 delete mode 100644 www/common/RealtimeTextarea.js

diff --git a/www/common/RealtimeTextarea.js b/www/common/RealtimeTextarea.js
deleted file mode 100644
index ee9fcdeb8..000000000
--- a/www/common/RealtimeTextarea.js
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * 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 .
- */
-define([
-    '/common/messages.js',
-    '/bower_components/reconnectingWebsocket/reconnecting-websocket.js',
-    '/common/crypto.js',
-    '/common/chainpad.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-], function (Messages, ReconnectingWebSocket, Crypto) {
-    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 warn = function (x) { console.error(x); };
-
-    /* websocket stuff */
-    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;
-        }
-    };
-
-    // TODO before removing websocket implementation
-    // bind abort to onLeaving
-    var abort = function (socket, realtime) {
-        realtime.abort();
-        try { socket._socket.close(); } catch (e) { warn(e); }
-    };
-
-    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;
-    };
-    /* end websocket stuff */
-
-    var start = module.exports.start = function (config) { 
-
-        var websocketUrl = config.websocketURL;
-        var userName = config.userName;
-        var channel = config.channel;
-        var cryptKey = config.cryptKey;
-        var passwd = 'y';
-
-        var toReturn = {};
-
-        var socket = makeWebsocket(websocketUrl);
-
-        var allMessages = [];
-        var isErrorState = false;
-        var initializing = true;
-        var recoverableErrorCount = 0;
-
-        socket.onOpen.push(function (evt) {
-            var realtime = socket.realtime = ChainPad.create(userName,
-                                passwd,
-                                channel,
-                                config.initialState || '',
-                                {
-                                    transformFunction: config.transformFunction
-                                });
-
-            if (config.onInit) {
-                // extend as you wish
-                config.onInit({
-                    realtime: realtime
-                });
-            }
-
-            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.
-                initializing = false;
-
-                // execute an onReady callback if one was supplied
-                // pass an object so we can extend this later
-                if (config.onReady) {
-                    // extend as you wish
-                    config.onReady({
-                        userList: userList,
-                        realtime: realtime
-                    });
-                }
-            });
-
-            // when you receive a message...
-            socket.onMessage.push(function (evt) {
-                if (isErrorState) { return; }
-
-                var message = Crypto.decrypt(evt.data, cryptKey);
-                allMessages.push(message);
-
-                // super important step that avoids us having
-                // the 'backspace bug'
-                if (config.onLocal) {
-                    config.onLocal();
-                }
-
-                realtime.message(message);
-            });
-
-            // when you receive a patch
-            realtime.onPatch(function () {
-                if (config.onRemote) {
-                    config.onRemote({
-                        realtime: realtime
-                    });
-                }
-            });
-
-            // 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);
-                }
-            });
-
-            var socketChecker = setInterval(function () {
-                if (checkSocket(socket)) {
-                    warn("Socket disconnected!");
-
-                    recoverableErrorCount += 1;
-
-                    if (recoverableErrorCount >= MAX_RECOVERABLE_ERRORS) {
-                        warn("Giving up!");
-                        abort(socket, realtime);
-                        if (config.onAbort) {
-                            config.onAbort({
-                                realtime: realtime
-                            });
-                        }
-                        if (socketChecker) { clearInterval(socketChecker); }
-                    }
-                }
-            },200);
-
-            realtime.start();
-        });
-        return toReturn;
-    };
-    return module.exports;
-});

From 2c6cf9883b11bd888737aaebde1aaf9629b21568 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 22 Apr 2016 08:19:58 +0200
Subject: [PATCH 133/257] stop using deleted file

---
 www/text/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/text/main.js b/www/text/main.js
index 0143a0f10..0db823560 100644
--- a/www/text/main.js
+++ b/www/text/main.js
@@ -1,6 +1,6 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/RealtimeTextarea.js',
+    '/common/RealtimeTextSocket.js',
     '/common/messages.js',
     '/common/crypto.js',
     '/common/TextPatcher.js',

From b140b6429d64b79bf9190c168f774bd3a4149876 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 22 Apr 2016 09:46:06 +0200
Subject: [PATCH 134/257] remove a little bit of dead code

---
 www/common/realtime-input.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 7e818f8ae..6a958e406 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -51,8 +51,6 @@ define([
         // make sure configuration is defined
         config = config || {};
 
-        var doc = config.doc || null;
-
         var allMessages = [];
         var initializing = true;
         var recoverableErrorCount = 0; // unused
@@ -107,8 +105,6 @@ define([
             // we're fully synced
             initializing = false;
 
-            // execute an onReady callback if one was supplied
-            // FIXME this should be once the chain has synced
             if (config.onReady) {
                 config.onReady({
                     realtime: realtime

From 4c9560234795fbed738d20d8679ddc3e8be9dc95 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 22 Apr 2016 09:46:41 +0200
Subject: [PATCH 135/257] remove a little bit more dead code

---
 www/pad/main.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index c535b678b..09055bc33 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -250,14 +250,10 @@ define([
                 // our encryption key
                 cryptKey: key,
 
-                // configuration :D
-                doc: inner,
-
                 setMyID: setMyID,
 
                 // really basic operational transform
                 transformFunction : JsonOT.validate
-                // pass in websocket/netflux object TODO
             };
 
             var onRemote = realtimeOptions.onRemote = function (info) {

From d4943511fe47d1efbff20d201fcab6534f7a6553 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 22 Apr 2016 09:47:26 +0200
Subject: [PATCH 136/257] move text/ and hack/ to Netflux

---
 www/hack/main.js | 36 +++++++++++++++++++++++-------------
 www/text/main.js | 31 ++++++++++++++++++++++++-------
 2 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/www/hack/main.js b/www/hack/main.js
index 8805a3169..8830b9007 100644
--- a/www/hack/main.js
+++ b/www/hack/main.js
@@ -1,21 +1,28 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/RealtimeTextarea.js',
+    '/common/realtime-input.js',
     '/common/crypto.js',
     '/common/TextPatcher.js',
     '/bower_components/jquery/dist/jquery.min.js'
 ], function (Config, Realtime, Crypto, TextPatcher) {
     var $ = window.jQuery;
+    /*
     $(window).on('hashchange', function() {
         window.location.reload();
-    });
+    });*/
+
+    var key;
+    var channel = '';
     if (window.location.href.indexOf('#') === -1) {
-        window.location.href = window.location.href + '#' + Crypto.genKey();
-        return;
+        key = Crypto.genKey();
+        //window.location.href = window.location.href + '#' + Crypto.genKey();
+        //return;
+    } else {
+        var hash = window.location.hash.substr(1);
+        channel = hash.substr(0,32);
+        key = hash.substr(32);
     }
 
-    var key = Crypto.parseKey(window.location.hash.substring(1));
-
     var $textarea = $('textarea'),
         $run = $('#run');
 
@@ -29,13 +36,14 @@ define([
         transformFunction
     */
 
+    var userName = Crypto.rand64(8);
+
     var config = {
-        textarea: $textarea[0],
-        websocketURL: Config.websocketURL + '_old',
-        webrtcURL: Config.webrtcURL,
-        userName: Crypto.rand64(8),
-        channel: key.channel,
-        cryptKey: key.cryptKey,
+        initialState: '',
+        websocketURL: Config.websocketURL,
+        userName: userName,
+        channel: channel,
+        cryptKey: key,
     };
     var initializing = true;
 
@@ -44,7 +52,9 @@ define([
 
     setEditable(false);
 
-    var onInit = config.onInit = function (info) { };
+    var onInit = config.onInit = function (info) {
+        window.location.hash = info.channel + key;
+    };
 
     var onRemote = config.onRemote = function (info) {
         if (initializing) { return; }
diff --git a/www/text/main.js b/www/text/main.js
index 0db823560..644fa86f6 100644
--- a/www/text/main.js
+++ b/www/text/main.js
@@ -1,6 +1,6 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/RealtimeTextSocket.js',
+    '/common/realtime-input.js',
     '/common/messages.js',
     '/common/crypto.js',
     '/common/TextPatcher.js',
@@ -11,22 +11,37 @@ define([
     $(window).on('hashchange', function() {
         window.location.reload();
     });
+    /*
     if (window.location.href.indexOf('#') === -1) {
         window.location.href = window.location.href + '#' + Crypto.genKey();
         return;
+    }*/
+
+
+    var key;
+    var channel = '';
+    if (window.location.href.indexOf('#') === -1) {
+        key = Crypto.genKey();
+    } else {
+        var hash = window.location.hash.substr(1);
+        channel = hash.substr(0, 32);
+        key = hash.substr(32);
     }
 
     var module = window.APP = {};
-    var key = Crypto.parseKey(window.location.hash.substring(1));
+
+    var userName = module.userName = Crypto.rand64(8);
+
     var initializing = true;
     var $textarea = $('textarea');
 
     var config = module.config = {
+        initialState: '',
         textarea: $textarea[0],
-        websocketURL: Config.websocketURL + '_old',
-        userName: Crypto.rand64(8),
-        channel: key.channel,
-        cryptKey: key.cryptKey
+        websocketURL: Config.websocketURL,
+        userName: userName,
+        channel: channel,
+        cryptKey: key,
     };
 
     var setEditable = function (bool) { $textarea.attr('disabled', !bool); };
@@ -34,7 +49,9 @@ define([
 
     setEditable(false);
 
-    var onInit = config.onInit = function (info) { };
+    var onInit = config.onInit = function (info) {
+        window.location.hash = info.channel + key;
+    };
 
     var onRemote = config.onRemote = function (info) {
         if (initializing) { return; }

From be1ef7abe32c42a9048f4afae8d1cbf7f1eee872 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 22 Apr 2016 10:04:54 +0200
Subject: [PATCH 137/257] migrate canvas to netflux

---
 www/canvas/main.js | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/www/canvas/main.js b/www/canvas/main.js
index f25b64ecb..1a52213ff 100644
--- a/www/canvas/main.js
+++ b/www/canvas/main.js
@@ -4,7 +4,7 @@ require.config({ paths: {
 
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/RealtimeTextarea.js',
+    '/common/realtime-input.js',
     '/common/messages.js',
     '/common/crypto.js',
     '/common/TextPatcher.js',
@@ -17,12 +17,15 @@ define([
     var $ = module.$ = window.jQuery;
     var Fabric = module.Fabric = window.fabric;
 
-    $(window).on('hashchange', function() {
-        window.location.reload();
-    });
-    if (window.location.href.indexOf('#') === -1) {
-        window.location.href = window.location.href + '#' + Crypto.genKey();
-        return;
+
+    var key;
+    var channel = '';
+    if (!/#/.test(window.location.href)) {
+        key = Crypto.genKey();
+    } else {
+        var hash = window.location.hash.slice(1);
+        channel = hash.slice(0, 32);
+        key = hash.slice(32);
     }
 
     /* Initialize Fabric */
@@ -56,17 +59,22 @@ define([
         $canvas.css('border-color', bool? 'black': 'red');
     };
 
-    var key = Crypto.parseKey(window.location.hash.substring(1));
     var initializing = true;
 
     var config = module.config = {
-        websocketURL: Config.websocketURL + '_old',
+        // TODO initialState ?
+        websocketURL: Config.websocketURL,
         userName: Crypto.rand64(8),
-        channel: key.channel,
-        cryptKey: key.cryptKey
+        channel: channel,
+        cryptKey: key,
     };
 
-    var onInit = config.onInit = function (info) { };
+    var onInit = config.onInit = function (info) {
+        window.location.hash = info.channel + key;
+        $(window).on('hashchange', function() {
+            window.location.reload();
+        });
+    };
 
     var onRemote = config.onRemote = function () {
         if (initializing) { return; }

From e83e5026cec3826d4e91a4b16adf9d71dc543d2f Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 22 Apr 2016 10:54:44 +0200
Subject: [PATCH 138/257] make amnesiadb compatible with netflux

---
 storage/amnesia.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/storage/amnesia.js b/storage/amnesia.js
index f068a5e75..bd414b8fb 100644
--- a/storage/amnesia.js
+++ b/storage/amnesia.js
@@ -18,6 +18,7 @@ module.exports.create = function(conf, cb){
 
     var db=[],
         index=0;
+
     cb({
         message: function(channelName, content, cb){
             var val = {
@@ -27,17 +28,18 @@ module.exports.create = function(conf, cb){
                 time: new Date().getTime(),
             };
             db.push(val);
-            cb();
+            if (cb) { cb(); }
         },
-        getMessages: function(channelName, cb){
+        getMessages: function(channelName, handler, cb){
             db.sort(function(a,b){
                 return a.id - b.id;
             });
             db.filter(function(val){
                 return val.chan === channelName;
             }).forEach(function(doc){
-                cb(doc.msg);
+                handler(doc.msg);
             });
+            if (cb) { cb(); }
         },
     });
 };

From 60eb8b52a9e908350327b0b2e001e5e1f847e407 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 22 Apr 2016 10:55:20 +0200
Subject: [PATCH 139/257] listen for websockets on the same port as the httpd

---
 config.js.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.js.dist b/config.js.dist
index f61828e4c..e2f521963 100644
--- a/config.js.dist
+++ b/config.js.dist
@@ -10,7 +10,7 @@ module.exports = {
     // the port on which your httpd will listen
     httpPort: 3000,
     // the port used for websockets
-    websocketPort: 3001,
+    websocketPort: 3000,
 
     // You now have a choice of storage engines
 

From 2c158558f5558d28ea47c15cfbaf67ea2aa488d7 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 22 Apr 2016 11:05:54 +0200
Subject: [PATCH 140/257] use leveldb adaptor by default

---
 config.js.dist | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config.js.dist b/config.js.dist
index e2f521963..b79777eb7 100644
--- a/config.js.dist
+++ b/config.js.dist
@@ -19,7 +19,7 @@ module.exports = {
      * it will not scale well if your server stays alive for a long time.
      * but it is completely dependency free
      */
-    storage: './storage/amnesia',
+    //storage: './storage/amnesia',
 
     /* the 'lvl' storage module uses leveldb
      * it persists, and will perform better than amnesiadb
@@ -31,8 +31,8 @@ module.exports = {
      *
      * to delete all pads, run `rm -rf $YOUR_DB`
      */
-    // storage: './storage/lvl',
-    // levelPath: './test.level.db'
+    storage: './storage/lvl',
+    levelPath: './test.level.db'
 
     /* mongo is the original storage engine for cryptpad
      * it has been more thoroughly tested, but requires a little more setup

From 8ac69ca2621cd2311300815ce2ea42c39fddd9b1 Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Fri, 22 Apr 2016 11:46:27 +0200
Subject: [PATCH 141/257] Add a missing "time" property in the netflux client
 causing incorrect timeout errors

---
 www/common/netflux-client.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/netflux-client.js b/www/common/netflux-client.js
index e6567229a..7d436f018 100644
--- a/www/common/netflux-client.js
+++ b/www/common/netflux-client.js
@@ -51,6 +51,7 @@ const mkChannel = (ctx, id) => {
     };
     const chan = {
         _: internal,
+        time: now(),
         id: id,
         members: internal.members,
         bcast: (msg) => channelBcast(ctx, chan.id, msg),

From d3203d1c2a4afda9ba52d48ec3ae825bdfac391c Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Fri, 22 Apr 2016 14:26:37 +0200
Subject: [PATCH 142/257] Remove Crypto from the modules loaded with RequireJS
 in realtime-input

It now has to be passed in the config in the main JS file
---
 www/common/realtime-input.js | 44 ++++++++++++++++++++----------------
 www/pad/main.js              | 32 ++++++++++++++------------
 2 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 6a958e406..5a8726e35 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -15,16 +15,15 @@
  * along with this program.  If not, see .
  */
 define([
-    '/common/messages.js',
     '/common/netflux-client.js',
-    '/common/crypto.js',
     '/common/es6-promise.min.js',
     '/common/chainpad.js',
     '/bower_components/jquery/dist/jquery.min.js',
-], function (Messages, Netflux, Crypto) {
+], function (Netflux) {
     var $ = window.jQuery;
     var ChainPad = window.ChainPad;
     var PARANOIA = true;
+    var USE_HISTORY = true;
     var module = { exports: {} };
 
     /**
@@ -44,14 +43,14 @@ define([
         var websocketUrl = config.websocketURL;
         var userName = config.userName;
         var channel = config.channel;
-        var chanKey = config.cryptKey;
+        var chanKey = config.cryptKey || '';
+        var Crypto = config.crypto;
         var cryptKey = Crypto.parseKey(chanKey).cryptKey;
         var passwd = 'y';
 
         // make sure configuration is defined
         config = config || {};
 
-        var allMessages = [];
         var initializing = true;
         var recoverableErrorCount = 0; // unused
         var toReturn = {};
@@ -99,6 +98,11 @@ define([
         };
 
         var onReady = function(wc, network) {
+            if(config.setMyID) {
+                config.setMyID({
+                    myID: wc.myID
+                });
+            }
             // Trigger onJoining with our own Cryptpad username to tell the toolbar that we are synced
             onJoining(wc.myID);
 
@@ -127,11 +131,10 @@ define([
             var message = chainpadAdapter.msgIn(peer, msg);
 
             verbose(message);
-            allMessages.push(message);
 
             if (!initializing) {
-                if (toReturn.onLocal) {
-                    toReturn.onLocal();
+                if (config.onLocal) {
+                    config.onLocal();
                 }
             }
             // pass the message into Chainpad
@@ -205,11 +208,6 @@ define([
             wc.on('join', onJoining);
             wc.on('leave', onLeaving);
 
-            if(config.setMyID) {
-                config.setMyID({
-                    myID: wc.myID
-                });
-            }
             // Open a Chainpad session
             realtime = createRealtime();
 
@@ -249,14 +247,22 @@ define([
             });
 
             // Get the channel history
-            var hc;
-            wc.members.forEach(function (p) { 
-              if (p.length === 16) { hc = p; } 
-            });
-            wc.history_keeper = hc;
-            if (hc) { network.sendto(hc, JSON.stringify(['GET_HISTORY', wc.id])); }
+            if(USE_HISTORY) {
+              var hc;
+
+              wc.members.forEach(function (p) {
+                if (p.length === 16) { hc = p; }
+              });
+              wc.history_keeper = hc;
+
+              if (hc) { network.sendto(hc, JSON.stringify(['GET_HISTORY', wc.id])); }
+            }
 
             realtime.start();
+
+            if(!USE_HISTORY) {
+              onReady(wc, network);
+            }
         };
 
         var findChannelById = function(webChannels, channelId) {
diff --git a/www/pad/main.js b/www/pad/main.js
index 09055bc33..11b45843e 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -87,7 +87,6 @@ define([
         }
 
         var fixThings = false;
-        // var key = Crypto.parseKey(window.location.hash.substring(1));
         var editor = window.editor = Ckeditor.replace('editor1', {
             // https://dev.ckeditor.com/ticket/10907
             needsBrFiller: fixThings,
@@ -184,7 +183,6 @@ define([
                 }
             };
 
-            var now = function () { return new Date().getTime(); };
 
             var initializing = true;
             var userList = {}; // List of pretty name of all users (mapped with their server ID)
@@ -250,12 +248,29 @@ define([
                 // our encryption key
                 cryptKey: key,
 
+                // method which allows us to get the id of the user
                 setMyID: setMyID,
 
+                // Crypto object to avoid loading it twice in Cryptpad
+                crypto: Crypto,
+
                 // really basic operational transform
                 transformFunction : JsonOT.validate
             };
 
+            var updateUserList = function(shjson) {
+                // Extract the user list (metadata) from the hyperjson
+                var hjson = JSON.parse(shjson);
+                var peerUserList = hjson[hjson.length-1];
+                if(peerUserList.metadata) {
+                  var userData = peerUserList.metadata;
+                  // Update the local user data
+                  addToUserList(userData);
+                  hjson.pop();
+                }
+                return hjson;
+            }
+
             var onRemote = realtimeOptions.onRemote = function (info) {
                 if (initializing) { return; }
 
@@ -265,18 +280,7 @@ define([
                 cursor.update();
 
                 // Extract the user list (metadata) from the hyperjson
-                var hjson = JSON.parse(shjson);
-                var peerUserList = hjson[hjson.length-1];
-                if(peerUserList.metadata) {
-                  var userData = peerUserList.metadata;
-                  // Update the local user data
-                  userList = userData;
-                  // Send the new data to the toolbar
-                  if(toolbarList && typeof toolbarList.onChange === "function") {
-                    toolbarList.onChange(userList);
-                  }
-                  hjson.pop();
-                }
+                var hjson = updateUserList(shjson);
 
                 // build a dom from HJSON, diff, and patch the editor
                 applyHjson(shjson);

From aa07dd31eee4e70df32c9135c01a5247350ec125 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 22 Apr 2016 17:35:07 +0200
Subject: [PATCH 143/257] have json-ot initialize its own debug module, instead
 of relying on a window variable's existence

---
 www/common/json-ot.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/www/common/json-ot.js b/www/common/json-ot.js
index a785d524c..f04cf3b75 100644
--- a/www/common/json-ot.js
+++ b/www/common/json-ot.js
@@ -4,10 +4,9 @@ define([
     var ChainPad = window.ChainPad;
     var JsonOT = {};
 
-/*  FIXME
-    resultOp after transform0() might be null, in which case you should return null
-    because it is simply a transformation which yields a "do nothing" operation */
     var validate = JsonOT.validate = function (text, toTransform, transformBy) {
+        var DEBUG = window.REALTIME_DEBUG = window.REALTIME_DEBUG || {};
+
         var resultOp, text2, text3;
         try {
             // text = O (mutual common ancestor)
@@ -28,7 +27,7 @@ define([
                 return resultOp;
             } catch (e) {
                 console.error(e);
-                var info = window.REALTIME_MODULE.ot_parseError = {
+                var info = DEBUG.ot_parseError = {
                     type: 'resultParseError',
                     resultOp: resultOp,
 
@@ -40,11 +39,11 @@ define([
                     text3: text3,
                     error: e
                 };
-                console.log('Debugging info available at `window.REALTIME_MODULE.ot_parseError`');
+                console.log('Debugging info available at `window.REALTIME_DEBUG.ot_parseError`');
             }
         } catch (x) {
             console.error(x);
-            window.REALTIME_MODULE.ot_applyError = {
+            window.DEBUG.ot_applyError = {
                 type: 'resultParseError',
                 resultOp: resultOp,
 
@@ -56,7 +55,7 @@ define([
                 text3: text3,
                 error: x
             };
-            console.log('Debugging info available at `window.REALTIME_MODULE.ot_applyError`');
+            console.log('Debugging info available at `window.REALTIME_DEBUG.ot_applyError`');
         }
 
         // returning **null** breaks out of the loop

From 5f16ad4a58639cb92ca8ce78598a3453b927e600 Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Fri, 22 Apr 2016 18:17:00 +0200
Subject: [PATCH 144/257] Update to most recent chainpad

---
 www/common/chainpad.js | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/www/common/chainpad.js b/www/common/chainpad.js
index 134d80ce2..e7823bc58 100644
--- a/www/common/chainpad.js
+++ b/www/common/chainpad.js
@@ -224,10 +224,16 @@ var transform = Patch.transform = function (origToTransform, transformBy, doc, t
     var text = doc;
     for (var i = toTransform.operations.length-1; i >= 0; i--) {
         for (var j = transformBy.operations.length-1; j >= 0; j--) {
-            toTransform.operations[i] = Operation.transform(text,
-                                                            toTransform.operations[i],
-                                                            transformBy.operations[j],
-                                                            transformFunction);
+            try {
+                toTransform.operations[i] = Operation.transform(text,
+                                                                toTransform.operations[i],
+                                                                transformBy.operations[j],
+                                                                transformFunction);
+            } catch (e) {
+                console.error("The pluggable transform function threw an error, " +
+                    "failing operational transformation");
+                return create(Sha.hex_sha256(resultOfTransformBy));
+            }
             if (!toTransform.operations[i]) {
                 break;
             }
@@ -370,6 +376,9 @@ var random = Patch.random = function (doc, opCount) {
 
 var PARANOIA = module.exports.PARANOIA = true;
 
+/* Good testing but slooooooooooow */
+var VALIDATE_ENTIRE_CHAIN_EACH_MSG = module.exports.VALIDATE_ENTIRE_CHAIN_EACH_MSG = false;
+
 /* throw errors over non-compliant messages which would otherwise be treated as invalid */
 var TESTING = module.exports.TESTING = true;
 
@@ -832,7 +841,9 @@ var check = ChainPad.check = function(realtime) {
         Common.assert(uiDoc === realtime.userInterfaceContent);
     }
 
-    /*var doc = realtime.authDoc;
+    if (!Common.VALIDATE_ENTIRE_CHAIN_EACH_MSG) { return; }
+
+    var doc = realtime.authDoc;
     var patchMsg = realtime.best;
     Common.assert(patchMsg.content.inverseOf.parentHash === realtime.uncommitted.parentHash);
     var patches = [];
@@ -844,7 +855,7 @@ var check = ChainPad.check = function(realtime) {
     while ((patchMsg = patches.pop())) {
         doc = Patch.apply(patchMsg.content, doc);
     }
-    Common.assert(doc === realtime.authDoc);*/
+    Common.assert(doc === realtime.authDoc);
 };
 
 var doOperation = ChainPad.doOperation = function (realtime, op) {

From 69e8f54e8f1f2278d05292e310c5c77a4f41ed95 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 22 Apr 2016 18:54:24 +0200
Subject: [PATCH 145/257] pass in Crypto to realtime-input

---
 www/canvas/main.js   |  1 +
 www/hack/main.js     |  6 +--
 www/p/main.js        |  7 ++--
 www/padrtc/main.js   |  8 ++--
 www/style/index.html |  1 -
 www/style/main.js    | 89 +++++++++++++++++++++++++++-----------------
 www/text/main.js     | 16 +++-----
 7 files changed, 69 insertions(+), 59 deletions(-)

diff --git a/www/canvas/main.js b/www/canvas/main.js
index 1a52213ff..212f12bfe 100644
--- a/www/canvas/main.js
+++ b/www/canvas/main.js
@@ -67,6 +67,7 @@ define([
         userName: Crypto.rand64(8),
         channel: channel,
         cryptKey: key,
+        crypto: Crypto,
     };
 
     var onInit = config.onInit = function (info) {
diff --git a/www/hack/main.js b/www/hack/main.js
index 8830b9007..fe71ac64d 100644
--- a/www/hack/main.js
+++ b/www/hack/main.js
@@ -6,10 +6,6 @@ define([
     '/bower_components/jquery/dist/jquery.min.js'
 ], function (Config, Realtime, Crypto, TextPatcher) {
     var $ = window.jQuery;
-    /*
-    $(window).on('hashchange', function() {
-        window.location.reload();
-    });*/
 
     var key;
     var channel = '';
@@ -44,6 +40,7 @@ define([
         userName: userName,
         channel: channel,
         cryptKey: key,
+        crypto: Crypto,
     };
     var initializing = true;
 
@@ -54,6 +51,7 @@ define([
 
     var onInit = config.onInit = function (info) {
         window.location.hash = info.channel + key;
+        $(window).on('hashchange', function() { window.location.reload(); });
     };
 
     var onRemote = config.onRemote = function (info) {
diff --git a/www/p/main.js b/www/p/main.js
index 023f9b9f1..64eda9f70 100644
--- a/www/p/main.js
+++ b/www/p/main.js
@@ -194,9 +194,6 @@ define([
             var now = function () { return new Date().getTime(); };
 
             var realtimeOptions = {
-                // configuration :D
-                doc: inner,
-
                 // provide initialstate...
                 initialState: stringifyDOM(inner) || '{}',
 
@@ -213,7 +210,9 @@ define([
                 channel: key.channel,
 
                 // encryption key
-                cryptKey: key.cryptKey
+                cryptKey: key.cryptKey,
+
+                crypto: Crypto,
             };
 
             var DD = new DiffDom(diffOptions);
diff --git a/www/padrtc/main.js b/www/padrtc/main.js
index ba983e799..233241a86 100644
--- a/www/padrtc/main.js
+++ b/www/padrtc/main.js
@@ -206,14 +206,12 @@ define([
                 // our encryption key
                 cryptKey: key,
 
-                // configuration :D
-                doc: inner,
-
                 setMyID: setMyID,
 
                 // really basic operational transform
-                transformFunction : JsonOT.validate
-                // pass in websocket/netflux object TODO
+                transformFunction : JsonOT.validate,
+
+                crypto: Crypto,
             };
 
             var onRemote = realtimeOptions.onRemote = function (info) {
diff --git a/www/style/index.html b/www/style/index.html
index e9fdf2855..4ede5c688 100644
--- a/www/style/index.html
+++ b/www/style/index.html
@@ -8,7 +8,6 @@
     
     
         Edit this document's style
-        
 
 
    HTML Ipsum Presents
    
            
diff --git a/www/style/main.js b/www/style/main.js
index b230bbb3f..7fe78cc34 100644
--- a/www/style/main.js
+++ b/www/style/main.js
@@ -1,31 +1,34 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/realtime-input.js',
-    '/common/messages.js',
     '/common/crypto.js',
+    '/common/TextPatcher.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Realtime, Messages, Crypto) { 
+], function (Config, Realtime, Crypto, TextPatcher) { 
     // TODO consider adding support for less.js
     var $ = window.jQuery;
-    $(window).on('hashchange', function() {
-        window.location.reload();
-    });
 
-    var userName = Crypto.rand64(8);
+    var module = window.APP = {};
 
-    if (window.location.href.indexOf('#') === -1) {
-        window.location.href = window.location.href + '#' + Crypto.genKey();
-        return;
+    var key;
+    var channel = '';
+    if (!/#/.test(window.location.href)) {
+        key = Crypto.genKey();    
+    } else {
+        var hash = window.location.hash.slice(1);
+        channel = hash.slice(0, 32);
+        key = hash.slice(32);
     }
 
-    var key = Crypto.parseKey(window.location.hash.slice(1));
-
-    var $style = $('style').first(),
-        $css = $('#css'),
-        $edit = $('#edit');
+    var config = {
+        websocketURL: Config.websocketURL,
+        channel: channel,
+        cryptKey: key,
+        crypto: Crypto,
+    };
 
-    $edit.attr('href', '/text/'+ window.location.hash);
+    var userName = module.userName = config.userName = Crypto.rand64(8);
 
     var lazyDraw = (function () {
         var to,
@@ -38,29 +41,47 @@ define([
         };
     }());
 
-    var draw = function () {
-        lazyDraw($css.val());
+    var draw = function (content) { lazyDraw(content); };
+
+    var initializing = true;
+
+    var onInit = config.onInit = function (info) {
+        window.location.hash = info.channel + key;
+        var realtime = module.realtime = info.realtime;
+        module.patchText = TextPatcher.create({
+            realtime: realtime,
+            logging: true,
+        });
+
+        $(window).on('hashchange', function() {
+            window.location.reload();
+        });
+    };
+
+    var onReady = config.onReady = function (info) {
+        var userDoc = module.realtime.getUserDoc();
+        draw(userDoc);
+        console.log("Ready");
+        initializing = false;
     };
 
-    $css // set the initial value
-        .val($style.text())
-        .on('change', draw);
+    var onRemote = config.onRemote = function () {
+        draw(module.realtime.getUserDoc());
+    };
 
-    var rts = $('textarea').toArray().map(function (e, i) {
+    var onAbort = config.onAbort = function (info) {
+        // notify the user of the abort
+        window.alert("Network Connection Lost");
+    };
 
-        var config = {
-            onRemote: draw,
-            onInit: draw,
-            onReady: draw,
+    var onLocal = config.onLocal = function () {
+        // nope
+    };
 
-            textarea: e,
-            websocketURL: Config.websocketURL,
-            userName: userName,
-            channel: key.channel,
-            cryptKey: key.cryptKey
-        };
+    var $style = $('style').first(),
+        $edit = $('#edit');
+
+    $edit.attr('href', '/text/'+ window.location.hash);
 
-        var rt = Realtime.start(config);
-        return rt;
-    });
+    var rt = Realtime.start(config);
 });
diff --git a/www/text/main.js b/www/text/main.js
index 644fa86f6..2b91c446d 100644
--- a/www/text/main.js
+++ b/www/text/main.js
@@ -1,22 +1,12 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/realtime-input.js',
-    '/common/messages.js',
     '/common/crypto.js',
     '/common/TextPatcher.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Realtime, Messages, Crypto, TextPatcher) { 
+], function (Config, Realtime, Crypto, TextPatcher) { 
     var $ = window.jQuery;
-    $(window).on('hashchange', function() {
-        window.location.reload();
-    });
-    /*
-    if (window.location.href.indexOf('#') === -1) {
-        window.location.href = window.location.href + '#' + Crypto.genKey();
-        return;
-    }*/
-
 
     var key;
     var channel = '';
@@ -42,6 +32,7 @@ define([
         userName: userName,
         channel: channel,
         cryptKey: key,
+        crypto: Crypto,
     };
 
     var setEditable = function (bool) { $textarea.attr('disabled', !bool); };
@@ -51,6 +42,9 @@ define([
 
     var onInit = config.onInit = function (info) {
         window.location.hash = info.channel + key;
+        $(window).on('hashchange', function() {
+            window.location.reload();
+        });
     };
 
     var onRemote = config.onRemote = function (info) {

From 1a9e7299fc263a1af04d46b86a39a7617189a4bd Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 23 Apr 2016 00:15:39 +0200
Subject: [PATCH 146/257] working state

---
 www/code/main.js   | 87 ++++++++++++++++++++++++++++++++++++----------
 www/migrate        | 50 ++++++++++++++++++++++++++
 www/render/main.js |  2 +-
 3 files changed, 120 insertions(+), 19 deletions(-)
 create mode 100644 www/migrate

diff --git a/www/code/main.js b/www/code/main.js
index 9f5d1fa1c..26cd0b1e9 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -3,23 +3,40 @@ define([
     '/code/rt_codemirror.js',
     '/common/messages.js',
     '/common/crypto.js',
+    '/common/realtime-input.js',
+    '/common/TextPatcher.js',
     '/bower_components/jquery/dist/jquery.min.js'
-], function (Config, RTCode, Messages, Crypto) {
+], function (Config, RTCode, Messages, Crypto, Realtime, TextPatcher) {
     var $ = window.jQuery;
     var ifrw = $('#pad-iframe')[0].contentWindow;
+    var module = {};
 
     $(function () {
-        $(window).on('hashchange', function() {
-            window.location.reload();
-        });
-        if (window.location.href.indexOf('#') === -1) {
-            window.location.href = window.location.href + '#' + Crypto.genKey();
-            return;
+        var userName = Crypto.rand64(8);
+
+        var key;
+        var channel = '';
+        if (!/#/.test(window.location.href)) {
+            key = Crypto.genKey();
+        } else {
+            var hash = window.location.hash.slice(1);
+            channel = hash.slice(0, 32);
+            key = hash.slice(32);
         }
 
+        var config = {
+            userName: userName,
+            websocketURL: Config.websocketURL,
+            channel: channel,
+            cryptKey: key,
+            crypto: Crypto,
+        };
+
         var andThen = function (CMeditor) {
-            var key = Crypto.parseKey(window.location.hash.substring(1));
-            var editor = CMeditor.fromTextArea($('#pad-iframe').contents().find('#editor1')[0], {
+            var $pad = $('#pad-iframe');
+            var $textarea = $pad.contents().find('#editor1');
+
+            var editor = CMeditor.fromTextArea($textarea[0], {
                 lineNumbers: true,
                 lineWrapping: true,
                 autoCloseBrackets: true,
@@ -35,16 +52,50 @@ define([
             });
             editor.setValue(Messages.codeInitialState);
 
-            var rtw =
-                RTCode.start(ifrw,
-                                Config.websocketURL,
-                                Crypto.rand64(8),
-                                key.channel,
-                                key.cryptKey);
-            editor.on('change', function() {
+            // TODO lock editor until chain is synced
+            // then unlock
+            var setEditable = function () { };
+
+            var initializing = true;
+
+            var onInit = config.onInit = function (info) {
+                window.location.hash = info.channel + key;
+                var realtime = info.realtime;
+                module.patchText = TextPatcher.create({
+                    realtime: realtime,
+                    logging: true,
+                });
+                $(window).on('hashchange', function() {
+                    window.location.reload();
+                });
+            };
+
+            var onReady = config.onReady = function (info) {
+                console.log("READY!");
+                
+                initializing = false;
+            };
+
+            var onRemote = config.onRemote = function (info) {
+                if (initializing) { return; }
+                // check cursor
+                // apply changes to textarea
+                // replace cursor
+            };
+
+            var onLocal = config.onLocal = function () {
                 editor.save();
-                rtw.onEvent();
-            });
+                //rtw.onEvent();
+            };
+
+            var onAbort = config.onAbort = function (info) {
+                // TODO  alert the user
+                // inform of network disconnect
+            };
+
+            var realtime = module.realtime = Realtime.start(config);
+
+            editor.on('change', onLocal);
         };
 
         var interval = 100;
diff --git a/www/migrate b/www/migrate
new file mode 100644
index 000000000..936251961
--- /dev/null
+++ b/www/migrate
@@ -0,0 +1,50 @@
+* hack
+  - good
+* code
+  - this is actually a fair bit of work (maybe)
+* canvas
+  - seems to work
+  - should have json-ot
+* form
+  - doesn't work yet
+  - don't bother developing for websocket, move to netflux asap
+* p
+  - using sockets, pad is the fixed version
+  - move things over and deprecate
+* pad
+  - using netflux already, but might require some updates from /p/
+* padrtc
+  - using netflux, but it's not really useful
+* render
+  - idek man
+* style
+  - works, using netflux
+* text
+  - works
+
+
+## Remaining
+
+* code
+  - use netflux
+* form
+  - use netflux
+  - get it working
+  - audit json-ot
+* pad
+  - update /pad/ from /p/
+  - then delete p
+* p
+  - see above
+* padrtc
+  - idk
+* render
+  - get it working
+  - use diffdom
+  - continue to use rainbow?
+* style
+  - push initial styles into new documents
+* text
+  - support tabs?
+
+
diff --git a/www/render/main.js b/www/render/main.js
index a3eaaa45c..105514dc7 100644
--- a/www/render/main.js
+++ b/www/render/main.js
@@ -8,7 +8,7 @@ define([
     '/common/rainbow.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Realtime, Messages, Crypto, Marked, Convert, Rainbow) { 
+], function (Config, Realtime, Crypto, Marked, Convert, Rainbow) { 
     var $ = window.jQuery;
 
     var Vdom = Convert.core.vdom,

From c509c28c1849e32045dd525e15c127b6e6d167fb Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 23 Apr 2016 16:31:07 +0200
Subject: [PATCH 147/257] realtime form prototype, almost in good condition

---
 www/form/index.html |  46 +++++++---
 www/form/main.js    | 201 +++++++++++++++++++++++++++++++++++---------
 www/form/types.md   |  14 +++
 www/form/ula.js     |  24 ++++++
 4 files changed, 235 insertions(+), 50 deletions(-)
 create mode 100644 www/form/types.md
 create mode 100644 www/form/ula.js

diff --git a/www/form/index.html b/www/form/index.html
index aa5a39fc6..97b69f270 100644
--- a/www/form/index.html
+++ b/www/form/index.html
@@ -11,33 +11,59 @@
             overflow: hidden;
             box-sizing: border-box;
         }
+
+        form {
+            border: 3px solid black;
+            border-radius: 5px;
+            padding: 15px;
+            font-weight: bold !important;
+            font-size: 18px !important;
+        }
+
+        input[type="text"],
+        input[type="password"],
+        input[type="number"],
+        input[type="range"],
+        select
+        {
+            margin-top: 5px;
+            margin-bottom: 5px;
+            width: 80%;
+        }
+        textarea {
+            width: 80%;
+            height: 40vh;
+            font-weight: bold;
+            font-size: 18px;
+        }
     
 
 
 
     
    
-        
    
-        
    
-
-        One
    
-        Two
    
+        One 
+        Two
         Three
    
 
-        Checkbox One
    
+        Checkbox One
         Checkbox Two
    
 
-        Number
    
+        
    
+        
    
+
+
+        Number
    
 
-        Ranges
    
+        Ranges
    
 
-        
             
             
             
             
          Dropdowns
    
 
-        
    
+        
    
 
     
    
 
diff --git a/www/form/main.js b/www/form/main.js
index ce756275e..102ed9bf9 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -1,80 +1,201 @@
+require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/RealtimeTextarea.js',
-    '/common/messages.js',
+    '/common/realtime-input.js',
     '/common/crypto.js',
     '/common/TextPatcher.js',
+    'json.sortify',
+    '/form/ula.js',
+    '/common/json-ot.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Realtime, Messages, Crypto, TextPatcher) { 
+], function (Config, Realtime, Crypto, TextPatcher, Sortify, Formula, JsonOT) {
     var $ = window.jQuery;
-    $(window).on('hashchange', function() {
-        window.location.reload();
-    });
-    if (window.location.href.indexOf('#') === -1) {
-        window.location.href = window.location.href + '#' + Crypto.genKey();
-        return;
+
+    var key;
+    var channel = '';
+    var hash = false;
+    if (!/#/.test(window.location.href)) {
+        key = Crypto.genKey();
+    } else {
+        hash = window.location.hash.slice(1);
+        channel = hash.slice(0,32);
+        key = hash.slice(32);
     }
 
-    var module = window.APP = {};
-    var key = Crypto.parseKey(window.location.hash.substring(1));
+    var module = window.APP = {
+        TextPatcher: TextPatcher,
+        Sortify: Sortify,
+        Formula: Formula,
+    };
     var initializing = true;
 
-    /* elements that we need to listen to */
-    /*
-        * text
-        * password
-        * radio
-        * checkbox
-        * number
-        * range
-        * select
-        * textarea
-    */
+    var uid = module.uid = Formula.uid;
+
+    var getInputType = Formula.getInputType;
+    var $elements = module.elements = $('input, select, textarea')
+
+    var eventsByType = Formula.eventsByType;
 
-    var $textarea = $('textarea');
+    var Map = module.Map = {};
+
+    var UI = module.UI = {
+        ids: [],
+        each: function (f) {
+            UI.ids.forEach(function (id, i, list) {
+                f(UI[id], i, list);
+            });
+        }
+    };
+
+    var cursorTypes = ['textarea', 'password', 'text'];
+
+    var canonicalize = function (text) { return text.replace(/\r\n/g, '\n'); };
+    $elements.each(function (element) {
+        var $this = $(this);
+
+        var id = uid();
+        var type = getInputType($this);
+
+        $this   // give each element a uid
+            .data('rtform-uid', id)
+                // get its type
+            .data('rt-ui-type', type);
+
+        UI.ids.push(id);
+
+        var component = UI[id] = {
+            id: id,
+            $: $this,
+            element: element,
+            type: type,
+            preserveCursor: cursorTypes.indexOf(type) !== -1,
+            name: $this.prop('name'),
+        };
+
+        component.value = (function () {
+            var checker = ['radio', 'checkbox'].indexOf(type) !== -1;
+
+            if (checker) {
+                return function (content) {
+                    return typeof content !== 'undefined'?
+                        $this.prop('checked', !!content):
+                        $this.prop('checked');
+                };
+            } else {
+                return function (content) {
+                    return typeof content !== 'undefined' ?
+                        $this.val(content):
+                        canonicalize($this.val());
+                };
+            }
+        }());
+
+        var update = component.update = function () { Map[id] = component.value(); };
+        update();
+    });
 
     var config = module.config = {
-        websocketURL: Config.websocketURL + '_old',
+        initialState: Sortify(Map) || '{}',
+        websocketURL: Config.websocketURL,
         userName: Crypto.rand64(8),
-        channel: key.channel,
-        cryptKey: key.cryptKey
+        channel: channel,
+        cryptKey: key,
+        crypto: Crypto,
+        transformFunction: JsonOT.validate
     };
 
-    var setEditable = function (bool) {/* allow editing */};
-    var canonicalize = function (text) {/* canonicalize all the things */};
+    var setEditable = module.setEditable = function (bool) {
+        /* (dis)allow editing */
+        $elements.each(function () {
+            $(this).attr('disabled', !bool);
+        });
+    };
 
     setEditable(false);
 
-    var onInit = config.onInit = function (info) { };
+    var onInit = config.onInit = function (info) {
+        var realtime = module.realtime = info.realtime;
+        window.location.hash = info.channel + key;
 
-    var onRemote = config.onRemote = function (info) {
-        if (initializing) { return; }
-        /* integrate remote changes */
+        // create your patcher
+        module.patchText = TextPatcher.create({
+            realtime: realtime,
+            logging: true,
+        });
     };
 
     var onLocal = config.onLocal = function () {
         if (initializing) { return; }
         /* serialize local changes */
+        readValues();
+        module.patchText(Sortify(Map));
     };
 
-    var onReady = config.onReady = function (info) {
-        var realtime = module.realtime = info.realtime;
+    var readValues = function () {
+        UI.each(function (ui, i, list) {
+            Map[ui.id] = ui.value();
+        });
+    };
 
-        // create your patcher
-        module.patchText = TextPatcher.create({
-            realtime: realtime
+    var updateValues = function () {
+        var userDoc = module.realtime.getUserDoc();
+        var parsed = JSON.parse(userDoc);
+
+        console.log(userDoc);
+
+        UI.each(function (ui, i, list) {
+            var newval = parsed[ui.id];
+            var oldval = ui.value();
+
+            if (newval === oldval) { return; }
+
+            var op;
+            var element = ui.element;
+            if (ui.preserveCursor) {
+                op = TextPatcher.diff(oldval, newval);
+                var selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
+                    var before = element[attr];
+                    var after = TextPatcher.transformCursor(element[attr], op);
+                    return after;
+                });
+            }
+
+            ui.value(newval);
+            ui.update();
+
+            if (op) {
+                console.log(selects);
+                element.selectionStart = selects[0];
+                element.selectionEnd = selects[1];
+            }
         });
+    };
 
-        // get ready
+    var onRemote = config.onRemote = function (info) {
+        if (initializing) { return; }
+        /* integrate remote changes */
+        updateValues();
+    };
+
+    var onReady = config.onReady = function (info) {
+        updateValues();
 
+        console.log("READY");
         setEditable(true);
         initializing = false;
     };
 
-    var onAbort = config.onAbort = function (info) {};
+    var onAbort = config.onAbort = function (info) {
+        window.alert("Network Connection Lost");
+    };
 
     var rt = Realtime.start(config);
 
-    // bind to events...
+    UI.each(function (ui, i, list) {
+        var type = ui.type;
+        var events = eventsByType[type];
+        ui.$.on(events, onLocal);
+    });
+
 });
diff --git a/www/form/types.md b/www/form/types.md
new file mode 100644
index 000000000..ab73d3bfa
--- /dev/null
+++ b/www/form/types.md
@@ -0,0 +1,14 @@
+
+```Javascript
+/* elements that we need to listen to */
+/*
+    * text      =>  $(text).val()
+    * password  =>  $(password).val()
+    * radio     =>  $(radio).prop('checked')
+    * checkbox  =>  $(checkbox).prop('checked')
+    * number    =>  $(number).val() // returns string, no default
+    * range     =>  $(range).val()
+    * select    =>  $(select).val()
+    * textarea  =>  $(textarea).val()
+*/
+```
diff --git a/www/form/ula.js b/www/form/ula.js
new file mode 100644
index 000000000..4591bb5eb
--- /dev/null
+++ b/www/form/ula.js
@@ -0,0 +1,24 @@
+define([], function () {
+    var ula = {};
+
+    var uid = ula.uid = (function () {
+        var i = 0;
+        var prefix = 'rt_';
+        return function () { return prefix + i++; };
+    }());
+
+    ula.getInputType = function ($el) { return $el[0].type; };
+
+    ula.eventsByType = {
+        text: 'change keyup',
+        password: 'change keyup',
+        radio: 'change click',
+        checkbox: 'change click',
+        number: 'change',
+        range: 'keyup change',
+        'select-one': 'change',
+        textarea: 'change keyup',
+    };
+
+    return ula;
+});

From c0b8aac792b34b9220e93cd804421032d4656b3b Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Mon, 25 Apr 2016 15:29:09 +0200
Subject: [PATCH 148/257] Fix an issue where metadata could be duplicated in
 the realtime userdoc

---
 www/pad/main.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 11b45843e..9b50902c7 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -261,8 +261,8 @@ define([
             var updateUserList = function(shjson) {
                 // Extract the user list (metadata) from the hyperjson
                 var hjson = JSON.parse(shjson);
-                var peerUserList = hjson[hjson.length-1];
-                if(peerUserList.metadata) {
+                var peerUserList = hjson[3];
+                if(peerUserList && peerUserList.metadata) {
                   var userData = peerUserList.metadata;
                   // Update the local user data
                   addToUserList(userData);
@@ -313,7 +313,7 @@ define([
             var onReady = realtimeOptions.onReady = function (info) {
                 module.patchText = TextPatcher.create({
                     realtime: info.realtime,
-                    logging: false,
+                    logging: true,
                 });
 
                 module.realtime = info.realtime;
@@ -342,7 +342,7 @@ define([
 
                 // append the userlist to the hyperjson structure
                 if(Object.keys(myData).length > 0) {
-                    hjson[hjson.length] = {metadata: userList};
+                    hjson[3] = {metadata: userList};
                 }
                 // stringify the json and send it into chainpad
                 var shjson = stringify(hjson);

From 85d5f5c47f19492129510be90bbc77de070a95f1 Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Mon, 25 Apr 2016 15:29:39 +0200
Subject: [PATCH 149/257] Convert netflux to es5

---
 www/common/netflux-client.js | 471 ++++++++++++++++++++---------------
 1 file changed, 268 insertions(+), 203 deletions(-)

diff --git a/www/common/netflux-client.js b/www/common/netflux-client.js
index 7d436f018..83dadcf5c 100644
--- a/www/common/netflux-client.js
+++ b/www/common/netflux-client.js
@@ -1,226 +1,291 @@
 /*global: WebSocket */
-define(() => {
-'use strict';
-const MAX_LAG_BEFORE_PING = 15000;
-const MAX_LAG_BEFORE_DISCONNECT = 30000;
-const PING_CYCLE = 5000;
-const REQUEST_TIMEOUT = 30000;
-
-const now = () => new Date().getTime();
-
-const networkSendTo = (ctx, peerId, content) => {
-    const seq = ctx.seq++;
-    ctx.ws.send(JSON.stringify([seq, 'MSG', peerId, content]));
-    return new Promise((res, rej) => {
-        ctx.requests[seq] = { reject: rej, resolve: res, time: now() };
-    });
-};
-
-const channelBcast = (ctx, chanId, content) => {
-    const chan = ctx.channels[chanId];
-    if (!chan) { throw new Error("no such channel " + chanId); }
-    const seq = ctx.seq++;
-    ctx.ws.send(JSON.stringify([seq, 'MSG', chanId, content]));
-    return new Promise((res, rej) => {
-        ctx.requests[seq] = { reject: rej, resolve: res, time: now() };
-    });
-};
-
-const channelLeave = (ctx, chanId, reason) => {
-    const chan = ctx.channels[chanId];
-    if (!chan) { throw new Error("no such channel " + chanId); }
-    delete ctx.channels[chanId];
-    ctx.ws.send(JSON.stringify([ctx.seq++, 'LEAVE', chanId, reason]));
-};
-
-const makeEventHandlers = (ctx, mappings) => {
-    return (name, handler) => {
-        const handlers = mappings[name];
-        if (!handlers) { throw new Error("no such event " + name); }
-        handlers.push(handler);
-    };
-};
-
-const mkChannel = (ctx, id) => {
-    const internal = {
-        onMessage: [],
-        onJoin: [],
-        onLeave: [],
-        members: [],
-        jSeq: ctx.seq++
+define(function () {
+    'use strict';
+
+    var MAX_LAG_BEFORE_PING = 15000;
+    var MAX_LAG_BEFORE_DISCONNECT = 30000;
+    var PING_CYCLE = 5000;
+    var REQUEST_TIMEOUT = 30000;
+
+    var now = function now() {
+        return new Date().getTime();
     };
-    const chan = {
-        _: internal,
-        time: now(),
-        id: id,
-        members: internal.members,
-        bcast: (msg) => channelBcast(ctx, chan.id, msg),
-        leave: (reason) => channelLeave(ctx, chan.id, reason),
-        on: makeEventHandlers(ctx, { message:
-            internal.onMessage, join: internal.onJoin, leave: internal.onLeave })
+
+    var networkSendTo = function networkSendTo(ctx, peerId, content) {
+        var seq = ctx.seq++;
+        ctx.ws.send(JSON.stringify([seq, 'MSG', peerId, content]));
+        return new Promise(function (res, rej) {
+            ctx.requests[seq] = { reject: rej, resolve: res, time: now() };
+        });
     };
-    ctx.requests[internal.jSeq] = chan;
-    ctx.ws.send(JSON.stringify([internal.jSeq, 'JOIN', id]));
-
-    return new Promise((res, rej) => {
-        chan._.resolve = res;
-        chan._.reject = rej;
-    })
-};
-
-const mkNetwork = (ctx) => {
-    const network = {
-        webChannels: ctx.channels,
-        getLag: () => (ctx.lag),
-        sendto: (peerId, content) => (networkSendTo(ctx, peerId, content)),
-        join: (chanId) => (mkChannel(ctx, chanId)),
-        on: makeEventHandlers(ctx, { message: ctx.onMessage, disconnect: ctx.onDisconnect })
+
+    var channelBcast = function channelBcast(ctx, chanId, content) {
+        var chan = ctx.channels[chanId];
+        if (!chan) {
+            throw new Error("no such channel " + chanId);
+        }
+        var seq = ctx.seq++;
+        ctx.ws.send(JSON.stringify([seq, 'MSG', chanId, content]));
+        return new Promise(function (res, rej) {
+            ctx.requests[seq] = { reject: rej, resolve: res, time: now() };
+        });
     };
-    network.__defineGetter__("webChannels", () => {
-        return Object.keys(ctx.channels).map((k) => (ctx.channels[k]));
-    });
-    return network;
-};
-
-const onMessage = (ctx, evt) => {
-    let msg;
-    try { msg = JSON.parse(evt.data); } catch (e) { console.log(e.stack); return; }
-    if (msg[0] !== 0) {
-        const req = ctx.requests[msg[0]];
-        if (!req) {
-            console.log("error: " + JSON.stringify(msg));
-            return;
+
+    var channelLeave = function channelLeave(ctx, chanId, reason) {
+        var chan = ctx.channels[chanId];
+        if (!chan) {
+            throw new Error("no such channel " + chanId);
         }
-        delete ctx.requests[msg[0]];
-        if (msg[1] === 'ACK') {
-            if (req.ping) { // ACK of a PING
-                ctx.lag = now() - Number(req.ping);
-                return;
-            }
-            req.resolve();
-        } else if (msg[1] === 'JACK') {
-            if (req._) {
-                // Channel join request...
-                if (!msg[2]) { throw new Error("wrong type of ACK for channel join"); }
-                req.id = msg[2];
-                ctx.channels[req.id] = req;
-                return;
+        delete ctx.channels[chanId];
+        ctx.ws.send(JSON.stringify([ctx.seq++, 'LEAVE', chanId, reason]));
+    };
+
+    var makeEventHandlers = function makeEventHandlers(ctx, mappings) {
+        return function (name, handler) {
+            var handlers = mappings[name];
+            if (!handlers) {
+                throw new Error("no such event " + name);
             }
-            req.resolve();
-        } else if (msg[1] === 'ERROR') {
-            req.reject({ type: msg[2], message: msg[3] });
-        } else {
-            req.reject({ type: 'UNKNOWN', message: JSON.stringify(msg) });
+            handlers.push(handler);
+        };
+    };
+
+    var mkChannel = function mkChannel(ctx, id) {
+        var internal = {
+            onMessage: [],
+            onJoin: [],
+            onLeave: [],
+            members: [],
+            jSeq: ctx.seq++
+        };
+        var chan = {
+            _: internal,
+            time: now(),
+            id: id,
+            members: internal.members,
+            bcast: function bcast(msg) {
+                return channelBcast(ctx, chan.id, msg);
+            },
+            leave: function leave(reason) {
+                return channelLeave(ctx, chan.id, reason);
+            },
+            on: makeEventHandlers(ctx, { message: internal.onMessage, join: internal.onJoin, leave: internal.onLeave })
+        };
+        ctx.requests[internal.jSeq] = chan;
+        ctx.ws.send(JSON.stringify([internal.jSeq, 'JOIN', id]));
+
+        return new Promise(function (res, rej) {
+            chan._.resolve = res;
+            chan._.reject = rej;
+        });
+    };
+
+    var mkNetwork = function mkNetwork(ctx) {
+        var network = {
+            webChannels: ctx.channels,
+            getLag: function getLag() {
+                return ctx.lag;
+            },
+            sendto: function sendto(peerId, content) {
+                return networkSendTo(ctx, peerId, content);
+            },
+            join: function join(chanId) {
+                return mkChannel(ctx, chanId);
+            },
+            on: makeEventHandlers(ctx, { message: ctx.onMessage, disconnect: ctx.onDisconnect })
+        };
+        network.__defineGetter__("webChannels", function () {
+            return Object.keys(ctx.channels).map(function (k) {
+                return ctx.channels[k];
+            });
+        });
+        return network;
+    };
+
+    var onMessage = function onMessage(ctx, evt) {
+        var msg = void 0;
+        try {
+            msg = JSON.parse(evt.data);
+        } catch (e) {
+            console.log(e.stack);return;
         }
-        return;
-    }
-    if (msg[2] === 'IDENT') {
-        ctx.uid = msg[3];
-
-        setInterval(() => {
-            if (now() - ctx.timeOfLastMessage < MAX_LAG_BEFORE_PING) { return; }
-            let seq = ctx.seq++;
-            let currentDate = now();
-            ctx.requests[seq] = {time: now(), ping: currentDate};
-            ctx.ws.send(JSON.stringify([seq, 'PING', currentDate]));
-            if (now() - ctx.timeOfLastMessage > MAX_LAG_BEFORE_DISCONNECT) {
-                ctx.ws.close();
-            }
-        }, PING_CYCLE);
-
-        return;
-    } else if (!ctx.uid) {
-        // extranious message, waiting for an ident.
-        return;
-    }
-    if (msg[2] === 'PING') {
-        msg[2] = 'PONG';
-        ctx.ws.send(JSON.stringify(msg));
-        return;
-    }
-
-    if (msg[2] === 'MSG') {
-        let handlers;
-        if (msg[3] === ctx.uid) {
-            handlers = ctx.onMessage;
-        } else {
-            const chan = ctx.channels[msg[3]];
-            if (!chan) {
-                console.log("message to non-existant chan " + JSON.stringify(msg));
+        if (msg[0] !== 0) {
+            var req = ctx.requests[msg[0]];
+            if (!req) {
+                console.log("error: " + JSON.stringify(msg));
                 return;
             }
-            handlers = chan._.onMessage;
+            delete ctx.requests[msg[0]];
+            if (msg[1] === 'ACK') {
+                if (req.ping) {
+                    // ACK of a PING
+                    ctx.lag = now() - Number(req.ping);
+                    return;
+                }
+                req.resolve();
+            } else if (msg[1] === 'JACK') {
+                if (req._) {
+                    // Channel join request...
+                    if (!msg[2]) {
+                        throw new Error("wrong type of ACK for channel join");
+                    }
+                    req.id = msg[2];
+                    ctx.channels[req.id] = req;
+                    return;
+                }
+                req.resolve();
+            } else if (msg[1] === 'ERROR') {
+                req.reject({ type: msg[2], message: msg[3] });
+            } else {
+                req.reject({ type: 'UNKNOWN', message: JSON.stringify(msg) });
+            }
+            return;
         }
-        handlers.forEach((h) => {
-            try { h(msg[4], msg[1]); } catch (e) { console.error(e); }
-        });
-    }
+        
+        if (msg[2] === 'IDENT') {
+            ctx.uid = msg[3];
+
+            setInterval(function () {
+                if (now() - ctx.timeOfLastMessage < MAX_LAG_BEFORE_PING) {
+                    return;
+                }
+                var seq = ctx.seq++;
+                var currentDate = now();
+                ctx.requests[seq] = { time: now(), ping: currentDate };
+                ctx.ws.send(JSON.stringify([seq, 'PING', currentDate]));
+                if (now() - ctx.timeOfLastMessage > MAX_LAG_BEFORE_DISCONNECT) {
+                    ctx.ws.close();
+                }
+            }, PING_CYCLE);
 
-    if (msg[2] === 'LEAVE') {
-        const chan = ctx.channels[msg[3]];
-        if (!chan) {
-            console.log("leaving non-existant chan " + JSON.stringify(msg));
+            return;
+        } else if (!ctx.uid) {
+            // extranious message, waiting for an ident.
             return;
         }
-        chan._.onLeave.forEach((h) => {
-            try { h(msg[1], msg[4]); } catch (e) { console.log(e.stack); }
-        });
-    }
-
-    if (msg[2] === 'JOIN') {
-        const chan = ctx.channels[msg[3]];
-        if (!chan) {
-            console.log("ERROR: join to non-existant chan " + JSON.stringify(msg));
+        if (msg[2] === 'PING') {
+            msg[2] = 'PONG';
+            ctx.ws.send(JSON.stringify(msg));
             return;
         }
-        // have we yet fully joined the chan?
-        const synced = (chan._.members.indexOf(ctx.uid) !== -1);
-        chan._.members.push(msg[1]);
-        if (!synced && msg[1] === ctx.uid) {
-            // sync the channel join event
-            chan.myID = ctx.uid;
-            chan._.resolve(chan);
+
+        if (msg[2] === 'MSG') {
+            var handlers = void 0;
+            if (msg[3] === ctx.uid) {
+                handlers = ctx.onMessage;
+            } else {
+                var chan = ctx.channels[msg[3]];
+                if (!chan) {
+                    console.log("message to non-existant chan " + JSON.stringify(msg));
+                    return;
+                }
+                handlers = chan._.onMessage;
+            }
+            handlers.forEach(function (h) {
+                try {
+                    h(msg[4], msg[1]);
+                } catch (e) {
+                    console.error(e);
+                }
+            });
         }
-        if (synced) {
-            chan._.onJoin.forEach((h) => {
-                try { h(msg[1]); } catch (e) { console.log(e.stack); }
+
+        if (msg[2] === 'LEAVE') {
+            var _chan = ctx.channels[msg[3]];
+            if (!_chan) {
+                console.log("leaving non-existant chan " + JSON.stringify(msg));
+                return;
+            }
+            _chan._.onLeave.forEach(function (h) {
+                try {
+                    h(msg[1], msg[4]);
+                } catch (e) {
+                    console.log(e.stack);
+                }
             });
         }
-    }
-};
-
-const connect = (websocketURL) => {
-    let ctx = {
-        ws: new WebSocket(websocketURL),
-        seq: 1,
-        lag: 0,
-        uid: null,
-        network: null,
-        channels: {},
-        onMessage: [],
-        onDisconnect: [],
-        requests: {}
-    };
-    setInterval(() => {
-        for (let id in ctx.requests) {
-            const req = ctx.requests[id];
-            if (now() - req.time > REQUEST_TIMEOUT) {
-                delete ctx.requests[id];
-                if(typeof req.reject === "function") { req.reject({ type: 'TIMEOUT', message: 'waited ' + now() - req.time + 'ms' }); }
+
+        if (msg[2] === 'JOIN') {
+            var _chan2 = ctx.channels[msg[3]];
+            if (!_chan2) {
+                console.log("ERROR: join to non-existant chan " + JSON.stringify(msg));
+                return;
+            }
+            // have we yet fully joined the chan?
+            var synced = _chan2._.members.indexOf(ctx.uid) !== -1;
+            _chan2._.members.push(msg[1]);
+            if (!synced && msg[1] === ctx.uid) {
+                // sync the channel join event
+                _chan2.myID = ctx.uid;
+                _chan2._.resolve(_chan2);
+            }
+            if (synced) {
+                _chan2._.onJoin.forEach(function (h) {
+                    try {
+                        h(msg[1]);
+                    } catch (e) {
+                        console.log(e.stack);
+                    }
+                });
             }
         }
-    }, 5000);
-    ctx.network = mkNetwork(ctx);
-    ctx.ws.onmessage = (msg) => (onMessage(ctx, msg));
-    ctx.ws.onclose = (evt) => {
-        ctx.onDisconnect.forEach((h) => {
-            try { h(evt.reason); } catch (e) { console.log(e.stack); }
+    };
+
+    var connect = function connect(websocketURL) {
+        var ctx = {
+            ws: new WebSocket(websocketURL),
+            seq: 1,
+            lag: 0,
+            uid: null,
+            network: null,
+            channels: {},
+            onMessage: [],
+            onDisconnect: [],
+            requests: {}
+        };
+        setInterval(function () {
+            for (var id in ctx.requests) {
+                var req = ctx.requests[id];
+                if (now() - req.time > REQUEST_TIMEOUT) {
+                    delete ctx.requests[id];
+                    if (typeof req.reject === "function") {
+                        req.reject({ type: 'TIMEOUT', message: 'waited ' + (now() - req.time) + 'ms' });
+                    }
+                }
+            }
+        }, 5000);
+        ctx.network = mkNetwork(ctx);
+        ctx.ws.onmessage = function (msg) {
+            return onMessage(ctx, msg);
+        };
+        ctx.ws.onclose = function (evt) {
+            ctx.onDisconnect.forEach(function (h) {
+                try {
+                    h(evt.reason);
+                } catch (e) {
+                    console.log(e.stack);
+                }
+            });
+        };
+        return new Promise(function (resolve, reject) {
+            ctx.ws.onopen = function () {
+                var count = 0;
+                var interval = 100;
+                var checkIdent = function() {
+                  if(ctx.uid !== null) {
+                    return resolve(ctx.network);
+                  }
+                  else {
+                    if(count * interval > REQUEST_TIMEOUT) {
+                      return reject({ type: 'TIMEOUT', message: 'waited ' + (count * interval) + 'ms' });
+                    }
+                    setTimeout(checkIdent, 100);
+                  }
+                }
+                checkIdent();
+            };
         });
     };
-    return new Promise((resolve, reject) => {
-        ctx.ws.onopen = () => resolve(ctx.network);
-    });
-};
 
-return { connect: connect };
-});
+    return { connect: connect };
+});
\ No newline at end of file

From b3ef2abb846ed11a147e9fef1c2a06488f64693f Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 25 Apr 2016 16:06:10 +0200
Subject: [PATCH 150/257] fix jshint complain

---
 www/style/main.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/www/style/main.js b/www/style/main.js
index 7fe78cc34..fa209cf7c 100644
--- a/www/style/main.js
+++ b/www/style/main.js
@@ -9,6 +9,9 @@ define([
     // TODO consider adding support for less.js
     var $ = window.jQuery;
 
+    var $style = $('style').first(),
+        $edit = $('#edit');
+
     var module = window.APP = {};
 
     var key;
@@ -78,8 +81,6 @@ define([
         // nope
     };
 
-    var $style = $('style').first(),
-        $edit = $('#edit');
 
     $edit.attr('href', '/text/'+ window.location.hash);
 

From c14b86d84a30b711972cdfda2ead2a3e621ba857 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 25 Apr 2016 16:07:02 +0200
Subject: [PATCH 151/257] add missing semicolon

---
 www/pad/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 11b45843e..ef5f6acff 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -269,7 +269,7 @@ define([
                   hjson.pop();
                 }
                 return hjson;
-            }
+            };
 
             var onRemote = realtimeOptions.onRemote = function (info) {
                 if (initializing) { return; }

From 53b2644b64436c70439ab3d1ac8d0c892e6a2736 Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Tue, 26 Apr 2016 17:16:58 +0200
Subject: [PATCH 152/257] Fix a issue with fights over usernames

---
 www/pad/main.js | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 9b50902c7..35848477b 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -60,10 +60,6 @@ define([
         return hj;
     };
 
-    var stringifyDOM = function (dom) {
-        return stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter));
-    };
-
     var andThen = function (Ckeditor) {
         /*  This is turned off because we prefer that the channel name
             be chosen by the server, not generated by the client.
@@ -232,6 +228,12 @@ define([
                 (DD).apply(inner, patch);
             };
 
+            var stringifyDOM = function (dom) {
+                var hjson = Hyperjson.fromDOM(dom, isNotMagicLine, brFilter);
+                hjson[3] = {metadata: userList};
+                return stringify(hjson);
+            };
+
             var realtimeOptions = {
                 // provide initialstate...
                 initialState: stringifyDOM(inner) || '{}',
@@ -268,7 +270,6 @@ define([
                   addToUserList(userData);
                   hjson.pop();
                 }
-                return hjson;
             }
 
             var onRemote = realtimeOptions.onRemote = function (info) {
@@ -279,15 +280,12 @@ define([
                 // remember where the cursor is
                 cursor.update();
 
-                // Extract the user list (metadata) from the hyperjson
-                var hjson = updateUserList(shjson);
+                // Update the user list (metadata) from the hyperjson
+                updateUserList(shjson);
 
                 // build a dom from HJSON, diff, and patch the editor
                 applyHjson(shjson);
 
-                // Build a new stringified Chainpad hyperjson without metadata to compare with the one build from the dom
-                shjson = stringify(hjson);
-
                 var shjson2 = stringifyDOM(inner);
                 if (shjson2 !== shjson) {
                     console.error("shjson2 !== shjson");
@@ -337,15 +335,8 @@ define([
             var onLocal = realtimeOptions.onLocal = function () {
                 if (initializing) { return; }
 
-                // serialize your DOM into an object
-                var hjson = Hyperjson.fromDOM(inner, isNotMagicLine, brFilter);
-
-                // append the userlist to the hyperjson structure
-                if(Object.keys(myData).length > 0) {
-                    hjson[3] = {metadata: userList};
-                }
                 // stringify the json and send it into chainpad
-                var shjson = stringify(hjson);
+                var shjson = stringifyDOM(inner);
                 module.patchText(shjson);
 
                 if (module.realtime.getUserDoc() !== shjson) {

From fa6914037caca8fd11d74c9c6a903131149d82a4 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 26 Apr 2016 17:34:57 +0200
Subject: [PATCH 153/257] start rewriting codepad to use realtime-input

---
 www/code/main.js | 62 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index 26cd0b1e9..f65453622 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -1,30 +1,32 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/code/rt_codemirror.js',
+//    '/code/rt_codemirror.js',
     '/common/messages.js',
     '/common/crypto.js',
     '/common/realtime-input.js',
     '/common/TextPatcher.js',
     '/bower_components/jquery/dist/jquery.min.js'
-], function (Config, RTCode, Messages, Crypto, Realtime, TextPatcher) {
+], function (Config, /*RTCode,*/ Messages, Crypto, Realtime, TextPatcher) {
     var $ = window.jQuery;
-    var ifrw = $('#pad-iframe')[0].contentWindow;
-    var module = {};
+    var module = window.APP = {};
+    var ifrw = module.ifrw = $('#pad-iframe')[0].contentWindow;
 
     $(function () {
         var userName = Crypto.rand64(8);
 
         var key;
         var channel = '';
+        var hash = false;
         if (!/#/.test(window.location.href)) {
             key = Crypto.genKey();
         } else {
-            var hash = window.location.hash.slice(1);
+            hash = window.location.hash.slice(1);
             channel = hash.slice(0, 32);
             key = hash.slice(32);
         }
 
         var config = {
+            //initialState: Messages.codeInitialState,
             userName: userName,
             websocketURL: Config.websocketURL,
             channel: channel,
@@ -36,7 +38,7 @@ define([
             var $pad = $('#pad-iframe');
             var $textarea = $pad.contents().find('#editor1');
 
-            var editor = CMeditor.fromTextArea($textarea[0], {
+            var editor = module.editor = CMeditor.fromTextArea($textarea[0], {
                 lineNumbers: true,
                 lineWrapping: true,
                 autoCloseBrackets: true,
@@ -50,52 +52,86 @@ define([
                 gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
                 mode: "javascript"
             });
-            editor.setValue(Messages.codeInitialState);
 
             // TODO lock editor until chain is synced
             // then unlock
             var setEditable = function () { };
+            var canonicalize = function (t) { return t.replace(/\r\n/g, '\n'); };
 
             var initializing = true;
 
             var onInit = config.onInit = function (info) {
                 window.location.hash = info.channel + key;
-                var realtime = info.realtime;
+                var realtime = module.realtime = info.realtime;
                 module.patchText = TextPatcher.create({
                     realtime: realtime,
                     logging: true,
+                    //initialState: Messages.codeInitialState
                 });
-                $(window).on('hashchange', function() {
-                    window.location.reload();
-                });
+
+
+                if (!hash) {
+                    editor.setValue(Messages.codeInitialState);
+                    module.patchText(Messages.codeInitialState);
+                    module.patchText(Messages.codeInitialState);
+                    editor.setValue(Messages.codeInitialState);
+                }
+
+                //$(window).on('hashchange', function() { window.location.reload(); });
             };
 
             var onReady = config.onReady = function (info) {
                 console.log("READY!");
-                
+
+                var userDoc = module.realtime.getUserDoc();
+
+                editor.setValue(userDoc);
+
                 initializing = false;
             };
 
             var onRemote = config.onRemote = function (info) {
                 if (initializing) { return; }
+                console.log("REMOTE");
+
+                var oldDoc = $textarea.val();
+                var userDoc = module.realtime.getUserDoc();
+
+                $textarea.val(userDoc);
+                editor.setValue(userDoc);
+
+                editor.save();
+
                 // check cursor
                 // apply changes to textarea
                 // replace cursor
             };
 
             var onLocal = config.onLocal = function () {
+                if (initializing) { return; }
+                console.log("LOCAL");
+                module.patchText(canonicalize($textarea.val()));
                 editor.save();
-                //rtw.onEvent();
             };
 
             var onAbort = config.onAbort = function (info) {
                 // TODO  alert the user
                 // inform of network disconnect
+                window.alert("Network Connection Lost!");
             };
 
             var realtime = module.realtime = Realtime.start(config);
 
             editor.on('change', onLocal);
+
+            ['keydown', /*'keyup',*/ 'select', 'mousedown', 'mouseup', 'click'].forEach(function (evt) {
+                $textarea.on(evt, function () {
+                    onRemote();
+                    onLocal();
+                });
+                // onLocal?
+            });
+
         };
 
         var interval = 100;

From f5f8f6e1eb3057aeaeea3336f6e2ba65b57ae443 Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Tue, 26 Apr 2016 17:50:54 +0200
Subject: [PATCH 154/257] Remove the delay between a change and its propagation
 to chainpad

---
 www/code/main.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index f65453622..6b9aa65fa 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -110,8 +110,8 @@ define([
             var onLocal = config.onLocal = function () {
                 if (initializing) { return; }
                 console.log("LOCAL");
-                module.patchText(canonicalize($textarea.val()));
                 editor.save();
+                module.patchText(canonicalize($textarea.val()));
             };
 
             var onAbort = config.onAbort = function (info) {
@@ -123,15 +123,6 @@ define([
             var realtime = module.realtime = Realtime.start(config);
 
             editor.on('change', onLocal);
-
-            ['keydown', /*'keyup',*/ 'select', 'mousedown', 'mouseup', 'click'].forEach(function (evt) {
-                $textarea.on(evt, function () {
-                    onRemote();
-                    onLocal();
-                });
-                // onLocal?
-            });
-
         };
 
         var interval = 100;

From a735d63306bf2b859f3784307fde60ac61c54506 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 10:38:44 +0200
Subject: [PATCH 155/257] migrate markdown rendering 'pad' to netflux

---
 www/render/main.js | 108 ++++++++++++++++++++++++++-------------------
 1 file changed, 63 insertions(+), 45 deletions(-)

diff --git a/www/render/main.js b/www/render/main.js
index a3eaaa45c..451728ad0 100644
--- a/www/render/main.js
+++ b/www/render/main.js
@@ -1,44 +1,51 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/realtime-input.js',
-    '/common/messages.js',
     '/common/crypto.js',
     '/bower_components/marked/marked.min.js',
     '/common/convert.js',
     '/common/rainbow.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Realtime, Messages, Crypto, Marked, Convert, Rainbow) { 
+], function (Config, Realtime, Crypto, Marked, Convert, Rainbow) { 
     var $ = window.jQuery;
 
     var Vdom = Convert.core.vdom,
         Hyperjson = Convert.core.hyperjson,
         Hyperscript = Convert.core.hyperscript;
 
-    window.Vdom = Vdom;
-    window.Hyperjson = Hyperjson;
-    window.Hyperscript = 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;
+    var channel = '';
+    var hash = false;
+    if (!/#/.test(window.location.href)) {
+        key = Crypto.genKey();
+    } else {
+        hash = window.location.hash.slice(1);
+        channel = hash.slice(0, 32);
+        key = hash.slice(32);
     }
 
-    var key = Crypto.parseKey(window.location.hash.substring(1));
-
-    var $textarea = $('textarea').first(),
-        $target = $('#target');
-
-    window.$textarea = $textarea;
-
     // set markdown rendering options :: strip html to prevent XSS
     Marked.setOptions({
         sanitize: true
     });
 
+    var module = window.APP = {
+        Vdom: Vdom,
+        Hyperjson: Hyperjson,
+        Hyperscript: Hyperscript
+    };
+
+    var $target = module.$target = $('#target');
+
+    var config = {
+        websocketURL: Config.websocketURL,
+        userName: Crypto.rand64(8),
+        channel: channel,
+        cryptKey: key,
+        crypto: Crypto
+    };
+
     var draw = window.draw = (function () {
         var target = $target[0],
             inner = $target.find('#inner')[0];
@@ -58,8 +65,7 @@ define([
         };
     }());
 
-    // FIXME
-    var colour = window.colour = Rainbow();
+    var colour = module.colour = Rainbow();
 
     var $inner = $('#inner');
 
@@ -83,31 +89,43 @@ define([
         }, 450);
     };
 
-    var config = {
-        textarea: $textarea[0],
-        websocketURL: Config.websocketURL,
-        userName: Crypto.rand64(8),
-        channel: key.channel,
-        cryptKey: key.cryptKey,
-
-        // when remote editors do things...
-        onRemote: function () {
-            lazyDraw($textarea.val());
-        },
-        // when your editor is ready
-        onReady: function (info) {
-            if (info.userList) { console.log("Userlist: [%s]", info.userList.join(',')); }
-            console.log("Realtime is ready!");
-            $textarea.trigger('keyup');
-        }
+    var initializing = true;
+
+    var onInit = config.onInit = function (info) {
+        window.location.hash = info.channel + key;
+        module.realtime = info.realtime;
     };
 
-    var rts = Realtime.start(config);
+    // when your editor is ready
+    var onReady = config.onReady = function (info) {
+        //if (info.userList) { console.log("Userlist: [%s]", info.userList.join(',')); }
+        console.log("Realtime is ready!");
 
-    $textarea.on('change keyup keydown', function () {
-        if (redrawTimeout) { clearTimeout(redrawTimeout); }
-        redrawTimeout = setTimeout(function () {
-            lazyDraw($textarea.val());
-        }, 500);
-    });
+        var userDoc = module.realtime.getUserDoc();
+        lazyDraw(userDoc);
+
+        initializing = false;
+    };
+
+    // when remote editors do things...
+    var onRemote = config.onRemote = function () {
+        if (initializing) { return; }
+        var userDoc = module.realtime.getUserDoc();
+        lazyDraw(userDoc);
+    };
+
+    var onLocal = config.onLocal = function () {
+        // we're not really expecting any local events for this editor...
+        /*  but we might add a second pane in the future so that you don't need
+            a second window to edit your markdown */
+        if (initializing) { return; }
+        var userDoc = module.realtime.getUserDoc();
+        lazyDraw(userDoc);
+    };
+
+    var onAbort = config.onAbort = function () {
+        window.alert("Network Connection Lost");
+    };
+
+    var rts = Realtime.start(config);
 });

From cc51e6d6edf5576d830795ce7b61bbeaa2cf4321 Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Wed, 27 Apr 2016 10:44:04 +0200
Subject: [PATCH 156/257] Update CodeMirror pad to work with Netflux

---
 www/code/main.js      | 158 ++++++++++++++++++++++++++++++++++--------
 www/common/toolbar.js |  10 ++-
 2 files changed, 140 insertions(+), 28 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index 6b9aa65fa..cd3ea4c0c 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -1,3 +1,4 @@
+require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
 //    '/code/rt_codemirror.js',
@@ -5,14 +6,20 @@ define([
     '/common/crypto.js',
     '/common/realtime-input.js',
     '/common/TextPatcher.js',
+    '/common/toolbar.js',
+    'json.sortify',
     '/bower_components/jquery/dist/jquery.min.js'
-], function (Config, /*RTCode,*/ Messages, Crypto, Realtime, TextPatcher) {
+], function (Config, /*RTCode,*/ Messages, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify) {
     var $ = window.jQuery;
     var module = window.APP = {};
     var ifrw = module.ifrw = $('#pad-iframe')[0].contentWindow;
+    var stringify = function (obj) {
+        return JSONSortify(obj);
+    };
 
     $(function () {
-        var userName = Crypto.rand64(8);
+        var userName = Crypto.rand64(8),
+            toolbar;
 
         var key;
         var channel = '';
@@ -25,15 +32,6 @@ define([
             key = hash.slice(32);
         }
 
-        var config = {
-            //initialState: Messages.codeInitialState,
-            userName: userName,
-            websocketURL: Config.websocketURL,
-            channel: channel,
-            cryptKey: key,
-            crypto: Crypto,
-        };
-
         var andThen = function (CMeditor) {
             var $pad = $('#pad-iframe');
             var $textarea = $pad.contents().find('#editor1');
@@ -53,6 +51,53 @@ define([
                 mode: "javascript"
             });
 
+            var userList = {}; // List of pretty name of all users (mapped with their server ID)
+            var toolbarList; // List of users still connected to the channel (server IDs)
+            var addToUserList = function(data) {
+                for (var attrname in data) { userList[attrname] = data[attrname]; }
+                if(toolbarList && typeof toolbarList.onChange === "function") {
+                    toolbarList.onChange(userList);
+                }
+            };
+
+            var myData = {};
+            var myUserName = ''; // My "pretty name"
+            var myID; // My server ID
+
+            var setMyID = function(info) {
+              myID = info.myID || null;
+              myUserName = myID;
+            };
+
+            var createChangeName = function(id, $container) {
+                var buttonElmt = $container.find('#'+id)[0];
+                buttonElmt.addEventListener("click", function() {
+                   var newName = window.prompt("Change your name :", myUserName);
+                   if (newName && newName.trim()) {
+                       var myUserNameTemp = newName.trim();
+                       if(newName.trim().length > 32) {
+                         myUserNameTemp = myUserNameTemp.substr(0, 32);
+                       }
+                       myUserName = myUserNameTemp;
+                       myData[myID] = {
+                          name: myUserName
+                       };
+                       addToUserList(myData);
+                       onLocal();
+                   }
+                });
+            };
+
+            var config = {
+                //initialState: Messages.codeInitialState,
+                userName: userName,
+                websocketURL: Config.websocketURL,
+                channel: channel,
+                cryptKey: key,
+                crypto: Crypto,
+                setMyID: setMyID,
+            };
+
             // TODO lock editor until chain is synced
             // then unlock
             var setEditable = function () { };
@@ -61,47 +106,93 @@ define([
             var initializing = true;
 
             var onInit = config.onInit = function (info) {
+                var $bar = $('#pad-iframe')[0].contentWindow.$('#cme_toolbox');
+                toolbarList = info.userList;
+                var config = {
+                    userData: userList,
+                    changeNameID: 'cryptpad-changeName'
+                };
+                toolbar = info.realtime.toolbar = Toolbar.create($bar, info.myID, info.realtime, info.getLag, info.userList, config);
+                createChangeName('cryptpad-changeName', $bar);
                 window.location.hash = info.channel + key;
-                var realtime = module.realtime = info.realtime;
-                module.patchText = TextPatcher.create({
-                    realtime: realtime,
-                    logging: true,
-                    //initialState: Messages.codeInitialState
-                });
 
 
-                if (!hash) {
+
+                /*if (!hash) {
                     editor.setValue(Messages.codeInitialState);
                     module.patchText(Messages.codeInitialState);
                     module.patchText(Messages.codeInitialState);
                     editor.setValue(Messages.codeInitialState);
-                }
+                }*/
 
                 //$(window).on('hashchange', function() { window.location.reload(); });
             };
 
+            var updateUserList = function(shjson) {
+                // Extract the user list (metadata) from the hyperjson
+                var hjson = (shjson === "") ? "" : JSON.parse(shjson);
+                if(hjson && hjson.metadata) {
+                  var userData = hjson.metadata;
+                  // Update the local user data
+                  addToUserList(userData);
+                }
+            }
+
             var onReady = config.onReady = function (info) {
-                console.log("READY!");
+                var realtime = module.realtime = info.realtime;
+                module.patchText = TextPatcher.create({
+                    realtime: realtime,
+                    logging: true,
+                    //initialState: Messages.codeInitialState
+                });
 
                 var userDoc = module.realtime.getUserDoc();
 
-                editor.setValue(userDoc);
+                var newDoc = "";
+                if(userDoc !== "") {
+                    var hjson = JSON.parse(userDoc);
+                    newDoc = hjson.content;
+                }
+
+                // Update the user list (metadata) from the hyperjson
+                //updateUserList(shjson);
+
+                editor.setValue(newDoc);
 
                 initializing = false;
             };
 
             var onRemote = config.onRemote = function (info) {
                 if (initializing) { return; }
-                console.log("REMOTE");
 
                 var oldDoc = $textarea.val();
-                var userDoc = module.realtime.getUserDoc();
+                var shjson = module.realtime.getUserDoc();
 
-                $textarea.val(userDoc);
-                editor.setValue(userDoc);
+                // Update the user list (metadata) from the hyperjson
+                updateUserList(shjson);
 
+                var hjson = JSON.parse(shjson);
+                var remoteDoc = hjson.content;
+                editor.setValue(remoteDoc);
                 editor.save();
 
+                var op = TextPatcher.diff(oldDoc, remoteDoc);
+                //Fix cursor here
+
+                var localDoc = $textarea.val();
+                var hjson2 = {
+                  content: localDoc,
+                  metadata: userList
+                };
+
+                var shjson2 = stringify(hjson2);
+
+                if (shjson2 !== shjson) {
+                    console.error("shjson2 !== shjson");
+                    module.patchText(shjson2);
+                }
+
+
                 // check cursor
                 // apply changes to textarea
                 // replace cursor
@@ -109,9 +200,22 @@ define([
 
             var onLocal = config.onLocal = function () {
                 if (initializing) { return; }
-                console.log("LOCAL");
+
                 editor.save();
-                module.patchText(canonicalize($textarea.val()));
+                var textValue = canonicalize($textarea.val());
+                var obj = {content: textValue};
+
+                // append the userlist to the hyperjson structure
+                obj.metadata = userList;
+
+                // stringify the json and send it into chainpad
+                var shjson = stringify(obj);
+
+                module.patchText(shjson);
+
+                if (module.realtime.getUserDoc() !== shjson) {
+                    console.error("realtime.getUserDoc() !== shjson");
+                }
             };
 
             var onAbort = config.onAbort = function (info) {
diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index 942fb586d..f3adbe1df 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -9,6 +9,7 @@ define([
     var USER_LIST_CLS = 'rtwysiwyg-user-list';
 
     /** Id of the button to change my username. */
+    var USERNAME_BUTTON_GROUP = 'cryptpad-changeName';
     var USERNAME_BUTTON_ID = 'rtwysiwyg-change-username';
 
     /** Id of the div containing the lag info. */
@@ -67,6 +68,13 @@ define([
             '    cursor: pointer;',
             '    color: #000;',
             '}',
+            '#' + USERNAME_BUTTON_GROUP + ' {',
+            '    float: left;',
+            '}',
+            '#' + USERNAME_BUTTON_GROUP + ' button {',
+            '    padding: 0;',
+            '    margin-right: 5px;',
+            '}',
             '.rtwysiwyg-toolbar-leftside div {',
             '    float: left;',
             '}',
@@ -145,7 +153,7 @@ define([
 
     var createChangeName = function($container, userList, buttonID) {
         var id = uid();
-        userList.innerHTML = 'Change name';
+        userList.innerHTML = '';
         return $container.find('#'+id)[0];
     };
 

From 626ecaffcdda1bf649dadbe8c9d3d36ae46b7970 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 11:10:31 +0200
Subject: [PATCH 157/257] log browser fights in /pad/

---
 www/pad/main.js | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 35848477b..cb536cfac 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -36,7 +36,9 @@ define([
 
     var module = window.REALTIME_MODULE = {
         Hyperjson: Hyperjson,
-        Hyperscript: Hyperscript
+        Hyperscript: Hyperscript,
+        logFights: true,
+        fights: []
     };
 
     var userName = Crypto.rand64(8),
@@ -290,6 +292,29 @@ define([
                 if (shjson2 !== shjson) {
                     console.error("shjson2 !== shjson");
                     module.patchText(shjson2);
+
+                    /*  pushing back over the wire is necessary, but it can
+                        result in a feedback loop, which we call a browser
+                        fight */
+                    if (module.logFights) {
+                        // what changed?
+                        var op = TextPatcher.diff(shjson, shjson2);
+                        // log the changes
+                        TextPatcher.log(shjson, op);
+                        var sop = JSON.stringify(TextPatcher.format(shjson, op));
+
+                        var index = module.fights.indexOf(sop);
+                        if (index === -1) {
+                            module.fights.push(sop);
+                            console.log("Found a new type of browser disagreement");
+                            console.log("You can inspect the list in your " +
+                                "console at `REALTIME_MODULE.fights`");
+                            console.log(module.fights);
+                        } else {
+                            console.log("Encountered a known browser disagreement: " +
+                                "available at `REALTIME_MODULE.fights[%s]`", index);
+                        }
+                    }
                 }
             };
 

From 492054a93808e5501cb3e591439a4aab1f690df1 Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Wed, 27 Apr 2016 12:17:06 +0200
Subject: [PATCH 158/257] Fix the cursor position when a remote patch is
 applied

---
 www/code/main.js          | 53 ++++++++++++++++++++++++++++++++++-----
 www/common/TextPatcher.js |  1 +
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index cd3ea4c0c..3e6647b46 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -8,8 +8,9 @@ define([
     '/common/TextPatcher.js',
     '/common/toolbar.js',
     'json.sortify',
+    '/common/json-ot.js',
     '/bower_components/jquery/dist/jquery.min.js'
-], function (Config, /*RTCode,*/ Messages, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify) {
+], function (Config, /*RTCode,*/ Messages, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT) {
     var $ = window.jQuery;
     var module = window.APP = {};
     var ifrw = module.ifrw = $('#pad-iframe')[0].contentWindow;
@@ -96,6 +97,7 @@ define([
                 cryptKey: key,
                 crypto: Crypto,
                 setMyID: setMyID,
+                transformFunction: JsonOT.validate
             };
 
             // TODO lock editor until chain is synced
@@ -162,10 +164,37 @@ define([
                 initializing = false;
             };
 
+            var cursorToPos = function(cursor, oldText) {
+                var cLine = cursor.line;
+                var cCh = cursor.ch;
+                var pos = 0;
+                var textLines = oldText.split("\n");
+                for (var line = 0; line <= cLine; line++) {
+                    if(line < cLine) {
+                        pos += textLines[line].length+1;
+                    }
+                    else if(line === cLine) {
+                        pos += cCh;
+                    }
+                }
+                return pos;
+            }
+            
+            var posToCursor = function(position, newText) {
+                var cursor = {
+                    line: 0,
+                    ch: 0
+                };
+                var textLines = newText.substr(0, position).split("\n");
+                cursor.line = textLines.length - 1;
+                cursor.ch = textLines[cursor.line].length;
+                return cursor;
+            }
+
             var onRemote = config.onRemote = function (info) {
                 if (initializing) { return; }
 
-                var oldDoc = $textarea.val();
+                var oldDoc = canonicalize($textarea.val());
                 var shjson = module.realtime.getUserDoc();
 
                 // Update the user list (metadata) from the hyperjson
@@ -173,20 +202,32 @@ define([
 
                 var hjson = JSON.parse(shjson);
                 var remoteDoc = hjson.content;
+                
+                //get old cursor here
+                var oldCursor = {};
+                oldCursor.selectionStart = cursorToPos(editor.getCursor('from'), oldDoc);
+                oldCursor.selectionEnd = cursorToPos(editor.getCursor('to'), oldDoc);
+                
                 editor.setValue(remoteDoc);
                 editor.save();
 
                 var op = TextPatcher.diff(oldDoc, remoteDoc);
-                //Fix cursor here
+                var selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
+                    return TextPatcher.transformCursor(oldCursor[attr], op);
+                });
+                if(selects[0] === selects[1]) {
+                    editor.setCursor(posToCursor(selects[0], remoteDoc));
+                }
+                else {
+                    editor.setSelection(posToCursor(selects[0], remoteDoc), posToCursor(selects[1], remoteDoc));
+                }                                
 
-                var localDoc = $textarea.val();
+                var localDoc = canonicalize($textarea.val());
                 var hjson2 = {
                   content: localDoc,
                   metadata: userList
                 };
-
                 var shjson2 = stringify(hjson2);
-
                 if (shjson2 !== shjson) {
                     console.error("shjson2 !== shjson");
                     module.patchText(shjson2);
diff --git a/www/common/TextPatcher.js b/www/common/TextPatcher.js
index f815fbc97..83bfedc48 100644
--- a/www/common/TextPatcher.js
+++ b/www/common/TextPatcher.js
@@ -92,6 +92,7 @@ var applyChange = function(ctx, oldval, newval, logging) {
 };
 
 var transformCursor = function (cursor, op) {
+    if (!op) { return cursor; }
     var pos = op.offset;
     var remove = op.toRemove;
     var insert = op.toInsert.length;

From 619406f868bc1904152041dfd7c6a9b4d777f19c Mon Sep 17 00:00:00 2001
From: Yann Flory 
Date: Wed, 27 Apr 2016 12:17:39 +0200
Subject: [PATCH 159/257] Send an ACK when someone asks for the history

---
 NetfluxWebsocketSrv.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 93aac0d0e..2bc4f3f1d 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -103,6 +103,7 @@ const handleMessage = function (ctx, user, msg) {
             let parsed;
             try { parsed = JSON.parse(json[2]); } catch (err) { console.error(err); return; }
             if (parsed[0] === 'GET_HISTORY') {
+                sendMsg(ctx, user, [seq, 'ACK']);
                 getHistory(ctx, parsed[1], function (msg) {
                     sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'MSG', user.id, JSON.stringify(msg)]);
                 }, function () {

From 32d180735047494e84f4e60903bebed0cd42c10e Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 12:25:19 +0200
Subject: [PATCH 160/257] import unused functions from /p/, to be integrated
 later

---
 www/pad/main.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index cb536cfac..084d57746 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -47,7 +47,7 @@ define([
     var isNotMagicLine = function (el) {
         // factor as:
         // return !(el.tagName === 'SPAN' && el.contentEditable === 'false');
-        var filter = (el.tagName === 'SPAN' && el.contentEditable === 'false');
+        var filter = (el.tagName === 'SPAN' && el.getAttribute('contentEditable') === 'false');
         if (filter) {
             console.log("[hyperjson.serializer] prevented an element" +
                 "from being serialized:", el);
@@ -62,6 +62,20 @@ define([
         return hj;
     };
 
+    /*  TODO integrate into flow to prevent browser fights over style */
+    var setStyle = function (elem, newStyleAttr) {
+        elem.setAttribute("data-chainpad-origstyle", newStyleAttr);
+        elem.setAttribute("style", newStyleAttr);
+        elem.setAttribute("data-chainpad-styleclone", elem.getAttribute("style"));
+    };
+
+    /*  TODO integrate into flow to prevent browser fights over style */
+    var getStyle = function (elem) {
+        var st = elem.getAttribute("style");
+        if (elem.getAttribute("data-chainpad-styleclone") !== st) { return st; }
+        return elem.getAttribute("data-chainpad-origstyle");
+    };
+
     var andThen = function (Ckeditor) {
         /*  This is turned off because we prefer that the channel name
             be chosen by the server, not generated by the client.
@@ -225,6 +239,9 @@ define([
             // apply patches, and try not to lose the cursor in the process!
             var applyHjson = function (shjson) {
                 var userDocStateDom = hjsonToDom(JSON.parse(shjson));
+
+                // we *might* be able to remove this now
+                // changes to hyperscript fixed this bug *maybe* --ansuz
                 userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf
                 var patch = (DD).diff(inner, userDocStateDom);
                 (DD).apply(inner, patch);

From 46b009d20fe34993920c46dc2be282f1108eb774 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 12:30:43 +0200
Subject: [PATCH 161/257] remove last non-netflux pad

---
 www/p/index.html |  30 ----
 www/p/inner.html |  12 --
 www/p/main.js    | 359 -----------------------------------------------
 www/p/toolbar.js | 233 ------------------------------
 4 files changed, 634 deletions(-)
 delete mode 100644 www/p/index.html
 delete mode 100644 www/p/inner.html
 delete mode 100644 www/p/main.js
 delete mode 100644 www/p/toolbar.js

diff --git a/www/p/index.html b/www/p/index.html
deleted file mode 100644
index 830d56125..000000000
--- a/www/p/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-    
-    
-    
-
-
-    
-
-
-
diff --git a/www/p/inner.html b/www/p/inner.html
deleted file mode 100644
index bf79dcd0d..000000000
--- a/www/p/inner.html
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-    
-    
-    
-
-
-    
-
-
-
diff --git a/www/p/main.js b/www/p/main.js
deleted file mode 100644
index 64eda9f70..000000000
--- a/www/p/main.js
+++ /dev/null
@@ -1,359 +0,0 @@
-require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
-define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/messages.js',
-    '/common/crypto.js',
-    '/common/RealtimeTextSocket.js',
-    '/common/hyperjson.js',
-    '/common/hyperscript.js',
-    '/p/toolbar.js',
-    '/common/cursor.js',
-    '/common/json-ot.js',
-    '/common/TypingTests.js',
-    'json.sortify',
-    '/common/TextPatcher.js',
-    '/bower_components/diff-dom/diffDOM.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-    '/customize/pad.js'
-], function (Config, Messages, Crypto, realtimeInput, Hyperjson, Hyperscript, Toolbar, Cursor, JsonOT, TypingTest, JSONSortify, TextPatcher) {
-    var $ = window.jQuery;
-    var ifrw = $('#pad-iframe')[0].contentWindow;
-    var Ckeditor; // to be initialized later...
-    var DiffDom = window.diffDOM;
-
-    var stringify = function (obj) {
-        return JSONSortify(obj);
-    };
-
-    window.Hyperjson = Hyperjson;
-
-    var hjsonToDom = function (H) {
-        return Hyperjson.callOn(H, Hyperscript);
-    };
-
-    var userName = Crypto.rand64(8),
-        toolbar;
-
-    var module = window.REALTIME_MODULE = {
-        Hyperjson: Hyperjson,
-        Hyperscript: Hyperscript,
-        logFights: true,
-        fights: [],
-    };
-
-    var isNotMagicLine = function (el) {
-        // factor as:
-        // return !(el.tagName === 'SPAN' && el.contentEditable === 'false');
-        var filter = (el.tagName === 'SPAN' &&
-            el.getAttribute('contentEditable') === 'false');
-        if (filter) {
-            console.log("[hyperjson.serializer] prevented an element" +
-                "from being serialized:", el);
-            return false;
-        }
-        return true;
-    };
-
-    /* catch `type="_moz"` before it goes over the wire */
-    var brFilter = function (hj) {
-        if (hj[1].type === '_moz') { hj[1].type = undefined; }
-        return hj;
-    };
-
-    /*  TODO integrate into flow to prevent browser fights over style */
-    var setStyle = function (elem, newStyleAttr) {
-        elem.setAttribute("data-chainpad-origstyle", newStyleAttr);
-        elem.setAttribute("style", newStyleAttr);
-        elem.setAttribute("data-chainpad-styleclone", elem.getAttribute("style"));
-    };
-
-    /*  TODO integrate into flow to prevent browser fights over style */
-    var getStyle = function (elem) {
-        var st = elem.getAttribute("style");
-        if (elem.getAttribute("data-chainpad-styleclone") !== st) { return st; }
-        return elem.getAttribute("data-chainpad-origstyle");
-    };
-
-    var stringifyDOM = module.stringifyDOM = function (dom) {
-        return stringify(Hyperjson.fromDOM(dom, isNotMagicLine, brFilter));
-    };
-
-    var andThen = function (Ckeditor) {
-        $(window).on('hashchange', function() {
-            window.location.reload();
-        });
-        if (window.location.href.indexOf('#') === -1) {
-            window.location.href = window.location.href + '#' + Crypto.genKey();
-            return;
-        }
-
-        var fixThings = false;
-        var key = Crypto.parseKey(window.location.hash.substring(1));
-        var editor = window.editor = Ckeditor.replace('editor1', {
-            // https://dev.ckeditor.com/ticket/10907
-            needsBrFiller: fixThings,
-            needsNbspFiller: fixThings,
-            removeButtons: 'Source,Maximize',
-            // magicline plugin inserts html crap into the document which is not part of the
-            // document itself and causes problems when it's sent across the wire and reflected back
-            // but we filter it now, so that's ok.
-            removePlugins: 'resize'
-        });
-
-        editor.on('instanceReady', function (Ckeditor) {
-            editor.execCommand('maximize');
-            var documentBody = ifrw.$('iframe')[0].contentDocument.body;
-
-            documentBody.innerHTML = Messages.initialState;
-
-            var inner = window.inner = documentBody;
-            var cursor = window.cursor = Cursor(inner);
-
-            var setEditable = function (bool) {
-                // careful about putting attributes onto the DOM
-                // they get put into the chain, and you can have trouble
-                // getting rid of them later
-
-                //inner.style.backgroundColor = bool? 'white': 'grey';
-                inner.setAttribute('contenteditable', bool);
-            };
-
-            // don't let the user edit until the pad is ready
-            setEditable(false);
-
-            var diffOptions = {
-                preDiffApply: function (info) {
-                    /* DiffDOM will filter out magicline plugin elements
-                        in practice this will make it impossible to use it
-                        while someone else is typing, which could be annoying.
-
-                        we should check when such an element is going to be
-                        removed, and prevent that from happening. */
-                    if (info.node && info.node.tagName === 'SPAN' &&
-                        info.node.getAttribute('contentEditable') === "false") {
-                        // it seems to be a magicline plugin element...
-                        if (info.diff.action === 'removeElement') {
-                            // and you're about to remove it...
-                            // this probably isn't what you want
-
-                            /*
-                                I have never seen this in the console, but the
-                                magic line is still getting removed on remote
-                                edits. This suggests that it's getting removed
-                                by something other than diffDom.
-                            */
-                            console.log("preventing removal of the magic line!");
-
-                            // return true to prevent diff application
-                            return true;
-                        }
-                    }
-
-                    // no use trying to recover the cursor if it doesn't exist
-                    if (!cursor.exists()) { return; }
-
-                    /*  frame is either 0, 1, 2, or 3, depending on which
-                        cursor frames were affected: none, first, last, or both
-                    */
-                    var frame = info.frame = cursor.inNode(info.node);
-
-                    if (!frame) { return; }
-
-                    if (typeof info.diff.oldValue === 'string' && typeof info.diff.newValue === 'string') {
-                        var pushes = cursor.pushDelta(info.diff.oldValue, info.diff.newValue);
-
-                        if (frame & 1) {
-                            // push cursor start if necessary
-                            if (pushes.commonStart < cursor.Range.start.offset) {
-                                cursor.Range.start.offset += pushes.delta;
-                            }
-                        }
-                        if (frame & 2) {
-                            // push cursor end if necessary
-                            if (pushes.commonStart < cursor.Range.end.offset) {
-                                cursor.Range.end.offset += pushes.delta;
-                            }
-                        }
-                    }
-                },
-                postDiffApply: function (info) {
-                    if (info.frame) {
-                        if (info.node) {
-                            if (info.frame & 1) { cursor.fixStart(info.node); }
-                            if (info.frame & 2) { cursor.fixEnd(info.node); }
-                        } else { console.error("info.node did not exist"); }
-
-                        var sel = cursor.makeSelection();
-                        var range = cursor.makeRange();
-
-                        cursor.fixSelection(sel, range);
-                    }
-                }
-            };
-
-            var now = function () { return new Date().getTime(); };
-
-            var realtimeOptions = {
-                // provide initialstate...
-                initialState: stringifyDOM(inner) || '{}',
-
-                // really basic operational transform
-                // reject patch if it results in invalid JSON
-                transformFunction : JsonOT.validate,
-
-                websocketURL: Config.websocketURL+'_old',
-
-                // username
-                userName: userName,
-
-                // communication channel name
-                channel: key.channel,
-
-                // encryption key
-                cryptKey: key.cryptKey,
-
-                crypto: Crypto,
-            };
-
-            var DD = new DiffDom(diffOptions);
-
-            // apply patches, and try not to lose the cursor in the process!
-            var applyHjson = function (shjson) {
-                var userDocStateDom = hjsonToDom(JSON.parse(shjson));
-
-                /*  in the DOM contentEditable is "false"
-                    while "contenteditable" is undefined.
-
-                    When it goes over the wire, it seems hyperjson transforms it.
-                    of course, hyperjson simply gets attributes from the DOM.
-
-                    el.attributes returns 'contenteditable', so we have to correct for that
-
-                    There are quite possibly all sorts of other attributes which might lose
-                    information, and we won't know what they are until after we've lost them.
-
-                    this comes from hyperscript line 101. FIXME maybe
-                */
-                userDocStateDom.setAttribute("contenteditable", "true"); // lol wtf
-                var patch = (DD).diff(inner, userDocStateDom);
-                (DD).apply(inner, patch);
-            };
-
-            var initializing = true;
-
-            var onRemote = realtimeOptions.onRemote = function (info) {
-                if (initializing) { return; }
-
-                var shjson = info.realtime.getUserDoc();
-
-                // remember where the cursor is
-                cursor.update();
-
-                // build a dom from HJSON, diff, and patch the editor
-                applyHjson(shjson);
-
-                var shjson2 = stringifyDOM(inner);
-                if (shjson2 !== shjson) {
-                    /* the client's browser made changes when pushing content
-                       into the dom */
-                    console.error("shjson2 !== shjson");
-                    // push those changes back over the wire
-                    module.patchText(shjson2);
-
-                    /*  pushing back over the wire is necessary, but it can
-                        result in a feedback loop, which we call a browser
-                        fight */
-                    if (module.logFights) {
-                        // what changed?
-                        var op = TextPatcher.diff(shjson, shjson2);
-                        // log the changes
-                        TextPatcher.log(shjson, op);
-                        var sop = JSON.stringify(TextPatcher.format(shjson, op));
-
-                        var index = module.fights.indexOf(sop);
-                        if (index === -1) {
-                            module.fights.push(sop);
-                            console.log("Found a new type of browser disagreement");
-                            console.log("You can inspect the list in your " +
-                                "console at `REALTIME_MODULE.fights`");
-                            console.log(module.fights);
-                        } else {
-                            console.log("Encountered a known browser disagreement: " +
-                                "available at `REALTIME_MODULE.fights[%s]`", index);
-                        }
-                    }
-                }
-            };
-
-            var onInit = realtimeOptions.onInit = function (info) {
-                var $bar = $('#pad-iframe')[0].contentWindow.$('#cke_1_toolbox');
-                toolbar = info.realtime.toolbar = Toolbar.create($bar, userName, info.realtime);
-
-                /* TODO handle disconnects and such*/
-            };
-
-            var onReady = realtimeOptions.onReady = function (info) {
-                var shjson = info.realtime.getUserDoc();
-
-                module.patchText = TextPatcher.create({
-                    realtime: info.realtime,
-                    logging: true,
-                });
-
-                applyHjson(shjson);
-                console.log("Unlocking editor");
-                setEditable(true);
-                initializing = false;
-            };
-
-            var onAbort = realtimeOptions.onAbort = function (info) {
-                console.log("Aborting the session!");
-                // stop the user from continuing to edit
-                // by setting the editable to false
-                setEditable(false);
-                toolbar.failed();
-            };
-
-            var onLocal = realtimeOptions.onLocal = function () {
-                if (initializing) { return; }
-                var shjson = stringifyDOM(inner);
-                module.patchText(shjson);
-            };
-
-            var rti = module.realtimeInput = realtimeInput.start(realtimeOptions);
-
-            /* hitting enter makes a new line, but places the cursor inside
-                of the 
     instead of the 
    . This makes it such that you
-                cannot type until you click, which is rather unnacceptable.
-                If the cursor is ever inside such a 
    , you probably want
-                to push it out to the parent element, which ought to be a
-                paragraph tag. This needs to be done on keydown, otherwise
-                the first such keypress will not be inserted into the P. */
-            inner.addEventListener('keydown', cursor.brFix);
-
-            var easyTest = window.easyTest = function () {
-                cursor.update();
-                var start = cursor.Range.start;
-                var test = TypingTest.testInput(inner, start.el, start.offset, onLocal);
-                // why twice?
-                onLocal();
-                return test;
-            };
-
-            editor.on('change', onLocal);
-        });
-    };
-
-    var interval = 100;
-    var first = function () {
-        Ckeditor = ifrw.CKEDITOR;
-        if (Ckeditor) {
-            andThen(Ckeditor);
-        } else {
-            console.log("Ckeditor was not defined. Trying again in %sms",interval);
-            setTimeout(first, interval);
-        }
-    };
-
-    $(first);
-});
diff --git a/www/p/toolbar.js b/www/p/toolbar.js
deleted file mode 100644
index 4159ea0ac..000000000
--- a/www/p/toolbar.js
+++ /dev/null
@@ -1,233 +0,0 @@
-define([
-    '/common/messages.js'
-], function (Messages) {
-
-    /** Id of the element for getting debug info. */
-    var DEBUG_LINK_CLS = 'rtwysiwyg-debug-link';
-
-    /** Id of the div containing the user list. */
-    var USER_LIST_CLS = 'rtwysiwyg-user-list';
-
-    /** Id of the div containing the lag info. */
-    var LAG_ELEM_CLS = 'rtwysiwyg-lag';
-
-    /** The toolbar class which contains the user list, debug link and lag. */
-    var TOOLBAR_CLS = 'rtwysiwyg-toolbar';
-
-    /** Key in the localStore which indicates realtime activity should be disallowed. */
-    var LOCALSTORAGE_DISALLOW = 'rtwysiwyg-disallow';
-
-    var SPINNER_DISAPPEAR_TIME = 3000;
-    var SPINNER = [ '-', '\\', '|', '/' ];
-
-    var uid = function () {
-        return 'rtwysiwyg-uid-' + String(Math.random()).substring(2);
-    };
-
-    var createRealtimeToolbar = function ($container) {
-        var id = uid();
-        $container.prepend(
-            '
    ' +
-                '
    ' +
-                '
    ' +
-            '
    '
-        );
-        var toolbar = $container.find('#'+id);
-        toolbar.append([
-            ''
-         ].join('\n'));
-        return toolbar;
-    };
-
-    var createEscape = function ($container) {
-        var id = uid();
-        $container.append('
    ⇐ Back
    ');
-        var $ret = $container.find('#'+id);
-        $ret.on('click', function () {
-            window.location.href = '/';
-        });
-        return $ret[0];
-    };
-
-    var createSpinner = function ($container) {
-        var id = uid();
-        $container.append('');
-        return $container.find('#'+id)[0];
-    };
-
-    var kickSpinner = function (spinnerElement, reversed) {
-        var txt = spinnerElement.textContent || '-';
-        var inc = (reversed) ? -1 : 1;
-        spinnerElement.textContent = SPINNER[(SPINNER.indexOf(txt) + inc) % SPINNER.length];
-        if (spinnerElement.timeout) { clearTimeout(spinnerElement.timeout); }
-        spinnerElement.timeout = setTimeout(function () {
-            spinnerElement.textContent = '';
-        }, SPINNER_DISAPPEAR_TIME);
-    };
-
-    var createUserList = function ($container) {
-        var id = uid();
-        $container.append('
    ');
-        return $container.find('#'+id)[0];
-    };
-
-    var updateUserList = function (myUserName, listElement, userList) {
-        var meIdx = userList.indexOf(myUserName);
-        if (meIdx === -1) {
-            listElement.textContent = Messages.synchronizing;
-            return;
-        }
-        if (userList.length === 1) {
-            listElement.textContent = Messages.editingAlone;
-        } else if (userList.length === 2) {
-            listElement.textContent = Messages.editingWithOneOtherPerson;
-        } else {
-            listElement.textContent = Messages.editingWith + ' ' + (userList.length - 1) + ' ' + Messages.otherPeople;
-        }
-    };
-
-    var createLagElement = function ($container) {
-        var id = uid();
-        $container.append('
    ');
-        return $container.find('#'+id)[0];
-    };
-
-    var checkLag = function (realtime, lagElement) {
-        var lag = realtime.getLag();
-        var lagSec = lag.lag/1000;
-        var lagMsg = Messages.lag + ' ';
-        if (lag.waiting && lagSec > 1) {
-            lagMsg += "?? " + Math.floor(lagSec);
-        } else {
-            lagMsg += lagSec;
-        }
-        lagElement.textContent = lagMsg;
-    };
-
-    // this is a little hack, it should go in it's own file.
-    // FIXME ok, so let's put it in its own file then
-    // TODO there should also be a 'clear recent pads' button
-    var rememberPad = function () {
-        // FIXME, this is overly complicated, use array methods
-        var recentPadsStr = localStorage['CryptPad_RECENTPADS'];
-        var recentPads = [];
-        if (recentPadsStr) { recentPads = JSON.parse(recentPadsStr); }
-        // TODO use window.location.hash or something like that
-        if (window.location.href.indexOf('#') === -1) { return; }
-        var now = new Date();
-        var out = [];
-        for (var i = recentPads.length; i >= 0; i--) {
-            if (recentPads[i] &&
-                // TODO precompute this time value, maybe make it configurable?
-                // FIXME precompute the date too, why getTime every time?
-                now.getTime() - recentPads[i][1] < (1000*60*60*24*30) &&
-                recentPads[i][0] !== window.location.href)
-            {
-                out.push(recentPads[i]);
-            }
-        }
-        out.push([window.location.href, now.getTime()]);
-        localStorage['CryptPad_RECENTPADS'] = JSON.stringify(out);
-    };
-
-    var create = function ($container, myUserName, realtime) {
-        var toolbar = createRealtimeToolbar($container);
-        createEscape(toolbar.find('.rtwysiwyg-toolbar-leftside'));
-        var userListElement = createUserList(toolbar.find('.rtwysiwyg-toolbar-leftside'));
-        var spinner = createSpinner(toolbar.find('.rtwysiwyg-toolbar-rightside'));
-        var lagElement = createLagElement(toolbar.find('.rtwysiwyg-toolbar-rightside'));
-
-        rememberPad();
-
-        var connected = false;
-
-        realtime.onUserListChange(function (userList) {
-            if (userList.indexOf(myUserName) !== -1) { connected = true; }
-            if (!connected) { return; }
-            updateUserList(myUserName, userListElement, userList);
-        });
-
-        var ks = function () {
-            if (connected) { kickSpinner(spinner, false); }
-        };
-
-        realtime.onPatch(ks);
-        // Try to filter out non-patch messages, doesn't have to be perfect this is just the spinner
-        realtime.onMessage(function (msg) { if (msg.indexOf(':[2,') > -1) { ks(); } });
-
-        setInterval(function () {
-            if (!connected) { return; }
-            checkLag(realtime, lagElement);
-        }, 3000);
-
-        return {
-            failed: function () {
-                connected = false;
-                userListElement.textContent = '';
-                lagElement.textContent = '';
-            },
-            reconnecting: function () {
-                connected = false;
-                userListElement.textContent = Messages.reconnecting;
-                lagElement.textContent = '';
-            },
-            connected: function () {
-                connected = true;
-            }
-        };
-    };
-
-    return { create: create };
-});

From b09b73fcc6e14b2a3dcd39766d410d30d0d51449 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 14:09:01 +0200
Subject: [PATCH 162/257] remove chainpad server

---
 ChainPadSrv.js | 197 -------------------------------------------------
 server.js      |   3 -
 2 files changed, 200 deletions(-)
 delete mode 100644 ChainPadSrv.js

diff --git a/ChainPadSrv.js b/ChainPadSrv.js
deleted file mode 100644
index e2d7a9ef6..000000000
--- a/ChainPadSrv.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * 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 .
- */
-
-// triggers jsh because we're not in a browser and WebSocket is a thing
-var WebSocket = require('ws'); // jshint ignore:line
-
-var REGISTER     = 0;
-var REGISTER_ACK = 1;
-var PATCH        = 2;
-var DISCONNECT   = 3;
-var PING         = 4;
-var PONG         = 5;
-
-var parseMessage = function (msg) {
-    var res ={};
-    // two or more? use a for
-    ['pass','user','channelId','content'].forEach(function(attr){
-        var len=msg.slice(0,msg.indexOf(':')),
-        // taking an offset lets us slice out the prop
-        // and saves us one string copy
-            o=len.length+1,
-            prop=res[attr]=msg.slice(o,Number(len)+o);
-        // slice off the property and its descriptor
-        msg = msg.slice(prop.length+o);
-    });
-    // content is the only attribute that's not a string
-    res.content=JSON.parse(res.content);
-    return res;
-};
-
-// get the password off the message before sending it to other clients.
-var popPassword = function (msg) {
-    var passLen = msg.substring(0,msg.indexOf(':'));
-    return msg.substring(passLen.length+1 + Number(passLen));
-};
-
-var sendMsg = function (msg, socket) {
-    socket.send(msg);
-};
-
-var sendChannelMessage = function (ctx, channel, msg, cb) {
-    ctx.store.message(channel.name, msg, function () {
-        channel.forEach(function (user) {
-            try {
-                sendMsg(msg, user.socket);
-            } catch (e) {
-                console.log(e.stack);
-                try { user.socket.close(); } catch (e) { }
-            }
-        });
-        if (cb) { cb(); }
-    });
-};
-
-var mkMessage = function (user, channel, content) {
-    content = JSON.stringify(content);
-    return user.length + ':' + user +
-        channel.length + ':' + channel +
-        content.length + ':' + content;
-};
-
-var dropClient = function (ctx, userpass) {
-    var client = ctx.registeredClients[userpass];
-    if (client.socket.readyState !== WebSocket.CLOSING
-        && client.socket.readyState !== WebSocket.CLOSED)
-    {
-        try {
-            client.socket.close();
-        } catch (e) {
-            console.log("Failed to disconnect ["+client.userName+"], attempting to terminate");
-            try {
-                client.socket.terminate();
-            } catch (ee) {
-                console.log("Failed to terminate ["+client.userName+"]  *shrug*");
-            }
-        }
-    }
-
-    for (var i = 0; i < client.channels.length; i++) {
-        var chanName = client.channels[i];
-        var chan = ctx.channels[chanName];
-        var idx = chan.indexOf(client);
-        if (idx < 0) { continue; }
-        console.log("Removing ["+client.userName+"] from channel ["+chanName+"]");
-        chan.splice(idx, 1);
-        if (chan.length === 0) {
-            console.log("Removing empty channel ["+chanName+"]");
-            delete ctx.channels[chanName];
-        } else {
-            sendChannelMessage(ctx, chan, mkMessage(client.userName, chanName, [DISCONNECT,0]));
-        }
-    }
-    delete ctx.registeredClients[userpass];
-};
-
-var handleMessage = function (ctx, socket, msg) {
-    var parsed = parseMessage(msg);
-    var userPass = parsed.user + ':' + parsed.pass;
-    msg = popPassword(msg);
-
-    if (parsed.content[0] === REGISTER) {
-        if (parsed.user.length === 0) { throw new Error(); }
-console.log("[" + userPass + "] registered");
-        var user = ctx.registeredClients[userPass] = ctx.registeredClients[userPass] || {
-            channels: [parsed.channelId],
-            userName: parsed.user
-        };
-        if (user.socket && user.socket !== socket) { user.socket.close(); }
-        user.socket = socket;
-
-        var chan = ctx.channels[parsed.channelId] = ctx.channels[parsed.channelId] || [];
-        var newChan = (chan.length === 0);
-        chan.name = parsed.channelId;
-
-        // we send a register ack right away but then we fallthrough
-        // to let other users know that we were registered.
-        sendMsg(mkMessage('', parsed.channelId, [1,0]), socket);
-
-        var sendMsgs = function () {
-            sendChannelMessage(ctx, chan, msg, function () {
-                chan.push(user);
-                ctx.store.getMessages(chan.name, function (msg) {
-                    try {
-                        sendMsg(msg, socket);
-                    } catch (e) {
-                        console.log(e.stack);
-                        try { socket.close(); } catch (e) { }
-                    }
-                });
-            });
-        };
-        if (newChan) {
-            sendChannelMessage(ctx, chan, mkMessage('', chan.name, [DISCONNECT,0]), sendMsgs);
-        } else {
-            sendMsgs();
-        }
-        return;
-    }
-
-    if (parsed.content[0] === PING) {
-        //    31:xwiki:XWiki.Admin-141475016907510:RWJ5xF2+SL17:[5,1414752676547]
-        // 1:y31:xwiki:XWiki.Admin-141475016907510:RWJ5xF2+SL17:[4,1414752676547]
-        sendMsg(mkMessage(parsed.user, parsed.channelId, [ PONG, parsed.content[1] ]), socket);
-        return;
-    }
-
-    var client = ctx.registeredClients[userPass];
-    if (typeof(client) === 'undefined') { throw new Error('unregistered'); }
-
-    var channel = ctx.channels[parsed.channelId];
-    if (typeof(channel) === 'undefined') { throw new Error('no such channel'); }
-
-    if (channel.indexOf(client) === -1) { throw new Error('client not in channel'); }
-
-    sendChannelMessage(ctx, channel, msg);
-};
-
-var create = module.exports.create = function (socketServer, store) {
-    var ctx = {
-        registeredClients: {},
-        channels: {},
-        store: store
-    };
-
-    socketServer.on('connection', function(socket) {
-        if(socket.upgradeReq.url !== '/cryptpad_websocket_old') { return; }
-        socket.on('message', function(message) {
-            try {
-                handleMessage(ctx, socket, message);
-            } catch (e) {
-                console.log(e.stack);
-                try { socket.close(); } catch (e) { }
-            }
-        });
-        socket.on('close', function (evt) {
-            for (var client in ctx.registeredClients) {
-                if (ctx.registeredClients[client].socket === socket) {
-                    dropClient(ctx, client);
-                }
-            }
-        });
-    });
-};
diff --git a/server.js b/server.js
index f3d472dea..819480fcf 100644
--- a/server.js
+++ b/server.js
@@ -6,8 +6,6 @@ var Http = require('http');
 var Https = require('https');
 var Fs = require('fs');
 var WebSocketServer = require('ws').Server;
-var ChainPadSrv = require('./ChainPadSrv');
-// var NetfluxSrv = require('./NetFluxWebsocketServer');
 var NetfluxSrv = require('./NetfluxWebsocketSrv');
 var WebRTCSrv = require('./WebRTCSrv');
 
@@ -84,6 +82,5 @@ var wsSrv = new WebSocketServer(wsConfig);
 Storage.create(config, function (store) {
     console.log('DB connected');
     NetfluxSrv.run(store, wsSrv);
-    ChainPadSrv.create(wsSrv, store);
     WebRTCSrv.run(wsSrv);
 });

From a5ae0270431cb242c1d4bb3085d321d0755a6165 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 15:03:41 +0200
Subject: [PATCH 163/257] make logging configurable

---
 NetfluxWebsocketSrv.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 2bc4f3f1d..13ec51cca 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -8,6 +8,8 @@ const HISTORY_KEEPER_ID = Crypto.randomBytes(8).toString('hex');
 
 const USE_HISTORY_KEEPER = true;
 const USE_FILE_BACKUP_STORAGE = true;
+const LOG_MESSAGES = false;
+
 
 let dropUser;
 
@@ -15,7 +17,7 @@ const now = function () { return (new Date()).getTime(); };
 
 const sendMsg = function (ctx, user, msg) {
     try {
-        console.log('<' + JSON.stringify(msg));
+        if (LOG_MESSAGES) { console.log('<' + JSON.stringify(msg)); }
         user.socket.send(JSON.stringify(msg));
     } catch (e) {
         console.log(e.stack);
@@ -181,7 +183,7 @@ let run = module.exports.run = function (storage, socketServer) {
         ctx.users[user.id] = user;
         sendMsg(ctx, user, [0, '', 'IDENT', user.id]);
         socket.on('message', function(message) {
-            console.log('>'+message);
+            if (LOG_MESSAGES) { console.log('>'+message); }
             try {
                 handleMessage(ctx, user, message);
             } catch (e) {

From 4c8475826537c9027917ee1d9052d846a3a045df Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 15:30:53 +0200
Subject: [PATCH 164/257] disable textpatcher logging

---
 www/code/main.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index 3e6647b46..37fb572ce 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -144,8 +144,7 @@ define([
                 var realtime = module.realtime = info.realtime;
                 module.patchText = TextPatcher.create({
                     realtime: realtime,
-                    logging: true,
-                    //initialState: Messages.codeInitialState
+                    //logging: true
                 });
 
                 var userDoc = module.realtime.getUserDoc();

From d79b3616c9ae80da93dc19ef38ae90bd6d60ecbd Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 15:32:15 +0200
Subject: [PATCH 165/257] remove unused files

---
 www/code/codemirror-5.7/.gitattributes        |    8 -
 www/code/codemirror-5.7/.gitignore            |    8 -
 www/code/codemirror-5.7/.npmignore            |   10 -
 www/code/codemirror-5.7/.travis.yml           |    4 -
 www/code/codemirror-5.7/AUTHORS               |  496 -
 www/code/codemirror-5.7/CONTRIBUTING.md       |   88 -
 www/code/codemirror-5.7/LICENSE               |   19 -
 www/code/codemirror-5.7/README.md             |   28 -
 .../codemirror-5.7/addon/comment/comment.js   |  183 -
 .../addon/comment/continuecomment.js          |   85 -
 .../codemirror-5.7/addon/dialog/dialog.css    |   32 -
 .../codemirror-5.7/addon/dialog/dialog.js     |  157 -
 .../addon/display/autorefresh.js              |   47 -
 .../addon/display/fullscreen.css              |    6 -
 .../addon/display/fullscreen.js               |   41 -
 .../codemirror-5.7/addon/display/panel.js     |  112 -
 .../addon/display/placeholder.js              |   60 -
 .../codemirror-5.7/addon/display/rulers.js    |   63 -
 .../addon/edit/closebrackets.js               |  195 -
 .../codemirror-5.7/addon/edit/closetag.js     |  169 -
 .../codemirror-5.7/addon/edit/continuelist.js |   51 -
 .../addon/edit/matchbrackets.js               |  120 -
 .../codemirror-5.7/addon/edit/matchtags.js    |   66 -
 .../addon/edit/trailingspace.js               |   27 -
 .../codemirror-5.7/addon/fold/brace-fold.js   |  105 -
 .../codemirror-5.7/addon/fold/comment-fold.js |   57 -
 .../codemirror-5.7/addon/fold/foldcode.js     |  149 -
 .../codemirror-5.7/addon/fold/foldgutter.css  |   20 -
 .../codemirror-5.7/addon/fold/foldgutter.js   |  146 -
 .../codemirror-5.7/addon/fold/indent-fold.js  |   44 -
 .../addon/fold/markdown-fold.js               |   49 -
 .../codemirror-5.7/addon/fold/xml-fold.js     |  182 -
 .../codemirror-5.7/addon/hint/anyword-hint.js |   41 -
 .../codemirror-5.7/addon/hint/css-hint.js     |   60 -
 .../codemirror-5.7/addon/hint/html-hint.js    |  348 -
 .../addon/hint/javascript-hint.js             |  146 -
 .../codemirror-5.7/addon/hint/show-hint.css   |   38 -
 .../codemirror-5.7/addon/hint/show-hint.js    |  386 -
 .../codemirror-5.7/addon/hint/sql-hint.js     |  254 -
 .../codemirror-5.7/addon/hint/xml-hint.js     |  110 -
 .../addon/lint/coffeescript-lint.js           |   41 -
 .../codemirror-5.7/addon/lint/css-lint.js     |   35 -
 .../codemirror-5.7/addon/lint/html-lint.js    |   46 -
 .../addon/lint/javascript-lint.js             |  136 -
 .../codemirror-5.7/addon/lint/json-lint.js    |   31 -
 www/code/codemirror-5.7/addon/lint/lint.css   |   73 -
 www/code/codemirror-5.7/addon/lint/lint.js    |  231 -
 .../codemirror-5.7/addon/lint/yaml-lint.js    |   28 -
 www/code/codemirror-5.7/addon/merge/merge.css |  112 -
 www/code/codemirror-5.7/addon/merge/merge.js  |  775 --
 .../codemirror-5.7/addon/mode/loadmode.js     |   64 -
 .../codemirror-5.7/addon/mode/multiplex.js    |  123 -
 .../addon/mode/multiplex_test.js              |   33 -
 www/code/codemirror-5.7/addon/mode/overlay.js |   85 -
 www/code/codemirror-5.7/addon/mode/simple.js  |  213 -
 .../codemirror-5.7/addon/runmode/colorize.js  |   40 -
 .../addon/runmode/runmode-standalone.js       |  157 -
 .../codemirror-5.7/addon/runmode/runmode.js   |   72 -
 .../addon/runmode/runmode.node.js             |  178 -
 .../addon/scroll/annotatescrollbar.js         |  115 -
 .../addon/scroll/scrollpastend.js             |   46 -
 .../addon/scroll/simplescrollbars.css         |   66 -
 .../addon/scroll/simplescrollbars.js          |  147 -
 .../addon/search/match-highlighter.js         |  128 -
 .../addon/search/matchesonscrollbar.css       |    8 -
 .../addon/search/matchesonscrollbar.js        |   97 -
 .../codemirror-5.7/addon/search/search.js     |  228 -
 .../addon/search/searchcursor.js              |  189 -
 .../addon/selection/active-line.js            |   71 -
 .../addon/selection/mark-selection.js         |  118 -
 .../addon/selection/selection-pointer.js      |   98 -
 www/code/codemirror-5.7/addon/tern/tern.css   |   87 -
 www/code/codemirror-5.7/addon/tern/tern.js    |  700 --
 www/code/codemirror-5.7/addon/tern/worker.js  |   44 -
 .../codemirror-5.7/addon/wrap/hardwrap.js     |  139 -
 www/code/codemirror-5.7/bin/authors.sh        |    6 -
 www/code/codemirror-5.7/bin/compress          |   92 -
 www/code/codemirror-5.7/bin/lint              |    3 -
 www/code/codemirror-5.7/bin/release           |   45 -
 www/code/codemirror-5.7/bin/source-highlight  |   51 -
 www/code/codemirror-5.7/bower.json            |   17 -
 www/code/codemirror-5.7/demo/activeline.html  |   78 -
 www/code/codemirror-5.7/demo/anywordhint.html |   79 -
 www/code/codemirror-5.7/demo/bidi.html        |   74 -
 www/code/codemirror-5.7/demo/btree.html       |   85 -
 www/code/codemirror-5.7/demo/buffers.html     |  109 -
 www/code/codemirror-5.7/demo/changemode.html  |   58 -
 .../codemirror-5.7/demo/closebrackets.html    |   52 -
 www/code/codemirror-5.7/demo/closetag.html    |   41 -
 www/code/codemirror-5.7/demo/complete.html    |   79 -
 www/code/codemirror-5.7/demo/emacs.html       |   75 -
 www/code/codemirror-5.7/demo/folding.html     |   95 -
 www/code/codemirror-5.7/demo/fullscreen.html  |   83 -
 www/code/codemirror-5.7/demo/hardwrap.html    |   72 -
 .../codemirror-5.7/demo/html5complete.html    |   56 -
 www/code/codemirror-5.7/demo/indentwrap.html  |   59 -
 www/code/codemirror-5.7/demo/lint.html        |  171 -
 www/code/codemirror-5.7/demo/loadmode.html    |   72 -
 www/code/codemirror-5.7/demo/marker.html      |   52 -
 .../codemirror-5.7/demo/markselection.html    |   52 -
 .../codemirror-5.7/demo/matchhighlighter.html |   47 -
 www/code/codemirror-5.7/demo/matchtags.html   |   48 -
 www/code/codemirror-5.7/demo/merge.html       |  122 -
 www/code/codemirror-5.7/demo/multiplex.html   |   75 -
 www/code/codemirror-5.7/demo/mustache.html    |   69 -
 www/code/codemirror-5.7/demo/panel.html       |  136 -
 www/code/codemirror-5.7/demo/placeholder.html |   45 -
 www/code/codemirror-5.7/demo/preview.html     |   87 -
 www/code/codemirror-5.7/demo/requirejs.html   |   70 -
 www/code/codemirror-5.7/demo/resize.html      |   51 -
 www/code/codemirror-5.7/demo/rulers.html      |   49 -
 www/code/codemirror-5.7/demo/runmode.html     |   62 -
 www/code/codemirror-5.7/demo/search.html      |   95 -
 www/code/codemirror-5.7/demo/simplemode.html  |  186 -
 .../codemirror-5.7/demo/simplescrollbars.html |   82 -
 .../demo/spanaffectswrapping_shim.html        |   85 -
 www/code/codemirror-5.7/demo/sublime.html     |   77 -
 www/code/codemirror-5.7/demo/tern.html        |  133 -
 www/code/codemirror-5.7/demo/theme.html       |  154 -
 .../codemirror-5.7/demo/trailingspace.html    |   48 -
 .../codemirror-5.7/demo/variableheight.html   |   67 -
 www/code/codemirror-5.7/demo/vim.html         |  104 -
 www/code/codemirror-5.7/demo/visibletabs.html |   62 -
 www/code/codemirror-5.7/demo/widget.html      |   85 -
 www/code/codemirror-5.7/demo/xmlcomplete.html |  119 -
 www/code/codemirror-5.7/doc/activebookmark.js |   57 -
 www/code/codemirror-5.7/doc/compress.html     |  334 -
 www/code/codemirror-5.7/doc/docs.css          |  271 -
 www/code/codemirror-5.7/doc/internals.html    |  503 -
 www/code/codemirror-5.7/doc/logo.png          |  Bin 9310 -> 0 bytes
 www/code/codemirror-5.7/doc/logo.svg          |  181 -
 www/code/codemirror-5.7/doc/manual.html       | 3349 -------
 www/code/codemirror-5.7/doc/realworld.html    |  175 -
 www/code/codemirror-5.7/doc/releases.html     | 1144 ---
 www/code/codemirror-5.7/doc/reporting.html    |   61 -
 www/code/codemirror-5.7/doc/upgrade_v2.2.html |   96 -
 www/code/codemirror-5.7/doc/upgrade_v3.html   |  230 -
 www/code/codemirror-5.7/doc/upgrade_v4.html   |  144 -
 www/code/codemirror-5.7/doc/yinyang.png       |  Bin 4633 -> 0 bytes
 www/code/codemirror-5.7/index.html            |  199 -
 www/code/codemirror-5.7/keymap/emacs.js       |  412 -
 www/code/codemirror-5.7/keymap/sublime.js     |  563 --
 www/code/codemirror-5.7/keymap/vim.js         | 5060 ----------
 www/code/codemirror-5.7/lib/codemirror.css    |  334 -
 www/code/codemirror-5.7/lib/codemirror.js     | 8835 -----------------
 www/code/codemirror-5.7/mode/apl/apl.js       |  174 -
 www/code/codemirror-5.7/mode/apl/index.html   |   72 -
 .../mode/asciiarmor/asciiarmor.js             |   73 -
 .../codemirror-5.7/mode/asciiarmor/index.html |   46 -
 www/code/codemirror-5.7/mode/asn.1/asn.1.js   |  204 -
 www/code/codemirror-5.7/mode/asn.1/index.html |   78 -
 .../codemirror-5.7/mode/asterisk/asterisk.js  |  196 -
 .../codemirror-5.7/mode/asterisk/index.html   |  154 -
 .../mode/brainfuck/brainfuck.js               |   85 -
 .../codemirror-5.7/mode/brainfuck/index.html  |   85 -
 www/code/codemirror-5.7/mode/clike/clike.js   |  619 --
 www/code/codemirror-5.7/mode/clike/index.html |  252 -
 www/code/codemirror-5.7/mode/clike/scala.html |  767 --
 www/code/codemirror-5.7/mode/clike/test.js    |   42 -
 .../codemirror-5.7/mode/clojure/clojure.js    |  244 -
 .../codemirror-5.7/mode/clojure/index.html    |   88 -
 www/code/codemirror-5.7/mode/cmake/cmake.js   |   97 -
 www/code/codemirror-5.7/mode/cmake/index.html |  129 -
 www/code/codemirror-5.7/mode/cobol/cobol.js   |  255 -
 www/code/codemirror-5.7/mode/cobol/index.html |  210 -
 .../mode/coffeescript/coffeescript.js         |  366 -
 .../mode/coffeescript/index.html              |  740 --
 .../mode/commonlisp/commonlisp.js             |  123 -
 .../codemirror-5.7/mode/commonlisp/index.html |  177 -
 www/code/codemirror-5.7/mode/css/css.js       |  823 --
 www/code/codemirror-5.7/mode/css/gss.html     |  103 -
 www/code/codemirror-5.7/mode/css/gss_test.js  |   17 -
 www/code/codemirror-5.7/mode/css/index.html   |   75 -
 www/code/codemirror-5.7/mode/css/less.html    |  152 -
 www/code/codemirror-5.7/mode/css/less_test.js |   54 -
 www/code/codemirror-5.7/mode/css/scss.html    |  157 -
 www/code/codemirror-5.7/mode/css/scss_test.js |  110 -
 www/code/codemirror-5.7/mode/css/test.js      |  194 -
 www/code/codemirror-5.7/mode/cypher/cypher.js |  146 -
 .../codemirror-5.7/mode/cypher/index.html     |   63 -
 www/code/codemirror-5.7/mode/d/d.js           |  218 -
 www/code/codemirror-5.7/mode/d/index.html     |  273 -
 www/code/codemirror-5.7/mode/dart/dart.js     |   50 -
 www/code/codemirror-5.7/mode/dart/index.html  |   71 -
 www/code/codemirror-5.7/mode/diff/diff.js     |   47 -
 www/code/codemirror-5.7/mode/diff/index.html  |  117 -
 www/code/codemirror-5.7/mode/django/django.js |  350 -
 .../codemirror-5.7/mode/django/index.html     |   73 -
 .../mode/dockerfile/dockerfile.js             |   79 -
 .../codemirror-5.7/mode/dockerfile/index.html |   73 -
 www/code/codemirror-5.7/mode/dtd/dtd.js       |  142 -
 www/code/codemirror-5.7/mode/dtd/index.html   |   89 -
 www/code/codemirror-5.7/mode/dylan/dylan.js   |  291 -
 www/code/codemirror-5.7/mode/dylan/index.html |  407 -
 www/code/codemirror-5.7/mode/ebnf/ebnf.js     |  195 -
 www/code/codemirror-5.7/mode/ebnf/index.html  |  102 -
 www/code/codemirror-5.7/mode/ecl/ecl.js       |  206 -
 www/code/codemirror-5.7/mode/ecl/index.html   |   52 -
 www/code/codemirror-5.7/mode/eiffel/eiffel.js |  160 -
 .../codemirror-5.7/mode/eiffel/index.html     |  429 -
 www/code/codemirror-5.7/mode/elm/elm.js       |  205 -
 www/code/codemirror-5.7/mode/elm/index.html   |   61 -
 www/code/codemirror-5.7/mode/erlang/erlang.js |  618 --
 .../codemirror-5.7/mode/erlang/index.html     |   76 -
 www/code/codemirror-5.7/mode/factor/factor.js |   83 -
 .../codemirror-5.7/mode/factor/index.html     |   77 -
 www/code/codemirror-5.7/mode/forth/forth.js   |  180 -
 www/code/codemirror-5.7/mode/forth/index.html |   75 -
 .../codemirror-5.7/mode/fortran/fortran.js    |  188 -
 .../codemirror-5.7/mode/fortran/index.html    |   81 -
 www/code/codemirror-5.7/mode/gas/gas.js       |  345 -
 www/code/codemirror-5.7/mode/gas/index.html   |   68 -
 www/code/codemirror-5.7/mode/gfm/gfm.js       |  130 -
 www/code/codemirror-5.7/mode/gfm/index.html   |   93 -
 www/code/codemirror-5.7/mode/gfm/test.js      |  230 -
 .../codemirror-5.7/mode/gherkin/gherkin.js    |  178 -
 .../codemirror-5.7/mode/gherkin/index.html    |   48 -
 www/code/codemirror-5.7/mode/go/go.js         |  185 -
 www/code/codemirror-5.7/mode/go/index.html    |   85 -
 www/code/codemirror-5.7/mode/groovy/groovy.js |  230 -
 .../codemirror-5.7/mode/groovy/index.html     |   84 -
 www/code/codemirror-5.7/mode/haml/haml.js     |  159 -
 www/code/codemirror-5.7/mode/haml/index.html  |   79 -
 www/code/codemirror-5.7/mode/haml/test.js     |   97 -
 .../mode/handlebars/handlebars.js             |   53 -
 .../codemirror-5.7/mode/handlebars/index.html |   83 -
 .../codemirror-5.7/mode/haskell/haskell.js    |  267 -
 .../codemirror-5.7/mode/haskell/index.html    |   73 -
 www/code/codemirror-5.7/mode/haxe/haxe.js     |  506 -
 www/code/codemirror-5.7/mode/haxe/index.html  |  124 -
 .../mode/htmlembedded/htmlembedded.js         |   28 -
 .../mode/htmlembedded/index.html              |   59 -
 .../mode/htmlmixed/htmlmixed.js               |  150 -
 .../codemirror-5.7/mode/htmlmixed/index.html  |   89 -
 www/code/codemirror-5.7/mode/http/http.js     |  113 -
 www/code/codemirror-5.7/mode/http/index.html  |   45 -
 www/code/codemirror-5.7/mode/idl/idl.js       |  290 -
 www/code/codemirror-5.7/mode/idl/index.html   |   64 -
 www/code/codemirror-5.7/mode/index.html       |  152 -
 www/code/codemirror-5.7/mode/jade/index.html  |   70 -
 www/code/codemirror-5.7/mode/jade/jade.js     |  590 --
 .../codemirror-5.7/mode/javascript/index.html |  114 -
 .../mode/javascript/javascript.js             |  708 --
 .../mode/javascript/json-ld.html              |   72 -
 .../codemirror-5.7/mode/javascript/test.js    |  198 -
 .../mode/javascript/typescript.html           |   61 -
 .../codemirror-5.7/mode/jinja2/index.html     |   54 -
 www/code/codemirror-5.7/mode/jinja2/jinja2.js |  142 -
 www/code/codemirror-5.7/mode/julia/index.html |  195 -
 www/code/codemirror-5.7/mode/julia/julia.js   |  299 -
 .../codemirror-5.7/mode/kotlin/index.html     |   89 -
 www/code/codemirror-5.7/mode/kotlin/kotlin.js |  284 -
 .../codemirror-5.7/mode/livescript/index.html |  459 -
 .../mode/livescript/livescript.js             |  280 -
 www/code/codemirror-5.7/mode/lua/index.html   |   85 -
 www/code/codemirror-5.7/mode/lua/lua.js       |  159 -
 .../codemirror-5.7/mode/markdown/index.html   |  361 -
 .../codemirror-5.7/mode/markdown/markdown.js  |  792 --
 www/code/codemirror-5.7/mode/markdown/test.js |  848 --
 .../mode/mathematica/index.html               |   72 -
 .../mode/mathematica/mathematica.js           |  175 -
 www/code/codemirror-5.7/mode/meta.js          |  196 -
 www/code/codemirror-5.7/mode/mirc/index.html  |  160 -
 www/code/codemirror-5.7/mode/mirc/mirc.js     |  193 -
 .../codemirror-5.7/mode/mllike/index.html     |  179 -
 www/code/codemirror-5.7/mode/mllike/mllike.js |  205 -
 .../codemirror-5.7/mode/modelica/index.html   |   67 -
 .../codemirror-5.7/mode/modelica/modelica.js  |  245 -
 .../codemirror-5.7/mode/mscgen/index.html     |   65 -
 .../mode/mscgen/index_msgenny.html            |   44 -
 .../codemirror-5.7/mode/mscgen/index_xu.html  |   70 -
 www/code/codemirror-5.7/mode/mscgen/mscgen.js |  169 -
 .../codemirror-5.7/mode/mscgen/mscgen_test.js |   75 -
 .../mode/mscgen/msgenny_test.js               |   71 -
 .../codemirror-5.7/mode/mscgen/xu_test.js     |   75 -
 www/code/codemirror-5.7/mode/mumps/index.html |   85 -
 www/code/codemirror-5.7/mode/mumps/mumps.js   |  148 -
 www/code/codemirror-5.7/mode/nginx/index.html |  181 -
 www/code/codemirror-5.7/mode/nginx/nginx.js   |  178 -
 .../codemirror-5.7/mode/ntriples/index.html   |   45 -
 .../codemirror-5.7/mode/ntriples/ntriples.js  |  186 -
 .../codemirror-5.7/mode/octave/index.html     |   83 -
 www/code/codemirror-5.7/mode/octave/octave.js |  135 -
 www/code/codemirror-5.7/mode/oz/index.html    |   59 -
 www/code/codemirror-5.7/mode/oz/oz.js         |  252 -
 .../codemirror-5.7/mode/pascal/index.html     |   61 -
 www/code/codemirror-5.7/mode/pascal/pascal.js |  109 -
 www/code/codemirror-5.7/mode/pegjs/index.html |   66 -
 www/code/codemirror-5.7/mode/pegjs/pegjs.js   |  114 -
 www/code/codemirror-5.7/mode/perl/index.html  |   75 -
 www/code/codemirror-5.7/mode/perl/perl.js     |  837 --
 www/code/codemirror-5.7/mode/php/index.html   |   64 -
 www/code/codemirror-5.7/mode/php/php.js       |  234 -
 www/code/codemirror-5.7/mode/php/test.js      |  154 -
 www/code/codemirror-5.7/mode/pig/index.html   |   55 -
 www/code/codemirror-5.7/mode/pig/pig.js       |  178 -
 .../codemirror-5.7/mode/properties/index.html |   53 -
 .../mode/properties/properties.js             |   78 -
 .../codemirror-5.7/mode/puppet/index.html     |  121 -
 www/code/codemirror-5.7/mode/puppet/puppet.js |  220 -
 .../codemirror-5.7/mode/python/index.html     |  198 -
 www/code/codemirror-5.7/mode/python/python.js |  358 -
 www/code/codemirror-5.7/mode/q/index.html     |  144 -
 www/code/codemirror-5.7/mode/q/q.js           |  139 -
 www/code/codemirror-5.7/mode/r/index.html     |   85 -
 www/code/codemirror-5.7/mode/r/r.js           |  162 -
 .../mode/rpm/changes/index.html               |   66 -
 www/code/codemirror-5.7/mode/rpm/index.html   |  149 -
 www/code/codemirror-5.7/mode/rpm/rpm.js       |  101 -
 www/code/codemirror-5.7/mode/rst/index.html   |  535 -
 www/code/codemirror-5.7/mode/rst/rst.js       |  557 --
 www/code/codemirror-5.7/mode/ruby/index.html  |  183 -
 www/code/codemirror-5.7/mode/ruby/ruby.js     |  285 -
 www/code/codemirror-5.7/mode/ruby/test.js     |   14 -
 www/code/codemirror-5.7/mode/rust/index.html  |   64 -
 www/code/codemirror-5.7/mode/rust/rust.js     |   58 -
 www/code/codemirror-5.7/mode/rust/test.js     |   40 -
 www/code/codemirror-5.7/mode/sass/index.html  |   66 -
 www/code/codemirror-5.7/mode/sass/sass.js     |  414 -
 .../codemirror-5.7/mode/scheme/index.html     |   77 -
 www/code/codemirror-5.7/mode/scheme/scheme.js |  249 -
 www/code/codemirror-5.7/mode/shell/index.html |   66 -
 www/code/codemirror-5.7/mode/shell/shell.js   |  139 -
 www/code/codemirror-5.7/mode/shell/test.js    |   58 -
 www/code/codemirror-5.7/mode/sieve/index.html |   93 -
 www/code/codemirror-5.7/mode/sieve/sieve.js   |  193 -
 www/code/codemirror-5.7/mode/slim/index.html  |   96 -
 www/code/codemirror-5.7/mode/slim/slim.js     |  575 --
 www/code/codemirror-5.7/mode/slim/test.js     |   96 -
 .../codemirror-5.7/mode/smalltalk/index.html  |   68 -
 .../mode/smalltalk/smalltalk.js               |  168 -
 .../codemirror-5.7/mode/smarty/index.html     |  138 -
 www/code/codemirror-5.7/mode/smarty/smarty.js |  225 -
 www/code/codemirror-5.7/mode/solr/index.html  |   57 -
 www/code/codemirror-5.7/mode/solr/solr.js     |  104 -
 www/code/codemirror-5.7/mode/soy/index.html   |   68 -
 www/code/codemirror-5.7/mode/soy/soy.js       |  198 -
 .../codemirror-5.7/mode/sparql/index.html     |   61 -
 www/code/codemirror-5.7/mode/sparql/sparql.js |  174 -
 .../mode/spreadsheet/index.html               |   42 -
 .../mode/spreadsheet/spreadsheet.js           |  109 -
 www/code/codemirror-5.7/mode/sql/index.html   |   84 -
 www/code/codemirror-5.7/mode/sql/sql.js       |  391 -
 www/code/codemirror-5.7/mode/stex/index.html  |  110 -
 www/code/codemirror-5.7/mode/stex/stex.js     |  251 -
 www/code/codemirror-5.7/mode/stex/test.js     |  123 -
 .../codemirror-5.7/mode/stylus/index.html     |  106 -
 www/code/codemirror-5.7/mode/stylus/stylus.js |  769 --
 www/code/codemirror-5.7/mode/swift/index.html |   88 -
 www/code/codemirror-5.7/mode/swift/swift.js   |  203 -
 www/code/codemirror-5.7/mode/tcl/index.html   |  142 -
 www/code/codemirror-5.7/mode/tcl/tcl.js       |  147 -
 .../codemirror-5.7/mode/textile/index.html    |  191 -
 www/code/codemirror-5.7/mode/textile/test.js  |  417 -
 .../codemirror-5.7/mode/textile/textile.js    |  469 -
 .../codemirror-5.7/mode/tiddlywiki/index.html |  154 -
 .../mode/tiddlywiki/tiddlywiki.css            |   14 -
 .../mode/tiddlywiki/tiddlywiki.js             |  358 -
 www/code/codemirror-5.7/mode/tiki/index.html  |   95 -
 www/code/codemirror-5.7/mode/tiki/tiki.css    |   26 -
 www/code/codemirror-5.7/mode/tiki/tiki.js     |  312 -
 www/code/codemirror-5.7/mode/toml/index.html  |   73 -
 www/code/codemirror-5.7/mode/toml/toml.js     |   88 -
 .../codemirror-5.7/mode/tornado/index.html    |   63 -
 .../codemirror-5.7/mode/tornado/tornado.js    |   68 -
 www/code/codemirror-5.7/mode/troff/index.html |  146 -
 www/code/codemirror-5.7/mode/troff/troff.js   |   82 -
 .../codemirror-5.7/mode/ttcn-cfg/index.html   |  115 -
 .../codemirror-5.7/mode/ttcn-cfg/ttcn-cfg.js  |  214 -
 www/code/codemirror-5.7/mode/ttcn/index.html  |  118 -
 www/code/codemirror-5.7/mode/ttcn/ttcn.js     |  283 -
 .../codemirror-5.7/mode/turtle/index.html     |   50 -
 www/code/codemirror-5.7/mode/turtle/turtle.js |  162 -
 www/code/codemirror-5.7/mode/twig/index.html  |   45 -
 www/code/codemirror-5.7/mode/twig/twig.js     |  132 -
 www/code/codemirror-5.7/mode/vb/index.html    |  102 -
 www/code/codemirror-5.7/mode/vb/vb.js         |  276 -
 .../codemirror-5.7/mode/vbscript/index.html   |   55 -
 .../codemirror-5.7/mode/vbscript/vbscript.js  |  350 -
 .../codemirror-5.7/mode/velocity/index.html   |  118 -
 .../codemirror-5.7/mode/velocity/velocity.js  |  201 -
 .../codemirror-5.7/mode/verilog/index.html    |  120 -
 www/code/codemirror-5.7/mode/verilog/test.js  |  273 -
 .../codemirror-5.7/mode/verilog/verilog.js    |  537 -
 www/code/codemirror-5.7/mode/vhdl/index.html  |   95 -
 www/code/codemirror-5.7/mode/vhdl/vhdl.js     |  189 -
 www/code/codemirror-5.7/mode/vue/index.html   |   69 -
 www/code/codemirror-5.7/mode/vue/vue.js       |   69 -
 www/code/codemirror-5.7/mode/xml/index.html   |   57 -
 www/code/codemirror-5.7/mode/xml/test.js      |   51 -
 www/code/codemirror-5.7/mode/xml/xml.js       |  385 -
 .../codemirror-5.7/mode/xquery/index.html     |  210 -
 www/code/codemirror-5.7/mode/xquery/test.js   |   67 -
 www/code/codemirror-5.7/mode/xquery/xquery.js |  437 -
 www/code/codemirror-5.7/mode/yaml/index.html  |   80 -
 www/code/codemirror-5.7/mode/yaml/yaml.js     |  117 -
 www/code/codemirror-5.7/mode/z80/index.html   |   53 -
 www/code/codemirror-5.7/mode/z80/z80.js       |  116 -
 www/code/codemirror-5.7/package.json          |   20 -
 www/code/codemirror-5.7/test/comment_test.js  |  100 -
 www/code/codemirror-5.7/test/doc_test.js      |  371 -
 www/code/codemirror-5.7/test/driver.js        |  138 -
 www/code/codemirror-5.7/test/emacs_test.js    |  147 -
 www/code/codemirror-5.7/test/index.html       |  249 -
 www/code/codemirror-5.7/test/lint.js          |   11 -
 www/code/codemirror-5.7/test/mode_test.css    |   23 -
 www/code/codemirror-5.7/test/mode_test.js     |  192 -
 www/code/codemirror-5.7/test/multi_test.js    |  285 -
 .../codemirror-5.7/test/phantom_driver.js     |   31 -
 www/code/codemirror-5.7/test/run.js           |   31 -
 www/code/codemirror-5.7/test/scroll_test.js   |  115 -
 www/code/codemirror-5.7/test/search_test.js   |   62 -
 www/code/codemirror-5.7/test/sql-hint-test.js |  189 -
 www/code/codemirror-5.7/test/sublime_test.js  |  303 -
 www/code/codemirror-5.7/test/test.js          | 2142 ----
 www/code/codemirror-5.7/test/vim_test.js      | 3955 --------
 www/code/codemirror-5.7/theme/3024-day.css    |   41 -
 www/code/codemirror-5.7/theme/3024-night.css  |   39 -
 www/code/codemirror-5.7/theme/abcdef.css      |   32 -
 .../codemirror-5.7/theme/ambiance-mobile.css  |    5 -
 www/code/codemirror-5.7/theme/ambiance.css    |   74 -
 www/code/codemirror-5.7/theme/base16-dark.css |   38 -
 .../codemirror-5.7/theme/base16-light.css     |   38 -
 www/code/codemirror-5.7/theme/blackboard.css  |   32 -
 www/code/codemirror-5.7/theme/cobalt.css      |   25 -
 www/code/codemirror-5.7/theme/colorforth.css  |   33 -
 www/code/codemirror-5.7/theme/dracula.css     |   41 -
 www/code/codemirror-5.7/theme/eclipse.css     |   23 -
 www/code/codemirror-5.7/theme/elegant.css     |   13 -
 www/code/codemirror-5.7/theme/erlang-dark.css |   34 -
 www/code/codemirror-5.7/theme/icecoder.css    |   43 -
 www/code/codemirror-5.7/theme/lesser-dark.css |   47 -
 www/code/codemirror-5.7/theme/liquibyte.css   |   95 -
 www/code/codemirror-5.7/theme/material.css    |   53 -
 www/code/codemirror-5.7/theme/mbo.css         |   37 -
 www/code/codemirror-5.7/theme/mdn-like.css    |   46 -
 www/code/codemirror-5.7/theme/midnight.css    |   45 -
 www/code/codemirror-5.7/theme/monokai.css     |   35 -
 www/code/codemirror-5.7/theme/neat.css        |   12 -
 www/code/codemirror-5.7/theme/neo.css         |   43 -
 www/code/codemirror-5.7/theme/night.css       |   28 -
 .../codemirror-5.7/theme/paraiso-dark.css     |   38 -
 .../codemirror-5.7/theme/paraiso-light.css    |   38 -
 .../codemirror-5.7/theme/pastel-on-dark.css   |   53 -
 www/code/codemirror-5.7/theme/rubyblue.css    |   25 -
 www/code/codemirror-5.7/theme/seti.css        |   44 -
 www/code/codemirror-5.7/theme/solarized.css   |  163 -
 www/code/codemirror-5.7/theme/the-matrix.css  |   30 -
 .../theme/tomorrow-night-bright.css           |   35 -
 .../theme/tomorrow-night-eighties.css         |   38 -
 www/code/codemirror-5.7/theme/ttcn.css        |   64 -
 www/code/codemirror-5.7/theme/twilight.css    |   32 -
 www/code/codemirror-5.7/theme/vibrant-ink.css |   34 -
 www/code/codemirror-5.7/theme/xq-dark.css     |   53 -
 www/code/codemirror-5.7/theme/xq-light.css    |   43 -
 www/code/codemirror-5.7/theme/yeti.css        |   44 -
 www/code/codemirror-5.7/theme/zenburn.css     |   37 -
 www/code/errorbox.js                          |   93 -
 www/code/rt_codemirror.js                     |  447 -
 www/code/toolbar.js                           |  233 -
 460 files changed, 90411 deletions(-)
 delete mode 100644 www/code/codemirror-5.7/.gitattributes
 delete mode 100644 www/code/codemirror-5.7/.gitignore
 delete mode 100644 www/code/codemirror-5.7/.npmignore
 delete mode 100644 www/code/codemirror-5.7/.travis.yml
 delete mode 100644 www/code/codemirror-5.7/AUTHORS
 delete mode 100644 www/code/codemirror-5.7/CONTRIBUTING.md
 delete mode 100644 www/code/codemirror-5.7/LICENSE
 delete mode 100644 www/code/codemirror-5.7/README.md
 delete mode 100644 www/code/codemirror-5.7/addon/comment/comment.js
 delete mode 100644 www/code/codemirror-5.7/addon/comment/continuecomment.js
 delete mode 100644 www/code/codemirror-5.7/addon/dialog/dialog.css
 delete mode 100644 www/code/codemirror-5.7/addon/dialog/dialog.js
 delete mode 100644 www/code/codemirror-5.7/addon/display/autorefresh.js
 delete mode 100644 www/code/codemirror-5.7/addon/display/fullscreen.css
 delete mode 100644 www/code/codemirror-5.7/addon/display/fullscreen.js
 delete mode 100644 www/code/codemirror-5.7/addon/display/panel.js
 delete mode 100644 www/code/codemirror-5.7/addon/display/placeholder.js
 delete mode 100644 www/code/codemirror-5.7/addon/display/rulers.js
 delete mode 100644 www/code/codemirror-5.7/addon/edit/closebrackets.js
 delete mode 100644 www/code/codemirror-5.7/addon/edit/closetag.js
 delete mode 100644 www/code/codemirror-5.7/addon/edit/continuelist.js
 delete mode 100644 www/code/codemirror-5.7/addon/edit/matchbrackets.js
 delete mode 100644 www/code/codemirror-5.7/addon/edit/matchtags.js
 delete mode 100644 www/code/codemirror-5.7/addon/edit/trailingspace.js
 delete mode 100644 www/code/codemirror-5.7/addon/fold/brace-fold.js
 delete mode 100644 www/code/codemirror-5.7/addon/fold/comment-fold.js
 delete mode 100644 www/code/codemirror-5.7/addon/fold/foldcode.js
 delete mode 100644 www/code/codemirror-5.7/addon/fold/foldgutter.css
 delete mode 100644 www/code/codemirror-5.7/addon/fold/foldgutter.js
 delete mode 100644 www/code/codemirror-5.7/addon/fold/indent-fold.js
 delete mode 100644 www/code/codemirror-5.7/addon/fold/markdown-fold.js
 delete mode 100644 www/code/codemirror-5.7/addon/fold/xml-fold.js
 delete mode 100644 www/code/codemirror-5.7/addon/hint/anyword-hint.js
 delete mode 100644 www/code/codemirror-5.7/addon/hint/css-hint.js
 delete mode 100644 www/code/codemirror-5.7/addon/hint/html-hint.js
 delete mode 100644 www/code/codemirror-5.7/addon/hint/javascript-hint.js
 delete mode 100644 www/code/codemirror-5.7/addon/hint/show-hint.css
 delete mode 100644 www/code/codemirror-5.7/addon/hint/show-hint.js
 delete mode 100644 www/code/codemirror-5.7/addon/hint/sql-hint.js
 delete mode 100644 www/code/codemirror-5.7/addon/hint/xml-hint.js
 delete mode 100644 www/code/codemirror-5.7/addon/lint/coffeescript-lint.js
 delete mode 100644 www/code/codemirror-5.7/addon/lint/css-lint.js
 delete mode 100644 www/code/codemirror-5.7/addon/lint/html-lint.js
 delete mode 100644 www/code/codemirror-5.7/addon/lint/javascript-lint.js
 delete mode 100644 www/code/codemirror-5.7/addon/lint/json-lint.js
 delete mode 100644 www/code/codemirror-5.7/addon/lint/lint.css
 delete mode 100644 www/code/codemirror-5.7/addon/lint/lint.js
 delete mode 100644 www/code/codemirror-5.7/addon/lint/yaml-lint.js
 delete mode 100644 www/code/codemirror-5.7/addon/merge/merge.css
 delete mode 100644 www/code/codemirror-5.7/addon/merge/merge.js
 delete mode 100644 www/code/codemirror-5.7/addon/mode/loadmode.js
 delete mode 100644 www/code/codemirror-5.7/addon/mode/multiplex.js
 delete mode 100644 www/code/codemirror-5.7/addon/mode/multiplex_test.js
 delete mode 100644 www/code/codemirror-5.7/addon/mode/overlay.js
 delete mode 100644 www/code/codemirror-5.7/addon/mode/simple.js
 delete mode 100644 www/code/codemirror-5.7/addon/runmode/colorize.js
 delete mode 100644 www/code/codemirror-5.7/addon/runmode/runmode-standalone.js
 delete mode 100644 www/code/codemirror-5.7/addon/runmode/runmode.js
 delete mode 100644 www/code/codemirror-5.7/addon/runmode/runmode.node.js
 delete mode 100644 www/code/codemirror-5.7/addon/scroll/annotatescrollbar.js
 delete mode 100644 www/code/codemirror-5.7/addon/scroll/scrollpastend.js
 delete mode 100644 www/code/codemirror-5.7/addon/scroll/simplescrollbars.css
 delete mode 100644 www/code/codemirror-5.7/addon/scroll/simplescrollbars.js
 delete mode 100644 www/code/codemirror-5.7/addon/search/match-highlighter.js
 delete mode 100644 www/code/codemirror-5.7/addon/search/matchesonscrollbar.css
 delete mode 100644 www/code/codemirror-5.7/addon/search/matchesonscrollbar.js
 delete mode 100644 www/code/codemirror-5.7/addon/search/search.js
 delete mode 100644 www/code/codemirror-5.7/addon/search/searchcursor.js
 delete mode 100644 www/code/codemirror-5.7/addon/selection/active-line.js
 delete mode 100644 www/code/codemirror-5.7/addon/selection/mark-selection.js
 delete mode 100644 www/code/codemirror-5.7/addon/selection/selection-pointer.js
 delete mode 100644 www/code/codemirror-5.7/addon/tern/tern.css
 delete mode 100644 www/code/codemirror-5.7/addon/tern/tern.js
 delete mode 100644 www/code/codemirror-5.7/addon/tern/worker.js
 delete mode 100644 www/code/codemirror-5.7/addon/wrap/hardwrap.js
 delete mode 100644 www/code/codemirror-5.7/bin/authors.sh
 delete mode 100644 www/code/codemirror-5.7/bin/compress
 delete mode 100644 www/code/codemirror-5.7/bin/lint
 delete mode 100644 www/code/codemirror-5.7/bin/release
 delete mode 100644 www/code/codemirror-5.7/bin/source-highlight
 delete mode 100644 www/code/codemirror-5.7/bower.json
 delete mode 100644 www/code/codemirror-5.7/demo/activeline.html
 delete mode 100644 www/code/codemirror-5.7/demo/anywordhint.html
 delete mode 100644 www/code/codemirror-5.7/demo/bidi.html
 delete mode 100644 www/code/codemirror-5.7/demo/btree.html
 delete mode 100644 www/code/codemirror-5.7/demo/buffers.html
 delete mode 100644 www/code/codemirror-5.7/demo/changemode.html
 delete mode 100644 www/code/codemirror-5.7/demo/closebrackets.html
 delete mode 100644 www/code/codemirror-5.7/demo/closetag.html
 delete mode 100644 www/code/codemirror-5.7/demo/complete.html
 delete mode 100644 www/code/codemirror-5.7/demo/emacs.html
 delete mode 100644 www/code/codemirror-5.7/demo/folding.html
 delete mode 100644 www/code/codemirror-5.7/demo/fullscreen.html
 delete mode 100644 www/code/codemirror-5.7/demo/hardwrap.html
 delete mode 100644 www/code/codemirror-5.7/demo/html5complete.html
 delete mode 100644 www/code/codemirror-5.7/demo/indentwrap.html
 delete mode 100644 www/code/codemirror-5.7/demo/lint.html
 delete mode 100644 www/code/codemirror-5.7/demo/loadmode.html
 delete mode 100644 www/code/codemirror-5.7/demo/marker.html
 delete mode 100644 www/code/codemirror-5.7/demo/markselection.html
 delete mode 100644 www/code/codemirror-5.7/demo/matchhighlighter.html
 delete mode 100644 www/code/codemirror-5.7/demo/matchtags.html
 delete mode 100644 www/code/codemirror-5.7/demo/merge.html
 delete mode 100644 www/code/codemirror-5.7/demo/multiplex.html
 delete mode 100644 www/code/codemirror-5.7/demo/mustache.html
 delete mode 100644 www/code/codemirror-5.7/demo/panel.html
 delete mode 100644 www/code/codemirror-5.7/demo/placeholder.html
 delete mode 100644 www/code/codemirror-5.7/demo/preview.html
 delete mode 100644 www/code/codemirror-5.7/demo/requirejs.html
 delete mode 100644 www/code/codemirror-5.7/demo/resize.html
 delete mode 100644 www/code/codemirror-5.7/demo/rulers.html
 delete mode 100644 www/code/codemirror-5.7/demo/runmode.html
 delete mode 100644 www/code/codemirror-5.7/demo/search.html
 delete mode 100644 www/code/codemirror-5.7/demo/simplemode.html
 delete mode 100644 www/code/codemirror-5.7/demo/simplescrollbars.html
 delete mode 100644 www/code/codemirror-5.7/demo/spanaffectswrapping_shim.html
 delete mode 100644 www/code/codemirror-5.7/demo/sublime.html
 delete mode 100644 www/code/codemirror-5.7/demo/tern.html
 delete mode 100644 www/code/codemirror-5.7/demo/theme.html
 delete mode 100644 www/code/codemirror-5.7/demo/trailingspace.html
 delete mode 100644 www/code/codemirror-5.7/demo/variableheight.html
 delete mode 100644 www/code/codemirror-5.7/demo/vim.html
 delete mode 100644 www/code/codemirror-5.7/demo/visibletabs.html
 delete mode 100644 www/code/codemirror-5.7/demo/widget.html
 delete mode 100644 www/code/codemirror-5.7/demo/xmlcomplete.html
 delete mode 100644 www/code/codemirror-5.7/doc/activebookmark.js
 delete mode 100644 www/code/codemirror-5.7/doc/compress.html
 delete mode 100644 www/code/codemirror-5.7/doc/docs.css
 delete mode 100644 www/code/codemirror-5.7/doc/internals.html
 delete mode 100644 www/code/codemirror-5.7/doc/logo.png
 delete mode 100644 www/code/codemirror-5.7/doc/logo.svg
 delete mode 100644 www/code/codemirror-5.7/doc/manual.html
 delete mode 100644 www/code/codemirror-5.7/doc/realworld.html
 delete mode 100644 www/code/codemirror-5.7/doc/releases.html
 delete mode 100644 www/code/codemirror-5.7/doc/reporting.html
 delete mode 100644 www/code/codemirror-5.7/doc/upgrade_v2.2.html
 delete mode 100644 www/code/codemirror-5.7/doc/upgrade_v3.html
 delete mode 100644 www/code/codemirror-5.7/doc/upgrade_v4.html
 delete mode 100644 www/code/codemirror-5.7/doc/yinyang.png
 delete mode 100644 www/code/codemirror-5.7/index.html
 delete mode 100644 www/code/codemirror-5.7/keymap/emacs.js
 delete mode 100644 www/code/codemirror-5.7/keymap/sublime.js
 delete mode 100644 www/code/codemirror-5.7/keymap/vim.js
 delete mode 100644 www/code/codemirror-5.7/lib/codemirror.css
 delete mode 100644 www/code/codemirror-5.7/lib/codemirror.js
 delete mode 100644 www/code/codemirror-5.7/mode/apl/apl.js
 delete mode 100644 www/code/codemirror-5.7/mode/apl/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/asciiarmor/asciiarmor.js
 delete mode 100644 www/code/codemirror-5.7/mode/asciiarmor/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/asn.1/asn.1.js
 delete mode 100644 www/code/codemirror-5.7/mode/asn.1/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/asterisk/asterisk.js
 delete mode 100644 www/code/codemirror-5.7/mode/asterisk/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/brainfuck/brainfuck.js
 delete mode 100644 www/code/codemirror-5.7/mode/brainfuck/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/clike/clike.js
 delete mode 100644 www/code/codemirror-5.7/mode/clike/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/clike/scala.html
 delete mode 100644 www/code/codemirror-5.7/mode/clike/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/clojure/clojure.js
 delete mode 100644 www/code/codemirror-5.7/mode/clojure/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/cmake/cmake.js
 delete mode 100644 www/code/codemirror-5.7/mode/cmake/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/cobol/cobol.js
 delete mode 100644 www/code/codemirror-5.7/mode/cobol/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/coffeescript/coffeescript.js
 delete mode 100644 www/code/codemirror-5.7/mode/coffeescript/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/commonlisp/commonlisp.js
 delete mode 100644 www/code/codemirror-5.7/mode/commonlisp/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/css/css.js
 delete mode 100644 www/code/codemirror-5.7/mode/css/gss.html
 delete mode 100644 www/code/codemirror-5.7/mode/css/gss_test.js
 delete mode 100644 www/code/codemirror-5.7/mode/css/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/css/less.html
 delete mode 100644 www/code/codemirror-5.7/mode/css/less_test.js
 delete mode 100644 www/code/codemirror-5.7/mode/css/scss.html
 delete mode 100644 www/code/codemirror-5.7/mode/css/scss_test.js
 delete mode 100644 www/code/codemirror-5.7/mode/css/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/cypher/cypher.js
 delete mode 100644 www/code/codemirror-5.7/mode/cypher/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/d/d.js
 delete mode 100644 www/code/codemirror-5.7/mode/d/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/dart/dart.js
 delete mode 100644 www/code/codemirror-5.7/mode/dart/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/diff/diff.js
 delete mode 100644 www/code/codemirror-5.7/mode/diff/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/django/django.js
 delete mode 100644 www/code/codemirror-5.7/mode/django/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/dockerfile/dockerfile.js
 delete mode 100644 www/code/codemirror-5.7/mode/dockerfile/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/dtd/dtd.js
 delete mode 100644 www/code/codemirror-5.7/mode/dtd/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/dylan/dylan.js
 delete mode 100644 www/code/codemirror-5.7/mode/dylan/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/ebnf/ebnf.js
 delete mode 100644 www/code/codemirror-5.7/mode/ebnf/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/ecl/ecl.js
 delete mode 100644 www/code/codemirror-5.7/mode/ecl/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/eiffel/eiffel.js
 delete mode 100644 www/code/codemirror-5.7/mode/eiffel/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/elm/elm.js
 delete mode 100644 www/code/codemirror-5.7/mode/elm/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/erlang/erlang.js
 delete mode 100644 www/code/codemirror-5.7/mode/erlang/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/factor/factor.js
 delete mode 100644 www/code/codemirror-5.7/mode/factor/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/forth/forth.js
 delete mode 100644 www/code/codemirror-5.7/mode/forth/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/fortran/fortran.js
 delete mode 100644 www/code/codemirror-5.7/mode/fortran/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/gas/gas.js
 delete mode 100644 www/code/codemirror-5.7/mode/gas/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/gfm/gfm.js
 delete mode 100644 www/code/codemirror-5.7/mode/gfm/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/gfm/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/gherkin/gherkin.js
 delete mode 100644 www/code/codemirror-5.7/mode/gherkin/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/go/go.js
 delete mode 100644 www/code/codemirror-5.7/mode/go/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/groovy/groovy.js
 delete mode 100644 www/code/codemirror-5.7/mode/groovy/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/haml/haml.js
 delete mode 100644 www/code/codemirror-5.7/mode/haml/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/haml/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/handlebars/handlebars.js
 delete mode 100644 www/code/codemirror-5.7/mode/handlebars/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/haskell/haskell.js
 delete mode 100644 www/code/codemirror-5.7/mode/haskell/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/haxe/haxe.js
 delete mode 100644 www/code/codemirror-5.7/mode/haxe/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/htmlembedded/htmlembedded.js
 delete mode 100644 www/code/codemirror-5.7/mode/htmlembedded/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/htmlmixed/htmlmixed.js
 delete mode 100644 www/code/codemirror-5.7/mode/htmlmixed/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/http/http.js
 delete mode 100644 www/code/codemirror-5.7/mode/http/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/idl/idl.js
 delete mode 100644 www/code/codemirror-5.7/mode/idl/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/jade/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/jade/jade.js
 delete mode 100644 www/code/codemirror-5.7/mode/javascript/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/javascript/javascript.js
 delete mode 100644 www/code/codemirror-5.7/mode/javascript/json-ld.html
 delete mode 100644 www/code/codemirror-5.7/mode/javascript/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/javascript/typescript.html
 delete mode 100644 www/code/codemirror-5.7/mode/jinja2/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/jinja2/jinja2.js
 delete mode 100644 www/code/codemirror-5.7/mode/julia/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/julia/julia.js
 delete mode 100644 www/code/codemirror-5.7/mode/kotlin/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/kotlin/kotlin.js
 delete mode 100644 www/code/codemirror-5.7/mode/livescript/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/livescript/livescript.js
 delete mode 100644 www/code/codemirror-5.7/mode/lua/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/lua/lua.js
 delete mode 100644 www/code/codemirror-5.7/mode/markdown/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/markdown/markdown.js
 delete mode 100644 www/code/codemirror-5.7/mode/markdown/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/mathematica/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/mathematica/mathematica.js
 delete mode 100644 www/code/codemirror-5.7/mode/meta.js
 delete mode 100644 www/code/codemirror-5.7/mode/mirc/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/mirc/mirc.js
 delete mode 100644 www/code/codemirror-5.7/mode/mllike/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/mllike/mllike.js
 delete mode 100644 www/code/codemirror-5.7/mode/modelica/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/modelica/modelica.js
 delete mode 100644 www/code/codemirror-5.7/mode/mscgen/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/mscgen/index_msgenny.html
 delete mode 100644 www/code/codemirror-5.7/mode/mscgen/index_xu.html
 delete mode 100644 www/code/codemirror-5.7/mode/mscgen/mscgen.js
 delete mode 100644 www/code/codemirror-5.7/mode/mscgen/mscgen_test.js
 delete mode 100644 www/code/codemirror-5.7/mode/mscgen/msgenny_test.js
 delete mode 100644 www/code/codemirror-5.7/mode/mscgen/xu_test.js
 delete mode 100644 www/code/codemirror-5.7/mode/mumps/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/mumps/mumps.js
 delete mode 100644 www/code/codemirror-5.7/mode/nginx/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/nginx/nginx.js
 delete mode 100644 www/code/codemirror-5.7/mode/ntriples/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/ntriples/ntriples.js
 delete mode 100644 www/code/codemirror-5.7/mode/octave/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/octave/octave.js
 delete mode 100644 www/code/codemirror-5.7/mode/oz/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/oz/oz.js
 delete mode 100644 www/code/codemirror-5.7/mode/pascal/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/pascal/pascal.js
 delete mode 100644 www/code/codemirror-5.7/mode/pegjs/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/pegjs/pegjs.js
 delete mode 100644 www/code/codemirror-5.7/mode/perl/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/perl/perl.js
 delete mode 100644 www/code/codemirror-5.7/mode/php/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/php/php.js
 delete mode 100644 www/code/codemirror-5.7/mode/php/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/pig/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/pig/pig.js
 delete mode 100644 www/code/codemirror-5.7/mode/properties/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/properties/properties.js
 delete mode 100644 www/code/codemirror-5.7/mode/puppet/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/puppet/puppet.js
 delete mode 100644 www/code/codemirror-5.7/mode/python/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/python/python.js
 delete mode 100644 www/code/codemirror-5.7/mode/q/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/q/q.js
 delete mode 100644 www/code/codemirror-5.7/mode/r/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/r/r.js
 delete mode 100644 www/code/codemirror-5.7/mode/rpm/changes/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/rpm/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/rpm/rpm.js
 delete mode 100644 www/code/codemirror-5.7/mode/rst/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/rst/rst.js
 delete mode 100644 www/code/codemirror-5.7/mode/ruby/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/ruby/ruby.js
 delete mode 100644 www/code/codemirror-5.7/mode/ruby/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/rust/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/rust/rust.js
 delete mode 100644 www/code/codemirror-5.7/mode/rust/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/sass/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/sass/sass.js
 delete mode 100644 www/code/codemirror-5.7/mode/scheme/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/scheme/scheme.js
 delete mode 100644 www/code/codemirror-5.7/mode/shell/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/shell/shell.js
 delete mode 100644 www/code/codemirror-5.7/mode/shell/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/sieve/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/sieve/sieve.js
 delete mode 100644 www/code/codemirror-5.7/mode/slim/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/slim/slim.js
 delete mode 100644 www/code/codemirror-5.7/mode/slim/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/smalltalk/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/smalltalk/smalltalk.js
 delete mode 100644 www/code/codemirror-5.7/mode/smarty/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/smarty/smarty.js
 delete mode 100644 www/code/codemirror-5.7/mode/solr/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/solr/solr.js
 delete mode 100644 www/code/codemirror-5.7/mode/soy/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/soy/soy.js
 delete mode 100644 www/code/codemirror-5.7/mode/sparql/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/sparql/sparql.js
 delete mode 100644 www/code/codemirror-5.7/mode/spreadsheet/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/spreadsheet/spreadsheet.js
 delete mode 100644 www/code/codemirror-5.7/mode/sql/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/sql/sql.js
 delete mode 100644 www/code/codemirror-5.7/mode/stex/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/stex/stex.js
 delete mode 100644 www/code/codemirror-5.7/mode/stex/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/stylus/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/stylus/stylus.js
 delete mode 100644 www/code/codemirror-5.7/mode/swift/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/swift/swift.js
 delete mode 100644 www/code/codemirror-5.7/mode/tcl/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/tcl/tcl.js
 delete mode 100644 www/code/codemirror-5.7/mode/textile/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/textile/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/textile/textile.js
 delete mode 100644 www/code/codemirror-5.7/mode/tiddlywiki/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/tiddlywiki/tiddlywiki.css
 delete mode 100644 www/code/codemirror-5.7/mode/tiddlywiki/tiddlywiki.js
 delete mode 100644 www/code/codemirror-5.7/mode/tiki/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/tiki/tiki.css
 delete mode 100644 www/code/codemirror-5.7/mode/tiki/tiki.js
 delete mode 100644 www/code/codemirror-5.7/mode/toml/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/toml/toml.js
 delete mode 100644 www/code/codemirror-5.7/mode/tornado/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/tornado/tornado.js
 delete mode 100644 www/code/codemirror-5.7/mode/troff/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/troff/troff.js
 delete mode 100644 www/code/codemirror-5.7/mode/ttcn-cfg/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/ttcn-cfg/ttcn-cfg.js
 delete mode 100644 www/code/codemirror-5.7/mode/ttcn/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/ttcn/ttcn.js
 delete mode 100644 www/code/codemirror-5.7/mode/turtle/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/turtle/turtle.js
 delete mode 100644 www/code/codemirror-5.7/mode/twig/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/twig/twig.js
 delete mode 100644 www/code/codemirror-5.7/mode/vb/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/vb/vb.js
 delete mode 100644 www/code/codemirror-5.7/mode/vbscript/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/vbscript/vbscript.js
 delete mode 100644 www/code/codemirror-5.7/mode/velocity/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/velocity/velocity.js
 delete mode 100644 www/code/codemirror-5.7/mode/verilog/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/verilog/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/verilog/verilog.js
 delete mode 100644 www/code/codemirror-5.7/mode/vhdl/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/vhdl/vhdl.js
 delete mode 100644 www/code/codemirror-5.7/mode/vue/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/vue/vue.js
 delete mode 100644 www/code/codemirror-5.7/mode/xml/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/xml/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/xml/xml.js
 delete mode 100644 www/code/codemirror-5.7/mode/xquery/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/xquery/test.js
 delete mode 100644 www/code/codemirror-5.7/mode/xquery/xquery.js
 delete mode 100644 www/code/codemirror-5.7/mode/yaml/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/yaml/yaml.js
 delete mode 100644 www/code/codemirror-5.7/mode/z80/index.html
 delete mode 100644 www/code/codemirror-5.7/mode/z80/z80.js
 delete mode 100644 www/code/codemirror-5.7/package.json
 delete mode 100644 www/code/codemirror-5.7/test/comment_test.js
 delete mode 100644 www/code/codemirror-5.7/test/doc_test.js
 delete mode 100644 www/code/codemirror-5.7/test/driver.js
 delete mode 100644 www/code/codemirror-5.7/test/emacs_test.js
 delete mode 100644 www/code/codemirror-5.7/test/index.html
 delete mode 100644 www/code/codemirror-5.7/test/lint.js
 delete mode 100644 www/code/codemirror-5.7/test/mode_test.css
 delete mode 100644 www/code/codemirror-5.7/test/mode_test.js
 delete mode 100644 www/code/codemirror-5.7/test/multi_test.js
 delete mode 100644 www/code/codemirror-5.7/test/phantom_driver.js
 delete mode 100644 www/code/codemirror-5.7/test/run.js
 delete mode 100644 www/code/codemirror-5.7/test/scroll_test.js
 delete mode 100644 www/code/codemirror-5.7/test/search_test.js
 delete mode 100644 www/code/codemirror-5.7/test/sql-hint-test.js
 delete mode 100644 www/code/codemirror-5.7/test/sublime_test.js
 delete mode 100644 www/code/codemirror-5.7/test/test.js
 delete mode 100644 www/code/codemirror-5.7/test/vim_test.js
 delete mode 100644 www/code/codemirror-5.7/theme/3024-day.css
 delete mode 100644 www/code/codemirror-5.7/theme/3024-night.css
 delete mode 100644 www/code/codemirror-5.7/theme/abcdef.css
 delete mode 100644 www/code/codemirror-5.7/theme/ambiance-mobile.css
 delete mode 100644 www/code/codemirror-5.7/theme/ambiance.css
 delete mode 100644 www/code/codemirror-5.7/theme/base16-dark.css
 delete mode 100644 www/code/codemirror-5.7/theme/base16-light.css
 delete mode 100644 www/code/codemirror-5.7/theme/blackboard.css
 delete mode 100644 www/code/codemirror-5.7/theme/cobalt.css
 delete mode 100644 www/code/codemirror-5.7/theme/colorforth.css
 delete mode 100644 www/code/codemirror-5.7/theme/dracula.css
 delete mode 100644 www/code/codemirror-5.7/theme/eclipse.css
 delete mode 100644 www/code/codemirror-5.7/theme/elegant.css
 delete mode 100644 www/code/codemirror-5.7/theme/erlang-dark.css
 delete mode 100644 www/code/codemirror-5.7/theme/icecoder.css
 delete mode 100644 www/code/codemirror-5.7/theme/lesser-dark.css
 delete mode 100644 www/code/codemirror-5.7/theme/liquibyte.css
 delete mode 100644 www/code/codemirror-5.7/theme/material.css
 delete mode 100644 www/code/codemirror-5.7/theme/mbo.css
 delete mode 100644 www/code/codemirror-5.7/theme/mdn-like.css
 delete mode 100644 www/code/codemirror-5.7/theme/midnight.css
 delete mode 100644 www/code/codemirror-5.7/theme/monokai.css
 delete mode 100644 www/code/codemirror-5.7/theme/neat.css
 delete mode 100644 www/code/codemirror-5.7/theme/neo.css
 delete mode 100644 www/code/codemirror-5.7/theme/night.css
 delete mode 100644 www/code/codemirror-5.7/theme/paraiso-dark.css
 delete mode 100644 www/code/codemirror-5.7/theme/paraiso-light.css
 delete mode 100644 www/code/codemirror-5.7/theme/pastel-on-dark.css
 delete mode 100644 www/code/codemirror-5.7/theme/rubyblue.css
 delete mode 100644 www/code/codemirror-5.7/theme/seti.css
 delete mode 100644 www/code/codemirror-5.7/theme/solarized.css
 delete mode 100644 www/code/codemirror-5.7/theme/the-matrix.css
 delete mode 100644 www/code/codemirror-5.7/theme/tomorrow-night-bright.css
 delete mode 100644 www/code/codemirror-5.7/theme/tomorrow-night-eighties.css
 delete mode 100644 www/code/codemirror-5.7/theme/ttcn.css
 delete mode 100644 www/code/codemirror-5.7/theme/twilight.css
 delete mode 100644 www/code/codemirror-5.7/theme/vibrant-ink.css
 delete mode 100644 www/code/codemirror-5.7/theme/xq-dark.css
 delete mode 100644 www/code/codemirror-5.7/theme/xq-light.css
 delete mode 100644 www/code/codemirror-5.7/theme/yeti.css
 delete mode 100644 www/code/codemirror-5.7/theme/zenburn.css
 delete mode 100644 www/code/errorbox.js
 delete mode 100644 www/code/rt_codemirror.js
 delete mode 100644 www/code/toolbar.js

diff --git a/www/code/codemirror-5.7/.gitattributes b/www/code/codemirror-5.7/.gitattributes
deleted file mode 100644
index f8bdd60f4..000000000
--- a/www/code/codemirror-5.7/.gitattributes
+++ /dev/null
@@ -1,8 +0,0 @@
-*.txt   text
-*.js    text
-*.html  text
-*.md    text
-*.json  text
-*.yml   text
-*.css   text
-*.svg   text
diff --git a/www/code/codemirror-5.7/.gitignore b/www/code/codemirror-5.7/.gitignore
deleted file mode 100644
index f91c241f2..000000000
--- a/www/code/codemirror-5.7/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/node_modules
-/npm-debug.log
-/test*.html
-.tern-*
-*~
-*.swp
-.idea
-*.iml
diff --git a/www/code/codemirror-5.7/.npmignore b/www/code/codemirror-5.7/.npmignore
deleted file mode 100644
index 5ed053f89..000000000
--- a/www/code/codemirror-5.7/.npmignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/node_modules
-/demo
-/doc
-/test
-/test*.html
-/index.html
-/mode/*/*test.js
-/mode/*/*.html
-/mode/index.html
-.*
diff --git a/www/code/codemirror-5.7/.travis.yml b/www/code/codemirror-5.7/.travis.yml
deleted file mode 100644
index 52b8b8159..000000000
--- a/www/code/codemirror-5.7/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: node_js
-node_js:
-  - stable
-sudo: false
diff --git a/www/code/codemirror-5.7/AUTHORS b/www/code/codemirror-5.7/AUTHORS
deleted file mode 100644
index 67a8e248c..000000000
--- a/www/code/codemirror-5.7/AUTHORS
+++ /dev/null
@@ -1,496 +0,0 @@
-List of CodeMirror contributors. Updated before every release.
-
-4r2r
-Aaron Brooks
-Abdelouahab
-Abe Fettig
-Adam Ahmed
-Adam King
-adanlobato
-Adán Lobato
-Adrian Aichner
-aeroson
-Ahmad Amireh
-Ahmad M. Zawawi
-ahoward
-Akeksandr Motsjonov
-Alberto González Palomo
-Alberto Pose
-Albert Xing
-Alexander Pavlov
-Alexander Schepanovski
-Alexander Shvets
-Alexander Solovyov
-Alexandre Bique
-alexey-k
-Alex Piggott
-Aliaksei Chapyzhenka
-Allen Sarkisyan
-Amin Shali
-Amsul
-amuntean
-Amy
-Ananya Sen
-anaran
-AndersMad
-Anders Nawroth
-Anderson Mesquita
-Anders Wåglund
-Andrea G
-Andreas Reischuck
-Andres Taylor
-Andre von Houck
-Andrey Fedorov
-Andrey Klyuchnikov
-Andrey Lushnikov
-Andy Joslin
-Andy Kimball
-Andy Li
-Angelo
-angelozerr
-angelo.zerr@gmail.com
-Ankit
-Ankit Ahuja
-Ansel Santosa
-Anthony Dugois
-anthonygego
-Anthony Gégo
-Anthony Grimes
-Anton Kovalyov
-AQNOUCH Mohammed
-areos
-as3boyan
-AtomicPages LLC
-Atul Bhouraskar
-Aurelian Oancea
-Bastian Müller
-belhaj
-Bem Jones-Bey
-benbro
-Beni Cherniavsky-Paskin
-Benjamin DeCoste
-Ben Keen
-Bernhard Sirlinger
-Bert Chang
-Billy Moon
-binny
-B Krishna Chaitanya
-Blaine G
-blukat29
-boomyjee
-borawjm
-Brad Metcalf
-Brandon Frohs
-Brandon Wamboldt
-Brett Zamir
-Brian Grinstead
-Brian Sletten
-Bruce Mitchener
-Calin Barbat
-Chandra Sekhar Pydi
-Charles Skelton
-Cheah Chu Yeow
-Chris Coyier
-Chris Granger
-Chris Houseknecht
-Chris Lohfink
-Chris Morgan
-Christian Oyarzun
-Christian Petrov
-Christopher Brown
-Christopher Mitchell
-Christopher Pfohl
-ciaranj
-CodeAnimal
-coderaiser
-ComFreek
-Curtis Gagliardi
-dagsta
-daines
-Dale Jung
-Dan Bentley
-Dan Heberden
-Daniel, Dao Quang Minh
-Daniele Di Sarli
-Daniel Faust
-Daniel Huigens
-Daniel KJ
-Daniel Neel
-Daniel Parnell
-Danny Yoo
-darealshinji
-Darius Roberts
-Dave Brondsema
-Dave Myers
-David Barnett
-David Mignot
-David Pathakjee
-David Vázquez
-deebugger
-Deep Thought
-Devon Carew
-dignifiedquire
-Dimage Sapelkin
-Dmitry Kiselyov
-domagoj412
-Dominator008
-Domizio Demichelis
-Doug Wikle
-Drew Bratcher
-Drew Hintz
-Drew Khoury
-Dror BG
-duralog
-eborden
-edsharp
-ekhaled
-Enam Mijbah Noor
-Eric Allam
-eustas
-Fabien O'Carroll
-Fabio Zendhi Nagao
-Faiza Alsaied
-Fauntleroy
-fbuchinger
-feizhang365
-Felipe Lalanne
-Felix Raab
-Filip Noetzel
-flack
-ForbesLindesay
-Forbes Lindesay
-Ford_Lawnmower
-Forrest Oliphant
-Frank Wiegand
-Gabriel Gheorghian
-Gabriel Horner
-Gabriel Nahmias
-galambalazs
-Gautam Mehta
-gekkoe
-Gerard Braad
-Gergely Hegykozi
-Giovanni Calò
-Glenn Jorde
-Glenn Ruehle
-Golevka
-Gordon Smith
-Grant Skinner
-greengiant
-Gregory Koberger
-Guillaume Massé
-Guillaume Massé
-Gustavo Rodrigues
-Hakan Tunc
-Hans Engel
-Hardest
-Hasan Karahan
-Hector Oswaldo Caballero
-Herculano Campos
-Hiroyuki Makino
-hitsthings
-Hocdoc
-Ian Beck
-Ian Dickinson
-Ian Wehrman
-Ian Wetherbee
-Ice White
-ICHIKAWA, Yuji
-ilvalle
-Ingo Richter
-Irakli Gozalishvili
-Ivan Kurnosov
-Ivoah
-Jacob Lee
-Jakob Miland
-Jakub Vrana
-Jakub Vrána
-James Campos
-James Thorne
-Jamie Hill
-Jan Jongboom
-jankeromnes
-Jan Keromnes
-Jan Odvarko
-Jan T. Sott
-Jared Forsyth
-Jason
-Jason Barnabe
-Jason Grout
-Jason Johnston
-Jason San Jose
-Jason Siefken
-Jaydeep Solanki
-Jean Boussier
-Jeff Blaisdell
-jeffkenton
-Jeff Pickhardt
-jem (graphite)
-Jeremy Parmenter
-Jochen Berger
-Johan Ask
-John Connor
-John Lees-Miller
-John Snelson
-John Van Der Loo
-Jonas Döbertin
-Jonathan Malmaud
-jongalloway
-Jon Malmaud
-Jon Sangster
-Joost-Wim Boekesteijn
-Joseph Pecoraro
-Joshua Newman
-Josh Watzman
-jots
-jsoojeon
-ju1ius
-Juan Benavides Romero
-Jucovschi Constantin
-Juho Vuori
-Justin Hileman
-jwallers@gmail.com
-kaniga
-karevn
-Ken Newman
-Ken Rockot
-Kevin Earls
-Kevin Sawicki
-Kevin Ushey
-Klaus Silveira
-Koh Zi Han, Cliff
-komakino
-Konstantin Lopuhin
-koops
-ks-ifware
-kubelsmieci
-KwanEsq
-Lanfei
-Lanny
-Laszlo Vidacs
-leaf corcoran
-Leonid Khachaturov
-Leon Sorokin
-Leonya Khachaturov
-Liam Newman
-Libo Cannici
-LloydMilligan
-LM
-lochel
-Lorenzo Stoakes
-Luciano Longo
-Luke Stagner
-lynschinzer
-M1cha
-Madhura Jayaratne
-Maksim Lin
-Maksym Taran
-Malay Majithia
-Manuel Rego Casasnovas
-Marat Dreizin
-Marcel Gerber
-Marco Aurélio
-Marco Munizaga
-Marcus Bointon
-Marek Rudnicki
-Marijn Haverbeke
-Mário Gonçalves
-Mario Pietsch
-Mark Lentczner
-Marko Bonaci
-Martin Balek
-Martín Gaitán
-Martin Hasoň
-Martin Hunt
-Martin Zagora
-Mason Malone
-Mateusz Paprocki
-Mathias Bynens
-mats cronqvist
-Matt Gaide
-Matthew Bauer
-Matthew Beale
-Matthew Rathbone
-Matthias Bussonnier
-Matthias BUSSONNIER
-Matt McDonald
-Matt Pass
-Matt Sacks
-mauricio
-Maximilian Hils
-Maxim Kraev
-Max Kirsch
-Max Schaefer
-Max Xiantu
-mbarkhau
-melpon
-Metatheos
-Micah Dubinko
-Michael
-Michael Grey
-Michael Kaminsky
-Michael Lehenbauer
-Michael Zhou
-Michal Dorner
-Mighty Guava
-Miguel Castillo
-mihailik
-Mike
-Mike Brevoort
-Mike Diaz
-Mike Ivanov
-Mike Kadin
-MinRK
-Miraculix87
-misfo
-mkaminsky11
-mloginov
-Moritz Schwörer
-mps
-ms
-mtaran-google
-Narciso Jaramillo
-Nathan Williams
-ndr
-nerbert
-nextrevision
-ngn
-nguillaumin
-Ng Zhi An
-Nicholas Bollweg
-Nicholas Bollweg (Nick)
-Nick Kreeger
-Nick Small
-Niels van Groningen
-nightwing
-Nikita Beloglazov
-Nikita Vasilyev
-Nikolay Kostov
-nilp0inter
-Nisarg Jhaveri
-nlwillia
-noragrossman
-Norman Rzepka
-Oreoluwa Onatemowo
-pablo
-Page
-Panupong Pasupat
-paris
-Paris
-Patil Arpith
-Patrick Stoica
-Patrick Strawderman
-Paul Garvin
-Paul Ivanov
-Pavel Feldman
-Pavel Strashkin
-Paweł Bartkiewicz
-peteguhl
-Peter Flynn
-peterkroon
-Peter Kroon
-Philip Stadermann
-prasanthj
-Prasanth J
-Radek Piórkowski
-Rahul
-ramwin1
-Randall Mason
-Randy Burden
-Randy Edmunds
-Rasmus Erik Voel Jensen
-ray ratchup
-Ray Ratchup
-Richard Denton
-Richard van der Meer
-Richard Z.H. Wang
-Robert Crossfield
-Roberto Abdelkader Martínez Pérez
-robertop23
-Robert Plummer
-Rrandom
-Ruslan Osmanov
-Ryan Prior
-sabaca
-Samuel Ainsworth
-sandeepshetty
-Sander AKA Redsandro
-santec
-Sascha Peilicke
-satamas
-satchmorun
-sathyamoorthi
-SCLINIC\jdecker
-Scott Aikin
-Scott Goodhew
-Sebastian Zaha
-Se-Won Kim
-shaund
-shaun gilchrist
-Shawn A
-Shea Bunge
-sheopory
-Shiv Deepak
-Shmuel Englard
-Shubham Jain
-silverwind
-snasa
-soliton4
-sonson
-spastorelli
-srajanpaliwal
-Stanislav Oaserele
-Stas Kobzar
-Stefan Borsje
-Steffen Beyer
-Stephen Lavelle
-Steve O'Hara
-stoskov
-Sungho Kim
-sverweij
-Taha Jahangir
-Takuji Shimokawa
-Tarmil
-tel
-tfjgeorge
-Thaddee Tyl
-thanasis
-TheHowl
-think
-Thomas Dvornik
-Thomas Schmid
-Tim Alby
-Tim Baumann
-Timothy Farrell
-Timothy Hatcher
-TobiasBg
-Tomas-A
-Tomas Varaneckas
-Tom Erik Støwer
-Tom MacWright
-Tony Jian
-Travis Heppe
-Triangle717
-twifkak
-Vestimir Markov
-vf
-Victor Bocharsky
-Vincent Woo
-Volker Mische
-wenli
-Wes Cossick
-Wesley Wiser
-Will Binns-Smith
-William Jamieson
-William Stein
-Willy
-Wojtek Ptak
-Xavier Mendez
-Yassin N. Hassan
-YNH Webdev
-Yunchi Luo
-Yuvi Panda
-Zachary Dremann
-Zhang Hao
-zziuni
-魏鹏刚
diff --git a/www/code/codemirror-5.7/CONTRIBUTING.md b/www/code/codemirror-5.7/CONTRIBUTING.md
deleted file mode 100644
index 77ed15b52..000000000
--- a/www/code/codemirror-5.7/CONTRIBUTING.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# How to contribute
-
-- [Getting help](#getting-help-)
-- [Submitting bug reports](#submitting-bug-reports-)
-- [Contributing code](#contributing-code-)
-
-## Getting help
-
-Community discussion, questions, and informal bug reporting is done on the
-[discuss.CodeMirror forum](http://discuss.codemirror.net).
-
-## Submitting bug reports
-
-The preferred way to report bugs is to use the
-[GitHub issue tracker](http://github.com/codemirror/CodeMirror/issues). Before
-reporting a bug, read these pointers.
-
-**Note:** The issue tracker is for *bugs*, not requests for help. Questions
-should be asked on the
-[discuss.CodeMirror forum](http://discuss.codemirror.net) instead.
-
-### Reporting bugs effectively
-
-- CodeMirror is maintained by volunteers. They don't owe you anything, so be
-  polite. Reports with an indignant or belligerent tone tend to be moved to the
-  bottom of the pile.
-
-- Include information about **the browser in which the problem occurred**. Even
-  if you tested several browsers, and the problem occurred in all of them,
-  mention this fact in the bug report. Also include browser version numbers and
-  the operating system that you're on.
-
-- Mention which release of CodeMirror you're using. Preferably, try also with
-  the current development snapshot, to ensure the problem has not already been
-  fixed.
-
-- Mention very precisely what went wrong. "X is broken" is not a good bug
-  report. What did you expect to happen? What happened instead? Describe the
-  exact steps a maintainer has to take to make the problem occur. We can not
-  fix something that we can not observe.
-
-- If the problem can not be reproduced in any of the demos included in the
-  CodeMirror distribution, please provide an HTML document that demonstrates
-  the problem. The best way to do this is to go to
-  [jsbin.com](http://jsbin.com/ihunin/edit), enter it there, press save, and
-  include the resulting link in your bug report.
-
-## Contributing code
-
-- Make sure you have a [GitHub Account](https://github.com/signup/free)
-- Fork [CodeMirror](https://github.com/codemirror/CodeMirror/)
-  ([how to fork a repo](https://help.github.com/articles/fork-a-repo))
-- Make your changes
-- If your changes are easy to test or likely to regress, add tests.
-  Tests for the core go into `test/test.js`, some modes have their own
-  test suite under `mode/XXX/test.js`. Feel free to add new test
-  suites to modes that don't have one yet (be sure to link the new
-  tests into `test/index.html`).
-- Follow the general code style of the rest of the project (see
-  below). Run `bin/lint` to verify that the linter is happy.
-- Make sure all tests pass. Visit `test/index.html` in your browser to
-  run them.
-- Submit a pull request
-([how to create a pull request](https://help.github.com/articles/fork-a-repo)).
-  Don't put more than one feature/fix in a single pull request.
-
-By contributing code to CodeMirror you
-
- - agree to license the contributed code under CodeMirror's [MIT
-   license](http://codemirror.net/LICENSE).
-
- - confirm that you have the right to contribute and license the code
-   in question. (Either you hold all rights on the code, or the rights
-   holder has explicitly granted the right to use it like this,
-   through a compatible open source license or through a direct
-   agreement with you.)
-
-### Coding standards
-
-- 2 spaces per indentation level, no tabs.
-
-- Note that the linter (`bin/lint`) which is run after each commit
-  complains about unused variables and functions. Prefix their names
-  with an underscore to muffle it.
-
-- CodeMirror does *not* follow JSHint or JSLint prescribed style.
-  Patches that try to 'fix' code to pass one of these linters will be
-  unceremoniously discarded.
diff --git a/www/code/codemirror-5.7/LICENSE b/www/code/codemirror-5.7/LICENSE
deleted file mode 100644
index f4a5a4a25..000000000
--- a/www/code/codemirror-5.7/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2015 by Marijn Haverbeke  and others
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/www/code/codemirror-5.7/README.md b/www/code/codemirror-5.7/README.md
deleted file mode 100644
index 6c818272f..000000000
--- a/www/code/codemirror-5.7/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# CodeMirror
-[![Build Status](https://travis-ci.org/codemirror/CodeMirror.svg)](https://travis-ci.org/codemirror/CodeMirror)
-[![NPM version](https://img.shields.io/npm/v/codemirror.svg)](https://www.npmjs.org/package/codemirror)
-[![Join the chat at https://gitter.im/codemirror/CodeMirror](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/codemirror/CodeMirror)  
-[Funding status: ![maintainer happiness](https://marijnhaverbeke.nl/fund/status_s.png?again)](https://marijnhaverbeke.nl/fund/)
-
-CodeMirror is a versatile text editor implemented in JavaScript for
-the browser. It is specialized for editing code, and comes with over
-100 language modes and various addons that implement more advanced
-editing functionality.
-
-A rich programming API and a CSS theming system are available for
-customizing CodeMirror to fit your application, and extending it with
-new functionality.
-
-You can find more information (and the
-[manual](http://codemirror.net/doc/manual.html)) on the [project
-page](http://codemirror.net). For questions and discussion, use the
-[discussion forum](http://discuss.codemirror.net/).
-
-See
-[CONTRIBUTING.md](https://github.com/codemirror/CodeMirror/blob/master/CONTRIBUTING.md)
-for contributing guidelines.
-
-The CodeMirror community aims to be welcoming to everybody. We use the
-[Contributor Covenant
-(1.1)](http://contributor-covenant.org/version/1/1/0/) as our code of
-conduct.
diff --git a/www/code/codemirror-5.7/addon/comment/comment.js b/www/code/codemirror-5.7/addon/comment/comment.js
deleted file mode 100644
index 2dd114d33..000000000
--- a/www/code/codemirror-5.7/addon/comment/comment.js
+++ /dev/null
@@ -1,183 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var noOptions = {};
-  var nonWS = /[^\s\u00a0]/;
-  var Pos = CodeMirror.Pos;
-
-  function firstNonWS(str) {
-    var found = str.search(nonWS);
-    return found == -1 ? 0 : found;
-  }
-
-  CodeMirror.commands.toggleComment = function(cm) {
-    var minLine = Infinity, ranges = cm.listSelections(), mode = null;
-    for (var i = ranges.length - 1; i >= 0; i--) {
-      var from = ranges[i].from(), to = ranges[i].to();
-      if (from.line >= minLine) continue;
-      if (to.line >= minLine) to = Pos(minLine, 0);
-      minLine = from.line;
-      if (mode == null) {
-        if (cm.uncomment(from, to)) mode = "un";
-        else { cm.lineComment(from, to); mode = "line"; }
-      } else if (mode == "un") {
-        cm.uncomment(from, to);
-      } else {
-        cm.lineComment(from, to);
-      }
-    }
-  };
-
-  CodeMirror.defineExtension("lineComment", function(from, to, options) {
-    if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
-    var commentString = options.lineComment || mode.lineComment;
-    if (!commentString) {
-      if (options.blockCommentStart || mode.blockCommentStart) {
-        options.fullLines = true;
-        self.blockComment(from, to, options);
-      }
-      return;
-    }
-    var firstLine = self.getLine(from.line);
-    if (firstLine == null) return;
-    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
-    var pad = options.padding == null ? " " : options.padding;
-    var blankLines = options.commentBlankLines || from.line == to.line;
-
-    self.operation(function() {
-      if (options.indent) {
-        var baseString = firstLine.slice(0, firstNonWS(firstLine));
-        for (var i = from.line; i < end; ++i) {
-          var line = self.getLine(i), cut = baseString.length;
-          if (!blankLines && !nonWS.test(line)) continue;
-          if (line.slice(0, cut) != baseString) cut = firstNonWS(line);
-          self.replaceRange(baseString + commentString + pad, Pos(i, 0), Pos(i, cut));
-        }
-      } else {
-        for (var i = from.line; i < end; ++i) {
-          if (blankLines || nonWS.test(self.getLine(i)))
-            self.replaceRange(commentString + pad, Pos(i, 0));
-        }
-      }
-    });
-  });
-
-  CodeMirror.defineExtension("blockComment", function(from, to, options) {
-    if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
-    var startString = options.blockCommentStart || mode.blockCommentStart;
-    var endString = options.blockCommentEnd || mode.blockCommentEnd;
-    if (!startString || !endString) {
-      if ((options.lineComment || mode.lineComment) && options.fullLines != false)
-        self.lineComment(from, to, options);
-      return;
-    }
-
-    var end = Math.min(to.line, self.lastLine());
-    if (end != from.line && to.ch == 0 && nonWS.test(self.getLine(end))) --end;
-
-    var pad = options.padding == null ? " " : options.padding;
-    if (from.line > end) return;
-
-    self.operation(function() {
-      if (options.fullLines != false) {
-        var lastLineHasText = nonWS.test(self.getLine(end));
-        self.replaceRange(pad + endString, Pos(end));
-        self.replaceRange(startString + pad, Pos(from.line, 0));
-        var lead = options.blockCommentLead || mode.blockCommentLead;
-        if (lead != null) for (var i = from.line + 1; i <= end; ++i)
-          if (i != end || lastLineHasText)
-            self.replaceRange(lead + pad, Pos(i, 0));
-      } else {
-        self.replaceRange(endString, to);
-        self.replaceRange(startString, from);
-      }
-    });
-  });
-
-  CodeMirror.defineExtension("uncomment", function(from, to, options) {
-    if (!options) options = noOptions;
-    var self = this, mode = self.getModeAt(from);
-    var end = Math.min(to.ch != 0 || to.line == from.line ? to.line : to.line - 1, self.lastLine()), start = Math.min(from.line, end);
-
-    // Try finding line comments
-    var lineString = options.lineComment || mode.lineComment, lines = [];
-    var pad = options.padding == null ? " " : options.padding, didSomething;
-    lineComment: {
-      if (!lineString) break lineComment;
-      for (var i = start; i <= end; ++i) {
-        var line = self.getLine(i);
-        var found = line.indexOf(lineString);
-        if (found > -1 && !/comment/.test(self.getTokenTypeAt(Pos(i, found + 1)))) found = -1;
-        if (found == -1 && (i != end || i == start) && nonWS.test(line)) break lineComment;
-        if (found > -1 && nonWS.test(line.slice(0, found))) break lineComment;
-        lines.push(line);
-      }
-      self.operation(function() {
-        for (var i = start; i <= end; ++i) {
-          var line = lines[i - start];
-          var pos = line.indexOf(lineString), endPos = pos + lineString.length;
-          if (pos < 0) continue;
-          if (line.slice(endPos, endPos + pad.length) == pad) endPos += pad.length;
-          didSomething = true;
-          self.replaceRange("", Pos(i, pos), Pos(i, endPos));
-        }
-      });
-      if (didSomething) return true;
-    }
-
-    // Try block comments
-    var startString = options.blockCommentStart || mode.blockCommentStart;
-    var endString = options.blockCommentEnd || mode.blockCommentEnd;
-    if (!startString || !endString) return false;
-    var lead = options.blockCommentLead || mode.blockCommentLead;
-    var startLine = self.getLine(start), endLine = end == start ? startLine : self.getLine(end);
-    var open = startLine.indexOf(startString), close = endLine.lastIndexOf(endString);
-    if (close == -1 && start != end) {
-      endLine = self.getLine(--end);
-      close = endLine.lastIndexOf(endString);
-    }
-    if (open == -1 || close == -1 ||
-        !/comment/.test(self.getTokenTypeAt(Pos(start, open + 1))) ||
-        !/comment/.test(self.getTokenTypeAt(Pos(end, close + 1))))
-      return false;
-
-    // Avoid killing block comments completely outside the selection.
-    // Positions of the last startString before the start of the selection, and the first endString after it.
-    var lastStart = startLine.lastIndexOf(startString, from.ch);
-    var firstEnd = lastStart == -1 ? -1 : startLine.slice(0, from.ch).indexOf(endString, lastStart + startString.length);
-    if (lastStart != -1 && firstEnd != -1 && firstEnd + endString.length != from.ch) return false;
-    // Positions of the first endString after the end of the selection, and the last startString before it.
-    firstEnd = endLine.indexOf(endString, to.ch);
-    var almostLastStart = endLine.slice(to.ch).lastIndexOf(startString, firstEnd - to.ch);
-    lastStart = (firstEnd == -1 || almostLastStart == -1) ? -1 : to.ch + almostLastStart;
-    if (firstEnd != -1 && lastStart != -1 && lastStart != to.ch) return false;
-
-    self.operation(function() {
-      self.replaceRange("", Pos(end, close - (pad && endLine.slice(close - pad.length, close) == pad ? pad.length : 0)),
-                        Pos(end, close + endString.length));
-      var openEnd = open + startString.length;
-      if (pad && startLine.slice(openEnd, openEnd + pad.length) == pad) openEnd += pad.length;
-      self.replaceRange("", Pos(start, open), Pos(start, openEnd));
-      if (lead) for (var i = start + 1; i <= end; ++i) {
-        var line = self.getLine(i), found = line.indexOf(lead);
-        if (found == -1 || nonWS.test(line.slice(0, found))) continue;
-        var foundEnd = found + lead.length;
-        if (pad && line.slice(foundEnd, foundEnd + pad.length) == pad) foundEnd += pad.length;
-        self.replaceRange("", Pos(i, found), Pos(i, foundEnd));
-      }
-    });
-    return true;
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/comment/continuecomment.js b/www/code/codemirror-5.7/addon/comment/continuecomment.js
deleted file mode 100644
index b11d51e6c..000000000
--- a/www/code/codemirror-5.7/addon/comment/continuecomment.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  var modes = ["clike", "css", "javascript"];
-
-  for (var i = 0; i < modes.length; ++i)
-    CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
-
-  function continueComment(cm) {
-    if (cm.getOption("disableInput")) return CodeMirror.Pass;
-    var ranges = cm.listSelections(), mode, inserts = [];
-    for (var i = 0; i < ranges.length; i++) {
-      var pos = ranges[i].head, token = cm.getTokenAt(pos);
-      if (token.type != "comment") return CodeMirror.Pass;
-      var modeHere = CodeMirror.innerMode(cm.getMode(), token.state).mode;
-      if (!mode) mode = modeHere;
-      else if (mode != modeHere) return CodeMirror.Pass;
-
-      var insert = null;
-      if (mode.blockCommentStart && mode.blockCommentContinue) {
-        var end = token.string.indexOf(mode.blockCommentEnd);
-        var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
-        if (end != -1 && end == token.string.length - mode.blockCommentEnd.length && pos.ch >= end) {
-          // Comment ended, don't continue it
-        } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
-          insert = full.slice(0, token.start);
-          if (!/^\s*$/.test(insert)) {
-            insert = "";
-            for (var j = 0; j < token.start; ++j) insert += " ";
-          }
-        } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
-                   found + mode.blockCommentContinue.length > token.start &&
-                   /^\s*$/.test(full.slice(0, found))) {
-          insert = full.slice(0, found);
-        }
-        if (insert != null) insert += mode.blockCommentContinue;
-      }
-      if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
-        var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
-        if (found > -1) {
-          insert = line.slice(0, found);
-          if (/\S/.test(insert)) insert = null;
-          else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
-        }
-      }
-      if (insert == null) return CodeMirror.Pass;
-      inserts[i] = "\n" + insert;
-    }
-
-    cm.operation(function() {
-      for (var i = ranges.length - 1; i >= 0; i--)
-        cm.replaceRange(inserts[i], ranges[i].from(), ranges[i].to(), "+insert");
-    });
-  }
-
-  function continueLineCommentEnabled(cm) {
-    var opt = cm.getOption("continueComments");
-    if (opt && typeof opt == "object")
-      return opt.continueLineComment !== false;
-    return true;
-  }
-
-  CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {
-    if (prev && prev != CodeMirror.Init)
-      cm.removeKeyMap("continueComment");
-    if (val) {
-      var key = "Enter";
-      if (typeof val == "string")
-        key = val;
-      else if (typeof val == "object" && val.key)
-        key = val.key;
-      var map = {name: "continueComment"};
-      map[key] = continueComment;
-      cm.addKeyMap(map);
-    }
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/dialog/dialog.css b/www/code/codemirror-5.7/addon/dialog/dialog.css
deleted file mode 100644
index 677c07838..000000000
--- a/www/code/codemirror-5.7/addon/dialog/dialog.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.CodeMirror-dialog {
-  position: absolute;
-  left: 0; right: 0;
-  background: inherit;
-  z-index: 15;
-  padding: .1em .8em;
-  overflow: hidden;
-  color: inherit;
-}
-
-.CodeMirror-dialog-top {
-  border-bottom: 1px solid #eee;
-  top: 0;
-}
-
-.CodeMirror-dialog-bottom {
-  border-top: 1px solid #eee;
-  bottom: 0;
-}
-
-.CodeMirror-dialog input {
-  border: none;
-  outline: none;
-  background: transparent;
-  width: 20em;
-  color: inherit;
-  font-family: monospace;
-}
-
-.CodeMirror-dialog button {
-  font-size: 70%;
-}
diff --git a/www/code/codemirror-5.7/addon/dialog/dialog.js b/www/code/codemirror-5.7/addon/dialog/dialog.js
deleted file mode 100644
index 323b20078..000000000
--- a/www/code/codemirror-5.7/addon/dialog/dialog.js
+++ /dev/null
@@ -1,157 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Open simple dialogs on top of an editor. Relies on dialog.css.
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  function dialogDiv(cm, template, bottom) {
-    var wrap = cm.getWrapperElement();
-    var dialog;
-    dialog = wrap.appendChild(document.createElement("div"));
-    if (bottom)
-      dialog.className = "CodeMirror-dialog CodeMirror-dialog-bottom";
-    else
-      dialog.className = "CodeMirror-dialog CodeMirror-dialog-top";
-
-    if (typeof template == "string") {
-      dialog.innerHTML = template;
-    } else { // Assuming it's a detached DOM element.
-      dialog.appendChild(template);
-    }
-    return dialog;
-  }
-
-  function closeNotification(cm, newVal) {
-    if (cm.state.currentNotificationClose)
-      cm.state.currentNotificationClose();
-    cm.state.currentNotificationClose = newVal;
-  }
-
-  CodeMirror.defineExtension("openDialog", function(template, callback, options) {
-    if (!options) options = {};
-
-    closeNotification(this, null);
-
-    var dialog = dialogDiv(this, template, options.bottom);
-    var closed = false, me = this;
-    function close(newVal) {
-      if (typeof newVal == 'string') {
-        inp.value = newVal;
-      } else {
-        if (closed) return;
-        closed = true;
-        dialog.parentNode.removeChild(dialog);
-        me.focus();
-
-        if (options.onClose) options.onClose(dialog);
-      }
-    }
-
-    var inp = dialog.getElementsByTagName("input")[0], button;
-    if (inp) {
-      if (options.value) {
-        inp.value = options.value;
-        if (options.selectValueOnOpen !== false) {
-          inp.select();
-        }
-      }
-
-      if (options.onInput)
-        CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);});
-      if (options.onKeyUp)
-        CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
-
-      CodeMirror.on(inp, "keydown", function(e) {
-        if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
-        if (e.keyCode == 27 || (options.closeOnEnter !== false && e.keyCode == 13)) {
-          inp.blur();
-          CodeMirror.e_stop(e);
-          close();
-        }
-        if (e.keyCode == 13) callback(inp.value, e);
-      });
-
-      if (options.closeOnBlur !== false) CodeMirror.on(inp, "blur", close);
-
-      inp.focus();
-    } else if (button = dialog.getElementsByTagName("button")[0]) {
-      CodeMirror.on(button, "click", function() {
-        close();
-        me.focus();
-      });
-
-      if (options.closeOnBlur !== false) CodeMirror.on(button, "blur", close);
-
-      button.focus();
-    }
-    return close;
-  });
-
-  CodeMirror.defineExtension("openConfirm", function(template, callbacks, options) {
-    closeNotification(this, null);
-    var dialog = dialogDiv(this, template, options && options.bottom);
-    var buttons = dialog.getElementsByTagName("button");
-    var closed = false, me = this, blurring = 1;
-    function close() {
-      if (closed) return;
-      closed = true;
-      dialog.parentNode.removeChild(dialog);
-      me.focus();
-    }
-    buttons[0].focus();
-    for (var i = 0; i < buttons.length; ++i) {
-      var b = buttons[i];
-      (function(callback) {
-        CodeMirror.on(b, "click", function(e) {
-          CodeMirror.e_preventDefault(e);
-          close();
-          if (callback) callback(me);
-        });
-      })(callbacks[i]);
-      CodeMirror.on(b, "blur", function() {
-        --blurring;
-        setTimeout(function() { if (blurring <= 0) close(); }, 200);
-      });
-      CodeMirror.on(b, "focus", function() { ++blurring; });
-    }
-  });
-
-  /*
-   * openNotification
-   * Opens a notification, that can be closed with an optional timer
-   * (default 5000ms timer) and always closes on click.
-   *
-   * If a notification is opened while another is opened, it will close the
-   * currently opened one and open the new one immediately.
-   */
-  CodeMirror.defineExtension("openNotification", function(template, options) {
-    closeNotification(this, close);
-    var dialog = dialogDiv(this, template, options && options.bottom);
-    var closed = false, doneTimer;
-    var duration = options && typeof options.duration !== "undefined" ? options.duration : 5000;
-
-    function close() {
-      if (closed) return;
-      closed = true;
-      clearTimeout(doneTimer);
-      dialog.parentNode.removeChild(dialog);
-    }
-
-    CodeMirror.on(dialog, 'click', function(e) {
-      CodeMirror.e_preventDefault(e);
-      close();
-    });
-
-    if (duration)
-      doneTimer = setTimeout(close, duration);
-
-    return close;
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/display/autorefresh.js b/www/code/codemirror-5.7/addon/display/autorefresh.js
deleted file mode 100644
index 1e0e85046..000000000
--- a/www/code/codemirror-5.7/addon/display/autorefresh.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"))
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod)
-  else // Plain browser env
-    mod(CodeMirror)
-})(function(CodeMirror) {
-  "use strict"
-
-  CodeMirror.defineOption("autoRefresh", false, function(cm, val) {
-    if (cm.state.autoRefresh) {
-      stopListening(cm, cm.state.autoRefresh)
-      cm.state.autoRefresh = null
-    }
-    if (val && cm.display.wrapper.offsetHeight == 0)
-      startListening(cm, cm.state.autoRefresh = {delay: val.delay || 250})
-  })
-
-  function startListening(cm, state) {
-    function check() {
-      if (cm.display.wrapper.offsetHeight) {
-        stopListening(cm, state)
-        if (cm.display.lastWrapHeight != cm.display.wrapper.clientHeight)
-          cm.refresh()
-      } else {
-        state.timeout = setTimeout(check, state.delay)
-      }
-    }
-    state.timeout = setTimeout(check, state.delay)
-    state.hurry = function() {
-      clearTimeout(state.timeout)
-      state.timeout = setTimeout(check, 50)
-    }
-    CodeMirror.on(window, "mouseup", state.hurry)
-    CodeMirror.on(window, "keyup", state.hurry)
-  }
-
-  function stopListening(_cm, state) {
-    clearTimeout(state.timeout)
-    CodeMirror.off(window, "mouseup", state.hurry)
-    CodeMirror.off(window, "keyup", state.hurry)
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/display/fullscreen.css b/www/code/codemirror-5.7/addon/display/fullscreen.css
deleted file mode 100644
index 437acd89b..000000000
--- a/www/code/codemirror-5.7/addon/display/fullscreen.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.CodeMirror-fullscreen {
-  position: fixed;
-  top: 0; left: 0; right: 0; bottom: 0;
-  height: auto;
-  z-index: 9;
-}
diff --git a/www/code/codemirror-5.7/addon/display/fullscreen.js b/www/code/codemirror-5.7/addon/display/fullscreen.js
deleted file mode 100644
index cd3673b96..000000000
--- a/www/code/codemirror-5.7/addon/display/fullscreen.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineOption("fullScreen", false, function(cm, val, old) {
-    if (old == CodeMirror.Init) old = false;
-    if (!old == !val) return;
-    if (val) setFullscreen(cm);
-    else setNormal(cm);
-  });
-
-  function setFullscreen(cm) {
-    var wrap = cm.getWrapperElement();
-    cm.state.fullScreenRestore = {scrollTop: window.pageYOffset, scrollLeft: window.pageXOffset,
-                                  width: wrap.style.width, height: wrap.style.height};
-    wrap.style.width = "";
-    wrap.style.height = "auto";
-    wrap.className += " CodeMirror-fullscreen";
-    document.documentElement.style.overflow = "hidden";
-    cm.refresh();
-  }
-
-  function setNormal(cm) {
-    var wrap = cm.getWrapperElement();
-    wrap.className = wrap.className.replace(/\s*CodeMirror-fullscreen\b/, "");
-    document.documentElement.style.overflow = "";
-    var info = cm.state.fullScreenRestore;
-    wrap.style.width = info.width; wrap.style.height = info.height;
-    window.scrollTo(info.scrollLeft, info.scrollTop);
-    cm.refresh();
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/display/panel.js b/www/code/codemirror-5.7/addon/display/panel.js
deleted file mode 100644
index ba29484d6..000000000
--- a/www/code/codemirror-5.7/addon/display/panel.js
+++ /dev/null
@@ -1,112 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  CodeMirror.defineExtension("addPanel", function(node, options) {
-    options = options || {};
-
-    if (!this.state.panels) initPanels(this);
-
-    var info = this.state.panels;
-    var wrapper = info.wrapper;
-    var cmWrapper = this.getWrapperElement();
-
-    if (options.after instanceof Panel && !options.after.cleared) {
-      wrapper.insertBefore(node, options.before.node.nextSibling);
-    } else if (options.before instanceof Panel && !options.before.cleared) {
-      wrapper.insertBefore(node, options.before.node);
-    } else if (options.replace instanceof Panel && !options.replace.cleared) {
-      wrapper.insertBefore(node, options.replace.node);
-      options.replace.clear();
-    } else if (options.position == "bottom") {
-      wrapper.appendChild(node);
-    } else if (options.position == "before-bottom") {
-      wrapper.insertBefore(node, cmWrapper.nextSibling);
-    } else if (options.position == "after-top") {
-      wrapper.insertBefore(node, cmWrapper);
-    } else {
-      wrapper.insertBefore(node, wrapper.firstChild);
-    }
-
-    var height = (options && options.height) || node.offsetHeight;
-    this._setSize(null, info.heightLeft -= height);
-    info.panels++;
-    return new Panel(this, node, options, height);
-  });
-
-  function Panel(cm, node, options, height) {
-    this.cm = cm;
-    this.node = node;
-    this.options = options;
-    this.height = height;
-    this.cleared = false;
-  }
-
-  Panel.prototype.clear = function() {
-    if (this.cleared) return;
-    this.cleared = true;
-    var info = this.cm.state.panels;
-    this.cm._setSize(null, info.heightLeft += this.height);
-    info.wrapper.removeChild(this.node);
-    if (--info.panels == 0) removePanels(this.cm);
-  };
-
-  Panel.prototype.changed = function(height) {
-    var newHeight = height == null ? this.node.offsetHeight : height;
-    var info = this.cm.state.panels;
-    this.cm._setSize(null, info.height += (newHeight - this.height));
-    this.height = newHeight;
-  };
-
-  function initPanels(cm) {
-    var wrap = cm.getWrapperElement();
-    var style = window.getComputedStyle ? window.getComputedStyle(wrap) : wrap.currentStyle;
-    var height = parseInt(style.height);
-    var info = cm.state.panels = {
-      setHeight: wrap.style.height,
-      heightLeft: height,
-      panels: 0,
-      wrapper: document.createElement("div")
-    };
-    wrap.parentNode.insertBefore(info.wrapper, wrap);
-    var hasFocus = cm.hasFocus();
-    info.wrapper.appendChild(wrap);
-    if (hasFocus) cm.focus();
-
-    cm._setSize = cm.setSize;
-    if (height != null) cm.setSize = function(width, newHeight) {
-      if (newHeight == null) return this._setSize(width, newHeight);
-      info.setHeight = newHeight;
-      if (typeof newHeight != "number") {
-        var px = /^(\d+\.?\d*)px$/.exec(newHeight);
-        if (px) {
-          newHeight = Number(px[1]);
-        } else {
-          info.wrapper.style.height = newHeight;
-          newHeight = info.wrapper.offsetHeight;
-          info.wrapper.style.height = "";
-        }
-      }
-      cm._setSize(width, info.heightLeft += (newHeight - height));
-      height = newHeight;
-    };
-  }
-
-  function removePanels(cm) {
-    var info = cm.state.panels;
-    cm.state.panels = null;
-
-    var wrap = cm.getWrapperElement();
-    info.wrapper.parentNode.replaceChild(wrap, info.wrapper);
-    wrap.style.height = info.setHeight;
-    cm.setSize = cm._setSize;
-    cm.setSize();
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/display/placeholder.js b/www/code/codemirror-5.7/addon/display/placeholder.js
deleted file mode 100644
index babddfb1f..000000000
--- a/www/code/codemirror-5.7/addon/display/placeholder.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  CodeMirror.defineOption("placeholder", "", function(cm, val, old) {
-    var prev = old && old != CodeMirror.Init;
-    if (val && !prev) {
-      cm.on("blur", onBlur);
-      cm.on("change", onChange);
-      onChange(cm);
-    } else if (!val && prev) {
-      cm.off("blur", onBlur);
-      cm.off("change", onChange);
-      clearPlaceholder(cm);
-      var wrapper = cm.getWrapperElement();
-      wrapper.className = wrapper.className.replace(" CodeMirror-empty", "");
-    }
-
-    if (val && !cm.hasFocus()) onBlur(cm);
-  });
-
-  function clearPlaceholder(cm) {
-    if (cm.state.placeholder) {
-      cm.state.placeholder.parentNode.removeChild(cm.state.placeholder);
-      cm.state.placeholder = null;
-    }
-  }
-  function setPlaceholder(cm) {
-    clearPlaceholder(cm);
-    var elt = cm.state.placeholder = document.createElement("pre");
-    elt.style.cssText = "height: 0; overflow: visible";
-    elt.className = "CodeMirror-placeholder";
-    var placeHolder = cm.getOption("placeholder")
-    if (typeof placeHolder == "string") placeHolder = document.createTextNode(placeHolder)
-    elt.appendChild(placeHolder)
-    cm.display.lineSpace.insertBefore(elt, cm.display.lineSpace.firstChild);
-  }
-
-  function onBlur(cm) {
-    if (isEmpty(cm)) setPlaceholder(cm);
-  }
-  function onChange(cm) {
-    var wrapper = cm.getWrapperElement(), empty = isEmpty(cm);
-    wrapper.className = wrapper.className.replace(" CodeMirror-empty", "") + (empty ? " CodeMirror-empty" : "");
-
-    if (empty) setPlaceholder(cm);
-    else clearPlaceholder(cm);
-  }
-
-  function isEmpty(cm) {
-    return (cm.lineCount() === 1) && (cm.getLine(0) === "");
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/display/rulers.js b/www/code/codemirror-5.7/addon/display/rulers.js
deleted file mode 100644
index 01f65667c..000000000
--- a/www/code/codemirror-5.7/addon/display/rulers.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineOption("rulers", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      clearRulers(cm);
-      cm.off("refresh", refreshRulers);
-    }
-    if (val && val.length) {
-      setRulers(cm);
-      cm.on("refresh", refreshRulers);
-    }
-  });
-
-  function clearRulers(cm) {
-    for (var i = cm.display.lineSpace.childNodes.length - 1; i >= 0; i--) {
-      var node = cm.display.lineSpace.childNodes[i];
-      if (/(^|\s)CodeMirror-ruler($|\s)/.test(node.className))
-        node.parentNode.removeChild(node);
-    }
-  }
-
-  function setRulers(cm) {
-    var val = cm.getOption("rulers");
-    var cw = cm.defaultCharWidth();
-    var left = cm.charCoords(CodeMirror.Pos(cm.firstLine(), 0), "div").left;
-    var minH = cm.display.scroller.offsetHeight + 30;
-    for (var i = 0; i < val.length; i++) {
-      var elt = document.createElement("div");
-      elt.className = "CodeMirror-ruler";
-      var col, conf = val[i];
-      if (typeof conf == "number") {
-        col = conf;
-      } else {
-        col = conf.column;
-        if (conf.className) elt.className += " " + conf.className;
-        if (conf.color) elt.style.borderColor = conf.color;
-        if (conf.lineStyle) elt.style.borderLeftStyle = conf.lineStyle;
-        if (conf.width) elt.style.borderLeftWidth = conf.width;
-      }
-      elt.style.left = (left + col * cw) + "px";
-      elt.style.top = "-50px";
-      elt.style.bottom = "-20px";
-      elt.style.minHeight = minH + "px";
-      cm.display.lineSpace.insertBefore(elt, cm.display.cursorDiv);
-    }
-  }
-
-  function refreshRulers(cm) {
-    clearRulers(cm);
-    setRulers(cm);
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/edit/closebrackets.js b/www/code/codemirror-5.7/addon/edit/closebrackets.js
deleted file mode 100644
index f3006976f..000000000
--- a/www/code/codemirror-5.7/addon/edit/closebrackets.js
+++ /dev/null
@@ -1,195 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  var defaults = {
-    pairs: "()[]{}''\"\"",
-    triples: "",
-    explode: "[]{}"
-  };
-
-  var Pos = CodeMirror.Pos;
-
-  CodeMirror.defineOption("autoCloseBrackets", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      cm.removeKeyMap(keyMap);
-      cm.state.closeBrackets = null;
-    }
-    if (val) {
-      cm.state.closeBrackets = val;
-      cm.addKeyMap(keyMap);
-    }
-  });
-
-  function getOption(conf, name) {
-    if (name == "pairs" && typeof conf == "string") return conf;
-    if (typeof conf == "object" && conf[name] != null) return conf[name];
-    return defaults[name];
-  }
-
-  var bind = defaults.pairs + "`";
-  var keyMap = {Backspace: handleBackspace, Enter: handleEnter};
-  for (var i = 0; i < bind.length; i++)
-    keyMap["'" + bind.charAt(i) + "'"] = handler(bind.charAt(i));
-
-  function handler(ch) {
-    return function(cm) { return handleChar(cm, ch); };
-  }
-
-  function getConfig(cm) {
-    var deflt = cm.state.closeBrackets;
-    if (!deflt) return null;
-    var mode = cm.getModeAt(cm.getCursor());
-    return mode.closeBrackets || deflt;
-  }
-
-  function handleBackspace(cm) {
-    var conf = getConfig(cm);
-    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
-
-    var pairs = getOption(conf, "pairs");
-    var ranges = cm.listSelections();
-    for (var i = 0; i < ranges.length; i++) {
-      if (!ranges[i].empty()) return CodeMirror.Pass;
-      var around = charsAround(cm, ranges[i].head);
-      if (!around || pairs.indexOf(around) % 2 != 0) return CodeMirror.Pass;
-    }
-    for (var i = ranges.length - 1; i >= 0; i--) {
-      var cur = ranges[i].head;
-      cm.replaceRange("", Pos(cur.line, cur.ch - 1), Pos(cur.line, cur.ch + 1));
-    }
-  }
-
-  function handleEnter(cm) {
-    var conf = getConfig(cm);
-    var explode = conf && getOption(conf, "explode");
-    if (!explode || cm.getOption("disableInput")) return CodeMirror.Pass;
-
-    var ranges = cm.listSelections();
-    for (var i = 0; i < ranges.length; i++) {
-      if (!ranges[i].empty()) return CodeMirror.Pass;
-      var around = charsAround(cm, ranges[i].head);
-      if (!around || explode.indexOf(around) % 2 != 0) return CodeMirror.Pass;
-    }
-    cm.operation(function() {
-      cm.replaceSelection("\n\n", null);
-      cm.execCommand("goCharLeft");
-      ranges = cm.listSelections();
-      for (var i = 0; i < ranges.length; i++) {
-        var line = ranges[i].head.line;
-        cm.indentLine(line, null, true);
-        cm.indentLine(line + 1, null, true);
-      }
-    });
-  }
-
-  function contractSelection(sel) {
-    var inverted = CodeMirror.cmpPos(sel.anchor, sel.head) > 0;
-    return {anchor: new Pos(sel.anchor.line, sel.anchor.ch + (inverted ? -1 : 1)),
-            head: new Pos(sel.head.line, sel.head.ch + (inverted ? 1 : -1))};
-  }
-
-  function handleChar(cm, ch) {
-    var conf = getConfig(cm);
-    if (!conf || cm.getOption("disableInput")) return CodeMirror.Pass;
-
-    var pairs = getOption(conf, "pairs");
-    var pos = pairs.indexOf(ch);
-    if (pos == -1) return CodeMirror.Pass;
-    var triples = getOption(conf, "triples");
-
-    var identical = pairs.charAt(pos + 1) == ch;
-    var ranges = cm.listSelections();
-    var opening = pos % 2 == 0;
-
-    var type, next;
-    for (var i = 0; i < ranges.length; i++) {
-      var range = ranges[i], cur = range.head, curType;
-      var next = cm.getRange(cur, Pos(cur.line, cur.ch + 1));
-      if (opening && !range.empty()) {
-        curType = "surround";
-      } else if ((identical || !opening) && next == ch) {
-        if (triples.indexOf(ch) >= 0 && cm.getRange(cur, Pos(cur.line, cur.ch + 3)) == ch + ch + ch)
-          curType = "skipThree";
-        else
-          curType = "skip";
-      } else if (identical && cur.ch > 1 && triples.indexOf(ch) >= 0 &&
-                 cm.getRange(Pos(cur.line, cur.ch - 2), cur) == ch + ch &&
-                 (cur.ch <= 2 || cm.getRange(Pos(cur.line, cur.ch - 3), Pos(cur.line, cur.ch - 2)) != ch)) {
-        curType = "addFour";
-      } else if (identical) {
-        if (!CodeMirror.isWordChar(next) && enteringString(cm, cur, ch)) curType = "both";
-        else return CodeMirror.Pass;
-      } else if (opening && (cm.getLine(cur.line).length == cur.ch ||
-                             isClosingBracket(next, pairs) ||
-                             /\s/.test(next))) {
-        curType = "both";
-      } else {
-        return CodeMirror.Pass;
-      }
-      if (!type) type = curType;
-      else if (type != curType) return CodeMirror.Pass;
-    }
-
-    var left = pos % 2 ? pairs.charAt(pos - 1) : ch;
-    var right = pos % 2 ? ch : pairs.charAt(pos + 1);
-    cm.operation(function() {
-      if (type == "skip") {
-        cm.execCommand("goCharRight");
-      } else if (type == "skipThree") {
-        for (var i = 0; i < 3; i++)
-          cm.execCommand("goCharRight");
-      } else if (type == "surround") {
-        var sels = cm.getSelections();
-        for (var i = 0; i < sels.length; i++)
-          sels[i] = left + sels[i] + right;
-        cm.replaceSelections(sels, "around");
-        sels = cm.listSelections().slice();
-        for (var i = 0; i < sels.length; i++)
-          sels[i] = contractSelection(sels[i]);
-        cm.setSelections(sels);
-      } else if (type == "both") {
-        cm.replaceSelection(left + right, null);
-        cm.triggerElectric(left + right);
-        cm.execCommand("goCharLeft");
-      } else if (type == "addFour") {
-        cm.replaceSelection(left + left + left + left, "before");
-        cm.execCommand("goCharRight");
-      }
-    });
-  }
-
-  function isClosingBracket(ch, pairs) {
-    var pos = pairs.lastIndexOf(ch);
-    return pos > -1 && pos % 2 == 1;
-  }
-
-  function charsAround(cm, pos) {
-    var str = cm.getRange(Pos(pos.line, pos.ch - 1),
-                          Pos(pos.line, pos.ch + 1));
-    return str.length == 2 ? str : null;
-  }
-
-  // Project the token type that will exists after the given char is
-  // typed, and use it to determine whether it would cause the start
-  // of a string token.
-  function enteringString(cm, pos, ch) {
-    var line = cm.getLine(pos.line);
-    var token = cm.getTokenAt(pos);
-    if (/\bstring2?\b/.test(token.type)) return false;
-    var stream = new CodeMirror.StringStream(line.slice(0, pos.ch) + ch + line.slice(pos.ch), 4);
-    stream.pos = stream.start = token.start;
-    for (;;) {
-      var type1 = cm.getMode().token(stream, token.state);
-      if (stream.pos >= pos.ch + 1) return /\bstring2?\b/.test(type1);
-      stream.start = stream.pos;
-    }
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/edit/closetag.js b/www/code/codemirror-5.7/addon/edit/closetag.js
deleted file mode 100644
index a518da3ec..000000000
--- a/www/code/codemirror-5.7/addon/edit/closetag.js
+++ /dev/null
@@ -1,169 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**
- * Tag-closer extension for CodeMirror.
- *
- * This extension adds an "autoCloseTags" option that can be set to
- * either true to get the default behavior, or an object to further
- * configure its behavior.
- *
- * These are supported options:
- *
- * `whenClosing` (default true)
- *   Whether to autoclose when the '/' of a closing tag is typed.
- * `whenOpening` (default true)
- *   Whether to autoclose the tag when the final '>' of an opening
- *   tag is typed.
- * `dontCloseTags` (default is empty tags for HTML, none for XML)
- *   An array of tag names that should not be autoclosed.
- * `indentTags` (default is block tags for HTML, none for XML)
- *   An array of tag names that should, when opened, cause a
- *   blank line to be added inside the tag, and the blank line and
- *   closing line to be indented.
- *
- * See demos/closetag.html for a usage example.
- */
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  CodeMirror.defineOption("autoCloseTags", false, function(cm, val, old) {
-    if (old != CodeMirror.Init && old)
-      cm.removeKeyMap("autoCloseTags");
-    if (!val) return;
-    var map = {name: "autoCloseTags"};
-    if (typeof val != "object" || val.whenClosing)
-      map["'/'"] = function(cm) { return autoCloseSlash(cm); };
-    if (typeof val != "object" || val.whenOpening)
-      map["'>'"] = function(cm) { return autoCloseGT(cm); };
-    cm.addKeyMap(map);
-  });
-
-  var htmlDontClose = ["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param",
-                       "source", "track", "wbr"];
-  var htmlIndent = ["applet", "blockquote", "body", "button", "div", "dl", "fieldset", "form", "frameset", "h1", "h2", "h3", "h4",
-                    "h5", "h6", "head", "html", "iframe", "layer", "legend", "object", "ol", "p", "select", "table", "ul"];
-
-  function autoCloseGT(cm) {
-    if (cm.getOption("disableInput")) return CodeMirror.Pass;
-    var ranges = cm.listSelections(), replacements = [];
-    for (var i = 0; i < ranges.length; i++) {
-      if (!ranges[i].empty()) return CodeMirror.Pass;
-      var pos = ranges[i].head, tok = cm.getTokenAt(pos);
-      var inner = CodeMirror.innerMode(cm.getMode(), tok.state), state = inner.state;
-      if (inner.mode.name != "xml" || !state.tagName) return CodeMirror.Pass;
-
-      var opt = cm.getOption("autoCloseTags"), html = inner.mode.configuration == "html";
-      var dontCloseTags = (typeof opt == "object" && opt.dontCloseTags) || (html && htmlDontClose);
-      var indentTags = (typeof opt == "object" && opt.indentTags) || (html && htmlIndent);
-
-      var tagName = state.tagName;
-      if (tok.end > pos.ch) tagName = tagName.slice(0, tagName.length - tok.end + pos.ch);
-      var lowerTagName = tagName.toLowerCase();
-      // Don't process the '>' at the end of an end-tag or self-closing tag
-      if (!tagName ||
-          tok.type == "string" && (tok.end != pos.ch || !/[\"\']/.test(tok.string.charAt(tok.string.length - 1)) || tok.string.length == 1) ||
-          tok.type == "tag" && state.type == "closeTag" ||
-          tok.string.indexOf("/") == (tok.string.length - 1) || // match something like 
-          dontCloseTags && indexOf(dontCloseTags, lowerTagName) > -1 ||
-          closingTagExists(cm, tagName, pos, state, true))
-        return CodeMirror.Pass;
-
-      var indent = indentTags && indexOf(indentTags, lowerTagName) > -1;
-      replacements[i] = {indent: indent,
-                         text: ">" + (indent ? "\n\n" : "") + "",
-                         newPos: indent ? CodeMirror.Pos(pos.line + 1, 0) : CodeMirror.Pos(pos.line, pos.ch + 1)};
-    }
-
-    for (var i = ranges.length - 1; i >= 0; i--) {
-      var info = replacements[i];
-      cm.replaceRange(info.text, ranges[i].head, ranges[i].anchor, "+insert");
-      var sel = cm.listSelections().slice(0);
-      sel[i] = {head: info.newPos, anchor: info.newPos};
-      cm.setSelections(sel);
-      if (info.indent) {
-        cm.indentLine(info.newPos.line, null, true);
-        cm.indentLine(info.newPos.line + 1, null, true);
-      }
-    }
-  }
-
-  function autoCloseCurrent(cm, typingSlash) {
-    var ranges = cm.listSelections(), replacements = [];
-    var head = typingSlash ? "/" : "") replacement += ">";
-      replacements[i] = replacement;
-    }
-    cm.replaceSelections(replacements);
-    ranges = cm.listSelections();
-    for (var i = 0; i < ranges.length; i++)
-      if (i == ranges.length - 1 || ranges[i].head.line < ranges[i + 1].head.line)
-        cm.indentLine(ranges[i].head.line);
-  }
-
-  function autoCloseSlash(cm) {
-    if (cm.getOption("disableInput")) return CodeMirror.Pass;
-    return autoCloseCurrent(cm, true);
-  }
-
-  CodeMirror.commands.closeTag = function(cm) { return autoCloseCurrent(cm); };
-
-  function indexOf(collection, elt) {
-    if (collection.indexOf) return collection.indexOf(elt);
-    for (var i = 0, e = collection.length; i < e; ++i)
-      if (collection[i] == elt) return i;
-    return -1;
-  }
-
-  // If xml-fold is loaded, we use its functionality to try and verify
-  // whether a given tag is actually unclosed.
-  function closingTagExists(cm, tagName, pos, state, newTag) {
-    if (!CodeMirror.scanForClosingTag) return false;
-    var end = Math.min(cm.lastLine() + 1, pos.line + 500);
-    var nextClose = CodeMirror.scanForClosingTag(cm, pos, null, end);
-    if (!nextClose || nextClose.tag != tagName) return false;
-    var cx = state.context;
-    // If the immediate wrapping context contains onCx instances of
-    // the same tag, a closing tag only exists if there are at least
-    // that many closing tags of that type following.
-    for (var onCx = newTag ? 1 : 0; cx && cx.tagName == tagName; cx = cx.prev) ++onCx;
-    pos = nextClose.to;
-    for (var i = 1; i < onCx; i++) {
-      var next = CodeMirror.scanForClosingTag(cm, pos, null, end);
-      if (!next || next.tag != tagName) return false;
-      pos = next.to;
-    }
-    return true;
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/edit/continuelist.js b/www/code/codemirror-5.7/addon/edit/continuelist.js
deleted file mode 100644
index df5179fe4..000000000
--- a/www/code/codemirror-5.7/addon/edit/continuelist.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var listRE = /^(\s*)(>[> ]*|[*+-]\s|(\d+)([.)]))(\s*)/,
-      emptyListRE = /^(\s*)(>[> ]*|[*+-]|(\d+)[.)])(\s*)$/,
-      unorderedListRE = /[*+-]\s/;
-
-  CodeMirror.commands.newlineAndIndentContinueMarkdownList = function(cm) {
-    if (cm.getOption("disableInput")) return CodeMirror.Pass;
-    var ranges = cm.listSelections(), replacements = [];
-    for (var i = 0; i < ranges.length; i++) {
-      var pos = ranges[i].head;
-      var eolState = cm.getStateAfter(pos.line);
-      var inList = eolState.list !== false;
-      var inQuote = eolState.quote !== 0;
-
-      var line = cm.getLine(pos.line), match = listRE.exec(line);
-      if (!ranges[i].empty() || (!inList && !inQuote) || !match) {
-        cm.execCommand("newlineAndIndent");
-        return;
-      }
-      if (emptyListRE.test(line)) {
-        cm.replaceRange("", {
-          line: pos.line, ch: 0
-        }, {
-          line: pos.line, ch: pos.ch + 1
-        });
-        replacements[i] = "\n";
-      } else {
-        var indent = match[1], after = match[5];
-        var bullet = unorderedListRE.test(match[2]) || match[2].indexOf(">") >= 0
-          ? match[2]
-          : (parseInt(match[3], 10) + 1) + match[4];
-
-        replacements[i] = "\n" + indent + bullet + after;
-      }
-    }
-
-    cm.replaceSelections(replacements);
-  };
-});
diff --git a/www/code/codemirror-5.7/addon/edit/matchbrackets.js b/www/code/codemirror-5.7/addon/edit/matchbrackets.js
deleted file mode 100644
index 70e1ae18c..000000000
--- a/www/code/codemirror-5.7/addon/edit/matchbrackets.js
+++ /dev/null
@@ -1,120 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  var ie_lt8 = /MSIE \d/.test(navigator.userAgent) &&
-    (document.documentMode == null || document.documentMode < 8);
-
-  var Pos = CodeMirror.Pos;
-
-  var matching = {"(": ")>", ")": "(<", "[": "]>", "]": "[<", "{": "}>", "}": "{<"};
-
-  function findMatchingBracket(cm, where, strict, config) {
-    var line = cm.getLineHandle(where.line), pos = where.ch - 1;
-    var match = (pos >= 0 && matching[line.text.charAt(pos)]) || matching[line.text.charAt(++pos)];
-    if (!match) return null;
-    var dir = match.charAt(1) == ">" ? 1 : -1;
-    if (strict && (dir > 0) != (pos == where.ch)) return null;
-    var style = cm.getTokenTypeAt(Pos(where.line, pos + 1));
-
-    var found = scanForBracket(cm, Pos(where.line, pos + (dir > 0 ? 1 : 0)), dir, style || null, config);
-    if (found == null) return null;
-    return {from: Pos(where.line, pos), to: found && found.pos,
-            match: found && found.ch == match.charAt(0), forward: dir > 0};
-  }
-
-  // bracketRegex is used to specify which type of bracket to scan
-  // should be a regexp, e.g. /[[\]]/
-  //
-  // Note: If "where" is on an open bracket, then this bracket is ignored.
-  //
-  // Returns false when no bracket was found, null when it reached
-  // maxScanLines and gave up
-  function scanForBracket(cm, where, dir, style, config) {
-    var maxScanLen = (config && config.maxScanLineLength) || 10000;
-    var maxScanLines = (config && config.maxScanLines) || 1000;
-
-    var stack = [];
-    var re = config && config.bracketRegex ? config.bracketRegex : /[(){}[\]]/;
-    var lineEnd = dir > 0 ? Math.min(where.line + maxScanLines, cm.lastLine() + 1)
-                          : Math.max(cm.firstLine() - 1, where.line - maxScanLines);
-    for (var lineNo = where.line; lineNo != lineEnd; lineNo += dir) {
-      var line = cm.getLine(lineNo);
-      if (!line) continue;
-      var pos = dir > 0 ? 0 : line.length - 1, end = dir > 0 ? line.length : -1;
-      if (line.length > maxScanLen) continue;
-      if (lineNo == where.line) pos = where.ch - (dir < 0 ? 1 : 0);
-      for (; pos != end; pos += dir) {
-        var ch = line.charAt(pos);
-        if (re.test(ch) && (style === undefined || cm.getTokenTypeAt(Pos(lineNo, pos + 1)) == style)) {
-          var match = matching[ch];
-          if ((match.charAt(1) == ">") == (dir > 0)) stack.push(ch);
-          else if (!stack.length) return {pos: Pos(lineNo, pos), ch: ch};
-          else stack.pop();
-        }
-      }
-    }
-    return lineNo - dir == (dir > 0 ? cm.lastLine() : cm.firstLine()) ? false : null;
-  }
-
-  function matchBrackets(cm, autoclear, config) {
-    // Disable brace matching in long lines, since it'll cause hugely slow updates
-    var maxHighlightLen = cm.state.matchBrackets.maxHighlightLineLength || 1000;
-    var marks = [], ranges = cm.listSelections();
-    for (var i = 0; i < ranges.length; i++) {
-      var match = ranges[i].empty() && findMatchingBracket(cm, ranges[i].head, false, config);
-      if (match && cm.getLine(match.from.line).length <= maxHighlightLen) {
-        var style = match.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket";
-        marks.push(cm.markText(match.from, Pos(match.from.line, match.from.ch + 1), {className: style}));
-        if (match.to && cm.getLine(match.to.line).length <= maxHighlightLen)
-          marks.push(cm.markText(match.to, Pos(match.to.line, match.to.ch + 1), {className: style}));
-      }
-    }
-
-    if (marks.length) {
-      // Kludge to work around the IE bug from issue #1193, where text
-      // input stops going to the textare whever this fires.
-      if (ie_lt8 && cm.state.focused) cm.focus();
-
-      var clear = function() {
-        cm.operation(function() {
-          for (var i = 0; i < marks.length; i++) marks[i].clear();
-        });
-      };
-      if (autoclear) setTimeout(clear, 800);
-      else return clear;
-    }
-  }
-
-  var currentlyHighlighted = null;
-  function doMatchBrackets(cm) {
-    cm.operation(function() {
-      if (currentlyHighlighted) {currentlyHighlighted(); currentlyHighlighted = null;}
-      currentlyHighlighted = matchBrackets(cm, false, cm.state.matchBrackets);
-    });
-  }
-
-  CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init)
-      cm.off("cursorActivity", doMatchBrackets);
-    if (val) {
-      cm.state.matchBrackets = typeof val == "object" ? val : {};
-      cm.on("cursorActivity", doMatchBrackets);
-    }
-  });
-
-  CodeMirror.defineExtension("matchBrackets", function() {matchBrackets(this, true);});
-  CodeMirror.defineExtension("findMatchingBracket", function(pos, strict, config){
-    return findMatchingBracket(this, pos, strict, config);
-  });
-  CodeMirror.defineExtension("scanForBracket", function(pos, dir, style, config){
-    return scanForBracket(this, pos, dir, style, config);
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/edit/matchtags.js b/www/code/codemirror-5.7/addon/edit/matchtags.js
deleted file mode 100644
index fb1911a8d..000000000
--- a/www/code/codemirror-5.7/addon/edit/matchtags.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../fold/xml-fold"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../fold/xml-fold"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineOption("matchTags", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      cm.off("cursorActivity", doMatchTags);
-      cm.off("viewportChange", maybeUpdateMatch);
-      clear(cm);
-    }
-    if (val) {
-      cm.state.matchBothTags = typeof val == "object" && val.bothTags;
-      cm.on("cursorActivity", doMatchTags);
-      cm.on("viewportChange", maybeUpdateMatch);
-      doMatchTags(cm);
-    }
-  });
-
-  function clear(cm) {
-    if (cm.state.tagHit) cm.state.tagHit.clear();
-    if (cm.state.tagOther) cm.state.tagOther.clear();
-    cm.state.tagHit = cm.state.tagOther = null;
-  }
-
-  function doMatchTags(cm) {
-    cm.state.failedTagMatch = false;
-    cm.operation(function() {
-      clear(cm);
-      if (cm.somethingSelected()) return;
-      var cur = cm.getCursor(), range = cm.getViewport();
-      range.from = Math.min(range.from, cur.line); range.to = Math.max(cur.line + 1, range.to);
-      var match = CodeMirror.findMatchingTag(cm, cur, range);
-      if (!match) return;
-      if (cm.state.matchBothTags) {
-        var hit = match.at == "open" ? match.open : match.close;
-        if (hit) cm.state.tagHit = cm.markText(hit.from, hit.to, {className: "CodeMirror-matchingtag"});
-      }
-      var other = match.at == "close" ? match.open : match.close;
-      if (other)
-        cm.state.tagOther = cm.markText(other.from, other.to, {className: "CodeMirror-matchingtag"});
-      else
-        cm.state.failedTagMatch = true;
-    });
-  }
-
-  function maybeUpdateMatch(cm) {
-    if (cm.state.failedTagMatch) doMatchTags(cm);
-  }
-
-  CodeMirror.commands.toMatchingTag = function(cm) {
-    var found = CodeMirror.findMatchingTag(cm, cm.getCursor());
-    if (found) {
-      var other = found.at == "close" ? found.open : found.close;
-      if (other) cm.extendSelection(other.to, other.from);
-    }
-  };
-});
diff --git a/www/code/codemirror-5.7/addon/edit/trailingspace.js b/www/code/codemirror-5.7/addon/edit/trailingspace.js
deleted file mode 100644
index fa7b56be5..000000000
--- a/www/code/codemirror-5.7/addon/edit/trailingspace.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  CodeMirror.defineOption("showTrailingSpace", false, function(cm, val, prev) {
-    if (prev == CodeMirror.Init) prev = false;
-    if (prev && !val)
-      cm.removeOverlay("trailingspace");
-    else if (!prev && val)
-      cm.addOverlay({
-        token: function(stream) {
-          for (var l = stream.string.length, i = l; i && /\s/.test(stream.string.charAt(i - 1)); --i) {}
-          if (i > stream.pos) { stream.pos = i; return null; }
-          stream.pos = l;
-          return "trailingspace";
-        },
-        name: "trailingspace"
-      });
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/fold/brace-fold.js b/www/code/codemirror-5.7/addon/fold/brace-fold.js
deleted file mode 100644
index 1605f6c2a..000000000
--- a/www/code/codemirror-5.7/addon/fold/brace-fold.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.registerHelper("fold", "brace", function(cm, start) {
-  var line = start.line, lineText = cm.getLine(line);
-  var startCh, tokenType;
-
-  function findOpening(openCh) {
-    for (var at = start.ch, pass = 0;;) {
-      var found = at <= 0 ? -1 : lineText.lastIndexOf(openCh, at - 1);
-      if (found == -1) {
-        if (pass == 1) break;
-        pass = 1;
-        at = lineText.length;
-        continue;
-      }
-      if (pass == 1 && found < start.ch) break;
-      tokenType = cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1));
-      if (!/^(comment|string)/.test(tokenType)) return found + 1;
-      at = found - 1;
-    }
-  }
-
-  var startToken = "{", endToken = "}", startCh = findOpening("{");
-  if (startCh == null) {
-    startToken = "[", endToken = "]";
-    startCh = findOpening("[");
-  }
-
-  if (startCh == null) return;
-  var count = 1, lastLine = cm.lastLine(), end, endCh;
-  outer: for (var i = line; i <= lastLine; ++i) {
-    var text = cm.getLine(i), pos = i == line ? startCh : 0;
-    for (;;) {
-      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
-      if (nextOpen < 0) nextOpen = text.length;
-      if (nextClose < 0) nextClose = text.length;
-      pos = Math.min(nextOpen, nextClose);
-      if (pos == text.length) break;
-      if (cm.getTokenTypeAt(CodeMirror.Pos(i, pos + 1)) == tokenType) {
-        if (pos == nextOpen) ++count;
-        else if (!--count) { end = i; endCh = pos; break outer; }
-      }
-      ++pos;
-    }
-  }
-  if (end == null || line == end && endCh == startCh) return;
-  return {from: CodeMirror.Pos(line, startCh),
-          to: CodeMirror.Pos(end, endCh)};
-});
-
-CodeMirror.registerHelper("fold", "import", function(cm, start) {
-  function hasImport(line) {
-    if (line < cm.firstLine() || line > cm.lastLine()) return null;
-    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
-    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
-    if (start.type != "keyword" || start.string != "import") return null;
-    // Now find closing semicolon, return its position
-    for (var i = line, e = Math.min(cm.lastLine(), line + 10); i <= e; ++i) {
-      var text = cm.getLine(i), semi = text.indexOf(";");
-      if (semi != -1) return {startCh: start.end, end: CodeMirror.Pos(i, semi)};
-    }
-  }
-
-  var start = start.line, has = hasImport(start), prev;
-  if (!has || hasImport(start - 1) || ((prev = hasImport(start - 2)) && prev.end.line == start - 1))
-    return null;
-  for (var end = has.end;;) {
-    var next = hasImport(end.line + 1);
-    if (next == null) break;
-    end = next.end;
-  }
-  return {from: cm.clipPos(CodeMirror.Pos(start, has.startCh + 1)), to: end};
-});
-
-CodeMirror.registerHelper("fold", "include", function(cm, start) {
-  function hasInclude(line) {
-    if (line < cm.firstLine() || line > cm.lastLine()) return null;
-    var start = cm.getTokenAt(CodeMirror.Pos(line, 1));
-    if (!/\S/.test(start.string)) start = cm.getTokenAt(CodeMirror.Pos(line, start.end + 1));
-    if (start.type == "meta" && start.string.slice(0, 8) == "#include") return start.start + 8;
-  }
-
-  var start = start.line, has = hasInclude(start);
-  if (has == null || hasInclude(start - 1) != null) return null;
-  for (var end = start;;) {
-    var next = hasInclude(end + 1);
-    if (next == null) break;
-    ++end;
-  }
-  return {from: CodeMirror.Pos(start, has + 1),
-          to: cm.clipPos(CodeMirror.Pos(end))};
-});
-
-});
diff --git a/www/code/codemirror-5.7/addon/fold/comment-fold.js b/www/code/codemirror-5.7/addon/fold/comment-fold.js
deleted file mode 100644
index b75db7ea2..000000000
--- a/www/code/codemirror-5.7/addon/fold/comment-fold.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.registerGlobalHelper("fold", "comment", function(mode) {
-  return mode.blockCommentStart && mode.blockCommentEnd;
-}, function(cm, start) {
-  var mode = cm.getModeAt(start), startToken = mode.blockCommentStart, endToken = mode.blockCommentEnd;
-  if (!startToken || !endToken) return;
-  var line = start.line, lineText = cm.getLine(line);
-
-  var startCh;
-  for (var at = start.ch, pass = 0;;) {
-    var found = at <= 0 ? -1 : lineText.lastIndexOf(startToken, at - 1);
-    if (found == -1) {
-      if (pass == 1) return;
-      pass = 1;
-      at = lineText.length;
-      continue;
-    }
-    if (pass == 1 && found < start.ch) return;
-    if (/comment/.test(cm.getTokenTypeAt(CodeMirror.Pos(line, found + 1)))) {
-      startCh = found + startToken.length;
-      break;
-    }
-    at = found - 1;
-  }
-
-  var depth = 1, lastLine = cm.lastLine(), end, endCh;
-  outer: for (var i = line; i <= lastLine; ++i) {
-    var text = cm.getLine(i), pos = i == line ? startCh : 0;
-    for (;;) {
-      var nextOpen = text.indexOf(startToken, pos), nextClose = text.indexOf(endToken, pos);
-      if (nextOpen < 0) nextOpen = text.length;
-      if (nextClose < 0) nextClose = text.length;
-      pos = Math.min(nextOpen, nextClose);
-      if (pos == text.length) break;
-      if (pos == nextOpen) ++depth;
-      else if (!--depth) { end = i; endCh = pos; break outer; }
-      ++pos;
-    }
-  }
-  if (end == null || line == end && endCh == startCh) return;
-  return {from: CodeMirror.Pos(line, startCh),
-          to: CodeMirror.Pos(end, endCh)};
-});
-
-});
diff --git a/www/code/codemirror-5.7/addon/fold/foldcode.js b/www/code/codemirror-5.7/addon/fold/foldcode.js
deleted file mode 100644
index 62911f935..000000000
--- a/www/code/codemirror-5.7/addon/fold/foldcode.js
+++ /dev/null
@@ -1,149 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  function doFold(cm, pos, options, force) {
-    if (options && options.call) {
-      var finder = options;
-      options = null;
-    } else {
-      var finder = getOption(cm, options, "rangeFinder");
-    }
-    if (typeof pos == "number") pos = CodeMirror.Pos(pos, 0);
-    var minSize = getOption(cm, options, "minFoldSize");
-
-    function getRange(allowFolded) {
-      var range = finder(cm, pos);
-      if (!range || range.to.line - range.from.line < minSize) return null;
-      var marks = cm.findMarksAt(range.from);
-      for (var i = 0; i < marks.length; ++i) {
-        if (marks[i].__isFold && force !== "fold") {
-          if (!allowFolded) return null;
-          range.cleared = true;
-          marks[i].clear();
-        }
-      }
-      return range;
-    }
-
-    var range = getRange(true);
-    if (getOption(cm, options, "scanUp")) while (!range && pos.line > cm.firstLine()) {
-      pos = CodeMirror.Pos(pos.line - 1, 0);
-      range = getRange(false);
-    }
-    if (!range || range.cleared || force === "unfold") return;
-
-    var myWidget = makeWidget(cm, options);
-    CodeMirror.on(myWidget, "mousedown", function(e) {
-      myRange.clear();
-      CodeMirror.e_preventDefault(e);
-    });
-    var myRange = cm.markText(range.from, range.to, {
-      replacedWith: myWidget,
-      clearOnEnter: true,
-      __isFold: true
-    });
-    myRange.on("clear", function(from, to) {
-      CodeMirror.signal(cm, "unfold", cm, from, to);
-    });
-    CodeMirror.signal(cm, "fold", cm, range.from, range.to);
-  }
-
-  function makeWidget(cm, options) {
-    var widget = getOption(cm, options, "widget");
-    if (typeof widget == "string") {
-      var text = document.createTextNode(widget);
-      widget = document.createElement("span");
-      widget.appendChild(text);
-      widget.className = "CodeMirror-foldmarker";
-    }
-    return widget;
-  }
-
-  // Clumsy backwards-compatible interface
-  CodeMirror.newFoldFunction = function(rangeFinder, widget) {
-    return function(cm, pos) { doFold(cm, pos, {rangeFinder: rangeFinder, widget: widget}); };
-  };
-
-  // New-style interface
-  CodeMirror.defineExtension("foldCode", function(pos, options, force) {
-    doFold(this, pos, options, force);
-  });
-
-  CodeMirror.defineExtension("isFolded", function(pos) {
-    var marks = this.findMarksAt(pos);
-    for (var i = 0; i < marks.length; ++i)
-      if (marks[i].__isFold) return true;
-  });
-
-  CodeMirror.commands.toggleFold = function(cm) {
-    cm.foldCode(cm.getCursor());
-  };
-  CodeMirror.commands.fold = function(cm) {
-    cm.foldCode(cm.getCursor(), null, "fold");
-  };
-  CodeMirror.commands.unfold = function(cm) {
-    cm.foldCode(cm.getCursor(), null, "unfold");
-  };
-  CodeMirror.commands.foldAll = function(cm) {
-    cm.operation(function() {
-      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
-        cm.foldCode(CodeMirror.Pos(i, 0), null, "fold");
-    });
-  };
-  CodeMirror.commands.unfoldAll = function(cm) {
-    cm.operation(function() {
-      for (var i = cm.firstLine(), e = cm.lastLine(); i <= e; i++)
-        cm.foldCode(CodeMirror.Pos(i, 0), null, "unfold");
-    });
-  };
-
-  CodeMirror.registerHelper("fold", "combine", function() {
-    var funcs = Array.prototype.slice.call(arguments, 0);
-    return function(cm, start) {
-      for (var i = 0; i < funcs.length; ++i) {
-        var found = funcs[i](cm, start);
-        if (found) return found;
-      }
-    };
-  });
-
-  CodeMirror.registerHelper("fold", "auto", function(cm, start) {
-    var helpers = cm.getHelpers(start, "fold");
-    for (var i = 0; i < helpers.length; i++) {
-      var cur = helpers[i](cm, start);
-      if (cur) return cur;
-    }
-  });
-
-  var defaultOptions = {
-    rangeFinder: CodeMirror.fold.auto,
-    widget: "\u2194",
-    minFoldSize: 0,
-    scanUp: false
-  };
-
-  CodeMirror.defineOption("foldOptions", null);
-
-  function getOption(cm, options, name) {
-    if (options && options[name] !== undefined)
-      return options[name];
-    var editorOptions = cm.options.foldOptions;
-    if (editorOptions && editorOptions[name] !== undefined)
-      return editorOptions[name];
-    return defaultOptions[name];
-  }
-
-  CodeMirror.defineExtension("foldOption", function(options, name) {
-    return getOption(this, options, name);
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/fold/foldgutter.css b/www/code/codemirror-5.7/addon/fold/foldgutter.css
deleted file mode 100644
index ad19ae2d3..000000000
--- a/www/code/codemirror-5.7/addon/fold/foldgutter.css
+++ /dev/null
@@ -1,20 +0,0 @@
-.CodeMirror-foldmarker {
-  color: blue;
-  text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
-  font-family: arial;
-  line-height: .3;
-  cursor: pointer;
-}
-.CodeMirror-foldgutter {
-  width: .7em;
-}
-.CodeMirror-foldgutter-open,
-.CodeMirror-foldgutter-folded {
-  cursor: pointer;
-}
-.CodeMirror-foldgutter-open:after {
-  content: "\25BE";
-}
-.CodeMirror-foldgutter-folded:after {
-  content: "\25B8";
-}
diff --git a/www/code/codemirror-5.7/addon/fold/foldgutter.js b/www/code/codemirror-5.7/addon/fold/foldgutter.js
deleted file mode 100644
index ed7bd87d3..000000000
--- a/www/code/codemirror-5.7/addon/fold/foldgutter.js
+++ /dev/null
@@ -1,146 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("./foldcode"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "./foldcode"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineOption("foldGutter", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      cm.clearGutter(cm.state.foldGutter.options.gutter);
-      cm.state.foldGutter = null;
-      cm.off("gutterClick", onGutterClick);
-      cm.off("change", onChange);
-      cm.off("viewportChange", onViewportChange);
-      cm.off("fold", onFold);
-      cm.off("unfold", onFold);
-      cm.off("swapDoc", updateInViewport);
-    }
-    if (val) {
-      cm.state.foldGutter = new State(parseOptions(val));
-      updateInViewport(cm);
-      cm.on("gutterClick", onGutterClick);
-      cm.on("change", onChange);
-      cm.on("viewportChange", onViewportChange);
-      cm.on("fold", onFold);
-      cm.on("unfold", onFold);
-      cm.on("swapDoc", updateInViewport);
-    }
-  });
-
-  var Pos = CodeMirror.Pos;
-
-  function State(options) {
-    this.options = options;
-    this.from = this.to = 0;
-  }
-
-  function parseOptions(opts) {
-    if (opts === true) opts = {};
-    if (opts.gutter == null) opts.gutter = "CodeMirror-foldgutter";
-    if (opts.indicatorOpen == null) opts.indicatorOpen = "CodeMirror-foldgutter-open";
-    if (opts.indicatorFolded == null) opts.indicatorFolded = "CodeMirror-foldgutter-folded";
-    return opts;
-  }
-
-  function isFolded(cm, line) {
-    var marks = cm.findMarksAt(Pos(line));
-    for (var i = 0; i < marks.length; ++i)
-      if (marks[i].__isFold && marks[i].find().from.line == line) return marks[i];
-  }
-
-  function marker(spec) {
-    if (typeof spec == "string") {
-      var elt = document.createElement("div");
-      elt.className = spec + " CodeMirror-guttermarker-subtle";
-      return elt;
-    } else {
-      return spec.cloneNode(true);
-    }
-  }
-
-  function updateFoldInfo(cm, from, to) {
-    var opts = cm.state.foldGutter.options, cur = from;
-    var minSize = cm.foldOption(opts, "minFoldSize");
-    var func = cm.foldOption(opts, "rangeFinder");
-    cm.eachLine(from, to, function(line) {
-      var mark = null;
-      if (isFolded(cm, cur)) {
-        mark = marker(opts.indicatorFolded);
-      } else {
-        var pos = Pos(cur, 0);
-        var range = func && func(cm, pos);
-        if (range && range.to.line - range.from.line >= minSize)
-          mark = marker(opts.indicatorOpen);
-      }
-      cm.setGutterMarker(line, opts.gutter, mark);
-      ++cur;
-    });
-  }
-
-  function updateInViewport(cm) {
-    var vp = cm.getViewport(), state = cm.state.foldGutter;
-    if (!state) return;
-    cm.operation(function() {
-      updateFoldInfo(cm, vp.from, vp.to);
-    });
-    state.from = vp.from; state.to = vp.to;
-  }
-
-  function onGutterClick(cm, line, gutter) {
-    var state = cm.state.foldGutter;
-    if (!state) return;
-    var opts = state.options;
-    if (gutter != opts.gutter) return;
-    var folded = isFolded(cm, line);
-    if (folded) folded.clear();
-    else cm.foldCode(Pos(line, 0), opts.rangeFinder);
-  }
-
-  function onChange(cm) {
-    var state = cm.state.foldGutter;
-    if (!state) return;
-    var opts = state.options;
-    state.from = state.to = 0;
-    clearTimeout(state.changeUpdate);
-    state.changeUpdate = setTimeout(function() { updateInViewport(cm); }, opts.foldOnChangeTimeSpan || 600);
-  }
-
-  function onViewportChange(cm) {
-    var state = cm.state.foldGutter;
-    if (!state) return;
-    var opts = state.options;
-    clearTimeout(state.changeUpdate);
-    state.changeUpdate = setTimeout(function() {
-      var vp = cm.getViewport();
-      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
-        updateInViewport(cm);
-      } else {
-        cm.operation(function() {
-          if (vp.from < state.from) {
-            updateFoldInfo(cm, vp.from, state.from);
-            state.from = vp.from;
-          }
-          if (vp.to > state.to) {
-            updateFoldInfo(cm, state.to, vp.to);
-            state.to = vp.to;
-          }
-        });
-      }
-    }, opts.updateViewportTimeSpan || 400);
-  }
-
-  function onFold(cm, from) {
-    var state = cm.state.foldGutter;
-    if (!state) return;
-    var line = from.line;
-    if (line >= state.from && line < state.to)
-      updateFoldInfo(cm, line, line + 1);
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/fold/indent-fold.js b/www/code/codemirror-5.7/addon/fold/indent-fold.js
deleted file mode 100644
index e29f15e9d..000000000
--- a/www/code/codemirror-5.7/addon/fold/indent-fold.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.registerHelper("fold", "indent", function(cm, start) {
-  var tabSize = cm.getOption("tabSize"), firstLine = cm.getLine(start.line);
-  if (!/\S/.test(firstLine)) return;
-  var getIndent = function(line) {
-    return CodeMirror.countColumn(line, null, tabSize);
-  };
-  var myIndent = getIndent(firstLine);
-  var lastLineInFold = null;
-  // Go through lines until we find a line that definitely doesn't belong in
-  // the block we're folding, or to the end.
-  for (var i = start.line + 1, end = cm.lastLine(); i <= end; ++i) {
-    var curLine = cm.getLine(i);
-    var curIndent = getIndent(curLine);
-    if (curIndent > myIndent) {
-      // Lines with a greater indent are considered part of the block.
-      lastLineInFold = i;
-    } else if (!/\S/.test(curLine)) {
-      // Empty lines might be breaks within the block we're trying to fold.
-    } else {
-      // A non-empty line at an indent equal to or less than ours marks the
-      // start of another block.
-      break;
-    }
-  }
-  if (lastLineInFold) return {
-    from: CodeMirror.Pos(start.line, firstLine.length),
-    to: CodeMirror.Pos(lastLineInFold, cm.getLine(lastLineInFold).length)
-  };
-});
-
-});
diff --git a/www/code/codemirror-5.7/addon/fold/markdown-fold.js b/www/code/codemirror-5.7/addon/fold/markdown-fold.js
deleted file mode 100644
index ce84c946c..000000000
--- a/www/code/codemirror-5.7/addon/fold/markdown-fold.js
+++ /dev/null
@@ -1,49 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.registerHelper("fold", "markdown", function(cm, start) {
-  var maxDepth = 100;
-
-  function isHeader(lineNo) {
-    var tokentype = cm.getTokenTypeAt(CodeMirror.Pos(lineNo, 0));
-    return tokentype && /\bheader\b/.test(tokentype);
-  }
-
-  function headerLevel(lineNo, line, nextLine) {
-    var match = line && line.match(/^#+/);
-    if (match && isHeader(lineNo)) return match[0].length;
-    match = nextLine && nextLine.match(/^[=\-]+\s*$/);
-    if (match && isHeader(lineNo + 1)) return nextLine[0] == "=" ? 1 : 2;
-    return maxDepth;
-  }
-
-  var firstLine = cm.getLine(start.line), nextLine = cm.getLine(start.line + 1);
-  var level = headerLevel(start.line, firstLine, nextLine);
-  if (level === maxDepth) return undefined;
-
-  var lastLineNo = cm.lastLine();
-  var end = start.line, nextNextLine = cm.getLine(end + 2);
-  while (end < lastLineNo) {
-    if (headerLevel(end + 1, nextLine, nextNextLine) <= level) break;
-    ++end;
-    nextLine = nextNextLine;
-    nextNextLine = cm.getLine(end + 2);
-  }
-
-  return {
-    from: CodeMirror.Pos(start.line, firstLine.length),
-    to: CodeMirror.Pos(end, cm.getLine(end).length)
-  };
-});
-
-});
diff --git a/www/code/codemirror-5.7/addon/fold/xml-fold.js b/www/code/codemirror-5.7/addon/fold/xml-fold.js
deleted file mode 100644
index 504727f38..000000000
--- a/www/code/codemirror-5.7/addon/fold/xml-fold.js
+++ /dev/null
@@ -1,182 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-  function cmp(a, b) { return a.line - b.line || a.ch - b.ch; }
-
-  var nameStartChar = "A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD";
-  var nameChar = nameStartChar + "\-\:\.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040";
-  var xmlTagStart = new RegExp("<(/?)([" + nameStartChar + "][" + nameChar + "]*)", "g");
-
-  function Iter(cm, line, ch, range) {
-    this.line = line; this.ch = ch;
-    this.cm = cm; this.text = cm.getLine(line);
-    this.min = range ? range.from : cm.firstLine();
-    this.max = range ? range.to - 1 : cm.lastLine();
-  }
-
-  function tagAt(iter, ch) {
-    var type = iter.cm.getTokenTypeAt(Pos(iter.line, ch));
-    return type && /\btag\b/.test(type);
-  }
-
-  function nextLine(iter) {
-    if (iter.line >= iter.max) return;
-    iter.ch = 0;
-    iter.text = iter.cm.getLine(++iter.line);
-    return true;
-  }
-  function prevLine(iter) {
-    if (iter.line <= iter.min) return;
-    iter.text = iter.cm.getLine(--iter.line);
-    iter.ch = iter.text.length;
-    return true;
-  }
-
-  function toTagEnd(iter) {
-    for (;;) {
-      var gt = iter.text.indexOf(">", iter.ch);
-      if (gt == -1) { if (nextLine(iter)) continue; else return; }
-      if (!tagAt(iter, gt + 1)) { iter.ch = gt + 1; continue; }
-      var lastSlash = iter.text.lastIndexOf("/", gt);
-      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
-      iter.ch = gt + 1;
-      return selfClose ? "selfClose" : "regular";
-    }
-  }
-  function toTagStart(iter) {
-    for (;;) {
-      var lt = iter.ch ? iter.text.lastIndexOf("<", iter.ch - 1) : -1;
-      if (lt == -1) { if (prevLine(iter)) continue; else return; }
-      if (!tagAt(iter, lt + 1)) { iter.ch = lt; continue; }
-      xmlTagStart.lastIndex = lt;
-      iter.ch = lt;
-      var match = xmlTagStart.exec(iter.text);
-      if (match && match.index == lt) return match;
-    }
-  }
-
-  function toNextTag(iter) {
-    for (;;) {
-      xmlTagStart.lastIndex = iter.ch;
-      var found = xmlTagStart.exec(iter.text);
-      if (!found) { if (nextLine(iter)) continue; else return; }
-      if (!tagAt(iter, found.index + 1)) { iter.ch = found.index + 1; continue; }
-      iter.ch = found.index + found[0].length;
-      return found;
-    }
-  }
-  function toPrevTag(iter) {
-    for (;;) {
-      var gt = iter.ch ? iter.text.lastIndexOf(">", iter.ch - 1) : -1;
-      if (gt == -1) { if (prevLine(iter)) continue; else return; }
-      if (!tagAt(iter, gt + 1)) { iter.ch = gt; continue; }
-      var lastSlash = iter.text.lastIndexOf("/", gt);
-      var selfClose = lastSlash > -1 && !/\S/.test(iter.text.slice(lastSlash + 1, gt));
-      iter.ch = gt + 1;
-      return selfClose ? "selfClose" : "regular";
-    }
-  }
-
-  function findMatchingClose(iter, tag) {
-    var stack = [];
-    for (;;) {
-      var next = toNextTag(iter), end, startLine = iter.line, startCh = iter.ch - (next ? next[0].length : 0);
-      if (!next || !(end = toTagEnd(iter))) return;
-      if (end == "selfClose") continue;
-      if (next[1]) { // closing tag
-        for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == next[2]) {
-          stack.length = i;
-          break;
-        }
-        if (i < 0 && (!tag || tag == next[2])) return {
-          tag: next[2],
-          from: Pos(startLine, startCh),
-          to: Pos(iter.line, iter.ch)
-        };
-      } else { // opening tag
-        stack.push(next[2]);
-      }
-    }
-  }
-  function findMatchingOpen(iter, tag) {
-    var stack = [];
-    for (;;) {
-      var prev = toPrevTag(iter);
-      if (!prev) return;
-      if (prev == "selfClose") { toTagStart(iter); continue; }
-      var endLine = iter.line, endCh = iter.ch;
-      var start = toTagStart(iter);
-      if (!start) return;
-      if (start[1]) { // closing tag
-        stack.push(start[2]);
-      } else { // opening tag
-        for (var i = stack.length - 1; i >= 0; --i) if (stack[i] == start[2]) {
-          stack.length = i;
-          break;
-        }
-        if (i < 0 && (!tag || tag == start[2])) return {
-          tag: start[2],
-          from: Pos(iter.line, iter.ch),
-          to: Pos(endLine, endCh)
-        };
-      }
-    }
-  }
-
-  CodeMirror.registerHelper("fold", "xml", function(cm, start) {
-    var iter = new Iter(cm, start.line, 0);
-    for (;;) {
-      var openTag = toNextTag(iter), end;
-      if (!openTag || iter.line != start.line || !(end = toTagEnd(iter))) return;
-      if (!openTag[1] && end != "selfClose") {
-        var start = Pos(iter.line, iter.ch);
-        var close = findMatchingClose(iter, openTag[2]);
-        return close && {from: start, to: close.from};
-      }
-    }
-  });
-  CodeMirror.findMatchingTag = function(cm, pos, range) {
-    var iter = new Iter(cm, pos.line, pos.ch, range);
-    if (iter.text.indexOf(">") == -1 && iter.text.indexOf("<") == -1) return;
-    var end = toTagEnd(iter), to = end && Pos(iter.line, iter.ch);
-    var start = end && toTagStart(iter);
-    if (!end || !start || cmp(iter, pos) > 0) return;
-    var here = {from: Pos(iter.line, iter.ch), to: to, tag: start[2]};
-    if (end == "selfClose") return {open: here, close: null, at: "open"};
-
-    if (start[1]) { // closing tag
-      return {open: findMatchingOpen(iter, start[2]), close: here, at: "close"};
-    } else { // opening tag
-      iter = new Iter(cm, to.line, to.ch, range);
-      return {open: here, close: findMatchingClose(iter, start[2]), at: "open"};
-    }
-  };
-
-  CodeMirror.findEnclosingTag = function(cm, pos, range) {
-    var iter = new Iter(cm, pos.line, pos.ch, range);
-    for (;;) {
-      var open = findMatchingOpen(iter);
-      if (!open) break;
-      var forward = new Iter(cm, pos.line, pos.ch, range);
-      var close = findMatchingClose(forward, open.tag);
-      if (close) return {open: open, close: close};
-    }
-  };
-
-  // Used by addon/edit/closetag.js
-  CodeMirror.scanForClosingTag = function(cm, pos, name, end) {
-    var iter = new Iter(cm, pos.line, pos.ch, end ? {from: 0, to: end} : null);
-    return findMatchingClose(iter, name);
-  };
-});
diff --git a/www/code/codemirror-5.7/addon/hint/anyword-hint.js b/www/code/codemirror-5.7/addon/hint/anyword-hint.js
deleted file mode 100644
index dae78e2ef..000000000
--- a/www/code/codemirror-5.7/addon/hint/anyword-hint.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var WORD = /[\w$]+/, RANGE = 500;
-
-  CodeMirror.registerHelper("hint", "anyword", function(editor, options) {
-    var word = options && options.word || WORD;
-    var range = options && options.range || RANGE;
-    var cur = editor.getCursor(), curLine = editor.getLine(cur.line);
-    var end = cur.ch, start = end;
-    while (start && word.test(curLine.charAt(start - 1))) --start;
-    var curWord = start != end && curLine.slice(start, end);
-
-    var list = options && options.list || [], seen = {};
-    var re = new RegExp(word.source, "g");
-    for (var dir = -1; dir <= 1; dir += 2) {
-      var line = cur.line, endLine = Math.min(Math.max(line + dir * range, editor.firstLine()), editor.lastLine()) + dir;
-      for (; line != endLine; line += dir) {
-        var text = editor.getLine(line), m;
-        while (m = re.exec(text)) {
-          if (line == cur.line && m[0] === curWord) continue;
-          if ((!curWord || m[0].lastIndexOf(curWord, 0) == 0) && !Object.prototype.hasOwnProperty.call(seen, m[0])) {
-            seen[m[0]] = true;
-            list.push(m[0]);
-          }
-        }
-      }
-    }
-    return {list: list, from: CodeMirror.Pos(cur.line, start), to: CodeMirror.Pos(cur.line, end)};
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/hint/css-hint.js b/www/code/codemirror-5.7/addon/hint/css-hint.js
deleted file mode 100644
index 22642727c..000000000
--- a/www/code/codemirror-5.7/addon/hint/css-hint.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../../mode/css/css"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../../mode/css/css"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var pseudoClasses = {link: 1, visited: 1, active: 1, hover: 1, focus: 1,
-                       "first-letter": 1, "first-line": 1, "first-child": 1,
-                       before: 1, after: 1, lang: 1};
-
-  CodeMirror.registerHelper("hint", "css", function(cm) {
-    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    var inner = CodeMirror.innerMode(cm.getMode(), token.state);
-    if (inner.mode.name != "css") return;
-
-    if (token.type == "keyword" && "!important".indexOf(token.string) == 0)
-      return {list: ["!important"], from: CodeMirror.Pos(cur.line, token.start),
-              to: CodeMirror.Pos(cur.line, token.end)};
-
-    var start = token.start, end = cur.ch, word = token.string.slice(0, end - start);
-    if (/[^\w$_-]/.test(word)) {
-      word = ""; start = end = cur.ch;
-    }
-
-    var spec = CodeMirror.resolveMode("text/css");
-
-    var result = [];
-    function add(keywords) {
-      for (var name in keywords)
-        if (!word || name.lastIndexOf(word, 0) == 0)
-          result.push(name);
-    }
-
-    var st = inner.state.state;
-    if (st == "pseudo" || token.type == "variable-3") {
-      add(pseudoClasses);
-    } else if (st == "block" || st == "maybeprop") {
-      add(spec.propertyKeywords);
-    } else if (st == "prop" || st == "parens" || st == "at" || st == "params") {
-      add(spec.valueKeywords);
-      add(spec.colorKeywords);
-    } else if (st == "media" || st == "media_parens") {
-      add(spec.mediaTypes);
-      add(spec.mediaFeatures);
-    }
-
-    if (result.length) return {
-      list: result,
-      from: CodeMirror.Pos(cur.line, start),
-      to: CodeMirror.Pos(cur.line, end)
-    };
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/hint/html-hint.js b/www/code/codemirror-5.7/addon/hint/html-hint.js
deleted file mode 100644
index c6769bcae..000000000
--- a/www/code/codemirror-5.7/addon/hint/html-hint.js
+++ /dev/null
@@ -1,348 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("./xml-hint"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "./xml-hint"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var langs = "ab aa af ak sq am ar an hy as av ae ay az bm ba eu be bn bh bi bs br bg my ca ch ce ny zh cv kw co cr hr cs da dv nl dz en eo et ee fo fj fi fr ff gl ka de el gn gu ht ha he hz hi ho hu ia id ie ga ig ik io is it iu ja jv kl kn kr ks kk km ki rw ky kv kg ko ku kj la lb lg li ln lo lt lu lv gv mk mg ms ml mt mi mr mh mn na nv nb nd ne ng nn no ii nr oc oj cu om or os pa pi fa pl ps pt qu rm rn ro ru sa sc sd se sm sg sr gd sn si sk sl so st es su sw ss sv ta te tg th ti bo tk tl tn to tr ts tt tw ty ug uk ur uz ve vi vo wa cy wo fy xh yi yo za zu".split(" ");
-  var targets = ["_blank", "_self", "_top", "_parent"];
-  var charsets = ["ascii", "utf-8", "utf-16", "latin1", "latin1"];
-  var methods = ["get", "post", "put", "delete"];
-  var encs = ["application/x-www-form-urlencoded", "multipart/form-data", "text/plain"];
-  var media = ["all", "screen", "print", "embossed", "braille", "handheld", "print", "projection", "screen", "tty", "tv", "speech",
-               "3d-glasses", "resolution [>][<][=] [X]", "device-aspect-ratio: X/Y", "orientation:portrait",
-               "orientation:landscape", "device-height: [X]", "device-width: [X]"];
-  var s = { attrs: {} }; // Simple tag, reused for a whole lot of tags
-
-  var data = {
-    a: {
-      attrs: {
-        href: null, ping: null, type: null,
-        media: media,
-        target: targets,
-        hreflang: langs
-      }
-    },
-    abbr: s,
-    acronym: s,
-    address: s,
-    applet: s,
-    area: {
-      attrs: {
-        alt: null, coords: null, href: null, target: null, ping: null,
-        media: media, hreflang: langs, type: null,
-        shape: ["default", "rect", "circle", "poly"]
-      }
-    },
-    article: s,
-    aside: s,
-    audio: {
-      attrs: {
-        src: null, mediagroup: null,
-        crossorigin: ["anonymous", "use-credentials"],
-        preload: ["none", "metadata", "auto"],
-        autoplay: ["", "autoplay"],
-        loop: ["", "loop"],
-        controls: ["", "controls"]
-      }
-    },
-    b: s,
-    base: { attrs: { href: null, target: targets } },
-    basefont: s,
-    bdi: s,
-    bdo: s,
-    big: s,
-    blockquote: { attrs: { cite: null } },
-    body: s,
-    br: s,
-    button: {
-      attrs: {
-        form: null, formaction: null, name: null, value: null,
-        autofocus: ["", "autofocus"],
-        disabled: ["", "autofocus"],
-        formenctype: encs,
-        formmethod: methods,
-        formnovalidate: ["", "novalidate"],
-        formtarget: targets,
-        type: ["submit", "reset", "button"]
-      }
-    },
-    canvas: { attrs: { width: null, height: null } },
-    caption: s,
-    center: s,
-    cite: s,
-    code: s,
-    col: { attrs: { span: null } },
-    colgroup: { attrs: { span: null } },
-    command: {
-      attrs: {
-        type: ["command", "checkbox", "radio"],
-        label: null, icon: null, radiogroup: null, command: null, title: null,
-        disabled: ["", "disabled"],
-        checked: ["", "checked"]
-      }
-    },
-    data: { attrs: { value: null } },
-    datagrid: { attrs: { disabled: ["", "disabled"], multiple: ["", "multiple"] } },
-    datalist: { attrs: { data: null } },
-    dd: s,
-    del: { attrs: { cite: null, datetime: null } },
-    details: { attrs: { open: ["", "open"] } },
-    dfn: s,
-    dir: s,
-    div: s,
-    dl: s,
-    dt: s,
-    em: s,
-    embed: { attrs: { src: null, type: null, width: null, height: null } },
-    eventsource: { attrs: { src: null } },
-    fieldset: { attrs: { disabled: ["", "disabled"], form: null, name: null } },
-    figcaption: s,
-    figure: s,
-    font: s,
-    footer: s,
-    form: {
-      attrs: {
-        action: null, name: null,
-        "accept-charset": charsets,
-        autocomplete: ["on", "off"],
-        enctype: encs,
-        method: methods,
-        novalidate: ["", "novalidate"],
-        target: targets
-      }
-    },
-    frame: s,
-    frameset: s,
-    h1: s, h2: s, h3: s, h4: s, h5: s, h6: s,
-    head: {
-      attrs: {},
-      children: ["title", "base", "link", "style", "meta", "script", "noscript", "command"]
-    },
-    header: s,
-    hgroup: s,
-    hr: s,
-    html: {
-      attrs: { manifest: null },
-      children: ["head", "body"]
-    },
-    i: s,
-    iframe: {
-      attrs: {
-        src: null, srcdoc: null, name: null, width: null, height: null,
-        sandbox: ["allow-top-navigation", "allow-same-origin", "allow-forms", "allow-scripts"],
-        seamless: ["", "seamless"]
-      }
-    },
-    img: {
-      attrs: {
-        alt: null, src: null, ismap: null, usemap: null, width: null, height: null,
-        crossorigin: ["anonymous", "use-credentials"]
-      }
-    },
-    input: {
-      attrs: {
-        alt: null, dirname: null, form: null, formaction: null,
-        height: null, list: null, max: null, maxlength: null, min: null,
-        name: null, pattern: null, placeholder: null, size: null, src: null,
-        step: null, value: null, width: null,
-        accept: ["audio/*", "video/*", "image/*"],
-        autocomplete: ["on", "off"],
-        autofocus: ["", "autofocus"],
-        checked: ["", "checked"],
-        disabled: ["", "disabled"],
-        formenctype: encs,
-        formmethod: methods,
-        formnovalidate: ["", "novalidate"],
-        formtarget: targets,
-        multiple: ["", "multiple"],
-        readonly: ["", "readonly"],
-        required: ["", "required"],
-        type: ["hidden", "text", "search", "tel", "url", "email", "password", "datetime", "date", "month",
-               "week", "time", "datetime-local", "number", "range", "color", "checkbox", "radio",
-               "file", "submit", "image", "reset", "button"]
-      }
-    },
-    ins: { attrs: { cite: null, datetime: null } },
-    kbd: s,
-    keygen: {
-      attrs: {
-        challenge: null, form: null, name: null,
-        autofocus: ["", "autofocus"],
-        disabled: ["", "disabled"],
-        keytype: ["RSA"]
-      }
-    },
-    label: { attrs: { "for": null, form: null } },
-    legend: s,
-    li: { attrs: { value: null } },
-    link: {
-      attrs: {
-        href: null, type: null,
-        hreflang: langs,
-        media: media,
-        sizes: ["all", "16x16", "16x16 32x32", "16x16 32x32 64x64"]
-      }
-    },
-    map: { attrs: { name: null } },
-    mark: s,
-    menu: { attrs: { label: null, type: ["list", "context", "toolbar"] } },
-    meta: {
-      attrs: {
-        content: null,
-        charset: charsets,
-        name: ["viewport", "application-name", "author", "description", "generator", "keywords"],
-        "http-equiv": ["content-language", "content-type", "default-style", "refresh"]
-      }
-    },
-    meter: { attrs: { value: null, min: null, low: null, high: null, max: null, optimum: null } },
-    nav: s,
-    noframes: s,
-    noscript: s,
-    object: {
-      attrs: {
-        data: null, type: null, name: null, usemap: null, form: null, width: null, height: null,
-        typemustmatch: ["", "typemustmatch"]
-      }
-    },
-    ol: { attrs: { reversed: ["", "reversed"], start: null, type: ["1", "a", "A", "i", "I"] } },
-    optgroup: { attrs: { disabled: ["", "disabled"], label: null } },
-    option: { attrs: { disabled: ["", "disabled"], label: null, selected: ["", "selected"], value: null } },
-    output: { attrs: { "for": null, form: null, name: null } },
-    p: s,
-    param: { attrs: { name: null, value: null } },
-    pre: s,
-    progress: { attrs: { value: null, max: null } },
-    q: { attrs: { cite: null } },
-    rp: s,
-    rt: s,
-    ruby: s,
-    s: s,
-    samp: s,
-    script: {
-      attrs: {
-        type: ["text/javascript"],
-        src: null,
-        async: ["", "async"],
-        defer: ["", "defer"],
-        charset: charsets
-      }
-    },
-    section: s,
-    select: {
-      attrs: {
-        form: null, name: null, size: null,
-        autofocus: ["", "autofocus"],
-        disabled: ["", "disabled"],
-        multiple: ["", "multiple"]
-      }
-    },
-    small: s,
-    source: { attrs: { src: null, type: null, media: null } },
-    span: s,
-    strike: s,
-    strong: s,
-    style: {
-      attrs: {
-        type: ["text/css"],
-        media: media,
-        scoped: null
-      }
-    },
-    sub: s,
-    summary: s,
-    sup: s,
-    table: s,
-    tbody: s,
-    td: { attrs: { colspan: null, rowspan: null, headers: null } },
-    textarea: {
-      attrs: {
-        dirname: null, form: null, maxlength: null, name: null, placeholder: null,
-        rows: null, cols: null,
-        autofocus: ["", "autofocus"],
-        disabled: ["", "disabled"],
-        readonly: ["", "readonly"],
-        required: ["", "required"],
-        wrap: ["soft", "hard"]
-      }
-    },
-    tfoot: s,
-    th: { attrs: { colspan: null, rowspan: null, headers: null, scope: ["row", "col", "rowgroup", "colgroup"] } },
-    thead: s,
-    time: { attrs: { datetime: null } },
-    title: s,
-    tr: s,
-    track: {
-      attrs: {
-        src: null, label: null, "default": null,
-        kind: ["subtitles", "captions", "descriptions", "chapters", "metadata"],
-        srclang: langs
-      }
-    },
-    tt: s,
-    u: s,
-    ul: s,
-    "var": s,
-    video: {
-      attrs: {
-        src: null, poster: null, width: null, height: null,
-        crossorigin: ["anonymous", "use-credentials"],
-        preload: ["auto", "metadata", "none"],
-        autoplay: ["", "autoplay"],
-        mediagroup: ["movie"],
-        muted: ["", "muted"],
-        controls: ["", "controls"]
-      }
-    },
-    wbr: s
-  };
-
-  var globalAttrs = {
-    accesskey: ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
-    "class": null,
-    contenteditable: ["true", "false"],
-    contextmenu: null,
-    dir: ["ltr", "rtl", "auto"],
-    draggable: ["true", "false", "auto"],
-    dropzone: ["copy", "move", "link", "string:", "file:"],
-    hidden: ["hidden"],
-    id: null,
-    inert: ["inert"],
-    itemid: null,
-    itemprop: null,
-    itemref: null,
-    itemscope: ["itemscope"],
-    itemtype: null,
-    lang: ["en", "es"],
-    spellcheck: ["true", "false"],
-    style: null,
-    tabindex: ["1", "2", "3", "4", "5", "6", "7", "8", "9"],
-    title: null,
-    translate: ["yes", "no"],
-    onclick: null,
-    rel: ["stylesheet", "alternate", "author", "bookmark", "help", "license", "next", "nofollow", "noreferrer", "prefetch", "prev", "search", "tag"]
-  };
-  function populate(obj) {
-    for (var attr in globalAttrs) if (globalAttrs.hasOwnProperty(attr))
-      obj.attrs[attr] = globalAttrs[attr];
-  }
-
-  populate(s);
-  for (var tag in data) if (data.hasOwnProperty(tag) && data[tag] != s)
-    populate(data[tag]);
-
-  CodeMirror.htmlSchema = data;
-  function htmlHint(cm, options) {
-    var local = {schemaInfo: data};
-    if (options) for (var opt in options) local[opt] = options[opt];
-    return CodeMirror.hint.xml(cm, local);
-  }
-  CodeMirror.registerHelper("hint", "html", htmlHint);
-});
diff --git a/www/code/codemirror-5.7/addon/hint/javascript-hint.js b/www/code/codemirror-5.7/addon/hint/javascript-hint.js
deleted file mode 100644
index 7bcbf4a05..000000000
--- a/www/code/codemirror-5.7/addon/hint/javascript-hint.js
+++ /dev/null
@@ -1,146 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  var Pos = CodeMirror.Pos;
-
-  function forEach(arr, f) {
-    for (var i = 0, e = arr.length; i < e; ++i) f(arr[i]);
-  }
-
-  function arrayContains(arr, item) {
-    if (!Array.prototype.indexOf) {
-      var i = arr.length;
-      while (i--) {
-        if (arr[i] === item) {
-          return true;
-        }
-      }
-      return false;
-    }
-    return arr.indexOf(item) != -1;
-  }
-
-  function scriptHint(editor, keywords, getToken, options) {
-    // Find the token at the cursor
-    var cur = editor.getCursor(), token = getToken(editor, cur);
-    if (/\b(?:string|comment)\b/.test(token.type)) return;
-    token.state = CodeMirror.innerMode(editor.getMode(), token.state).state;
-
-    // If it's not a 'word-style' token, ignore the token.
-    if (!/^[\w$_]*$/.test(token.string)) {
-      token = {start: cur.ch, end: cur.ch, string: "", state: token.state,
-               type: token.string == "." ? "property" : null};
-    } else if (token.end > cur.ch) {
-      token.end = cur.ch;
-      token.string = token.string.slice(0, cur.ch - token.start);
-    }
-
-    var tprop = token;
-    // If it is a property, find out what it is a property of.
-    while (tprop.type == "property") {
-      tprop = getToken(editor, Pos(cur.line, tprop.start));
-      if (tprop.string != ".") return;
-      tprop = getToken(editor, Pos(cur.line, tprop.start));
-      if (!context) var context = [];
-      context.push(tprop);
-    }
-    return {list: getCompletions(token, context, keywords, options),
-            from: Pos(cur.line, token.start),
-            to: Pos(cur.line, token.end)};
-  }
-
-  function javascriptHint(editor, options) {
-    return scriptHint(editor, javascriptKeywords,
-                      function (e, cur) {return e.getTokenAt(cur);},
-                      options);
-  };
-  CodeMirror.registerHelper("hint", "javascript", javascriptHint);
-
-  function getCoffeeScriptToken(editor, cur) {
-  // This getToken, it is for coffeescript, imitates the behavior of
-  // getTokenAt method in javascript.js, that is, returning "property"
-  // type and treat "." as indepenent token.
-    var token = editor.getTokenAt(cur);
-    if (cur.ch == token.start + 1 && token.string.charAt(0) == '.') {
-      token.end = token.start;
-      token.string = '.';
-      token.type = "property";
-    }
-    else if (/^\.[\w$_]*$/.test(token.string)) {
-      token.type = "property";
-      token.start++;
-      token.string = token.string.replace(/\./, '');
-    }
-    return token;
-  }
-
-  function coffeescriptHint(editor, options) {
-    return scriptHint(editor, coffeescriptKeywords, getCoffeeScriptToken, options);
-  }
-  CodeMirror.registerHelper("hint", "coffeescript", coffeescriptHint);
-
-  var stringProps = ("charAt charCodeAt indexOf lastIndexOf substring substr slice trim trimLeft trimRight " +
-                     "toUpperCase toLowerCase split concat match replace search").split(" ");
-  var arrayProps = ("length concat join splice push pop shift unshift slice reverse sort indexOf " +
-                    "lastIndexOf every some filter forEach map reduce reduceRight ").split(" ");
-  var funcProps = "prototype apply call bind".split(" ");
-  var javascriptKeywords = ("break case catch continue debugger default delete do else false finally for function " +
-                  "if in instanceof new null return switch throw true try typeof var void while with").split(" ");
-  var coffeescriptKeywords = ("and break catch class continue delete do else extends false finally for " +
-                  "if in instanceof isnt new no not null of off on or return switch then throw true try typeof until void while with yes").split(" ");
-
-  function getCompletions(token, context, keywords, options) {
-    var found = [], start = token.string, global = options && options.globalScope || window;
-    function maybeAdd(str) {
-      if (str.lastIndexOf(start, 0) == 0 && !arrayContains(found, str)) found.push(str);
-    }
-    function gatherCompletions(obj) {
-      if (typeof obj == "string") forEach(stringProps, maybeAdd);
-      else if (obj instanceof Array) forEach(arrayProps, maybeAdd);
-      else if (obj instanceof Function) forEach(funcProps, maybeAdd);
-      for (var name in obj) maybeAdd(name);
-    }
-
-    if (context && context.length) {
-      // If this is a property, see if it belongs to some object we can
-      // find in the current environment.
-      var obj = context.pop(), base;
-      if (obj.type && obj.type.indexOf("variable") === 0) {
-        if (options && options.additionalContext)
-          base = options.additionalContext[obj.string];
-        if (!options || options.useGlobalScope !== false)
-          base = base || global[obj.string];
-      } else if (obj.type == "string") {
-        base = "";
-      } else if (obj.type == "atom") {
-        base = 1;
-      } else if (obj.type == "function") {
-        if (global.jQuery != null && (obj.string == '$' || obj.string == 'jQuery') &&
-            (typeof global.jQuery == 'function'))
-          base = global.jQuery();
-        else if (global._ != null && (obj.string == '_') && (typeof global._ == 'function'))
-          base = global._();
-      }
-      while (base != null && context.length)
-        base = base[context.pop().string];
-      if (base != null) gatherCompletions(base);
-    } else {
-      // If not, just look in the global object and any local scope
-      // (reading into JS mode internals to get at the local and global variables)
-      for (var v = token.state.localVars; v; v = v.next) maybeAdd(v.name);
-      for (var v = token.state.globalVars; v; v = v.next) maybeAdd(v.name);
-      if (!options || options.useGlobalScope !== false)
-        gatherCompletions(global);
-      forEach(keywords, maybeAdd);
-    }
-    return found;
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/hint/show-hint.css b/www/code/codemirror-5.7/addon/hint/show-hint.css
deleted file mode 100644
index 924e638f7..000000000
--- a/www/code/codemirror-5.7/addon/hint/show-hint.css
+++ /dev/null
@@ -1,38 +0,0 @@
-.CodeMirror-hints {
-  position: absolute;
-  z-index: 10;
-  overflow: hidden;
-  list-style: none;
-
-  margin: 0;
-  padding: 2px;
-
-  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  border-radius: 3px;
-  border: 1px solid silver;
-
-  background: white;
-  font-size: 90%;
-  font-family: monospace;
-
-  max-height: 20em;
-  overflow-y: auto;
-}
-
-.CodeMirror-hint {
-  margin: 0;
-  padding: 0 4px;
-  border-radius: 2px;
-  max-width: 19em;
-  overflow: hidden;
-  white-space: pre;
-  color: black;
-  cursor: pointer;
-}
-
-li.CodeMirror-hint-active {
-  background: #08f;
-  color: white;
-}
diff --git a/www/code/codemirror-5.7/addon/hint/show-hint.js b/www/code/codemirror-5.7/addon/hint/show-hint.js
deleted file mode 100644
index 980da5235..000000000
--- a/www/code/codemirror-5.7/addon/hint/show-hint.js
+++ /dev/null
@@ -1,386 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var HINT_ELEMENT_CLASS        = "CodeMirror-hint";
-  var ACTIVE_HINT_ELEMENT_CLASS = "CodeMirror-hint-active";
-
-  // This is the old interface, kept around for now to stay
-  // backwards-compatible.
-  CodeMirror.showHint = function(cm, getHints, options) {
-    if (!getHints) return cm.showHint(options);
-    if (options && options.async) getHints.async = true;
-    var newOpts = {hint: getHints};
-    if (options) for (var prop in options) newOpts[prop] = options[prop];
-    return cm.showHint(newOpts);
-  };
-
-  CodeMirror.defineExtension("showHint", function(options) {
-    // We want a single cursor position.
-    if (this.listSelections().length > 1 || this.somethingSelected()) return;
-
-    if (this.state.completionActive) this.state.completionActive.close();
-    var completion = this.state.completionActive = new Completion(this, options);
-    if (!completion.options.hint) return;
-
-    CodeMirror.signal(this, "startCompletion", this);
-    completion.update(true);
-  });
-
-  function Completion(cm, options) {
-    this.cm = cm;
-    this.options = this.buildOptions(options);
-    this.widget = null;
-    this.debounce = 0;
-    this.tick = 0;
-    this.startPos = this.cm.getCursor();
-    this.startLen = this.cm.getLine(this.startPos.line).length;
-
-    var self = this;
-    cm.on("cursorActivity", this.activityFunc = function() { self.cursorActivity(); });
-  }
-
-  var requestAnimationFrame = window.requestAnimationFrame || function(fn) {
-    return setTimeout(fn, 1000/60);
-  };
-  var cancelAnimationFrame = window.cancelAnimationFrame || clearTimeout;
-
-  Completion.prototype = {
-    close: function() {
-      if (!this.active()) return;
-      this.cm.state.completionActive = null;
-      this.tick = null;
-      this.cm.off("cursorActivity", this.activityFunc);
-
-      if (this.widget && this.data) CodeMirror.signal(this.data, "close");
-      if (this.widget) this.widget.close();
-      CodeMirror.signal(this.cm, "endCompletion", this.cm);
-    },
-
-    active: function() {
-      return this.cm.state.completionActive == this;
-    },
-
-    pick: function(data, i) {
-      var completion = data.list[i];
-      if (completion.hint) completion.hint(this.cm, data, completion);
-      else this.cm.replaceRange(getText(completion), completion.from || data.from,
-                                completion.to || data.to, "complete");
-      CodeMirror.signal(data, "pick", completion);
-      this.close();
-    },
-
-    cursorActivity: function() {
-      if (this.debounce) {
-        cancelAnimationFrame(this.debounce);
-        this.debounce = 0;
-      }
-
-      var pos = this.cm.getCursor(), line = this.cm.getLine(pos.line);
-      if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||
-          pos.ch < this.startPos.ch || this.cm.somethingSelected() ||
-          (pos.ch && this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
-        this.close();
-      } else {
-        var self = this;
-        this.debounce = requestAnimationFrame(function() {self.update();});
-        if (this.widget) this.widget.disable();
-      }
-    },
-
-    update: function(first) {
-      if (this.tick == null) return;
-      if (!this.options.hint.async) {
-        this.finishUpdate(this.options.hint(this.cm, this.options), first);
-      } else {
-        var myTick = ++this.tick, self = this;
-        this.options.hint(this.cm, function(data) {
-          if (self.tick == myTick) self.finishUpdate(data, first);
-        }, this.options);
-      }
-    },
-
-    finishUpdate: function(data, first) {
-      if (this.data) CodeMirror.signal(this.data, "update");
-      if (data && this.data && CodeMirror.cmpPos(data.from, this.data.from)) data = null;
-      this.data = data;
-
-      var picked = (this.widget && this.widget.picked) || (first && this.options.completeSingle);
-      if (this.widget) this.widget.close();
-      if (data && data.list.length) {
-        if (picked && data.list.length == 1) {
-          this.pick(data, 0);
-        } else {
-          this.widget = new Widget(this, data);
-          CodeMirror.signal(data, "shown");
-        }
-      }
-    },
-
-    buildOptions: function(options) {
-      var editor = this.cm.options.hintOptions;
-      var out = {};
-      for (var prop in defaultOptions) out[prop] = defaultOptions[prop];
-      if (editor) for (var prop in editor)
-        if (editor[prop] !== undefined) out[prop] = editor[prop];
-      if (options) for (var prop in options)
-        if (options[prop] !== undefined) out[prop] = options[prop];
-      return out;
-    }
-  };
-
-  function getText(completion) {
-    if (typeof completion == "string") return completion;
-    else return completion.text;
-  }
-
-  function buildKeyMap(completion, handle) {
-    var baseMap = {
-      Up: function() {handle.moveFocus(-1);},
-      Down: function() {handle.moveFocus(1);},
-      PageUp: function() {handle.moveFocus(-handle.menuSize() + 1, true);},
-      PageDown: function() {handle.moveFocus(handle.menuSize() - 1, true);},
-      Home: function() {handle.setFocus(0);},
-      End: function() {handle.setFocus(handle.length - 1);},
-      Enter: handle.pick,
-      Tab: handle.pick,
-      Esc: handle.close
-    };
-    var custom = completion.options.customKeys;
-    var ourMap = custom ? {} : baseMap;
-    function addBinding(key, val) {
-      var bound;
-      if (typeof val != "string")
-        bound = function(cm) { return val(cm, handle); };
-      // This mechanism is deprecated
-      else if (baseMap.hasOwnProperty(val))
-        bound = baseMap[val];
-      else
-        bound = val;
-      ourMap[key] = bound;
-    }
-    if (custom)
-      for (var key in custom) if (custom.hasOwnProperty(key))
-        addBinding(key, custom[key]);
-    var extra = completion.options.extraKeys;
-    if (extra)
-      for (var key in extra) if (extra.hasOwnProperty(key))
-        addBinding(key, extra[key]);
-    return ourMap;
-  }
-
-  function getHintElement(hintsElement, el) {
-    while (el && el != hintsElement) {
-      if (el.nodeName.toUpperCase() === "LI" && el.parentNode == hintsElement) return el;
-      el = el.parentNode;
-    }
-  }
-
-  function Widget(completion, data) {
-    this.completion = completion;
-    this.data = data;
-    this.picked = false;
-    var widget = this, cm = completion.cm;
-
-    var hints = this.hints = document.createElement("ul");
-    hints.className = "CodeMirror-hints";
-    this.selectedHint = data.selectedHint || 0;
-
-    var completions = data.list;
-    for (var i = 0; i < completions.length; ++i) {
-      var elt = hints.appendChild(document.createElement("li")), cur = completions[i];
-      var className = HINT_ELEMENT_CLASS + (i != this.selectedHint ? "" : " " + ACTIVE_HINT_ELEMENT_CLASS);
-      if (cur.className != null) className = cur.className + " " + className;
-      elt.className = className;
-      if (cur.render) cur.render(elt, data, cur);
-      else elt.appendChild(document.createTextNode(cur.displayText || getText(cur)));
-      elt.hintId = i;
-    }
-
-    var pos = cm.cursorCoords(completion.options.alignWithWord ? data.from : null);
-    var left = pos.left, top = pos.bottom, below = true;
-    hints.style.left = left + "px";
-    hints.style.top = top + "px";
-    // If we're at the edge of the screen, then we want the menu to appear on the left of the cursor.
-    var winW = window.innerWidth || Math.max(document.body.offsetWidth, document.documentElement.offsetWidth);
-    var winH = window.innerHeight || Math.max(document.body.offsetHeight, document.documentElement.offsetHeight);
-    (completion.options.container || document.body).appendChild(hints);
-    var box = hints.getBoundingClientRect(), overlapY = box.bottom - winH;
-    if (overlapY > 0) {
-      var height = box.bottom - box.top, curTop = pos.top - (pos.bottom - box.top);
-      if (curTop - height > 0) { // Fits above cursor
-        hints.style.top = (top = pos.top - height) + "px";
-        below = false;
-      } else if (height > winH) {
-        hints.style.height = (winH - 5) + "px";
-        hints.style.top = (top = pos.bottom - box.top) + "px";
-        var cursor = cm.getCursor();
-        if (data.from.ch != cursor.ch) {
-          pos = cm.cursorCoords(cursor);
-          hints.style.left = (left = pos.left) + "px";
-          box = hints.getBoundingClientRect();
-        }
-      }
-    }
-    var overlapX = box.right - winW;
-    if (overlapX > 0) {
-      if (box.right - box.left > winW) {
-        hints.style.width = (winW - 5) + "px";
-        overlapX -= (box.right - box.left) - winW;
-      }
-      hints.style.left = (left = pos.left - overlapX) + "px";
-    }
-
-    cm.addKeyMap(this.keyMap = buildKeyMap(completion, {
-      moveFocus: function(n, avoidWrap) { widget.changeActive(widget.selectedHint + n, avoidWrap); },
-      setFocus: function(n) { widget.changeActive(n); },
-      menuSize: function() { return widget.screenAmount(); },
-      length: completions.length,
-      close: function() { completion.close(); },
-      pick: function() { widget.pick(); },
-      data: data
-    }));
-
-    if (completion.options.closeOnUnfocus) {
-      var closingOnBlur;
-      cm.on("blur", this.onBlur = function() { closingOnBlur = setTimeout(function() { completion.close(); }, 100); });
-      cm.on("focus", this.onFocus = function() { clearTimeout(closingOnBlur); });
-    }
-
-    var startScroll = cm.getScrollInfo();
-    cm.on("scroll", this.onScroll = function() {
-      var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
-      var newTop = top + startScroll.top - curScroll.top;
-      var point = newTop - (window.pageYOffset || (document.documentElement || document.body).scrollTop);
-      if (!below) point += hints.offsetHeight;
-      if (point <= editor.top || point >= editor.bottom) return completion.close();
-      hints.style.top = newTop + "px";
-      hints.style.left = (left + startScroll.left - curScroll.left) + "px";
-    });
-
-    CodeMirror.on(hints, "dblclick", function(e) {
-      var t = getHintElement(hints, e.target || e.srcElement);
-      if (t && t.hintId != null) {widget.changeActive(t.hintId); widget.pick();}
-    });
-
-    CodeMirror.on(hints, "click", function(e) {
-      var t = getHintElement(hints, e.target || e.srcElement);
-      if (t && t.hintId != null) {
-        widget.changeActive(t.hintId);
-        if (completion.options.completeOnSingleClick) widget.pick();
-      }
-    });
-
-    CodeMirror.on(hints, "mousedown", function() {
-      setTimeout(function(){cm.focus();}, 20);
-    });
-
-    CodeMirror.signal(data, "select", completions[0], hints.firstChild);
-    return true;
-  }
-
-  Widget.prototype = {
-    close: function() {
-      if (this.completion.widget != this) return;
-      this.completion.widget = null;
-      this.hints.parentNode.removeChild(this.hints);
-      this.completion.cm.removeKeyMap(this.keyMap);
-
-      var cm = this.completion.cm;
-      if (this.completion.options.closeOnUnfocus) {
-        cm.off("blur", this.onBlur);
-        cm.off("focus", this.onFocus);
-      }
-      cm.off("scroll", this.onScroll);
-    },
-
-    disable: function() {
-      this.completion.cm.removeKeyMap(this.keyMap);
-      var widget = this;
-      this.keyMap = {Enter: function() { widget.picked = true; }};
-      this.completion.cm.addKeyMap(this.keyMap);
-    },
-
-    pick: function() {
-      this.completion.pick(this.data, this.selectedHint);
-    },
-
-    changeActive: function(i, avoidWrap) {
-      if (i >= this.data.list.length)
-        i = avoidWrap ? this.data.list.length - 1 : 0;
-      else if (i < 0)
-        i = avoidWrap ? 0  : this.data.list.length - 1;
-      if (this.selectedHint == i) return;
-      var node = this.hints.childNodes[this.selectedHint];
-      node.className = node.className.replace(" " + ACTIVE_HINT_ELEMENT_CLASS, "");
-      node = this.hints.childNodes[this.selectedHint = i];
-      node.className += " " + ACTIVE_HINT_ELEMENT_CLASS;
-      if (node.offsetTop < this.hints.scrollTop)
-        this.hints.scrollTop = node.offsetTop - 3;
-      else if (node.offsetTop + node.offsetHeight > this.hints.scrollTop + this.hints.clientHeight)
-        this.hints.scrollTop = node.offsetTop + node.offsetHeight - this.hints.clientHeight + 3;
-      CodeMirror.signal(this.data, "select", this.data.list[this.selectedHint], node);
-    },
-
-    screenAmount: function() {
-      return Math.floor(this.hints.clientHeight / this.hints.firstChild.offsetHeight) || 1;
-    }
-  };
-
-  CodeMirror.registerHelper("hint", "auto", function(cm, options) {
-    var helpers = cm.getHelpers(cm.getCursor(), "hint"), words;
-    if (helpers.length) {
-      for (var i = 0; i < helpers.length; i++) {
-        var cur = helpers[i](cm, options);
-        if (cur && cur.list.length) return cur;
-      }
-    } else if (words = cm.getHelper(cm.getCursor(), "hintWords")) {
-      if (words) return CodeMirror.hint.fromList(cm, {words: words});
-    } else if (CodeMirror.hint.anyword) {
-      return CodeMirror.hint.anyword(cm, options);
-    }
-  });
-
-  CodeMirror.registerHelper("hint", "fromList", function(cm, options) {
-    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    var to = CodeMirror.Pos(cur.line, token.end);
-    if (token.string && /\w/.test(token.string[token.string.length - 1])) {
-      var term = token.string, from = CodeMirror.Pos(cur.line, token.start);
-    } else {
-      var term = "", from = to;
-    }
-    var found = [];
-    for (var i = 0; i < options.words.length; i++) {
-      var word = options.words[i];
-      if (word.slice(0, term.length) == term)
-        found.push(word);
-    }
-
-    if (found.length) return {list: found, from: from, to: to};
-  });
-
-  CodeMirror.commands.autocomplete = CodeMirror.showHint;
-
-  var defaultOptions = {
-    hint: CodeMirror.hint.auto,
-    completeSingle: true,
-    alignWithWord: true,
-    closeCharacters: /[\s()\[\]{};:>,]/,
-    closeOnUnfocus: true,
-    completeOnSingleClick: false,
-    container: null,
-    customKeys: null,
-    extraKeys: null
-  };
-
-  CodeMirror.defineOption("hintOptions", null);
-});
diff --git a/www/code/codemirror-5.7/addon/hint/sql-hint.js b/www/code/codemirror-5.7/addon/hint/sql-hint.js
deleted file mode 100644
index 22124b58f..000000000
--- a/www/code/codemirror-5.7/addon/hint/sql-hint.js
+++ /dev/null
@@ -1,254 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../../mode/sql/sql"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../../mode/sql/sql"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var tables;
-  var defaultTable;
-  var keywords;
-  var CONS = {
-    QUERY_DIV: ";",
-    ALIAS_KEYWORD: "AS"
-  };
-  var Pos = CodeMirror.Pos;
-
-  function getKeywords(editor) {
-    var mode = editor.doc.modeOption;
-    if (mode === "sql") mode = "text/x-sql";
-    return CodeMirror.resolveMode(mode).keywords;
-  }
-
-  function getText(item) {
-    return typeof item == "string" ? item : item.text;
-  }
-
-  function getItem(list, item) {
-    if (!list.slice) return list[item];
-    for (var i = list.length - 1; i >= 0; i--) if (getText(list[i]) == item)
-      return list[i];
-  }
-
-  function shallowClone(object) {
-    var result = {};
-    for (var key in object) if (object.hasOwnProperty(key))
-      result[key] = object[key];
-    return result;
-  }
-
-  function match(string, word) {
-    var len = string.length;
-    var sub = getText(word).substr(0, len);
-    return string.toUpperCase() === sub.toUpperCase();
-  }
-
-  function addMatches(result, search, wordlist, formatter) {
-    for (var word in wordlist) {
-      if (!wordlist.hasOwnProperty(word)) continue;
-      if (wordlist.slice) word = wordlist[word];
-
-      if (match(search, word)) result.push(formatter(word));
-    }
-  }
-
-  function cleanName(name) {
-    // Get rid name from backticks(`) and preceding dot(.)
-    if (name.charAt(0) == ".") {
-      name = name.substr(1);
-    }
-    return name.replace(/`/g, "");
-  }
-
-  function insertBackticks(name) {
-    var nameParts = getText(name).split(".");
-    for (var i = 0; i < nameParts.length; i++)
-      nameParts[i] = "`" + nameParts[i] + "`";
-    var escaped = nameParts.join(".");
-    if (typeof name == "string") return escaped;
-    name = shallowClone(name);
-    name.text = escaped;
-    return name;
-  }
-
-  function nameCompletion(cur, token, result, editor) {
-    // Try to complete table, colunm names and return start position of completion
-    var useBacktick = false;
-    var nameParts = [];
-    var start = token.start;
-    var cont = true;
-    while (cont) {
-      cont = (token.string.charAt(0) == ".");
-      useBacktick = useBacktick || (token.string.charAt(0) == "`");
-
-      start = token.start;
-      nameParts.unshift(cleanName(token.string));
-
-      token = editor.getTokenAt(Pos(cur.line, token.start));
-      if (token.string == ".") {
-        cont = true;
-        token = editor.getTokenAt(Pos(cur.line, token.start));
-      }
-    }
-
-    // Try to complete table names
-    var string = nameParts.join(".");
-    addMatches(result, string, tables, function(w) {
-      return useBacktick ? insertBackticks(w) : w;
-    });
-
-    // Try to complete columns from defaultTable
-    addMatches(result, string, defaultTable, function(w) {
-      return useBacktick ? insertBackticks(w) : w;
-    });
-
-    // Try to complete columns
-    string = nameParts.pop();
-    var table = nameParts.join(".");
-
-    var alias = false;
-    var aliasTable = table;
-    // Check if table is available. If not, find table by Alias
-    if (!getItem(tables, table)) {
-      var oldTable = table;
-      table = findTableByAlias(table, editor);
-      if (table !== oldTable) alias = true;
-    }
-
-    var columns = getItem(tables, table);
-    if (columns && columns.columns)
-      columns = columns.columns;
-
-    if (columns) {
-      addMatches(result, string, columns, function(w) {
-        var tableInsert = table;
-        if (alias == true) tableInsert = aliasTable;
-        if (typeof w == "string") {
-          w = tableInsert + "." + w;
-        } else {
-          w = shallowClone(w);
-          w.text = tableInsert + "." + w.text;
-        }
-        return useBacktick ? insertBackticks(w) : w;
-      });
-    }
-
-    return start;
-  }
-
-  function eachWord(lineText, f) {
-    if (!lineText) return;
-    var excepted = /[,;]/g;
-    var words = lineText.split(" ");
-    for (var i = 0; i < words.length; i++) {
-      f(words[i]?words[i].replace(excepted, '') : '');
-    }
-  }
-
-  function convertCurToNumber(cur) {
-    // max characters of a line is 999,999.
-    return cur.line + cur.ch / Math.pow(10, 6);
-  }
-
-  function convertNumberToCur(num) {
-    return Pos(Math.floor(num), +num.toString().split('.').pop());
-  }
-
-  function findTableByAlias(alias, editor) {
-    var doc = editor.doc;
-    var fullQuery = doc.getValue();
-    var aliasUpperCase = alias.toUpperCase();
-    var previousWord = "";
-    var table = "";
-    var separator = [];
-    var validRange = {
-      start: Pos(0, 0),
-      end: Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).length)
-    };
-
-    //add separator
-    var indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV);
-    while(indexOfSeparator != -1) {
-      separator.push(doc.posFromIndex(indexOfSeparator));
-      indexOfSeparator = fullQuery.indexOf(CONS.QUERY_DIV, indexOfSeparator+1);
-    }
-    separator.unshift(Pos(0, 0));
-    separator.push(Pos(editor.lastLine(), editor.getLineHandle(editor.lastLine()).text.length));
-
-    //find valid range
-    var prevItem = 0;
-    var current = convertCurToNumber(editor.getCursor());
-    for (var i=0; i< separator.length; i++) {
-      var _v = convertCurToNumber(separator[i]);
-      if (current > prevItem && current <= _v) {
-        validRange = { start: convertNumberToCur(prevItem), end: convertNumberToCur(_v) };
-        break;
-      }
-      prevItem = _v;
-    }
-
-    var query = doc.getRange(validRange.start, validRange.end, false);
-
-    for (var i = 0; i < query.length; i++) {
-      var lineText = query[i];
-      eachWord(lineText, function(word) {
-        var wordUpperCase = word.toUpperCase();
-        if (wordUpperCase === aliasUpperCase && getItem(tables, previousWord))
-          table = previousWord;
-        if (wordUpperCase !== CONS.ALIAS_KEYWORD)
-          previousWord = word;
-      });
-      if (table) break;
-    }
-    return table;
-  }
-
-  CodeMirror.registerHelper("hint", "sql", function(editor, options) {
-    tables = (options && options.tables) || {};
-    var defaultTableName = options && options.defaultTable;
-    var disableKeywords = options && options.disableKeywords;
-    defaultTable = defaultTableName && getItem(tables, defaultTableName);
-    keywords = keywords || getKeywords(editor);
-
-    if (defaultTableName && !defaultTable)
-      defaultTable = findTableByAlias(defaultTableName, editor);
-
-    defaultTable = defaultTable || [];
-
-    if (defaultTable.columns)
-      defaultTable = defaultTable.columns;
-
-    var cur = editor.getCursor();
-    var result = [];
-    var token = editor.getTokenAt(cur), start, end, search;
-    if (token.end > cur.ch) {
-      token.end = cur.ch;
-      token.string = token.string.slice(0, cur.ch - token.start);
-    }
-
-    if (token.string.match(/^[.`\w@]\w*$/)) {
-      search = token.string;
-      start = token.start;
-      end = token.end;
-    } else {
-      start = end = cur.ch;
-      search = "";
-    }
-    if (search.charAt(0) == "." || search.charAt(0) == "`") {
-      start = nameCompletion(cur, token, result, editor);
-    } else {
-      addMatches(result, search, tables, function(w) {return w;});
-      addMatches(result, search, defaultTable, function(w) {return w;});
-      if (!disableKeywords)
-        addMatches(result, search, keywords, function(w) {return w.toUpperCase();});
-    }
-
-    return {list: result, from: Pos(cur.line, start), to: Pos(cur.line, end)};
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/hint/xml-hint.js b/www/code/codemirror-5.7/addon/hint/xml-hint.js
deleted file mode 100644
index 9b9baa0c6..000000000
--- a/www/code/codemirror-5.7/addon/hint/xml-hint.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-
-  function getHints(cm, options) {
-    var tags = options && options.schemaInfo;
-    var quote = (options && options.quoteChar) || '"';
-    if (!tags) return;
-    var cur = cm.getCursor(), token = cm.getTokenAt(cur);
-    if (token.end > cur.ch) {
-      token.end = cur.ch;
-      token.string = token.string.slice(0, cur.ch - token.start);
-    }
-    var inner = CodeMirror.innerMode(cm.getMode(), token.state);
-    if (inner.mode.name != "xml") return;
-    var result = [], replaceToken = false, prefix;
-    var tag = /\btag\b/.test(token.type) && !/>$/.test(token.string);
-    var tagName = tag && /^\w/.test(token.string), tagStart;
-
-    if (tagName) {
-      var before = cm.getLine(cur.line).slice(Math.max(0, token.start - 2), token.start);
-      var tagType = /<\/$/.test(before) ? "close" : /<$/.test(before) ? "open" : null;
-      if (tagType) tagStart = token.start - (tagType == "close" ? 2 : 1);
-    } else if (tag && token.string == "<") {
-      tagType = "open";
-    } else if (tag && token.string == "");
-    } else {
-      // Attribute completion
-      var curTag = tags[inner.state.tagName], attrs = curTag && curTag.attrs;
-      var globalAttrs = tags["!attrs"];
-      if (!attrs && !globalAttrs) return;
-      if (!attrs) {
-        attrs = globalAttrs;
-      } else if (globalAttrs) { // Combine tag-local and global attributes
-        var set = {};
-        for (var nm in globalAttrs) if (globalAttrs.hasOwnProperty(nm)) set[nm] = globalAttrs[nm];
-        for (var nm in attrs) if (attrs.hasOwnProperty(nm)) set[nm] = attrs[nm];
-        attrs = set;
-      }
-      if (token.type == "string" || token.string == "=") { // A value
-        var before = cm.getRange(Pos(cur.line, Math.max(0, cur.ch - 60)),
-                                 Pos(cur.line, token.type == "string" ? token.start : token.end));
-        var atName = before.match(/([^\s\u00a0=<>\"\']+)=$/), atValues;
-        if (!atName || !attrs.hasOwnProperty(atName[1]) || !(atValues = attrs[atName[1]])) return;
-        if (typeof atValues == 'function') atValues = atValues.call(this, cm); // Functions can be used to supply values for autocomplete widget
-        if (token.type == "string") {
-          prefix = token.string;
-          var n = 0;
-          if (/['"]/.test(token.string.charAt(0))) {
-            quote = token.string.charAt(0);
-            prefix = token.string.slice(1);
-            n++;
-          }
-          var len = token.string.length;
-          if (/['"]/.test(token.string.charAt(len - 1))) {
-            quote = token.string.charAt(len - 1);
-            prefix = token.string.substr(n, len - 2);
-          }
-          replaceToken = true;
-        }
-        for (var i = 0; i < atValues.length; ++i) if (!prefix || atValues[i].lastIndexOf(prefix, 0) == 0)
-          result.push(quote + atValues[i] + quote);
-      } else { // An attribute name
-        if (token.type == "attribute") {
-          prefix = token.string;
-          replaceToken = true;
-        }
-        for (var attr in attrs) if (attrs.hasOwnProperty(attr) && (!prefix || attr.lastIndexOf(prefix, 0) == 0))
-          result.push(attr);
-      }
-    }
-    return {
-      list: result,
-      from: replaceToken ? Pos(cur.line, tagStart == null ? token.start : tagStart) : cur,
-      to: replaceToken ? Pos(cur.line, token.end) : cur
-    };
-  }
-
-  CodeMirror.registerHelper("hint", "xml", getHints);
-});
diff --git a/www/code/codemirror-5.7/addon/lint/coffeescript-lint.js b/www/code/codemirror-5.7/addon/lint/coffeescript-lint.js
deleted file mode 100644
index 7e39428f7..000000000
--- a/www/code/codemirror-5.7/addon/lint/coffeescript-lint.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Depends on coffeelint.js from http://www.coffeelint.org/js/coffeelint.js
-
-// declare global: coffeelint
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.registerHelper("lint", "coffeescript", function(text) {
-  var found = [];
-  var parseError = function(err) {
-    var loc = err.lineNumber;
-    found.push({from: CodeMirror.Pos(loc-1, 0),
-                to: CodeMirror.Pos(loc, 0),
-                severity: err.level,
-                message: err.message});
-  };
-  try {
-    var res = coffeelint.lint(text);
-    for(var i = 0; i < res.length; i++) {
-      parseError(res[i]);
-    }
-  } catch(e) {
-    found.push({from: CodeMirror.Pos(e.location.first_line, 0),
-                to: CodeMirror.Pos(e.location.last_line, e.location.last_column),
-                severity: 'error',
-                message: e.message});
-  }
-  return found;
-});
-
-});
diff --git a/www/code/codemirror-5.7/addon/lint/css-lint.js b/www/code/codemirror-5.7/addon/lint/css-lint.js
deleted file mode 100644
index 1f61b479b..000000000
--- a/www/code/codemirror-5.7/addon/lint/css-lint.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Depends on csslint.js from https://github.com/stubbornella/csslint
-
-// declare global: CSSLint
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.registerHelper("lint", "css", function(text) {
-  var found = [];
-  if (!window.CSSLint) return found;
-  var results = CSSLint.verify(text), messages = results.messages, message = null;
-  for ( var i = 0; i < messages.length; i++) {
-    message = messages[i];
-    var startLine = message.line -1, endLine = message.line -1, startCol = message.col -1, endCol = message.col;
-    found.push({
-      from: CodeMirror.Pos(startLine, startCol),
-      to: CodeMirror.Pos(endLine, endCol),
-      message: message.message,
-      severity : message.type
-    });
-  }
-  return found;
-});
-
-});
diff --git a/www/code/codemirror-5.7/addon/lint/html-lint.js b/www/code/codemirror-5.7/addon/lint/html-lint.js
deleted file mode 100644
index 1e8417098..000000000
--- a/www/code/codemirror-5.7/addon/lint/html-lint.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Depends on htmlhint.js from http://htmlhint.com/js/htmlhint.js
-
-// declare global: HTMLHint
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("htmlhint"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "htmlhint"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var defaultRules = {
-    "tagname-lowercase": true,
-    "attr-lowercase": true,
-    "attr-value-double-quotes": true,
-    "doctype-first": false,
-    "tag-pair": true,
-    "spec-char-escape": true,
-    "id-unique": true,
-    "src-not-empty": true,
-    "attr-no-duplication": true
-  };
-
-  CodeMirror.registerHelper("lint", "html", function(text, options) {
-    var found = [];
-    if (!window.HTMLHint) return found;
-    var messages = HTMLHint.verify(text, options && options.rules || defaultRules);
-    for (var i = 0; i < messages.length; i++) {
-      var message = messages[i];
-      var startLine = message.line - 1, endLine = message.line - 1, startCol = message.col - 1, endCol = message.col;
-      found.push({
-        from: CodeMirror.Pos(startLine, startCol),
-        to: CodeMirror.Pos(endLine, endCol),
-        message: message.message,
-        severity : message.type
-      });
-    }
-    return found;
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/lint/javascript-lint.js b/www/code/codemirror-5.7/addon/lint/javascript-lint.js
deleted file mode 100644
index d4f2ae9a1..000000000
--- a/www/code/codemirror-5.7/addon/lint/javascript-lint.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-  // declare global: JSHINT
-
-  var bogus = [ "Dangerous comment" ];
-
-  var warnings = [ [ "Expected '{'",
-                     "Statement body should be inside '{ }' braces." ] ];
-
-  var errors = [ "Missing semicolon", "Extra comma", "Missing property name",
-                 "Unmatched ", " and instead saw", " is not defined",
-                 "Unclosed string", "Stopping, unable to continue" ];
-
-  function validator(text, options) {
-    if (!window.JSHINT) return [];
-    JSHINT(text, options, options.globals);
-    var errors = JSHINT.data().errors, result = [];
-    if (errors) parseErrors(errors, result);
-    return result;
-  }
-
-  CodeMirror.registerHelper("lint", "javascript", validator);
-
-  function cleanup(error) {
-    // All problems are warnings by default
-    fixWith(error, warnings, "warning", true);
-    fixWith(error, errors, "error");
-
-    return isBogus(error) ? null : error;
-  }
-
-  function fixWith(error, fixes, severity, force) {
-    var description, fix, find, replace, found;
-
-    description = error.description;
-
-    for ( var i = 0; i < fixes.length; i++) {
-      fix = fixes[i];
-      find = (typeof fix === "string" ? fix : fix[0]);
-      replace = (typeof fix === "string" ? null : fix[1]);
-      found = description.indexOf(find) !== -1;
-
-      if (force || found) {
-        error.severity = severity;
-      }
-      if (found && replace) {
-        error.description = replace;
-      }
-    }
-  }
-
-  function isBogus(error) {
-    var description = error.description;
-    for ( var i = 0; i < bogus.length; i++) {
-      if (description.indexOf(bogus[i]) !== -1) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  function parseErrors(errors, output) {
-    for ( var i = 0; i < errors.length; i++) {
-      var error = errors[i];
-      if (error) {
-        var linetabpositions, index;
-
-        linetabpositions = [];
-
-        // This next block is to fix a problem in jshint. Jshint
-        // replaces
-        // all tabs with spaces then performs some checks. The error
-        // positions (character/space) are then reported incorrectly,
-        // not taking the replacement step into account. Here we look
-        // at the evidence line and try to adjust the character position
-        // to the correct value.
-        if (error.evidence) {
-          // Tab positions are computed once per line and cached
-          var tabpositions = linetabpositions[error.line];
-          if (!tabpositions) {
-            var evidence = error.evidence;
-            tabpositions = [];
-            // ugggh phantomjs does not like this
-            // forEachChar(evidence, function(item, index) {
-            Array.prototype.forEach.call(evidence, function(item,
-                                                            index) {
-              if (item === '\t') {
-                // First col is 1 (not 0) to match error
-                // positions
-                tabpositions.push(index + 1);
-              }
-            });
-            linetabpositions[error.line] = tabpositions;
-          }
-          if (tabpositions.length > 0) {
-            var pos = error.character;
-            tabpositions.forEach(function(tabposition) {
-              if (pos > tabposition) pos -= 1;
-            });
-            error.character = pos;
-          }
-        }
-
-        var start = error.character - 1, end = start + 1;
-        if (error.evidence) {
-          index = error.evidence.substring(start).search(/.\b/);
-          if (index > -1) {
-            end += index;
-          }
-        }
-
-        // Convert to format expected by validation service
-        error.description = error.reason;// + "(jshint)";
-        error.start = error.character;
-        error.end = end;
-        error = cleanup(error);
-
-        if (error)
-          output.push({message: error.description,
-                       severity: error.severity,
-                       from: CodeMirror.Pos(error.line - 1, start),
-                       to: CodeMirror.Pos(error.line - 1, end)});
-      }
-    }
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/lint/json-lint.js b/www/code/codemirror-5.7/addon/lint/json-lint.js
deleted file mode 100644
index 9dbb616b3..000000000
--- a/www/code/codemirror-5.7/addon/lint/json-lint.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Depends on jsonlint.js from https://github.com/zaach/jsonlint
-
-// declare global: jsonlint
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.registerHelper("lint", "json", function(text) {
-  var found = [];
-  jsonlint.parseError = function(str, hash) {
-    var loc = hash.loc;
-    found.push({from: CodeMirror.Pos(loc.first_line - 1, loc.first_column),
-                to: CodeMirror.Pos(loc.last_line - 1, loc.last_column),
-                message: str});
-  };
-  try { jsonlint.parse(text); }
-  catch(e) {}
-  return found;
-});
-
-});
diff --git a/www/code/codemirror-5.7/addon/lint/lint.css b/www/code/codemirror-5.7/addon/lint/lint.css
deleted file mode 100644
index 414a9a0e0..000000000
--- a/www/code/codemirror-5.7/addon/lint/lint.css
+++ /dev/null
@@ -1,73 +0,0 @@
-/* The lint marker gutter */
-.CodeMirror-lint-markers {
-  width: 16px;
-}
-
-.CodeMirror-lint-tooltip {
-  background-color: infobackground;
-  border: 1px solid black;
-  border-radius: 4px 4px 4px 4px;
-  color: infotext;
-  font-family: monospace;
-  font-size: 10pt;
-  overflow: hidden;
-  padding: 2px 5px;
-  position: fixed;
-  white-space: pre;
-  white-space: pre-wrap;
-  z-index: 100;
-  max-width: 600px;
-  opacity: 0;
-  transition: opacity .4s;
-  -moz-transition: opacity .4s;
-  -webkit-transition: opacity .4s;
-  -o-transition: opacity .4s;
-  -ms-transition: opacity .4s;
-}
-
-.CodeMirror-lint-mark-error, .CodeMirror-lint-mark-warning {
-  background-position: left bottom;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-lint-mark-error {
-  background-image:
-  url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==")
-  ;
-}
-
-.CodeMirror-lint-mark-warning {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJFhQXEbhTg7YAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAMklEQVQI12NkgIIvJ3QXMjAwdDN+OaEbysDA4MPAwNDNwMCwiOHLCd1zX07o6kBVGQEAKBANtobskNMAAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-error, .CodeMirror-lint-marker-warning {
-  background-position: center center;
-  background-repeat: no-repeat;
-  cursor: pointer;
-  display: inline-block;
-  height: 16px;
-  width: 16px;
-  vertical-align: middle;
-  position: relative;
-}
-
-.CodeMirror-lint-message-error, .CodeMirror-lint-message-warning {
-  padding-left: 18px;
-  background-position: top left;
-  background-repeat: no-repeat;
-}
-
-.CodeMirror-lint-marker-error, .CodeMirror-lint-message-error {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAHlBMVEW7AAC7AACxAAC7AAC7AAAAAAC4AAC5AAD///+7AAAUdclpAAAABnRSTlMXnORSiwCK0ZKSAAAATUlEQVR42mWPOQ7AQAgDuQLx/z8csYRmPRIFIwRGnosRrpamvkKi0FTIiMASR3hhKW+hAN6/tIWhu9PDWiTGNEkTtIOucA5Oyr9ckPgAWm0GPBog6v4AAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-warning, .CodeMirror-lint-message-warning {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAANlBMVEX/uwDvrwD/uwD/uwD/uwD/uwD/uwD/uwD/uwD6twD/uwAAAADurwD2tQD7uAD+ugAAAAD/uwDhmeTRAAAADHRSTlMJ8mN1EYcbmiixgACm7WbuAAAAVklEQVR42n3PUQqAIBBFUU1LLc3u/jdbOJoW1P08DA9Gba8+YWJ6gNJoNYIBzAA2chBth5kLmG9YUoG0NHAUwFXwO9LuBQL1giCQb8gC9Oro2vp5rncCIY8L8uEx5ZkAAAAASUVORK5CYII=");
-}
-
-.CodeMirror-lint-marker-multiple {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAMAAADzjKfhAAAACVBMVEUAAAAAAAC/v7914kyHAAAAAXRSTlMAQObYZgAAACNJREFUeNo1ioEJAAAIwmz/H90iFFSGJgFMe3gaLZ0od+9/AQZ0ADosbYraAAAAAElFTkSuQmCC");
-  background-repeat: no-repeat;
-  background-position: right bottom;
-  width: 100%; height: 100%;
-}
diff --git a/www/code/codemirror-5.7/addon/lint/lint.js b/www/code/codemirror-5.7/addon/lint/lint.js
deleted file mode 100644
index 5afe49d0f..000000000
--- a/www/code/codemirror-5.7/addon/lint/lint.js
+++ /dev/null
@@ -1,231 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-  var GUTTER_ID = "CodeMirror-lint-markers";
-
-  function showTooltip(e, content) {
-    var tt = document.createElement("div");
-    tt.className = "CodeMirror-lint-tooltip";
-    tt.appendChild(content.cloneNode(true));
-    document.body.appendChild(tt);
-
-    function position(e) {
-      if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position);
-      tt.style.top = Math.max(0, e.clientY - tt.offsetHeight - 5) + "px";
-      tt.style.left = (e.clientX + 5) + "px";
-    }
-    CodeMirror.on(document, "mousemove", position);
-    position(e);
-    if (tt.style.opacity != null) tt.style.opacity = 1;
-    return tt;
-  }
-  function rm(elt) {
-    if (elt.parentNode) elt.parentNode.removeChild(elt);
-  }
-  function hideTooltip(tt) {
-    if (!tt.parentNode) return;
-    if (tt.style.opacity == null) rm(tt);
-    tt.style.opacity = 0;
-    setTimeout(function() { rm(tt); }, 600);
-  }
-
-  function showTooltipFor(e, content, node) {
-    var tooltip = showTooltip(e, content);
-    function hide() {
-      CodeMirror.off(node, "mouseout", hide);
-      if (tooltip) { hideTooltip(tooltip); tooltip = null; }
-    }
-    var poll = setInterval(function() {
-      if (tooltip) for (var n = node;; n = n.parentNode) {
-        if (n && n.nodeType == 11) n = n.host;
-        if (n == document.body) return;
-        if (!n) { hide(); break; }
-      }
-      if (!tooltip) return clearInterval(poll);
-    }, 400);
-    CodeMirror.on(node, "mouseout", hide);
-  }
-
-  function LintState(cm, options, hasGutter) {
-    this.marked = [];
-    this.options = options;
-    this.timeout = null;
-    this.hasGutter = hasGutter;
-    this.onMouseOver = function(e) { onMouseOver(cm, e); };
-    this.waitingFor = 0
-  }
-
-  function parseOptions(_cm, options) {
-    if (options instanceof Function) return {getAnnotations: options};
-    if (!options || options === true) options = {};
-    return options;
-  }
-
-  function clearMarks(cm) {
-    var state = cm.state.lint;
-    if (state.hasGutter) cm.clearGutter(GUTTER_ID);
-    for (var i = 0; i < state.marked.length; ++i)
-      state.marked[i].clear();
-    state.marked.length = 0;
-  }
-
-  function makeMarker(labels, severity, multiple, tooltips) {
-    var marker = document.createElement("div"), inner = marker;
-    marker.className = "CodeMirror-lint-marker-" + severity;
-    if (multiple) {
-      inner = marker.appendChild(document.createElement("div"));
-      inner.className = "CodeMirror-lint-marker-multiple";
-    }
-
-    if (tooltips != false) CodeMirror.on(inner, "mouseover", function(e) {
-      showTooltipFor(e, labels, inner);
-    });
-
-    return marker;
-  }
-
-  function getMaxSeverity(a, b) {
-    if (a == "error") return a;
-    else return b;
-  }
-
-  function groupByLine(annotations) {
-    var lines = [];
-    for (var i = 0; i < annotations.length; ++i) {
-      var ann = annotations[i], line = ann.from.line;
-      (lines[line] || (lines[line] = [])).push(ann);
-    }
-    return lines;
-  }
-
-  function annotationTooltip(ann) {
-    var severity = ann.severity;
-    if (!severity) severity = "error";
-    var tip = document.createElement("div");
-    tip.className = "CodeMirror-lint-message-" + severity;
-    tip.appendChild(document.createTextNode(ann.message));
-    return tip;
-  }
-
-  function lintAsync(cm, getAnnotations, passOptions) {
-    var state = cm.state.lint
-    var id = ++state.waitingFor
-    function abort() {
-      id = -1
-      cm.off("change", abort)
-    }
-    cm.on("change", abort)
-    getAnnotations(cm.getValue(), function(annotations, arg2) {
-      cm.off("change", abort)
-      if (state.waitingFor != id) return
-      if (arg2 && annotations instanceof CodeMirror) annotations = arg2
-      updateLinting(cm, annotations)
-    }, passOptions, cm);
-  }
-
-  function startLinting(cm) {
-    var state = cm.state.lint, options = state.options;
-    var passOptions = options.options || options; // Support deprecated passing of `options` property in options
-    var getAnnotations = options.getAnnotations || cm.getHelper(CodeMirror.Pos(0, 0), "lint");
-    if (!getAnnotations) return;
-    if (options.async || getAnnotations.async) {
-      lintAsync(cm, getAnnotations, passOptions)
-    } else {
-      updateLinting(cm, getAnnotations(cm.getValue(), passOptions, cm));
-    }
-  }
-
-  function updateLinting(cm, annotationsNotSorted) {
-    clearMarks(cm);
-    var state = cm.state.lint, options = state.options;
-
-    var annotations = groupByLine(annotationsNotSorted);
-
-    for (var line = 0; line < annotations.length; ++line) {
-      var anns = annotations[line];
-      if (!anns) continue;
-
-      var maxSeverity = null;
-      var tipLabel = state.hasGutter && document.createDocumentFragment();
-
-      for (var i = 0; i < anns.length; ++i) {
-        var ann = anns[i];
-        var severity = ann.severity;
-        if (!severity) severity = "error";
-        maxSeverity = getMaxSeverity(maxSeverity, severity);
-
-        if (options.formatAnnotation) ann = options.formatAnnotation(ann);
-        if (state.hasGutter) tipLabel.appendChild(annotationTooltip(ann));
-
-        if (ann.to) state.marked.push(cm.markText(ann.from, ann.to, {
-          className: "CodeMirror-lint-mark-" + severity,
-          __annotation: ann
-        }));
-      }
-
-      if (state.hasGutter)
-        cm.setGutterMarker(line, GUTTER_ID, makeMarker(tipLabel, maxSeverity, anns.length > 1,
-                                                       state.options.tooltips));
-    }
-    if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
-  }
-
-  function onChange(cm) {
-    var state = cm.state.lint;
-    if (!state) return;
-    clearTimeout(state.timeout);
-    state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
-  }
-
-  function popupSpanTooltip(ann, e) {
-    var target = e.target || e.srcElement;
-    showTooltipFor(e, annotationTooltip(ann), target);
-  }
-
-  function onMouseOver(cm, e) {
-    var target = e.target || e.srcElement;
-    if (!/\bCodeMirror-lint-mark-/.test(target.className)) return;
-    var box = target.getBoundingClientRect(), x = (box.left + box.right) / 2, y = (box.top + box.bottom) / 2;
-    var spans = cm.findMarksAt(cm.coordsChar({left: x, top: y}, "client"));
-    for (var i = 0; i < spans.length; ++i) {
-      var ann = spans[i].__annotation;
-      if (ann) return popupSpanTooltip(ann, e);
-    }
-  }
-
-  CodeMirror.defineOption("lint", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      clearMarks(cm);
-      if (cm.state.lint.options.lintOnChange !== false)
-        cm.off("change", onChange);
-      CodeMirror.off(cm.getWrapperElement(), "mouseover", cm.state.lint.onMouseOver);
-      clearTimeout(cm.state.lint.timeout);
-      delete cm.state.lint;
-    }
-
-    if (val) {
-      var gutters = cm.getOption("gutters"), hasLintGutter = false;
-      for (var i = 0; i < gutters.length; ++i) if (gutters[i] == GUTTER_ID) hasLintGutter = true;
-      var state = cm.state.lint = new LintState(cm, parseOptions(cm, val), hasLintGutter);
-      if (state.options.lintOnChange !== false)
-        cm.on("change", onChange);
-      if (state.options.tooltips != false)
-        CodeMirror.on(cm.getWrapperElement(), "mouseover", state.onMouseOver);
-
-      startLinting(cm);
-    }
-  });
-
-  CodeMirror.defineExtension("performLint", function() {
-    if (this.state.lint) startLinting(this);
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/lint/yaml-lint.js b/www/code/codemirror-5.7/addon/lint/yaml-lint.js
deleted file mode 100644
index 3f77e525b..000000000
--- a/www/code/codemirror-5.7/addon/lint/yaml-lint.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-// Depends on js-yaml.js from https://github.com/nodeca/js-yaml
-
-// declare global: jsyaml
-
-CodeMirror.registerHelper("lint", "yaml", function(text) {
-  var found = [];
-  try { jsyaml.load(text); }
-  catch(e) {
-      var loc = e.mark;
-      found.push({ from: CodeMirror.Pos(loc.line, loc.column), to: CodeMirror.Pos(loc.line, loc.column), message: e.message });
-  }
-  return found;
-});
-
-});
diff --git a/www/code/codemirror-5.7/addon/merge/merge.css b/www/code/codemirror-5.7/addon/merge/merge.css
deleted file mode 100644
index a6a80e43e..000000000
--- a/www/code/codemirror-5.7/addon/merge/merge.css
+++ /dev/null
@@ -1,112 +0,0 @@
-.CodeMirror-merge {
-  position: relative;
-  border: 1px solid #ddd;
-  white-space: pre;
-}
-
-.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
-  height: 350px;
-}
-
-.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 47%; }
-.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 6%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
-
-.CodeMirror-merge-pane {
-  display: inline-block;
-  white-space: normal;
-  vertical-align: top;
-}
-.CodeMirror-merge-pane-rightmost {
-  position: absolute;
-  right: 0px;
-  z-index: 1;
-}
-
-.CodeMirror-merge-gap {
-  z-index: 2;
-  display: inline-block;
-  height: 100%;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  overflow: hidden;
-  border-left: 1px solid #ddd;
-  border-right: 1px solid #ddd;
-  position: relative;
-  background: #f8f8f8;
-}
-
-.CodeMirror-merge-scrolllock-wrap {
-  position: absolute;
-  bottom: 0; left: 50%;
-}
-.CodeMirror-merge-scrolllock {
-  position: relative;
-  left: -50%;
-  cursor: pointer;
-  color: #555;
-  line-height: 1;
-}
-
-.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
-  position: absolute;
-  left: 0; top: 0;
-  right: 0; bottom: 0;
-  line-height: 1;
-}
-
-.CodeMirror-merge-copy {
-  position: absolute;
-  cursor: pointer;
-  color: #44c;
-}
-
-.CodeMirror-merge-copy-reverse {
-  position: absolute;
-  cursor: pointer;
-  color: #44c;
-}
-
-.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
-.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
-
-.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
-  background-position: bottom left;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
-  background-position: bottom left;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-chunk { background: #ffffe0; }
-.CodeMirror-merge-r-chunk-start { border-top: 1px solid #ee8; }
-.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #ee8; }
-.CodeMirror-merge-r-connect { fill: #ffffe0; stroke: #ee8; stroke-width: 1px; }
-
-.CodeMirror-merge-l-chunk { background: #eef; }
-.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
-.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
-.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
-
-.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
-.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
-.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
-
-.CodeMirror-merge-collapsed-widget:before {
-  content: "(...)";
-}
-.CodeMirror-merge-collapsed-widget {
-  cursor: pointer;
-  color: #88b;
-  background: #eef;
-  border: 1px solid #ddf;
-  font-size: 90%;
-  padding: 0 3px;
-  border-radius: 4px;
-}
-.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }
diff --git a/www/code/codemirror-5.7/addon/merge/merge.js b/www/code/codemirror-5.7/addon/merge/merge.js
deleted file mode 100644
index e99de0b77..000000000
--- a/www/code/codemirror-5.7/addon/merge/merge.js
+++ /dev/null
@@ -1,775 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// declare global: diff_match_patch, DIFF_INSERT, DIFF_DELETE, DIFF_EQUAL
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("diff_match_patch"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "diff_match_patch"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-  var Pos = CodeMirror.Pos;
-  var svgNS = "http://www.w3.org/2000/svg";
-
-  function DiffView(mv, type) {
-    this.mv = mv;
-    this.type = type;
-    this.classes = type == "left"
-      ? {chunk: "CodeMirror-merge-l-chunk",
-         start: "CodeMirror-merge-l-chunk-start",
-         end: "CodeMirror-merge-l-chunk-end",
-         insert: "CodeMirror-merge-l-inserted",
-         del: "CodeMirror-merge-l-deleted",
-         connect: "CodeMirror-merge-l-connect"}
-      : {chunk: "CodeMirror-merge-r-chunk",
-         start: "CodeMirror-merge-r-chunk-start",
-         end: "CodeMirror-merge-r-chunk-end",
-         insert: "CodeMirror-merge-r-inserted",
-         del: "CodeMirror-merge-r-deleted",
-         connect: "CodeMirror-merge-r-connect"};
-  }
-
-  DiffView.prototype = {
-    constructor: DiffView,
-    init: function(pane, orig, options) {
-      this.edit = this.mv.edit;
-      (this.edit.state.diffViews || (this.edit.state.diffViews = [])).push(this);
-      this.orig = CodeMirror(pane, copyObj({value: orig, readOnly: !this.mv.options.allowEditingOriginals}, copyObj(options)));
-      this.orig.state.diffViews = [this];
-
-      this.diff = getDiff(asString(orig), asString(options.value));
-      this.chunks = getChunks(this.diff);
-      this.diffOutOfDate = this.dealigned = false;
-
-      this.showDifferences = options.showDifferences !== false;
-      this.forceUpdate = registerUpdate(this);
-      setScrollLock(this, true, false);
-      registerScroll(this);
-    },
-    setShowDifferences: function(val) {
-      val = val !== false;
-      if (val != this.showDifferences) {
-        this.showDifferences = val;
-        this.forceUpdate("full");
-      }
-    }
-  };
-
-  function ensureDiff(dv) {
-    if (dv.diffOutOfDate) {
-      dv.diff = getDiff(dv.orig.getValue(), dv.edit.getValue());
-      dv.chunks = getChunks(dv.diff);
-      dv.diffOutOfDate = false;
-      CodeMirror.signal(dv.edit, "updateDiff", dv.diff);
-    }
-  }
-
-  var updating = false;
-  function registerUpdate(dv) {
-    var edit = {from: 0, to: 0, marked: []};
-    var orig = {from: 0, to: 0, marked: []};
-    var debounceChange, updatingFast = false;
-    function update(mode) {
-      updating = true;
-      updatingFast = false;
-      if (mode == "full") {
-        if (dv.svg) clear(dv.svg);
-        if (dv.copyButtons) clear(dv.copyButtons);
-        clearMarks(dv.edit, edit.marked, dv.classes);
-        clearMarks(dv.orig, orig.marked, dv.classes);
-        edit.from = edit.to = orig.from = orig.to = 0;
-      }
-      ensureDiff(dv);
-      if (dv.showDifferences) {
-        updateMarks(dv.edit, dv.diff, edit, DIFF_INSERT, dv.classes);
-        updateMarks(dv.orig, dv.diff, orig, DIFF_DELETE, dv.classes);
-      }
-      makeConnections(dv);
-
-      if (dv.mv.options.connect == "align")
-        alignChunks(dv);
-      updating = false;
-    }
-    function setDealign(fast) {
-      if (updating) return;
-      dv.dealigned = true;
-      set(fast);
-    }
-    function set(fast) {
-      if (updating || updatingFast) return;
-      clearTimeout(debounceChange);
-      if (fast === true) updatingFast = true;
-      debounceChange = setTimeout(update, fast === true ? 20 : 250);
-    }
-    function change(_cm, change) {
-      if (!dv.diffOutOfDate) {
-        dv.diffOutOfDate = true;
-        edit.from = edit.to = orig.from = orig.to = 0;
-      }
-      // Update faster when a line was added/removed
-      setDealign(change.text.length - 1 != change.to.line - change.from.line);
-    }
-    dv.edit.on("change", change);
-    dv.orig.on("change", change);
-    dv.edit.on("markerAdded", setDealign);
-    dv.edit.on("markerCleared", setDealign);
-    dv.orig.on("markerAdded", setDealign);
-    dv.orig.on("markerCleared", setDealign);
-    dv.edit.on("viewportChange", function() { set(false); });
-    dv.orig.on("viewportChange", function() { set(false); });
-    update();
-    return update;
-  }
-
-  function registerScroll(dv) {
-    dv.edit.on("scroll", function() {
-      syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
-    });
-    dv.orig.on("scroll", function() {
-      syncScroll(dv, DIFF_DELETE) && makeConnections(dv);
-    });
-  }
-
-  function syncScroll(dv, type) {
-    // Change handler will do a refresh after a timeout when diff is out of date
-    if (dv.diffOutOfDate) return false;
-    if (!dv.lockScroll) return true;
-    var editor, other, now = +new Date;
-    if (type == DIFF_INSERT) { editor = dv.edit; other = dv.orig; }
-    else { editor = dv.orig; other = dv.edit; }
-    // Don't take action if the position of this editor was recently set
-    // (to prevent feedback loops)
-    if (editor.state.scrollSetBy == dv && (editor.state.scrollSetAt || 0) + 50 > now) return false;
-
-    var sInfo = editor.getScrollInfo();
-    if (dv.mv.options.connect == "align") {
-      targetPos = sInfo.top;
-    } else {
-      var halfScreen = .5 * sInfo.clientHeight, midY = sInfo.top + halfScreen;
-      var mid = editor.lineAtHeight(midY, "local");
-      var around = chunkBoundariesAround(dv.chunks, mid, type == DIFF_INSERT);
-      var off = getOffsets(editor, type == DIFF_INSERT ? around.edit : around.orig);
-      var offOther = getOffsets(other, type == DIFF_INSERT ? around.orig : around.edit);
-      var ratio = (midY - off.top) / (off.bot - off.top);
-      var targetPos = (offOther.top - halfScreen) + ratio * (offOther.bot - offOther.top);
-
-      var botDist, mix;
-      // Some careful tweaking to make sure no space is left out of view
-      // when scrolling to top or bottom.
-      if (targetPos > sInfo.top && (mix = sInfo.top / halfScreen) < 1) {
-        targetPos = targetPos * mix + sInfo.top * (1 - mix);
-      } else if ((botDist = sInfo.height - sInfo.clientHeight - sInfo.top) < halfScreen) {
-        var otherInfo = other.getScrollInfo();
-        var botDistOther = otherInfo.height - otherInfo.clientHeight - targetPos;
-        if (botDistOther > botDist && (mix = botDist / halfScreen) < 1)
-          targetPos = targetPos * mix + (otherInfo.height - otherInfo.clientHeight - botDist) * (1 - mix);
-      }
-    }
-
-    other.scrollTo(sInfo.left, targetPos);
-    other.state.scrollSetAt = now;
-    other.state.scrollSetBy = dv;
-    return true;
-  }
-
-  function getOffsets(editor, around) {
-    var bot = around.after;
-    if (bot == null) bot = editor.lastLine() + 1;
-    return {top: editor.heightAtLine(around.before || 0, "local"),
-            bot: editor.heightAtLine(bot, "local")};
-  }
-
-  function setScrollLock(dv, val, action) {
-    dv.lockScroll = val;
-    if (val && action != false) syncScroll(dv, DIFF_INSERT) && makeConnections(dv);
-    dv.lockButton.innerHTML = val ? "\u21db\u21da" : "\u21db  \u21da";
-  }
-
-  // Updating the marks for editor content
-
-  function clearMarks(editor, arr, classes) {
-    for (var i = 0; i < arr.length; ++i) {
-      var mark = arr[i];
-      if (mark instanceof CodeMirror.TextMarker) {
-        mark.clear();
-      } else if (mark.parent) {
-        editor.removeLineClass(mark, "background", classes.chunk);
-        editor.removeLineClass(mark, "background", classes.start);
-        editor.removeLineClass(mark, "background", classes.end);
-      }
-    }
-    arr.length = 0;
-  }
-
-  // FIXME maybe add a margin around viewport to prevent too many updates
-  function updateMarks(editor, diff, state, type, classes) {
-    var vp = editor.getViewport();
-    editor.operation(function() {
-      if (state.from == state.to || vp.from - state.to > 20 || state.from - vp.to > 20) {
-        clearMarks(editor, state.marked, classes);
-        markChanges(editor, diff, type, state.marked, vp.from, vp.to, classes);
-        state.from = vp.from; state.to = vp.to;
-      } else {
-        if (vp.from < state.from) {
-          markChanges(editor, diff, type, state.marked, vp.from, state.from, classes);
-          state.from = vp.from;
-        }
-        if (vp.to > state.to) {
-          markChanges(editor, diff, type, state.marked, state.to, vp.to, classes);
-          state.to = vp.to;
-        }
-      }
-    });
-  }
-
-  function markChanges(editor, diff, type, marks, from, to, classes) {
-    var pos = Pos(0, 0);
-    var top = Pos(from, 0), bot = editor.clipPos(Pos(to - 1));
-    var cls = type == DIFF_DELETE ? classes.del : classes.insert;
-    function markChunk(start, end) {
-      var bfrom = Math.max(from, start), bto = Math.min(to, end);
-      for (var i = bfrom; i < bto; ++i) {
-        var line = editor.addLineClass(i, "background", classes.chunk);
-        if (i == start) editor.addLineClass(line, "background", classes.start);
-        if (i == end - 1) editor.addLineClass(line, "background", classes.end);
-        marks.push(line);
-      }
-      // When the chunk is empty, make sure a horizontal line shows up
-      if (start == end && bfrom == end && bto == end) {
-        if (bfrom)
-          marks.push(editor.addLineClass(bfrom - 1, "background", classes.end));
-        else
-          marks.push(editor.addLineClass(bfrom, "background", classes.start));
-      }
-    }
-
-    var chunkStart = 0;
-    for (var i = 0; i < diff.length; ++i) {
-      var part = diff[i], tp = part[0], str = part[1];
-      if (tp == DIFF_EQUAL) {
-        var cleanFrom = pos.line + (startOfLineClean(diff, i) ? 0 : 1);
-        moveOver(pos, str);
-        var cleanTo = pos.line + (endOfLineClean(diff, i) ? 1 : 0);
-        if (cleanTo > cleanFrom) {
-          if (i) markChunk(chunkStart, cleanFrom);
-          chunkStart = cleanTo;
-        }
-      } else {
-        if (tp == type) {
-          var end = moveOver(pos, str, true);
-          var a = posMax(top, pos), b = posMin(bot, end);
-          if (!posEq(a, b))
-            marks.push(editor.markText(a, b, {className: cls}));
-          pos = end;
-        }
-      }
-    }
-    if (chunkStart <= pos.line) markChunk(chunkStart, pos.line + 1);
-  }
-
-  // Updating the gap between editor and original
-
-  function makeConnections(dv) {
-    if (!dv.showDifferences) return;
-
-    if (dv.svg) {
-      clear(dv.svg);
-      var w = dv.gap.offsetWidth;
-      attrs(dv.svg, "width", w, "height", dv.gap.offsetHeight);
-    }
-    if (dv.copyButtons) clear(dv.copyButtons);
-
-    var vpEdit = dv.edit.getViewport(), vpOrig = dv.orig.getViewport();
-    var sTopEdit = dv.edit.getScrollInfo().top, sTopOrig = dv.orig.getScrollInfo().top;
-    for (var i = 0; i < dv.chunks.length; i++) {
-      var ch = dv.chunks[i];
-      if (ch.editFrom <= vpEdit.to && ch.editTo >= vpEdit.from &&
-          ch.origFrom <= vpOrig.to && ch.origTo >= vpOrig.from)
-        drawConnectorsForChunk(dv, ch, sTopOrig, sTopEdit, w);
-    }
-  }
-
-  function getMatchingOrigLine(editLine, chunks) {
-    var editStart = 0, origStart = 0;
-    for (var i = 0; i < chunks.length; i++) {
-      var chunk = chunks[i];
-      if (chunk.editTo > editLine && chunk.editFrom <= editLine) return null;
-      if (chunk.editFrom > editLine) break;
-      editStart = chunk.editTo;
-      origStart = chunk.origTo;
-    }
-    return origStart + (editLine - editStart);
-  }
-
-  function findAlignedLines(dv, other) {
-    var linesToAlign = [];
-    for (var i = 0; i < dv.chunks.length; i++) {
-      var chunk = dv.chunks[i];
-      linesToAlign.push([chunk.origTo, chunk.editTo, other ? getMatchingOrigLine(chunk.editTo, other.chunks) : null]);
-    }
-    if (other) {
-      for (var i = 0; i < other.chunks.length; i++) {
-        var chunk = other.chunks[i];
-        for (var j = 0; j < linesToAlign.length; j++) {
-          var align = linesToAlign[j];
-          if (align[1] == chunk.editTo) {
-            j = -1;
-            break;
-          } else if (align[1] > chunk.editTo) {
-            break;
-          }
-        }
-        if (j > -1)
-          linesToAlign.splice(j - 1, 0, [getMatchingOrigLine(chunk.editTo, dv.chunks), chunk.editTo, chunk.origTo]);
-      }
-    }
-    return linesToAlign;
-  }
-
-  function alignChunks(dv, force) {
-    if (!dv.dealigned && !force) return;
-    if (!dv.orig.curOp) return dv.orig.operation(function() {
-      alignChunks(dv, force);
-    });
-
-    dv.dealigned = false;
-    var other = dv.mv.left == dv ? dv.mv.right : dv.mv.left;
-    if (other) {
-      ensureDiff(other);
-      other.dealigned = false;
-    }
-    var linesToAlign = findAlignedLines(dv, other);
-
-    // Clear old aligners
-    var aligners = dv.mv.aligners;
-    for (var i = 0; i < aligners.length; i++)
-      aligners[i].clear();
-    aligners.length = 0;
-
-    var cm = [dv.orig, dv.edit], scroll = [];
-    if (other) cm.push(other.orig);
-    for (var i = 0; i < cm.length; i++)
-      scroll.push(cm[i].getScrollInfo().top);
-
-    for (var ln = 0; ln < linesToAlign.length; ln++)
-      alignLines(cm, linesToAlign[ln], aligners);
-
-    for (var i = 0; i < cm.length; i++)
-      cm[i].scrollTo(null, scroll[i]);
-  }
-
-  function alignLines(cm, lines, aligners) {
-    var maxOffset = 0, offset = [];
-    for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
-      var off = cm[i].heightAtLine(lines[i], "local");
-      offset[i] = off;
-      maxOffset = Math.max(maxOffset, off);
-    }
-    for (var i = 0; i < cm.length; i++) if (lines[i] != null) {
-      var diff = maxOffset - offset[i];
-      if (diff > 1)
-        aligners.push(padAbove(cm[i], lines[i], diff));
-    }
-  }
-
-  function padAbove(cm, line, size) {
-    var above = true;
-    if (line > cm.lastLine()) {
-      line--;
-      above = false;
-    }
-    var elt = document.createElement("div");
-    elt.className = "CodeMirror-merge-spacer";
-    elt.style.height = size + "px"; elt.style.minWidth = "1px";
-    return cm.addLineWidget(line, elt, {height: size, above: above});
-  }
-
-  function drawConnectorsForChunk(dv, chunk, sTopOrig, sTopEdit, w) {
-    var flip = dv.type == "left";
-    var top = dv.orig.heightAtLine(chunk.origFrom, "local") - sTopOrig;
-    if (dv.svg) {
-      var topLpx = top;
-      var topRpx = dv.edit.heightAtLine(chunk.editFrom, "local") - sTopEdit;
-      if (flip) { var tmp = topLpx; topLpx = topRpx; topRpx = tmp; }
-      var botLpx = dv.orig.heightAtLine(chunk.origTo, "local") - sTopOrig;
-      var botRpx = dv.edit.heightAtLine(chunk.editTo, "local") - sTopEdit;
-      if (flip) { var tmp = botLpx; botLpx = botRpx; botRpx = tmp; }
-      var curveTop = " C " + w/2 + " " + topRpx + " " + w/2 + " " + topLpx + " " + (w + 2) + " " + topLpx;
-      var curveBot = " C " + w/2 + " " + botLpx + " " + w/2 + " " + botRpx + " -1 " + botRpx;
-      attrs(dv.svg.appendChild(document.createElementNS(svgNS, "path")),
-            "d", "M -1 " + topRpx + curveTop + " L " + (w + 2) + " " + botLpx + curveBot + " z",
-            "class", dv.classes.connect);
-    }
-    if (dv.copyButtons) {
-      var copy = dv.copyButtons.appendChild(elt("div", dv.type == "left" ? "\u21dd" : "\u21dc",
-                                                "CodeMirror-merge-copy"));
-      var editOriginals = dv.mv.options.allowEditingOriginals;
-      copy.title = editOriginals ? "Push to left" : "Revert chunk";
-      copy.chunk = chunk;
-      copy.style.top = top + "px";
-
-      if (editOriginals) {
-        var topReverse = dv.orig.heightAtLine(chunk.editFrom, "local") - sTopEdit;
-        var copyReverse = dv.copyButtons.appendChild(elt("div", dv.type == "right" ? "\u21dd" : "\u21dc",
-                                                         "CodeMirror-merge-copy-reverse"));
-        copyReverse.title = "Push to right";
-        copyReverse.chunk = {editFrom: chunk.origFrom, editTo: chunk.origTo,
-                             origFrom: chunk.editFrom, origTo: chunk.editTo};
-        copyReverse.style.top = topReverse + "px";
-        dv.type == "right" ? copyReverse.style.left = "2px" : copyReverse.style.right = "2px";
-      }
-    }
-  }
-
-  function copyChunk(dv, to, from, chunk) {
-    if (dv.diffOutOfDate) return;
-    to.replaceRange(from.getRange(Pos(chunk.origFrom, 0), Pos(chunk.origTo, 0)),
-                         Pos(chunk.editFrom, 0), Pos(chunk.editTo, 0));
-  }
-
-  // Merge view, containing 0, 1, or 2 diff views.
-
-  var MergeView = CodeMirror.MergeView = function(node, options) {
-    if (!(this instanceof MergeView)) return new MergeView(node, options);
-
-    this.options = options;
-    var origLeft = options.origLeft, origRight = options.origRight == null ? options.orig : options.origRight;
-
-    var hasLeft = origLeft != null, hasRight = origRight != null;
-    var panes = 1 + (hasLeft ? 1 : 0) + (hasRight ? 1 : 0);
-    var wrap = [], left = this.left = null, right = this.right = null;
-    var self = this;
-
-    if (hasLeft) {
-      left = this.left = new DiffView(this, "left");
-      var leftPane = elt("div", null, "CodeMirror-merge-pane");
-      wrap.push(leftPane);
-      wrap.push(buildGap(left));
-    }
-
-    var editPane = elt("div", null, "CodeMirror-merge-pane");
-    wrap.push(editPane);
-
-    if (hasRight) {
-      right = this.right = new DiffView(this, "right");
-      wrap.push(buildGap(right));
-      var rightPane = elt("div", null, "CodeMirror-merge-pane");
-      wrap.push(rightPane);
-    }
-
-    (hasRight ? rightPane : editPane).className += " CodeMirror-merge-pane-rightmost";
-
-    wrap.push(elt("div", null, null, "height: 0; clear: both;"));
-
-    var wrapElt = this.wrap = node.appendChild(elt("div", wrap, "CodeMirror-merge CodeMirror-merge-" + panes + "pane"));
-    this.edit = CodeMirror(editPane, copyObj(options));
-
-    if (left) left.init(leftPane, origLeft, options);
-    if (right) right.init(rightPane, origRight, options);
-
-    if (options.collapseIdentical) {
-      updating = true;
-      this.editor().operation(function() {
-        collapseIdenticalStretches(self, options.collapseIdentical);
-      });
-      updating = false;
-    }
-    if (options.connect == "align") {
-      this.aligners = [];
-      alignChunks(this.left || this.right, true);
-    }
-
-    var onResize = function() {
-      if (left) makeConnections(left);
-      if (right) makeConnections(right);
-    };
-    CodeMirror.on(window, "resize", onResize);
-    var resizeInterval = setInterval(function() {
-      for (var p = wrapElt.parentNode; p && p != document.body; p = p.parentNode) {}
-      if (!p) { clearInterval(resizeInterval); CodeMirror.off(window, "resize", onResize); }
-    }, 5000);
-  };
-
-  function buildGap(dv) {
-    var lock = dv.lockButton = elt("div", null, "CodeMirror-merge-scrolllock");
-    lock.title = "Toggle locked scrolling";
-    var lockWrap = elt("div", [lock], "CodeMirror-merge-scrolllock-wrap");
-    CodeMirror.on(lock, "click", function() { setScrollLock(dv, !dv.lockScroll); });
-    var gapElts = [lockWrap];
-    if (dv.mv.options.revertButtons !== false) {
-      dv.copyButtons = elt("div", null, "CodeMirror-merge-copybuttons-" + dv.type);
-      CodeMirror.on(dv.copyButtons, "click", function(e) {
-        var node = e.target || e.srcElement;
-        if (!node.chunk) return;
-        if (node.className == "CodeMirror-merge-copy-reverse") {
-          copyChunk(dv, dv.orig, dv.edit, node.chunk);
-          return;
-        }
-        copyChunk(dv, dv.edit, dv.orig, node.chunk);
-      });
-      gapElts.unshift(dv.copyButtons);
-    }
-    if (dv.mv.options.connect != "align") {
-      var svg = document.createElementNS && document.createElementNS(svgNS, "svg");
-      if (svg && !svg.createSVGRect) svg = null;
-      dv.svg = svg;
-      if (svg) gapElts.push(svg);
-    }
-
-    return dv.gap = elt("div", gapElts, "CodeMirror-merge-gap");
-  }
-
-  MergeView.prototype = {
-    constuctor: MergeView,
-    editor: function() { return this.edit; },
-    rightOriginal: function() { return this.right && this.right.orig; },
-    leftOriginal: function() { return this.left && this.left.orig; },
-    setShowDifferences: function(val) {
-      if (this.right) this.right.setShowDifferences(val);
-      if (this.left) this.left.setShowDifferences(val);
-    },
-    rightChunks: function() {
-      if (this.right) { ensureDiff(this.right); return this.right.chunks; }
-    },
-    leftChunks: function() {
-      if (this.left) { ensureDiff(this.left); return this.left.chunks; }
-    }
-  };
-
-  function asString(obj) {
-    if (typeof obj == "string") return obj;
-    else return obj.getValue();
-  }
-
-  // Operations on diffs
-
-  var dmp = new diff_match_patch();
-  function getDiff(a, b) {
-    var diff = dmp.diff_main(a, b);
-    dmp.diff_cleanupSemantic(diff);
-    // The library sometimes leaves in empty parts, which confuse the algorithm
-    for (var i = 0; i < diff.length; ++i) {
-      var part = diff[i];
-      if (!part[1]) {
-        diff.splice(i--, 1);
-      } else if (i && diff[i - 1][0] == part[0]) {
-        diff.splice(i--, 1);
-        diff[i][1] += part[1];
-      }
-    }
-    return diff;
-  }
-
-  function getChunks(diff) {
-    var chunks = [];
-    var startEdit = 0, startOrig = 0;
-    var edit = Pos(0, 0), orig = Pos(0, 0);
-    for (var i = 0; i < diff.length; ++i) {
-      var part = diff[i], tp = part[0];
-      if (tp == DIFF_EQUAL) {
-        var startOff = startOfLineClean(diff, i) ? 0 : 1;
-        var cleanFromEdit = edit.line + startOff, cleanFromOrig = orig.line + startOff;
-        moveOver(edit, part[1], null, orig);
-        var endOff = endOfLineClean(diff, i) ? 1 : 0;
-        var cleanToEdit = edit.line + endOff, cleanToOrig = orig.line + endOff;
-        if (cleanToEdit > cleanFromEdit) {
-          if (i) chunks.push({origFrom: startOrig, origTo: cleanFromOrig,
-                              editFrom: startEdit, editTo: cleanFromEdit});
-          startEdit = cleanToEdit; startOrig = cleanToOrig;
-        }
-      } else {
-        moveOver(tp == DIFF_INSERT ? edit : orig, part[1]);
-      }
-    }
-    if (startEdit <= edit.line || startOrig <= orig.line)
-      chunks.push({origFrom: startOrig, origTo: orig.line + 1,
-                   editFrom: startEdit, editTo: edit.line + 1});
-    return chunks;
-  }
-
-  function endOfLineClean(diff, i) {
-    if (i == diff.length - 1) return true;
-    var next = diff[i + 1][1];
-    if (next.length == 1 || next.charCodeAt(0) != 10) return false;
-    if (i == diff.length - 2) return true;
-    next = diff[i + 2][1];
-    return next.length > 1 && next.charCodeAt(0) == 10;
-  }
-
-  function startOfLineClean(diff, i) {
-    if (i == 0) return true;
-    var last = diff[i - 1][1];
-    if (last.charCodeAt(last.length - 1) != 10) return false;
-    if (i == 1) return true;
-    last = diff[i - 2][1];
-    return last.charCodeAt(last.length - 1) == 10;
-  }
-
-  function chunkBoundariesAround(chunks, n, nInEdit) {
-    var beforeE, afterE, beforeO, afterO;
-    for (var i = 0; i < chunks.length; i++) {
-      var chunk = chunks[i];
-      var fromLocal = nInEdit ? chunk.editFrom : chunk.origFrom;
-      var toLocal = nInEdit ? chunk.editTo : chunk.origTo;
-      if (afterE == null) {
-        if (fromLocal > n) { afterE = chunk.editFrom; afterO = chunk.origFrom; }
-        else if (toLocal > n) { afterE = chunk.editTo; afterO = chunk.origTo; }
-      }
-      if (toLocal <= n) { beforeE = chunk.editTo; beforeO = chunk.origTo; }
-      else if (fromLocal <= n) { beforeE = chunk.editFrom; beforeO = chunk.origFrom; }
-    }
-    return {edit: {before: beforeE, after: afterE}, orig: {before: beforeO, after: afterO}};
-  }
-
-  function collapseSingle(cm, from, to) {
-    cm.addLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
-    var widget = document.createElement("span");
-    widget.className = "CodeMirror-merge-collapsed-widget";
-    widget.title = "Identical text collapsed. Click to expand.";
-    var mark = cm.markText(Pos(from, 0), Pos(to - 1), {
-      inclusiveLeft: true,
-      inclusiveRight: true,
-      replacedWith: widget,
-      clearOnEnter: true
-    });
-    function clear() {
-      mark.clear();
-      cm.removeLineClass(from, "wrap", "CodeMirror-merge-collapsed-line");
-    }
-    widget.addEventListener("click", clear);
-    return {mark: mark, clear: clear};
-  }
-
-  function collapseStretch(size, editors) {
-    var marks = [];
-    function clear() {
-      for (var i = 0; i < marks.length; i++) marks[i].clear();
-    }
-    for (var i = 0; i < editors.length; i++) {
-      var editor = editors[i];
-      var mark = collapseSingle(editor.cm, editor.line, editor.line + size);
-      marks.push(mark);
-      mark.mark.on("clear", clear);
-    }
-    return marks[0].mark;
-  }
-
-  function unclearNearChunks(dv, margin, off, clear) {
-    for (var i = 0; i < dv.chunks.length; i++) {
-      var chunk = dv.chunks[i];
-      for (var l = chunk.editFrom - margin; l < chunk.editTo + margin; l++) {
-        var pos = l + off;
-        if (pos >= 0 && pos < clear.length) clear[pos] = false;
-      }
-    }
-  }
-
-  function collapseIdenticalStretches(mv, margin) {
-    if (typeof margin != "number") margin = 2;
-    var clear = [], edit = mv.editor(), off = edit.firstLine();
-    for (var l = off, e = edit.lastLine(); l <= e; l++) clear.push(true);
-    if (mv.left) unclearNearChunks(mv.left, margin, off, clear);
-    if (mv.right) unclearNearChunks(mv.right, margin, off, clear);
-
-    for (var i = 0; i < clear.length; i++) {
-      if (clear[i]) {
-        var line = i + off;
-        for (var size = 1; i < clear.length - 1 && clear[i + 1]; i++, size++) {}
-        if (size > margin) {
-          var editors = [{line: line, cm: edit}];
-          if (mv.left) editors.push({line: getMatchingOrigLine(line, mv.left.chunks), cm: mv.left.orig});
-          if (mv.right) editors.push({line: getMatchingOrigLine(line, mv.right.chunks), cm: mv.right.orig});
-          var mark = collapseStretch(size, editors);
-          if (mv.options.onCollapse) mv.options.onCollapse(mv, line, size, mark);
-        }
-      }
-    }
-  }
-
-  // General utilities
-
-  function elt(tag, content, className, style) {
-    var e = document.createElement(tag);
-    if (className) e.className = className;
-    if (style) e.style.cssText = style;
-    if (typeof content == "string") e.appendChild(document.createTextNode(content));
-    else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
-    return e;
-  }
-
-  function clear(node) {
-    for (var count = node.childNodes.length; count > 0; --count)
-      node.removeChild(node.firstChild);
-  }
-
-  function attrs(elt) {
-    for (var i = 1; i < arguments.length; i += 2)
-      elt.setAttribute(arguments[i], arguments[i+1]);
-  }
-
-  function copyObj(obj, target) {
-    if (!target) target = {};
-    for (var prop in obj) if (obj.hasOwnProperty(prop)) target[prop] = obj[prop];
-    return target;
-  }
-
-  function moveOver(pos, str, copy, other) {
-    var out = copy ? Pos(pos.line, pos.ch) : pos, at = 0;
-    for (;;) {
-      var nl = str.indexOf("\n", at);
-      if (nl == -1) break;
-      ++out.line;
-      if (other) ++other.line;
-      at = nl + 1;
-    }
-    out.ch = (at ? 0 : out.ch) + (str.length - at);
-    if (other) other.ch = (at ? 0 : other.ch) + (str.length - at);
-    return out;
-  }
-
-  function posMin(a, b) { return (a.line - b.line || a.ch - b.ch) < 0 ? a : b; }
-  function posMax(a, b) { return (a.line - b.line || a.ch - b.ch) > 0 ? a : b; }
-  function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
-
-  function findPrevDiff(chunks, start, isOrig) {
-    for (var i = chunks.length - 1; i >= 0; i--) {
-      var chunk = chunks[i];
-      var to = (isOrig ? chunk.origTo : chunk.editTo) - 1;
-      if (to < start) return to;
-    }
-  }
-
-  function findNextDiff(chunks, start, isOrig) {
-    for (var i = 0; i < chunks.length; i++) {
-      var chunk = chunks[i];
-      var from = (isOrig ? chunk.origFrom : chunk.editFrom);
-      if (from > start) return from;
-    }
-  }
-
-  function goNearbyDiff(cm, dir) {
-    var found = null, views = cm.state.diffViews, line = cm.getCursor().line;
-    if (views) for (var i = 0; i < views.length; i++) {
-      var dv = views[i], isOrig = cm == dv.orig;
-      ensureDiff(dv);
-      var pos = dir < 0 ? findPrevDiff(dv.chunks, line, isOrig) : findNextDiff(dv.chunks, line, isOrig);
-      if (pos != null && (found == null || (dir < 0 ? pos > found : pos < found)))
-        found = pos;
-    }
-    if (found != null)
-      cm.setCursor(found, 0);
-    else
-      return CodeMirror.Pass;
-  }
-
-  CodeMirror.commands.goNextDiff = function(cm) {
-    return goNearbyDiff(cm, 1);
-  };
-  CodeMirror.commands.goPrevDiff = function(cm) {
-    return goNearbyDiff(cm, -1);
-  };
-});
diff --git a/www/code/codemirror-5.7/addon/mode/loadmode.js b/www/code/codemirror-5.7/addon/mode/loadmode.js
deleted file mode 100644
index 10117ec22..000000000
--- a/www/code/codemirror-5.7/addon/mode/loadmode.js
+++ /dev/null
@@ -1,64 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), "cjs");
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], function(CM) { mod(CM, "amd"); });
-  else // Plain browser env
-    mod(CodeMirror, "plain");
-})(function(CodeMirror, env) {
-  if (!CodeMirror.modeURL) CodeMirror.modeURL = "../mode/%N/%N.js";
-
-  var loading = {};
-  function splitCallback(cont, n) {
-    var countDown = n;
-    return function() { if (--countDown == 0) cont(); };
-  }
-  function ensureDeps(mode, cont) {
-    var deps = CodeMirror.modes[mode].dependencies;
-    if (!deps) return cont();
-    var missing = [];
-    for (var i = 0; i < deps.length; ++i) {
-      if (!CodeMirror.modes.hasOwnProperty(deps[i]))
-        missing.push(deps[i]);
-    }
-    if (!missing.length) return cont();
-    var split = splitCallback(cont, missing.length);
-    for (var i = 0; i < missing.length; ++i)
-      CodeMirror.requireMode(missing[i], split);
-  }
-
-  CodeMirror.requireMode = function(mode, cont) {
-    if (typeof mode != "string") mode = mode.name;
-    if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);
-    if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);
-
-    var file = CodeMirror.modeURL.replace(/%N/g, mode);
-    if (env == "plain") {
-      var script = document.createElement("script");
-      script.src = file;
-      var others = document.getElementsByTagName("script")[0];
-      var list = loading[mode] = [cont];
-      CodeMirror.on(script, "load", function() {
-        ensureDeps(mode, function() {
-          for (var i = 0; i < list.length; ++i) list[i]();
-        });
-      });
-      others.parentNode.insertBefore(script, others);
-    } else if (env == "cjs") {
-      require(file);
-      cont();
-    } else if (env == "amd") {
-      requirejs([file], cont);
-    }
-  };
-
-  CodeMirror.autoLoadMode = function(instance, mode) {
-    if (!CodeMirror.modes.hasOwnProperty(mode))
-      CodeMirror.requireMode(mode, function() {
-        instance.setOption("mode", instance.getOption("mode"));
-      });
-  };
-});
diff --git a/www/code/codemirror-5.7/addon/mode/multiplex.js b/www/code/codemirror-5.7/addon/mode/multiplex.js
deleted file mode 100644
index fe48c7fbd..000000000
--- a/www/code/codemirror-5.7/addon/mode/multiplex.js
+++ /dev/null
@@ -1,123 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.multiplexingMode = function(outer /*, others */) {
-  // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
-  var others = Array.prototype.slice.call(arguments, 1);
-
-  function indexOf(string, pattern, from, returnEnd) {
-    if (typeof pattern == "string") {
-      var found = string.indexOf(pattern, from);
-      return returnEnd && found > -1 ? found + pattern.length : found;
-    }
-    var m = pattern.exec(from ? string.slice(from) : string);
-    return m ? m.index + from + (returnEnd ? m[0].length : 0) : -1;
-  }
-
-  return {
-    startState: function() {
-      return {
-        outer: CodeMirror.startState(outer),
-        innerActive: null,
-        inner: null
-      };
-    },
-
-    copyState: function(state) {
-      return {
-        outer: CodeMirror.copyState(outer, state.outer),
-        innerActive: state.innerActive,
-        inner: state.innerActive && CodeMirror.copyState(state.innerActive.mode, state.inner)
-      };
-    },
-
-    token: function(stream, state) {
-      if (!state.innerActive) {
-        var cutOff = Infinity, oldContent = stream.string;
-        for (var i = 0; i < others.length; ++i) {
-          var other = others[i];
-          var found = indexOf(oldContent, other.open, stream.pos);
-          if (found == stream.pos) {
-            if (!other.parseDelimiters) stream.match(other.open);
-            state.innerActive = other;
-            state.inner = CodeMirror.startState(other.mode, outer.indent ? outer.indent(state.outer, "") : 0);
-            return other.delimStyle;
-          } else if (found != -1 && found < cutOff) {
-            cutOff = found;
-          }
-        }
-        if (cutOff != Infinity) stream.string = oldContent.slice(0, cutOff);
-        var outerToken = outer.token(stream, state.outer);
-        if (cutOff != Infinity) stream.string = oldContent;
-        return outerToken;
-      } else {
-        var curInner = state.innerActive, oldContent = stream.string;
-        if (!curInner.close && stream.sol()) {
-          state.innerActive = state.inner = null;
-          return this.token(stream, state);
-        }
-        var found = curInner.close ? indexOf(oldContent, curInner.close, stream.pos, curInner.parseDelimiters) : -1;
-        if (found == stream.pos && !curInner.parseDelimiters) {
-          stream.match(curInner.close);
-          state.innerActive = state.inner = null;
-          return curInner.delimStyle;
-        }
-        if (found > -1) stream.string = oldContent.slice(0, found);
-        var innerToken = curInner.mode.token(stream, state.inner);
-        if (found > -1) stream.string = oldContent;
-
-        if (found == stream.pos && curInner.parseDelimiters)
-          state.innerActive = state.inner = null;
-
-        if (curInner.innerStyle) {
-          if (innerToken) innerToken = innerToken + ' ' + curInner.innerStyle;
-          else innerToken = curInner.innerStyle;
-        }
-
-        return innerToken;
-      }
-    },
-
-    indent: function(state, textAfter) {
-      var mode = state.innerActive ? state.innerActive.mode : outer;
-      if (!mode.indent) return CodeMirror.Pass;
-      return mode.indent(state.innerActive ? state.inner : state.outer, textAfter);
-    },
-
-    blankLine: function(state) {
-      var mode = state.innerActive ? state.innerActive.mode : outer;
-      if (mode.blankLine) {
-        mode.blankLine(state.innerActive ? state.inner : state.outer);
-      }
-      if (!state.innerActive) {
-        for (var i = 0; i < others.length; ++i) {
-          var other = others[i];
-          if (other.open === "\n") {
-            state.innerActive = other;
-            state.inner = CodeMirror.startState(other.mode, mode.indent ? mode.indent(state.outer, "") : 0);
-          }
-        }
-      } else if (state.innerActive.close === "\n") {
-        state.innerActive = state.inner = null;
-      }
-    },
-
-    electricChars: outer.electricChars,
-
-    innerMode: function(state) {
-      return state.inner ? {state: state.inner, mode: state.innerActive.mode} : {state: state.outer, mode: outer};
-    }
-  };
-};
-
-});
diff --git a/www/code/codemirror-5.7/addon/mode/multiplex_test.js b/www/code/codemirror-5.7/addon/mode/multiplex_test.js
deleted file mode 100644
index d33943420..000000000
--- a/www/code/codemirror-5.7/addon/mode/multiplex_test.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  CodeMirror.defineMode("markdown_with_stex", function(){
-    var inner = CodeMirror.getMode({}, "stex");
-    var outer = CodeMirror.getMode({}, "markdown");
-
-    var innerOptions = {
-      open: '$',
-      close: '$',
-      mode: inner,
-      delimStyle: 'delim',
-      innerStyle: 'inner'
-    };
-
-    return CodeMirror.multiplexingMode(outer, innerOptions);
-  });
-
-  var mode = CodeMirror.getMode({}, "markdown_with_stex");
-
-  function MT(name) {
-    test.mode(
-      name,
-      mode,
-      Array.prototype.slice.call(arguments, 1),
-      'multiplexing');
-  }
-
-  MT(
-    "stexInsideMarkdown",
-    "[strong **Equation:**] [delim $][inner&tag \\pi][delim $]");
-})();
diff --git a/www/code/codemirror-5.7/addon/mode/overlay.js b/www/code/codemirror-5.7/addon/mode/overlay.js
deleted file mode 100644
index e1b9ed375..000000000
--- a/www/code/codemirror-5.7/addon/mode/overlay.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Utility function that allows modes to be combined. The mode given
-// as the base argument takes care of most of the normal mode
-// functionality, but a second (typically simple) mode is used, which
-// can override the style of text. Both modes get to parse all of the
-// text, but when both assign a non-null style to a piece of code, the
-// overlay wins, unless the combine argument was true and not overridden,
-// or state.overlay.combineTokens was true, in which case the styles are
-// combined.
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.overlayMode = function(base, overlay, combine) {
-  return {
-    startState: function() {
-      return {
-        base: CodeMirror.startState(base),
-        overlay: CodeMirror.startState(overlay),
-        basePos: 0, baseCur: null,
-        overlayPos: 0, overlayCur: null,
-        streamSeen: null
-      };
-    },
-    copyState: function(state) {
-      return {
-        base: CodeMirror.copyState(base, state.base),
-        overlay: CodeMirror.copyState(overlay, state.overlay),
-        basePos: state.basePos, baseCur: null,
-        overlayPos: state.overlayPos, overlayCur: null
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream != state.streamSeen ||
-          Math.min(state.basePos, state.overlayPos) < stream.start) {
-        state.streamSeen = stream;
-        state.basePos = state.overlayPos = stream.start;
-      }
-
-      if (stream.start == state.basePos) {
-        state.baseCur = base.token(stream, state.base);
-        state.basePos = stream.pos;
-      }
-      if (stream.start == state.overlayPos) {
-        stream.pos = stream.start;
-        state.overlayCur = overlay.token(stream, state.overlay);
-        state.overlayPos = stream.pos;
-      }
-      stream.pos = Math.min(state.basePos, state.overlayPos);
-
-      // state.overlay.combineTokens always takes precedence over combine,
-      // unless set to null
-      if (state.overlayCur == null) return state.baseCur;
-      else if (state.baseCur != null &&
-               state.overlay.combineTokens ||
-               combine && state.overlay.combineTokens == null)
-        return state.baseCur + " " + state.overlayCur;
-      else return state.overlayCur;
-    },
-
-    indent: base.indent && function(state, textAfter) {
-      return base.indent(state.base, textAfter);
-    },
-    electricChars: base.electricChars,
-
-    innerMode: function(state) { return {state: state.base, mode: base}; },
-
-    blankLine: function(state) {
-      if (base.blankLine) base.blankLine(state.base);
-      if (overlay.blankLine) overlay.blankLine(state.overlay);
-    }
-  };
-};
-
-});
diff --git a/www/code/codemirror-5.7/addon/mode/simple.js b/www/code/codemirror-5.7/addon/mode/simple.js
deleted file mode 100644
index 795328b83..000000000
--- a/www/code/codemirror-5.7/addon/mode/simple.js
+++ /dev/null
@@ -1,213 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineSimpleMode = function(name, states) {
-    CodeMirror.defineMode(name, function(config) {
-      return CodeMirror.simpleMode(config, states);
-    });
-  };
-
-  CodeMirror.simpleMode = function(config, states) {
-    ensureState(states, "start");
-    var states_ = {}, meta = states.meta || {}, hasIndentation = false;
-    for (var state in states) if (state != meta && states.hasOwnProperty(state)) {
-      var list = states_[state] = [], orig = states[state];
-      for (var i = 0; i < orig.length; i++) {
-        var data = orig[i];
-        list.push(new Rule(data, states));
-        if (data.indent || data.dedent) hasIndentation = true;
-      }
-    }
-    var mode = {
-      startState: function() {
-        return {state: "start", pending: null,
-                local: null, localState: null,
-                indent: hasIndentation ? [] : null};
-      },
-      copyState: function(state) {
-        var s = {state: state.state, pending: state.pending,
-                 local: state.local, localState: null,
-                 indent: state.indent && state.indent.slice(0)};
-        if (state.localState)
-          s.localState = CodeMirror.copyState(state.local.mode, state.localState);
-        if (state.stack)
-          s.stack = state.stack.slice(0);
-        for (var pers = state.persistentStates; pers; pers = pers.next)
-          s.persistentStates = {mode: pers.mode,
-                                spec: pers.spec,
-                                state: pers.state == state.localState ? s.localState : CodeMirror.copyState(pers.mode, pers.state),
-                                next: s.persistentStates};
-        return s;
-      },
-      token: tokenFunction(states_, config),
-      innerMode: function(state) { return state.local && {mode: state.local.mode, state: state.localState}; },
-      indent: indentFunction(states_, meta)
-    };
-    if (meta) for (var prop in meta) if (meta.hasOwnProperty(prop))
-      mode[prop] = meta[prop];
-    return mode;
-  };
-
-  function ensureState(states, name) {
-    if (!states.hasOwnProperty(name))
-      throw new Error("Undefined state " + name + "in simple mode");
-  }
-
-  function toRegex(val, caret) {
-    if (!val) return /(?:)/;
-    var flags = "";
-    if (val instanceof RegExp) {
-      if (val.ignoreCase) flags = "i";
-      val = val.source;
-    } else {
-      val = String(val);
-    }
-    return new RegExp((caret === false ? "" : "^") + "(?:" + val + ")", flags);
-  }
-
-  function asToken(val) {
-    if (!val) return null;
-    if (typeof val == "string") return val.replace(/\./g, " ");
-    var result = [];
-    for (var i = 0; i < val.length; i++)
-      result.push(val[i] && val[i].replace(/\./g, " "));
-    return result;
-  }
-
-  function Rule(data, states) {
-    if (data.next || data.push) ensureState(states, data.next || data.push);
-    this.regex = toRegex(data.regex);
-    this.token = asToken(data.token);
-    this.data = data;
-  }
-
-  function tokenFunction(states, config) {
-    return function(stream, state) {
-      if (state.pending) {
-        var pend = state.pending.shift();
-        if (state.pending.length == 0) state.pending = null;
-        stream.pos += pend.text.length;
-        return pend.token;
-      }
-
-      if (state.local) {
-        if (state.local.end && stream.match(state.local.end)) {
-          var tok = state.local.endToken || null;
-          state.local = state.localState = null;
-          return tok;
-        } else {
-          var tok = state.local.mode.token(stream, state.localState), m;
-          if (state.local.endScan && (m = state.local.endScan.exec(stream.current())))
-            stream.pos = stream.start + m.index;
-          return tok;
-        }
-      }
-
-      var curState = states[state.state];
-      for (var i = 0; i < curState.length; i++) {
-        var rule = curState[i];
-        var matches = (!rule.data.sol || stream.sol()) && stream.match(rule.regex);
-        if (matches) {
-          if (rule.data.next) {
-            state.state = rule.data.next;
-          } else if (rule.data.push) {
-            (state.stack || (state.stack = [])).push(state.state);
-            state.state = rule.data.push;
-          } else if (rule.data.pop && state.stack && state.stack.length) {
-            state.state = state.stack.pop();
-          }
-
-          if (rule.data.mode)
-            enterLocalMode(config, state, rule.data.mode, rule.token);
-          if (rule.data.indent)
-            state.indent.push(stream.indentation() + config.indentUnit);
-          if (rule.data.dedent)
-            state.indent.pop();
-          if (matches.length > 2) {
-            state.pending = [];
-            for (var j = 2; j < matches.length; j++)
-              if (matches[j])
-                state.pending.push({text: matches[j], token: rule.token[j - 1]});
-            stream.backUp(matches[0].length - (matches[1] ? matches[1].length : 0));
-            return rule.token[0];
-          } else if (rule.token && rule.token.join) {
-            return rule.token[0];
-          } else {
-            return rule.token;
-          }
-        }
-      }
-      stream.next();
-      return null;
-    };
-  }
-
-  function cmp(a, b) {
-    if (a === b) return true;
-    if (!a || typeof a != "object" || !b || typeof b != "object") return false;
-    var props = 0;
-    for (var prop in a) if (a.hasOwnProperty(prop)) {
-      if (!b.hasOwnProperty(prop) || !cmp(a[prop], b[prop])) return false;
-      props++;
-    }
-    for (var prop in b) if (b.hasOwnProperty(prop)) props--;
-    return props == 0;
-  }
-
-  function enterLocalMode(config, state, spec, token) {
-    var pers;
-    if (spec.persistent) for (var p = state.persistentStates; p && !pers; p = p.next)
-      if (spec.spec ? cmp(spec.spec, p.spec) : spec.mode == p.mode) pers = p;
-    var mode = pers ? pers.mode : spec.mode || CodeMirror.getMode(config, spec.spec);
-    var lState = pers ? pers.state : CodeMirror.startState(mode);
-    if (spec.persistent && !pers)
-      state.persistentStates = {mode: mode, spec: spec.spec, state: lState, next: state.persistentStates};
-
-    state.localState = lState;
-    state.local = {mode: mode,
-                   end: spec.end && toRegex(spec.end),
-                   endScan: spec.end && spec.forceEnd !== false && toRegex(spec.end, false),
-                   endToken: token && token.join ? token[token.length - 1] : token};
-  }
-
-  function indexOf(val, arr) {
-    for (var i = 0; i < arr.length; i++) if (arr[i] === val) return true;
-  }
-
-  function indentFunction(states, meta) {
-    return function(state, textAfter, line) {
-      if (state.local && state.local.mode.indent)
-        return state.local.mode.indent(state.localState, textAfter, line);
-      if (state.indent == null || state.local || meta.dontIndentStates && indexOf(state.state, meta.dontIndentStates) > -1)
-        return CodeMirror.Pass;
-
-      var pos = state.indent.length - 1, rules = states[state.state];
-      scan: for (;;) {
-        for (var i = 0; i < rules.length; i++) {
-          var rule = rules[i];
-          if (rule.data.dedent && rule.data.dedentIfLineStart !== false) {
-            var m = rule.regex.exec(textAfter);
-            if (m && m[0]) {
-              pos--;
-              if (rule.next || rule.push) rules = states[rule.next || rule.push];
-              textAfter = textAfter.slice(m[0].length);
-              continue scan;
-            }
-          }
-        }
-        break;
-      }
-      return pos < 0 ? 0 : state.indent[pos];
-    };
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/runmode/colorize.js b/www/code/codemirror-5.7/addon/runmode/colorize.js
deleted file mode 100644
index eb7060d0a..000000000
--- a/www/code/codemirror-5.7/addon/runmode/colorize.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("./runmode"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "./runmode"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var isBlock = /^(p|li|div|h\\d|pre|blockquote|td)$/;
-
-  function textContent(node, out) {
-    if (node.nodeType == 3) return out.push(node.nodeValue);
-    for (var ch = node.firstChild; ch; ch = ch.nextSibling) {
-      textContent(ch, out);
-      if (isBlock.test(node.nodeType)) out.push("\n");
-    }
-  }
-
-  CodeMirror.colorize = function(collection, defaultMode) {
-    if (!collection) collection = document.body.getElementsByTagName("pre");
-
-    for (var i = 0; i < collection.length; ++i) {
-      var node = collection[i];
-      var mode = node.getAttribute("data-lang") || defaultMode;
-      if (!mode) continue;
-
-      var text = [];
-      textContent(node, text);
-      node.innerHTML = "";
-      CodeMirror.runMode(text.join(""), mode, node);
-
-      node.className += " cm-s-default";
-    }
-  };
-});
diff --git a/www/code/codemirror-5.7/addon/runmode/runmode-standalone.js b/www/code/codemirror-5.7/addon/runmode/runmode-standalone.js
deleted file mode 100644
index f4f352c80..000000000
--- a/www/code/codemirror-5.7/addon/runmode/runmode-standalone.js
+++ /dev/null
@@ -1,157 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-window.CodeMirror = {};
-
-(function() {
-"use strict";
-
-function splitLines(string){ return string.split(/\r?\n|\r/); };
-
-function StringStream(string) {
-  this.pos = this.start = 0;
-  this.string = string;
-  this.lineStart = 0;
-}
-StringStream.prototype = {
-  eol: function() {return this.pos >= this.string.length;},
-  sol: function() {return this.pos == 0;},
-  peek: function() {return this.string.charAt(this.pos) || null;},
-  next: function() {
-    if (this.pos < this.string.length)
-      return this.string.charAt(this.pos++);
-  },
-  eat: function(match) {
-    var ch = this.string.charAt(this.pos);
-    if (typeof match == "string") var ok = ch == match;
-    else var ok = ch && (match.test ? match.test(ch) : match(ch));
-    if (ok) {++this.pos; return ch;}
-  },
-  eatWhile: function(match) {
-    var start = this.pos;
-    while (this.eat(match)){}
-    return this.pos > start;
-  },
-  eatSpace: function() {
-    var start = this.pos;
-    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-    return this.pos > start;
-  },
-  skipToEnd: function() {this.pos = this.string.length;},
-  skipTo: function(ch) {
-    var found = this.string.indexOf(ch, this.pos);
-    if (found > -1) {this.pos = found; return true;}
-  },
-  backUp: function(n) {this.pos -= n;},
-  column: function() {return this.start - this.lineStart;},
-  indentation: function() {return 0;},
-  match: function(pattern, consume, caseInsensitive) {
-    if (typeof pattern == "string") {
-      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-      var substr = this.string.substr(this.pos, pattern.length);
-      if (cased(substr) == cased(pattern)) {
-        if (consume !== false) this.pos += pattern.length;
-        return true;
-      }
-    } else {
-      var match = this.string.slice(this.pos).match(pattern);
-      if (match && match.index > 0) return null;
-      if (match && consume !== false) this.pos += match[0].length;
-      return match;
-    }
-  },
-  current: function(){return this.string.slice(this.start, this.pos);},
-  hideFirstChars: function(n, inner) {
-    this.lineStart += n;
-    try { return inner(); }
-    finally { this.lineStart -= n; }
-  }
-};
-CodeMirror.StringStream = StringStream;
-
-CodeMirror.startState = function (mode, a1, a2) {
-  return mode.startState ? mode.startState(a1, a2) : true;
-};
-
-var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-CodeMirror.defineMode = function (name, mode) {
-  if (arguments.length > 2)
-    mode.dependencies = Array.prototype.slice.call(arguments, 2);
-  modes[name] = mode;
-};
-CodeMirror.defineMIME = function (mime, spec) { mimeModes[mime] = spec; };
-CodeMirror.resolveMode = function(spec) {
-  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
-    spec = mimeModes[spec];
-  } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
-    spec = mimeModes[spec.name];
-  }
-  if (typeof spec == "string") return {name: spec};
-  else return spec || {name: "null"};
-};
-CodeMirror.getMode = function (options, spec) {
-  spec = CodeMirror.resolveMode(spec);
-  var mfactory = modes[spec.name];
-  if (!mfactory) throw new Error("Unknown mode: " + spec);
-  return mfactory(options, spec);
-};
-CodeMirror.registerHelper = CodeMirror.registerGlobalHelper = Math.min;
-CodeMirror.defineMode("null", function() {
-  return {token: function(stream) {stream.skipToEnd();}};
-});
-CodeMirror.defineMIME("text/plain", "null");
-
-CodeMirror.runMode = function (string, modespec, callback, options) {
-  var mode = CodeMirror.getMode({ indentUnit: 2 }, modespec);
-
-  if (callback.nodeType == 1) {
-    var tabSize = (options && options.tabSize) || 4;
-    var node = callback, col = 0;
-    node.innerHTML = "";
-    callback = function (text, style) {
-      if (text == "\n") {
-        node.appendChild(document.createElement("br"));
-        col = 0;
-        return;
-      }
-      var content = "";
-      // replace tabs
-      for (var pos = 0; ;) {
-        var idx = text.indexOf("\t", pos);
-        if (idx == -1) {
-          content += text.slice(pos);
-          col += text.length - pos;
-          break;
-        } else {
-          col += idx - pos;
-          content += text.slice(pos, idx);
-          var size = tabSize - col % tabSize;
-          col += size;
-          for (var i = 0; i < size; ++i) content += " ";
-          pos = idx + 1;
-        }
-      }
-
-      if (style) {
-        var sp = node.appendChild(document.createElement("span"));
-        sp.className = "cm-" + style.replace(/ +/g, " cm-");
-        sp.appendChild(document.createTextNode(content));
-      } else {
-        node.appendChild(document.createTextNode(content));
-      }
-    };
-  }
-
-  var lines = splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
-  for (var i = 0, e = lines.length; i < e; ++i) {
-    if (i) callback("\n");
-    var stream = new CodeMirror.StringStream(lines[i]);
-    if (!stream.string && mode.blankLine) mode.blankLine(state);
-    while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
-      stream.start = stream.pos;
-    }
-  }
-};
-})();
diff --git a/www/code/codemirror-5.7/addon/runmode/runmode.js b/www/code/codemirror-5.7/addon/runmode/runmode.js
deleted file mode 100644
index 07d2279f7..000000000
--- a/www/code/codemirror-5.7/addon/runmode/runmode.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.runMode = function(string, modespec, callback, options) {
-  var mode = CodeMirror.getMode(CodeMirror.defaults, modespec);
-  var ie = /MSIE \d/.test(navigator.userAgent);
-  var ie_lt9 = ie && (document.documentMode == null || document.documentMode < 9);
-
-  if (callback.nodeType == 1) {
-    var tabSize = (options && options.tabSize) || CodeMirror.defaults.tabSize;
-    var node = callback, col = 0;
-    node.innerHTML = "";
-    callback = function(text, style) {
-      if (text == "\n") {
-        // Emitting LF or CRLF on IE8 or earlier results in an incorrect display.
-        // Emitting a carriage return makes everything ok.
-        node.appendChild(document.createTextNode(ie_lt9 ? '\r' : text));
-        col = 0;
-        return;
-      }
-      var content = "";
-      // replace tabs
-      for (var pos = 0;;) {
-        var idx = text.indexOf("\t", pos);
-        if (idx == -1) {
-          content += text.slice(pos);
-          col += text.length - pos;
-          break;
-        } else {
-          col += idx - pos;
-          content += text.slice(pos, idx);
-          var size = tabSize - col % tabSize;
-          col += size;
-          for (var i = 0; i < size; ++i) content += " ";
-          pos = idx + 1;
-        }
-      }
-
-      if (style) {
-        var sp = node.appendChild(document.createElement("span"));
-        sp.className = "cm-" + style.replace(/ +/g, " cm-");
-        sp.appendChild(document.createTextNode(content));
-      } else {
-        node.appendChild(document.createTextNode(content));
-      }
-    };
-  }
-
-  var lines = CodeMirror.splitLines(string), state = (options && options.state) || CodeMirror.startState(mode);
-  for (var i = 0, e = lines.length; i < e; ++i) {
-    if (i) callback("\n");
-    var stream = new CodeMirror.StringStream(lines[i]);
-    if (!stream.string && mode.blankLine) mode.blankLine(state);
-    while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
-      stream.start = stream.pos;
-    }
-  }
-};
-
-});
diff --git a/www/code/codemirror-5.7/addon/runmode/runmode.node.js b/www/code/codemirror-5.7/addon/runmode/runmode.node.js
deleted file mode 100644
index 8f345a32c..000000000
--- a/www/code/codemirror-5.7/addon/runmode/runmode.node.js
+++ /dev/null
@@ -1,178 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/* Just enough of CodeMirror to run runMode under node.js */
-
-function splitLines(string){return string.split(/\r\n?|\n/);};
-
-// Counts the column offset in a string, taking tabs into account.
-// Used mostly to find indentation.
-var countColumn = function(string, end, tabSize, startIndex, startValue) {
-  if (end == null) {
-    end = string.search(/[^\s\u00a0]/);
-    if (end == -1) end = string.length;
-  }
-  for (var i = startIndex || 0, n = startValue || 0;;) {
-    var nextTab = string.indexOf("\t", i);
-    if (nextTab < 0 || nextTab >= end)
-      return n + (end - i);
-    n += nextTab - i;
-    n += tabSize - (n % tabSize);
-    i = nextTab + 1;
-  }
-};
-
-function StringStream(string, tabSize) {
-  this.pos = this.start = 0;
-  this.string = string;
-  this.tabSize = tabSize || 8;
-  this.lastColumnPos = this.lastColumnValue = 0;
-  this.lineStart = 0;
-};
-
-StringStream.prototype = {
-  eol: function() {return this.pos >= this.string.length;},
-  sol: function() {return this.pos == this.lineStart;},
-  peek: function() {return this.string.charAt(this.pos) || undefined;},
-  next: function() {
-    if (this.pos < this.string.length)
-      return this.string.charAt(this.pos++);
-  },
-  eat: function(match) {
-    var ch = this.string.charAt(this.pos);
-    if (typeof match == "string") var ok = ch == match;
-    else var ok = ch && (match.test ? match.test(ch) : match(ch));
-    if (ok) {++this.pos; return ch;}
-  },
-  eatWhile: function(match) {
-    var start = this.pos;
-    while (this.eat(match)){}
-    return this.pos > start;
-  },
-  eatSpace: function() {
-    var start = this.pos;
-    while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-    return this.pos > start;
-  },
-  skipToEnd: function() {this.pos = this.string.length;},
-  skipTo: function(ch) {
-    var found = this.string.indexOf(ch, this.pos);
-    if (found > -1) {this.pos = found; return true;}
-  },
-  backUp: function(n) {this.pos -= n;},
-  column: function() {
-    if (this.lastColumnPos < this.start) {
-      this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
-      this.lastColumnPos = this.start;
-    }
-    return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-  },
-  indentation: function() {
-    return countColumn(this.string, null, this.tabSize) -
-      (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-  },
-  match: function(pattern, consume, caseInsensitive) {
-    if (typeof pattern == "string") {
-      var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-      var substr = this.string.substr(this.pos, pattern.length);
-      if (cased(substr) == cased(pattern)) {
-        if (consume !== false) this.pos += pattern.length;
-        return true;
-      }
-    } else {
-      var match = this.string.slice(this.pos).match(pattern);
-      if (match && match.index > 0) return null;
-      if (match && consume !== false) this.pos += match[0].length;
-      return match;
-    }
-  },
-  current: function(){return this.string.slice(this.start, this.pos);},
-  hideFirstChars: function(n, inner) {
-    this.lineStart += n;
-    try { return inner(); }
-    finally { this.lineStart -= n; }
-  }
-};
-exports.StringStream = StringStream;
-
-exports.startState = function(mode, a1, a2) {
-  return mode.startState ? mode.startState(a1, a2) : true;
-};
-
-var modes = exports.modes = {}, mimeModes = exports.mimeModes = {};
-exports.defineMode = function(name, mode) {
-  if (arguments.length > 2)
-    mode.dependencies = Array.prototype.slice.call(arguments, 2);
-  modes[name] = mode;
-};
-exports.defineMIME = function(mime, spec) { mimeModes[mime] = spec; };
-
-exports.defineMode("null", function() {
-  return {token: function(stream) {stream.skipToEnd();}};
-});
-exports.defineMIME("text/plain", "null");
-
-exports.resolveMode = function(spec) {
-  if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
-    spec = mimeModes[spec];
-  } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
-    spec = mimeModes[spec.name];
-  }
-  if (typeof spec == "string") return {name: spec};
-  else return spec || {name: "null"};
-};
-
-function copyObj(obj, target, overwrite) {
-  if (!target) target = {};
-  for (var prop in obj)
-    if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
-      target[prop] = obj[prop];
-  return target;
-}
-
-// This can be used to attach properties to mode objects from
-// outside the actual mode definition.
-var modeExtensions = exports.modeExtensions = {};
-exports.extendMode = function(mode, properties) {
-  var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
-  copyObj(properties, exts);
-};
-
-exports.getMode = function(options, spec) {
-  var spec = exports.resolveMode(spec);
-  var mfactory = modes[spec.name];
-  if (!mfactory) return exports.getMode(options, "text/plain");
-  var modeObj = mfactory(options, spec);
-  if (modeExtensions.hasOwnProperty(spec.name)) {
-    var exts = modeExtensions[spec.name];
-    for (var prop in exts) {
-      if (!exts.hasOwnProperty(prop)) continue;
-      if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
-      modeObj[prop] = exts[prop];
-    }
-  }
-  modeObj.name = spec.name;
-  if (spec.helperType) modeObj.helperType = spec.helperType;
-  if (spec.modeProps) for (var prop in spec.modeProps)
-    modeObj[prop] = spec.modeProps[prop];
-
-  return modeObj;
-};
-exports.registerHelper = exports.registerGlobalHelper = Math.min;
-
-exports.runMode = function(string, modespec, callback, options) {
-  var mode = exports.getMode({indentUnit: 2}, modespec);
-  var lines = splitLines(string), state = (options && options.state) || exports.startState(mode);
-  for (var i = 0, e = lines.length; i < e; ++i) {
-    if (i) callback("\n");
-    var stream = new exports.StringStream(lines[i]);
-    if (!stream.string && mode.blankLine) mode.blankLine(state);
-    while (!stream.eol()) {
-      var style = mode.token(stream, state);
-      callback(stream.current(), style, i, stream.start, state);
-      stream.start = stream.pos;
-    }
-  }
-};
-
-require.cache[require.resolve("../../lib/codemirror")] = require.cache[require.resolve("./runmode.node")];
diff --git a/www/code/codemirror-5.7/addon/scroll/annotatescrollbar.js b/www/code/codemirror-5.7/addon/scroll/annotatescrollbar.js
deleted file mode 100644
index e62a45acf..000000000
--- a/www/code/codemirror-5.7/addon/scroll/annotatescrollbar.js
+++ /dev/null
@@ -1,115 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineExtension("annotateScrollbar", function(options) {
-    if (typeof options == "string") options = {className: options};
-    return new Annotation(this, options);
-  });
-
-  CodeMirror.defineOption("scrollButtonHeight", 0);
-
-  function Annotation(cm, options) {
-    this.cm = cm;
-    this.options = options;
-    this.buttonHeight = options.scrollButtonHeight || cm.getOption("scrollButtonHeight");
-    this.annotations = [];
-    this.doRedraw = this.doUpdate = null;
-    this.div = cm.getWrapperElement().appendChild(document.createElement("div"));
-    this.div.style.cssText = "position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none";
-    this.computeScale();
-
-    function scheduleRedraw(delay) {
-      clearTimeout(self.doRedraw);
-      self.doRedraw = setTimeout(function() { self.redraw(); }, delay);
-    }
-
-    var self = this;
-    cm.on("refresh", this.resizeHandler = function() {
-      clearTimeout(self.doUpdate);
-      self.doUpdate = setTimeout(function() {
-        if (self.computeScale()) scheduleRedraw(20);
-      }, 100);
-    });
-    cm.on("markerAdded", this.resizeHandler);
-    cm.on("markerCleared", this.resizeHandler);
-    if (options.listenForChanges !== false)
-      cm.on("change", this.changeHandler = function() {
-        scheduleRedraw(250);
-      });
-  }
-
-  Annotation.prototype.computeScale = function() {
-    var cm = this.cm;
-    var hScale = (cm.getWrapperElement().clientHeight - cm.display.barHeight - this.buttonHeight * 2) /
-      cm.heightAtLine(cm.lastLine() + 1, "local");
-    if (hScale != this.hScale) {
-      this.hScale = hScale;
-      return true;
-    }
-  };
-
-  Annotation.prototype.update = function(annotations) {
-    this.annotations = annotations;
-    this.redraw();
-  };
-
-  Annotation.prototype.redraw = function(compute) {
-    if (compute !== false) this.computeScale();
-    var cm = this.cm, hScale = this.hScale;
-
-    var frag = document.createDocumentFragment(), anns = this.annotations;
-
-    var wrapping = cm.getOption("lineWrapping");
-    var singleLineH = wrapping && cm.defaultTextHeight() * 1.5;
-    var curLine = null, curLineObj = null;
-    function getY(pos, top) {
-      if (curLine != pos.line) {
-        curLine = pos.line;
-        curLineObj = cm.getLineHandle(curLine);
-      }
-      if (wrapping && curLineObj.height > singleLineH)
-        return cm.charCoords(pos, "local")[top ? "top" : "bottom"];
-      var topY = cm.heightAtLine(curLineObj, "local");
-      return topY + (top ? 0 : curLineObj.height);
-    }
-
-    if (cm.display.barWidth) for (var i = 0, nextTop; i < anns.length; i++) {
-      var ann = anns[i];
-      var top = nextTop || getY(ann.from, true) * hScale;
-      var bottom = getY(ann.to, false) * hScale;
-      while (i < anns.length - 1) {
-        nextTop = getY(anns[i + 1].from, true) * hScale;
-        if (nextTop > bottom + .9) break;
-        ann = anns[++i];
-        bottom = getY(ann.to, false) * hScale;
-      }
-      if (bottom == top) continue;
-      var height = Math.max(bottom - top, 3);
-
-      var elt = frag.appendChild(document.createElement("div"));
-      elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth - 1, 2) + "px; top: "
-        + (top + this.buttonHeight) + "px; height: " + height + "px";
-      elt.className = this.options.className;
-    }
-    this.div.textContent = "";
-    this.div.appendChild(frag);
-  };
-
-  Annotation.prototype.clear = function() {
-    this.cm.off("refresh", this.resizeHandler);
-    this.cm.off("markerAdded", this.resizeHandler);
-    this.cm.off("markerCleared", this.resizeHandler);
-    if (this.changeHandler) this.cm.off("change", this.changeHandler);
-    this.div.parentNode.removeChild(this.div);
-  };
-});
diff --git a/www/code/codemirror-5.7/addon/scroll/scrollpastend.js b/www/code/codemirror-5.7/addon/scroll/scrollpastend.js
deleted file mode 100644
index 008ae4c7b..000000000
--- a/www/code/codemirror-5.7/addon/scroll/scrollpastend.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineOption("scrollPastEnd", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      cm.off("change", onChange);
-      cm.off("refresh", updateBottomMargin);
-      cm.display.lineSpace.parentNode.style.paddingBottom = "";
-      cm.state.scrollPastEndPadding = null;
-    }
-    if (val) {
-      cm.on("change", onChange);
-      cm.on("refresh", updateBottomMargin);
-      updateBottomMargin(cm);
-    }
-  });
-
-  function onChange(cm, change) {
-    if (CodeMirror.changeEnd(change).line == cm.lastLine())
-      updateBottomMargin(cm);
-  }
-
-  function updateBottomMargin(cm) {
-    var padding = "";
-    if (cm.lineCount() > 1) {
-      var totalH = cm.display.scroller.clientHeight - 30,
-          lastLineH = cm.getLineHandle(cm.lastLine()).height;
-      padding = (totalH - lastLineH) + "px";
-    }
-    if (cm.state.scrollPastEndPadding != padding) {
-      cm.state.scrollPastEndPadding = padding;
-      cm.display.lineSpace.parentNode.style.paddingBottom = padding;
-      cm.setSize();
-    }
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/scroll/simplescrollbars.css b/www/code/codemirror-5.7/addon/scroll/simplescrollbars.css
deleted file mode 100644
index 5eea7aa1b..000000000
--- a/www/code/codemirror-5.7/addon/scroll/simplescrollbars.css
+++ /dev/null
@@ -1,66 +0,0 @@
-.CodeMirror-simplescroll-horizontal div, .CodeMirror-simplescroll-vertical div {
-  position: absolute;
-  background: #ccc;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  border: 1px solid #bbb;
-  border-radius: 2px;
-}
-
-.CodeMirror-simplescroll-horizontal, .CodeMirror-simplescroll-vertical {
-  position: absolute;
-  z-index: 6;
-  background: #eee;
-}
-
-.CodeMirror-simplescroll-horizontal {
-  bottom: 0; left: 0;
-  height: 8px;
-}
-.CodeMirror-simplescroll-horizontal div {
-  bottom: 0;
-  height: 100%;
-}
-
-.CodeMirror-simplescroll-vertical {
-  right: 0; top: 0;
-  width: 8px;
-}
-.CodeMirror-simplescroll-vertical div {
-  right: 0;
-  width: 100%;
-}
-
-
-.CodeMirror-overlayscroll .CodeMirror-scrollbar-filler, .CodeMirror-overlayscroll .CodeMirror-gutter-filler {
-  display: none;
-}
-
-.CodeMirror-overlayscroll-horizontal div, .CodeMirror-overlayscroll-vertical div {
-  position: absolute;
-  background: #bcd;
-  border-radius: 3px;
-}
-
-.CodeMirror-overlayscroll-horizontal, .CodeMirror-overlayscroll-vertical {
-  position: absolute;
-  z-index: 6;
-}
-
-.CodeMirror-overlayscroll-horizontal {
-  bottom: 0; left: 0;
-  height: 6px;
-}
-.CodeMirror-overlayscroll-horizontal div {
-  bottom: 0;
-  height: 100%;
-}
-
-.CodeMirror-overlayscroll-vertical {
-  right: 0; top: 0;
-  width: 6px;
-}
-.CodeMirror-overlayscroll-vertical div {
-  right: 0;
-  width: 100%;
-}
diff --git a/www/code/codemirror-5.7/addon/scroll/simplescrollbars.js b/www/code/codemirror-5.7/addon/scroll/simplescrollbars.js
deleted file mode 100644
index f78353a13..000000000
--- a/www/code/codemirror-5.7/addon/scroll/simplescrollbars.js
+++ /dev/null
@@ -1,147 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  function Bar(cls, orientation, scroll) {
-    this.orientation = orientation;
-    this.scroll = scroll;
-    this.screen = this.total = this.size = 1;
-    this.pos = 0;
-
-    this.node = document.createElement("div");
-    this.node.className = cls + "-" + orientation;
-    this.inner = this.node.appendChild(document.createElement("div"));
-
-    var self = this;
-    CodeMirror.on(this.inner, "mousedown", function(e) {
-      if (e.which != 1) return;
-      CodeMirror.e_preventDefault(e);
-      var axis = self.orientation == "horizontal" ? "pageX" : "pageY";
-      var start = e[axis], startpos = self.pos;
-      function done() {
-        CodeMirror.off(document, "mousemove", move);
-        CodeMirror.off(document, "mouseup", done);
-      }
-      function move(e) {
-        if (e.which != 1) return done();
-        self.moveTo(startpos + (e[axis] - start) * (self.total / self.size));
-      }
-      CodeMirror.on(document, "mousemove", move);
-      CodeMirror.on(document, "mouseup", done);
-    });
-
-    CodeMirror.on(this.node, "click", function(e) {
-      CodeMirror.e_preventDefault(e);
-      var innerBox = self.inner.getBoundingClientRect(), where;
-      if (self.orientation == "horizontal")
-        where = e.clientX < innerBox.left ? -1 : e.clientX > innerBox.right ? 1 : 0;
-      else
-        where = e.clientY < innerBox.top ? -1 : e.clientY > innerBox.bottom ? 1 : 0;
-      self.moveTo(self.pos + where * self.screen);
-    });
-
-    function onWheel(e) {
-      var moved = CodeMirror.wheelEventPixels(e)[self.orientation == "horizontal" ? "x" : "y"];
-      var oldPos = self.pos;
-      self.moveTo(self.pos + moved);
-      if (self.pos != oldPos) CodeMirror.e_preventDefault(e);
-    }
-    CodeMirror.on(this.node, "mousewheel", onWheel);
-    CodeMirror.on(this.node, "DOMMouseScroll", onWheel);
-  }
-
-  Bar.prototype.moveTo = function(pos, update) {
-    if (pos < 0) pos = 0;
-    if (pos > this.total - this.screen) pos = this.total - this.screen;
-    if (pos == this.pos) return;
-    this.pos = pos;
-    this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
-      (pos * (this.size / this.total)) + "px";
-    if (update !== false) this.scroll(pos, this.orientation);
-  };
-
-  var minButtonSize = 10;
-
-  Bar.prototype.update = function(scrollSize, clientSize, barSize) {
-    this.screen = clientSize;
-    this.total = scrollSize;
-    this.size = barSize;
-
-    var buttonSize = this.screen * (this.size / this.total);
-    if (buttonSize < minButtonSize) {
-      this.size -= minButtonSize - buttonSize;
-      buttonSize = minButtonSize;
-    }
-    this.inner.style[this.orientation == "horizontal" ? "width" : "height"] =
-      buttonSize + "px";
-    this.inner.style[this.orientation == "horizontal" ? "left" : "top"] =
-      this.pos * (this.size / this.total) + "px";
-  };
-
-  function SimpleScrollbars(cls, place, scroll) {
-    this.addClass = cls;
-    this.horiz = new Bar(cls, "horizontal", scroll);
-    place(this.horiz.node);
-    this.vert = new Bar(cls, "vertical", scroll);
-    place(this.vert.node);
-    this.width = null;
-  }
-
-  SimpleScrollbars.prototype.update = function(measure) {
-    if (this.width == null) {
-      var style = window.getComputedStyle ? window.getComputedStyle(this.horiz.node) : this.horiz.node.currentStyle;
-      if (style) this.width = parseInt(style.height);
-    }
-    var width = this.width || 0;
-
-    var needsH = measure.scrollWidth > measure.clientWidth + 1;
-    var needsV = measure.scrollHeight > measure.clientHeight + 1;
-    this.vert.node.style.display = needsV ? "block" : "none";
-    this.horiz.node.style.display = needsH ? "block" : "none";
-
-    if (needsV) {
-      this.vert.update(measure.scrollHeight, measure.clientHeight,
-                       measure.viewHeight - (needsH ? width : 0));
-      this.vert.node.style.display = "block";
-      this.vert.node.style.bottom = needsH ? width + "px" : "0";
-    }
-    if (needsH) {
-      this.horiz.update(measure.scrollWidth, measure.clientWidth,
-                        measure.viewWidth - (needsV ? width : 0) - measure.barLeft);
-      this.horiz.node.style.right = needsV ? width + "px" : "0";
-      this.horiz.node.style.left = measure.barLeft + "px";
-    }
-
-    return {right: needsV ? width : 0, bottom: needsH ? width : 0};
-  };
-
-  SimpleScrollbars.prototype.setScrollTop = function(pos) {
-    this.vert.moveTo(pos, false);
-  };
-
-  SimpleScrollbars.prototype.setScrollLeft = function(pos) {
-    this.horiz.moveTo(pos, false);
-  };
-
-  SimpleScrollbars.prototype.clear = function() {
-    var parent = this.horiz.node.parentNode;
-    parent.removeChild(this.horiz.node);
-    parent.removeChild(this.vert.node);
-  };
-
-  CodeMirror.scrollbarModel.simple = function(place, scroll) {
-    return new SimpleScrollbars("CodeMirror-simplescroll", place, scroll);
-  };
-  CodeMirror.scrollbarModel.overlay = function(place, scroll) {
-    return new SimpleScrollbars("CodeMirror-overlayscroll", place, scroll);
-  };
-});
diff --git a/www/code/codemirror-5.7/addon/search/match-highlighter.js b/www/code/codemirror-5.7/addon/search/match-highlighter.js
deleted file mode 100644
index e9a22721f..000000000
--- a/www/code/codemirror-5.7/addon/search/match-highlighter.js
+++ /dev/null
@@ -1,128 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Highlighting text that matches the selection
-//
-// Defines an option highlightSelectionMatches, which, when enabled,
-// will style strings that match the selection throughout the
-// document.
-//
-// The option can be set to true to simply enable it, or to a
-// {minChars, style, wordsOnly, showToken, delay} object to explicitly
-// configure it. minChars is the minimum amount of characters that should be
-// selected for the behavior to occur, and style is the token style to
-// apply to the matches. This will be prefixed by "cm-" to create an
-// actual CSS class name. If wordsOnly is enabled, the matches will be
-// highlighted only if the selected text is a word. showToken, when enabled,
-// will cause the current token to be highlighted when nothing is selected.
-// delay is used to specify how much time to wait, in milliseconds, before
-// highlighting the matches.
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var DEFAULT_MIN_CHARS = 2;
-  var DEFAULT_TOKEN_STYLE = "matchhighlight";
-  var DEFAULT_DELAY = 100;
-  var DEFAULT_WORDS_ONLY = false;
-
-  function State(options) {
-    if (typeof options == "object") {
-      this.minChars = options.minChars;
-      this.style = options.style;
-      this.showToken = options.showToken;
-      this.delay = options.delay;
-      this.wordsOnly = options.wordsOnly;
-    }
-    if (this.style == null) this.style = DEFAULT_TOKEN_STYLE;
-    if (this.minChars == null) this.minChars = DEFAULT_MIN_CHARS;
-    if (this.delay == null) this.delay = DEFAULT_DELAY;
-    if (this.wordsOnly == null) this.wordsOnly = DEFAULT_WORDS_ONLY;
-    this.overlay = this.timeout = null;
-  }
-
-  CodeMirror.defineOption("highlightSelectionMatches", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      var over = cm.state.matchHighlighter.overlay;
-      if (over) cm.removeOverlay(over);
-      clearTimeout(cm.state.matchHighlighter.timeout);
-      cm.state.matchHighlighter = null;
-      cm.off("cursorActivity", cursorActivity);
-    }
-    if (val) {
-      cm.state.matchHighlighter = new State(val);
-      highlightMatches(cm);
-      cm.on("cursorActivity", cursorActivity);
-    }
-  });
-
-  function cursorActivity(cm) {
-    var state = cm.state.matchHighlighter;
-    clearTimeout(state.timeout);
-    state.timeout = setTimeout(function() {highlightMatches(cm);}, state.delay);
-  }
-
-  function highlightMatches(cm) {
-    cm.operation(function() {
-      var state = cm.state.matchHighlighter;
-      if (state.overlay) {
-        cm.removeOverlay(state.overlay);
-        state.overlay = null;
-      }
-      if (!cm.somethingSelected() && state.showToken) {
-        var re = state.showToken === true ? /[\w$]/ : state.showToken;
-        var cur = cm.getCursor(), line = cm.getLine(cur.line), start = cur.ch, end = start;
-        while (start && re.test(line.charAt(start - 1))) --start;
-        while (end < line.length && re.test(line.charAt(end))) ++end;
-        if (start < end)
-          cm.addOverlay(state.overlay = makeOverlay(line.slice(start, end), re, state.style));
-        return;
-      }
-      var from = cm.getCursor("from"), to = cm.getCursor("to");
-      if (from.line != to.line) return;
-      if (state.wordsOnly && !isWord(cm, from, to)) return;
-      var selection = cm.getRange(from, to).replace(/^\s+|\s+$/g, "");
-      if (selection.length >= state.minChars)
-        cm.addOverlay(state.overlay = makeOverlay(selection, false, state.style));
-    });
-  }
-
-  function isWord(cm, from, to) {
-    var str = cm.getRange(from, to);
-    if (str.match(/^\w+$/) !== null) {
-        if (from.ch > 0) {
-            var pos = {line: from.line, ch: from.ch - 1};
-            var chr = cm.getRange(pos, from);
-            if (chr.match(/\W/) === null) return false;
-        }
-        if (to.ch < cm.getLine(from.line).length) {
-            var pos = {line: to.line, ch: to.ch + 1};
-            var chr = cm.getRange(to, pos);
-            if (chr.match(/\W/) === null) return false;
-        }
-        return true;
-    } else return false;
-  }
-
-  function boundariesAround(stream, re) {
-    return (!stream.start || !re.test(stream.string.charAt(stream.start - 1))) &&
-      (stream.pos == stream.string.length || !re.test(stream.string.charAt(stream.pos)));
-  }
-
-  function makeOverlay(query, hasBoundary, style) {
-    return {token: function(stream) {
-      if (stream.match(query) &&
-          (!hasBoundary || boundariesAround(stream, hasBoundary)))
-        return style;
-      stream.next();
-      stream.skipTo(query.charAt(0)) || stream.skipToEnd();
-    }};
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/search/matchesonscrollbar.css b/www/code/codemirror-5.7/addon/search/matchesonscrollbar.css
deleted file mode 100644
index 77932cc90..000000000
--- a/www/code/codemirror-5.7/addon/search/matchesonscrollbar.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.CodeMirror-search-match {
-  background: gold;
-  border-top: 1px solid orange;
-  border-bottom: 1px solid orange;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  opacity: .5;
-}
diff --git a/www/code/codemirror-5.7/addon/search/matchesonscrollbar.js b/www/code/codemirror-5.7/addon/search/matchesonscrollbar.js
deleted file mode 100644
index 8d1922897..000000000
--- a/www/code/codemirror-5.7/addon/search/matchesonscrollbar.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../scroll/annotatescrollbar"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "./searchcursor", "../scroll/annotatescrollbar"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineExtension("showMatchesOnScrollbar", function(query, caseFold, options) {
-    if (typeof options == "string") options = {className: options};
-    if (!options) options = {};
-    return new SearchAnnotation(this, query, caseFold, options);
-  });
-
-  function SearchAnnotation(cm, query, caseFold, options) {
-    this.cm = cm;
-    this.options = options;
-    var annotateOptions = {listenForChanges: false};
-    for (var prop in options) annotateOptions[prop] = options[prop];
-    if (!annotateOptions.className) annotateOptions.className = "CodeMirror-search-match";
-    this.annotation = cm.annotateScrollbar(annotateOptions);
-    this.query = query;
-    this.caseFold = caseFold;
-    this.gap = {from: cm.firstLine(), to: cm.lastLine() + 1};
-    this.matches = [];
-    this.update = null;
-
-    this.findMatches();
-    this.annotation.update(this.matches);
-
-    var self = this;
-    cm.on("change", this.changeHandler = function(_cm, change) { self.onChange(change); });
-  }
-
-  var MAX_MATCHES = 1000;
-
-  SearchAnnotation.prototype.findMatches = function() {
-    if (!this.gap) return;
-    for (var i = 0; i < this.matches.length; i++) {
-      var match = this.matches[i];
-      if (match.from.line >= this.gap.to) break;
-      if (match.to.line >= this.gap.from) this.matches.splice(i--, 1);
-    }
-    var cursor = this.cm.getSearchCursor(this.query, CodeMirror.Pos(this.gap.from, 0), this.caseFold);
-    var maxMatches = this.options && this.options.maxMatches || MAX_MATCHES;
-    while (cursor.findNext()) {
-      var match = {from: cursor.from(), to: cursor.to()};
-      if (match.from.line >= this.gap.to) break;
-      this.matches.splice(i++, 0, match);
-      if (this.matches.length > maxMatches) break;
-    }
-    this.gap = null;
-  };
-
-  function offsetLine(line, changeStart, sizeChange) {
-    if (line <= changeStart) return line;
-    return Math.max(changeStart, line + sizeChange);
-  }
-
-  SearchAnnotation.prototype.onChange = function(change) {
-    var startLine = change.from.line;
-    var endLine = CodeMirror.changeEnd(change).line;
-    var sizeChange = endLine - change.to.line;
-    if (this.gap) {
-      this.gap.from = Math.min(offsetLine(this.gap.from, startLine, sizeChange), change.from.line);
-      this.gap.to = Math.max(offsetLine(this.gap.to, startLine, sizeChange), change.from.line);
-    } else {
-      this.gap = {from: change.from.line, to: endLine + 1};
-    }
-
-    if (sizeChange) for (var i = 0; i < this.matches.length; i++) {
-      var match = this.matches[i];
-      var newFrom = offsetLine(match.from.line, startLine, sizeChange);
-      if (newFrom != match.from.line) match.from = CodeMirror.Pos(newFrom, match.from.ch);
-      var newTo = offsetLine(match.to.line, startLine, sizeChange);
-      if (newTo != match.to.line) match.to = CodeMirror.Pos(newTo, match.to.ch);
-    }
-    clearTimeout(this.update);
-    var self = this;
-    this.update = setTimeout(function() { self.updateAfterChange(); }, 250);
-  };
-
-  SearchAnnotation.prototype.updateAfterChange = function() {
-    this.findMatches();
-    this.annotation.update(this.matches);
-  };
-
-  SearchAnnotation.prototype.clear = function() {
-    this.cm.off("change", this.changeHandler);
-    this.annotation.clear();
-  };
-});
diff --git a/www/code/codemirror-5.7/addon/search/search.js b/www/code/codemirror-5.7/addon/search/search.js
deleted file mode 100644
index ac0f3254d..000000000
--- a/www/code/codemirror-5.7/addon/search/search.js
+++ /dev/null
@@ -1,228 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Define search commands. Depends on dialog.js or another
-// implementation of the openDialog method.
-
-// Replace works a little oddly -- it will do the replace on the next
-// Ctrl-G (or whatever is bound to findNext) press. You prevent a
-// replace by making sure the match is no longer selected when hitting
-// Ctrl-G.
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("./searchcursor"), require("../dialog/dialog"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "./searchcursor", "../dialog/dialog"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  function searchOverlay(query, caseInsensitive) {
-    if (typeof query == "string")
-      query = new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&"), caseInsensitive ? "gi" : "g");
-    else if (!query.global)
-      query = new RegExp(query.source, query.ignoreCase ? "gi" : "g");
-
-    return {token: function(stream) {
-      query.lastIndex = stream.pos;
-      var match = query.exec(stream.string);
-      if (match && match.index == stream.pos) {
-        stream.pos += match[0].length;
-        return "searching";
-      } else if (match) {
-        stream.pos = match.index;
-      } else {
-        stream.skipToEnd();
-      }
-    }};
-  }
-
-  function SearchState() {
-    this.posFrom = this.posTo = this.lastQuery = this.query = null;
-    this.overlay = null;
-  }
-
-  function getSearchState(cm) {
-    return cm.state.search || (cm.state.search = new SearchState());
-  }
-
-  function queryCaseInsensitive(query) {
-    return typeof query == "string" && query == query.toLowerCase();
-  }
-
-  function getSearchCursor(cm, query, pos) {
-    // Heuristic: if the query string is all lowercase, do a case insensitive search.
-    return cm.getSearchCursor(query, pos, queryCaseInsensitive(query));
-  }
-
-  function persistentDialog(cm, text, deflt, f) {
-    cm.openDialog(text, f, {
-      value: deflt,
-      selectValueOnOpen: true,
-      closeOnEnter: false,
-      onClose: function() { clearSearch(cm); }
-    });
-  }
-
-  function dialog(cm, text, shortText, deflt, f) {
-    if (cm.openDialog) cm.openDialog(text, f, {value: deflt, selectValueOnOpen: true});
-    else f(prompt(shortText, deflt));
-  }
-
-  function confirmDialog(cm, text, shortText, fs) {
-    if (cm.openConfirm) cm.openConfirm(text, fs);
-    else if (confirm(shortText)) fs[0]();
-  }
-
-  function parseString(string) {
-    return string.replace(/\\(.)/g, function(_, ch) {
-      if (ch == "n") return "\n"
-      if (ch == "r") return "\r"
-      return ch
-    })
-  }
-
-  function parseQuery(query) {
-    var isRE = query.match(/^\/(.*)\/([a-z]*)$/);
-    if (isRE) {
-      try { query = new RegExp(isRE[1], isRE[2].indexOf("i") == -1 ? "" : "i"); }
-      catch(e) {} // Not a regular expression after all, do a string search
-    } else {
-      query = parseString(query)
-    }
-    if (typeof query == "string" ? query == "" : query.test(""))
-      query = /x^/;
-    return query;
-  }
-
-  var queryDialog =
-    'Search:  (Use /re/ syntax for regexp search)';
-
-  function startSearch(cm, state, query) {
-    state.queryText = query;
-    state.query = parseQuery(query);
-    cm.removeOverlay(state.overlay, queryCaseInsensitive(state.query));
-    state.overlay = searchOverlay(state.query, queryCaseInsensitive(state.query));
-    cm.addOverlay(state.overlay);
-    if (cm.showMatchesOnScrollbar) {
-      if (state.annotate) { state.annotate.clear(); state.annotate = null; }
-      state.annotate = cm.showMatchesOnScrollbar(state.query, queryCaseInsensitive(state.query));
-    }
-  }
-
-  function doSearch(cm, rev, persistent) {
-    var state = getSearchState(cm);
-    if (state.query) return findNext(cm, rev);
-    var q = cm.getSelection() || state.lastQuery;
-    if (persistent && cm.openDialog) {
-      var hiding = null
-      persistentDialog(cm, queryDialog, q, function(query, event) {
-        CodeMirror.e_stop(event);
-        if (!query) return;
-        if (query != state.queryText) startSearch(cm, state, query);
-        if (hiding) hiding.style.opacity = 1
-        findNext(cm, event.shiftKey, function(_, to) {
-          var dialog
-          if (to.line < 3 && document.querySelector &&
-              (dialog = cm.display.wrapper.querySelector(".CodeMirror-dialog")) &&
-              dialog.getBoundingClientRect().bottom - 4 > cm.cursorCoords(to, "window").top)
-            (hiding = dialog).style.opacity = .4
-        })
-      });
-    } else {
-      dialog(cm, queryDialog, "Search for:", q, function(query) {
-        if (query && !state.query) cm.operation(function() {
-          startSearch(cm, state, query);
-          state.posFrom = state.posTo = cm.getCursor();
-          findNext(cm, rev);
-        });
-      });
-    }
-  }
-
-  function findNext(cm, rev, callback) {cm.operation(function() {
-    var state = getSearchState(cm);
-    var cursor = getSearchCursor(cm, state.query, rev ? state.posFrom : state.posTo);
-    if (!cursor.find(rev)) {
-      cursor = getSearchCursor(cm, state.query, rev ? CodeMirror.Pos(cm.lastLine()) : CodeMirror.Pos(cm.firstLine(), 0));
-      if (!cursor.find(rev)) return;
-    }
-    cm.setSelection(cursor.from(), cursor.to());
-    cm.scrollIntoView({from: cursor.from(), to: cursor.to()}, 20);
-    state.posFrom = cursor.from(); state.posTo = cursor.to();
-    if (callback) callback(cursor.from(), cursor.to())
-  });}
-
-  function clearSearch(cm) {cm.operation(function() {
-    var state = getSearchState(cm);
-    state.lastQuery = state.query;
-    if (!state.query) return;
-    state.query = state.queryText = null;
-    cm.removeOverlay(state.overlay);
-    if (state.annotate) { state.annotate.clear(); state.annotate = null; }
-  });}
-
-  var replaceQueryDialog =
-    '  (Use /re/ syntax for regexp search)';
-  var replacementQueryDialog = 'With: ';
-  var doReplaceConfirm = "Replace?    ";
-
-  function replaceAll(cm, query, text) {
-    cm.operation(function() {
-      for (var cursor = getSearchCursor(cm, query); cursor.findNext();) {
-        if (typeof query != "string") {
-          var match = cm.getRange(cursor.from(), cursor.to()).match(query);
-          cursor.replace(text.replace(/\$(\d)/g, function(_, i) {return match[i];}));
-        } else cursor.replace(text);
-      }
-    });
-  }
-
-  function replace(cm, all) {
-    if (cm.getOption("readOnly")) return;
-    var query = cm.getSelection() || getSearchState(cm).lastQuery;
-    var dialogText = all ? "Replace all:" : "Replace:"
-    dialog(cm, dialogText + replaceQueryDialog, dialogText, query, function(query) {
-      if (!query) return;
-      query = parseQuery(query);
-      dialog(cm, replacementQueryDialog, "Replace with:", "", function(text) {
-        text = parseString(text)
-        if (all) {
-          replaceAll(cm, query, text)
-        } else {
-          clearSearch(cm);
-          var cursor = getSearchCursor(cm, query, cm.getCursor());
-          var advance = function() {
-            var start = cursor.from(), match;
-            if (!(match = cursor.findNext())) {
-              cursor = getSearchCursor(cm, query);
-              if (!(match = cursor.findNext()) ||
-                  (start && cursor.from().line == start.line && cursor.from().ch == start.ch)) return;
-            }
-            cm.setSelection(cursor.from(), cursor.to());
-            cm.scrollIntoView({from: cursor.from(), to: cursor.to()});
-            confirmDialog(cm, doReplaceConfirm, "Replace?",
-                          [function() {doReplace(match);}, advance,
-                           function() {replaceAll(cm, query, text)}]);
-          };
-          var doReplace = function(match) {
-            cursor.replace(typeof query == "string" ? text :
-                           text.replace(/\$(\d)/g, function(_, i) {return match[i];}));
-            advance();
-          };
-          advance();
-        }
-      });
-    });
-  }
-
-  CodeMirror.commands.find = function(cm) {clearSearch(cm); doSearch(cm);};
-  CodeMirror.commands.findPersistent = function(cm) {clearSearch(cm); doSearch(cm, false, true);};
-  CodeMirror.commands.findNext = doSearch;
-  CodeMirror.commands.findPrev = function(cm) {doSearch(cm, true);};
-  CodeMirror.commands.clearSearch = clearSearch;
-  CodeMirror.commands.replace = replace;
-  CodeMirror.commands.replaceAll = function(cm) {replace(cm, true);};
-});
diff --git a/www/code/codemirror-5.7/addon/search/searchcursor.js b/www/code/codemirror-5.7/addon/search/searchcursor.js
deleted file mode 100644
index b70242ee4..000000000
--- a/www/code/codemirror-5.7/addon/search/searchcursor.js
+++ /dev/null
@@ -1,189 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-  var Pos = CodeMirror.Pos;
-
-  function SearchCursor(doc, query, pos, caseFold) {
-    this.atOccurrence = false; this.doc = doc;
-    if (caseFold == null && typeof query == "string") caseFold = false;
-
-    pos = pos ? doc.clipPos(pos) : Pos(0, 0);
-    this.pos = {from: pos, to: pos};
-
-    // The matches method is filled in based on the type of query.
-    // It takes a position and a direction, and returns an object
-    // describing the next occurrence of the query, or null if no
-    // more matches were found.
-    if (typeof query != "string") { // Regexp match
-      if (!query.global) query = new RegExp(query.source, query.ignoreCase ? "ig" : "g");
-      this.matches = function(reverse, pos) {
-        if (reverse) {
-          query.lastIndex = 0;
-          var line = doc.getLine(pos.line).slice(0, pos.ch), cutOff = 0, match, start;
-          for (;;) {
-            query.lastIndex = cutOff;
-            var newMatch = query.exec(line);
-            if (!newMatch) break;
-            match = newMatch;
-            start = match.index;
-            cutOff = match.index + (match[0].length || 1);
-            if (cutOff == line.length) break;
-          }
-          var matchLen = (match && match[0].length) || 0;
-          if (!matchLen) {
-            if (start == 0 && line.length == 0) {match = undefined;}
-            else if (start != doc.getLine(pos.line).length) {
-              matchLen++;
-            }
-          }
-        } else {
-          query.lastIndex = pos.ch;
-          var line = doc.getLine(pos.line), match = query.exec(line);
-          var matchLen = (match && match[0].length) || 0;
-          var start = match && match.index;
-          if (start + matchLen != line.length && !matchLen) matchLen = 1;
-        }
-        if (match && matchLen)
-          return {from: Pos(pos.line, start),
-                  to: Pos(pos.line, start + matchLen),
-                  match: match};
-      };
-    } else { // String query
-      var origQuery = query;
-      if (caseFold) query = query.toLowerCase();
-      var fold = caseFold ? function(str){return str.toLowerCase();} : function(str){return str;};
-      var target = query.split("\n");
-      // Different methods for single-line and multi-line queries
-      if (target.length == 1) {
-        if (!query.length) {
-          // Empty string would match anything and never progress, so
-          // we define it to match nothing instead.
-          this.matches = function() {};
-        } else {
-          this.matches = function(reverse, pos) {
-            if (reverse) {
-              var orig = doc.getLine(pos.line).slice(0, pos.ch), line = fold(orig);
-              var match = line.lastIndexOf(query);
-              if (match > -1) {
-                match = adjustPos(orig, line, match);
-                return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
-              }
-             } else {
-               var orig = doc.getLine(pos.line).slice(pos.ch), line = fold(orig);
-               var match = line.indexOf(query);
-               if (match > -1) {
-                 match = adjustPos(orig, line, match) + pos.ch;
-                 return {from: Pos(pos.line, match), to: Pos(pos.line, match + origQuery.length)};
-               }
-            }
-          };
-        }
-      } else {
-        var origTarget = origQuery.split("\n");
-        this.matches = function(reverse, pos) {
-          var last = target.length - 1;
-          if (reverse) {
-            if (pos.line - (target.length - 1) < doc.firstLine()) return;
-            if (fold(doc.getLine(pos.line).slice(0, origTarget[last].length)) != target[target.length - 1]) return;
-            var to = Pos(pos.line, origTarget[last].length);
-            for (var ln = pos.line - 1, i = last - 1; i >= 1; --i, --ln)
-              if (target[i] != fold(doc.getLine(ln))) return;
-            var line = doc.getLine(ln), cut = line.length - origTarget[0].length;
-            if (fold(line.slice(cut)) != target[0]) return;
-            return {from: Pos(ln, cut), to: to};
-          } else {
-            if (pos.line + (target.length - 1) > doc.lastLine()) return;
-            var line = doc.getLine(pos.line), cut = line.length - origTarget[0].length;
-            if (fold(line.slice(cut)) != target[0]) return;
-            var from = Pos(pos.line, cut);
-            for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln)
-              if (target[i] != fold(doc.getLine(ln))) return;
-            if (fold(doc.getLine(ln).slice(0, origTarget[last].length)) != target[last]) return;
-            return {from: from, to: Pos(ln, origTarget[last].length)};
-          }
-        };
-      }
-    }
-  }
-
-  SearchCursor.prototype = {
-    findNext: function() {return this.find(false);},
-    findPrevious: function() {return this.find(true);},
-
-    find: function(reverse) {
-      var self = this, pos = this.doc.clipPos(reverse ? this.pos.from : this.pos.to);
-      function savePosAndFail(line) {
-        var pos = Pos(line, 0);
-        self.pos = {from: pos, to: pos};
-        self.atOccurrence = false;
-        return false;
-      }
-
-      for (;;) {
-        if (this.pos = this.matches(reverse, pos)) {
-          this.atOccurrence = true;
-          return this.pos.match || true;
-        }
-        if (reverse) {
-          if (!pos.line) return savePosAndFail(0);
-          pos = Pos(pos.line-1, this.doc.getLine(pos.line-1).length);
-        }
-        else {
-          var maxLine = this.doc.lineCount();
-          if (pos.line == maxLine - 1) return savePosAndFail(maxLine);
-          pos = Pos(pos.line + 1, 0);
-        }
-      }
-    },
-
-    from: function() {if (this.atOccurrence) return this.pos.from;},
-    to: function() {if (this.atOccurrence) return this.pos.to;},
-
-    replace: function(newText, origin) {
-      if (!this.atOccurrence) return;
-      var lines = CodeMirror.splitLines(newText);
-      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin);
-      this.pos.to = Pos(this.pos.from.line + lines.length - 1,
-                        lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0));
-    }
-  };
-
-  // Maps a position in a case-folded line back to a position in the original line
-  // (compensating for codepoints increasing in number during folding)
-  function adjustPos(orig, folded, pos) {
-    if (orig.length == folded.length) return pos;
-    for (var pos1 = Math.min(pos, orig.length);;) {
-      var len1 = orig.slice(0, pos1).toLowerCase().length;
-      if (len1 < pos) ++pos1;
-      else if (len1 > pos) --pos1;
-      else return pos1;
-    }
-  }
-
-  CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this.doc, query, pos, caseFold);
-  });
-  CodeMirror.defineDocExtension("getSearchCursor", function(query, pos, caseFold) {
-    return new SearchCursor(this, query, pos, caseFold);
-  });
-
-  CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
-    var ranges = [];
-    var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold);
-    while (cur.findNext()) {
-      if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break;
-      ranges.push({anchor: cur.from(), head: cur.to()});
-    }
-    if (ranges.length)
-      this.setSelections(ranges, 0);
-  });
-});
diff --git a/www/code/codemirror-5.7/addon/selection/active-line.js b/www/code/codemirror-5.7/addon/selection/active-line.js
deleted file mode 100644
index 22da2e0aa..000000000
--- a/www/code/codemirror-5.7/addon/selection/active-line.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Because sometimes you need to style the cursor's line.
-//
-// Adds an option 'styleActiveLine' which, when enabled, gives the
-// active line's wrapping 
     the CSS class "CodeMirror-activeline",
-// and gives its background 
     the class "CodeMirror-activeline-background".
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-  var WRAP_CLASS = "CodeMirror-activeline";
-  var BACK_CLASS = "CodeMirror-activeline-background";
-
-  CodeMirror.defineOption("styleActiveLine", false, function(cm, val, old) {
-    var prev = old && old != CodeMirror.Init;
-    if (val && !prev) {
-      cm.state.activeLines = [];
-      updateActiveLines(cm, cm.listSelections());
-      cm.on("beforeSelectionChange", selectionChange);
-    } else if (!val && prev) {
-      cm.off("beforeSelectionChange", selectionChange);
-      clearActiveLines(cm);
-      delete cm.state.activeLines;
-    }
-  });
-
-  function clearActiveLines(cm) {
-    for (var i = 0; i < cm.state.activeLines.length; i++) {
-      cm.removeLineClass(cm.state.activeLines[i], "wrap", WRAP_CLASS);
-      cm.removeLineClass(cm.state.activeLines[i], "background", BACK_CLASS);
-    }
-  }
-
-  function sameArray(a, b) {
-    if (a.length != b.length) return false;
-    for (var i = 0; i < a.length; i++)
-      if (a[i] != b[i]) return false;
-    return true;
-  }
-
-  function updateActiveLines(cm, ranges) {
-    var active = [];
-    for (var i = 0; i < ranges.length; i++) {
-      var range = ranges[i];
-      if (!range.empty()) continue;
-      var line = cm.getLineHandleVisualStart(range.head.line);
-      if (active[active.length - 1] != line) active.push(line);
-    }
-    if (sameArray(cm.state.activeLines, active)) return;
-    cm.operation(function() {
-      clearActiveLines(cm);
-      for (var i = 0; i < active.length; i++) {
-        cm.addLineClass(active[i], "wrap", WRAP_CLASS);
-        cm.addLineClass(active[i], "background", BACK_CLASS);
-      }
-      cm.state.activeLines = active;
-    });
-  }
-
-  function selectionChange(cm, sel) {
-    updateActiveLines(cm, sel.ranges);
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/selection/mark-selection.js b/www/code/codemirror-5.7/addon/selection/mark-selection.js
deleted file mode 100644
index 5c42d21eb..000000000
--- a/www/code/codemirror-5.7/addon/selection/mark-selection.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Because sometimes you need to mark the selected *text*.
-//
-// Adds an option 'styleSelectedText' which, when enabled, gives
-// selected text the CSS class given as option value, or
-// "CodeMirror-selectedtext" when the value is not a string.
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineOption("styleSelectedText", false, function(cm, val, old) {
-    var prev = old && old != CodeMirror.Init;
-    if (val && !prev) {
-      cm.state.markedSelection = [];
-      cm.state.markedSelectionStyle = typeof val == "string" ? val : "CodeMirror-selectedtext";
-      reset(cm);
-      cm.on("cursorActivity", onCursorActivity);
-      cm.on("change", onChange);
-    } else if (!val && prev) {
-      cm.off("cursorActivity", onCursorActivity);
-      cm.off("change", onChange);
-      clear(cm);
-      cm.state.markedSelection = cm.state.markedSelectionStyle = null;
-    }
-  });
-
-  function onCursorActivity(cm) {
-    cm.operation(function() { update(cm); });
-  }
-
-  function onChange(cm) {
-    if (cm.state.markedSelection.length)
-      cm.operation(function() { clear(cm); });
-  }
-
-  var CHUNK_SIZE = 8;
-  var Pos = CodeMirror.Pos;
-  var cmp = CodeMirror.cmpPos;
-
-  function coverRange(cm, from, to, addAt) {
-    if (cmp(from, to) == 0) return;
-    var array = cm.state.markedSelection;
-    var cls = cm.state.markedSelectionStyle;
-    for (var line = from.line;;) {
-      var start = line == from.line ? from : Pos(line, 0);
-      var endLine = line + CHUNK_SIZE, atEnd = endLine >= to.line;
-      var end = atEnd ? to : Pos(endLine, 0);
-      var mark = cm.markText(start, end, {className: cls});
-      if (addAt == null) array.push(mark);
-      else array.splice(addAt++, 0, mark);
-      if (atEnd) break;
-      line = endLine;
-    }
-  }
-
-  function clear(cm) {
-    var array = cm.state.markedSelection;
-    for (var i = 0; i < array.length; ++i) array[i].clear();
-    array.length = 0;
-  }
-
-  function reset(cm) {
-    clear(cm);
-    var ranges = cm.listSelections();
-    for (var i = 0; i < ranges.length; i++)
-      coverRange(cm, ranges[i].from(), ranges[i].to());
-  }
-
-  function update(cm) {
-    if (!cm.somethingSelected()) return clear(cm);
-    if (cm.listSelections().length > 1) return reset(cm);
-
-    var from = cm.getCursor("start"), to = cm.getCursor("end");
-
-    var array = cm.state.markedSelection;
-    if (!array.length) return coverRange(cm, from, to);
-
-    var coverStart = array[0].find(), coverEnd = array[array.length - 1].find();
-    if (!coverStart || !coverEnd || to.line - from.line < CHUNK_SIZE ||
-        cmp(from, coverEnd.to) >= 0 || cmp(to, coverStart.from) <= 0)
-      return reset(cm);
-
-    while (cmp(from, coverStart.from) > 0) {
-      array.shift().clear();
-      coverStart = array[0].find();
-    }
-    if (cmp(from, coverStart.from) < 0) {
-      if (coverStart.to.line - from.line < CHUNK_SIZE) {
-        array.shift().clear();
-        coverRange(cm, from, coverStart.to, 0);
-      } else {
-        coverRange(cm, from, coverStart.from, 0);
-      }
-    }
-
-    while (cmp(to, coverEnd.to) < 0) {
-      array.pop().clear();
-      coverEnd = array[array.length - 1].find();
-    }
-    if (cmp(to, coverEnd.to) > 0) {
-      if (to.line - coverEnd.from.line < CHUNK_SIZE) {
-        array.pop().clear();
-        coverRange(cm, coverEnd.from, to);
-      } else {
-        coverRange(cm, coverEnd.to, to);
-      }
-    }
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/selection/selection-pointer.js b/www/code/codemirror-5.7/addon/selection/selection-pointer.js
deleted file mode 100644
index ef5e404ad..000000000
--- a/www/code/codemirror-5.7/addon/selection/selection-pointer.js
+++ /dev/null
@@ -1,98 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineOption("selectionPointer", false, function(cm, val) {
-    var data = cm.state.selectionPointer;
-    if (data) {
-      CodeMirror.off(cm.getWrapperElement(), "mousemove", data.mousemove);
-      CodeMirror.off(cm.getWrapperElement(), "mouseout", data.mouseout);
-      CodeMirror.off(window, "scroll", data.windowScroll);
-      cm.off("cursorActivity", reset);
-      cm.off("scroll", reset);
-      cm.state.selectionPointer = null;
-      cm.display.lineDiv.style.cursor = "";
-    }
-    if (val) {
-      data = cm.state.selectionPointer = {
-        value: typeof val == "string" ? val : "default",
-        mousemove: function(event) { mousemove(cm, event); },
-        mouseout: function(event) { mouseout(cm, event); },
-        windowScroll: function() { reset(cm); },
-        rects: null,
-        mouseX: null, mouseY: null,
-        willUpdate: false
-      };
-      CodeMirror.on(cm.getWrapperElement(), "mousemove", data.mousemove);
-      CodeMirror.on(cm.getWrapperElement(), "mouseout", data.mouseout);
-      CodeMirror.on(window, "scroll", data.windowScroll);
-      cm.on("cursorActivity", reset);
-      cm.on("scroll", reset);
-    }
-  });
-
-  function mousemove(cm, event) {
-    var data = cm.state.selectionPointer;
-    if (event.buttons == null ? event.which : event.buttons) {
-      data.mouseX = data.mouseY = null;
-    } else {
-      data.mouseX = event.clientX;
-      data.mouseY = event.clientY;
-    }
-    scheduleUpdate(cm);
-  }
-
-  function mouseout(cm, event) {
-    if (!cm.getWrapperElement().contains(event.relatedTarget)) {
-      var data = cm.state.selectionPointer;
-      data.mouseX = data.mouseY = null;
-      scheduleUpdate(cm);
-    }
-  }
-
-  function reset(cm) {
-    cm.state.selectionPointer.rects = null;
-    scheduleUpdate(cm);
-  }
-
-  function scheduleUpdate(cm) {
-    if (!cm.state.selectionPointer.willUpdate) {
-      cm.state.selectionPointer.willUpdate = true;
-      setTimeout(function() {
-        update(cm);
-        cm.state.selectionPointer.willUpdate = false;
-      }, 50);
-    }
-  }
-
-  function update(cm) {
-    var data = cm.state.selectionPointer;
-    if (!data) return;
-    if (data.rects == null && data.mouseX != null) {
-      data.rects = [];
-      if (cm.somethingSelected()) {
-        for (var sel = cm.display.selectionDiv.firstChild; sel; sel = sel.nextSibling)
-          data.rects.push(sel.getBoundingClientRect());
-      }
-    }
-    var inside = false;
-    if (data.mouseX != null) for (var i = 0; i < data.rects.length; i++) {
-      var rect = data.rects[i];
-      if (rect.left <= data.mouseX && rect.right >= data.mouseX &&
-          rect.top <= data.mouseY && rect.bottom >= data.mouseY)
-        inside = true;
-    }
-    var cursor = inside ? data.value : "";
-    if (cm.display.lineDiv.style.cursor != cursor)
-      cm.display.lineDiv.style.cursor = cursor;
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/tern/tern.css b/www/code/codemirror-5.7/addon/tern/tern.css
deleted file mode 100644
index c4b8a2f77..000000000
--- a/www/code/codemirror-5.7/addon/tern/tern.css
+++ /dev/null
@@ -1,87 +0,0 @@
-.CodeMirror-Tern-completion {
-  padding-left: 22px;
-  position: relative;
-  line-height: 1.5;
-}
-.CodeMirror-Tern-completion:before {
-  position: absolute;
-  left: 2px;
-  bottom: 2px;
-  border-radius: 50%;
-  font-size: 12px;
-  font-weight: bold;
-  height: 15px;
-  width: 15px;
-  line-height: 16px;
-  text-align: center;
-  color: white;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.CodeMirror-Tern-completion-unknown:before {
-  content: "?";
-  background: #4bb;
-}
-.CodeMirror-Tern-completion-object:before {
-  content: "O";
-  background: #77c;
-}
-.CodeMirror-Tern-completion-fn:before {
-  content: "F";
-  background: #7c7;
-}
-.CodeMirror-Tern-completion-array:before {
-  content: "A";
-  background: #c66;
-}
-.CodeMirror-Tern-completion-number:before {
-  content: "1";
-  background: #999;
-}
-.CodeMirror-Tern-completion-string:before {
-  content: "S";
-  background: #999;
-}
-.CodeMirror-Tern-completion-bool:before {
-  content: "B";
-  background: #999;
-}
-
-.CodeMirror-Tern-completion-guess {
-  color: #999;
-}
-
-.CodeMirror-Tern-tooltip {
-  border: 1px solid silver;
-  border-radius: 3px;
-  color: #444;
-  padding: 2px 5px;
-  font-size: 90%;
-  font-family: monospace;
-  background-color: white;
-  white-space: pre-wrap;
-
-  max-width: 40em;
-  position: absolute;
-  z-index: 10;
-  -webkit-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  -moz-box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-  box-shadow: 2px 3px 5px rgba(0,0,0,.2);
-
-  transition: opacity 1s;
-  -moz-transition: opacity 1s;
-  -webkit-transition: opacity 1s;
-  -o-transition: opacity 1s;
-  -ms-transition: opacity 1s;
-}
-
-.CodeMirror-Tern-hint-doc {
-  max-width: 25em;
-  margin-top: -3px;
-}
-
-.CodeMirror-Tern-fname { color: black; }
-.CodeMirror-Tern-farg { color: #70a; }
-.CodeMirror-Tern-farg-current { text-decoration: underline; }
-.CodeMirror-Tern-type { color: #07c; }
-.CodeMirror-Tern-fhint-guess { opacity: .7; }
diff --git a/www/code/codemirror-5.7/addon/tern/tern.js b/www/code/codemirror-5.7/addon/tern/tern.js
deleted file mode 100644
index 3ff2d53e5..000000000
--- a/www/code/codemirror-5.7/addon/tern/tern.js
+++ /dev/null
@@ -1,700 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Glue code between CodeMirror and Tern.
-//
-// Create a CodeMirror.TernServer to wrap an actual Tern server,
-// register open documents (CodeMirror.Doc instances) with it, and
-// call its methods to activate the assisting functions that Tern
-// provides.
-//
-// Options supported (all optional):
-// * defs: An array of JSON definition data structures.
-// * plugins: An object mapping plugin names to configuration
-//   options.
-// * getFile: A function(name, c) that can be used to access files in
-//   the project that haven't been loaded yet. Simply do c(null) to
-//   indicate that a file is not available.
-// * fileFilter: A function(value, docName, doc) that will be applied
-//   to documents before passing them on to Tern.
-// * switchToDoc: A function(name, doc) that should, when providing a
-//   multi-file view, switch the view or focus to the named file.
-// * showError: A function(editor, message) that can be used to
-//   override the way errors are displayed.
-// * completionTip: Customize the content in tooltips for completions.
-//   Is passed a single argument—the completion's data as returned by
-//   Tern—and may return a string, DOM node, or null to indicate that
-//   no tip should be shown. By default the docstring is shown.
-// * typeTip: Like completionTip, but for the tooltips shown for type
-//   queries.
-// * responseFilter: A function(doc, query, request, error, data) that
-//   will be applied to the Tern responses before treating them
-//
-//
-// It is possible to run the Tern server in a web worker by specifying
-// these additional options:
-// * useWorker: Set to true to enable web worker mode. You'll probably
-//   want to feature detect the actual value you use here, for example
-//   !!window.Worker.
-// * workerScript: The main script of the worker. Point this to
-//   wherever you are hosting worker.js from this directory.
-// * workerDeps: An array of paths pointing (relative to workerScript)
-//   to the Acorn and Tern libraries and any Tern plugins you want to
-//   load. Or, if you minified those into a single script and included
-//   them in the workerScript, simply leave this undefined.
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-  // declare global: tern
-
-  CodeMirror.TernServer = function(options) {
-    var self = this;
-    this.options = options || {};
-    var plugins = this.options.plugins || (this.options.plugins = {});
-    if (!plugins.doc_comment) plugins.doc_comment = true;
-    this.docs = Object.create(null);
-    if (this.options.useWorker) {
-      this.server = new WorkerServer(this);
-    } else {
-      this.server = new tern.Server({
-        getFile: function(name, c) { return getFile(self, name, c); },
-        async: true,
-        defs: this.options.defs || [],
-        plugins: plugins
-      });
-    }
-    this.trackChange = function(doc, change) { trackChange(self, doc, change); };
-
-    this.cachedArgHints = null;
-    this.activeArgHints = null;
-    this.jumpStack = [];
-
-    this.getHint = function(cm, c) { return hint(self, cm, c); };
-    this.getHint.async = true;
-  };
-
-  CodeMirror.TernServer.prototype = {
-    addDoc: function(name, doc) {
-      var data = {doc: doc, name: name, changed: null};
-      this.server.addFile(name, docValue(this, data));
-      CodeMirror.on(doc, "change", this.trackChange);
-      return this.docs[name] = data;
-    },
-
-    delDoc: function(id) {
-      var found = resolveDoc(this, id);
-      if (!found) return;
-      CodeMirror.off(found.doc, "change", this.trackChange);
-      delete this.docs[found.name];
-      this.server.delFile(found.name);
-    },
-
-    hideDoc: function(id) {
-      closeArgHints(this);
-      var found = resolveDoc(this, id);
-      if (found && found.changed) sendDoc(this, found);
-    },
-
-    complete: function(cm) {
-      cm.showHint({hint: this.getHint});
-    },
-
-    showType: function(cm, pos, c) { showContextInfo(this, cm, pos, "type", c); },
-
-    showDocs: function(cm, pos, c) { showContextInfo(this, cm, pos, "documentation", c); },
-
-    updateArgHints: function(cm) { updateArgHints(this, cm); },
-
-    jumpToDef: function(cm) { jumpToDef(this, cm); },
-
-    jumpBack: function(cm) { jumpBack(this, cm); },
-
-    rename: function(cm) { rename(this, cm); },
-
-    selectName: function(cm) { selectName(this, cm); },
-
-    request: function (cm, query, c, pos) {
-      var self = this;
-      var doc = findDoc(this, cm.getDoc());
-      var request = buildRequest(this, doc, query, pos);
-      var extraOptions = request.query && this.options.queryOptions && this.options.queryOptions[request.query.type]
-      if (extraOptions) for (var prop in extraOptions) request.query[prop] = extraOptions[prop];
-
-      this.server.request(request, function (error, data) {
-        if (!error && self.options.responseFilter)
-          data = self.options.responseFilter(doc, query, request, error, data);
-        c(error, data);
-      });
-    },
-
-    destroy: function () {
-      if (this.worker) {
-        this.worker.terminate();
-        this.worker = null;
-      }
-    }
-  };
-
-  var Pos = CodeMirror.Pos;
-  var cls = "CodeMirror-Tern-";
-  var bigDoc = 250;
-
-  function getFile(ts, name, c) {
-    var buf = ts.docs[name];
-    if (buf)
-      c(docValue(ts, buf));
-    else if (ts.options.getFile)
-      ts.options.getFile(name, c);
-    else
-      c(null);
-  }
-
-  function findDoc(ts, doc, name) {
-    for (var n in ts.docs) {
-      var cur = ts.docs[n];
-      if (cur.doc == doc) return cur;
-    }
-    if (!name) for (var i = 0;; ++i) {
-      n = "[doc" + (i || "") + "]";
-      if (!ts.docs[n]) { name = n; break; }
-    }
-    return ts.addDoc(name, doc);
-  }
-
-  function resolveDoc(ts, id) {
-    if (typeof id == "string") return ts.docs[id];
-    if (id instanceof CodeMirror) id = id.getDoc();
-    if (id instanceof CodeMirror.Doc) return findDoc(ts, id);
-  }
-
-  function trackChange(ts, doc, change) {
-    var data = findDoc(ts, doc);
-
-    var argHints = ts.cachedArgHints;
-    if (argHints && argHints.doc == doc && cmpPos(argHints.start, change.to) <= 0)
-      ts.cachedArgHints = null;
-
-    var changed = data.changed;
-    if (changed == null)
-      data.changed = changed = {from: change.from.line, to: change.from.line};
-    var end = change.from.line + (change.text.length - 1);
-    if (change.from.line < changed.to) changed.to = changed.to - (change.to.line - end);
-    if (end >= changed.to) changed.to = end + 1;
-    if (changed.from > change.from.line) changed.from = change.from.line;
-
-    if (doc.lineCount() > bigDoc && change.to - changed.from > 100) setTimeout(function() {
-      if (data.changed && data.changed.to - data.changed.from > 100) sendDoc(ts, data);
-    }, 200);
-  }
-
-  function sendDoc(ts, doc) {
-    ts.server.request({files: [{type: "full", name: doc.name, text: docValue(ts, doc)}]}, function(error) {
-      if (error) window.console.error(error);
-      else doc.changed = null;
-    });
-  }
-
-  // Completion
-
-  function hint(ts, cm, c) {
-    ts.request(cm, {type: "completions", types: true, docs: true, urls: true}, function(error, data) {
-      if (error) return showError(ts, cm, error);
-      var completions = [], after = "";
-      var from = data.start, to = data.end;
-      if (cm.getRange(Pos(from.line, from.ch - 2), from) == "[\"" &&
-          cm.getRange(to, Pos(to.line, to.ch + 2)) != "\"]")
-        after = "\"]";
-
-      for (var i = 0; i < data.completions.length; ++i) {
-        var completion = data.completions[i], className = typeToIcon(completion.type);
-        if (data.guess) className += " " + cls + "guess";
-        completions.push({text: completion.name + after,
-                          displayText: completion.displayName || completion.name,
-                          className: className,
-                          data: completion});
-      }
-
-      var obj = {from: from, to: to, list: completions};
-      var tooltip = null;
-      CodeMirror.on(obj, "close", function() { remove(tooltip); });
-      CodeMirror.on(obj, "update", function() { remove(tooltip); });
-      CodeMirror.on(obj, "select", function(cur, node) {
-        remove(tooltip);
-        var content = ts.options.completionTip ? ts.options.completionTip(cur.data) : cur.data.doc;
-        if (content) {
-          tooltip = makeTooltip(node.parentNode.getBoundingClientRect().right + window.pageXOffset,
-                                node.getBoundingClientRect().top + window.pageYOffset, content);
-          tooltip.className += " " + cls + "hint-doc";
-        }
-      });
-      c(obj);
-    });
-  }
-
-  function typeToIcon(type) {
-    var suffix;
-    if (type == "?") suffix = "unknown";
-    else if (type == "number" || type == "string" || type == "bool") suffix = type;
-    else if (/^fn\(/.test(type)) suffix = "fn";
-    else if (/^\[/.test(type)) suffix = "array";
-    else suffix = "object";
-    return cls + "completion " + cls + "completion-" + suffix;
-  }
-
-  // Type queries
-
-  function showContextInfo(ts, cm, pos, queryName, c) {
-    ts.request(cm, queryName, function(error, data) {
-      if (error) return showError(ts, cm, error);
-      if (ts.options.typeTip) {
-        var tip = ts.options.typeTip(data);
-      } else {
-        var tip = elt("span", null, elt("strong", null, data.type || "not found"));
-        if (data.doc)
-          tip.appendChild(document.createTextNode(" — " + data.doc));
-        if (data.url) {
-          tip.appendChild(document.createTextNode(" "));
-          var child = tip.appendChild(elt("a", null, "[docs]"));
-          child.href = data.url;
-          child.target = "_blank";
-        }
-      }
-      tempTooltip(cm, tip, ts);
-      if (c) c();
-    }, pos);
-  }
-
-  // Maintaining argument hints
-
-  function updateArgHints(ts, cm) {
-    closeArgHints(ts);
-
-    if (cm.somethingSelected()) return;
-    var state = cm.getTokenAt(cm.getCursor()).state;
-    var inner = CodeMirror.innerMode(cm.getMode(), state);
-    if (inner.mode.name != "javascript") return;
-    var lex = inner.state.lexical;
-    if (lex.info != "call") return;
-
-    var ch, argPos = lex.pos || 0, tabSize = cm.getOption("tabSize");
-    for (var line = cm.getCursor().line, e = Math.max(0, line - 9), found = false; line >= e; --line) {
-      var str = cm.getLine(line), extra = 0;
-      for (var pos = 0;;) {
-        var tab = str.indexOf("\t", pos);
-        if (tab == -1) break;
-        extra += tabSize - (tab + extra) % tabSize - 1;
-        pos = tab + 1;
-      }
-      ch = lex.column - extra;
-      if (str.charAt(ch) == "(") {found = true; break;}
-    }
-    if (!found) return;
-
-    var start = Pos(line, ch);
-    var cache = ts.cachedArgHints;
-    if (cache && cache.doc == cm.getDoc() && cmpPos(start, cache.start) == 0)
-      return showArgHints(ts, cm, argPos);
-
-    ts.request(cm, {type: "type", preferFunction: true, end: start}, function(error, data) {
-      if (error || !data.type || !(/^fn\(/).test(data.type)) return;
-      ts.cachedArgHints = {
-        start: pos,
-        type: parseFnType(data.type),
-        name: data.exprName || data.name || "fn",
-        guess: data.guess,
-        doc: cm.getDoc()
-      };
-      showArgHints(ts, cm, argPos);
-    });
-  }
-
-  function showArgHints(ts, cm, pos) {
-    closeArgHints(ts);
-
-    var cache = ts.cachedArgHints, tp = cache.type;
-    var tip = elt("span", cache.guess ? cls + "fhint-guess" : null,
-                  elt("span", cls + "fname", cache.name), "(");
-    for (var i = 0; i < tp.args.length; ++i) {
-      if (i) tip.appendChild(document.createTextNode(", "));
-      var arg = tp.args[i];
-      tip.appendChild(elt("span", cls + "farg" + (i == pos ? " " + cls + "farg-current" : ""), arg.name || "?"));
-      if (arg.type != "?") {
-        tip.appendChild(document.createTextNode(":\u00a0"));
-        tip.appendChild(elt("span", cls + "type", arg.type));
-      }
-    }
-    tip.appendChild(document.createTextNode(tp.rettype ? ") ->\u00a0" : ")"));
-    if (tp.rettype) tip.appendChild(elt("span", cls + "type", tp.rettype));
-    var place = cm.cursorCoords(null, "page");
-    ts.activeArgHints = makeTooltip(place.right + 1, place.bottom, tip);
-  }
-
-  function parseFnType(text) {
-    var args = [], pos = 3;
-
-    function skipMatching(upto) {
-      var depth = 0, start = pos;
-      for (;;) {
-        var next = text.charAt(pos);
-        if (upto.test(next) && !depth) return text.slice(start, pos);
-        if (/[{\[\(]/.test(next)) ++depth;
-        else if (/[}\]\)]/.test(next)) --depth;
-        ++pos;
-      }
-    }
-
-    // Parse arguments
-    if (text.charAt(pos) != ")") for (;;) {
-      var name = text.slice(pos).match(/^([^, \(\[\{]+): /);
-      if (name) {
-        pos += name[0].length;
-        name = name[1];
-      }
-      args.push({name: name, type: skipMatching(/[\),]/)});
-      if (text.charAt(pos) == ")") break;
-      pos += 2;
-    }
-
-    var rettype = text.slice(pos).match(/^\) -> (.*)$/);
-
-    return {args: args, rettype: rettype && rettype[1]};
-  }
-
-  // Moving to the definition of something
-
-  function jumpToDef(ts, cm) {
-    function inner(varName) {
-      var req = {type: "definition", variable: varName || null};
-      var doc = findDoc(ts, cm.getDoc());
-      ts.server.request(buildRequest(ts, doc, req), function(error, data) {
-        if (error) return showError(ts, cm, error);
-        if (!data.file && data.url) { window.open(data.url); return; }
-
-        if (data.file) {
-          var localDoc = ts.docs[data.file], found;
-          if (localDoc && (found = findContext(localDoc.doc, data))) {
-            ts.jumpStack.push({file: doc.name,
-                               start: cm.getCursor("from"),
-                               end: cm.getCursor("to")});
-            moveTo(ts, doc, localDoc, found.start, found.end);
-            return;
-          }
-        }
-        showError(ts, cm, "Could not find a definition.");
-      });
-    }
-
-    if (!atInterestingExpression(cm))
-      dialog(cm, "Jump to variable", function(name) { if (name) inner(name); });
-    else
-      inner();
-  }
-
-  function jumpBack(ts, cm) {
-    var pos = ts.jumpStack.pop(), doc = pos && ts.docs[pos.file];
-    if (!doc) return;
-    moveTo(ts, findDoc(ts, cm.getDoc()), doc, pos.start, pos.end);
-  }
-
-  function moveTo(ts, curDoc, doc, start, end) {
-    doc.doc.setSelection(start, end);
-    if (curDoc != doc && ts.options.switchToDoc) {
-      closeArgHints(ts);
-      ts.options.switchToDoc(doc.name, doc.doc);
-    }
-  }
-
-  // The {line,ch} representation of positions makes this rather awkward.
-  function findContext(doc, data) {
-    var before = data.context.slice(0, data.contextOffset).split("\n");
-    var startLine = data.start.line - (before.length - 1);
-    var start = Pos(startLine, (before.length == 1 ? data.start.ch : doc.getLine(startLine).length) - before[0].length);
-
-    var text = doc.getLine(startLine).slice(start.ch);
-    for (var cur = startLine + 1; cur < doc.lineCount() && text.length < data.context.length; ++cur)
-      text += "\n" + doc.getLine(cur);
-    if (text.slice(0, data.context.length) == data.context) return data;
-
-    var cursor = doc.getSearchCursor(data.context, 0, false);
-    var nearest, nearestDist = Infinity;
-    while (cursor.findNext()) {
-      var from = cursor.from(), dist = Math.abs(from.line - start.line) * 10000;
-      if (!dist) dist = Math.abs(from.ch - start.ch);
-      if (dist < nearestDist) { nearest = from; nearestDist = dist; }
-    }
-    if (!nearest) return null;
-
-    if (before.length == 1)
-      nearest.ch += before[0].length;
-    else
-      nearest = Pos(nearest.line + (before.length - 1), before[before.length - 1].length);
-    if (data.start.line == data.end.line)
-      var end = Pos(nearest.line, nearest.ch + (data.end.ch - data.start.ch));
-    else
-      var end = Pos(nearest.line + (data.end.line - data.start.line), data.end.ch);
-    return {start: nearest, end: end};
-  }
-
-  function atInterestingExpression(cm) {
-    var pos = cm.getCursor("end"), tok = cm.getTokenAt(pos);
-    if (tok.start < pos.ch && tok.type == "comment") return false;
-    return /[\w)\]]/.test(cm.getLine(pos.line).slice(Math.max(pos.ch - 1, 0), pos.ch + 1));
-  }
-
-  // Variable renaming
-
-  function rename(ts, cm) {
-    var token = cm.getTokenAt(cm.getCursor());
-    if (!/\w/.test(token.string)) return showError(ts, cm, "Not at a variable");
-    dialog(cm, "New name for " + token.string, function(newName) {
-      ts.request(cm, {type: "rename", newName: newName, fullDocs: true}, function(error, data) {
-        if (error) return showError(ts, cm, error);
-        applyChanges(ts, data.changes);
-      });
-    });
-  }
-
-  function selectName(ts, cm) {
-    var name = findDoc(ts, cm.doc).name;
-    ts.request(cm, {type: "refs"}, function(error, data) {
-      if (error) return showError(ts, cm, error);
-      var ranges = [], cur = 0;
-      var curPos = cm.getCursor();
-      for (var i = 0; i < data.refs.length; i++) {
-        var ref = data.refs[i];
-        if (ref.file == name) {
-          ranges.push({anchor: ref.start, head: ref.end});
-          if (cmpPos(curPos, ref.start) >= 0 && cmpPos(curPos, ref.end) <= 0)
-            cur = ranges.length - 1;
-        }
-      }
-      cm.setSelections(ranges, cur);
-    });
-  }
-
-  var nextChangeOrig = 0;
-  function applyChanges(ts, changes) {
-    var perFile = Object.create(null);
-    for (var i = 0; i < changes.length; ++i) {
-      var ch = changes[i];
-      (perFile[ch.file] || (perFile[ch.file] = [])).push(ch);
-    }
-    for (var file in perFile) {
-      var known = ts.docs[file], chs = perFile[file];;
-      if (!known) continue;
-      chs.sort(function(a, b) { return cmpPos(b.start, a.start); });
-      var origin = "*rename" + (++nextChangeOrig);
-      for (var i = 0; i < chs.length; ++i) {
-        var ch = chs[i];
-        known.doc.replaceRange(ch.text, ch.start, ch.end, origin);
-      }
-    }
-  }
-
-  // Generic request-building helper
-
-  function buildRequest(ts, doc, query, pos) {
-    var files = [], offsetLines = 0, allowFragments = !query.fullDocs;
-    if (!allowFragments) delete query.fullDocs;
-    if (typeof query == "string") query = {type: query};
-    query.lineCharPositions = true;
-    if (query.end == null) {
-      query.end = pos || doc.doc.getCursor("end");
-      if (doc.doc.somethingSelected())
-        query.start = doc.doc.getCursor("start");
-    }
-    var startPos = query.start || query.end;
-
-    if (doc.changed) {
-      if (doc.doc.lineCount() > bigDoc && allowFragments !== false &&
-          doc.changed.to - doc.changed.from < 100 &&
-          doc.changed.from <= startPos.line && doc.changed.to > query.end.line) {
-        files.push(getFragmentAround(doc, startPos, query.end));
-        query.file = "#0";
-        var offsetLines = files[0].offsetLines;
-        if (query.start != null) query.start = Pos(query.start.line - -offsetLines, query.start.ch);
-        query.end = Pos(query.end.line - offsetLines, query.end.ch);
-      } else {
-        files.push({type: "full",
-                    name: doc.name,
-                    text: docValue(ts, doc)});
-        query.file = doc.name;
-        doc.changed = null;
-      }
-    } else {
-      query.file = doc.name;
-    }
-    for (var name in ts.docs) {
-      var cur = ts.docs[name];
-      if (cur.changed && cur != doc) {
-        files.push({type: "full", name: cur.name, text: docValue(ts, cur)});
-        cur.changed = null;
-      }
-    }
-
-    return {query: query, files: files};
-  }
-
-  function getFragmentAround(data, start, end) {
-    var doc = data.doc;
-    var minIndent = null, minLine = null, endLine, tabSize = 4;
-    for (var p = start.line - 1, min = Math.max(0, p - 50); p >= min; --p) {
-      var line = doc.getLine(p), fn = line.search(/\bfunction\b/);
-      if (fn < 0) continue;
-      var indent = CodeMirror.countColumn(line, null, tabSize);
-      if (minIndent != null && minIndent <= indent) continue;
-      minIndent = indent;
-      minLine = p;
-    }
-    if (minLine == null) minLine = min;
-    var max = Math.min(doc.lastLine(), end.line + 20);
-    if (minIndent == null || minIndent == CodeMirror.countColumn(doc.getLine(start.line), null, tabSize))
-      endLine = max;
-    else for (endLine = end.line + 1; endLine < max; ++endLine) {
-      var indent = CodeMirror.countColumn(doc.getLine(endLine), null, tabSize);
-      if (indent <= minIndent) break;
-    }
-    var from = Pos(minLine, 0);
-
-    return {type: "part",
-            name: data.name,
-            offsetLines: from.line,
-            text: doc.getRange(from, Pos(endLine, 0))};
-  }
-
-  // Generic utilities
-
-  var cmpPos = CodeMirror.cmpPos;
-
-  function elt(tagname, cls /*, ... elts*/) {
-    var e = document.createElement(tagname);
-    if (cls) e.className = cls;
-    for (var i = 2; i < arguments.length; ++i) {
-      var elt = arguments[i];
-      if (typeof elt == "string") elt = document.createTextNode(elt);
-      e.appendChild(elt);
-    }
-    return e;
-  }
-
-  function dialog(cm, text, f) {
-    if (cm.openDialog)
-      cm.openDialog(text + ": ", f);
-    else
-      f(prompt(text, ""));
-  }
-
-  // Tooltips
-
-  function tempTooltip(cm, content, ts) {
-    if (cm.state.ternTooltip) remove(cm.state.ternTooltip);
-    var where = cm.cursorCoords();
-    var tip = cm.state.ternTooltip = makeTooltip(where.right + 1, where.bottom, content);
-    function maybeClear() {
-      old = true;
-      if (!mouseOnTip) clear();
-    }
-    function clear() {
-      cm.state.ternTooltip = null;
-      if (!tip.parentNode) return;
-      cm.off("cursorActivity", clear);
-      cm.off('blur', clear);
-      cm.off('scroll', clear);
-      fadeOut(tip);
-    }
-    var mouseOnTip = false, old = false;
-    CodeMirror.on(tip, "mousemove", function() { mouseOnTip = true; });
-    CodeMirror.on(tip, "mouseout", function(e) {
-      if (!CodeMirror.contains(tip, e.relatedTarget || e.toElement)) {
-        if (old) clear();
-        else mouseOnTip = false;
-      }
-    });
-    setTimeout(maybeClear, ts.options.hintDelay ? ts.options.hintDelay : 1700);
-    cm.on("cursorActivity", clear);
-    cm.on('blur', clear);
-    cm.on('scroll', clear);
-  }
-
-  function makeTooltip(x, y, content) {
-    var node = elt("div", cls + "tooltip", content);
-    node.style.left = x + "px";
-    node.style.top = y + "px";
-    document.body.appendChild(node);
-    return node;
-  }
-
-  function remove(node) {
-    var p = node && node.parentNode;
-    if (p) p.removeChild(node);
-  }
-
-  function fadeOut(tooltip) {
-    tooltip.style.opacity = "0";
-    setTimeout(function() { remove(tooltip); }, 1100);
-  }
-
-  function showError(ts, cm, msg) {
-    if (ts.options.showError)
-      ts.options.showError(cm, msg);
-    else
-      tempTooltip(cm, String(msg), ts);
-  }
-
-  function closeArgHints(ts) {
-    if (ts.activeArgHints) { remove(ts.activeArgHints); ts.activeArgHints = null; }
-  }
-
-  function docValue(ts, doc) {
-    var val = doc.doc.getValue();
-    if (ts.options.fileFilter) val = ts.options.fileFilter(val, doc.name, doc.doc);
-    return val;
-  }
-
-  // Worker wrapper
-
-  function WorkerServer(ts) {
-    var worker = ts.worker = new Worker(ts.options.workerScript);
-    worker.postMessage({type: "init",
-                        defs: ts.options.defs,
-                        plugins: ts.options.plugins,
-                        scripts: ts.options.workerDeps});
-    var msgId = 0, pending = {};
-
-    function send(data, c) {
-      if (c) {
-        data.id = ++msgId;
-        pending[msgId] = c;
-      }
-      worker.postMessage(data);
-    }
-    worker.onmessage = function(e) {
-      var data = e.data;
-      if (data.type == "getFile") {
-        getFile(ts, data.name, function(err, text) {
-          send({type: "getFile", err: String(err), text: text, id: data.id});
-        });
-      } else if (data.type == "debug") {
-        window.console.log(data.message);
-      } else if (data.id && pending[data.id]) {
-        pending[data.id](data.err, data.body);
-        delete pending[data.id];
-      }
-    };
-    worker.onerror = function(e) {
-      for (var id in pending) pending[id](e);
-      pending = {};
-    };
-
-    this.addFile = function(name, text) { send({type: "add", name: name, text: text}); };
-    this.delFile = function(name) { send({type: "del", name: name}); };
-    this.request = function(body, c) { send({type: "req", body: body}, c); };
-  }
-});
diff --git a/www/code/codemirror-5.7/addon/tern/worker.js b/www/code/codemirror-5.7/addon/tern/worker.js
deleted file mode 100644
index 887f906a4..000000000
--- a/www/code/codemirror-5.7/addon/tern/worker.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// declare global: tern, server
-
-var server;
-
-this.onmessage = function(e) {
-  var data = e.data;
-  switch (data.type) {
-  case "init": return startServer(data.defs, data.plugins, data.scripts);
-  case "add": return server.addFile(data.name, data.text);
-  case "del": return server.delFile(data.name);
-  case "req": return server.request(data.body, function(err, reqData) {
-    postMessage({id: data.id, body: reqData, err: err && String(err)});
-  });
-  case "getFile":
-    var c = pending[data.id];
-    delete pending[data.id];
-    return c(data.err, data.text);
-  default: throw new Error("Unknown message type: " + data.type);
-  }
-};
-
-var nextId = 0, pending = {};
-function getFile(file, c) {
-  postMessage({type: "getFile", name: file, id: ++nextId});
-  pending[nextId] = c;
-}
-
-function startServer(defs, plugins, scripts) {
-  if (scripts) importScripts.apply(null, scripts);
-
-  server = new tern.Server({
-    getFile: getFile,
-    async: true,
-    defs: defs,
-    plugins: plugins
-  });
-}
-
-this.console = {
-  log: function(v) { postMessage({type: "debug", message: v}); }
-};
diff --git a/www/code/codemirror-5.7/addon/wrap/hardwrap.js b/www/code/codemirror-5.7/addon/wrap/hardwrap.js
deleted file mode 100644
index fe9b4dd66..000000000
--- a/www/code/codemirror-5.7/addon/wrap/hardwrap.js
+++ /dev/null
@@ -1,139 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-
-  function findParagraph(cm, pos, options) {
-    var startRE = options.paragraphStart || cm.getHelper(pos, "paragraphStart");
-    for (var start = pos.line, first = cm.firstLine(); start > first; --start) {
-      var line = cm.getLine(start);
-      if (startRE && startRE.test(line)) break;
-      if (!/\S/.test(line)) { ++start; break; }
-    }
-    var endRE = options.paragraphEnd || cm.getHelper(pos, "paragraphEnd");
-    for (var end = pos.line + 1, last = cm.lastLine(); end <= last; ++end) {
-      var line = cm.getLine(end);
-      if (endRE && endRE.test(line)) { ++end; break; }
-      if (!/\S/.test(line)) break;
-    }
-    return {from: start, to: end};
-  }
-
-  function findBreakPoint(text, column, wrapOn, killTrailingSpace) {
-    for (var at = column; at > 0; --at)
-      if (wrapOn.test(text.slice(at - 1, at + 1))) break;
-    if (at == 0) at = column;
-    var endOfText = at;
-    if (killTrailingSpace)
-      while (text.charAt(endOfText - 1) == " ") --endOfText;
-    return {from: endOfText, to: at};
-  }
-
-  function wrapRange(cm, from, to, options) {
-    from = cm.clipPos(from); to = cm.clipPos(to);
-    var column = options.column || 80;
-    var wrapOn = options.wrapOn || /\s\S|-[^\.\d]/;
-    var killTrailing = options.killTrailingSpace !== false;
-    var changes = [], curLine = "", curNo = from.line;
-    var lines = cm.getRange(from, to, false);
-    if (!lines.length) return null;
-    var leadingSpace = lines[0].match(/^[ \t]*/)[0];
-
-    for (var i = 0; i < lines.length; ++i) {
-      var text = lines[i], oldLen = curLine.length, spaceInserted = 0;
-      if (curLine && text && !wrapOn.test(curLine.charAt(curLine.length - 1) + text.charAt(0))) {
-        curLine += " ";
-        spaceInserted = 1;
-      }
-      var spaceTrimmed = "";
-      if (i) {
-        spaceTrimmed = text.match(/^\s*/)[0];
-        text = text.slice(spaceTrimmed.length);
-      }
-      curLine += text;
-      if (i) {
-        var firstBreak = curLine.length > column && leadingSpace == spaceTrimmed &&
-          findBreakPoint(curLine, column, wrapOn, killTrailing);
-        // If this isn't broken, or is broken at a different point, remove old break
-        if (!firstBreak || firstBreak.from != oldLen || firstBreak.to != oldLen + spaceInserted) {
-          changes.push({text: [spaceInserted ? " " : ""],
-                        from: Pos(curNo, oldLen),
-                        to: Pos(curNo + 1, spaceTrimmed.length)});
-        } else {
-          curLine = leadingSpace + text;
-          ++curNo;
-        }
-      }
-      while (curLine.length > column) {
-        var bp = findBreakPoint(curLine, column, wrapOn, killTrailing);
-        changes.push({text: ["", leadingSpace],
-                      from: Pos(curNo, bp.from),
-                      to: Pos(curNo, bp.to)});
-        curLine = leadingSpace + curLine.slice(bp.to);
-        ++curNo;
-      }
-    }
-    if (changes.length) cm.operation(function() {
-      for (var i = 0; i < changes.length; ++i) {
-        var change = changes[i];
-        cm.replaceRange(change.text, change.from, change.to);
-      }
-    });
-    return changes.length ? {from: changes[0].from, to: CodeMirror.changeEnd(changes[changes.length - 1])} : null;
-  }
-
-  CodeMirror.defineExtension("wrapParagraph", function(pos, options) {
-    options = options || {};
-    if (!pos) pos = this.getCursor();
-    var para = findParagraph(this, pos, options);
-    return wrapRange(this, Pos(para.from, 0), Pos(para.to - 1), options);
-  });
-
-  CodeMirror.commands.wrapLines = function(cm) {
-    cm.operation(function() {
-      var ranges = cm.listSelections(), at = cm.lastLine() + 1;
-      for (var i = ranges.length - 1; i >= 0; i--) {
-        var range = ranges[i], span;
-        if (range.empty()) {
-          var para = findParagraph(cm, range.head, {});
-          span = {from: Pos(para.from, 0), to: Pos(para.to - 1)};
-        } else {
-          span = {from: range.from(), to: range.to()};
-        }
-        if (span.to.line >= at) continue;
-        at = span.from.line;
-        wrapRange(cm, span.from, span.to, {});
-      }
-    });
-  };
-
-  CodeMirror.defineExtension("wrapRange", function(from, to, options) {
-    return wrapRange(this, from, to, options || {});
-  });
-
-  CodeMirror.defineExtension("wrapParagraphsInRange", function(from, to, options) {
-    options = options || {};
-    var cm = this, paras = [];
-    for (var line = from.line; line <= to.line;) {
-      var para = findParagraph(cm, Pos(line, 0), options);
-      paras.push(para);
-      line = para.to;
-    }
-    var madeChange = false;
-    if (paras.length) cm.operation(function() {
-      for (var i = paras.length - 1; i >= 0; --i)
-        madeChange = madeChange || wrapRange(cm, Pos(paras[i].from, 0), Pos(paras[i].to - 1), options);
-    });
-    return madeChange;
-  });
-});
diff --git a/www/code/codemirror-5.7/bin/authors.sh b/www/code/codemirror-5.7/bin/authors.sh
deleted file mode 100644
index b3ee99c6d..000000000
--- a/www/code/codemirror-5.7/bin/authors.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Combine existing list of authors with everyone known in git, sort, add header.
-tail --lines=+3 AUTHORS > AUTHORS.tmp
-git log --format='%aN' >> AUTHORS.tmp
-echo -e "List of CodeMirror contributors. Updated before every release.\n" > AUTHORS
-sort -u AUTHORS.tmp >> AUTHORS
-rm -f AUTHORS.tmp
diff --git a/www/code/codemirror-5.7/bin/compress b/www/code/codemirror-5.7/bin/compress
deleted file mode 100644
index 809fbe83d..000000000
--- a/www/code/codemirror-5.7/bin/compress
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env node
-
-// Compression helper for CodeMirror
-//
-// Example:
-//
-//   bin/compress codemirror runmode javascript xml
-//
-// Will take lib/codemirror.js, addon/runmode/runmode.js,
-// mode/javascript/javascript.js, and mode/xml/xml.js, run them though
-// the online minifier at http://marijnhaverbeke.nl/uglifyjs, and spit
-// out the result.
-//
-//   bin/compress codemirror --local /path/to/bin/UglifyJS
-//
-// Will use a local minifier instead of the online default one.
-//
-// Script files are specified without .js ending. Prefixing them with
-// their full (local) path is optional. So you may say lib/codemirror
-// or mode/xml/xml to be more precise. In fact, even the .js suffix
-// may be speficied, if wanted.
-
-"use strict";
-
-var fs = require("fs");
-
-function help(ok) {
-  console.log("usage: " + process.argv[1] + " [--local /path/to/uglifyjs] files...");
-  process.exit(ok ? 0 : 1);
-}
-
-var local = null, args = [], extraArgs = null, files = [], blob = "";
-
-for (var i = 2; i < process.argv.length; ++i) {
-  var arg = process.argv[i];
-  if (arg == "--local" && i + 1 < process.argv.length) {
-    var parts = process.argv[++i].split(/\s+/);
-    local = parts[0];
-    extraArgs = parts.slice(1);
-    if (!extraArgs.length) extraArgs = ["-c", "-m"];
-  } else if (arg == "--help") {
-    help(true);
-  } else if (arg[0] != "-") {
-    files.push({name: arg, re: new RegExp("(?:\\/|^)" + arg + (/\.js$/.test(arg) ? "$" : "\\.js$"))});
-  } else help(false);
-}
-
-function walk(dir) {
-  fs.readdirSync(dir).forEach(function(fname) {
-    if (/^[_\.]/.test(fname)) return;
-    var file = dir + fname;
-    if (fs.statSync(file).isDirectory()) return walk(file + "/");
-    if (files.some(function(spec, i) {
-      var match = spec.re.test(file);
-      if (match) files.splice(i, 1);
-      return match;
-    })) {
-      if (local) args.push(file);
-      else blob += fs.readFileSync(file, "utf8");
-    }
-  });
-}
-
-walk("lib/");
-walk("addon/");
-walk("mode/");
-
-if (!local && !blob) help(false);
-
-if (files.length) {
-  console.log("Some speficied files were not found: " +
-              files.map(function(a){return a.name;}).join(", "));
-  process.exit(1);
-}
-  
-if (local) {
-  require("child_process").spawn(local, args.concat(extraArgs), {stdio: ["ignore", process.stdout, process.stderr]});
-} else {
-  var data = new Buffer("js_code=" + require("querystring").escape(blob), "utf8");
-  var req = require("http").request({
-    host: "marijnhaverbeke.nl",
-    port: 80,
-    method: "POST",
-    path: "/uglifyjs",
-    headers: {"content-type": "application/x-www-form-urlencoded",
-              "content-length": data.length}
-  });
-  req.on("response", function(resp) {
-    resp.on("data", function (chunk) { process.stdout.write(chunk); });
-  });
-  req.end(data);
-}
diff --git a/www/code/codemirror-5.7/bin/lint b/www/code/codemirror-5.7/bin/lint
deleted file mode 100644
index 47f45f367..000000000
--- a/www/code/codemirror-5.7/bin/lint
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-process.exit(require("../test/lint").ok ? 0 : 1);
diff --git a/www/code/codemirror-5.7/bin/release b/www/code/codemirror-5.7/bin/release
deleted file mode 100644
index b782739fa..000000000
--- a/www/code/codemirror-5.7/bin/release
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env node
-
-var fs = require("fs"), child = require("child_process");
-
-var number, bumpOnly;
-
-for (var i = 2; i < process.argv.length; i++) {
-  if (process.argv[i] == "-bump") bumpOnly = true;
-  else if (/^\d+\.\d+\.\d+$/.test(process.argv[i])) number = process.argv[i];
-  else { console.log("Bogus command line arg: " + process.argv[i]); process.exit(1); }
-}
-
-if (!number) { console.log("Must give a version"); process.exit(1); }
-
-function rewrite(file, f) {
-  fs.writeFileSync(file, f(fs.readFileSync(file, "utf8")), "utf8");
-}
-
-rewrite("lib/codemirror.js", function(lib) {
-  return lib.replace(/CodeMirror\.version = "\d+\.\d+\.\d+"/,
-                     "CodeMirror.version = \"" + number + "\"");
-});
-function rewriteJSON(pack) {
-  return pack.replace(/"version":"\d+\.\d+\.\d+"/, "\"version\":\"" + number + "\"");
-}
-rewrite("package.json", rewriteJSON);
-rewrite("doc/manual.html", function(manual) {
-  return manual.replace(/>version \d+\.\d+\.\d+<\/span>/, ">version " + number + "");
-});
-
-if (bumpOnly) process.exit(0);
-
-child.exec("bash bin/authors.sh", function(){});
-
-var simple = number.slice(0, number.lastIndexOf("."));
-
-rewrite("doc/compress.html", function(cmp) {
-  return cmp.replace(/\n        ");
-});
-
-rewrite("index.html", function(index) {
-  return index.replace(/\.zip">\d+\.\d+<\/a>/,
-                       ".zip\">" + simple + "");
-});
diff --git a/www/code/codemirror-5.7/bin/source-highlight b/www/code/codemirror-5.7/bin/source-highlight
deleted file mode 100644
index 6d15f1ae3..000000000
--- a/www/code/codemirror-5.7/bin/source-highlight
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env node
-
-// Simple command-line code highlighting tool. Reads code from stdin,
-// spits html to stdout. For example:
-//
-//   echo 'function foo(a) { return a; }' | bin/source-highlight -s javascript
-//   bin/source-highlight -s 
-
-var fs = require("fs");
-
-var CodeMirror = require("../addon/runmode/runmode.node.js");
-require("../mode/meta.js");
-
-var sPos = process.argv.indexOf("-s");
-if (sPos == -1 || sPos == process.argv.length - 1) {
-   console.error("Usage: source-highlight -s language");
-   process.exit(1);
-}
-var lang = process.argv[sPos + 1].toLowerCase(), modeName = lang;
-CodeMirror.modeInfo.forEach(function(info) {
-  if (info.mime == lang) {
-    modeName = info.mode;
-  } else if (info.name.toLowerCase() == lang) {
-    modeName = info.mode;
-    lang = info.mime;
-  }
-});
-
-if (!CodeMirror.modes[modeName])
-  require("../mode/" + modeName + "/" + modeName + ".js");
-
-function esc(str) {
-  return str.replace(/[<&]/g, function(ch) { return ch == "&" ? "&" : "<"; });
-}
-
-var code = fs.readFileSync("/dev/stdin", "utf8");
-var curStyle = null, accum = "";
-function flush() {
-  if (curStyle) process.stdout.write("" + esc(accum) + "");
-  else process.stdout.write(esc(accum));
-}
-
-CodeMirror.runMode(code, lang, function(text, style) {
-  if (style != curStyle) {
-    flush();
-    curStyle = style; accum = text;
-  } else {
-    accum += text;
-  }
-});
-flush();
diff --git a/www/code/codemirror-5.7/bower.json b/www/code/codemirror-5.7/bower.json
deleted file mode 100644
index 903d9f55f..000000000
--- a/www/code/codemirror-5.7/bower.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "codemirror",
-  "main": ["lib/codemirror.js", "lib/codemirror.css"],
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "components",
-    "bin",
-    "demo",
-    "doc",
-    "test",
-    "index.html",
-    "package.json",
-    "mode/*/*test.js",
-    "mode/*/*.html"
-  ]
-}
diff --git a/www/code/codemirror-5.7/demo/activeline.html b/www/code/codemirror-5.7/demo/activeline.html
deleted file mode 100644
index 741f6c45a..000000000
--- a/www/code/codemirror-5.7/demo/activeline.html
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-CodeMirror: Active Line Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Active Line Demo
    
-
    
-
-    
-
-    
    Styling the current cursor line.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/anywordhint.html b/www/code/codemirror-5.7/demo/anywordhint.html
deleted file mode 100644
index 0a7caece2..000000000
--- a/www/code/codemirror-5.7/demo/anywordhint.html
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-CodeMirror: Any Word Completion Demo
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Any Word Completion Demo
    
-
    
-
-
    Press ctrl-space to activate autocompletion. The
-completion uses
-the anyword-hint.js
-module, which simply looks at nearby words in the buffer and completes
-to those.
    
-
-    
-  
    
diff --git a/www/code/codemirror-5.7/demo/bidi.html b/www/code/codemirror-5.7/demo/bidi.html
deleted file mode 100644
index 6dd73bec3..000000000
--- a/www/code/codemirror-5.7/demo/bidi.html
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-CodeMirror: Bi-directional Text Demo
-
-
-
-
-
-
-
-
-
-
    
-
    Bi-directional Text Demo
    
-
    
-
-    
-
-  
    Demonstration of bi-directional text support. See
-  the related
-  blog post for more background.
    
-
-  
    Note: There is
-  a known
-  bug with cursor motion and mouse clicks in bi-directional lines
-  that are line wrapped.
    
-
-
    
diff --git a/www/code/codemirror-5.7/demo/btree.html b/www/code/codemirror-5.7/demo/btree.html
deleted file mode 100644
index fc4997f4f..000000000
--- a/www/code/codemirror-5.7/demo/btree.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-CodeMirror: B-Tree visualization
-
-
-
-
-
-
-
-
-
    
-
    B-Tree visualization
    
-
    
-      
    
-      
    
-    
    
-
-    
-
-
    
-
-  
diff --git a/www/code/codemirror-5.7/demo/buffers.html b/www/code/codemirror-5.7/demo/buffers.html
deleted file mode 100644
index 16ffc7dfe..000000000
--- a/www/code/codemirror-5.7/demo/buffers.html
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-CodeMirror: Multiple Buffer & Split View Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Multiple Buffer & Split View Demo
    
-
-
-    
    
-    
    
-      Select buffer: 
-          
-    
    
-    
    
-    
    
-      Select buffer: 
-          
-    
    
-
-    
-
-    
    Demonstration of
-    using linked documents
-    to provide a split view on a document, and
-    using swapDoc
-    to use a single editor to display multiple documents.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/changemode.html b/www/code/codemirror-5.7/demo/changemode.html
deleted file mode 100644
index 9405932ab..000000000
--- a/www/code/codemirror-5.7/demo/changemode.html
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-CodeMirror: Mode-Changing Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Mode-Changing Demo
    
-
    
-
-
    On changes to the content of the above editor, a (crude) script
-tries to auto-detect the language used, and switches the editor to
-either JavaScript or Scheme mode based on that.
    
-
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/closebrackets.html b/www/code/codemirror-5.7/demo/closebrackets.html
deleted file mode 100644
index d702f5269..000000000
--- a/www/code/codemirror-5.7/demo/closebrackets.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-CodeMirror: Closebrackets Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Closebrackets Demo
    
-
    
-
-    
-  
    
diff --git a/www/code/codemirror-5.7/demo/closetag.html b/www/code/codemirror-5.7/demo/closetag.html
deleted file mode 100644
index 79959d2c4..000000000
--- a/www/code/codemirror-5.7/demo/closetag.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-CodeMirror: Close-Tag Demo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Close-Tag Demo
    
-
    
-
-    
-  
    
diff --git a/www/code/codemirror-5.7/demo/complete.html b/www/code/codemirror-5.7/demo/complete.html
deleted file mode 100644
index cdf49dbeb..000000000
--- a/www/code/codemirror-5.7/demo/complete.html
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-CodeMirror: Autocomplete Demo
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Autocomplete Demo
    
-
    
-
-
    Press ctrl-space to activate autocompletion. Built
-on top of the show-hint
-and javascript-hint
-addons.
    
-
-    
-  
    
diff --git a/www/code/codemirror-5.7/demo/emacs.html b/www/code/codemirror-5.7/demo/emacs.html
deleted file mode 100644
index c626b8d40..000000000
--- a/www/code/codemirror-5.7/demo/emacs.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-CodeMirror: Emacs bindings demo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Emacs bindings demo
    
-
    
-
-
    The emacs keybindings are enabled by
-including keymap/emacs.js and setting
-the keyMap option to "emacs". Because
-CodeMirror's internal API is quite different from Emacs, they are only
-a loose approximation of actual emacs bindings, though.
    
-
-
    Also note that a lot of browsers disallow certain keys from being
-captured. For example, Chrome blocks both Ctrl-W and Ctrl-N, with the
-result that idiomatic use of Emacs keys will constantly close your tab
-or open a new window.
    
-
-    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/folding.html b/www/code/codemirror-5.7/demo/folding.html
deleted file mode 100644
index 81cbf9894..000000000
--- a/www/code/codemirror-5.7/demo/folding.html
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-  CodeMirror: Code Folding Demo
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-
-
-
-
-
    
-  
    Code Folding Demo
    
-  
    
-    
    JavaScript:
    
-    
    
-    
    HTML:
    
-    
    
-    
    Markdown:
    
-    
    
-  
    
-  
-
    
-
diff --git a/www/code/codemirror-5.7/demo/fullscreen.html b/www/code/codemirror-5.7/demo/fullscreen.html
deleted file mode 100644
index 1fbdc488e..000000000
--- a/www/code/codemirror-5.7/demo/fullscreen.html
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-CodeMirror: Full Screen Editing
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Full Screen Editing
    
-
    
-  
-
-    
    Demonstration of
-    the fullscreen
-    addon. Press F11 when cursor is in the editor to
-    toggle full screen editing. Esc can also be used
-    to exit full screen editing.
    
-  
    
diff --git a/www/code/codemirror-5.7/demo/hardwrap.html b/www/code/codemirror-5.7/demo/hardwrap.html
deleted file mode 100644
index f1a870b41..000000000
--- a/www/code/codemirror-5.7/demo/hardwrap.html
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-CodeMirror: Hard-wrapping Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Hard-wrapping Demo
    
-
    
-
-
    Demonstration of
-the hardwrap addon.
-The above editor has its change event hooked up to
-the wrapParagraphsInRange method, so that the paragraphs
-are reflown as you are typing.
    
-
-
-
-
    
diff --git a/www/code/codemirror-5.7/demo/html5complete.html b/www/code/codemirror-5.7/demo/html5complete.html
deleted file mode 100644
index 411baae3e..000000000
--- a/www/code/codemirror-5.7/demo/html5complete.html
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-  CodeMirror: HTML completion demo
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-
-
-  
-
-  
    
-    
    HTML completion demo
    
-
-    
    Shows the XML completer
-    parameterized with information about the tags in HTML.
-    Press ctrl-space to activate completion.
    
-
-    
    
-
-    
-  
    
-
diff --git a/www/code/codemirror-5.7/demo/indentwrap.html b/www/code/codemirror-5.7/demo/indentwrap.html
deleted file mode 100644
index 3d3d0af6a..000000000
--- a/www/code/codemirror-5.7/demo/indentwrap.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-CodeMirror: Indented wrapped line demo
-
-
-
-
-
-
-
-
-
-
    
-
    Indented wrapped line demo
    
-
    
-
-    
    This page uses a hack on top of the "renderLine"
-    event to make wrapped text line up with the base indentation of
-    the line.
    
-
-    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/lint.html b/www/code/codemirror-5.7/demo/lint.html
deleted file mode 100644
index 29936a8d9..000000000
--- a/www/code/codemirror-5.7/demo/lint.html
+++ /dev/null
@@ -1,171 +0,0 @@
-
-
-CodeMirror: Linter Demo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Linter Demo
    
-
-
-    
    
-
-    
    
-
-    
    
-
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/loadmode.html b/www/code/codemirror-5.7/demo/loadmode.html
deleted file mode 100644
index 809cd9022..000000000
--- a/www/code/codemirror-5.7/demo/loadmode.html
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-CodeMirror: Lazy Mode Loading Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Lazy Mode Loading Demo
    
-
    Current mode: text/plain
    
-
    
-
    Filename, mime, or mode name:  
    
-
-    
-  
    
diff --git a/www/code/codemirror-5.7/demo/marker.html b/www/code/codemirror-5.7/demo/marker.html
deleted file mode 100644
index 3a8b85000..000000000
--- a/www/code/codemirror-5.7/demo/marker.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-CodeMirror: Breakpoint Demo
-
-
-
-
-
-
-
-
-
-
    
-
    Breakpoint Demo
    
-
    
-
-
    Click the line-number gutter to add or remove 'breakpoints'.
    
-
-    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/markselection.html b/www/code/codemirror-5.7/demo/markselection.html
deleted file mode 100644
index d4c8a7a0d..000000000
--- a/www/code/codemirror-5.7/demo/markselection.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-CodeMirror: Selection Marking Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Selection Marking Demo
    
-
    
-
-    
-
-    
    Simple addon to easily mark (and style) selected text. Docs.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/matchhighlighter.html b/www/code/codemirror-5.7/demo/matchhighlighter.html
deleted file mode 100644
index c60109009..000000000
--- a/www/code/codemirror-5.7/demo/matchhighlighter.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-CodeMirror: Match Highlighter Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Match Highlighter Demo
    
-
    
-
-    
-
-    
    Search and highlight occurences of the selected text.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/matchtags.html b/www/code/codemirror-5.7/demo/matchtags.html
deleted file mode 100644
index 175639a39..000000000
--- a/www/code/codemirror-5.7/demo/matchtags.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-CodeMirror: Tag Matcher Demo
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Tag Matcher Demo
    
-
-
-    
    
-
-    
-
-    
    Put the cursor on or inside a pair of tags to highlight them.
-    Press Ctrl-J to jump to the tag that matches the one under the
-    cursor.
    
-  
    
diff --git a/www/code/codemirror-5.7/demo/merge.html b/www/code/codemirror-5.7/demo/merge.html
deleted file mode 100644
index c60e65329..000000000
--- a/www/code/codemirror-5.7/demo/merge.html
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-CodeMirror: merge view demo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    merge view demo
    
-
-
-
    
-
-
    The merge
-addon provides an interface for displaying and merging diffs,
-either two-way
-or three-way.
-The left (or center) pane is editable, and the differences with the
-other pane(s) are optionally shown live as you edit
-it. In the two-way configuration, there are also options to pad changed
-sections to align them, and to collapse unchanged
-stretches of text.
    
-
-
    This addon depends on
-the google-diff-match-patch
-library to compute the diffs.
    
-
-
-
    
diff --git a/www/code/codemirror-5.7/demo/multiplex.html b/www/code/codemirror-5.7/demo/multiplex.html
deleted file mode 100644
index ca8c80aed..000000000
--- a/www/code/codemirror-5.7/demo/multiplex.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-CodeMirror: Multiplexing Parser Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Multiplexing Parser Demo
    
-
    
-
-    
-
-    
    Demonstration of a multiplexing mode, which, at certain
-    boundary strings, switches to one or more inner modes. The out
-    (HTML) mode does not get fed the content of the <<
-    >> blocks. See
-    the manual and
-    the source for more
-    information.
    
-
-    
    
-      Parsing/Highlighting Tests:
-      normal,
-      verbose.
-    
    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/mustache.html b/www/code/codemirror-5.7/demo/mustache.html
deleted file mode 100644
index ae4e6a891..000000000
--- a/www/code/codemirror-5.7/demo/mustache.html
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-CodeMirror: Overlay Parser Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Overlay Parser Demo
    
-
    
-
-    
-
-    
    Demonstration of a mode that parses HTML, highlighting
-    the Mustache templating
-    directives inside of it by using the code
-    in overlay.js. View
-    source to see the 15 lines of code needed to accomplish this.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/panel.html b/www/code/codemirror-5.7/demo/panel.html
deleted file mode 100644
index b3b0b7ca6..000000000
--- a/www/code/codemirror-5.7/demo/panel.html
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-CodeMirror: Panel Demo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
-
    Panel Demo
    
-
-
    
-    
-
    
-
-
    
-  The panel
-  addon allows you to display panels above or below an editor.
-  
    
-  Click the links below to add panels at the given position:
-
    
-
-
    
-
    
-  top
-  after-top
-  before-bottom
-  bottom
-
    
-
    
-  You can also replace an existing panel:
-
    
-
    
-  
-  
-
    
-
-
-
-
    
-
-
    
diff --git a/www/code/codemirror-5.7/demo/placeholder.html b/www/code/codemirror-5.7/demo/placeholder.html
deleted file mode 100644
index 432331a48..000000000
--- a/www/code/codemirror-5.7/demo/placeholder.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-CodeMirror: Placeholder demo
-
-
-
-
-
-
-
-
-
-
    
-
    Placeholder demo
    
-
    
-
-    
    The placeholder
-    plug-in adds an option placeholder that can be set to
-    make text appear in the editor when it is empty and not focused.
-    If the source textarea has a placeholder attribute,
-    it will automatically be inherited.
    
-
-    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/preview.html b/www/code/codemirror-5.7/demo/preview.html
deleted file mode 100644
index 19e1530b8..000000000
--- a/www/code/codemirror-5.7/demo/preview.html
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-CodeMirror: HTML5 preview
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    HTML5 preview
    
-
-    
-    
-    
-  
    
diff --git a/www/code/codemirror-5.7/demo/requirejs.html b/www/code/codemirror-5.7/demo/requirejs.html
deleted file mode 100644
index 438ef9fbf..000000000
--- a/www/code/codemirror-5.7/demo/requirejs.html
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-  CodeMirror: HTML completion demo
-  
-  
-
-  
-  
-  
-  
-
-
-
-  
-
-  
    
-    
    RequireJS module loading demo
    
-
-    
    This demo does the same thing as
-    the HTML5 completion demo, but
-    loads its dependencies
-    with Require.js, rather than
-    explicitly. Press ctrl-space to activate
-    completion.
    
-
-    
    
-
-    
-
-    
-  
    
-
diff --git a/www/code/codemirror-5.7/demo/resize.html b/www/code/codemirror-5.7/demo/resize.html
deleted file mode 100644
index 1c1ef390a..000000000
--- a/www/code/codemirror-5.7/demo/resize.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-CodeMirror: Autoresize Demo
-
-
-
-
-
-
-
-
-
-
    
-
    Autoresize Demo
    
-
    
-
-
    By setting an editor's height style
-to auto and giving
-the viewportMargin
-a value of Infinity, CodeMirror can be made to
-automatically resize to fit its content.
    
-
-    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/rulers.html b/www/code/codemirror-5.7/demo/rulers.html
deleted file mode 100644
index 2ac411158..000000000
--- a/www/code/codemirror-5.7/demo/rulers.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-CodeMirror: Ruler Demo
-
-
-
-
-
-
-
-
-
-
    
-
    Ruler Demo
    
-
-
-
-
    Demonstration of
-the rulers addon, which
-displays vertical lines at given column offsets.
    
-
-
    
diff --git a/www/code/codemirror-5.7/demo/runmode.html b/www/code/codemirror-5.7/demo/runmode.html
deleted file mode 100644
index 257f03d6b..000000000
--- a/www/code/codemirror-5.7/demo/runmode.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-CodeMirror: Mode Runner Demo
-
-
-
-
-
-
-
-
-
-
    
-
    Mode Runner Demo
    
-
-
-    
    
-    
-    
    
-
-    
-
-    
    Running a CodeMirror mode outside of the editor.
-    The CodeMirror.runMode function, defined
-    in lib/runmode.js takes the following arguments:
    
-
-    
    
-      
    text (string)
    
-      
    The document to run through the highlighter.
    
-      
    mode (mode spec)
    
-      
    The mode to use (must be loaded as normal).
    
-      
    output (function or DOM node)
    
-      
    If this is a function, it will be called for each token with
-      two arguments, the token's text and the token's style class (may
-      be null for unstyled tokens). If it is a DOM node,
-      the tokens will be converted to span elements as in
-      an editor, and inserted into the node
-      (through innerHTML).
    
-    
    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/search.html b/www/code/codemirror-5.7/demo/search.html
deleted file mode 100644
index 21c34251e..000000000
--- a/www/code/codemirror-5.7/demo/search.html
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-CodeMirror: Search/Replace Demo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Search/Replace Demo
    
-
    
-
-    
-
-    
    Demonstration of primitive search/replace functionality. The
-    keybindings (which can be configured with custom keymaps) are:
    
-    
    
-      
    Ctrl-F / Cmd-F
    Start searching
    
-      
    Ctrl-G / Cmd-G
    Find next
    
-      
    Shift-Ctrl-G / Shift-Cmd-G
    Find previous
    
-      
    Shift-Ctrl-F / Cmd-Option-F
    Replace
    
-      
    Shift-Ctrl-R / Shift-Cmd-Option-F
    Replace all
    
-      
    Alt-F
    Persistent search (dialog doesn't autoclose, enter to find next, shift-enter to find previous)
    
-    
    
-    
    Searching is enabled by
-    including addon/search/search.js
-    and addon/search/searchcursor.js.
-    For good-looking input dialogs, you also want to include
-    addon/dialog/dialog.js
-    and addon/dialog/dialog.css.
    
-  
    
diff --git a/www/code/codemirror-5.7/demo/simplemode.html b/www/code/codemirror-5.7/demo/simplemode.html
deleted file mode 100644
index 49778ef1e..000000000
--- a/www/code/codemirror-5.7/demo/simplemode.html
+++ /dev/null
@@ -1,186 +0,0 @@
-
-
-CodeMirror: Simple Mode Demo
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Simple Mode Demo
    
-
-
    The mode/simple
-addon allows CodeMirror modes to be specified using a relatively simple
-declarative format. This format is not as powerful as writing code
-directly against the mode
-interface, but is a lot easier to get started with, and
-sufficiently expressive for many simple language modes.
    
-
-
    This interface is still in flux. It is unlikely to be scrapped or
-overhauled completely, so do start writing code against it, but
-details might change as it stabilizes, and you might have to tweak
-your code when upgrading.
    
-
-
    Simple modes (loosely based on
-the Common
-JavaScript Syntax Highlighting Specification, which never took
-off), are state machines, where each state has a number of rules that
-match tokens. A rule describes a type of token that may occur in the
-current state, and possibly a transition to another state caused by
-that token.
    
-
-
    The CodeMirror.defineSimpleMode(name, states) method
-takes a mode name and an object that describes the mode's states. The
-editor below shows an example of such a mode (and is itself
-highlighted by the mode shown in it).
    
-
-
    
-
-
    Each state is an array of rules. A rule may have the following properties:
    
-
-
    
-  
    regex: string | RegExp
    
-  
    The regular expression that matches the token. May be a string
-  or a regex object. When a regex, the ignoreCase flag
-  will be taken into account when matching the token. This regex
-  should only capture groups when the token property is
-  an array.
    
-  
    token: string | null
    
-  
    An optional token style. Multiple styles can be specified by
-  separating them with dots or spaces. When the regex for
-  this rule captures groups, it must capture all of the
-  string (since JS provides no way to find out where a group matched),
-  and this property must hold an array of token styles that has one
-  style for each matched group.
    
-  
    sol: boolean
    
-  
    When true, this token will only match at the start of the line.
-  (The ^ regexp marker doesn't work as you'd expect in
-  this context because of limitations in JavaScript's RegExp
-  API.)
    
-  
    next: string
    
-  
    When a next property is present, the mode will
-  transfer to the state named by the property when the token is
-  encountered.
    
-  
    push: string
    
-  
    Like next, but instead replacing the current state
-  by the new state, the current state is kept on a stack, and can be
-  returned to with the pop directive.
    
-  
    pop: bool
    
-  
    When true, and there is another state on the state stack, will
-  cause the mode to pop that state off the stack and transition to
-  it.
    
-  
    mode: {spec, end, persistent}
    
-  
    Can be used to embed another mode inside a mode. When present,
-  must hold an object with a spec property that describes
-  the embedded mode, and an optional end end property
-  that specifies the regexp that will end the extent of the mode. When
-  a persistent property is set (and true), the nested
-  mode's state will be preserved between occurrences of the mode.
    
-  
    indent: bool
    
-  
    When true, this token changes the indentation to be one unit
-  more than the current line's indentation.
    
-  
    dedent: bool
    
-  
    When true, this token will pop one scope off the indentation
-  stack.
    
-  
    dedentIfLineStart: bool
    
-  
    If a token has its dedent property set, it will, by
-  default, cause lines where it appears at the start to be dedented.
-  Set this property to false to prevent that behavior.
    
-
    
-
-
    The meta property of the states object is special, and
-will not be interpreted as a state. Instead, properties set on it will
-be set on the mode, which is useful for properties
-like lineComment,
-which sets the comment style for a mode. The simple mode addon also
-recognizes a few such properties:
    
-
-
    
-  
    dontIndentStates: array<string>
    
-  
    An array of states in which the mode's auto-indentation should
-  not take effect. Usually used for multi-line comment and string
-  states.
    
-
    
-
-
-
-
-
-
    
diff --git a/www/code/codemirror-5.7/demo/simplescrollbars.html b/www/code/codemirror-5.7/demo/simplescrollbars.html
deleted file mode 100644
index 9d4093264..000000000
--- a/www/code/codemirror-5.7/demo/simplescrollbars.html
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-CodeMirror: Simple Scrollbar Demo
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Simple Scrollbar Demo
    
-
    
-
-
    The simplescrollbars addon defines two
-styles of non-native scrollbars: "simple" and "overlay" (click to try), which can be passed to
-the scrollbarStyle option. These implement
-the scrollbar using DOM elements, allowing more control over
-its appearance.
    
-
-  
-
    
diff --git a/www/code/codemirror-5.7/demo/spanaffectswrapping_shim.html b/www/code/codemirror-5.7/demo/spanaffectswrapping_shim.html
deleted file mode 100644
index 879d99b60..000000000
--- a/www/code/codemirror-5.7/demo/spanaffectswrapping_shim.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-CodeMirror: Automatically derive odd wrapping behavior for your browser
-
-
-
-
-
-
    
-
    Automatically derive odd wrapping behavior for your browser
    
-
-
-    
    This is a hack to automatically derive
-    a spanAffectsWrapping regexp for a browser. See the
-    comments above that variable
-    in lib/codemirror.js
-    for some more details.
    
-
-    
    
-    
    
-
-    
-  
    
diff --git a/www/code/codemirror-5.7/demo/sublime.html b/www/code/codemirror-5.7/demo/sublime.html
deleted file mode 100644
index 233dd83a4..000000000
--- a/www/code/codemirror-5.7/demo/sublime.html
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-CodeMirror: Sublime Text bindings demo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Sublime Text bindings demo
    
-
-
    The sublime keymap defines many Sublime Text-specific
-bindings for CodeMirror. See the code below for an overview.
    
-
-
    Enable the keymap by
-loading keymap/sublime.js
-and setting
-the keyMap
-option to "sublime".
    
-
-
    (A lot of the search functionality is still missing.)
-
-
-
-
    
diff --git a/www/code/codemirror-5.7/demo/tern.html b/www/code/codemirror-5.7/demo/tern.html
deleted file mode 100644
index d5badfef6..000000000
--- a/www/code/codemirror-5.7/demo/tern.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-CodeMirror: Tern Demo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Tern Demo
    
-
    
-
-
    Demonstrates integration of Tern
-and CodeMirror. The following keys are bound:
    
-
-
    
-  
    Ctrl-Space
    Autocomplete
    
-  
    Ctrl-O
    Find docs for the expression at the cursor
    
-  
    Ctrl-I
    Find type at cursor
    
-  
    Alt-.
    Jump to definition (Alt-, to jump back)
    
-  
    Ctrl-Q
    Rename variable
    
-  
    Ctrl-.
    Select all occurrences of a variable
    
-
    
-
-
    Documentation is sparse for now. See the top of
-the script for a rough API
-overview.
    
-
-
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/theme.html b/www/code/codemirror-5.7/demo/theme.html
deleted file mode 100644
index 3c6b1c07d..000000000
--- a/www/code/codemirror-5.7/demo/theme.html
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-CodeMirror: Theme Demo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Theme Demo
    
-
-
-
    Select a theme: 
-
    
-
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/trailingspace.html b/www/code/codemirror-5.7/demo/trailingspace.html
deleted file mode 100644
index 1992ba3ff..000000000
--- a/www/code/codemirror-5.7/demo/trailingspace.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-CodeMirror: Trailing Whitespace Demo
-
-
-
-
-
-
-
-
-
-
    
-
    Trailing Whitespace Demo
    
-
    
-
-    
-
-
    Uses
-the trailingspace
-addon to highlight trailing whitespace.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/variableheight.html b/www/code/codemirror-5.7/demo/variableheight.html
deleted file mode 100644
index d49942864..000000000
--- a/www/code/codemirror-5.7/demo/variableheight.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-CodeMirror: Variable Height Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Variable Height Demo
    
-
    
-    
-  
    
diff --git a/www/code/codemirror-5.7/demo/vim.html b/www/code/codemirror-5.7/demo/vim.html
deleted file mode 100644
index be4b85721..000000000
--- a/www/code/codemirror-5.7/demo/vim.html
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-CodeMirror: Vim bindings demo
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Vim bindings demo
    
-
    
-
    Key buffer: 
    
-
-
    The vim keybindings are enabled by including keymap/vim.js and setting the
-keyMap option to vim.
    
-
-
    Features
    
-
-
      
-  
    • All common motions and operators, including text objects
      • 
-  
    • Operator motion orthogonality
      • 
-  
    • Visual mode - characterwise, linewise, blockwise
      • 
-  
    • Full macro support (q, @)
      • 
-  
    • Incremental highlighted search (/, ?, #, *, g#, g*)
      • 
-  
    • Search/replace with confirm (:substitute, :%s)
      • 
-  
    • Search history
      • 
-  
    • Jump lists (Ctrl-o, Ctrl-i)
      • 
-  
    • Key/command mapping with API (:map, :nmap, :vmap)
      • 
-  
    • Sort (:sort)
      • 
-  
    • Marks (`, ')
      • 
-  
    • :global
      • 
-  
    • Insert mode behaves identical to base CodeMirror
      • 
-  
    • Cross-buffer yank/paste
      • 
-
    
-
-
    For the full list of key mappings and Ex commands, refer to the
-defaultKeymap and defaultExCommandMap at the
-top of keymap/vim.js.
-
-
    Note that while the vim mode tries to emulate the most useful
-features of vim as faithfully as possible, it does not strive to
-become a complete vim implementation
    
-
-    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/visibletabs.html b/www/code/codemirror-5.7/demo/visibletabs.html
deleted file mode 100644
index 2eec337ed..000000000
--- a/www/code/codemirror-5.7/demo/visibletabs.html
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-CodeMirror: Visible tabs demo
-
-
-
-
-
-
-
-
-
-
    
-
    Visible tabs demo
    
-
    
-
-
    Tabs inside the editor are spans with the
-class cm-tab, and can be styled.
    
-
-    
-
-  
    
diff --git a/www/code/codemirror-5.7/demo/widget.html b/www/code/codemirror-5.7/demo/widget.html
deleted file mode 100644
index da39a9297..000000000
--- a/www/code/codemirror-5.7/demo/widget.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-CodeMirror: Inline Widget Demo
-
-
-
-
-
-
-
-
-
-
-
    
-
    Inline Widget Demo
    
-
-
-    
    
-    
-
    This demo runs JSHint over the code
-in the editor (which is the script used on this page), and
-inserts line widgets to
-display the warnings that JSHint comes up with.
    
-  
    
diff --git a/www/code/codemirror-5.7/demo/xmlcomplete.html b/www/code/codemirror-5.7/demo/xmlcomplete.html
deleted file mode 100644
index bd452e6f6..000000000
--- a/www/code/codemirror-5.7/demo/xmlcomplete.html
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-CodeMirror: XML Autocomplete Demo
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    XML Autocomplete Demo
    
-
    
-
-    
    Press ctrl-space, or type a '<' character to
-    activate autocompletion. This demo defines a simple schema that
-    guides completion. The schema can be customized—see
-    the manual.
    
-
-    
    Development of the xml-hint addon was kindly
-    sponsored
-    by www.xperiment.mobi.
    
-
-    
-  
    
diff --git a/www/code/codemirror-5.7/doc/activebookmark.js b/www/code/codemirror-5.7/doc/activebookmark.js
deleted file mode 100644
index 407282d02..000000000
--- a/www/code/codemirror-5.7/doc/activebookmark.js
+++ /dev/null
@@ -1,57 +0,0 @@
-// Kludge in HTML5 tag recognition in IE8
-document.createElement("section");
-document.createElement("article");
-
-(function() {
-  if (!window.addEventListener) return;
-  var pending = false, prevVal = null;
-
-  function updateSoon() {
-    if (!pending) {
-      pending = true;
-      setTimeout(update, 250);
-    }
-  }
-
-  function update() {
-    pending = false;
-    var marks = document.getElementById("nav").getElementsByTagName("a"), found;
-    for (var i = 0; i < marks.length; ++i) {
-      var mark = marks[i], m;
-      if (mark.getAttribute("data-default")) {
-        if (found == null) found = i;
-      } else if (m = mark.href.match(/#(.*)/)) {
-        var ref = document.getElementById(m[1]);
-        if (ref && ref.getBoundingClientRect().top < 50)
-          found = i;
-      }
-    }
-    if (found != null && found != prevVal) {
-      prevVal = found;
-      var lis = document.getElementById("nav").getElementsByTagName("li");
-      for (var i = 0; i < lis.length; ++i) lis[i].className = "";
-      for (var i = 0; i < marks.length; ++i) {
-        if (found == i) {
-          marks[i].className = "active";
-          for (var n = marks[i]; n; n = n.parentNode)
-            if (n.nodeName == "LI") n.className = "active";
-        } else {
-          marks[i].className = "";
-        }
-      }
-    }
-  }
-
-  window.addEventListener("scroll", updateSoon);
-  window.addEventListener("load", updateSoon);
-  window.addEventListener("hashchange", function() {
-    setTimeout(function() {
-      var hash = document.location.hash, found = null, m;
-      var marks = document.getElementById("nav").getElementsByTagName("a");
-      for (var i = 0; i < marks.length; i++)
-        if ((m = marks[i].href.match(/(#.*)/)) && m[1] == hash) { found = i; break; }
-      if (found != null) for (var i = 0; i < marks.length; i++)
-        marks[i].className = i == found ? "active" : "";
-    }, 300);
-  });
-})();
diff --git a/www/code/codemirror-5.7/doc/compress.html b/www/code/codemirror-5.7/doc/compress.html
deleted file mode 100644
index 218cacc2f..000000000
--- a/www/code/codemirror-5.7/doc/compress.html
+++ /dev/null
@@ -1,334 +0,0 @@
-
-
-CodeMirror: Compression Helper
-
-
-
-
-
-
-
-
-
    
-
-
    Script compression helper
    
-
-    
    To optimize loading CodeMirror, especially when including a
-    bunch of different modes, it is recommended that you combine and
-    minify (and preferably also gzip) the scripts. This page makes
-    those first two steps very easy. Simply select the version and
-    scripts you need in the form below, and
-    click Compress to download the minified script
-    file.
    
-
-    
    
-      
-      
    Version: 
    
-
-      
-
-      
    
-         with UglifyJS
-      
    
-      
-      
    Custom code to add to the compressed file:
    
-    
    
-
-    
-
-
    
diff --git a/www/code/codemirror-5.7/doc/docs.css b/www/code/codemirror-5.7/doc/docs.css
deleted file mode 100644
index 881d2aa45..000000000
--- a/www/code/codemirror-5.7/doc/docs.css
+++ /dev/null
@@ -1,271 +0,0 @@
-@font-face {
-  font-family: 'Source Sans Pro';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Source Sans Pro'), local('SourceSansPro-Regular'), url(//themes.googleusercontent.com/static/fonts/sourcesanspro/v5/ODelI1aHBYDBqgeIAH2zlBM0YzuT7MdOe03otPbuUS0.woff) format('woff');
-}
-
-body, html { margin: 0; padding: 0; height: 100%; }
-section, article { display: block; padding: 0; }
-
-body {
-  background: #f8f8f8;
-  font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-}
-
-p { margin-top: 0; }
-
-h2, h3, h1 {
-  font-weight: normal;
-  margin-bottom: .7em;
-}
-h1 { font-size: 140%; }
-h2 { font-size: 120%; }
-h3 { font-size: 110%; }
-article > h2:first-child, section:first-child > h2 { margin-top: 0; }
-
-#nav h1 {
-  margin-right: 12px;
-  margin-top: 0;
-  margin-bottom: 2px;
-  color: #d30707;
-  letter-spacing: .5px;
-}
-
-a, a:visited, a:link, .quasilink {
-  color: #A21313;
-  text-decoration: none;
-}
-
-em {
-  padding-right: 2px;
-}
-
-.quasilink {
-  cursor: pointer;
-}
-
-article {
-  max-width: 700px;
-  margin: 0 0 0 160px;
-  border-left: 2px solid #E30808;
-  border-right: 1px solid #ddd;
-  padding: 30px 50px 100px 50px;
-  background: white;
-  z-index: 2;
-  position: relative;
-  min-height: 100%;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-}
-
-#nav {
-  position: fixed;
-  padding-top: 30px;
-  max-height: 100%;
-  box-sizing: -moz-border-box;
-  box-sizing: border-box;
-  overflow-y: auto;
-  left: 0; right: none;
-  width: 160px;
-  text-align: right;
-  z-index: 1;
-}
-
-@media screen and (min-width: 1000px) {
-  article {
-    margin: 0 auto;
-  }
-  #nav {
-    right: 50%;
-    width: auto;
-    border-right: 349px solid transparent;
-  }
-}
-
-#nav ul {
-  display: block;
-  margin: 0; padding: 0;
-  margin-bottom: 32px;
-}
-
-#nav li {
-  display: block;
-  margin-bottom: 4px;
-}
-
-#nav li ul {
-  font-size: 80%;
-  margin-bottom: 0;
-  display: none;
-}
-
-#nav li.active ul {
-  display: block;
-}
-
-#nav li li a {
-  padding-right: 20px;
-  display: inline-block;
-}
-
-#nav ul a {
-  color: black;
-  padding: 0 7px 1px 11px;
-}
-
-#nav ul a.active, #nav ul a:hover {
-  border-bottom: 1px solid #E30808;
-  margin-bottom: -1px;
-  color: #E30808;
-}
-
-#logo {
-  border: 0;
-  margin-right: 12px;
-  margin-bottom: 25px;
-}
-
-section {
-  border-top: 1px solid #E30808;
-  margin: 1.5em 0;
-}
-
-section.first {
-  border: none;
-  margin-top: 0;
-}
-
-#demo {
-  position: relative;
-}
-
-#demolist {
-  position: absolute;
-  right: 5px;
-  top: 5px;
-  z-index: 25;
-}
-
-.yinyang {
-  position: absolute;
-  top: -10px;
-  left: 0; right: 0;
-  margin: auto;
-  display: block;
-  height: 120px;
-}
-
-.actions {
-  margin: 1em 0 0;
-  min-height: 100px;
-  position: relative;
-}
-
-.actionspicture {
-  pointer-events: none;
-  position: absolute;
-  height: 100px;
-  top: 0; left: 0; right: 0;
-}
-
-.actionlink {
-  pointer-events: auto;
-  font-family: arial;
-  font-size: 80%;
-  font-weight: bold;
-  position: absolute;
-  top: 0; bottom: 0;
-  line-height: 1;
-  height: 1em;
-  margin: auto;
-}
-
-.actionlink.download {
-  color: white;
-  right: 50%;
-  margin-right: 13px;
-  text-shadow: -1px 1px 3px #b00, -1px -1px 3px #b00, 1px 0px 3px #b00;
-}
-
-.actionlink.fund {
-  color: #b00;
-  left: 50%;
-  margin-left: 15px;
-}
-
-.actionlink:hover {
-  text-decoration: underline;
-}
-
-.actionlink a {
-  color: inherit;
-}
-
-.actionsleft {
-  float: left;
-}
-
-.actionsright {
-  float: right;
-  text-align: right;
-}
-
-@media screen and (max-width: 800px) {
-  .actions {
-    padding-top: 120px;
-  }
-  .actionsleft, .actionsright {
-    float: none;
-    text-align: left;
-    margin-bottom: 1em;
-  }
-}
-
-th {
-  text-decoration: underline;
-  font-weight: normal;
-  text-align: left;
-}
-
-#features ul {
-  list-style: none;
-  margin: 0 0 1em;
-  padding: 0 0 0 1.2em;
-}
-
-#features li:before {
-  content: "-";
-  width: 1em;
-  display: inline-block;
-  padding: 0;
-  margin: 0;
-  margin-left: -1em;
-}
-
-.rel {
-  margin-bottom: 0;
-}
-.rel-note {
-  margin-top: 0;
-  color: #555;
-}
-
-pre {
-  padding-left: 15px;
-  border-left: 2px solid #ddd;
-}
-
-code {
-  padding: 0 2px;
-}
-
-strong {
-  text-decoration: underline;
-  font-weight: normal;
-}
-
-.field {
-  border: 1px solid #A21313;
-}
diff --git a/www/code/codemirror-5.7/doc/internals.html b/www/code/codemirror-5.7/doc/internals.html
deleted file mode 100644
index e1ed3e991..000000000
--- a/www/code/codemirror-5.7/doc/internals.html
+++ /dev/null
@@ -1,503 +0,0 @@
-
-
-CodeMirror: Internals
-
-
-
-
-
-
-
-
    
-
-
    (Re-) Implementing A Syntax-Highlighting Editor in JavaScript
    
-
-
    
-  Topic: JavaScript, code editor implementation
    
-  Author: Marijn Haverbeke
    
-  Date: March 2nd 2011 (updated November 13th 2011)
-
    
-
-
    Caution: this text was written briefly after
-version 2 was initially written. It no longer (even including the
-update at the bottom) fully represents the current implementation. I'm
-leaving it here as a historic document. For more up-to-date
-information, look at the entries
-tagged cm-internals
-on my blog.
    
-
-
    This is a followup to
-my Brutal Odyssey to the
-Dark Side of the DOM Tree story. That one describes the
-mind-bending process of implementing (what would become) CodeMirror 1.
-This one describes the internals of CodeMirror 2, a complete rewrite
-and rethink of the old code base. I wanted to give this piece another
-Hunter Thompson copycat subtitle, but somehow that would be out of
-place—the process this time around was one of straightforward
-engineering, requiring no serious mind-bending whatsoever.
    
-
-
    So, what is wrong with CodeMirror 1? I'd estimate, by mailing list
-activity and general search-engine presence, that it has been
-integrated into about a thousand systems by now. The most prominent
-one, since a few weeks,
-being Google
-code's project hosting. It works, and it's being used widely.
    
-
-
    Still, I did not start replacing it because I was bored. CodeMirror
-1 was heavily reliant on designMode
-or contentEditable (depending on the browser). Neither of
-these are well specified (HTML5 tries
-to specify
-their basics), and, more importantly, they tend to be one of the more
-obscure and buggy areas of browser functionality—CodeMirror, by using
-this functionality in a non-typical way, was constantly running up
-against browser bugs. WebKit wouldn't show an empty line at the end of
-the document, and in some releases would suddenly get unbearably slow.
-Firefox would show the cursor in the wrong place. Internet Explorer
-would insist on linkifying everything that looked like a URL or email
-address, a behaviour that can't be turned off. Some bugs I managed to
-work around (which was often a frustrating, painful process), others,
-such as the Firefox cursor placement, I gave up on, and had to tell
-user after user that they were known problems, but not something I
-could help.
    
-
-
    Also, there is the fact that designMode (which seemed
-to be less buggy than contentEditable in Webkit and
-Firefox, and was thus used by CodeMirror 1 in those browsers) requires
-a frame. Frames are another tricky area. It takes some effort to
-prevent getting tripped up by domain restrictions, they don't
-initialize synchronously, behave strangely in response to the back
-button, and, on several browsers, can't be moved around the DOM
-without having them re-initialize. They did provide a very nice way to
-namespace the library, though—CodeMirror 1 could freely pollute the
-namespace inside the frame.
    
-
-
    Finally, working with an editable document means working with
-selection in arbitrary DOM structures. Internet Explorer (8 and
-before) has an utterly different (and awkward) selection API than all
-of the other browsers, and even among the different implementations of
-document.selection, details about how exactly a selection
-is represented vary quite a bit. Add to that the fact that Opera's
-selection support tended to be very buggy until recently, and you can
-imagine why CodeMirror 1 contains 700 lines of selection-handling
-code.
    
-
-
    And that brings us to the main issue with the CodeMirror 1
-code base: The proportion of browser-bug-workarounds to real
-application code was getting dangerously high. By building on top of a
-few dodgy features, I put the system in a vulnerable position—any
-incompatibility and bugginess in these features, I had to paper over
-with my own code. Not only did I have to do some serious stunt-work to
-get it to work on older browsers (as detailed in the
-previous story), things
-also kept breaking in newly released versions, requiring me to come up
-with new scary hacks in order to keep up. This was starting
-to lose its appeal.
    
-
-
    
-  
    General Approach
    
-
-
    What CodeMirror 2 does is try to sidestep most of the hairy hacks
-that came up in version 1. I owe a lot to the
-ACE editor for inspiration on how to
-approach this.
    
-
-
    I absolutely did not want to be completely reliant on key events to
-generate my input. Every JavaScript programmer knows that key event
-information is horrible and incomplete. Some people (most awesomely
-Mihai Bazon with Ymacs) have been able
-to build more or less functioning editors by directly reading key
-events, but it takes a lot of work (the kind of never-ending, fragile
-work I described earlier), and will never be able to properly support
-things like multi-keystoke international character
-input. [see below for caveat]
    
-
-
    So what I do is focus a hidden textarea, and let the browser
-believe that the user is typing into that. What we show to the user is
-a DOM structure we built to represent his document. If this is updated
-quickly enough, and shows some kind of believable cursor, it feels
-like a real text-input control.
    
-
-
    Another big win is that this DOM representation does not have to
-span the whole document. Some CodeMirror 1 users insisted that they
-needed to put a 30 thousand line XML document into CodeMirror. Putting
-all that into the DOM takes a while, especially since, for some
-reason, an editable DOM tree is slower than a normal one on most
-browsers. If we have full control over what we show, we must only
-ensure that the visible part of the document has been added, and can
-do the rest only when needed. (Fortunately, the onscroll
-event works almost the same on all browsers, and lends itself well to
-displaying things only as they are scrolled into view.)
    
-
    
-
    
-  
    Input
    
-
-
    ACE uses its hidden textarea only as a text input shim, and does
-all cursor movement and things like text deletion itself by directly
-handling key events. CodeMirror's way is to let the browser do its
-thing as much as possible, and not, for example, define its own set of
-key bindings. One way to do this would have been to have the whole
-document inside the hidden textarea, and after each key event update
-the display DOM to reflect what's in that textarea.
    
-
-
    That'd be simple, but it is not realistic. For even medium-sized
-document the editor would be constantly munging huge strings, and get
-terribly slow. What CodeMirror 2 does is put the current selection,
-along with an extra line on the top and on the bottom, into the
-textarea.
    
-
-
    This means that the arrow keys (and their ctrl-variations), home,
-end, etcetera, do not have to be handled specially. We just read the
-cursor position in the textarea, and update our cursor to match it.
-Also, copy and paste work pretty much for free, and people get their
-native key bindings, without any special work on my part. For example,
-I have emacs key bindings configured for Chrome and Firefox. There is
-no way for a script to detect this. [no longer the case]
    
-
-
    Of course, since only a small part of the document sits in the
-textarea, keys like page up and ctrl-end won't do the right thing.
-CodeMirror is catching those events and handling them itself.
    
-
    
-
    
-  
    Selection
    
-
-
    Getting and setting the selection range of a textarea in modern
-browsers is trivial—you just use the selectionStart
-and selectionEnd properties. On IE you have to do some
-insane stuff with temporary ranges and compensating for the fact that
-moving the selection by a 'character' will treat \r\n as a single
-character, but even there it is possible to build functions that
-reliably set and get the selection range.
    
-
-
    But consider this typical case: When I'm somewhere in my document,
-press shift, and press the up arrow, something gets selected. Then, if
-I, still holding shift, press the up arrow again, the top of my
-selection is adjusted. The selection remembers where its head
-and its anchor are, and moves the head when we shift-move.
-This is a generally accepted property of selections, and done right by
-every editing component built in the past twenty years.
    
-
-
    But not something that the browser selection APIs expose.
    
-
-
    Great. So when someone creates an 'upside-down' selection, the next
-time CodeMirror has to update the textarea, it'll re-create the
-selection as an 'upside-up' selection, with the anchor at the top, and
-the next cursor motion will behave in an unexpected way—our second
-up-arrow press in the example above will not do anything, since it is
-interpreted in exactly the same way as the first.
    
-
-
    No problem. We'll just, ehm, detect that the selection is
-upside-down (you can tell by the way it was created), and then, when
-an upside-down selection is present, and a cursor-moving key is
-pressed in combination with shift, we quickly collapse the selection
-in the textarea to its start, allow the key to take effect, and then
-combine its new head with its old anchor to get the real
-selection.
    
-
-
    In short, scary hacks could not be avoided entirely in CodeMirror
-2.
    
-
-
    And, the observant reader might ask, how do you even know that a
-key combo is a cursor-moving combo, if you claim you support any
-native key bindings? Well, we don't, but we can learn. The editor
-keeps a set known cursor-movement combos (initialized to the
-predictable defaults), and updates this set when it observes that
-pressing a certain key had (only) the effect of moving the cursor.
-This, of course, doesn't work if the first time the key is used was
-for extending an inverted selection, but it works most of the
-time.
    
-
    
-
    
-  
    Intelligent Updating
    
-
-
    One thing that always comes up when you have a complicated internal
-state that's reflected in some user-visible external representation
-(in this case, the displayed code and the textarea's content) is
-keeping the two in sync. The naive way is to just update the display
-every time you change your state, but this is not only error prone
-(you'll forget), it also easily leads to duplicate work on big,
-composite operations. Then you start passing around flags indicating
-whether the display should be updated in an attempt to be efficient
-again and, well, at that point you might as well give up completely.
    
-
-
    I did go down that road, but then switched to a much simpler model:
-simply keep track of all the things that have been changed during an
-action, and then, only at the end, use this information to update the
-user-visible display.
    
-
-
    CodeMirror uses a concept of operations, which start by
-calling a specific set-up function that clears the state and end by
-calling another function that reads this state and does the required
-updating. Most event handlers, and all the user-visible methods that
-change state are wrapped like this. There's a method
-called operation that accepts a function, and returns
-another function that wraps the given function as an operation.
    
-
-
    It's trivial to extend this (as CodeMirror does) to detect nesting,
-and, when an operation is started inside an operation, simply
-increment the nesting count, and only do the updating when this count
-reaches zero again.
    
-
-
    If we have a set of changed ranges and know the currently shown
-range, we can (with some awkward code to deal with the fact that
-changes can add and remove lines, so we're dealing with a changing
-coordinate system) construct a map of the ranges that were left
-intact. We can then compare this map with the part of the document
-that's currently visible (based on scroll offset and editor height) to
-determine whether something needs to be updated.
    
-
-
    CodeMirror uses two update algorithms—a full refresh, where it just
-discards the whole part of the DOM that contains the edited text and
-rebuilds it, and a patch algorithm, where it uses the information
-about changed and intact ranges to update only the out-of-date parts
-of the DOM. When more than 30 percent (which is the current heuristic,
-might change) of the lines need to be updated, the full refresh is
-chosen (since it's faster to do than painstakingly finding and
-updating all the changed lines), in the other case it does the
-patching (so that, if you scroll a line or select another character,
-the whole screen doesn't have to be
-re-rendered). [the full-refresh
-algorithm was dropped, it wasn't really faster than the patching
-one]
    
-
-
    All updating uses innerHTML rather than direct DOM
-manipulation, since that still seems to be by far the fastest way to
-build documents. There's a per-line function that combines the
-highlighting, marking, and
-selection info for that line into a snippet of HTML. The patch updater
-uses this to reset individual lines, the refresh updater builds an
-HTML chunk for the whole visible document at once, and then uses a
-single innerHTML update to do the refresh.
    
-
    
-
    
-  
    Parsers can be Simple
    
-
-
    When I wrote CodeMirror 1, I
-thought interruptable
-parsers were a hugely scary and complicated thing, and I used a
-bunch of heavyweight abstractions to keep this supposed complexity
-under control: parsers
-were iterators
-that consumed input from another iterator, and used funny
-closure-resetting tricks to copy and resume themselves.
    
-
-
    This made for a rather nice system, in that parsers formed strictly
-separate modules, and could be composed in predictable ways.
-Unfortunately, it was quite slow (stacking three or four iterators on
-top of each other), and extremely intimidating to people not used to a
-functional programming style.
    
-
-
    With a few small changes, however, we can keep all those
-advantages, but simplify the API and make the whole thing less
-indirect and inefficient. CodeMirror
-2's mode API uses explicit state
-objects, and makes the parser/tokenizer a function that simply takes a
-state and a character stream abstraction, advances the stream one
-token, and returns the way the token should be styled. This state may
-be copied, optionally in a mode-defined way, in order to be able to
-continue a parse at a given point. Even someone who's never touched a
-lambda in his life can understand this approach. Additionally, far
-fewer objects are allocated in the course of parsing now.
    
-
-
    The biggest speedup comes from the fact that the parsing no longer
-has to touch the DOM though. In CodeMirror 1, on an older browser, you
-could see the parser work its way through the document,
-managing some twenty lines in each 50-millisecond time slice it got. It
-was reading its input from the DOM, and updating the DOM as it went
-along, which any experienced JavaScript programmer will immediately
-spot as a recipe for slowness. In CodeMirror 2, the parser usually
-finishes the whole document in a single 100-millisecond time slice—it
-manages some 1500 lines during that time on Chrome. All it has to do
-is munge strings, so there is no real reason for it to be slow
-anymore.
    
-
    
-
    
-  
    What Gives?
    
-
-
    Given all this, what can you expect from CodeMirror 2?
    
-
-
      
-
-
    • Small. the base library is
-some 45k when minified
-now, 17k when gzipped. It's smaller than
-its own logo.
      • 
-
-
    • Lightweight. CodeMirror 2 initializes very
-quickly, and does almost no work when it is not focused. This means
-you can treat it almost like a textarea, have multiple instances on a
-page without trouble.
      • 
-
-
    • Huge document support. Since highlighting is
-really fast, and no DOM structure is being built for non-visible
-content, you don't have to worry about locking up your browser when a
-user enters a megabyte-sized document.
      • 
-
-
    • Extended API. Some things kept coming up in the
-mailing list, such as marking pieces of text or lines, which were
-extremely hard to do with CodeMirror 1. The new version has proper
-support for these built in.
      • 
-
-
    • Tab support. Tabs inside editable documents were,
-for some reason, a no-go. At least six different people announced they
-were going to add tab support to CodeMirror 1, none survived (I mean,
-none delivered a working version). CodeMirror 2 no longer removes tabs
-from your document.
      • 
-
-
    • Sane styling. iframe nodes aren't
-really known for respecting document flow. Now that an editor instance
-is a plain div element, it is much easier to size it to
-fit the surrounding elements. You don't even have to make it scroll if
-you do not want to.
      • 
-
-
    
-
-
    On the downside, a CodeMirror 2 instance is not a native
-editable component. Though it does its best to emulate such a
-component as much as possible, there is functionality that browsers
-just do not allow us to hook into. Doing select-all from the context
-menu, for example, is not currently detected by CodeMirror.
    
-
-
    [Updates from November 13th 2011] Recently, I've made
-some changes to the codebase that cause some of the text above to no
-longer be current. I've left the text intact, but added markers at the
-passages that are now inaccurate. The new situation is described
-below.
    
-
    
-
    
-  
    Content Representation
    
-
-
    The original implementation of CodeMirror 2 represented the
-document as a flat array of line objects. This worked well—splicing
-arrays will require the part of the array after the splice to be
-moved, but this is basically just a simple memmove of a
-bunch of pointers, so it is cheap even for huge documents.
    
-
-
    However, I recently added line wrapping and code folding (line
-collapsing, basically). Once lines start taking up a non-constant
-amount of vertical space, looking up a line by vertical position
-(which is needed when someone clicks the document, and to determine
-the visible part of the document during scrolling) can only be done
-with a linear scan through the whole array, summing up line heights as
-you go. Seeing how I've been going out of my way to make big documents
-fast, this is not acceptable.
    
-
-
    The new representation is based on a B-tree. The leaves of the tree
-contain arrays of line objects, with a fixed minimum and maximum size,
-and the non-leaf nodes simply hold arrays of child nodes. Each node
-stores both the amount of lines that live below them and the vertical
-space taken up by these lines. This allows the tree to be indexed both
-by line number and by vertical position, and all access has
-logarithmic complexity in relation to the document size.
    
-
-
    I gave line objects and tree nodes parent pointers, to the node
-above them. When a line has to update its height, it can simply walk
-these pointers to the top of the tree, adding or subtracting the
-difference in height from each node it encounters. The parent pointers
-also make it cheaper (in complexity terms, the difference is probably
-tiny in normal-sized documents) to find the current line number when
-given a line object. In the old approach, the whole document array had
-to be searched. Now, we can just walk up the tree and count the sizes
-of the nodes coming before us at each level.
    
-
-
    I chose B-trees, not regular binary trees, mostly because they
-allow for very fast bulk insertions and deletions. When there is a big
-change to a document, it typically involves adding, deleting, or
-replacing a chunk of subsequent lines. In a regular balanced tree, all
-these inserts or deletes would have to be done separately, which could
-be really expensive. In a B-tree, to insert a chunk, you just walk
-down the tree once to find where it should go, insert them all in one
-shot, and then break up the node if needed. This breaking up might
-involve breaking up nodes further up, but only requires a single pass
-back up the tree. For deletion, I'm somewhat lax in keeping things
-balanced—I just collapse nodes into a leaf when their child count goes
-below a given number. This means that there are some weird editing
-patterns that may result in a seriously unbalanced tree, but even such
-an unbalanced tree will perform well, unless you spend a day making
-strangely repeating edits to a really big document.
    
-
    
-
    
-  
    Keymaps
    
-
-
    Above, I claimed that directly catching key
-events for things like cursor movement is impractical because it
-requires some browser-specific kludges. I then proceeded to explain
-some awful hacks that were needed to make it
-possible for the selection changes to be detected through the
-textarea. In fact, the second hack is about as bad as the first.
    
-
-
    On top of that, in the presence of user-configurable tab sizes and
-collapsed and wrapped lines, lining up cursor movement in the textarea
-with what's visible on the screen becomes a nightmare. Thus, I've
-decided to move to a model where the textarea's selection is no longer
-depended on.
    
-
-
    So I moved to a model where all cursor movement is handled by my
-own code. This adds support for a goal column, proper interaction of
-cursor movement with collapsed lines, and makes it possible for
-vertical movement to move through wrapped lines properly, instead of
-just treating them like non-wrapped lines.
    
-
-
    The key event handlers now translate the key event into a string,
-something like Ctrl-Home or Shift-Cmd-R, and
-use that string to look up an action to perform. To make keybinding
-customizable, this lookup goes through
-a table, using a scheme that
-allows such tables to be chained together (for example, the default
-Mac bindings fall through to a table named 'emacsy', which defines
-basic Emacs-style bindings like Ctrl-F, and which is also
-used by the custom Emacs bindings).
    
-
-
    A new
-option extraKeys
-allows ad-hoc keybindings to be defined in a much nicer way than what
-was possible with the
-old onKeyEvent
-callback. You simply provide an object mapping key identifiers to
-functions, instead of painstakingly looking at raw key events.
    
-
-
    Built-in commands map to strings, rather than functions, for
-example "goLineUp" is the default action bound to the up
-arrow key. This allows new keymaps to refer to them without
-duplicating any code. New commands can be defined by assigning to
-the CodeMirror.commands object, which maps such commands
-to functions.
    
-
-
    The hidden textarea now only holds the current selection, with no
-extra characters around it. This has a nice advantage: polling for
-input becomes much, much faster. If there's a big selection, this text
-does not have to be read from the textarea every time—when we poll,
-just noticing that something is still selected is enough to tell us
-that no new text was typed.
    
-
-
    The reason that cheap polling is important is that many browsers do
-not fire useful events on IME (input method engine) input, which is
-the thing where people inputting a language like Japanese or Chinese
-use multiple keystrokes to create a character or sequence of
-characters. Most modern browsers fire input when the
-composing is finished, but many don't fire anything when the character
-is updated during composition. So we poll, whenever the
-editor is focused, to provide immediate updates of the display.
    
-
-
    
diff --git a/www/code/codemirror-5.7/doc/logo.png b/www/code/codemirror-5.7/doc/logo.png
deleted file mode 100644
index 9aabda1d709f565bb115fa083cc16b6d52db64cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9310
zcmWk!Wl$VV6g=D|1b25!aEIUyhr7GGTL{5|1$PMU!Gb&FaCaxTyW6*4U2W~w{MehF
z_g=s5o{3aZl14)&LC@FTctEwWVDw?~{3&X8ah!PRD9*tQT8757ES=R=O
zZIdr2ugtx4l6@a%-%CqPVF44eaQ%2fx0Jpla6f)NKFVjM^Z_h)hKuzjB4sSI@ekEg
z@U#NrAp>;|c$0x9hg?WZTdZG(0VD4>#GX6z>|wuiM$CS;G$FUC%`Yu#T3S`2xx9Q%
z&L>hk-l%{+T9H<*SA=}sbo%%o@Lho^HR{1J(LU%?j7M6P@vF0Z0pn
zRg3c$bb5L^PunUDMRKYs2Bi84p?^h2s-wqmdrz@zp~k4I#jPdj=S+$6^$1(n#c@vV
zQV@AYWo0F0iuwG?$(^c;iwoWx)a709!-19&TMi)>)^tO&r)EX+#@$=$u6%0kebYPc
zJhdwF-;A+6Nv~cvrd5Mk9vYf~d&?L>K|$|Ad8<9vw25-A3Z(NDgczyq)xxNFX3irt
z5&W3H!9k+!9`(QJE||;POE|miR+~Sm6)TtkQ-cj}VANhC(QrgTL%V&q;;Zro-FDY}
zLEOj{mjZVGgd>u4m
z9zF7e&^@tyDqDe64B@zwmmb{Zn8=9D0EkzmV(u^0Er>Me3Q1W@zsY6$umA0>sVZm?
zf(GAr5tO2~04nkJ@wvUbz0JP5-v~N(8$pml|2M|7;cjEJKc2naVlq*V$ErUVu%xCc
zfs#1n{*MfE1l}<8>Gn8IRz?OtB`Ikq$e{Y8Acr;iHY83OaqB8@B8#tYMp?M1xTHiN
zI7wa+cO)-Jl$p=D%D=t+`FM2=o|c+=mO*=?NKfnSwkBw*RJ8!PBhEop&nIA&$mb;v
z`(VuSI$`*;(y|?=VesS!rUgt{Jdt*)`0hZ?G
z7usFYr+DK=vmmf4*I#j$aOU?KF(7dFFyg^IqOV_XZ;56L^zPYvdwU(1ez>LJ;p|HN
z4VWobRPeX^YQ|=%QMp8X`Hn78u&x4ka1N?5=y}S^Blo>WDpAfA7QE<&X|fPi*P!91
zP1%g!{BoS*|03)2@?Zo#sF~owf;%$sj_3DF)yW$ZALRySHTxJ?p2Ot=fq#BIgX)5|XO;LcR_79G0BHnqmaV{@z-l*0V&*FitQ+$n$GKK~(Sm8!dKL(9qB_GBTi@yf$25rWcs(1P9>X)ru?O`26nlrz=f0
zm@U<-rU~O=l$e1aj>uh@$@ff@7IHbdSS0=;!NwcMhud
z53gSK=5Ft3eehCzt=I&`DimK+)jCpbx;}m$z19HbQtn`d)!hQVW?ChL;
zbyKo%9MIsH(Q>--r@-OVua@MI!wIa-jBE9Yw#B6Hdl@SfkOB%&hU2fK`1pfgB~cEi
z>K7acZUFF41c0jUSTU1(EXAar0TlOu9ixo!E{YZ*$|c}u>+__hBK&*hRIDa8Af}Q;
zWDit2MeZN4SZfyUHj}GWt#8A|6Cu@MLU~bqjhe+}#m%DI(CommzwUQ#@%IP8XxgXH
zkyN(SV_iLNCzH9TWd7jqj-)r0;Kso}!idX{4~*c?b&}V(1|!o(&NG`&2I&`ADZUIJ|pBJ69gpMjxo{`=IqPIR49;HZJ)o;WIDAx4o8-
z1j5nrhNlg>pzELyfsea#kffV~rD%Ax^X=p*GhV+t=9NEE
zwGMXJptrZT*>W|aY^89`irs&YC|M#w!f}@{7kC*bUPqjh!Uwy0bsC~_hGjab`^uy}
ztltpI_08Dvm(#}fwt2E&myYl$E+P(Q!cUqD3UxVZSM03`xg;(xj3F4~&-sfCMd~A{
zKqcWr3+}cf1UzhoH@&vk(EDzNAZT}ZqK%}mY#-Nj(O&AtR+xan;967_CN{F;l|~|8
zbv4eSqnd;^x`NQ7i^pBJQWXuEPbA(AiyNG_JNvs^k2SQ48Kr?Gew5?MKFwqKY(F(DdQVId#=h;KNtK-Z_T*+|&{hTo_Dmm~TmWj5{v?&Y`#Q-Eb
zTz&kT>byP|t@F$QR+V?o4xQ)xp3Ohpq{U`hSM0{j5y}#&wUnJ=k1^XyQfGGV`7zm0
zE56Y;?0&vKmsggnf@JGdGPs5f1=AO!H`mBk5|vl*z}R
z*lpQn=>%|W7C2x6OuNW6mFZ4#aq$jO;SZRY@s{oHf#++f@5Odiy7Y#IuOBOL;sdb5rDr#wo^`On0`NwfaORizU;5S`T|a`{+m2KhV!OF2ne
zn)5u+*B7c3=iXT%Iyyc+&gM;Z1*+9%ehzt68mX~f`BMd1@9^Uoo+;_u?+Wkg3K|X|
zjHx*~QxY;V!iLQ-hH3LW{Wn{t=CjfuRg$i^ESx3gzuNLkZD0E0=BB+uR50L5z2_I@
z0CYH%y42$a@fVdzp$8SB%r$@50Z3+R&bl?>tn~Idgp!Uc6LT~!GE$bg@oDPt9dgA|
z)Zx3K0a~`_w(`&$?;ANGV>IlkAOtPLHeJ=_4)Imh6kAU=Ael_$2x%+q9s8$9adapc
z@ZR;|^71uWa}qB9aq`j%@do6JI#;g5gO~kkLO@fV9hIo_EwQ|kO+AI6P%VPG$x%=-
z@5C!jI64WxmL(<%YY`eDXQg`aZFOF5&|6FJU=Oa3e0$`#p1wY+f@)TXyJT_UFBF@h
zm&fbunEXn@wzIX*%ASx7e`1A#zcI}#*00OAaA}0x8_-MYP#IkIi|jhGU7Z~{*Y~X5
z3Bz%wvHe+$Y!UGLy#h-+zuEcix%UM~Ky`&lIGtqNPV4$8-t%@U8wSgDQ_X&PC>YzX
z3~E{1JN?fOkI56WeWg6J@KEE%i6B9%?8D(U|25<-TDdbvw=dRGJ=x+Pzw*;ZBPnm%Q1e{g)fvam7XWvnY_
z`y0C)y*qsiC%B2!CtHWE!`L|+|AvSX;yDQyy+nYrR3nwpYQ
zJZH@bm2-AR0s{?ADlac$
zkx01)laBkr=%@l^j&DXHo$?;5U6S;#=JU>H{Ll9EfOHzrZG8vU#$Rw({7!P;`l4{N
zG@f%v$3a!h-uc>@$S^BZL8p1fpBpb(buJ}6eJJIeClz0mfySxp)sr;X(9p1*+mZQx
z!-#)MRuy}>As`~X-m2E~m7g@|Z
z=1NnAGf&Ig$rmUc%eOqeCP(*^Mb*c>Os6!yZIt|SaB{C9#pri-&IJgJk7N6HT&Wah
z9k2~ZFz|&pG>2etaRG99GsCkF10?k5H=YgX&BM13?U#Rv!fbO-JOx}*c;EOh@qo|r
z_Ve35Jynb$;s
zfuT&*mrEAvtLK5Y$;_@8VTK)M0G9rk15iwC*`mH_Y
zTr=PfTv5ukYR1Rc+8hNU>Mh4i*R!&&r!1IK@N6nQwpM*`S>B?G6*I9&NzcFo9czwO
z+kaz5b9qwTtS0c5r3$9l*|Ip
zP^-oekWvM_v054$w@z9d+*6_vZd-3KQ%$?{!;VcH9!Kh$%pCUVqFY}MjCIzeeTz#*Hqqwvp81OK
z>w5Tar|?+{)Wdf5+Gqw>w8+~-A3=L)=`d4m%3^!p;98rP6--6QoNvdQA%%n&g@t^#
zv?^zShDMby`x6Kd;J*Q$ddy?Eu)?a{5OH(kUWM&y!3RQx>x5e!j9k36&nKs)rb*V7
z)*tK&p$qH(8g{oIsgfK-Ay%0yB$zKClk&(7fSgmtC+!^t&zphF<=^r
zfXnT$+)%DLg|4o_l^Z!y6#b|*7LCUyC#i}xW~t`$c_3g1#GXpZgxxO^OImgjKMJ^H
zmAZ{lZ2Mzgux)N&UT>c(K)z^Lzdzrdn(h5y<8?n!>49^J`K9qU>96{ik|{+vzF)>Z
z#*Hte5ISXIWgtS3I$dl)FX)PvKo8v8g{Z+1L5QP@lsBZA%r7c6nV2*yjW2)IH2dD#
z<~!6?rt7ymcVe1tTyZeBd7bWLI(1R)b@zOIg1CA1pjg%)K7-GTzPwRW^8`QiMpIqC
z#Vxl==J5M0*HfRZ45$P-az3C>LU-ZX`_S*@jr5ER4i3VcFE`rpkes|L)bIQnjfWEVseduN~aJG0f7S$^cFb@LBvA6KZ`~dpI%eGT+_{$sb$t%P3(UDByT#lH|WYvjN*cf
z0b`D{*oIX|&b=(W1r
zq&JVJ8U?0r+~GQsY#yJAzl%+t2IhB1iR0GGTTlUx9YO?z
zAu95t;&6Z;IzQoVSbIa-C^2`YjU#(fc^`)GL!Jug_2mVhllLc(c$sI7RMN53%*;Q0
zuJ>yF_F1QA8YuB;<+S$H+w=aFE1GqWv-6dM6UO1yLjF9Q1{2P1}rE3j*P*0
zIVlSY36*KpkV=K-?D_U7D!(UUVI52t+2xpS%_x^lHTbBJp5JSeUQ@v)0*N}L4*mHE
zEvFkP&(fq7i+qxxpM3KNhjh`Db;Og2UM;f0zL5Jv{lsod+@U)^CH#%m&R_y8ta|m2
zYQXBXI=osepS;
zW2_+-c5}5$jVv_v1(TM&0^HglgzAQI>w21-jw`3oc#pYtZj@9xB8BCd@u
z@Wngwe$o@ezzdf@fR+wc%iNrL0^KVGv%iv?f?{Ib60{b=6IJ>LDz`T#1kV!caeBDQ
zuq6u5&^upyC6mKy+de=Tj*`R?)
z(kA$|$GF>?bDh)pXFZf_@hSgBP3IFM(Az5wTaX!w1_wuV0ZCD^@G~(H(%;{|8Y@1(
z@61ojEV_}wyvM;4Y+aZ3ZZ}I5NCUCswZf24b4epXE?H@-NM
zHNT2_@l_*jG#{IUTs~6Q58po2Ea+KWNEtwD{`cLk+VPw^ZgDr9mb2nU0$gU_F$oAF
zHTCYOp>Y!<2M2pf0s9NuNtsQvN>3c1!O{9?uBk>E8aep`jd?G0K{BiN&;glP)!{V|1@J_|hJ&i%FZv@t`iu~WCNpYixA@}peMe)$3kJHL
zLK-iHvItWVHJ4D#f}vlPOg;AgtJ_9rK&4(=acTBlb{%{z3n-6`y(^8@E*pv&OCoU~
z3wG6*i0|h#`a#7K$5OdY
zijMc=q<&g*+<5S+cd<776F!~5CbT=Dqu>?e&lnD!
z(G94TE2LprS-{rGMuubO<4ad0;@%55pRTgYx4Dp$|Gzsg{VW=H-K1l*wUSKc0QmqR
z$su4@Ia~KBAR8{35!pSMqUt?t(!pb_<Ww
zfah;*u-#flq}%R!tb6?#V;`Au<>vt&jL&cYeWmW|TKE5+1eMf}L96O5?Bka@Z1-5M
z%sz|(k|&l8L%Z6S@*Yw{bWkRUDO$Cr1DIJ5n>$5UdQq^dlQq%_+?AjMu!Z*UwBlq9
zl*bV7*ek-|+bL)XL9tZwL?~mqanj?w{~O85VyBx`4(h{7=f;Q!d%MLoE?}Y2*Vore
zj>FUsVp|cYPD=ceO{DE~)NR5bvBc#M_PsrtVQj#0N$Ep}VdOIkOC=%guEwUbg?=xJ
zZ)iu?wW>?Yr3as}M7D&hIz>=JdKt;YuXlUl2B2-aoD+WVMgJya)d}{%IdJ>O&VUZp
zu38{fsnhglG_)S*%8!pX6InT`{$|4Vfq$CgNAqLIN-f;nf@I|=qZc!=M4532FAV{$
zN`nVFfH{HE#TnR#sv`E6TM~13zvJVBdXa-Id|maKrVR{MU}&-Px0hmM8!!@SKU+Ch
zrB!C_Abonc+*ZgDMGJVV#GJUM$TtIRpd=dS_-4-2BiKwnDn#b5>v&tpX
z+AB6&%40nwtEH|!`;R#sFZg_0@pIMA0D>}r1)bRUL!VA1!$C@>_lm3!W%A?-AB&Xm)~uFywT%$n#=8W
zSc4QS2PcF5l_!JKZn>6P^~$N%R1aX07$IAdoU(Afnaq1wHX(A^zt&25yg|nd@i)^x
zHj23&m@DH#MXhJimqE_F+fQ3gRl1EpTUt>JyWbs29RXB@d2vaxk3JdbvPG)ov0p>@
zk`;cE=mDNSO0@<4=CjTy4Z4oz(F-DN^pc!X`E6C$*dUqLsZ`46@R`5;c8?&~gLSG(
z?T#bBLq|kGsSkL%r0a#s!`b1i%B;>GGR;tzg{nk(0iy=v1;-Xa{Z`R*o54ryh)BRaz
z5J?M`5b%%LpmMR>W#POLL;o^>KrkEsp9SF0-QH7?$QrD>3h1@?Lt{WyhUvn>
z&K{4J$-V9@)oe9ED%EvUmjvdw%!^3)a`!oNO!Dao@JqYcXOdE5
zP~Xs{v8`s31Z?}sq-tuke#*lT#l*Mx?Y7jopM}}thh+oM+9gUPdjWj!@E|D9)8#OZ
zV9-*$YhO1(Og11yY8g!l`2PNZbCCNgDjdcb#DR~x&4}1;T(JH-F-s*&5(*#gzyQkF
zChYYmC>>VN;NeR5;m7^$ZP7aijQ3U;Ues(tjz~~vo)HYPX+ZQIiu#**o
zL!i(O2=(@h-sqdNnYP8gb-?Gx`(yebn_n#fr(qrCD+?ypH)5%_B1HTNeoDv46gar`
z<-rTyM`(v@2M>-;KvJP50NSBeP3ojN^&u(7R~!!^O_ISI2^slcx)_YlQCSHxm+$cC
zXrbSN@KF#`XZ_8wjuK;H8}<)^djB7KXf{L8ZE{pRp0B#Lpcoq*
z)Ltp}I5x)&b@}|y^%qsCX#>M}LqX{=kKOzUY4)T?Lht&pdF>CDJ~wY(Y?2A+HK$%R
zeOO_bJ)oH*qsh9;i!$et<0~rJc4Zdx)?nd_0vk>F`S~q*o=!`3MLHo+rTAgpdXm)g
z6a}kmYdn(D(kqOcIYiI~B)OzC&F5XjFWsg9IQcOBy-oRgz{&o$WqhRTkk?NFCCr^lDm1lJD@v#Qli~ZnEZ$Xji^p29BteJ3I(;JX2>ye%XjYfT!8qfs
zA%}?qr2)g~1wkjqECv7o

diff --git a/www/code/codemirror-5.7/doc/logo.svg b/www/code/codemirror-5.7/doc/logo.svg
deleted file mode 100644
index 0aa6323f9..000000000
--- a/www/code/codemirror-5.7/doc/logo.svg
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-image/svg+xml
\ No newline at end of file
diff --git a/www/code/codemirror-5.7/doc/manual.html b/www/code/codemirror-5.7/doc/manual.html
deleted file mode 100644
index f83f2748f..000000000
--- a/www/code/codemirror-5.7/doc/manual.html
+++ /dev/null
@@ -1,3349 +0,0 @@
-
-
-CodeMirror: User Manual
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
-
    
-    
    
-      User manual and reference guide
-      version 5.7.0
-    
    
-
-    
    CodeMirror is a code-editor component that can be embedded in
-    Web pages. The core library provides only the editor
-    component, no accompanying buttons, auto-completion, or other IDE
-    functionality. It does provide a rich API on top of which such
-    functionality can be straightforwardly implemented. See
-    the addons included in the distribution,
-    and the list
-    of externally hosted addons, for reusable
-    implementations of extra features.
    
-
-    
    CodeMirror works with language-specific modes. Modes are
-    JavaScript programs that help color (and optionally indent) text
-    written in a given language. The distribution comes with a number
-    of modes (see the mode/
-    directory), and it isn't hard to write new
-    ones for other languages.
    
-
    
-
-
    
-    
    Basic Usage
    
-
-    
    The easiest way to use CodeMirror is to simply load the script
-    and style sheet found under lib/ in the distribution,
-    plus a mode script from one of the mode/ directories.
-    (See the compression helper for an
-    easy way to combine scripts.) For example:
    
-
-    
    <script src="lib/codemirror.js"></script>
-<link rel="stylesheet" href="lib/codemirror.css">
-<script src="mode/javascript/javascript.js"></script>
    
-
-    
    (Alternatively, use a module loader. More
-    about that later.)
    
-
-    
    Having done this, an editor instance can be created like
-    this:
    
-
-    
    var myCodeMirror = CodeMirror(document.body);
    
-
-    
    The editor will be appended to the document body, will start
-    empty, and will use the mode that we loaded. To have more control
-    over the new editor, a configuration object can be passed
-    to CodeMirror as a second
-    argument:
    
-
-    
    var myCodeMirror = CodeMirror(document.body, {
-  value: "function myScript(){return 100;}\n",
-  mode:  "javascript"
-});
    
-
-    
    This will initialize the editor with a piece of code already in
-    it, and explicitly tell it to use the JavaScript mode (which is
-    useful when multiple modes are loaded).
-    See below for a full discussion of the
-    configuration options that CodeMirror accepts.
    
-
-    
    In cases where you don't want to append the editor to an
-    element, and need more control over the way it is inserted, the
-    first argument to the CodeMirror function can also
-    be a function that, when given a DOM element, inserts it into the
-    document somewhere. This could be used to, for example, replace a
-    textarea with a real editor:
    
-
-    
    var myCodeMirror = CodeMirror(function(elt) {
-  myTextArea.parentNode.replaceChild(elt, myTextArea);
-}, {value: myTextArea.value});
    
-
-    
    However, for this use case, which is a common way to use
-    CodeMirror, the library provides a much more powerful
-    shortcut:
    
-
-    
    var myCodeMirror = CodeMirror.fromTextArea(myTextArea);
    
-
-    
    This will, among other things, ensure that the textarea's value
-    is updated with the editor's contents when the form (if it is part
-    of a form) is submitted. See the API
-    reference for a full description of this method.
    
-
-    
    Module loaders
    
-
-    
    The files in the CodeMirror distribution contain shims for
-    loading them (and their dependencies) in AMD or CommonJS
-    environments. If the variables exports
-    and module exist and have type object, CommonJS-style
-    require will be used. If not, but there is a
-    function define with an amd property
-    present, AMD-style (RequireJS) will be used.
    
-
-    
    It is possible to
-    use Browserify or similar
-    tools to statically build modules using CodeMirror. Alternatively,
-    use RequireJS to dynamically
-    load dependencies at runtime. Both of these approaches have the
-    advantage that they don't use the global namespace and can, thus,
-    do things like load multiple versions of CodeMirror alongside each
-    other.
    
-
-    
    Here's a simple example of using RequireJS to load CodeMirror:
    
-
-    
    require([
-  "cm/lib/codemirror", "cm/mode/htmlmixed/htmlmixed"
-], function(CodeMirror) {
-  CodeMirror.fromTextArea(document.getElementById("code"), {
-    lineNumbers: true,
-    mode: "htmlmixed"
-  });
-});
    
-
-    
    It will automatically load the modes that the mixed HTML mode
-    depends on (XML, JavaScript, and CSS). Do not use
-    RequireJS' paths option to configure the path to
-    CodeMirror, since it will break loading submodules through
-    relative paths. Use
-    the packages
-    configuration option instead, as in:
    
-
-    
    require.config({
-  packages: [{
-    name: "codemirror",
-    location: "../path/to/codemirror",
-    main: "lib/codemirror"
-  }]
-});
    
-
-
    
-
-
    
-    
    Configuration
    
-
-    
    Both the CodeMirror
-    function and its fromTextArea method take as second
-    (optional) argument an object containing configuration options.
-    Any option not supplied like this will be taken
-    from CodeMirror.defaults, an
-    object containing the default options. You can update this object
-    to change the defaults on your page.
    
-
-    
    Options are not checked in any way, so setting bogus option
-    values is bound to lead to odd errors.
    
-
-    
    These are the supported options:
    
-
-    
    
-      
    value: string|CodeMirror.Doc
    
-      
    The starting value of the editor. Can be a string, or
-      a document object.
    
-
-      
    mode: string|object
    
-      
    The mode to use. When not given, this will default to the
-      first mode that was loaded. It may be a string, which either
-      simply names the mode or is
-      a MIME type
-      associated with the mode. Alternatively, it may be an object
-      containing configuration options for the mode, with
-      a name property that names the mode (for
-      example {name: "javascript", json: true}). The demo
-      pages for each mode contain information about what configuration
-      parameters the mode supports. You can ask CodeMirror which modes
-      and MIME types have been defined by inspecting
-      the CodeMirror.modes
-      and CodeMirror.mimeModes objects. The first maps
-      mode names to their constructors, and the second maps MIME types
-      to mode specs.
    
-
-      
    lineSeparator: string|null
    
-      
    Explicitly set the line separator for the editor. By default
-      (value null), the document will be split on CRLFs
-      as well as lone CRs and LFs, and a single LF will be used as
-      line separator in all output (such
-      as getValue). When a
-      specific string is given, lines will only be split on that
-      string, and output will, by default, use that same
-      separator.
    
-
-      
    theme: string
    
-      
    The theme to style the editor with. You must make sure the
-      CSS file defining the corresponding .cm-s-[name]
-      styles is loaded (see
-      the theme directory in the
-      distribution). The default is "default", for which
-      colors are included in codemirror.css. It is
-      possible to use multiple theming classes at once—for
-      example "foo bar" will assign both
-      the cm-s-foo and the cm-s-bar classes
-      to the editor.
    
-
-      
    indentUnit: integer
    
-      
    How many spaces a block (whatever that means in the edited
-      language) should be indented. The default is 2.
    
-
-      
    smartIndent: boolean
    
-      
    Whether to use the context-sensitive indentation that the
-      mode provides (or just indent the same as the line before).
-      Defaults to true.
    
-
-      
    tabSize: integer
    
-      
    The width of a tab character. Defaults to 4.
    
-
-      
    indentWithTabs: boolean
    
-      
    Whether, when indenting, the first N*tabSize
-      spaces should be replaced by N tabs. Default is false.
    
-
-      
    electricChars: boolean
    
-      
    Configures whether the editor should re-indent the current
-      line when a character is typed that might change its proper
-      indentation (only works if the mode supports indentation).
-      Default is true.
    
-
-      
    specialChars: RegExp
    
-      
    A regular expression used to determine which characters
-      should be replaced by a
-      special placeholder.
-      Mostly useful for non-printing special characters. The default
-      is /[\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/.
    
-      
    specialCharPlaceholder: function(char) → Element
    
-      
    A function that, given a special character identified by
-      the specialChars
-      option, produces a DOM node that is used to represent the
-      character. By default, a red dot (•)
-      is shown, with a title tooltip to indicate the character code.
    
-
-      
    rtlMoveVisually: boolean
    
-      
    Determines whether horizontal cursor movement through
-      right-to-left (Arabic, Hebrew) text is visual (pressing the left
-      arrow moves the cursor left) or logical (pressing the left arrow
-      moves to the next lower index in the string, which is visually
-      right in right-to-left text). The default is false
-      on Windows, and true on other platforms.
    
-
-      
    keyMap: string
    
-      
    Configures the key map to use. The default
-      is "default", which is the only key map defined
-      in codemirror.js itself. Extra key maps are found in
-      the key map directory. See
-      the section on key maps for more
-      information.
    
-
-      
    extraKeys: object
    
-      
    Can be used to specify extra key bindings for the editor,
-      alongside the ones defined
-      by keyMap. Should be
-      either null, or a valid key map value.
    
-
-      
    lineWrapping: boolean
    
-      
    Whether CodeMirror should scroll or wrap for long lines.
-      Defaults to false (scroll).
    
-
-      
    lineNumbers: boolean
    
-      
    Whether to show line numbers to the left of the editor.
    
-
-      
    firstLineNumber: integer
    
-      
    At which number to start counting lines. Default is 1.
    
-
-      
    lineNumberFormatter: function(line: integer) → string
    
-      
    A function used to format line numbers. The function is
-      passed the line number, and should return a string that will be
-      shown in the gutter.
    
-
-      
    gutters: array<string>
    
-      
    Can be used to add extra gutters (beyond or instead of the
-      line number gutter). Should be an array of CSS class names, each
-      of which defines a width (and optionally a
-      background), and which will be used to draw the background of
-      the gutters. May include
-      the CodeMirror-linenumbers class, in order to
-      explicitly set the position of the line number gutter (it will
-      default to be to the right of all other gutters). These class
-      names are the keys passed
-      to setGutterMarker.
    
-
-      
    fixedGutter: boolean
    
-      
    Determines whether the gutter scrolls along with the content
-      horizontally (false) or whether it stays fixed during horizontal
-      scrolling (true, the default).
    
-
-      
    scrollbarStyle: string
    
-      
    Chooses a scrollbar implementation. The default
-      is "native", showing native scrollbars. The core
-      library also provides the "null" style, which
-      completely hides the
-      scrollbars. Addons can
-      implement additional scrollbar models.
    
-
-      
    coverGutterNextToScrollbar: boolean
    
-      
    When fixedGutter
-      is on, and there is a horizontal scrollbar, by default the
-      gutter will be visible to the left of this scrollbar. If this
-      option is set to true, it will be covered by an element with
-      class CodeMirror-gutter-filler.
    
-
-      
    inputStyle: string
    
-      
    Selects the way CodeMirror handles input and focus. The core
-      library defines the "textarea"
-      and "contenteditable" input models. On mobile
-      browsers, the default is "contenteditable". On
-      desktop browsers, the default is "textarea".
-      Support for IME and screen readers is better in
-      the "contenteditable" model. The intention is to
-      make it the default on modern desktop browsers in the
-      future.
    
-
-      
    readOnly: boolean|string
    
-      
    This disables editing of the editor content by the user. If
-      the special value "nocursor" is given (instead of
-      simply true), focusing of the editor is also
-      disallowed.
    
-
-      
    showCursorWhenSelecting: boolean
    
-      
    Whether the cursor should be drawn when a selection is
-      active. Defaults to false.
    
-
-      
    lineWiseCopyCut: boolean
    
-      
    When enabled, which is the default, doing copy or cut when
-      there is no selection will copy or cut the whole lines that have
-      cursors on them.
    
-
-      
    undoDepth: integer
    
-      
    The maximum number of undo levels that the editor stores.
-      Note that this includes selection change events. Defaults to
-      200.
    
-
-      
    historyEventDelay: integer
    
-      
    The period of inactivity (in milliseconds) that will cause a
-      new history event to be started when typing or deleting.
-      Defaults to 1250.
    
-
-      
    tabindex: integer
    
-      
    The tab
-      index to assign to the editor. If not given, no tab index
-      will be assigned.
    
-
-      
    autofocus: boolean
    
-      
    Can be used to make CodeMirror focus itself on
-      initialization. Defaults to off.
-      When fromTextArea is
-      used, and no explicit value is given for this option, it will be
-      set to true when either the source textarea is focused, or it
-      has an autofocus attribute and no other element is
-      focused.
    
-    
    
-
-    
    Below this a few more specialized, low-level options are
-    listed. These are only useful in very specific situations, you
-    might want to skip them the first time you read this manual.
    
-
-    
    
-      
    dragDrop: boolean
    
-      
    Controls whether drag-and-drop is enabled. On by default.
    
-
-      
    cursorBlinkRate: number
    
-      
    Half-period in milliseconds used for cursor blinking. The default blink
-      rate is 530ms. By setting this to zero, blinking can be disabled. A
-      negative value hides the cursor entirely.
    
-
-      
    cursorScrollMargin: number
    
-      
    How much extra space to always keep above and below the
-      cursor when approaching the top or bottom of the visible view in
-      a scrollable document. Default is 0.
    
-
-      
    cursorHeight: number
    
-      
    Determines the height of the cursor. Default is 1, meaning
-      it spans the whole height of the line. For some fonts (and by
-      some tastes) a smaller height (for example 0.85),
-      which causes the cursor to not reach all the way to the bottom
-      of the line, looks better
    
-
-      
    resetSelectionOnContextMenu: boolean
    
-      
    Controls whether, when the context menu is opened with a
-      click outside of the current selection, the cursor is moved to
-      the point of the click. Defaults to true.
    
-
-      
    workTime, workDelay: number
    
-      
    Highlighting is done by a pseudo background-thread that will
-      work for workTime milliseconds, and then use
-      timeout to sleep for workDelay milliseconds. The
-      defaults are 200 and 300, you can change these options to make
-      the highlighting more or less aggressive.
    
-
-      
    pollInterval: number
    
-      
    Indicates how quickly CodeMirror should poll its input
-      textarea for changes (when focused). Most input is captured by
-      events, but some things, like IME input on some browsers, don't
-      generate events that allow CodeMirror to properly detect it.
-      Thus, it polls. Default is 100 milliseconds.
    
-
-      
    flattenSpans: boolean
    
-      
    By default, CodeMirror will combine adjacent tokens into a
-      single span if they have the same class. This will result in a
-      simpler DOM tree, and thus perform better. With some kinds of
-      styling (such as rounded corners), this will change the way the
-      document looks. You can set this option to false to disable this
-      behavior.
    
-
-      
    addModeClass: boolean
    
-      
    When enabled (off by default), an extra CSS class will be
-      added to each token, indicating the
-      (inner) mode that produced it, prefixed
-      with "cm-m-". For example, tokens from the XML mode
-      will get the cm-m-xml class.
    
-
-      
    maxHighlightLength: number
    
-      
    When highlighting long lines, in order to stay responsive,
-      the editor will give up and simply style the rest of the line as
-      plain text when it reaches a certain position. The default is
-      10 000. You can set this to Infinity to turn off
-      this behavior.
    
-
-      
    viewportMargin: integer
    
-      
    Specifies the amount of lines that are rendered above and
-      below the part of the document that's currently scrolled into
-      view. This affects the amount of updates needed when scrolling,
-      and the amount of work that such an update does. You should
-      usually leave it at its default, 10. Can be set
-      to Infinity to make sure the whole document is
-      always rendered, and thus the browser's text search works on it.
-      This will have bad effects on performance of big
-      documents.
    
-    
    
-
    
-
-
    
-    
    Events
    
-
-    
    Various CodeMirror-related objects emit events, which allow
-    client code to react to various situations. Handlers for such
-    events can be registered with the on
-    and off methods on the objects
-    that the event fires on. To fire your own events,
-    use CodeMirror.signal(target, name, args...),
-    where target is a non-DOM-node object.
    
-
-    
    An editor instance fires the following events.
-    The instance argument always refers to the editor
-    itself.
    
-
-    
    
-      
    "change" (instance: CodeMirror, changeObj: object)
    
-      
    Fires every time the content of the editor is changed.
-      The changeObj is a {from, to, text, removed,
-      origin} object containing information about the changes
-      that occurred as second argument. from
-      and to are the positions (in the pre-change
-      coordinate system) where the change started and ended (for
-      example, it might be {ch:0, line:18} if the
-      position is at the beginning of line #19). text is
-      an array of strings representing the text that replaced the
-      changed range (split by line). removed is the text
-      that used to be between from and to,
-      which is overwritten by this change. This event is
-      fired before the end of
-      an operation, before the DOM updates
-      happen.
    
-
-      
    "changes" (instance: CodeMirror, changes: array<object>)
    
-      
    Like the "change"
-      event, but batched per operation,
-      passing an array containing all the changes that happened in the
-      operation. This event is fired after the operation finished, and
-      display changes it makes will trigger a new operation.
    
-
-      
    "beforeChange" (instance: CodeMirror, changeObj: object)
    
-      
    This event is fired before a change is applied, and its
-      handler may choose to modify or cancel the change.
-      The changeObj object
-      has from, to, and text
-      properties, as with
-      the "change" event. It
-      also has a cancel() method, which can be called to
-      cancel the change, and, if the change isn't
-      coming from an undo or redo event, an update(from, to,
-      text) method, which may be used to modify the change.
-      Undo or redo changes can't be modified, because they hold some
-      metainformation for restoring old marked ranges that is only
-      valid for that specific change. All three arguments
-      to update are optional, and can be left off to
-      leave the existing value for that field
-      intact. Note: you may not do anything from
-      a "beforeChange" handler that would cause changes
-      to the document or its visualization. Doing so will, since this
-      handler is called directly from the bowels of the CodeMirror
-      implementation, probably cause the editor to become
-      corrupted.
    
-
-      
    "cursorActivity" (instance: CodeMirror)
    
-      
    Will be fired when the cursor or selection moves, or any
-      change is made to the editor content.
    
-
-      
    "keyHandled" (instance: CodeMirror, name: string, event: Event)
    
-      
    Fired after a key is handled through a
-      key map. name is the name of the handled key (for
-      example "Ctrl-X" or "'q'"),
-      and event is the DOM keydown
-      or keypress event.
    
-
-      
    "inputRead" (instance: CodeMirror, changeObj: object)
    
-      
    Fired whenever new input is read from the hidden textarea
-      (typed or pasted by the user).
    
-
-      
    "electrictInput" (instance: CodeMirror, line: integer)
    
-      
    Fired if text input matched the
-      mode's electric patterns,
-      and this caused the line's indentation to change.
    
-
-      
    "beforeSelectionChange" (instance: CodeMirror, obj: {ranges, update})
    
-      
    This event is fired before the selection is moved. Its
-      handler may inspect the set of selection ranges, present as an
-      array of {anchor, head} objects in
-      the ranges property of the obj
-      argument, and optionally change them by calling
-      the update method on this object, passing an array
-      of ranges in the same format. Handlers for this event have the
-      same restriction
-      as "beforeChange"
-      handlers — they should not do anything to directly update the
-      state of the editor.
    
-
-      
    "viewportChange" (instance: CodeMirror, from: number, to: number)
    
-      
    Fires whenever the view port of
-      the editor changes (due to scrolling, editing, or any other
-      factor). The from and to arguments
-      give the new start and end of the viewport.
    
-
-      
    "swapDoc" (instance: CodeMirror, oldDoc: Doc)
    
-      
    This is signalled when the editor's document is replaced
-      using the swapDoc
-      method.
    
-
-      
    "gutterClick" (instance: CodeMirror, line: integer, gutter: string, clickEvent: Event)
    
-      
    Fires when the editor gutter (the line-number area) is
-      clicked. Will pass the editor instance as first argument, the
-      (zero-based) number of the line that was clicked as second
-      argument, the CSS class of the gutter that was clicked as third
-      argument, and the raw mousedown event object as
-      fourth argument.
    
-
-      
    "gutterContextMenu" (instance: CodeMirror, line: integer, gutter: string, contextMenu: Event: Event)
    
-      
    Fires when the editor gutter (the line-number area)
-      receives a contextmenu event. Will pass the editor
-      instance as first argument, the (zero-based) number of the line
-      that was clicked as second argument, the CSS class of the
-      gutter that was clicked as third argument, and the raw
-      contextmenu mouse event object as fourth argument.
-      You can preventDefault the event, to signal that
-      CodeMirror should do no further handling.
    
-
-      
    "focus" (instance: CodeMirror)
    
-      
    Fires whenever the editor is focused.
    
-
-      
    "blur" (instance: CodeMirror)
    
-      
    Fires whenever the editor is unfocused.
    
-
-      
    "scroll" (instance: CodeMirror)
    
-      
    Fires when the editor is scrolled.
    
-
-      
    "scrollCursorIntoView" (instance: CodeMirror, event: Event)
    
-      
    Fires when the editor tries to scroll its cursor into view.
-      Can be hooked into to take care of additional scrollable
-      containers around the editor. When the event object has
-      its preventDefault method called, CodeMirror will
-      not itself try to scroll the window.
    
-
-      
    "update" (instance: CodeMirror)
    
-      
    Will be fired whenever CodeMirror updates its DOM display.
    
-
-      
    "renderLine" (instance: CodeMirror, line: LineHandle, element: Element)
    
-      
    Fired whenever a line is (re-)rendered to the DOM. Fired
-      right after the DOM element is built, before it is
-      added to the document. The handler may mess with the style of
-      the resulting element, or add event handlers, but
-      should not try to change the state of the editor.
    
-
-      
    "mousedown",
-      "dblclick", "contextmenu", "keydown", "keypress",
-      "keyup", "dragstart", "dragenter",
-      "dragover", "drop"
-      (instance: CodeMirror, event: Event)
    
-      
    Fired when CodeMirror is handling a DOM event of this type.
-      You can preventDefault the event, or give it a
-      truthy codemirrorIgnore property, to signal that
-      CodeMirror should do no further handling.
    
-    
    
-
-    
    Document objects (instances
-    of CodeMirror.Doc) emit the
-    following events:
    
-
-    
    
-      
    "change" (doc: CodeMirror.Doc, changeObj: object)
    
-      
    Fired whenever a change occurs to the
-      document. changeObj has a similar type as the
-      object passed to the
-      editor's "change"
-      event.
    
-
-      
    "beforeChange" (doc: CodeMirror.Doc, change: object)
    
-      
    See the description of the
-      same event on editor instances.
    
-
-      
    "cursorActivity" (doc: CodeMirror.Doc)
    
-      
    Fired whenever the cursor or selection in this document
-      changes.
    
-
-      
    "beforeSelectionChange" (doc: CodeMirror.Doc, selection: {head, anchor})
    
-      
    Equivalent to
-      the event by the same
-      name as fired on editor instances.
    
-    
    
-
-    
    Line handles (as returned by, for
-    example, getLineHandle)
-    support these events:
    
-
-    
    
-      
    "delete" ()
    
-      
    Will be fired when the line object is deleted. A line object
-      is associated with the start of the line. Mostly useful
-      when you need to find out when your gutter
-      markers on a given line are removed.
    
-      
    "change" (line: LineHandle, changeObj: object)
    
-      
    Fires when the line's text content is changed in any way
-      (but the line is not deleted outright). The change
-      object is similar to the one passed
-      to change event on the editor
-      object.
    
-    
    
-
-    
    Marked range handles (CodeMirror.TextMarker), as returned
-    by markText
-    and setBookmark, emit the
-    following events:
    
-
-    
    
-      
    "beforeCursorEnter" ()
    
-      
    Fired when the cursor enters the marked range. From this
-      event handler, the editor state may be inspected
-      but not modified, with the exception that the range on
-      which the event fires may be cleared.
    
-      
    "clear" (from: {line, ch}, to: {line, ch})
    
-      
    Fired when the range is cleared, either through cursor
-      movement in combination
-      with clearOnEnter
-      or through a call to its clear() method. Will only
-      be fired once per handle. Note that deleting the range through
-      text editing does not fire this event, because an undo action
-      might bring the range back into existence. from
-      and to give the part of the document that the range
-      spanned when it was cleared.
    
-      
    "hide" ()
    
-      
    Fired when the last part of the marker is removed from the
-      document by editing operations.
    
-      
    "unhide" ()
    
-      
    Fired when, after the marker was removed by editing, a undo
-      operation brought the marker back.
    
-    
    
-
-    
    Line widgets (CodeMirror.LineWidget), returned
-    by addLineWidget, fire
-    these events:
    
-
-    
    
-      
    "redraw" ()
    
-      
    Fired whenever the editor re-adds the widget to the DOM.
-      This will happen once right after the widget is added (if it is
-      scrolled into view), and then again whenever it is scrolled out
-      of view and back in again, or when changes to the editor options
-      or the line the widget is on require the widget to be
-      redrawn.
    
-    
    
-
    
-
-
    
-    
    Key Maps
    
-
-    
    Key maps are ways to associate keys with functionality. A key map
-    is an object mapping strings that identify the keys to functions
-    that implement their functionality.
    
-
-    
    The CodeMirror distributions comes
-    with Emacs, Vim,
-    and Sublime Text-style keymaps.
    
-
-    
    Keys are identified either by name or by character.
-    The CodeMirror.keyNames object defines names for
-    common keys and associates them with their key codes. Examples of
-    names defined here are Enter, F5,
-    and Q. These can be prefixed
-    with Shift-, Cmd-, Ctrl-,
-    and Alt- to specify a modifier. So for
-    example, Shift-Ctrl-Space would be a valid key
-    identifier.
    
-
-    
    Common example: map the Tab key to insert spaces instead of a tab
-    character.
    
-
-    
    -editor.setOption("extraKeys", {
-  Tab: function(cm) {
-    var spaces = Array(cm.getOption("indentUnit") + 1).join(" ");
-    cm.replaceSelection(spaces);
-  }
-});
    
-
-    
    Alternatively, a character can be specified directly by
-    surrounding it in single quotes, for example '$'
-    or 'q'. Due to limitations in the way browsers fire
-    key events, these may not be prefixed with modifiers.
    
-
-    
    Multi-stroke key bindings can be specified
-    by separating the key names by spaces in the property name, for
-    example Ctrl-X Ctrl-V. When a map contains
-    multi-stoke bindings or keys with modifiers that are not specified
-    in the default order (Shift-Cmd-Ctrl-Alt), you must
-    call CodeMirror.normalizeKeyMap on it before it can
-    be used. This function takes a keymap and modifies it to normalize
-    modifier order and properly recognize multi-stroke bindings. It
-    will return the keymap itself.
    
-
-    
    The CodeMirror.keyMap object associates key maps
-    with names. User code and key map definitions can assign extra
-    properties to this object. Anywhere where a key map is expected, a
-    string can be given, which will be looked up in this object. It
-    also contains the "default" key map holding the
-    default bindings.
    
-
-    
    The values of properties in key maps can be either functions of
-    a single argument (the CodeMirror instance), strings, or
-    false. Strings refer
-    to commands, which are described below. If
-    the property is set to false, CodeMirror leaves
-    handling of the key up to the browser. A key handler function may
-    return CodeMirror.Pass to indicate that it has
-    decided not to handle the key, and other handlers (or the default
-    behavior) should be given a turn.
    
-
-    
    Keys mapped to command names that start with the
-    characters "go" or to functions that have a
-    truthy motion property (which should be used for
-    cursor-movement actions) will be fired even when an
-    extra Shift modifier is present (i.e. "Up":
-    "goLineUp" matches both up and shift-up). This is used to
-    easily implement shift-selection.
    
-
-    
    Key maps can defer to each other by defining
-    a fallthrough property. This indicates that when a
-    key is not found in the map itself, one or more other maps should
-    be searched. It can hold either a single key map or an array of
-    key maps.
    
-
-    
    When a key map needs to set something up when it becomes
-    active, or tear something down when deactivated, it can
-    contain attach and/or detach properties,
-    which should hold functions that take the editor instance and the
-    next or previous keymap. Note that this only works for the
-    top-level keymap, not for fallthrough
-    maps or maps added
-    with extraKeys
-    or addKeyMap.
    
-
    
-
-
    
-    
    Commands
    
-
-    
    Commands are parameter-less actions that can be performed on an
-    editor. Their main use is for key bindings. Commands are defined by
-    adding properties to the CodeMirror.commands object.
-    A number of common commands are defined by the library itself,
-    most of them used by the default key bindings. The value of a
-    command property must be a function of one argument (an editor
-    instance).
    
-
-    
    Some of the commands below are referenced in the default
-    key map, but not defined by the core library. These are intended to
-    be defined by user code or addons.
    
-
-    
    Commands can also be run with
-    the execCommand
-    method.
    
-
-    
    
-      
    selectAllCtrl-A (PC), Cmd-A (Mac)
    
-      
    Select the whole content of the editor.
    
-
-      
    singleSelectionEsc
    
-      
    When multiple selections are present, this deselects all but
-      the primary selection.
    
-
-      
    killLineCtrl-K (Mac)
    
-      
    Emacs-style line killing. Deletes the part of the line after
-      the cursor. If that consists only of whitespace, the newline at
-      the end of the line is also deleted.
    
-
-      
    deleteLineCtrl-D (PC), Cmd-D (Mac)
    
-      
    Deletes the whole line under the cursor, including newline at the end.
    
-
-      
    delLineLeft
    
-      
    Delete the part of the line before the cursor.
    
-
-      
    delWrappedLineLeftCmd-Backspace (Mac)
    
-      
    Delete the part of the line from the left side of the visual line the cursor is on to the cursor.
    
-
-      
    delWrappedLineRightCmd-Delete (Mac)
    
-      
    Delete the part of the line from the cursor to the right side of the visual line the cursor is on.
    
-
-      
    undoCtrl-Z (PC), Cmd-Z (Mac)
    
-      
    Undo the last change.
    
-
-      
    redoCtrl-Y (PC), Shift-Cmd-Z (Mac), Cmd-Y (Mac)
    
-      
    Redo the last undone change.
    
-
-      
    undoSelectionCtrl-U (PC), Cmd-U (Mac)
    
-      
    Undo the last change to the selection, or if there are no
-      selection-only changes at the top of the history, undo the last
-      change.
    
-
-      
    redoSelectionAlt-U (PC), Shift-Cmd-U (Mac)
    
-      
    Redo the last change to the selection, or the last text change if
-      no selection changes remain.
    
-
-      
    goDocStartCtrl-Home (PC), Cmd-Up (Mac), Cmd-Home (Mac)
    
-      
    Move the cursor to the start of the document.
    
-
-      
    goDocEndCtrl-End (PC), Cmd-End (Mac), Cmd-Down (Mac)
    
-      
    Move the cursor to the end of the document.
    
-
-      
    goLineStartAlt-Left (PC), Ctrl-A (Mac)
    
-      
    Move the cursor to the start of the line.
    
-
-      
    goLineStartSmartHome
    
-      
    Move to the start of the text on the line, or if we are
-      already there, to the actual start of the line (including
-      whitespace).
    
-
-      
    goLineEndAlt-Right (PC), Ctrl-E (Mac)
    
-      
    Move the cursor to the end of the line.
    
-
-      
    goLineRightCmd-Right (Mac)
    
-      
    Move the cursor to the right side of the visual line it is on.
    
-
-      
    goLineLeftCmd-Left (Mac)
    
-      
    Move the cursor to the left side of the visual line it is on. If
-      this line is wrapped, that may not be the start of the line.
    
-
-      
    goLineLeftSmart
    
-      
    Move the cursor to the left side of the visual line it is
-      on. If that takes it to the start of the line, behave
-      like goLineStartSmart.
    
-
-      
    goLineUpUp, Ctrl-P (Mac)
    
-      
    Move the cursor up one line.
    
-
-      
    goLineDownDown, Ctrl-N (Mac)
    
-      
    Move down one line.
    
-
-      
    goPageUpPageUp, Shift-Ctrl-V (Mac)
    
-      
    Move the cursor up one screen, and scroll up by the same distance.
    
-
-      
    goPageDownPageDown, Ctrl-V (Mac)
    
-      
    Move the cursor down one screen, and scroll down by the same distance.
    
-
-      
    goCharLeftLeft, Ctrl-B (Mac)
    
-      
    Move the cursor one character left, going to the previous line
-      when hitting the start of line.
    
-
-      
    goCharRightRight, Ctrl-F (Mac)
    
-      
    Move the cursor one character right, going to the next line
-      when hitting the end of line.
    
-
-      
    goColumnLeft
    
-      
    Move the cursor one character left, but don't cross line boundaries.
    
-
-      
    goColumnRight
    
-      
    Move the cursor one character right, don't cross line boundaries.
    
-
-      
    goWordLeftAlt-B (Mac)
    
-      
    Move the cursor to the start of the previous word.
    
-
-      
    goWordRightAlt-F (Mac)
    
-      
    Move the cursor to the end of the next word.
    
-
-      
    goGroupLeftCtrl-Left (PC), Alt-Left (Mac)
    
-      
    Move to the left of the group before the cursor. A group is
-      a stretch of word characters, a stretch of punctuation
-      characters, a newline, or a stretch of more than one
-      whitespace character.
    
-
-      
    goGroupRightCtrl-Right (PC), Alt-Right (Mac)
    
-      
    Move to the right of the group after the cursor
-      (see above).
    
-
-      
    delCharBeforeShift-Backspace, Ctrl-H (Mac)
    
-      
    Delete the character before the cursor.
    
-
-      
    delCharAfterDelete, Ctrl-D (Mac)
    
-      
    Delete the character after the cursor.
    
-
-      
    delWordBeforeAlt-Backspace (Mac)
    
-      
    Delete up to the start of the word before the cursor.
    
-
-      
    delWordAfterAlt-D (Mac)
    
-      
    Delete up to the end of the word after the cursor.
    
-
-      
    delGroupBeforeCtrl-Backspace (PC), Alt-Backspace (Mac)
    
-      
    Delete to the left of the group before the cursor.
    
-
-      
    delGroupAfterCtrl-Delete (PC), Ctrl-Alt-Backspace (Mac), Alt-Delete (Mac)
    
-      
    Delete to the start of the group after the cursor.
    
-
-      
    indentAutoShift-Tab
    
-      
    Auto-indent the current line or selection.
    
-
-      
    indentMoreCtrl-] (PC), Cmd-] (Mac)
    
-      
    Indent the current line or selection by one indent unit.
    
-
-      
    indentLessCtrl-[ (PC), Cmd-[ (Mac)
    
-      
    Dedent the current line or selection by one indent unit.
    
-
-      
    insertTab
    
-      
    Insert a tab character at the cursor.
    
-
-      
    insertSoftTab
    
-      
    Insert the amount of spaces that match the width a tab at
-      the cursor position would have.
    
-
-      
    defaultTabTab
    
-      
    If something is selected, indent it by
-      one indent unit. If nothing is
-      selected, insert a tab character.
    
-
-      
    transposeCharsCtrl-T (Mac)
    
-      
    Swap the characters before and after the cursor.
    
-
-      
    newlineAndIndentEnter
    
-      
    Insert a newline and auto-indent the new line.
    
-
-      
    toggleOverwriteInsert
    
-      
    Flip the overwrite flag.
    
-
-      
    saveCtrl-S (PC), Cmd-S (Mac)
    
-      
    Not defined by the core library, only referred to in
-      key maps. Intended to provide an easy way for user code to define
-      a save command.
    
-
-      
    findCtrl-F (PC), Cmd-F (Mac)
    
-      
    findNextCtrl-G (PC), Cmd-G (Mac)
    
-      
    findPrevShift-Ctrl-G (PC), Shift-Cmd-G (Mac)
    
-      
    replaceShift-Ctrl-F (PC), Cmd-Alt-F (Mac)
    
-      
    replaceAllShift-Ctrl-R (PC), Shift-Cmd-Alt-F (Mac)
    
-      
    Not defined by the core library, but defined in
-      the search addon (or custom client
-      addons).
    
-
-    
    
-
-
    
-
-
    
-    
    Customized Styling
    
-
-    
    Up to a certain extent, CodeMirror's look can be changed by
-    modifying style sheet files. The style sheets supplied by modes
-    simply provide the colors for that mode, and can be adapted in a
-    very straightforward way. To style the editor itself, it is
-    possible to alter or override the styles defined
-    in codemirror.css.
    
-
-    
    Some care must be taken there, since a lot of the rules in this
-    file are necessary to have CodeMirror function properly. Adjusting
-    colors should be safe, of course, and with some care a lot of
-    other things can be changed as well. The CSS classes defined in
-    this file serve the following roles:
    
-
-    
    
-      
    CodeMirror
    
-      
    The outer element of the editor. This should be used for the
-      editor width, height, borders and positioning. Can also be used
-      to set styles that should hold for everything inside the editor
-      (such as font and font size), or to set a background. Setting
-      this class' height style to auto will
-      make the editor resize to fit its
-      content (it is recommended to also set
-      the viewportMargin
-      option to Infinity when doing this.
    
-
-      
    CodeMirror-focused
    
-      
    Whenever the editor is focused, the top element gets this
-      class. This is used to hide the cursor and give the selection a
-      different color when the editor is not focused.
    
-
-      
    CodeMirror-gutters
    
-      
    This is the backdrop for all gutters. Use it to set the
-      default gutter background color, and optionally add a border on
-      the right of the gutters.
    
-
-      
    CodeMirror-linenumbers
    
-      
    Use this for giving a background or width to the line number
-      gutter.
    
-
-      
    CodeMirror-linenumber
    
-      
    Used to style the actual individual line numbers. These
-      won't be children of the CodeMirror-linenumbers
-      (plural) element, but rather will be absolutely positioned to
-      overlay it. Use this to set alignment and text properties for
-      the line numbers.
    
-
-      
    CodeMirror-lines
    
-      
    The visible lines. This is where you specify vertical
-      padding for the editor content.
    
-
-      
    CodeMirror-cursor
    
-      
    The cursor is a block element that is absolutely positioned.
-      You can make it look whichever way you want.
    
-
-      
    CodeMirror-selected
    
-      
    The selection is represented by span elements
-      with this class.
    
-
-      
    CodeMirror-matchingbracket,
-        CodeMirror-nonmatchingbracket
    
-      
    These are used to style matched (or unmatched) brackets.
    
-    
    
-
-    
    If your page's style sheets do funky things to
-    all div or pre elements (you probably
-    shouldn't do that), you'll have to define rules to cancel these
-    effects out again for elements under the CodeMirror
-    class.
    
-
-    
    Themes are also simply CSS files, which define colors for
-    various syntactic elements. See the files in
-    the theme directory.
    
-
    
-
-
    
-    
    Programming API
    
-
-    
    A lot of CodeMirror features are only available through its
-    API. Thus, you need to write code (or
-    use addons) if you want to expose them to
-    your users.
    
-
-    
    Whenever points in the document are represented, the API uses
-    objects with line and ch properties.
-    Both are zero-based. CodeMirror makes sure to 'clip' any positions
-    passed by client code so that they fit inside the document, so you
-    shouldn't worry too much about sanitizing your coordinates. If you
-    give ch a value of null, or don't
-    specify it, it will be replaced with the length of the specified
-    line.
    
-
-    
    Methods prefixed with doc. can, unless otherwise
-    specified, be called both on CodeMirror (editor)
-    instances and CodeMirror.Doc instances. Methods
-    prefixed with cm. are only available
-    on CodeMirror instances.
    
-
-    
    Constructor
    
-
-    
    Constructing an editor instance is done with
-    the CodeMirror(place: Element|fn(Element),
-    ?option: object) constructor. If the place
-    argument is a DOM element, the editor will be appended to it. If
-    it is a function, it will be called, and is expected to place the
-    editor into the document. options may be an element
-    mapping option names to values. The options
-    that it doesn't explicitly specify (or all options, if it is not
-    passed) will be taken
-    from CodeMirror.defaults.
    
-
-    
    Note that the options object passed to the constructor will be
-    mutated when the instance's options
-    are changed, so you shouldn't share such
-    objects between instances.
    
-
-    
    See CodeMirror.fromTextArea
-    for another way to construct an editor instance.
    
-
-    
    Content manipulation methods
    
-
-    
    
-      
    doc.getValue(?separator: string) → string
    
-      
    Get the current editor content. You can pass it an optional
-      argument to specify the string to be used to separate lines
-      (defaults to "\n").
    
-      
    doc.setValue(content: string)
    
-      
    Set the editor content.
    
-
-      
    doc.getRange(from: {line, ch}, to: {line, ch}, ?separator: string) → string
    
-      
    Get the text between the given points in the editor, which
-      should be {line, ch} objects. An optional third
-      argument can be given to indicate the line separator string to
-      use (defaults to "\n").
    
-      
    doc.replaceRange(replacement: string, from: {line, ch}, to: {line, ch}, ?origin: string)
    
-      
    Replace the part of the document between from
-      and to with the given string. from
-      and to must be {line, ch}
-      objects. to can be left off to simply insert the
-      string at position from. When origin
-      is given, it will be passed on
-      to "change" events, and
-      its first letter will be used to determine whether this change
-      can be merged with previous history events, in the way described
-      for selection origins.
    
-
-      
    doc.getLine(n: integer) → string
    
-      
    Get the content of line n.
    
-
-      
    doc.lineCount() → integer
    
-      
    Get the number of lines in the editor.
    
-      
    doc.firstLine() → integer
    
-      
    Get the first line of the editor. This will
-      usually be zero but for linked sub-views,
-      or documents instantiated with a non-zero
-      first line, it might return other values.
    
-      
    doc.lastLine() → integer
    
-      
    Get the last line of the editor. This will
-      usually be doc.lineCount() - 1,
-      but for linked sub-views,
-      it might return other values.
    
-
-      
    doc.getLineHandle(num: integer) → LineHandle
    
-      
    Fetches the line handle for the given line number.
    
-      
    doc.getLineNumber(handle: LineHandle) → integer
    
-      
    Given a line handle, returns the current position of that
-      line (or null when it is no longer in the
-      document).
    
-      
    doc.eachLine(f: (line: LineHandle))
    
-      
    doc.eachLine(start: integer, end: integer, f: (line: LineHandle))
    
-      
    Iterate over the whole document, or if start
-      and end line numbers are given, the range
-      from start up to (not including) end,
-      and call f for each line, passing the line handle.
-      This is a faster way to visit a range of line handlers than
-      calling getLineHandle
-      for each of them. Note that line handles have
-      a text property containing the line's content (as a
-      string).
    
-
-      
    doc.markClean()
    
-      
    Set the editor content as 'clean', a flag that it will
-      retain until it is edited, and which will be set again when such
-      an edit is undone again. Useful to track whether the content
-      needs to be saved. This function is deprecated in favor
-      of changeGeneration,
-      which allows multiple subsystems to track different notions of
-      cleanness without interfering.
    
-      
    doc.changeGeneration(?closeEvent: boolean) → integer
    
-      
    Returns a number that can later be passed
-      to isClean to test whether
-      any edits were made (and not undone) in the meantime.
-      If closeEvent is true, the current history event
-      will be ‘closed’, meaning it can't be combined with further
-      changes (rapid typing or deleting events are typically
-      combined).
    
-      
    doc.isClean(?generation: integer) → boolean
    
-      
    Returns whether the document is currently clean — not
-      modified since initialization or the last call
-      to markClean if no
-      argument is passed, or since the matching call
-      to changeGeneration
-      if a generation value is given.
    
-    
    
-
-    
    Cursor and selection methods
    
-
-    
    
-      
    doc.getSelection(?lineSep: string) → string
    
-      
    Get the currently selected code. Optionally pass a line
-      separator to put between the lines in the output. When multiple
-      selections are present, they are concatenated with instances
-      of lineSep in between.
    
-      
    doc.getSelections(?lineSep: string) → string
    
-      
    Returns an array containing a string for each selection,
-      representing the content of the selections.
    
-
-      
    doc.replaceSelection(replacement: string, ?select: string)
    
-      
    Replace the selection(s) with the given string. By default,
-      the new selection ends up after the inserted text. The
-      optional select argument can be used to change
-      this—passing "around" will cause the new text to be
-      selected, passing "start" will collapse the
-      selection to the start of the inserted text.
    
-      
    doc.replaceSelections(replacements: array<string>, ?select: string)
    
-      
    The length of the given array should be the same as the
-      number of active selections. Replaces the content of the
-      selections with the strings in the array.
-      The select argument works the same as
-      in replaceSelection.
    
-
-      
    doc.getCursor(?start: string) → {line, ch}
    
-      
    Retrieve one end of the primary
-      selection. start is a an optional string indicating
-      which end of the selection to return. It may
-      be "from", "to", "head"
-      (the side of the selection that moves when you press
-      shift+arrow), or "anchor" (the fixed side of the
-      selection). Omitting the argument is the same as
-      passing "head". A {line, ch} object
-      will be returned.
    
-      
    doc.listSelections() → array<{anchor, head}>
    
-      
    Retrieves a list of all current selections. These will
-      always be sorted, and never overlap (overlapping selections are
-      merged). Each object in the array contains anchor
-      and head properties referring to {line,
-      ch} objects.
    
-
-      
    doc.somethingSelected() → boolean
    
-      
    Return true if any text is selected.
    
-      
    doc.setCursor(pos: {line, ch}|number, ?ch: number, ?options: object)
    
-      
    Set the cursor position. You can either pass a
-      single {line, ch} object, or the line and the
-      character as two separate parameters. Will replace all
-      selections with a single, empty selection at the given position.
-      The supported options are the same as for setSelection.
    
-
-      
    doc.setSelection(anchor: {line, ch}, ?head: {line, ch}, ?options: object)
    
-      
    Set a single selection range. anchor
-      and head should be {line, ch}
-      objects. head defaults to anchor when
-      not given. These options are supported:
-      
    
-        
    scroll: boolean
    
-        
    Determines whether the selection head should be scrolled
-        into view. Defaults to true.
    
-        
    origin: string
    
-        
    Detemines whether the selection history event may be
-        merged with the previous one. When an origin starts with the
-        character +, and the last recorded selection had
-        the same origin and was similar (close
-        in time, both
-        collapsed or both non-collapsed), the new one will replace the
-        old one. When it starts with *, it will always
-        replace the previous event (if that had the same origin).
-        Built-in motion uses the "+move" origin.
    
-        
    bias: number
    
-        
    Determine the direction into which the selection endpoints
-        should be adjusted when they fall inside
-        an atomic range. Can be either -1
-        (backward) or 1 (forward). When not given, the bias will be
-        based on the relative position of the old selection—the editor
-        will try to move further away from that, to prevent getting
-        stuck.
    
-      
    
-
-      
    doc.setSelections(ranges: array<{anchor, head}>, ?primary: integer, ?options: object)
    
-      
    Sets a new set of selections. There must be at least one
-      selection in the given array. When primary is a
-      number, it determines which selection is the primary one. When
-      it is not given, the primary index is taken from the previous
-      selection, or set to the last range if the previous selection
-      had less ranges than the new one. Supports the same options
-      as setSelection.
    
-      
    doc.addSelection(anchor: {line, ch}, ?head: {line, ch})
    
-      
    Adds a new selection to the existing set of selections, and
-      makes it the primary selection.
    
-
-      
    doc.extendSelection(from: {line, ch}, ?to: {line, ch}, ?options: object)
    
-      
    Similar
-      to setSelection, but
-      will, if shift is held or
-      the extending flag is set, move the
-      head of the selection while leaving the anchor at its current
-      place. to is optional, and can be passed to ensure
-      a region (for example a word or paragraph) will end up selected
-      (in addition to whatever lies between that region and the
-      current anchor). When multiple selections are present, all but
-      the primary selection will be dropped by this method.
-      Supports the same options as setSelection.
    
-      
    doc.extendSelections(heads: array<{line, ch}>, ?options: object)
    
-      
    An equivalent
-      of extendSelection
-      that acts on all selections at once.
    
-      
    doc.extendSelectionsBy(f: function(range: {anchor, head}) → {anchor, head}), ?options: object)
    
-      
    Applies the given function to all existing selections, and
-      calls extendSelections
-      on the result.
    
-      
    doc.setExtending(value: boolean)
    
-      
    Sets or clears the 'extending' flag, which acts similar to
-      the shift key, in that it will cause cursor movement and calls
-      to extendSelection
-      to leave the selection anchor in place.
    
-      
    doc.getExtending() → boolean
    
-      
    Get the value of the 'extending' flag.
    
-
-      
    cm.hasFocus() → boolean
    
-      
    Tells you whether the editor currently has focus.
    
-
-      
    cm.findPosH(start: {line, ch}, amount: integer, unit: string, visually: boolean) → {line, ch, ?hitSide: boolean}
    
-      
    Used to find the target position for horizontal cursor
-      motion. start is a {line, ch}
-      object, amount an integer (may be negative),
-      and unit one of the
-      string "char", "column",
-      or "word". Will return a position that is produced
-      by moving amount times the distance specified
-      by unit. When visually is true, motion
-      in right-to-left text will be visual rather than logical. When
-      the motion was clipped by hitting the end or start of the
-      document, the returned value will have a hitSide
-      property set to true.
    
-      
    cm.findPosV(start: {line, ch}, amount: integer, unit: string) → {line, ch, ?hitSide: boolean}
    
-      
    Similar to findPosH,
-      but used for vertical motion. unit may
-      be "line" or "page". The other
-      arguments and the returned value have the same interpretation as
-      they have in findPosH.
    
-
-      
    cm.findWordAt(pos: {line, ch}) → {anchor: {line, ch}, head: {line, ch}}
    
-      
    Returns the start and end of the 'word' (the stretch of
-      letters, whitespace, or punctuation) at the given position.
    
-    
    
-
-    
    Configuration methods
    
-
-    
    
-      
    cm.setOption(option: string, value: any)
    
-      
    Change the configuration of the editor. option
-      should the name of an option,
-      and value should be a valid value for that
-      option.
    
-      
    cm.getOption(option: string) → any
    
-      
    Retrieves the current value of the given option for this
-      editor instance.
    
-
-      
    cm.addKeyMap(map: object, bottom: boolean)
    
-      
    Attach an additional key map to the
-      editor. This is mostly useful for addons that need to register
-      some key handlers without trampling on
-      the extraKeys
-      option. Maps added in this way have a higher precedence than
-      the extraKeys
-      and keyMap options,
-      and between them, the maps added earlier have a lower precedence
-      than those added later, unless the bottom argument
-      was passed, in which case they end up below other key maps added
-      with this method.
    
-      
    cm.removeKeyMap(map: object)
    
-      
    Disable a keymap added
-      with addKeyMap. Either
-      pass in the key map object itself, or a string, which will be
-      compared against the name property of the active
-      key maps.
    
-
-      
    cm.addOverlay(mode: string|object, ?options: object)
    
-      
    Enable a highlighting overlay. This is a stateless mini-mode
-      that can be used to add extra highlighting. For example,
-      the search addon uses it to
-      highlight the term that's currently being
-      searched. mode can be a mode
-      spec or a mode object (an object with
-      a token method).
-      The options parameter is optional. If given, it
-      should be an object. Currently, only the opaque
-      option is recognized. This defaults to off, but can be given to
-      allow the overlay styling, when not null, to
-      override the styling of the base mode entirely, instead of the
-      two being applied together.
    
-      
    cm.removeOverlay(mode: string|object)
    
-      
    Pass this the exact value passed for the mode
-      parameter to addOverlay,
-      or a string that corresponds to the name propery of
-      that value, to remove an overlay again.
    
-
-      
    cm.on(type: string, func: (...args))
    
-      
    Register an event handler for the given event type (a
-      string) on the editor instance. There is also
-      a CodeMirror.on(object, type, func) version
-      that allows registering of events on any object.
    
-      
    cm.off(type: string, func: (...args))
    
-      
    Remove an event handler on the editor instance. An
-      equivalent CodeMirror.off(object, type,
-      func) also exists.
    
-    
    
-
-    
    Document management methods
    
-
-    
    Each editor is associated with an instance
-    of CodeMirror.Doc, its document. A document
-    represents the editor content, plus a selection, an undo history,
-    and a mode. A document can only be
-    associated with a single editor at a time. You can create new
-    documents by calling the CodeMirror.Doc(text, mode,
-    firstLineNumber) constructor. The last two arguments are
-    optional and can be used to set a mode for the document and make
-    it start at a line number other than 0, respectively.
    
-
-    
    
-      
    cm.getDoc() → Doc
    
-      
    Retrieve the currently active document from an editor.
    
-      
    doc.getEditor() → CodeMirror
    
-      
    Retrieve the editor associated with a document. May
-      return null.
    
-
-      
    cm.swapDoc(doc: CodeMirror.Doc) → Doc
    
-      
    Attach a new document to the editor. Returns the old
-      document, which is now no longer associated with an editor.
    
-
-      
    doc.copy(copyHistory: boolean) → Doc
    
-      
    Create an identical copy of the given doc.
-      When copyHistory is true, the history will also be
-      copied. Can not be called directly on an editor.
    
-
-      
    doc.linkedDoc(options: object) → Doc
    
-      
    Create a new document that's linked to the target document.
-      Linked documents will stay in sync (changes to one are also
-      applied to the other) until unlinked.
-      These are the options that are supported:
-        
    
-          
    sharedHist: boolean
    
-          
    When turned on, the linked copy will share an undo
-          history with the original. Thus, something done in one of
-          the two can be undone in the other, and vice versa.
    
-          
    from: integer
    
-          
    to: integer
    
-          
    Can be given to make the new document a subview of the
-          original. Subviews only show a given range of lines. Note
-          that line coordinates inside the subview will be consistent
-          with those of the parent, so that for example a subview
-          starting at line 10 will refer to its first line as line 10,
-          not 0.
    
-          
    mode: string|object
    
-          
    By default, the new document inherits the mode of the
-          parent. This option can be set to
-          a mode spec to give it a
-          different mode.
    
-        
    
-      
    doc.unlinkDoc(doc: CodeMirror.Doc)
    
-      
    Break the link between two documents. After calling this,
-      changes will no longer propagate between the documents, and, if
-      they had a shared history, the history will become
-      separate.
    
-      
    doc.iterLinkedDocs(function: (doc: CodeMirror.Doc, sharedHist: boolean))
    
-      
    Will call the given function for all documents linked to the
-      target document. It will be passed two arguments, the linked document
-      and a boolean indicating whether that document shares history
-      with the target.
    
-    
    
-
-    
    History-related methods
    
-
-    
    
-      
    doc.undo()
    
-      
    Undo one edit (if any undo events are stored).
    
-      
    doc.redo()
    
-      
    Redo one undone edit.
    
-
-      
    doc.undoSelection()
    
-      
    Undo one edit or selection change.
    
-      
    doc.redoSelection()
    
-      
    Redo one undone edit or selection change.
    
-
-      
    doc.historySize() → {undo: integer, redo: integer}
    
-      
    Returns an object with {undo, redo} properties,
-      both of which hold integers, indicating the amount of stored
-      undo and redo operations.
    
-      
    doc.clearHistory()
    
-      
    Clears the editor's undo history.
    
-      
    doc.getHistory() → object
    
-      
    Get a (JSON-serializeable) representation of the undo history.
    
-      
    doc.setHistory(history: object)
    
-      
    Replace the editor's undo history with the one provided,
-      which must be a value as returned
-      by getHistory. Note that
-      this will have entirely undefined results if the editor content
-      isn't also the same as it was when getHistory was
-      called.
    
-    
    
-
-    
    Text-marking methods
    
-
-    
    
-      
    doc.markText(from: {line, ch}, to: {line, ch}, ?options: object) → TextMarker
    
-      
    Can be used to mark a range of text with a specific CSS
-      class name. from and to should
-      be {line, ch} objects. The options
-      parameter is optional. When given, it should be an object that
-      may contain the following configuration options:
-      
    
-        
    className: string
    
-        
    Assigns a CSS class to the marked stretch of text.
    
-        
    inclusiveLeft: boolean
    
-        
    Determines whether
-        text inserted on the left of the marker will end up inside
-        or outside of it.
    
-        
    inclusiveRight: boolean
    
-        
    Like inclusiveLeft,
-        but for the right side.
    
-        
    atomic: boolean
    
-        
    Atomic ranges act as a single unit when cursor movement is
-        concerned—i.e. it is impossible to place the cursor inside of
-        them. In atomic ranges, inclusiveLeft
-        and inclusiveRight have a different meaning—they
-        will prevent the cursor from being placed respectively
-        directly before and directly after the range.
    
-        
    collapsed: boolean
    
-        
    Collapsed ranges do not show up in the display. Setting a
-        range to be collapsed will automatically make it atomic.
    
-        
    clearOnEnter: boolean
    
-        
    When enabled, will cause the mark to clear itself whenever
-        the cursor enters its range. This is mostly useful for
-        text-replacement widgets that need to 'snap open' when the
-        user tries to edit them. The
-        "clear" event
-        fired on the range handle can be used to be notified when this
-        happens.
    
-        
    clearWhenEmpty: boolean
    
-        
    Determines whether the mark is automatically cleared when
-        it becomes empty. Default is true.
    
-        
    replacedWith: Element
    
-        
    Use a given node to display this range. Implies both
-        collapsed and atomic. The given DOM node must be an
-        inline element (as opposed to a block element).
    
-        
    handleMouseEvents: boolean
    
-        
    When replacedWith is given, this determines
-        whether the editor will capture mouse and drag events
-        occurring in this widget. Default is false—the events will be
-        left alone for the default browser handler, or specific
-        handlers on the widget, to capture.
    
-        
    readOnly: boolean
    
-        
    A read-only span can, as long as it is not cleared, not be
-        modified except by
-        calling setValue to reset
-        the whole document. Note: adding a read-only span
-        currently clears the undo history of the editor, because
-        existing undo events being partially nullified by read-only
-        spans would corrupt the history (in the current
-        implementation).
    
-        
    addToHistory: boolean
    
-        
    When set to true (default is false), adding this marker
-        will create an event in the undo history that can be
-        individually undone (clearing the marker).
    
-        
    startStyle: string
    Can be used to specify
-        an extra CSS class to be applied to the leftmost span that
-        is part of the marker.
    
-        
    endStyle: string
    Equivalent
-        to startStyle, but for the rightmost span.
    
-        
    css: string
    
-        
    A string of CSS to be applied to the covered text. For example "color: #fe3".
    
-        
    title:
-        string
    When given, will give the nodes created
-        for this span a HTML title attribute with the
-        given value.
    
-        
    shared: boolean
    When the
-        target document is linked to other
-        documents, you can set shared to true to make the
-        marker appear in all documents. By default, a marker appears
-        only in its target document.
    
-      
    
-      The method will return an object that represents the marker
-      (with constructor CodeMirror.TextMarker), which
-      exposes three methods:
-      clear(), to remove the mark,
-      find(), which returns
-      a {from, to} object (both holding document
-      positions), indicating the current position of the marked range,
-      or undefined if the marker is no longer in the
-      document, and finally changed(),
-      which you can call if you've done something that might change
-      the size of the marker (for example changing the content of
-      a replacedWith
-      node), and want to cheaply update the display.
    
-
-      
    doc.setBookmark(pos: {line, ch}, ?options: object) → TextMarker
    
-      
    Inserts a bookmark, a handle that follows the text around it
-      as it is being edited, at the given position. A bookmark has two
-      methods find() and clear(). The first
-      returns the current position of the bookmark, if it is still in
-      the document, and the second explicitly removes the bookmark.
-      The options argument is optional. If given, the following
-      properties are recognized:
-      
    
-        
    widget: Element
    Can be used to display a DOM
-        node at the current location of the bookmark (analogous to
-        the replacedWith
-        option to markText).
    
-        
    insertLeft: boolean
    By default, text typed
-        when the cursor is on top of the bookmark will end up to the
-        right of the bookmark. Set this option to true to make it go
-        to the left instead.
    
-        
    shared: boolean
    See
-        the corresponding option
-        to markText.
    
-        
    handleMouseEvents: boolean
    
-        
    As with markText,
-        this determines whether mouse events on the widget inserted
-        for this bookmark are handled by CodeMirror. The default is
-        false.
    
-      
    
-
-      
    doc.findMarks(from: {line, ch}, to: {line, ch}) → array<TextMarker>
    
-      
    Returns an array of all the bookmarks and marked ranges
-      found between the given positions.
    
-      
    doc.findMarksAt(pos: {line, ch}) → array<TextMarker>
    
-      
    Returns an array of all the bookmarks and marked ranges
-      present at the given position.
    
-      
    doc.getAllMarks() → array<TextMarker>
    
-      
    Returns an array containing all marked ranges in the document.
    
-    
    
-
-    
    Widget, gutter, and decoration methods
    
-
-    
    
-      
    cm.setGutterMarker(line: integer|LineHandle, gutterID: string, value: Element) → LineHandle
    
-      
    Sets the gutter marker for the given gutter (identified by
-      its CSS class, see
-      the gutters option)
-      to the given value. Value can be either null, to
-      clear the marker, or a DOM element, to set it. The DOM element
-      will be shown in the specified gutter next to the specified
-      line.
    
-
-      
    cm.clearGutter(gutterID: string)
    
-      
    Remove all gutter markers in
-      the gutter with the given ID.
    
-
-      
    doc.addLineClass(line: integer|LineHandle, where: string, class: string) → LineHandle
    
-      
    Set a CSS class name for the given line. line
-      can be a number or a line handle. where determines
-      to which element this class should be applied, can can be one
-      of "text" (the text element, which lies in front of
-      the selection), "background" (a background element
-      that will be behind the selection), "gutter" (the
-      line's gutter space), or "wrap" (the wrapper node
-      that wraps all of the line's elements, including gutter
-      elements). class should be the name of the class to
-      apply.
    
-
-      
    doc.removeLineClass(line: integer|LineHandle, where: string, class: string) → LineHandle
    
-      
    Remove a CSS class from a line. line can be a
-      line handle or number. where should be one
-      of "text", "background",
-      or "wrap"
-      (see addLineClass). class
-      can be left off to remove all classes for the specified node, or
-      be a string to remove only a specific class.
    
-
-      
    cm.lineInfo(line: integer|LineHandle) → object
    
-      
    Returns the line number, text content, and marker status of
-      the given line, which can be either a number or a line handle.
-      The returned object has the structure {line, handle, text,
-      gutterMarkers, textClass, bgClass, wrapClass, widgets},
-      where gutterMarkers is an object mapping gutter IDs
-      to marker elements, and widgets is an array
-      of line widgets attached to this
-      line, and the various class properties refer to classes added
-      with addLineClass.
    
-
-      
    cm.addWidget(pos: {line, ch}, node: Element, scrollIntoView: boolean)
    
-      
    Puts node, which should be an absolutely
-      positioned DOM node, into the editor, positioned right below the
-      given {line, ch} position.
-      When scrollIntoView is true, the editor will ensure
-      that the entire node is visible (if possible). To remove the
-      widget again, simply use DOM methods (move it somewhere else, or
-      call removeChild on its parent).
    
-
-      
    doc.addLineWidget(line: integer|LineHandle, node: Element, ?options: object) → LineWidget
    
-      
    Adds a line widget, an element shown below a line, spanning
-      the whole of the editor's width, and moving the lines below it
-      downwards. line should be either an integer or a
-      line handle, and node should be a DOM node, which
-      will be displayed below the given line. options,
-      when given, should be an object that configures the behavior of
-      the widget. The following options are supported (all default to
-      false):
-        
    
-          
    coverGutter: boolean
    
-          
    Whether the widget should cover the gutter.
    
-          
    noHScroll: boolean
    
-          
    Whether the widget should stay fixed in the face of
-          horizontal scrolling.
    
-          
    above: boolean
    
-          
    Causes the widget to be placed above instead of below
-          the text of the line.
    
-          
    handleMouseEvents: boolean
    
-          
    Determines whether the editor will capture mouse and
-          drag events occurring in this widget. Default is false—the
-          events will be left alone for the default browser handler,
-          or specific handlers on the widget, to capture.
    
-          
    insertAt: integer
    
-          
    By default, the widget is added below other widgets for
-          the line. This option can be used to place it at a different
-          position (zero for the top, N to put it after the Nth other
-          widget). Note that this only has effect once, when the
-          widget is created.
-        
    
-      Note that the widget node will become a descendant of nodes with
-      CodeMirror-specific CSS classes, and those classes might in some
-      cases affect it. This method returns an object that represents
-      the widget placement. It'll have a line property
-      pointing at the line handle that it is associated with, and the following methods:
-        
    
-          
    clear()
    Removes the widget.
    
-          
    changed()
    Call
-          this if you made some change to the widget's DOM node that
-          might affect its height. It'll force CodeMirror to update
-          the height of the line that contains the widget.
    
-        
    
-      
    
-    
    
-
-    
    Sizing, scrolling and positioning methods
    
-
-    
    
-      
    cm.setSize(width: number|string, height: number|string)
    
-      
    Programatically set the size of the editor (overriding the
-      applicable CSS
-      rules). width and height
-      can be either numbers (interpreted as pixels) or CSS units
-      ("100%", for example). You can
-      pass null for either of them to indicate that that
-      dimension should not be changed.
    
-
-      
    cm.scrollTo(x: number, y: number)
    
-      
    Scroll the editor to a given (pixel) position. Both
-      arguments may be left as null
-      or undefined to have no effect.
    
-      
    cm.getScrollInfo() → {left, top, width, height, clientWidth, clientHeight}
    
-      
    Get an {left, top, width, height, clientWidth,
-      clientHeight} object that represents the current scroll
-      position, the size of the scrollable area, and the size of the
-      visible area (minus scrollbars).
    
-      
    cm.scrollIntoView(what: {line, ch}|{left, top, right, bottom}|{from, to}|null, ?margin: number)
    
-      
    Scrolls the given position into view. what may
-      be null to scroll the cursor into view,
-      a {line, ch} position to scroll a character into
-      view, a {left, top, right, bottom} pixel range (in
-      editor-local coordinates), or a range {from, to}
-      containing either two character positions or two pixel squares.
-      The margin parameter is optional. When given, it
-      indicates the amount of vertical pixels around the given area
-      that should be made visible as well.
    
-
-      
    cm.cursorCoords(where: boolean|{line, ch}, mode: string) → {left, top, bottom}
    
-      
    Returns an {left, top, bottom} object
-      containing the coordinates of the cursor position.
-      If mode is "local", they will be
-      relative to the top-left corner of the editable document. If it
-      is "page" or not given, they are relative to the
-      top-left corner of the page. If mode
-      is "window", the coordinates are relative to the
-      top-left corner of the currently visible (scrolled)
-      window. where can be a boolean indicating whether
-      you want the start (true) or the end
-      (false) of the selection, or, if a {line,
-      ch} object is given, it specifies the precise position at
-      which you want to measure.
    
-      
    cm.charCoords(pos: {line, ch}, ?mode: string) → {left, right, top, bottom}
    
-      
    Returns the position and dimensions of an arbitrary
-      character. pos should be a {line, ch}
-      object. This differs from cursorCoords in that
-      it'll give the size of the whole character, rather than just the
-      position that the cursor would have when it would sit at that
-      position.
    
-      
    cm.coordsChar(object: {left, top}, ?mode: string) → {line, ch}
    
-      
    Given an {left, top} object, returns
-      the {line, ch} position that corresponds to it. The
-      optional mode parameter determines relative to what
-      the coordinates are interpreted. It may
-      be "window", "page" (the default),
-      or "local".
    
-      
    cm.lineAtHeight(height: number, ?mode: string) → number
    
-      
    Computes the line at the given pixel
-      height. mode can be one of the same strings
-      that coordsChar
-      accepts.
    
-      
    cm.heightAtLine(line: integer|LineHandle, ?mode: string) → number
    
-      
    Computes the height of the top of a line, in the coordinate
-      system specified by mode
-      (see coordsChar), which
-      defaults to "page". When a line below the bottom of
-      the document is specified, the returned value is the bottom of
-      the last line in the document.
    
-      
    cm.defaultTextHeight() → number
    
-      
    Returns the line height of the default font for the editor.
    
-      
    cm.defaultCharWidth() → number
    
-      
    Returns the pixel width of an 'x' in the default font for
-      the editor. (Note that for non-monospace fonts, this is mostly
-      useless, and even for monospace fonts, non-ascii characters
-      might have a different width).
    
-
-      
    cm.getViewport() → {from: number, to: number}
    
-      
    Returns a {from, to} object indicating the
-      start (inclusive) and end (exclusive) of the currently rendered
-      part of the document. In big documents, when most content is
-      scrolled out of view, CodeMirror will only render the visible
-      part, and a margin around it. See also
-      the viewportChange
-      event.
    
-
-      
    cm.refresh()
    
-      
    If your code does something to change the size of the editor
-      element (window resizes are already listened for), or unhides
-      it, you should probably follow up by calling this method to
-      ensure CodeMirror is still looking as intended. See also
-      the autorefresh addon.
    
-    
    
-
-    
    Mode, state, and token-related methods
    
-
-    
    When writing language-aware functionality, it can often be
-    useful to hook into the knowledge that the CodeMirror language
-    mode has. See the section on modes for a
-    more detailed description of how these work.
    
-
-    
    
-      
    doc.getMode() → object
    
-      
    Gets the (outer) mode object for the editor. Note that this
-      is distinct from getOption("mode"), which gives you
-      the mode specification, rather than the resolved, instantiated
-      mode object.
    
-
-      
    cm.getModeAt(pos: {line, ch}) → object
    
-      
    Gets the inner mode at a given position. This will return
-      the same as getMode for
-      simple modes, but will return an inner mode for nesting modes
-      (such as htmlmixed).
    
-
-      
    cm.getTokenAt(pos: {line, ch}, ?precise: boolean) → object
    
-      
    Retrieves information about the token the current mode found
-      before the given position (a {line, ch} object). The
-      returned object has the following properties:
-      
    
-        
    start
    The character (on the given line) at which the token starts.
    
-        
    end
    The character at which the token ends.
    
-        
    string
    The token's string.
    
-        
    type
    The token type the mode assigned
-        to the token, such as "keyword"
-        or "comment" (may also be null).
    
-        
    state
    The mode's state at the end of this token.
    
-      
    
-      If precise is true, the token will be guaranteed to be accurate based on recent edits. If false or
-      not specified, the token will use cached state information, which will be faster but might not be accurate if
-      edits were recently made and highlighting has not yet completed.
-      
    
-
-      
    cm.getLineTokens(line: integer, ?precise: boolean) → array<{start, end, string, type, state}>
    
-      
    This is similar
-      to getTokenAt, but
-      collects all tokens for a given line into an array. It is much
-      cheaper than repeatedly calling getTokenAt, which
-      re-parses the part of the line before the token for every call.
    
-
-      
    cm.getTokenTypeAt(pos: {line, ch}) → string
    
-      
    This is a (much) cheaper version
-      of getTokenAt useful for
-      when you just need the type of the token at a given position,
-      and no other information. Will return null for
-      unstyled tokens, and a string, potentially containing multiple
-      space-separated style names, otherwise.
    
-
-      
    cm.getHelpers(pos: {line, ch}, type: string) → array<helper>
    
-      
    Fetch the set of applicable helper values for the given
-      position. Helpers provide a way to look up functionality
-      appropriate for a mode. The type argument provides
-      the helper namespace (see
-      registerHelper), in
-      which the values will be looked up. When the mode itself has a
-      property that corresponds to the type, that
-      directly determines the keys that are used to look up the helper
-      values (it may be either a single string, or an array of
-      strings). Failing that, the mode's helperType
-      property and finally the mode's name are used.
    
-      
    For example, the JavaScript mode has a
-      property fold containing "brace". When
-      the brace-fold addon is loaded, that defines a
-      helper named brace in the fold
-      namespace. This is then used by
-      the foldcode addon to
-      figure out that it can use that folding function to fold
-      JavaScript code.
    
-      
    When any 'global'
-      helpers are defined for the given namespace, their predicates
-      are called on the current mode and editor, and all those that
-      declare they are applicable will also be added to the array that
-      is returned.
    
-
-      
    cm.getHelper(pos: {line, ch}, type: string) → helper
    
-      
    Returns the first applicable helper value.
-      See getHelpers.
    
-
-      
    cm.getStateAfter(?line: integer, ?precise: boolean) → object
    
-      
    Returns the mode's parser state, if any, at the end of the
-      given line number. If no line number is given, the state at the
-      end of the document is returned. This can be useful for storing
-      parsing errors in the state, or getting other kinds of
-      contextual information for a line. precise is defined
-      as in getTokenAt().
    
-    
    
-
-    
    Miscellaneous methods
    
-
-    
    
-      
    cm.operation(func: () → any) → any
    
-      
    CodeMirror internally buffers changes and only updates its
-      DOM structure after it has finished performing some operation.
-      If you need to perform a lot of operations on a CodeMirror
-      instance, you can call this method with a function argument. It
-      will call the function, buffering up all changes, and only doing
-      the expensive update after the function returns. This can be a
-      lot faster. The return value from this method will be the return
-      value of your function.
    
-
-      
    cm.indentLine(line: integer, ?dir: string|integer)
    
-      
    Adjust the indentation of the given line. The second
-      argument (which defaults to "smart") may be one of:
-        
    
-          
    "prev"
    
-          
    Base indentation on the indentation of the previous line.
    
-          
    "smart"
    
-          
    Use the mode's smart indentation if available, behave
-          like "prev" otherwise.
    
-          
    "add"
    
-          
    Increase the indentation of the line by
-          one indent unit.
    
-          
    "subtract"
    
-          
    Reduce the indentation of the line.
    
-          
    <integer>
    
-          
    Add (positive number) or reduce (negative number) the
-          indentation by the given amount of spaces.
    
-        
    
-
-      
    cm.toggleOverwrite(?value: bool)
    
-      
    Switches between overwrite and normal insert mode (when not
-      given an argument), or sets the overwrite mode to a specific
-      state (when given an argument).
    
-
-      
    doc.lineSeparator()
    
-      
    Returns the preferred line separator string for this
-      document, as per the option
-      by the same name. When that option is null, the
-      string "\n" is returned.
    
-
-      
    cm.execCommand(name: string)
    
-      
    Runs the command with the given name on the editor.
    
-
-      
    doc.posFromIndex(index: integer) → {line, ch}
    
-      
    Calculates and returns a {line, ch} object for a
-      zero-based index who's value is relative to the start of the
-      editor's text. If the index is out of range of the text then
-      the returned object is clipped to start or end of the text
-      respectively.
    
-      
    doc.indexFromPos(object: {line, ch}) → integer
    
-      
    The reverse of posFromIndex.
    
-
-      
    cm.focus()
    
-      
    Give the editor focus.
    
-
-      
    cm.getInputField() → Element
    
-      
    Returns the input field for the editor. Will be a textarea
-      or an editable div, depending on the value of
-      the inputStyle
-      option.
    
-      
    cm.getWrapperElement() → Element
    
-      
    Returns the DOM node that represents the editor, and
-      controls its size. Remove this from your tree to delete an
-      editor instance.
    
-      
    cm.getScrollerElement() → Element
    
-      
    Returns the DOM node that is responsible for the scrolling
-      of the editor.
    
-      
    cm.getGutterElement() → Element
    
-      
    Fetches the DOM node that contains the editor gutters.
    
-    
    
-
-    
    Static properties
    
-    
    The CodeMirror object itself provides
-    several useful properties.
    
-
-    
    
-      
    CodeMirror.version: string
    
-      
    It contains a string that indicates the version of the
-      library. This is a triple of
-      integers "major.minor.patch",
-      where patch is zero for releases, and something
-      else (usually one) for dev snapshots.
    
-
-      
    CodeMirror.fromTextArea(textArea: TextAreaElement, ?config: object)
    
-      
    
-        The method provides another way to initialize an editor. It
-        takes a textarea DOM node as first argument and an optional
-        configuration object as second. It will replace the textarea
-        with a CodeMirror instance, and wire up the form of that
-        textarea (if any) to make sure the editor contents are put
-        into the textarea when the form is submitted. The text in the
-        textarea will provide the content for the editor. A CodeMirror
-        instance created this way has three additional methods:
-        
    
-          
    cm.save()
    
-          
    Copy the content of the editor into the textarea.
    
-
-          
    cm.toTextArea()
    
-          
    Remove the editor, and restore the original textarea (with
-          the editor's current content).
    
-
-          
    cm.getTextArea() → TextAreaElement
    
-          
    Returns the textarea that the instance was based on.
    
-        
    
-      
    
-
-      
    CodeMirror.defaults: object
    
-      
    An object containing default values for
-      all options. You can assign to its
-      properties to modify defaults (though this won't affect editors
-      that have already been created).
    
-
-      
    CodeMirror.defineExtension(name: string, value: any)
    
-      
    If you want to define extra methods in terms of the
-      CodeMirror API, it is possible to
-      use defineExtension. This will cause the given
-      value (usually a method) to be added to all CodeMirror instances
-      created from then on.
    
-
-      
    CodeMirror.defineDocExtension(name: string, value: any)
    
-      
    Like defineExtension,
-      but the method will be added to the interface
-      for Doc objects instead.
    
-
-      
    CodeMirror.defineOption(name: string,
-      default: any, updateFunc: function)
    
-      
    Similarly, defineOption can be used to define new options for
-      CodeMirror. The updateFunc will be called with the
-      editor instance and the new value when an editor is initialized,
-      and whenever the option is modified
-      through setOption.
    
-
-      
    CodeMirror.defineInitHook(func: function)
    
-      
    If your extention just needs to run some
-      code whenever a CodeMirror instance is initialized,
-      use CodeMirror.defineInitHook. Give it a function as
-      its only argument, and from then on, that function will be called
-      (with the instance as argument) whenever a new CodeMirror instance
-      is initialized.
    
-
-      
    CodeMirror.registerHelper(type: string, name: string, value: helper)
    
-      
    Registers a helper value with the given name in
-      the given namespace (type). This is used to define
-      functionality that may be looked up by mode. Will create (if it
-      doesn't already exist) a property on the CodeMirror
-      object for the given type, pointing to an object
-      that maps names to values. I.e. after
-      doing CodeMirror.registerHelper("hint", "foo",
-      myFoo), the value CodeMirror.hint.foo will
-      point to myFoo.
    
-
-      
    CodeMirror.registerGlobalHelper(type: string, name: string, predicate: fn(mode, CodeMirror), value: helper)
    
-      
    Acts
-      like registerHelper,
-      but also registers this helper as 'global', meaning that it will
-      be included by getHelpers
-      whenever the given predicate returns true when
-      called with the local mode and editor.
    
-
-      
    CodeMirror.Pos(line: integer, ?ch: integer)
    
-      
    A constructor for the {line, ch} objects that
-      are used to represent positions in editor documents.
    
-
-      
    CodeMirror.changeEnd(change: object) → {line, ch}
    
-      
    Utility function that computes an end position from a change
-      (an object with from, to,
-      and text properties, as passed to
-      various event handlers). The
-      returned position will be the end of the changed
-      range, after the change is applied.
    
-    
    
-
    
-
-
    
-    
    Addons
    
-
-    
    The addon directory in the distribution contains a
-    number of reusable components that implement extra editor
-    functionality (on top of extension functions
-    like defineOption, defineExtension,
-    and registerHelper). In
-    brief, they are:
    
-
-    
    
-      
    dialog/dialog.js
    
-      
    Provides a very simple way to query users for text input.
-      Adds the openDialog(template, callback, options) →
-      closeFunction method to CodeMirror instances,
-      which can be called with an HTML fragment or a detached DOM
-      node that provides the prompt (should include an input
-      or button tag), and a callback function that is called
-      when the user presses enter. It returns a function closeFunction
-      which, if called, will close the dialog immediately.
-      openDialog takes the following options:
-        
    
-          
    closeOnEnter:
    
-          
    If true, the dialog will be closed when the user presses
-          enter in the input. Defaults to true.
    
-          
    onKeyDown:
    
-          
    An event handler of the signature (event, value, closeFunction)
-          that will be called whenever keydown fires in the
-          dialog's input. If your callback returns true,
-          the dialog will not do any further processing of the event.
    
-          
    onKeyUp:
    
-          
    Same as onKeyDown but for the
-          keyup event.
    
-          
    onInput:
    
-          
    Same as onKeyDown but for the
-          input event.
    
-          
    onClose:
    
-          
    A callback of the signature (dialogInstance)
-          that will be called after the dialog has been closed and
-          removed from the DOM. No return value.
    
-        
    
-
-      
    Also adds an openNotification(template, options) →
-      closeFunction function that simply shows an HTML
-      fragment as a notification at the top of the editor. It takes a
-      single option: duration, the amount of time after
-      which the notification will be automatically closed. If 
-      duration is zero, the dialog will not be closed automatically.
    
-
-      
    Depends on addon/dialog/dialog.css.
    
-
-      
    search/searchcursor.js
    
-      
    Adds the getSearchCursor(query, start, caseFold) →
-      cursor method to CodeMirror instances, which can be used
-      to implement search/replace functionality. query
-      can be a regular expression or a string (only strings will match
-      across lines—if they contain newlines). start
-      provides the starting position of the search. It can be
-      a {line, ch} object, or can be left off to default
-      to the start of the document. caseFold is only
-      relevant when matching a string. It will cause the search to be
-      case-insensitive. A search cursor has the following methods:
-        
    
-          
    findNext() → boolean
    
-          
    findPrevious() → boolean
    
-          
    Search forward or backward from the current position.
-          The return value indicates whether a match was found. If
-          matching a regular expression, the return value will be the
-          array returned by the match method, in case you
-          want to extract matched groups.
    
-          
    from() → {line, ch}
    
-          
    to() → {line, ch}
    
-          
    These are only valid when the last call
-          to findNext or findPrevious did
-          not return false. They will return {line, ch}
-          objects pointing at the start and end of the match.
    
-          
    replace(text: string, ?origin: string)
    
-          
    Replaces the currently found match with the given text
-          and adjusts the cursor position to reflect the
-          replacement.
    
-        
    
-
-      
-      
    Implements the search commands. CodeMirror has keys bound to
-      these by default, but will not do anything with them unless an
-      implementation is provided. Depends
-      on searchcursor.js, and will make use
-      of openDialog when
-      available to make prompting for search queries less ugly.
    
-
-      
    search/matchesonscrollbar.js
    
-      
    Adds a showMatchesOnScrollbar method to editor
-      instances, which should be given a query (string or regular
-      expression), optionally a case-fold flag (only applicable for
-      strings), and optionally a class name (defaults
-      to CodeMirror-search-match) as arguments. When
-      called, matches of the given query will be displayed on the
-      editor's vertical scrollbar. The method returns an object with
-      a clear method that can be called to remove the
-      matches. Depends on
-      the annotatescrollbar
-      addon, and
-      the matchesonscrollbar.css
-      file provides a default (transparent yellowish) definition of
-      the CSS class applied to the matches. Note that the matches are
-      only perfectly aligned if your scrollbar does not have buttons
-      at the top and bottom. You can use
-      the simplescrollbar
-      addon to make sure of this. If this addon is loaded,
-      the search addon will
-      automatically use it.
    
-
-      
    edit/matchbrackets.js
    
-      
    Defines an option matchBrackets which, when set
-      to true, causes matching brackets to be highlighted whenever the
-      cursor is next to them. It also adds a
-      method matchBrackets that forces this to happen
-      once, and a method findMatchingBracket that can be
-      used to run the bracket-finding algorithm that this uses
-      internally.
    
-
-      
    edit/closebrackets.js
    
-      
    Defines an option autoCloseBrackets that will
-      auto-close brackets and quotes when typed. By default, it'll
-      auto-close ()[]{}''"", but you can pass it a string
-      similar to that (containing pairs of matching characters), or an
-      object with pairs and
-      optionally explode properties to customize
-      it. explode should be a similar string that gives
-      the pairs of characters that, when enter is pressed between
-      them, should have the second character also moved to its own
-      line. Demo here.
    
-
-      
    edit/matchtags.js
    
-      
    Defines an option matchTags that, when enabled,
-      will cause the tags around the cursor to be highlighted (using
-      the CodeMirror-matchingtag class). Also
-      defines
-      a command toMatchingTag,
-      which you can bind a key to in order to jump to the tag mathing
-      the one under the cursor. Depends on
-      the addon/fold/xml-fold.js
-      addon. Demo here.
    
-
-      
    edit/trailingspace.js
    
-      
    Adds an option showTrailingSpace which, when
-      enabled, adds the CSS class cm-trailingspace to
-      stretches of whitespace at the end of lines.
-      The demo has a nice
-      squiggly underline style for this class.
    
-
-      
    edit/closetag.js
    
-      
    Defines an autoCloseTags option that will
-      auto-close XML tags when '>' or '/'
-      is typed, and
-      a closeTag command that
-      closes the nearest open tag. Depends on
-      the fold/xml-fold.js addon. See
-      the demo.
    
-
-      
    edit/continuelist.js
    
-      
    Markdown specific. Defines
-      a "newlineAndIndentContinueMarkdownList" command
-      command that can be bound to enter to automatically
-      insert the leading characters for continuing a list. See
-      the Markdown mode
-      demo.
    
-
-      
    comment/comment.js
    
-      
    Addon for commenting and uncommenting code. Adds three
-      methods to CodeMirror instances:
-      
    
-        
    lineComment(from: {line, ch}, to: {line, ch}, ?options: object)
    
-        
    Set the lines in the given range to be line comments. Will
-        fall back to blockComment when no line comment
-        style is defined for the mode.
    
-        
    blockComment(from: {line, ch}, to: {line, ch}, ?options: object)
    
-        
    Wrap the code in the given range in a block comment. Will
-        fall back to lineComment when no block comment
-        style is defined for the mode.
    
-        
    uncomment(from: {line, ch}, to: {line, ch}, ?options: object) → boolean
    
-        
    Try to uncomment the given range.
-          Returns true if a comment range was found and
-          removed, false otherwise.
    
-      
    
-      The options object accepted by these methods may
-      have the following properties:
-      
    
-        
    blockCommentStart, blockCommentEnd, blockCommentLead, lineComment: string
    
-        
    Override the comment string
-        properties of the mode with custom comment strings.
    
-        
    padding: string
    
-        
    A string that will be inserted after opening and leading
-        markers, and before closing comment markers. Defaults to a
-        single space.
    
-        
    commentBlankLines: boolean
    
-        
    Whether, when adding line comments, to also comment lines
-        that contain only whitespace.
    
-        
    indent: boolean
    
-        
    When adding line comments and this is turned on, it will
-        align the comment block to the current indentation of the
-        first line of the block.
    
-        
    fullLines: boolean
    
-        
    When block commenting, this controls whether the whole
-        lines are indented, or only the precise range that is given.
-        Defaults to true.
    
-      
    
-      The addon also defines
-      a toggleComment command,
-      which will try to uncomment the current selection, and if that
-      fails, line-comments it.
    
-
-      
    fold/foldcode.js
    
-      
    Helps with code folding. Adds a foldCode method
-      to editor instances, which will try to do a code fold starting
-      at the given line, or unfold the fold that is already present.
-      The method takes as first argument the position that should be
-      folded (may be a line number or
-      a Pos), and as second optional
-      argument either a range-finder function, or an options object,
-      supporting the following properties:
-      
    
-        
    rangeFinder: fn(CodeMirror, Pos)
    
-        
    The function that is used to find
-        foldable ranges. If this is not directly passed, it will
-        default to CodeMirror.fold.auto, which
-        uses getHelpers with
-        a "fold" type to find folding functions
-        appropriate for the local mode. There are files in
-        the addon/fold/
-        directory providing CodeMirror.fold.brace, which
-        finds blocks in brace languages (JavaScript, C, Java,
-        etc), CodeMirror.fold.indent, for languages where
-        indentation determines block structure (Python, Haskell),
-        and CodeMirror.fold.xml, for XML-style languages,
-        and CodeMirror.fold.comment, for folding comment
-        blocks.
    
-        
    widget: string|Element
    
-        
    The widget to show for folded ranges. Can be either a
-        string, in which case it'll become a span with
-        class CodeMirror-foldmarker, or a DOM node.
    
-        
    scanUp: boolean
    
-        
    When true (default is false), the addon will try to find
-        foldable ranges on the lines above the current one if there
-        isn't an eligible one on the given line.
    
-        
    minFoldSize: integer
    
-        
    The minimum amount of lines that a fold should span to be
-        accepted. Defaults to 0, which also allows single-line
-        folds.
    
-      
    
-      See the demo for an
-      example.
    
-
-      
    fold/foldgutter.js
    
-      
    Provides an option foldGutter, which can be
-      used to create a gutter with markers indicating the blocks that
-      can be folded. Create a gutter using
-      the gutters option,
-      giving it the class CodeMirror-foldgutter or
-      something else if you configure the addon to use a different
-      class, and this addon will show markers next to folded and
-      foldable blocks, and handle clicks in this gutter. Note that
-      CSS styles should be applied to make the gutter, and the fold
-      markers within it, visible. A default set of CSS styles are
-      available in:
-      
-        addon/fold/foldgutter.css
-      .
-      The option
-      can be either set to true, or an object containing
-      the following optional option fields:
-      
    
-        
    gutter: string
    
-        
    The CSS class of the gutter. Defaults
-        to "CodeMirror-foldgutter". You will have to
-        style this yourself to give it a width (and possibly a
-        background). See the default gutter style rules above.
    
-        
    indicatorOpen: string | Element
    
-        
    A CSS class or DOM element to be used as the marker for
-        open, foldable blocks. Defaults
-        to "CodeMirror-foldgutter-open".
    
-        
    indicatorFolded: string | Element
    
-        
    A CSS class or DOM element to be used as the marker for
-        folded blocks. Defaults to "CodeMirror-foldgutter-folded".
    
-        
    rangeFinder: fn(CodeMirror, Pos)
    
-        
    The range-finder function to use when determining whether
-        something can be folded. When not
-        given, CodeMirror.fold.auto
-        will be used as default.
    
-      
    
-      The foldOptions editor option can be set to an
-      object to provide an editor-wide default configuration.
-      Demo here.
    
-
-      
    runmode/runmode.js
    
-      
    Can be used to run a CodeMirror mode over text without
-      actually opening an editor instance.
-      See the demo for an example.
-      There are alternate versions of the file avaible for
-      running stand-alone
-      (without including all of CodeMirror) and
-      for running under
-      node.js (see bin/source-highlight for an example of using the latter).
    
-
-      
    runmode/colorize.js
    
-      
    Provides a convenient way to syntax-highlight code snippets
-      in a webpage. Depends on
-      the runmode addon (or
-      its standalone variant). Provides
-      a CodeMirror.colorize function that can be called
-      with an array (or other array-ish collection) of DOM nodes that
-      represent the code snippets. By default, it'll get
-      all pre tags. Will read the data-lang
-      attribute of these nodes to figure out their language, and
-      syntax-color their content using the relevant CodeMirror mode
-      (you'll have to load the scripts for the relevant modes
-      yourself). A second argument may be provided to give a default
-      mode, used when no language attribute is found for a node. Used
-      in this manual to highlight example code.
    
-
-      
    mode/overlay.js
    
-      
    Mode combinator that can be used to extend a mode with an
-      'overlay' — a secondary mode is run over the stream, along with
-      the base mode, and can color specific pieces of text without
-      interfering with the base mode.
-      Defines CodeMirror.overlayMode, which is used to
-      create such a mode. See this
-      demo for a detailed example.
    
-
-      
    mode/multiplex.js
    
-      
    Mode combinator that can be used to easily 'multiplex'
-      between several modes.
-      Defines CodeMirror.multiplexingMode which, when
-      given as first argument a mode object, and as other arguments
-      any number of {open, close, mode [, delimStyle, innerStyle, parseDelimiters]}
-      objects, will return a mode object that starts parsing using the
-      mode passed as first argument, but will switch to another mode
-      as soon as it encounters a string that occurs in one of
-      the open fields of the passed objects. When in a
-      sub-mode, it will go back to the top mode again when
-      the close string is encountered.
-      Pass "\n" for open or close
-      if you want to switch on a blank line.
-      
    • When delimStyle is specified, it will be the token
-      style returned for the delimiter tokens.
      • 
-      
    • When innerStyle is specified, it will be the token
-      style added for each inner mode token.
      • 
-      
    • When parseDelimiters is true, the content of
-      the delimiters will also be passed to the inner mode.
-      (And delimStyle is ignored.)
     The outer
-      mode will not see the content between the delimiters.
-      See this demo for an
-      example.
    
-
-      
    hint/show-hint.js
    
-      
    Provides a framework for showing autocompletion hints.
-      Defines editor.showHint, which takes an optional
-      options object, and pops up a widget that allows the user to
-      select a completion. Finding hints is done with a hinting
-      functions (the hint option), which is a function
-      that take an editor instance and options object, and return
-      a {list, from, to} object, where list
-      is an array of strings or objects (the completions),
-      and from and to give the start and end
-      of the token that is being completed as {line, ch}
-      objects. An optional selectedHint property (an
-      integer) can be added to the completion object to control the
-      initially selected hint.
    
-      
    If no hinting function is given, the addon will
-      use CodeMirror.hint.auto, which
-      calls getHelpers with
-      the "hint" type to find applicable hinting
-      functions, and tries them one by one. If that fails, it looks
-      for a "hintWords" helper to fetch a list of
-      completable words for the mode, and
-      uses CodeMirror.hint.fromList to complete from
-      those.
    
-      
    When completions aren't simple strings, they should be
-      objects with the following properties:
-      
    
-        
    text: string
    
-        
    The completion text. This is the only required
-        property.
    
-        
    displayText: string
    
-        
    The text that should be displayed in the menu.
    
-        
    className: string
    
-        
    A CSS class name to apply to the completion's line in the
-        menu.
    
-        
    render: fn(Element, self, data)
    
-        
    A method used to create the DOM structure for showing the
-        completion by appending it to its first argument.
    
-        
    hint: fn(CodeMirror, self, data)
    
-        
    A method used to actually apply the completion, instead of
-        the default behavior.
    
-        
    from: {line, ch}
    
-        
    Optional from position that will be used by pick() instead
-        of the global one passed with the full list of completions.
    
-        
    to: {line, ch}
    
-        
    Optional to position that will be used by pick() instead
-        of the global one passed with the full list of completions.
    
-      
    
-      The plugin understands the following options (the options object
-      will also be passed along to the hinting function, which may
-      understand additional options):
-      
    
-        
    hint: function
    
-        
    A hinting function, as specified above. It is possible to
-        set the async property on a hinting function to
-        true, in which case it will be called with
-        arguments (cm, callback, ?options), and the
-        completion interface will only be popped up when the hinting
-        function calls the callback, passing it the object holding the
-        completions.
    
-        
    completeSingle: boolean
    
-        
    Determines whether, when only a single completion is
-        available, it is completed without showing the dialog.
-        Defaults to true.
    
-        
    alignWithWord: boolean
    
-        
    Whether the pop-up should be horizontally aligned with the
-        start of the word (true, default), or with the cursor (false).
    
-        
    closeOnUnfocus: boolean
    
-        
    When enabled (which is the default), the pop-up will close
-        when the editor is unfocused.
    
-        
    customKeys: keymap
    
-        
    Allows you to provide a custom key map of keys to be active
-        when the pop-up is active. The handlers will be called with an
-        extra argument, a handle to the completion menu, which
-        has moveFocus(n), setFocus(n), pick(),
-        and close() methods (see the source for details),
-        that can be used to change the focused element, pick the
-        current element or close the menu. Additionnaly menuSize()
-        can give you access to the size of the current dropdown menu,
-        length give you the number of availlable completions, and
-        data give you full access to the completion returned by the
-        hinting function.
    
-        
    extraKeys: keymap
    
-        
    Like customKeys above, but the bindings will
-        be added to the set of default bindings, instead of replacing
-        them.
    
-      
    
-      The following events will be fired on the completions object
-      during completion:
-      
    
-        
    "shown" ()
    
-        
    Fired when the pop-up is shown.
    
-        
    "select" (completion, Element)
    
-        
    Fired when a completion is selected. Passed the completion
-        value (string or object) and the DOM node that represents it
-        in the menu.
    
-        
    "pick" (completion)
    
-        
    Fired when a completion is picked. Passed the completion value
-        (string or object).
    
-        
    "close" ()
    
-        
    Fired when the completion is finished.
    
-      
    
-      This addon depends on styles
-      from addon/hint/show-hint.css. Check
-      out the demo for an
-      example.
    
-
-      
    hint/javascript-hint.js
    
-      
    Defines a simple hinting function for JavaScript
-      (CodeMirror.hint.javascript) and CoffeeScript
-      (CodeMirror.hint.coffeescript) code. This will
-      simply use the JavaScript environment that the editor runs in as
-      a source of information about objects and their properties.
    
-
-      
    hint/xml-hint.js
    
-      
    Defines CodeMirror.hint.xml, which produces
-      hints for XML tagnames, attribute names, and attribute values,
-      guided by a schemaInfo option (a property of the
-      second argument passed to the hinting function, or the third
-      argument passed to CodeMirror.showHint).
    The
-      schema info should be an object mapping tag names to information
-      about these tags, with optionally a "!top" property
-      containing a list of the names of valid top-level tags. The
-      values of the properties should be objects with optional
-      properties children (an array of valid child
-      element names, omit to simply allow all tags to appear)
-      and attrs (an object mapping attribute names
-      to null for free-form attributes, and an array of
-      valid values for restricted
-      attributes). Demo
-      here.
    
-
-      
    hint/html-hint.js
    
-      
    Provides schema info to
-      the xml-hint addon for HTML
-      documents. Defines a schema
-      object CodeMirror.htmlSchema that you can pass to
-      as a schemaInfo option, and
-      a CodeMirror.hint.html hinting function that
-      automatically calls CodeMirror.hint.xml with this
-      schema data. See
-      the demo.
    
-
-      
    hint/css-hint.js
    
-      
    A hinting function for CSS, SCSS, or LESS code.
-      Defines CodeMirror.hint.css.
    
-
-      
    hint/anyword-hint.js
    
-      
    A very simple hinting function
-      (CodeMirror.hint.anyword) that simply looks for
-      words in the nearby code and completes to those. Takes two
-      optional options, word, a regular expression that
-      matches words (sequences of one or more character),
-      and range, which defines how many lines the addon
-      should scan when completing (defaults to 500).
    
-
-      
    hint/sql-hint.js
    
-      
    A simple SQL hinter. Defines CodeMirror.hint.sql.
-      Takes two optional options, tables, a object with
-      table names as keys and array of respective column names as values,
-      and defaultTable, a string corresponding to a
-      table name in tables for autocompletion.
    
-
-      
    search/match-highlighter.js
    
-      
    Adds a highlightSelectionMatches option that
-      can be enabled to highlight all instances of a currently
-      selected word. Can be set either to true or to an object
-      containing the following options: minChars, for the
-      minimum amount of selected characters that triggers a highlight
-      (default 2), style, for the style to be used to
-      highlight the matches (default "matchhighlight",
-      which will correspond to CSS
-      class cm-matchhighlight),
-      and showToken which can be set to true
-      or to a regexp matching the characters that make up a word. When
-      enabled, it causes the current word to be highlighted when
-      nothing is selected (defaults to off).
-      Demo here.
    
-
-      
    lint/lint.js
    
-      
    Defines an interface component for showing linting warnings,
-      with pluggable warning sources
-      (see html-lint.js,
-      json-lint.js,
-      javascript-lint.js,
-      coffeescript-lint.js,
-      and css-lint.js
-      in the same directory). Defines a lint option that
-      can be set to an annotation source (for
-      example CodeMirror.lint.javascript), to an options
-      object (in which case the getAnnotations field is
-      used as annotation source), or simply to true. When
-      no annotation source is
-      specified, getHelper with
-      type "lint" is used to find an annotation function.
-      An annotation source function should, when given a document
-      string, an options object, and an editor instance, return an
-      array of {message, severity, from, to} objects
-      representing problems. When the function has
-      an async property with a truthy value, it will be
-      called with an additional second argument, which is a callback
-      to pass the array to. By default, the linter will run
-      (debounced) whenever the document is changed. You can pass
-      a lintOnChange: false option to disable that.
-      Depends on addon/lint/lint.css. A demo can be
-      found here.
    
-
-      
    selection/mark-selection.js
    
-      
    Causes the selected text to be marked with the CSS class
-      CodeMirror-selectedtext when the styleSelectedText option
-      is enabled. Useful to change the colour of the selection (in addition to the background),
-      like in this demo.
    
-
-      
    selection/active-line.js
    
-      
    Defines a styleActiveLine option that, when enabled,
-      gives the wrapper of the active line the class CodeMirror-activeline,
-      and adds a background with the class CodeMirror-activeline-background.
-      is enabled. See the demo.
    
-
-      
    selection/selection-pointer.js
    
-      
    Defines a selectionPointer option which you can
-      use to control the mouse cursor appearance when hovering over
-      the selection. It can be set to a string,
-      like "pointer", or to true, in which case
-      the "default" (arrow) cursor will be used. You can
-      see a demo here.
    
-
-      
    mode/loadmode.js
    
-      
    Defines a CodeMirror.requireMode(modename,
-      callback) function that will try to load a given mode and
-      call the callback when it succeeded. You'll have to
-      set CodeMirror.modeURL to a string that mode paths
-      can be constructed from, for
-      example "mode/%N/%N.js"—the %N's will
-      be replaced with the mode name. Also
-      defines CodeMirror.autoLoadMode(instance, mode),
-      which will ensure the given mode is loaded and cause the given
-      editor instance to refresh its mode when the loading
-      succeeded. See the demo.
    
-
-      
    mode/meta.js
    
-      
    Provides meta-information about all the modes in the
-      distribution in a single file.
-      Defines CodeMirror.modeInfo, an array of objects
-      with {name, mime, mode} properties,
-      where name is the human-readable
-      name, mime the MIME type, and mode the
-      name of the mode file that defines this MIME. There are optional
-      properties mimes, which holds an array of MIME
-      types for modes with multiple MIMEs associated,
-      and ext, which holds an array of file extensions
-      associated with this mode. Four convenience
-      functions, CodeMirror.findModeByMIME,
-      CodeMirror.findModeByExtension,
-      CodeMirror.findModeByFileName
-      and CodeMirror.findModeByName are provided, which
-      return such an object given a MIME, extension, file name or mode name
-      string. Note that, for historical reasons, this file resides in the
-      top-level mode directory, not
-      under addon. Demo.
    
-
-      
    comment/continuecomment.js
    
-      
    Adds a continueComments option, which sets whether the
-      editor will make the next line continue a comment when you press Enter
-      inside a comment block. Can be set to a boolean to enable/disable this
-      functionality. Set to a string, it will continue comments using a custom
-      shortcut. Set to an object, it will use the key property for
-      a custom shortcut and the boolean continueLineComment
-      property to determine whether single-line comments should be continued
-      (defaulting to true).
    
-
-      
    display/placeholder.js
    
-      
    Adds a placeholder option that can be used to
-      make content appear in the editor when it is empty and not
-      focused. It can hold either a string or a DOM node. Also gives
-      the editor a CodeMirror-empty CSS class whenever it
-      doesn't contain any text.
-      See the demo.
    
-
-      
    display/fullscreen.js
    
-      
    Defines an option fullScreen that, when set
-      to true, will make the editor full-screen (as in,
-      taking up the whole browser window). Depends
-      on fullscreen.css. Demo
-      here.
    
-
-      
    display/autorefresh.js
    
-      
    This addon can be useful when initalizing an editor in a
-      hidden DOM node, in cases where it is difficult to
-      call refresh when the editor
-      becomes visible. It defines an option autoRefresh
-      which you can set to true to ensure that, if the editor wasn't
-      visible on initialization, it will be refreshed the first time
-      it becomes visible. This is done by polling every 250
-      milliseconds (you can pass a value like {delay:
-      500} as the option value to configure this). Note that
-      this addon will only refresh the editor once when it
-      first becomes visible, and won't take care of further restyling
-      and resizing.
    
-
-      
    scroll/simplescrollbars.js
    
-      
    Defines two additional scrollbar
-      models, "simple" and "overlay"
-      (see demo) that can
-      be selected with
-      the scrollbarStyle
-      option. Depends
-      on simplescrollbars.css,
-      which can be further overridden to style your own
-      scrollbars.
    
-
-      
    scroll/annotatescrollbar.js
    
-      
    Provides functionality for showing markers on the scrollbar
-      to call out certain parts of the document. Adds a
-      method annotateScrollbar to editor instances that
-      can be called, with a CSS class name as argument, to create a
-      set of annotations. The method returns an object
-      whose update method can be called with an array
-      of {from: Pos, to: Pos} objects marking the ranges
-      to be higlighed. To detach the annotations, call the
-      object's clear method.
    
-
-      
    display/rulers.js
    
-      
    Adds a rulers option, which can be used to show
-      one or more vertical rulers in the editor. The option, if
-      defined, should be given an array of {column [, className,
-      color, lineStyle, width]} objects or numbers (wich
-      indicate a column). The ruler will be displayed at the column
-      indicated by the number or the column property.
-      The className property can be used to assign a
-      custom style to a ruler. Demo
-      here.
    
-
-      
    display/panel.js
    
-      
    Defines an addPanel method for CodeMirror
-      instances, which places a DOM node above or below an editor, and
-      shrinks the editor to make room for the node. The method takes
-      as first argument as DOM node, and as second an optional options
-      object. The Panel object returned by this method
-      has a clear method that is used to remove the
-      panel, and a changed method that can be used to
-      notify the addon when the size of the panel's DOM node has
-      changed.
    
-      The method accepts the following options:
-      
    
-        
    position : string
    
-        
    Controls the position of the newly added panel. The
-        following values are recognized:
-          
    
-            
    top (default)
    
-            
    Adds the panel at the very top.
    
-            
    after-top
    
-            
    Adds the panel at the bottom of the top panels.
    
-            
    bottom
    
-            
    Adds the panel at the very bottom.
    
-            
    before-bottom
    
-            
    Adds the panel at the top of the bottom panels.
    
-          
    
-        
    
-        
    before : Panel
    
-        
    The new panel will be added before the given panel.
    
-        
    after : Panel
    
-        
    The new panel will be added after the given panel.
    
-        
    replace : Panel
    
-        
    The new panel will replace the given panel.
    
-      
    
-      When using the after, before or replace options,
-      if the panel doesn't exists or has been removed,
-      the value of the position option will be used as a fallback.
-      
    
-      A demo of the addon is available here.
-      
    
-
-      
    wrap/hardwrap.js
    
-      
    Addon to perform hard line wrapping/breaking for paragraphs
-      of text. Adds these methods to editor instances:
-        
    
-          
    wrapParagraph(?pos: {line, ch}, ?options: object)
    
-          
    Wraps the paragraph at the given position.
-          If pos is not given, it defaults to the cursor
-          position.
    
-          
    wrapRange(from: {line, ch}, to: {line, ch}, ?options: object)
    
-          
    Wraps the given range as one big paragraph.
    
-          
    wrapParagraphsInRange(from: {line, ch}, to: {line, ch}, ?options: object)
    
-          
    Wrapps the paragraphs in (and overlapping with) the
-          given range individually.
    
-        
    
-        The following options are recognized:
-        
    
-          
    paragraphStart, paragraphEnd: RegExp
    
-          
    Blank lines are always considered paragraph boundaries.
-          These options can be used to specify a pattern that causes
-          lines to be considered the start or end of a paragraph.
    
-          
    column: number
    
-          
    The column to wrap at. Defaults to 80.
    
-          
    wrapOn: RegExp
    
-          
    A regular expression that matches only those
-          two-character strings that allow wrapping. By default, the
-          addon wraps on whitespace and after dash characters.
    
-          
    killTrailingSpace: boolean
    
-          
    Whether trailing space caused by wrapping should be
-          preserved, or deleted. Defaults to true.
    
-        
    
-        A demo of the addon is available here.
-      
    
-
-      
    merge/merge.js
    
-      
    Implements an interface for merging changes, using either a
-      2-way or a 3-way view. The CodeMirror.MergeView
-      constructor takes arguments similar to
-      the CodeMirror
-      constructor, first a node to append the interface to, and then
-      an options object. Options are passed through to the editors
-      inside the view. These extra options are recognized:
-        
    
-          
    origLeft and origRight: string
    
-          
    If given these provide original versions of the
-          document, which will be shown to the left and right of the
-          editor in non-editable CodeMirror instances. The merge
-          interface will highlight changes between the editable
-          document and the original(s). To create a 2-way (as opposed
-          to 3-way) merge view, provide only one of them.
    
-          
    revertButtons: boolean
    
-          
    Determines whether buttons that allow the user to revert
-          changes are shown. Defaults to true.
    
-          
    connect: string
    
-          
    Sets the style used to connect changed chunks of code.
-          By default, connectors are drawn. When this is set
-          to "align", the smaller chunk is padded to
-          align with the bigger chunk instead.
    
-          
    collapseIdentical: boolean|number
    
-          
    When true (default is false), stretches of unchanged
-          text will be collapsed. When a number is given, this
-          indicates the amount of lines to leave visible around such
-          stretches (which defaults to 2).
    
-          
    allowEditingOriginals: boolean
    
-          
    Determines whether the original editor allows editing.
-          Defaults to false.
    
-          
    showDifferences: boolean
    
-          
    When true (the default), changed pieces of text are
-          highlighted.
    
-        
    
-        The addon also defines commands "goNextDiff"
-        and "goPrevDiff" to quickly jump to the next
-        changed chunk. Demo
-        here.
    
-
-      
    tern/tern.js
    
-      
    Provides integration with
-      the Tern JavaScript analysis
-      engine, for completion, definition finding, and minor
-      refactoring help. See the demo
-      for a very simple integration. For more involved scenarios, see
-      the comments at the top of
-      the addon and the
-      implementation of the
-      (multi-file) demonstration
-      on the Tern website.
    
-    
    
-
    
-
-
    
-    
    Writing CodeMirror Modes
    
-
-    
    Modes typically consist of a single JavaScript file. This file
-    defines, in the simplest case, a lexer (tokenizer) for your
-    language—a function that takes a character stream as input,
-    advances it past a token, and returns a style for that token. More
-    advanced modes can also handle indentation for the language.
    
-
-    
    This section describes the low-level mode interface. Many modes
-    are written directly against this, since it offers a lot of
-    control, but for a quick mode definition, you might want to use
-    the simple mode addon.
    
-
-    
    The mode script should
-    call CodeMirror.defineMode to
-    register itself with CodeMirror. This function takes two
-    arguments. The first should be the name of the mode, for which you
-    should use a lowercase string, preferably one that is also the
-    name of the files that define the mode (i.e. "xml" is
-    defined in xml.js). The second argument should be a
-    function that, given a CodeMirror configuration object (the thing
-    passed to the CodeMirror function) and an optional
-    mode configuration object (as in
-    the mode option), returns
-    a mode object.
    
-
-    
    Typically, you should use this second argument
-    to defineMode as your module scope function (modes
-    should not leak anything into the global scope!), i.e. write your
-    whole mode inside this function.
    
-
-    
    The main responsibility of a mode script is parsing
-    the content of the editor. Depending on the language and the
-    amount of functionality desired, this can be done in really easy
-    or extremely complicated ways. Some parsers can be stateless,
-    meaning that they look at one element (token) of the code
-    at a time, with no memory of what came before. Most, however, will
-    need to remember something. This is done by using a state
-    object, which is an object that is always passed when
-    reading a token, and which can be mutated by the tokenizer.
    
-
-    
    Modes that use a state must define
-    a startState method on their mode
-    object. This is a function of no arguments that produces a state
-    object to be used at the start of a document.
    
-
-    
    The most important part of a mode object is
-    its token(stream, state) method. All
-    modes must define this method. It should read one token from the
-    stream it is given as an argument, optionally update its state,
-    and return a style string, or null for tokens that do
-    not have to be styled. For your styles, you are encouraged to use
-    the 'standard' names defined in the themes (without
-    the cm- prefix). If that fails, it is also possible
-    to come up with your own and write your own CSS theme file.
    
-
-    
    A typical token string would
-    be "variable" or "comment". Multiple
-    styles can be returned (separated by spaces), for
-    example "string error" for a thing that looks like a
-    string but is invalid somehow (say, missing its closing quote).
-    When a style is prefixed by "line-"
-    or "line-background-", the style will be applied to
-    the whole line, analogous to what
-    the addLineClass method
-    does—styling the "text" in the simple case, and
-    the "background" element
-    when "line-background-" is prefixed.
    
-
-    
    The stream object that's passed
-    to token encapsulates a line of code (tokens may
-    never span lines) and our current position in that line. It has
-    the following API:
    
-
-    
    
-      
    eol() → boolean
    
-      
    Returns true only if the stream is at the end of the
-      line.
    
-      
    sol() → boolean
    
-      
    Returns true only if the stream is at the start of the
-      line.
    
-
-      
    peek() → string
    
-      
    Returns the next character in the stream without advancing
-      it. Will return an null at the end of the
-      line.
    
-      
    next() → string
    
-      
    Returns the next character in the stream and advances it.
-      Also returns null when no more characters are
-      available.
    
-
-      
    eat(match: string|regexp|function(char: string) → boolean) → string
    
-      
    match can be a character, a regular expression,
-      or a function that takes a character and returns a boolean. If
-      the next character in the stream 'matches' the given argument,
-      it is consumed and returned. Otherwise, undefined
-      is returned.
    
-      
    eatWhile(match: string|regexp|function(char: string) → boolean) → boolean
    
-      
    Repeatedly calls eat with the given argument,
-      until it fails. Returns true if any characters were eaten.
    
-      
    eatSpace() → boolean
    
-      
    Shortcut for eatWhile when matching
-      white-space.
    
-      
    skipToEnd()
    
-      
    Moves the position to the end of the line.
    
-      
    skipTo(ch: string) → boolean
    
-      
    Skips to the next occurrence of the given character, if
-      found on the current line (doesn't advance the stream if the
-      character does not occur on the line). Returns true if the
-      character was found.
    
-      
    match(pattern: string, ?consume: boolean, ?caseFold: boolean) → boolean
    
-      
    match(pattern: regexp, ?consume: boolean) → array<string>
    
-      
    Act like a
-      multi-character eat—if consume is true
-      or not given—or a look-ahead that doesn't update the stream
-      position—if it is false. pattern can be either a
-      string or a regular expression starting with ^.
-      When it is a string, caseFold can be set to true to
-      make the match case-insensitive. When successfully matching a
-      regular expression, the returned value will be the array
-      returned by match, in case you need to extract
-      matched groups.
    
-
-      
    backUp(n: integer)
    
-      
    Backs up the stream n characters. Backing it up
-      further than the start of the current token will cause things to
-      break, so be careful.
    
-      
    column() → integer
    
-      
    Returns the column (taking into account tabs) at which the
-      current token starts.
    
-      
    indentation() → integer
    
-      
    Tells you how far the current line has been indented, in
-      spaces. Corrects for tab characters.
    
-
-      
    current() → string
    
-      
    Get the string between the start of the current token and
-      the current stream position.
    
-    
    
-
-    
    By default, blank lines are simply skipped when
-    tokenizing a document. For languages that have significant blank
-    lines, you can define
-    a blankLine(state) method on your
-    mode that will get called whenever a blank line is passed over, so
-    that it can update the parser state.
    
-
-    
    Because state object are mutated, and CodeMirror
-    needs to keep valid versions of a state around so that it can
-    restart a parse at any line, copies must be made of state objects.
-    The default algorithm used is that a new state object is created,
-    which gets all the properties of the old object. Any properties
-    which hold arrays get a copy of these arrays (since arrays tend to
-    be used as mutable stacks). When this is not correct, for example
-    because a mode mutates non-array properties of its state object, a
-    mode object should define
-    a copyState method, which is given a
-    state and should return a safe copy of that state.
    
-
-    
    If you want your mode to provide smart indentation
-    (through the indentLine
-    method and the indentAuto
-    and newlineAndIndent commands, to which keys can be
-    bound), you must define
-    an indent(state, textAfter) method
-    on your mode object.
    
-
-    
    The indentation method should inspect the given state object,
-    and optionally the textAfter string, which contains
-    the text on the line that is being indented, and return an
-    integer, the amount of spaces to indent. It should usually take
-    the indentUnit
-    option into account. An indentation method may
-    return CodeMirror.Pass to indicate that it
-    could not come up with a precise indentation.
    
-
-    
    To work well with
-    the commenting addon, a mode may
-    define lineComment (string that
-    starts a line
-    comment), blockCommentStart, blockCommentEnd
-    (strings that start and end block comments),
-    and blockCommentLead (a string to put at the start of
-    continued lines in a block comment). All of these are
-    optional.
    
-
-    
    Finally, a mode may define either
-    an electricChars or an electricInput
-    property, which are used to automatically reindent the line when
-    certain patterns are typed and
-    the electricChars
-    option is enabled. electricChars may be a string, and
-    will trigger a reindent whenever one of the characters in that
-    string are typed. Often, it is more appropriate to
-    use electricInput, which should hold a regular
-    expression, and will trigger indentation when the part of the
-    line before the cursor matches the expression. It should
-    usually end with a $ character, so that it only
-    matches when the indentation-changing pattern was just typed, not when something was
-    typed after the pattern.
    
-
-    
    So, to summarize, a mode must provide
-    a token method, and it may
-    provide startState, copyState,
-    and indent methods. For an example of a trivial mode,
-    see the diff mode, for a more
-    involved example, see the C-like
-    mode.
    
-
-    
    Sometimes, it is useful for modes to nest—to have one
-    mode delegate work to another mode. An example of this kind of
-    mode is the mixed-mode HTML
-    mode. To implement such nesting, it is usually necessary to
-    create mode objects and copy states yourself. To create a mode
-    object, there are CodeMirror.getMode(options,
-    parserConfig), where the first argument is a configuration
-    object as passed to the mode constructor function, and the second
-    argument is a mode specification as in
-    the mode option. To copy a
-    state object, call CodeMirror.copyState(mode, state),
-    where mode is the mode that created the given
-    state.
    
-
-    
    In a nested mode, it is recommended to add an
-    extra method, innerMode which, given
-    a state object, returns a {state, mode} object with
-    the inner mode and its state for the current position. These are
-    used by utility scripts such as the tag
-    closer to get context information. Use
-    the CodeMirror.innerMode helper function to, starting
-    from a mode and a state, recursively walk down to the innermost
-    mode and state.
    
-
-    
    To make indentation work properly in a nested parser, it is
-    advisable to give the startState method of modes that
-    are intended to be nested an optional argument that provides the
-    base indentation for the block of code. The JavaScript and CSS
-    parser do this, for example, to allow JavaScript and CSS code
-    inside the mixed-mode HTML mode to be properly indented.
    
-
-    
    It is possible, and encouraged, to associate
-    your mode, or a certain configuration of your mode, with
-    a MIME type. For
-    example, the JavaScript mode associates itself
-    with text/javascript, and its JSON variant
-    with application/json. To do this,
-    call CodeMirror.defineMIME(mime,
-    modeSpec), where modeSpec can be a string or
-    object specifying a mode, as in
-    the mode option.
    
-
-    
    If a mode specification wants to add some properties to the
-    resulting mode object, typically for use
-    with getHelpers, it may
-    contain a modeProps property, which holds an object.
-    This object's properties will be copied to the actual mode
-    object.
    
-
-    
    Sometimes, it is useful to add or override mode
-    object properties from external code.
-    The CodeMirror.extendMode function
-    can be used to add properties to mode objects produced for a
-    specific mode. Its first argument is the name of the mode, its
-    second an object that specifies the properties that should be
-    added. This is mostly useful to add utilities that can later be
-    looked up through getMode.
    
-
    
-
-
    
-    
    VIM Mode API
    
-
-    
    CodeMirror has a robust VIM mode that attempts to faithfully
-    emulate VIM's most useful features. It can be enabled by
-    including keymap/vim.js
-     and setting the keymap option to
-    vim.
    
-
-    
    Configuration
    
-
-    
    VIM mode accepts configuration options for customizing
-    behavior at run time. These methods can be called at any time
-    and will affect all existing CodeMirror instances unless
-    specified otherwise. The methods are exposed on the
-    CodeMirror.Vim object.
    
-
-    
    
-      
    setOption(name: string, value: any, ?cm: CodeMirror, ?cfg: object)
    
-      
    Sets the value of a VIM option. name should
-      be the name of an option. If cfg.scope is not set
-      and cm is provided, then sets the global and
-      instance values of the option. Otherwise, sets either the
-      global or instance value of the option depending on whether
-      cfg.scope is global or
-      local.
    
-      
    getOption(name: string, ?cm: CodeMirror: ?cfg: object)
    
-      
    Gets the current value of a VIM option. If
-      cfg.scope is not set and cm is
-      provided, then gets the instance value of the option, falling
-      back to the global value if not set. If cfg.scope is provided, then gets the global or
-      local value without checking the other.
    
-
-      
    map(lhs: string, rhs: string, ?context: string)
    
-      
    Maps a key sequence to another key sequence. Implements
-      VIM's :map command. To map ; to : in VIM would be
-      :map ; :. That would translate to
-      CodeMirror.Vim.map(';', ':');.
-      The context can be normal,
-      visual, or insert, which correspond
-      to :nmap, :vmap, and
-      :imap
-      respectively.
    
-
-      
    mapCommand(keys: string, type: string, name: string, ?args: object, ?extra: object)
    
-      
    Maps a key sequence to a motion,
-      operator, or action type command.
-      The args object is passed through to the command when it is
-      invoked by the provided key sequence.
-      extras.context can be normal,
-      visual, or insert, to map the key
-      sequence only in the corresponding mode.
-      extras.isEdit is applicable only to actions,
-      determining whether it is recorded for replay for the
-      . single-repeat command.
-    
    
-
-    
    Extending VIM
    
-
-    
    CodeMirror's VIM mode implements a large subset of VIM's core
-    editing functionality. But since there's always more to be
-    desired, there is a set of APIs for extending VIM's
-    functionality. As with the configuration API, the methods are
-    exposed on CodeMirror.Vim and may
-    be called at any time.
    
-
-    
    
-      
    defineOption(name: string, default: any, type: string, ?aliases: array<string>, ?callback: function (?value: any, ?cm: CodeMirror) → ?any)
    
-      
    Defines a VIM style option and makes it available to the
-      :set command. Type can be boolean or
-      string, used for validation and by
-      :set to determine which syntax to accept. If a
-      callback is passed in, VIM does not store the value of the
-      option itself, but instead uses the callback as a setter/getter. If the
-      first argument to the callback is undefined, then the
-      callback should return the value of the option. Otherwise, it should set
-      instead. Since VIM options have global and instance values, whether a
-      CodeMirror instance is passed in denotes whether the global
-      or local value should be used. Consequently, it's possible for the
-      callback to be called twice for a single setOption or
-      getOption call. Note that right now, VIM does not support
-      defining buffer-local options that do not have global values. If an
-      option should not have a global value, either always ignore the
-      cm parameter in the callback, or always pass in a
-      cfg.scope to setOption and
-      getOption.
    
-
-      
    defineMotion(name: string, fn: function(cm: CodeMirror, head: {line, ch}, ?motionArgs: object}) → {line, ch})
    
-      
    Defines a motion command for VIM. The motion should return
-      the desired result position of the cursor. head
-      is the current position of the cursor. It can differ from
-      cm.getCursor('head') if VIM is in visual mode.
-      motionArgs is the object passed into
-      mapCommand().
    
-
-      
    defineOperator(name: string, fn: function(cm: CodeMirror, ?operatorArgs: object, ranges: array<{anchor, head}>) → ?{line, ch})
    
-      
    Defines an operator command, similar to 
-      defineMotion. ranges is the range
-      of text the operator should operate on. If the cursor should
-      be set to a certain position after the operation finishes, it
-      can return a cursor object.
    
-
-      
    defineAction(name: string, fn: function(cm: CodeMirror, ?actionArgs: object))
    
-      
    Defines an action command, similar to
-      defineMotion. Action commands
-      can have arbitrary behavior, making them more flexible than
-      motions and operators, at the loss of orthogonality.
    
-
-      
    defineEx(name: string, ?prefix: string, fn: function(cm: CodeMirror, ?params: object))
    
-      
    Defines an Ex command, and maps it to :name.
-      If a prefix is provided, it, and any prefixed substring of the
-      name beginning with the prefix can
-      be used to invoke the command. If the prefix is
-      falsy, then name is used as the prefix. 
-      params.argString contains the part of the prompted
-      string after the command name. params.args is
-      params.argString split by whitespace. If the
-      command was prefixed with a
-      line range,
-      params.line and params.lineEnd will
-      be set.
-    
    
-
-
    
-
-
    
-
-
diff --git a/www/code/codemirror-5.7/doc/realworld.html b/www/code/codemirror-5.7/doc/realworld.html
deleted file mode 100644
index 3f72b28c8..000000000
--- a/www/code/codemirror-5.7/doc/realworld.html
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-CodeMirror: Real-world Uses
-
-
-
-
-
-
    
-
-
    CodeMirror real-world uses
    
-
-    
    Create a pull
-    request if you'd like your project to be added to this list.
    
-
-    
-
-
    
-
diff --git a/www/code/codemirror-5.7/doc/releases.html b/www/code/codemirror-5.7/doc/releases.html
deleted file mode 100644
index b2685f571..000000000
--- a/www/code/codemirror-5.7/doc/releases.html
+++ /dev/null
@@ -1,1144 +0,0 @@
-
-
-CodeMirror: Release History
-
-
-
-
-
-
-
    
-
-
    Release notes and version history
    
-
-
    
-
-  
    Version 5.x
    
-
-  
    20-08-2015: Version 5.7:
    
-
-  
-
-  
    20-08-2015: Version 5.6:
    
-
-  
      
-    
    • Fix bug where you could paste into a readOnly editor
      • 
-    
    • Show a cursor at the drop location when dragging over the editor
      • 
-    
    • The Rust mode was rewritten to handle modern Rust
      • 
-    
    • The editor and theme CSS was cleaned up. Some selectors are now less specific than before
      • 
-    
    • New theme: abcdef
      • 
-    
    • Lines longer than maxHighlightLength are now less likely to mess up indentation
      • 
-    
    • New addons: autorefresh for refreshing an editor the first time it becomes visible, and html-lint for using HTMLHint
      • 
-    
    • The search addon now recognizes \r and \n in pattern and replacement input
      • 
-    
    • Full list of patches
      • 
-  
    
-
-  
    20-07-2015: Version 5.5:
    
-
-  
-
-  
    25-06-2015: Version 5.4:
    
-
-  
-
-  
    20-05-2015: Version 5.3:
    
-
-  
-
-  
    20-04-2015: Version 5.2:
    
-
-  
-
-  
    23-03-2015: Version 5.1:
    
-
-  
-
-  
    20-02-2015: Version 5.0:
    
-
-  
      
-    
    • Experimental mobile support (tested on iOS, Android Chrome, stock Android browser)
      • 
-    
    • New option inputStyle to switch between hidden textarea and contenteditable input.
      • 
-    
    • The getInputField
-    method is no longer guaranteed to return a textarea.
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-
    
-
-
    
-
-  
    Version 4.x
    
-
-  
    20-02-2015: Version 4.13:
    
-
-  
-
-  
    22-01-2015: Version 4.12:
    
-
-  
-
-  
    9-01-2015: Version 4.11:
    
-
-  
    Unfortunately, 4.10 did not take care of the
-  Firefox scrolling issue entirely. This release adds two more patches
-  to address that.
    
-
-  
    29-12-2014: Version 4.10:
    
-
-  
    Emergency single-patch update to 4.9. Fixes
-  Firefox-specific problem where the cursor could end up behind the
-  horizontal scrollbar.
    
-
-  
    23-12-2014: Version 4.9:
    
-
-  
-
-  
    22-11-2014: Version 4.8:
    
-
-  
-
-  
    20-10-2014: Version 4.7:
    
-
-  
      
-    
    • Incompatible:
-    The lint addon now passes the
-    editor's value as first argument to asynchronous lint functions,
-    for consistency. The editor is still passed, as fourth
-    argument.
      • 
-    
    • Improved handling of unicode identifiers in modes for
-    languages that support them.
      • 
-    
    • More mode
-    improvements: CoffeeScript
-    (indentation), Verilog
-    (indentation), Scala
-    (indentation, triple-quoted strings),
-    and PHP (interpolated
-    variables in heredoc strings).
      • 
-    
    • New modes: Textile and Tornado templates.
      • 
-    
    • Experimental new way to define modes.
      • 
-    
    • Improvements to the Vim
-    bindings: Arbitrary insert mode key mappings are now possible,
-    and text objects are supported in visual mode.
      • 
-    
    • The mode meta-information file
-    now includes information about file extensions,
-    and helper
-    functions findModeByMIME
-    and findModeByExtension.
      • 
-    
    • New logo!
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    19-09-2014: Version 4.6:
    
-
-  
-
-  
    21-08-2014: Version 4.5:
    
-
-  
      
-    
    • Fix several serious bugs with horizontal scrolling
      • 
-    
    • New mode: Slim
      • 
-    
    • New command: goLineLeftSmart
      • 
-    
    • More fixes and extensions for the Vim visual block mode
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    21-07-2014: Version 4.4:
    
-
-  
      
-    
    • Note: Some events might now fire in slightly
-    different order ("change" is still guaranteed to fire
-    before "cursorActivity")
      • 
-    
    • Nested operations in multiple editors are now synced (complete
-    at same time, reducing DOM reflows)
      • 
-    
    • Visual block mode for vim (<C-v>) is nearly complete
      • 
-    
    • New mode: Kotlin
      • 
-    
    • Better multi-selection paste for text copied from multiple CodeMirror selections
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    23-06-2014: Version 4.3:
    
-
-  
      
-    
    • Several vim bindings
-    improvements: search and exCommand history, global flag
-    for :substitute, :global command.
-    
    • Allow hiding the cursor by
-    setting cursorBlinkRate
-    to a negative value.
      • 
-    
    • Make gutter markers themeable, use this in foldgutter.
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    19-05-2014: Version 4.2:
    
-
-  
      
-    
    • Fix problem where some modes were broken by the fact that empty tokens were forbidden.
      • 
-    
    • Several fixes to context menu handling.
      • 
-    
    • On undo, scroll change, not cursor, into view.
      • 
-    
    • Rewritten Jade mode.
      • 
-    
    • Various improvements to Shell (support for more syntax) and Python (better indentation) modes.
      • 
-    
    • New mode: Cypher.
      • 
-    
    • New theme: Neo.
      • 
-    
    • Support direct styling options (color, line style, width) in the rulers addon.
      • 
-    
    • Recognize per-editor configuration for the show-hint and foldcode addons.
      • 
-    
    • More intelligent scanning for existing close tags in closetag addon.
      • 
-    
    • In the Vim bindings: Fix bracket matching, support case conversion in visual mode, visual paste, append action.
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    22-04-2014: Version 4.1:
    
-
-  
      
-    
    • Slightly incompatible:
-    The "cursorActivity"
-    event now fires after all other events for the operation (and only
-    for handlers that were actually registered at the time the
-    activity happened).
      • 
-    
    • New command: insertSoftTab.
      • 
-    
    • New mode: Django.
      • 
-    
    • Improved modes: Verilog (rewritten), Jinja2, Haxe, PHP (string interpolation highlighted), JavaScript (indentation of trailing else, template strings), LiveScript (multi-line strings).
      • 
-    
    • Many small issues from the 3.x→4.x transition were found and fixed.
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    20-03-2014: Version 4.0:
    
-
-  
    This is a new major version of CodeMirror. There
-  are a few incompatible changes in the API. Upgrade
-  with care, and read the upgrading
-  guide.
    
-
-  
-
-
    
-
-
    
-
-  
    Version 3.x
    
-
-  
    22-04-2014: Version 3.24:
    
-
-  
    Merges the improvements from 4.1 that could
-  easily be applied to the 3.x code. Also improves the way the editor
-  size is updated when line widgets change.
    
-
-  
    20-03-2014: Version 3.23:
    
-
-  
      
-    
    • In the XML mode,
-    add brackets style to angle brackets, fix
-    case-sensitivity of tags for HTML.
      • 
-    
    • New mode: Dylan.
      • 
-    
    • Many improvements to the Vim bindings.
      • 
-  
    
-
-  
    21-02-2014: Version 3.22:
    
-
-  
-
-  
    16-01-2014: Version 3.21:
    
-
-  
      
-    
    • Auto-indenting a block will no longer add trailing whitespace to blank lines.
-    
    • Marking text has a new option clearWhenEmpty to control auto-removal.
      • 
-    
    • Several bugfixes in the handling of bidirectional text.
      • 
-    
    • The XML and CSS modes were largely rewritten. LESS support was added to the CSS mode.
      • 
-    
    • The OCaml mode was moved to an mllike mode, F# support added.
      • 
-    
    • Make it possible to fetch multiple applicable helper values with getHelpers, and to register helpers matched on predicates with registerGlobalHelper.
      • 
-    
    • New theme pastel-on-dark.
      • 
-    
    • Better ECMAScript 6 support in JavaScript mode.
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    21-11-2013: Version 3.20:
    
-
-  
-
-  
    21-10-2013: Version 3.19:
    
-
-  
-
-  
    23-09-2013: Version 3.18:
    
-
-  
    Emergency release to fix a problem in 3.17
-  where .setOption("lineNumbers", false) would raise an
-  error.
    
-
-  
    23-09-2013: Version 3.17:
    
-
-  
-
-  
    21-08-2013: Version 3.16:
    
-
-  
-
-  
    29-07-2013: Version 3.15:
    
-
-  
-
-  
    20-06-2013: Version 3.14:
    
-
-  
-
-  
    20-05-2013: Version 3.13:
    
-
-  
-
-  
    19-04-2013: Version 3.12:
    
-
-  
-
-  
    20-03-2013: Version 3.11:
    
-
-  
-
-  
    21-02-2013: Version 3.1:
    
-
-  
-  
-
-  
    25-01-2013: Version 3.02:
    
-
-  
    Single-bugfix release. Fixes a problem that
-  prevents CodeMirror instances from being garbage-collected after
-  they become unused.
    
-
-  
    21-01-2013: Version 3.01:
    
-
-  
-
-  
    10-12-2012: Version 3.0:
    
-
-  
    New major version. Only
-  partially backwards-compatible. See
-  the upgrading guide for more
-  information. Changes since release candidate 2:
    
-
-  
      
-    
    • Rewritten VIM mode.
      • 
-    
    • Fix a few minor scrolling and sizing issues.
      • 
-    
    • Work around Safari segfault when dragging.
      • 
-    
    • Full list of patches.
      • 
-  
    
-  
-  
    20-11-2012: Version 3.0, release candidate 2:
    
-
-  
      
-    
    • New mode: HTTP.
      • 
-    
    • Improved handling of selection anchor position.
      • 
-    
    • Improve IE performance on longer lines.
      • 
-    
    • Reduce gutter glitches during horiz. scrolling.
      • 
-    
    • Add addKeyMap and removeKeyMap methods.
      • 
-    
    • Rewrite formatting and closetag add-ons.
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    20-11-2012: Version 3.0, release candidate 1:
    
-
-  
-
-  
    22-10-2012: Version 3.0, beta 2:
    
-
-  
      
-    
    • Fix page-based coordinate computation.
      • 
-    
    • Fix firing of gutterClick event.
      • 
-    
    • Add cursorHeight option.
      • 
-    
    • Fix bi-directional text regression.
      • 
-    
    • Add viewportMargin option.
      • 
-    
    • Directly handle mousewheel events (again, hopefully better).
      • 
-    
    • Make vertical cursor movement more robust (through widgets, big line gaps).
      • 
-    
    • Add flattenSpans option.
      • 
-    
    • Many optimizations. Poor responsiveness should be fixed.
      • 
-    
    • Initialization in hidden state works again.
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    19-09-2012: Version 3.0, beta 1:
    
-
-  
      
-    
    • Bi-directional text support.
      • 
-    
    • More powerful gutter model.
      • 
-    
    • Support for arbitrary text/widget height.
      • 
-    
    • In-line widgets.
      • 
-    
    • Generalized event handling.
      • 
-  
    
-
-
    
-
-
    
-
-  
    Version 2.x
    
-
-  
    21-01-2013: Version 2.38:
    
-
-  
    Integrate some bugfixes, enhancements to the vim keymap, and new
-  modes
-  (D, Sass, APL)
-  from the v3 branch.
    
-
-  
    20-12-2012: Version 2.37:
    
-
-  
      
-    
    • New mode: SQL (will replace plsql and mysql modes).
      • 
-    
    • Further work on the new VIM mode.
      • 
-    
    • Fix Cmd/Ctrl keys on recent Operas on OS X.
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    20-11-2012: Version 2.36:
    
-
-  
-
-  
    22-10-2012: Version 2.35:
    
-
-  
      
-    
    • New (sub) mode: TypeScript.
      • 
-    
    • Don't overwrite (insert key) when pasting.
      • 
-    
    • Fix several bugs in markText/undo interaction.
      • 
-    
    • Better indentation of JavaScript code without semicolons.
      • 
-    
    • Add defineInitHook function.
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    19-09-2012: Version 2.34:
    
-
-  
      
-    
    • New mode: Common Lisp.
      • 
-    
    • Fix right-click select-all on most browsers.
      • 
-    
    • Change the way highlighting happens:
        Saves memory and CPU cycles.
        compareStates is no longer needed.
        onHighlightComplete no longer works.
      • 
-    
    • Integrate mode (Markdown, XQuery, CSS, sTex) tests in central testsuite.
      • 
-    
    • Add a CodeMirror.version property.
      • 
-    
    • More robust handling of nested modes in formatting and closetag plug-ins.
      • 
-    
    • Un/redo now preserves marked text and bookmarks.
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    23-08-2012: Version 2.33:
    
-
-  
      
-    
    • New mode: Sieve.
      • 
-    
    • New getViewPort and onViewportChange API.
      • 
-    
    • Configurable cursor blink rate.
      • 
-    
    • Make binding a key to false disabling handling (again).
      • 
-    
    • Show non-printing characters as red dots.
      • 
-    
    • More tweaks to the scrolling model.
      • 
-    
    • Expanded testsuite. Basic linter added.
      • 
-    
    • Remove most uses of innerHTML. Remove CodeMirror.htmlEscape.
      • 
-    
    • Full list of patches.
      • 
-  
    
-
-  
    23-07-2012: Version 2.32:
    
-
-  
    Emergency fix for a bug where an editor with
-  line wrapping on IE will break when there is no
-  scrollbar.
    
-
-  
    20-07-2012: Version 2.31:
    
-
-  
-
-  
    22-06-2012: Version 2.3:
    
-
-  
      
-    
    • New scrollbar implementation. Should flicker less. Changes DOM structure of the editor.
      • 
-    
    • New theme: vibrant-ink.
      • 
-    
    • Many extensions to the VIM keymap (including text objects).
      • 
-    
    • Add mode-multiplexing utility script.
      • 
-    
    • Fix bug where right-click paste works in read-only mode.
      • 
-    
    • Add a getScrollInfo method.
      • 
-    
    • Lots of other fixes.
      • 
-  
    
-
-  
    23-05-2012: Version 2.25:
    
-
-  
      
-    
    • New mode: Erlang.
      • 
-    
    • Remove xmlpure mode (use xml.js).
      • 
-    
    • Fix line-wrapping in Opera.
      • 
-    
    • Fix X Windows middle-click paste in Chrome.
      • 
-    
    • Fix bug that broke pasting of huge documents.
      • 
-    
    • Fix backspace and tab key repeat in Opera.
      • 
-  
    
-
-  
    23-04-2012: Version 2.24:
    
-
-  
      
-    
    • Drop support for Internet Explorer 6.
      • 
-    
    • New
-    modes: Shell, Tiki
-    wiki, Pig Latin.
      • 
-    
    • New themes: Ambiance, Blackboard.
      • 
-    
    • More control over drag/drop
-    with dragDrop
-    and onDragEvent
-    options.
      • 
-    
    • Make HTML mode a bit less pedantic.
      • 
-    
    • Add compoundChange API method.
      • 
-    
    • Several fixes in undo history and line hiding.
      • 
-    
    • Remove (broken) support for catchall in key maps,
-    add nofallthrough boolean field instead.
      • 
-  
    
-
-  
    26-03-2012: Version 2.23:
    
-
-  
      
-    
    • Change default binding for tab [more]
-      
-    
      • 
-    
    • New modes: XQuery and VBScript.
      • 
-    
    • Two new themes: lesser-dark and xq-dark.
      • 
-    
    • Differentiate between background and text styles in setLineClass.
      • 
-    
    • Fix drag-and-drop in IE9+.
      • 
-    
    • Extend charCoords
-    and cursorCoords with a mode argument.
      • 
-    
    • Add autofocus option.
      • 
-    
    • Add findMarksAt method.
      • 
-  
    
-
-  
    27-02-2012: Version 2.22:
    
-
-  
-
-  
    27-01-2012: Version 2.21:
    
-
-  
      
-    
    • Added LESS, MySQL,
-    Go, and Verilog modes.
      • 
-    
    • Add smartIndent
-    option.
      • 
-    
    • Support a cursor in readOnly-mode.
      • 
-    
    • Support assigning multiple styles to a token.
      • 
-    
    • Use a new approach to drawing the selection.
      • 
-    
    • Add scrollTo method.
      • 
-    
    • Allow undo/redo events to span non-adjacent lines.
      • 
-    
    • Lots and lots of bugfixes.
      • 
-  
    
-
-  
    20-12-2011: Version 2.2:
    
-
-  
-
-  
    21-11-2011: Version 2.18:
    
-  
    Fixes TextMarker.clear, which is broken in 2.17.
    
-
-  
    21-11-2011: Version 2.17:
    
-  
      
-    
    • Add support for line
-    wrapping and code
-    folding.
      • 
-    
    • Add Github-style Markdown mode.
      • 
-    
    • Add Monokai
-    and Rubyblue themes.
      • 
-    
    • Add setBookmark method.
      • 
-    
    • Move some of the demo code into reusable components
-    under lib/util.
      • 
-    
    • Make screen-coord-finding code faster and more reliable.
      • 
-    
    • Fix drag-and-drop in Firefox.
      • 
-    
    • Improve support for IME.
      • 
-    
    • Speed up content rendering.
      • 
-    
    • Fix browser's built-in search in Webkit.
      • 
-    
    • Make double- and triple-click work in IE.
      • 
-    
    • Various fixes to modes.
      • 
-  
    
-
-  
    27-10-2011: Version 2.16:
    
-  
      
-    
    • Add Perl, Rust, TiddlyWiki, and Groovy modes.
      • 
-    
    • Dragging text inside the editor now moves, rather than copies.
      • 
-    
    • Add a coordsFromIndex method.
      • 
-    
    • API change: setValue now no longer clears history. Use clearHistory for that.
      • 
-    
    • API change: markText now
-    returns an object with clear and find
-    methods. Marked text is now more robust when edited.
      • 
-    
    • Fix editing code with tabs in Internet Explorer.
      • 
-  
    
-
-  
    26-09-2011: Version 2.15:
    
-  
    Fix bug that snuck into 2.14: Clicking the
-  character that currently has the cursor didn't re-focus the
-  editor.
    
-
-  
    26-09-2011: Version 2.14:
    
-  
-
-
-  
    23-08-2011: Version 2.13:
    
-  
-
-  
    25-07-2011: Version 2.12:
    
-  
      
-    
    • Add a SPARQL mode.
      • 
-    
    • Fix bug with cursor jumping around in an unfocused editor in IE.
      • 
-    
    • Allow key and mouse events to bubble out of the editor. Ignore widget clicks.
      • 
-    
    • Solve cursor flakiness after undo/redo.
      • 
-    
    • Fix block-reindent ignoring the last few lines.
      • 
-    
    • Fix parsing of multi-line attrs in XML mode.
      • 
-    
    • Use innerHTML for HTML-escaping.
      • 
-    
    • Some fixes to indentation in C-like mode.
      • 
-    
    • Shrink horiz scrollbars when long lines removed.
      • 
-    
    • Fix width feedback loop bug that caused the width of an inner DIV to shrink.
      • 
-  
    
-
-  
    04-07-2011: Version 2.11:
    
-  
      
-    
    • Add a Scheme mode.
      • 
-    
    • Add a replace method to search cursors, for cursor-preserving replacements.
      • 
-    
    • Make the C-like mode mode more customizable.
      • 
-    
    • Update XML mode to spot mismatched tags.
      • 
-    
    • Add getStateAfter API and compareState mode API methods for finer-grained mode magic.
      • 
-    
    • Add a getScrollerElement API method to manipulate the scrolling DIV.
      • 
-    
    • Fix drag-and-drop for Firefox.
      • 
-    
    • Add a C# configuration for the C-like mode.
      • 
-    
    • Add full-screen editing and mode-changing demos.
      • 
-  
    
-
-  
    07-06-2011: Version 2.1:
    
-  
    Add
-  a theme system
-  (demo). Note that this is not
-  backwards-compatible—you'll have to update your styles and
-  modes!
    
-
-  
    07-06-2011: Version 2.02:
    
-  
      
-    
    • Add a Lua mode.
      • 
-    
    • Fix reverse-searching for a regexp.
      • 
-    
    • Empty lines can no longer break highlighting.
      • 
-    
    • Rework scrolling model (the outer wrapper no longer does the scrolling).
      • 
-    
    • Solve horizontal jittering on long lines.
      • 
-    
    • Add runmode.js.
      • 
-    
    • Immediately re-highlight text when typing.
      • 
-    
    • Fix problem with 'sticking' horizontal scrollbar.
      • 
-  
    
-
-  
    26-05-2011: Version 2.01:
    
-  
      
-    
    • Add a Smalltalk mode.
      • 
-    
    • Add a reStructuredText mode.
      • 
-    
    • Add a Python mode.
      • 
-    
    • Add a PL/SQL mode.
      • 
-    
    • coordsChar now works
      • 
-    
    • Fix a problem where onCursorActivity interfered with onChange.
      • 
-    
    • Fix a number of scrolling and mouse-click-position glitches.
      • 
-    
    • Pass information about the changed lines to onChange.
      • 
-    
    • Support cmd-up/down on OS X.
      • 
-    
    • Add triple-click line selection.
      • 
-    
    • Don't handle shift when changing the selection through the API.
      • 
-    
    • Support "nocursor" mode for readOnly option.
      • 
-    
    • Add an onHighlightComplete option.
      • 
-    
    • Fix the context menu for Firefox.
      • 
-  
    
-
-  
    28-03-2011: Version 2.0:
    
-  
    CodeMirror 2 is a complete rewrite that's
-  faster, smaller, simpler to use, and less dependent on browser
-  quirks. See this
-  and this
-  for more information.
    
-
-  
    22-02-2011: Version 2.0 beta 2:
    
-  
    Somewhat more mature API, lots of bugs shaken out.
    
-
-  
    17-02-2011: Version 0.94:
    
-  
      
-    
    • tabMode: "spaces" was modified slightly (now indents when something is selected).
      • 
-    
    • Fixes a bug that would cause the selection code to break on some IE versions.
      • 
-    
    • Disabling spell-check on WebKit browsers now works.
      • 
-  
    
-
-  
    08-02-2011: Version 2.0 beta 1:
    
-  
    CodeMirror 2 is a complete rewrite of
-  CodeMirror, no longer depending on an editable frame.
    
-
-  
    19-01-2011: Version 0.93:
    
-  
      
-    
    • Added a Regular Expression parser.
      • 
-    
    • Fixes to the PHP parser.
      • 
-    
    • Support for regular expression in search/replace.
      • 
-    
    • Add save method to instances created with fromTextArea.
      • 
-    
    • Add support for MS T-SQL in the SQL parser.
      • 
-    
    • Support use of CSS classes for highlighting brackets.
      • 
-    
    • Fix yet another hang with line-numbering in hidden editors.
      • 
-  
    
-
    
-
-
    
-
-  
    Version 0.x
    
-
-  
    28-03-2011: Version 1.0:
    
-  
      
-    
    • Fix error when debug history overflows.
      • 
-    
    • Refine handling of C# verbatim strings.
      • 
-    
    • Fix some issues with JavaScript indentation.
      • 
-  
    
-
-  
    17-12-2010: Version 0.92:
    
-  
      
-    
    • Make CodeMirror work in XHTML documents.
      • 
-    
    • Fix bug in handling of backslashes in Python strings.
      • 
-    
    • The styleNumbers option is now officially
-    supported and documented.
      • 
-    
    • onLineNumberClick option added.
      • 
-    
    • More consistent names onLoad and
-    onCursorActivity callbacks. Old names still work, but
-    are deprecated.
      • 
-    
    • Add a Freemarker mode.
      • 
-  
    
-
-  
    11-11-2010: Version 0.91:
    
-  
      
-    
    • Adds support for Java.
      • 
-    
    • Small additions to the PHP and SQL parsers.
      • 
-    
    • Work around various Webkit issues.
      • 
-    
    • Fix toTextArea to update the code in the textarea.
      • 
-    
    • Add a noScriptCaching option (hack to ease development).
      • 
-    
    • Make sub-modes of HTML mixed mode configurable.
      • 
-  
    
-
-  
    02-10-2010: Version 0.9:
    
-  
      
-    
    • Add support for searching backwards.
      • 
-    
    • There are now parsers for Scheme, XQuery, and OmetaJS.
      • 
-    
    • Makes height: "dynamic" more robust.
      • 
-    
    • Fixes bug where paste did not work on OS X.
      • 
-    
    • Add a enterMode and electricChars options to make indentation even more customizable.
      • 
-    
    • Add firstLineNumber option.
      • 
-    
    • Fix bad handling of @media rules by the CSS parser.
      • 
-    
    • Take a new, more robust approach to working around the invisible-last-line bug in WebKit.
      • 
-  
    
-
-  
    22-07-2010: Version 0.8:
    
-  
      
-    
    • Add a cursorCoords method to find the screen
-    coordinates of the cursor.
      • 
-    
    • A number of fixes and support for more syntax in the PHP parser.
      • 
-    
    • Fix indentation problem with JSON-mode JS parser in Webkit.
      • 
-    
    • Add a minification UI.
      • 
-    
    • Support a height: dynamic mode, where the editor's
-    height will adjust to the size of its content.
      • 
-    
    • Better support for IME input mode.
      • 
-    
    • Fix JavaScript parser getting confused when seeing a no-argument
-    function call.
      • 
-    
    • Have CSS parser see the difference between selectors and other
-    identifiers.
      • 
-    
    • Fix scrolling bug when pasting in a horizontally-scrolled
-    editor.
      • 
-    
    • Support toTextArea method in instances created with
-    fromTextArea.
      • 
-    
    • Work around new Opera cursor bug that causes the cursor to jump
-    when pressing backspace at the end of a line.
      • 
-  
    
-
-  
    27-04-2010: Version
-  0.67:
    
-  
    More consistent page-up/page-down behaviour
-  across browsers. Fix some issues with hidden editors looping forever
-  when line-numbers were enabled. Make PHP parser parse
-  "\\" correctly. Have jumpToLine work on
-  line handles, and add cursorLine function to fetch the
-  line handle where the cursor currently is. Add new
-  setStylesheet function to switch style-sheets in a
-  running editor.
    
-
-  
    01-03-2010: Version
-  0.66:
    
-  
    Adds removeLine method to API.
-  Introduces the PLSQL parser.
-  Marks XML errors by adding (rather than replacing) a CSS class, so
-  that they can be disabled by modifying their style. Fixes several
-  selection bugs, and a number of small glitches.
    
-
-  
    12-11-2009: Version
-  0.65:
    
-  
    Add support for having both line-wrapping and
-  line-numbers turned on, make paren-highlighting style customisable
-  (markParen and unmarkParen config
-  options), work around a selection bug that Opera
-  reintroduced in version 10.
    
-
-  
    23-10-2009: Version
-  0.64:
    
-  
    Solves some issues introduced by the
-  paste-handling changes from the previous release. Adds
-  setSpellcheck, setTextWrapping,
-  setIndentUnit, setUndoDepth,
-  setTabMode, and setLineNumbers to
-  customise a running editor. Introduces an SQL parser. Fixes a few small
-  problems in the Python
-  parser. And, as usual, add workarounds for various newly discovered
-  browser incompatibilities.
    
-
-  
    31-08-2009: Version 0.63:
    
-  
     Overhaul of paste-handling (less fragile), fixes for several
-  serious IE8 issues (cursor jumping, end-of-document bugs) and a number
-  of small problems.
    
-
-  
    30-05-2009: Version 0.62:
    
-  
    Introduces Python
-  and Lua parsers. Add
-  setParser (on-the-fly mode changing) and
-  clearHistory methods. Make parsing passes time-based
-  instead of lines-based (see the passTime option).
    
-
-
    
-
    
diff --git a/www/code/codemirror-5.7/doc/reporting.html b/www/code/codemirror-5.7/doc/reporting.html
deleted file mode 100644
index 3c582d961..000000000
--- a/www/code/codemirror-5.7/doc/reporting.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-CodeMirror: Reporting Bugs
-
-
-
-
-
-
    
-
-
    Reporting bugs effectively
    
-
-
    
-
-
    So you found a problem in CodeMirror. By all means, report it! Bug
-reports from users are the main drive behind improvements to
-CodeMirror. But first, please read over these points:
    
-
-
      
-  
    1. CodeMirror is maintained by volunteers. They don't owe you
-  anything, so be polite. Reports with an indignant or belligerent
-  tone tend to be moved to the bottom of the pile.
      2. 
-
-  
    2. Include information about the browser in which the
-  problem occurred. Even if you tested several browsers, and
-  the problem occurred in all of them, mention this fact in the bug
-  report. Also include browser version numbers and the operating
-  system that you're on.
      3. 
-
-  
    3. Mention which release of CodeMirror you're using. Preferably,
-  try also with the current development snapshot, to ensure the
-  problem has not already been fixed.
      4. 
-
-  
    4. Mention very precisely what went wrong. "X is broken" is not a
-  good bug report. What did you expect to happen? What happened
-  instead? Describe the exact steps a maintainer has to take to make
-  the problem occur. We can not fix something that we can not
-  observe.
      5. 
-
-  
    5. If the problem can not be reproduced in any of the demos
-  included in the CodeMirror distribution, please provide an HTML
-  document that demonstrates the problem. The best way to do this is
-  to go to jsbin.com, enter
-  it there, press save, and include the resulting link in your bug
-  report.
      6. 
-
    
-
-
    
-
-
    
diff --git a/www/code/codemirror-5.7/doc/upgrade_v2.2.html b/www/code/codemirror-5.7/doc/upgrade_v2.2.html
deleted file mode 100644
index 3948ce6e5..000000000
--- a/www/code/codemirror-5.7/doc/upgrade_v2.2.html
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-CodeMirror: Version 2.2 upgrade guide
-
-
-
-
-
-
    
-
-
    Upgrading to v2.2
    
-
-
    There are a few things in the 2.2 release that require some care
-when upgrading.
    
-
-
    No more default.css
    
-
-
    The default theme is now included
-in codemirror.css, so
-you do not have to included it separately anymore. (It was tiny, so
-even if you're not using it, the extra data overhead is negligible.)
-
-
    Different key customization
    
-
-
    CodeMirror has moved to a system
-where keymaps are used to
-bind behavior to keys. This means custom
-bindings are now possible.
    
-
-
    Three options that influenced key
-behavior, tabMode, enterMode,
-and smartHome, are no longer supported. Instead, you can
-provide custom bindings to influence the way these keys act. This is
-done through the
-new extraKeys
-option, which can hold an object mapping key names to functionality. A
-simple example would be:
    
-
-
      extraKeys: {
-    "Ctrl-S": function(instance) { saveText(instance.getValue()); },
-    "Ctrl-/": "undo"
-  }
    
-
-
    Keys can be mapped either to functions, which will be given the
-editor instance as argument, or to strings, which are mapped through
-functions through the CodeMirror.commands table, which
-contains all the built-in editing commands, and can be inspected and
-extended by external code.
    
-
-
    By default, the Home key is bound to
-the "goLineStartSmart" command, which moves the cursor to
-the first non-whitespace character on the line. You can set do this to
-make it always go to the very start instead:
    
-
-
      extraKeys: {"Home": "goLineStart"}
    
-
-
    Similarly, Enter is bound
-to "newlineAndIndent" by default. You can bind it to
-something else to get different behavior. To disable special handling
-completely and only get a newline character inserted, you can bind it
-to false:
    
-
-
      extraKeys: {"Enter": false}
    
-
-
    The same works for Tab. If you don't want CodeMirror
-to handle it, bind it to false. The default behaviour is
-to indent the current line more ("indentMore" command),
-and indent it less when shift is held ("indentLess").
-There are also "indentAuto" (smart indent)
-and "insertTab" commands provided for alternate
-behaviors. Or you can write your own handler function to do something
-different altogether.
    
-
-
    Tabs
    
-
-
    Handling of tabs changed completely. The display width of tabs can
-now be set with the tabSize option, and tabs can
-be styled by setting CSS rules
-for the cm-tab class.
    
-
-
    The default width for tabs is now 4, as opposed to the 8 that is
-hard-wired into browsers. If you are relying on 8-space tabs, make
-sure you explicitly set tabSize: 8 in your options.
    
-
-
    
diff --git a/www/code/codemirror-5.7/doc/upgrade_v3.html b/www/code/codemirror-5.7/doc/upgrade_v3.html
deleted file mode 100644
index 5f94067aa..000000000
--- a/www/code/codemirror-5.7/doc/upgrade_v3.html
+++ /dev/null
@@ -1,230 +0,0 @@
-
-
-CodeMirror: Version 3 upgrade guide
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
-
    Upgrading to version 3
    
-
-
    Version 3 does not depart too much from 2.x API, and sites that use
-CodeMirror in a very simple way might be able to upgrade without
-trouble. But it does introduce a number of incompatibilities. Please
-at least skim this text before upgrading.
    
-
-
    Note that version 3 drops full support for Internet
-Explorer 7. The editor will mostly work on that browser, but
-it'll be significantly glitchy.
    
-
-
    
-  
    DOM structure
    
-
-
    This one is the most likely to cause problems. The internal
-structure of the editor has changed quite a lot, mostly to implement a
-new scrolling model.
    
-
-
    Editor height is now set on the outer wrapper element (CSS
-class CodeMirror), not on the scroller element
-(CodeMirror-scroll).
    
-
-
    Other nodes were moved, dropped, and added. If you have any code
-that makes assumptions about the internal DOM structure of the editor,
-you'll have to re-test it and probably update it to work with v3.
    
-
-
    See the styling section of the
-manual for more information.
    
-
    
-
    
-  
    Gutter model
    
-
-
    In CodeMirror 2.x, there was a single gutter, and line markers
-created with setMarker would have to somehow coexist with
-the line numbers (if present). Version 3 allows you to specify an
-array of gutters, by class
-name,
-use setGutterMarker
-to add or remove markers in individual gutters, and clear whole
-gutters
-with clearGutter.
-Gutter markers are now specified as DOM nodes, rather than HTML
-snippets.
    
-
-
    The gutters no longer horizontally scrolls along with the content.
-The fixedGutter option was removed (since it is now the
-only behavior).
    
-
-
    -<style>
-  /* Define a gutter style */
-  .note-gutter { width: 3em; background: cyan; }
-</style>
-<script>
-  // Create an instance with two gutters -- line numbers and notes
-  var cm = new CodeMirror(document.body, {
-    gutters: ["note-gutter", "CodeMirror-linenumbers"],
-    lineNumbers: true
-  });
-  // Add a note to line 0
-  cm.setGutterMarker(0, "note-gutter", document.createTextNode("hi"));
-</script>
-
    
-
    
-
    
-  
    Event handling
    
-
-
    Most of the onXYZ options have been removed. The same
-effect is now obtained by calling
-the on method with a string
-identifying the event type. Multiple handlers can now be registered
-(and individually unregistered) for an event, and objects such as line
-handlers now also expose events. See the
-full list here.
    
-
-
    (The onKeyEvent and onDragEvent options,
-which act more as hooks than as event handlers, are still there in
-their old form.)
    
-
-
    -cm.on("change", function(cm, change) {
-  console.log("something changed! (" + change.origin + ")");
-});
-
    
-
    
-
    
-  
    markText method arguments
    
-
-
    The markText method
-(which has gained some interesting new features, such as creating
-atomic and read-only spans, or replacing spans with widgets) no longer
-takes the CSS class name as a separate argument, but makes it an
-optional field in the options object instead.
    
-
-
    -// Style first ten lines, and forbid the cursor from entering them
-cm.markText({line: 0, ch: 0}, {line: 10, ch: 0}, {
-  className: "magic-text",
-  inclusiveLeft: true,
-  atomic: true
-});
-
    
-
    
-
    
-  
    Line folding
    
-
-
    The interface for hiding lines has been
-removed. markText can
-now be used to do the same in a more flexible and powerful way.
    
-
-
    The folding script has been
-updated to use the new interface, and should now be more robust.
    
-
-
    -// Fold a range, replacing it with the text "??"
-var range = cm.markText({line: 4, ch: 2}, {line: 8, ch: 1}, {
-  replacedWith: document.createTextNode("??"),
-  // Auto-unfold when cursor moves into the range
-  clearOnEnter: true
-});
-// Get notified when auto-unfolding
-CodeMirror.on(range, "clear", function() {
-  console.log("boom");
-});
-
    
-
    
-
    
-  
    Line CSS classes
    
-
-
    The setLineClass method has been replaced
-by addLineClass
-and removeLineClass,
-which allow more modular control over the classes attached to a line.
    
-
-
    -var marked = cm.addLineClass(10, "background", "highlighted-line");
-setTimeout(function() {
-  cm.removeLineClass(marked, "background", "highlighted-line");
-});
-
    
-
    
-
    
-  
    Position properties
    
-
-
    All methods that take or return objects that represent screen
-positions now use {left, top, bottom, right} properties
-(not always all of them) instead of the {x, y, yBot} used
-by some methods in v2.x.
    
-
-
    Affected methods
-are cursorCoords, charCoords, coordsChar,
-and getScrollInfo.
    
-
    
-
    
-  
    Bracket matching no longer in core
    
-
-
    The matchBrackets
-option is no longer defined in the core editor.
-Load addon/edit/matchbrackets.js to enable it.
    
-
    
-
    
-  
    Mode management
    
-
-
    The CodeMirror.listModes
-and CodeMirror.listMIMEs functions, used for listing
-defined modes, are gone. You are now encouraged to simply
-inspect CodeMirror.modes (mapping mode names to mode
-constructors) and CodeMirror.mimeModes (mapping MIME
-strings to mode specs).
    
-
    
-
    
-  
    New features
    
-
-
    Some more reasons to upgrade to version 3.
    
-
-
      
-  
    • Bi-directional text support. CodeMirror will now mostly do the
-  right thing when editing Arabic or Hebrew text.
      • 
-  
    • Arbitrary line heights. Using fonts with different heights
-  inside the editor (whether off by one pixel or fifty) is now
-  supported and handled gracefully.
      • 
-  
    • In-line widgets. See the demo
-  and the docs.
      • 
-  
    • Defining custom options
-  with CodeMirror.defineOption.
      • 
-
    
-
    
-
    
-
-
diff --git a/www/code/codemirror-5.7/doc/upgrade_v4.html b/www/code/codemirror-5.7/doc/upgrade_v4.html
deleted file mode 100644
index 09df00ca1..000000000
--- a/www/code/codemirror-5.7/doc/upgrade_v4.html
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-CodeMirror: Version 4 upgrade guide
-
-
-
-
-
-
-
    
-
-
    Upgrading to version 4
    
-
-
    CodeMirror 4's interface is very close version 3, but it
-does fix a few awkward details in a backwards-incompatible ways. At
-least skim the text below before upgrading.
    
-
-
    Multiple selections
    
-
-
    The main new feature in version 4 is multiple selections. The
-single-selection variants of methods are still there, but now
-typically act only on the primary selection (usually the last
-one added).
    
-
-
    The exception to this
-is getSelection,
-which will now return the content of all selections
-(separated by newlines, or whatever lineSep parameter you passed
-it).
    
-
-
    
-
-
    The beforeSelectionChange event
    
-
-
    This event still exists, but the object it is passed has
-a completely new
-interface, because such changes now concern multiple
-selections.
    
-
-
    
-
-
    replaceSelection's collapsing behavior
    
-
-
    By
-default, replaceSelection
-would leave the newly inserted text selected. This is only rarely what
-you want, and also (slightly) more expensive in the new model, so the
-default was changed to "end", meaning the old behavior
-must be explicitly specified by passing a second argument
-of "around".
    
-
-
    
-
-
    change event data
    
-
-
    Rather than forcing client code to follow next
-pointers from one change object to the next, the library will now
-simply fire
-multiple "change"
-events. Existing code will probably continue to work unmodified.
    
-
-
    
-
-
    showIfHidden option to line widgets
    
-
-
    This option, which conceptually caused line widgets to be visible
-even if their line was hidden, was never really well-defined, and was
-buggy from the start. It would be a rather expensive feature, both in
-code complexity and run-time performance, to implement properly. It
-has been dropped entirely in 4.0.
    
-
-
    
-
-
    Module loaders
    
-
-
    All modules in the CodeMirror distribution are now wrapped in a
-shim function to make them compatible with both AMD
-(requirejs) and CommonJS (as used
-by node
-and browserify) module loaders.
-When neither of these is present, they fall back to simply using the
-global CodeMirror variable.
    
-
-
    If you have a module loader present in your environment, CodeMirror
-will attempt to use it, and you might need to change the way you load
-CodeMirror modules.
    
-
-
    
-
-
    Mutating shared data structures
    
-
-
    Data structures produced by the library should not be mutated
-unless explicitly allowed, in general. This is slightly more strict in
-4.0 than it was in earlier versions, which copied the position objects
-returned by getCursor
-for nebulous, historic reasons. In 4.0, mutating these
-objects will corrupt your editor's selection.
    
-
-
    
-
-
    Deprecated interfaces dropped
    
-
-
    A few properties and methods that have been deprecated for a while
-are now gone. Most notably, the onKeyEvent
-and onDragEvent options (use the
-corresponding events instead).
    
-
-
    Two silly methods, which were mostly there to stay close to the 0.x
-API, setLine and removeLine are now gone.
-Use the more
-flexible replaceRange
-method instead.
    
-
-
    The long names for folding and completing functions
-(CodeMirror.braceRangeFinder, CodeMirror.javascriptHint,
-etc) are also gone
-(use CodeMirror.fold.brace, CodeMirror.hint.javascript).
    
-
-
    The className property in the return value
-of getTokenAt, which
-has been superseded by the type property, is also no
-longer present.
    
-
-
    
-
    
diff --git a/www/code/codemirror-5.7/doc/yinyang.png b/www/code/codemirror-5.7/doc/yinyang.png
deleted file mode 100644
index 2eafd3f1ca137898ede8c27d0e64d99919bdc1ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4633
zcmV+!66WoRP)02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{01<&nL_t(|+U=cPY#Y~=$Nxhy
zV#HV?X-TGS*&^w9;jhFRrrmgx#ahFz1vCy?kuL#aq!!t?6h%Z81?uLZB43geHDU@V
z+Mp;vst;|SN~%ad0C~-k)9hlmSaX=zPPDc)WGqXTMTJAjrb?Oe-3N*cW$Tk1&I~CX
zfUqS?^p$>dKJU5bQiKrHlFYFz0f02eVNnnYpU(;c7Gg1IX}a*adb1fCv$^nbBg0Ur
zF`=pzaE9keIvT}1$05D+nvTcOcJd?uKugo8)9VXguh#2PZ#E;%afQz<#A3+AVug?I
zT)vD}lL=ayhL)z$$S`Q==;%@#3>UWnOCae;gd_$BF~_o)9vj1Ms}+q511(KMV>Ux;
zwTkiJV2))A4^1)jMuvgDyBivdh1v!zk|aYRB7{O14+gQ*Y=+)$hrwdXeFI?DcrCgJCeg6hO_fEbc`jSeTt%_4{{s
zbQA)kyswm6vdJW70s&0ER}
z6HG1_T6%gU_0>fWEG9f2EX3n5`~7IL*{CfAIK%T~!s|u+4}ZXscizEbB7s{MF084g
zrAn*G1f$!XkA5Ww9dkONu~@LDzh4&6k^`Rd`N*|%=U`}RLW|3V*asg}1nf#${cK+!
z_If;$KhO!k9}^xA8f`Z0zi>g)yjn8A8J;J%91cv~xPeFMv}|sn)nv+>P04-ql+TAT
zpAXLk0x&onRLuaM@Oa4RyYJ%B!h&M5hXXx5*ni;y)CPkrW?S!YU~hka#kE;g;ivZ0
zXJ7w18U5MMkW~;|02mt_#Hh`NY%(e7|J!7<;V8!egy6c>I-HI~NL6ZZIuarO{qoDX
zd@PeuY^7&+M+Yo^ziiR=mF{jlH!y$}my4o>KKu}ib91OBkrQ$@nZzi=Kx?(a5(tP2S+xx}CkwN);9V}s
zeKG*34F()yS%45+qiK>&CQm5}a5kAdHFo9rYb4vK1)f4+1{@;td%_?{ksqC_#*WdpwU{PU!i;O71D
zOR<>bIdUZ+mt~^I&YY<^xOsnk+wGQh4VJ+{WOyFD(@A6je5b#keDUFjH3zrw@c!mE
z$nde&R&@_y_y=Y_@)EB{Bh{Z6+vY7CCaj&SqS!^x-
zw^T|I7UlEKPBbzM+Pq#$bim1AkbH9XEVB3SOZEdb=yZ5K6xvXa)l48zG0<}7#d*o_
zJpQYr1209R8}8uTkcrMFlczp;;|)pS?xAT|S$4w>bj?mDjz%KbQ*<;%ESY0jMQE_b
zV!;uw7crMhTpxVf?H-0&Eh*eX;V>FD39C-8$H8C_4LV&-0tNtMUmpk|n7VLbL#B6K
z6FnOalc?P;N#9gnUgkJ7baa&b{qr1$2*Y4rB;TndKfIL5;C~qgFLKu`t~O{XIf#Q@e?tvKLzZzxY!t*5<{pMDB5KQGzh#p-(0
z+wG#RE32@Iozd+^JQzfV=Sj(cW8e9Xq#clZXc{{@JH-Lq-7TswUZ_wSR;s8Ch7AQ=
zs{&5={UjxEDNvrWAflPhC=75u;L7kkX2W5!X~2{3y(ej4wJoK)v`Mdba~eDw
z4wJq29p5M~Ak%X*LdBO{{1-F^JH;{CAJYDJw+hh#8FRt22;
z^Pgos+F7t7PABH0(bCL(G>T8UyG31(lFjq7yx8r2!o@8EJpJomD`v5g&dyCko*5j>
zeV@o119Hs#D0Q9Vs{zjNJW1TSqnO3cr&9P&nnuj!!a_X0c6yacVbbf(X?_KEeZ;P7
zS4uP%3wD~#%Nq0wo4jI0uVTxsKmfM_0X*w;LT|T2t=FT0rZLZP$O;04PzV#jU`4sWwPJc~tgwx!0&+c9>FqM%ljhmski93mq_oazEmZMT0FdUmVM?RfCig&p{^;m7)gm#=5UqC
z$O;0~3$YloTey3&818Dvc&MfG(ChuXB29E=3v?c?CWn9W6CC9@)amuP`wb{+#aA)N
z)&4zyM}pEsy%oW>wzuOzFoO?;9r8GIx-;cxLuwHC+U!5<^C=##lzFlW05m&x
z)CAn;d_J@|omI8wN(EkbE?-8I%|=m#5c~&4k!pv#k6~~q9Inc>iyd@jcpjq+gX8fy
zl?$?JU_aRG_gC%O#WvM*MKOp90G>HjdUHP0OHGMlm2(KVli+|C$3wqiW%TG8xCWq*}QCq^s<(n_9_Zk#Gae6CVTX
zHzAW8hg%{JJuOFsQ0R$L?J~fI*Iuide7I4hvBP<}X}4pt#P+4zEW4?D6e<;L2}46q
zJow82I~8Gp0|B4wsFT`RP9~mj@J#Ga8qR%C4h)M6}~~@cA?pD7|!+-%`-}&>{3X^xLeaif#
z*9+qsx0SC7xXEUt_LO-+RW(Sn$UR(AZhp*$!^rSFT3jw_(|`fM^uY&;OqtRmo~NqQ
z>tPnDg14`;Q&JNhbGg$|{C?D%Oso3dysUdU
zWrpX;$48DRZcv(-BlZ^s0iz6q$uj13?&;{jQ4uZ6TDwWvWD?h{R+#<%bpfw?K3HS1
zP{-bV7ixv2O=%H_r`GB9IK;BpWipjkcxh^aMZ)}d!s9_>XXmxc7@4~9ahZ))1K=AMW~CG)+r;V{Phe(d-8x;FCl8$RK02?U^0kT0%8-M4|JaUvSU
zvm4yR-`ClRLo5ra&RA!YNyJ<(bPNs_dal+JYBM_)cl!Iu&GYAxRlvm^0MIE2P>X!q
zcX0t^!sEdl%jQ~{mSmU7ghqye(e197)~@D%zgTJyZXX!f@MZzE*$%$XPMjbU9H)rh
zt&TtdEfV!cEiN6$ltNYloD2qW+wI0tj_cZ}_Lc-Vn@pbiTU*=kq5`JlRkANjPI(+~
z{z~_+vFsE3y`uTxLZ!xFxcK77A1lHiPsd_Nh_uzGRJhq>5;q+V9P#-!4Ywq~`2xt%
z_uhk60X@kRRXUY@qe0cE&4%Wlo;AynqMGPp8GHS8a{G^els)K@(icmqy}Z*25CY5K
zV96aARJn(p#$JD&O#St*vi4JJbUOS?JYKPgS}M4}SIu_3(}{E>f@9HWS?x7tPr5ts
zyWdg9Z+=r&bDc@05UaA2{VQtQV{i|#Y*)GODat6r_Fw#>tEsI`R><*C2vb!$%)8h$
z=gso5Xq4JaI#f}>YJ=h8p^rY29rBI-eo<@GQkv#$GKo=!Dck2(1aKbmv8z{QHP@L`
z3cS;aY=!PItQ6dZSPY{!8|qCaQQ?XTxY#GRzx5W>GEMHe%W)WG7{x=*!xcgy{0~jT
z*xM^QTv4Lv)gC>{9>`W?!E1jK+DQ6NwaBpA$f45q(qq7r-M@Fbh!mYRl7fUi2B%i$T26kw*
zvS{-@hJiT{ki}#ZLXeI`F#dxdfDi&pAh6;ogsRivVlg-z)W438ckMiVdedDKV#qkl
z;%{a%CM3L*Fq=x@_PKMo-Peb|GYs_I-8eilLP-TzQVlMa*>ITLId=|suU^F?8S2;?
zoeu3T7mRLqMKn5_O5vW*htGfdQ&1FzwwGUq=~usklwf5ATnu{rhd;#KYu9A!+BDhi
z&@a8psby!E4xUZoy(U2wOUr#E5Vfa0L^qQBBw3
-
-CodeMirror
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
-
    
-  
    CodeMirror is a versatile text editor
-  implemented in JavaScript for the browser. It is specialized for
-  editing code, and comes with a number of language modes and addons
-  that implement more advanced editing functionality.
    
-
-  
    A rich programming API and a
-  CSS theming system are
-  available for customizing CodeMirror to fit your application, and
-  extending it with new functionality.
    
-
    
-
-
    
-  
    This is CodeMirror
    
-  
    
-  
    
-  
-
-  
    
-    
    
-      
-      
    
-        DOWNLOAD
-      
    
-      
    
-        FUND
-      
    
-    
    
-    
    
-      Get the current version: 5.7.
    
-      You can see the code or
    
-      read the release notes.
    
-      There is a minification helper.
-    
    
-    
    
-      Software needs maintenance,
    
-      maintainers need to subsist.
    
-      Current funding status = 
    
-      You can help per month or
-      once.
-      
    
-        
-        
-      
    
-    
    
-  
    
-  
-
    
-
-
    
-  
    Features
    
-  
-
    
-
-
    
-  
    Community
    
-
-  
    CodeMirror is an open-source project shared under
-  an MIT license. It is the editor used in the
-  dev tools for
-  both Firefox
-  and Chrome, Light
-  Table, Adobe
-  Brackets, Bitbucket,
-  and many other projects.
    
-
-  
    Development and bug tracking happens
-  on github
-  (alternate git
-  repository).
-  Please read these
-  pointers before submitting a bug. Use pull requests to submit
-  patches. All contributions must be released under the same MIT
-  license that CodeMirror uses.
    
-
-  
    Discussion around the project is done on
-  a discussion forum.
-  There is also
-  the codemirror-announce
-  list, which is only used for major announcements (such as new
-  versions). If needed, you can
-  contact the maintainer
-  directly. We aim to be an inclusive, welcoming community. To make
-  that explicit, we have
-  a code of
-  conduct that applies to communication around the project.
    
-
-  
    A list of CodeMirror-related software that is not part of the
-  main distribution is maintained
-  on our
-  wiki. Feel free to add your project.
    
-
    
-
-
    
-  
    Browser support
    
-  
    The desktop versions of the following browsers,
-  in standards mode (HTML5 <!doctype html>
-  recommended) are supported:
    
-  
-    
-    
-    
-    
-    
-  
    Firefoxversion 4 and up
    Chromeany version
    Safariversion 5.2 and up
    Internet Explorerversion 8 and up
    Operaversion 9 and up
    
-  
    Support for modern mobile browsers is experimental. Recent
-  versions of the iOS browser and Chrome on Android should work
-  pretty well.
    
-
    
-
-
    
diff --git a/www/code/codemirror-5.7/keymap/emacs.js b/www/code/codemirror-5.7/keymap/emacs.js
deleted file mode 100644
index 3eec1e576..000000000
--- a/www/code/codemirror-5.7/keymap/emacs.js
+++ /dev/null
@@ -1,412 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-  function posEq(a, b) { return a.line == b.line && a.ch == b.ch; }
-
-  // Kill 'ring'
-
-  var killRing = [];
-  function addToRing(str) {
-    killRing.push(str);
-    if (killRing.length > 50) killRing.shift();
-  }
-  function growRingTop(str) {
-    if (!killRing.length) return addToRing(str);
-    killRing[killRing.length - 1] += str;
-  }
-  function getFromRing(n) { return killRing[killRing.length - (n ? Math.min(n, 1) : 1)] || ""; }
-  function popFromRing() { if (killRing.length > 1) killRing.pop(); return getFromRing(); }
-
-  var lastKill = null;
-
-  function kill(cm, from, to, mayGrow, text) {
-    if (text == null) text = cm.getRange(from, to);
-
-    if (mayGrow && lastKill && lastKill.cm == cm && posEq(from, lastKill.pos) && cm.isClean(lastKill.gen))
-      growRingTop(text);
-    else
-      addToRing(text);
-    cm.replaceRange("", from, to, "+delete");
-
-    if (mayGrow) lastKill = {cm: cm, pos: from, gen: cm.changeGeneration()};
-    else lastKill = null;
-  }
-
-  // Boundaries of various units
-
-  function byChar(cm, pos, dir) {
-    return cm.findPosH(pos, dir, "char", true);
-  }
-
-  function byWord(cm, pos, dir) {
-    return cm.findPosH(pos, dir, "word", true);
-  }
-
-  function byLine(cm, pos, dir) {
-    return cm.findPosV(pos, dir, "line", cm.doc.sel.goalColumn);
-  }
-
-  function byPage(cm, pos, dir) {
-    return cm.findPosV(pos, dir, "page", cm.doc.sel.goalColumn);
-  }
-
-  function byParagraph(cm, pos, dir) {
-    var no = pos.line, line = cm.getLine(no);
-    var sawText = /\S/.test(dir < 0 ? line.slice(0, pos.ch) : line.slice(pos.ch));
-    var fst = cm.firstLine(), lst = cm.lastLine();
-    for (;;) {
-      no += dir;
-      if (no < fst || no > lst)
-        return cm.clipPos(Pos(no - dir, dir < 0 ? 0 : null));
-      line = cm.getLine(no);
-      var hasText = /\S/.test(line);
-      if (hasText) sawText = true;
-      else if (sawText) return Pos(no, 0);
-    }
-  }
-
-  function bySentence(cm, pos, dir) {
-    var line = pos.line, ch = pos.ch;
-    var text = cm.getLine(pos.line), sawWord = false;
-    for (;;) {
-      var next = text.charAt(ch + (dir < 0 ? -1 : 0));
-      if (!next) { // End/beginning of line reached
-        if (line == (dir < 0 ? cm.firstLine() : cm.lastLine())) return Pos(line, ch);
-        text = cm.getLine(line + dir);
-        if (!/\S/.test(text)) return Pos(line, ch);
-        line += dir;
-        ch = dir < 0 ? text.length : 0;
-        continue;
-      }
-      if (sawWord && /[!?.]/.test(next)) return Pos(line, ch + (dir > 0 ? 1 : 0));
-      if (!sawWord) sawWord = /\w/.test(next);
-      ch += dir;
-    }
-  }
-
-  function byExpr(cm, pos, dir) {
-    var wrap;
-    if (cm.findMatchingBracket && (wrap = cm.findMatchingBracket(pos, true))
-        && wrap.match && (wrap.forward ? 1 : -1) == dir)
-      return dir > 0 ? Pos(wrap.to.line, wrap.to.ch + 1) : wrap.to;
-
-    for (var first = true;; first = false) {
-      var token = cm.getTokenAt(pos);
-      var after = Pos(pos.line, dir < 0 ? token.start : token.end);
-      if (first && dir > 0 && token.end == pos.ch || !/\w/.test(token.string)) {
-        var newPos = cm.findPosH(after, dir, "char");
-        if (posEq(after, newPos)) return pos;
-        else pos = newPos;
-      } else {
-        return after;
-      }
-    }
-  }
-
-  // Prefixes (only crudely supported)
-
-  function getPrefix(cm, precise) {
-    var digits = cm.state.emacsPrefix;
-    if (!digits) return precise ? null : 1;
-    clearPrefix(cm);
-    return digits == "-" ? -1 : Number(digits);
-  }
-
-  function repeated(cmd) {
-    var f = typeof cmd == "string" ? function(cm) { cm.execCommand(cmd); } : cmd;
-    return function(cm) {
-      var prefix = getPrefix(cm);
-      f(cm);
-      for (var i = 1; i < prefix; ++i) f(cm);
-    };
-  }
-
-  function findEnd(cm, pos, by, dir) {
-    var prefix = getPrefix(cm);
-    if (prefix < 0) { dir = -dir; prefix = -prefix; }
-    for (var i = 0; i < prefix; ++i) {
-      var newPos = by(cm, pos, dir);
-      if (posEq(newPos, pos)) break;
-      pos = newPos;
-    }
-    return pos;
-  }
-
-  function move(by, dir) {
-    var f = function(cm) {
-      cm.extendSelection(findEnd(cm, cm.getCursor(), by, dir));
-    };
-    f.motion = true;
-    return f;
-  }
-
-  function killTo(cm, by, dir) {
-    var selections = cm.listSelections(), cursor;
-    var i = selections.length;
-    while (i--) {
-      cursor = selections[i].head;
-      kill(cm, cursor, findEnd(cm, cursor, by, dir), true);
-    }
-  }
-
-  function killRegion(cm) {
-    if (cm.somethingSelected()) {
-      var selections = cm.listSelections(), selection;
-      var i = selections.length;
-      while (i--) {
-        selection = selections[i];
-        kill(cm, selection.anchor, selection.head);
-      }
-      return true;
-    }
-  }
-
-  function addPrefix(cm, digit) {
-    if (cm.state.emacsPrefix) {
-      if (digit != "-") cm.state.emacsPrefix += digit;
-      return;
-    }
-    // Not active yet
-    cm.state.emacsPrefix = digit;
-    cm.on("keyHandled", maybeClearPrefix);
-    cm.on("inputRead", maybeDuplicateInput);
-  }
-
-  var prefixPreservingKeys = {"Alt-G": true, "Ctrl-X": true, "Ctrl-Q": true, "Ctrl-U": true};
-
-  function maybeClearPrefix(cm, arg) {
-    if (!cm.state.emacsPrefixMap && !prefixPreservingKeys.hasOwnProperty(arg))
-      clearPrefix(cm);
-  }
-
-  function clearPrefix(cm) {
-    cm.state.emacsPrefix = null;
-    cm.off("keyHandled", maybeClearPrefix);
-    cm.off("inputRead", maybeDuplicateInput);
-  }
-
-  function maybeDuplicateInput(cm, event) {
-    var dup = getPrefix(cm);
-    if (dup > 1 && event.origin == "+input") {
-      var one = event.text.join("\n"), txt = "";
-      for (var i = 1; i < dup; ++i) txt += one;
-      cm.replaceSelection(txt);
-    }
-  }
-
-  function addPrefixMap(cm) {
-    cm.state.emacsPrefixMap = true;
-    cm.addKeyMap(prefixMap);
-    cm.on("keyHandled", maybeRemovePrefixMap);
-    cm.on("inputRead", maybeRemovePrefixMap);
-  }
-
-  function maybeRemovePrefixMap(cm, arg) {
-    if (typeof arg == "string" && (/^\d$/.test(arg) || arg == "Ctrl-U")) return;
-    cm.removeKeyMap(prefixMap);
-    cm.state.emacsPrefixMap = false;
-    cm.off("keyHandled", maybeRemovePrefixMap);
-    cm.off("inputRead", maybeRemovePrefixMap);
-  }
-
-  // Utilities
-
-  function setMark(cm) {
-    cm.setCursor(cm.getCursor());
-    cm.setExtending(!cm.getExtending());
-    cm.on("change", function() { cm.setExtending(false); });
-  }
-
-  function clearMark(cm) {
-    cm.setExtending(false);
-    cm.setCursor(cm.getCursor());
-  }
-
-  function getInput(cm, msg, f) {
-    if (cm.openDialog)
-      cm.openDialog(msg + ": ", f, {bottom: true});
-    else
-      f(prompt(msg, ""));
-  }
-
-  function operateOnWord(cm, op) {
-    var start = cm.getCursor(), end = cm.findPosH(start, 1, "word");
-    cm.replaceRange(op(cm.getRange(start, end)), start, end);
-    cm.setCursor(end);
-  }
-
-  function toEnclosingExpr(cm) {
-    var pos = cm.getCursor(), line = pos.line, ch = pos.ch;
-    var stack = [];
-    while (line >= cm.firstLine()) {
-      var text = cm.getLine(line);
-      for (var i = ch == null ? text.length : ch; i > 0;) {
-        var ch = text.charAt(--i);
-        if (ch == ")")
-          stack.push("(");
-        else if (ch == "]")
-          stack.push("[");
-        else if (ch == "}")
-          stack.push("{");
-        else if (/[\(\{\[]/.test(ch) && (!stack.length || stack.pop() != ch))
-          return cm.extendSelection(Pos(line, i));
-      }
-      --line; ch = null;
-    }
-  }
-
-  function quit(cm) {
-    cm.execCommand("clearSearch");
-    clearMark(cm);
-  }
-
-  // Actual keymap
-
-  var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({
-    "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
-    "Ctrl-K": repeated(function(cm) {
-      var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
-      var text = cm.getRange(start, end);
-      if (!/\S/.test(text)) {
-        text += "\n";
-        end = Pos(start.line + 1, 0);
-      }
-      kill(cm, start, end, true, text);
-    }),
-    "Alt-W": function(cm) {
-      addToRing(cm.getSelection());
-      clearMark(cm);
-    },
-    "Ctrl-Y": function(cm) {
-      var start = cm.getCursor();
-      cm.replaceRange(getFromRing(getPrefix(cm)), start, start, "paste");
-      cm.setSelection(start, cm.getCursor());
-    },
-    "Alt-Y": function(cm) {cm.replaceSelection(popFromRing(), "around", "paste");},
-
-    "Ctrl-Space": setMark, "Ctrl-Shift-2": setMark,
-
-    "Ctrl-F": move(byChar, 1), "Ctrl-B": move(byChar, -1),
-    "Right": move(byChar, 1), "Left": move(byChar, -1),
-    "Ctrl-D": function(cm) { killTo(cm, byChar, 1); },
-    "Delete": function(cm) { killRegion(cm) || killTo(cm, byChar, 1); },
-    "Ctrl-H": function(cm) { killTo(cm, byChar, -1); },
-    "Backspace": function(cm) { killRegion(cm) || killTo(cm, byChar, -1); },
-
-    "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1),
-    "Alt-D": function(cm) { killTo(cm, byWord, 1); },
-    "Alt-Backspace": function(cm) { killTo(cm, byWord, -1); },
-
-    "Ctrl-N": move(byLine, 1), "Ctrl-P": move(byLine, -1),
-    "Down": move(byLine, 1), "Up": move(byLine, -1),
-    "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-    "End": "goLineEnd", "Home": "goLineStart",
-
-    "Alt-V": move(byPage, -1), "Ctrl-V": move(byPage, 1),
-    "PageUp": move(byPage, -1), "PageDown": move(byPage, 1),
-
-    "Ctrl-Up": move(byParagraph, -1), "Ctrl-Down": move(byParagraph, 1),
-
-    "Alt-A": move(bySentence, -1), "Alt-E": move(bySentence, 1),
-    "Alt-K": function(cm) { killTo(cm, bySentence, 1); },
-
-    "Ctrl-Alt-K": function(cm) { killTo(cm, byExpr, 1); },
-    "Ctrl-Alt-Backspace": function(cm) { killTo(cm, byExpr, -1); },
-    "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1),
-
-    "Shift-Ctrl-Alt-2": function(cm) {
-      var cursor = cm.getCursor();
-      cm.setSelection(findEnd(cm, cursor, byExpr, 1), cursor);
-    },
-    "Ctrl-Alt-T": function(cm) {
-      var leftStart = byExpr(cm, cm.getCursor(), -1), leftEnd = byExpr(cm, leftStart, 1);
-      var rightEnd = byExpr(cm, leftEnd, 1), rightStart = byExpr(cm, rightEnd, -1);
-      cm.replaceRange(cm.getRange(rightStart, rightEnd) + cm.getRange(leftEnd, rightStart) +
-                      cm.getRange(leftStart, leftEnd), leftStart, rightEnd);
-    },
-    "Ctrl-Alt-U": repeated(toEnclosingExpr),
-
-    "Alt-Space": function(cm) {
-      var pos = cm.getCursor(), from = pos.ch, to = pos.ch, text = cm.getLine(pos.line);
-      while (from && /\s/.test(text.charAt(from - 1))) --from;
-      while (to < text.length && /\s/.test(text.charAt(to))) ++to;
-      cm.replaceRange(" ", Pos(pos.line, from), Pos(pos.line, to));
-    },
-    "Ctrl-O": repeated(function(cm) { cm.replaceSelection("\n", "start"); }),
-    "Ctrl-T": repeated(function(cm) {
-      cm.execCommand("transposeChars");
-    }),
-
-    "Alt-C": repeated(function(cm) {
-      operateOnWord(cm, function(w) {
-        var letter = w.search(/\w/);
-        if (letter == -1) return w;
-        return w.slice(0, letter) + w.charAt(letter).toUpperCase() + w.slice(letter + 1).toLowerCase();
-      });
-    }),
-    "Alt-U": repeated(function(cm) {
-      operateOnWord(cm, function(w) { return w.toUpperCase(); });
-    }),
-    "Alt-L": repeated(function(cm) {
-      operateOnWord(cm, function(w) { return w.toLowerCase(); });
-    }),
-
-    "Alt-;": "toggleComment",
-
-    "Ctrl-/": repeated("undo"), "Shift-Ctrl--": repeated("undo"),
-    "Ctrl-Z": repeated("undo"), "Cmd-Z": repeated("undo"),
-    "Shift-Alt-,": "goDocStart", "Shift-Alt-.": "goDocEnd",
-    "Ctrl-S": "findNext", "Ctrl-R": "findPrev", "Ctrl-G": quit, "Shift-Alt-5": "replace",
-    "Alt-/": "autocomplete",
-    "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto",
-
-    "Alt-G G": function(cm) {
-      var prefix = getPrefix(cm, true);
-      if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1);
-
-      getInput(cm, "Goto line", function(str) {
-        var num;
-        if (str && !isNaN(num = Number(str)) && num == (num|0) && num > 0)
-          cm.setCursor(num - 1);
-      });
-    },
-
-    "Ctrl-X Tab": function(cm) {
-      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
-    },
-    "Ctrl-X Ctrl-X": function(cm) {
-      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
-    },
-    "Ctrl-X Ctrl-S": "save",
-    "Ctrl-X Ctrl-W": "save",
-    "Ctrl-X S": "saveAll",
-    "Ctrl-X F": "open",
-    "Ctrl-X U": repeated("undo"),
-    "Ctrl-X K": "close",
-    "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
-    "Ctrl-X H": "selectAll",
-
-    "Ctrl-Q Tab": repeated("insertTab"),
-    "Ctrl-U": addPrefixMap
-  });
-
-  var prefixMap = {"Ctrl-G": clearPrefix};
-  function regPrefix(d) {
-    prefixMap[d] = function(cm) { addPrefix(cm, d); };
-    keyMap["Ctrl-" + d] = function(cm) { addPrefix(cm, d); };
-    prefixPreservingKeys["Ctrl-" + d] = true;
-  }
-  for (var i = 0; i < 10; ++i) regPrefix(String(i));
-  regPrefix("-");
-});
diff --git a/www/code/codemirror-5.7/keymap/sublime.js b/www/code/codemirror-5.7/keymap/sublime.js
deleted file mode 100644
index 44e812a24..000000000
--- a/www/code/codemirror-5.7/keymap/sublime.js
+++ /dev/null
@@ -1,563 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// A rough approximation of Sublime Text's keybindings
-// Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/edit/matchbrackets"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/edit/matchbrackets"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var map = CodeMirror.keyMap.sublime = {fallthrough: "default"};
-  var cmds = CodeMirror.commands;
-  var Pos = CodeMirror.Pos;
-  var mac = CodeMirror.keyMap["default"] == CodeMirror.keyMap.macDefault;
-  var ctrl = mac ? "Cmd-" : "Ctrl-";
-
-  // This is not exactly Sublime's algorithm. I couldn't make heads or tails of that.
-  function findPosSubword(doc, start, dir) {
-    if (dir < 0 && start.ch == 0) return doc.clipPos(Pos(start.line - 1));
-    var line = doc.getLine(start.line);
-    if (dir > 0 && start.ch >= line.length) return doc.clipPos(Pos(start.line + 1, 0));
-    var state = "start", type;
-    for (var pos = start.ch, e = dir < 0 ? 0 : line.length, i = 0; pos != e; pos += dir, i++) {
-      var next = line.charAt(dir < 0 ? pos - 1 : pos);
-      var cat = next != "_" && CodeMirror.isWordChar(next) ? "w" : "o";
-      if (cat == "w" && next.toUpperCase() == next) cat = "W";
-      if (state == "start") {
-        if (cat != "o") { state = "in"; type = cat; }
-      } else if (state == "in") {
-        if (type != cat) {
-          if (type == "w" && cat == "W" && dir < 0) pos--;
-          if (type == "W" && cat == "w" && dir > 0) { type = "w"; continue; }
-          break;
-        }
-      }
-    }
-    return Pos(start.line, pos);
-  }
-
-  function moveSubword(cm, dir) {
-    cm.extendSelectionsBy(function(range) {
-      if (cm.display.shift || cm.doc.extend || range.empty())
-        return findPosSubword(cm.doc, range.head, dir);
-      else
-        return dir < 0 ? range.from() : range.to();
-    });
-  }
-
-  cmds[map["Alt-Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
-  cmds[map["Alt-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
-
-  var scrollLineCombo = mac ? "Ctrl-Alt-" : "Ctrl-";
-
-  cmds[map[scrollLineCombo + "Up"] = "scrollLineUp"] = function(cm) {
-    var info = cm.getScrollInfo();
-    if (!cm.somethingSelected()) {
-      var visibleBottomLine = cm.lineAtHeight(info.top + info.clientHeight, "local");
-      if (cm.getCursor().line >= visibleBottomLine)
-        cm.execCommand("goLineUp");
-    }
-    cm.scrollTo(null, info.top - cm.defaultTextHeight());
-  };
-  cmds[map[scrollLineCombo + "Down"] = "scrollLineDown"] = function(cm) {
-    var info = cm.getScrollInfo();
-    if (!cm.somethingSelected()) {
-      var visibleTopLine = cm.lineAtHeight(info.top, "local")+1;
-      if (cm.getCursor().line <= visibleTopLine)
-        cm.execCommand("goLineDown");
-    }
-    cm.scrollTo(null, info.top + cm.defaultTextHeight());
-  };
-
-  cmds[map["Shift-" + ctrl + "L"] = "splitSelectionByLine"] = function(cm) {
-    var ranges = cm.listSelections(), lineRanges = [];
-    for (var i = 0; i < ranges.length; i++) {
-      var from = ranges[i].from(), to = ranges[i].to();
-      for (var line = from.line; line <= to.line; ++line)
-        if (!(to.line > from.line && line == to.line && to.ch == 0))
-          lineRanges.push({anchor: line == from.line ? from : Pos(line, 0),
-                           head: line == to.line ? to : Pos(line)});
-    }
-    cm.setSelections(lineRanges, 0);
-  };
-
-  map["Shift-Tab"] = "indentLess";
-
-  cmds[map["Esc"] = "singleSelectionTop"] = function(cm) {
-    var range = cm.listSelections()[0];
-    cm.setSelection(range.anchor, range.head, {scroll: false});
-  };
-
-  cmds[map[ctrl + "L"] = "selectLine"] = function(cm) {
-    var ranges = cm.listSelections(), extended = [];
-    for (var i = 0; i < ranges.length; i++) {
-      var range = ranges[i];
-      extended.push({anchor: Pos(range.from().line, 0),
-                     head: Pos(range.to().line + 1, 0)});
-    }
-    cm.setSelections(extended);
-  };
-
-  map["Shift-" + ctrl + "K"] = "deleteLine";
-
-  function insertLine(cm, above) {
-    cm.operation(function() {
-      var len = cm.listSelections().length, newSelection = [], last = -1;
-      for (var i = 0; i < len; i++) {
-        var head = cm.listSelections()[i].head;
-        if (head.line <= last) continue;
-        var at = Pos(head.line + (above ? 0 : 1), 0);
-        cm.replaceRange("\n", at, null, "+insertLine");
-        cm.indentLine(at.line, null, true);
-        newSelection.push({head: at, anchor: at});
-        last = head.line + 1;
-      }
-      cm.setSelections(newSelection);
-    });
-  }
-
-  cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { insertLine(cm, false); };
-
-  cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { insertLine(cm, true); };
-
-  function wordAt(cm, pos) {
-    var start = pos.ch, end = start, line = cm.getLine(pos.line);
-    while (start && CodeMirror.isWordChar(line.charAt(start - 1))) --start;
-    while (end < line.length && CodeMirror.isWordChar(line.charAt(end))) ++end;
-    return {from: Pos(pos.line, start), to: Pos(pos.line, end), word: line.slice(start, end)};
-  }
-
-  cmds[map[ctrl + "D"] = "selectNextOccurrence"] = function(cm) {
-    var from = cm.getCursor("from"), to = cm.getCursor("to");
-    var fullWord = cm.state.sublimeFindFullWord == cm.doc.sel;
-    if (CodeMirror.cmpPos(from, to) == 0) {
-      var word = wordAt(cm, from);
-      if (!word.word) return;
-      cm.setSelection(word.from, word.to);
-      fullWord = true;
-    } else {
-      var text = cm.getRange(from, to);
-      var query = fullWord ? new RegExp("\\b" + text + "\\b") : text;
-      var cur = cm.getSearchCursor(query, to);
-      if (cur.findNext()) {
-        cm.addSelection(cur.from(), cur.to());
-      } else {
-        cur = cm.getSearchCursor(query, Pos(cm.firstLine(), 0));
-        if (cur.findNext())
-          cm.addSelection(cur.from(), cur.to());
-      }
-    }
-    if (fullWord)
-      cm.state.sublimeFindFullWord = cm.doc.sel;
-  };
-
-  var mirror = "(){}[]";
-  function selectBetweenBrackets(cm) {
-    var pos = cm.getCursor(), opening = cm.scanForBracket(pos, -1);
-    if (!opening) return;
-    for (;;) {
-      var closing = cm.scanForBracket(pos, 1);
-      if (!closing) return;
-      if (closing.ch == mirror.charAt(mirror.indexOf(opening.ch) + 1)) {
-        cm.setSelection(Pos(opening.pos.line, opening.pos.ch + 1), closing.pos, false);
-        return true;
-      }
-      pos = Pos(closing.pos.line, closing.pos.ch + 1);
-    }
-  }
-
-  cmds[map["Shift-" + ctrl + "Space"] = "selectScope"] = function(cm) {
-    selectBetweenBrackets(cm) || cm.execCommand("selectAll");
-  };
-  cmds[map["Shift-" + ctrl + "M"] = "selectBetweenBrackets"] = function(cm) {
-    if (!selectBetweenBrackets(cm)) return CodeMirror.Pass;
-  };
-
-  cmds[map[ctrl + "M"] = "goToBracket"] = function(cm) {
-    cm.extendSelectionsBy(function(range) {
-      var next = cm.scanForBracket(range.head, 1);
-      if (next && CodeMirror.cmpPos(next.pos, range.head) != 0) return next.pos;
-      var prev = cm.scanForBracket(range.head, -1);
-      return prev && Pos(prev.pos.line, prev.pos.ch + 1) || range.head;
-    });
-  };
-
-  var swapLineCombo = mac ? "Cmd-Ctrl-" : "Shift-Ctrl-";
-
-  cmds[map[swapLineCombo + "Up"] = "swapLineUp"] = function(cm) {
-    var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1, newSels = [];
-    for (var i = 0; i < ranges.length; i++) {
-      var range = ranges[i], from = range.from().line - 1, to = range.to().line;
-      newSels.push({anchor: Pos(range.anchor.line - 1, range.anchor.ch),
-                    head: Pos(range.head.line - 1, range.head.ch)});
-      if (range.to().ch == 0 && !range.empty()) --to;
-      if (from > at) linesToMove.push(from, to);
-      else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
-      at = to;
-    }
-    cm.operation(function() {
-      for (var i = 0; i < linesToMove.length; i += 2) {
-        var from = linesToMove[i], to = linesToMove[i + 1];
-        var line = cm.getLine(from);
-        cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
-        if (to > cm.lastLine())
-          cm.replaceRange("\n" + line, Pos(cm.lastLine()), null, "+swapLine");
-        else
-          cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
-      }
-      cm.setSelections(newSels);
-      cm.scrollIntoView();
-    });
-  };
-
-  cmds[map[swapLineCombo + "Down"] = "swapLineDown"] = function(cm) {
-    var ranges = cm.listSelections(), linesToMove = [], at = cm.lastLine() + 1;
-    for (var i = ranges.length - 1; i >= 0; i--) {
-      var range = ranges[i], from = range.to().line + 1, to = range.from().line;
-      if (range.to().ch == 0 && !range.empty()) from--;
-      if (from < at) linesToMove.push(from, to);
-      else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
-      at = to;
-    }
-    cm.operation(function() {
-      for (var i = linesToMove.length - 2; i >= 0; i -= 2) {
-        var from = linesToMove[i], to = linesToMove[i + 1];
-        var line = cm.getLine(from);
-        if (from == cm.lastLine())
-          cm.replaceRange("", Pos(from - 1), Pos(from), "+swapLine");
-        else
-          cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
-        cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
-      }
-      cm.scrollIntoView();
-    });
-  };
-
-  map[ctrl + "/"] = "toggleComment";
-
-  cmds[map[ctrl + "J"] = "joinLines"] = function(cm) {
-    var ranges = cm.listSelections(), joined = [];
-    for (var i = 0; i < ranges.length; i++) {
-      var range = ranges[i], from = range.from();
-      var start = from.line, end = range.to().line;
-      while (i < ranges.length - 1 && ranges[i + 1].from().line == end)
-        end = ranges[++i].to().line;
-      joined.push({start: start, end: end, anchor: !range.empty() && from});
-    }
-    cm.operation(function() {
-      var offset = 0, ranges = [];
-      for (var i = 0; i < joined.length; i++) {
-        var obj = joined[i];
-        var anchor = obj.anchor && Pos(obj.anchor.line - offset, obj.anchor.ch), head;
-        for (var line = obj.start; line <= obj.end; line++) {
-          var actual = line - offset;
-          if (line == obj.end) head = Pos(actual, cm.getLine(actual).length + 1);
-          if (actual < cm.lastLine()) {
-            cm.replaceRange(" ", Pos(actual), Pos(actual + 1, /^\s*/.exec(cm.getLine(actual + 1))[0].length));
-            ++offset;
-          }
-        }
-        ranges.push({anchor: anchor || head, head: head});
-      }
-      cm.setSelections(ranges, 0);
-    });
-  };
-
-  cmds[map["Shift-" + ctrl + "D"] = "duplicateLine"] = function(cm) {
-    cm.operation(function() {
-      var rangeCount = cm.listSelections().length;
-      for (var i = 0; i < rangeCount; i++) {
-        var range = cm.listSelections()[i];
-        if (range.empty())
-          cm.replaceRange(cm.getLine(range.head.line) + "\n", Pos(range.head.line, 0));
-        else
-          cm.replaceRange(cm.getRange(range.from(), range.to()), range.from());
-      }
-      cm.scrollIntoView();
-    });
-  };
-
-  map[ctrl + "T"] = "transposeChars";
-
-  function sortLines(cm, caseSensitive) {
-    var ranges = cm.listSelections(), toSort = [], selected;
-    for (var i = 0; i < ranges.length; i++) {
-      var range = ranges[i];
-      if (range.empty()) continue;
-      var from = range.from().line, to = range.to().line;
-      while (i < ranges.length - 1 && ranges[i + 1].from().line == to)
-        to = range[++i].to().line;
-      toSort.push(from, to);
-    }
-    if (toSort.length) selected = true;
-    else toSort.push(cm.firstLine(), cm.lastLine());
-
-    cm.operation(function() {
-      var ranges = [];
-      for (var i = 0; i < toSort.length; i += 2) {
-        var from = toSort[i], to = toSort[i + 1];
-        var start = Pos(from, 0), end = Pos(to);
-        var lines = cm.getRange(start, end, false);
-        if (caseSensitive)
-          lines.sort();
-        else
-          lines.sort(function(a, b) {
-            var au = a.toUpperCase(), bu = b.toUpperCase();
-            if (au != bu) { a = au; b = bu; }
-            return a < b ? -1 : a == b ? 0 : 1;
-          });
-        cm.replaceRange(lines, start, end);
-        if (selected) ranges.push({anchor: start, head: end});
-      }
-      if (selected) cm.setSelections(ranges, 0);
-    });
-  }
-
-  cmds[map["F9"] = "sortLines"] = function(cm) { sortLines(cm, true); };
-  cmds[map[ctrl + "F9"] = "sortLinesInsensitive"] = function(cm) { sortLines(cm, false); };
-
-  cmds[map["F2"] = "nextBookmark"] = function(cm) {
-    var marks = cm.state.sublimeBookmarks;
-    if (marks) while (marks.length) {
-      var current = marks.shift();
-      var found = current.find();
-      if (found) {
-        marks.push(current);
-        return cm.setSelection(found.from, found.to);
-      }
-    }
-  };
-
-  cmds[map["Shift-F2"] = "prevBookmark"] = function(cm) {
-    var marks = cm.state.sublimeBookmarks;
-    if (marks) while (marks.length) {
-      marks.unshift(marks.pop());
-      var found = marks[marks.length - 1].find();
-      if (!found)
-        marks.pop();
-      else
-        return cm.setSelection(found.from, found.to);
-    }
-  };
-
-  cmds[map[ctrl + "F2"] = "toggleBookmark"] = function(cm) {
-    var ranges = cm.listSelections();
-    var marks = cm.state.sublimeBookmarks || (cm.state.sublimeBookmarks = []);
-    for (var i = 0; i < ranges.length; i++) {
-      var from = ranges[i].from(), to = ranges[i].to();
-      var found = cm.findMarks(from, to);
-      for (var j = 0; j < found.length; j++) {
-        if (found[j].sublimeBookmark) {
-          found[j].clear();
-          for (var k = 0; k < marks.length; k++)
-            if (marks[k] == found[j])
-              marks.splice(k--, 1);
-          break;
-        }
-      }
-      if (j == found.length)
-        marks.push(cm.markText(from, to, {sublimeBookmark: true, clearWhenEmpty: false}));
-    }
-  };
-
-  cmds[map["Shift-" + ctrl + "F2"] = "clearBookmarks"] = function(cm) {
-    var marks = cm.state.sublimeBookmarks;
-    if (marks) for (var i = 0; i < marks.length; i++) marks[i].clear();
-    marks.length = 0;
-  };
-
-  cmds[map["Alt-F2"] = "selectBookmarks"] = function(cm) {
-    var marks = cm.state.sublimeBookmarks, ranges = [];
-    if (marks) for (var i = 0; i < marks.length; i++) {
-      var found = marks[i].find();
-      if (!found)
-        marks.splice(i--, 0);
-      else
-        ranges.push({anchor: found.from, head: found.to});
-    }
-    if (ranges.length)
-      cm.setSelections(ranges, 0);
-  };
-
-  map["Alt-Q"] = "wrapLines";
-
-  var cK = ctrl + "K ";
-
-  function modifyWordOrSelection(cm, mod) {
-    cm.operation(function() {
-      var ranges = cm.listSelections(), indices = [], replacements = [];
-      for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i];
-        if (range.empty()) { indices.push(i); replacements.push(""); }
-        else replacements.push(mod(cm.getRange(range.from(), range.to())));
-      }
-      cm.replaceSelections(replacements, "around", "case");
-      for (var i = indices.length - 1, at; i >= 0; i--) {
-        var range = ranges[indices[i]];
-        if (at && CodeMirror.cmpPos(range.head, at) > 0) continue;
-        var word = wordAt(cm, range.head);
-        at = word.from;
-        cm.replaceRange(mod(word.word), word.from, word.to);
-      }
-    });
-  }
-
-  map[cK + ctrl + "Backspace"] = "delLineLeft";
-
-  cmds[map["Backspace"] = "smartBackspace"] = function(cm) {
-    if (cm.somethingSelected()) return CodeMirror.Pass;
-
-    var cursor = cm.getCursor();
-    var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor);
-    var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize"));
-    var indentUnit = cm.getOption("indentUnit");
-
-    if (toStartOfLine && !/\S/.test(toStartOfLine) && column % indentUnit == 0) {
-      var prevIndent = new Pos(cursor.line,
-        CodeMirror.findColumn(toStartOfLine, column - indentUnit, indentUnit));
-
-      // If no smart delete is happening (due to tab sizing) just do a regular delete
-      if (prevIndent.ch == cursor.ch) return CodeMirror.Pass;
-
-      return cm.replaceRange("", prevIndent, cursor, "+delete");
-    } else {
-      return CodeMirror.Pass;
-    }
-  };
-
-  cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {
-    cm.operation(function() {
-      var ranges = cm.listSelections();
-      for (var i = ranges.length - 1; i >= 0; i--)
-        cm.replaceRange("", ranges[i].anchor, Pos(ranges[i].to().line), "+delete");
-      cm.scrollIntoView();
-    });
-  };
-
-  cmds[map[cK + ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
-    modifyWordOrSelection(cm, function(str) { return str.toUpperCase(); });
-  };
-  cmds[map[cK + ctrl + "L"] = "downcaseAtCursor"] = function(cm) {
-    modifyWordOrSelection(cm, function(str) { return str.toLowerCase(); });
-  };
-
-  cmds[map[cK + ctrl + "Space"] = "setSublimeMark"] = function(cm) {
-    if (cm.state.sublimeMark) cm.state.sublimeMark.clear();
-    cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
-  };
-  cmds[map[cK + ctrl + "A"] = "selectToSublimeMark"] = function(cm) {
-    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
-    if (found) cm.setSelection(cm.getCursor(), found);
-  };
-  cmds[map[cK + ctrl + "W"] = "deleteToSublimeMark"] = function(cm) {
-    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
-    if (found) {
-      var from = cm.getCursor(), to = found;
-      if (CodeMirror.cmpPos(from, to) > 0) { var tmp = to; to = from; from = tmp; }
-      cm.state.sublimeKilled = cm.getRange(from, to);
-      cm.replaceRange("", from, to);
-    }
-  };
-  cmds[map[cK + ctrl + "X"] = "swapWithSublimeMark"] = function(cm) {
-    var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
-    if (found) {
-      cm.state.sublimeMark.clear();
-      cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
-      cm.setCursor(found);
-    }
-  };
-  cmds[map[cK + ctrl + "Y"] = "sublimeYank"] = function(cm) {
-    if (cm.state.sublimeKilled != null)
-      cm.replaceSelection(cm.state.sublimeKilled, null, "paste");
-  };
-
-  map[cK + ctrl + "G"] = "clearBookmarks";
-  cmds[map[cK + ctrl + "C"] = "showInCenter"] = function(cm) {
-    var pos = cm.cursorCoords(null, "local");
-    cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
-  };
-
-  cmds[map["Shift-Alt-Up"] = "selectLinesUpward"] = function(cm) {
-    cm.operation(function() {
-      var ranges = cm.listSelections();
-      for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i];
-        if (range.head.line > cm.firstLine())
-          cm.addSelection(Pos(range.head.line - 1, range.head.ch));
-      }
-    });
-  };
-  cmds[map["Shift-Alt-Down"] = "selectLinesDownward"] = function(cm) {
-    cm.operation(function() {
-      var ranges = cm.listSelections();
-      for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i];
-        if (range.head.line < cm.lastLine())
-          cm.addSelection(Pos(range.head.line + 1, range.head.ch));
-      }
-    });
-  };
-
-  function getTarget(cm) {
-    var from = cm.getCursor("from"), to = cm.getCursor("to");
-    if (CodeMirror.cmpPos(from, to) == 0) {
-      var word = wordAt(cm, from);
-      if (!word.word) return;
-      from = word.from;
-      to = word.to;
-    }
-    return {from: from, to: to, query: cm.getRange(from, to), word: word};
-  }
-
-  function findAndGoTo(cm, forward) {
-    var target = getTarget(cm);
-    if (!target) return;
-    var query = target.query;
-    var cur = cm.getSearchCursor(query, forward ? target.to : target.from);
-
-    if (forward ? cur.findNext() : cur.findPrevious()) {
-      cm.setSelection(cur.from(), cur.to());
-    } else {
-      cur = cm.getSearchCursor(query, forward ? Pos(cm.firstLine(), 0)
-                                              : cm.clipPos(Pos(cm.lastLine())));
-      if (forward ? cur.findNext() : cur.findPrevious())
-        cm.setSelection(cur.from(), cur.to());
-      else if (target.word)
-        cm.setSelection(target.from, target.to);
-    }
-  };
-  cmds[map[ctrl + "F3"] = "findUnder"] = function(cm) { findAndGoTo(cm, true); };
-  cmds[map["Shift-" + ctrl + "F3"] = "findUnderPrevious"] = function(cm) { findAndGoTo(cm,false); };
-  cmds[map["Alt-F3"] = "findAllUnder"] = function(cm) {
-    var target = getTarget(cm);
-    if (!target) return;
-    var cur = cm.getSearchCursor(target.query);
-    var matches = [];
-    var primaryIndex = -1;
-    while (cur.findNext()) {
-      matches.push({anchor: cur.from(), head: cur.to()});
-      if (cur.from().line <= target.from.line && cur.from().ch <= target.from.ch)
-        primaryIndex++;
-    }
-    cm.setSelections(matches, primaryIndex);
-  };
-
-  map["Shift-" + ctrl + "["] = "fold";
-  map["Shift-" + ctrl + "]"] = "unfold";
-  map[cK + ctrl + "0"] = map[cK + ctrl + "j"] = "unfoldAll";
-
-  map[ctrl + "I"] = "findIncremental";
-  map["Shift-" + ctrl + "I"] = "findIncrementalReverse";
-  map[ctrl + "H"] = "replace";
-  map["F3"] = "findNext";
-  map["Shift-F3"] = "findPrev";
-
-  CodeMirror.normalizeKeyMap(map);
-});
diff --git a/www/code/codemirror-5.7/keymap/vim.js b/www/code/codemirror-5.7/keymap/vim.js
deleted file mode 100644
index 14897a84d..000000000
--- a/www/code/codemirror-5.7/keymap/vim.js
+++ /dev/null
@@ -1,5060 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**
- * Supported keybindings:
- *   Too many to list. Refer to defaultKeyMap below.
- *
- * Supported Ex commands:
- *   Refer to defaultExCommandMap below.
- *
- * Registers: unnamed, -, a-z, A-Z, 0-9
- *   (Does not respect the special case for number registers when delete
- *    operator is made with these commands: %, (, ),  , /, ?, n, N, {, } )
- *   TODO: Implement the remaining registers.
- *
- * Marks: a-z, A-Z, and 0-9
- *   TODO: Implement the remaining special marks. They have more complex
- *       behavior.
- *
- * Events:
- *  'vim-mode-change' - raised on the editor anytime the current mode changes,
- *                      Event object: {mode: "visual", subMode: "linewise"}
- *
- * Code structure:
- *  1. Default keymap
- *  2. Variable declarations and short basic helpers
- *  3. Instance (External API) implementation
- *  4. Internal state tracking objects (input state, counter) implementation
- *     and instanstiation
- *  5. Key handler (the main command dispatcher) implementation
- *  6. Motion, operator, and action implementations
- *  7. Helper functions for the key handler, motions, operators, and actions
- *  8. Set up Vim to work as a keymap for CodeMirror.
- *  9. Ex command implementations.
- */
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../lib/codemirror"), require("../addon/search/searchcursor"), require("../addon/dialog/dialog"), require("../addon/edit/matchbrackets.js"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../lib/codemirror", "../addon/search/searchcursor", "../addon/dialog/dialog", "../addon/edit/matchbrackets"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  'use strict';
-
-  var defaultKeymap = [
-    // Key to key mapping. This goes first to make it possible to override
-    // existing mappings.
-    { keys: '', type: 'keyToKey', toKeys: 'h' },
-    { keys: '', type: 'keyToKey', toKeys: 'l' },
-    { keys: '', type: 'keyToKey', toKeys: 'k' },
-    { keys: '', type: 'keyToKey', toKeys: 'j' },
-    { keys: '', type: 'keyToKey', toKeys: 'l' },
-    { keys: '', type: 'keyToKey', toKeys: 'h', context: 'normal'},
-    { keys: '', type: 'keyToKey', toKeys: 'W' },
-    { keys: '', type: 'keyToKey', toKeys: 'B', context: 'normal' },
-    { keys: '', type: 'keyToKey', toKeys: 'w' },
-    { keys: '', type: 'keyToKey', toKeys: 'b', context: 'normal' },
-    { keys: '', type: 'keyToKey', toKeys: 'j' },
-    { keys: '', type: 'keyToKey', toKeys: 'k' },
-    { keys: '', type: 'keyToKey', toKeys: '' },
-    { keys: '', type: 'keyToKey', toKeys: '' },
-    { keys: '', type: 'keyToKey', toKeys: '', context: 'insert' },
-    { keys: '', type: 'keyToKey', toKeys: '', context: 'insert' },
-    { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' },
-    { keys: 's', type: 'keyToKey', toKeys: 'xi', context: 'visual'},
-    { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' },
-    { keys: 'S', type: 'keyToKey', toKeys: 'dcc', context: 'visual' },
-    { keys: '', type: 'keyToKey', toKeys: '0' },
-    { keys: '', type: 'keyToKey', toKeys: '$' },
-    { keys: '', type: 'keyToKey', toKeys: '' },
-    { keys: '', type: 'keyToKey', toKeys: '' },
-    { keys: '', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
-    // Motions
-    { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
-    { keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }},
-    { keys: 'L', type: 'motion', motion: 'moveToBottomLine', motionArgs: { linewise: true, toJumplist: true }},
-    { keys: 'h', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }},
-    { keys: 'l', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: true }},
-    { keys: 'j', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, linewise: true }},
-    { keys: 'k', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, linewise: true }},
-    { keys: 'gj', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: true }},
-    { keys: 'gk', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: false }},
-    { keys: 'w', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false }},
-    { keys: 'W', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false, bigWord: true }},
-    { keys: 'e', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, inclusive: true }},
-    { keys: 'E', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, bigWord: true, inclusive: true }},
-    { keys: 'b', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }},
-    { keys: 'B', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false, bigWord: true }},
-    { keys: 'ge', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, inclusive: true }},
-    { keys: 'gE', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, bigWord: true, inclusive: true }},
-    { keys: '{', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: false, toJumplist: true }},
-    { keys: '}', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: true, toJumplist: true }},
-    { keys: '', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }},
-    { keys: '', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }},
-    { keys: '', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }},
-    { keys: '', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }},
-    { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
-    { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }},
-    { keys: '-', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, toFirstChar:true }},
-    { keys: '_', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
-    { keys: '$', type: 'motion', motion: 'moveToEol', motionArgs: { inclusive: true }},
-    { keys: '%', type: 'motion', motion: 'moveToMatchedSymbol', motionArgs: { inclusive: true, toJumplist: true }},
-    { keys: 'f', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: true , inclusive: true }},
-    { keys: 'F', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: false }},
-    { keys: 't', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: true, inclusive: true }},
-    { keys: 'T', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: false }},
-    { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: true }},
-    { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: false }},
-    { keys: '\'', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true, linewise: true}},
-    { keys: '`', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true}},
-    { keys: ']`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
-    { keys: '[`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
-    { keys: ']\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
-    { keys: '[\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
-    // the next two aren't motions but must come before more general motion declarations
-    { keys: ']p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true, matchIndent: true}},
-    { keys: '[p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true, matchIndent: true}},
-    { keys: ']', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: true, toJumplist: true}},
-    { keys: '[', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: false, toJumplist: true}},
-    { keys: '|', type: 'motion', motion: 'moveToColumn'},
-    { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', context:'visual'},
-    { keys: 'O', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
-    // Operators
-    { keys: 'd', type: 'operator', operator: 'delete' },
-    { keys: 'y', type: 'operator', operator: 'yank' },
-    { keys: 'c', type: 'operator', operator: 'change' },
-    { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
-    { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
-    { keys: 'g~', type: 'operator', operator: 'changeCase' },
-    { keys: 'gu', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, isEdit: true },
-    { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true },
-    { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
-    { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
-    // Operator-Motion dual commands
-    { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
-    { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
-    { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
-    { keys: 'D', type: 'operator', operator: 'delete', operatorArgs: { linewise: true }, context: 'visual'},
-    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
-    { keys: 'Y', type: 'operator', operator: 'yank', operatorArgs: { linewise: true }, context: 'visual'},
-    { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
-    { keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'},
-    { keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'},
-    { keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'},
-    { keys: '', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
-    // Actions
-    { keys: '', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
-    { keys: '', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
-    { keys: '', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }},
-    { keys: '', type: 'action', action: 'scroll', actionArgs: { forward: false, linewise: true }},
-    { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }, context: 'normal' },
-    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
-    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
-    { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
-    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' },
-    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' },
-    { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
-    { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
-    { keys: 'v', type: 'action', action: 'toggleVisualMode' },
-    { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }},
-    { keys: '', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
-    { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
-    { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
-    { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},
-    { keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }},
-    { keys: 'r', type: 'action', action: 'replace', isEdit: true },
-    { keys: '@', type: 'action', action: 'replayMacro' },
-    { keys: 'q', type: 'action', action: 'enterMacroRecordMode' },
-    // Handle Replace-mode as a special case of insert mode.
-    { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
-    { keys: 'u', type: 'action', action: 'undo', context: 'normal' },
-    { keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true },
-    { keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true },
-    { keys: '', type: 'action', action: 'redo' },
-    { keys: 'm', type: 'action', action: 'setMark' },
-    { keys: '"', type: 'action', action: 'setRegister' },
-    { keys: 'zz', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }},
-    { keys: 'z.', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: 'zt', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }},
-    { keys: 'z', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }},
-    { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: '.', type: 'action', action: 'repeatLastEdit' },
-    { keys: '', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
-    { keys: '', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
-    // Text object motions
-    { keys: 'a', type: 'motion', motion: 'textObjectManipulation' },
-    { keys: 'i', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }},
-    // Search
-    { keys: '/', type: 'search', searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
-    { keys: '?', type: 'search', searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
-    { keys: '*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
-    { keys: '#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
-    { keys: 'g*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
-    { keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
-    // Ex command
-    { keys: ':', type: 'ex' }
-  ];
-
-  /**
-   * Ex commands
-   * Care must be taken when adding to the default Ex command map. For any
-   * pair of commands that have a shared prefix, at least one of their
-   * shortNames must not match the prefix of the other command.
-   */
-  var defaultExCommandMap = [
-    { name: 'colorscheme', shortName: 'colo' },
-    { name: 'map' },
-    { name: 'imap', shortName: 'im' },
-    { name: 'nmap', shortName: 'nm' },
-    { name: 'vmap', shortName: 'vm' },
-    { name: 'unmap' },
-    { name: 'write', shortName: 'w' },
-    { name: 'undo', shortName: 'u' },
-    { name: 'redo', shortName: 'red' },
-    { name: 'set', shortName: 'se' },
-    { name: 'set', shortName: 'se' },
-    { name: 'setlocal', shortName: 'setl' },
-    { name: 'setglobal', shortName: 'setg' },
-    { name: 'sort', shortName: 'sor' },
-    { name: 'substitute', shortName: 's', possiblyAsync: true },
-    { name: 'nohlsearch', shortName: 'noh' },
-    { name: 'delmarks', shortName: 'delm' },
-    { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
-    { name: 'global', shortName: 'g' }
-  ];
-
-  var Pos = CodeMirror.Pos;
-
-  var Vim = function() {
-    function enterVimMode(cm) {
-      cm.setOption('disableInput', true);
-      cm.setOption('showCursorWhenSelecting', false);
-      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-      cm.on('cursorActivity', onCursorActivity);
-      maybeInitVimState(cm);
-      CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
-    }
-
-    function leaveVimMode(cm) {
-      cm.setOption('disableInput', false);
-      cm.off('cursorActivity', onCursorActivity);
-      CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
-      cm.state.vim = null;
-    }
-
-    function detachVimMap(cm, next) {
-      if (this == CodeMirror.keyMap.vim)
-        CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
-
-      if (!next || next.attach != attachVimMap)
-        leaveVimMode(cm, false);
-    }
-    function attachVimMap(cm, prev) {
-      if (this == CodeMirror.keyMap.vim)
-        CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
-
-      if (!prev || prev.attach != attachVimMap)
-        enterVimMode(cm);
-    }
-
-    // Deprecated, simply setting the keymap works again.
-    CodeMirror.defineOption('vimMode', false, function(cm, val, prev) {
-      if (val && cm.getOption("keyMap") != "vim")
-        cm.setOption("keyMap", "vim");
-      else if (!val && prev != CodeMirror.Init && /^vim/.test(cm.getOption("keyMap")))
-        cm.setOption("keyMap", "default");
-    });
-
-    function cmKey(key, cm) {
-      if (!cm) { return undefined; }
-      var vimKey = cmKeyToVimKey(key);
-      if (!vimKey) {
-        return false;
-      }
-      var cmd = CodeMirror.Vim.findKey(cm, vimKey);
-      if (typeof cmd == 'function') {
-        CodeMirror.signal(cm, 'vim-keypress', vimKey);
-      }
-      return cmd;
-    }
-
-    var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'};
-    var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del'};
-    function cmKeyToVimKey(key) {
-      if (key.charAt(0) == '\'') {
-        // Keypress character binding of format "'a'"
-        return key.charAt(1);
-      }
-      var pieces = key.split('-');
-      if (/-$/.test(key)) {
-        // If the - key was typed, split will result in 2 extra empty strings
-        // in the array. Replace them with 1 '-'.
-        pieces.splice(-2, 2, '-');
-      }
-      var lastPiece = pieces[pieces.length - 1];
-      if (pieces.length == 1 && pieces[0].length == 1) {
-        // No-modifier bindings use literal character bindings above. Skip.
-        return false;
-      } else if (pieces.length == 2 && pieces[0] == 'Shift' && lastPiece.length == 1) {
-        // Ignore Shift+char bindings as they should be handled by literal character.
-        return false;
-      }
-      var hasCharacter = false;
-      for (var i = 0; i < pieces.length; i++) {
-        var piece = pieces[i];
-        if (piece in modifiers) { pieces[i] = modifiers[piece]; }
-        else { hasCharacter = true; }
-        if (piece in specialKeys) { pieces[i] = specialKeys[piece]; }
-      }
-      if (!hasCharacter) {
-        // Vim does not support modifier only keys.
-        return false;
-      }
-      // TODO: Current bindings expect the character to be lower case, but
-      // it looks like vim key notation uses upper case.
-      if (isUpperCase(lastPiece)) {
-        pieces[pieces.length - 1] = lastPiece.toLowerCase();
-      }
-      return '<' + pieces.join('-') + '>';
-    }
-
-    function getOnPasteFn(cm) {
-      var vim = cm.state.vim;
-      if (!vim.onPasteFn) {
-        vim.onPasteFn = function() {
-          if (!vim.insertMode) {
-            cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
-            actions.enterInsertMode(cm, {}, vim);
-          }
-        };
-      }
-      return vim.onPasteFn;
-    }
-
-    var numberRegex = /[\d]/;
-    var wordCharTest = [CodeMirror.isWordChar, function(ch) {
-      return ch && !CodeMirror.isWordChar(ch) && !/\s/.test(ch);
-    }], bigWordCharTest = [function(ch) {
-      return /\S/.test(ch);
-    }];
-    function makeKeyRange(start, size) {
-      var keys = [];
-      for (var i = start; i < start + size; i++) {
-        keys.push(String.fromCharCode(i));
-      }
-      return keys;
-    }
-    var upperCaseAlphabet = makeKeyRange(65, 26);
-    var lowerCaseAlphabet = makeKeyRange(97, 26);
-    var numbers = makeKeyRange(48, 10);
-    var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
-    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']);
-
-    function isLine(cm, line) {
-      return line >= cm.firstLine() && line <= cm.lastLine();
-    }
-    function isLowerCase(k) {
-      return (/^[a-z]$/).test(k);
-    }
-    function isMatchableSymbol(k) {
-      return '()[]{}'.indexOf(k) != -1;
-    }
-    function isNumber(k) {
-      return numberRegex.test(k);
-    }
-    function isUpperCase(k) {
-      return (/^[A-Z]$/).test(k);
-    }
-    function isWhiteSpaceString(k) {
-      return (/^\s*$/).test(k);
-    }
-    function inArray(val, arr) {
-      for (var i = 0; i < arr.length; i++) {
-        if (arr[i] == val) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    var options = {};
-    function defineOption(name, defaultValue, type, aliases, callback) {
-      if (defaultValue === undefined && !callback) {
-        throw Error('defaultValue is required unless callback is provided');
-      }
-      if (!type) { type = 'string'; }
-      options[name] = {
-        type: type,
-        defaultValue: defaultValue,
-        callback: callback
-      };
-      if (aliases) {
-        for (var i = 0; i < aliases.length; i++) {
-          options[aliases[i]] = options[name];
-        }
-      }
-      if (defaultValue) {
-        setOption(name, defaultValue);
-      }
-    }
-
-    function setOption(name, value, cm, cfg) {
-      var option = options[name];
-      cfg = cfg || {};
-      var scope = cfg.scope;
-      if (!option) {
-        throw Error('Unknown option: ' + name);
-      }
-      if (option.type == 'boolean') {
-        if (value && value !== true) {
-          throw Error('Invalid argument: ' + name + '=' + value);
-        } else if (value !== false) {
-          // Boolean options are set to true if value is not defined.
-          value = true;
-        }
-      }
-      if (option.callback) {
-        if (scope !== 'local') {
-          option.callback(value, undefined);
-        }
-        if (scope !== 'global' && cm) {
-          option.callback(value, cm);
-        }
-      } else {
-        if (scope !== 'local') {
-          option.value = option.type == 'boolean' ? !!value : value;
-        }
-        if (scope !== 'global' && cm) {
-          cm.state.vim.options[name] = {value: value};
-        }
-      }
-    }
-
-    function getOption(name, cm, cfg) {
-      var option = options[name];
-      cfg = cfg || {};
-      var scope = cfg.scope;
-      if (!option) {
-        throw Error('Unknown option: ' + name);
-      }
-      if (option.callback) {
-        var local = cm && option.callback(undefined, cm);
-        if (scope !== 'global' && local !== undefined) {
-          return local;
-        }
-        if (scope !== 'local') {
-          return option.callback();
-        }
-        return;
-      } else {
-        var local = (scope !== 'global') && (cm && cm.state.vim.options[name]);
-        return (local || (scope !== 'local') && option || {}).value;
-      }
-    }
-
-    defineOption('filetype', undefined, 'string', ['ft'], function(name, cm) {
-      // Option is local. Do nothing for global.
-      if (cm === undefined) {
-        return;
-      }
-      // The 'filetype' option proxies to the CodeMirror 'mode' option.
-      if (name === undefined) {
-        var mode = cm.getOption('mode');
-        return mode == 'null' ? '' : mode;
-      } else {
-        var mode = name == '' ? 'null' : name;
-        cm.setOption('mode', mode);
-      }
-    });
-
-    var createCircularJumpList = function() {
-      var size = 100;
-      var pointer = -1;
-      var head = 0;
-      var tail = 0;
-      var buffer = new Array(size);
-      function add(cm, oldCur, newCur) {
-        var current = pointer % size;
-        var curMark = buffer[current];
-        function useNextSlot(cursor) {
-          var next = ++pointer % size;
-          var trashMark = buffer[next];
-          if (trashMark) {
-            trashMark.clear();
-          }
-          buffer[next] = cm.setBookmark(cursor);
-        }
-        if (curMark) {
-          var markPos = curMark.find();
-          // avoid recording redundant cursor position
-          if (markPos && !cursorEqual(markPos, oldCur)) {
-            useNextSlot(oldCur);
-          }
-        } else {
-          useNextSlot(oldCur);
-        }
-        useNextSlot(newCur);
-        head = pointer;
-        tail = pointer - size + 1;
-        if (tail < 0) {
-          tail = 0;
-        }
-      }
-      function move(cm, offset) {
-        pointer += offset;
-        if (pointer > head) {
-          pointer = head;
-        } else if (pointer < tail) {
-          pointer = tail;
-        }
-        var mark = buffer[(size + pointer) % size];
-        // skip marks that are temporarily removed from text buffer
-        if (mark && !mark.find()) {
-          var inc = offset > 0 ? 1 : -1;
-          var newCur;
-          var oldCur = cm.getCursor();
-          do {
-            pointer += inc;
-            mark = buffer[(size + pointer) % size];
-            // skip marks that are the same as current position
-            if (mark &&
-                (newCur = mark.find()) &&
-                !cursorEqual(oldCur, newCur)) {
-              break;
-            }
-          } while (pointer < head && pointer > tail);
-        }
-        return mark;
-      }
-      return {
-        cachedCursor: undefined, //used for # and * jumps
-        add: add,
-        move: move
-      };
-    };
-
-    // Returns an object to track the changes associated insert mode.  It
-    // clones the object that is passed in, or creates an empty object one if
-    // none is provided.
-    var createInsertModeChanges = function(c) {
-      if (c) {
-        // Copy construction
-        return {
-          changes: c.changes,
-          expectCursorActivityForChange: c.expectCursorActivityForChange
-        };
-      }
-      return {
-        // Change list
-        changes: [],
-        // Set to true on change, false on cursorActivity.
-        expectCursorActivityForChange: false
-      };
-    };
-
-    function MacroModeState() {
-      this.latestRegister = undefined;
-      this.isPlaying = false;
-      this.isRecording = false;
-      this.replaySearchQueries = [];
-      this.onRecordingDone = undefined;
-      this.lastInsertModeChanges = createInsertModeChanges();
-    }
-    MacroModeState.prototype = {
-      exitMacroRecordMode: function() {
-        var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.onRecordingDone) {
-          macroModeState.onRecordingDone(); // close dialog
-        }
-        macroModeState.onRecordingDone = undefined;
-        macroModeState.isRecording = false;
-      },
-      enterMacroRecordMode: function(cm, registerName) {
-        var register =
-            vimGlobalState.registerController.getRegister(registerName);
-        if (register) {
-          register.clear();
-          this.latestRegister = registerName;
-          if (cm.openDialog) {
-            this.onRecordingDone = cm.openDialog(
-                '(recording)['+registerName+']', null, {bottom:true});
-          }
-          this.isRecording = true;
-        }
-      }
-    };
-
-    function maybeInitVimState(cm) {
-      if (!cm.state.vim) {
-        // Store instance state in the CodeMirror object.
-        cm.state.vim = {
-          inputState: new InputState(),
-          // Vim's input state that triggered the last edit, used to repeat
-          // motions and operators with '.'.
-          lastEditInputState: undefined,
-          // Vim's action command before the last edit, used to repeat actions
-          // with '.' and insert mode repeat.
-          lastEditActionCommand: undefined,
-          // When using jk for navigation, if you move from a longer line to a
-          // shorter line, the cursor may clip to the end of the shorter line.
-          // If j is pressed again and cursor goes to the next line, the
-          // cursor should go back to its horizontal position on the longer
-          // line if it can. This is to keep track of the horizontal position.
-          lastHPos: -1,
-          // Doing the same with screen-position for gj/gk
-          lastHSPos: -1,
-          // The last motion command run. Cleared if a non-motion command gets
-          // executed in between.
-          lastMotion: null,
-          marks: {},
-          // Mark for rendering fake cursor for visual mode.
-          fakeCursor: null,
-          insertMode: false,
-          // Repeat count for changes made in insert mode, triggered by key
-          // sequences like 3,i. Only exists when insertMode is true.
-          insertModeRepeat: undefined,
-          visualMode: false,
-          // If we are in visual line mode. No effect if visualMode is false.
-          visualLine: false,
-          visualBlock: false,
-          lastSelection: null,
-          lastPastedText: null,
-          sel: {},
-          // Buffer-local/window-local values of vim options.
-          options: {}
-        };
-      }
-      return cm.state.vim;
-    }
-    var vimGlobalState;
-    function resetVimGlobalState() {
-      vimGlobalState = {
-        // The current search query.
-        searchQuery: null,
-        // Whether we are searching backwards.
-        searchIsReversed: false,
-        // Replace part of the last substituted pattern
-        lastSubstituteReplacePart: undefined,
-        jumpList: createCircularJumpList(),
-        macroModeState: new MacroModeState,
-        // Recording latest f, t, F or T motion command.
-        lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
-        registerController: new RegisterController({}),
-        // search history buffer
-        searchHistoryController: new HistoryController({}),
-        // ex Command history buffer
-        exCommandHistoryController : new HistoryController({})
-      };
-      for (var optionName in options) {
-        var option = options[optionName];
-        option.value = option.defaultValue;
-      }
-    }
-
-    var lastInsertModeKeyTimer;
-    var vimApi= {
-      buildKeyMap: function() {
-        // TODO: Convert keymap into dictionary format for fast lookup.
-      },
-      // Testing hook, though it might be useful to expose the register
-      // controller anyways.
-      getRegisterController: function() {
-        return vimGlobalState.registerController;
-      },
-      // Testing hook.
-      resetVimGlobalState_: resetVimGlobalState,
-
-      // Testing hook.
-      getVimGlobalState_: function() {
-        return vimGlobalState;
-      },
-
-      // Testing hook.
-      maybeInitVimState_: maybeInitVimState,
-
-      suppressErrorLogging: false,
-
-      InsertModeKey: InsertModeKey,
-      map: function(lhs, rhs, ctx) {
-        // Add user defined key bindings.
-        exCommandDispatcher.map(lhs, rhs, ctx);
-      },
-      // TODO: Expose setOption and getOption as instance methods. Need to decide how to namespace
-      // them, or somehow make them work with the existing CodeMirror setOption/getOption API.
-      setOption: setOption,
-      getOption: getOption,
-      defineOption: defineOption,
-      defineEx: function(name, prefix, func){
-        if (!prefix) {
-          prefix = name;
-        } else if (name.indexOf(prefix) !== 0) {
-          throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered');
-        }
-        exCommands[name]=func;
-        exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
-      },
-      handleKey: function (cm, key, origin) {
-        var command = this.findKey(cm, key, origin);
-        if (typeof command === 'function') {
-          return command();
-        }
-      },
-      /**
-       * This is the outermost function called by CodeMirror, after keys have
-       * been mapped to their Vim equivalents.
-       *
-       * Finds a command based on the key (and cached keys if there is a
-       * multi-key sequence). Returns `undefined` if no key is matched, a noop
-       * function if a partial match is found (multi-key), and a function to
-       * execute the bound command if a a key is matched. The function always
-       * returns true.
-       */
-      findKey: function(cm, key, origin) {
-        var vim = maybeInitVimState(cm);
-        function handleMacroRecording() {
-          var macroModeState = vimGlobalState.macroModeState;
-          if (macroModeState.isRecording) {
-            if (key == 'q') {
-              macroModeState.exitMacroRecordMode();
-              clearInputState(cm);
-              return true;
-            }
-            if (origin != 'mapping') {
-              logKey(macroModeState, key);
-            }
-          }
-        }
-        function handleEsc() {
-          if (key == '') {
-            // Clear input state and get back to normal mode.
-            clearInputState(cm);
-            if (vim.visualMode) {
-              exitVisualMode(cm);
-            } else if (vim.insertMode) {
-              exitInsertMode(cm);
-            }
-            return true;
-          }
-        }
-        function doKeyToKey(keys) {
-          // TODO: prevent infinite recursion.
-          var match;
-          while (keys) {
-            // Pull off one command key, which is either a single character
-            // or a special sequence wrapped in '<' and '>', e.g. ''.
-            match = (/<\w+-.+?>|<\w+>|./).exec(keys);
-            key = match[0];
-            keys = keys.substring(match.index + key.length);
-            CodeMirror.Vim.handleKey(cm, key, 'mapping');
-          }
-        }
-
-        function handleKeyInsertMode() {
-          if (handleEsc()) { return true; }
-          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
-          var keysAreChars = key.length == 1;
-          var match = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
-          // Need to check all key substrings in insert mode.
-          while (keys.length > 1 && match.type != 'full') {
-            var keys = vim.inputState.keyBuffer = keys.slice(1);
-            var thisMatch = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
-            if (thisMatch.type != 'none') { match = thisMatch; }
-          }
-          if (match.type == 'none') { clearInputState(cm); return false; }
-          else if (match.type == 'partial') {
-            if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
-            lastInsertModeKeyTimer = window.setTimeout(
-              function() { if (vim.insertMode && vim.inputState.keyBuffer) { clearInputState(cm); } },
-              getOption('insertModeEscKeysTimeout'));
-            return !keysAreChars;
-          }
-
-          if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
-          if (keysAreChars) {
-            var here = cm.getCursor();
-            cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
-          }
-          clearInputState(cm);
-          return match.command;
-        }
-
-        function handleKeyNonInsertMode() {
-          if (handleMacroRecording() || handleEsc()) { return true; };
-
-          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
-          if (/^[1-9]\d*$/.test(keys)) { return true; }
-
-          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
-          if (!keysMatcher) { clearInputState(cm); return false; }
-          var context = vim.visualMode ? 'visual' :
-                                         'normal';
-          var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context);
-          if (match.type == 'none') { clearInputState(cm); return false; }
-          else if (match.type == 'partial') { return true; }
-
-          vim.inputState.keyBuffer = '';
-          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
-          if (keysMatcher[1] && keysMatcher[1] != '0') {
-            vim.inputState.pushRepeatDigit(keysMatcher[1]);
-          }
-          return match.command;
-        }
-
-        var command;
-        if (vim.insertMode) { command = handleKeyInsertMode(); }
-        else { command = handleKeyNonInsertMode(); }
-        if (command === false) {
-          return undefined;
-        } else if (command === true) {
-          // TODO: Look into using CodeMirror's multi-key handling.
-          // Return no-op since we are caching the key. Counts as handled, but
-          // don't want act on it just yet.
-          return function() {};
-        } else {
-          return function() {
-            return cm.operation(function() {
-              cm.curOp.isVimOp = true;
-              try {
-                if (command.type == 'keyToKey') {
-                  doKeyToKey(command.toKeys);
-                } else {
-                  commandDispatcher.processCommand(cm, vim, command);
-                }
-              } catch (e) {
-                // clear VIM state in case it's in a bad state.
-                cm.state.vim = undefined;
-                maybeInitVimState(cm);
-                if (!CodeMirror.Vim.suppressErrorLogging) {
-                  console['log'](e);
-                }
-                throw e;
-              }
-              return true;
-            });
-          };
-        }
-      },
-      handleEx: function(cm, input) {
-        exCommandDispatcher.processCommand(cm, input);
-      },
-
-      defineMotion: defineMotion,
-      defineAction: defineAction,
-      defineOperator: defineOperator,
-      mapCommand: mapCommand,
-      _mapCommand: _mapCommand,
-
-      defineRegister: defineRegister,
-
-      exitVisualMode: exitVisualMode,
-      exitInsertMode: exitInsertMode
-    };
-
-    // Represents the current input state.
-    function InputState() {
-      this.prefixRepeat = [];
-      this.motionRepeat = [];
-
-      this.operator = null;
-      this.operatorArgs = null;
-      this.motion = null;
-      this.motionArgs = null;
-      this.keyBuffer = []; // For matching multi-key commands.
-      this.registerName = null; // Defaults to the unnamed register.
-    }
-    InputState.prototype.pushRepeatDigit = function(n) {
-      if (!this.operator) {
-        this.prefixRepeat = this.prefixRepeat.concat(n);
-      } else {
-        this.motionRepeat = this.motionRepeat.concat(n);
-      }
-    };
-    InputState.prototype.getRepeat = function() {
-      var repeat = 0;
-      if (this.prefixRepeat.length > 0 || this.motionRepeat.length > 0) {
-        repeat = 1;
-        if (this.prefixRepeat.length > 0) {
-          repeat *= parseInt(this.prefixRepeat.join(''), 10);
-        }
-        if (this.motionRepeat.length > 0) {
-          repeat *= parseInt(this.motionRepeat.join(''), 10);
-        }
-      }
-      return repeat;
-    };
-
-    function clearInputState(cm, reason) {
-      cm.state.vim.inputState = new InputState();
-      CodeMirror.signal(cm, 'vim-command-done', reason);
-    }
-
-    /*
-     * Register stores information about copy and paste registers.  Besides
-     * text, a register must store whether it is linewise (i.e., when it is
-     * pasted, should it insert itself into a new line, or should the text be
-     * inserted at the cursor position.)
-     */
-    function Register(text, linewise, blockwise) {
-      this.clear();
-      this.keyBuffer = [text || ''];
-      this.insertModeChanges = [];
-      this.searchQueries = [];
-      this.linewise = !!linewise;
-      this.blockwise = !!blockwise;
-    }
-    Register.prototype = {
-      setText: function(text, linewise, blockwise) {
-        this.keyBuffer = [text || ''];
-        this.linewise = !!linewise;
-        this.blockwise = !!blockwise;
-      },
-      pushText: function(text, linewise) {
-        // if this register has ever been set to linewise, use linewise.
-        if (linewise) {
-          if (!this.linewise) {
-            this.keyBuffer.push('\n');
-          }
-          this.linewise = true;
-        }
-        this.keyBuffer.push(text);
-      },
-      pushInsertModeChanges: function(changes) {
-        this.insertModeChanges.push(createInsertModeChanges(changes));
-      },
-      pushSearchQuery: function(query) {
-        this.searchQueries.push(query);
-      },
-      clear: function() {
-        this.keyBuffer = [];
-        this.insertModeChanges = [];
-        this.searchQueries = [];
-        this.linewise = false;
-      },
-      toString: function() {
-        return this.keyBuffer.join('');
-      }
-    };
-
-    /**
-     * Defines an external register.
-     *
-     * The name should be a single character that will be used to reference the register.
-     * The register should support setText, pushText, clear, and toString(). See Register
-     * for a reference implementation.
-     */
-    function defineRegister(name, register) {
-      var registers = vimGlobalState.registerController.registers[name];
-      if (!name || name.length != 1) {
-        throw Error('Register name must be 1 character');
-      }
-      if (registers[name]) {
-        throw Error('Register already defined ' + name);
-      }
-      registers[name] = register;
-      validRegisters.push(name);
-    }
-
-    /*
-     * vim registers allow you to keep many independent copy and paste buffers.
-     * See http://usevim.com/2012/04/13/registers/ for an introduction.
-     *
-     * RegisterController keeps the state of all the registers.  An initial
-     * state may be passed in.  The unnamed register '"' will always be
-     * overridden.
-     */
-    function RegisterController(registers) {
-      this.registers = registers;
-      this.unnamedRegister = registers['"'] = new Register();
-      registers['.'] = new Register();
-      registers[':'] = new Register();
-      registers['/'] = new Register();
-    }
-    RegisterController.prototype = {
-      pushText: function(registerName, operator, text, linewise, blockwise) {
-        if (linewise && text.charAt(0) == '\n') {
-          text = text.slice(1) + '\n';
-        }
-        if (linewise && text.charAt(text.length - 1) !== '\n'){
-          text += '\n';
-        }
-        // Lowercase and uppercase registers refer to the same register.
-        // Uppercase just means append.
-        var register = this.isValidRegister(registerName) ?
-            this.getRegister(registerName) : null;
-        // if no register/an invalid register was specified, things go to the
-        // default registers
-        if (!register) {
-          switch (operator) {
-            case 'yank':
-              // The 0 register contains the text from the most recent yank.
-              this.registers['0'] = new Register(text, linewise, blockwise);
-              break;
-            case 'delete':
-            case 'change':
-              if (text.indexOf('\n') == -1) {
-                // Delete less than 1 line. Update the small delete register.
-                this.registers['-'] = new Register(text, linewise);
-              } else {
-                // Shift down the contents of the numbered registers and put the
-                // deleted text into register 1.
-                this.shiftNumericRegisters_();
-                this.registers['1'] = new Register(text, linewise);
-              }
-              break;
-          }
-          // Make sure the unnamed register is set to what just happened
-          this.unnamedRegister.setText(text, linewise, blockwise);
-          return;
-        }
-
-        // If we've gotten to this point, we've actually specified a register
-        var append = isUpperCase(registerName);
-        if (append) {
-          register.pushText(text, linewise);
-        } else {
-          register.setText(text, linewise, blockwise);
-        }
-        // The unnamed register always has the same value as the last used
-        // register.
-        this.unnamedRegister.setText(register.toString(), linewise);
-      },
-      // Gets the register named @name.  If one of @name doesn't already exist,
-      // create it.  If @name is invalid, return the unnamedRegister.
-      getRegister: function(name) {
-        if (!this.isValidRegister(name)) {
-          return this.unnamedRegister;
-        }
-        name = name.toLowerCase();
-        if (!this.registers[name]) {
-          this.registers[name] = new Register();
-        }
-        return this.registers[name];
-      },
-      isValidRegister: function(name) {
-        return name && inArray(name, validRegisters);
-      },
-      shiftNumericRegisters_: function() {
-        for (var i = 9; i >= 2; i--) {
-          this.registers[i] = this.getRegister('' + (i - 1));
-        }
-      }
-    };
-    function HistoryController() {
-        this.historyBuffer = [];
-        this.iterator;
-        this.initialPrefix = null;
-    }
-    HistoryController.prototype = {
-      // the input argument here acts a user entered prefix for a small time
-      // until we start autocompletion in which case it is the autocompleted.
-      nextMatch: function (input, up) {
-        var historyBuffer = this.historyBuffer;
-        var dir = up ? -1 : 1;
-        if (this.initialPrefix === null) this.initialPrefix = input;
-        for (var i = this.iterator + dir; up ? i >= 0 : i < historyBuffer.length; i+= dir) {
-          var element = historyBuffer[i];
-          for (var j = 0; j <= element.length; j++) {
-            if (this.initialPrefix == element.substring(0, j)) {
-              this.iterator = i;
-              return element;
-            }
-          }
-        }
-        // should return the user input in case we reach the end of buffer.
-        if (i >= historyBuffer.length) {
-          this.iterator = historyBuffer.length;
-          return this.initialPrefix;
-        }
-        // return the last autocompleted query or exCommand as it is.
-        if (i < 0 ) return input;
-      },
-      pushInput: function(input) {
-        var index = this.historyBuffer.indexOf(input);
-        if (index > -1) this.historyBuffer.splice(index, 1);
-        if (input.length) this.historyBuffer.push(input);
-      },
-      reset: function() {
-        this.initialPrefix = null;
-        this.iterator = this.historyBuffer.length;
-      }
-    };
-    var commandDispatcher = {
-      matchCommand: function(keys, keyMap, inputState, context) {
-        var matches = commandMatches(keys, keyMap, context, inputState);
-        if (!matches.full && !matches.partial) {
-          return {type: 'none'};
-        } else if (!matches.full && matches.partial) {
-          return {type: 'partial'};
-        }
-
-        var bestMatch;
-        for (var i = 0; i < matches.full.length; i++) {
-          var match = matches.full[i];
-          if (!bestMatch) {
-            bestMatch = match;
-          }
-        }
-        if (bestMatch.keys.slice(-11) == '') {
-          inputState.selectedCharacter = lastChar(keys);
-        }
-        return {type: 'full', command: bestMatch};
-      },
-      processCommand: function(cm, vim, command) {
-        vim.inputState.repeatOverride = command.repeatOverride;
-        switch (command.type) {
-          case 'motion':
-            this.processMotion(cm, vim, command);
-            break;
-          case 'operator':
-            this.processOperator(cm, vim, command);
-            break;
-          case 'operatorMotion':
-            this.processOperatorMotion(cm, vim, command);
-            break;
-          case 'action':
-            this.processAction(cm, vim, command);
-            break;
-          case 'search':
-            this.processSearch(cm, vim, command);
-            break;
-          case 'ex':
-          case 'keyToEx':
-            this.processEx(cm, vim, command);
-            break;
-          default:
-            break;
-        }
-      },
-      processMotion: function(cm, vim, command) {
-        vim.inputState.motion = command.motion;
-        vim.inputState.motionArgs = copyArgs(command.motionArgs);
-        this.evalInput(cm, vim);
-      },
-      processOperator: function(cm, vim, command) {
-        var inputState = vim.inputState;
-        if (inputState.operator) {
-          if (inputState.operator == command.operator) {
-            // Typing an operator twice like 'dd' makes the operator operate
-            // linewise
-            inputState.motion = 'expandToLine';
-            inputState.motionArgs = { linewise: true };
-            this.evalInput(cm, vim);
-            return;
-          } else {
-            // 2 different operators in a row doesn't make sense.
-            clearInputState(cm);
-          }
-        }
-        inputState.operator = command.operator;
-        inputState.operatorArgs = copyArgs(command.operatorArgs);
-        if (vim.visualMode) {
-          // Operating on a selection in visual mode. We don't need a motion.
-          this.evalInput(cm, vim);
-        }
-      },
-      processOperatorMotion: function(cm, vim, command) {
-        var visualMode = vim.visualMode;
-        var operatorMotionArgs = copyArgs(command.operatorMotionArgs);
-        if (operatorMotionArgs) {
-          // Operator motions may have special behavior in visual mode.
-          if (visualMode && operatorMotionArgs.visualLine) {
-            vim.visualLine = true;
-          }
-        }
-        this.processOperator(cm, vim, command);
-        if (!visualMode) {
-          this.processMotion(cm, vim, command);
-        }
-      },
-      processAction: function(cm, vim, command) {
-        var inputState = vim.inputState;
-        var repeat = inputState.getRepeat();
-        var repeatIsExplicit = !!repeat;
-        var actionArgs = copyArgs(command.actionArgs) || {};
-        if (inputState.selectedCharacter) {
-          actionArgs.selectedCharacter = inputState.selectedCharacter;
-        }
-        // Actions may or may not have motions and operators. Do these first.
-        if (command.operator) {
-          this.processOperator(cm, vim, command);
-        }
-        if (command.motion) {
-          this.processMotion(cm, vim, command);
-        }
-        if (command.motion || command.operator) {
-          this.evalInput(cm, vim);
-        }
-        actionArgs.repeat = repeat || 1;
-        actionArgs.repeatIsExplicit = repeatIsExplicit;
-        actionArgs.registerName = inputState.registerName;
-        clearInputState(cm);
-        vim.lastMotion = null;
-        if (command.isEdit) {
-          this.recordLastEdit(vim, inputState, command);
-        }
-        actions[command.action](cm, actionArgs, vim);
-      },
-      processSearch: function(cm, vim, command) {
-        if (!cm.getSearchCursor) {
-          // Search depends on SearchCursor.
-          return;
-        }
-        var forward = command.searchArgs.forward;
-        var wholeWordOnly = command.searchArgs.wholeWordOnly;
-        getSearchState(cm).setReversed(!forward);
-        var promptPrefix = (forward) ? '/' : '?';
-        var originalQuery = getSearchState(cm).getQuery();
-        var originalScrollPos = cm.getScrollInfo();
-        function handleQuery(query, ignoreCase, smartCase) {
-          vimGlobalState.searchHistoryController.pushInput(query);
-          vimGlobalState.searchHistoryController.reset();
-          try {
-            updateSearchQuery(cm, query, ignoreCase, smartCase);
-          } catch (e) {
-            showConfirm(cm, 'Invalid regex: ' + query);
-            clearInputState(cm);
-            return;
-          }
-          commandDispatcher.processMotion(cm, vim, {
-            type: 'motion',
-            motion: 'findNext',
-            motionArgs: { forward: true, toJumplist: command.searchArgs.toJumplist }
-          });
-        }
-        function onPromptClose(query) {
-          cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
-          handleQuery(query, true /** ignoreCase */, true /** smartCase */);
-          var macroModeState = vimGlobalState.macroModeState;
-          if (macroModeState.isRecording) {
-            logSearchQuery(macroModeState, query);
-          }
-        }
-        function onPromptKeyUp(e, query, close) {
-          var keyName = CodeMirror.keyName(e), up;
-          if (keyName == 'Up' || keyName == 'Down') {
-            up = keyName == 'Up' ? true : false;
-            query = vimGlobalState.searchHistoryController.nextMatch(query, up) || '';
-            close(query);
-          } else {
-            if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
-              vimGlobalState.searchHistoryController.reset();
-          }
-          var parsedQuery;
-          try {
-            parsedQuery = updateSearchQuery(cm, query,
-                true /** ignoreCase */, true /** smartCase */);
-          } catch (e) {
-            // Swallow bad regexes for incremental search.
-          }
-          if (parsedQuery) {
-            cm.scrollIntoView(findNext(cm, !forward, parsedQuery), 30);
-          } else {
-            clearSearchHighlight(cm);
-            cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
-          }
-        }
-        function onPromptKeyDown(e, query, close) {
-          var keyName = CodeMirror.keyName(e);
-          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
-              (keyName == 'Backspace' && query == '')) {
-            vimGlobalState.searchHistoryController.pushInput(query);
-            vimGlobalState.searchHistoryController.reset();
-            updateSearchQuery(cm, originalQuery);
-            clearSearchHighlight(cm);
-            cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
-            CodeMirror.e_stop(e);
-            clearInputState(cm);
-            close();
-            cm.focus();
-          } else if (keyName == 'Ctrl-U') {
-            // Ctrl-U clears input.
-            CodeMirror.e_stop(e);
-            close('');
-          }
-        }
-        switch (command.searchArgs.querySrc) {
-          case 'prompt':
-            var macroModeState = vimGlobalState.macroModeState;
-            if (macroModeState.isPlaying) {
-              var query = macroModeState.replaySearchQueries.shift();
-              handleQuery(query, true /** ignoreCase */, false /** smartCase */);
-            } else {
-              showPrompt(cm, {
-                  onClose: onPromptClose,
-                  prefix: promptPrefix,
-                  desc: searchPromptDesc,
-                  onKeyUp: onPromptKeyUp,
-                  onKeyDown: onPromptKeyDown
-              });
-            }
-            break;
-          case 'wordUnderCursor':
-            var word = expandWordUnderCursor(cm, false /** inclusive */,
-                true /** forward */, false /** bigWord */,
-                true /** noSymbol */);
-            var isKeyword = true;
-            if (!word) {
-              word = expandWordUnderCursor(cm, false /** inclusive */,
-                  true /** forward */, false /** bigWord */,
-                  false /** noSymbol */);
-              isKeyword = false;
-            }
-            if (!word) {
-              return;
-            }
-            var query = cm.getLine(word.start.line).substring(word.start.ch,
-                word.end.ch);
-            if (isKeyword && wholeWordOnly) {
-                query = '\\b' + query + '\\b';
-            } else {
-              query = escapeRegex(query);
-            }
-
-            // cachedCursor is used to save the old position of the cursor
-            // when * or # causes vim to seek for the nearest word and shift
-            // the cursor before entering the motion.
-            vimGlobalState.jumpList.cachedCursor = cm.getCursor();
-            cm.setCursor(word.start);
-
-            handleQuery(query, true /** ignoreCase */, false /** smartCase */);
-            break;
-        }
-      },
-      processEx: function(cm, vim, command) {
-        function onPromptClose(input) {
-          // Give the prompt some time to close so that if processCommand shows
-          // an error, the elements don't overlap.
-          vimGlobalState.exCommandHistoryController.pushInput(input);
-          vimGlobalState.exCommandHistoryController.reset();
-          exCommandDispatcher.processCommand(cm, input);
-        }
-        function onPromptKeyDown(e, input, close) {
-          var keyName = CodeMirror.keyName(e), up;
-          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
-              (keyName == 'Backspace' && input == '')) {
-            vimGlobalState.exCommandHistoryController.pushInput(input);
-            vimGlobalState.exCommandHistoryController.reset();
-            CodeMirror.e_stop(e);
-            clearInputState(cm);
-            close();
-            cm.focus();
-          }
-          if (keyName == 'Up' || keyName == 'Down') {
-            up = keyName == 'Up' ? true : false;
-            input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || '';
-            close(input);
-          } else if (keyName == 'Ctrl-U') {
-            // Ctrl-U clears input.
-            CodeMirror.e_stop(e);
-            close('');
-          } else {
-            if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
-              vimGlobalState.exCommandHistoryController.reset();
-          }
-        }
-        if (command.type == 'keyToEx') {
-          // Handle user defined Ex to Ex mappings
-          exCommandDispatcher.processCommand(cm, command.exArgs.input);
-        } else {
-          if (vim.visualMode) {
-            showPrompt(cm, { onClose: onPromptClose, prefix: ':', value: '\'<,\'>',
-                onKeyDown: onPromptKeyDown});
-          } else {
-            showPrompt(cm, { onClose: onPromptClose, prefix: ':',
-                onKeyDown: onPromptKeyDown});
-          }
-        }
-      },
-      evalInput: function(cm, vim) {
-        // If the motion comand is set, execute both the operator and motion.
-        // Otherwise return.
-        var inputState = vim.inputState;
-        var motion = inputState.motion;
-        var motionArgs = inputState.motionArgs || {};
-        var operator = inputState.operator;
-        var operatorArgs = inputState.operatorArgs || {};
-        var registerName = inputState.registerName;
-        var sel = vim.sel;
-        // TODO: Make sure cm and vim selections are identical outside visual mode.
-        var origHead = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.head): cm.getCursor('head'));
-        var origAnchor = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.anchor) : cm.getCursor('anchor'));
-        var oldHead = copyCursor(origHead);
-        var oldAnchor = copyCursor(origAnchor);
-        var newHead, newAnchor;
-        var repeat;
-        if (operator) {
-          this.recordLastEdit(vim, inputState);
-        }
-        if (inputState.repeatOverride !== undefined) {
-          // If repeatOverride is specified, that takes precedence over the
-          // input state's repeat. Used by Ex mode and can be user defined.
-          repeat = inputState.repeatOverride;
-        } else {
-          repeat = inputState.getRepeat();
-        }
-        if (repeat > 0 && motionArgs.explicitRepeat) {
-          motionArgs.repeatIsExplicit = true;
-        } else if (motionArgs.noRepeat ||
-            (!motionArgs.explicitRepeat && repeat === 0)) {
-          repeat = 1;
-          motionArgs.repeatIsExplicit = false;
-        }
-        if (inputState.selectedCharacter) {
-          // If there is a character input, stick it in all of the arg arrays.
-          motionArgs.selectedCharacter = operatorArgs.selectedCharacter =
-              inputState.selectedCharacter;
-        }
-        motionArgs.repeat = repeat;
-        clearInputState(cm);
-        if (motion) {
-          var motionResult = motions[motion](cm, origHead, motionArgs, vim);
-          vim.lastMotion = motions[motion];
-          if (!motionResult) {
-            return;
-          }
-          if (motionArgs.toJumplist) {
-            var jumpList = vimGlobalState.jumpList;
-            // if the current motion is # or *, use cachedCursor
-            var cachedCursor = jumpList.cachedCursor;
-            if (cachedCursor) {
-              recordJumpPosition(cm, cachedCursor, motionResult);
-              delete jumpList.cachedCursor;
-            } else {
-              recordJumpPosition(cm, origHead, motionResult);
-            }
-          }
-          if (motionResult instanceof Array) {
-            newAnchor = motionResult[0];
-            newHead = motionResult[1];
-          } else {
-            newHead = motionResult;
-          }
-          // TODO: Handle null returns from motion commands better.
-          if (!newHead) {
-            newHead = copyCursor(origHead);
-          }
-          if (vim.visualMode) {
-            if (!(vim.visualBlock && newHead.ch === Infinity)) {
-              newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
-            }
-            if (newAnchor) {
-              newAnchor = clipCursorToContent(cm, newAnchor, true);
-            }
-            newAnchor = newAnchor || oldAnchor;
-            sel.anchor = newAnchor;
-            sel.head = newHead;
-            updateCmSelection(cm);
-            updateMark(cm, vim, '<',
-                cursorIsBefore(newAnchor, newHead) ? newAnchor
-                    : newHead);
-            updateMark(cm, vim, '>',
-                cursorIsBefore(newAnchor, newHead) ? newHead
-                    : newAnchor);
-          } else if (!operator) {
-            newHead = clipCursorToContent(cm, newHead);
-            cm.setCursor(newHead.line, newHead.ch);
-          }
-        }
-        if (operator) {
-          if (operatorArgs.lastSel) {
-            // Replaying a visual mode operation
-            newAnchor = oldAnchor;
-            var lastSel = operatorArgs.lastSel;
-            var lineOffset = Math.abs(lastSel.head.line - lastSel.anchor.line);
-            var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch);
-            if (lastSel.visualLine) {
-              // Linewise Visual mode: The same number of lines.
-              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
-            } else if (lastSel.visualBlock) {
-              // Blockwise Visual mode: The same number of lines and columns.
-              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
-            } else if (lastSel.head.line == lastSel.anchor.line) {
-              // Normal Visual mode within one line: The same number of characters.
-              newHead = Pos(oldAnchor.line, oldAnchor.ch + chOffset);
-            } else {
-              // Normal Visual mode with several lines: The same number of lines, in the
-              // last line the same number of characters as in the last line the last time.
-              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
-            }
-            vim.visualMode = true;
-            vim.visualLine = lastSel.visualLine;
-            vim.visualBlock = lastSel.visualBlock;
-            sel = vim.sel = {
-              anchor: newAnchor,
-              head: newHead
-            };
-            updateCmSelection(cm);
-          } else if (vim.visualMode) {
-            operatorArgs.lastSel = {
-              anchor: copyCursor(sel.anchor),
-              head: copyCursor(sel.head),
-              visualBlock: vim.visualBlock,
-              visualLine: vim.visualLine
-            };
-          }
-          var curStart, curEnd, linewise, mode;
-          var cmSel;
-          if (vim.visualMode) {
-            // Init visual op
-            curStart = cursorMin(sel.head, sel.anchor);
-            curEnd = cursorMax(sel.head, sel.anchor);
-            linewise = vim.visualLine || operatorArgs.linewise;
-            mode = vim.visualBlock ? 'block' :
-                   linewise ? 'line' :
-                   'char';
-            cmSel = makeCmSelection(cm, {
-              anchor: curStart,
-              head: curEnd
-            }, mode);
-            if (linewise) {
-              var ranges = cmSel.ranges;
-              if (mode == 'block') {
-                // Linewise operators in visual block mode extend to end of line
-                for (var i = 0; i < ranges.length; i++) {
-                  ranges[i].head.ch = lineLength(cm, ranges[i].head.line);
-                }
-              } else if (mode == 'line') {
-                ranges[0].head = Pos(ranges[0].head.line + 1, 0);
-              }
-            }
-          } else {
-            // Init motion op
-            curStart = copyCursor(newAnchor || oldAnchor);
-            curEnd = copyCursor(newHead || oldHead);
-            if (cursorIsBefore(curEnd, curStart)) {
-              var tmp = curStart;
-              curStart = curEnd;
-              curEnd = tmp;
-            }
-            linewise = motionArgs.linewise || operatorArgs.linewise;
-            if (linewise) {
-              // Expand selection to entire line.
-              expandSelectionToLine(cm, curStart, curEnd);
-            } else if (motionArgs.forward) {
-              // Clip to trailing newlines only if the motion goes forward.
-              clipToLine(cm, curStart, curEnd);
-            }
-            mode = 'char';
-            var exclusive = !motionArgs.inclusive || linewise;
-            cmSel = makeCmSelection(cm, {
-              anchor: curStart,
-              head: curEnd
-            }, mode, exclusive);
-          }
-          cm.setSelections(cmSel.ranges, cmSel.primary);
-          vim.lastMotion = null;
-          operatorArgs.repeat = repeat; // For indent in visual mode.
-          operatorArgs.registerName = registerName;
-          // Keep track of linewise as it affects how paste and change behave.
-          operatorArgs.linewise = linewise;
-          var operatorMoveTo = operators[operator](
-            cm, operatorArgs, cmSel.ranges, oldAnchor, newHead);
-          if (vim.visualMode) {
-            exitVisualMode(cm, operatorMoveTo != null);
-          }
-          if (operatorMoveTo) {
-            cm.setCursor(operatorMoveTo);
-          }
-        }
-      },
-      recordLastEdit: function(vim, inputState, actionCommand) {
-        var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.isPlaying) { return; }
-        vim.lastEditInputState = inputState;
-        vim.lastEditActionCommand = actionCommand;
-        macroModeState.lastInsertModeChanges.changes = [];
-        macroModeState.lastInsertModeChanges.expectCursorActivityForChange = false;
-      }
-    };
-
-    /**
-     * typedef {Object{line:number,ch:number}} Cursor An object containing the
-     *     position of the cursor.
-     */
-    // All of the functions below return Cursor objects.
-    var motions = {
-      moveToTopLine: function(cm, _head, motionArgs) {
-        var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
-        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
-      },
-      moveToMiddleLine: function(cm) {
-        var range = getUserVisibleLines(cm);
-        var line = Math.floor((range.top + range.bottom) * 0.5);
-        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
-      },
-      moveToBottomLine: function(cm, _head, motionArgs) {
-        var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
-        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
-      },
-      expandToLine: function(_cm, head, motionArgs) {
-        // Expands forward to end of line, and then to next line if repeat is
-        // >1. Does not handle backward motion!
-        var cur = head;
-        return Pos(cur.line + motionArgs.repeat - 1, Infinity);
-      },
-      findNext: function(cm, _head, motionArgs) {
-        var state = getSearchState(cm);
-        var query = state.getQuery();
-        if (!query) {
-          return;
-        }
-        var prev = !motionArgs.forward;
-        // If search is initiated with ? instead of /, negate direction.
-        prev = (state.isReversed()) ? !prev : prev;
-        highlightSearchMatches(cm, query);
-        return findNext(cm, prev/** prev */, query, motionArgs.repeat);
-      },
-      goToMark: function(cm, _head, motionArgs, vim) {
-        var mark = vim.marks[motionArgs.selectedCharacter];
-        if (mark) {
-          var pos = mark.find();
-          return motionArgs.linewise ? { line: pos.line, ch: findFirstNonWhiteSpaceCharacter(cm.getLine(pos.line)) } : pos;
-        }
-        return null;
-      },
-      moveToOtherHighlightedEnd: function(cm, _head, motionArgs, vim) {
-        if (vim.visualBlock && motionArgs.sameLine) {
-          var sel = vim.sel;
-          return [
-            clipCursorToContent(cm, Pos(sel.anchor.line, sel.head.ch)),
-            clipCursorToContent(cm, Pos(sel.head.line, sel.anchor.ch))
-          ];
-        } else {
-          return ([vim.sel.head, vim.sel.anchor]);
-        }
-      },
-      jumpToMark: function(cm, head, motionArgs, vim) {
-        var best = head;
-        for (var i = 0; i < motionArgs.repeat; i++) {
-          var cursor = best;
-          for (var key in vim.marks) {
-            if (!isLowerCase(key)) {
-              continue;
-            }
-            var mark = vim.marks[key].find();
-            var isWrongDirection = (motionArgs.forward) ?
-              cursorIsBefore(mark, cursor) : cursorIsBefore(cursor, mark);
-
-            if (isWrongDirection) {
-              continue;
-            }
-            if (motionArgs.linewise && (mark.line == cursor.line)) {
-              continue;
-            }
-
-            var equal = cursorEqual(cursor, best);
-            var between = (motionArgs.forward) ?
-              cursorIsBetween(cursor, mark, best) :
-              cursorIsBetween(best, mark, cursor);
-
-            if (equal || between) {
-              best = mark;
-            }
-          }
-        }
-
-        if (motionArgs.linewise) {
-          // Vim places the cursor on the first non-whitespace character of
-          // the line if there is one, else it places the cursor at the end
-          // of the line, regardless of whether a mark was found.
-          best = Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line)));
-        }
-        return best;
-      },
-      moveByCharacters: function(_cm, head, motionArgs) {
-        var cur = head;
-        var repeat = motionArgs.repeat;
-        var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
-        return Pos(cur.line, ch);
-      },
-      moveByLines: function(cm, head, motionArgs, vim) {
-        var cur = head;
-        var endCh = cur.ch;
-        // Depending what our last motion was, we may want to do different
-        // things. If our last motion was moving vertically, we want to
-        // preserve the HPos from our last horizontal move.  If our last motion
-        // was going to the end of a line, moving vertically we should go to
-        // the end of the line, etc.
-        switch (vim.lastMotion) {
-          case this.moveByLines:
-          case this.moveByDisplayLines:
-          case this.moveByScroll:
-          case this.moveToColumn:
-          case this.moveToEol:
-            endCh = vim.lastHPos;
-            break;
-          default:
-            vim.lastHPos = endCh;
-        }
-        var repeat = motionArgs.repeat+(motionArgs.repeatOffset||0);
-        var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
-        var first = cm.firstLine();
-        var last = cm.lastLine();
-        // Vim cancels linewise motions that start on an edge and move beyond
-        // that edge. It does not cancel motions that do not start on an edge.
-        if ((line < first && cur.line == first) ||
-            (line > last && cur.line == last)) {
-          return;
-        }
-        if (motionArgs.toFirstChar){
-          endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
-          vim.lastHPos = endCh;
-        }
-        vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left;
-        return Pos(line, endCh);
-      },
-      moveByDisplayLines: function(cm, head, motionArgs, vim) {
-        var cur = head;
-        switch (vim.lastMotion) {
-          case this.moveByDisplayLines:
-          case this.moveByScroll:
-          case this.moveByLines:
-          case this.moveToColumn:
-          case this.moveToEol:
-            break;
-          default:
-            vim.lastHSPos = cm.charCoords(cur,'div').left;
-        }
-        var repeat = motionArgs.repeat;
-        var res=cm.findPosV(cur,(motionArgs.forward ? repeat : -repeat),'line',vim.lastHSPos);
-        if (res.hitSide) {
-          if (motionArgs.forward) {
-            var lastCharCoords = cm.charCoords(res, 'div');
-            var goalCoords = { top: lastCharCoords.top + 8, left: vim.lastHSPos };
-            var res = cm.coordsChar(goalCoords, 'div');
-          } else {
-            var resCoords = cm.charCoords(Pos(cm.firstLine(), 0), 'div');
-            resCoords.left = vim.lastHSPos;
-            res = cm.coordsChar(resCoords, 'div');
-          }
-        }
-        vim.lastHPos = res.ch;
-        return res;
-      },
-      moveByPage: function(cm, head, motionArgs) {
-        // CodeMirror only exposes functions that move the cursor page down, so
-        // doing this bad hack to move the cursor and move it back. evalInput
-        // will move the cursor to where it should be in the end.
-        var curStart = head;
-        var repeat = motionArgs.repeat;
-        return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
-      },
-      moveByParagraph: function(cm, head, motionArgs) {
-        var dir = motionArgs.forward ? 1 : -1;
-        return findParagraph(cm, head, motionArgs.repeat, dir);
-      },
-      moveByScroll: function(cm, head, motionArgs, vim) {
-        var scrollbox = cm.getScrollInfo();
-        var curEnd = null;
-        var repeat = motionArgs.repeat;
-        if (!repeat) {
-          repeat = scrollbox.clientHeight / (2 * cm.defaultTextHeight());
-        }
-        var orig = cm.charCoords(head, 'local');
-        motionArgs.repeat = repeat;
-        var curEnd = motions.moveByDisplayLines(cm, head, motionArgs, vim);
-        if (!curEnd) {
-          return null;
-        }
-        var dest = cm.charCoords(curEnd, 'local');
-        cm.scrollTo(null, scrollbox.top + dest.top - orig.top);
-        return curEnd;
-      },
-      moveByWords: function(cm, head, motionArgs) {
-        return moveToWord(cm, head, motionArgs.repeat, !!motionArgs.forward,
-            !!motionArgs.wordEnd, !!motionArgs.bigWord);
-      },
-      moveTillCharacter: function(cm, _head, motionArgs) {
-        var repeat = motionArgs.repeat;
-        var curEnd = moveToCharacter(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter);
-        var increment = motionArgs.forward ? -1 : 1;
-        recordLastCharacterSearch(increment, motionArgs);
-        if (!curEnd) return null;
-        curEnd.ch += increment;
-        return curEnd;
-      },
-      moveToCharacter: function(cm, head, motionArgs) {
-        var repeat = motionArgs.repeat;
-        recordLastCharacterSearch(0, motionArgs);
-        return moveToCharacter(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || head;
-      },
-      moveToSymbol: function(cm, head, motionArgs) {
-        var repeat = motionArgs.repeat;
-        return findSymbol(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || head;
-      },
-      moveToColumn: function(cm, head, motionArgs, vim) {
-        var repeat = motionArgs.repeat;
-        // repeat is equivalent to which column we want to move to!
-        vim.lastHPos = repeat - 1;
-        vim.lastHSPos = cm.charCoords(head,'div').left;
-        return moveToColumn(cm, repeat);
-      },
-      moveToEol: function(cm, head, motionArgs, vim) {
-        var cur = head;
-        vim.lastHPos = Infinity;
-        var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
-        var end=cm.clipPos(retval);
-        end.ch--;
-        vim.lastHSPos = cm.charCoords(end,'div').left;
-        return retval;
-      },
-      moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
-        // Go to the start of the line where the text begins, or the end for
-        // whitespace-only lines
-        var cursor = head;
-        return Pos(cursor.line,
-                   findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
-      },
-      moveToMatchedSymbol: function(cm, head) {
-        var cursor = head;
-        var line = cursor.line;
-        var ch = cursor.ch;
-        var lineText = cm.getLine(line);
-        var symbol;
-        do {
-          symbol = lineText.charAt(ch++);
-          if (symbol && isMatchableSymbol(symbol)) {
-            var style = cm.getTokenTypeAt(Pos(line, ch));
-            if (style !== "string" && style !== "comment") {
-              break;
-            }
-          }
-        } while (symbol);
-        if (symbol) {
-          var matched = cm.findMatchingBracket(Pos(line, ch));
-          return matched.to;
-        } else {
-          return cursor;
-        }
-      },
-      moveToStartOfLine: function(_cm, head) {
-        return Pos(head.line, 0);
-      },
-      moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) {
-        var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
-        if (motionArgs.repeatIsExplicit) {
-          lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
-        }
-        return Pos(lineNum,
-                   findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
-      },
-      textObjectManipulation: function(cm, head, motionArgs, vim) {
-        // TODO: lots of possible exceptions that can be thrown here. Try da(
-        //     outside of a () block.
-
-        // TODO: adding <> >< to this map doesn't work, presumably because
-        // they're operators
-        var mirroredPairs = {'(': ')', ')': '(',
-                             '{': '}', '}': '{',
-                             '[': ']', ']': '['};
-        var selfPaired = {'\'': true, '"': true};
-
-        var character = motionArgs.selectedCharacter;
-        // 'b' refers to  '()' block.
-        // 'B' refers to  '{}' block.
-        if (character == 'b') {
-          character = '(';
-        } else if (character == 'B') {
-          character = '{';
-        }
-
-        // Inclusive is the difference between a and i
-        // TODO: Instead of using the additional text object map to perform text
-        //     object operations, merge the map into the defaultKeyMap and use
-        //     motionArgs to define behavior. Define separate entries for 'aw',
-        //     'iw', 'a[', 'i[', etc.
-        var inclusive = !motionArgs.textObjectInner;
-
-        var tmp;
-        if (mirroredPairs[character]) {
-          tmp = selectCompanionObject(cm, head, character, inclusive);
-        } else if (selfPaired[character]) {
-          tmp = findBeginningAndEnd(cm, head, character, inclusive);
-        } else if (character === 'W') {
-          tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
-                                                     true /** bigWord */);
-        } else if (character === 'w') {
-          tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
-                                                     false /** bigWord */);
-        } else if (character === 'p') {
-          tmp = findParagraph(cm, head, motionArgs.repeat, 0, inclusive);
-          motionArgs.linewise = true;
-          if (vim.visualMode) {
-            if (!vim.visualLine) { vim.visualLine = true; }
-          } else {
-            var operatorArgs = vim.inputState.operatorArgs;
-            if (operatorArgs) { operatorArgs.linewise = true; }
-            tmp.end.line--;
-          }
-        } else {
-          // No text object defined for this, don't move.
-          return null;
-        }
-
-        if (!cm.state.vim.visualMode) {
-          return [tmp.start, tmp.end];
-        } else {
-          return expandSelection(cm, tmp.start, tmp.end);
-        }
-      },
-
-      repeatLastCharacterSearch: function(cm, head, motionArgs) {
-        var lastSearch = vimGlobalState.lastChararacterSearch;
-        var repeat = motionArgs.repeat;
-        var forward = motionArgs.forward === lastSearch.forward;
-        var increment = (lastSearch.increment ? 1 : 0) * (forward ? -1 : 1);
-        cm.moveH(-increment, 'char');
-        motionArgs.inclusive = forward ? true : false;
-        var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter);
-        if (!curEnd) {
-          cm.moveH(increment, 'char');
-          return head;
-        }
-        curEnd.ch += increment;
-        return curEnd;
-      }
-    };
-
-    function defineMotion(name, fn) {
-      motions[name] = fn;
-    }
-
-    function fillArray(val, times) {
-      var arr = [];
-      for (var i = 0; i < times; i++) {
-        arr.push(val);
-      }
-      return arr;
-    }
-    /**
-     * An operator acts on a text selection. It receives the list of selections
-     * as input. The corresponding CodeMirror selection is guaranteed to
-    * match the input selection.
-     */
-    var operators = {
-      change: function(cm, args, ranges) {
-        var finalHead, text;
-        var vim = cm.state.vim;
-        vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock;
-        if (!vim.visualMode) {
-          var anchor = ranges[0].anchor,
-              head = ranges[0].head;
-          text = cm.getRange(anchor, head);
-          var lastState = vim.lastEditInputState || {};
-          if (lastState.motion == "moveByWords" && !isWhiteSpaceString(text)) {
-            // Exclude trailing whitespace if the range is not all whitespace.
-            var match = (/\s+$/).exec(text);
-            if (match && lastState.motionArgs && lastState.motionArgs.forward) {
-              head = offsetCursor(head, 0, - match[0].length);
-              text = text.slice(0, - match[0].length);
-            }
-          }
-          var wasLastLine = head.line - 1 == cm.lastLine();
-          cm.replaceRange('', anchor, head);
-          if (args.linewise && !wasLastLine) {
-            // Push the next line back down, if there is a next line.
-            CodeMirror.commands.newlineAndIndent(cm);
-            // null ch so setCursor moves to end of line.
-            anchor.ch = null;
-          }
-          finalHead = anchor;
-        } else {
-          text = cm.getSelection();
-          var replacement = fillArray('', ranges.length);
-          cm.replaceSelections(replacement);
-          finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
-        }
-        vimGlobalState.registerController.pushText(
-            args.registerName, 'change', text,
-            args.linewise, ranges.length > 1);
-        actions.enterInsertMode(cm, {head: finalHead}, cm.state.vim);
-      },
-      // delete is a javascript keyword.
-      'delete': function(cm, args, ranges) {
-        var finalHead, text;
-        var vim = cm.state.vim;
-        if (!vim.visualBlock) {
-          var anchor = ranges[0].anchor,
-              head = ranges[0].head;
-          if (args.linewise &&
-              head.line != cm.firstLine() &&
-              anchor.line == cm.lastLine() &&
-              anchor.line == head.line - 1) {
-            // Special case for dd on last line (and first line).
-            if (anchor.line == cm.firstLine()) {
-              anchor.ch = 0;
-            } else {
-              anchor = Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
-            }
-          }
-          text = cm.getRange(anchor, head);
-          cm.replaceRange('', anchor, head);
-          finalHead = anchor;
-          if (args.linewise) {
-            finalHead = motions.moveToFirstNonWhiteSpaceCharacter(cm, anchor);
-          }
-        } else {
-          text = cm.getSelection();
-          var replacement = fillArray('', ranges.length);
-          cm.replaceSelections(replacement);
-          finalHead = ranges[0].anchor;
-        }
-        vimGlobalState.registerController.pushText(
-            args.registerName, 'delete', text,
-            args.linewise, vim.visualBlock);
-        return clipCursorToContent(cm, finalHead);
-      },
-      indent: function(cm, args, ranges) {
-        var vim = cm.state.vim;
-        var startLine = ranges[0].anchor.line;
-        var endLine = vim.visualBlock ?
-          ranges[ranges.length - 1].anchor.line :
-          ranges[0].head.line;
-        // In visual mode, n> shifts the selection right n times, instead of
-        // shifting n lines right once.
-        var repeat = (vim.visualMode) ? args.repeat : 1;
-        if (args.linewise) {
-          // The only way to delete a newline is to delete until the start of
-          // the next line, so in linewise mode evalInput will include the next
-          // line. We don't want this in indent, so we go back a line.
-          endLine--;
-        }
-        for (var i = startLine; i <= endLine; i++) {
-          for (var j = 0; j < repeat; j++) {
-            cm.indentLine(i, args.indentRight);
-          }
-        }
-        return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
-      },
-      changeCase: function(cm, args, ranges, oldAnchor, newHead) {
-        var selections = cm.getSelections();
-        var swapped = [];
-        var toLower = args.toLower;
-        for (var j = 0; j < selections.length; j++) {
-          var toSwap = selections[j];
-          var text = '';
-          if (toLower === true) {
-            text = toSwap.toLowerCase();
-          } else if (toLower === false) {
-            text = toSwap.toUpperCase();
-          } else {
-            for (var i = 0; i < toSwap.length; i++) {
-              var character = toSwap.charAt(i);
-              text += isUpperCase(character) ? character.toLowerCase() :
-                  character.toUpperCase();
-            }
-          }
-          swapped.push(text);
-        }
-        cm.replaceSelections(swapped);
-        if (args.shouldMoveCursor){
-          return newHead;
-        } else if (!cm.state.vim.visualMode && args.linewise && ranges[0].anchor.line + 1 == ranges[0].head.line) {
-          return motions.moveToFirstNonWhiteSpaceCharacter(cm, oldAnchor);
-        } else if (args.linewise){
-          return oldAnchor;
-        } else {
-          return cursorMin(ranges[0].anchor, ranges[0].head);
-        }
-      },
-      yank: function(cm, args, ranges, oldAnchor) {
-        var vim = cm.state.vim;
-        var text = cm.getSelection();
-        var endPos = vim.visualMode
-          ? cursorMin(vim.sel.anchor, vim.sel.head, ranges[0].head, ranges[0].anchor)
-          : oldAnchor;
-        vimGlobalState.registerController.pushText(
-            args.registerName, 'yank',
-            text, args.linewise, vim.visualBlock);
-        return endPos;
-      }
-    };
-
-    function defineOperator(name, fn) {
-      operators[name] = fn;
-    }
-
-    var actions = {
-      jumpListWalk: function(cm, actionArgs, vim) {
-        if (vim.visualMode) {
-          return;
-        }
-        var repeat = actionArgs.repeat;
-        var forward = actionArgs.forward;
-        var jumpList = vimGlobalState.jumpList;
-
-        var mark = jumpList.move(cm, forward ? repeat : -repeat);
-        var markPos = mark ? mark.find() : undefined;
-        markPos = markPos ? markPos : cm.getCursor();
-        cm.setCursor(markPos);
-      },
-      scroll: function(cm, actionArgs, vim) {
-        if (vim.visualMode) {
-          return;
-        }
-        var repeat = actionArgs.repeat || 1;
-        var lineHeight = cm.defaultTextHeight();
-        var top = cm.getScrollInfo().top;
-        var delta = lineHeight * repeat;
-        var newPos = actionArgs.forward ? top + delta : top - delta;
-        var cursor = copyCursor(cm.getCursor());
-        var cursorCoords = cm.charCoords(cursor, 'local');
-        if (actionArgs.forward) {
-          if (newPos > cursorCoords.top) {
-             cursor.line += (newPos - cursorCoords.top) / lineHeight;
-             cursor.line = Math.ceil(cursor.line);
-             cm.setCursor(cursor);
-             cursorCoords = cm.charCoords(cursor, 'local');
-             cm.scrollTo(null, cursorCoords.top);
-          } else {
-             // Cursor stays within bounds.  Just reposition the scroll window.
-             cm.scrollTo(null, newPos);
-          }
-        } else {
-          var newBottom = newPos + cm.getScrollInfo().clientHeight;
-          if (newBottom < cursorCoords.bottom) {
-             cursor.line -= (cursorCoords.bottom - newBottom) / lineHeight;
-             cursor.line = Math.floor(cursor.line);
-             cm.setCursor(cursor);
-             cursorCoords = cm.charCoords(cursor, 'local');
-             cm.scrollTo(
-                 null, cursorCoords.bottom - cm.getScrollInfo().clientHeight);
-          } else {
-             // Cursor stays within bounds.  Just reposition the scroll window.
-             cm.scrollTo(null, newPos);
-          }
-        }
-      },
-      scrollToCursor: function(cm, actionArgs) {
-        var lineNum = cm.getCursor().line;
-        var charCoords = cm.charCoords(Pos(lineNum, 0), 'local');
-        var height = cm.getScrollInfo().clientHeight;
-        var y = charCoords.top;
-        var lineHeight = charCoords.bottom - y;
-        switch (actionArgs.position) {
-          case 'center': y = y - (height / 2) + lineHeight;
-            break;
-          case 'bottom': y = y - height + lineHeight*1.4;
-            break;
-          case 'top': y = y + lineHeight*0.4;
-            break;
-        }
-        cm.scrollTo(null, y);
-      },
-      replayMacro: function(cm, actionArgs, vim) {
-        var registerName = actionArgs.selectedCharacter;
-        var repeat = actionArgs.repeat;
-        var macroModeState = vimGlobalState.macroModeState;
-        if (registerName == '@') {
-          registerName = macroModeState.latestRegister;
-        }
-        while(repeat--){
-          executeMacroRegister(cm, vim, macroModeState, registerName);
-        }
-      },
-      enterMacroRecordMode: function(cm, actionArgs) {
-        var macroModeState = vimGlobalState.macroModeState;
-        var registerName = actionArgs.selectedCharacter;
-        macroModeState.enterMacroRecordMode(cm, registerName);
-      },
-      enterInsertMode: function(cm, actionArgs, vim) {
-        if (cm.getOption('readOnly')) { return; }
-        vim.insertMode = true;
-        vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
-        var insertAt = (actionArgs) ? actionArgs.insertAt : null;
-        var sel = vim.sel;
-        var head = actionArgs.head || cm.getCursor('head');
-        var height = cm.listSelections().length;
-        if (insertAt == 'eol') {
-          head = Pos(head.line, lineLength(cm, head.line));
-        } else if (insertAt == 'charAfter') {
-          head = offsetCursor(head, 0, 1);
-        } else if (insertAt == 'firstNonBlank') {
-          head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
-        } else if (insertAt == 'startOfSelectedArea') {
-          if (!vim.visualBlock) {
-            if (sel.head.line < sel.anchor.line) {
-              head = sel.head;
-            } else {
-              head = Pos(sel.anchor.line, 0);
-            }
-          } else {
-            head = Pos(
-                Math.min(sel.head.line, sel.anchor.line),
-                Math.min(sel.head.ch, sel.anchor.ch));
-            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
-          }
-        } else if (insertAt == 'endOfSelectedArea') {
-          if (!vim.visualBlock) {
-            if (sel.head.line >= sel.anchor.line) {
-              head = offsetCursor(sel.head, 0, 1);
-            } else {
-              head = Pos(sel.anchor.line, 0);
-            }
-          } else {
-            head = Pos(
-                Math.min(sel.head.line, sel.anchor.line),
-                Math.max(sel.head.ch + 1, sel.anchor.ch));
-            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
-          }
-        } else if (insertAt == 'inplace') {
-          if (vim.visualMode){
-            return;
-          }
-        }
-        cm.setOption('keyMap', 'vim-insert');
-        cm.setOption('disableInput', false);
-        if (actionArgs && actionArgs.replace) {
-          // Handle Replace-mode as a special case of insert mode.
-          cm.toggleOverwrite(true);
-          cm.setOption('keyMap', 'vim-replace');
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "replace"});
-        } else {
-          cm.setOption('keyMap', 'vim-insert');
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "insert"});
-        }
-        if (!vimGlobalState.macroModeState.isPlaying) {
-          // Only record if not replaying.
-          cm.on('change', onChange);
-          CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
-        }
-        if (vim.visualMode) {
-          exitVisualMode(cm);
-        }
-        selectForInsert(cm, head, height);
-      },
-      toggleVisualMode: function(cm, actionArgs, vim) {
-        var repeat = actionArgs.repeat;
-        var anchor = cm.getCursor();
-        var head;
-        // TODO: The repeat should actually select number of characters/lines
-        //     equal to the repeat times the size of the previous visual
-        //     operation.
-        if (!vim.visualMode) {
-          // Entering visual mode
-          vim.visualMode = true;
-          vim.visualLine = !!actionArgs.linewise;
-          vim.visualBlock = !!actionArgs.blockwise;
-          head = clipCursorToContent(
-              cm, Pos(anchor.line, anchor.ch + repeat - 1),
-              true /** includeLineBreak */);
-          vim.sel = {
-            anchor: anchor,
-            head: head
-          };
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
-          updateCmSelection(cm);
-          updateMark(cm, vim, '<', cursorMin(anchor, head));
-          updateMark(cm, vim, '>', cursorMax(anchor, head));
-        } else if (vim.visualLine ^ actionArgs.linewise ||
-            vim.visualBlock ^ actionArgs.blockwise) {
-          // Toggling between modes
-          vim.visualLine = !!actionArgs.linewise;
-          vim.visualBlock = !!actionArgs.blockwise;
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
-          updateCmSelection(cm);
-        } else {
-          exitVisualMode(cm);
-        }
-      },
-      reselectLastSelection: function(cm, _actionArgs, vim) {
-        var lastSelection = vim.lastSelection;
-        if (vim.visualMode) {
-          updateLastSelection(cm, vim);
-        }
-        if (lastSelection) {
-          var anchor = lastSelection.anchorMark.find();
-          var head = lastSelection.headMark.find();
-          if (!anchor || !head) {
-            // If the marks have been destroyed due to edits, do nothing.
-            return;
-          }
-          vim.sel = {
-            anchor: anchor,
-            head: head
-          };
-          vim.visualMode = true;
-          vim.visualLine = lastSelection.visualLine;
-          vim.visualBlock = lastSelection.visualBlock;
-          updateCmSelection(cm);
-          updateMark(cm, vim, '<', cursorMin(anchor, head));
-          updateMark(cm, vim, '>', cursorMax(anchor, head));
-          CodeMirror.signal(cm, 'vim-mode-change', {
-            mode: 'visual',
-            subMode: vim.visualLine ? 'linewise' :
-                     vim.visualBlock ? 'blockwise' : ''});
-        }
-      },
-      joinLines: function(cm, actionArgs, vim) {
-        var curStart, curEnd;
-        if (vim.visualMode) {
-          curStart = cm.getCursor('anchor');
-          curEnd = cm.getCursor('head');
-          if (cursorIsBefore(curEnd, curStart)) {
-            var tmp = curEnd;
-            curEnd = curStart;
-            curStart = tmp;
-          }
-          curEnd.ch = lineLength(cm, curEnd.line) - 1;
-        } else {
-          // Repeat is the number of lines to join. Minimum 2 lines.
-          var repeat = Math.max(actionArgs.repeat, 2);
-          curStart = cm.getCursor();
-          curEnd = clipCursorToContent(cm, Pos(curStart.line + repeat - 1,
-                                               Infinity));
-        }
-        var finalCh = 0;
-        for (var i = curStart.line; i < curEnd.line; i++) {
-          finalCh = lineLength(cm, curStart.line);
-          var tmp = Pos(curStart.line + 1,
-                        lineLength(cm, curStart.line + 1));
-          var text = cm.getRange(curStart, tmp);
-          text = text.replace(/\n\s*/g, ' ');
-          cm.replaceRange(text, curStart, tmp);
-        }
-        var curFinalPos = Pos(curStart.line, finalCh);
-        if (vim.visualMode) {
-          exitVisualMode(cm, false);
-        }
-        cm.setCursor(curFinalPos);
-      },
-      newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
-        vim.insertMode = true;
-        var insertAt = copyCursor(cm.getCursor());
-        if (insertAt.line === cm.firstLine() && !actionArgs.after) {
-          // Special case for inserting newline before start of document.
-          cm.replaceRange('\n', Pos(cm.firstLine(), 0));
-          cm.setCursor(cm.firstLine(), 0);
-        } else {
-          insertAt.line = (actionArgs.after) ? insertAt.line :
-              insertAt.line - 1;
-          insertAt.ch = lineLength(cm, insertAt.line);
-          cm.setCursor(insertAt);
-          var newlineFn = CodeMirror.commands.newlineAndIndentContinueComment ||
-              CodeMirror.commands.newlineAndIndent;
-          newlineFn(cm);
-        }
-        this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
-      },
-      paste: function(cm, actionArgs, vim) {
-        var cur = copyCursor(cm.getCursor());
-        var register = vimGlobalState.registerController.getRegister(
-            actionArgs.registerName);
-        var text = register.toString();
-        if (!text) {
-          return;
-        }
-        if (actionArgs.matchIndent) {
-          var tabSize = cm.getOption("tabSize");
-          // length that considers tabs and tabSize
-          var whitespaceLength = function(str) {
-            var tabs = (str.split("\t").length - 1);
-            var spaces = (str.split(" ").length - 1);
-            return tabs * tabSize + spaces * 1;
-          };
-          var currentLine = cm.getLine(cm.getCursor().line);
-          var indent = whitespaceLength(currentLine.match(/^\s*/)[0]);
-          // chomp last newline b/c don't want it to match /^\s*/gm
-          var chompedText = text.replace(/\n$/, '');
-          var wasChomped = text !== chompedText;
-          var firstIndent = whitespaceLength(text.match(/^\s*/)[0]);
-          var text = chompedText.replace(/^\s*/gm, function(wspace) {
-            var newIndent = indent + (whitespaceLength(wspace) - firstIndent);
-            if (newIndent < 0) {
-              return "";
-            }
-            else if (cm.getOption("indentWithTabs")) {
-              var quotient = Math.floor(newIndent / tabSize);
-              return Array(quotient + 1).join('\t');
-            }
-            else {
-              return Array(newIndent + 1).join(' ');
-            }
-          });
-          text += wasChomped ? "\n" : "";
-        }
-        if (actionArgs.repeat > 1) {
-          var text = Array(actionArgs.repeat + 1).join(text);
-        }
-        var linewise = register.linewise;
-        var blockwise = register.blockwise;
-        if (linewise) {
-          if(vim.visualMode) {
-            text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
-          } else if (actionArgs.after) {
-            // Move the newline at the end to the start instead, and paste just
-            // before the newline character of the line we are on right now.
-            text = '\n' + text.slice(0, text.length - 1);
-            cur.ch = lineLength(cm, cur.line);
-          } else {
-            cur.ch = 0;
-          }
-        } else {
-          if (blockwise) {
-            text = text.split('\n');
-            for (var i = 0; i < text.length; i++) {
-              text[i] = (text[i] == '') ? ' ' : text[i];
-            }
-          }
-          cur.ch += actionArgs.after ? 1 : 0;
-        }
-        var curPosFinal;
-        var idx;
-        if (vim.visualMode) {
-          //  save the pasted text for reselection if the need arises
-          vim.lastPastedText = text;
-          var lastSelectionCurEnd;
-          var selectedArea = getSelectedAreaRange(cm, vim);
-          var selectionStart = selectedArea[0];
-          var selectionEnd = selectedArea[1];
-          var selectedText = cm.getSelection();
-          var selections = cm.listSelections();
-          var emptyStrings = new Array(selections.length).join('1').split('1');
-          // save the curEnd marker before it get cleared due to cm.replaceRange.
-          if (vim.lastSelection) {
-            lastSelectionCurEnd = vim.lastSelection.headMark.find();
-          }
-          // push the previously selected text to unnamed register
-          vimGlobalState.registerController.unnamedRegister.setText(selectedText);
-          if (blockwise) {
-            // first delete the selected text
-            cm.replaceSelections(emptyStrings);
-            // Set new selections as per the block length of the yanked text
-            selectionEnd = Pos(selectionStart.line + text.length-1, selectionStart.ch);
-            cm.setCursor(selectionStart);
-            selectBlock(cm, selectionEnd);
-            cm.replaceSelections(text);
-            curPosFinal = selectionStart;
-          } else if (vim.visualBlock) {
-            cm.replaceSelections(emptyStrings);
-            cm.setCursor(selectionStart);
-            cm.replaceRange(text, selectionStart, selectionStart);
-            curPosFinal = selectionStart;
-          } else {
-            cm.replaceRange(text, selectionStart, selectionEnd);
-            curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
-          }
-          // restore the the curEnd marker
-          if(lastSelectionCurEnd) {
-            vim.lastSelection.headMark = cm.setBookmark(lastSelectionCurEnd);
-          }
-          if (linewise) {
-            curPosFinal.ch=0;
-          }
-        } else {
-          if (blockwise) {
-            cm.setCursor(cur);
-            for (var i = 0; i < text.length; i++) {
-              var line = cur.line+i;
-              if (line > cm.lastLine()) {
-                cm.replaceRange('\n',  Pos(line, 0));
-              }
-              var lastCh = lineLength(cm, line);
-              if (lastCh < cur.ch) {
-                extendLineToColumn(cm, line, cur.ch);
-              }
-            }
-            cm.setCursor(cur);
-            selectBlock(cm, Pos(cur.line + text.length-1, cur.ch));
-            cm.replaceSelections(text);
-            curPosFinal = cur;
-          } else {
-            cm.replaceRange(text, cur);
-            // Now fine tune the cursor to where we want it.
-            if (linewise && actionArgs.after) {
-              curPosFinal = Pos(
-              cur.line + 1,
-              findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
-            } else if (linewise && !actionArgs.after) {
-              curPosFinal = Pos(
-                cur.line,
-                findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
-            } else if (!linewise && actionArgs.after) {
-              idx = cm.indexFromPos(cur);
-              curPosFinal = cm.posFromIndex(idx + text.length - 1);
-            } else {
-              idx = cm.indexFromPos(cur);
-              curPosFinal = cm.posFromIndex(idx + text.length);
-            }
-          }
-        }
-        if (vim.visualMode) {
-          exitVisualMode(cm, false);
-        }
-        cm.setCursor(curPosFinal);
-      },
-      undo: function(cm, actionArgs) {
-        cm.operation(function() {
-          repeatFn(cm, CodeMirror.commands.undo, actionArgs.repeat)();
-          cm.setCursor(cm.getCursor('anchor'));
-        });
-      },
-      redo: function(cm, actionArgs) {
-        repeatFn(cm, CodeMirror.commands.redo, actionArgs.repeat)();
-      },
-      setRegister: function(_cm, actionArgs, vim) {
-        vim.inputState.registerName = actionArgs.selectedCharacter;
-      },
-      setMark: function(cm, actionArgs, vim) {
-        var markName = actionArgs.selectedCharacter;
-        updateMark(cm, vim, markName, cm.getCursor());
-      },
-      replace: function(cm, actionArgs, vim) {
-        var replaceWith = actionArgs.selectedCharacter;
-        var curStart = cm.getCursor();
-        var replaceTo;
-        var curEnd;
-        var selections = cm.listSelections();
-        if (vim.visualMode) {
-          curStart = cm.getCursor('start');
-          curEnd = cm.getCursor('end');
-        } else {
-          var line = cm.getLine(curStart.line);
-          replaceTo = curStart.ch + actionArgs.repeat;
-          if (replaceTo > line.length) {
-            replaceTo=line.length;
-          }
-          curEnd = Pos(curStart.line, replaceTo);
-        }
-        if (replaceWith=='\n') {
-          if (!vim.visualMode) cm.replaceRange('', curStart, curEnd);
-          // special case, where vim help says to replace by just one line-break
-          (CodeMirror.commands.newlineAndIndentContinueComment || CodeMirror.commands.newlineAndIndent)(cm);
-        } else {
-          var replaceWithStr = cm.getRange(curStart, curEnd);
-          //replace all characters in range by selected, but keep linebreaks
-          replaceWithStr = replaceWithStr.replace(/[^\n]/g, replaceWith);
-          if (vim.visualBlock) {
-            // Tabs are split in visua block before replacing
-            var spaces = new Array(cm.getOption("tabSize")+1).join(' ');
-            replaceWithStr = cm.getSelection();
-            replaceWithStr = replaceWithStr.replace(/\t/g, spaces).replace(/[^\n]/g, replaceWith).split('\n');
-            cm.replaceSelections(replaceWithStr);
-          } else {
-            cm.replaceRange(replaceWithStr, curStart, curEnd);
-          }
-          if (vim.visualMode) {
-            curStart = cursorIsBefore(selections[0].anchor, selections[0].head) ?
-                         selections[0].anchor : selections[0].head;
-            cm.setCursor(curStart);
-            exitVisualMode(cm, false);
-          } else {
-            cm.setCursor(offsetCursor(curEnd, 0, -1));
-          }
-        }
-      },
-      incrementNumberToken: function(cm, actionArgs) {
-        var cur = cm.getCursor();
-        var lineStr = cm.getLine(cur.line);
-        var re = /-?\d+/g;
-        var match;
-        var start;
-        var end;
-        var numberStr;
-        var token;
-        while ((match = re.exec(lineStr)) !== null) {
-          token = match[0];
-          start = match.index;
-          end = start + token.length;
-          if (cur.ch < end)break;
-        }
-        if (!actionArgs.backtrack && (end <= cur.ch))return;
-        if (token) {
-          var increment = actionArgs.increase ? 1 : -1;
-          var number = parseInt(token) + (increment * actionArgs.repeat);
-          var from = Pos(cur.line, start);
-          var to = Pos(cur.line, end);
-          numberStr = number.toString();
-          cm.replaceRange(numberStr, from, to);
-        } else {
-          return;
-        }
-        cm.setCursor(Pos(cur.line, start + numberStr.length - 1));
-      },
-      repeatLastEdit: function(cm, actionArgs, vim) {
-        var lastEditInputState = vim.lastEditInputState;
-        if (!lastEditInputState) { return; }
-        var repeat = actionArgs.repeat;
-        if (repeat && actionArgs.repeatIsExplicit) {
-          vim.lastEditInputState.repeatOverride = repeat;
-        } else {
-          repeat = vim.lastEditInputState.repeatOverride || repeat;
-        }
-        repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
-      },
-      exitInsertMode: exitInsertMode
-    };
-
-    function defineAction(name, fn) {
-      actions[name] = fn;
-    }
-
-    /*
-     * Below are miscellaneous utility functions used by vim.js
-     */
-
-    /**
-     * Clips cursor to ensure that line is within the buffer's range
-     * If includeLineBreak is true, then allow cur.ch == lineLength.
-     */
-    function clipCursorToContent(cm, cur, includeLineBreak) {
-      var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() );
-      var maxCh = lineLength(cm, line) - 1;
-      maxCh = (includeLineBreak) ? maxCh + 1 : maxCh;
-      var ch = Math.min(Math.max(0, cur.ch), maxCh);
-      return Pos(line, ch);
-    }
-    function copyArgs(args) {
-      var ret = {};
-      for (var prop in args) {
-        if (args.hasOwnProperty(prop)) {
-          ret[prop] = args[prop];
-        }
-      }
-      return ret;
-    }
-    function offsetCursor(cur, offsetLine, offsetCh) {
-      if (typeof offsetLine === 'object') {
-        offsetCh = offsetLine.ch;
-        offsetLine = offsetLine.line;
-      }
-      return Pos(cur.line + offsetLine, cur.ch + offsetCh);
-    }
-    function getOffset(anchor, head) {
-      return {
-        line: head.line - anchor.line,
-        ch: head.line - anchor.line
-      };
-    }
-    function commandMatches(keys, keyMap, context, inputState) {
-      // Partial matches are not applied. They inform the key handler
-      // that the current key sequence is a subsequence of a valid key
-      // sequence, so that the key buffer is not cleared.
-      var match, partial = [], full = [];
-      for (var i = 0; i < keyMap.length; i++) {
-        var command = keyMap[i];
-        if (context == 'insert' && command.context != 'insert' ||
-            command.context && command.context != context ||
-            inputState.operator && command.type == 'action' ||
-            !(match = commandMatch(keys, command.keys))) { continue; }
-        if (match == 'partial') { partial.push(command); }
-        if (match == 'full') { full.push(command); }
-      }
-      return {
-        partial: partial.length && partial,
-        full: full.length && full
-      };
-    }
-    function commandMatch(pressed, mapped) {
-      if (mapped.slice(-11) == '') {
-        // Last character matches anything.
-        var prefixLen = mapped.length - 11;
-        var pressedPrefix = pressed.slice(0, prefixLen);
-        var mappedPrefix = mapped.slice(0, prefixLen);
-        return pressedPrefix == mappedPrefix && pressed.length > prefixLen ? 'full' :
-               mappedPrefix.indexOf(pressedPrefix) == 0 ? 'partial' : false;
-      } else {
-        return pressed == mapped ? 'full' :
-               mapped.indexOf(pressed) == 0 ? 'partial' : false;
-      }
-    }
-    function lastChar(keys) {
-      var match = /^.*(<[\w\-]+>)$/.exec(keys);
-      var selectedCharacter = match ? match[1] : keys.slice(-1);
-      if (selectedCharacter.length > 1){
-        switch(selectedCharacter){
-          case '':
-            selectedCharacter='\n';
-            break;
-          case '':
-            selectedCharacter=' ';
-            break;
-          default:
-            break;
-        }
-      }
-      return selectedCharacter;
-    }
-    function repeatFn(cm, fn, repeat) {
-      return function() {
-        for (var i = 0; i < repeat; i++) {
-          fn(cm);
-        }
-      };
-    }
-    function copyCursor(cur) {
-      return Pos(cur.line, cur.ch);
-    }
-    function cursorEqual(cur1, cur2) {
-      return cur1.ch == cur2.ch && cur1.line == cur2.line;
-    }
-    function cursorIsBefore(cur1, cur2) {
-      if (cur1.line < cur2.line) {
-        return true;
-      }
-      if (cur1.line == cur2.line && cur1.ch < cur2.ch) {
-        return true;
-      }
-      return false;
-    }
-    function cursorMin(cur1, cur2) {
-      if (arguments.length > 2) {
-        cur2 = cursorMin.apply(undefined, Array.prototype.slice.call(arguments, 1));
-      }
-      return cursorIsBefore(cur1, cur2) ? cur1 : cur2;
-    }
-    function cursorMax(cur1, cur2) {
-      if (arguments.length > 2) {
-        cur2 = cursorMax.apply(undefined, Array.prototype.slice.call(arguments, 1));
-      }
-      return cursorIsBefore(cur1, cur2) ? cur2 : cur1;
-    }
-    function cursorIsBetween(cur1, cur2, cur3) {
-      // returns true if cur2 is between cur1 and cur3.
-      var cur1before2 = cursorIsBefore(cur1, cur2);
-      var cur2before3 = cursorIsBefore(cur2, cur3);
-      return cur1before2 && cur2before3;
-    }
-    function lineLength(cm, lineNum) {
-      return cm.getLine(lineNum).length;
-    }
-    function trim(s) {
-      if (s.trim) {
-        return s.trim();
-      }
-      return s.replace(/^\s+|\s+$/g, '');
-    }
-    function escapeRegex(s) {
-      return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
-    }
-    function extendLineToColumn(cm, lineNum, column) {
-      var endCh = lineLength(cm, lineNum);
-      var spaces = new Array(column-endCh+1).join(' ');
-      cm.setCursor(Pos(lineNum, endCh));
-      cm.replaceRange(spaces, cm.getCursor());
-    }
-    // This functions selects a rectangular block
-    // of text with selectionEnd as any of its corner
-    // Height of block:
-    // Difference in selectionEnd.line and first/last selection.line
-    // Width of the block:
-    // Distance between selectionEnd.ch and any(first considered here) selection.ch
-    function selectBlock(cm, selectionEnd) {
-      var selections = [], ranges = cm.listSelections();
-      var head = copyCursor(cm.clipPos(selectionEnd));
-      var isClipped = !cursorEqual(selectionEnd, head);
-      var curHead = cm.getCursor('head');
-      var primIndex = getIndex(ranges, curHead);
-      var wasClipped = cursorEqual(ranges[primIndex].head, ranges[primIndex].anchor);
-      var max = ranges.length - 1;
-      var index = max - primIndex > primIndex ? max : 0;
-      var base = ranges[index].anchor;
-
-      var firstLine = Math.min(base.line, head.line);
-      var lastLine = Math.max(base.line, head.line);
-      var baseCh = base.ch, headCh = head.ch;
-
-      var dir = ranges[index].head.ch - baseCh;
-      var newDir = headCh - baseCh;
-      if (dir > 0 && newDir <= 0) {
-        baseCh++;
-        if (!isClipped) { headCh--; }
-      } else if (dir < 0 && newDir >= 0) {
-        baseCh--;
-        if (!wasClipped) { headCh++; }
-      } else if (dir < 0 && newDir == -1) {
-        baseCh--;
-        headCh++;
-      }
-      for (var line = firstLine; line <= lastLine; line++) {
-        var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
-        selections.push(range);
-      }
-      primIndex = head.line == lastLine ? selections.length - 1 : 0;
-      cm.setSelections(selections);
-      selectionEnd.ch = headCh;
-      base.ch = baseCh;
-      return base;
-    }
-    function selectForInsert(cm, head, height) {
-      var sel = [];
-      for (var i = 0; i < height; i++) {
-        var lineHead = offsetCursor(head, i, 0);
-        sel.push({anchor: lineHead, head: lineHead});
-      }
-      cm.setSelections(sel, 0);
-    }
-    // getIndex returns the index of the cursor in the selections.
-    function getIndex(ranges, cursor, end) {
-      for (var i = 0; i < ranges.length; i++) {
-        var atAnchor = end != 'head' && cursorEqual(ranges[i].anchor, cursor);
-        var atHead = end != 'anchor' && cursorEqual(ranges[i].head, cursor);
-        if (atAnchor || atHead) {
-          return i;
-        }
-      }
-      return -1;
-    }
-    function getSelectedAreaRange(cm, vim) {
-      var lastSelection = vim.lastSelection;
-      var getCurrentSelectedAreaRange = function() {
-        var selections = cm.listSelections();
-        var start =  selections[0];
-        var end = selections[selections.length-1];
-        var selectionStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
-        var selectionEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
-        return [selectionStart, selectionEnd];
-      };
-      var getLastSelectedAreaRange = function() {
-        var selectionStart = cm.getCursor();
-        var selectionEnd = cm.getCursor();
-        var block = lastSelection.visualBlock;
-        if (block) {
-          var width = block.width;
-          var height = block.height;
-          selectionEnd = Pos(selectionStart.line + height, selectionStart.ch + width);
-          var selections = [];
-          // selectBlock creates a 'proper' rectangular block.
-          // We do not want that in all cases, so we manually set selections.
-          for (var i = selectionStart.line; i < selectionEnd.line; i++) {
-            var anchor = Pos(i, selectionStart.ch);
-            var head = Pos(i, selectionEnd.ch);
-            var range = {anchor: anchor, head: head};
-            selections.push(range);
-          }
-          cm.setSelections(selections);
-        } else {
-          var start = lastSelection.anchorMark.find();
-          var end = lastSelection.headMark.find();
-          var line = end.line - start.line;
-          var ch = end.ch - start.ch;
-          selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
-          if (lastSelection.visualLine) {
-            selectionStart = Pos(selectionStart.line, 0);
-            selectionEnd = Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
-          }
-          cm.setSelection(selectionStart, selectionEnd);
-        }
-        return [selectionStart, selectionEnd];
-      };
-      if (!vim.visualMode) {
-      // In case of replaying the action.
-        return getLastSelectedAreaRange();
-      } else {
-        return getCurrentSelectedAreaRange();
-      }
-    }
-    // Updates the previous selection with the current selection's values. This
-    // should only be called in visual mode.
-    function updateLastSelection(cm, vim) {
-      var anchor = vim.sel.anchor;
-      var head = vim.sel.head;
-      // To accommodate the effect of lastPastedText in the last selection
-      if (vim.lastPastedText) {
-        head = cm.posFromIndex(cm.indexFromPos(anchor) + vim.lastPastedText.length);
-        vim.lastPastedText = null;
-      }
-      vim.lastSelection = {'anchorMark': cm.setBookmark(anchor),
-                           'headMark': cm.setBookmark(head),
-                           'anchor': copyCursor(anchor),
-                           'head': copyCursor(head),
-                           'visualMode': vim.visualMode,
-                           'visualLine': vim.visualLine,
-                           'visualBlock': vim.visualBlock};
-    }
-    function expandSelection(cm, start, end) {
-      var sel = cm.state.vim.sel;
-      var head = sel.head;
-      var anchor = sel.anchor;
-      var tmp;
-      if (cursorIsBefore(end, start)) {
-        tmp = end;
-        end = start;
-        start = tmp;
-      }
-      if (cursorIsBefore(head, anchor)) {
-        head = cursorMin(start, head);
-        anchor = cursorMax(anchor, end);
-      } else {
-        anchor = cursorMin(start, anchor);
-        head = cursorMax(head, end);
-        head = offsetCursor(head, 0, -1);
-        if (head.ch == -1 && head.line != cm.firstLine()) {
-          head = Pos(head.line - 1, lineLength(cm, head.line - 1));
-        }
-      }
-      return [anchor, head];
-    }
-    /**
-     * Updates the CodeMirror selection to match the provided vim selection.
-     * If no arguments are given, it uses the current vim selection state.
-     */
-    function updateCmSelection(cm, sel, mode) {
-      var vim = cm.state.vim;
-      sel = sel || vim.sel;
-      var mode = mode ||
-        vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char';
-      var cmSel = makeCmSelection(cm, sel, mode);
-      cm.setSelections(cmSel.ranges, cmSel.primary);
-      updateFakeCursor(cm);
-    }
-    function makeCmSelection(cm, sel, mode, exclusive) {
-      var head = copyCursor(sel.head);
-      var anchor = copyCursor(sel.anchor);
-      if (mode == 'char') {
-        var headOffset = !exclusive && !cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
-        var anchorOffset = cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
-        head = offsetCursor(sel.head, 0, headOffset);
-        anchor = offsetCursor(sel.anchor, 0, anchorOffset);
-        return {
-          ranges: [{anchor: anchor, head: head}],
-          primary: 0
-        };
-      } else if (mode == 'line') {
-        if (!cursorIsBefore(sel.head, sel.anchor)) {
-          anchor.ch = 0;
-
-          var lastLine = cm.lastLine();
-          if (head.line > lastLine) {
-            head.line = lastLine;
-          }
-          head.ch = lineLength(cm, head.line);
-        } else {
-          head.ch = 0;
-          anchor.ch = lineLength(cm, anchor.line);
-        }
-        return {
-          ranges: [{anchor: anchor, head: head}],
-          primary: 0
-        };
-      } else if (mode == 'block') {
-        var top = Math.min(anchor.line, head.line),
-            left = Math.min(anchor.ch, head.ch),
-            bottom = Math.max(anchor.line, head.line),
-            right = Math.max(anchor.ch, head.ch) + 1;
-        var height = bottom - top + 1;
-        var primary = head.line == top ? 0 : height - 1;
-        var ranges = [];
-        for (var i = 0; i < height; i++) {
-          ranges.push({
-            anchor: Pos(top + i, left),
-            head: Pos(top + i, right)
-          });
-        }
-        return {
-          ranges: ranges,
-          primary: primary
-        };
-      }
-    }
-    function getHead(cm) {
-      var cur = cm.getCursor('head');
-      if (cm.getSelection().length == 1) {
-        // Small corner case when only 1 character is selected. The "real"
-        // head is the left of head and anchor.
-        cur = cursorMin(cur, cm.getCursor('anchor'));
-      }
-      return cur;
-    }
-
-    /**
-     * If moveHead is set to false, the CodeMirror selection will not be
-     * touched. The caller assumes the responsibility of putting the cursor
-    * in the right place.
-     */
-    function exitVisualMode(cm, moveHead) {
-      var vim = cm.state.vim;
-      if (moveHead !== false) {
-        cm.setCursor(clipCursorToContent(cm, vim.sel.head));
-      }
-      updateLastSelection(cm, vim);
-      vim.visualMode = false;
-      vim.visualLine = false;
-      vim.visualBlock = false;
-      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-      if (vim.fakeCursor) {
-        vim.fakeCursor.clear();
-      }
-    }
-
-    // Remove any trailing newlines from the selection. For
-    // example, with the caret at the start of the last word on the line,
-    // 'dw' should word, but not the newline, while 'w' should advance the
-    // caret to the first character of the next line.
-    function clipToLine(cm, curStart, curEnd) {
-      var selection = cm.getRange(curStart, curEnd);
-      // Only clip if the selection ends with trailing newline + whitespace
-      if (/\n\s*$/.test(selection)) {
-        var lines = selection.split('\n');
-        // We know this is all whitepsace.
-        lines.pop();
-
-        // Cases:
-        // 1. Last word is an empty line - do not clip the trailing '\n'
-        // 2. Last word is not an empty line - clip the trailing '\n'
-        var line;
-        // Find the line containing the last word, and clip all whitespace up
-        // to it.
-        for (var line = lines.pop(); lines.length > 0 && line && isWhiteSpaceString(line); line = lines.pop()) {
-          curEnd.line--;
-          curEnd.ch = 0;
-        }
-        // If the last word is not an empty line, clip an additional newline
-        if (line) {
-          curEnd.line--;
-          curEnd.ch = lineLength(cm, curEnd.line);
-        } else {
-          curEnd.ch = 0;
-        }
-      }
-    }
-
-    // Expand the selection to line ends.
-    function expandSelectionToLine(_cm, curStart, curEnd) {
-      curStart.ch = 0;
-      curEnd.ch = 0;
-      curEnd.line++;
-    }
-
-    function findFirstNonWhiteSpaceCharacter(text) {
-      if (!text) {
-        return 0;
-      }
-      var firstNonWS = text.search(/\S/);
-      return firstNonWS == -1 ? text.length : firstNonWS;
-    }
-
-    function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) {
-      var cur = getHead(cm);
-      var line = cm.getLine(cur.line);
-      var idx = cur.ch;
-
-      // Seek to first word or non-whitespace character, depending on if
-      // noSymbol is true.
-      var test = noSymbol ? wordCharTest[0] : bigWordCharTest [0];
-      while (!test(line.charAt(idx))) {
-        idx++;
-        if (idx >= line.length) { return null; }
-      }
-
-      if (bigWord) {
-        test = bigWordCharTest[0];
-      } else {
-        test = wordCharTest[0];
-        if (!test(line.charAt(idx))) {
-          test = wordCharTest[1];
-        }
-      }
-
-      var end = idx, start = idx;
-      while (test(line.charAt(end)) && end < line.length) { end++; }
-      while (test(line.charAt(start)) && start >= 0) { start--; }
-      start++;
-
-      if (inclusive) {
-        // If present, include all whitespace after word.
-        // Otherwise, include all whitespace before word, except indentation.
-        var wordEnd = end;
-        while (/\s/.test(line.charAt(end)) && end < line.length) { end++; }
-        if (wordEnd == end) {
-          var wordStart = start;
-          while (/\s/.test(line.charAt(start - 1)) && start > 0) { start--; }
-          if (!start) { start = wordStart; }
-        }
-      }
-      return { start: Pos(cur.line, start), end: Pos(cur.line, end) };
-    }
-
-    function recordJumpPosition(cm, oldCur, newCur) {
-      if (!cursorEqual(oldCur, newCur)) {
-        vimGlobalState.jumpList.add(cm, oldCur, newCur);
-      }
-    }
-
-    function recordLastCharacterSearch(increment, args) {
-        vimGlobalState.lastChararacterSearch.increment = increment;
-        vimGlobalState.lastChararacterSearch.forward = args.forward;
-        vimGlobalState.lastChararacterSearch.selectedCharacter = args.selectedCharacter;
-    }
-
-    var symbolToMode = {
-        '(': 'bracket', ')': 'bracket', '{': 'bracket', '}': 'bracket',
-        '[': 'section', ']': 'section',
-        '*': 'comment', '/': 'comment',
-        'm': 'method', 'M': 'method',
-        '#': 'preprocess'
-    };
-    var findSymbolModes = {
-      bracket: {
-        isComplete: function(state) {
-          if (state.nextCh === state.symb) {
-            state.depth++;
-            if (state.depth >= 1)return true;
-          } else if (state.nextCh === state.reverseSymb) {
-            state.depth--;
-          }
-          return false;
-        }
-      },
-      section: {
-        init: function(state) {
-          state.curMoveThrough = true;
-          state.symb = (state.forward ? ']' : '[') === state.symb ? '{' : '}';
-        },
-        isComplete: function(state) {
-          return state.index === 0 && state.nextCh === state.symb;
-        }
-      },
-      comment: {
-        isComplete: function(state) {
-          var found = state.lastCh === '*' && state.nextCh === '/';
-          state.lastCh = state.nextCh;
-          return found;
-        }
-      },
-      // TODO: The original Vim implementation only operates on level 1 and 2.
-      // The current implementation doesn't check for code block level and
-      // therefore it operates on any levels.
-      method: {
-        init: function(state) {
-          state.symb = (state.symb === 'm' ? '{' : '}');
-          state.reverseSymb = state.symb === '{' ? '}' : '{';
-        },
-        isComplete: function(state) {
-          if (state.nextCh === state.symb)return true;
-          return false;
-        }
-      },
-      preprocess: {
-        init: function(state) {
-          state.index = 0;
-        },
-        isComplete: function(state) {
-          if (state.nextCh === '#') {
-            var token = state.lineText.match(/#(\w+)/)[1];
-            if (token === 'endif') {
-              if (state.forward && state.depth === 0) {
-                return true;
-              }
-              state.depth++;
-            } else if (token === 'if') {
-              if (!state.forward && state.depth === 0) {
-                return true;
-              }
-              state.depth--;
-            }
-            if (token === 'else' && state.depth === 0)return true;
-          }
-          return false;
-        }
-      }
-    };
-    function findSymbol(cm, repeat, forward, symb) {
-      var cur = copyCursor(cm.getCursor());
-      var increment = forward ? 1 : -1;
-      var endLine = forward ? cm.lineCount() : -1;
-      var curCh = cur.ch;
-      var line = cur.line;
-      var lineText = cm.getLine(line);
-      var state = {
-        lineText: lineText,
-        nextCh: lineText.charAt(curCh),
-        lastCh: null,
-        index: curCh,
-        symb: symb,
-        reverseSymb: (forward ?  { ')': '(', '}': '{' } : { '(': ')', '{': '}' })[symb],
-        forward: forward,
-        depth: 0,
-        curMoveThrough: false
-      };
-      var mode = symbolToMode[symb];
-      if (!mode)return cur;
-      var init = findSymbolModes[mode].init;
-      var isComplete = findSymbolModes[mode].isComplete;
-      if (init) { init(state); }
-      while (line !== endLine && repeat) {
-        state.index += increment;
-        state.nextCh = state.lineText.charAt(state.index);
-        if (!state.nextCh) {
-          line += increment;
-          state.lineText = cm.getLine(line) || '';
-          if (increment > 0) {
-            state.index = 0;
-          } else {
-            var lineLen = state.lineText.length;
-            state.index = (lineLen > 0) ? (lineLen-1) : 0;
-          }
-          state.nextCh = state.lineText.charAt(state.index);
-        }
-        if (isComplete(state)) {
-          cur.line = line;
-          cur.ch = state.index;
-          repeat--;
-        }
-      }
-      if (state.nextCh || state.curMoveThrough) {
-        return Pos(line, state.index);
-      }
-      return cur;
-    }
-
-    /*
-     * Returns the boundaries of the next word. If the cursor in the middle of
-     * the word, then returns the boundaries of the current word, starting at
-     * the cursor. If the cursor is at the start/end of a word, and we are going
-     * forward/backward, respectively, find the boundaries of the next word.
-     *
-     * @param {CodeMirror} cm CodeMirror object.
-     * @param {Cursor} cur The cursor position.
-     * @param {boolean} forward True to search forward. False to search
-     *     backward.
-     * @param {boolean} bigWord True if punctuation count as part of the word.
-     *     False if only [a-zA-Z0-9] characters count as part of the word.
-     * @param {boolean} emptyLineIsWord True if empty lines should be treated
-     *     as words.
-     * @return {Object{from:number, to:number, line: number}} The boundaries of
-     *     the word, or null if there are no more words.
-     */
-    function findWord(cm, cur, forward, bigWord, emptyLineIsWord) {
-      var lineNum = cur.line;
-      var pos = cur.ch;
-      var line = cm.getLine(lineNum);
-      var dir = forward ? 1 : -1;
-      var charTests = bigWord ? bigWordCharTest: wordCharTest;
-
-      if (emptyLineIsWord && line == '') {
-        lineNum += dir;
-        line = cm.getLine(lineNum);
-        if (!isLine(cm, lineNum)) {
-          return null;
-        }
-        pos = (forward) ? 0 : line.length;
-      }
-
-      while (true) {
-        if (emptyLineIsWord && line == '') {
-          return { from: 0, to: 0, line: lineNum };
-        }
-        var stop = (dir > 0) ? line.length : -1;
-        var wordStart = stop, wordEnd = stop;
-        // Find bounds of next word.
-        while (pos != stop) {
-          var foundWord = false;
-          for (var i = 0; i < charTests.length && !foundWord; ++i) {
-            if (charTests[i](line.charAt(pos))) {
-              wordStart = pos;
-              // Advance to end of word.
-              while (pos != stop && charTests[i](line.charAt(pos))) {
-                pos += dir;
-              }
-              wordEnd = pos;
-              foundWord = wordStart != wordEnd;
-              if (wordStart == cur.ch && lineNum == cur.line &&
-                  wordEnd == wordStart + dir) {
-                // We started at the end of a word. Find the next one.
-                continue;
-              } else {
-                return {
-                  from: Math.min(wordStart, wordEnd + 1),
-                  to: Math.max(wordStart, wordEnd),
-                  line: lineNum };
-              }
-            }
-          }
-          if (!foundWord) {
-            pos += dir;
-          }
-        }
-        // Advance to next/prev line.
-        lineNum += dir;
-        if (!isLine(cm, lineNum)) {
-          return null;
-        }
-        line = cm.getLine(lineNum);
-        pos = (dir > 0) ? 0 : line.length;
-      }
-      // Should never get here.
-      throw new Error('The impossible happened.');
-    }
-
-    /**
-     * @param {CodeMirror} cm CodeMirror object.
-     * @param {Pos} cur The position to start from.
-     * @param {int} repeat Number of words to move past.
-     * @param {boolean} forward True to search forward. False to search
-     *     backward.
-     * @param {boolean} wordEnd True to move to end of word. False to move to
-     *     beginning of word.
-     * @param {boolean} bigWord True if punctuation count as part of the word.
-     *     False if only alphabet characters count as part of the word.
-     * @return {Cursor} The position the cursor should move to.
-     */
-    function moveToWord(cm, cur, repeat, forward, wordEnd, bigWord) {
-      var curStart = copyCursor(cur);
-      var words = [];
-      if (forward && !wordEnd || !forward && wordEnd) {
-        repeat++;
-      }
-      // For 'e', empty lines are not considered words, go figure.
-      var emptyLineIsWord = !(forward && wordEnd);
-      for (var i = 0; i < repeat; i++) {
-        var word = findWord(cm, cur, forward, bigWord, emptyLineIsWord);
-        if (!word) {
-          var eodCh = lineLength(cm, cm.lastLine());
-          words.push(forward
-              ? {line: cm.lastLine(), from: eodCh, to: eodCh}
-              : {line: 0, from: 0, to: 0});
-          break;
-        }
-        words.push(word);
-        cur = Pos(word.line, forward ? (word.to - 1) : word.from);
-      }
-      var shortCircuit = words.length != repeat;
-      var firstWord = words[0];
-      var lastWord = words.pop();
-      if (forward && !wordEnd) {
-        // w
-        if (!shortCircuit && (firstWord.from != curStart.ch || firstWord.line != curStart.line)) {
-          // We did not start in the middle of a word. Discard the extra word at the end.
-          lastWord = words.pop();
-        }
-        return Pos(lastWord.line, lastWord.from);
-      } else if (forward && wordEnd) {
-        return Pos(lastWord.line, lastWord.to - 1);
-      } else if (!forward && wordEnd) {
-        // ge
-        if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) {
-          // We did not start in the middle of a word. Discard the extra word at the end.
-          lastWord = words.pop();
-        }
-        return Pos(lastWord.line, lastWord.to);
-      } else {
-        // b
-        return Pos(lastWord.line, lastWord.from);
-      }
-    }
-
-    function moveToCharacter(cm, repeat, forward, character) {
-      var cur = cm.getCursor();
-      var start = cur.ch;
-      var idx;
-      for (var i = 0; i < repeat; i ++) {
-        var line = cm.getLine(cur.line);
-        idx = charIdxInLine(start, line, character, forward, true);
-        if (idx == -1) {
-          return null;
-        }
-        start = idx;
-      }
-      return Pos(cm.getCursor().line, idx);
-    }
-
-    function moveToColumn(cm, repeat) {
-      // repeat is always >= 1, so repeat - 1 always corresponds
-      // to the column we want to go to.
-      var line = cm.getCursor().line;
-      return clipCursorToContent(cm, Pos(line, repeat - 1));
-    }
-
-    function updateMark(cm, vim, markName, pos) {
-      if (!inArray(markName, validMarks)) {
-        return;
-      }
-      if (vim.marks[markName]) {
-        vim.marks[markName].clear();
-      }
-      vim.marks[markName] = cm.setBookmark(pos);
-    }
-
-    function charIdxInLine(start, line, character, forward, includeChar) {
-      // Search for char in line.
-      // motion_options: {forward, includeChar}
-      // If includeChar = true, include it too.
-      // If forward = true, search forward, else search backwards.
-      // If char is not found on this line, do nothing
-      var idx;
-      if (forward) {
-        idx = line.indexOf(character, start + 1);
-        if (idx != -1 && !includeChar) {
-          idx -= 1;
-        }
-      } else {
-        idx = line.lastIndexOf(character, start - 1);
-        if (idx != -1 && !includeChar) {
-          idx += 1;
-        }
-      }
-      return idx;
-    }
-
-    function findParagraph(cm, head, repeat, dir, inclusive) {
-      var line = head.line;
-      var min = cm.firstLine();
-      var max = cm.lastLine();
-      var start, end, i = line;
-      function isEmpty(i) { return !cm.getLine(i); }
-      function isBoundary(i, dir, any) {
-        if (any) { return isEmpty(i) != isEmpty(i + dir); }
-        return !isEmpty(i) && isEmpty(i + dir);
-      }
-      if (dir) {
-        while (min <= i && i <= max && repeat > 0) {
-          if (isBoundary(i, dir)) { repeat--; }
-          i += dir;
-        }
-        return new Pos(i, 0);
-      }
-
-      var vim = cm.state.vim;
-      if (vim.visualLine && isBoundary(line, 1, true)) {
-        var anchor = vim.sel.anchor;
-        if (isBoundary(anchor.line, -1, true)) {
-          if (!inclusive || anchor.line != line) {
-            line += 1;
-          }
-        }
-      }
-      var startState = isEmpty(line);
-      for (i = line; i <= max && repeat; i++) {
-        if (isBoundary(i, 1, true)) {
-          if (!inclusive || isEmpty(i) != startState) {
-            repeat--;
-          }
-        }
-      }
-      end = new Pos(i, 0);
-      // select boundary before paragraph for the last one
-      if (i > max && !startState) { startState = true; }
-      else { inclusive = false; }
-      for (i = line; i > min; i--) {
-        if (!inclusive || isEmpty(i) == startState || i == line) {
-          if (isBoundary(i, -1, true)) { break; }
-        }
-      }
-      start = new Pos(i, 0);
-      return { start: start, end: end };
-    }
-
-    // TODO: perhaps this finagling of start and end positions belonds
-    // in codmirror/replaceRange?
-    function selectCompanionObject(cm, head, symb, inclusive) {
-      var cur = head, start, end;
-
-      var bracketRegexp = ({
-        '(': /[()]/, ')': /[()]/,
-        '[': /[[\]]/, ']': /[[\]]/,
-        '{': /[{}]/, '}': /[{}]/})[symb];
-      var openSym = ({
-        '(': '(', ')': '(',
-        '[': '[', ']': '[',
-        '{': '{', '}': '{'})[symb];
-      var curChar = cm.getLine(cur.line).charAt(cur.ch);
-      // Due to the behavior of scanForBracket, we need to add an offset if the
-      // cursor is on a matching open bracket.
-      var offset = curChar === openSym ? 1 : 0;
-
-      start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, null, {'bracketRegex': bracketRegexp});
-      end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, null, {'bracketRegex': bracketRegexp});
-
-      if (!start || !end) {
-        return { start: cur, end: cur };
-      }
-
-      start = start.pos;
-      end = end.pos;
-
-      if ((start.line == end.line && start.ch > end.ch)
-          || (start.line > end.line)) {
-        var tmp = start;
-        start = end;
-        end = tmp;
-      }
-
-      if (inclusive) {
-        end.ch += 1;
-      } else {
-        start.ch += 1;
-      }
-
-      return { start: start, end: end };
-    }
-
-    // Takes in a symbol and a cursor and tries to simulate text objects that
-    // have identical opening and closing symbols
-    // TODO support across multiple lines
-    function findBeginningAndEnd(cm, head, symb, inclusive) {
-      var cur = copyCursor(head);
-      var line = cm.getLine(cur.line);
-      var chars = line.split('');
-      var start, end, i, len;
-      var firstIndex = chars.indexOf(symb);
-
-      // the decision tree is to always look backwards for the beginning first,
-      // but if the cursor is in front of the first instance of the symb,
-      // then move the cursor forward
-      if (cur.ch < firstIndex) {
-        cur.ch = firstIndex;
-        // Why is this line even here???
-        // cm.setCursor(cur.line, firstIndex+1);
-      }
-      // otherwise if the cursor is currently on the closing symbol
-      else if (firstIndex < cur.ch && chars[cur.ch] == symb) {
-        end = cur.ch; // assign end to the current cursor
-        --cur.ch; // make sure to look backwards
-      }
-
-      // if we're currently on the symbol, we've got a start
-      if (chars[cur.ch] == symb && !end) {
-        start = cur.ch + 1; // assign start to ahead of the cursor
-      } else {
-        // go backwards to find the start
-        for (i = cur.ch; i > -1 && !start; i--) {
-          if (chars[i] == symb) {
-            start = i + 1;
-          }
-        }
-      }
-
-      // look forwards for the end symbol
-      if (start && !end) {
-        for (i = start, len = chars.length; i < len && !end; i++) {
-          if (chars[i] == symb) {
-            end = i;
-          }
-        }
-      }
-
-      // nothing found
-      if (!start || !end) {
-        return { start: cur, end: cur };
-      }
-
-      // include the symbols
-      if (inclusive) {
-        --start; ++end;
-      }
-
-      return {
-        start: Pos(cur.line, start),
-        end: Pos(cur.line, end)
-      };
-    }
-
-    // Search functions
-    defineOption('pcre', true, 'boolean');
-    function SearchState() {}
-    SearchState.prototype = {
-      getQuery: function() {
-        return vimGlobalState.query;
-      },
-      setQuery: function(query) {
-        vimGlobalState.query = query;
-      },
-      getOverlay: function() {
-        return this.searchOverlay;
-      },
-      setOverlay: function(overlay) {
-        this.searchOverlay = overlay;
-      },
-      isReversed: function() {
-        return vimGlobalState.isReversed;
-      },
-      setReversed: function(reversed) {
-        vimGlobalState.isReversed = reversed;
-      },
-      getScrollbarAnnotate: function() {
-        return this.annotate;
-      },
-      setScrollbarAnnotate: function(annotate) {
-        this.annotate = annotate;
-      }
-    };
-    function getSearchState(cm) {
-      var vim = cm.state.vim;
-      return vim.searchState_ || (vim.searchState_ = new SearchState());
-    }
-    function dialog(cm, template, shortText, onClose, options) {
-      if (cm.openDialog) {
-        cm.openDialog(template, onClose, { bottom: true, value: options.value,
-            onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
-            selectValueOnOpen: false});
-      }
-      else {
-        onClose(prompt(shortText, ''));
-      }
-    }
-    function splitBySlash(argString) {
-      var slashes = findUnescapedSlashes(argString) || [];
-      if (!slashes.length) return [];
-      var tokens = [];
-      // in case of strings like foo/bar
-      if (slashes[0] !== 0) return;
-      for (var i = 0; i < slashes.length; i++) {
-        if (typeof slashes[i] == 'number')
-          tokens.push(argString.substring(slashes[i] + 1, slashes[i+1]));
-      }
-      return tokens;
-    }
-
-    function findUnescapedSlashes(str) {
-      var escapeNextChar = false;
-      var slashes = [];
-      for (var i = 0; i < str.length; i++) {
-        var c = str.charAt(i);
-        if (!escapeNextChar && c == '/') {
-          slashes.push(i);
-        }
-        escapeNextChar = !escapeNextChar && (c == '\\');
-      }
-      return slashes;
-    }
-
-    // Translates a search string from ex (vim) syntax into javascript form.
-    function translateRegex(str) {
-      // When these match, add a '\' if unescaped or remove one if escaped.
-      var specials = '|(){';
-      // Remove, but never add, a '\' for these.
-      var unescape = '}';
-      var escapeNextChar = false;
-      var out = [];
-      for (var i = -1; i < str.length; i++) {
-        var c = str.charAt(i) || '';
-        var n = str.charAt(i+1) || '';
-        var specialComesNext = (n && specials.indexOf(n) != -1);
-        if (escapeNextChar) {
-          if (c !== '\\' || !specialComesNext) {
-            out.push(c);
-          }
-          escapeNextChar = false;
-        } else {
-          if (c === '\\') {
-            escapeNextChar = true;
-            // Treat the unescape list as special for removing, but not adding '\'.
-            if (n && unescape.indexOf(n) != -1) {
-              specialComesNext = true;
-            }
-            // Not passing this test means removing a '\'.
-            if (!specialComesNext || n === '\\') {
-              out.push(c);
-            }
-          } else {
-            out.push(c);
-            if (specialComesNext && n !== '\\') {
-              out.push('\\');
-            }
-          }
-        }
-      }
-      return out.join('');
-    }
-
-    // Translates the replace part of a search and replace from ex (vim) syntax into
-    // javascript form.  Similar to translateRegex, but additionally fixes back references
-    // (translates '\[0..9]' to '$[0..9]') and follows different rules for escaping '$'.
-    var charUnescapes = {'\\n': '\n', '\\r': '\r', '\\t': '\t'};
-    function translateRegexReplace(str) {
-      var escapeNextChar = false;
-      var out = [];
-      for (var i = -1; i < str.length; i++) {
-        var c = str.charAt(i) || '';
-        var n = str.charAt(i+1) || '';
-        if (charUnescapes[c + n]) {
-          out.push(charUnescapes[c+n]);
-          i++;
-        } else if (escapeNextChar) {
-          // At any point in the loop, escapeNextChar is true if the previous
-          // character was a '\' and was not escaped.
-          out.push(c);
-          escapeNextChar = false;
-        } else {
-          if (c === '\\') {
-            escapeNextChar = true;
-            if ((isNumber(n) || n === '$')) {
-              out.push('$');
-            } else if (n !== '/' && n !== '\\') {
-              out.push('\\');
-            }
-          } else {
-            if (c === '$') {
-              out.push('$');
-            }
-            out.push(c);
-            if (n === '/') {
-              out.push('\\');
-            }
-          }
-        }
-      }
-      return out.join('');
-    }
-
-    // Unescape \ and / in the replace part, for PCRE mode.
-    var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t'};
-    function unescapeRegexReplace(str) {
-      var stream = new CodeMirror.StringStream(str);
-      var output = [];
-      while (!stream.eol()) {
-        // Search for \.
-        while (stream.peek() && stream.peek() != '\\') {
-          output.push(stream.next());
-        }
-        var matched = false;
-        for (var matcher in unescapes) {
-          if (stream.match(matcher, true)) {
-            matched = true;
-            output.push(unescapes[matcher]);
-            break;
-          }
-        }
-        if (!matched) {
-          // Don't change anything
-          output.push(stream.next());
-        }
-      }
-      return output.join('');
-    }
-
-    /**
-     * Extract the regular expression from the query and return a Regexp object.
-     * Returns null if the query is blank.
-     * If ignoreCase is passed in, the Regexp object will have the 'i' flag set.
-     * If smartCase is passed in, and the query contains upper case letters,
-     *   then ignoreCase is overridden, and the 'i' flag will not be set.
-     * If the query contains the /i in the flag part of the regular expression,
-     *   then both ignoreCase and smartCase are ignored, and 'i' will be passed
-     *   through to the Regex object.
-     */
-    function parseQuery(query, ignoreCase, smartCase) {
-      // First update the last search register
-      var lastSearchRegister = vimGlobalState.registerController.getRegister('/');
-      lastSearchRegister.setText(query);
-      // Check if the query is already a regex.
-      if (query instanceof RegExp) { return query; }
-      // First try to extract regex + flags from the input. If no flags found,
-      // extract just the regex. IE does not accept flags directly defined in
-      // the regex string in the form /regex/flags
-      var slashes = findUnescapedSlashes(query);
-      var regexPart;
-      var forceIgnoreCase;
-      if (!slashes.length) {
-        // Query looks like 'regexp'
-        regexPart = query;
-      } else {
-        // Query looks like 'regexp/...'
-        regexPart = query.substring(0, slashes[0]);
-        var flagsPart = query.substring(slashes[0]);
-        forceIgnoreCase = (flagsPart.indexOf('i') != -1);
-      }
-      if (!regexPart) {
-        return null;
-      }
-      if (!getOption('pcre')) {
-        regexPart = translateRegex(regexPart);
-      }
-      if (smartCase) {
-        ignoreCase = (/^[^A-Z]*$/).test(regexPart);
-      }
-      var regexp = new RegExp(regexPart,
-          (ignoreCase || forceIgnoreCase) ? 'i' : undefined);
-      return regexp;
-    }
-    function showConfirm(cm, text) {
-      if (cm.openNotification) {
-        cm.openNotification('' + text + '',
-                            {bottom: true, duration: 5000});
-      } else {
-        alert(text);
-      }
-    }
-    function makePrompt(prefix, desc) {
-      var raw = '';
-      if (prefix) {
-        raw += '' + prefix + '';
-      }
-      raw += ' ' +
-          '';
-      if (desc) {
-        raw += '';
-        raw += desc;
-        raw += '';
-      }
-      return raw;
-    }
-    var searchPromptDesc = '(Javascript regexp)';
-    function showPrompt(cm, options) {
-      var shortText = (options.prefix || '') + ' ' + (options.desc || '');
-      var prompt = makePrompt(options.prefix, options.desc);
-      dialog(cm, prompt, shortText, options.onClose, options);
-    }
-    function regexEqual(r1, r2) {
-      if (r1 instanceof RegExp && r2 instanceof RegExp) {
-          var props = ['global', 'multiline', 'ignoreCase', 'source'];
-          for (var i = 0; i < props.length; i++) {
-              var prop = props[i];
-              if (r1[prop] !== r2[prop]) {
-                  return false;
-              }
-          }
-          return true;
-      }
-      return false;
-    }
-    // Returns true if the query is valid.
-    function updateSearchQuery(cm, rawQuery, ignoreCase, smartCase) {
-      if (!rawQuery) {
-        return;
-      }
-      var state = getSearchState(cm);
-      var query = parseQuery(rawQuery, !!ignoreCase, !!smartCase);
-      if (!query) {
-        return;
-      }
-      highlightSearchMatches(cm, query);
-      if (regexEqual(query, state.getQuery())) {
-        return query;
-      }
-      state.setQuery(query);
-      return query;
-    }
-    function searchOverlay(query) {
-      if (query.source.charAt(0) == '^') {
-        var matchSol = true;
-      }
-      return {
-        token: function(stream) {
-          if (matchSol && !stream.sol()) {
-            stream.skipToEnd();
-            return;
-          }
-          var match = stream.match(query, false);
-          if (match) {
-            if (match[0].length == 0) {
-              // Matched empty string, skip to next.
-              stream.next();
-              return 'searching';
-            }
-            if (!stream.sol()) {
-              // Backtrack 1 to match \b
-              stream.backUp(1);
-              if (!query.exec(stream.next() + match[0])) {
-                stream.next();
-                return null;
-              }
-            }
-            stream.match(query);
-            return 'searching';
-          }
-          while (!stream.eol()) {
-            stream.next();
-            if (stream.match(query, false)) break;
-          }
-        },
-        query: query
-      };
-    }
-    function highlightSearchMatches(cm, query) {
-      var searchState = getSearchState(cm);
-      var overlay = searchState.getOverlay();
-      if (!overlay || query != overlay.query) {
-        if (overlay) {
-          cm.removeOverlay(overlay);
-        }
-        overlay = searchOverlay(query);
-        cm.addOverlay(overlay);
-        if (cm.showMatchesOnScrollbar) {
-          if (searchState.getScrollbarAnnotate()) {
-            searchState.getScrollbarAnnotate().clear();
-          }
-          searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query));
-        }
-        searchState.setOverlay(overlay);
-      }
-    }
-    function findNext(cm, prev, query, repeat) {
-      if (repeat === undefined) { repeat = 1; }
-      return cm.operation(function() {
-        var pos = cm.getCursor();
-        var cursor = cm.getSearchCursor(query, pos);
-        for (var i = 0; i < repeat; i++) {
-          var found = cursor.find(prev);
-          if (i == 0 && found && cursorEqual(cursor.from(), pos)) { found = cursor.find(prev); }
-          if (!found) {
-            // SearchCursor may have returned null because it hit EOF, wrap
-            // around and try again.
-            cursor = cm.getSearchCursor(query,
-                (prev) ? Pos(cm.lastLine()) : Pos(cm.firstLine(), 0) );
-            if (!cursor.find(prev)) {
-              return;
-            }
-          }
-        }
-        return cursor.from();
-      });
-    }
-    function clearSearchHighlight(cm) {
-      var state = getSearchState(cm);
-      cm.removeOverlay(getSearchState(cm).getOverlay());
-      state.setOverlay(null);
-      if (state.getScrollbarAnnotate()) {
-        state.getScrollbarAnnotate().clear();
-        state.setScrollbarAnnotate(null);
-      }
-    }
-    /**
-     * Check if pos is in the specified range, INCLUSIVE.
-     * Range can be specified with 1 or 2 arguments.
-     * If the first range argument is an array, treat it as an array of line
-     * numbers. Match pos against any of the lines.
-     * If the first range argument is a number,
-     *   if there is only 1 range argument, check if pos has the same line
-     *       number
-     *   if there are 2 range arguments, then check if pos is in between the two
-     *       range arguments.
-     */
-    function isInRange(pos, start, end) {
-      if (typeof pos != 'number') {
-        // Assume it is a cursor position. Get the line number.
-        pos = pos.line;
-      }
-      if (start instanceof Array) {
-        return inArray(pos, start);
-      } else {
-        if (end) {
-          return (pos >= start && pos <= end);
-        } else {
-          return pos == start;
-        }
-      }
-    }
-    function getUserVisibleLines(cm) {
-      var scrollInfo = cm.getScrollInfo();
-      var occludeToleranceTop = 6;
-      var occludeToleranceBottom = 10;
-      var from = cm.coordsChar({left:0, top: occludeToleranceTop + scrollInfo.top}, 'local');
-      var bottomY = scrollInfo.clientHeight - occludeToleranceBottom + scrollInfo.top;
-      var to = cm.coordsChar({left:0, top: bottomY}, 'local');
-      return {top: from.line, bottom: to.line};
-    }
-
-    var ExCommandDispatcher = function() {
-      this.buildCommandMap_();
-    };
-    ExCommandDispatcher.prototype = {
-      processCommand: function(cm, input, opt_params) {
-        var that = this;
-        cm.operation(function () {
-          cm.curOp.isVimOp = true;
-          that._processCommand(cm, input, opt_params);
-        });
-      },
-      _processCommand: function(cm, input, opt_params) {
-        var vim = cm.state.vim;
-        var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
-        var previousCommand = commandHistoryRegister.toString();
-        if (vim.visualMode) {
-          exitVisualMode(cm);
-        }
-        var inputStream = new CodeMirror.StringStream(input);
-        // update ": with the latest command whether valid or invalid
-        commandHistoryRegister.setText(input);
-        var params = opt_params || {};
-        params.input = input;
-        try {
-          this.parseInput_(cm, inputStream, params);
-        } catch(e) {
-          showConfirm(cm, e);
-          throw e;
-        }
-        var command;
-        var commandName;
-        if (!params.commandName) {
-          // If only a line range is defined, move to the line.
-          if (params.line !== undefined) {
-            commandName = 'move';
-          }
-        } else {
-          command = this.matchCommand_(params.commandName);
-          if (command) {
-            commandName = command.name;
-            if (command.excludeFromCommandHistory) {
-              commandHistoryRegister.setText(previousCommand);
-            }
-            this.parseCommandArgs_(inputStream, params, command);
-            if (command.type == 'exToKey') {
-              // Handle Ex to Key mapping.
-              for (var i = 0; i < command.toKeys.length; i++) {
-                CodeMirror.Vim.handleKey(cm, command.toKeys[i], 'mapping');
-              }
-              return;
-            } else if (command.type == 'exToEx') {
-              // Handle Ex to Ex mapping.
-              this.processCommand(cm, command.toInput);
-              return;
-            }
-          }
-        }
-        if (!commandName) {
-          showConfirm(cm, 'Not an editor command ":' + input + '"');
-          return;
-        }
-        try {
-          exCommands[commandName](cm, params);
-          // Possibly asynchronous commands (e.g. substitute, which might have a
-          // user confirmation), are responsible for calling the callback when
-          // done. All others have it taken care of for them here.
-          if ((!command || !command.possiblyAsync) && params.callback) {
-            params.callback();
-          }
-        } catch(e) {
-          showConfirm(cm, e);
-          throw e;
-        }
-      },
-      parseInput_: function(cm, inputStream, result) {
-        inputStream.eatWhile(':');
-        // Parse range.
-        if (inputStream.eat('%')) {
-          result.line = cm.firstLine();
-          result.lineEnd = cm.lastLine();
-        } else {
-          result.line = this.parseLineSpec_(cm, inputStream);
-          if (result.line !== undefined && inputStream.eat(',')) {
-            result.lineEnd = this.parseLineSpec_(cm, inputStream);
-          }
-        }
-
-        // Parse command name.
-        var commandMatch = inputStream.match(/^(\w+)/);
-        if (commandMatch) {
-          result.commandName = commandMatch[1];
-        } else {
-          result.commandName = inputStream.match(/.*/)[0];
-        }
-
-        return result;
-      },
-      parseLineSpec_: function(cm, inputStream) {
-        var numberMatch = inputStream.match(/^(\d+)/);
-        if (numberMatch) {
-          return parseInt(numberMatch[1], 10) - 1;
-        }
-        switch (inputStream.next()) {
-          case '.':
-            return cm.getCursor().line;
-          case '$':
-            return cm.lastLine();
-          case '\'':
-            var mark = cm.state.vim.marks[inputStream.next()];
-            if (mark && mark.find()) {
-              return mark.find().line;
-            }
-            throw new Error('Mark not set');
-          default:
-            inputStream.backUp(1);
-            return undefined;
-        }
-      },
-      parseCommandArgs_: function(inputStream, params, command) {
-        if (inputStream.eol()) {
-          return;
-        }
-        params.argString = inputStream.match(/.*/)[0];
-        // Parse command-line arguments
-        var delim = command.argDelimiter || /\s+/;
-        var args = trim(params.argString).split(delim);
-        if (args.length && args[0]) {
-          params.args = args;
-        }
-      },
-      matchCommand_: function(commandName) {
-        // Return the command in the command map that matches the shortest
-        // prefix of the passed in command name. The match is guaranteed to be
-        // unambiguous if the defaultExCommandMap's shortNames are set up
-        // correctly. (see @code{defaultExCommandMap}).
-        for (var i = commandName.length; i > 0; i--) {
-          var prefix = commandName.substring(0, i);
-          if (this.commandMap_[prefix]) {
-            var command = this.commandMap_[prefix];
-            if (command.name.indexOf(commandName) === 0) {
-              return command;
-            }
-          }
-        }
-        return null;
-      },
-      buildCommandMap_: function() {
-        this.commandMap_ = {};
-        for (var i = 0; i < defaultExCommandMap.length; i++) {
-          var command = defaultExCommandMap[i];
-          var key = command.shortName || command.name;
-          this.commandMap_[key] = command;
-        }
-      },
-      map: function(lhs, rhs, ctx) {
-        if (lhs != ':' && lhs.charAt(0) == ':') {
-          if (ctx) { throw Error('Mode not supported for ex mappings'); }
-          var commandName = lhs.substring(1);
-          if (rhs != ':' && rhs.charAt(0) == ':') {
-            // Ex to Ex mapping
-            this.commandMap_[commandName] = {
-              name: commandName,
-              type: 'exToEx',
-              toInput: rhs.substring(1),
-              user: true
-            };
-          } else {
-            // Ex to key mapping
-            this.commandMap_[commandName] = {
-              name: commandName,
-              type: 'exToKey',
-              toKeys: rhs,
-              user: true
-            };
-          }
-        } else {
-          if (rhs != ':' && rhs.charAt(0) == ':') {
-            // Key to Ex mapping.
-            var mapping = {
-              keys: lhs,
-              type: 'keyToEx',
-              exArgs: { input: rhs.substring(1) },
-              user: true};
-            if (ctx) { mapping.context = ctx; }
-            defaultKeymap.unshift(mapping);
-          } else {
-            // Key to key mapping
-            var mapping = {
-              keys: lhs,
-              type: 'keyToKey',
-              toKeys: rhs,
-              user: true
-            };
-            if (ctx) { mapping.context = ctx; }
-            defaultKeymap.unshift(mapping);
-          }
-        }
-      },
-      unmap: function(lhs, ctx) {
-        if (lhs != ':' && lhs.charAt(0) == ':') {
-          // Ex to Ex or Ex to key mapping
-          if (ctx) { throw Error('Mode not supported for ex mappings'); }
-          var commandName = lhs.substring(1);
-          if (this.commandMap_[commandName] && this.commandMap_[commandName].user) {
-            delete this.commandMap_[commandName];
-            return;
-          }
-        } else {
-          // Key to Ex or key to key mapping
-          var keys = lhs;
-          for (var i = 0; i < defaultKeymap.length; i++) {
-            if (keys == defaultKeymap[i].keys
-                && defaultKeymap[i].context === ctx
-                && defaultKeymap[i].user) {
-              defaultKeymap.splice(i, 1);
-              return;
-            }
-          }
-        }
-        throw Error('No such mapping.');
-      }
-    };
-
-    var exCommands = {
-      colorscheme: function(cm, params) {
-        if (!params.args || params.args.length < 1) {
-          showConfirm(cm, cm.getOption('theme'));
-          return;
-        }
-        cm.setOption('theme', params.args[0]);
-      },
-      map: function(cm, params, ctx) {
-        var mapArgs = params.args;
-        if (!mapArgs || mapArgs.length < 2) {
-          if (cm) {
-            showConfirm(cm, 'Invalid mapping: ' + params.input);
-          }
-          return;
-        }
-        exCommandDispatcher.map(mapArgs[0], mapArgs[1], ctx);
-      },
-      imap: function(cm, params) { this.map(cm, params, 'insert'); },
-      nmap: function(cm, params) { this.map(cm, params, 'normal'); },
-      vmap: function(cm, params) { this.map(cm, params, 'visual'); },
-      unmap: function(cm, params, ctx) {
-        var mapArgs = params.args;
-        if (!mapArgs || mapArgs.length < 1) {
-          if (cm) {
-            showConfirm(cm, 'No such mapping: ' + params.input);
-          }
-          return;
-        }
-        exCommandDispatcher.unmap(mapArgs[0], ctx);
-      },
-      move: function(cm, params) {
-        commandDispatcher.processCommand(cm, cm.state.vim, {
-            type: 'motion',
-            motion: 'moveToLineOrEdgeOfDocument',
-            motionArgs: { forward: false, explicitRepeat: true,
-              linewise: true },
-            repeatOverride: params.line+1});
-      },
-      set: function(cm, params) {
-        var setArgs = params.args;
-        // Options passed through to the setOption/getOption calls. May be passed in by the
-        // local/global versions of the set command
-        var setCfg = params.setCfg || {};
-        if (!setArgs || setArgs.length < 1) {
-          if (cm) {
-            showConfirm(cm, 'Invalid mapping: ' + params.input);
-          }
-          return;
-        }
-        var expr = setArgs[0].split('=');
-        var optionName = expr[0];
-        var value = expr[1];
-        var forceGet = false;
-
-        if (optionName.charAt(optionName.length - 1) == '?') {
-          // If post-fixed with ?, then the set is actually a get.
-          if (value) { throw Error('Trailing characters: ' + params.argString); }
-          optionName = optionName.substring(0, optionName.length - 1);
-          forceGet = true;
-        }
-        if (value === undefined && optionName.substring(0, 2) == 'no') {
-          // To set boolean options to false, the option name is prefixed with
-          // 'no'.
-          optionName = optionName.substring(2);
-          value = false;
-        }
-
-        var optionIsBoolean = options[optionName] && options[optionName].type == 'boolean';
-        if (optionIsBoolean && value == undefined) {
-          // Calling set with a boolean option sets it to true.
-          value = true;
-        }
-        // If no value is provided, then we assume this is a get.
-        if (!optionIsBoolean && value === undefined || forceGet) {
-          var oldValue = getOption(optionName, cm, setCfg);
-          if (oldValue === true || oldValue === false) {
-            showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
-          } else {
-            showConfirm(cm, '  ' + optionName + '=' + oldValue);
-          }
-        } else {
-          setOption(optionName, value, cm, setCfg);
-        }
-      },
-      setlocal: function (cm, params) {
-        // setCfg is passed through to setOption
-        params.setCfg = {scope: 'local'};
-        this.set(cm, params);
-      },
-      setglobal: function (cm, params) {
-        // setCfg is passed through to setOption
-        params.setCfg = {scope: 'global'};
-        this.set(cm, params);
-      },
-      registers: function(cm, params) {
-        var regArgs = params.args;
-        var registers = vimGlobalState.registerController.registers;
-        var regInfo = '----------Registers----------

    ';
-        if (!regArgs) {
-          for (var registerName in registers) {
-            var text = registers[registerName].toString();
-            if (text.length) {
-              regInfo += '"' + registerName + '    ' + text + '
    ';
-            }
-          }
-        } else {
-          var registerName;
-          regArgs = regArgs.join('');
-          for (var i = 0; i < regArgs.length; i++) {
-            registerName = regArgs.charAt(i);
-            if (!vimGlobalState.registerController.isValidRegister(registerName)) {
-              continue;
-            }
-            var register = registers[registerName] || new Register();
-            regInfo += '"' + registerName + '    ' + register.toString() + '
    ';
-          }
-        }
-        showConfirm(cm, regInfo);
-      },
-      sort: function(cm, params) {
-        var reverse, ignoreCase, unique, number;
-        function parseArgs() {
-          if (params.argString) {
-            var args = new CodeMirror.StringStream(params.argString);
-            if (args.eat('!')) { reverse = true; }
-            if (args.eol()) { return; }
-            if (!args.eatSpace()) { return 'Invalid arguments'; }
-            var opts = args.match(/[a-z]+/);
-            if (opts) {
-              opts = opts[0];
-              ignoreCase = opts.indexOf('i') != -1;
-              unique = opts.indexOf('u') != -1;
-              var decimal = opts.indexOf('d') != -1 && 1;
-              var hex = opts.indexOf('x') != -1 && 1;
-              var octal = opts.indexOf('o') != -1 && 1;
-              if (decimal + hex + octal > 1) { return 'Invalid arguments'; }
-              number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
-            }
-            if (args.match(/\/.*\//)) { return 'patterns not supported'; }
-          }
-        }
-        var err = parseArgs();
-        if (err) {
-          showConfirm(cm, err + ': ' + params.argString);
-          return;
-        }
-        var lineStart = params.line || cm.firstLine();
-        var lineEnd = params.lineEnd || params.line || cm.lastLine();
-        if (lineStart == lineEnd) { return; }
-        var curStart = Pos(lineStart, 0);
-        var curEnd = Pos(lineEnd, lineLength(cm, lineEnd));
-        var text = cm.getRange(curStart, curEnd).split('\n');
-        var numberRegex = (number == 'decimal') ? /(-?)([\d]+)/ :
-           (number == 'hex') ? /(-?)(?:0x)?([0-9a-f]+)/i :
-           (number == 'octal') ? /([0-7]+)/ : null;
-        var radix = (number == 'decimal') ? 10 : (number == 'hex') ? 16 : (number == 'octal') ? 8 : null;
-        var numPart = [], textPart = [];
-        if (number) {
-          for (var i = 0; i < text.length; i++) {
-            if (numberRegex.exec(text[i])) {
-              numPart.push(text[i]);
-            } else {
-              textPart.push(text[i]);
-            }
-          }
-        } else {
-          textPart = text;
-        }
-        function compareFn(a, b) {
-          if (reverse) { var tmp; tmp = a; a = b; b = tmp; }
-          if (ignoreCase) { a = a.toLowerCase(); b = b.toLowerCase(); }
-          var anum = number && numberRegex.exec(a);
-          var bnum = number && numberRegex.exec(b);
-          if (!anum) { return a < b ? -1 : 1; }
-          anum = parseInt((anum[1] + anum[2]).toLowerCase(), radix);
-          bnum = parseInt((bnum[1] + bnum[2]).toLowerCase(), radix);
-          return anum - bnum;
-        }
-        numPart.sort(compareFn);
-        textPart.sort(compareFn);
-        text = (!reverse) ? textPart.concat(numPart) : numPart.concat(textPart);
-        if (unique) { // Remove duplicate lines
-          var textOld = text;
-          var lastLine;
-          text = [];
-          for (var i = 0; i < textOld.length; i++) {
-            if (textOld[i] != lastLine) {
-              text.push(textOld[i]);
-            }
-            lastLine = textOld[i];
-          }
-        }
-        cm.replaceRange(text.join('\n'), curStart, curEnd);
-      },
-      global: function(cm, params) {
-        // a global command is of the form
-        // :[range]g/pattern/[cmd]
-        // argString holds the string /pattern/[cmd]
-        var argString = params.argString;
-        if (!argString) {
-          showConfirm(cm, 'Regular Expression missing from global');
-          return;
-        }
-        // range is specified here
-        var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
-        var lineEnd = params.lineEnd || params.line || cm.lastLine();
-        // get the tokens from argString
-        var tokens = splitBySlash(argString);
-        var regexPart = argString, cmd;
-        if (tokens.length) {
-          regexPart = tokens[0];
-          cmd = tokens.slice(1, tokens.length).join('/');
-        }
-        if (regexPart) {
-          // If regex part is empty, then use the previous query. Otherwise
-          // use the regex part as the new query.
-          try {
-           updateSearchQuery(cm, regexPart, true /** ignoreCase */,
-             true /** smartCase */);
-          } catch (e) {
-           showConfirm(cm, 'Invalid regex: ' + regexPart);
-           return;
-          }
-        }
-        // now that we have the regexPart, search for regex matches in the
-        // specified range of lines
-        var query = getSearchState(cm).getQuery();
-        var matchedLines = [], content = '';
-        for (var i = lineStart; i <= lineEnd; i++) {
-          var matched = query.test(cm.getLine(i));
-          if (matched) {
-            matchedLines.push(i+1);
-            content+= cm.getLine(i) + '
    ';
-          }
-        }
-        // if there is no [cmd], just display the list of matched lines
-        if (!cmd) {
-          showConfirm(cm, content);
-          return;
-        }
-        var index = 0;
-        var nextCommand = function() {
-          if (index < matchedLines.length) {
-            var command = matchedLines[index] + cmd;
-            exCommandDispatcher.processCommand(cm, command, {
-              callback: nextCommand
-            });
-          }
-          index++;
-        };
-        nextCommand();
-      },
-      substitute: function(cm, params) {
-        if (!cm.getSearchCursor) {
-          throw new Error('Search feature not available. Requires searchcursor.js or ' +
-              'any other getSearchCursor implementation.');
-        }
-        var argString = params.argString;
-        var tokens = argString ? splitBySlash(argString) : [];
-        var regexPart, replacePart = '', trailing, flagsPart, count;
-        var confirm = false; // Whether to confirm each replace.
-        var global = false; // True to replace all instances on a line, false to replace only 1.
-        if (tokens.length) {
-          regexPart = tokens[0];
-          replacePart = tokens[1];
-          if (replacePart !== undefined) {
-            if (getOption('pcre')) {
-              replacePart = unescapeRegexReplace(replacePart);
-            } else {
-              replacePart = translateRegexReplace(replacePart);
-            }
-            vimGlobalState.lastSubstituteReplacePart = replacePart;
-          }
-          trailing = tokens[2] ? tokens[2].split(' ') : [];
-        } else {
-          // either the argString is empty or its of the form ' hello/world'
-          // actually splitBySlash returns a list of tokens
-          // only if the string starts with a '/'
-          if (argString && argString.length) {
-            showConfirm(cm, 'Substitutions should be of the form ' +
-                ':s/pattern/replace/');
-            return;
-          }
-        }
-        // After the 3rd slash, we can have flags followed by a space followed
-        // by count.
-        if (trailing) {
-          flagsPart = trailing[0];
-          count = parseInt(trailing[1]);
-          if (flagsPart) {
-            if (flagsPart.indexOf('c') != -1) {
-              confirm = true;
-              flagsPart.replace('c', '');
-            }
-            if (flagsPart.indexOf('g') != -1) {
-              global = true;
-              flagsPart.replace('g', '');
-            }
-            regexPart = regexPart + '/' + flagsPart;
-          }
-        }
-        if (regexPart) {
-          // If regex part is empty, then use the previous query. Otherwise use
-          // the regex part as the new query.
-          try {
-            updateSearchQuery(cm, regexPart, true /** ignoreCase */,
-              true /** smartCase */);
-          } catch (e) {
-            showConfirm(cm, 'Invalid regex: ' + regexPart);
-            return;
-          }
-        }
-        replacePart = replacePart || vimGlobalState.lastSubstituteReplacePart;
-        if (replacePart === undefined) {
-          showConfirm(cm, 'No previous substitute regular expression');
-          return;
-        }
-        var state = getSearchState(cm);
-        var query = state.getQuery();
-        var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
-        var lineEnd = params.lineEnd || lineStart;
-        if (lineStart == cm.firstLine() && lineEnd == cm.lastLine()) {
-          lineEnd = Infinity;
-        }
-        if (count) {
-          lineStart = lineEnd;
-          lineEnd = lineStart + count - 1;
-        }
-        var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
-        var cursor = cm.getSearchCursor(query, startPos);
-        doReplace(cm, confirm, global, lineStart, lineEnd, cursor, query, replacePart, params.callback);
-      },
-      redo: CodeMirror.commands.redo,
-      undo: CodeMirror.commands.undo,
-      write: function(cm) {
-        if (CodeMirror.commands.save) {
-          // If a save command is defined, call it.
-          CodeMirror.commands.save(cm);
-        } else {
-          // Saves to text area if no save command is defined.
-          cm.save();
-        }
-      },
-      nohlsearch: function(cm) {
-        clearSearchHighlight(cm);
-      },
-      delmarks: function(cm, params) {
-        if (!params.argString || !trim(params.argString)) {
-          showConfirm(cm, 'Argument required');
-          return;
-        }
-
-        var state = cm.state.vim;
-        var stream = new CodeMirror.StringStream(trim(params.argString));
-        while (!stream.eol()) {
-          stream.eatSpace();
-
-          // Record the streams position at the beginning of the loop for use
-          // in error messages.
-          var count = stream.pos;
-
-          if (!stream.match(/[a-zA-Z]/, false)) {
-            showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
-            return;
-          }
-
-          var sym = stream.next();
-          // Check if this symbol is part of a range
-          if (stream.match('-', true)) {
-            // This symbol is part of a range.
-
-            // The range must terminate at an alphabetic character.
-            if (!stream.match(/[a-zA-Z]/, false)) {
-              showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
-              return;
-            }
-
-            var startMark = sym;
-            var finishMark = stream.next();
-            // The range must terminate at an alphabetic character which
-            // shares the same case as the start of the range.
-            if (isLowerCase(startMark) && isLowerCase(finishMark) ||
-                isUpperCase(startMark) && isUpperCase(finishMark)) {
-              var start = startMark.charCodeAt(0);
-              var finish = finishMark.charCodeAt(0);
-              if (start >= finish) {
-                showConfirm(cm, 'Invalid argument: ' + params.argString.substring(count));
-                return;
-              }
-
-              // Because marks are always ASCII values, and we have
-              // determined that they are the same case, we can use
-              // their char codes to iterate through the defined range.
-              for (var j = 0; j <= finish - start; j++) {
-                var mark = String.fromCharCode(start + j);
-                delete state.marks[mark];
-              }
-            } else {
-              showConfirm(cm, 'Invalid argument: ' + startMark + '-');
-              return;
-            }
-          } else {
-            // This symbol is a valid mark, and is not part of a range.
-            delete state.marks[sym];
-          }
-        }
-      }
-    };
-
-    var exCommandDispatcher = new ExCommandDispatcher();
-
-    /**
-    * @param {CodeMirror} cm CodeMirror instance we are in.
-    * @param {boolean} confirm Whether to confirm each replace.
-    * @param {Cursor} lineStart Line to start replacing from.
-    * @param {Cursor} lineEnd Line to stop replacing at.
-    * @param {RegExp} query Query for performing matches with.
-    * @param {string} replaceWith Text to replace matches with. May contain $1,
-    *     $2, etc for replacing captured groups using Javascript replace.
-    * @param {function()} callback A callback for when the replace is done.
-    */
-    function doReplace(cm, confirm, global, lineStart, lineEnd, searchCursor, query,
-        replaceWith, callback) {
-      // Set up all the functions.
-      cm.state.vim.exMode = true;
-      var done = false;
-      var lastPos = searchCursor.from();
-      function replaceAll() {
-        cm.operation(function() {
-          while (!done) {
-            replace();
-            next();
-          }
-          stop();
-        });
-      }
-      function replace() {
-        var text = cm.getRange(searchCursor.from(), searchCursor.to());
-        var newText = text.replace(query, replaceWith);
-        searchCursor.replace(newText);
-      }
-      function next() {
-        // The below only loops to skip over multiple occurrences on the same
-        // line when 'global' is not true.
-        while(searchCursor.findNext() &&
-              isInRange(searchCursor.from(), lineStart, lineEnd)) {
-          if (!global && lastPos && searchCursor.from().line == lastPos.line) {
-            continue;
-          }
-          cm.scrollIntoView(searchCursor.from(), 30);
-          cm.setSelection(searchCursor.from(), searchCursor.to());
-          lastPos = searchCursor.from();
-          done = false;
-          return;
-        }
-        done = true;
-      }
-      function stop(close) {
-        if (close) { close(); }
-        cm.focus();
-        if (lastPos) {
-          cm.setCursor(lastPos);
-          var vim = cm.state.vim;
-          vim.exMode = false;
-          vim.lastHPos = vim.lastHSPos = lastPos.ch;
-        }
-        if (callback) { callback(); }
-      }
-      function onPromptKeyDown(e, _value, close) {
-        // Swallow all keys.
-        CodeMirror.e_stop(e);
-        var keyName = CodeMirror.keyName(e);
-        switch (keyName) {
-          case 'Y':
-            replace(); next(); break;
-          case 'N':
-            next(); break;
-          case 'A':
-            // replaceAll contains a call to close of its own. We don't want it
-            // to fire too early or multiple times.
-            var savedCallback = callback;
-            callback = undefined;
-            cm.operation(replaceAll);
-            callback = savedCallback;
-            break;
-          case 'L':
-            replace();
-            // fall through and exit.
-          case 'Q':
-          case 'Esc':
-          case 'Ctrl-C':
-          case 'Ctrl-[':
-            stop(close);
-            break;
-        }
-        if (done) { stop(close); }
-        return true;
-      }
-
-      // Actually do replace.
-      next();
-      if (done) {
-        showConfirm(cm, 'No matches for ' + query.source);
-        return;
-      }
-      if (!confirm) {
-        replaceAll();
-        if (callback) { callback(); };
-        return;
-      }
-      showPrompt(cm, {
-        prefix: 'replace with ' + replaceWith + ' (y/n/a/q/l)',
-        onKeyDown: onPromptKeyDown
-      });
-    }
-
-    CodeMirror.keyMap.vim = {
-      attach: attachVimMap,
-      detach: detachVimMap,
-      call: cmKey
-    };
-
-    function exitInsertMode(cm) {
-      var vim = cm.state.vim;
-      var macroModeState = vimGlobalState.macroModeState;
-      var insertModeChangeRegister = vimGlobalState.registerController.getRegister('.');
-      var isPlaying = macroModeState.isPlaying;
-      var lastChange = macroModeState.lastInsertModeChanges;
-      // In case of visual block, the insertModeChanges are not saved as a
-      // single word, so we convert them to a single word
-      // so as to update the ". register as expected in real vim.
-      var text = [];
-      if (!isPlaying) {
-        var selLength = lastChange.inVisualBlock ? vim.lastSelection.visualBlock.height : 1;
-        var changes = lastChange.changes;
-        var text = [];
-        var i = 0;
-        // In case of multiple selections in blockwise visual,
-        // the inserted text, for example: 'foo', is stored as
-        // 'f', 'f', InsertModeKey 'o', 'o', 'o', 'o'. (if you have a block with 2 lines).
-        // We push the contents of the changes array as per the following:
-        // 1. In case of InsertModeKey, just increment by 1.
-        // 2. In case of a character, jump by selLength (2 in the example).
-        while (i < changes.length) {
-          // This loop will convert 'ffoooo' to 'foo'.
-          text.push(changes[i]);
-          if (changes[i] instanceof InsertModeKey) {
-             i++;
-          } else {
-             i+= selLength;
-          }
-        }
-        lastChange.changes = text;
-        cm.off('change', onChange);
-        CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
-      }
-      if (!isPlaying && vim.insertModeRepeat > 1) {
-        // Perform insert mode repeat for commands like 3,a and 3,o.
-        repeatLastEdit(cm, vim, vim.insertModeRepeat - 1,
-            true /** repeatForInsert */);
-        vim.lastEditInputState.repeatOverride = vim.insertModeRepeat;
-      }
-      delete vim.insertModeRepeat;
-      vim.insertMode = false;
-      cm.setCursor(cm.getCursor().line, cm.getCursor().ch-1);
-      cm.setOption('keyMap', 'vim');
-      cm.setOption('disableInput', true);
-      cm.toggleOverwrite(false); // exit replace mode if we were in it.
-      // update the ". register before exiting insert mode
-      insertModeChangeRegister.setText(lastChange.changes.join(''));
-      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-      if (macroModeState.isRecording) {
-        logInsertModeChange(macroModeState);
-      }
-    }
-
-    function _mapCommand(command) {
-      defaultKeymap.unshift(command);
-    }
-
-    function mapCommand(keys, type, name, args, extra) {
-      var command = {keys: keys, type: type};
-      command[type] = name;
-      command[type + "Args"] = args;
-      for (var key in extra)
-        command[key] = extra[key];
-      _mapCommand(command);
-    }
-
-    // The timeout in milliseconds for the two-character ESC keymap should be
-    // adjusted according to your typing speed to prevent false positives.
-    defineOption('insertModeEscKeysTimeout', 200, 'number');
-
-    CodeMirror.keyMap['vim-insert'] = {
-      // TODO: override navigation keys so that Esc will cancel automatic
-      // indentation from o, O, i_
-      'Ctrl-N': 'autocomplete',
-      'Ctrl-P': 'autocomplete',
-      'Enter': function(cm) {
-        var fn = CodeMirror.commands.newlineAndIndentContinueComment ||
-            CodeMirror.commands.newlineAndIndent;
-        fn(cm);
-      },
-      fallthrough: ['default'],
-      attach: attachVimMap,
-      detach: detachVimMap,
-      call: cmKey
-    };
-
-    CodeMirror.keyMap['vim-replace'] = {
-      'Backspace': 'goCharLeft',
-      fallthrough: ['vim-insert'],
-      attach: attachVimMap,
-      detach: detachVimMap,
-      call: cmKey
-    };
-
-    function executeMacroRegister(cm, vim, macroModeState, registerName) {
-      var register = vimGlobalState.registerController.getRegister(registerName);
-      if (registerName == ':') {
-        // Read-only register containing last Ex command.
-        if (register.keyBuffer[0]) {
-          exCommandDispatcher.processCommand(cm, register.keyBuffer[0]);
-        }
-        macroModeState.isPlaying = false;
-        return;
-      }
-      var keyBuffer = register.keyBuffer;
-      var imc = 0;
-      macroModeState.isPlaying = true;
-      macroModeState.replaySearchQueries = register.searchQueries.slice(0);
-      for (var i = 0; i < keyBuffer.length; i++) {
-        var text = keyBuffer[i];
-        var match, key;
-        while (text) {
-          // Pull off one command key, which is either a single character
-          // or a special sequence wrapped in '<' and '>', e.g. ''.
-          match = (/<\w+-.+?>|<\w+>|./).exec(text);
-          key = match[0];
-          text = text.substring(match.index + key.length);
-          CodeMirror.Vim.handleKey(cm, key, 'macro');
-          if (vim.insertMode) {
-            var changes = register.insertModeChanges[imc++].changes;
-            vimGlobalState.macroModeState.lastInsertModeChanges.changes =
-                changes;
-            repeatInsertModeChanges(cm, changes, 1);
-            exitInsertMode(cm);
-          }
-        }
-      };
-      macroModeState.isPlaying = false;
-    }
-
-    function logKey(macroModeState, key) {
-      if (macroModeState.isPlaying) { return; }
-      var registerName = macroModeState.latestRegister;
-      var register = vimGlobalState.registerController.getRegister(registerName);
-      if (register) {
-        register.pushText(key);
-      }
-    }
-
-    function logInsertModeChange(macroModeState) {
-      if (macroModeState.isPlaying) { return; }
-      var registerName = macroModeState.latestRegister;
-      var register = vimGlobalState.registerController.getRegister(registerName);
-      if (register && register.pushInsertModeChanges) {
-        register.pushInsertModeChanges(macroModeState.lastInsertModeChanges);
-      }
-    }
-
-    function logSearchQuery(macroModeState, query) {
-      if (macroModeState.isPlaying) { return; }
-      var registerName = macroModeState.latestRegister;
-      var register = vimGlobalState.registerController.getRegister(registerName);
-      if (register && register.pushSearchQuery) {
-        register.pushSearchQuery(query);
-      }
-    }
-
-    /**
-     * Listens for changes made in insert mode.
-     * Should only be active in insert mode.
-     */
-    function onChange(_cm, changeObj) {
-      var macroModeState = vimGlobalState.macroModeState;
-      var lastChange = macroModeState.lastInsertModeChanges;
-      if (!macroModeState.isPlaying) {
-        while(changeObj) {
-          lastChange.expectCursorActivityForChange = true;
-          if (changeObj.origin == '+input' || changeObj.origin == 'paste'
-              || changeObj.origin === undefined /* only in testing */) {
-            var text = changeObj.text.join('\n');
-            lastChange.changes.push(text);
-          }
-          // Change objects may be chained with next.
-          changeObj = changeObj.next;
-        }
-      }
-    }
-
-    /**
-    * Listens for any kind of cursor activity on CodeMirror.
-    */
-    function onCursorActivity(cm) {
-      var vim = cm.state.vim;
-      if (vim.insertMode) {
-        // Tracking cursor activity in insert mode (for macro support).
-        var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.isPlaying) { return; }
-        var lastChange = macroModeState.lastInsertModeChanges;
-        if (lastChange.expectCursorActivityForChange) {
-          lastChange.expectCursorActivityForChange = false;
-        } else {
-          // Cursor moved outside the context of an edit. Reset the change.
-          lastChange.changes = [];
-        }
-      } else if (!cm.curOp.isVimOp) {
-        handleExternalSelection(cm, vim);
-      }
-      if (vim.visualMode) {
-        updateFakeCursor(cm);
-      }
-    }
-    function updateFakeCursor(cm) {
-      var vim = cm.state.vim;
-      var from = clipCursorToContent(cm, copyCursor(vim.sel.head));
-      var to = offsetCursor(from, 0, 1);
-      if (vim.fakeCursor) {
-        vim.fakeCursor.clear();
-      }
-      vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
-    }
-    function handleExternalSelection(cm, vim) {
-      var anchor = cm.getCursor('anchor');
-      var head = cm.getCursor('head');
-      // Enter or exit visual mode to match mouse selection.
-      if (vim.visualMode && !cm.somethingSelected()) {
-        exitVisualMode(cm, false);
-      } else if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
-        vim.visualMode = true;
-        vim.visualLine = false;
-        CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-      }
-      if (vim.visualMode) {
-        // Bind CodeMirror selection model to vim selection model.
-        // Mouse selections are considered visual characterwise.
-        var headOffset = !cursorIsBefore(head, anchor) ? -1 : 0;
-        var anchorOffset = cursorIsBefore(head, anchor) ? -1 : 0;
-        head = offsetCursor(head, 0, headOffset);
-        anchor = offsetCursor(anchor, 0, anchorOffset);
-        vim.sel = {
-          anchor: anchor,
-          head: head
-        };
-        updateMark(cm, vim, '<', cursorMin(head, anchor));
-        updateMark(cm, vim, '>', cursorMax(head, anchor));
-      } else if (!vim.insertMode) {
-        // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
-        vim.lastHPos = cm.getCursor().ch;
-      }
-    }
-
-    /** Wrapper for special keys pressed in insert mode */
-    function InsertModeKey(keyName) {
-      this.keyName = keyName;
-    }
-
-    /**
-    * Handles raw key down events from the text area.
-    * - Should only be active in insert mode.
-    * - For recording deletes in insert mode.
-    */
-    function onKeyEventTargetKeyDown(e) {
-      var macroModeState = vimGlobalState.macroModeState;
-      var lastChange = macroModeState.lastInsertModeChanges;
-      var keyName = CodeMirror.keyName(e);
-      if (!keyName) { return; }
-      function onKeyFound() {
-        lastChange.changes.push(new InsertModeKey(keyName));
-        return true;
-      }
-      if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
-        CodeMirror.lookupKey(keyName, 'vim-insert', onKeyFound);
-      }
-    }
-
-    /**
-     * Repeats the last edit, which includes exactly 1 command and at most 1
-     * insert. Operator and motion commands are read from lastEditInputState,
-     * while action commands are read from lastEditActionCommand.
-     *
-     * If repeatForInsert is true, then the function was called by
-     * exitInsertMode to repeat the insert mode changes the user just made. The
-     * corresponding enterInsertMode call was made with a count.
-     */
-    function repeatLastEdit(cm, vim, repeat, repeatForInsert) {
-      var macroModeState = vimGlobalState.macroModeState;
-      macroModeState.isPlaying = true;
-      var isAction = !!vim.lastEditActionCommand;
-      var cachedInputState = vim.inputState;
-      function repeatCommand() {
-        if (isAction) {
-          commandDispatcher.processAction(cm, vim, vim.lastEditActionCommand);
-        } else {
-          commandDispatcher.evalInput(cm, vim);
-        }
-      }
-      function repeatInsert(repeat) {
-        if (macroModeState.lastInsertModeChanges.changes.length > 0) {
-          // For some reason, repeat cw in desktop VIM does not repeat
-          // insert mode changes. Will conform to that behavior.
-          repeat = !vim.lastEditActionCommand ? 1 : repeat;
-          var changeObject = macroModeState.lastInsertModeChanges;
-          repeatInsertModeChanges(cm, changeObject.changes, repeat);
-        }
-      }
-      vim.inputState = vim.lastEditInputState;
-      if (isAction && vim.lastEditActionCommand.interlaceInsertRepeat) {
-        // o and O repeat have to be interlaced with insert repeats so that the
-        // insertions appear on separate lines instead of the last line.
-        for (var i = 0; i < repeat; i++) {
-          repeatCommand();
-          repeatInsert(1);
-        }
-      } else {
-        if (!repeatForInsert) {
-          // Hack to get the cursor to end up at the right place. If I is
-          // repeated in insert mode repeat, cursor will be 1 insert
-          // change set left of where it should be.
-          repeatCommand();
-        }
-        repeatInsert(repeat);
-      }
-      vim.inputState = cachedInputState;
-      if (vim.insertMode && !repeatForInsert) {
-        // Don't exit insert mode twice. If repeatForInsert is set, then we
-        // were called by an exitInsertMode call lower on the stack.
-        exitInsertMode(cm);
-      }
-      macroModeState.isPlaying = false;
-    };
-
-    function repeatInsertModeChanges(cm, changes, repeat) {
-      function keyHandler(binding) {
-        if (typeof binding == 'string') {
-          CodeMirror.commands[binding](cm);
-        } else {
-          binding(cm);
-        }
-        return true;
-      }
-      var head = cm.getCursor('head');
-      var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock;
-      if (inVisualBlock) {
-        // Set up block selection again for repeating the changes.
-        var vim = cm.state.vim;
-        var lastSel = vim.lastSelection;
-        var offset = getOffset(lastSel.anchor, lastSel.head);
-        selectForInsert(cm, head, offset.line + 1);
-        repeat = cm.listSelections().length;
-        cm.setCursor(head);
-      }
-      for (var i = 0; i < repeat; i++) {
-        if (inVisualBlock) {
-          cm.setCursor(offsetCursor(head, i, 0));
-        }
-        for (var j = 0; j < changes.length; j++) {
-          var change = changes[j];
-          if (change instanceof InsertModeKey) {
-            CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
-          } else {
-            var cur = cm.getCursor();
-            cm.replaceRange(change, cur, cur);
-          }
-        }
-      }
-      if (inVisualBlock) {
-        cm.setCursor(offsetCursor(head, 0, 1));
-      }
-    }
-
-    resetVimGlobalState();
-    return vimApi;
-  };
-  // Initialize Vim and make it available as an API.
-  CodeMirror.Vim = Vim();
-});
diff --git a/www/code/codemirror-5.7/lib/codemirror.css b/www/code/codemirror-5.7/lib/codemirror.css
deleted file mode 100644
index 3543523e6..000000000
--- a/www/code/codemirror-5.7/lib/codemirror.css
+++ /dev/null
@@ -1,334 +0,0 @@
-/* BASICS */
-
-.CodeMirror {
-  /* Set height, width, borders, and global font properties here */
-  font-family: monospace;
-  height: 300px;
-  color: black;
-}
-
-/* PADDING */
-
-.CodeMirror-lines {
-  padding: 4px 0; /* Vertical padding around content */
-}
-.CodeMirror pre {
-  padding: 0 4px; /* Horizontal padding of content */
-}
-
-.CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  background-color: white; /* The little square between H and V scrollbars */
-}
-
-/* GUTTER */
-
-.CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
-  white-space: nowrap;
-}
-.CodeMirror-linenumbers {}
-.CodeMirror-linenumber {
-  padding: 0 3px 0 5px;
-  min-width: 20px;
-  text-align: right;
-  color: #999;
-  white-space: nowrap;
-}
-
-.CodeMirror-guttermarker { color: black; }
-.CodeMirror-guttermarker-subtle { color: #999; }
-
-/* CURSOR */
-
-.CodeMirror-cursor {
-  border-left: 1px solid black;
-  border-right: none;
-  width: 0;
-}
-/* Shown when moving in bi-directional text */
-.CodeMirror div.CodeMirror-secondarycursor {
-  border-left: 1px solid silver;
-}
-.cm-fat-cursor .CodeMirror-cursor {
-  width: auto;
-  border: 0;
-  background: #7e7;
-}
-.cm-fat-cursor div.CodeMirror-cursors {
-  z-index: 1;
-}
-
-.cm-animate-fat-cursor {
-  width: auto;
-  border: 0;
-  -webkit-animation: blink 1.06s steps(1) infinite;
-  -moz-animation: blink 1.06s steps(1) infinite;
-  animation: blink 1.06s steps(1) infinite;
-  background-color: #7e7;
-}
-@-moz-keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-@-webkit-keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-@keyframes blink {
-  0% {}
-  50% { background-color: transparent; }
-  100% {}
-}
-
-/* Can style cursor different in overwrite (non-insert) mode */
-.CodeMirror-overwrite .CodeMirror-cursor {}
-
-.cm-tab { display: inline-block; text-decoration: inherit; }
-
-.CodeMirror-ruler {
-  border-left: 1px solid #ccc;
-  position: absolute;
-}
-
-/* DEFAULT THEME */
-
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-.cm-strikethrough {text-decoration: line-through;}
-
-.cm-s-default .cm-keyword {color: #708;}
-.cm-s-default .cm-atom {color: #219;}
-.cm-s-default .cm-number {color: #164;}
-.cm-s-default .cm-def {color: #00f;}
-.cm-s-default .cm-variable,
-.cm-s-default .cm-punctuation,
-.cm-s-default .cm-property,
-.cm-s-default .cm-operator {}
-.cm-s-default .cm-variable-2 {color: #05a;}
-.cm-s-default .cm-variable-3 {color: #085;}
-.cm-s-default .cm-comment {color: #a50;}
-.cm-s-default .cm-string {color: #a11;}
-.cm-s-default .cm-string-2 {color: #f50;}
-.cm-s-default .cm-meta {color: #555;}
-.cm-s-default .cm-qualifier {color: #555;}
-.cm-s-default .cm-builtin {color: #30a;}
-.cm-s-default .cm-bracket {color: #997;}
-.cm-s-default .cm-tag {color: #170;}
-.cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-hr {color: #999;}
-.cm-s-default .cm-link {color: #00c;}
-
-.cm-s-default .cm-error {color: #f00;}
-.cm-invalidchar {color: #f00;}
-
-.CodeMirror-composing { border-bottom: 2px solid; }
-
-/* Default styles for common addons */
-
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
-.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
-.CodeMirror-activeline-background {background: #e8f2ff;}
-
-/* STOP */
-
-/* The rest of this file contains styles related to the mechanics of
-   the editor. You probably shouldn't touch them. */
-
-.CodeMirror {
-  position: relative;
-  overflow: hidden;
-  background: white;
-}
-
-.CodeMirror-scroll {
-  overflow: scroll !important; /* Things will break if this is overridden */
-  /* 30px is the magic margin used to hide the element's real scrollbars */
-  /* See overflow: hidden in .CodeMirror */
-  margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px;
-  height: 100%;
-  outline: none; /* Prevent dragging from highlighting the element */
-  position: relative;
-}
-.CodeMirror-sizer {
-  position: relative;
-  border-right: 30px solid transparent;
-}
-
-/* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actuall scrolling happens, thus preventing shaking and
-   flickering artifacts. */
-.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
-  position: absolute;
-  z-index: 6;
-  display: none;
-}
-.CodeMirror-vscrollbar {
-  right: 0; top: 0;
-  overflow-x: hidden;
-  overflow-y: scroll;
-}
-.CodeMirror-hscrollbar {
-  bottom: 0; left: 0;
-  overflow-y: hidden;
-  overflow-x: scroll;
-}
-.CodeMirror-scrollbar-filler {
-  right: 0; bottom: 0;
-}
-.CodeMirror-gutter-filler {
-  left: 0; bottom: 0;
-}
-
-.CodeMirror-gutters {
-  position: absolute; left: 0; top: 0;
-  z-index: 3;
-}
-.CodeMirror-gutter {
-  white-space: normal;
-  height: 100%;
-  display: inline-block;
-  margin-bottom: -30px;
-  /* Hack to make IE7 behave */
-  *zoom:1;
-  *display:inline;
-}
-.CodeMirror-gutter-wrapper {
-  position: absolute;
-  z-index: 4;
-  background: none !important;
-  border: none !important;
-}
-.CodeMirror-gutter-background {
-  position: absolute;
-  top: 0; bottom: 0;
-  z-index: 4;
-}
-.CodeMirror-gutter-elt {
-  position: absolute;
-  cursor: default;
-  z-index: 4;
-}
-.CodeMirror-gutter-wrapper {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  user-select: none;
-}
-
-.CodeMirror-lines {
-  cursor: text;
-  min-height: 1px; /* prevents collapsing before first draw */
-}
-.CodeMirror pre {
-  /* Reset some styles that the rest of the page might have set */
-  -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0;
-  border-width: 0;
-  background: transparent;
-  font-family: inherit;
-  font-size: inherit;
-  margin: 0;
-  white-space: pre;
-  word-wrap: normal;
-  line-height: inherit;
-  color: inherit;
-  z-index: 2;
-  position: relative;
-  overflow: visible;
-  -webkit-tap-highlight-color: transparent;
-}
-.CodeMirror-wrap pre {
-  word-wrap: break-word;
-  white-space: pre-wrap;
-  word-break: normal;
-}
-
-.CodeMirror-linebackground {
-  position: absolute;
-  left: 0; right: 0; top: 0; bottom: 0;
-  z-index: 0;
-}
-
-.CodeMirror-linewidget {
-  position: relative;
-  z-index: 2;
-  overflow: auto;
-}
-
-.CodeMirror-widget {}
-
-.CodeMirror-code {
-  outline: none;
-}
-
-/* Force content-box sizing for the elements where we expect it */
-.CodeMirror-scroll,
-.CodeMirror-sizer,
-.CodeMirror-gutter,
-.CodeMirror-gutters,
-.CodeMirror-linenumber {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-}
-
-.CodeMirror-measure {
-  position: absolute;
-  width: 100%;
-  height: 0;
-  overflow: hidden;
-  visibility: hidden;
-}
-
-.CodeMirror-cursor { position: absolute; }
-.CodeMirror-measure pre { position: static; }
-
-div.CodeMirror-cursors {
-  visibility: hidden;
-  position: relative;
-  z-index: 3;
-}
-div.CodeMirror-dragcursors {
-  visibility: visible;
-}
-
-.CodeMirror-focused div.CodeMirror-cursors {
-  visibility: visible;
-}
-
-.CodeMirror-selected { background: #d9d9d9; }
-.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
-.CodeMirror-crosshair { cursor: crosshair; }
-.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
-.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
-
-.cm-searching {
-  background: #ffa;
-  background: rgba(255, 255, 0, .4);
-}
-
-/* IE7 hack to prevent it from returning funny offsetTops on the spans */
-.CodeMirror span { *vertical-align: text-bottom; }
-
-/* Used to force a border model for a node */
-.cm-force-border { padding-right: .1px; }
-
-@media print {
-  /* Hide the cursor when printing */
-  .CodeMirror div.CodeMirror-cursors {
-    visibility: hidden;
-  }
-}
-
-/* See issue #2901 */
-.cm-tab-wrap-hack:after { content: ''; }
-
-/* Help users use markselection to safely style text background */
-span.CodeMirror-selectedtext { background: none; }
diff --git a/www/code/codemirror-5.7/lib/codemirror.js b/www/code/codemirror-5.7/lib/codemirror.js
deleted file mode 100644
index c6f9af859..000000000
--- a/www/code/codemirror-5.7/lib/codemirror.js
+++ /dev/null
@@ -1,8835 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// This is CodeMirror (http://codemirror.net), a code editor
-// implemented in JavaScript on top of the browser's DOM.
-//
-// You can find some technical background for some of the code below
-// at http://marijnhaverbeke.nl/blog/#cm-internals .
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    module.exports = mod();
-  else if (typeof define == "function" && define.amd) // AMD
-    return define([], mod);
-  else // Plain browser env
-    this.CodeMirror = mod();
-})(function() {
-  "use strict";
-
-  // BROWSER SNIFFING
-
-  // Kludges for bugs and behavior differences that can't be feature
-  // detected are enabled based on userAgent etc sniffing.
-
-  var gecko = /gecko\/\d/i.test(navigator.userAgent);
-  var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
-  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(navigator.userAgent);
-  var ie = ie_upto10 || ie_11up;
-  var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
-  var webkit = /WebKit\//.test(navigator.userAgent);
-  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
-  var chrome = /Chrome\//.test(navigator.userAgent);
-  var presto = /Opera\//.test(navigator.userAgent);
-  var safari = /Apple Computer/.test(navigator.vendor);
-  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
-  var phantom = /PhantomJS/.test(navigator.userAgent);
-
-  var ios = /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent);
-  // This is woefully incomplete. Suggestions for alternative methods welcome.
-  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent);
-  var mac = ios || /Mac/.test(navigator.platform);
-  var windows = /win/i.test(navigator.platform);
-
-  var presto_version = presto && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
-  if (presto_version) presto_version = Number(presto_version[1]);
-  if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
-  // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
-  var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
-  var captureRightClick = gecko || (ie && ie_version >= 9);
-
-  // Optimize some code when these features are not used.
-  var sawReadOnlySpans = false, sawCollapsedSpans = false;
-
-  // EDITOR CONSTRUCTOR
-
-  // A CodeMirror instance represents an editor. This is the object
-  // that user code is usually dealing with.
-
-  function CodeMirror(place, options) {
-    if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
-
-    this.options = options = options ? copyObj(options) : {};
-    // Determine effective options based on given values and defaults.
-    copyObj(defaults, options, false);
-    setGuttersForLineNumbers(options);
-
-    var doc = options.value;
-    if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator);
-    this.doc = doc;
-
-    var input = new CodeMirror.inputStyles[options.inputStyle](this);
-    var display = this.display = new Display(place, doc, input);
-    display.wrapper.CodeMirror = this;
-    updateGutters(this);
-    themeChanged(this);
-    if (options.lineWrapping)
-      this.display.wrapper.className += " CodeMirror-wrap";
-    if (options.autofocus && !mobile) display.input.focus();
-    initScrollbars(this);
-
-    this.state = {
-      keyMaps: [],  // stores maps added by addKeyMap
-      overlays: [], // highlighting overlays, as added by addOverlay
-      modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
-      overwrite: false,
-      delayingBlurEvent: false,
-      focused: false,
-      suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
-      pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
-      selectingText: false,
-      draggingText: false,
-      highlight: new Delayed(), // stores highlight worker timeout
-      keySeq: null,  // Unfinished key sequence
-      specialChars: null
-    };
-
-    var cm = this;
-
-    // Override magic textarea content restore that IE sometimes does
-    // on our hidden textarea on reload
-    if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true); }, 20);
-
-    registerEventHandlers(this);
-    ensureGlobalHandlers();
-
-    startOperation(this);
-    this.curOp.forceUpdate = true;
-    attachDoc(this, doc);
-
-    if ((options.autofocus && !mobile) || cm.hasFocus())
-      setTimeout(bind(onFocus, this), 20);
-    else
-      onBlur(this);
-
-    for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
-      optionHandlers[opt](this, options[opt], Init);
-    maybeUpdateLineNumberWidth(this);
-    if (options.finishInit) options.finishInit(this);
-    for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
-    endOperation(this);
-    // Suppress optimizelegibility in Webkit, since it breaks text
-    // measuring on line wrapping boundaries.
-    if (webkit && options.lineWrapping &&
-        getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
-      display.lineDiv.style.textRendering = "auto";
-  }
-
-  // DISPLAY CONSTRUCTOR
-
-  // The display handles the DOM integration, both for input reading
-  // and content drawing. It holds references to DOM nodes and
-  // display-related state.
-
-  function Display(place, doc, input) {
-    var d = this;
-    this.input = input;
-
-    // Covers bottom-right square when both scrollbars are present.
-    d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
-    d.scrollbarFiller.setAttribute("cm-not-content", "true");
-    // Covers bottom of gutter when coverGutterNextToScrollbar is on
-    // and h scrollbar is present.
-    d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
-    d.gutterFiller.setAttribute("cm-not-content", "true");
-    // Will contain the actual code, positioned to cover the viewport.
-    d.lineDiv = elt("div", null, "CodeMirror-code");
-    // Elements are added to these to represent selection and cursors.
-    d.selectionDiv = elt("div", null, null, "position: relative; z-index: 1");
-    d.cursorDiv = elt("div", null, "CodeMirror-cursors");
-    // A visibility: hidden element used to find the size of things.
-    d.measure = elt("div", null, "CodeMirror-measure");
-    // When lines outside of the viewport are measured, they are drawn in this.
-    d.lineMeasure = elt("div", null, "CodeMirror-measure");
-    // Wraps everything that needs to exist inside the vertically-padded coordinate system
-    d.lineSpace = elt("div", [d.measure, d.lineMeasure, d.selectionDiv, d.cursorDiv, d.lineDiv],
-                      null, "position: relative; outline: none");
-    // Moved around its parent to cover visible view.
-    d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
-    // Set to the height of the document, allowing scrolling.
-    d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
-    d.sizerWidth = null;
-    // Behavior of elts with overflow: auto and padding is
-    // inconsistent across browsers. This is used to ensure the
-    // scrollable area is big enough.
-    d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
-    // Will contain the gutters, if any.
-    d.gutters = elt("div", null, "CodeMirror-gutters");
-    d.lineGutter = null;
-    // Actual scrollable element.
-    d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
-    d.scroller.setAttribute("tabIndex", "-1");
-    // The element in which the editor lives.
-    d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
-
-    // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
-    if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
-    if (!webkit && !(gecko && mobile)) d.scroller.draggable = true;
-
-    if (place) {
-      if (place.appendChild) place.appendChild(d.wrapper);
-      else place(d.wrapper);
-    }
-
-    // Current rendered range (may be bigger than the view window).
-    d.viewFrom = d.viewTo = doc.first;
-    d.reportedViewFrom = d.reportedViewTo = doc.first;
-    // Information about the rendered lines.
-    d.view = [];
-    d.renderedView = null;
-    // Holds info about a single rendered line when it was rendered
-    // for measurement, while not in view.
-    d.externalMeasured = null;
-    // Empty space (in pixels) above the view
-    d.viewOffset = 0;
-    d.lastWrapHeight = d.lastWrapWidth = 0;
-    d.updateLineNumbers = null;
-
-    d.nativeBarWidth = d.barHeight = d.barWidth = 0;
-    d.scrollbarsClipped = false;
-
-    // Used to only resize the line number gutter when necessary (when
-    // the amount of lines crosses a boundary that makes its width change)
-    d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
-    // Set to true when a non-horizontal-scrolling line widget is
-    // added. As an optimization, line widget aligning is skipped when
-    // this is false.
-    d.alignWidgets = false;
-
-    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
-
-    // Tracks the maximum line length so that the horizontal scrollbar
-    // can be kept static when scrolling.
-    d.maxLine = null;
-    d.maxLineLength = 0;
-    d.maxLineChanged = false;
-
-    // Used for measuring wheel scrolling granularity
-    d.wheelDX = d.wheelDY = d.wheelStartX = d.wheelStartY = null;
-
-    // True when shift is held down.
-    d.shift = false;
-
-    // Used to track whether anything happened since the context menu
-    // was opened.
-    d.selForContextMenu = null;
-
-    d.activeTouch = null;
-
-    input.init(d);
-  }
-
-  // STATE UPDATES
-
-  // Used to get the editor into a consistent state again when options change.
-
-  function loadMode(cm) {
-    cm.doc.mode = CodeMirror.getMode(cm.options, cm.doc.modeOption);
-    resetModeState(cm);
-  }
-
-  function resetModeState(cm) {
-    cm.doc.iter(function(line) {
-      if (line.stateAfter) line.stateAfter = null;
-      if (line.styles) line.styles = null;
-    });
-    cm.doc.frontier = cm.doc.first;
-    startWorker(cm, 100);
-    cm.state.modeGen++;
-    if (cm.curOp) regChange(cm);
-  }
-
-  function wrappingChanged(cm) {
-    if (cm.options.lineWrapping) {
-      addClass(cm.display.wrapper, "CodeMirror-wrap");
-      cm.display.sizer.style.minWidth = "";
-      cm.display.sizerWidth = null;
-    } else {
-      rmClass(cm.display.wrapper, "CodeMirror-wrap");
-      findMaxLine(cm);
-    }
-    estimateLineHeights(cm);
-    regChange(cm);
-    clearCaches(cm);
-    setTimeout(function(){updateScrollbars(cm);}, 100);
-  }
-
-  // Returns a function that estimates the height of a line, to use as
-  // first approximation until the line becomes visible (and is thus
-  // properly measurable).
-  function estimateHeight(cm) {
-    var th = textHeight(cm.display), wrapping = cm.options.lineWrapping;
-    var perLine = wrapping && Math.max(5, cm.display.scroller.clientWidth / charWidth(cm.display) - 3);
-    return function(line) {
-      if (lineIsHidden(cm.doc, line)) return 0;
-
-      var widgetsHeight = 0;
-      if (line.widgets) for (var i = 0; i < line.widgets.length; i++) {
-        if (line.widgets[i].height) widgetsHeight += line.widgets[i].height;
-      }
-
-      if (wrapping)
-        return widgetsHeight + (Math.ceil(line.text.length / perLine) || 1) * th;
-      else
-        return widgetsHeight + th;
-    };
-  }
-
-  function estimateLineHeights(cm) {
-    var doc = cm.doc, est = estimateHeight(cm);
-    doc.iter(function(line) {
-      var estHeight = est(line);
-      if (estHeight != line.height) updateLineHeight(line, estHeight);
-    });
-  }
-
-  function themeChanged(cm) {
-    cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
-      cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
-    clearCaches(cm);
-  }
-
-  function guttersChanged(cm) {
-    updateGutters(cm);
-    regChange(cm);
-    setTimeout(function(){alignHorizontally(cm);}, 20);
-  }
-
-  // Rebuild the gutter elements, ensure the margin to the left of the
-  // code matches their width.
-  function updateGutters(cm) {
-    var gutters = cm.display.gutters, specs = cm.options.gutters;
-    removeChildren(gutters);
-    for (var i = 0; i < specs.length; ++i) {
-      var gutterClass = specs[i];
-      var gElt = gutters.appendChild(elt("div", null, "CodeMirror-gutter " + gutterClass));
-      if (gutterClass == "CodeMirror-linenumbers") {
-        cm.display.lineGutter = gElt;
-        gElt.style.width = (cm.display.lineNumWidth || 1) + "px";
-      }
-    }
-    gutters.style.display = i ? "" : "none";
-    updateGutterSpace(cm);
-  }
-
-  function updateGutterSpace(cm) {
-    var width = cm.display.gutters.offsetWidth;
-    cm.display.sizer.style.marginLeft = width + "px";
-  }
-
-  // Compute the character length of a line, taking into account
-  // collapsed ranges (see markText) that might hide parts, and join
-  // other lines onto it.
-  function lineLength(line) {
-    if (line.height == 0) return 0;
-    var len = line.text.length, merged, cur = line;
-    while (merged = collapsedSpanAtStart(cur)) {
-      var found = merged.find(0, true);
-      cur = found.from.line;
-      len += found.from.ch - found.to.ch;
-    }
-    cur = line;
-    while (merged = collapsedSpanAtEnd(cur)) {
-      var found = merged.find(0, true);
-      len -= cur.text.length - found.from.ch;
-      cur = found.to.line;
-      len += cur.text.length - found.to.ch;
-    }
-    return len;
-  }
-
-  // Find the longest line in the document.
-  function findMaxLine(cm) {
-    var d = cm.display, doc = cm.doc;
-    d.maxLine = getLine(doc, doc.first);
-    d.maxLineLength = lineLength(d.maxLine);
-    d.maxLineChanged = true;
-    doc.iter(function(line) {
-      var len = lineLength(line);
-      if (len > d.maxLineLength) {
-        d.maxLineLength = len;
-        d.maxLine = line;
-      }
-    });
-  }
-
-  // Make sure the gutters options contains the element
-  // "CodeMirror-linenumbers" when the lineNumbers option is true.
-  function setGuttersForLineNumbers(options) {
-    var found = indexOf(options.gutters, "CodeMirror-linenumbers");
-    if (found == -1 && options.lineNumbers) {
-      options.gutters = options.gutters.concat(["CodeMirror-linenumbers"]);
-    } else if (found > -1 && !options.lineNumbers) {
-      options.gutters = options.gutters.slice(0);
-      options.gutters.splice(found, 1);
-    }
-  }
-
-  // SCROLLBARS
-
-  // Prepare DOM reads needed to update the scrollbars. Done in one
-  // shot to minimize update/measure roundtrips.
-  function measureForScrollbars(cm) {
-    var d = cm.display, gutterW = d.gutters.offsetWidth;
-    var docH = Math.round(cm.doc.height + paddingVert(cm.display));
-    return {
-      clientHeight: d.scroller.clientHeight,
-      viewHeight: d.wrapper.clientHeight,
-      scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
-      viewWidth: d.wrapper.clientWidth,
-      barLeft: cm.options.fixedGutter ? gutterW : 0,
-      docHeight: docH,
-      scrollHeight: docH + scrollGap(cm) + d.barHeight,
-      nativeBarWidth: d.nativeBarWidth,
-      gutterWidth: gutterW
-    };
-  }
-
-  function NativeScrollbars(place, scroll, cm) {
-    this.cm = cm;
-    var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
-    var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
-    place(vert); place(horiz);
-
-    on(vert, "scroll", function() {
-      if (vert.clientHeight) scroll(vert.scrollTop, "vertical");
-    });
-    on(horiz, "scroll", function() {
-      if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
-    });
-
-    this.checkedOverlay = false;
-    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-    if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
-  }
-
-  NativeScrollbars.prototype = copyObj({
-    update: function(measure) {
-      var needsH = measure.scrollWidth > measure.clientWidth + 1;
-      var needsV = measure.scrollHeight > measure.clientHeight + 1;
-      var sWidth = measure.nativeBarWidth;
-
-      if (needsV) {
-        this.vert.style.display = "block";
-        this.vert.style.bottom = needsH ? sWidth + "px" : "0";
-        var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
-        // A bug in IE8 can cause this value to be negative, so guard it.
-        this.vert.firstChild.style.height =
-          Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
-      } else {
-        this.vert.style.display = "";
-        this.vert.firstChild.style.height = "0";
-      }
-
-      if (needsH) {
-        this.horiz.style.display = "block";
-        this.horiz.style.right = needsV ? sWidth + "px" : "0";
-        this.horiz.style.left = measure.barLeft + "px";
-        var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
-        this.horiz.firstChild.style.width =
-          (measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
-      } else {
-        this.horiz.style.display = "";
-        this.horiz.firstChild.style.width = "0";
-      }
-
-      if (!this.checkedOverlay && measure.clientHeight > 0) {
-        if (sWidth == 0) this.overlayHack();
-        this.checkedOverlay = true;
-      }
-
-      return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
-    },
-    setScrollLeft: function(pos) {
-      if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
-    },
-    setScrollTop: function(pos) {
-      if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
-    },
-    overlayHack: function() {
-      var w = mac && !mac_geMountainLion ? "12px" : "18px";
-      this.horiz.style.minHeight = this.vert.style.minWidth = w;
-      var self = this;
-      var barMouseDown = function(e) {
-        if (e_target(e) != self.vert && e_target(e) != self.horiz)
-          operation(self.cm, onMouseDown)(e);
-      };
-      on(this.vert, "mousedown", barMouseDown);
-      on(this.horiz, "mousedown", barMouseDown);
-    },
-    clear: function() {
-      var parent = this.horiz.parentNode;
-      parent.removeChild(this.horiz);
-      parent.removeChild(this.vert);
-    }
-  }, NativeScrollbars.prototype);
-
-  function NullScrollbars() {}
-
-  NullScrollbars.prototype = copyObj({
-    update: function() { return {bottom: 0, right: 0}; },
-    setScrollLeft: function() {},
-    setScrollTop: function() {},
-    clear: function() {}
-  }, NullScrollbars.prototype);
-
-  CodeMirror.scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
-
-  function initScrollbars(cm) {
-    if (cm.display.scrollbars) {
-      cm.display.scrollbars.clear();
-      if (cm.display.scrollbars.addClass)
-        rmClass(cm.display.wrapper, cm.display.scrollbars.addClass);
-    }
-
-    cm.display.scrollbars = new CodeMirror.scrollbarModel[cm.options.scrollbarStyle](function(node) {
-      cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
-      // Prevent clicks in the scrollbars from killing focus
-      on(node, "mousedown", function() {
-        if (cm.state.focused) setTimeout(function() { cm.display.input.focus(); }, 0);
-      });
-      node.setAttribute("cm-not-content", "true");
-    }, function(pos, axis) {
-      if (axis == "horizontal") setScrollLeft(cm, pos);
-      else setScrollTop(cm, pos);
-    }, cm);
-    if (cm.display.scrollbars.addClass)
-      addClass(cm.display.wrapper, cm.display.scrollbars.addClass);
-  }
-
-  function updateScrollbars(cm, measure) {
-    if (!measure) measure = measureForScrollbars(cm);
-    var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
-    updateScrollbarsInner(cm, measure);
-    for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
-      if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
-        updateHeightsInViewport(cm);
-      updateScrollbarsInner(cm, measureForScrollbars(cm));
-      startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
-    }
-  }
-
-  // Re-synchronize the fake scrollbars with the actual size of the
-  // content.
-  function updateScrollbarsInner(cm, measure) {
-    var d = cm.display;
-    var sizes = d.scrollbars.update(measure);
-
-    d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
-    d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
-
-    if (sizes.right && sizes.bottom) {
-      d.scrollbarFiller.style.display = "block";
-      d.scrollbarFiller.style.height = sizes.bottom + "px";
-      d.scrollbarFiller.style.width = sizes.right + "px";
-    } else d.scrollbarFiller.style.display = "";
-    if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
-      d.gutterFiller.style.display = "block";
-      d.gutterFiller.style.height = sizes.bottom + "px";
-      d.gutterFiller.style.width = measure.gutterWidth + "px";
-    } else d.gutterFiller.style.display = "";
-  }
-
-  // Compute the lines that are visible in a given viewport (defaults
-  // the the current scroll position). viewport may contain top,
-  // height, and ensure (see op.scrollToPos) properties.
-  function visibleLines(display, doc, viewport) {
-    var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
-    top = Math.floor(top - paddingTop(display));
-    var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
-
-    var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
-    // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
-    // forces those lines into the viewport (if possible).
-    if (viewport && viewport.ensure) {
-      var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
-      if (ensureFrom < from) {
-        from = ensureFrom;
-        to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
-      } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
-        from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
-        to = ensureTo;
-      }
-    }
-    return {from: from, to: Math.max(to, from + 1)};
-  }
-
-  // LINE NUMBERS
-
-  // Re-align line numbers and gutter marks to compensate for
-  // horizontal scrolling.
-  function alignHorizontally(cm) {
-    var display = cm.display, view = display.view;
-    if (!display.alignWidgets && (!display.gutters.firstChild || !cm.options.fixedGutter)) return;
-    var comp = compensateForHScroll(display) - display.scroller.scrollLeft + cm.doc.scrollLeft;
-    var gutterW = display.gutters.offsetWidth, left = comp + "px";
-    for (var i = 0; i < view.length; i++) if (!view[i].hidden) {
-      if (cm.options.fixedGutter && view[i].gutter)
-        view[i].gutter.style.left = left;
-      var align = view[i].alignable;
-      if (align) for (var j = 0; j < align.length; j++)
-        align[j].style.left = left;
-    }
-    if (cm.options.fixedGutter)
-      display.gutters.style.left = (comp + gutterW) + "px";
-  }
-
-  // Used to ensure that the line number gutter is still the right
-  // size for the current document size. Returns true when an update
-  // is needed.
-  function maybeUpdateLineNumberWidth(cm) {
-    if (!cm.options.lineNumbers) return false;
-    var doc = cm.doc, last = lineNumberFor(cm.options, doc.first + doc.size - 1), display = cm.display;
-    if (last.length != display.lineNumChars) {
-      var test = display.measure.appendChild(elt("div", [elt("div", last)],
-                                                 "CodeMirror-linenumber CodeMirror-gutter-elt"));
-      var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
-      display.lineGutter.style.width = "";
-      display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
-      display.lineNumWidth = display.lineNumInnerWidth + padding;
-      display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
-      display.lineGutter.style.width = display.lineNumWidth + "px";
-      updateGutterSpace(cm);
-      return true;
-    }
-    return false;
-  }
-
-  function lineNumberFor(options, i) {
-    return String(options.lineNumberFormatter(i + options.firstLineNumber));
-  }
-
-  // Computes display.scroller.scrollLeft + display.gutters.offsetWidth,
-  // but using getBoundingClientRect to get a sub-pixel-accurate
-  // result.
-  function compensateForHScroll(display) {
-    return display.scroller.getBoundingClientRect().left - display.sizer.getBoundingClientRect().left;
-  }
-
-  // DISPLAY DRAWING
-
-  function DisplayUpdate(cm, viewport, force) {
-    var display = cm.display;
-
-    this.viewport = viewport;
-    // Store some values that we'll need later (but don't want to force a relayout for)
-    this.visible = visibleLines(display, cm.doc, viewport);
-    this.editorIsHidden = !display.wrapper.offsetWidth;
-    this.wrapperHeight = display.wrapper.clientHeight;
-    this.wrapperWidth = display.wrapper.clientWidth;
-    this.oldDisplayWidth = displayWidth(cm);
-    this.force = force;
-    this.dims = getDimensions(cm);
-    this.events = [];
-  }
-
-  DisplayUpdate.prototype.signal = function(emitter, type) {
-    if (hasHandler(emitter, type))
-      this.events.push(arguments);
-  };
-  DisplayUpdate.prototype.finish = function() {
-    for (var i = 0; i < this.events.length; i++)
-      signal.apply(null, this.events[i]);
-  };
-
-  function maybeClipScrollbars(cm) {
-    var display = cm.display;
-    if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
-      display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
-      display.heightForcer.style.height = scrollGap(cm) + "px";
-      display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
-      display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
-      display.scrollbarsClipped = true;
-    }
-  }
-
-  // Does the actual updating of the line display. Bails out
-  // (returning false) when there is nothing to be done and forced is
-  // false.
-  function updateDisplayIfNeeded(cm, update) {
-    var display = cm.display, doc = cm.doc;
-
-    if (update.editorIsHidden) {
-      resetView(cm);
-      return false;
-    }
-
-    // Bail out if the visible area is already rendered and nothing changed.
-    if (!update.force &&
-        update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
-        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
-        display.renderedView == display.view && countDirtyView(cm) == 0)
-      return false;
-
-    if (maybeUpdateLineNumberWidth(cm)) {
-      resetView(cm);
-      update.dims = getDimensions(cm);
-    }
-
-    // Compute a suitable new viewport (from & to)
-    var end = doc.first + doc.size;
-    var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
-    var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
-    if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom);
-    if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo);
-    if (sawCollapsedSpans) {
-      from = visualLineNo(cm.doc, from);
-      to = visualLineEndNo(cm.doc, to);
-    }
-
-    var different = from != display.viewFrom || to != display.viewTo ||
-      display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
-    adjustView(cm, from, to);
-
-    display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
-    // Position the mover div to align with the current scroll position
-    cm.display.mover.style.top = display.viewOffset + "px";
-
-    var toUpdate = countDirtyView(cm);
-    if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
-        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
-      return false;
-
-    // For big changes, we hide the enclosing element during the
-    // update, since that speeds up the operations on most browsers.
-    var focused = activeElt();
-    if (toUpdate > 4) display.lineDiv.style.display = "none";
-    patchDisplay(cm, display.updateLineNumbers, update.dims);
-    if (toUpdate > 4) display.lineDiv.style.display = "";
-    display.renderedView = display.view;
-    // There might have been a widget with a focused element that got
-    // hidden or updated, if so re-focus it.
-    if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
-
-    // Prevent selection and cursors from interfering with the scroll
-    // width and height.
-    removeChildren(display.cursorDiv);
-    removeChildren(display.selectionDiv);
-    display.gutters.style.height = display.sizer.style.minHeight = 0;
-
-    if (different) {
-      display.lastWrapHeight = update.wrapperHeight;
-      display.lastWrapWidth = update.wrapperWidth;
-      startWorker(cm, 400);
-    }
-
-    display.updateLineNumbers = null;
-
-    return true;
-  }
-
-  function postUpdateDisplay(cm, update) {
-    var viewport = update.viewport;
-    for (var first = true;; first = false) {
-      if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
-        // Clip forced viewport to actual scrollable area.
-        if (viewport && viewport.top != null)
-          viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)};
-        // Updated line heights might result in the drawn area not
-        // actually covering the viewport. Keep looping until it does.
-        update.visible = visibleLines(cm.display, cm.doc, viewport);
-        if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
-          break;
-      }
-      if (!updateDisplayIfNeeded(cm, update)) break;
-      updateHeightsInViewport(cm);
-      var barMeasure = measureForScrollbars(cm);
-      updateSelection(cm);
-      setDocumentHeight(cm, barMeasure);
-      updateScrollbars(cm, barMeasure);
-    }
-
-    update.signal(cm, "update", cm);
-    if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
-      update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
-      cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
-    }
-  }
-
-  function updateDisplaySimple(cm, viewport) {
-    var update = new DisplayUpdate(cm, viewport);
-    if (updateDisplayIfNeeded(cm, update)) {
-      updateHeightsInViewport(cm);
-      postUpdateDisplay(cm, update);
-      var barMeasure = measureForScrollbars(cm);
-      updateSelection(cm);
-      setDocumentHeight(cm, barMeasure);
-      updateScrollbars(cm, barMeasure);
-      update.finish();
-    }
-  }
-
-  function setDocumentHeight(cm, measure) {
-    cm.display.sizer.style.minHeight = measure.docHeight + "px";
-    var total = measure.docHeight + cm.display.barHeight;
-    cm.display.heightForcer.style.top = total + "px";
-    cm.display.gutters.style.height = Math.max(total + scrollGap(cm), measure.clientHeight) + "px";
-  }
-
-  // Read the actual heights of the rendered lines, and update their
-  // stored heights to match.
-  function updateHeightsInViewport(cm) {
-    var display = cm.display;
-    var prevBottom = display.lineDiv.offsetTop;
-    for (var i = 0; i < display.view.length; i++) {
-      var cur = display.view[i], height;
-      if (cur.hidden) continue;
-      if (ie && ie_version < 8) {
-        var bot = cur.node.offsetTop + cur.node.offsetHeight;
-        height = bot - prevBottom;
-        prevBottom = bot;
-      } else {
-        var box = cur.node.getBoundingClientRect();
-        height = box.bottom - box.top;
-      }
-      var diff = cur.line.height - height;
-      if (height < 2) height = textHeight(display);
-      if (diff > .001 || diff < -.001) {
-        updateLineHeight(cur.line, height);
-        updateWidgetHeight(cur.line);
-        if (cur.rest) for (var j = 0; j < cur.rest.length; j++)
-          updateWidgetHeight(cur.rest[j]);
-      }
-    }
-  }
-
-  // Read and store the height of line widgets associated with the
-  // given line.
-  function updateWidgetHeight(line) {
-    if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
-      line.widgets[i].height = line.widgets[i].node.offsetHeight;
-  }
-
-  // Do a bulk-read of the DOM positions and sizes needed to draw the
-  // view, so that we don't interleave reading and writing to the DOM.
-  function getDimensions(cm) {
-    var d = cm.display, left = {}, width = {};
-    var gutterLeft = d.gutters.clientLeft;
-    for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
-      left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;
-      width[cm.options.gutters[i]] = n.clientWidth;
-    }
-    return {fixedPos: compensateForHScroll(d),
-            gutterTotalWidth: d.gutters.offsetWidth,
-            gutterLeft: left,
-            gutterWidth: width,
-            wrapperWidth: d.wrapper.clientWidth};
-  }
-
-  // Sync the actual display DOM structure with display.view, removing
-  // nodes for lines that are no longer in view, and creating the ones
-  // that are not there yet, and updating the ones that are out of
-  // date.
-  function patchDisplay(cm, updateNumbersFrom, dims) {
-    var display = cm.display, lineNumbers = cm.options.lineNumbers;
-    var container = display.lineDiv, cur = container.firstChild;
-
-    function rm(node) {
-      var next = node.nextSibling;
-      // Works around a throw-scroll bug in OS X Webkit
-      if (webkit && mac && cm.display.currentWheelTarget == node)
-        node.style.display = "none";
-      else
-        node.parentNode.removeChild(node);
-      return next;
-    }
-
-    var view = display.view, lineN = display.viewFrom;
-    // Loop over the elements in the view, syncing cur (the DOM nodes
-    // in display.lineDiv) with the view as we go.
-    for (var i = 0; i < view.length; i++) {
-      var lineView = view[i];
-      if (lineView.hidden) {
-      } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
-        var node = buildLineElement(cm, lineView, lineN, dims);
-        container.insertBefore(node, cur);
-      } else { // Already drawn
-        while (cur != lineView.node) cur = rm(cur);
-        var updateNumber = lineNumbers && updateNumbersFrom != null &&
-          updateNumbersFrom <= lineN && lineView.lineNumber;
-        if (lineView.changes) {
-          if (indexOf(lineView.changes, "gutter") > -1) updateNumber = false;
-          updateLineForChanges(cm, lineView, lineN, dims);
-        }
-        if (updateNumber) {
-          removeChildren(lineView.lineNumber);
-          lineView.lineNumber.appendChild(document.createTextNode(lineNumberFor(cm.options, lineN)));
-        }
-        cur = lineView.node.nextSibling;
-      }
-      lineN += lineView.size;
-    }
-    while (cur) cur = rm(cur);
-  }
-
-  // When an aspect of a line changes, a string is added to
-  // lineView.changes. This updates the relevant part of the line's
-  // DOM structure.
-  function updateLineForChanges(cm, lineView, lineN, dims) {
-    for (var j = 0; j < lineView.changes.length; j++) {
-      var type = lineView.changes[j];
-      if (type == "text") updateLineText(cm, lineView);
-      else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims);
-      else if (type == "class") updateLineClasses(lineView);
-      else if (type == "widget") updateLineWidgets(cm, lineView, dims);
-    }
-    lineView.changes = null;
-  }
-
-  // Lines with gutter elements, widgets or a background class need to
-  // be wrapped, and have the extra elements added to the wrapper div
-  function ensureLineWrapped(lineView) {
-    if (lineView.node == lineView.text) {
-      lineView.node = elt("div", null, null, "position: relative");
-      if (lineView.text.parentNode)
-        lineView.text.parentNode.replaceChild(lineView.node, lineView.text);
-      lineView.node.appendChild(lineView.text);
-      if (ie && ie_version < 8) lineView.node.style.zIndex = 2;
-    }
-    return lineView.node;
-  }
-
-  function updateLineBackground(lineView) {
-    var cls = lineView.bgClass ? lineView.bgClass + " " + (lineView.line.bgClass || "") : lineView.line.bgClass;
-    if (cls) cls += " CodeMirror-linebackground";
-    if (lineView.background) {
-      if (cls) lineView.background.className = cls;
-      else { lineView.background.parentNode.removeChild(lineView.background); lineView.background = null; }
-    } else if (cls) {
-      var wrap = ensureLineWrapped(lineView);
-      lineView.background = wrap.insertBefore(elt("div", null, cls), wrap.firstChild);
-    }
-  }
-
-  // Wrapper around buildLineContent which will reuse the structure
-  // in display.externalMeasured when possible.
-  function getLineContent(cm, lineView) {
-    var ext = cm.display.externalMeasured;
-    if (ext && ext.line == lineView.line) {
-      cm.display.externalMeasured = null;
-      lineView.measure = ext.measure;
-      return ext.built;
-    }
-    return buildLineContent(cm, lineView);
-  }
-
-  // Redraw the line's text. Interacts with the background and text
-  // classes because the mode may output tokens that influence these
-  // classes.
-  function updateLineText(cm, lineView) {
-    var cls = lineView.text.className;
-    var built = getLineContent(cm, lineView);
-    if (lineView.text == lineView.node) lineView.node = built.pre;
-    lineView.text.parentNode.replaceChild(built.pre, lineView.text);
-    lineView.text = built.pre;
-    if (built.bgClass != lineView.bgClass || built.textClass != lineView.textClass) {
-      lineView.bgClass = built.bgClass;
-      lineView.textClass = built.textClass;
-      updateLineClasses(lineView);
-    } else if (cls) {
-      lineView.text.className = cls;
-    }
-  }
-
-  function updateLineClasses(lineView) {
-    updateLineBackground(lineView);
-    if (lineView.line.wrapClass)
-      ensureLineWrapped(lineView).className = lineView.line.wrapClass;
-    else if (lineView.node != lineView.text)
-      lineView.node.className = "";
-    var textClass = lineView.textClass ? lineView.textClass + " " + (lineView.line.textClass || "") : lineView.line.textClass;
-    lineView.text.className = textClass || "";
-  }
-
-  function updateLineGutter(cm, lineView, lineN, dims) {
-    if (lineView.gutter) {
-      lineView.node.removeChild(lineView.gutter);
-      lineView.gutter = null;
-    }
-    if (lineView.gutterBackground) {
-      lineView.node.removeChild(lineView.gutterBackground);
-      lineView.gutterBackground = null;
-    }
-    if (lineView.line.gutterClass) {
-      var wrap = ensureLineWrapped(lineView);
-      lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
-                                      "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
-                                      "px; width: " + dims.gutterTotalWidth + "px");
-      wrap.insertBefore(lineView.gutterBackground, lineView.text);
-    }
-    var markers = lineView.line.gutterMarkers;
-    if (cm.options.lineNumbers || markers) {
-      var wrap = ensureLineWrapped(lineView);
-      var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
-                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px");
-      cm.display.input.setUneditable(gutterWrap);
-      wrap.insertBefore(gutterWrap, lineView.text);
-      if (lineView.line.gutterClass)
-        gutterWrap.className += " " + lineView.line.gutterClass;
-      if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
-        lineView.lineNumber = gutterWrap.appendChild(
-          elt("div", lineNumberFor(cm.options, lineN),
-              "CodeMirror-linenumber CodeMirror-gutter-elt",
-              "left: " + dims.gutterLeft["CodeMirror-linenumbers"] + "px; width: "
-              + cm.display.lineNumInnerWidth + "px"));
-      if (markers) for (var k = 0; k < cm.options.gutters.length; ++k) {
-        var id = cm.options.gutters[k], found = markers.hasOwnProperty(id) && markers[id];
-        if (found)
-          gutterWrap.appendChild(elt("div", [found], "CodeMirror-gutter-elt", "left: " +
-                                     dims.gutterLeft[id] + "px; width: " + dims.gutterWidth[id] + "px"));
-      }
-    }
-  }
-
-  function updateLineWidgets(cm, lineView, dims) {
-    if (lineView.alignable) lineView.alignable = null;
-    for (var node = lineView.node.firstChild, next; node; node = next) {
-      var next = node.nextSibling;
-      if (node.className == "CodeMirror-linewidget")
-        lineView.node.removeChild(node);
-    }
-    insertLineWidgets(cm, lineView, dims);
-  }
-
-  // Build a line's DOM representation from scratch
-  function buildLineElement(cm, lineView, lineN, dims) {
-    var built = getLineContent(cm, lineView);
-    lineView.text = lineView.node = built.pre;
-    if (built.bgClass) lineView.bgClass = built.bgClass;
-    if (built.textClass) lineView.textClass = built.textClass;
-
-    updateLineClasses(lineView);
-    updateLineGutter(cm, lineView, lineN, dims);
-    insertLineWidgets(cm, lineView, dims);
-    return lineView.node;
-  }
-
-  // A lineView may contain multiple logical lines (when merged by
-  // collapsed spans). The widgets for all of them need to be drawn.
-  function insertLineWidgets(cm, lineView, dims) {
-    insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
-    if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-      insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false);
-  }
-
-  function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
-    if (!line.widgets) return;
-    var wrap = ensureLineWrapped(lineView);
-    for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
-      var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
-      if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true");
-      positionLineWidget(widget, node, lineView, dims);
-      cm.display.input.setUneditable(node);
-      if (allowAbove && widget.above)
-        wrap.insertBefore(node, lineView.gutter || lineView.text);
-      else
-        wrap.appendChild(node);
-      signalLater(widget, "redraw");
-    }
-  }
-
-  function positionLineWidget(widget, node, lineView, dims) {
-    if (widget.noHScroll) {
-      (lineView.alignable || (lineView.alignable = [])).push(node);
-      var width = dims.wrapperWidth;
-      node.style.left = dims.fixedPos + "px";
-      if (!widget.coverGutter) {
-        width -= dims.gutterTotalWidth;
-        node.style.paddingLeft = dims.gutterTotalWidth + "px";
-      }
-      node.style.width = width + "px";
-    }
-    if (widget.coverGutter) {
-      node.style.zIndex = 5;
-      node.style.position = "relative";
-      if (!widget.noHScroll) node.style.marginLeft = -dims.gutterTotalWidth + "px";
-    }
-  }
-
-  // POSITION OBJECT
-
-  // A Pos instance represents a position within the text.
-  var Pos = CodeMirror.Pos = function(line, ch) {
-    if (!(this instanceof Pos)) return new Pos(line, ch);
-    this.line = line; this.ch = ch;
-  };
-
-  // Compare two positions, return 0 if they are the same, a negative
-  // number when a is less, and a positive number otherwise.
-  var cmp = CodeMirror.cmpPos = function(a, b) { return a.line - b.line || a.ch - b.ch; };
-
-  function copyPos(x) {return Pos(x.line, x.ch);}
-  function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
-  function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
-
-  // INPUT HANDLING
-
-  function ensureFocus(cm) {
-    if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
-  }
-
-  function isReadOnly(cm) {
-    return cm.options.readOnly || cm.doc.cantEdit;
-  }
-
-  // This will be set to an array of strings when copying, so that,
-  // when pasting, we know what kind of selections the copied text
-  // was made out of.
-  var lastCopied = null;
-
-  function applyTextInput(cm, inserted, deleted, sel, origin) {
-    var doc = cm.doc;
-    cm.display.shift = false;
-    if (!sel) sel = doc.sel;
-
-    var paste = cm.state.pasteIncoming || origin == "paste";
-    var textLines = doc.splitLines(inserted), multiPaste = null;
-    // When pasing N lines into N selections, insert one line per selection
-    if (paste && sel.ranges.length > 1) {
-      if (lastCopied && lastCopied.join("\n") == inserted) {
-        if (sel.ranges.length % lastCopied.length == 0) {
-          multiPaste = [];
-          for (var i = 0; i < lastCopied.length; i++)
-            multiPaste.push(doc.splitLines(lastCopied[i]));
-        }
-      } else if (textLines.length == sel.ranges.length) {
-        multiPaste = map(textLines, function(l) { return [l]; });
-      }
-    }
-
-    // Normal behavior is to insert the new text into every selection
-    for (var i = sel.ranges.length - 1; i >= 0; i--) {
-      var range = sel.ranges[i];
-      var from = range.from(), to = range.to();
-      if (range.empty()) {
-        if (deleted && deleted > 0) // Handle deletion
-          from = Pos(from.line, from.ch - deleted);
-        else if (cm.state.overwrite && !paste) // Handle overwrite
-          to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
-      }
-      var updateInput = cm.curOp.updateInput;
-      var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
-                         origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
-      makeChange(cm.doc, changeEvent);
-      signalLater(cm, "inputRead", cm, changeEvent);
-    }
-    if (inserted && !paste)
-      triggerElectric(cm, inserted);
-
-    ensureCursorVisible(cm);
-    cm.curOp.updateInput = updateInput;
-    cm.curOp.typing = true;
-    cm.state.pasteIncoming = cm.state.cutIncoming = false;
-  }
-
-  function handlePaste(e, cm) {
-    var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
-    if (pasted) {
-      e.preventDefault();
-      if (!isReadOnly(cm) && !cm.options.disableInput)
-        runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
-      return true;
-    }
-  }
-
-  function triggerElectric(cm, inserted) {
-    // When an 'electric' character is inserted, immediately trigger a reindent
-    if (!cm.options.electricChars || !cm.options.smartIndent) return;
-    var sel = cm.doc.sel;
-
-    for (var i = sel.ranges.length - 1; i >= 0; i--) {
-      var range = sel.ranges[i];
-      if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue;
-      var mode = cm.getModeAt(range.head);
-      var indented = false;
-      if (mode.electricChars) {
-        for (var j = 0; j < mode.electricChars.length; j++)
-          if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
-            indented = indentLine(cm, range.head.line, "smart");
-            break;
-          }
-      } else if (mode.electricInput) {
-        if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))
-          indented = indentLine(cm, range.head.line, "smart");
-      }
-      if (indented) signalLater(cm, "electricInput", cm, range.head.line);
-    }
-  }
-
-  function copyableRanges(cm) {
-    var text = [], ranges = [];
-    for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
-      var line = cm.doc.sel.ranges[i].head.line;
-      var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
-      ranges.push(lineRange);
-      text.push(cm.getRange(lineRange.anchor, lineRange.head));
-    }
-    return {text: text, ranges: ranges};
-  }
-
-  function disableBrowserMagic(field) {
-    field.setAttribute("autocorrect", "off");
-    field.setAttribute("autocapitalize", "off");
-    field.setAttribute("spellcheck", "false");
-  }
-
-  // TEXTAREA INPUT STYLE
-
-  function TextareaInput(cm) {
-    this.cm = cm;
-    // See input.poll and input.reset
-    this.prevInput = "";
-
-    // Flag that indicates whether we expect input to appear real soon
-    // now (after some event like 'keypress' or 'input') and are
-    // polling intensively.
-    this.pollingFast = false;
-    // Self-resetting timeout for the poller
-    this.polling = new Delayed();
-    // Tracks when input.reset has punted to just putting a short
-    // string into the textarea instead of the full selection.
-    this.inaccurateSelection = false;
-    // Used to work around IE issue with selection being forgotten when focus moves away from textarea
-    this.hasSelection = false;
-    this.composing = null;
-  };
-
-  function hiddenTextarea() {
-    var te = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
-    var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
-    // The textarea is kept positioned near the cursor to prevent the
-    // fact that it'll be scrolled into view on input from scrolling
-    // our fake cursor out of view. On webkit, when wrap=off, paste is
-    // very slow. So make the area wide instead.
-    if (webkit) te.style.width = "1000px";
-    else te.setAttribute("wrap", "off");
-    // If border: 0; -- iOS fails to open keyboard (issue #1287)
-    if (ios) te.style.border = "1px solid black";
-    disableBrowserMagic(te);
-    return div;
-  }
-
-  TextareaInput.prototype = copyObj({
-    init: function(display) {
-      var input = this, cm = this.cm;
-
-      // Wraps and hides input textarea
-      var div = this.wrapper = hiddenTextarea();
-      // The semihidden textarea that is focused when the editor is
-      // focused, and receives input.
-      var te = this.textarea = div.firstChild;
-      display.wrapper.insertBefore(div, display.wrapper.firstChild);
-
-      // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
-      if (ios) te.style.width = "0px";
-
-      on(te, "input", function() {
-        if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null;
-        input.poll();
-      });
-
-      on(te, "paste", function(e) {
-        if (handlePaste(e, cm)) return true;
-
-        cm.state.pasteIncoming = true;
-        input.fastPoll();
-      });
-
-      function prepareCopyCut(e) {
-        if (cm.somethingSelected()) {
-          lastCopied = cm.getSelections();
-          if (input.inaccurateSelection) {
-            input.prevInput = "";
-            input.inaccurateSelection = false;
-            te.value = lastCopied.join("\n");
-            selectInput(te);
-          }
-        } else if (!cm.options.lineWiseCopyCut) {
-          return;
-        } else {
-          var ranges = copyableRanges(cm);
-          lastCopied = ranges.text;
-          if (e.type == "cut") {
-            cm.setSelections(ranges.ranges, null, sel_dontScroll);
-          } else {
-            input.prevInput = "";
-            te.value = ranges.text.join("\n");
-            selectInput(te);
-          }
-        }
-        if (e.type == "cut") cm.state.cutIncoming = true;
-      }
-      on(te, "cut", prepareCopyCut);
-      on(te, "copy", prepareCopyCut);
-
-      on(display.scroller, "paste", function(e) {
-        if (eventInWidget(display, e)) return;
-        cm.state.pasteIncoming = true;
-        input.focus();
-      });
-
-      // Prevent normal selection in the editor (we handle our own)
-      on(display.lineSpace, "selectstart", function(e) {
-        if (!eventInWidget(display, e)) e_preventDefault(e);
-      });
-
-      on(te, "compositionstart", function() {
-        var start = cm.getCursor("from");
-        if (input.composing) input.composing.range.clear()
-        input.composing = {
-          start: start,
-          range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
-        };
-      });
-      on(te, "compositionend", function() {
-        if (input.composing) {
-          input.poll();
-          input.composing.range.clear();
-          input.composing = null;
-        }
-      });
-    },
-
-    prepareSelection: function() {
-      // Redraw the selection and/or cursor
-      var cm = this.cm, display = cm.display, doc = cm.doc;
-      var result = prepareSelection(cm);
-
-      // Move the hidden textarea near the cursor to prevent scrolling artifacts
-      if (cm.options.moveInputWithCursor) {
-        var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
-        var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
-        result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
-                                            headPos.top + lineOff.top - wrapOff.top));
-        result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
-                                             headPos.left + lineOff.left - wrapOff.left));
-      }
-
-      return result;
-    },
-
-    showSelection: function(drawn) {
-      var cm = this.cm, display = cm.display;
-      removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
-      removeChildrenAndAdd(display.selectionDiv, drawn.selection);
-      if (drawn.teTop != null) {
-        this.wrapper.style.top = drawn.teTop + "px";
-        this.wrapper.style.left = drawn.teLeft + "px";
-      }
-    },
-
-    // Reset the input to correspond to the selection (or to be empty,
-    // when not typing and nothing is selected)
-    reset: function(typing) {
-      if (this.contextMenuPending) return;
-      var minimal, selected, cm = this.cm, doc = cm.doc;
-      if (cm.somethingSelected()) {
-        this.prevInput = "";
-        var range = doc.sel.primary();
-        minimal = hasCopyEvent &&
-          (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
-        var content = minimal ? "-" : selected || cm.getSelection();
-        this.textarea.value = content;
-        if (cm.state.focused) selectInput(this.textarea);
-        if (ie && ie_version >= 9) this.hasSelection = content;
-      } else if (!typing) {
-        this.prevInput = this.textarea.value = "";
-        if (ie && ie_version >= 9) this.hasSelection = null;
-      }
-      this.inaccurateSelection = minimal;
-    },
-
-    getField: function() { return this.textarea; },
-
-    supportsTouch: function() { return false; },
-
-    focus: function() {
-      if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
-        try { this.textarea.focus(); }
-        catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
-      }
-    },
-
-    blur: function() { this.textarea.blur(); },
-
-    resetPosition: function() {
-      this.wrapper.style.top = this.wrapper.style.left = 0;
-    },
-
-    receivedFocus: function() { this.slowPoll(); },
-
-    // Poll for input changes, using the normal rate of polling. This
-    // runs as long as the editor is focused.
-    slowPoll: function() {
-      var input = this;
-      if (input.pollingFast) return;
-      input.polling.set(this.cm.options.pollInterval, function() {
-        input.poll();
-        if (input.cm.state.focused) input.slowPoll();
-      });
-    },
-
-    // When an event has just come in that is likely to add or change
-    // something in the input textarea, we poll faster, to ensure that
-    // the change appears on the screen quickly.
-    fastPoll: function() {
-      var missed = false, input = this;
-      input.pollingFast = true;
-      function p() {
-        var changed = input.poll();
-        if (!changed && !missed) {missed = true; input.polling.set(60, p);}
-        else {input.pollingFast = false; input.slowPoll();}
-      }
-      input.polling.set(20, p);
-    },
-
-    // Read input from the textarea, and update the document to match.
-    // When something is selected, it is present in the textarea, and
-    // selected (unless it is huge, in which case a placeholder is
-    // used). When nothing is selected, the cursor sits after previously
-    // seen text (can be empty), which is stored in prevInput (we must
-    // not reset the textarea when typing, because that breaks IME).
-    poll: function() {
-      var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
-      // Since this is called a *lot*, try to bail out as cheaply as
-      // possible when it is clear that nothing happened. hasSelection
-      // will be the case when there is a lot of text in the textarea,
-      // in which case reading its value would be expensive.
-      if (this.contextMenuPending || !cm.state.focused ||
-          (hasSelection(input) && !prevInput && !this.composing) ||
-          isReadOnly(cm) || cm.options.disableInput || cm.state.keySeq)
-        return false;
-
-      var text = input.value;
-      // If nothing changed, bail.
-      if (text == prevInput && !cm.somethingSelected()) return false;
-      // Work around nonsensical selection resetting in IE9/10, and
-      // inexplicable appearance of private area unicode characters on
-      // some key combos in Mac (#2689).
-      if (ie && ie_version >= 9 && this.hasSelection === text ||
-          mac && /[\uf700-\uf7ff]/.test(text)) {
-        cm.display.input.reset();
-        return false;
-      }
-
-      if (cm.doc.sel == cm.display.selForContextMenu) {
-        var first = text.charCodeAt(0);
-        if (first == 0x200b && !prevInput) prevInput = "\u200b";
-        if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo"); }
-      }
-      // Find the part of the input that is actually new
-      var same = 0, l = Math.min(prevInput.length, text.length);
-      while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
-
-      var self = this;
-      runInOp(cm, function() {
-        applyTextInput(cm, text.slice(same), prevInput.length - same,
-                       null, self.composing ? "*compose" : null);
-
-        // Don't leave long text in the textarea, since it makes further polling slow
-        if (text.length > 1000 || text.indexOf("\n") > -1) input.value = self.prevInput = "";
-        else self.prevInput = text;
-
-        if (self.composing) {
-          self.composing.range.clear();
-          self.composing.range = cm.markText(self.composing.start, cm.getCursor("to"),
-                                             {className: "CodeMirror-composing"});
-        }
-      });
-      return true;
-    },
-
-    ensurePolled: function() {
-      if (this.pollingFast && this.poll()) this.pollingFast = false;
-    },
-
-    onKeyPress: function() {
-      if (ie && ie_version >= 9) this.hasSelection = null;
-      this.fastPoll();
-    },
-
-    onContextMenu: function(e) {
-      var input = this, cm = input.cm, display = cm.display, te = input.textarea;
-      var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
-      if (!pos || presto) return; // Opera is difficult.
-
-      // Reset the current text selection only if the click is done outside of the selection
-      // and 'resetSelectionOnContextMenu' option is true.
-      var reset = cm.options.resetSelectionOnContextMenu;
-      if (reset && cm.doc.sel.contains(pos) == -1)
-        operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
-
-      var oldCSS = te.style.cssText;
-      input.wrapper.style.position = "absolute";
-      te.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
-        "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
-        (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
-        "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
-      if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
-      display.input.focus();
-      if (webkit) window.scrollTo(null, oldScrollY);
-      display.input.reset();
-      // Adds "Select all" to context menu in FF
-      if (!cm.somethingSelected()) te.value = input.prevInput = " ";
-      input.contextMenuPending = true;
-      display.selForContextMenu = cm.doc.sel;
-      clearTimeout(display.detectingSelectAll);
-
-      // Select-all will be greyed out if there's nothing to select, so
-      // this adds a zero-width space so that we can later check whether
-      // it got selected.
-      function prepareSelectAllHack() {
-        if (te.selectionStart != null) {
-          var selected = cm.somethingSelected();
-          var extval = "\u200b" + (selected ? te.value : "");
-          te.value = "\u21da"; // Used to catch context-menu undo
-          te.value = extval;
-          input.prevInput = selected ? "" : "\u200b";
-          te.selectionStart = 1; te.selectionEnd = extval.length;
-          // Re-set this, in case some other handler touched the
-          // selection in the meantime.
-          display.selForContextMenu = cm.doc.sel;
-        }
-      }
-      function rehide() {
-        input.contextMenuPending = false;
-        input.wrapper.style.position = "relative";
-        te.style.cssText = oldCSS;
-        if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
-
-        // Try to detect the user choosing select-all
-        if (te.selectionStart != null) {
-          if (!ie || (ie && ie_version < 9)) prepareSelectAllHack();
-          var i = 0, poll = function() {
-            if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
-                te.selectionEnd > 0 && input.prevInput == "\u200b")
-              operation(cm, commands.selectAll)(cm);
-            else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
-            else display.input.reset();
-          };
-          display.detectingSelectAll = setTimeout(poll, 200);
-        }
-      }
-
-      if (ie && ie_version >= 9) prepareSelectAllHack();
-      if (captureRightClick) {
-        e_stop(e);
-        var mouseup = function() {
-          off(window, "mouseup", mouseup);
-          setTimeout(rehide, 20);
-        };
-        on(window, "mouseup", mouseup);
-      } else {
-        setTimeout(rehide, 50);
-      }
-    },
-
-    readOnlyChanged: function(val) {
-      if (!val) this.reset();
-    },
-
-    setUneditable: nothing,
-
-    needsContentAttribute: false
-  }, TextareaInput.prototype);
-
-  // CONTENTEDITABLE INPUT STYLE
-
-  function ContentEditableInput(cm) {
-    this.cm = cm;
-    this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
-    this.polling = new Delayed();
-    this.gracePeriod = false;
-  }
-
-  ContentEditableInput.prototype = copyObj({
-    init: function(display) {
-      var input = this, cm = input.cm;
-      var div = input.div = display.lineDiv;
-      disableBrowserMagic(div);
-
-      on(div, "paste", function(e) { handlePaste(e, cm); })
-
-      on(div, "compositionstart", function(e) {
-        var data = e.data;
-        input.composing = {sel: cm.doc.sel, data: data, startData: data};
-        if (!data) return;
-        var prim = cm.doc.sel.primary();
-        var line = cm.getLine(prim.head.line);
-        var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length));
-        if (found > -1 && found <= prim.head.ch)
-          input.composing.sel = simpleSelection(Pos(prim.head.line, found),
-                                                Pos(prim.head.line, found + data.length));
-      });
-      on(div, "compositionupdate", function(e) {
-        input.composing.data = e.data;
-      });
-      on(div, "compositionend", function(e) {
-        var ours = input.composing;
-        if (!ours) return;
-        if (e.data != ours.startData && !/\u200b/.test(e.data))
-          ours.data = e.data;
-        // Need a small delay to prevent other code (input event,
-        // selection polling) from doing damage when fired right after
-        // compositionend.
-        setTimeout(function() {
-          if (!ours.handled)
-            input.applyComposition(ours);
-          if (input.composing == ours)
-            input.composing = null;
-        }, 50);
-      });
-
-      on(div, "touchstart", function() {
-        input.forceCompositionEnd();
-      });
-
-      on(div, "input", function() {
-        if (input.composing) return;
-        if (isReadOnly(cm) || !input.pollContent())
-          runInOp(input.cm, function() {regChange(cm);});
-      });
-
-      function onCopyCut(e) {
-        if (cm.somethingSelected()) {
-          lastCopied = cm.getSelections();
-          if (e.type == "cut") cm.replaceSelection("", null, "cut");
-        } else if (!cm.options.lineWiseCopyCut) {
-          return;
-        } else {
-          var ranges = copyableRanges(cm);
-          lastCopied = ranges.text;
-          if (e.type == "cut") {
-            cm.operation(function() {
-              cm.setSelections(ranges.ranges, 0, sel_dontScroll);
-              cm.replaceSelection("", null, "cut");
-            });
-          }
-        }
-        // iOS exposes the clipboard API, but seems to discard content inserted into it
-        if (e.clipboardData && !ios) {
-          e.preventDefault();
-          e.clipboardData.clearData();
-          e.clipboardData.setData("text/plain", lastCopied.join("\n"));
-        } else {
-          // Old-fashioned briefly-focus-a-textarea hack
-          var kludge = hiddenTextarea(), te = kludge.firstChild;
-          cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
-          te.value = lastCopied.join("\n");
-          var hadFocus = document.activeElement;
-          selectInput(te);
-          setTimeout(function() {
-            cm.display.lineSpace.removeChild(kludge);
-            hadFocus.focus();
-          }, 50);
-        }
-      }
-      on(div, "copy", onCopyCut);
-      on(div, "cut", onCopyCut);
-    },
-
-    prepareSelection: function() {
-      var result = prepareSelection(this.cm, false);
-      result.focus = this.cm.state.focused;
-      return result;
-    },
-
-    showSelection: function(info) {
-      if (!info || !this.cm.display.view.length) return;
-      if (info.focus) this.showPrimarySelection();
-      this.showMultipleSelections(info);
-    },
-
-    showPrimarySelection: function() {
-      var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
-      var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
-      var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset);
-      if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
-          cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
-          cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
-        return;
-
-      var start = posToDOM(this.cm, prim.from());
-      var end = posToDOM(this.cm, prim.to());
-      if (!start && !end) return;
-
-      var view = this.cm.display.view;
-      var old = sel.rangeCount && sel.getRangeAt(0);
-      if (!start) {
-        start = {node: view[0].measure.map[2], offset: 0};
-      } else if (!end) { // FIXME dangerously hacky
-        var measure = view[view.length - 1].measure;
-        var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
-        end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
-      }
-
-      try { var rng = range(start.node, start.offset, end.offset, end.node); }
-      catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
-      if (rng) {
-        sel.removeAllRanges();
-        sel.addRange(rng);
-        if (old && sel.anchorNode == null) sel.addRange(old);
-        else if (gecko) this.startGracePeriod();
-      }
-      this.rememberSelection();
-    },
-
-    startGracePeriod: function() {
-      var input = this;
-      clearTimeout(this.gracePeriod);
-      this.gracePeriod = setTimeout(function() {
-        input.gracePeriod = false;
-        if (input.selectionChanged())
-          input.cm.operation(function() { input.cm.curOp.selectionChanged = true; });
-      }, 20);
-    },
-
-    showMultipleSelections: function(info) {
-      removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
-      removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
-    },
-
-    rememberSelection: function() {
-      var sel = window.getSelection();
-      this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
-      this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
-    },
-
-    selectionInEditor: function() {
-      var sel = window.getSelection();
-      if (!sel.rangeCount) return false;
-      var node = sel.getRangeAt(0).commonAncestorContainer;
-      return contains(this.div, node);
-    },
-
-    focus: function() {
-      if (this.cm.options.readOnly != "nocursor") this.div.focus();
-    },
-    blur: function() { this.div.blur(); },
-    getField: function() { return this.div; },
-
-    supportsTouch: function() { return true; },
-
-    receivedFocus: function() {
-      var input = this;
-      if (this.selectionInEditor())
-        this.pollSelection();
-      else
-        runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true; });
-
-      function poll() {
-        if (input.cm.state.focused) {
-          input.pollSelection();
-          input.polling.set(input.cm.options.pollInterval, poll);
-        }
-      }
-      this.polling.set(this.cm.options.pollInterval, poll);
-    },
-
-    selectionChanged: function() {
-      var sel = window.getSelection();
-      return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
-        sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset;
-    },
-
-    pollSelection: function() {
-      if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
-        var sel = window.getSelection(), cm = this.cm;
-        this.rememberSelection();
-        var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
-        var head = domToPos(cm, sel.focusNode, sel.focusOffset);
-        if (anchor && head) runInOp(cm, function() {
-          setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
-          if (anchor.bad || head.bad) cm.curOp.selectionChanged = true;
-        });
-      }
-    },
-
-    pollContent: function() {
-      var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
-      var from = sel.from(), to = sel.to();
-      if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false;
-
-      var fromIndex;
-      if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
-        var fromLine = lineNo(display.view[0].line);
-        var fromNode = display.view[0].node;
-      } else {
-        var fromLine = lineNo(display.view[fromIndex].line);
-        var fromNode = display.view[fromIndex - 1].node.nextSibling;
-      }
-      var toIndex = findViewIndex(cm, to.line);
-      if (toIndex == display.view.length - 1) {
-        var toLine = display.viewTo - 1;
-        var toNode = display.lineDiv.lastChild;
-      } else {
-        var toLine = lineNo(display.view[toIndex + 1].line) - 1;
-        var toNode = display.view[toIndex + 1].node.previousSibling;
-      }
-
-      var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
-      var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
-      while (newText.length > 1 && oldText.length > 1) {
-        if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
-        else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
-        else break;
-      }
-
-      var cutFront = 0, cutEnd = 0;
-      var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
-      while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
-        ++cutFront;
-      var newBot = lst(newText), oldBot = lst(oldText);
-      var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
-                               oldBot.length - (oldText.length == 1 ? cutFront : 0));
-      while (cutEnd < maxCutEnd &&
-             newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
-        ++cutEnd;
-
-      newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
-      newText[0] = newText[0].slice(cutFront);
-
-      var chFrom = Pos(fromLine, cutFront);
-      var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
-      if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
-        replaceRange(cm.doc, newText, chFrom, chTo, "+input");
-        return true;
-      }
-    },
-
-    ensurePolled: function() {
-      this.forceCompositionEnd();
-    },
-    reset: function() {
-      this.forceCompositionEnd();
-    },
-    forceCompositionEnd: function() {
-      if (!this.composing || this.composing.handled) return;
-      this.applyComposition(this.composing);
-      this.composing.handled = true;
-      this.div.blur();
-      this.div.focus();
-    },
-    applyComposition: function(composing) {
-      if (isReadOnly(this.cm))
-        operation(this.cm, regChange)(this.cm)
-      else if (composing.data && composing.data != composing.startData)
-        operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
-    },
-
-    setUneditable: function(node) {
-      node.contentEditable = "false"
-    },
-
-    onKeyPress: function(e) {
-      e.preventDefault();
-      if (!isReadOnly(this.cm))
-        operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
-    },
-
-    readOnlyChanged: function(val) {
-      this.div.contentEditable = String(val != "nocursor")
-    },
-
-    onContextMenu: nothing,
-    resetPosition: nothing,
-
-    needsContentAttribute: true
-  }, ContentEditableInput.prototype);
-
-  function posToDOM(cm, pos) {
-    var view = findViewForLine(cm, pos.line);
-    if (!view || view.hidden) return null;
-    var line = getLine(cm.doc, pos.line);
-    var info = mapFromLineView(view, line, pos.line);
-
-    var order = getOrder(line), side = "left";
-    if (order) {
-      var partPos = getBidiPartAt(order, pos.ch);
-      side = partPos % 2 ? "right" : "left";
-    }
-    var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
-    result.offset = result.collapse == "right" ? result.end : result.start;
-    return result;
-  }
-
-  function badPos(pos, bad) { if (bad) pos.bad = true; return pos; }
-
-  function domToPos(cm, node, offset) {
-    var lineNode;
-    if (node == cm.display.lineDiv) {
-      lineNode = cm.display.lineDiv.childNodes[offset];
-      if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true);
-      node = null; offset = 0;
-    } else {
-      for (lineNode = node;; lineNode = lineNode.parentNode) {
-        if (!lineNode || lineNode == cm.display.lineDiv) return null;
-        if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
-      }
-    }
-    for (var i = 0; i < cm.display.view.length; i++) {
-      var lineView = cm.display.view[i];
-      if (lineView.node == lineNode)
-        return locateNodeInLineView(lineView, node, offset);
-    }
-  }
-
-  function locateNodeInLineView(lineView, node, offset) {
-    var wrapper = lineView.text.firstChild, bad = false;
-    if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true);
-    if (node == wrapper) {
-      bad = true;
-      node = wrapper.childNodes[offset];
-      offset = 0;
-      if (!node) {
-        var line = lineView.rest ? lst(lineView.rest) : lineView.line;
-        return badPos(Pos(lineNo(line), line.text.length), bad);
-      }
-    }
-
-    var textNode = node.nodeType == 3 ? node : null, topNode = node;
-    if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
-      textNode = node.firstChild;
-      if (offset) offset = textNode.nodeValue.length;
-    }
-    while (topNode.parentNode != wrapper) topNode = topNode.parentNode;
-    var measure = lineView.measure, maps = measure.maps;
-
-    function find(textNode, topNode, offset) {
-      for (var i = -1; i < (maps ? maps.length : 0); i++) {
-        var map = i < 0 ? measure.map : maps[i];
-        for (var j = 0; j < map.length; j += 3) {
-          var curNode = map[j + 2];
-          if (curNode == textNode || curNode == topNode) {
-            var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
-            var ch = map[j] + offset;
-            if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)];
-            return Pos(line, ch);
-          }
-        }
-      }
-    }
-    var found = find(textNode, topNode, offset);
-    if (found) return badPos(found, bad);
-
-    // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
-    for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
-      found = find(after, after.firstChild, 0);
-      if (found)
-        return badPos(Pos(found.line, found.ch - dist), bad);
-      else
-        dist += after.textContent.length;
-    }
-    for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
-      found = find(before, before.firstChild, -1);
-      if (found)
-        return badPos(Pos(found.line, found.ch + dist), bad);
-      else
-        dist += after.textContent.length;
-    }
-  }
-
-  function domTextBetween(cm, from, to, fromLine, toLine) {
-    var text = "", closing = false, lineSep = cm.doc.lineSeparator();
-    function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
-    function walk(node) {
-      if (node.nodeType == 1) {
-        var cmText = node.getAttribute("cm-text");
-        if (cmText != null) {
-          if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "");
-          text += cmText;
-          return;
-        }
-        var markerID = node.getAttribute("cm-marker"), range;
-        if (markerID) {
-          var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
-          if (found.length && (range = found[0].find()))
-            text += getBetween(cm.doc, range.from, range.to).join(lineSep);
-          return;
-        }
-        if (node.getAttribute("contenteditable") == "false") return;
-        for (var i = 0; i < node.childNodes.length; i++)
-          walk(node.childNodes[i]);
-        if (/^(pre|div|p)$/i.test(node.nodeName))
-          closing = true;
-      } else if (node.nodeType == 3) {
-        var val = node.nodeValue;
-        if (!val) return;
-        if (closing) {
-          text += lineSep;
-          closing = false;
-        }
-        text += val;
-      }
-    }
-    for (;;) {
-      walk(from);
-      if (from == to) break;
-      from = from.nextSibling;
-    }
-    return text;
-  }
-
-  CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
-
-  // SELECTION / CURSOR
-
-  // Selection objects are immutable. A new one is created every time
-  // the selection changes. A selection is one or more non-overlapping
-  // (and non-touching) ranges, sorted, and an integer that indicates
-  // which one is the primary selection (the one that's scrolled into
-  // view, that getCursor returns, etc).
-  function Selection(ranges, primIndex) {
-    this.ranges = ranges;
-    this.primIndex = primIndex;
-  }
-
-  Selection.prototype = {
-    primary: function() { return this.ranges[this.primIndex]; },
-    equals: function(other) {
-      if (other == this) return true;
-      if (other.primIndex != this.primIndex || other.ranges.length != this.ranges.length) return false;
-      for (var i = 0; i < this.ranges.length; i++) {
-        var here = this.ranges[i], there = other.ranges[i];
-        if (cmp(here.anchor, there.anchor) != 0 || cmp(here.head, there.head) != 0) return false;
-      }
-      return true;
-    },
-    deepCopy: function() {
-      for (var out = [], i = 0; i < this.ranges.length; i++)
-        out[i] = new Range(copyPos(this.ranges[i].anchor), copyPos(this.ranges[i].head));
-      return new Selection(out, this.primIndex);
-    },
-    somethingSelected: function() {
-      for (var i = 0; i < this.ranges.length; i++)
-        if (!this.ranges[i].empty()) return true;
-      return false;
-    },
-    contains: function(pos, end) {
-      if (!end) end = pos;
-      for (var i = 0; i < this.ranges.length; i++) {
-        var range = this.ranges[i];
-        if (cmp(end, range.from()) >= 0 && cmp(pos, range.to()) <= 0)
-          return i;
-      }
-      return -1;
-    }
-  };
-
-  function Range(anchor, head) {
-    this.anchor = anchor; this.head = head;
-  }
-
-  Range.prototype = {
-    from: function() { return minPos(this.anchor, this.head); },
-    to: function() { return maxPos(this.anchor, this.head); },
-    empty: function() {
-      return this.head.line == this.anchor.line && this.head.ch == this.anchor.ch;
-    }
-  };
-
-  // Take an unsorted, potentially overlapping set of ranges, and
-  // build a selection out of it. 'Consumes' ranges array (modifying
-  // it).
-  function normalizeSelection(ranges, primIndex) {
-    var prim = ranges[primIndex];
-    ranges.sort(function(a, b) { return cmp(a.from(), b.from()); });
-    primIndex = indexOf(ranges, prim);
-    for (var i = 1; i < ranges.length; i++) {
-      var cur = ranges[i], prev = ranges[i - 1];
-      if (cmp(prev.to(), cur.from()) >= 0) {
-        var from = minPos(prev.from(), cur.from()), to = maxPos(prev.to(), cur.to());
-        var inv = prev.empty() ? cur.from() == cur.head : prev.from() == prev.head;
-        if (i <= primIndex) --primIndex;
-        ranges.splice(--i, 2, new Range(inv ? to : from, inv ? from : to));
-      }
-    }
-    return new Selection(ranges, primIndex);
-  }
-
-  function simpleSelection(anchor, head) {
-    return new Selection([new Range(anchor, head || anchor)], 0);
-  }
-
-  // Most of the external API clips given positions to make sure they
-  // actually exist within the document.
-  function clipLine(doc, n) {return Math.max(doc.first, Math.min(n, doc.first + doc.size - 1));}
-  function clipPos(doc, pos) {
-    if (pos.line < doc.first) return Pos(doc.first, 0);
-    var last = doc.first + doc.size - 1;
-    if (pos.line > last) return Pos(last, getLine(doc, last).text.length);
-    return clipToLen(pos, getLine(doc, pos.line).text.length);
-  }
-  function clipToLen(pos, linelen) {
-    var ch = pos.ch;
-    if (ch == null || ch > linelen) return Pos(pos.line, linelen);
-    else if (ch < 0) return Pos(pos.line, 0);
-    else return pos;
-  }
-  function isLine(doc, l) {return l >= doc.first && l < doc.first + doc.size;}
-  function clipPosArray(doc, array) {
-    for (var out = [], i = 0; i < array.length; i++) out[i] = clipPos(doc, array[i]);
-    return out;
-  }
-
-  // SELECTION UPDATES
-
-  // The 'scroll' parameter given to many of these indicated whether
-  // the new cursor position should be scrolled into view after
-  // modifying the selection.
-
-  // If shift is held or the extend flag is set, extends a range to
-  // include a given position (and optionally a second position).
-  // Otherwise, simply returns the range between the given positions.
-  // Used for cursor motion and such.
-  function extendRange(doc, range, head, other) {
-    if (doc.cm && doc.cm.display.shift || doc.extend) {
-      var anchor = range.anchor;
-      if (other) {
-        var posBefore = cmp(head, anchor) < 0;
-        if (posBefore != (cmp(other, anchor) < 0)) {
-          anchor = head;
-          head = other;
-        } else if (posBefore != (cmp(head, other) < 0)) {
-          head = other;
-        }
-      }
-      return new Range(anchor, head);
-    } else {
-      return new Range(other || head, head);
-    }
-  }
-
-  // Extend the primary selection range, discard the rest.
-  function extendSelection(doc, head, other, options) {
-    setSelection(doc, new Selection([extendRange(doc, doc.sel.primary(), head, other)], 0), options);
-  }
-
-  // Extend all selections (pos is an array of selections with length
-  // equal the number of selections)
-  function extendSelections(doc, heads, options) {
-    for (var out = [], i = 0; i < doc.sel.ranges.length; i++)
-      out[i] = extendRange(doc, doc.sel.ranges[i], heads[i], null);
-    var newSel = normalizeSelection(out, doc.sel.primIndex);
-    setSelection(doc, newSel, options);
-  }
-
-  // Updates a single range in the selection.
-  function replaceOneSelection(doc, i, range, options) {
-    var ranges = doc.sel.ranges.slice(0);
-    ranges[i] = range;
-    setSelection(doc, normalizeSelection(ranges, doc.sel.primIndex), options);
-  }
-
-  // Reset the selection to a single range.
-  function setSimpleSelection(doc, anchor, head, options) {
-    setSelection(doc, simpleSelection(anchor, head), options);
-  }
-
-  // Give beforeSelectionChange handlers a change to influence a
-  // selection update.
-  function filterSelectionChange(doc, sel) {
-    var obj = {
-      ranges: sel.ranges,
-      update: function(ranges) {
-        this.ranges = [];
-        for (var i = 0; i < ranges.length; i++)
-          this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
-                                     clipPos(doc, ranges[i].head));
-      }
-    };
-    signal(doc, "beforeSelectionChange", doc, obj);
-    if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
-    if (obj.ranges != sel.ranges) return normalizeSelection(obj.ranges, obj.ranges.length - 1);
-    else return sel;
-  }
-
-  function setSelectionReplaceHistory(doc, sel, options) {
-    var done = doc.history.done, last = lst(done);
-    if (last && last.ranges) {
-      done[done.length - 1] = sel;
-      setSelectionNoUndo(doc, sel, options);
-    } else {
-      setSelection(doc, sel, options);
-    }
-  }
-
-  // Set a new selection.
-  function setSelection(doc, sel, options) {
-    setSelectionNoUndo(doc, sel, options);
-    addSelectionToHistory(doc, doc.sel, doc.cm ? doc.cm.curOp.id : NaN, options);
-  }
-
-  function setSelectionNoUndo(doc, sel, options) {
-    if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
-      sel = filterSelectionChange(doc, sel);
-
-    var bias = options && options.bias ||
-      (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
-    setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
-
-    if (!(options && options.scroll === false) && doc.cm)
-      ensureCursorVisible(doc.cm);
-  }
-
-  function setSelectionInner(doc, sel) {
-    if (sel.equals(doc.sel)) return;
-
-    doc.sel = sel;
-
-    if (doc.cm) {
-      doc.cm.curOp.updateInput = doc.cm.curOp.selectionChanged = true;
-      signalCursorActivity(doc.cm);
-    }
-    signalLater(doc, "cursorActivity", doc);
-  }
-
-  // Verify that the selection does not partially select any atomic
-  // marked ranges.
-  function reCheckSelection(doc) {
-    setSelectionInner(doc, skipAtomicInSelection(doc, doc.sel, null, false), sel_dontScroll);
-  }
-
-  // Return a selection that does not partially select any atomic
-  // ranges.
-  function skipAtomicInSelection(doc, sel, bias, mayClear) {
-    var out;
-    for (var i = 0; i < sel.ranges.length; i++) {
-      var range = sel.ranges[i];
-      var newAnchor = skipAtomic(doc, range.anchor, bias, mayClear);
-      var newHead = skipAtomic(doc, range.head, bias, mayClear);
-      if (out || newAnchor != range.anchor || newHead != range.head) {
-        if (!out) out = sel.ranges.slice(0, i);
-        out[i] = new Range(newAnchor, newHead);
-      }
-    }
-    return out ? normalizeSelection(out, sel.primIndex) : sel;
-  }
-
-  // Ensure a given position is not inside an atomic range.
-  function skipAtomic(doc, pos, bias, mayClear) {
-    var flipped = false, curPos = pos;
-    var dir = bias || 1;
-    doc.cantEdit = false;
-    search: for (;;) {
-      var line = getLine(doc, curPos.line);
-      if (line.markedSpans) {
-        for (var i = 0; i < line.markedSpans.length; ++i) {
-          var sp = line.markedSpans[i], m = sp.marker;
-          if ((sp.from == null || (m.inclusiveLeft ? sp.from <= curPos.ch : sp.from < curPos.ch)) &&
-              (sp.to == null || (m.inclusiveRight ? sp.to >= curPos.ch : sp.to > curPos.ch))) {
-            if (mayClear) {
-              signal(m, "beforeCursorEnter");
-              if (m.explicitlyCleared) {
-                if (!line.markedSpans) break;
-                else {--i; continue;}
-              }
-            }
-            if (!m.atomic) continue;
-            var newPos = m.find(dir < 0 ? -1 : 1);
-            if (cmp(newPos, curPos) == 0) {
-              newPos.ch += dir;
-              if (newPos.ch < 0) {
-                if (newPos.line > doc.first) newPos = clipPos(doc, Pos(newPos.line - 1));
-                else newPos = null;
-              } else if (newPos.ch > line.text.length) {
-                if (newPos.line < doc.first + doc.size - 1) newPos = Pos(newPos.line + 1, 0);
-                else newPos = null;
-              }
-              if (!newPos) {
-                if (flipped) {
-                  // Driven in a corner -- no valid cursor position found at all
-                  // -- try again *with* clearing, if we didn't already
-                  if (!mayClear) return skipAtomic(doc, pos, bias, true);
-                  // Otherwise, turn off editing until further notice, and return the start of the doc
-                  doc.cantEdit = true;
-                  return Pos(doc.first, 0);
-                }
-                flipped = true; newPos = pos; dir = -dir;
-              }
-            }
-            curPos = newPos;
-            continue search;
-          }
-        }
-      }
-      return curPos;
-    }
-  }
-
-  // SELECTION DRAWING
-
-  function updateSelection(cm) {
-    cm.display.input.showSelection(cm.display.input.prepareSelection());
-  }
-
-  function prepareSelection(cm, primary) {
-    var doc = cm.doc, result = {};
-    var curFragment = result.cursors = document.createDocumentFragment();
-    var selFragment = result.selection = document.createDocumentFragment();
-
-    for (var i = 0; i < doc.sel.ranges.length; i++) {
-      if (primary === false && i == doc.sel.primIndex) continue;
-      var range = doc.sel.ranges[i];
-      var collapsed = range.empty();
-      if (collapsed || cm.options.showCursorWhenSelecting)
-        drawSelectionCursor(cm, range.head, curFragment);
-      if (!collapsed)
-        drawSelectionRange(cm, range, selFragment);
-    }
-    return result;
-  }
-
-  // Draws a cursor for the given range
-  function drawSelectionCursor(cm, head, output) {
-    var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
-
-    var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
-    cursor.style.left = pos.left + "px";
-    cursor.style.top = pos.top + "px";
-    cursor.style.height = Math.max(0, pos.bottom - pos.top) * cm.options.cursorHeight + "px";
-
-    if (pos.other) {
-      // Secondary cursor, shown when on a 'jump' in bi-directional text
-      var otherCursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor CodeMirror-secondarycursor"));
-      otherCursor.style.display = "";
-      otherCursor.style.left = pos.other.left + "px";
-      otherCursor.style.top = pos.other.top + "px";
-      otherCursor.style.height = (pos.other.bottom - pos.other.top) * .85 + "px";
-    }
-  }
-
-  // Draws the given range as a highlighted selection
-  function drawSelectionRange(cm, range, output) {
-    var display = cm.display, doc = cm.doc;
-    var fragment = document.createDocumentFragment();
-    var padding = paddingH(cm.display), leftSide = padding.left;
-    var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
-
-    function add(left, top, width, bottom) {
-      if (top < 0) top = 0;
-      top = Math.round(top);
-      bottom = Math.round(bottom);
-      fragment.appendChild(elt("div", null, "CodeMirror-selected", "position: absolute; left: " + left +
-                               "px; top: " + top + "px; width: " + (width == null ? rightSide - left : width) +
-                               "px; height: " + (bottom - top) + "px"));
-    }
-
-    function drawForLine(line, fromArg, toArg) {
-      var lineObj = getLine(doc, line);
-      var lineLen = lineObj.text.length;
-      var start, end;
-      function coords(ch, bias) {
-        return charCoords(cm, Pos(line, ch), "div", lineObj, bias);
-      }
-
-      iterateBidiSections(getOrder(lineObj), fromArg || 0, toArg == null ? lineLen : toArg, function(from, to, dir) {
-        var leftPos = coords(from, "left"), rightPos, left, right;
-        if (from == to) {
-          rightPos = leftPos;
-          left = right = leftPos.left;
-        } else {
-          rightPos = coords(to - 1, "right");
-          if (dir == "rtl") { var tmp = leftPos; leftPos = rightPos; rightPos = tmp; }
-          left = leftPos.left;
-          right = rightPos.right;
-        }
-        if (fromArg == null && from == 0) left = leftSide;
-        if (rightPos.top - leftPos.top > 3) { // Different lines, draw top part
-          add(left, leftPos.top, null, leftPos.bottom);
-          left = leftSide;
-          if (leftPos.bottom < rightPos.top) add(left, leftPos.bottom, null, rightPos.top);
-        }
-        if (toArg == null && to == lineLen) right = rightSide;
-        if (!start || leftPos.top < start.top || leftPos.top == start.top && leftPos.left < start.left)
-          start = leftPos;
-        if (!end || rightPos.bottom > end.bottom || rightPos.bottom == end.bottom && rightPos.right > end.right)
-          end = rightPos;
-        if (left < leftSide + 1) left = leftSide;
-        add(left, rightPos.top, right - left, rightPos.bottom);
-      });
-      return {start: start, end: end};
-    }
-
-    var sFrom = range.from(), sTo = range.to();
-    if (sFrom.line == sTo.line) {
-      drawForLine(sFrom.line, sFrom.ch, sTo.ch);
-    } else {
-      var fromLine = getLine(doc, sFrom.line), toLine = getLine(doc, sTo.line);
-      var singleVLine = visualLine(fromLine) == visualLine(toLine);
-      var leftEnd = drawForLine(sFrom.line, sFrom.ch, singleVLine ? fromLine.text.length + 1 : null).end;
-      var rightStart = drawForLine(sTo.line, singleVLine ? 0 : null, sTo.ch).start;
-      if (singleVLine) {
-        if (leftEnd.top < rightStart.top - 2) {
-          add(leftEnd.right, leftEnd.top, null, leftEnd.bottom);
-          add(leftSide, rightStart.top, rightStart.left, rightStart.bottom);
-        } else {
-          add(leftEnd.right, leftEnd.top, rightStart.left - leftEnd.right, leftEnd.bottom);
-        }
-      }
-      if (leftEnd.bottom < rightStart.top)
-        add(leftSide, leftEnd.bottom, null, rightStart.top);
-    }
-
-    output.appendChild(fragment);
-  }
-
-  // Cursor-blinking
-  function restartBlink(cm) {
-    if (!cm.state.focused) return;
-    var display = cm.display;
-    clearInterval(display.blinker);
-    var on = true;
-    display.cursorDiv.style.visibility = "";
-    if (cm.options.cursorBlinkRate > 0)
-      display.blinker = setInterval(function() {
-        display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";
-      }, cm.options.cursorBlinkRate);
-    else if (cm.options.cursorBlinkRate < 0)
-      display.cursorDiv.style.visibility = "hidden";
-  }
-
-  // HIGHLIGHT WORKER
-
-  function startWorker(cm, time) {
-    if (cm.doc.mode.startState && cm.doc.frontier < cm.display.viewTo)
-      cm.state.highlight.set(time, bind(highlightWorker, cm));
-  }
-
-  function highlightWorker(cm) {
-    var doc = cm.doc;
-    if (doc.frontier < doc.first) doc.frontier = doc.first;
-    if (doc.frontier >= cm.display.viewTo) return;
-    var end = +new Date + cm.options.workTime;
-    var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
-    var changedLines = [];
-
-    doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
-      if (doc.frontier >= cm.display.viewFrom) { // Visible
-        var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength;
-        var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true);
-        line.styles = highlighted.styles;
-        var oldCls = line.styleClasses, newCls = highlighted.classes;
-        if (newCls) line.styleClasses = newCls;
-        else if (oldCls) line.styleClasses = null;
-        var ischange = !oldStyles || oldStyles.length != line.styles.length ||
-          oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
-        for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
-        if (ischange) changedLines.push(doc.frontier);
-        line.stateAfter = tooLong ? state : copyState(doc.mode, state);
-      } else {
-        if (line.text.length <= cm.options.maxHighlightLength)
-          processLine(cm, line.text, state);
-        line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
-      }
-      ++doc.frontier;
-      if (+new Date > end) {
-        startWorker(cm, cm.options.workDelay);
-        return true;
-      }
-    });
-    if (changedLines.length) runInOp(cm, function() {
-      for (var i = 0; i < changedLines.length; i++)
-        regLineChange(cm, changedLines[i], "text");
-    });
-  }
-
-  // Finds the line to start with when starting a parse. Tries to
-  // find a line with a stateAfter, so that it can start with a
-  // valid state. If that fails, it returns the line with the
-  // smallest indentation, which tends to need the least context to
-  // parse correctly.
-  function findStartLine(cm, n, precise) {
-    var minindent, minline, doc = cm.doc;
-    var lim = precise ? -1 : n - (cm.doc.mode.innerMode ? 1000 : 100);
-    for (var search = n; search > lim; --search) {
-      if (search <= doc.first) return doc.first;
-      var line = getLine(doc, search - 1);
-      if (line.stateAfter && (!precise || search <= doc.frontier)) return search;
-      var indented = countColumn(line.text, null, cm.options.tabSize);
-      if (minline == null || minindent > indented) {
-        minline = search - 1;
-        minindent = indented;
-      }
-    }
-    return minline;
-  }
-
-  function getStateBefore(cm, n, precise) {
-    var doc = cm.doc, display = cm.display;
-    if (!doc.mode.startState) return true;
-    var pos = findStartLine(cm, n, precise), state = pos > doc.first && getLine(doc, pos-1).stateAfter;
-    if (!state) state = startState(doc.mode);
-    else state = copyState(doc.mode, state);
-    doc.iter(pos, n, function(line) {
-      processLine(cm, line.text, state);
-      var save = pos == n - 1 || pos % 5 == 0 || pos >= display.viewFrom && pos < display.viewTo;
-      line.stateAfter = save ? copyState(doc.mode, state) : null;
-      ++pos;
-    });
-    if (precise) doc.frontier = pos;
-    return state;
-  }
-
-  // POSITION MEASUREMENT
-
-  function paddingTop(display) {return display.lineSpace.offsetTop;}
-  function paddingVert(display) {return display.mover.offsetHeight - display.lineSpace.offsetHeight;}
-  function paddingH(display) {
-    if (display.cachedPaddingH) return display.cachedPaddingH;
-    var e = removeChildrenAndAdd(display.measure, elt("pre", "x"));
-    var style = window.getComputedStyle ? window.getComputedStyle(e) : e.currentStyle;
-    var data = {left: parseInt(style.paddingLeft), right: parseInt(style.paddingRight)};
-    if (!isNaN(data.left) && !isNaN(data.right)) display.cachedPaddingH = data;
-    return data;
-  }
-
-  function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth; }
-  function displayWidth(cm) {
-    return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth;
-  }
-  function displayHeight(cm) {
-    return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight;
-  }
-
-  // Ensure the lineView.wrapping.heights array is populated. This is
-  // an array of bottom offsets for the lines that make up a drawn
-  // line. When lineWrapping is on, there might be more than one
-  // height.
-  function ensureLineHeights(cm, lineView, rect) {
-    var wrapping = cm.options.lineWrapping;
-    var curWidth = wrapping && displayWidth(cm);
-    if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
-      var heights = lineView.measure.heights = [];
-      if (wrapping) {
-        lineView.measure.width = curWidth;
-        var rects = lineView.text.firstChild.getClientRects();
-        for (var i = 0; i < rects.length - 1; i++) {
-          var cur = rects[i], next = rects[i + 1];
-          if (Math.abs(cur.bottom - next.bottom) > 2)
-            heights.push((cur.bottom + next.top) / 2 - rect.top);
-        }
-      }
-      heights.push(rect.bottom - rect.top);
-    }
-  }
-
-  // Find a line map (mapping character offsets to text nodes) and a
-  // measurement cache for the given line number. (A line view might
-  // contain multiple lines when collapsed ranges are present.)
-  function mapFromLineView(lineView, line, lineN) {
-    if (lineView.line == line)
-      return {map: lineView.measure.map, cache: lineView.measure.cache};
-    for (var i = 0; i < lineView.rest.length; i++)
-      if (lineView.rest[i] == line)
-        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i]};
-    for (var i = 0; i < lineView.rest.length; i++)
-      if (lineNo(lineView.rest[i]) > lineN)
-        return {map: lineView.measure.maps[i], cache: lineView.measure.caches[i], before: true};
-  }
-
-  // Render a line into the hidden node display.externalMeasured. Used
-  // when measurement is needed for a line that's not in the viewport.
-  function updateExternalMeasurement(cm, line) {
-    line = visualLine(line);
-    var lineN = lineNo(line);
-    var view = cm.display.externalMeasured = new LineView(cm.doc, line, lineN);
-    view.lineN = lineN;
-    var built = view.built = buildLineContent(cm, view);
-    view.text = built.pre;
-    removeChildrenAndAdd(cm.display.lineMeasure, built.pre);
-    return view;
-  }
-
-  // Get a {top, bottom, left, right} box (in line-local coordinates)
-  // for a given character.
-  function measureChar(cm, line, ch, bias) {
-    return measureCharPrepared(cm, prepareMeasureForLine(cm, line), ch, bias);
-  }
-
-  // Find a line view that corresponds to the given line number.
-  function findViewForLine(cm, lineN) {
-    if (lineN >= cm.display.viewFrom && lineN < cm.display.viewTo)
-      return cm.display.view[findViewIndex(cm, lineN)];
-    var ext = cm.display.externalMeasured;
-    if (ext && lineN >= ext.lineN && lineN < ext.lineN + ext.size)
-      return ext;
-  }
-
-  // Measurement can be split in two steps, the set-up work that
-  // applies to the whole line, and the measurement of the actual
-  // character. Functions like coordsChar, that need to do a lot of
-  // measurements in a row, can thus ensure that the set-up work is
-  // only done once.
-  function prepareMeasureForLine(cm, line) {
-    var lineN = lineNo(line);
-    var view = findViewForLine(cm, lineN);
-    if (view && !view.text) {
-      view = null;
-    } else if (view && view.changes) {
-      updateLineForChanges(cm, view, lineN, getDimensions(cm));
-      cm.curOp.forceUpdate = true;
-    }
-    if (!view)
-      view = updateExternalMeasurement(cm, line);
-
-    var info = mapFromLineView(view, line, lineN);
-    return {
-      line: line, view: view, rect: null,
-      map: info.map, cache: info.cache, before: info.before,
-      hasHeights: false
-    };
-  }
-
-  // Given a prepared measurement object, measures the position of an
-  // actual character (or fetches it from the cache).
-  function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
-    if (prepared.before) ch = -1;
-    var key = ch + (bias || ""), found;
-    if (prepared.cache.hasOwnProperty(key)) {
-      found = prepared.cache[key];
-    } else {
-      if (!prepared.rect)
-        prepared.rect = prepared.view.text.getBoundingClientRect();
-      if (!prepared.hasHeights) {
-        ensureLineHeights(cm, prepared.view, prepared.rect);
-        prepared.hasHeights = true;
-      }
-      found = measureCharInner(cm, prepared, ch, bias);
-      if (!found.bogus) prepared.cache[key] = found;
-    }
-    return {left: found.left, right: found.right,
-            top: varHeight ? found.rtop : found.top,
-            bottom: varHeight ? found.rbottom : found.bottom};
-  }
-
-  var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
-
-  function nodeAndOffsetInLineMap(map, ch, bias) {
-    var node, start, end, collapse;
-    // First, search the line map for the text node corresponding to,
-    // or closest to, the target character.
-    for (var i = 0; i < map.length; i += 3) {
-      var mStart = map[i], mEnd = map[i + 1];
-      if (ch < mStart) {
-        start = 0; end = 1;
-        collapse = "left";
-      } else if (ch < mEnd) {
-        start = ch - mStart;
-        end = start + 1;
-      } else if (i == map.length - 3 || ch == mEnd && map[i + 3] > ch) {
-        end = mEnd - mStart;
-        start = end - 1;
-        if (ch >= mEnd) collapse = "right";
-      }
-      if (start != null) {
-        node = map[i + 2];
-        if (mStart == mEnd && bias == (node.insertLeft ? "left" : "right"))
-          collapse = bias;
-        if (bias == "left" && start == 0)
-          while (i && map[i - 2] == map[i - 3] && map[i - 1].insertLeft) {
-            node = map[(i -= 3) + 2];
-            collapse = "left";
-          }
-        if (bias == "right" && start == mEnd - mStart)
-          while (i < map.length - 3 && map[i + 3] == map[i + 4] && !map[i + 5].insertLeft) {
-            node = map[(i += 3) + 2];
-            collapse = "right";
-          }
-        break;
-      }
-    }
-    return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd};
-  }
-
-  function measureCharInner(cm, prepared, ch, bias) {
-    var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
-    var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
-
-    var rect;
-    if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
-      for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
-        while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start;
-        while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end;
-        if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) {
-          rect = node.parentNode.getBoundingClientRect();
-        } else if (ie && cm.options.lineWrapping) {
-          var rects = range(node, start, end).getClientRects();
-          if (rects.length)
-            rect = rects[bias == "right" ? rects.length - 1 : 0];
-          else
-            rect = nullRect;
-        } else {
-          rect = range(node, start, end).getBoundingClientRect() || nullRect;
-        }
-        if (rect.left || rect.right || start == 0) break;
-        end = start;
-        start = start - 1;
-        collapse = "right";
-      }
-      if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
-    } else { // If it is a widget, simply get the box for the whole widget.
-      if (start > 0) collapse = bias = "right";
-      var rects;
-      if (cm.options.lineWrapping && (rects = node.getClientRects()).length > 1)
-        rect = rects[bias == "right" ? rects.length - 1 : 0];
-      else
-        rect = node.getBoundingClientRect();
-    }
-    if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
-      var rSpan = node.parentNode.getClientRects()[0];
-      if (rSpan)
-        rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
-      else
-        rect = nullRect;
-    }
-
-    var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
-    var mid = (rtop + rbot) / 2;
-    var heights = prepared.view.measure.heights;
-    for (var i = 0; i < heights.length - 1; i++)
-      if (mid < heights[i]) break;
-    var top = i ? heights[i - 1] : 0, bot = heights[i];
-    var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
-                  right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
-                  top: top, bottom: bot};
-    if (!rect.left && !rect.right) result.bogus = true;
-    if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
-
-    return result;
-  }
-
-  // Work around problem with bounding client rects on ranges being
-  // returned incorrectly when zoomed on IE10 and below.
-  function maybeUpdateRectForZooming(measure, rect) {
-    if (!window.screen || screen.logicalXDPI == null ||
-        screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
-      return rect;
-    var scaleX = screen.logicalXDPI / screen.deviceXDPI;
-    var scaleY = screen.logicalYDPI / screen.deviceYDPI;
-    return {left: rect.left * scaleX, right: rect.right * scaleX,
-            top: rect.top * scaleY, bottom: rect.bottom * scaleY};
-  }
-
-  function clearLineMeasurementCacheFor(lineView) {
-    if (lineView.measure) {
-      lineView.measure.cache = {};
-      lineView.measure.heights = null;
-      if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-        lineView.measure.caches[i] = {};
-    }
-  }
-
-  function clearLineMeasurementCache(cm) {
-    cm.display.externalMeasure = null;
-    removeChildren(cm.display.lineMeasure);
-    for (var i = 0; i < cm.display.view.length; i++)
-      clearLineMeasurementCacheFor(cm.display.view[i]);
-  }
-
-  function clearCaches(cm) {
-    clearLineMeasurementCache(cm);
-    cm.display.cachedCharWidth = cm.display.cachedTextHeight = cm.display.cachedPaddingH = null;
-    if (!cm.options.lineWrapping) cm.display.maxLineChanged = true;
-    cm.display.lineNumChars = null;
-  }
-
-  function pageScrollX() { return window.pageXOffset || (document.documentElement || document.body).scrollLeft; }
-  function pageScrollY() { return window.pageYOffset || (document.documentElement || document.body).scrollTop; }
-
-  // Converts a {top, bottom, left, right} box from line-local
-  // coordinates into another coordinate system. Context may be one of
-  // "line", "div" (display.lineDiv), "local"/null (editor), "window",
-  // or "page".
-  function intoCoordSystem(cm, lineObj, rect, context) {
-    if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
-      var size = widgetHeight(lineObj.widgets[i]);
-      rect.top += size; rect.bottom += size;
-    }
-    if (context == "line") return rect;
-    if (!context) context = "local";
-    var yOff = heightAtLine(lineObj);
-    if (context == "local") yOff += paddingTop(cm.display);
-    else yOff -= cm.display.viewOffset;
-    if (context == "page" || context == "window") {
-      var lOff = cm.display.lineSpace.getBoundingClientRect();
-      yOff += lOff.top + (context == "window" ? 0 : pageScrollY());
-      var xOff = lOff.left + (context == "window" ? 0 : pageScrollX());
-      rect.left += xOff; rect.right += xOff;
-    }
-    rect.top += yOff; rect.bottom += yOff;
-    return rect;
-  }
-
-  // Coverts a box from "div" coords to another coordinate system.
-  // Context may be "window", "page", "div", or "local"/null.
-  function fromCoordSystem(cm, coords, context) {
-    if (context == "div") return coords;
-    var left = coords.left, top = coords.top;
-    // First move into "page" coordinate system
-    if (context == "page") {
-      left -= pageScrollX();
-      top -= pageScrollY();
-    } else if (context == "local" || !context) {
-      var localBox = cm.display.sizer.getBoundingClientRect();
-      left += localBox.left;
-      top += localBox.top;
-    }
-
-    var lineSpaceBox = cm.display.lineSpace.getBoundingClientRect();
-    return {left: left - lineSpaceBox.left, top: top - lineSpaceBox.top};
-  }
-
-  function charCoords(cm, pos, context, lineObj, bias) {
-    if (!lineObj) lineObj = getLine(cm.doc, pos.line);
-    return intoCoordSystem(cm, lineObj, measureChar(cm, lineObj, pos.ch, bias), context);
-  }
-
-  // Returns a box for a given cursor position, which may have an
-  // 'other' property containing the position of the secondary cursor
-  // on a bidi boundary.
-  function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
-    lineObj = lineObj || getLine(cm.doc, pos.line);
-    if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj);
-    function get(ch, right) {
-      var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
-      if (right) m.left = m.right; else m.right = m.left;
-      return intoCoordSystem(cm, lineObj, m, context);
-    }
-    function getBidi(ch, partPos) {
-      var part = order[partPos], right = part.level % 2;
-      if (ch == bidiLeft(part) && partPos && part.level < order[partPos - 1].level) {
-        part = order[--partPos];
-        ch = bidiRight(part) - (part.level % 2 ? 0 : 1);
-        right = true;
-      } else if (ch == bidiRight(part) && partPos < order.length - 1 && part.level < order[partPos + 1].level) {
-        part = order[++partPos];
-        ch = bidiLeft(part) - part.level % 2;
-        right = false;
-      }
-      if (right && ch == part.to && ch > part.from) return get(ch - 1);
-      return get(ch, right);
-    }
-    var order = getOrder(lineObj), ch = pos.ch;
-    if (!order) return get(ch);
-    var partPos = getBidiPartAt(order, ch);
-    var val = getBidi(ch, partPos);
-    if (bidiOther != null) val.other = getBidi(ch, bidiOther);
-    return val;
-  }
-
-  // Used to cheaply estimate the coordinates for a position. Used for
-  // intermediate scroll updates.
-  function estimateCoords(cm, pos) {
-    var left = 0, pos = clipPos(cm.doc, pos);
-    if (!cm.options.lineWrapping) left = charWidth(cm.display) * pos.ch;
-    var lineObj = getLine(cm.doc, pos.line);
-    var top = heightAtLine(lineObj) + paddingTop(cm.display);
-    return {left: left, right: left, top: top, bottom: top + lineObj.height};
-  }
-
-  // Positions returned by coordsChar contain some extra information.
-  // xRel is the relative x position of the input coordinates compared
-  // to the found position (so xRel > 0 means the coordinates are to
-  // the right of the character position, for example). When outside
-  // is true, that means the coordinates lie outside the line's
-  // vertical range.
-  function PosWithInfo(line, ch, outside, xRel) {
-    var pos = Pos(line, ch);
-    pos.xRel = xRel;
-    if (outside) pos.outside = true;
-    return pos;
-  }
-
-  // Compute the character position closest to the given coordinates.
-  // Input must be lineSpace-local ("div" coordinate system).
-  function coordsChar(cm, x, y) {
-    var doc = cm.doc;
-    y += cm.display.viewOffset;
-    if (y < 0) return PosWithInfo(doc.first, 0, true, -1);
-    var lineN = lineAtHeight(doc, y), last = doc.first + doc.size - 1;
-    if (lineN > last)
-      return PosWithInfo(doc.first + doc.size - 1, getLine(doc, last).text.length, true, 1);
-    if (x < 0) x = 0;
-
-    var lineObj = getLine(doc, lineN);
-    for (;;) {
-      var found = coordsCharInner(cm, lineObj, lineN, x, y);
-      var merged = collapsedSpanAtEnd(lineObj);
-      var mergedPos = merged && merged.find(0, true);
-      if (merged && (found.ch > mergedPos.from.ch || found.ch == mergedPos.from.ch && found.xRel > 0))
-        lineN = lineNo(lineObj = mergedPos.to.line);
-      else
-        return found;
-    }
-  }
-
-  function coordsCharInner(cm, lineObj, lineNo, x, y) {
-    var innerOff = y - heightAtLine(lineObj);
-    var wrongLine = false, adjust = 2 * cm.display.wrapper.clientWidth;
-    var preparedMeasure = prepareMeasureForLine(cm, lineObj);
-
-    function getX(ch) {
-      var sp = cursorCoords(cm, Pos(lineNo, ch), "line", lineObj, preparedMeasure);
-      wrongLine = true;
-      if (innerOff > sp.bottom) return sp.left - adjust;
-      else if (innerOff < sp.top) return sp.left + adjust;
-      else wrongLine = false;
-      return sp.left;
-    }
-
-    var bidi = getOrder(lineObj), dist = lineObj.text.length;
-    var from = lineLeft(lineObj), to = lineRight(lineObj);
-    var fromX = getX(from), fromOutside = wrongLine, toX = getX(to), toOutside = wrongLine;
-
-    if (x > toX) return PosWithInfo(lineNo, to, toOutside, 1);
-    // Do a binary search between these bounds.
-    for (;;) {
-      if (bidi ? to == from || to == moveVisually(lineObj, from, 1) : to - from <= 1) {
-        var ch = x < fromX || x - fromX <= toX - x ? from : to;
-        var xDiff = x - (ch == from ? fromX : toX);
-        while (isExtendingChar(lineObj.text.charAt(ch))) ++ch;
-        var pos = PosWithInfo(lineNo, ch, ch == from ? fromOutside : toOutside,
-                              xDiff < -1 ? -1 : xDiff > 1 ? 1 : 0);
-        return pos;
-      }
-      var step = Math.ceil(dist / 2), middle = from + step;
-      if (bidi) {
-        middle = from;
-        for (var i = 0; i < step; ++i) middle = moveVisually(lineObj, middle, 1);
-      }
-      var middleX = getX(middle);
-      if (middleX > x) {to = middle; toX = middleX; if (toOutside = wrongLine) toX += 1000; dist = step;}
-      else {from = middle; fromX = middleX; fromOutside = wrongLine; dist -= step;}
-    }
-  }
-
-  var measureText;
-  // Compute the default text height.
-  function textHeight(display) {
-    if (display.cachedTextHeight != null) return display.cachedTextHeight;
-    if (measureText == null) {
-      measureText = elt("pre");
-      // Measure a bunch of lines, for browsers that compute
-      // fractional heights.
-      for (var i = 0; i < 49; ++i) {
-        measureText.appendChild(document.createTextNode("x"));
-        measureText.appendChild(elt("br"));
-      }
-      measureText.appendChild(document.createTextNode("x"));
-    }
-    removeChildrenAndAdd(display.measure, measureText);
-    var height = measureText.offsetHeight / 50;
-    if (height > 3) display.cachedTextHeight = height;
-    removeChildren(display.measure);
-    return height || 1;
-  }
-
-  // Compute the default character width.
-  function charWidth(display) {
-    if (display.cachedCharWidth != null) return display.cachedCharWidth;
-    var anchor = elt("span", "xxxxxxxxxx");
-    var pre = elt("pre", [anchor]);
-    removeChildrenAndAdd(display.measure, pre);
-    var rect = anchor.getBoundingClientRect(), width = (rect.right - rect.left) / 10;
-    if (width > 2) display.cachedCharWidth = width;
-    return width || 10;
-  }
-
-  // OPERATIONS
-
-  // Operations are used to wrap a series of changes to the editor
-  // state in such a way that each change won't have to update the
-  // cursor and display (which would be awkward, slow, and
-  // error-prone). Instead, display updates are batched and then all
-  // combined and executed at once.
-
-  var operationGroup = null;
-
-  var nextOpId = 0;
-  // Start a new operation.
-  function startOperation(cm) {
-    cm.curOp = {
-      cm: cm,
-      viewChanged: false,      // Flag that indicates that lines might need to be redrawn
-      startHeight: cm.doc.height, // Used to detect need to update scrollbar
-      forceUpdate: false,      // Used to force a redraw
-      updateInput: null,       // Whether to reset the input textarea
-      typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
-      changeObjs: null,        // Accumulated changes, for firing change events
-      cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
-      cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
-      selectionChanged: false, // Whether the selection needs to be redrawn
-      updateMaxLine: false,    // Set when the widest line needs to be determined anew
-      scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
-      scrollToPos: null,       // Used to scroll to a specific position
-      focus: false,
-      id: ++nextOpId           // Unique ID
-    };
-    if (operationGroup) {
-      operationGroup.ops.push(cm.curOp);
-    } else {
-      cm.curOp.ownsGroup = operationGroup = {
-        ops: [cm.curOp],
-        delayedCallbacks: []
-      };
-    }
-  }
-
-  function fireCallbacksForOps(group) {
-    // Calls delayed callbacks and cursorActivity handlers until no
-    // new ones appear
-    var callbacks = group.delayedCallbacks, i = 0;
-    do {
-      for (; i < callbacks.length; i++)
-        callbacks[i].call(null);
-      for (var j = 0; j < group.ops.length; j++) {
-        var op = group.ops[j];
-        if (op.cursorActivityHandlers)
-          while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
-            op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm);
-      }
-    } while (i < callbacks.length);
-  }
-
-  // Finish an operation, updating the display and signalling delayed events
-  function endOperation(cm) {
-    var op = cm.curOp, group = op.ownsGroup;
-    if (!group) return;
-
-    try { fireCallbacksForOps(group); }
-    finally {
-      operationGroup = null;
-      for (var i = 0; i < group.ops.length; i++)
-        group.ops[i].cm.curOp = null;
-      endOperations(group);
-    }
-  }
-
-  // The DOM updates done when an operation finishes are batched so
-  // that the minimum number of relayouts are required.
-  function endOperations(group) {
-    var ops = group.ops;
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_R1(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
-      endOperation_W1(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_R2(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
-      endOperation_W2(ops[i]);
-    for (var i = 0; i < ops.length; i++) // Read DOM
-      endOperation_finish(ops[i]);
-  }
-
-  function endOperation_R1(op) {
-    var cm = op.cm, display = cm.display;
-    maybeClipScrollbars(cm);
-    if (op.updateMaxLine) findMaxLine(cm);
-
-    op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
-      op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
-                         op.scrollToPos.to.line >= display.viewTo) ||
-      display.maxLineChanged && cm.options.lineWrapping;
-    op.update = op.mustUpdate &&
-      new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
-  }
-
-  function endOperation_W1(op) {
-    op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
-  }
-
-  function endOperation_R2(op) {
-    var cm = op.cm, display = cm.display;
-    if (op.updatedDisplay) updateHeightsInViewport(cm);
-
-    op.barMeasure = measureForScrollbars(cm);
-
-    // If the max line changed since it was last measured, measure it,
-    // and ensure the document's width matches it.
-    // updateDisplay_W2 will use these properties to do the actual resizing
-    if (display.maxLineChanged && !cm.options.lineWrapping) {
-      op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
-      cm.display.sizerWidth = op.adjustWidthTo;
-      op.barMeasure.scrollWidth =
-        Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
-      op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
-    }
-
-    if (op.updatedDisplay || op.selectionChanged)
-      op.preparedSelection = display.input.prepareSelection();
-  }
-
-  function endOperation_W2(op) {
-    var cm = op.cm;
-
-    if (op.adjustWidthTo != null) {
-      cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
-      if (op.maxScrollLeft < cm.doc.scrollLeft)
-        setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true);
-      cm.display.maxLineChanged = false;
-    }
-
-    if (op.preparedSelection)
-      cm.display.input.showSelection(op.preparedSelection);
-    if (op.updatedDisplay)
-      setDocumentHeight(cm, op.barMeasure);
-    if (op.updatedDisplay || op.startHeight != cm.doc.height)
-      updateScrollbars(cm, op.barMeasure);
-
-    if (op.selectionChanged) restartBlink(cm);
-
-    if (cm.state.focused && op.updateInput)
-      cm.display.input.reset(op.typing);
-    if (op.focus && op.focus == activeElt()) ensureFocus(op.cm);
-  }
-
-  function endOperation_finish(op) {
-    var cm = op.cm, display = cm.display, doc = cm.doc;
-
-    if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
-
-    // Abort mouse wheel delta measurement, when scrolling explicitly
-    if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
-      display.wheelStartX = display.wheelStartY = null;
-
-    // Propagate the scroll position to the actual DOM scroller
-    if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
-      doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
-      display.scrollbars.setScrollTop(doc.scrollTop);
-      display.scroller.scrollTop = doc.scrollTop;
-    }
-    if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
-      doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - displayWidth(cm), op.scrollLeft));
-      display.scrollbars.setScrollLeft(doc.scrollLeft);
-      display.scroller.scrollLeft = doc.scrollLeft;
-      alignHorizontally(cm);
-    }
-    // If we need to scroll a specific position into view, do so.
-    if (op.scrollToPos) {
-      var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
-                                     clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
-      if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
-    }
-
-    // Fire events for markers that are hidden/unidden by editing or
-    // undoing
-    var hidden = op.maybeHiddenMarkers, unhidden = op.maybeUnhiddenMarkers;
-    if (hidden) for (var i = 0; i < hidden.length; ++i)
-      if (!hidden[i].lines.length) signal(hidden[i], "hide");
-    if (unhidden) for (var i = 0; i < unhidden.length; ++i)
-      if (unhidden[i].lines.length) signal(unhidden[i], "unhide");
-
-    if (display.wrapper.offsetHeight)
-      doc.scrollTop = cm.display.scroller.scrollTop;
-
-    // Fire change events, and delayed event handlers
-    if (op.changeObjs)
-      signal(cm, "changes", cm, op.changeObjs);
-    if (op.update)
-      op.update.finish();
-  }
-
-  // Run the given function in an operation
-  function runInOp(cm, f) {
-    if (cm.curOp) return f();
-    startOperation(cm);
-    try { return f(); }
-    finally { endOperation(cm); }
-  }
-  // Wraps a function in an operation. Returns the wrapped function.
-  function operation(cm, f) {
-    return function() {
-      if (cm.curOp) return f.apply(cm, arguments);
-      startOperation(cm);
-      try { return f.apply(cm, arguments); }
-      finally { endOperation(cm); }
-    };
-  }
-  // Used to add methods to editor and doc instances, wrapping them in
-  // operations.
-  function methodOp(f) {
-    return function() {
-      if (this.curOp) return f.apply(this, arguments);
-      startOperation(this);
-      try { return f.apply(this, arguments); }
-      finally { endOperation(this); }
-    };
-  }
-  function docMethodOp(f) {
-    return function() {
-      var cm = this.cm;
-      if (!cm || cm.curOp) return f.apply(this, arguments);
-      startOperation(cm);
-      try { return f.apply(this, arguments); }
-      finally { endOperation(cm); }
-    };
-  }
-
-  // VIEW TRACKING
-
-  // These objects are used to represent the visible (currently drawn)
-  // part of the document. A LineView may correspond to multiple
-  // logical lines, if those are connected by collapsed ranges.
-  function LineView(doc, line, lineN) {
-    // The starting line
-    this.line = line;
-    // Continuing lines, if any
-    this.rest = visualLineContinued(line);
-    // Number of logical lines in this visual line
-    this.size = this.rest ? lineNo(lst(this.rest)) - lineN + 1 : 1;
-    this.node = this.text = null;
-    this.hidden = lineIsHidden(doc, line);
-  }
-
-  // Create a range of LineView objects for the given lines.
-  function buildViewArray(cm, from, to) {
-    var array = [], nextPos;
-    for (var pos = from; pos < to; pos = nextPos) {
-      var view = new LineView(cm.doc, getLine(cm.doc, pos), pos);
-      nextPos = pos + view.size;
-      array.push(view);
-    }
-    return array;
-  }
-
-  // Updates the display.view data structure for a given change to the
-  // document. From and to are in pre-change coordinates. Lendiff is
-  // the amount of lines added or subtracted by the change. This is
-  // used for changes that span multiple lines, or change the way
-  // lines are divided into visual lines. regLineChange (below)
-  // registers single-line changes.
-  function regChange(cm, from, to, lendiff) {
-    if (from == null) from = cm.doc.first;
-    if (to == null) to = cm.doc.first + cm.doc.size;
-    if (!lendiff) lendiff = 0;
-
-    var display = cm.display;
-    if (lendiff && to < display.viewTo &&
-        (display.updateLineNumbers == null || display.updateLineNumbers > from))
-      display.updateLineNumbers = from;
-
-    cm.curOp.viewChanged = true;
-
-    if (from >= display.viewTo) { // Change after
-      if (sawCollapsedSpans && visualLineNo(cm.doc, from) < display.viewTo)
-        resetView(cm);
-    } else if (to <= display.viewFrom) { // Change before
-      if (sawCollapsedSpans && visualLineEndNo(cm.doc, to + lendiff) > display.viewFrom) {
-        resetView(cm);
-      } else {
-        display.viewFrom += lendiff;
-        display.viewTo += lendiff;
-      }
-    } else if (from <= display.viewFrom && to >= display.viewTo) { // Full overlap
-      resetView(cm);
-    } else if (from <= display.viewFrom) { // Top overlap
-      var cut = viewCuttingPoint(cm, to, to + lendiff, 1);
-      if (cut) {
-        display.view = display.view.slice(cut.index);
-        display.viewFrom = cut.lineN;
-        display.viewTo += lendiff;
-      } else {
-        resetView(cm);
-      }
-    } else if (to >= display.viewTo) { // Bottom overlap
-      var cut = viewCuttingPoint(cm, from, from, -1);
-      if (cut) {
-        display.view = display.view.slice(0, cut.index);
-        display.viewTo = cut.lineN;
-      } else {
-        resetView(cm);
-      }
-    } else { // Gap in the middle
-      var cutTop = viewCuttingPoint(cm, from, from, -1);
-      var cutBot = viewCuttingPoint(cm, to, to + lendiff, 1);
-      if (cutTop && cutBot) {
-        display.view = display.view.slice(0, cutTop.index)
-          .concat(buildViewArray(cm, cutTop.lineN, cutBot.lineN))
-          .concat(display.view.slice(cutBot.index));
-        display.viewTo += lendiff;
-      } else {
-        resetView(cm);
-      }
-    }
-
-    var ext = display.externalMeasured;
-    if (ext) {
-      if (to < ext.lineN)
-        ext.lineN += lendiff;
-      else if (from < ext.lineN + ext.size)
-        display.externalMeasured = null;
-    }
-  }
-
-  // Register a change to a single line. Type must be one of "text",
-  // "gutter", "class", "widget"
-  function regLineChange(cm, line, type) {
-    cm.curOp.viewChanged = true;
-    var display = cm.display, ext = cm.display.externalMeasured;
-    if (ext && line >= ext.lineN && line < ext.lineN + ext.size)
-      display.externalMeasured = null;
-
-    if (line < display.viewFrom || line >= display.viewTo) return;
-    var lineView = display.view[findViewIndex(cm, line)];
-    if (lineView.node == null) return;
-    var arr = lineView.changes || (lineView.changes = []);
-    if (indexOf(arr, type) == -1) arr.push(type);
-  }
-
-  // Clear the view.
-  function resetView(cm) {
-    cm.display.viewFrom = cm.display.viewTo = cm.doc.first;
-    cm.display.view = [];
-    cm.display.viewOffset = 0;
-  }
-
-  // Find the view element corresponding to a given line. Return null
-  // when the line isn't visible.
-  function findViewIndex(cm, n) {
-    if (n >= cm.display.viewTo) return null;
-    n -= cm.display.viewFrom;
-    if (n < 0) return null;
-    var view = cm.display.view;
-    for (var i = 0; i < view.length; i++) {
-      n -= view[i].size;
-      if (n < 0) return i;
-    }
-  }
-
-  function viewCuttingPoint(cm, oldN, newN, dir) {
-    var index = findViewIndex(cm, oldN), diff, view = cm.display.view;
-    if (!sawCollapsedSpans || newN == cm.doc.first + cm.doc.size)
-      return {index: index, lineN: newN};
-    for (var i = 0, n = cm.display.viewFrom; i < index; i++)
-      n += view[i].size;
-    if (n != oldN) {
-      if (dir > 0) {
-        if (index == view.length - 1) return null;
-        diff = (n + view[index].size) - oldN;
-        index++;
-      } else {
-        diff = n - oldN;
-      }
-      oldN += diff; newN += diff;
-    }
-    while (visualLineNo(cm.doc, newN) != newN) {
-      if (index == (dir < 0 ? 0 : view.length - 1)) return null;
-      newN += dir * view[index - (dir < 0 ? 1 : 0)].size;
-      index += dir;
-    }
-    return {index: index, lineN: newN};
-  }
-
-  // Force the view to cover a given range, adding empty view element
-  // or clipping off existing ones as needed.
-  function adjustView(cm, from, to) {
-    var display = cm.display, view = display.view;
-    if (view.length == 0 || from >= display.viewTo || to <= display.viewFrom) {
-      display.view = buildViewArray(cm, from, to);
-      display.viewFrom = from;
-    } else {
-      if (display.viewFrom > from)
-        display.view = buildViewArray(cm, from, display.viewFrom).concat(display.view);
-      else if (display.viewFrom < from)
-        display.view = display.view.slice(findViewIndex(cm, from));
-      display.viewFrom = from;
-      if (display.viewTo < to)
-        display.view = display.view.concat(buildViewArray(cm, display.viewTo, to));
-      else if (display.viewTo > to)
-        display.view = display.view.slice(0, findViewIndex(cm, to));
-    }
-    display.viewTo = to;
-  }
-
-  // Count the number of lines in the view whose DOM representation is
-  // out of date (or nonexistent).
-  function countDirtyView(cm) {
-    var view = cm.display.view, dirty = 0;
-    for (var i = 0; i < view.length; i++) {
-      var lineView = view[i];
-      if (!lineView.hidden && (!lineView.node || lineView.changes)) ++dirty;
-    }
-    return dirty;
-  }
-
-  // EVENT HANDLERS
-
-  // Attach the necessary event handlers when initializing the editor
-  function registerEventHandlers(cm) {
-    var d = cm.display;
-    on(d.scroller, "mousedown", operation(cm, onMouseDown));
-    // Older IE's will not fire a second mousedown for a double click
-    if (ie && ie_version < 11)
-      on(d.scroller, "dblclick", operation(cm, function(e) {
-        if (signalDOMEvent(cm, e)) return;
-        var pos = posFromMouse(cm, e);
-        if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
-        e_preventDefault(e);
-        var word = cm.findWordAt(pos);
-        extendSelection(cm.doc, word.anchor, word.head);
-      }));
-    else
-      on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
-    // Some browsers fire contextmenu *after* opening the menu, at
-    // which point we can't mess with it anymore. Context menu is
-    // handled in onMouseDown for these browsers.
-    if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
-
-    // Used to suppress mouse event handling when a touch happens
-    var touchFinished, prevTouch = {end: 0};
-    function finishTouch() {
-      if (d.activeTouch) {
-        touchFinished = setTimeout(function() {d.activeTouch = null;}, 1000);
-        prevTouch = d.activeTouch;
-        prevTouch.end = +new Date;
-      }
-    };
-    function isMouseLikeTouchEvent(e) {
-      if (e.touches.length != 1) return false;
-      var touch = e.touches[0];
-      return touch.radiusX <= 1 && touch.radiusY <= 1;
-    }
-    function farAway(touch, other) {
-      if (other.left == null) return true;
-      var dx = other.left - touch.left, dy = other.top - touch.top;
-      return dx * dx + dy * dy > 20 * 20;
-    }
-    on(d.scroller, "touchstart", function(e) {
-      if (!isMouseLikeTouchEvent(e)) {
-        clearTimeout(touchFinished);
-        var now = +new Date;
-        d.activeTouch = {start: now, moved: false,
-                         prev: now - prevTouch.end <= 300 ? prevTouch : null};
-        if (e.touches.length == 1) {
-          d.activeTouch.left = e.touches[0].pageX;
-          d.activeTouch.top = e.touches[0].pageY;
-        }
-      }
-    });
-    on(d.scroller, "touchmove", function() {
-      if (d.activeTouch) d.activeTouch.moved = true;
-    });
-    on(d.scroller, "touchend", function(e) {
-      var touch = d.activeTouch;
-      if (touch && !eventInWidget(d, e) && touch.left != null &&
-          !touch.moved && new Date - touch.start < 300) {
-        var pos = cm.coordsChar(d.activeTouch, "page"), range;
-        if (!touch.prev || farAway(touch, touch.prev)) // Single tap
-          range = new Range(pos, pos);
-        else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
-          range = cm.findWordAt(pos);
-        else // Triple tap
-          range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)));
-        cm.setSelection(range.anchor, range.head);
-        cm.focus();
-        e_preventDefault(e);
-      }
-      finishTouch();
-    });
-    on(d.scroller, "touchcancel", finishTouch);
-
-    // Sync scrolling between fake scrollbars and real scrollable
-    // area, ensure viewport is updated when scrolling.
-    on(d.scroller, "scroll", function() {
-      if (d.scroller.clientHeight) {
-        setScrollTop(cm, d.scroller.scrollTop);
-        setScrollLeft(cm, d.scroller.scrollLeft, true);
-        signal(cm, "scroll", cm);
-      }
-    });
-
-    // Listen to wheel events in order to try and update the viewport on time.
-    on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);});
-    on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);});
-
-    // Prevent wrapper from ever scrolling
-    on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
-
-    d.dragFunctions = {
-      enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
-      over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
-      start: function(e){onDragStart(cm, e);},
-      drop: operation(cm, onDrop),
-      leave: function() {clearDragCursor(cm);}
-    };
-
-    var inp = d.input.getField();
-    on(inp, "keyup", function(e) { onKeyUp.call(cm, e); });
-    on(inp, "keydown", operation(cm, onKeyDown));
-    on(inp, "keypress", operation(cm, onKeyPress));
-    on(inp, "focus", bind(onFocus, cm));
-    on(inp, "blur", bind(onBlur, cm));
-  }
-
-  function dragDropChanged(cm, value, old) {
-    var wasOn = old && old != CodeMirror.Init;
-    if (!value != !wasOn) {
-      var funcs = cm.display.dragFunctions;
-      var toggle = value ? on : off;
-      toggle(cm.display.scroller, "dragstart", funcs.start);
-      toggle(cm.display.scroller, "dragenter", funcs.enter);
-      toggle(cm.display.scroller, "dragover", funcs.over);
-      toggle(cm.display.scroller, "dragleave", funcs.leave);
-      toggle(cm.display.scroller, "drop", funcs.drop);
-    }
-  }
-
-  // Called when the window resizes
-  function onResize(cm) {
-    var d = cm.display;
-    if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
-      return;
-    // Might be a text scaling operation, clear size caches.
-    d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
-    d.scrollbarsClipped = false;
-    cm.setSize();
-  }
-
-  // MOUSE EVENTS
-
-  // Return true when the given mouse event happened in a widget
-  function eventInWidget(display, e) {
-    for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
-      if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
-          (n.parentNode == display.sizer && n != display.mover))
-        return true;
-    }
-  }
-
-  // Given a mouse event, find the corresponding position. If liberal
-  // is false, it checks whether a gutter or scrollbar was clicked,
-  // and returns null if it was. forRect is used by rectangular
-  // selections, and tries to estimate a character position even for
-  // coordinates beyond the right of the text.
-  function posFromMouse(cm, e, liberal, forRect) {
-    var display = cm.display;
-    if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null;
-
-    var x, y, space = display.lineSpace.getBoundingClientRect();
-    // Fails unpredictably on IE[67] when mouse is dragged around quickly.
-    try { x = e.clientX - space.left; y = e.clientY - space.top; }
-    catch (e) { return null; }
-    var coords = coordsChar(cm, x, y), line;
-    if (forRect && coords.xRel == 1 && (line = getLine(cm.doc, coords.line).text).length == coords.ch) {
-      var colDiff = countColumn(line, line.length, cm.options.tabSize) - line.length;
-      coords = Pos(coords.line, Math.max(0, Math.round((x - paddingH(cm.display).left) / charWidth(cm.display)) - colDiff));
-    }
-    return coords;
-  }
-
-  // A mouse down can be a single click, double click, triple click,
-  // start of selection drag, start of text drag, new cursor
-  // (ctrl-click), rectangle drag (alt-drag), or xwin
-  // middle-click-paste. Or it might be a click on something we should
-  // not interfere with, such as a scrollbar or widget.
-  function onMouseDown(e) {
-    var cm = this, display = cm.display;
-    if (display.activeTouch && display.input.supportsTouch() || signalDOMEvent(cm, e)) return;
-    display.shift = e.shiftKey;
-
-    if (eventInWidget(display, e)) {
-      if (!webkit) {
-        // Briefly turn off draggability, to allow widgets to do
-        // normal dragging things.
-        display.scroller.draggable = false;
-        setTimeout(function(){display.scroller.draggable = true;}, 100);
-      }
-      return;
-    }
-    if (clickInGutter(cm, e)) return;
-    var start = posFromMouse(cm, e);
-    window.focus();
-
-    switch (e_button(e)) {
-    case 1:
-      // #3261: make sure, that we're not starting a second selection
-      if (cm.state.selectingText)
-        cm.state.selectingText(e);
-      else if (start)
-        leftButtonDown(cm, e, start);
-      else if (e_target(e) == display.scroller)
-        e_preventDefault(e);
-      break;
-    case 2:
-      if (webkit) cm.state.lastMiddleDown = +new Date;
-      if (start) extendSelection(cm.doc, start);
-      setTimeout(function() {display.input.focus();}, 20);
-      e_preventDefault(e);
-      break;
-    case 3:
-      if (captureRightClick) onContextMenu(cm, e);
-      else delayBlurEvent(cm);
-      break;
-    }
-  }
-
-  var lastClick, lastDoubleClick;
-  function leftButtonDown(cm, e, start) {
-    if (ie) setTimeout(bind(ensureFocus, cm), 0);
-    else cm.curOp.focus = activeElt();
-
-    var now = +new Date, type;
-    if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
-      type = "triple";
-    } else if (lastClick && lastClick.time > now - 400 && cmp(lastClick.pos, start) == 0) {
-      type = "double";
-      lastDoubleClick = {time: now, pos: start};
-    } else {
-      type = "single";
-      lastClick = {time: now, pos: start};
-    }
-
-    var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
-    if (cm.options.dragDrop && dragAndDrop && !isReadOnly(cm) &&
-        type == "single" && (contained = sel.contains(start)) > -1 &&
-        (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
-        (cmp(contained.to(), start) > 0 || start.xRel < 0))
-      leftButtonStartDrag(cm, e, start, modifier);
-    else
-      leftButtonSelect(cm, e, start, type, modifier);
-  }
-
-  // Start a text drag. When it ends, see if any dragging actually
-  // happen, and treat as a click if it didn't.
-  function leftButtonStartDrag(cm, e, start, modifier) {
-    var display = cm.display, startTime = +new Date;
-    var dragEnd = operation(cm, function(e2) {
-      if (webkit) display.scroller.draggable = false;
-      cm.state.draggingText = false;
-      off(document, "mouseup", dragEnd);
-      off(display.scroller, "drop", dragEnd);
-      if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
-        e_preventDefault(e2);
-        if (!modifier && +new Date - 200 < startTime)
-          extendSelection(cm.doc, start);
-        // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
-        if (webkit || ie && ie_version == 9)
-          setTimeout(function() {document.body.focus(); display.input.focus();}, 20);
-        else
-          display.input.focus();
-      }
-    });
-    // Let the drag handler handle this.
-    if (webkit) display.scroller.draggable = true;
-    cm.state.draggingText = dragEnd;
-    // IE's approach to draggable
-    if (display.scroller.dragDrop) display.scroller.dragDrop();
-    on(document, "mouseup", dragEnd);
-    on(display.scroller, "drop", dragEnd);
-  }
-
-  // Normal selection, as opposed to text dragging.
-  function leftButtonSelect(cm, e, start, type, addNew) {
-    var display = cm.display, doc = cm.doc;
-    e_preventDefault(e);
-
-    var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
-    if (addNew && !e.shiftKey) {
-      ourIndex = doc.sel.contains(start);
-      if (ourIndex > -1)
-        ourRange = ranges[ourIndex];
-      else
-        ourRange = new Range(start, start);
-    } else {
-      ourRange = doc.sel.primary();
-      ourIndex = doc.sel.primIndex;
-    }
-
-    if (e.altKey) {
-      type = "rect";
-      if (!addNew) ourRange = new Range(start, start);
-      start = posFromMouse(cm, e, true, true);
-      ourIndex = -1;
-    } else if (type == "double") {
-      var word = cm.findWordAt(start);
-      if (cm.display.shift || doc.extend)
-        ourRange = extendRange(doc, ourRange, word.anchor, word.head);
-      else
-        ourRange = word;
-    } else if (type == "triple") {
-      var line = new Range(Pos(start.line, 0), clipPos(doc, Pos(start.line + 1, 0)));
-      if (cm.display.shift || doc.extend)
-        ourRange = extendRange(doc, ourRange, line.anchor, line.head);
-      else
-        ourRange = line;
-    } else {
-      ourRange = extendRange(doc, ourRange, start);
-    }
-
-    if (!addNew) {
-      ourIndex = 0;
-      setSelection(doc, new Selection([ourRange], 0), sel_mouse);
-      startSel = doc.sel;
-    } else if (ourIndex == -1) {
-      ourIndex = ranges.length;
-      setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
-                   {scroll: false, origin: "*mouse"});
-    } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
-      setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
-                   {scroll: false, origin: "*mouse"});
-      startSel = doc.sel;
-    } else {
-      replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
-    }
-
-    var lastPos = start;
-    function extendTo(pos) {
-      if (cmp(lastPos, pos) == 0) return;
-      lastPos = pos;
-
-      if (type == "rect") {
-        var ranges = [], tabSize = cm.options.tabSize;
-        var startCol = countColumn(getLine(doc, start.line).text, start.ch, tabSize);
-        var posCol = countColumn(getLine(doc, pos.line).text, pos.ch, tabSize);
-        var left = Math.min(startCol, posCol), right = Math.max(startCol, posCol);
-        for (var line = Math.min(start.line, pos.line), end = Math.min(cm.lastLine(), Math.max(start.line, pos.line));
-             line <= end; line++) {
-          var text = getLine(doc, line).text, leftPos = findColumn(text, left, tabSize);
-          if (left == right)
-            ranges.push(new Range(Pos(line, leftPos), Pos(line, leftPos)));
-          else if (text.length > leftPos)
-            ranges.push(new Range(Pos(line, leftPos), Pos(line, findColumn(text, right, tabSize))));
-        }
-        if (!ranges.length) ranges.push(new Range(start, start));
-        setSelection(doc, normalizeSelection(startSel.ranges.slice(0, ourIndex).concat(ranges), ourIndex),
-                     {origin: "*mouse", scroll: false});
-        cm.scrollIntoView(pos);
-      } else {
-        var oldRange = ourRange;
-        var anchor = oldRange.anchor, head = pos;
-        if (type != "single") {
-          if (type == "double")
-            var range = cm.findWordAt(pos);
-          else
-            var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
-          if (cmp(range.anchor, anchor) > 0) {
-            head = range.head;
-            anchor = minPos(oldRange.from(), range.anchor);
-          } else {
-            head = range.anchor;
-            anchor = maxPos(oldRange.to(), range.head);
-          }
-        }
-        var ranges = startSel.ranges.slice(0);
-        ranges[ourIndex] = new Range(clipPos(doc, anchor), head);
-        setSelection(doc, normalizeSelection(ranges, ourIndex), sel_mouse);
-      }
-    }
-
-    var editorSize = display.wrapper.getBoundingClientRect();
-    // Used to ensure timeout re-tries don't fire when another extend
-    // happened in the meantime (clearTimeout isn't reliable -- at
-    // least on Chrome, the timeouts still happen even when cleared,
-    // if the clear happens after their scheduled firing time).
-    var counter = 0;
-
-    function extend(e) {
-      var curCount = ++counter;
-      var cur = posFromMouse(cm, e, true, type == "rect");
-      if (!cur) return;
-      if (cmp(cur, lastPos) != 0) {
-        cm.curOp.focus = activeElt();
-        extendTo(cur);
-        var visible = visibleLines(display, doc);
-        if (cur.line >= visible.to || cur.line < visible.from)
-          setTimeout(operation(cm, function(){if (counter == curCount) extend(e);}), 150);
-      } else {
-        var outside = e.clientY < editorSize.top ? -20 : e.clientY > editorSize.bottom ? 20 : 0;
-        if (outside) setTimeout(operation(cm, function() {
-          if (counter != curCount) return;
-          display.scroller.scrollTop += outside;
-          extend(e);
-        }), 50);
-      }
-    }
-
-    function done(e) {
-      cm.state.selectingText = false;
-      counter = Infinity;
-      e_preventDefault(e);
-      display.input.focus();
-      off(document, "mousemove", move);
-      off(document, "mouseup", up);
-      doc.history.lastSelOrigin = null;
-    }
-
-    var move = operation(cm, function(e) {
-      if (!e_button(e)) done(e);
-      else extend(e);
-    });
-    var up = operation(cm, done);
-    cm.state.selectingText = up;
-    on(document, "mousemove", move);
-    on(document, "mouseup", up);
-  }
-
-  // Determines whether an event happened in the gutter, and fires the
-  // handlers for the corresponding event.
-  function gutterEvent(cm, e, type, prevent, signalfn) {
-    try { var mX = e.clientX, mY = e.clientY; }
-    catch(e) { return false; }
-    if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false;
-    if (prevent) e_preventDefault(e);
-
-    var display = cm.display;
-    var lineBox = display.lineDiv.getBoundingClientRect();
-
-    if (mY > lineBox.bottom || !hasHandler(cm, type)) return e_defaultPrevented(e);
-    mY -= lineBox.top - display.viewOffset;
-
-    for (var i = 0; i < cm.options.gutters.length; ++i) {
-      var g = display.gutters.childNodes[i];
-      if (g && g.getBoundingClientRect().right >= mX) {
-        var line = lineAtHeight(cm.doc, mY);
-        var gutter = cm.options.gutters[i];
-        signalfn(cm, type, cm, line, gutter, e);
-        return e_defaultPrevented(e);
-      }
-    }
-  }
-
-  function clickInGutter(cm, e) {
-    return gutterEvent(cm, e, "gutterClick", true, signalLater);
-  }
-
-  // Kludge to work around strange IE behavior where it'll sometimes
-  // re-fire a series of drag-related events right after the drop (#1551)
-  var lastDrop = 0;
-
-  function onDrop(e) {
-    var cm = this;
-    clearDragCursor(cm);
-    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
-      return;
-    e_preventDefault(e);
-    if (ie) lastDrop = +new Date;
-    var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
-    if (!pos || isReadOnly(cm)) return;
-    // Might be a file drop, in which case we simply extract the text
-    // and insert it.
-    if (files && files.length && window.FileReader && window.File) {
-      var n = files.length, text = Array(n), read = 0;
-      var loadFile = function(file, i) {
-        var reader = new FileReader;
-        reader.onload = operation(cm, function() {
-          text[i] = reader.result;
-          if (++read == n) {
-            pos = clipPos(cm.doc, pos);
-            var change = {from: pos, to: pos,
-                          text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
-                          origin: "paste"};
-            makeChange(cm.doc, change);
-            setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
-          }
-        });
-        reader.readAsText(file);
-      };
-      for (var i = 0; i < n; ++i) loadFile(files[i], i);
-    } else { // Normal drop
-      // Don't do a replace if the drop happened inside of the selected text.
-      if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
-        cm.state.draggingText(e);
-        // Ensure the editor is re-focused
-        setTimeout(function() {cm.display.input.focus();}, 20);
-        return;
-      }
-      try {
-        var text = e.dataTransfer.getData("Text");
-        if (text) {
-          if (cm.state.draggingText && !(mac ? e.altKey : e.ctrlKey))
-            var selected = cm.listSelections();
-          setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
-          if (selected) for (var i = 0; i < selected.length; ++i)
-            replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
-          cm.replaceSelection(text, "around", "paste");
-          cm.display.input.focus();
-        }
-      }
-      catch(e){}
-    }
-  }
-
-  function onDragStart(cm, e) {
-    if (ie && (!cm.state.draggingText || +new Date - lastDrop < 100)) { e_stop(e); return; }
-    if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e)) return;
-
-    e.dataTransfer.setData("Text", cm.getSelection());
-
-    // Use dummy image instead of default browsers image.
-    // Recent Safari (~6.0.2) have a tendency to segfault when this happens, so we don't do it there.
-    if (e.dataTransfer.setDragImage && !safari) {
-      var img = elt("img", null, null, "position: fixed; left: 0; top: 0;");
-      img.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
-      if (presto) {
-        img.width = img.height = 1;
-        cm.display.wrapper.appendChild(img);
-        // Force a relayout, or Opera won't use our image for some obscure reason
-        img._top = img.offsetTop;
-      }
-      e.dataTransfer.setDragImage(img, 0, 0);
-      if (presto) img.parentNode.removeChild(img);
-    }
-  }
-
-  function onDragOver(cm, e) {
-    var pos = posFromMouse(cm, e);
-    if (!pos) return;
-    var frag = document.createDocumentFragment();
-    drawSelectionCursor(cm, pos, frag);
-    if (!cm.display.dragCursor) {
-      cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
-      cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
-    }
-    removeChildrenAndAdd(cm.display.dragCursor, frag);
-  }
-
-  function clearDragCursor(cm) {
-    if (cm.display.dragCursor) {
-      cm.display.lineSpace.removeChild(cm.display.dragCursor);
-      cm.display.dragCursor = null;
-    }
-  }
-
-  // SCROLL EVENTS
-
-  // Sync the scrollable area and scrollbars, ensure the viewport
-  // covers the visible area.
-  function setScrollTop(cm, val) {
-    if (Math.abs(cm.doc.scrollTop - val) < 2) return;
-    cm.doc.scrollTop = val;
-    if (!gecko) updateDisplaySimple(cm, {top: val});
-    if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
-    cm.display.scrollbars.setScrollTop(val);
-    if (gecko) updateDisplaySimple(cm);
-    startWorker(cm, 100);
-  }
-  // Sync scroller and scrollbar, ensure the gutter elements are
-  // aligned.
-  function setScrollLeft(cm, val, isScroller) {
-    if (isScroller ? val == cm.doc.scrollLeft : Math.abs(cm.doc.scrollLeft - val) < 2) return;
-    val = Math.min(val, cm.display.scroller.scrollWidth - cm.display.scroller.clientWidth);
-    cm.doc.scrollLeft = val;
-    alignHorizontally(cm);
-    if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val;
-    cm.display.scrollbars.setScrollLeft(val);
-  }
-
-  // Since the delta values reported on mouse wheel events are
-  // unstandardized between browsers and even browser versions, and
-  // generally horribly unpredictable, this code starts by measuring
-  // the scroll effect that the first few mouse wheel events have,
-  // and, from that, detects the way it can convert deltas to pixel
-  // offsets afterwards.
-  //
-  // The reason we want to know the amount a wheel event will scroll
-  // is that it gives us a chance to update the display before the
-  // actual scrolling happens, reducing flickering.
-
-  var wheelSamples = 0, wheelPixelsPerUnit = null;
-  // Fill in a browser-detected starting value on browsers where we
-  // know one. These don't have to be accurate -- the result of them
-  // being wrong would just be a slight flicker on the first wheel
-  // scroll (if it is large enough).
-  if (ie) wheelPixelsPerUnit = -.53;
-  else if (gecko) wheelPixelsPerUnit = 15;
-  else if (chrome) wheelPixelsPerUnit = -.7;
-  else if (safari) wheelPixelsPerUnit = -1/3;
-
-  var wheelEventDelta = function(e) {
-    var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
-    if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail;
-    if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail;
-    else if (dy == null) dy = e.wheelDelta;
-    return {x: dx, y: dy};
-  };
-  CodeMirror.wheelEventPixels = function(e) {
-    var delta = wheelEventDelta(e);
-    delta.x *= wheelPixelsPerUnit;
-    delta.y *= wheelPixelsPerUnit;
-    return delta;
-  };
-
-  function onScrollWheel(cm, e) {
-    var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
-
-    var display = cm.display, scroll = display.scroller;
-    // Quit if there's nothing to scroll here
-    if (!(dx && scroll.scrollWidth > scroll.clientWidth ||
-          dy && scroll.scrollHeight > scroll.clientHeight)) return;
-
-    // Webkit browsers on OS X abort momentum scrolls when the target
-    // of the scroll event is removed from the scrollable element.
-    // This hack (see related code in patchDisplay) makes sure the
-    // element is kept around.
-    if (dy && mac && webkit) {
-      outer: for (var cur = e.target, view = display.view; cur != scroll; cur = cur.parentNode) {
-        for (var i = 0; i < view.length; i++) {
-          if (view[i].node == cur) {
-            cm.display.currentWheelTarget = cur;
-            break outer;
-          }
-        }
-      }
-    }
-
-    // On some browsers, horizontal scrolling will cause redraws to
-    // happen before the gutter has been realigned, causing it to
-    // wriggle around in a most unseemly way. When we have an
-    // estimated pixels/delta value, we just handle horizontal
-    // scrolling entirely here. It'll be slightly off from native, but
-    // better than glitching out.
-    if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
-      if (dy)
-        setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
-      setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
-      e_preventDefault(e);
-      display.wheelStartX = null; // Abort measurement, if in progress
-      return;
-    }
-
-    // 'Project' the visible viewport to cover the area that is being
-    // scrolled into view (if we know enough to estimate it).
-    if (dy && wheelPixelsPerUnit != null) {
-      var pixels = dy * wheelPixelsPerUnit;
-      var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
-      if (pixels < 0) top = Math.max(0, top + pixels - 50);
-      else bot = Math.min(cm.doc.height, bot + pixels + 50);
-      updateDisplaySimple(cm, {top: top, bottom: bot});
-    }
-
-    if (wheelSamples < 20) {
-      if (display.wheelStartX == null) {
-        display.wheelStartX = scroll.scrollLeft; display.wheelStartY = scroll.scrollTop;
-        display.wheelDX = dx; display.wheelDY = dy;
-        setTimeout(function() {
-          if (display.wheelStartX == null) return;
-          var movedX = scroll.scrollLeft - display.wheelStartX;
-          var movedY = scroll.scrollTop - display.wheelStartY;
-          var sample = (movedY && display.wheelDY && movedY / display.wheelDY) ||
-            (movedX && display.wheelDX && movedX / display.wheelDX);
-          display.wheelStartX = display.wheelStartY = null;
-          if (!sample) return;
-          wheelPixelsPerUnit = (wheelPixelsPerUnit * wheelSamples + sample) / (wheelSamples + 1);
-          ++wheelSamples;
-        }, 200);
-      } else {
-        display.wheelDX += dx; display.wheelDY += dy;
-      }
-    }
-  }
-
-  // KEY EVENTS
-
-  // Run a handler that was bound to a key.
-  function doHandleBinding(cm, bound, dropShift) {
-    if (typeof bound == "string") {
-      bound = commands[bound];
-      if (!bound) return false;
-    }
-    // Ensure previous input has been read, so that the handler sees a
-    // consistent view of the document
-    cm.display.input.ensurePolled();
-    var prevShift = cm.display.shift, done = false;
-    try {
-      if (isReadOnly(cm)) cm.state.suppressEdits = true;
-      if (dropShift) cm.display.shift = false;
-      done = bound(cm) != Pass;
-    } finally {
-      cm.display.shift = prevShift;
-      cm.state.suppressEdits = false;
-    }
-    return done;
-  }
-
-  function lookupKeyForEditor(cm, name, handle) {
-    for (var i = 0; i < cm.state.keyMaps.length; i++) {
-      var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
-      if (result) return result;
-    }
-    return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
-      || lookupKey(name, cm.options.keyMap, handle, cm);
-  }
-
-  var stopSeq = new Delayed;
-  function dispatchKey(cm, name, e, handle) {
-    var seq = cm.state.keySeq;
-    if (seq) {
-      if (isModifierKey(name)) return "handled";
-      stopSeq.set(50, function() {
-        if (cm.state.keySeq == seq) {
-          cm.state.keySeq = null;
-          cm.display.input.reset();
-        }
-      });
-      name = seq + " " + name;
-    }
-    var result = lookupKeyForEditor(cm, name, handle);
-
-    if (result == "multi")
-      cm.state.keySeq = name;
-    if (result == "handled")
-      signalLater(cm, "keyHandled", cm, name, e);
-
-    if (result == "handled" || result == "multi") {
-      e_preventDefault(e);
-      restartBlink(cm);
-    }
-
-    if (seq && !result && /\'$/.test(name)) {
-      e_preventDefault(e);
-      return true;
-    }
-    return !!result;
-  }
-
-  // Handle a key from the keydown event.
-  function handleKeyBinding(cm, e) {
-    var name = keyName(e, true);
-    if (!name) return false;
-
-    if (e.shiftKey && !cm.state.keySeq) {
-      // First try to resolve full name (including 'Shift-'). Failing
-      // that, see if there is a cursor-motion command (starting with
-      // 'go') bound to the keyname without 'Shift-'.
-      return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true);})
-          || dispatchKey(cm, name, e, function(b) {
-               if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
-                 return doHandleBinding(cm, b);
-             });
-    } else {
-      return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b); });
-    }
-  }
-
-  // Handle a key from the keypress event
-  function handleCharBinding(cm, e, ch) {
-    return dispatchKey(cm, "'" + ch + "'", e,
-                       function(b) { return doHandleBinding(cm, b, true); });
-  }
-
-  var lastStoppedKey = null;
-  function onKeyDown(e) {
-    var cm = this;
-    cm.curOp.focus = activeElt();
-    if (signalDOMEvent(cm, e)) return;
-    // IE does strange things with escape.
-    if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false;
-    var code = e.keyCode;
-    cm.display.shift = code == 16 || e.shiftKey;
-    var handled = handleKeyBinding(cm, e);
-    if (presto) {
-      lastStoppedKey = handled ? code : null;
-      // Opera has no cut event... we try to at least catch the key combo
-      if (!handled && code == 88 && !hasCopyEvent && (mac ? e.metaKey : e.ctrlKey))
-        cm.replaceSelection("", null, "cut");
-    }
-
-    // Turn mouse into crosshair when Alt is held on Mac.
-    if (code == 18 && !/\bCodeMirror-crosshair\b/.test(cm.display.lineDiv.className))
-      showCrossHair(cm);
-  }
-
-  function showCrossHair(cm) {
-    var lineDiv = cm.display.lineDiv;
-    addClass(lineDiv, "CodeMirror-crosshair");
-
-    function up(e) {
-      if (e.keyCode == 18 || !e.altKey) {
-        rmClass(lineDiv, "CodeMirror-crosshair");
-        off(document, "keyup", up);
-        off(document, "mouseover", up);
-      }
-    }
-    on(document, "keyup", up);
-    on(document, "mouseover", up);
-  }
-
-  function onKeyUp(e) {
-    if (e.keyCode == 16) this.doc.sel.shift = false;
-    signalDOMEvent(this, e);
-  }
-
-  function onKeyPress(e) {
-    var cm = this;
-    if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
-    var keyCode = e.keyCode, charCode = e.charCode;
-    if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
-    if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return;
-    var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
-    if (handleCharBinding(cm, e, ch)) return;
-    cm.display.input.onKeyPress(e);
-  }
-
-  // FOCUS/BLUR EVENTS
-
-  function delayBlurEvent(cm) {
-    cm.state.delayingBlurEvent = true;
-    setTimeout(function() {
-      if (cm.state.delayingBlurEvent) {
-        cm.state.delayingBlurEvent = false;
-        onBlur(cm);
-      }
-    }, 100);
-  }
-
-  function onFocus(cm) {
-    if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false;
-
-    if (cm.options.readOnly == "nocursor") return;
-    if (!cm.state.focused) {
-      signal(cm, "focus", cm);
-      cm.state.focused = true;
-      addClass(cm.display.wrapper, "CodeMirror-focused");
-      // This test prevents this from firing when a context
-      // menu is closed (since the input reset would kill the
-      // select-all detection hack)
-      if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
-        cm.display.input.reset();
-        if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730
-      }
-      cm.display.input.receivedFocus();
-    }
-    restartBlink(cm);
-  }
-  function onBlur(cm) {
-    if (cm.state.delayingBlurEvent) return;
-
-    if (cm.state.focused) {
-      signal(cm, "blur", cm);
-      cm.state.focused = false;
-      rmClass(cm.display.wrapper, "CodeMirror-focused");
-    }
-    clearInterval(cm.display.blinker);
-    setTimeout(function() {if (!cm.state.focused) cm.display.shift = false;}, 150);
-  }
-
-  // CONTEXT MENU HANDLING
-
-  // To make the context menu work, we need to briefly unhide the
-  // textarea (making it as unobtrusive as possible) to let the
-  // right-click take effect on it.
-  function onContextMenu(cm, e) {
-    if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
-    cm.display.input.onContextMenu(e);
-  }
-
-  function contextMenuInGutter(cm, e) {
-    if (!hasHandler(cm, "gutterContextMenu")) return false;
-    return gutterEvent(cm, e, "gutterContextMenu", false, signal);
-  }
-
-  // UPDATING
-
-  // Compute the position of the end of a change (its 'to' property
-  // refers to the pre-change end).
-  var changeEnd = CodeMirror.changeEnd = function(change) {
-    if (!change.text) return change.to;
-    return Pos(change.from.line + change.text.length - 1,
-               lst(change.text).length + (change.text.length == 1 ? change.from.ch : 0));
-  };
-
-  // Adjust a position to refer to the post-change position of the
-  // same text, or the end of the change if the change covers it.
-  function adjustForChange(pos, change) {
-    if (cmp(pos, change.from) < 0) return pos;
-    if (cmp(pos, change.to) <= 0) return changeEnd(change);
-
-    var line = pos.line + change.text.length - (change.to.line - change.from.line) - 1, ch = pos.ch;
-    if (pos.line == change.to.line) ch += changeEnd(change).ch - change.to.ch;
-    return Pos(line, ch);
-  }
-
-  function computeSelAfterChange(doc, change) {
-    var out = [];
-    for (var i = 0; i < doc.sel.ranges.length; i++) {
-      var range = doc.sel.ranges[i];
-      out.push(new Range(adjustForChange(range.anchor, change),
-                         adjustForChange(range.head, change)));
-    }
-    return normalizeSelection(out, doc.sel.primIndex);
-  }
-
-  function offsetPos(pos, old, nw) {
-    if (pos.line == old.line)
-      return Pos(nw.line, pos.ch - old.ch + nw.ch);
-    else
-      return Pos(nw.line + (pos.line - old.line), pos.ch);
-  }
-
-  // Used by replaceSelections to allow moving the selection to the
-  // start or around the replaced test. Hint may be "start" or "around".
-  function computeReplacedSel(doc, changes, hint) {
-    var out = [];
-    var oldPrev = Pos(doc.first, 0), newPrev = oldPrev;
-    for (var i = 0; i < changes.length; i++) {
-      var change = changes[i];
-      var from = offsetPos(change.from, oldPrev, newPrev);
-      var to = offsetPos(changeEnd(change), oldPrev, newPrev);
-      oldPrev = change.to;
-      newPrev = to;
-      if (hint == "around") {
-        var range = doc.sel.ranges[i], inv = cmp(range.head, range.anchor) < 0;
-        out[i] = new Range(inv ? to : from, inv ? from : to);
-      } else {
-        out[i] = new Range(from, from);
-      }
-    }
-    return new Selection(out, doc.sel.primIndex);
-  }
-
-  // Allow "beforeChange" event handlers to influence a change
-  function filterChange(doc, change, update) {
-    var obj = {
-      canceled: false,
-      from: change.from,
-      to: change.to,
-      text: change.text,
-      origin: change.origin,
-      cancel: function() { this.canceled = true; }
-    };
-    if (update) obj.update = function(from, to, text, origin) {
-      if (from) this.from = clipPos(doc, from);
-      if (to) this.to = clipPos(doc, to);
-      if (text) this.text = text;
-      if (origin !== undefined) this.origin = origin;
-    };
-    signal(doc, "beforeChange", doc, obj);
-    if (doc.cm) signal(doc.cm, "beforeChange", doc.cm, obj);
-
-    if (obj.canceled) return null;
-    return {from: obj.from, to: obj.to, text: obj.text, origin: obj.origin};
-  }
-
-  // Apply a change to a document, and add it to the document's
-  // history, and propagating it to all linked documents.
-  function makeChange(doc, change, ignoreReadOnly) {
-    if (doc.cm) {
-      if (!doc.cm.curOp) return operation(doc.cm, makeChange)(doc, change, ignoreReadOnly);
-      if (doc.cm.state.suppressEdits) return;
-    }
-
-    if (hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange")) {
-      change = filterChange(doc, change, true);
-      if (!change) return;
-    }
-
-    // Possibly split or suppress the update based on the presence
-    // of read-only spans in its range.
-    var split = sawReadOnlySpans && !ignoreReadOnly && removeReadOnlyRanges(doc, change.from, change.to);
-    if (split) {
-      for (var i = split.length - 1; i >= 0; --i)
-        makeChangeInner(doc, {from: split[i].from, to: split[i].to, text: i ? [""] : change.text});
-    } else {
-      makeChangeInner(doc, change);
-    }
-  }
-
-  function makeChangeInner(doc, change) {
-    if (change.text.length == 1 && change.text[0] == "" && cmp(change.from, change.to) == 0) return;
-    var selAfter = computeSelAfterChange(doc, change);
-    addChangeToHistory(doc, change, selAfter, doc.cm ? doc.cm.curOp.id : NaN);
-
-    makeChangeSingleDoc(doc, change, selAfter, stretchSpansOverChange(doc, change));
-    var rebased = [];
-
-    linkedDocs(doc, function(doc, sharedHist) {
-      if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-        rebaseHist(doc.history, change);
-        rebased.push(doc.history);
-      }
-      makeChangeSingleDoc(doc, change, null, stretchSpansOverChange(doc, change));
-    });
-  }
-
-  // Revert a change stored in a document's history.
-  function makeChangeFromHistory(doc, type, allowSelectionOnly) {
-    if (doc.cm && doc.cm.state.suppressEdits) return;
-
-    var hist = doc.history, event, selAfter = doc.sel;
-    var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
-
-    // Verify that there is a useable event (so that ctrl-z won't
-    // needlessly clear selection events)
-    for (var i = 0; i < source.length; i++) {
-      event = source[i];
-      if (allowSelectionOnly ? event.ranges && !event.equals(doc.sel) : !event.ranges)
-        break;
-    }
-    if (i == source.length) return;
-    hist.lastOrigin = hist.lastSelOrigin = null;
-
-    for (;;) {
-      event = source.pop();
-      if (event.ranges) {
-        pushSelectionToHistory(event, dest);
-        if (allowSelectionOnly && !event.equals(doc.sel)) {
-          setSelection(doc, event, {clearRedo: false});
-          return;
-        }
-        selAfter = event;
-      }
-      else break;
-    }
-
-    // Build up a reverse change object to add to the opposite history
-    // stack (redo when undoing, and vice versa).
-    var antiChanges = [];
-    pushSelectionToHistory(selAfter, dest);
-    dest.push({changes: antiChanges, generation: hist.generation});
-    hist.generation = event.generation || ++hist.maxGeneration;
-
-    var filter = hasHandler(doc, "beforeChange") || doc.cm && hasHandler(doc.cm, "beforeChange");
-
-    for (var i = event.changes.length - 1; i >= 0; --i) {
-      var change = event.changes[i];
-      change.origin = type;
-      if (filter && !filterChange(doc, change, false)) {
-        source.length = 0;
-        return;
-      }
-
-      antiChanges.push(historyChangeFromChange(doc, change));
-
-      var after = i ? computeSelAfterChange(doc, change) : lst(source);
-      makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
-      if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)});
-      var rebased = [];
-
-      // Propagate to the linked documents
-      linkedDocs(doc, function(doc, sharedHist) {
-        if (!sharedHist && indexOf(rebased, doc.history) == -1) {
-          rebaseHist(doc.history, change);
-          rebased.push(doc.history);
-        }
-        makeChangeSingleDoc(doc, change, null, mergeOldSpans(doc, change));
-      });
-    }
-  }
-
-  // Sub-views need their line numbers shifted when text is added
-  // above or below them in the parent document.
-  function shiftDoc(doc, distance) {
-    if (distance == 0) return;
-    doc.first += distance;
-    doc.sel = new Selection(map(doc.sel.ranges, function(range) {
-      return new Range(Pos(range.anchor.line + distance, range.anchor.ch),
-                       Pos(range.head.line + distance, range.head.ch));
-    }), doc.sel.primIndex);
-    if (doc.cm) {
-      regChange(doc.cm, doc.first, doc.first - distance, distance);
-      for (var d = doc.cm.display, l = d.viewFrom; l < d.viewTo; l++)
-        regLineChange(doc.cm, l, "gutter");
-    }
-  }
-
-  // More lower-level change function, handling only a single document
-  // (not linked ones).
-  function makeChangeSingleDoc(doc, change, selAfter, spans) {
-    if (doc.cm && !doc.cm.curOp)
-      return operation(doc.cm, makeChangeSingleDoc)(doc, change, selAfter, spans);
-
-    if (change.to.line < doc.first) {
-      shiftDoc(doc, change.text.length - 1 - (change.to.line - change.from.line));
-      return;
-    }
-    if (change.from.line > doc.lastLine()) return;
-
-    // Clip the change to the size of this doc
-    if (change.from.line < doc.first) {
-      var shift = change.text.length - 1 - (doc.first - change.from.line);
-      shiftDoc(doc, shift);
-      change = {from: Pos(doc.first, 0), to: Pos(change.to.line + shift, change.to.ch),
-                text: [lst(change.text)], origin: change.origin};
-    }
-    var last = doc.lastLine();
-    if (change.to.line > last) {
-      change = {from: change.from, to: Pos(last, getLine(doc, last).text.length),
-                text: [change.text[0]], origin: change.origin};
-    }
-
-    change.removed = getBetween(doc, change.from, change.to);
-
-    if (!selAfter) selAfter = computeSelAfterChange(doc, change);
-    if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
-    else updateDoc(doc, change, spans);
-    setSelectionNoUndo(doc, selAfter, sel_dontScroll);
-  }
-
-  // Handle the interaction of a change to a document with the editor
-  // that this document is part of.
-  function makeChangeSingleDocInEditor(cm, change, spans) {
-    var doc = cm.doc, display = cm.display, from = change.from, to = change.to;
-
-    var recomputeMaxLength = false, checkWidthStart = from.line;
-    if (!cm.options.lineWrapping) {
-      checkWidthStart = lineNo(visualLine(getLine(doc, from.line)));
-      doc.iter(checkWidthStart, to.line + 1, function(line) {
-        if (line == display.maxLine) {
-          recomputeMaxLength = true;
-          return true;
-        }
-      });
-    }
-
-    if (doc.sel.contains(change.from, change.to) > -1)
-      signalCursorActivity(cm);
-
-    updateDoc(doc, change, spans, estimateHeight(cm));
-
-    if (!cm.options.lineWrapping) {
-      doc.iter(checkWidthStart, from.line + change.text.length, function(line) {
-        var len = lineLength(line);
-        if (len > display.maxLineLength) {
-          display.maxLine = line;
-          display.maxLineLength = len;
-          display.maxLineChanged = true;
-          recomputeMaxLength = false;
-        }
-      });
-      if (recomputeMaxLength) cm.curOp.updateMaxLine = true;
-    }
-
-    // Adjust frontier, schedule worker
-    doc.frontier = Math.min(doc.frontier, from.line);
-    startWorker(cm, 400);
-
-    var lendiff = change.text.length - (to.line - from.line) - 1;
-    // Remember that these lines changed, for updating the display
-    if (change.full)
-      regChange(cm);
-    else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
-      regLineChange(cm, from.line, "text");
-    else
-      regChange(cm, from.line, to.line + 1, lendiff);
-
-    var changesHandler = hasHandler(cm, "changes"), changeHandler = hasHandler(cm, "change");
-    if (changeHandler || changesHandler) {
-      var obj = {
-        from: from, to: to,
-        text: change.text,
-        removed: change.removed,
-        origin: change.origin
-      };
-      if (changeHandler) signalLater(cm, "change", cm, obj);
-      if (changesHandler) (cm.curOp.changeObjs || (cm.curOp.changeObjs = [])).push(obj);
-    }
-    cm.display.selForContextMenu = null;
-  }
-
-  function replaceRange(doc, code, from, to, origin) {
-    if (!to) to = from;
-    if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; }
-    if (typeof code == "string") code = doc.splitLines(code);
-    makeChange(doc, {from: from, to: to, text: code, origin: origin});
-  }
-
-  // SCROLLING THINGS INTO VIEW
-
-  // If an editor sits on the top or bottom of the window, partially
-  // scrolled out of view, this ensures that the cursor is visible.
-  function maybeScrollWindow(cm, coords) {
-    if (signalDOMEvent(cm, "scrollCursorIntoView")) return;
-
-    var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
-    if (coords.top + box.top < 0) doScroll = true;
-    else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
-    if (doScroll != null && !phantom) {
-      var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
-                           (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
-                           (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " +
-                           coords.left + "px; width: 2px;");
-      cm.display.lineSpace.appendChild(scrollNode);
-      scrollNode.scrollIntoView(doScroll);
-      cm.display.lineSpace.removeChild(scrollNode);
-    }
-  }
-
-  // Scroll a given position into view (immediately), verifying that
-  // it actually became visible (as line heights are accurately
-  // measured, the position of something may 'drift' during drawing).
-  function scrollPosIntoView(cm, pos, end, margin) {
-    if (margin == null) margin = 0;
-    for (var limit = 0; limit < 5; limit++) {
-      var changed = false, coords = cursorCoords(cm, pos);
-      var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
-      var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
-                                         Math.min(coords.top, endCoords.top) - margin,
-                                         Math.max(coords.left, endCoords.left),
-                                         Math.max(coords.bottom, endCoords.bottom) + margin);
-      var startTop = cm.doc.scrollTop, startLeft = cm.doc.scrollLeft;
-      if (scrollPos.scrollTop != null) {
-        setScrollTop(cm, scrollPos.scrollTop);
-        if (Math.abs(cm.doc.scrollTop - startTop) > 1) changed = true;
-      }
-      if (scrollPos.scrollLeft != null) {
-        setScrollLeft(cm, scrollPos.scrollLeft);
-        if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true;
-      }
-      if (!changed) break;
-    }
-    return coords;
-  }
-
-  // Scroll a given set of coordinates into view (immediately).
-  function scrollIntoView(cm, x1, y1, x2, y2) {
-    var scrollPos = calculateScrollPos(cm, x1, y1, x2, y2);
-    if (scrollPos.scrollTop != null) setScrollTop(cm, scrollPos.scrollTop);
-    if (scrollPos.scrollLeft != null) setScrollLeft(cm, scrollPos.scrollLeft);
-  }
-
-  // Calculate a new scroll position needed to scroll the given
-  // rectangle into view. Returns an object with scrollTop and
-  // scrollLeft properties. When these are undefined, the
-  // vertical/horizontal position does not need to be adjusted.
-  function calculateScrollPos(cm, x1, y1, x2, y2) {
-    var display = cm.display, snapMargin = textHeight(cm.display);
-    if (y1 < 0) y1 = 0;
-    var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
-    var screen = displayHeight(cm), result = {};
-    if (y2 - y1 > screen) y2 = y1 + screen;
-    var docBottom = cm.doc.height + paddingVert(display);
-    var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
-    if (y1 < screentop) {
-      result.scrollTop = atTop ? 0 : y1;
-    } else if (y2 > screentop + screen) {
-      var newTop = Math.min(y1, (atBottom ? docBottom : y2) - screen);
-      if (newTop != screentop) result.scrollTop = newTop;
-    }
-
-    var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
-    var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
-    var tooWide = x2 - x1 > screenw;
-    if (tooWide) x2 = x1 + screenw;
-    if (x1 < 10)
-      result.scrollLeft = 0;
-    else if (x1 < screenleft)
-      result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10));
-    else if (x2 > screenw + screenleft - 3)
-      result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw;
-    return result;
-  }
-
-  // Store a relative adjustment to the scroll position in the current
-  // operation (to be applied when the operation finishes).
-  function addToScrollPos(cm, left, top) {
-    if (left != null || top != null) resolveScrollToPos(cm);
-    if (left != null)
-      cm.curOp.scrollLeft = (cm.curOp.scrollLeft == null ? cm.doc.scrollLeft : cm.curOp.scrollLeft) + left;
-    if (top != null)
-      cm.curOp.scrollTop = (cm.curOp.scrollTop == null ? cm.doc.scrollTop : cm.curOp.scrollTop) + top;
-  }
-
-  // Make sure that at the end of the operation the current cursor is
-  // shown.
-  function ensureCursorVisible(cm) {
-    resolveScrollToPos(cm);
-    var cur = cm.getCursor(), from = cur, to = cur;
-    if (!cm.options.lineWrapping) {
-      from = cur.ch ? Pos(cur.line, cur.ch - 1) : cur;
-      to = Pos(cur.line, cur.ch + 1);
-    }
-    cm.curOp.scrollToPos = {from: from, to: to, margin: cm.options.cursorScrollMargin, isCursor: true};
-  }
-
-  // When an operation has its scrollToPos property set, and another
-  // scroll action is applied before the end of the operation, this
-  // 'simulates' scrolling that position into view in a cheap way, so
-  // that the effect of intermediate scroll commands is not ignored.
-  function resolveScrollToPos(cm) {
-    var range = cm.curOp.scrollToPos;
-    if (range) {
-      cm.curOp.scrollToPos = null;
-      var from = estimateCoords(cm, range.from), to = estimateCoords(cm, range.to);
-      var sPos = calculateScrollPos(cm, Math.min(from.left, to.left),
-                                    Math.min(from.top, to.top) - range.margin,
-                                    Math.max(from.right, to.right),
-                                    Math.max(from.bottom, to.bottom) + range.margin);
-      cm.scrollTo(sPos.scrollLeft, sPos.scrollTop);
-    }
-  }
-
-  // API UTILITIES
-
-  // Indent the given line. The how parameter can be "smart",
-  // "add"/null, "subtract", or "prev". When aggressive is false
-  // (typically set to true for forced single-line indents), empty
-  // lines are not indented, and places where the mode returns Pass
-  // are left alone.
-  function indentLine(cm, n, how, aggressive) {
-    var doc = cm.doc, state;
-    if (how == null) how = "add";
-    if (how == "smart") {
-      // Fall back to "prev" when the mode doesn't have an indentation
-      // method.
-      if (!doc.mode.indent) how = "prev";
-      else state = getStateBefore(cm, n);
-    }
-
-    var tabSize = cm.options.tabSize;
-    var line = getLine(doc, n), curSpace = countColumn(line.text, null, tabSize);
-    if (line.stateAfter) line.stateAfter = null;
-    var curSpaceString = line.text.match(/^\s*/)[0], indentation;
-    if (!aggressive && !/\S/.test(line.text)) {
-      indentation = 0;
-      how = "not";
-    } else if (how == "smart") {
-      indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
-      if (indentation == Pass || indentation > 150) {
-        if (!aggressive) return;
-        how = "prev";
-      }
-    }
-    if (how == "prev") {
-      if (n > doc.first) indentation = countColumn(getLine(doc, n-1).text, null, tabSize);
-      else indentation = 0;
-    } else if (how == "add") {
-      indentation = curSpace + cm.options.indentUnit;
-    } else if (how == "subtract") {
-      indentation = curSpace - cm.options.indentUnit;
-    } else if (typeof how == "number") {
-      indentation = curSpace + how;
-    }
-    indentation = Math.max(0, indentation);
-
-    var indentString = "", pos = 0;
-    if (cm.options.indentWithTabs)
-      for (var i = Math.floor(indentation / tabSize); i; --i) {pos += tabSize; indentString += "\t";}
-    if (pos < indentation) indentString += spaceStr(indentation - pos);
-
-    if (indentString != curSpaceString) {
-      replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
-      line.stateAfter = null;
-      return true;
-    } else {
-      // Ensure that, if the cursor was in the whitespace at the start
-      // of the line, it is moved to the end of that space.
-      for (var i = 0; i < doc.sel.ranges.length; i++) {
-        var range = doc.sel.ranges[i];
-        if (range.head.line == n && range.head.ch < curSpaceString.length) {
-          var pos = Pos(n, curSpaceString.length);
-          replaceOneSelection(doc, i, new Range(pos, pos));
-          break;
-        }
-      }
-    }
-  }
-
-  // Utility for applying a change to a line by handle or number,
-  // returning the number and optionally registering the line as
-  // changed.
-  function changeLine(doc, handle, changeType, op) {
-    var no = handle, line = handle;
-    if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
-    else no = lineNo(handle);
-    if (no == null) return null;
-    if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType);
-    return line;
-  }
-
-  // Helper for deleting text near the selection(s), used to implement
-  // backspace, delete, and similar functionality.
-  function deleteNearSelection(cm, compute) {
-    var ranges = cm.doc.sel.ranges, kill = [];
-    // Build up a set of ranges to kill first, merging overlapping
-    // ranges.
-    for (var i = 0; i < ranges.length; i++) {
-      var toKill = compute(ranges[i]);
-      while (kill.length && cmp(toKill.from, lst(kill).to) <= 0) {
-        var replaced = kill.pop();
-        if (cmp(replaced.from, toKill.from) < 0) {
-          toKill.from = replaced.from;
-          break;
-        }
-      }
-      kill.push(toKill);
-    }
-    // Next, remove those actual ranges.
-    runInOp(cm, function() {
-      for (var i = kill.length - 1; i >= 0; i--)
-        replaceRange(cm.doc, "", kill[i].from, kill[i].to, "+delete");
-      ensureCursorVisible(cm);
-    });
-  }
-
-  // Used for horizontal relative motion. Dir is -1 or 1 (left or
-  // right), unit can be "char", "column" (like char, but doesn't
-  // cross line boundaries), "word" (across next word), or "group" (to
-  // the start of next group of word or non-word-non-whitespace
-  // chars). The visually param controls whether, in right-to-left
-  // text, direction 1 means to move towards the next index in the
-  // string, or towards the character to the right of the current
-  // position. The resulting position will have a hitSide=true
-  // property if it reached the end of the document.
-  function findPosH(doc, pos, dir, unit, visually) {
-    var line = pos.line, ch = pos.ch, origDir = dir;
-    var lineObj = getLine(doc, line);
-    var possible = true;
-    function findNextLine() {
-      var l = line + dir;
-      if (l < doc.first || l >= doc.first + doc.size) return (possible = false);
-      line = l;
-      return lineObj = getLine(doc, l);
-    }
-    function moveOnce(boundToLine) {
-      var next = (visually ? moveVisually : moveLogically)(lineObj, ch, dir, true);
-      if (next == null) {
-        if (!boundToLine && findNextLine()) {
-          if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
-          else ch = dir < 0 ? lineObj.text.length : 0;
-        } else return (possible = false);
-      } else ch = next;
-      return true;
-    }
-
-    if (unit == "char") moveOnce();
-    else if (unit == "column") moveOnce(true);
-    else if (unit == "word" || unit == "group") {
-      var sawType = null, group = unit == "group";
-      var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
-      for (var first = true;; first = false) {
-        if (dir < 0 && !moveOnce(!first)) break;
-        var cur = lineObj.text.charAt(ch) || "\n";
-        var type = isWordChar(cur, helper) ? "w"
-          : group && cur == "\n" ? "n"
-          : !group || /\s/.test(cur) ? null
-          : "p";
-        if (group && !first && !type) type = "s";
-        if (sawType && sawType != type) {
-          if (dir < 0) {dir = 1; moveOnce();}
-          break;
-        }
-
-        if (type) sawType = type;
-        if (dir > 0 && !moveOnce(!first)) break;
-      }
-    }
-    var result = skipAtomic(doc, Pos(line, ch), origDir, true);
-    if (!possible) result.hitSide = true;
-    return result;
-  }
-
-  // For relative vertical movement. Dir may be -1 or 1. Unit can be
-  // "page" or "line". The resulting position will have a hitSide=true
-  // property if it reached the end of the document.
-  function findPosV(cm, pos, dir, unit) {
-    var doc = cm.doc, x = pos.left, y;
-    if (unit == "page") {
-      var pageSize = Math.min(cm.display.wrapper.clientHeight, window.innerHeight || document.documentElement.clientHeight);
-      y = pos.top + dir * (pageSize - (dir < 0 ? 1.5 : .5) * textHeight(cm.display));
-    } else if (unit == "line") {
-      y = dir > 0 ? pos.bottom + 3 : pos.top - 3;
-    }
-    for (;;) {
-      var target = coordsChar(cm, x, y);
-      if (!target.outside) break;
-      if (dir < 0 ? y <= 0 : y >= doc.height) { target.hitSide = true; break; }
-      y += dir * 5;
-    }
-    return target;
-  }
-
-  // EDITOR METHODS
-
-  // The publicly visible API. Note that methodOp(f) means
-  // 'wrap f in an operation, performed on its `this` parameter'.
-
-  // This is not the complete set of editor methods. Most of the
-  // methods defined on the Doc type are also injected into
-  // CodeMirror.prototype, for backwards compatibility and
-  // convenience.
-
-  CodeMirror.prototype = {
-    constructor: CodeMirror,
-    focus: function(){window.focus(); this.display.input.focus();},
-
-    setOption: function(option, value) {
-      var options = this.options, old = options[option];
-      if (options[option] == value && option != "mode") return;
-      options[option] = value;
-      if (optionHandlers.hasOwnProperty(option))
-        operation(this, optionHandlers[option])(this, value, old);
-    },
-
-    getOption: function(option) {return this.options[option];},
-    getDoc: function() {return this.doc;},
-
-    addKeyMap: function(map, bottom) {
-      this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));
-    },
-    removeKeyMap: function(map) {
-      var maps = this.state.keyMaps;
-      for (var i = 0; i < maps.length; ++i)
-        if (maps[i] == map || maps[i].name == map) {
-          maps.splice(i, 1);
-          return true;
-        }
-    },
-
-    addOverlay: methodOp(function(spec, options) {
-      var mode = spec.token ? spec : CodeMirror.getMode(this.options, spec);
-      if (mode.startState) throw new Error("Overlays may not be stateful.");
-      this.state.overlays.push({mode: mode, modeSpec: spec, opaque: options && options.opaque});
-      this.state.modeGen++;
-      regChange(this);
-    }),
-    removeOverlay: methodOp(function(spec) {
-      var overlays = this.state.overlays;
-      for (var i = 0; i < overlays.length; ++i) {
-        var cur = overlays[i].modeSpec;
-        if (cur == spec || typeof spec == "string" && cur.name == spec) {
-          overlays.splice(i, 1);
-          this.state.modeGen++;
-          regChange(this);
-          return;
-        }
-      }
-    }),
-
-    indentLine: methodOp(function(n, dir, aggressive) {
-      if (typeof dir != "string" && typeof dir != "number") {
-        if (dir == null) dir = this.options.smartIndent ? "smart" : "prev";
-        else dir = dir ? "add" : "subtract";
-      }
-      if (isLine(this.doc, n)) indentLine(this, n, dir, aggressive);
-    }),
-    indentSelection: methodOp(function(how) {
-      var ranges = this.doc.sel.ranges, end = -1;
-      for (var i = 0; i < ranges.length; i++) {
-        var range = ranges[i];
-        if (!range.empty()) {
-          var from = range.from(), to = range.to();
-          var start = Math.max(end, from.line);
-          end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
-          for (var j = start; j < end; ++j)
-            indentLine(this, j, how);
-          var newRanges = this.doc.sel.ranges;
-          if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
-            replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll);
-        } else if (range.head.line > end) {
-          indentLine(this, range.head.line, how, true);
-          end = range.head.line;
-          if (i == this.doc.sel.primIndex) ensureCursorVisible(this);
-        }
-      }
-    }),
-
-    // Fetch the parser token for a given character. Useful for hacks
-    // that want to inspect the mode state (say, for completion).
-    getTokenAt: function(pos, precise) {
-      return takeToken(this, pos, precise);
-    },
-
-    getLineTokens: function(line, precise) {
-      return takeToken(this, Pos(line), precise, true);
-    },
-
-    getTokenTypeAt: function(pos) {
-      pos = clipPos(this.doc, pos);
-      var styles = getLineStyles(this, getLine(this.doc, pos.line));
-      var before = 0, after = (styles.length - 1) / 2, ch = pos.ch;
-      var type;
-      if (ch == 0) type = styles[2];
-      else for (;;) {
-        var mid = (before + after) >> 1;
-        if ((mid ? styles[mid * 2 - 1] : 0) >= ch) after = mid;
-        else if (styles[mid * 2 + 1] < ch) before = mid + 1;
-        else { type = styles[mid * 2 + 2]; break; }
-      }
-      var cut = type ? type.indexOf("cm-overlay ") : -1;
-      return cut < 0 ? type : cut == 0 ? null : type.slice(0, cut - 1);
-    },
-
-    getModeAt: function(pos) {
-      var mode = this.doc.mode;
-      if (!mode.innerMode) return mode;
-      return CodeMirror.innerMode(mode, this.getTokenAt(pos).state).mode;
-    },
-
-    getHelper: function(pos, type) {
-      return this.getHelpers(pos, type)[0];
-    },
-
-    getHelpers: function(pos, type) {
-      var found = [];
-      if (!helpers.hasOwnProperty(type)) return found;
-      var help = helpers[type], mode = this.getModeAt(pos);
-      if (typeof mode[type] == "string") {
-        if (help[mode[type]]) found.push(help[mode[type]]);
-      } else if (mode[type]) {
-        for (var i = 0; i < mode[type].length; i++) {
-          var val = help[mode[type][i]];
-          if (val) found.push(val);
-        }
-      } else if (mode.helperType && help[mode.helperType]) {
-        found.push(help[mode.helperType]);
-      } else if (help[mode.name]) {
-        found.push(help[mode.name]);
-      }
-      for (var i = 0; i < help._global.length; i++) {
-        var cur = help._global[i];
-        if (cur.pred(mode, this) && indexOf(found, cur.val) == -1)
-          found.push(cur.val);
-      }
-      return found;
-    },
-
-    getStateAfter: function(line, precise) {
-      var doc = this.doc;
-      line = clipLine(doc, line == null ? doc.first + doc.size - 1: line);
-      return getStateBefore(this, line + 1, precise);
-    },
-
-    cursorCoords: function(start, mode) {
-      var pos, range = this.doc.sel.primary();
-      if (start == null) pos = range.head;
-      else if (typeof start == "object") pos = clipPos(this.doc, start);
-      else pos = start ? range.from() : range.to();
-      return cursorCoords(this, pos, mode || "page");
-    },
-
-    charCoords: function(pos, mode) {
-      return charCoords(this, clipPos(this.doc, pos), mode || "page");
-    },
-
-    coordsChar: function(coords, mode) {
-      coords = fromCoordSystem(this, coords, mode || "page");
-      return coordsChar(this, coords.left, coords.top);
-    },
-
-    lineAtHeight: function(height, mode) {
-      height = fromCoordSystem(this, {top: height, left: 0}, mode || "page").top;
-      return lineAtHeight(this.doc, height + this.display.viewOffset);
-    },
-    heightAtLine: function(line, mode) {
-      var end = false, lineObj;
-      if (typeof line == "number") {
-        var last = this.doc.first + this.doc.size - 1;
-        if (line < this.doc.first) line = this.doc.first;
-        else if (line > last) { line = last; end = true; }
-        lineObj = getLine(this.doc, line);
-      } else {
-        lineObj = line;
-      }
-      return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top +
-        (end ? this.doc.height - heightAtLine(lineObj) : 0);
-    },
-
-    defaultTextHeight: function() { return textHeight(this.display); },
-    defaultCharWidth: function() { return charWidth(this.display); },
-
-    setGutterMarker: methodOp(function(line, gutterID, value) {
-      return changeLine(this.doc, line, "gutter", function(line) {
-        var markers = line.gutterMarkers || (line.gutterMarkers = {});
-        markers[gutterID] = value;
-        if (!value && isEmpty(markers)) line.gutterMarkers = null;
-        return true;
-      });
-    }),
-
-    clearGutter: methodOp(function(gutterID) {
-      var cm = this, doc = cm.doc, i = doc.first;
-      doc.iter(function(line) {
-        if (line.gutterMarkers && line.gutterMarkers[gutterID]) {
-          line.gutterMarkers[gutterID] = null;
-          regLineChange(cm, i, "gutter");
-          if (isEmpty(line.gutterMarkers)) line.gutterMarkers = null;
-        }
-        ++i;
-      });
-    }),
-
-    lineInfo: function(line) {
-      if (typeof line == "number") {
-        if (!isLine(this.doc, line)) return null;
-        var n = line;
-        line = getLine(this.doc, line);
-        if (!line) return null;
-      } else {
-        var n = lineNo(line);
-        if (n == null) return null;
-      }
-      return {line: n, handle: line, text: line.text, gutterMarkers: line.gutterMarkers,
-              textClass: line.textClass, bgClass: line.bgClass, wrapClass: line.wrapClass,
-              widgets: line.widgets};
-    },
-
-    getViewport: function() { return {from: this.display.viewFrom, to: this.display.viewTo};},
-
-    addWidget: function(pos, node, scroll, vert, horiz) {
-      var display = this.display;
-      pos = cursorCoords(this, clipPos(this.doc, pos));
-      var top = pos.bottom, left = pos.left;
-      node.style.position = "absolute";
-      node.setAttribute("cm-ignore-events", "true");
-      this.display.input.setUneditable(node);
-      display.sizer.appendChild(node);
-      if (vert == "over") {
-        top = pos.top;
-      } else if (vert == "above" || vert == "near") {
-        var vspace = Math.max(display.wrapper.clientHeight, this.doc.height),
-        hspace = Math.max(display.sizer.clientWidth, display.lineSpace.clientWidth);
-        // Default to positioning above (if specified and possible); otherwise default to positioning below
-        if ((vert == 'above' || pos.bottom + node.offsetHeight > vspace) && pos.top > node.offsetHeight)
-          top = pos.top - node.offsetHeight;
-        else if (pos.bottom + node.offsetHeight <= vspace)
-          top = pos.bottom;
-        if (left + node.offsetWidth > hspace)
-          left = hspace - node.offsetWidth;
-      }
-      node.style.top = top + "px";
-      node.style.left = node.style.right = "";
-      if (horiz == "right") {
-        left = display.sizer.clientWidth - node.offsetWidth;
-        node.style.right = "0px";
-      } else {
-        if (horiz == "left") left = 0;
-        else if (horiz == "middle") left = (display.sizer.clientWidth - node.offsetWidth) / 2;
-        node.style.left = left + "px";
-      }
-      if (scroll)
-        scrollIntoView(this, left, top, left + node.offsetWidth, top + node.offsetHeight);
-    },
-
-    triggerOnKeyDown: methodOp(onKeyDown),
-    triggerOnKeyPress: methodOp(onKeyPress),
-    triggerOnKeyUp: onKeyUp,
-
-    execCommand: function(cmd) {
-      if (commands.hasOwnProperty(cmd))
-        return commands[cmd].call(null, this);
-    },
-
-    triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
-
-    findPosH: function(from, amount, unit, visually) {
-      var dir = 1;
-      if (amount < 0) { dir = -1; amount = -amount; }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        cur = findPosH(this.doc, cur, dir, unit, visually);
-        if (cur.hitSide) break;
-      }
-      return cur;
-    },
-
-    moveH: methodOp(function(dir, unit) {
-      var cm = this;
-      cm.extendSelectionsBy(function(range) {
-        if (cm.display.shift || cm.doc.extend || range.empty())
-          return findPosH(cm.doc, range.head, dir, unit, cm.options.rtlMoveVisually);
-        else
-          return dir < 0 ? range.from() : range.to();
-      }, sel_move);
-    }),
-
-    deleteH: methodOp(function(dir, unit) {
-      var sel = this.doc.sel, doc = this.doc;
-      if (sel.somethingSelected())
-        doc.replaceSelection("", null, "+delete");
-      else
-        deleteNearSelection(this, function(range) {
-          var other = findPosH(doc, range.head, dir, unit, false);
-          return dir < 0 ? {from: other, to: range.head} : {from: range.head, to: other};
-        });
-    }),
-
-    findPosV: function(from, amount, unit, goalColumn) {
-      var dir = 1, x = goalColumn;
-      if (amount < 0) { dir = -1; amount = -amount; }
-      for (var i = 0, cur = clipPos(this.doc, from); i < amount; ++i) {
-        var coords = cursorCoords(this, cur, "div");
-        if (x == null) x = coords.left;
-        else coords.left = x;
-        cur = findPosV(this, coords, dir, unit);
-        if (cur.hitSide) break;
-      }
-      return cur;
-    },
-
-    moveV: methodOp(function(dir, unit) {
-      var cm = this, doc = this.doc, goals = [];
-      var collapse = !cm.display.shift && !doc.extend && doc.sel.somethingSelected();
-      doc.extendSelectionsBy(function(range) {
-        if (collapse)
-          return dir < 0 ? range.from() : range.to();
-        var headPos = cursorCoords(cm, range.head, "div");
-        if (range.goalColumn != null) headPos.left = range.goalColumn;
-        goals.push(headPos.left);
-        var pos = findPosV(cm, headPos, dir, unit);
-        if (unit == "page" && range == doc.sel.primary())
-          addToScrollPos(cm, null, charCoords(cm, pos, "div").top - headPos.top);
-        return pos;
-      }, sel_move);
-      if (goals.length) for (var i = 0; i < doc.sel.ranges.length; i++)
-        doc.sel.ranges[i].goalColumn = goals[i];
-    }),
-
-    // Find the word at the given position (as returned by coordsChar).
-    findWordAt: function(pos) {
-      var doc = this.doc, line = getLine(doc, pos.line).text;
-      var start = pos.ch, end = pos.ch;
-      if (line) {
-        var helper = this.getHelper(pos, "wordChars");
-        if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
-        var startChar = line.charAt(start);
-        var check = isWordChar(startChar, helper)
-          ? function(ch) { return isWordChar(ch, helper); }
-          : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
-          : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
-        while (start > 0 && check(line.charAt(start - 1))) --start;
-        while (end < line.length && check(line.charAt(end))) ++end;
-      }
-      return new Range(Pos(pos.line, start), Pos(pos.line, end));
-    },
-
-    toggleOverwrite: function(value) {
-      if (value != null && value == this.state.overwrite) return;
-      if (this.state.overwrite = !this.state.overwrite)
-        addClass(this.display.cursorDiv, "CodeMirror-overwrite");
-      else
-        rmClass(this.display.cursorDiv, "CodeMirror-overwrite");
-
-      signal(this, "overwriteToggle", this, this.state.overwrite);
-    },
-    hasFocus: function() { return this.display.input.getField() == activeElt(); },
-
-    scrollTo: methodOp(function(x, y) {
-      if (x != null || y != null) resolveScrollToPos(this);
-      if (x != null) this.curOp.scrollLeft = x;
-      if (y != null) this.curOp.scrollTop = y;
-    }),
-    getScrollInfo: function() {
-      var scroller = this.display.scroller;
-      return {left: scroller.scrollLeft, top: scroller.scrollTop,
-              height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
-              width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
-              clientHeight: displayHeight(this), clientWidth: displayWidth(this)};
-    },
-
-    scrollIntoView: methodOp(function(range, margin) {
-      if (range == null) {
-        range = {from: this.doc.sel.primary().head, to: null};
-        if (margin == null) margin = this.options.cursorScrollMargin;
-      } else if (typeof range == "number") {
-        range = {from: Pos(range, 0), to: null};
-      } else if (range.from == null) {
-        range = {from: range, to: null};
-      }
-      if (!range.to) range.to = range.from;
-      range.margin = margin || 0;
-
-      if (range.from.line != null) {
-        resolveScrollToPos(this);
-        this.curOp.scrollToPos = range;
-      } else {
-        var sPos = calculateScrollPos(this, Math.min(range.from.left, range.to.left),
-                                      Math.min(range.from.top, range.to.top) - range.margin,
-                                      Math.max(range.from.right, range.to.right),
-                                      Math.max(range.from.bottom, range.to.bottom) + range.margin);
-        this.scrollTo(sPos.scrollLeft, sPos.scrollTop);
-      }
-    }),
-
-    setSize: methodOp(function(width, height) {
-      var cm = this;
-      function interpret(val) {
-        return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
-      }
-      if (width != null) cm.display.wrapper.style.width = interpret(width);
-      if (height != null) cm.display.wrapper.style.height = interpret(height);
-      if (cm.options.lineWrapping) clearLineMeasurementCache(this);
-      var lineNo = cm.display.viewFrom;
-      cm.doc.iter(lineNo, cm.display.viewTo, function(line) {
-        if (line.widgets) for (var i = 0; i < line.widgets.length; i++)
-          if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break; }
-        ++lineNo;
-      });
-      cm.curOp.forceUpdate = true;
-      signal(cm, "refresh", this);
-    }),
-
-    operation: function(f){return runInOp(this, f);},
-
-    refresh: methodOp(function() {
-      var oldHeight = this.display.cachedTextHeight;
-      regChange(this);
-      this.curOp.forceUpdate = true;
-      clearCaches(this);
-      this.scrollTo(this.doc.scrollLeft, this.doc.scrollTop);
-      updateGutterSpace(this);
-      if (oldHeight == null || Math.abs(oldHeight - textHeight(this.display)) > .5)
-        estimateLineHeights(this);
-      signal(this, "refresh", this);
-    }),
-
-    swapDoc: methodOp(function(doc) {
-      var old = this.doc;
-      old.cm = null;
-      attachDoc(this, doc);
-      clearCaches(this);
-      this.display.input.reset();
-      this.scrollTo(doc.scrollLeft, doc.scrollTop);
-      this.curOp.forceScroll = true;
-      signalLater(this, "swapDoc", this, old);
-      return old;
-    }),
-
-    getInputField: function(){return this.display.input.getField();},
-    getWrapperElement: function(){return this.display.wrapper;},
-    getScrollerElement: function(){return this.display.scroller;},
-    getGutterElement: function(){return this.display.gutters;}
-  };
-  eventMixin(CodeMirror);
-
-  // OPTION DEFAULTS
-
-  // The default configuration options.
-  var defaults = CodeMirror.defaults = {};
-  // Functions to run when options are changed.
-  var optionHandlers = CodeMirror.optionHandlers = {};
-
-  function option(name, deflt, handle, notOnInit) {
-    CodeMirror.defaults[name] = deflt;
-    if (handle) optionHandlers[name] =
-      notOnInit ? function(cm, val, old) {if (old != Init) handle(cm, val, old);} : handle;
-  }
-
-  // Passed to option handlers when there is no old value.
-  var Init = CodeMirror.Init = {toString: function(){return "CodeMirror.Init";}};
-
-  // These two are, on init, called from the constructor because they
-  // have to be initialized before the editor can start at all.
-  option("value", "", function(cm, val) {
-    cm.setValue(val);
-  }, true);
-  option("mode", null, function(cm, val) {
-    cm.doc.modeOption = val;
-    loadMode(cm);
-  }, true);
-
-  option("indentUnit", 2, loadMode, true);
-  option("indentWithTabs", false);
-  option("smartIndent", true);
-  option("tabSize", 4, function(cm) {
-    resetModeState(cm);
-    clearCaches(cm);
-    regChange(cm);
-  }, true);
-  option("lineSeparator", null, function(cm, val) {
-    cm.doc.lineSep = val;
-    if (!val) return;
-    var newBreaks = [], lineNo = cm.doc.first;
-    cm.doc.iter(function(line) {
-      for (var pos = 0;;) {
-        var found = line.text.indexOf(val, pos);
-        if (found == -1) break;
-        pos = found + val.length;
-        newBreaks.push(Pos(lineNo, found));
-      }
-      lineNo++;
-    });
-    for (var i = newBreaks.length - 1; i >= 0; i--)
-      replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
-  });
-  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
-    cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
-    if (old != CodeMirror.Init) cm.refresh();
-  });
-  option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
-  option("electricChars", true);
-  option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
-    throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME
-  }, true);
-  option("rtlMoveVisually", !windows);
-  option("wholeLineUpdateBefore", true);
-
-  option("theme", "default", function(cm) {
-    themeChanged(cm);
-    guttersChanged(cm);
-  }, true);
-  option("keyMap", "default", function(cm, val, old) {
-    var next = getKeyMap(val);
-    var prev = old != CodeMirror.Init && getKeyMap(old);
-    if (prev && prev.detach) prev.detach(cm, next);
-    if (next.attach) next.attach(cm, prev || null);
-  });
-  option("extraKeys", null);
-
-  option("lineWrapping", false, wrappingChanged, true);
-  option("gutters", [], function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
-  option("fixedGutter", true, function(cm, val) {
-    cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
-    cm.refresh();
-  }, true);
-  option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm);}, true);
-  option("scrollbarStyle", "native", function(cm) {
-    initScrollbars(cm);
-    updateScrollbars(cm);
-    cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
-    cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
-  }, true);
-  option("lineNumbers", false, function(cm) {
-    setGuttersForLineNumbers(cm.options);
-    guttersChanged(cm);
-  }, true);
-  option("firstLineNumber", 1, guttersChanged, true);
-  option("lineNumberFormatter", function(integer) {return integer;}, guttersChanged, true);
-  option("showCursorWhenSelecting", false, updateSelection, true);
-
-  option("resetSelectionOnContextMenu", true);
-  option("lineWiseCopyCut", true);
-
-  option("readOnly", false, function(cm, val) {
-    if (val == "nocursor") {
-      onBlur(cm);
-      cm.display.input.blur();
-      cm.display.disabled = true;
-    } else {
-      cm.display.disabled = false;
-    }
-    cm.display.input.readOnlyChanged(val)
-  });
-  option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
-  option("dragDrop", true, dragDropChanged);
-
-  option("cursorBlinkRate", 530);
-  option("cursorScrollMargin", 0);
-  option("cursorHeight", 1, updateSelection, true);
-  option("singleCursorHeightPerLine", true, updateSelection, true);
-  option("workTime", 100);
-  option("workDelay", 100);
-  option("flattenSpans", true, resetModeState, true);
-  option("addModeClass", false, resetModeState, true);
-  option("pollInterval", 100);
-  option("undoDepth", 200, function(cm, val){cm.doc.history.undoDepth = val;});
-  option("historyEventDelay", 1250);
-  option("viewportMargin", 10, function(cm){cm.refresh();}, true);
-  option("maxHighlightLength", 10000, resetModeState, true);
-  option("moveInputWithCursor", true, function(cm, val) {
-    if (!val) cm.display.input.resetPosition();
-  });
-
-  option("tabindex", null, function(cm, val) {
-    cm.display.input.getField().tabIndex = val || "";
-  });
-  option("autofocus", null);
-
-  // MODE DEFINITION AND QUERYING
-
-  // Known modes, by name and by MIME
-  var modes = CodeMirror.modes = {}, mimeModes = CodeMirror.mimeModes = {};
-
-  // Extra arguments are stored as the mode's dependencies, which is
-  // used by (legacy) mechanisms like loadmode.js to automatically
-  // load a mode. (Preferred mechanism is the require/define calls.)
-  CodeMirror.defineMode = function(name, mode) {
-    if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
-    if (arguments.length > 2)
-      mode.dependencies = Array.prototype.slice.call(arguments, 2);
-    modes[name] = mode;
-  };
-
-  CodeMirror.defineMIME = function(mime, spec) {
-    mimeModes[mime] = spec;
-  };
-
-  // Given a MIME type, a {name, ...options} config object, or a name
-  // string, return a mode config object.
-  CodeMirror.resolveMode = function(spec) {
-    if (typeof spec == "string" && mimeModes.hasOwnProperty(spec)) {
-      spec = mimeModes[spec];
-    } else if (spec && typeof spec.name == "string" && mimeModes.hasOwnProperty(spec.name)) {
-      var found = mimeModes[spec.name];
-      if (typeof found == "string") found = {name: found};
-      spec = createObj(found, spec);
-      spec.name = found.name;
-    } else if (typeof spec == "string" && /^[\w\-]+\/[\w\-]+\+xml$/.test(spec)) {
-      return CodeMirror.resolveMode("application/xml");
-    }
-    if (typeof spec == "string") return {name: spec};
-    else return spec || {name: "null"};
-  };
-
-  // Given a mode spec (anything that resolveMode accepts), find and
-  // initialize an actual mode object.
-  CodeMirror.getMode = function(options, spec) {
-    var spec = CodeMirror.resolveMode(spec);
-    var mfactory = modes[spec.name];
-    if (!mfactory) return CodeMirror.getMode(options, "text/plain");
-    var modeObj = mfactory(options, spec);
-    if (modeExtensions.hasOwnProperty(spec.name)) {
-      var exts = modeExtensions[spec.name];
-      for (var prop in exts) {
-        if (!exts.hasOwnProperty(prop)) continue;
-        if (modeObj.hasOwnProperty(prop)) modeObj["_" + prop] = modeObj[prop];
-        modeObj[prop] = exts[prop];
-      }
-    }
-    modeObj.name = spec.name;
-    if (spec.helperType) modeObj.helperType = spec.helperType;
-    if (spec.modeProps) for (var prop in spec.modeProps)
-      modeObj[prop] = spec.modeProps[prop];
-
-    return modeObj;
-  };
-
-  // Minimal default mode.
-  CodeMirror.defineMode("null", function() {
-    return {token: function(stream) {stream.skipToEnd();}};
-  });
-  CodeMirror.defineMIME("text/plain", "null");
-
-  // This can be used to attach properties to mode objects from
-  // outside the actual mode definition.
-  var modeExtensions = CodeMirror.modeExtensions = {};
-  CodeMirror.extendMode = function(mode, properties) {
-    var exts = modeExtensions.hasOwnProperty(mode) ? modeExtensions[mode] : (modeExtensions[mode] = {});
-    copyObj(properties, exts);
-  };
-
-  // EXTENSIONS
-
-  CodeMirror.defineExtension = function(name, func) {
-    CodeMirror.prototype[name] = func;
-  };
-  CodeMirror.defineDocExtension = function(name, func) {
-    Doc.prototype[name] = func;
-  };
-  CodeMirror.defineOption = option;
-
-  var initHooks = [];
-  CodeMirror.defineInitHook = function(f) {initHooks.push(f);};
-
-  var helpers = CodeMirror.helpers = {};
-  CodeMirror.registerHelper = function(type, name, value) {
-    if (!helpers.hasOwnProperty(type)) helpers[type] = CodeMirror[type] = {_global: []};
-    helpers[type][name] = value;
-  };
-  CodeMirror.registerGlobalHelper = function(type, name, predicate, value) {
-    CodeMirror.registerHelper(type, name, value);
-    helpers[type]._global.push({pred: predicate, val: value});
-  };
-
-  // MODE STATE HANDLING
-
-  // Utility functions for working with state. Exported because nested
-  // modes need to do this for their inner modes.
-
-  var copyState = CodeMirror.copyState = function(mode, state) {
-    if (state === true) return state;
-    if (mode.copyState) return mode.copyState(state);
-    var nstate = {};
-    for (var n in state) {
-      var val = state[n];
-      if (val instanceof Array) val = val.concat([]);
-      nstate[n] = val;
-    }
-    return nstate;
-  };
-
-  var startState = CodeMirror.startState = function(mode, a1, a2) {
-    return mode.startState ? mode.startState(a1, a2) : true;
-  };
-
-  // Given a mode and a state (for that mode), find the inner mode and
-  // state at the position that the state refers to.
-  CodeMirror.innerMode = function(mode, state) {
-    while (mode.innerMode) {
-      var info = mode.innerMode(state);
-      if (!info || info.mode == mode) break;
-      state = info.state;
-      mode = info.mode;
-    }
-    return info || {mode: mode, state: state};
-  };
-
-  // STANDARD COMMANDS
-
-  // Commands are parameter-less actions that can be performed on an
-  // editor, mostly used for keybindings.
-  var commands = CodeMirror.commands = {
-    selectAll: function(cm) {cm.setSelection(Pos(cm.firstLine(), 0), Pos(cm.lastLine()), sel_dontScroll);},
-    singleSelection: function(cm) {
-      cm.setSelection(cm.getCursor("anchor"), cm.getCursor("head"), sel_dontScroll);
-    },
-    killLine: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        if (range.empty()) {
-          var len = getLine(cm.doc, range.head.line).text.length;
-          if (range.head.ch == len && range.head.line < cm.lastLine())
-            return {from: range.head, to: Pos(range.head.line + 1, 0)};
-          else
-            return {from: range.head, to: Pos(range.head.line, len)};
-        } else {
-          return {from: range.from(), to: range.to()};
-        }
-      });
-    },
-    deleteLine: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        return {from: Pos(range.from().line, 0),
-                to: clipPos(cm.doc, Pos(range.to().line + 1, 0))};
-      });
-    },
-    delLineLeft: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        return {from: Pos(range.from().line, 0), to: range.from()};
-      });
-    },
-    delWrappedLineLeft: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var leftPos = cm.coordsChar({left: 0, top: top}, "div");
-        return {from: leftPos, to: range.from()};
-      });
-    },
-    delWrappedLineRight: function(cm) {
-      deleteNearSelection(cm, function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-        return {from: range.from(), to: rightPos };
-      });
-    },
-    undo: function(cm) {cm.undo();},
-    redo: function(cm) {cm.redo();},
-    undoSelection: function(cm) {cm.undoSelection();},
-    redoSelection: function(cm) {cm.redoSelection();},
-    goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
-    goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
-    goLineStart: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); },
-                            {origin: "+move", bias: 1});
-    },
-    goLineStartSmart: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        return lineStartSmart(cm, range.head);
-      }, {origin: "+move", bias: 1});
-    },
-    goLineEnd: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); },
-                            {origin: "+move", bias: -1});
-    },
-    goLineRight: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        return cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
-      }, sel_move);
-    },
-    goLineLeft: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        return cm.coordsChar({left: 0, top: top}, "div");
-      }, sel_move);
-    },
-    goLineLeftSmart: function(cm) {
-      cm.extendSelectionsBy(function(range) {
-        var top = cm.charCoords(range.head, "div").top + 5;
-        var pos = cm.coordsChar({left: 0, top: top}, "div");
-        if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head);
-        return pos;
-      }, sel_move);
-    },
-    goLineUp: function(cm) {cm.moveV(-1, "line");},
-    goLineDown: function(cm) {cm.moveV(1, "line");},
-    goPageUp: function(cm) {cm.moveV(-1, "page");},
-    goPageDown: function(cm) {cm.moveV(1, "page");},
-    goCharLeft: function(cm) {cm.moveH(-1, "char");},
-    goCharRight: function(cm) {cm.moveH(1, "char");},
-    goColumnLeft: function(cm) {cm.moveH(-1, "column");},
-    goColumnRight: function(cm) {cm.moveH(1, "column");},
-    goWordLeft: function(cm) {cm.moveH(-1, "word");},
-    goGroupRight: function(cm) {cm.moveH(1, "group");},
-    goGroupLeft: function(cm) {cm.moveH(-1, "group");},
-    goWordRight: function(cm) {cm.moveH(1, "word");},
-    delCharBefore: function(cm) {cm.deleteH(-1, "char");},
-    delCharAfter: function(cm) {cm.deleteH(1, "char");},
-    delWordBefore: function(cm) {cm.deleteH(-1, "word");},
-    delWordAfter: function(cm) {cm.deleteH(1, "word");},
-    delGroupBefore: function(cm) {cm.deleteH(-1, "group");},
-    delGroupAfter: function(cm) {cm.deleteH(1, "group");},
-    indentAuto: function(cm) {cm.indentSelection("smart");},
-    indentMore: function(cm) {cm.indentSelection("add");},
-    indentLess: function(cm) {cm.indentSelection("subtract");},
-    insertTab: function(cm) {cm.replaceSelection("\t");},
-    insertSoftTab: function(cm) {
-      var spaces = [], ranges = cm.listSelections(), tabSize = cm.options.tabSize;
-      for (var i = 0; i < ranges.length; i++) {
-        var pos = ranges[i].from();
-        var col = countColumn(cm.getLine(pos.line), pos.ch, tabSize);
-        spaces.push(new Array(tabSize - col % tabSize + 1).join(" "));
-      }
-      cm.replaceSelections(spaces);
-    },
-    defaultTab: function(cm) {
-      if (cm.somethingSelected()) cm.indentSelection("add");
-      else cm.execCommand("insertTab");
-    },
-    transposeChars: function(cm) {
-      runInOp(cm, function() {
-        var ranges = cm.listSelections(), newSel = [];
-        for (var i = 0; i < ranges.length; i++) {
-          var cur = ranges[i].head, line = getLine(cm.doc, cur.line).text;
-          if (line) {
-            if (cur.ch == line.length) cur = new Pos(cur.line, cur.ch - 1);
-            if (cur.ch > 0) {
-              cur = new Pos(cur.line, cur.ch + 1);
-              cm.replaceRange(line.charAt(cur.ch - 1) + line.charAt(cur.ch - 2),
-                              Pos(cur.line, cur.ch - 2), cur, "+transpose");
-            } else if (cur.line > cm.doc.first) {
-              var prev = getLine(cm.doc, cur.line - 1).text;
-              if (prev)
-                cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
-                                prev.charAt(prev.length - 1),
-                                Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
-            }
-          }
-          newSel.push(new Range(cur, cur));
-        }
-        cm.setSelections(newSel);
-      });
-    },
-    newlineAndIndent: function(cm) {
-      runInOp(cm, function() {
-        var len = cm.listSelections().length;
-        for (var i = 0; i < len; i++) {
-          var range = cm.listSelections()[i];
-          cm.replaceRange(cm.doc.lineSeparator(), range.anchor, range.head, "+input");
-          cm.indentLine(range.from().line + 1, null, true);
-          ensureCursorVisible(cm);
-        }
-      });
-    },
-    toggleOverwrite: function(cm) {cm.toggleOverwrite();}
-  };
-
-
-  // STANDARD KEYMAPS
-
-  var keyMap = CodeMirror.keyMap = {};
-
-  keyMap.basic = {
-    "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
-    "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
-    "Delete": "delCharAfter", "Backspace": "delCharBefore", "Shift-Backspace": "delCharBefore",
-    "Tab": "defaultTab", "Shift-Tab": "indentAuto",
-    "Enter": "newlineAndIndent", "Insert": "toggleOverwrite",
-    "Esc": "singleSelection"
-  };
-  // Note that the save and find-related commands aren't defined by
-  // default. User code or addons can define them. Unknown commands
-  // are simply ignored.
-  keyMap.pcDefault = {
-    "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
-    "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
-    "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
-    "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
-    "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
-    "Ctrl-[": "indentLess", "Ctrl-]": "indentMore",
-    "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
-    fallthrough: "basic"
-  };
-  // Very basic readline/emacs-style bindings, which are standard on Mac.
-  keyMap.emacsy = {
-    "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
-    "Alt-F": "goWordRight", "Alt-B": "goWordLeft", "Ctrl-A": "goLineStart", "Ctrl-E": "goLineEnd",
-    "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
-    "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
-  };
-  keyMap.macDefault = {
-    "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
-    "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
-    "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
-    "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
-    "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
-    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
-    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
-    fallthrough: ["basic", "emacsy"]
-  };
-  keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
-
-  // KEYMAP DISPATCH
-
-  function normalizeKeyName(name) {
-    var parts = name.split(/-(?!$)/), name = parts[parts.length - 1];
-    var alt, ctrl, shift, cmd;
-    for (var i = 0; i < parts.length - 1; i++) {
-      var mod = parts[i];
-      if (/^(cmd|meta|m)$/i.test(mod)) cmd = true;
-      else if (/^a(lt)?$/i.test(mod)) alt = true;
-      else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true;
-      else if (/^s(hift)$/i.test(mod)) shift = true;
-      else throw new Error("Unrecognized modifier name: " + mod);
-    }
-    if (alt) name = "Alt-" + name;
-    if (ctrl) name = "Ctrl-" + name;
-    if (cmd) name = "Cmd-" + name;
-    if (shift) name = "Shift-" + name;
-    return name;
-  }
-
-  // This is a kludge to keep keymaps mostly working as raw objects
-  // (backwards compatibility) while at the same time support features
-  // like normalization and multi-stroke key bindings. It compiles a
-  // new normalized keymap, and then updates the old object to reflect
-  // this.
-  CodeMirror.normalizeKeyMap = function(keymap) {
-    var copy = {};
-    for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
-      var value = keymap[keyname];
-      if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue;
-      if (value == "...") { delete keymap[keyname]; continue; }
-
-      var keys = map(keyname.split(" "), normalizeKeyName);
-      for (var i = 0; i < keys.length; i++) {
-        var val, name;
-        if (i == keys.length - 1) {
-          name = keys.join(" ");
-          val = value;
-        } else {
-          name = keys.slice(0, i + 1).join(" ");
-          val = "...";
-        }
-        var prev = copy[name];
-        if (!prev) copy[name] = val;
-        else if (prev != val) throw new Error("Inconsistent bindings for " + name);
-      }
-      delete keymap[keyname];
-    }
-    for (var prop in copy) keymap[prop] = copy[prop];
-    return keymap;
-  };
-
-  var lookupKey = CodeMirror.lookupKey = function(key, map, handle, context) {
-    map = getKeyMap(map);
-    var found = map.call ? map.call(key, context) : map[key];
-    if (found === false) return "nothing";
-    if (found === "...") return "multi";
-    if (found != null && handle(found)) return "handled";
-
-    if (map.fallthrough) {
-      if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
-        return lookupKey(key, map.fallthrough, handle, context);
-      for (var i = 0; i < map.fallthrough.length; i++) {
-        var result = lookupKey(key, map.fallthrough[i], handle, context);
-        if (result) return result;
-      }
-    }
-  };
-
-  // Modifier key presses don't count as 'real' key presses for the
-  // purpose of keymap fallthrough.
-  var isModifierKey = CodeMirror.isModifierKey = function(value) {
-    var name = typeof value == "string" ? value : keyNames[value.keyCode];
-    return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
-  };
-
-  // Look up the name of a key as indicated by an event object.
-  var keyName = CodeMirror.keyName = function(event, noShift) {
-    if (presto && event.keyCode == 34 && event["char"]) return false;
-    var base = keyNames[event.keyCode], name = base;
-    if (name == null || event.altGraphKey) return false;
-    if (event.altKey && base != "Alt") name = "Alt-" + name;
-    if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name;
-    if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name;
-    if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name;
-    return name;
-  };
-
-  function getKeyMap(val) {
-    return typeof val == "string" ? keyMap[val] : val;
-  }
-
-  // FROMTEXTAREA
-
-  CodeMirror.fromTextArea = function(textarea, options) {
-    options = options ? copyObj(options) : {};
-    options.value = textarea.value;
-    if (!options.tabindex && textarea.tabIndex)
-      options.tabindex = textarea.tabIndex;
-    if (!options.placeholder && textarea.placeholder)
-      options.placeholder = textarea.placeholder;
-    // Set autofocus to true if this textarea is focused, or if it has
-    // autofocus and no other element is focused.
-    if (options.autofocus == null) {
-      var hasFocus = activeElt();
-      options.autofocus = hasFocus == textarea ||
-        textarea.getAttribute("autofocus") != null && hasFocus == document.body;
-    }
-
-    function save() {textarea.value = cm.getValue();}
-    if (textarea.form) {
-      on(textarea.form, "submit", save);
-      // Deplorable hack to make the submit method do the right thing.
-      if (!options.leaveSubmitMethodAlone) {
-        var form = textarea.form, realSubmit = form.submit;
-        try {
-          var wrappedSubmit = form.submit = function() {
-            save();
-            form.submit = realSubmit;
-            form.submit();
-            form.submit = wrappedSubmit;
-          };
-        } catch(e) {}
-      }
-    }
-
-    options.finishInit = function(cm) {
-      cm.save = save;
-      cm.getTextArea = function() { return textarea; };
-      cm.toTextArea = function() {
-        cm.toTextArea = isNaN; // Prevent this from being ran twice
-        save();
-        textarea.parentNode.removeChild(cm.getWrapperElement());
-        textarea.style.display = "";
-        if (textarea.form) {
-          off(textarea.form, "submit", save);
-          if (typeof textarea.form.submit == "function")
-            textarea.form.submit = realSubmit;
-        }
-      };
-    };
-
-    textarea.style.display = "none";
-    var cm = CodeMirror(function(node) {
-      textarea.parentNode.insertBefore(node, textarea.nextSibling);
-    }, options);
-    return cm;
-  };
-
-  // STRING STREAM
-
-  // Fed to the mode parsers, provides helper functions to make
-  // parsers more succinct.
-
-  var StringStream = CodeMirror.StringStream = function(string, tabSize) {
-    this.pos = this.start = 0;
-    this.string = string;
-    this.tabSize = tabSize || 8;
-    this.lastColumnPos = this.lastColumnValue = 0;
-    this.lineStart = 0;
-  };
-
-  StringStream.prototype = {
-    eol: function() {return this.pos >= this.string.length;},
-    sol: function() {return this.pos == this.lineStart;},
-    peek: function() {return this.string.charAt(this.pos) || undefined;},
-    next: function() {
-      if (this.pos < this.string.length)
-        return this.string.charAt(this.pos++);
-    },
-    eat: function(match) {
-      var ch = this.string.charAt(this.pos);
-      if (typeof match == "string") var ok = ch == match;
-      else var ok = ch && (match.test ? match.test(ch) : match(ch));
-      if (ok) {++this.pos; return ch;}
-    },
-    eatWhile: function(match) {
-      var start = this.pos;
-      while (this.eat(match)){}
-      return this.pos > start;
-    },
-    eatSpace: function() {
-      var start = this.pos;
-      while (/[\s\u00a0]/.test(this.string.charAt(this.pos))) ++this.pos;
-      return this.pos > start;
-    },
-    skipToEnd: function() {this.pos = this.string.length;},
-    skipTo: function(ch) {
-      var found = this.string.indexOf(ch, this.pos);
-      if (found > -1) {this.pos = found; return true;}
-    },
-    backUp: function(n) {this.pos -= n;},
-    column: function() {
-      if (this.lastColumnPos < this.start) {
-        this.lastColumnValue = countColumn(this.string, this.start, this.tabSize, this.lastColumnPos, this.lastColumnValue);
-        this.lastColumnPos = this.start;
-      }
-      return this.lastColumnValue - (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-    },
-    indentation: function() {
-      return countColumn(this.string, null, this.tabSize) -
-        (this.lineStart ? countColumn(this.string, this.lineStart, this.tabSize) : 0);
-    },
-    match: function(pattern, consume, caseInsensitive) {
-      if (typeof pattern == "string") {
-        var cased = function(str) {return caseInsensitive ? str.toLowerCase() : str;};
-        var substr = this.string.substr(this.pos, pattern.length);
-        if (cased(substr) == cased(pattern)) {
-          if (consume !== false) this.pos += pattern.length;
-          return true;
-        }
-      } else {
-        var match = this.string.slice(this.pos).match(pattern);
-        if (match && match.index > 0) return null;
-        if (match && consume !== false) this.pos += match[0].length;
-        return match;
-      }
-    },
-    current: function(){return this.string.slice(this.start, this.pos);},
-    hideFirstChars: function(n, inner) {
-      this.lineStart += n;
-      try { return inner(); }
-      finally { this.lineStart -= n; }
-    }
-  };
-
-  // TEXTMARKERS
-
-  // Created with markText and setBookmark methods. A TextMarker is a
-  // handle that can be used to clear or find a marked position in the
-  // document. Line objects hold arrays (markedSpans) containing
-  // {from, to, marker} object pointing to such marker objects, and
-  // indicating that such a marker is present on that line. Multiple
-  // lines may point to the same marker when it spans across lines.
-  // The spans will have null for their from/to properties when the
-  // marker continues beyond the start/end of the line. Markers have
-  // links back to the lines they currently touch.
-
-  var nextMarkerId = 0;
-
-  var TextMarker = CodeMirror.TextMarker = function(doc, type) {
-    this.lines = [];
-    this.type = type;
-    this.doc = doc;
-    this.id = ++nextMarkerId;
-  };
-  eventMixin(TextMarker);
-
-  // Clear the marker.
-  TextMarker.prototype.clear = function() {
-    if (this.explicitlyCleared) return;
-    var cm = this.doc.cm, withOp = cm && !cm.curOp;
-    if (withOp) startOperation(cm);
-    if (hasHandler(this, "clear")) {
-      var found = this.find();
-      if (found) signalLater(this, "clear", found.from, found.to);
-    }
-    var min = null, max = null;
-    for (var i = 0; i < this.lines.length; ++i) {
-      var line = this.lines[i];
-      var span = getMarkedSpanFor(line.markedSpans, this);
-      if (cm && !this.collapsed) regLineChange(cm, lineNo(line), "text");
-      else if (cm) {
-        if (span.to != null) max = lineNo(line);
-        if (span.from != null) min = lineNo(line);
-      }
-      line.markedSpans = removeMarkedSpan(line.markedSpans, span);
-      if (span.from == null && this.collapsed && !lineIsHidden(this.doc, line) && cm)
-        updateLineHeight(line, textHeight(cm.display));
-    }
-    if (cm && this.collapsed && !cm.options.lineWrapping) for (var i = 0; i < this.lines.length; ++i) {
-      var visual = visualLine(this.lines[i]), len = lineLength(visual);
-      if (len > cm.display.maxLineLength) {
-        cm.display.maxLine = visual;
-        cm.display.maxLineLength = len;
-        cm.display.maxLineChanged = true;
-      }
-    }
-
-    if (min != null && cm && this.collapsed) regChange(cm, min, max + 1);
-    this.lines.length = 0;
-    this.explicitlyCleared = true;
-    if (this.atomic && this.doc.cantEdit) {
-      this.doc.cantEdit = false;
-      if (cm) reCheckSelection(cm.doc);
-    }
-    if (cm) signalLater(cm, "markerCleared", cm, this);
-    if (withOp) endOperation(cm);
-    if (this.parent) this.parent.clear();
-  };
-
-  // Find the position of the marker in the document. Returns a {from,
-  // to} object by default. Side can be passed to get a specific side
-  // -- 0 (both), -1 (left), or 1 (right). When lineObj is true, the
-  // Pos objects returned contain a line object, rather than a line
-  // number (used to prevent looking up the same line twice).
-  TextMarker.prototype.find = function(side, lineObj) {
-    if (side == null && this.type == "bookmark") side = 1;
-    var from, to;
-    for (var i = 0; i < this.lines.length; ++i) {
-      var line = this.lines[i];
-      var span = getMarkedSpanFor(line.markedSpans, this);
-      if (span.from != null) {
-        from = Pos(lineObj ? line : lineNo(line), span.from);
-        if (side == -1) return from;
-      }
-      if (span.to != null) {
-        to = Pos(lineObj ? line : lineNo(line), span.to);
-        if (side == 1) return to;
-      }
-    }
-    return from && {from: from, to: to};
-  };
-
-  // Signals that the marker's widget changed, and surrounding layout
-  // should be recomputed.
-  TextMarker.prototype.changed = function() {
-    var pos = this.find(-1, true), widget = this, cm = this.doc.cm;
-    if (!pos || !cm) return;
-    runInOp(cm, function() {
-      var line = pos.line, lineN = lineNo(pos.line);
-      var view = findViewForLine(cm, lineN);
-      if (view) {
-        clearLineMeasurementCacheFor(view);
-        cm.curOp.selectionChanged = cm.curOp.forceUpdate = true;
-      }
-      cm.curOp.updateMaxLine = true;
-      if (!lineIsHidden(widget.doc, line) && widget.height != null) {
-        var oldHeight = widget.height;
-        widget.height = null;
-        var dHeight = widgetHeight(widget) - oldHeight;
-        if (dHeight)
-          updateLineHeight(line, line.height + dHeight);
-      }
-    });
-  };
-
-  TextMarker.prototype.attachLine = function(line) {
-    if (!this.lines.length && this.doc.cm) {
-      var op = this.doc.cm.curOp;
-      if (!op.maybeHiddenMarkers || indexOf(op.maybeHiddenMarkers, this) == -1)
-        (op.maybeUnhiddenMarkers || (op.maybeUnhiddenMarkers = [])).push(this);
-    }
-    this.lines.push(line);
-  };
-  TextMarker.prototype.detachLine = function(line) {
-    this.lines.splice(indexOf(this.lines, line), 1);
-    if (!this.lines.length && this.doc.cm) {
-      var op = this.doc.cm.curOp;
-      (op.maybeHiddenMarkers || (op.maybeHiddenMarkers = [])).push(this);
-    }
-  };
-
-  // Collapsed markers have unique ids, in order to be able to order
-  // them, which is needed for uniquely determining an outer marker
-  // when they overlap (they may nest, but not partially overlap).
-  var nextMarkerId = 0;
-
-  // Create a marker, wire it up to the right lines, and
-  function markText(doc, from, to, options, type) {
-    // Shared markers (across linked documents) are handled separately
-    // (markTextShared will call out to this again, once per
-    // document).
-    if (options && options.shared) return markTextShared(doc, from, to, options, type);
-    // Ensure we are in an operation.
-    if (doc.cm && !doc.cm.curOp) return operation(doc.cm, markText)(doc, from, to, options, type);
-
-    var marker = new TextMarker(doc, type), diff = cmp(from, to);
-    if (options) copyObj(options, marker, false);
-    // Don't connect empty markers unless clearWhenEmpty is false
-    if (diff > 0 || diff == 0 && marker.clearWhenEmpty !== false)
-      return marker;
-    if (marker.replacedWith) {
-      // Showing up as a widget implies collapsed (widget replaces text)
-      marker.collapsed = true;
-      marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget");
-      if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true");
-      if (options.insertLeft) marker.widgetNode.insertLeft = true;
-    }
-    if (marker.collapsed) {
-      if (conflictingCollapsedRange(doc, from.line, from, to, marker) ||
-          from.line != to.line && conflictingCollapsedRange(doc, to.line, from, to, marker))
-        throw new Error("Inserting collapsed marker partially overlapping an existing one");
-      sawCollapsedSpans = true;
-    }
-
-    if (marker.addToHistory)
-      addChangeToHistory(doc, {from: from, to: to, origin: "markText"}, doc.sel, NaN);
-
-    var curLine = from.line, cm = doc.cm, updateMaxLine;
-    doc.iter(curLine, to.line + 1, function(line) {
-      if (cm && marker.collapsed && !cm.options.lineWrapping && visualLine(line) == cm.display.maxLine)
-        updateMaxLine = true;
-      if (marker.collapsed && curLine != from.line) updateLineHeight(line, 0);
-      addMarkedSpan(line, new MarkedSpan(marker,
-                                         curLine == from.line ? from.ch : null,
-                                         curLine == to.line ? to.ch : null));
-      ++curLine;
-    });
-    // lineIsHidden depends on the presence of the spans, so needs a second pass
-    if (marker.collapsed) doc.iter(from.line, to.line + 1, function(line) {
-      if (lineIsHidden(doc, line)) updateLineHeight(line, 0);
-    });
-
-    if (marker.clearOnEnter) on(marker, "beforeCursorEnter", function() { marker.clear(); });
-
-    if (marker.readOnly) {
-      sawReadOnlySpans = true;
-      if (doc.history.done.length || doc.history.undone.length)
-        doc.clearHistory();
-    }
-    if (marker.collapsed) {
-      marker.id = ++nextMarkerId;
-      marker.atomic = true;
-    }
-    if (cm) {
-      // Sync editor state
-      if (updateMaxLine) cm.curOp.updateMaxLine = true;
-      if (marker.collapsed)
-        regChange(cm, from.line, to.line + 1);
-      else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
-        for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text");
-      if (marker.atomic) reCheckSelection(cm.doc);
-      signalLater(cm, "markerAdded", cm, marker);
-    }
-    return marker;
-  }
-
-  // SHARED TEXTMARKERS
-
-  // A shared marker spans multiple linked documents. It is
-  // implemented as a meta-marker-object controlling multiple normal
-  // markers.
-  var SharedTextMarker = CodeMirror.SharedTextMarker = function(markers, primary) {
-    this.markers = markers;
-    this.primary = primary;
-    for (var i = 0; i < markers.length; ++i)
-      markers[i].parent = this;
-  };
-  eventMixin(SharedTextMarker);
-
-  SharedTextMarker.prototype.clear = function() {
-    if (this.explicitlyCleared) return;
-    this.explicitlyCleared = true;
-    for (var i = 0; i < this.markers.length; ++i)
-      this.markers[i].clear();
-    signalLater(this, "clear");
-  };
-  SharedTextMarker.prototype.find = function(side, lineObj) {
-    return this.primary.find(side, lineObj);
-  };
-
-  function markTextShared(doc, from, to, options, type) {
-    options = copyObj(options);
-    options.shared = false;
-    var markers = [markText(doc, from, to, options, type)], primary = markers[0];
-    var widget = options.widgetNode;
-    linkedDocs(doc, function(doc) {
-      if (widget) options.widgetNode = widget.cloneNode(true);
-      markers.push(markText(doc, clipPos(doc, from), clipPos(doc, to), options, type));
-      for (var i = 0; i < doc.linked.length; ++i)
-        if (doc.linked[i].isParent) return;
-      primary = lst(markers);
-    });
-    return new SharedTextMarker(markers, primary);
-  }
-
-  function findSharedMarkers(doc) {
-    return doc.findMarks(Pos(doc.first, 0), doc.clipPos(Pos(doc.lastLine())),
-                         function(m) { return m.parent; });
-  }
-
-  function copySharedMarkers(doc, markers) {
-    for (var i = 0; i < markers.length; i++) {
-      var marker = markers[i], pos = marker.find();
-      var mFrom = doc.clipPos(pos.from), mTo = doc.clipPos(pos.to);
-      if (cmp(mFrom, mTo)) {
-        var subMark = markText(doc, mFrom, mTo, marker.primary, marker.primary.type);
-        marker.markers.push(subMark);
-        subMark.parent = marker;
-      }
-    }
-  }
-
-  function detachSharedMarkers(markers) {
-    for (var i = 0; i < markers.length; i++) {
-      var marker = markers[i], linked = [marker.primary.doc];;
-      linkedDocs(marker.primary.doc, function(d) { linked.push(d); });
-      for (var j = 0; j < marker.markers.length; j++) {
-        var subMarker = marker.markers[j];
-        if (indexOf(linked, subMarker.doc) == -1) {
-          subMarker.parent = null;
-          marker.markers.splice(j--, 1);
-        }
-      }
-    }
-  }
-
-  // TEXTMARKER SPANS
-
-  function MarkedSpan(marker, from, to) {
-    this.marker = marker;
-    this.from = from; this.to = to;
-  }
-
-  // Search an array of spans for a span matching the given marker.
-  function getMarkedSpanFor(spans, marker) {
-    if (spans) for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
-      if (span.marker == marker) return span;
-    }
-  }
-  // Remove a span from an array, returning undefined if no spans are
-  // left (we don't store arrays for lines without spans).
-  function removeMarkedSpan(spans, span) {
-    for (var r, i = 0; i < spans.length; ++i)
-      if (spans[i] != span) (r || (r = [])).push(spans[i]);
-    return r;
-  }
-  // Add a span to a line.
-  function addMarkedSpan(line, span) {
-    line.markedSpans = line.markedSpans ? line.markedSpans.concat([span]) : [span];
-    span.marker.attachLine(line);
-  }
-
-  // Used for the algorithm that adjusts markers for a change in the
-  // document. These functions cut an array of spans at a given
-  // character position, returning an array of remaining chunks (or
-  // undefined if nothing remains).
-  function markedSpansBefore(old, startCh, isInsert) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= startCh : span.from < startCh);
-      if (startsBefore || span.from == startCh && marker.type == "bookmark" && (!isInsert || !span.marker.insertLeft)) {
-        var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= startCh : span.to > startCh);
-        (nw || (nw = [])).push(new MarkedSpan(marker, span.from, endsAfter ? null : span.to));
-      }
-    }
-    return nw;
-  }
-  function markedSpansAfter(old, endCh, isInsert) {
-    if (old) for (var i = 0, nw; i < old.length; ++i) {
-      var span = old[i], marker = span.marker;
-      var endsAfter = span.to == null || (marker.inclusiveRight ? span.to >= endCh : span.to > endCh);
-      if (endsAfter || span.from == endCh && marker.type == "bookmark" && (!isInsert || span.marker.insertLeft)) {
-        var startsBefore = span.from == null || (marker.inclusiveLeft ? span.from <= endCh : span.from < endCh);
-        (nw || (nw = [])).push(new MarkedSpan(marker, startsBefore ? null : span.from - endCh,
-                                              span.to == null ? null : span.to - endCh));
-      }
-    }
-    return nw;
-  }
-
-  // Given a change object, compute the new set of marker spans that
-  // cover the line in which the change took place. Removes spans
-  // entirely within the change, reconnects spans belonging to the
-  // same marker that appear on both sides of the change, and cuts off
-  // spans partially within the change. Returns an array of span
-  // arrays with one element for each line in (after) the change.
-  function stretchSpansOverChange(doc, change) {
-    if (change.full) return null;
-    var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
-    var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
-    if (!oldFirst && !oldLast) return null;
-
-    var startCh = change.from.ch, endCh = change.to.ch, isInsert = cmp(change.from, change.to) == 0;
-    // Get the spans that 'stick out' on both sides
-    var first = markedSpansBefore(oldFirst, startCh, isInsert);
-    var last = markedSpansAfter(oldLast, endCh, isInsert);
-
-    // Next, merge those two ends
-    var sameLine = change.text.length == 1, offset = lst(change.text).length + (sameLine ? startCh : 0);
-    if (first) {
-      // Fix up .to properties of first
-      for (var i = 0; i < first.length; ++i) {
-        var span = first[i];
-        if (span.to == null) {
-          var found = getMarkedSpanFor(last, span.marker);
-          if (!found) span.to = startCh;
-          else if (sameLine) span.to = found.to == null ? null : found.to + offset;
-        }
-      }
-    }
-    if (last) {
-      // Fix up .from in last (or move them into first in case of sameLine)
-      for (var i = 0; i < last.length; ++i) {
-        var span = last[i];
-        if (span.to != null) span.to += offset;
-        if (span.from == null) {
-          var found = getMarkedSpanFor(first, span.marker);
-          if (!found) {
-            span.from = offset;
-            if (sameLine) (first || (first = [])).push(span);
-          }
-        } else {
-          span.from += offset;
-          if (sameLine) (first || (first = [])).push(span);
-        }
-      }
-    }
-    // Make sure we didn't create any zero-length spans
-    if (first) first = clearEmptySpans(first);
-    if (last && last != first) last = clearEmptySpans(last);
-
-    var newMarkers = [first];
-    if (!sameLine) {
-      // Fill gap with whole-line-spans
-      var gap = change.text.length - 2, gapMarkers;
-      if (gap > 0 && first)
-        for (var i = 0; i < first.length; ++i)
-          if (first[i].to == null)
-            (gapMarkers || (gapMarkers = [])).push(new MarkedSpan(first[i].marker, null, null));
-      for (var i = 0; i < gap; ++i)
-        newMarkers.push(gapMarkers);
-      newMarkers.push(last);
-    }
-    return newMarkers;
-  }
-
-  // Remove spans that are empty and don't have a clearWhenEmpty
-  // option of false.
-  function clearEmptySpans(spans) {
-    for (var i = 0; i < spans.length; ++i) {
-      var span = spans[i];
-      if (span.from != null && span.from == span.to && span.marker.clearWhenEmpty !== false)
-        spans.splice(i--, 1);
-    }
-    if (!spans.length) return null;
-    return spans;
-  }
-
-  // Used for un/re-doing changes from the history. Combines the
-  // result of computing the existing spans with the set of spans that
-  // existed in the history (so that deleting around a span and then
-  // undoing brings back the span).
-  function mergeOldSpans(doc, change) {
-    var old = getOldSpans(doc, change);
-    var stretched = stretchSpansOverChange(doc, change);
-    if (!old) return stretched;
-    if (!stretched) return old;
-
-    for (var i = 0; i < old.length; ++i) {
-      var oldCur = old[i], stretchCur = stretched[i];
-      if (oldCur && stretchCur) {
-        spans: for (var j = 0; j < stretchCur.length; ++j) {
-          var span = stretchCur[j];
-          for (var k = 0; k < oldCur.length; ++k)
-            if (oldCur[k].marker == span.marker) continue spans;
-          oldCur.push(span);
-        }
-      } else if (stretchCur) {
-        old[i] = stretchCur;
-      }
-    }
-    return old;
-  }
-
-  // Used to 'clip' out readOnly ranges when making a change.
-  function removeReadOnlyRanges(doc, from, to) {
-    var markers = null;
-    doc.iter(from.line, to.line + 1, function(line) {
-      if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
-        var mark = line.markedSpans[i].marker;
-        if (mark.readOnly && (!markers || indexOf(markers, mark) == -1))
-          (markers || (markers = [])).push(mark);
-      }
-    });
-    if (!markers) return null;
-    var parts = [{from: from, to: to}];
-    for (var i = 0; i < markers.length; ++i) {
-      var mk = markers[i], m = mk.find(0);
-      for (var j = 0; j < parts.length; ++j) {
-        var p = parts[j];
-        if (cmp(p.to, m.from) < 0 || cmp(p.from, m.to) > 0) continue;
-        var newParts = [j, 1], dfrom = cmp(p.from, m.from), dto = cmp(p.to, m.to);
-        if (dfrom < 0 || !mk.inclusiveLeft && !dfrom)
-          newParts.push({from: p.from, to: m.from});
-        if (dto > 0 || !mk.inclusiveRight && !dto)
-          newParts.push({from: m.to, to: p.to});
-        parts.splice.apply(parts, newParts);
-        j += newParts.length - 1;
-      }
-    }
-    return parts;
-  }
-
-  // Connect or disconnect spans from a line.
-  function detachMarkedSpans(line) {
-    var spans = line.markedSpans;
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.detachLine(line);
-    line.markedSpans = null;
-  }
-  function attachMarkedSpans(line, spans) {
-    if (!spans) return;
-    for (var i = 0; i < spans.length; ++i)
-      spans[i].marker.attachLine(line);
-    line.markedSpans = spans;
-  }
-
-  // Helpers used when computing which overlapping collapsed span
-  // counts as the larger one.
-  function extraLeft(marker) { return marker.inclusiveLeft ? -1 : 0; }
-  function extraRight(marker) { return marker.inclusiveRight ? 1 : 0; }
-
-  // Returns a number indicating which of two overlapping collapsed
-  // spans is larger (and thus includes the other). Falls back to
-  // comparing ids when the spans cover exactly the same range.
-  function compareCollapsedMarkers(a, b) {
-    var lenDiff = a.lines.length - b.lines.length;
-    if (lenDiff != 0) return lenDiff;
-    var aPos = a.find(), bPos = b.find();
-    var fromCmp = cmp(aPos.from, bPos.from) || extraLeft(a) - extraLeft(b);
-    if (fromCmp) return -fromCmp;
-    var toCmp = cmp(aPos.to, bPos.to) || extraRight(a) - extraRight(b);
-    if (toCmp) return toCmp;
-    return b.id - a.id;
-  }
-
-  // Find out whether a line ends or starts in a collapsed span. If
-  // so, return the marker for that span.
-  function collapsedSpanAtSide(line, start) {
-    var sps = sawCollapsedSpans && line.markedSpans, found;
-    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-      sp = sps[i];
-      if (sp.marker.collapsed && (start ? sp.from : sp.to) == null &&
-          (!found || compareCollapsedMarkers(found, sp.marker) < 0))
-        found = sp.marker;
-    }
-    return found;
-  }
-  function collapsedSpanAtStart(line) { return collapsedSpanAtSide(line, true); }
-  function collapsedSpanAtEnd(line) { return collapsedSpanAtSide(line, false); }
-
-  // Test whether there exists a collapsed span that partially
-  // overlaps (covers the start or end, but not both) of a new span.
-  // Such overlap is not allowed.
-  function conflictingCollapsedRange(doc, lineNo, from, to, marker) {
-    var line = getLine(doc, lineNo);
-    var sps = sawCollapsedSpans && line.markedSpans;
-    if (sps) for (var i = 0; i < sps.length; ++i) {
-      var sp = sps[i];
-      if (!sp.marker.collapsed) continue;
-      var found = sp.marker.find(0);
-      var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
-      var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
-      if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
-      if (fromCmp <= 0 && (cmp(found.to, from) > 0 || (sp.marker.inclusiveRight && marker.inclusiveLeft)) ||
-          fromCmp >= 0 && (cmp(found.from, to) < 0 || (sp.marker.inclusiveLeft && marker.inclusiveRight)))
-        return true;
-    }
-  }
-
-  // A visual line is a line as drawn on the screen. Folding, for
-  // example, can cause multiple logical lines to appear on the same
-  // visual line. This finds the start of the visual line that the
-  // given line is part of (usually that is the line itself).
-  function visualLine(line) {
-    var merged;
-    while (merged = collapsedSpanAtStart(line))
-      line = merged.find(-1, true).line;
-    return line;
-  }
-
-  // Returns an array of logical lines that continue the visual line
-  // started by the argument, or undefined if there are no such lines.
-  function visualLineContinued(line) {
-    var merged, lines;
-    while (merged = collapsedSpanAtEnd(line)) {
-      line = merged.find(1, true).line;
-      (lines || (lines = [])).push(line);
-    }
-    return lines;
-  }
-
-  // Get the line number of the start of the visual line that the
-  // given line number is part of.
-  function visualLineNo(doc, lineN) {
-    var line = getLine(doc, lineN), vis = visualLine(line);
-    if (line == vis) return lineN;
-    return lineNo(vis);
-  }
-  // Get the line number of the start of the next visual line after
-  // the given line.
-  function visualLineEndNo(doc, lineN) {
-    if (lineN > doc.lastLine()) return lineN;
-    var line = getLine(doc, lineN), merged;
-    if (!lineIsHidden(doc, line)) return lineN;
-    while (merged = collapsedSpanAtEnd(line))
-      line = merged.find(1, true).line;
-    return lineNo(line) + 1;
-  }
-
-  // Compute whether a line is hidden. Lines count as hidden when they
-  // are part of a visual line that starts with another line, or when
-  // they are entirely covered by collapsed, non-widget span.
-  function lineIsHidden(doc, line) {
-    var sps = sawCollapsedSpans && line.markedSpans;
-    if (sps) for (var sp, i = 0; i < sps.length; ++i) {
-      sp = sps[i];
-      if (!sp.marker.collapsed) continue;
-      if (sp.from == null) return true;
-      if (sp.marker.widgetNode) continue;
-      if (sp.from == 0 && sp.marker.inclusiveLeft && lineIsHiddenInner(doc, line, sp))
-        return true;
-    }
-  }
-  function lineIsHiddenInner(doc, line, span) {
-    if (span.to == null) {
-      var end = span.marker.find(1, true);
-      return lineIsHiddenInner(doc, end.line, getMarkedSpanFor(end.line.markedSpans, span.marker));
-    }
-    if (span.marker.inclusiveRight && span.to == line.text.length)
-      return true;
-    for (var sp, i = 0; i < line.markedSpans.length; ++i) {
-      sp = line.markedSpans[i];
-      if (sp.marker.collapsed && !sp.marker.widgetNode && sp.from == span.to &&
-          (sp.to == null || sp.to != span.from) &&
-          (sp.marker.inclusiveLeft || span.marker.inclusiveRight) &&
-          lineIsHiddenInner(doc, line, sp)) return true;
-    }
-  }
-
-  // LINE WIDGETS
-
-  // Line widgets are block elements displayed above or below a line.
-
-  var LineWidget = CodeMirror.LineWidget = function(doc, node, options) {
-    if (options) for (var opt in options) if (options.hasOwnProperty(opt))
-      this[opt] = options[opt];
-    this.doc = doc;
-    this.node = node;
-  };
-  eventMixin(LineWidget);
-
-  function adjustScrollWhenAboveVisible(cm, line, diff) {
-    if (heightAtLine(line) < ((cm.curOp && cm.curOp.scrollTop) || cm.doc.scrollTop))
-      addToScrollPos(cm, null, diff);
-  }
-
-  LineWidget.prototype.clear = function() {
-    var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
-    if (no == null || !ws) return;
-    for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
-    if (!ws.length) line.widgets = null;
-    var height = widgetHeight(this);
-    updateLineHeight(line, Math.max(0, line.height - height));
-    if (cm) runInOp(cm, function() {
-      adjustScrollWhenAboveVisible(cm, line, -height);
-      regLineChange(cm, no, "widget");
-    });
-  };
-  LineWidget.prototype.changed = function() {
-    var oldH = this.height, cm = this.doc.cm, line = this.line;
-    this.height = null;
-    var diff = widgetHeight(this) - oldH;
-    if (!diff) return;
-    updateLineHeight(line, line.height + diff);
-    if (cm) runInOp(cm, function() {
-      cm.curOp.forceUpdate = true;
-      adjustScrollWhenAboveVisible(cm, line, diff);
-    });
-  };
-
-  function widgetHeight(widget) {
-    if (widget.height != null) return widget.height;
-    var cm = widget.doc.cm;
-    if (!cm) return 0;
-    if (!contains(document.body, widget.node)) {
-      var parentStyle = "position: relative;";
-      if (widget.coverGutter)
-        parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;";
-      if (widget.noHScroll)
-        parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
-      removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
-    }
-    return widget.height = widget.node.offsetHeight;
-  }
-
-  function addLineWidget(doc, handle, node, options) {
-    var widget = new LineWidget(doc, node, options);
-    var cm = doc.cm;
-    if (cm && widget.noHScroll) cm.display.alignWidgets = true;
-    changeLine(doc, handle, "widget", function(line) {
-      var widgets = line.widgets || (line.widgets = []);
-      if (widget.insertAt == null) widgets.push(widget);
-      else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
-      widget.line = line;
-      if (cm && !lineIsHidden(doc, line)) {
-        var aboveVisible = heightAtLine(line) < doc.scrollTop;
-        updateLineHeight(line, line.height + widgetHeight(widget));
-        if (aboveVisible) addToScrollPos(cm, null, widget.height);
-        cm.curOp.forceUpdate = true;
-      }
-      return true;
-    });
-    return widget;
-  }
-
-  // LINE DATA STRUCTURE
-
-  // Line objects. These hold state related to a line, including
-  // highlighting info (the styles array).
-  var Line = CodeMirror.Line = function(text, markedSpans, estimateHeight) {
-    this.text = text;
-    attachMarkedSpans(this, markedSpans);
-    this.height = estimateHeight ? estimateHeight(this) : 1;
-  };
-  eventMixin(Line);
-  Line.prototype.lineNo = function() { return lineNo(this); };
-
-  // Change the content (text, markers) of a line. Automatically
-  // invalidates cached information and tries to re-estimate the
-  // line's height.
-  function updateLine(line, text, markedSpans, estimateHeight) {
-    line.text = text;
-    if (line.stateAfter) line.stateAfter = null;
-    if (line.styles) line.styles = null;
-    if (line.order != null) line.order = null;
-    detachMarkedSpans(line);
-    attachMarkedSpans(line, markedSpans);
-    var estHeight = estimateHeight ? estimateHeight(line) : 1;
-    if (estHeight != line.height) updateLineHeight(line, estHeight);
-  }
-
-  // Detach a line from the document tree and its markers.
-  function cleanUpLine(line) {
-    line.parent = null;
-    detachMarkedSpans(line);
-  }
-
-  function extractLineClasses(type, output) {
-    if (type) for (;;) {
-      var lineClass = type.match(/(?:^|\s+)line-(background-)?(\S+)/);
-      if (!lineClass) break;
-      type = type.slice(0, lineClass.index) + type.slice(lineClass.index + lineClass[0].length);
-      var prop = lineClass[1] ? "bgClass" : "textClass";
-      if (output[prop] == null)
-        output[prop] = lineClass[2];
-      else if (!(new RegExp("(?:^|\s)" + lineClass[2] + "(?:$|\s)")).test(output[prop]))
-        output[prop] += " " + lineClass[2];
-    }
-    return type;
-  }
-
-  function callBlankLine(mode, state) {
-    if (mode.blankLine) return mode.blankLine(state);
-    if (!mode.innerMode) return;
-    var inner = CodeMirror.innerMode(mode, state);
-    if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
-  }
-
-  function readToken(mode, stream, state, inner) {
-    for (var i = 0; i < 10; i++) {
-      if (inner) inner[0] = CodeMirror.innerMode(mode, state).mode;
-      var style = mode.token(stream, state);
-      if (stream.pos > stream.start) return style;
-    }
-    throw new Error("Mode " + mode.name + " failed to advance stream.");
-  }
-
-  // Utility for getTokenAt and getLineTokens
-  function takeToken(cm, pos, precise, asArray) {
-    function getObj(copy) {
-      return {start: stream.start, end: stream.pos,
-              string: stream.current(),
-              type: style || null,
-              state: copy ? copyState(doc.mode, state) : state};
-    }
-
-    var doc = cm.doc, mode = doc.mode, style;
-    pos = clipPos(doc, pos);
-    var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
-    var stream = new StringStream(line.text, cm.options.tabSize), tokens;
-    if (asArray) tokens = [];
-    while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
-      stream.start = stream.pos;
-      style = readToken(mode, stream, state);
-      if (asArray) tokens.push(getObj(true));
-    }
-    return asArray ? tokens : getObj();
-  }
-
-  // Run the given mode's parser over a line, calling f for each token.
-  function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
-    var flattenSpans = mode.flattenSpans;
-    if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
-    var curStart = 0, curStyle = null;
-    var stream = new StringStream(text, cm.options.tabSize), style;
-    var inner = cm.options.addModeClass && [null];
-    if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses);
-    while (!stream.eol()) {
-      if (stream.pos > cm.options.maxHighlightLength) {
-        flattenSpans = false;
-        if (forceToEnd) processLine(cm, text, state, stream.pos);
-        stream.pos = text.length;
-        style = null;
-      } else {
-        style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses);
-      }
-      if (inner) {
-        var mName = inner[0].name;
-        if (mName) style = "m-" + (style ? mName + " " + style : mName);
-      }
-      if (!flattenSpans || curStyle != style) {
-        while (curStart < stream.start) {
-          curStart = Math.min(stream.start, curStart + 50000);
-          f(curStart, curStyle);
-        }
-        curStyle = style;
-      }
-      stream.start = stream.pos;
-    }
-    while (curStart < stream.pos) {
-      // Webkit seems to refuse to render text nodes longer than 57444 characters
-      var pos = Math.min(stream.pos, curStart + 50000);
-      f(pos, curStyle);
-      curStart = pos;
-    }
-  }
-
-  // Compute a style array (an array starting with a mode generation
-  // -- for invalidation -- followed by pairs of end positions and
-  // style strings), which is used to highlight the tokens on the
-  // line.
-  function highlightLine(cm, line, state, forceToEnd) {
-    // A styles array always starts with a number identifying the
-    // mode/overlays that it is based on (for easy invalidation).
-    var st = [cm.state.modeGen], lineClasses = {};
-    // Compute the base array of styles
-    runMode(cm, line.text, cm.doc.mode, state, function(end, style) {
-      st.push(end, style);
-    }, lineClasses, forceToEnd);
-
-    // Run overlays, adjust style array.
-    for (var o = 0; o < cm.state.overlays.length; ++o) {
-      var overlay = cm.state.overlays[o], i = 1, at = 0;
-      runMode(cm, line.text, overlay.mode, true, function(end, style) {
-        var start = i;
-        // Ensure there's a token end at the current position, and that i points at it
-        while (at < end) {
-          var i_end = st[i];
-          if (i_end > end)
-            st.splice(i, 1, end, st[i+1], i_end);
-          i += 2;
-          at = Math.min(end, i_end);
-        }
-        if (!style) return;
-        if (overlay.opaque) {
-          st.splice(start, i - start, end, "cm-overlay " + style);
-          i = start + 2;
-        } else {
-          for (; start < i; start += 2) {
-            var cur = st[start+1];
-            st[start+1] = (cur ? cur + " " : "") + "cm-overlay " + style;
-          }
-        }
-      }, lineClasses);
-    }
-
-    return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null};
-  }
-
-  function getLineStyles(cm, line, updateFrontier) {
-    if (!line.styles || line.styles[0] != cm.state.modeGen) {
-      var state = getStateBefore(cm, lineNo(line));
-      var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state);
-      line.stateAfter = state;
-      line.styles = result.styles;
-      if (result.classes) line.styleClasses = result.classes;
-      else if (line.styleClasses) line.styleClasses = null;
-      if (updateFrontier === cm.doc.frontier) cm.doc.frontier++;
-    }
-    return line.styles;
-  }
-
-  // Lightweight form of highlight -- proceed over this line and
-  // update state, but don't save a style array. Used for lines that
-  // aren't currently visible.
-  function processLine(cm, text, state, startAt) {
-    var mode = cm.doc.mode;
-    var stream = new StringStream(text, cm.options.tabSize);
-    stream.start = stream.pos = startAt || 0;
-    if (text == "") callBlankLine(mode, state);
-    while (!stream.eol()) {
-      readToken(mode, stream, state);
-      stream.start = stream.pos;
-    }
-  }
-
-  // Convert a style as returned by a mode (either null, or a string
-  // containing one or more styles) to a CSS style. This is cached,
-  // and also looks for line-wide styles.
-  var styleToClassCache = {}, styleToClassCacheWithMode = {};
-  function interpretTokenStyle(style, options) {
-    if (!style || /^\s*$/.test(style)) return null;
-    var cache = options.addModeClass ? styleToClassCacheWithMode : styleToClassCache;
-    return cache[style] ||
-      (cache[style] = style.replace(/\S+/g, "cm-$&"));
-  }
-
-  // Render the DOM representation of the text of a line. Also builds
-  // up a 'line map', which points at the DOM nodes that represent
-  // specific stretches of text, and is used by the measuring code.
-  // The returned object contains the DOM node, this map, and
-  // information about line-wide styles that were set by the mode.
-  function buildLineContent(cm, lineView) {
-    // The padding-right forces the element to have a 'border', which
-    // is needed on Webkit to be able to get line-level bounding
-    // rectangles for it (in measureChar).
-    var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
-    var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
-                   col: 0, pos: 0, cm: cm,
-                   splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
-    lineView.measure = {};
-
-    // Iterate over the logical lines that make up this visual line.
-    for (var i = 0; i <= (lineView.rest ? lineView.rest.length : 0); i++) {
-      var line = i ? lineView.rest[i - 1] : lineView.line, order;
-      builder.pos = 0;
-      builder.addToken = buildToken;
-      // Optionally wire in some hacks into the token-rendering
-      // algorithm, to deal with browser quirks.
-      if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
-        builder.addToken = buildTokenBadBidi(builder.addToken, order);
-      builder.map = [];
-      var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
-      insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
-      if (line.styleClasses) {
-        if (line.styleClasses.bgClass)
-          builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "");
-        if (line.styleClasses.textClass)
-          builder.textClass = joinClasses(line.styleClasses.textClass, builder.textClass || "");
-      }
-
-      // Ensure at least a single node is present, for measuring.
-      if (builder.map.length == 0)
-        builder.map.push(0, 0, builder.content.appendChild(zeroWidthElement(cm.display.measure)));
-
-      // Store the map and a cache object for the current logical line
-      if (i == 0) {
-        lineView.measure.map = builder.map;
-        lineView.measure.cache = {};
-      } else {
-        (lineView.measure.maps || (lineView.measure.maps = [])).push(builder.map);
-        (lineView.measure.caches || (lineView.measure.caches = [])).push({});
-      }
-    }
-
-    // See issue #2901
-    if (webkit && /\bcm-tab\b/.test(builder.content.lastChild.className))
-      builder.content.className = "cm-tab-wrap-hack";
-
-    signal(cm, "renderLine", cm, lineView.line, builder.pre);
-    if (builder.pre.className)
-      builder.textClass = joinClasses(builder.pre.className, builder.textClass || "");
-
-    return builder;
-  }
-
-  function defaultSpecialCharPlaceholder(ch) {
-    var token = elt("span", "\u2022", "cm-invalidchar");
-    token.title = "\\u" + ch.charCodeAt(0).toString(16);
-    token.setAttribute("aria-label", token.title);
-    return token;
-  }
-
-  // Build up the DOM representation for a single token, and add it to
-  // the line map. Takes care to render special characters separately.
-  function buildToken(builder, text, style, startStyle, endStyle, title, css) {
-    if (!text) return;
-    var displayText = builder.splitSpaces ? text.replace(/ {3,}/g, splitSpaces) : text;
-    var special = builder.cm.state.specialChars, mustWrap = false;
-    if (!special.test(text)) {
-      builder.col += text.length;
-      var content = document.createTextNode(displayText);
-      builder.map.push(builder.pos, builder.pos + text.length, content);
-      if (ie && ie_version < 9) mustWrap = true;
-      builder.pos += text.length;
-    } else {
-      var content = document.createDocumentFragment(), pos = 0;
-      while (true) {
-        special.lastIndex = pos;
-        var m = special.exec(text);
-        var skipped = m ? m.index - pos : text.length - pos;
-        if (skipped) {
-          var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
-          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
-          else content.appendChild(txt);
-          builder.map.push(builder.pos, builder.pos + skipped, txt);
-          builder.col += skipped;
-          builder.pos += skipped;
-        }
-        if (!m) break;
-        pos += skipped + 1;
-        if (m[0] == "\t") {
-          var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
-          var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
-          txt.setAttribute("role", "presentation");
-          txt.setAttribute("cm-text", "\t");
-          builder.col += tabWidth;
-        } else if (m[0] == "\r" || m[0] == "\n") {
-          var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"));
-          txt.setAttribute("cm-text", m[0]);
-          builder.col += 1;
-        } else {
-          var txt = builder.cm.options.specialCharPlaceholder(m[0]);
-          txt.setAttribute("cm-text", m[0]);
-          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
-          else content.appendChild(txt);
-          builder.col += 1;
-        }
-        builder.map.push(builder.pos, builder.pos + 1, txt);
-        builder.pos++;
-      }
-    }
-    if (style || startStyle || endStyle || mustWrap || css) {
-      var fullStyle = style || "";
-      if (startStyle) fullStyle += startStyle;
-      if (endStyle) fullStyle += endStyle;
-      var token = elt("span", [content], fullStyle, css);
-      if (title) token.title = title;
-      return builder.content.appendChild(token);
-    }
-    builder.content.appendChild(content);
-  }
-
-  function splitSpaces(old) {
-    var out = " ";
-    for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0";
-    out += " ";
-    return out;
-  }
-
-  // Work around nonsense dimensions being reported for stretches of
-  // right-to-left text.
-  function buildTokenBadBidi(inner, order) {
-    return function(builder, text, style, startStyle, endStyle, title, css) {
-      style = style ? style + " cm-force-border" : "cm-force-border";
-      var start = builder.pos, end = start + text.length;
-      for (;;) {
-        // Find the part that overlaps with the start of this text
-        for (var i = 0; i < order.length; i++) {
-          var part = order[i];
-          if (part.to > start && part.from <= start) break;
-        }
-        if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css);
-        inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css);
-        startStyle = null;
-        text = text.slice(part.to - start);
-        start = part.to;
-      }
-    };
-  }
-
-  function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
-    var widget = !ignoreWidget && marker.widgetNode;
-    if (widget) builder.map.push(builder.pos, builder.pos + size, widget);
-    if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
-      if (!widget)
-        widget = builder.content.appendChild(document.createElement("span"));
-      widget.setAttribute("cm-marker", marker.id);
-    }
-    if (widget) {
-      builder.cm.display.input.setUneditable(widget);
-      builder.content.appendChild(widget);
-    }
-    builder.pos += size;
-  }
-
-  // Outputs a number of spans to make up a line, taking highlighting
-  // and marked text into account.
-  function insertLineContent(line, builder, styles) {
-    var spans = line.markedSpans, allText = line.text, at = 0;
-    if (!spans) {
-      for (var i = 1; i < styles.length; i+=2)
-        builder.addToken(builder, allText.slice(at, at = styles[i]), interpretTokenStyle(styles[i+1], builder.cm.options));
-      return;
-    }
-
-    var len = allText.length, pos = 0, i = 1, text = "", style, css;
-    var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
-    for (;;) {
-      if (nextChange == pos) { // Update current marker set
-        spanStyle = spanEndStyle = spanStartStyle = title = css = "";
-        collapsed = null; nextChange = Infinity;
-        var foundBookmarks = [];
-        for (var j = 0; j < spans.length; ++j) {
-          var sp = spans[j], m = sp.marker;
-          if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
-            foundBookmarks.push(m);
-          } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) {
-            if (sp.to != null && sp.to != pos && nextChange > sp.to) {
-              nextChange = sp.to;
-              spanEndStyle = "";
-            }
-            if (m.className) spanStyle += " " + m.className;
-            if (m.css) css = m.css;
-            if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
-            if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
-            if (m.title && !title) title = m.title;
-            if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
-              collapsed = sp;
-          } else if (sp.from > pos && nextChange > sp.from) {
-            nextChange = sp.from;
-          }
-        }
-        if (collapsed && (collapsed.from || 0) == pos) {
-          buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
-                             collapsed.marker, collapsed.from == null);
-          if (collapsed.to == null) return;
-          if (collapsed.to == pos) collapsed = false;
-        }
-        if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)
-          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
-      }
-      if (pos >= len) break;
-
-      var upto = Math.min(len, nextChange);
-      while (true) {
-        if (text) {
-          var end = pos + text.length;
-          if (!collapsed) {
-            var tokenText = end > upto ? text.slice(0, upto - pos) : text;
-            builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
-                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css);
-          }
-          if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
-          pos = end;
-          spanStartStyle = "";
-        }
-        text = allText.slice(at, at = styles[i++]);
-        style = interpretTokenStyle(styles[i++], builder.cm.options);
-      }
-    }
-  }
-
-  // DOCUMENT DATA STRUCTURE
-
-  // By default, updates that start and end at the beginning of a line
-  // are treated specially, in order to make the association of line
-  // widgets and marker elements with the text behave more intuitive.
-  function isWholeLineUpdate(doc, change) {
-    return change.from.ch == 0 && change.to.ch == 0 && lst(change.text) == "" &&
-      (!doc.cm || doc.cm.options.wholeLineUpdateBefore);
-  }
-
-  // Perform a change on the document data structure.
-  function updateDoc(doc, change, markedSpans, estimateHeight) {
-    function spansFor(n) {return markedSpans ? markedSpans[n] : null;}
-    function update(line, text, spans) {
-      updateLine(line, text, spans, estimateHeight);
-      signalLater(line, "change", line, change);
-    }
-    function linesFor(start, end) {
-      for (var i = start, result = []; i < end; ++i)
-        result.push(new Line(text[i], spansFor(i), estimateHeight));
-      return result;
-    }
-
-    var from = change.from, to = change.to, text = change.text;
-    var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
-    var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
-
-    // Adjust the line structure
-    if (change.full) {
-      doc.insert(0, linesFor(0, text.length));
-      doc.remove(text.length, doc.size - text.length);
-    } else if (isWholeLineUpdate(doc, change)) {
-      // This is a whole-line replace. Treated specially to make
-      // sure line objects move the way they are supposed to.
-      var added = linesFor(0, text.length - 1);
-      update(lastLine, lastLine.text, lastSpans);
-      if (nlines) doc.remove(from.line, nlines);
-      if (added.length) doc.insert(from.line, added);
-    } else if (firstLine == lastLine) {
-      if (text.length == 1) {
-        update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
-      } else {
-        var added = linesFor(1, text.length - 1);
-        added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
-        update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-        doc.insert(from.line + 1, added);
-      }
-    } else if (text.length == 1) {
-      update(firstLine, firstLine.text.slice(0, from.ch) + text[0] + lastLine.text.slice(to.ch), spansFor(0));
-      doc.remove(from.line + 1, nlines);
-    } else {
-      update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
-      update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
-      var added = linesFor(1, text.length - 1);
-      if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
-      doc.insert(from.line + 1, added);
-    }
-
-    signalLater(doc, "change", doc, change);
-  }
-
-  // The document is represented as a BTree consisting of leaves, with
-  // chunk of lines in them, and branches, with up to ten leaves or
-  // other branch nodes below them. The top node is always a branch
-  // node, and is the document object itself (meaning it has
-  // additional methods and properties).
-  //
-  // All nodes have parent links. The tree is used both to go from
-  // line numbers to line objects, and to go from objects to numbers.
-  // It also indexes by height, and is used to convert between height
-  // and line object, and to find the total height of the document.
-  //
-  // See also http://marijnhaverbeke.nl/blog/codemirror-line-tree.html
-
-  function LeafChunk(lines) {
-    this.lines = lines;
-    this.parent = null;
-    for (var i = 0, height = 0; i < lines.length; ++i) {
-      lines[i].parent = this;
-      height += lines[i].height;
-    }
-    this.height = height;
-  }
-
-  LeafChunk.prototype = {
-    chunkSize: function() { return this.lines.length; },
-    // Remove the n lines at offset 'at'.
-    removeInner: function(at, n) {
-      for (var i = at, e = at + n; i < e; ++i) {
-        var line = this.lines[i];
-        this.height -= line.height;
-        cleanUpLine(line);
-        signalLater(line, "delete");
-      }
-      this.lines.splice(at, n);
-    },
-    // Helper used to collapse a small branch into a single leaf.
-    collapse: function(lines) {
-      lines.push.apply(lines, this.lines);
-    },
-    // Insert the given array of lines at offset 'at', count them as
-    // having the given height.
-    insertInner: function(at, lines, height) {
-      this.height += height;
-      this.lines = this.lines.slice(0, at).concat(lines).concat(this.lines.slice(at));
-      for (var i = 0; i < lines.length; ++i) lines[i].parent = this;
-    },
-    // Used to iterate over a part of the tree.
-    iterN: function(at, n, op) {
-      for (var e = at + n; at < e; ++at)
-        if (op(this.lines[at])) return true;
-    }
-  };
-
-  function BranchChunk(children) {
-    this.children = children;
-    var size = 0, height = 0;
-    for (var i = 0; i < children.length; ++i) {
-      var ch = children[i];
-      size += ch.chunkSize(); height += ch.height;
-      ch.parent = this;
-    }
-    this.size = size;
-    this.height = height;
-    this.parent = null;
-  }
-
-  BranchChunk.prototype = {
-    chunkSize: function() { return this.size; },
-    removeInner: function(at, n) {
-      this.size -= n;
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var rm = Math.min(n, sz - at), oldHeight = child.height;
-          child.removeInner(at, rm);
-          this.height -= oldHeight - child.height;
-          if (sz == rm) { this.children.splice(i--, 1); child.parent = null; }
-          if ((n -= rm) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-      // If the result is smaller than 25 lines, ensure that it is a
-      // single leaf node.
-      if (this.size - n < 25 &&
-          (this.children.length > 1 || !(this.children[0] instanceof LeafChunk))) {
-        var lines = [];
-        this.collapse(lines);
-        this.children = [new LeafChunk(lines)];
-        this.children[0].parent = this;
-      }
-    },
-    collapse: function(lines) {
-      for (var i = 0; i < this.children.length; ++i) this.children[i].collapse(lines);
-    },
-    insertInner: function(at, lines, height) {
-      this.size += lines.length;
-      this.height += height;
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at <= sz) {
-          child.insertInner(at, lines, height);
-          if (child.lines && child.lines.length > 50) {
-            while (child.lines.length > 50) {
-              var spilled = child.lines.splice(child.lines.length - 25, 25);
-              var newleaf = new LeafChunk(spilled);
-              child.height -= newleaf.height;
-              this.children.splice(i + 1, 0, newleaf);
-              newleaf.parent = this;
-            }
-            this.maybeSpill();
-          }
-          break;
-        }
-        at -= sz;
-      }
-    },
-    // When a node has grown, check whether it should be split.
-    maybeSpill: function() {
-      if (this.children.length <= 10) return;
-      var me = this;
-      do {
-        var spilled = me.children.splice(me.children.length - 5, 5);
-        var sibling = new BranchChunk(spilled);
-        if (!me.parent) { // Become the parent node
-          var copy = new BranchChunk(me.children);
-          copy.parent = me;
-          me.children = [copy, sibling];
-          me = copy;
-        } else {
-          me.size -= sibling.size;
-          me.height -= sibling.height;
-          var myIndex = indexOf(me.parent.children, me);
-          me.parent.children.splice(myIndex + 1, 0, sibling);
-        }
-        sibling.parent = me.parent;
-      } while (me.children.length > 10);
-      me.parent.maybeSpill();
-    },
-    iterN: function(at, n, op) {
-      for (var i = 0; i < this.children.length; ++i) {
-        var child = this.children[i], sz = child.chunkSize();
-        if (at < sz) {
-          var used = Math.min(n, sz - at);
-          if (child.iterN(at, used, op)) return true;
-          if ((n -= used) == 0) break;
-          at = 0;
-        } else at -= sz;
-      }
-    }
-  };
-
-  var nextDocId = 0;
-  var Doc = CodeMirror.Doc = function(text, mode, firstLine, lineSep) {
-    if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep);
-    if (firstLine == null) firstLine = 0;
-
-    BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
-    this.first = firstLine;
-    this.scrollTop = this.scrollLeft = 0;
-    this.cantEdit = false;
-    this.cleanGeneration = 1;
-    this.frontier = firstLine;
-    var start = Pos(firstLine, 0);
-    this.sel = simpleSelection(start);
-    this.history = new History(null);
-    this.id = ++nextDocId;
-    this.modeOption = mode;
-    this.lineSep = lineSep;
-
-    if (typeof text == "string") text = this.splitLines(text);
-    updateDoc(this, {from: start, to: start, text: text});
-    setSelection(this, simpleSelection(start), sel_dontScroll);
-  };
-
-  Doc.prototype = createObj(BranchChunk.prototype, {
-    constructor: Doc,
-    // Iterate over the document. Supports two forms -- with only one
-    // argument, it calls that for each line in the document. With
-    // three, it iterates over the range given by the first two (with
-    // the second being non-inclusive).
-    iter: function(from, to, op) {
-      if (op) this.iterN(from - this.first, to - from, op);
-      else this.iterN(this.first, this.first + this.size, from);
-    },
-
-    // Non-public interface for adding and removing lines.
-    insert: function(at, lines) {
-      var height = 0;
-      for (var i = 0; i < lines.length; ++i) height += lines[i].height;
-      this.insertInner(at - this.first, lines, height);
-    },
-    remove: function(at, n) { this.removeInner(at - this.first, n); },
-
-    // From here, the methods are part of the public interface. Most
-    // are also available from CodeMirror (editor) instances.
-
-    getValue: function(lineSep) {
-      var lines = getLines(this, this.first, this.first + this.size);
-      if (lineSep === false) return lines;
-      return lines.join(lineSep || this.lineSeparator());
-    },
-    setValue: docMethodOp(function(code) {
-      var top = Pos(this.first, 0), last = this.first + this.size - 1;
-      makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
-                        text: this.splitLines(code), origin: "setValue", full: true}, true);
-      setSelection(this, simpleSelection(top));
-    }),
-    replaceRange: function(code, from, to, origin) {
-      from = clipPos(this, from);
-      to = to ? clipPos(this, to) : from;
-      replaceRange(this, code, from, to, origin);
-    },
-    getRange: function(from, to, lineSep) {
-      var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
-      if (lineSep === false) return lines;
-      return lines.join(lineSep || this.lineSeparator());
-    },
-
-    getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
-
-    getLineHandle: function(line) {if (isLine(this, line)) return getLine(this, line);},
-    getLineNumber: function(line) {return lineNo(line);},
-
-    getLineHandleVisualStart: function(line) {
-      if (typeof line == "number") line = getLine(this, line);
-      return visualLine(line);
-    },
-
-    lineCount: function() {return this.size;},
-    firstLine: function() {return this.first;},
-    lastLine: function() {return this.first + this.size - 1;},
-
-    clipPos: function(pos) {return clipPos(this, pos);},
-
-    getCursor: function(start) {
-      var range = this.sel.primary(), pos;
-      if (start == null || start == "head") pos = range.head;
-      else if (start == "anchor") pos = range.anchor;
-      else if (start == "end" || start == "to" || start === false) pos = range.to();
-      else pos = range.from();
-      return pos;
-    },
-    listSelections: function() { return this.sel.ranges; },
-    somethingSelected: function() {return this.sel.somethingSelected();},
-
-    setCursor: docMethodOp(function(line, ch, options) {
-      setSimpleSelection(this, clipPos(this, typeof line == "number" ? Pos(line, ch || 0) : line), null, options);
-    }),
-    setSelection: docMethodOp(function(anchor, head, options) {
-      setSimpleSelection(this, clipPos(this, anchor), clipPos(this, head || anchor), options);
-    }),
-    extendSelection: docMethodOp(function(head, other, options) {
-      extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
-    }),
-    extendSelections: docMethodOp(function(heads, options) {
-      extendSelections(this, clipPosArray(this, heads, options));
-    }),
-    extendSelectionsBy: docMethodOp(function(f, options) {
-      extendSelections(this, map(this.sel.ranges, f), options);
-    }),
-    setSelections: docMethodOp(function(ranges, primary, options) {
-      if (!ranges.length) return;
-      for (var i = 0, out = []; i < ranges.length; i++)
-        out[i] = new Range(clipPos(this, ranges[i].anchor),
-                           clipPos(this, ranges[i].head));
-      if (primary == null) primary = Math.min(ranges.length - 1, this.sel.primIndex);
-      setSelection(this, normalizeSelection(out, primary), options);
-    }),
-    addSelection: docMethodOp(function(anchor, head, options) {
-      var ranges = this.sel.ranges.slice(0);
-      ranges.push(new Range(clipPos(this, anchor), clipPos(this, head || anchor)));
-      setSelection(this, normalizeSelection(ranges, ranges.length - 1), options);
-    }),
-
-    getSelection: function(lineSep) {
-      var ranges = this.sel.ranges, lines;
-      for (var i = 0; i < ranges.length; i++) {
-        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        lines = lines ? lines.concat(sel) : sel;
-      }
-      if (lineSep === false) return lines;
-      else return lines.join(lineSep || this.lineSeparator());
-    },
-    getSelections: function(lineSep) {
-      var parts = [], ranges = this.sel.ranges;
-      for (var i = 0; i < ranges.length; i++) {
-        var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator());
-        parts[i] = sel;
-      }
-      return parts;
-    },
-    replaceSelection: function(code, collapse, origin) {
-      var dup = [];
-      for (var i = 0; i < this.sel.ranges.length; i++)
-        dup[i] = code;
-      this.replaceSelections(dup, collapse, origin || "+input");
-    },
-    replaceSelections: docMethodOp(function(code, collapse, origin) {
-      var changes = [], sel = this.sel;
-      for (var i = 0; i < sel.ranges.length; i++) {
-        var range = sel.ranges[i];
-        changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin};
-      }
-      var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
-      for (var i = changes.length - 1; i >= 0; i--)
-        makeChange(this, changes[i]);
-      if (newSel) setSelectionReplaceHistory(this, newSel);
-      else if (this.cm) ensureCursorVisible(this.cm);
-    }),
-    undo: docMethodOp(function() {makeChangeFromHistory(this, "undo");}),
-    redo: docMethodOp(function() {makeChangeFromHistory(this, "redo");}),
-    undoSelection: docMethodOp(function() {makeChangeFromHistory(this, "undo", true);}),
-    redoSelection: docMethodOp(function() {makeChangeFromHistory(this, "redo", true);}),
-
-    setExtending: function(val) {this.extend = val;},
-    getExtending: function() {return this.extend;},
-
-    historySize: function() {
-      var hist = this.history, done = 0, undone = 0;
-      for (var i = 0; i < hist.done.length; i++) if (!hist.done[i].ranges) ++done;
-      for (var i = 0; i < hist.undone.length; i++) if (!hist.undone[i].ranges) ++undone;
-      return {undo: done, redo: undone};
-    },
-    clearHistory: function() {this.history = new History(this.history.maxGeneration);},
-
-    markClean: function() {
-      this.cleanGeneration = this.changeGeneration(true);
-    },
-    changeGeneration: function(forceSplit) {
-      if (forceSplit)
-        this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null;
-      return this.history.generation;
-    },
-    isClean: function (gen) {
-      return this.history.generation == (gen || this.cleanGeneration);
-    },
-
-    getHistory: function() {
-      return {done: copyHistoryArray(this.history.done),
-              undone: copyHistoryArray(this.history.undone)};
-    },
-    setHistory: function(histData) {
-      var hist = this.history = new History(this.history.maxGeneration);
-      hist.done = copyHistoryArray(histData.done.slice(0), null, true);
-      hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
-    },
-
-    addLineClass: docMethodOp(function(handle, where, cls) {
-      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
-        var prop = where == "text" ? "textClass"
-                 : where == "background" ? "bgClass"
-                 : where == "gutter" ? "gutterClass" : "wrapClass";
-        if (!line[prop]) line[prop] = cls;
-        else if (classTest(cls).test(line[prop])) return false;
-        else line[prop] += " " + cls;
-        return true;
-      });
-    }),
-    removeLineClass: docMethodOp(function(handle, where, cls) {
-      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
-        var prop = where == "text" ? "textClass"
-                 : where == "background" ? "bgClass"
-                 : where == "gutter" ? "gutterClass" : "wrapClass";
-        var cur = line[prop];
-        if (!cur) return false;
-        else if (cls == null) line[prop] = null;
-        else {
-          var found = cur.match(classTest(cls));
-          if (!found) return false;
-          var end = found.index + found[0].length;
-          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
-        }
-        return true;
-      });
-    }),
-
-    addLineWidget: docMethodOp(function(handle, node, options) {
-      return addLineWidget(this, handle, node, options);
-    }),
-    removeLineWidget: function(widget) { widget.clear(); },
-
-    markText: function(from, to, options) {
-      return markText(this, clipPos(this, from), clipPos(this, to), options, "range");
-    },
-    setBookmark: function(pos, options) {
-      var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
-                      insertLeft: options && options.insertLeft,
-                      clearWhenEmpty: false, shared: options && options.shared,
-                      handleMouseEvents: options && options.handleMouseEvents};
-      pos = clipPos(this, pos);
-      return markText(this, pos, pos, realOpts, "bookmark");
-    },
-    findMarksAt: function(pos) {
-      pos = clipPos(this, pos);
-      var markers = [], spans = getLine(this, pos.line).markedSpans;
-      if (spans) for (var i = 0; i < spans.length; ++i) {
-        var span = spans[i];
-        if ((span.from == null || span.from <= pos.ch) &&
-            (span.to == null || span.to >= pos.ch))
-          markers.push(span.marker.parent || span.marker);
-      }
-      return markers;
-    },
-    findMarks: function(from, to, filter) {
-      from = clipPos(this, from); to = clipPos(this, to);
-      var found = [], lineNo = from.line;
-      this.iter(from.line, to.line + 1, function(line) {
-        var spans = line.markedSpans;
-        if (spans) for (var i = 0; i < spans.length; i++) {
-          var span = spans[i];
-          if (!(lineNo == from.line && from.ch > span.to ||
-                span.from == null && lineNo != from.line||
-                lineNo == to.line && span.from > to.ch) &&
-              (!filter || filter(span.marker)))
-            found.push(span.marker.parent || span.marker);
-        }
-        ++lineNo;
-      });
-      return found;
-    },
-    getAllMarks: function() {
-      var markers = [];
-      this.iter(function(line) {
-        var sps = line.markedSpans;
-        if (sps) for (var i = 0; i < sps.length; ++i)
-          if (sps[i].from != null) markers.push(sps[i].marker);
-      });
-      return markers;
-    },
-
-    posFromIndex: function(off) {
-      var ch, lineNo = this.first;
-      this.iter(function(line) {
-        var sz = line.text.length + 1;
-        if (sz > off) { ch = off; return true; }
-        off -= sz;
-        ++lineNo;
-      });
-      return clipPos(this, Pos(lineNo, ch));
-    },
-    indexFromPos: function (coords) {
-      coords = clipPos(this, coords);
-      var index = coords.ch;
-      if (coords.line < this.first || coords.ch < 0) return 0;
-      this.iter(this.first, coords.line, function (line) {
-        index += line.text.length + 1;
-      });
-      return index;
-    },
-
-    copy: function(copyHistory) {
-      var doc = new Doc(getLines(this, this.first, this.first + this.size),
-                        this.modeOption, this.first, this.lineSep);
-      doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
-      doc.sel = this.sel;
-      doc.extend = false;
-      if (copyHistory) {
-        doc.history.undoDepth = this.history.undoDepth;
-        doc.setHistory(this.getHistory());
-      }
-      return doc;
-    },
-
-    linkedDoc: function(options) {
-      if (!options) options = {};
-      var from = this.first, to = this.first + this.size;
-      if (options.from != null && options.from > from) from = options.from;
-      if (options.to != null && options.to < to) to = options.to;
-      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep);
-      if (options.sharedHist) copy.history = this.history;
-      (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
-      copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
-      copySharedMarkers(copy, findSharedMarkers(this));
-      return copy;
-    },
-    unlinkDoc: function(other) {
-      if (other instanceof CodeMirror) other = other.doc;
-      if (this.linked) for (var i = 0; i < this.linked.length; ++i) {
-        var link = this.linked[i];
-        if (link.doc != other) continue;
-        this.linked.splice(i, 1);
-        other.unlinkDoc(this);
-        detachSharedMarkers(findSharedMarkers(this));
-        break;
-      }
-      // If the histories were shared, split them again
-      if (other.history == this.history) {
-        var splitIds = [other.id];
-        linkedDocs(other, function(doc) {splitIds.push(doc.id);}, true);
-        other.history = new History(null);
-        other.history.done = copyHistoryArray(this.history.done, splitIds);
-        other.history.undone = copyHistoryArray(this.history.undone, splitIds);
-      }
-    },
-    iterLinkedDocs: function(f) {linkedDocs(this, f);},
-
-    getMode: function() {return this.mode;},
-    getEditor: function() {return this.cm;},
-
-    splitLines: function(str) {
-      if (this.lineSep) return str.split(this.lineSep);
-      return splitLinesAuto(str);
-    },
-    lineSeparator: function() { return this.lineSep || "\n"; }
-  });
-
-  // Public alias.
-  Doc.prototype.eachLine = Doc.prototype.iter;
-
-  // Set up methods on CodeMirror's prototype to redirect to the editor's document.
-  var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
-  for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
-    CodeMirror.prototype[prop] = (function(method) {
-      return function() {return method.apply(this.doc, arguments);};
-    })(Doc.prototype[prop]);
-
-  eventMixin(Doc);
-
-  // Call f for all linked documents.
-  function linkedDocs(doc, f, sharedHistOnly) {
-    function propagate(doc, skip, sharedHist) {
-      if (doc.linked) for (var i = 0; i < doc.linked.length; ++i) {
-        var rel = doc.linked[i];
-        if (rel.doc == skip) continue;
-        var shared = sharedHist && rel.sharedHist;
-        if (sharedHistOnly && !shared) continue;
-        f(rel.doc, shared);
-        propagate(rel.doc, doc, shared);
-      }
-    }
-    propagate(doc, null, true);
-  }
-
-  // Attach a document to an editor.
-  function attachDoc(cm, doc) {
-    if (doc.cm) throw new Error("This document is already in use.");
-    cm.doc = doc;
-    doc.cm = cm;
-    estimateLineHeights(cm);
-    loadMode(cm);
-    if (!cm.options.lineWrapping) findMaxLine(cm);
-    cm.options.mode = doc.modeOption;
-    regChange(cm);
-  }
-
-  // LINE UTILITIES
-
-  // Find the line object corresponding to the given line number.
-  function getLine(doc, n) {
-    n -= doc.first;
-    if (n < 0 || n >= doc.size) throw new Error("There is no line " + (n + doc.first) + " in the document.");
-    for (var chunk = doc; !chunk.lines;) {
-      for (var i = 0;; ++i) {
-        var child = chunk.children[i], sz = child.chunkSize();
-        if (n < sz) { chunk = child; break; }
-        n -= sz;
-      }
-    }
-    return chunk.lines[n];
-  }
-
-  // Get the part of a document between two positions, as an array of
-  // strings.
-  function getBetween(doc, start, end) {
-    var out = [], n = start.line;
-    doc.iter(start.line, end.line + 1, function(line) {
-      var text = line.text;
-      if (n == end.line) text = text.slice(0, end.ch);
-      if (n == start.line) text = text.slice(start.ch);
-      out.push(text);
-      ++n;
-    });
-    return out;
-  }
-  // Get the lines between from and to, as array of strings.
-  function getLines(doc, from, to) {
-    var out = [];
-    doc.iter(from, to, function(line) { out.push(line.text); });
-    return out;
-  }
-
-  // Update the height of a line, propagating the height change
-  // upwards to parent nodes.
-  function updateLineHeight(line, height) {
-    var diff = height - line.height;
-    if (diff) for (var n = line; n; n = n.parent) n.height += diff;
-  }
-
-  // Given a line object, find its line number by walking up through
-  // its parent links.
-  function lineNo(line) {
-    if (line.parent == null) return null;
-    var cur = line.parent, no = indexOf(cur.lines, line);
-    for (var chunk = cur.parent; chunk; cur = chunk, chunk = chunk.parent) {
-      for (var i = 0;; ++i) {
-        if (chunk.children[i] == cur) break;
-        no += chunk.children[i].chunkSize();
-      }
-    }
-    return no + cur.first;
-  }
-
-  // Find the line at the given vertical position, using the height
-  // information in the document tree.
-  function lineAtHeight(chunk, h) {
-    var n = chunk.first;
-    outer: do {
-      for (var i = 0; i < chunk.children.length; ++i) {
-        var child = chunk.children[i], ch = child.height;
-        if (h < ch) { chunk = child; continue outer; }
-        h -= ch;
-        n += child.chunkSize();
-      }
-      return n;
-    } while (!chunk.lines);
-    for (var i = 0; i < chunk.lines.length; ++i) {
-      var line = chunk.lines[i], lh = line.height;
-      if (h < lh) break;
-      h -= lh;
-    }
-    return n + i;
-  }
-
-
-  // Find the height above the given line.
-  function heightAtLine(lineObj) {
-    lineObj = visualLine(lineObj);
-
-    var h = 0, chunk = lineObj.parent;
-    for (var i = 0; i < chunk.lines.length; ++i) {
-      var line = chunk.lines[i];
-      if (line == lineObj) break;
-      else h += line.height;
-    }
-    for (var p = chunk.parent; p; chunk = p, p = chunk.parent) {
-      for (var i = 0; i < p.children.length; ++i) {
-        var cur = p.children[i];
-        if (cur == chunk) break;
-        else h += cur.height;
-      }
-    }
-    return h;
-  }
-
-  // Get the bidi ordering for the given line (and cache it). Returns
-  // false for lines that are fully left-to-right, and an array of
-  // BidiSpan objects otherwise.
-  function getOrder(line) {
-    var order = line.order;
-    if (order == null) order = line.order = bidiOrdering(line.text);
-    return order;
-  }
-
-  // HISTORY
-
-  function History(startGen) {
-    // Arrays of change events and selections. Doing something adds an
-    // event to done and clears undo. Undoing moves events from done
-    // to undone, redoing moves them in the other direction.
-    this.done = []; this.undone = [];
-    this.undoDepth = Infinity;
-    // Used to track when changes can be merged into a single undo
-    // event
-    this.lastModTime = this.lastSelTime = 0;
-    this.lastOp = this.lastSelOp = null;
-    this.lastOrigin = this.lastSelOrigin = null;
-    // Used by the isClean() method
-    this.generation = this.maxGeneration = startGen || 1;
-  }
-
-  // Create a history change event from an updateDoc-style change
-  // object.
-  function historyChangeFromChange(doc, change) {
-    var histChange = {from: copyPos(change.from), to: changeEnd(change), text: getBetween(doc, change.from, change.to)};
-    attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);
-    linkedDocs(doc, function(doc) {attachLocalSpans(doc, histChange, change.from.line, change.to.line + 1);}, true);
-    return histChange;
-  }
-
-  // Pop all selection events off the end of a history array. Stop at
-  // a change event.
-  function clearSelectionEvents(array) {
-    while (array.length) {
-      var last = lst(array);
-      if (last.ranges) array.pop();
-      else break;
-    }
-  }
-
-  // Find the top change event in the history. Pop off selection
-  // events that are in the way.
-  function lastChangeEvent(hist, force) {
-    if (force) {
-      clearSelectionEvents(hist.done);
-      return lst(hist.done);
-    } else if (hist.done.length && !lst(hist.done).ranges) {
-      return lst(hist.done);
-    } else if (hist.done.length > 1 && !hist.done[hist.done.length - 2].ranges) {
-      hist.done.pop();
-      return lst(hist.done);
-    }
-  }
-
-  // Register a change in the history. Merges changes that are within
-  // a single operation, ore are close together with an origin that
-  // allows merging (starting with "+") into a single event.
-  function addChangeToHistory(doc, change, selAfter, opId) {
-    var hist = doc.history;
-    hist.undone.length = 0;
-    var time = +new Date, cur;
-
-    if ((hist.lastOp == opId ||
-         hist.lastOrigin == change.origin && change.origin &&
-         ((change.origin.charAt(0) == "+" && doc.cm && hist.lastModTime > time - doc.cm.options.historyEventDelay) ||
-          change.origin.charAt(0) == "*")) &&
-        (cur = lastChangeEvent(hist, hist.lastOp == opId))) {
-      // Merge this change into the last event
-      var last = lst(cur.changes);
-      if (cmp(change.from, change.to) == 0 && cmp(change.from, last.to) == 0) {
-        // Optimized case for simple insertion -- don't want to add
-        // new changesets for every character typed
-        last.to = changeEnd(change);
-      } else {
-        // Add new sub-event
-        cur.changes.push(historyChangeFromChange(doc, change));
-      }
-    } else {
-      // Can not be merged, start a new event.
-      var before = lst(hist.done);
-      if (!before || !before.ranges)
-        pushSelectionToHistory(doc.sel, hist.done);
-      cur = {changes: [historyChangeFromChange(doc, change)],
-             generation: hist.generation};
-      hist.done.push(cur);
-      while (hist.done.length > hist.undoDepth) {
-        hist.done.shift();
-        if (!hist.done[0].ranges) hist.done.shift();
-      }
-    }
-    hist.done.push(selAfter);
-    hist.generation = ++hist.maxGeneration;
-    hist.lastModTime = hist.lastSelTime = time;
-    hist.lastOp = hist.lastSelOp = opId;
-    hist.lastOrigin = hist.lastSelOrigin = change.origin;
-
-    if (!last) signal(doc, "historyAdded");
-  }
-
-  function selectionEventCanBeMerged(doc, origin, prev, sel) {
-    var ch = origin.charAt(0);
-    return ch == "*" ||
-      ch == "+" &&
-      prev.ranges.length == sel.ranges.length &&
-      prev.somethingSelected() == sel.somethingSelected() &&
-      new Date - doc.history.lastSelTime <= (doc.cm ? doc.cm.options.historyEventDelay : 500);
-  }
-
-  // Called whenever the selection changes, sets the new selection as
-  // the pending selection in the history, and pushes the old pending
-  // selection into the 'done' array when it was significantly
-  // different (in number of selected ranges, emptiness, or time).
-  function addSelectionToHistory(doc, sel, opId, options) {
-    var hist = doc.history, origin = options && options.origin;
-
-    // A new event is started when the previous origin does not match
-    // the current, or the origins don't allow matching. Origins
-    // starting with * are always merged, those starting with + are
-    // merged when similar and close together in time.
-    if (opId == hist.lastSelOp ||
-        (origin && hist.lastSelOrigin == origin &&
-         (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
-          selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
-      hist.done[hist.done.length - 1] = sel;
-    else
-      pushSelectionToHistory(sel, hist.done);
-
-    hist.lastSelTime = +new Date;
-    hist.lastSelOrigin = origin;
-    hist.lastSelOp = opId;
-    if (options && options.clearRedo !== false)
-      clearSelectionEvents(hist.undone);
-  }
-
-  function pushSelectionToHistory(sel, dest) {
-    var top = lst(dest);
-    if (!(top && top.ranges && top.equals(sel)))
-      dest.push(sel);
-  }
-
-  // Used to store marked span information in the history.
-  function attachLocalSpans(doc, change, from, to) {
-    var existing = change["spans_" + doc.id], n = 0;
-    doc.iter(Math.max(doc.first, from), Math.min(doc.first + doc.size, to), function(line) {
-      if (line.markedSpans)
-        (existing || (existing = change["spans_" + doc.id] = {}))[n] = line.markedSpans;
-      ++n;
-    });
-  }
-
-  // When un/re-doing restores text containing marked spans, those
-  // that have been explicitly cleared should not be restored.
-  function removeClearedSpans(spans) {
-    if (!spans) return null;
-    for (var i = 0, out; i < spans.length; ++i) {
-      if (spans[i].marker.explicitlyCleared) { if (!out) out = spans.slice(0, i); }
-      else if (out) out.push(spans[i]);
-    }
-    return !out ? spans : out.length ? out : null;
-  }
-
-  // Retrieve and filter the old marked spans stored in a change event.
-  function getOldSpans(doc, change) {
-    var found = change["spans_" + doc.id];
-    if (!found) return null;
-    for (var i = 0, nw = []; i < change.text.length; ++i)
-      nw.push(removeClearedSpans(found[i]));
-    return nw;
-  }
-
-  // Used both to provide a JSON-safe object in .getHistory, and, when
-  // detaching a document, to split the history in two
-  function copyHistoryArray(events, newGroup, instantiateSel) {
-    for (var i = 0, copy = []; i < events.length; ++i) {
-      var event = events[i];
-      if (event.ranges) {
-        copy.push(instantiateSel ? Selection.prototype.deepCopy.call(event) : event);
-        continue;
-      }
-      var changes = event.changes, newChanges = [];
-      copy.push({changes: newChanges});
-      for (var j = 0; j < changes.length; ++j) {
-        var change = changes[j], m;
-        newChanges.push({from: change.from, to: change.to, text: change.text});
-        if (newGroup) for (var prop in change) if (m = prop.match(/^spans_(\d+)$/)) {
-          if (indexOf(newGroup, Number(m[1])) > -1) {
-            lst(newChanges)[prop] = change[prop];
-            delete change[prop];
-          }
-        }
-      }
-    }
-    return copy;
-  }
-
-  // Rebasing/resetting history to deal with externally-sourced changes
-
-  function rebaseHistSelSingle(pos, from, to, diff) {
-    if (to < pos.line) {
-      pos.line += diff;
-    } else if (from < pos.line) {
-      pos.line = from;
-      pos.ch = 0;
-    }
-  }
-
-  // Tries to rebase an array of history events given a change in the
-  // document. If the change touches the same lines as the event, the
-  // event, and everything 'behind' it, is discarded. If the change is
-  // before the event, the event's positions are updated. Uses a
-  // copy-on-write scheme for the positions, to avoid having to
-  // reallocate them all on every rebase, but also avoid problems with
-  // shared position objects being unsafely updated.
-  function rebaseHistArray(array, from, to, diff) {
-    for (var i = 0; i < array.length; ++i) {
-      var sub = array[i], ok = true;
-      if (sub.ranges) {
-        if (!sub.copied) { sub = array[i] = sub.deepCopy(); sub.copied = true; }
-        for (var j = 0; j < sub.ranges.length; j++) {
-          rebaseHistSelSingle(sub.ranges[j].anchor, from, to, diff);
-          rebaseHistSelSingle(sub.ranges[j].head, from, to, diff);
-        }
-        continue;
-      }
-      for (var j = 0; j < sub.changes.length; ++j) {
-        var cur = sub.changes[j];
-        if (to < cur.from.line) {
-          cur.from = Pos(cur.from.line + diff, cur.from.ch);
-          cur.to = Pos(cur.to.line + diff, cur.to.ch);
-        } else if (from <= cur.to.line) {
-          ok = false;
-          break;
-        }
-      }
-      if (!ok) {
-        array.splice(0, i + 1);
-        i = 0;
-      }
-    }
-  }
-
-  function rebaseHist(hist, change) {
-    var from = change.from.line, to = change.to.line, diff = change.text.length - (to - from) - 1;
-    rebaseHistArray(hist.done, from, to, diff);
-    rebaseHistArray(hist.undone, from, to, diff);
-  }
-
-  // EVENT UTILITIES
-
-  // Due to the fact that we still support jurassic IE versions, some
-  // compatibility wrappers are needed.
-
-  var e_preventDefault = CodeMirror.e_preventDefault = function(e) {
-    if (e.preventDefault) e.preventDefault();
-    else e.returnValue = false;
-  };
-  var e_stopPropagation = CodeMirror.e_stopPropagation = function(e) {
-    if (e.stopPropagation) e.stopPropagation();
-    else e.cancelBubble = true;
-  };
-  function e_defaultPrevented(e) {
-    return e.defaultPrevented != null ? e.defaultPrevented : e.returnValue == false;
-  }
-  var e_stop = CodeMirror.e_stop = function(e) {e_preventDefault(e); e_stopPropagation(e);};
-
-  function e_target(e) {return e.target || e.srcElement;}
-  function e_button(e) {
-    var b = e.which;
-    if (b == null) {
-      if (e.button & 1) b = 1;
-      else if (e.button & 2) b = 3;
-      else if (e.button & 4) b = 2;
-    }
-    if (mac && e.ctrlKey && b == 1) b = 3;
-    return b;
-  }
-
-  // EVENT HANDLING
-
-  // Lightweight event framework. on/off also work on DOM nodes,
-  // registering native DOM handlers.
-
-  var on = CodeMirror.on = function(emitter, type, f) {
-    if (emitter.addEventListener)
-      emitter.addEventListener(type, f, false);
-    else if (emitter.attachEvent)
-      emitter.attachEvent("on" + type, f);
-    else {
-      var map = emitter._handlers || (emitter._handlers = {});
-      var arr = map[type] || (map[type] = []);
-      arr.push(f);
-    }
-  };
-
-  var off = CodeMirror.off = function(emitter, type, f) {
-    if (emitter.removeEventListener)
-      emitter.removeEventListener(type, f, false);
-    else if (emitter.detachEvent)
-      emitter.detachEvent("on" + type, f);
-    else {
-      var arr = emitter._handlers && emitter._handlers[type];
-      if (!arr) return;
-      for (var i = 0; i < arr.length; ++i)
-        if (arr[i] == f) { arr.splice(i, 1); break; }
-    }
-  };
-
-  var signal = CodeMirror.signal = function(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
-    var args = Array.prototype.slice.call(arguments, 2);
-    for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args);
-  };
-
-  var orphanDelayedCallbacks = null;
-
-  // Often, we want to signal events at a point where we are in the
-  // middle of some work, but don't want the handler to start calling
-  // other methods on the editor, which might be in an inconsistent
-  // state or simply not expect any other events to happen.
-  // signalLater looks whether there are any handlers, and schedules
-  // them to be executed when the last operation ends, or, if no
-  // operation is active, when a timeout fires.
-  function signalLater(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
-    var args = Array.prototype.slice.call(arguments, 2), list;
-    if (operationGroup) {
-      list = operationGroup.delayedCallbacks;
-    } else if (orphanDelayedCallbacks) {
-      list = orphanDelayedCallbacks;
-    } else {
-      list = orphanDelayedCallbacks = [];
-      setTimeout(fireOrphanDelayed, 0);
-    }
-    function bnd(f) {return function(){f.apply(null, args);};};
-    for (var i = 0; i < arr.length; ++i)
-      list.push(bnd(arr[i]));
-  }
-
-  function fireOrphanDelayed() {
-    var delayed = orphanDelayedCallbacks;
-    orphanDelayedCallbacks = null;
-    for (var i = 0; i < delayed.length; ++i) delayed[i]();
-  }
-
-  // The DOM events that CodeMirror handles can be overridden by
-  // registering a (non-DOM) handler on the editor for the event name,
-  // and preventDefault-ing the event in that handler.
-  function signalDOMEvent(cm, e, override) {
-    if (typeof e == "string")
-      e = {type: e, preventDefault: function() { this.defaultPrevented = true; }};
-    signal(cm, override || e.type, cm, e);
-    return e_defaultPrevented(e) || e.codemirrorIgnore;
-  }
-
-  function signalCursorActivity(cm) {
-    var arr = cm._handlers && cm._handlers.cursorActivity;
-    if (!arr) return;
-    var set = cm.curOp.cursorActivityHandlers || (cm.curOp.cursorActivityHandlers = []);
-    for (var i = 0; i < arr.length; ++i) if (indexOf(set, arr[i]) == -1)
-      set.push(arr[i]);
-  }
-
-  function hasHandler(emitter, type) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    return arr && arr.length > 0;
-  }
-
-  // Add on and off methods to a constructor's prototype, to make
-  // registering events on such objects more convenient.
-  function eventMixin(ctor) {
-    ctor.prototype.on = function(type, f) {on(this, type, f);};
-    ctor.prototype.off = function(type, f) {off(this, type, f);};
-  }
-
-  // MISC UTILITIES
-
-  // Number of pixels added to scroller and sizer to hide scrollbar
-  var scrollerGap = 30;
-
-  // Returned or thrown by various protocols to signal 'I'm not
-  // handling this'.
-  var Pass = CodeMirror.Pass = {toString: function(){return "CodeMirror.Pass";}};
-
-  // Reused option objects for setSelection & friends
-  var sel_dontScroll = {scroll: false}, sel_mouse = {origin: "*mouse"}, sel_move = {origin: "+move"};
-
-  function Delayed() {this.id = null;}
-  Delayed.prototype.set = function(ms, f) {
-    clearTimeout(this.id);
-    this.id = setTimeout(f, ms);
-  };
-
-  // Counts the column offset in a string, taking tabs into account.
-  // Used mostly to find indentation.
-  var countColumn = CodeMirror.countColumn = function(string, end, tabSize, startIndex, startValue) {
-    if (end == null) {
-      end = string.search(/[^\s\u00a0]/);
-      if (end == -1) end = string.length;
-    }
-    for (var i = startIndex || 0, n = startValue || 0;;) {
-      var nextTab = string.indexOf("\t", i);
-      if (nextTab < 0 || nextTab >= end)
-        return n + (end - i);
-      n += nextTab - i;
-      n += tabSize - (n % tabSize);
-      i = nextTab + 1;
-    }
-  };
-
-  // The inverse of countColumn -- find the offset that corresponds to
-  // a particular column.
-  var findColumn = CodeMirror.findColumn = function(string, goal, tabSize) {
-    for (var pos = 0, col = 0;;) {
-      var nextTab = string.indexOf("\t", pos);
-      if (nextTab == -1) nextTab = string.length;
-      var skipped = nextTab - pos;
-      if (nextTab == string.length || col + skipped >= goal)
-        return pos + Math.min(skipped, goal - col);
-      col += nextTab - pos;
-      col += tabSize - (col % tabSize);
-      pos = nextTab + 1;
-      if (col >= goal) return pos;
-    }
-  }
-
-  var spaceStrs = [""];
-  function spaceStr(n) {
-    while (spaceStrs.length <= n)
-      spaceStrs.push(lst(spaceStrs) + " ");
-    return spaceStrs[n];
-  }
-
-  function lst(arr) { return arr[arr.length-1]; }
-
-  var selectInput = function(node) { node.select(); };
-  if (ios) // Mobile Safari apparently has a bug where select() is broken.
-    selectInput = function(node) { node.selectionStart = 0; node.selectionEnd = node.value.length; };
-  else if (ie) // Suppress mysterious IE10 errors
-    selectInput = function(node) { try { node.select(); } catch(_e) {} };
-
-  function indexOf(array, elt) {
-    for (var i = 0; i < array.length; ++i)
-      if (array[i] == elt) return i;
-    return -1;
-  }
-  function map(array, f) {
-    var out = [];
-    for (var i = 0; i < array.length; i++) out[i] = f(array[i], i);
-    return out;
-  }
-
-  function nothing() {}
-
-  function createObj(base, props) {
-    var inst;
-    if (Object.create) {
-      inst = Object.create(base);
-    } else {
-      nothing.prototype = base;
-      inst = new nothing();
-    }
-    if (props) copyObj(props, inst);
-    return inst;
-  };
-
-  function copyObj(obj, target, overwrite) {
-    if (!target) target = {};
-    for (var prop in obj)
-      if (obj.hasOwnProperty(prop) && (overwrite !== false || !target.hasOwnProperty(prop)))
-        target[prop] = obj[prop];
-    return target;
-  }
-
-  function bind(f) {
-    var args = Array.prototype.slice.call(arguments, 1);
-    return function(){return f.apply(null, args);};
-  }
-
-  var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
-  var isWordCharBasic = CodeMirror.isWordChar = function(ch) {
-    return /\w/.test(ch) || ch > "\x80" &&
-      (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));
-  };
-  function isWordChar(ch, helper) {
-    if (!helper) return isWordCharBasic(ch);
-    if (helper.source.indexOf("\\w") > -1 && isWordCharBasic(ch)) return true;
-    return helper.test(ch);
-  }
-
-  function isEmpty(obj) {
-    for (var n in obj) if (obj.hasOwnProperty(n) && obj[n]) return false;
-    return true;
-  }
-
-  // Extending unicode characters. A series of a non-extending char +
-  // any number of extending chars is treated as a single unit as far
-  // as editing and measuring is concerned. This is not fully correct,
-  // since some scripts/fonts/browsers also treat other configurations
-  // of code points as a group.
-  var extendingChars = /[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065e\u0670\u06d6-\u06dc\u06de-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0900-\u0902\u093c\u0941-\u0948\u094d\u0951-\u0955\u0962\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2\u09e3\u0a01\u0a02\u0a3c\u0a41\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81\u0a82\u0abc\u0ac1-\u0ac5\u0ac7\u0ac8\u0acd\u0ae2\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86\u0f87\u0f90-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039\u103a\u103d\u103e\u1058\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085\u1086\u108d\u109d\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927\u1928\u1932\u1939-\u193b\u1a17\u1a18\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80\u1b81\u1ba2-\u1ba5\u1ba8\u1ba9\u1c2c-\u1c33\u1c36\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1dc0-\u1de6\u1dfd-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua825\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\uaa29-\uaa2e\uaa31\uaa32\uaa35\uaa36\uaa43\uaa4c\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe5\uabe8\uabed\udc00-\udfff\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]/;
-  function isExtendingChar(ch) { return ch.charCodeAt(0) >= 768 && extendingChars.test(ch); }
-
-  // DOM UTILITIES
-
-  function elt(tag, content, className, style) {
-    var e = document.createElement(tag);
-    if (className) e.className = className;
-    if (style) e.style.cssText = style;
-    if (typeof content == "string") e.appendChild(document.createTextNode(content));
-    else if (content) for (var i = 0; i < content.length; ++i) e.appendChild(content[i]);
-    return e;
-  }
-
-  var range;
-  if (document.createRange) range = function(node, start, end, endNode) {
-    var r = document.createRange();
-    r.setEnd(endNode || node, end);
-    r.setStart(node, start);
-    return r;
-  };
-  else range = function(node, start, end) {
-    var r = document.body.createTextRange();
-    try { r.moveToElementText(node.parentNode); }
-    catch(e) { return r; }
-    r.collapse(true);
-    r.moveEnd("character", end);
-    r.moveStart("character", start);
-    return r;
-  };
-
-  function removeChildren(e) {
-    for (var count = e.childNodes.length; count > 0; --count)
-      e.removeChild(e.firstChild);
-    return e;
-  }
-
-  function removeChildrenAndAdd(parent, e) {
-    return removeChildren(parent).appendChild(e);
-  }
-
-  var contains = CodeMirror.contains = function(parent, child) {
-    if (child.nodeType == 3) // Android browser always returns false when child is a textnode
-      child = child.parentNode;
-    if (parent.contains)
-      return parent.contains(child);
-    do {
-      if (child.nodeType == 11) child = child.host;
-      if (child == parent) return true;
-    } while (child = child.parentNode);
-  };
-
-  function activeElt() {
-    var activeElement = document.activeElement;
-    while (activeElement && activeElement.root && activeElement.root.activeElement)
-      activeElement = activeElement.root.activeElement;
-    return activeElement;
-  }
-  // Older versions of IE throws unspecified error when touching
-  // document.activeElement in some cases (during loading, in iframe)
-  if (ie && ie_version < 11) activeElt = function() {
-    try { return document.activeElement; }
-    catch(e) { return document.body; }
-  };
-
-  function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); }
-  var rmClass = CodeMirror.rmClass = function(node, cls) {
-    var current = node.className;
-    var match = classTest(cls).exec(current);
-    if (match) {
-      var after = current.slice(match.index + match[0].length);
-      node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
-    }
-  };
-  var addClass = CodeMirror.addClass = function(node, cls) {
-    var current = node.className;
-    if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls;
-  };
-  function joinClasses(a, b) {
-    var as = a.split(" ");
-    for (var i = 0; i < as.length; i++)
-      if (as[i] && !classTest(as[i]).test(b)) b += " " + as[i];
-    return b;
-  }
-
-  // WINDOW-WIDE EVENTS
-
-  // These must be handled carefully, because naively registering a
-  // handler for each editor will cause the editors to never be
-  // garbage collected.
-
-  function forEachCodeMirror(f) {
-    if (!document.body.getElementsByClassName) return;
-    var byClass = document.body.getElementsByClassName("CodeMirror");
-    for (var i = 0; i < byClass.length; i++) {
-      var cm = byClass[i].CodeMirror;
-      if (cm) f(cm);
-    }
-  }
-
-  var globalsRegistered = false;
-  function ensureGlobalHandlers() {
-    if (globalsRegistered) return;
-    registerGlobalHandlers();
-    globalsRegistered = true;
-  }
-  function registerGlobalHandlers() {
-    // When the window resizes, we need to refresh active editors.
-    var resizeTimer;
-    on(window, "resize", function() {
-      if (resizeTimer == null) resizeTimer = setTimeout(function() {
-        resizeTimer = null;
-        forEachCodeMirror(onResize);
-      }, 100);
-    });
-    // When the window loses focus, we want to show the editor as blurred
-    on(window, "blur", function() {
-      forEachCodeMirror(onBlur);
-    });
-  }
-
-  // FEATURE DETECTION
-
-  // Detect drag-and-drop
-  var dragAndDrop = function() {
-    // There is *some* kind of drag-and-drop support in IE6-8, but I
-    // couldn't get it to work yet.
-    if (ie && ie_version < 9) return false;
-    var div = elt('div');
-    return "draggable" in div || "dragDrop" in div;
-  }();
-
-  var zwspSupported;
-  function zeroWidthElement(measure) {
-    if (zwspSupported == null) {
-      var test = elt("span", "\u200b");
-      removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
-      if (measure.firstChild.offsetHeight != 0)
-        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8);
-    }
-    var node = zwspSupported ? elt("span", "\u200b") :
-      elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
-    node.setAttribute("cm-text", "");
-    return node;
-  }
-
-  // Feature-detect IE's crummy client rect reporting for bidi text
-  var badBidiRects;
-  function hasBadBidiRects(measure) {
-    if (badBidiRects != null) return badBidiRects;
-    var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
-    var r0 = range(txt, 0, 1).getBoundingClientRect();
-    if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
-    var r1 = range(txt, 1, 2).getBoundingClientRect();
-    return badBidiRects = (r1.right - r0.right < 3);
-  }
-
-  // See if "".split is the broken IE version, if so, provide an
-  // alternative way to split lines.
-  var splitLinesAuto = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
-    var pos = 0, result = [], l = string.length;
-    while (pos <= l) {
-      var nl = string.indexOf("\n", pos);
-      if (nl == -1) nl = string.length;
-      var line = string.slice(pos, string.charAt(nl - 1) == "\r" ? nl - 1 : nl);
-      var rt = line.indexOf("\r");
-      if (rt != -1) {
-        result.push(line.slice(0, rt));
-        pos += rt + 1;
-      } else {
-        result.push(line);
-        pos = nl + 1;
-      }
-    }
-    return result;
-  } : function(string){return string.split(/\r\n?|\n/);};
-
-  var hasSelection = window.getSelection ? function(te) {
-    try { return te.selectionStart != te.selectionEnd; }
-    catch(e) { return false; }
-  } : function(te) {
-    try {var range = te.ownerDocument.selection.createRange();}
-    catch(e) {}
-    if (!range || range.parentElement() != te) return false;
-    return range.compareEndPoints("StartToEnd", range) != 0;
-  };
-
-  var hasCopyEvent = (function() {
-    var e = elt("div");
-    if ("oncopy" in e) return true;
-    e.setAttribute("oncopy", "return;");
-    return typeof e.oncopy == "function";
-  })();
-
-  var badZoomedRects = null;
-  function hasBadZoomedRects(measure) {
-    if (badZoomedRects != null) return badZoomedRects;
-    var node = removeChildrenAndAdd(measure, elt("span", "x"));
-    var normal = node.getBoundingClientRect();
-    var fromRange = range(node, 0, 1).getBoundingClientRect();
-    return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1;
-  }
-
-  // KEY NAMES
-
-  var keyNames = CodeMirror.keyNames = {
-    3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
-    19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
-    36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
-    46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
-    106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
-    173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
-    221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
-    63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
-  };
-  (function() {
-    // Number keys
-    for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i);
-    // Alphabetic keys
-    for (var i = 65; i <= 90; i++) keyNames[i] = String.fromCharCode(i);
-    // Function keys
-    for (var i = 1; i <= 12; i++) keyNames[i + 111] = keyNames[i + 63235] = "F" + i;
-  })();
-
-  // BIDI HELPERS
-
-  function iterateBidiSections(order, from, to, f) {
-    if (!order) return f(from, to, "ltr");
-    var found = false;
-    for (var i = 0; i < order.length; ++i) {
-      var part = order[i];
-      if (part.from < to && part.to > from || from == to && part.to == from) {
-        f(Math.max(part.from, from), Math.min(part.to, to), part.level == 1 ? "rtl" : "ltr");
-        found = true;
-      }
-    }
-    if (!found) f(from, to, "ltr");
-  }
-
-  function bidiLeft(part) { return part.level % 2 ? part.to : part.from; }
-  function bidiRight(part) { return part.level % 2 ? part.from : part.to; }
-
-  function lineLeft(line) { var order = getOrder(line); return order ? bidiLeft(order[0]) : 0; }
-  function lineRight(line) {
-    var order = getOrder(line);
-    if (!order) return line.text.length;
-    return bidiRight(lst(order));
-  }
-
-  function lineStart(cm, lineN) {
-    var line = getLine(cm.doc, lineN);
-    var visual = visualLine(line);
-    if (visual != line) lineN = lineNo(visual);
-    var order = getOrder(visual);
-    var ch = !order ? 0 : order[0].level % 2 ? lineRight(visual) : lineLeft(visual);
-    return Pos(lineN, ch);
-  }
-  function lineEnd(cm, lineN) {
-    var merged, line = getLine(cm.doc, lineN);
-    while (merged = collapsedSpanAtEnd(line)) {
-      line = merged.find(1, true).line;
-      lineN = null;
-    }
-    var order = getOrder(line);
-    var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line);
-    return Pos(lineN == null ? lineNo(line) : lineN, ch);
-  }
-  function lineStartSmart(cm, pos) {
-    var start = lineStart(cm, pos.line);
-    var line = getLine(cm.doc, start.line);
-    var order = getOrder(line);
-    if (!order || order[0].level == 0) {
-      var firstNonWS = Math.max(0, line.text.search(/\S/));
-      var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
-      return Pos(start.line, inWS ? 0 : firstNonWS);
-    }
-    return start;
-  }
-
-  function compareBidiLevel(order, a, b) {
-    var linedir = order[0].level;
-    if (a == linedir) return true;
-    if (b == linedir) return false;
-    return a < b;
-  }
-  var bidiOther;
-  function getBidiPartAt(order, pos) {
-    bidiOther = null;
-    for (var i = 0, found; i < order.length; ++i) {
-      var cur = order[i];
-      if (cur.from < pos && cur.to > pos) return i;
-      if ((cur.from == pos || cur.to == pos)) {
-        if (found == null) {
-          found = i;
-        } else if (compareBidiLevel(order, cur.level, order[found].level)) {
-          if (cur.from != cur.to) bidiOther = found;
-          return i;
-        } else {
-          if (cur.from != cur.to) bidiOther = i;
-          return found;
-        }
-      }
-    }
-    return found;
-  }
-
-  function moveInLine(line, pos, dir, byUnit) {
-    if (!byUnit) return pos + dir;
-    do pos += dir;
-    while (pos > 0 && isExtendingChar(line.text.charAt(pos)));
-    return pos;
-  }
-
-  // This is needed in order to move 'visually' through bi-directional
-  // text -- i.e., pressing left should make the cursor go left, even
-  // when in RTL text. The tricky part is the 'jumps', where RTL and
-  // LTR text touch each other. This often requires the cursor offset
-  // to move more than one unit, in order to visually move one unit.
-  function moveVisually(line, start, dir, byUnit) {
-    var bidi = getOrder(line);
-    if (!bidi) return moveLogically(line, start, dir, byUnit);
-    var pos = getBidiPartAt(bidi, start), part = bidi[pos];
-    var target = moveInLine(line, start, part.level % 2 ? -dir : dir, byUnit);
-
-    for (;;) {
-      if (target > part.from && target < part.to) return target;
-      if (target == part.from || target == part.to) {
-        if (getBidiPartAt(bidi, target) == pos) return target;
-        part = bidi[pos += dir];
-        return (dir > 0) == part.level % 2 ? part.to : part.from;
-      } else {
-        part = bidi[pos += dir];
-        if (!part) return null;
-        if ((dir > 0) == part.level % 2)
-          target = moveInLine(line, part.to, -1, byUnit);
-        else
-          target = moveInLine(line, part.from, 1, byUnit);
-      }
-    }
-  }
-
-  function moveLogically(line, start, dir, byUnit) {
-    var target = start + dir;
-    if (byUnit) while (target > 0 && isExtendingChar(line.text.charAt(target))) target += dir;
-    return target < 0 || target > line.text.length ? null : target;
-  }
-
-  // Bidirectional ordering algorithm
-  // See http://unicode.org/reports/tr9/tr9-13.html for the algorithm
-  // that this (partially) implements.
-
-  // One-char codes used for character types:
-  // L (L):   Left-to-Right
-  // R (R):   Right-to-Left
-  // r (AL):  Right-to-Left Arabic
-  // 1 (EN):  European Number
-  // + (ES):  European Number Separator
-  // % (ET):  European Number Terminator
-  // n (AN):  Arabic Number
-  // , (CS):  Common Number Separator
-  // m (NSM): Non-Spacing Mark
-  // b (BN):  Boundary Neutral
-  // s (B):   Paragraph Separator
-  // t (S):   Segment Separator
-  // w (WS):  Whitespace
-  // N (ON):  Other Neutrals
-
-  // Returns null if characters are ordered as they appear
-  // (left-to-right), or an array of sections ({from, to, level}
-  // objects) in the order in which they occur visually.
-  var bidiOrdering = (function() {
-    // Character types for codepoints 0 to 0xff
-    var lowTypes = "bbbbbbbbbtstwsbbbbbbbbbbbbbbssstwNN%%%NNNNNN,N,N1111111111NNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNNNLLLLLLLLLLLLLLLLLLLLLLLLLLNNNNbbbbbbsbbbbbbbbbbbbbbbbbbbbbbbbbb,N%%%%NNNNLNNNNN%%11NLNNN1LNNNNNLLLLLLLLLLLLLLLLLLLLLLLNLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLN";
-    // Character types for codepoints 0x600 to 0x6ff
-    var arabicTypes = "rrrrrrrrrrrr,rNNmmmmmmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmrrrrrrrnnnnnnnnnn%nnrrrmrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrmmmmmmmmmmmmmmmmmmmNmmmm";
-    function charType(code) {
-      if (code <= 0xf7) return lowTypes.charAt(code);
-      else if (0x590 <= code && code <= 0x5f4) return "R";
-      else if (0x600 <= code && code <= 0x6ed) return arabicTypes.charAt(code - 0x600);
-      else if (0x6ee <= code && code <= 0x8ac) return "r";
-      else if (0x2000 <= code && code <= 0x200b) return "w";
-      else if (code == 0x200c) return "b";
-      else return "L";
-    }
-
-    var bidiRE = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac]/;
-    var isNeutral = /[stwN]/, isStrong = /[LRr]/, countsAsLeft = /[Lb1n]/, countsAsNum = /[1n]/;
-    // Browsers seem to always treat the boundaries of block elements as being L.
-    var outerType = "L";
-
-    function BidiSpan(level, from, to) {
-      this.level = level;
-      this.from = from; this.to = to;
-    }
-
-    return function(str) {
-      if (!bidiRE.test(str)) return false;
-      var len = str.length, types = [];
-      for (var i = 0, type; i < len; ++i)
-        types.push(type = charType(str.charCodeAt(i)));
-
-      // W1. Examine each non-spacing mark (NSM) in the level run, and
-      // change the type of the NSM to the type of the previous
-      // character. If the NSM is at the start of the level run, it will
-      // get the type of sor.
-      for (var i = 0, prev = outerType; i < len; ++i) {
-        var type = types[i];
-        if (type == "m") types[i] = prev;
-        else prev = type;
-      }
-
-      // W2. Search backwards from each instance of a European number
-      // until the first strong type (R, L, AL, or sor) is found. If an
-      // AL is found, change the type of the European number to Arabic
-      // number.
-      // W3. Change all ALs to R.
-      for (var i = 0, cur = outerType; i < len; ++i) {
-        var type = types[i];
-        if (type == "1" && cur == "r") types[i] = "n";
-        else if (isStrong.test(type)) { cur = type; if (type == "r") types[i] = "R"; }
-      }
-
-      // W4. A single European separator between two European numbers
-      // changes to a European number. A single common separator between
-      // two numbers of the same type changes to that type.
-      for (var i = 1, prev = types[0]; i < len - 1; ++i) {
-        var type = types[i];
-        if (type == "+" && prev == "1" && types[i+1] == "1") types[i] = "1";
-        else if (type == "," && prev == types[i+1] &&
-                 (prev == "1" || prev == "n")) types[i] = prev;
-        prev = type;
-      }
-
-      // W5. A sequence of European terminators adjacent to European
-      // numbers changes to all European numbers.
-      // W6. Otherwise, separators and terminators change to Other
-      // Neutral.
-      for (var i = 0; i < len; ++i) {
-        var type = types[i];
-        if (type == ",") types[i] = "N";
-        else if (type == "%") {
-          for (var end = i + 1; end < len && types[end] == "%"; ++end) {}
-          var replace = (i && types[i-1] == "!") || (end < len && types[end] == "1") ? "1" : "N";
-          for (var j = i; j < end; ++j) types[j] = replace;
-          i = end - 1;
-        }
-      }
-
-      // W7. Search backwards from each instance of a European number
-      // until the first strong type (R, L, or sor) is found. If an L is
-      // found, then change the type of the European number to L.
-      for (var i = 0, cur = outerType; i < len; ++i) {
-        var type = types[i];
-        if (cur == "L" && type == "1") types[i] = "L";
-        else if (isStrong.test(type)) cur = type;
-      }
-
-      // N1. A sequence of neutrals takes the direction of the
-      // surrounding strong text if the text on both sides has the same
-      // direction. European and Arabic numbers act as if they were R in
-      // terms of their influence on neutrals. Start-of-level-run (sor)
-      // and end-of-level-run (eor) are used at level run boundaries.
-      // N2. Any remaining neutrals take the embedding direction.
-      for (var i = 0; i < len; ++i) {
-        if (isNeutral.test(types[i])) {
-          for (var end = i + 1; end < len && isNeutral.test(types[end]); ++end) {}
-          var before = (i ? types[i-1] : outerType) == "L";
-          var after = (end < len ? types[end] : outerType) == "L";
-          var replace = before || after ? "L" : "R";
-          for (var j = i; j < end; ++j) types[j] = replace;
-          i = end - 1;
-        }
-      }
-
-      // Here we depart from the documented algorithm, in order to avoid
-      // building up an actual levels array. Since there are only three
-      // levels (0, 1, 2) in an implementation that doesn't take
-      // explicit embedding into account, we can build up the order on
-      // the fly, without following the level-based algorithm.
-      var order = [], m;
-      for (var i = 0; i < len;) {
-        if (countsAsLeft.test(types[i])) {
-          var start = i;
-          for (++i; i < len && countsAsLeft.test(types[i]); ++i) {}
-          order.push(new BidiSpan(0, start, i));
-        } else {
-          var pos = i, at = order.length;
-          for (++i; i < len && types[i] != "L"; ++i) {}
-          for (var j = pos; j < i;) {
-            if (countsAsNum.test(types[j])) {
-              if (pos < j) order.splice(at, 0, new BidiSpan(1, pos, j));
-              var nstart = j;
-              for (++j; j < i && countsAsNum.test(types[j]); ++j) {}
-              order.splice(at, 0, new BidiSpan(2, nstart, j));
-              pos = j;
-            } else ++j;
-          }
-          if (pos < i) order.splice(at, 0, new BidiSpan(1, pos, i));
-        }
-      }
-      if (order[0].level == 1 && (m = str.match(/^\s+/))) {
-        order[0].from = m[0].length;
-        order.unshift(new BidiSpan(0, 0, m[0].length));
-      }
-      if (lst(order).level == 1 && (m = str.match(/\s+$/))) {
-        lst(order).to -= m[0].length;
-        order.push(new BidiSpan(0, len - m[0].length, len));
-      }
-      if (order[0].level == 2)
-        order.unshift(new BidiSpan(1, order[0].to, order[0].to));
-      if (order[0].level != lst(order).level)
-        order.push(new BidiSpan(order[0].level, len, len));
-
-      return order;
-    };
-  })();
-
-  // THE END
-
-  CodeMirror.version = "5.7.0";
-
-  return CodeMirror;
-});
diff --git a/www/code/codemirror-5.7/mode/apl/apl.js b/www/code/codemirror-5.7/mode/apl/apl.js
deleted file mode 100644
index caafe4e91..000000000
--- a/www/code/codemirror-5.7/mode/apl/apl.js
+++ /dev/null
@@ -1,174 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("apl", function() {
-  var builtInOps = {
-    ".": "innerProduct",
-    "\\": "scan",
-    "/": "reduce",
-    "⌿": "reduce1Axis",
-    "⍀": "scan1Axis",
-    "¨": "each",
-    "⍣": "power"
-  };
-  var builtInFuncs = {
-    "+": ["conjugate", "add"],
-    "−": ["negate", "subtract"],
-    "×": ["signOf", "multiply"],
-    "÷": ["reciprocal", "divide"],
-    "⌈": ["ceiling", "greaterOf"],
-    "⌊": ["floor", "lesserOf"],
-    "∣": ["absolute", "residue"],
-    "⍳": ["indexGenerate", "indexOf"],
-    "?": ["roll", "deal"],
-    "⋆": ["exponentiate", "toThePowerOf"],
-    "⍟": ["naturalLog", "logToTheBase"],
-    "○": ["piTimes", "circularFuncs"],
-    "!": ["factorial", "binomial"],
-    "⌹": ["matrixInverse", "matrixDivide"],
-    "<": [null, "lessThan"],
-    "≤": [null, "lessThanOrEqual"],
-    "=": [null, "equals"],
-    ">": [null, "greaterThan"],
-    "≥": [null, "greaterThanOrEqual"],
-    "≠": [null, "notEqual"],
-    "≡": ["depth", "match"],
-    "≢": [null, "notMatch"],
-    "∈": ["enlist", "membership"],
-    "⍷": [null, "find"],
-    "∪": ["unique", "union"],
-    "∩": [null, "intersection"],
-    "∼": ["not", "without"],
-    "∨": [null, "or"],
-    "∧": [null, "and"],
-    "⍱": [null, "nor"],
-    "⍲": [null, "nand"],
-    "⍴": ["shapeOf", "reshape"],
-    ",": ["ravel", "catenate"],
-    "⍪": [null, "firstAxisCatenate"],
-    "⌽": ["reverse", "rotate"],
-    "⊖": ["axis1Reverse", "axis1Rotate"],
-    "⍉": ["transpose", null],
-    "↑": ["first", "take"],
-    "↓": [null, "drop"],
-    "⊂": ["enclose", "partitionWithAxis"],
-    "⊃": ["diclose", "pick"],
-    "⌷": [null, "index"],
-    "⍋": ["gradeUp", null],
-    "⍒": ["gradeDown", null],
-    "⊤": ["encode", null],
-    "⊥": ["decode", null],
-    "⍕": ["format", "formatByExample"],
-    "⍎": ["execute", null],
-    "⊣": ["stop", "left"],
-    "⊢": ["pass", "right"]
-  };
-
-  var isOperator = /[\.\/⌿⍀¨⍣]/;
-  var isNiladic = /⍬/;
-  var isFunction = /[\+−×÷⌈⌊∣⍳\?⋆⍟○!⌹<≤=>≥≠≡≢∈⍷∪∩∼∨∧⍱⍲⍴,⍪⌽⊖⍉↑↓⊂⊃⌷⍋⍒⊤⊥⍕⍎⊣⊢]/;
-  var isArrow = /←/;
-  var isComment = /[⍝#].*$/;
-
-  var stringEater = function(type) {
-    var prev;
-    prev = false;
-    return function(c) {
-      prev = c;
-      if (c === type) {
-        return prev === "\\";
-      }
-      return true;
-    };
-  };
-  return {
-    startState: function() {
-      return {
-        prev: false,
-        func: false,
-        op: false,
-        string: false,
-        escape: false
-      };
-    },
-    token: function(stream, state) {
-      var ch, funcName;
-      if (stream.eatSpace()) {
-        return null;
-      }
-      ch = stream.next();
-      if (ch === '"' || ch === "'") {
-        stream.eatWhile(stringEater(ch));
-        stream.next();
-        state.prev = true;
-        return "string";
-      }
-      if (/[\[{\(]/.test(ch)) {
-        state.prev = false;
-        return null;
-      }
-      if (/[\]}\)]/.test(ch)) {
-        state.prev = true;
-        return null;
-      }
-      if (isNiladic.test(ch)) {
-        state.prev = false;
-        return "niladic";
-      }
-      if (/[¯\d]/.test(ch)) {
-        if (state.func) {
-          state.func = false;
-          state.prev = false;
-        } else {
-          state.prev = true;
-        }
-        stream.eatWhile(/[\w\.]/);
-        return "number";
-      }
-      if (isOperator.test(ch)) {
-        return "operator apl-" + builtInOps[ch];
-      }
-      if (isArrow.test(ch)) {
-        return "apl-arrow";
-      }
-      if (isFunction.test(ch)) {
-        funcName = "apl-";
-        if (builtInFuncs[ch] != null) {
-          if (state.prev) {
-            funcName += builtInFuncs[ch][1];
-          } else {
-            funcName += builtInFuncs[ch][0];
-          }
-        }
-        state.func = true;
-        state.prev = false;
-        return "function " + funcName;
-      }
-      if (isComment.test(ch)) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      if (ch === "∘" && stream.peek() === ".") {
-        stream.next();
-        return "function jot-dot";
-      }
-      stream.eatWhile(/[\w\$_]/);
-      state.prev = true;
-      return "keyword";
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/apl", "apl");
-
-});
diff --git a/www/code/codemirror-5.7/mode/apl/index.html b/www/code/codemirror-5.7/mode/apl/index.html
deleted file mode 100644
index 53dda6b58..000000000
--- a/www/code/codemirror-5.7/mode/apl/index.html
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-CodeMirror: APL mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    APL mode
    
-
    
-
-    
-
-    
    Simple mode that tries to handle APL as well as it can.
    
-    
    It attempts to label functions/operators based upon
-    monadic/dyadic usage (but this is far from fully fleshed out).
-    This means there are meaningful classnames so hover states can
-    have popups etc.
    
-
-    
    MIME types defined: text/apl (APL code)
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/asciiarmor/asciiarmor.js b/www/code/codemirror-5.7/mode/asciiarmor/asciiarmor.js
deleted file mode 100644
index d83090376..000000000
--- a/www/code/codemirror-5.7/mode/asciiarmor/asciiarmor.js
+++ /dev/null
@@ -1,73 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  function errorIfNotEmpty(stream) {
-    var nonWS = stream.match(/^\s*\S/);
-    stream.skipToEnd();
-    return nonWS ? "error" : null;
-  }
-
-  CodeMirror.defineMode("asciiarmor", function() {
-    return {
-      token: function(stream, state) {
-        var m;
-        if (state.state == "top") {
-          if (stream.sol() && (m = stream.match(/^-----BEGIN (.*)?-----\s*$/))) {
-            state.state = "headers";
-            state.type = m[1];
-            return "tag";
-          }
-          return errorIfNotEmpty(stream);
-        } else if (state.state == "headers") {
-          if (stream.sol() && stream.match(/^\w+:/)) {
-            state.state = "header";
-            return "atom";
-          } else {
-            var result = errorIfNotEmpty(stream);
-            if (result) state.state = "body";
-            return result;
-          }
-        } else if (state.state == "header") {
-          stream.skipToEnd();
-          state.state = "headers";
-          return "string";
-        } else if (state.state == "body") {
-          if (stream.sol() && (m = stream.match(/^-----END (.*)?-----\s*$/))) {
-            if (m[1] != state.type) return "error";
-            state.state = "end";
-            return "tag";
-          } else {
-            if (stream.eatWhile(/[A-Za-z0-9+\/=]/)) {
-              return null;
-            } else {
-              stream.next();
-              return "error";
-            }
-          }
-        } else if (state.state == "end") {
-          return errorIfNotEmpty(stream);
-        }
-      },
-      blankLine: function(state) {
-        if (state.state == "headers") state.state = "body";
-      },
-      startState: function() {
-        return {state: "top", type: null};
-      }
-    };
-  });
-
-  CodeMirror.defineMIME("application/pgp", "asciiarmor");
-  CodeMirror.defineMIME("application/pgp-keys", "asciiarmor");
-  CodeMirror.defineMIME("application/pgp-signature", "asciiarmor");
-});
diff --git a/www/code/codemirror-5.7/mode/asciiarmor/index.html b/www/code/codemirror-5.7/mode/asciiarmor/index.html
deleted file mode 100644
index 8ba1b5c76..000000000
--- a/www/code/codemirror-5.7/mode/asciiarmor/index.html
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-CodeMirror: ASCII Armor (PGP) mode
-
-
-
-
-
-
-
-
-
-
    
-
    ASCII Armor (PGP) mode
    
-
    
-
-
-
-
    MIME types
-defined: application/pgp, application/pgp-keys, application/pgp-signature
    
-
-
    
diff --git a/www/code/codemirror-5.7/mode/asn.1/asn.1.js b/www/code/codemirror-5.7/mode/asn.1/asn.1.js
deleted file mode 100644
index 9600247ea..000000000
--- a/www/code/codemirror-5.7/mode/asn.1/asn.1.js
+++ /dev/null
@@ -1,204 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("asn.1", function(config, parserConfig) {
-    var indentUnit = config.indentUnit,
-        keywords = parserConfig.keywords || {},
-        cmipVerbs = parserConfig.cmipVerbs || {},
-        compareTypes = parserConfig.compareTypes || {},
-        status = parserConfig.status || {},
-        tags = parserConfig.tags || {},
-        storage = parserConfig.storage || {},
-        modifier = parserConfig.modifier || {},
-        accessTypes = parserConfig.accessTypes|| {},
-        multiLineStrings = parserConfig.multiLineStrings,
-        indentStatements = parserConfig.indentStatements !== false;
-    var isOperatorChar = /[\|\^]/;
-    var curPunc;
-
-    function tokenBase(stream, state) {
-      var ch = stream.next();
-      if (ch == '"' || ch == "'") {
-        state.tokenize = tokenString(ch);
-        return state.tokenize(stream, state);
-      }
-      if (/[\[\]\(\){}:=,;]/.test(ch)) {
-        curPunc = ch;
-        return "punctuation";
-      }
-      if (ch == "-"){
-        if (stream.eat("-")) {
-          stream.skipToEnd();
-          return "comment";
-        }
-      }
-      if (/\d/.test(ch)) {
-        stream.eatWhile(/[\w\.]/);
-        return "number";
-      }
-      if (isOperatorChar.test(ch)) {
-        stream.eatWhile(isOperatorChar);
-        return "operator";
-      }
-
-      stream.eatWhile(/[\w\-]/);
-      var cur = stream.current();
-      if (keywords.propertyIsEnumerable(cur)) return "keyword";
-      if (cmipVerbs.propertyIsEnumerable(cur)) return "variable cmipVerbs";
-      if (compareTypes.propertyIsEnumerable(cur)) return "atom compareTypes";
-      if (status.propertyIsEnumerable(cur)) return "comment status";
-      if (tags.propertyIsEnumerable(cur)) return "variable-3 tags";
-      if (storage.propertyIsEnumerable(cur)) return "builtin storage";
-      if (modifier.propertyIsEnumerable(cur)) return "string-2 modifier";
-      if (accessTypes.propertyIsEnumerable(cur)) return "atom accessTypes";
-
-      return "variable";
-    }
-
-    function tokenString(quote) {
-      return function(stream, state) {
-        var escaped = false, next, end = false;
-        while ((next = stream.next()) != null) {
-          if (next == quote && !escaped){
-            var afterNext = stream.peek();
-            //look if the character if the quote is like the B in '10100010'B
-            if (afterNext){
-              afterNext = afterNext.toLowerCase();
-              if(afterNext == "b" || afterNext == "h" || afterNext == "o")
-                stream.next();
-            }
-            end = true; break;
-          }
-          escaped = !escaped && next == "\\";
-        }
-        if (end || !(escaped || multiLineStrings))
-          state.tokenize = null;
-        return "string";
-      };
-    }
-
-    function Context(indented, column, type, align, prev) {
-      this.indented = indented;
-      this.column = column;
-      this.type = type;
-      this.align = align;
-      this.prev = prev;
-    }
-    function pushContext(state, col, type) {
-      var indent = state.indented;
-      if (state.context && state.context.type == "statement")
-        indent = state.context.indented;
-      return state.context = new Context(indent, col, type, null, state.context);
-    }
-    function popContext(state) {
-      var t = state.context.type;
-      if (t == ")" || t == "]" || t == "}")
-        state.indented = state.context.indented;
-      return state.context = state.context.prev;
-    }
-
-    //Interface
-    return {
-      startState: function(basecolumn) {
-        return {
-          tokenize: null,
-          context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-          indented: 0,
-          startOfLine: true
-        };
-      },
-
-      token: function(stream, state) {
-        var ctx = state.context;
-        if (stream.sol()) {
-          if (ctx.align == null) ctx.align = false;
-          state.indented = stream.indentation();
-          state.startOfLine = true;
-        }
-        if (stream.eatSpace()) return null;
-        curPunc = null;
-        var style = (state.tokenize || tokenBase)(stream, state);
-        if (style == "comment") return style;
-        if (ctx.align == null) ctx.align = true;
-
-        if ((curPunc == ";" || curPunc == ":" || curPunc == ",")
-            && ctx.type == "statement"){
-          popContext(state);
-        }
-        else if (curPunc == "{") pushContext(state, stream.column(), "}");
-        else if (curPunc == "[") pushContext(state, stream.column(), "]");
-        else if (curPunc == "(") pushContext(state, stream.column(), ")");
-        else if (curPunc == "}") {
-          while (ctx.type == "statement") ctx = popContext(state);
-          if (ctx.type == "}") ctx = popContext(state);
-          while (ctx.type == "statement") ctx = popContext(state);
-        }
-        else if (curPunc == ctx.type) popContext(state);
-        else if (indentStatements && (((ctx.type == "}" || ctx.type == "top")
-            && curPunc != ';') || (ctx.type == "statement"
-            && curPunc == "newstatement")))
-          pushContext(state, stream.column(), "statement");
-
-        state.startOfLine = false;
-        return style;
-      },
-
-      electricChars: "{}",
-      lineComment: "--",
-      fold: "brace"
-    };
-  });
-
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  CodeMirror.defineMIME("text/x-ttcn-asn", {
-    name: "asn.1",
-    keywords: words("DEFINITIONS OBJECTS IF DERIVED INFORMATION ACTION" +
-    " REPLY ANY NAMED CHARACTERIZED BEHAVIOUR REGISTERED" +
-    " WITH AS IDENTIFIED CONSTRAINED BY PRESENT BEGIN" +
-    " IMPORTS FROM UNITS SYNTAX MIN-ACCESS MAX-ACCESS" +
-    " MINACCESS MAXACCESS REVISION STATUS DESCRIPTION" +
-    " SEQUENCE SET COMPONENTS OF CHOICE DistinguishedName" +
-    " ENUMERATED SIZE MODULE END INDEX AUGMENTS EXTENSIBILITY" +
-    " IMPLIED EXPORTS"),
-    cmipVerbs: words("ACTIONS ADD GET NOTIFICATIONS REPLACE REMOVE"),
-    compareTypes: words("OPTIONAL DEFAULT MANAGED MODULE-TYPE MODULE_IDENTITY" +
-    " MODULE-COMPLIANCE OBJECT-TYPE OBJECT-IDENTITY" +
-    " OBJECT-COMPLIANCE MODE CONFIRMED CONDITIONAL" +
-    " SUBORDINATE SUPERIOR CLASS TRUE FALSE NULL" +
-    " TEXTUAL-CONVENTION"),
-    status: words("current deprecated mandatory obsolete"),
-    tags: words("APPLICATION AUTOMATIC EXPLICIT IMPLICIT PRIVATE TAGS" +
-    " UNIVERSAL"),
-    storage: words("BOOLEAN INTEGER OBJECT IDENTIFIER BIT OCTET STRING" +
-    " UTCTime InterfaceIndex IANAifType CMIP-Attribute" +
-    " REAL PACKAGE PACKAGES IpAddress PhysAddress" +
-    " NetworkAddress BITS BMPString TimeStamp TimeTicks" +
-    " TruthValue RowStatus DisplayString GeneralString" +
-    " GraphicString IA5String NumericString" +
-    " PrintableString SnmpAdminAtring TeletexString" +
-    " UTF8String VideotexString VisibleString StringStore" +
-    " ISO646String T61String UniversalString Unsigned32" +
-    " Integer32 Gauge Gauge32 Counter Counter32 Counter64"),
-    modifier: words("ATTRIBUTE ATTRIBUTES MANDATORY-GROUP MANDATORY-GROUPS" +
-    " GROUP GROUPS ELEMENTS EQUALITY ORDERING SUBSTRINGS" +
-    " DEFINED"),
-    accessTypes: words("not-accessible accessible-for-notify read-only" +
-    " read-create read-write"),
-    multiLineStrings: true
-  });
-});
diff --git a/www/code/codemirror-5.7/mode/asn.1/index.html b/www/code/codemirror-5.7/mode/asn.1/index.html
deleted file mode 100644
index 8346f8e50..000000000
--- a/www/code/codemirror-5.7/mode/asn.1/index.html
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-CodeMirror: ASN.1 mode
-
-
-
-
-
-
-
-
-
    
-    
    ASN.1 example
    
-    
    
-        
-    
    
-
-    
-    
    
-    
    Language: Abstract Syntax Notation One
-        (ASN.1)
-    
    
-    
    MIME types defined: text/x-ttcn-asn
    
-
-    
    
-    
    The development of this mode has been sponsored by Ericsson
-    .
    
-    
    Coded by Asmelash Tsegay Gebretsadkan 
    
-    
    
-
-
diff --git a/www/code/codemirror-5.7/mode/asterisk/asterisk.js b/www/code/codemirror-5.7/mode/asterisk/asterisk.js
deleted file mode 100644
index b7ebfc5ad..000000000
--- a/www/code/codemirror-5.7/mode/asterisk/asterisk.js
+++ /dev/null
@@ -1,196 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/*
- * =====================================================================================
- *
- *       Filename:  mode/asterisk/asterisk.js
- *
- *    Description:  CodeMirror mode for Asterisk dialplan
- *
- *        Created:  05/17/2012 09:20:25 PM
- *       Revision:  none
- *
- *         Author:  Stas Kobzar (stas@modulis.ca),
- *        Company:  Modulis.ca Inc.
- *
- * =====================================================================================
- */
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("asterisk", function() {
-  var atoms    = ["exten", "same", "include","ignorepat","switch"],
-      dpcmd    = ["#include","#exec"],
-      apps     = [
-                  "addqueuemember","adsiprog","aelsub","agentlogin","agentmonitoroutgoing","agi",
-                  "alarmreceiver","amd","answer","authenticate","background","backgrounddetect",
-                  "bridge","busy","callcompletioncancel","callcompletionrequest","celgenuserevent",
-                  "changemonitor","chanisavail","channelredirect","chanspy","clearhash","confbridge",
-                  "congestion","continuewhile","controlplayback","dahdiacceptr2call","dahdibarge",
-                  "dahdiras","dahdiscan","dahdisendcallreroutingfacility","dahdisendkeypadfacility",
-                  "datetime","dbdel","dbdeltree","deadagi","dial","dictate","directory","disa",
-                  "dumpchan","eagi","echo","endwhile","exec","execif","execiftime","exitwhile","extenspy",
-                  "externalivr","festival","flash","followme","forkcdr","getcpeid","gosub","gosubif",
-                  "goto","gotoif","gotoiftime","hangup","iax2provision","ices","importvar","incomplete",
-                  "ivrdemo","jabberjoin","jabberleave","jabbersend","jabbersendgroup","jabberstatus",
-                  "jack","log","macro","macroexclusive","macroexit","macroif","mailboxexists","meetme",
-                  "meetmeadmin","meetmechanneladmin","meetmecount","milliwatt","minivmaccmess","minivmdelete",
-                  "minivmgreet","minivmmwi","minivmnotify","minivmrecord","mixmonitor","monitor","morsecode",
-                  "mp3player","mset","musiconhold","nbscat","nocdr","noop","odbc","odbc","odbcfinish",
-                  "originate","ospauth","ospfinish","osplookup","ospnext","page","park","parkandannounce",
-                  "parkedcall","pausemonitor","pausequeuemember","pickup","pickupchan","playback","playtones",
-                  "privacymanager","proceeding","progress","queue","queuelog","raiseexception","read","readexten",
-                  "readfile","receivefax","receivefax","receivefax","record","removequeuemember",
-                  "resetcdr","retrydial","return","ringing","sayalpha","saycountedadj","saycountednoun",
-                  "saycountpl","saydigits","saynumber","sayphonetic","sayunixtime","senddtmf","sendfax",
-                  "sendfax","sendfax","sendimage","sendtext","sendurl","set","setamaflags",
-                  "setcallerpres","setmusiconhold","sipaddheader","sipdtmfmode","sipremoveheader","skel",
-                  "slastation","slatrunk","sms","softhangup","speechactivategrammar","speechbackground",
-                  "speechcreate","speechdeactivategrammar","speechdestroy","speechloadgrammar","speechprocessingsound",
-                  "speechstart","speechunloadgrammar","stackpop","startmusiconhold","stopmixmonitor","stopmonitor",
-                  "stopmusiconhold","stopplaytones","system","testclient","testserver","transfer","tryexec",
-                  "trysystem","unpausemonitor","unpausequeuemember","userevent","verbose","vmauthenticate",
-                  "vmsayname","voicemail","voicemailmain","wait","waitexten","waitfornoise","waitforring",
-                  "waitforsilence","waitmusiconhold","waituntil","while","zapateller"
-                 ];
-
-  function basicToken(stream,state){
-    var cur = '';
-    var ch = stream.next();
-    // comment
-    if(ch == ";") {
-      stream.skipToEnd();
-      return "comment";
-    }
-    // context
-    if(ch == '[') {
-      stream.skipTo(']');
-      stream.eat(']');
-      return "header";
-    }
-    // string
-    if(ch == '"') {
-      stream.skipTo('"');
-      return "string";
-    }
-    if(ch == "'") {
-      stream.skipTo("'");
-      return "string-2";
-    }
-    // dialplan commands
-    if(ch == '#') {
-      stream.eatWhile(/\w/);
-      cur = stream.current();
-      if(dpcmd.indexOf(cur) !== -1) {
-        stream.skipToEnd();
-        return "strong";
-      }
-    }
-    // application args
-    if(ch == '$'){
-      var ch1 = stream.peek();
-      if(ch1 == '{'){
-        stream.skipTo('}');
-        stream.eat('}');
-        return "variable-3";
-      }
-    }
-    // extension
-    stream.eatWhile(/\w/);
-    cur = stream.current();
-    if(atoms.indexOf(cur) !== -1) {
-      state.extenStart = true;
-      switch(cur) {
-        case 'same': state.extenSame = true; break;
-        case 'include':
-        case 'switch':
-        case 'ignorepat':
-          state.extenInclude = true;break;
-        default:break;
-      }
-      return "atom";
-    }
-  }
-
-  return {
-    startState: function() {
-      return {
-        extenStart: false,
-        extenSame:  false,
-        extenInclude: false,
-        extenExten: false,
-        extenPriority: false,
-        extenApplication: false
-      };
-    },
-    token: function(stream, state) {
-
-      var cur = '';
-      if(stream.eatSpace()) return null;
-      // extension started
-      if(state.extenStart){
-        stream.eatWhile(/[^\s]/);
-        cur = stream.current();
-        if(/^=>?$/.test(cur)){
-          state.extenExten = true;
-          state.extenStart = false;
-          return "strong";
-        } else {
-          state.extenStart = false;
-          stream.skipToEnd();
-          return "error";
-        }
-      } else if(state.extenExten) {
-        // set exten and priority
-        state.extenExten = false;
-        state.extenPriority = true;
-        stream.eatWhile(/[^,]/);
-        if(state.extenInclude) {
-          stream.skipToEnd();
-          state.extenPriority = false;
-          state.extenInclude = false;
-        }
-        if(state.extenSame) {
-          state.extenPriority = false;
-          state.extenSame = false;
-          state.extenApplication = true;
-        }
-        return "tag";
-      } else if(state.extenPriority) {
-        state.extenPriority = false;
-        state.extenApplication = true;
-        stream.next(); // get comma
-        if(state.extenSame) return null;
-        stream.eatWhile(/[^,]/);
-        return "number";
-      } else if(state.extenApplication) {
-        stream.eatWhile(/,/);
-        cur = stream.current();
-        if(cur === ',') return null;
-        stream.eatWhile(/\w/);
-        cur = stream.current().toLowerCase();
-        state.extenApplication = false;
-        if(apps.indexOf(cur) !== -1){
-          return "def strong";
-        }
-      } else{
-        return basicToken(stream,state);
-      }
-
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-asterisk", "asterisk");
-
-});
diff --git a/www/code/codemirror-5.7/mode/asterisk/index.html b/www/code/codemirror-5.7/mode/asterisk/index.html
deleted file mode 100644
index 257bd3987..000000000
--- a/www/code/codemirror-5.7/mode/asterisk/index.html
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-CodeMirror: Asterisk dialplan mode
-
-
-
-
-
-
-
-
-
-
    
-
    Asterisk dialplan mode
    
-
    
-    
-
-    
    MIME types defined: text/x-asterisk.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/brainfuck/brainfuck.js b/www/code/codemirror-5.7/mode/brainfuck/brainfuck.js
deleted file mode 100644
index 3becf2a5a..000000000
--- a/www/code/codemirror-5.7/mode/brainfuck/brainfuck.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Brainfuck mode created by Michael Kaminsky https://github.com/mkaminsky11
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object")
-    mod(require("../../lib/codemirror"))
-  else if (typeof define == "function" && define.amd)
-    define(["../../lib/codemirror"], mod)
-  else
-    mod(CodeMirror)
-})(function(CodeMirror) {
-  "use strict"
-  var reserve = "><+-.,[]".split("");
-  /*
-  comments can be either:
-  placed behind lines
-
-        +++    this is a comment
-
-  where reserved characters cannot be used
-  or in a loop
-  [
-    this is ok to use [ ] and stuff
-  ]
-  or preceded by #
-  */
-  CodeMirror.defineMode("brainfuck", function() {
-    return {
-      startState: function() {
-        return {
-          commentLine: false,
-          left: 0,
-          right: 0,
-          commentLoop: false
-        }
-      },
-      token: function(stream, state) {
-        if (stream.eatSpace()) return null
-        if(stream.sol()){
-          state.commentLine = false;
-        }
-        var ch = stream.next().toString();
-        if(reserve.indexOf(ch) !== -1){
-          if(state.commentLine === true){
-            if(stream.eol()){
-              state.commentLine = false;
-            }
-            return "comment";
-          }
-          if(ch === "]" || ch === "["){
-            if(ch === "["){
-              state.left++;
-            }
-            else{
-              state.right++;
-            }
-            return "bracket";
-          }
-          else if(ch === "+" || ch === "-"){
-            return "keyword";
-          }
-          else if(ch === "<" || ch === ">"){
-            return "atom";
-          }
-          else if(ch === "." || ch === ","){
-            return "def";
-          }
-        }
-        else{
-          state.commentLine = true;
-          if(stream.eol()){
-            state.commentLine = false;
-          }
-          return "comment";
-        }
-        if(stream.eol()){
-          state.commentLine = false;
-        }
-      }
-    };
-  });
-CodeMirror.defineMIME("text/x-brainfuck","brainfuck")
-});
diff --git a/www/code/codemirror-5.7/mode/brainfuck/index.html b/www/code/codemirror-5.7/mode/brainfuck/index.html
deleted file mode 100644
index 6048fc241..000000000
--- a/www/code/codemirror-5.7/mode/brainfuck/index.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-CodeMirror: Brainfuck mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Brainfuck mode
    
-
    
-
-    
-
-    
    A mode for Brainfuck
    
-
-    
    MIME types defined: text/x-brainfuck
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/clike/clike.js b/www/code/codemirror-5.7/mode/clike/clike.js
deleted file mode 100644
index 50f1ea734..000000000
--- a/www/code/codemirror-5.7/mode/clike/clike.js
+++ /dev/null
@@ -1,619 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("clike", function(config, parserConfig) {
-  var indentUnit = config.indentUnit,
-      statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
-      dontAlignCalls = parserConfig.dontAlignCalls,
-      keywords = parserConfig.keywords || {},
-      types = parserConfig.types || {},
-      builtin = parserConfig.builtin || {},
-      blockKeywords = parserConfig.blockKeywords || {},
-      defKeywords = parserConfig.defKeywords || {},
-      atoms = parserConfig.atoms || {},
-      hooks = parserConfig.hooks || {},
-      multiLineStrings = parserConfig.multiLineStrings,
-      indentStatements = parserConfig.indentStatements !== false,
-      indentSwitch = parserConfig.indentSwitch !== false,
-      namespaceSeparator = parserConfig.namespaceSeparator;
-  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
-
-  var curPunc, isDefKeyword;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
-    if (namespaceSeparator) while (stream.match(namespaceSeparator))
-      stream.eatWhile(/[\w\$_\xa1-\uffff]/);
-
-    var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      if (defKeywords.propertyIsEnumerable(cur)) isDefKeyword = true;
-      return "keyword";
-    }
-    if (types.propertyIsEnumerable(cur)) return "variable-3";
-    if (builtin.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "builtin";
-    }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return "variable";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !(escaped || multiLineStrings))
-        state.tokenize = null;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function isStatement(type) {
-    return type == "statement" || type == "switchstatement" || type == "namespace";
-  }
-  function pushContext(state, col, type) {
-    var indent = state.indented;
-    if (state.context && isStatement(state.context.type) && !isStatement(type))
-      indent = state.context.indented;
-    return state.context = new Context(indent, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  function typeBefore(stream, state) {
-    if (state.prevToken == "variable" || state.prevToken == "variable-3") return true;
-    if (/\S(?:[^- ]>|[*\]])\s*$|\*$/.test(stream.string.slice(0, stream.start))) return true;
-  }
-
-  function isTopScope(context) {
-    for (;;) {
-      if (!context || context.type == "top") return true;
-      if (context.type == "}" && context.prev.type != "namespace") return false;
-      context = context.prev;
-    }
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true,
-        prevToken: null
-      };
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = isDefKeyword = null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if ((curPunc == ";" || curPunc == ":" || curPunc == ","))
-        while (isStatement(state.context.type)) popContext(state);
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (isStatement(ctx.type)) ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (isStatement(ctx.type)) ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (indentStatements &&
-               (((ctx.type == "}" || ctx.type == "top") && curPunc != ";") ||
-                (isStatement(ctx.type) && curPunc == "newstatement"))) {
-        var type = "statement";
-        if (curPunc == "newstatement" && indentSwitch && stream.current() == "switch")
-          type = "switchstatement";
-        else if (style == "keyword" && stream.current() == "namespace")
-          type = "namespace";
-        pushContext(state, stream.column(), type);
-      }
-
-      if (style == "variable" &&
-          ((state.prevToken == "def" ||
-            (parserConfig.typeFirstDefinitions && typeBefore(stream, state) &&
-             isTopScope(state.context) && stream.match(/^\s*\(/, false)))))
-        style = "def";
-
-      if (hooks.token) {
-        var result = hooks.token(stream, state, style);
-        if (result !== undefined) style = result;
-      }
-
-      if (style == "def" && parserConfig.styleDefs === false) style = "variable";
-
-      state.startOfLine = false;
-      state.prevToken = isDefKeyword ? "def" : style || curPunc;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
-      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (isStatement(ctx.type) && firstChar == "}") ctx = ctx.prev;
-      var closing = firstChar == ctx.type;
-      var switchBlock = ctx.prev && ctx.prev.type == "switchstatement";
-      if (isStatement(ctx.type))
-        return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
-      if (ctx.align && (!dontAlignCalls || ctx.type != ")"))
-        return ctx.column + (closing ? 0 : 1);
-      if (ctx.type == ")" && !closing)
-        return ctx.indented + statementIndentUnit;
-
-      return ctx.indented + (closing ? 0 : indentUnit) +
-        (!closing && switchBlock && !/^(?:case|default)\b/.test(textAfter) ? indentUnit : 0);
-    },
-
-    electricInput: indentSwitch ? /^\s*(?:case .*?:|default:|\{\}?|\})$/ : /^\s*[{}]$/,
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//",
-    fold: "brace"
-  };
-});
-
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var cKeywords = "auto if break case register continue return default do sizeof " +
-    "static else struct switch extern typedef float union for " +
-    "goto while enum const volatile";
-  var cTypes = "int long char short double float unsigned signed void size_t ptrdiff_t";
-
-  function cppHook(stream, state) {
-    if (!state.startOfLine) return false;
-    for (;;) {
-      if (stream.skipTo("\\")) {
-        stream.next();
-        if (stream.eol()) {
-          state.tokenize = cppHook;
-          break;
-        }
-      } else {
-        stream.skipToEnd();
-        state.tokenize = null;
-        break;
-      }
-    }
-    return "meta";
-  }
-
-  function pointerHook(_stream, state) {
-    if (state.prevToken == "variable-3") return "variable-3";
-    return false;
-  }
-
-  function cpp14Literal(stream) {
-    stream.eatWhile(/[\w\.']/);
-    return "number";
-  }
-
-  function cpp11StringHook(stream, state) {
-    stream.backUp(1);
-    // Raw strings.
-    if (stream.match(/(R|u8R|uR|UR|LR)/)) {
-      var match = stream.match(/"([^\s\\()]{0,16})\(/);
-      if (!match) {
-        return false;
-      }
-      state.cpp11RawStringDelim = match[1];
-      state.tokenize = tokenRawString;
-      return tokenRawString(stream, state);
-    }
-    // Unicode strings/chars.
-    if (stream.match(/(u8|u|U|L)/)) {
-      if (stream.match(/["']/, /* eat */ false)) {
-        return "string";
-      }
-      return false;
-    }
-    // Ignore this hook.
-    stream.next();
-    return false;
-  }
-
-  function cppLooksLikeConstructor(word) {
-    var lastTwo = /(\w+)::(\w+)$/.exec(word);
-    return lastTwo && lastTwo[1] == lastTwo[2];
-  }
-
-  // C#-style strings where "" escapes a quote.
-  function tokenAtString(stream, state) {
-    var next;
-    while ((next = stream.next()) != null) {
-      if (next == '"' && !stream.eat('"')) {
-        state.tokenize = null;
-        break;
-      }
-    }
-    return "string";
-  }
-
-  // C++11 raw string literal is "( anything )", where
-  //  can be a string up to 16 characters long.
-  function tokenRawString(stream, state) {
-    // Escape characters that have special regex meanings.
-    var delim = state.cpp11RawStringDelim.replace(/[^\w\s]/g, '\\$&');
-    var match = stream.match(new RegExp(".*?\\)" + delim + '"'));
-    if (match)
-      state.tokenize = null;
-    else
-      stream.skipToEnd();
-    return "string";
-  }
-
-  function def(mimes, mode) {
-    if (typeof mimes == "string") mimes = [mimes];
-    var words = [];
-    function add(obj) {
-      if (obj) for (var prop in obj) if (obj.hasOwnProperty(prop))
-        words.push(prop);
-    }
-    add(mode.keywords);
-    add(mode.types);
-    add(mode.builtin);
-    add(mode.atoms);
-    if (words.length) {
-      mode.helperType = mimes[0];
-      CodeMirror.registerHelper("hintWords", mimes[0], words);
-    }
-
-    for (var i = 0; i < mimes.length; ++i)
-      CodeMirror.defineMIME(mimes[i], mode);
-  }
-
-  def(["text/x-csrc", "text/x-c", "text/x-chdr"], {
-    name: "clike",
-    keywords: words(cKeywords),
-    types: words(cTypes + " bool _Complex _Bool float_t double_t intptr_t intmax_t " +
-                 "int8_t int16_t int32_t int64_t uintptr_t uintmax_t uint8_t uint16_t " +
-                 "uint32_t uint64_t"),
-    blockKeywords: words("case do else for if switch while struct"),
-    defKeywords: words("struct"),
-    typeFirstDefinitions: true,
-    atoms: words("null true false"),
-    hooks: {"#": cppHook, "*": pointerHook},
-    modeProps: {fold: ["brace", "include"]}
-  });
-
-  def(["text/x-c++src", "text/x-c++hdr"], {
-    name: "clike",
-    keywords: words(cKeywords + " asm dynamic_cast namespace reinterpret_cast try explicit new " +
-                    "static_cast typeid catch operator template typename class friend private " +
-                    "this using const_cast inline public throw virtual delete mutable protected " +
-                    "alignas alignof constexpr decltype nullptr noexcept thread_local final " +
-                    "static_assert override"),
-    types: words(cTypes + " bool wchar_t"),
-    blockKeywords: words("catch class do else finally for if struct switch try while"),
-    defKeywords: words("class namespace struct enum union"),
-    typeFirstDefinitions: true,
-    atoms: words("true false null"),
-    hooks: {
-      "#": cppHook,
-      "*": pointerHook,
-      "u": cpp11StringHook,
-      "U": cpp11StringHook,
-      "L": cpp11StringHook,
-      "R": cpp11StringHook,
-      "0": cpp14Literal,
-      "1": cpp14Literal,
-      "2": cpp14Literal,
-      "3": cpp14Literal,
-      "4": cpp14Literal,
-      "5": cpp14Literal,
-      "6": cpp14Literal,
-      "7": cpp14Literal,
-      "8": cpp14Literal,
-      "9": cpp14Literal,
-      token: function(stream, state, style) {
-        if (style == "variable" && stream.peek() == "(" &&
-            (state.prevToken == ";" || state.prevToken == null ||
-             state.prevToken == "}") &&
-            cppLooksLikeConstructor(stream.current()))
-          return "def";
-      }
-    },
-    namespaceSeparator: "::",
-    modeProps: {fold: ["brace", "include"]}
-  });
-
-  def("text/x-java", {
-    name: "clike",
-    keywords: words("abstract assert break case catch class const continue default " +
-                    "do else enum extends final finally float for goto if implements import " +
-                    "instanceof interface native new package private protected public " +
-                    "return static strictfp super switch synchronized this throw throws transient " +
-                    "try volatile while"),
-    types: words("byte short int long float double boolean char void Boolean Byte Character Double Float " +
-                 "Integer Long Number Object Short String StringBuffer StringBuilder Void"),
-    blockKeywords: words("catch class do else finally for if switch try while"),
-    defKeywords: words("class interface package enum"),
-    typeFirstDefinitions: true,
-    atoms: words("true false null"),
-    hooks: {
-      "@": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
-        return "meta";
-      }
-    },
-    modeProps: {fold: ["brace", "import"]}
-  });
-
-  def("text/x-csharp", {
-    name: "clike",
-    keywords: words("abstract as async await base break case catch checked class const continue" +
-                    " default delegate do else enum event explicit extern finally fixed for" +
-                    " foreach goto if implicit in interface internal is lock namespace new" +
-                    " operator out override params private protected public readonly ref return sealed" +
-                    " sizeof stackalloc static struct switch this throw try typeof unchecked" +
-                    " unsafe using virtual void volatile while add alias ascending descending dynamic from get" +
-                    " global group into join let orderby partial remove select set value var yield"),
-    types: words("Action Boolean Byte Char DateTime DateTimeOffset Decimal Double Func" +
-                 " Guid Int16 Int32 Int64 Object SByte Single String Task TimeSpan UInt16 UInt32" +
-                 " UInt64 bool byte char decimal double short int long object"  +
-                 " sbyte float string ushort uint ulong"),
-    blockKeywords: words("catch class do else finally for foreach if struct switch try while"),
-    defKeywords: words("class interface namespace struct var"),
-    typeFirstDefinitions: true,
-    atoms: words("true false null"),
-    hooks: {
-      "@": function(stream, state) {
-        if (stream.eat('"')) {
-          state.tokenize = tokenAtString;
-          return tokenAtString(stream, state);
-        }
-        stream.eatWhile(/[\w\$_]/);
-        return "meta";
-      }
-    }
-  });
-
-  function tokenTripleString(stream, state) {
-    var escaped = false;
-    while (!stream.eol()) {
-      if (!escaped && stream.match('"""')) {
-        state.tokenize = null;
-        break;
-      }
-      escaped = stream.next() == "\\" && !escaped;
-    }
-    return "string";
-  }
-
-  def("text/x-scala", {
-    name: "clike",
-    keywords: words(
-
-      /* scala */
-      "abstract case catch class def do else extends false final finally for forSome if " +
-      "implicit import lazy match new null object override package private protected return " +
-      "sealed super this throw trait try type val var while with yield _ : = => <- <: " +
-      "<% >: # @ " +
-
-      /* package scala */
-      "assert assume require print println printf readLine readBoolean readByte readShort " +
-      "readChar readInt readLong readFloat readDouble " +
-
-      ":: #:: "
-    ),
-    types: words(
-      "AnyVal App Application Array BufferedIterator BigDecimal BigInt Char Console Either " +
-      "Enumeration Equiv Error Exception Fractional Function IndexedSeq Integral Iterable " +
-      "Iterator List Map Numeric Nil NotNull Option Ordered Ordering PartialFunction PartialOrdering " +
-      "Product Proxy Range Responder Seq Serializable Set Specializable Stream StringBuilder " +
-      "StringContext Symbol Throwable Traversable TraversableOnce Tuple Unit Vector " +
-
-      /* package java.lang */
-      "Boolean Byte Character CharSequence Class ClassLoader Cloneable Comparable " +
-      "Compiler Double Exception Float Integer Long Math Number Object Package Pair Process " +
-      "Runtime Runnable SecurityManager Short StackTraceElement StrictMath String " +
-      "StringBuffer System Thread ThreadGroup ThreadLocal Throwable Triple Void"
-    ),
-    multiLineStrings: true,
-    blockKeywords: words("catch class do else finally for forSome if match switch try while"),
-    defKeywords: words("class def object package trait type val var"),
-    atoms: words("true false null"),
-    indentStatements: false,
-    indentSwitch: false,
-    hooks: {
-      "@": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
-        return "meta";
-      },
-      '"': function(stream, state) {
-        if (!stream.match('""')) return false;
-        state.tokenize = tokenTripleString;
-        return state.tokenize(stream, state);
-      },
-      "'": function(stream) {
-        stream.eatWhile(/[\w\$_\xa1-\uffff]/);
-        return "atom";
-      }
-    },
-    modeProps: {closeBrackets: {triples: '"'}}
-  });
-
-  def(["x-shader/x-vertex", "x-shader/x-fragment"], {
-    name: "clike",
-    keywords: words("sampler1D sampler2D sampler3D samplerCube " +
-                    "sampler1DShadow sampler2DShadow " +
-                    "const attribute uniform varying " +
-                    "break continue discard return " +
-                    "for while do if else struct " +
-                    "in out inout"),
-    types: words("float int bool void " +
-                 "vec2 vec3 vec4 ivec2 ivec3 ivec4 bvec2 bvec3 bvec4 " +
-                 "mat2 mat3 mat4"),
-    blockKeywords: words("for while do if else struct"),
-    builtin: words("radians degrees sin cos tan asin acos atan " +
-                    "pow exp log exp2 sqrt inversesqrt " +
-                    "abs sign floor ceil fract mod min max clamp mix step smoothstep " +
-                    "length distance dot cross normalize ftransform faceforward " +
-                    "reflect refract matrixCompMult " +
-                    "lessThan lessThanEqual greaterThan greaterThanEqual " +
-                    "equal notEqual any all not " +
-                    "texture1D texture1DProj texture1DLod texture1DProjLod " +
-                    "texture2D texture2DProj texture2DLod texture2DProjLod " +
-                    "texture3D texture3DProj texture3DLod texture3DProjLod " +
-                    "textureCube textureCubeLod " +
-                    "shadow1D shadow2D shadow1DProj shadow2DProj " +
-                    "shadow1DLod shadow2DLod shadow1DProjLod shadow2DProjLod " +
-                    "dFdx dFdy fwidth " +
-                    "noise1 noise2 noise3 noise4"),
-    atoms: words("true false " +
-                "gl_FragColor gl_SecondaryColor gl_Normal gl_Vertex " +
-                "gl_MultiTexCoord0 gl_MultiTexCoord1 gl_MultiTexCoord2 gl_MultiTexCoord3 " +
-                "gl_MultiTexCoord4 gl_MultiTexCoord5 gl_MultiTexCoord6 gl_MultiTexCoord7 " +
-                "gl_FogCoord gl_PointCoord " +
-                "gl_Position gl_PointSize gl_ClipVertex " +
-                "gl_FrontColor gl_BackColor gl_FrontSecondaryColor gl_BackSecondaryColor " +
-                "gl_TexCoord gl_FogFragCoord " +
-                "gl_FragCoord gl_FrontFacing " +
-                "gl_FragData gl_FragDepth " +
-                "gl_ModelViewMatrix gl_ProjectionMatrix gl_ModelViewProjectionMatrix " +
-                "gl_TextureMatrix gl_NormalMatrix gl_ModelViewMatrixInverse " +
-                "gl_ProjectionMatrixInverse gl_ModelViewProjectionMatrixInverse " +
-                "gl_TexureMatrixTranspose gl_ModelViewMatrixInverseTranspose " +
-                "gl_ProjectionMatrixInverseTranspose " +
-                "gl_ModelViewProjectionMatrixInverseTranspose " +
-                "gl_TextureMatrixInverseTranspose " +
-                "gl_NormalScale gl_DepthRange gl_ClipPlane " +
-                "gl_Point gl_FrontMaterial gl_BackMaterial gl_LightSource gl_LightModel " +
-                "gl_FrontLightModelProduct gl_BackLightModelProduct " +
-                "gl_TextureColor gl_EyePlaneS gl_EyePlaneT gl_EyePlaneR gl_EyePlaneQ " +
-                "gl_FogParameters " +
-                "gl_MaxLights gl_MaxClipPlanes gl_MaxTextureUnits gl_MaxTextureCoords " +
-                "gl_MaxVertexAttribs gl_MaxVertexUniformComponents gl_MaxVaryingFloats " +
-                "gl_MaxVertexTextureImageUnits gl_MaxTextureImageUnits " +
-                "gl_MaxFragmentUniformComponents gl_MaxCombineTextureImageUnits " +
-                "gl_MaxDrawBuffers"),
-    indentSwitch: false,
-    hooks: {"#": cppHook},
-    modeProps: {fold: ["brace", "include"]}
-  });
-
-  def("text/x-nesc", {
-    name: "clike",
-    keywords: words(cKeywords + "as atomic async call command component components configuration event generic " +
-                    "implementation includes interface module new norace nx_struct nx_union post provides " +
-                    "signal task uses abstract extends"),
-    types: words(cTypes),
-    blockKeywords: words("case do else for if switch while struct"),
-    atoms: words("null true false"),
-    hooks: {"#": cppHook},
-    modeProps: {fold: ["brace", "include"]}
-  });
-
-  def("text/x-objectivec", {
-    name: "clike",
-    keywords: words(cKeywords + "inline restrict _Bool _Complex _Imaginery BOOL Class bycopy byref id IMP in " +
-                    "inout nil oneway out Protocol SEL self super atomic nonatomic retain copy readwrite readonly"),
-    types: words(cTypes),
-    atoms: words("YES NO NULL NILL ON OFF true false"),
-    hooks: {
-      "@": function(stream) {
-        stream.eatWhile(/[\w\$]/);
-        return "keyword";
-      },
-      "#": cppHook
-    },
-    modeProps: {fold: "brace"}
-  });
-
-  def("text/x-squirrel", {
-    name: "clike",
-    keywords: words("base break clone continue const default delete enum extends function in class" +
-                    " foreach local resume return this throw typeof yield constructor instanceof static"),
-    types: words(cTypes),
-    blockKeywords: words("case catch class else for foreach if switch try while"),
-    defKeywords: words("function local class"),
-    typeFirstDefinitions: true,
-    atoms: words("true false null"),
-    hooks: {"#": cppHook},
-    modeProps: {fold: ["brace", "include"]}
-  });
-
-});
diff --git a/www/code/codemirror-5.7/mode/clike/index.html b/www/code/codemirror-5.7/mode/clike/index.html
deleted file mode 100644
index 226c6ce84..000000000
--- a/www/code/codemirror-5.7/mode/clike/index.html
+++ /dev/null
@@ -1,252 +0,0 @@
-
-
-CodeMirror: C-like mode
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    C-like mode
    
-
-
    
-
-
    C++ example
    
-
-
    
-
-
    Objective-C example
    
-
-
    
-
-
    Java example
    
-
-
    
-
-
    Scala example
    
-
-
    
-
-    
-
-    
    Simple mode that tries to handle C-like languages as well as it
-    can. Takes two configuration parameters: keywords, an
-    object whose property names are the keywords in the language,
-    and useCPP, which determines whether C preprocessor
-    directives are recognized.
    
-
-    
    MIME types defined: text/x-csrc
-    (C), text/x-c++src (C++), text/x-java
-    (Java), text/x-csharp (C#),
-    text/x-objectivec (Objective-C),
-    text/x-scala (Scala), text/x-vertex
-    and x-shader/x-fragment (shader programs),
-    text/x-squirrel (Squirrel).
    
-
    
diff --git a/www/code/codemirror-5.7/mode/clike/scala.html b/www/code/codemirror-5.7/mode/clike/scala.html
deleted file mode 100644
index aa04cf0f0..000000000
--- a/www/code/codemirror-5.7/mode/clike/scala.html
+++ /dev/null
@@ -1,767 +0,0 @@
-
-
-CodeMirror: Scala mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Scala mode
    
-
    
-
-
    
-
-    
-  
    
diff --git a/www/code/codemirror-5.7/mode/clike/test.js b/www/code/codemirror-5.7/mode/clike/test.js
deleted file mode 100644
index c84d22e18..000000000
--- a/www/code/codemirror-5.7/mode/clike/test.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-c");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("indent",
-     "[variable-3 void] [def foo]([variable-3 void*] [variable a], [variable-3 int] [variable b]) {",
-     "  [variable-3 int] [variable c] [operator =] [variable b] [operator +]",
-     "    [number 1];",
-     "  [keyword return] [operator *][variable a];",
-     "}");
-
-  MT("indent_switch",
-     "[keyword switch] ([variable x]) {",
-     "  [keyword case] [number 10]:",
-     "    [keyword return] [number 20];",
-     "  [keyword default]:",
-     "    [variable printf]([string \"foo %c\"], [variable x]);",
-     "}");
-
-  MT("def",
-     "[variable-3 void] [def foo]() {}",
-     "[keyword struct] [def bar]{}",
-     "[variable-3 int] [variable-3 *][def baz]() {}");
-
-  MT("double_block",
-     "[keyword for] (;;)",
-     "  [keyword for] (;;)",
-     "    [variable x][operator ++];",
-     "[keyword return];");
-
-  var mode_cpp = CodeMirror.getMode({indentUnit: 2}, "text/x-c++src");
-  function MTCPP(name) { test.mode(name, mode_cpp, Array.prototype.slice.call(arguments, 1)); }
-
-  MTCPP("cpp14_literal",
-    "[number 10'000];",
-    "[number 0b10'000];",
-    "[number 0x10'000];",
-    "[string '100000'];");
-})();
diff --git a/www/code/codemirror-5.7/mode/clojure/clojure.js b/www/code/codemirror-5.7/mode/clojure/clojure.js
deleted file mode 100644
index d531022a2..000000000
--- a/www/code/codemirror-5.7/mode/clojure/clojure.js
+++ /dev/null
@@ -1,244 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**
- * Author: Hans Engel
- * Branched from CodeMirror's Scheme mode (by Koh Zi Han, based on implementation by Koh Zi Chun)
- */
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("clojure", function (options) {
-    var BUILTIN = "builtin", COMMENT = "comment", STRING = "string", CHARACTER = "string-2",
-        ATOM = "atom", NUMBER = "number", BRACKET = "bracket", KEYWORD = "keyword", VAR = "variable";
-    var INDENT_WORD_SKIP = options.indentUnit || 2;
-    var NORMAL_INDENT_UNIT = options.indentUnit || 2;
-
-    function makeKeywords(str) {
-        var obj = {}, words = str.split(" ");
-        for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-        return obj;
-    }
-
-    var atoms = makeKeywords("true false nil");
-
-    var keywords = makeKeywords(
-      "defn defn- def def- defonce defmulti defmethod defmacro defstruct deftype defprotocol defrecord defproject deftest slice defalias defhinted defmacro- defn-memo defnk defnk defonce- defunbound defunbound- defvar defvar- let letfn do case cond condp for loop recur when when-not when-let when-first if if-let if-not . .. -> ->> doto and or dosync doseq dotimes dorun doall load import unimport ns in-ns refer try catch finally throw with-open with-local-vars binding gen-class gen-and-load-class gen-and-save-class handler-case handle");
-
-    var builtins = makeKeywords(
-        "* *' *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *compiler-options* *data-readers* *e *err* *file* *flush-on-newline* *fn-loader* *in* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* + +' - -' -> ->> ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods .. / < <= = == > >= EMPTY-NODE accessor aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint biginteger binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* bound? butlast byte byte-array bytes case cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? declare default-data-readers definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol defrecord defstruct deftype delay delay? deliver denominator deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info extend extend-protocol extend-type extenders extends? false? ffirst file-seq filter filterv find find-keyword find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn fn? fnext fnil for force format frequencies future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash hash-combine hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc inc' init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt keep keep-indexed key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map-indexed map? mapcat mapv max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext nthrest num number? numerator object-array odd? or parents partial partition partition-all partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-dup print-method print-simple print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int rand-nth range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string realized? reduce reduce-kv reductions ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure reify release-pending-sends rem remove remove-all-methods remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest restart-agent resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off seq seq? seque sequence sequential? set set-error-handler! set-error-mode! set-validator! set? short short-array shorts shuffle shutdown-agents slurp some some-fn sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync take take-last take-nth take-while test the-ns thread-bound? time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision with-redefs with-redefs-fn xml-seq zero? zipmap *default-data-reader-fn* as-> cond-> cond->> reduced reduced? send-via set-agent-send-executor! set-agent-send-off-executor! some-> some->>");
-
-    var indentKeys = makeKeywords(
-        // Built-ins
-        "ns fn def defn defmethod bound-fn if if-not case condp when while when-not when-first do future comment doto locking proxy with-open with-precision reify deftype defrecord defprotocol extend extend-protocol extend-type try catch " +
-
-        // Binding forms
-        "let letfn binding loop for doseq dotimes when-let if-let " +
-
-        // Data structures
-        "defstruct struct-map assoc " +
-
-        // clojure.test
-        "testing deftest " +
-
-        // contrib
-        "handler-case handle dotrace deftrace");
-
-    var tests = {
-        digit: /\d/,
-        digit_or_colon: /[\d:]/,
-        hex: /[0-9a-f]/i,
-        sign: /[+-]/,
-        exponent: /e/i,
-        keyword_char: /[^\s\(\[\;\)\]]/,
-        symbol: /[\w*+!\-\._?:<>\/\xa1-\uffff]/
-    };
-
-    function stateStack(indent, type, prev) { // represents a state stack object
-        this.indent = indent;
-        this.type = type;
-        this.prev = prev;
-    }
-
-    function pushStack(state, indent, type) {
-        state.indentStack = new stateStack(indent, type, state.indentStack);
-    }
-
-    function popStack(state) {
-        state.indentStack = state.indentStack.prev;
-    }
-
-    function isNumber(ch, stream){
-        // hex
-        if ( ch === '0' && stream.eat(/x/i) ) {
-            stream.eatWhile(tests.hex);
-            return true;
-        }
-
-        // leading sign
-        if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) {
-          stream.eat(tests.sign);
-          ch = stream.next();
-        }
-
-        if ( tests.digit.test(ch) ) {
-            stream.eat(ch);
-            stream.eatWhile(tests.digit);
-
-            if ( '.' == stream.peek() ) {
-                stream.eat('.');
-                stream.eatWhile(tests.digit);
-            }
-
-            if ( stream.eat(tests.exponent) ) {
-                stream.eat(tests.sign);
-                stream.eatWhile(tests.digit);
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    // Eat character that starts after backslash \
-    function eatCharacter(stream) {
-        var first = stream.next();
-        // Read special literals: backspace, newline, space, return.
-        // Just read all lowercase letters.
-        if (first && first.match(/[a-z]/) && stream.match(/[a-z]+/, true)) {
-            return;
-        }
-        // Read unicode character: \u1000 \uA0a1
-        if (first === "u") {
-            stream.match(/[0-9a-z]{4}/i, true);
-        }
-    }
-
-    return {
-        startState: function () {
-            return {
-                indentStack: null,
-                indentation: 0,
-                mode: false
-            };
-        },
-
-        token: function (stream, state) {
-            if (state.indentStack == null && stream.sol()) {
-                // update indentation, but only if indentStack is empty
-                state.indentation = stream.indentation();
-            }
-
-            // skip spaces
-            if (stream.eatSpace()) {
-                return null;
-            }
-            var returnType = null;
-
-            switch(state.mode){
-                case "string": // multi-line string parsing mode
-                    var next, escaped = false;
-                    while ((next = stream.next()) != null) {
-                        if (next == "\"" && !escaped) {
-
-                            state.mode = false;
-                            break;
-                        }
-                        escaped = !escaped && next == "\\";
-                    }
-                    returnType = STRING; // continue on in string mode
-                    break;
-                default: // default parsing mode
-                    var ch = stream.next();
-
-                    if (ch == "\"") {
-                        state.mode = "string";
-                        returnType = STRING;
-                    } else if (ch == "\\") {
-                        eatCharacter(stream);
-                        returnType = CHARACTER;
-                    } else if (ch == "'" && !( tests.digit_or_colon.test(stream.peek()) )) {
-                        returnType = ATOM;
-                    } else if (ch == ";") { // comment
-                        stream.skipToEnd(); // rest of the line is a comment
-                        returnType = COMMENT;
-                    } else if (isNumber(ch,stream)){
-                        returnType = NUMBER;
-                    } else if (ch == "(" || ch == "[" || ch == "{" ) {
-                        var keyWord = '', indentTemp = stream.column(), letter;
-                        /**
-                        Either
-                        (indent-word ..
-                        (non-indent-word ..
-                        (;something else, bracket, etc.
-                        */
-
-                        if (ch == "(") while ((letter = stream.eat(tests.keyword_char)) != null) {
-                            keyWord += letter;
-                        }
-
-                        if (keyWord.length > 0 && (indentKeys.propertyIsEnumerable(keyWord) ||
-                                                   /^(?:def|with)/.test(keyWord))) { // indent-word
-                            pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
-                        } else { // non-indent word
-                            // we continue eating the spaces
-                            stream.eatSpace();
-                            if (stream.eol() || stream.peek() == ";") {
-                                // nothing significant after
-                                // we restart indentation the user defined spaces after
-                                pushStack(state, indentTemp + NORMAL_INDENT_UNIT, ch);
-                            } else {
-                                pushStack(state, indentTemp + stream.current().length, ch); // else we match
-                            }
-                        }
-                        stream.backUp(stream.current().length - 1); // undo all the eating
-
-                        returnType = BRACKET;
-                    } else if (ch == ")" || ch == "]" || ch == "}") {
-                        returnType = BRACKET;
-                        if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : (ch == "]" ? "[" :"{"))) {
-                            popStack(state);
-                        }
-                    } else if ( ch == ":" ) {
-                        stream.eatWhile(tests.symbol);
-                        return ATOM;
-                    } else {
-                        stream.eatWhile(tests.symbol);
-
-                        if (keywords && keywords.propertyIsEnumerable(stream.current())) {
-                            returnType = KEYWORD;
-                        } else if (builtins && builtins.propertyIsEnumerable(stream.current())) {
-                            returnType = BUILTIN;
-                        } else if (atoms && atoms.propertyIsEnumerable(stream.current())) {
-                            returnType = ATOM;
-                        } else {
-                          returnType = VAR;
-                        }
-                    }
-            }
-
-            return returnType;
-        },
-
-        indent: function (state) {
-            if (state.indentStack == null) return state.indentation;
-            return state.indentStack.indent;
-        },
-
-        closeBrackets: {pairs: "()[]{}\"\""},
-        lineComment: ";;"
-    };
-});
-
-CodeMirror.defineMIME("text/x-clojure", "clojure");
-
-});
diff --git a/www/code/codemirror-5.7/mode/clojure/index.html b/www/code/codemirror-5.7/mode/clojure/index.html
deleted file mode 100644
index 3ecf4c486..000000000
--- a/www/code/codemirror-5.7/mode/clojure/index.html
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-CodeMirror: Clojure mode
-
-
-
-
-
-
-
-
-
-
    
-
    Clojure mode
    
-
    
-    
-
-    
    MIME types defined: text/x-clojure.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/cmake/cmake.js b/www/code/codemirror-5.7/mode/cmake/cmake.js
deleted file mode 100644
index 9f9eda541..000000000
--- a/www/code/codemirror-5.7/mode/cmake/cmake.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object")
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd)
-    define(["../../lib/codemirror"], mod);
-  else
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("cmake", function () {
-  var variable_regex = /({)?[a-zA-Z0-9_]+(})?/;
-
-  function tokenString(stream, state) {
-    var current, prev, found_var = false;
-    while (!stream.eol() && (current = stream.next()) != state.pending) {
-      if (current === '$' && prev != '\\' && state.pending == '"') {
-        found_var = true;
-        break;
-      }
-      prev = current;
-    }
-    if (found_var) {
-      stream.backUp(1);
-    }
-    if (current == state.pending) {
-      state.continueString = false;
-    } else {
-      state.continueString = true;
-    }
-    return "string";
-  }
-
-  function tokenize(stream, state) {
-    var ch = stream.next();
-
-    // Have we found a variable?
-    if (ch === '$') {
-      if (stream.match(variable_regex)) {
-        return 'variable-2';
-      }
-      return 'variable';
-    }
-    // Should we still be looking for the end of a string?
-    if (state.continueString) {
-      // If so, go through the loop again
-      stream.backUp(1);
-      return tokenString(stream, state);
-    }
-    // Do we just have a function on our hands?
-    // In 'cmake_minimum_required (VERSION 2.8.8)', 'cmake_minimum_required' is matched
-    if (stream.match(/(\s+)?\w+\(/) || stream.match(/(\s+)?\w+\ \(/)) {
-      stream.backUp(1);
-      return 'def';
-    }
-    if (ch == "#") {
-      stream.skipToEnd();
-      return "comment";
-    }
-    // Have we found a string?
-    if (ch == "'" || ch == '"') {
-      // Store the type (single or double)
-      state.pending = ch;
-      // Perform the looping function to find the end
-      return tokenString(stream, state);
-    }
-    if (ch == '(' || ch == ')') {
-      return 'bracket';
-    }
-    if (ch.match(/[0-9]/)) {
-      return 'number';
-    }
-    stream.eatWhile(/[\w-]/);
-    return null;
-  }
-  return {
-    startState: function () {
-      var state = {};
-      state.inDefinition = false;
-      state.inInclude = false;
-      state.continueString = false;
-      state.pending = false;
-      return state;
-    },
-    token: function (stream, state) {
-      if (stream.eatSpace()) return null;
-      return tokenize(stream, state);
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-cmake", "cmake");
-
-});
diff --git a/www/code/codemirror-5.7/mode/cmake/index.html b/www/code/codemirror-5.7/mode/cmake/index.html
deleted file mode 100644
index ed114fece..000000000
--- a/www/code/codemirror-5.7/mode/cmake/index.html
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-CodeMirror: CMake mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    CMake mode
    
-
    
-    
-
-    
    MIME types defined: text/x-cmake.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/cobol/cobol.js b/www/code/codemirror-5.7/mode/cobol/cobol.js
deleted file mode 100644
index 897022b18..000000000
--- a/www/code/codemirror-5.7/mode/cobol/cobol.js
+++ /dev/null
@@ -1,255 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**
- * Author: Gautam Mehta
- * Branched from CodeMirror's Scheme mode
- */
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("cobol", function () {
-  var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
-      ATOM = "atom", NUMBER = "number", KEYWORD = "keyword", MODTAG = "header",
-      COBOLLINENUM = "def", PERIOD = "link";
-  function makeKeywords(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var atoms = makeKeywords("TRUE FALSE ZEROES ZEROS ZERO SPACES SPACE LOW-VALUE LOW-VALUES ");
-  var keywords = makeKeywords(
-      "ACCEPT ACCESS ACQUIRE ADD ADDRESS " +
-      "ADVANCING AFTER ALIAS ALL ALPHABET " +
-      "ALPHABETIC ALPHABETIC-LOWER ALPHABETIC-UPPER ALPHANUMERIC ALPHANUMERIC-EDITED " +
-      "ALSO ALTER ALTERNATE AND ANY " +
-      "ARE AREA AREAS ARITHMETIC ASCENDING " +
-      "ASSIGN AT ATTRIBUTE AUTHOR AUTO " +
-      "AUTO-SKIP AUTOMATIC B-AND B-EXOR B-LESS " +
-      "B-NOT B-OR BACKGROUND-COLOR BACKGROUND-COLOUR BEEP " +
-      "BEFORE BELL BINARY BIT BITS " +
-      "BLANK BLINK BLOCK BOOLEAN BOTTOM " +
-      "BY CALL CANCEL CD CF " +
-      "CH CHARACTER CHARACTERS CLASS CLOCK-UNITS " +
-      "CLOSE COBOL CODE CODE-SET COL " +
-      "COLLATING COLUMN COMMA COMMIT COMMITMENT " +
-      "COMMON COMMUNICATION COMP COMP-0 COMP-1 " +
-      "COMP-2 COMP-3 COMP-4 COMP-5 COMP-6 " +
-      "COMP-7 COMP-8 COMP-9 COMPUTATIONAL COMPUTATIONAL-0 " +
-      "COMPUTATIONAL-1 COMPUTATIONAL-2 COMPUTATIONAL-3 COMPUTATIONAL-4 COMPUTATIONAL-5 " +
-      "COMPUTATIONAL-6 COMPUTATIONAL-7 COMPUTATIONAL-8 COMPUTATIONAL-9 COMPUTE " +
-      "CONFIGURATION CONNECT CONSOLE CONTAINED CONTAINS " +
-      "CONTENT CONTINUE CONTROL CONTROL-AREA CONTROLS " +
-      "CONVERTING COPY CORR CORRESPONDING COUNT " +
-      "CRT CRT-UNDER CURRENCY CURRENT CURSOR " +
-      "DATA DATE DATE-COMPILED DATE-WRITTEN DAY " +
-      "DAY-OF-WEEK DB DB-ACCESS-CONTROL-KEY DB-DATA-NAME DB-EXCEPTION " +
-      "DB-FORMAT-NAME DB-RECORD-NAME DB-SET-NAME DB-STATUS DBCS " +
-      "DBCS-EDITED DE DEBUG-CONTENTS DEBUG-ITEM DEBUG-LINE " +
-      "DEBUG-NAME DEBUG-SUB-1 DEBUG-SUB-2 DEBUG-SUB-3 DEBUGGING " +
-      "DECIMAL-POINT DECLARATIVES DEFAULT DELETE DELIMITED " +
-      "DELIMITER DEPENDING DESCENDING DESCRIBED DESTINATION " +
-      "DETAIL DISABLE DISCONNECT DISPLAY DISPLAY-1 " +
-      "DISPLAY-2 DISPLAY-3 DISPLAY-4 DISPLAY-5 DISPLAY-6 " +
-      "DISPLAY-7 DISPLAY-8 DISPLAY-9 DIVIDE DIVISION " +
-      "DOWN DROP DUPLICATE DUPLICATES DYNAMIC " +
-      "EBCDIC EGI EJECT ELSE EMI " +
-      "EMPTY EMPTY-CHECK ENABLE END END. END-ACCEPT END-ACCEPT. " +
-      "END-ADD END-CALL END-COMPUTE END-DELETE END-DISPLAY " +
-      "END-DIVIDE END-EVALUATE END-IF END-INVOKE END-MULTIPLY " +
-      "END-OF-PAGE END-PERFORM END-READ END-RECEIVE END-RETURN " +
-      "END-REWRITE END-SEARCH END-START END-STRING END-SUBTRACT " +
-      "END-UNSTRING END-WRITE END-XML ENTER ENTRY " +
-      "ENVIRONMENT EOP EQUAL EQUALS ERASE " +
-      "ERROR ESI EVALUATE EVERY EXCEEDS " +
-      "EXCEPTION EXCLUSIVE EXIT EXTEND EXTERNAL " +
-      "EXTERNALLY-DESCRIBED-KEY FD FETCH FILE FILE-CONTROL " +
-      "FILE-STREAM FILES FILLER FINAL FIND " +
-      "FINISH FIRST FOOTING FOR FOREGROUND-COLOR " +
-      "FOREGROUND-COLOUR FORMAT FREE FROM FULL " +
-      "FUNCTION GENERATE GET GIVING GLOBAL " +
-      "GO GOBACK GREATER GROUP HEADING " +
-      "HIGH-VALUE HIGH-VALUES HIGHLIGHT I-O I-O-CONTROL " +
-      "ID IDENTIFICATION IF IN INDEX " +
-      "INDEX-1 INDEX-2 INDEX-3 INDEX-4 INDEX-5 " +
-      "INDEX-6 INDEX-7 INDEX-8 INDEX-9 INDEXED " +
-      "INDIC INDICATE INDICATOR INDICATORS INITIAL " +
-      "INITIALIZE INITIATE INPUT INPUT-OUTPUT INSPECT " +
-      "INSTALLATION INTO INVALID INVOKE IS " +
-      "JUST JUSTIFIED KANJI KEEP KEY " +
-      "LABEL LAST LD LEADING LEFT " +
-      "LEFT-JUSTIFY LENGTH LENGTH-CHECK LESS LIBRARY " +
-      "LIKE LIMIT LIMITS LINAGE LINAGE-COUNTER " +
-      "LINE LINE-COUNTER LINES LINKAGE LOCAL-STORAGE " +
-      "LOCALE LOCALLY LOCK " +
-      "MEMBER MEMORY MERGE MESSAGE METACLASS " +
-      "MODE MODIFIED MODIFY MODULES MOVE " +
-      "MULTIPLE MULTIPLY NATIONAL NATIVE NEGATIVE " +
-      "NEXT NO NO-ECHO NONE NOT " +
-      "NULL NULL-KEY-MAP NULL-MAP NULLS NUMBER " +
-      "NUMERIC NUMERIC-EDITED OBJECT OBJECT-COMPUTER OCCURS " +
-      "OF OFF OMITTED ON ONLY " +
-      "OPEN OPTIONAL OR ORDER ORGANIZATION " +
-      "OTHER OUTPUT OVERFLOW OWNER PACKED-DECIMAL " +
-      "PADDING PAGE PAGE-COUNTER PARSE PERFORM " +
-      "PF PH PIC PICTURE PLUS " +
-      "POINTER POSITION POSITIVE PREFIX PRESENT " +
-      "PRINTING PRIOR PROCEDURE PROCEDURE-POINTER PROCEDURES " +
-      "PROCEED PROCESS PROCESSING PROGRAM PROGRAM-ID " +
-      "PROMPT PROTECTED PURGE QUEUE QUOTE " +
-      "QUOTES RANDOM RD READ READY " +
-      "REALM RECEIVE RECONNECT RECORD RECORD-NAME " +
-      "RECORDS RECURSIVE REDEFINES REEL REFERENCE " +
-      "REFERENCE-MONITOR REFERENCES RELATION RELATIVE RELEASE " +
-      "REMAINDER REMOVAL RENAMES REPEATED REPLACE " +
-      "REPLACING REPORT REPORTING REPORTS REPOSITORY " +
-      "REQUIRED RERUN RESERVE RESET RETAINING " +
-      "RETRIEVAL RETURN RETURN-CODE RETURNING REVERSE-VIDEO " +
-      "REVERSED REWIND REWRITE RF RH " +
-      "RIGHT RIGHT-JUSTIFY ROLLBACK ROLLING ROUNDED " +
-      "RUN SAME SCREEN SD SEARCH " +
-      "SECTION SECURE SECURITY SEGMENT SEGMENT-LIMIT " +
-      "SELECT SEND SENTENCE SEPARATE SEQUENCE " +
-      "SEQUENTIAL SET SHARED SIGN SIZE " +
-      "SKIP1 SKIP2 SKIP3 SORT SORT-MERGE " +
-      "SORT-RETURN SOURCE SOURCE-COMPUTER SPACE-FILL " +
-      "SPECIAL-NAMES STANDARD STANDARD-1 STANDARD-2 " +
-      "START STARTING STATUS STOP STORE " +
-      "STRING SUB-QUEUE-1 SUB-QUEUE-2 SUB-QUEUE-3 SUB-SCHEMA " +
-      "SUBFILE SUBSTITUTE SUBTRACT SUM SUPPRESS " +
-      "SYMBOLIC SYNC SYNCHRONIZED SYSIN SYSOUT " +
-      "TABLE TALLYING TAPE TENANT TERMINAL " +
-      "TERMINATE TEST TEXT THAN THEN " +
-      "THROUGH THRU TIME TIMES TITLE " +
-      "TO TOP TRAILING TRAILING-SIGN TRANSACTION " +
-      "TYPE TYPEDEF UNDERLINE UNEQUAL UNIT " +
-      "UNSTRING UNTIL UP UPDATE UPON " +
-      "USAGE USAGE-MODE USE USING VALID " +
-      "VALIDATE VALUE VALUES VARYING VLR " +
-      "WAIT WHEN WHEN-COMPILED WITH WITHIN " +
-      "WORDS WORKING-STORAGE WRITE XML XML-CODE " +
-      "XML-EVENT XML-NTEXT XML-TEXT ZERO ZERO-FILL " );
-
-  var builtins = makeKeywords("- * ** / + < <= = > >= ");
-  var tests = {
-    digit: /\d/,
-    digit_or_colon: /[\d:]/,
-    hex: /[0-9a-f]/i,
-    sign: /[+-]/,
-    exponent: /e/i,
-    keyword_char: /[^\s\(\[\;\)\]]/,
-    symbol: /[\w*+\-]/
-  };
-  function isNumber(ch, stream){
-    // hex
-    if ( ch === '0' && stream.eat(/x/i) ) {
-      stream.eatWhile(tests.hex);
-      return true;
-    }
-    // leading sign
-    if ( ( ch == '+' || ch == '-' ) && ( tests.digit.test(stream.peek()) ) ) {
-      stream.eat(tests.sign);
-      ch = stream.next();
-    }
-    if ( tests.digit.test(ch) ) {
-      stream.eat(ch);
-      stream.eatWhile(tests.digit);
-      if ( '.' == stream.peek()) {
-        stream.eat('.');
-        stream.eatWhile(tests.digit);
-      }
-      if ( stream.eat(tests.exponent) ) {
-        stream.eat(tests.sign);
-        stream.eatWhile(tests.digit);
-      }
-      return true;
-    }
-    return false;
-  }
-  return {
-    startState: function () {
-      return {
-        indentStack: null,
-        indentation: 0,
-        mode: false
-      };
-    },
-    token: function (stream, state) {
-      if (state.indentStack == null && stream.sol()) {
-        // update indentation, but only if indentStack is empty
-        state.indentation = 6 ; //stream.indentation();
-      }
-      // skip spaces
-      if (stream.eatSpace()) {
-        return null;
-      }
-      var returnType = null;
-      switch(state.mode){
-      case "string": // multi-line string parsing mode
-        var next = false;
-        while ((next = stream.next()) != null) {
-          if (next == "\"" || next == "\'") {
-            state.mode = false;
-            break;
-          }
-        }
-        returnType = STRING; // continue on in string mode
-        break;
-      default: // default parsing mode
-        var ch = stream.next();
-        var col = stream.column();
-        if (col >= 0 && col <= 5) {
-          returnType = COBOLLINENUM;
-        } else if (col >= 72 && col <= 79) {
-          stream.skipToEnd();
-          returnType = MODTAG;
-        } else if (ch == "*" && col == 6) { // comment
-          stream.skipToEnd(); // rest of the line is a comment
-          returnType = COMMENT;
-        } else if (ch == "\"" || ch == "\'") {
-          state.mode = "string";
-          returnType = STRING;
-        } else if (ch == "'" && !( tests.digit_or_colon.test(stream.peek()) )) {
-          returnType = ATOM;
-        } else if (ch == ".") {
-          returnType = PERIOD;
-        } else if (isNumber(ch,stream)){
-          returnType = NUMBER;
-        } else {
-          if (stream.current().match(tests.symbol)) {
-            while (col < 71) {
-              if (stream.eat(tests.symbol) === undefined) {
-                break;
-              } else {
-                col++;
-              }
-            }
-          }
-          if (keywords && keywords.propertyIsEnumerable(stream.current().toUpperCase())) {
-            returnType = KEYWORD;
-          } else if (builtins && builtins.propertyIsEnumerable(stream.current().toUpperCase())) {
-            returnType = BUILTIN;
-          } else if (atoms && atoms.propertyIsEnumerable(stream.current().toUpperCase())) {
-            returnType = ATOM;
-          } else returnType = null;
-        }
-      }
-      return returnType;
-    },
-    indent: function (state) {
-      if (state.indentStack == null) return state.indentation;
-      return state.indentStack.indent;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-cobol", "cobol");
-
-});
diff --git a/www/code/codemirror-5.7/mode/cobol/index.html b/www/code/codemirror-5.7/mode/cobol/index.html
deleted file mode 100644
index 4352419a0..000000000
--- a/www/code/codemirror-5.7/mode/cobol/index.html
+++ /dev/null
@@ -1,210 +0,0 @@
-
-
-CodeMirror: COBOL mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    COBOL mode
    
-
-    
     Select Theme     Select Font Size 
-
-
-
-
-
    
-
-    
-  
    
diff --git a/www/code/codemirror-5.7/mode/coffeescript/coffeescript.js b/www/code/codemirror-5.7/mode/coffeescript/coffeescript.js
deleted file mode 100644
index 1b96f85d8..000000000
--- a/www/code/codemirror-5.7/mode/coffeescript/coffeescript.js
+++ /dev/null
@@ -1,366 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**
- * Link to the project's GitHub page:
- * https://github.com/pickhardt/coffeescript-codemirror-mode
- */
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("coffeescript", function(conf, parserConf) {
-  var ERRORCLASS = "error";
-
-  function wordRegexp(words) {
-    return new RegExp("^((" + words.join(")|(") + "))\\b");
-  }
-
-  var operators = /^(?:->|=>|\+[+=]?|-[\-=]?|\*[\*=]?|\/[\/=]?|[=!]=|<[><]?=?|>>?=?|%=?|&=?|\|=?|\^=?|\~|!|\?|(or|and|\|\||&&|\?)=)/;
-  var delimiters = /^(?:[()\[\]{},:`=;]|\.\.?\.?)/;
-  var identifiers = /^[_A-Za-z$][_A-Za-z$0-9]*/;
-  var atProp = /^@[_A-Za-z$][_A-Za-z$0-9]*/;
-
-  var wordOperators = wordRegexp(["and", "or", "not",
-                                  "is", "isnt", "in",
-                                  "instanceof", "typeof"]);
-  var indentKeywords = ["for", "while", "loop", "if", "unless", "else",
-                        "switch", "try", "catch", "finally", "class"];
-  var commonKeywords = ["break", "by", "continue", "debugger", "delete",
-                        "do", "in", "of", "new", "return", "then",
-                        "this", "@", "throw", "when", "until", "extends"];
-
-  var keywords = wordRegexp(indentKeywords.concat(commonKeywords));
-
-  indentKeywords = wordRegexp(indentKeywords);
-
-
-  var stringPrefixes = /^('{3}|\"{3}|['\"])/;
-  var regexPrefixes = /^(\/{3}|\/)/;
-  var commonConstants = ["Infinity", "NaN", "undefined", "null", "true", "false", "on", "off", "yes", "no"];
-  var constants = wordRegexp(commonConstants);
-
-  // Tokenizers
-  function tokenBase(stream, state) {
-    // Handle scope changes
-    if (stream.sol()) {
-      if (state.scope.align === null) state.scope.align = false;
-      var scopeOffset = state.scope.offset;
-      if (stream.eatSpace()) {
-        var lineOffset = stream.indentation();
-        if (lineOffset > scopeOffset && state.scope.type == "coffee") {
-          return "indent";
-        } else if (lineOffset < scopeOffset) {
-          return "dedent";
-        }
-        return null;
-      } else {
-        if (scopeOffset > 0) {
-          dedent(stream, state);
-        }
-      }
-    }
-    if (stream.eatSpace()) {
-      return null;
-    }
-
-    var ch = stream.peek();
-
-    // Handle docco title comment (single line)
-    if (stream.match("####")) {
-      stream.skipToEnd();
-      return "comment";
-    }
-
-    // Handle multi line comments
-    if (stream.match("###")) {
-      state.tokenize = longComment;
-      return state.tokenize(stream, state);
-    }
-
-    // Single line comment
-    if (ch === "#") {
-      stream.skipToEnd();
-      return "comment";
-    }
-
-    // Handle number literals
-    if (stream.match(/^-?[0-9\.]/, false)) {
-      var floatLiteral = false;
-      // Floats
-      if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i)) {
-        floatLiteral = true;
-      }
-      if (stream.match(/^-?\d+\.\d*/)) {
-        floatLiteral = true;
-      }
-      if (stream.match(/^-?\.\d+/)) {
-        floatLiteral = true;
-      }
-
-      if (floatLiteral) {
-        // prevent from getting extra . on 1..
-        if (stream.peek() == "."){
-          stream.backUp(1);
-        }
-        return "number";
-      }
-      // Integers
-      var intLiteral = false;
-      // Hex
-      if (stream.match(/^-?0x[0-9a-f]+/i)) {
-        intLiteral = true;
-      }
-      // Decimal
-      if (stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/)) {
-        intLiteral = true;
-      }
-      // Zero by itself with no other piece of number.
-      if (stream.match(/^-?0(?![\dx])/i)) {
-        intLiteral = true;
-      }
-      if (intLiteral) {
-        return "number";
-      }
-    }
-
-    // Handle strings
-    if (stream.match(stringPrefixes)) {
-      state.tokenize = tokenFactory(stream.current(), false, "string");
-      return state.tokenize(stream, state);
-    }
-    // Handle regex literals
-    if (stream.match(regexPrefixes)) {
-      if (stream.current() != "/" || stream.match(/^.*\//, false)) { // prevent highlight of division
-        state.tokenize = tokenFactory(stream.current(), true, "string-2");
-        return state.tokenize(stream, state);
-      } else {
-        stream.backUp(1);
-      }
-    }
-
-
-
-    // Handle operators and delimiters
-    if (stream.match(operators) || stream.match(wordOperators)) {
-      return "operator";
-    }
-    if (stream.match(delimiters)) {
-      return "punctuation";
-    }
-
-    if (stream.match(constants)) {
-      return "atom";
-    }
-
-    if (stream.match(atProp) || state.prop && stream.match(identifiers)) {
-      return "property";
-    }
-
-    if (stream.match(keywords)) {
-      return "keyword";
-    }
-
-    if (stream.match(identifiers)) {
-      return "variable";
-    }
-
-    // Handle non-detected items
-    stream.next();
-    return ERRORCLASS;
-  }
-
-  function tokenFactory(delimiter, singleline, outclass) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        stream.eatWhile(/[^'"\/\\]/);
-        if (stream.eat("\\")) {
-          stream.next();
-          if (singleline && stream.eol()) {
-            return outclass;
-          }
-        } else if (stream.match(delimiter)) {
-          state.tokenize = tokenBase;
-          return outclass;
-        } else {
-          stream.eat(/['"\/]/);
-        }
-      }
-      if (singleline) {
-        if (parserConf.singleLineStringErrors) {
-          outclass = ERRORCLASS;
-        } else {
-          state.tokenize = tokenBase;
-        }
-      }
-      return outclass;
-    };
-  }
-
-  function longComment(stream, state) {
-    while (!stream.eol()) {
-      stream.eatWhile(/[^#]/);
-      if (stream.match("###")) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      stream.eatWhile("#");
-    }
-    return "comment";
-  }
-
-  function indent(stream, state, type) {
-    type = type || "coffee";
-    var offset = 0, align = false, alignOffset = null;
-    for (var scope = state.scope; scope; scope = scope.prev) {
-      if (scope.type === "coffee" || scope.type == "}") {
-        offset = scope.offset + conf.indentUnit;
-        break;
-      }
-    }
-    if (type !== "coffee") {
-      align = null;
-      alignOffset = stream.column() + stream.current().length;
-    } else if (state.scope.align) {
-      state.scope.align = false;
-    }
-    state.scope = {
-      offset: offset,
-      type: type,
-      prev: state.scope,
-      align: align,
-      alignOffset: alignOffset
-    };
-  }
-
-  function dedent(stream, state) {
-    if (!state.scope.prev) return;
-    if (state.scope.type === "coffee") {
-      var _indent = stream.indentation();
-      var matched = false;
-      for (var scope = state.scope; scope; scope = scope.prev) {
-        if (_indent === scope.offset) {
-          matched = true;
-          break;
-        }
-      }
-      if (!matched) {
-        return true;
-      }
-      while (state.scope.prev && state.scope.offset !== _indent) {
-        state.scope = state.scope.prev;
-      }
-      return false;
-    } else {
-      state.scope = state.scope.prev;
-      return false;
-    }
-  }
-
-  function tokenLexer(stream, state) {
-    var style = state.tokenize(stream, state);
-    var current = stream.current();
-
-    // Handle "." connected identifiers
-    if (false && current === ".") {
-      style = state.tokenize(stream, state);
-      current = stream.current();
-      if (/^\.[\w$]+$/.test(current)) {
-        return "variable";
-      } else {
-        return ERRORCLASS;
-      }
-    }
-
-    // Handle scope changes.
-    if (current === "return") {
-      state.dedent = true;
-    }
-    if (((current === "->" || current === "=>") && stream.eol())
-        || style === "indent") {
-      indent(stream, state);
-    }
-    var delimiter_index = "[({".indexOf(current);
-    if (delimiter_index !== -1) {
-      indent(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
-    }
-    if (indentKeywords.exec(current)){
-      indent(stream, state);
-    }
-    if (current == "then"){
-      dedent(stream, state);
-    }
-
-
-    if (style === "dedent") {
-      if (dedent(stream, state)) {
-        return ERRORCLASS;
-      }
-    }
-    delimiter_index = "])}".indexOf(current);
-    if (delimiter_index !== -1) {
-      while (state.scope.type == "coffee" && state.scope.prev)
-        state.scope = state.scope.prev;
-      if (state.scope.type == current)
-        state.scope = state.scope.prev;
-    }
-    if (state.dedent && stream.eol()) {
-      if (state.scope.type == "coffee" && state.scope.prev)
-        state.scope = state.scope.prev;
-      state.dedent = false;
-    }
-
-    return style;
-  }
-
-  var external = {
-    startState: function(basecolumn) {
-      return {
-        tokenize: tokenBase,
-        scope: {offset:basecolumn || 0, type:"coffee", prev: null, align: false},
-        prop: false,
-        dedent: 0
-      };
-    },
-
-    token: function(stream, state) {
-      var fillAlign = state.scope.align === null && state.scope;
-      if (fillAlign && stream.sol()) fillAlign.align = false;
-
-      var style = tokenLexer(stream, state);
-      if (style && style != "comment") {
-        if (fillAlign) fillAlign.align = true;
-        state.prop = style == "punctuation" && stream.current() == "."
-      }
-
-      return style;
-    },
-
-    indent: function(state, text) {
-      if (state.tokenize != tokenBase) return 0;
-      var scope = state.scope;
-      var closer = text && "])}".indexOf(text.charAt(0)) > -1;
-      if (closer) while (scope.type == "coffee" && scope.prev) scope = scope.prev;
-      var closes = closer && scope.type === text.charAt(0);
-      if (scope.align)
-        return scope.alignOffset - (closes ? 1 : 0);
-      else
-        return (closes ? scope.prev : scope).offset;
-    },
-
-    lineComment: "#",
-    fold: "indent"
-  };
-  return external;
-});
-
-CodeMirror.defineMIME("text/x-coffeescript", "coffeescript");
-CodeMirror.defineMIME("text/coffeescript", "coffeescript");
-
-});
diff --git a/www/code/codemirror-5.7/mode/coffeescript/index.html b/www/code/codemirror-5.7/mode/coffeescript/index.html
deleted file mode 100644
index 93a5f4f30..000000000
--- a/www/code/codemirror-5.7/mode/coffeescript/index.html
+++ /dev/null
@@ -1,740 +0,0 @@
-
-
-CodeMirror: CoffeeScript mode
-
-
-
-
-
-
-
-
-
-
    
-
    CoffeeScript mode
    
-
    
-    
-
-    
    MIME types defined: text/x-coffeescript.
    
-
-    
    The CoffeeScript mode was written by Jeff Pickhardt.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/commonlisp/commonlisp.js b/www/code/codemirror-5.7/mode/commonlisp/commonlisp.js
deleted file mode 100644
index fb1f99c63..000000000
--- a/www/code/codemirror-5.7/mode/commonlisp/commonlisp.js
+++ /dev/null
@@ -1,123 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("commonlisp", function (config) {
-  var specialForm = /^(block|let*|return-from|catch|load-time-value|setq|eval-when|locally|symbol-macrolet|flet|macrolet|tagbody|function|multiple-value-call|the|go|multiple-value-prog1|throw|if|progn|unwind-protect|labels|progv|let|quote)$/;
-  var assumeBody = /^with|^def|^do|^prog|case$|^cond$|bind$|when$|unless$/;
-  var numLiteral = /^(?:[+\-]?(?:\d+|\d*\.\d+)(?:[efd][+\-]?\d+)?|[+\-]?\d+(?:\/[+\-]?\d+)?|#b[+\-]?[01]+|#o[+\-]?[0-7]+|#x[+\-]?[\da-f]+)/;
-  var symbol = /[^\s'`,@()\[\]";]/;
-  var type;
-
-  function readSym(stream) {
-    var ch;
-    while (ch = stream.next()) {
-      if (ch == "\\") stream.next();
-      else if (!symbol.test(ch)) { stream.backUp(1); break; }
-    }
-    return stream.current();
-  }
-
-  function base(stream, state) {
-    if (stream.eatSpace()) {type = "ws"; return null;}
-    if (stream.match(numLiteral)) return "number";
-    var ch = stream.next();
-    if (ch == "\\") ch = stream.next();
-
-    if (ch == '"') return (state.tokenize = inString)(stream, state);
-    else if (ch == "(") { type = "open"; return "bracket"; }
-    else if (ch == ")" || ch == "]") { type = "close"; return "bracket"; }
-    else if (ch == ";") { stream.skipToEnd(); type = "ws"; return "comment"; }
-    else if (/['`,@]/.test(ch)) return null;
-    else if (ch == "|") {
-      if (stream.skipTo("|")) { stream.next(); return "symbol"; }
-      else { stream.skipToEnd(); return "error"; }
-    } else if (ch == "#") {
-      var ch = stream.next();
-      if (ch == "[") { type = "open"; return "bracket"; }
-      else if (/[+\-=\.']/.test(ch)) return null;
-      else if (/\d/.test(ch) && stream.match(/^\d*#/)) return null;
-      else if (ch == "|") return (state.tokenize = inComment)(stream, state);
-      else if (ch == ":") { readSym(stream); return "meta"; }
-      else return "error";
-    } else {
-      var name = readSym(stream);
-      if (name == ".") return null;
-      type = "symbol";
-      if (name == "nil" || name == "t" || name.charAt(0) == ":") return "atom";
-      if (state.lastType == "open" && (specialForm.test(name) || assumeBody.test(name))) return "keyword";
-      if (name.charAt(0) == "&") return "variable-2";
-      return "variable";
-    }
-  }
-
-  function inString(stream, state) {
-    var escaped = false, next;
-    while (next = stream.next()) {
-      if (next == '"' && !escaped) { state.tokenize = base; break; }
-      escaped = !escaped && next == "\\";
-    }
-    return "string";
-  }
-
-  function inComment(stream, state) {
-    var next, last;
-    while (next = stream.next()) {
-      if (next == "#" && last == "|") { state.tokenize = base; break; }
-      last = next;
-    }
-    type = "ws";
-    return "comment";
-  }
-
-  return {
-    startState: function () {
-      return {ctx: {prev: null, start: 0, indentTo: 0}, lastType: null, tokenize: base};
-    },
-
-    token: function (stream, state) {
-      if (stream.sol() && typeof state.ctx.indentTo != "number")
-        state.ctx.indentTo = state.ctx.start + 1;
-
-      type = null;
-      var style = state.tokenize(stream, state);
-      if (type != "ws") {
-        if (state.ctx.indentTo == null) {
-          if (type == "symbol" && assumeBody.test(stream.current()))
-            state.ctx.indentTo = state.ctx.start + config.indentUnit;
-          else
-            state.ctx.indentTo = "next";
-        } else if (state.ctx.indentTo == "next") {
-          state.ctx.indentTo = stream.column();
-        }
-        state.lastType = type;
-      }
-      if (type == "open") state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
-      else if (type == "close") state.ctx = state.ctx.prev || state.ctx;
-      return style;
-    },
-
-    indent: function (state, _textAfter) {
-      var i = state.ctx.indentTo;
-      return typeof i == "number" ? i : state.ctx.start + 1;
-    },
-
-    closeBrackets: {pairs: "()[]{}\"\""},
-    lineComment: ";;",
-    blockCommentStart: "#|",
-    blockCommentEnd: "|#"
-  };
-});
-
-CodeMirror.defineMIME("text/x-common-lisp", "commonlisp");
-
-});
diff --git a/www/code/codemirror-5.7/mode/commonlisp/index.html b/www/code/codemirror-5.7/mode/commonlisp/index.html
deleted file mode 100644
index f2bf4522d..000000000
--- a/www/code/codemirror-5.7/mode/commonlisp/index.html
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-CodeMirror: Common Lisp mode
-
-
-
-
-
-
-
-
-
-
    
-
    Common Lisp mode
    
-
    
-    
-
-    
    MIME types defined: text/x-common-lisp.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/css/css.js b/www/code/codemirror-5.7/mode/css/css.js
deleted file mode 100644
index 730085039..000000000
--- a/www/code/codemirror-5.7/mode/css/css.js
+++ /dev/null
@@ -1,823 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("css", function(config, parserConfig) {
-  var provided = parserConfig;
-  if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
-  parserConfig.inline = provided.inline;
-
-  var indentUnit = config.indentUnit,
-      tokenHooks = parserConfig.tokenHooks,
-      documentTypes = parserConfig.documentTypes || {},
-      mediaTypes = parserConfig.mediaTypes || {},
-      mediaFeatures = parserConfig.mediaFeatures || {},
-      mediaValueKeywords = parserConfig.mediaValueKeywords || {},
-      propertyKeywords = parserConfig.propertyKeywords || {},
-      nonStandardPropertyKeywords = parserConfig.nonStandardPropertyKeywords || {},
-      fontProperties = parserConfig.fontProperties || {},
-      counterDescriptors = parserConfig.counterDescriptors || {},
-      colorKeywords = parserConfig.colorKeywords || {},
-      valueKeywords = parserConfig.valueKeywords || {},
-      allowNested = parserConfig.allowNested,
-      supportsAtComponent = parserConfig.supportsAtComponent === true;
-
-  var type, override;
-  function ret(style, tp) { type = tp; return style; }
-
-  // Tokenizers
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (tokenHooks[ch]) {
-      var result = tokenHooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-    if (ch == "@") {
-      stream.eatWhile(/[\w\\\-]/);
-      return ret("def", stream.current());
-    } else if (ch == "=" || (ch == "~" || ch == "|") && stream.eat("=")) {
-      return ret(null, "compare");
-    } else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    } else if (ch == "#") {
-      stream.eatWhile(/[\w\\\-]/);
-      return ret("atom", "hash");
-    } else if (ch == "!") {
-      stream.match(/^\s*\w*/);
-      return ret("keyword", "important");
-    } else if (/\d/.test(ch) || ch == "." && stream.eat(/\d/)) {
-      stream.eatWhile(/[\w.%]/);
-      return ret("number", "unit");
-    } else if (ch === "-") {
-      if (/[\d.]/.test(stream.peek())) {
-        stream.eatWhile(/[\w.%]/);
-        return ret("number", "unit");
-      } else if (stream.match(/^-[\w\\\-]+/)) {
-        stream.eatWhile(/[\w\\\-]/);
-        if (stream.match(/^\s*:/, false))
-          return ret("variable-2", "variable-definition");
-        return ret("variable-2", "variable");
-      } else if (stream.match(/^\w+-/)) {
-        return ret("meta", "meta");
-      }
-    } else if (/[,+>*\/]/.test(ch)) {
-      return ret(null, "select-op");
-    } else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) {
-      return ret("qualifier", "qualifier");
-    } else if (/[:;{}\[\]\(\)]/.test(ch)) {
-      return ret(null, ch);
-    } else if ((ch == "u" && stream.match(/rl(-prefix)?\(/)) ||
-               (ch == "d" && stream.match("omain(")) ||
-               (ch == "r" && stream.match("egexp("))) {
-      stream.backUp(1);
-      state.tokenize = tokenParenthesized;
-      return ret("property", "word");
-    } else if (/[\w\\\-]/.test(ch)) {
-      stream.eatWhile(/[\w\\\-]/);
-      return ret("property", "word");
-    } else {
-      return ret(null, null);
-    }
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) {
-          if (quote == ")") stream.backUp(1);
-          break;
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      if (ch == quote || !escaped && quote != ")") state.tokenize = null;
-      return ret("string", "string");
-    };
-  }
-
-  function tokenParenthesized(stream, state) {
-    stream.next(); // Must be '('
-    if (!stream.match(/\s*[\"\')]/, false))
-      state.tokenize = tokenString(")");
-    else
-      state.tokenize = null;
-    return ret(null, "(");
-  }
-
-  // Context management
-
-  function Context(type, indent, prev) {
-    this.type = type;
-    this.indent = indent;
-    this.prev = prev;
-  }
-
-  function pushContext(state, stream, type, indent) {
-    state.context = new Context(type, stream.indentation() + (indent === false ? 0 : indentUnit), state.context);
-    return type;
-  }
-
-  function popContext(state) {
-    if (state.context.prev)
-      state.context = state.context.prev;
-    return state.context.type;
-  }
-
-  function pass(type, stream, state) {
-    return states[state.context.type](type, stream, state);
-  }
-  function popAndPass(type, stream, state, n) {
-    for (var i = n || 1; i > 0; i--)
-      state.context = state.context.prev;
-    return pass(type, stream, state);
-  }
-
-  // Parser
-
-  function wordAsValue(stream) {
-    var word = stream.current().toLowerCase();
-    if (valueKeywords.hasOwnProperty(word))
-      override = "atom";
-    else if (colorKeywords.hasOwnProperty(word))
-      override = "keyword";
-    else
-      override = "variable";
-  }
-
-  var states = {};
-
-  states.top = function(type, stream, state) {
-    if (type == "{") {
-      return pushContext(state, stream, "block");
-    } else if (type == "}" && state.context.prev) {
-      return popContext(state);
-    } else if (supportsAtComponent && /@component/.test(type)) {
-      return pushContext(state, stream, "atComponentBlock");
-    } else if (/^@(-moz-)?document$/.test(type)) {
-      return pushContext(state, stream, "documentTypes");
-    } else if (/^@(media|supports|(-moz-)?document|import)$/.test(type)) {
-      return pushContext(state, stream, "atBlock");
-    } else if (/^@(font-face|counter-style)/.test(type)) {
-      state.stateArg = type;
-      return "restricted_atBlock_before";
-    } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
-      return "keyframes";
-    } else if (type && type.charAt(0) == "@") {
-      return pushContext(state, stream, "at");
-    } else if (type == "hash") {
-      override = "builtin";
-    } else if (type == "word") {
-      override = "tag";
-    } else if (type == "variable-definition") {
-      return "maybeprop";
-    } else if (type == "interpolation") {
-      return pushContext(state, stream, "interpolation");
-    } else if (type == ":") {
-      return "pseudo";
-    } else if (allowNested && type == "(") {
-      return pushContext(state, stream, "parens");
-    }
-    return state.context.type;
-  };
-
-  states.block = function(type, stream, state) {
-    if (type == "word") {
-      var word = stream.current().toLowerCase();
-      if (propertyKeywords.hasOwnProperty(word)) {
-        override = "property";
-        return "maybeprop";
-      } else if (nonStandardPropertyKeywords.hasOwnProperty(word)) {
-        override = "string-2";
-        return "maybeprop";
-      } else if (allowNested) {
-        override = stream.match(/^\s*:(?:\s|$)/, false) ? "property" : "tag";
-        return "block";
-      } else {
-        override += " error";
-        return "maybeprop";
-      }
-    } else if (type == "meta") {
-      return "block";
-    } else if (!allowNested && (type == "hash" || type == "qualifier")) {
-      override = "error";
-      return "block";
-    } else {
-      return states.top(type, stream, state);
-    }
-  };
-
-  states.maybeprop = function(type, stream, state) {
-    if (type == ":") return pushContext(state, stream, "prop");
-    return pass(type, stream, state);
-  };
-
-  states.prop = function(type, stream, state) {
-    if (type == ";") return popContext(state);
-    if (type == "{" && allowNested) return pushContext(state, stream, "propBlock");
-    if (type == "}" || type == "{") return popAndPass(type, stream, state);
-    if (type == "(") return pushContext(state, stream, "parens");
-
-    if (type == "hash" && !/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
-      override += " error";
-    } else if (type == "word") {
-      wordAsValue(stream);
-    } else if (type == "interpolation") {
-      return pushContext(state, stream, "interpolation");
-    }
-    return "prop";
-  };
-
-  states.propBlock = function(type, _stream, state) {
-    if (type == "}") return popContext(state);
-    if (type == "word") { override = "property"; return "maybeprop"; }
-    return state.context.type;
-  };
-
-  states.parens = function(type, stream, state) {
-    if (type == "{" || type == "}") return popAndPass(type, stream, state);
-    if (type == ")") return popContext(state);
-    if (type == "(") return pushContext(state, stream, "parens");
-    if (type == "interpolation") return pushContext(state, stream, "interpolation");
-    if (type == "word") wordAsValue(stream);
-    return "parens";
-  };
-
-  states.pseudo = function(type, stream, state) {
-    if (type == "word") {
-      override = "variable-3";
-      return state.context.type;
-    }
-    return pass(type, stream, state);
-  };
-
-  states.documentTypes = function(type, stream, state) {
-    if (type == "word" && documentTypes.hasOwnProperty(stream.current())) {
-      override = "tag";
-      return state.context.type;
-    } else {
-      return states.atBlock(type, stream, state);
-    }
-  };
-
-  states.atBlock = function(type, stream, state) {
-    if (type == "(") return pushContext(state, stream, "atBlock_parens");
-    if (type == "}" || type == ";") return popAndPass(type, stream, state);
-    if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
-
-    if (type == "word") {
-      var word = stream.current().toLowerCase();
-      if (word == "only" || word == "not" || word == "and" || word == "or")
-        override = "keyword";
-      else if (mediaTypes.hasOwnProperty(word))
-        override = "attribute";
-      else if (mediaFeatures.hasOwnProperty(word))
-        override = "property";
-      else if (mediaValueKeywords.hasOwnProperty(word))
-        override = "keyword";
-      else if (propertyKeywords.hasOwnProperty(word))
-        override = "property";
-      else if (nonStandardPropertyKeywords.hasOwnProperty(word))
-        override = "string-2";
-      else if (valueKeywords.hasOwnProperty(word))
-        override = "atom";
-      else if (colorKeywords.hasOwnProperty(word))
-        override = "keyword";
-      else
-        override = "error";
-    }
-    return state.context.type;
-  };
-
-  states.atComponentBlock = function(type, stream, state) {
-    if (type == "}")
-      return popAndPass(type, stream, state);
-    if (type == "{")
-      return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top", false);
-    if (type == "word")
-      override = "error";
-    return state.context.type;
-  };
-
-  states.atBlock_parens = function(type, stream, state) {
-    if (type == ")") return popContext(state);
-    if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
-    return states.atBlock(type, stream, state);
-  };
-
-  states.restricted_atBlock_before = function(type, stream, state) {
-    if (type == "{")
-      return pushContext(state, stream, "restricted_atBlock");
-    if (type == "word" && state.stateArg == "@counter-style") {
-      override = "variable";
-      return "restricted_atBlock_before";
-    }
-    return pass(type, stream, state);
-  };
-
-  states.restricted_atBlock = function(type, stream, state) {
-    if (type == "}") {
-      state.stateArg = null;
-      return popContext(state);
-    }
-    if (type == "word") {
-      if ((state.stateArg == "@font-face" && !fontProperties.hasOwnProperty(stream.current().toLowerCase())) ||
-          (state.stateArg == "@counter-style" && !counterDescriptors.hasOwnProperty(stream.current().toLowerCase())))
-        override = "error";
-      else
-        override = "property";
-      return "maybeprop";
-    }
-    return "restricted_atBlock";
-  };
-
-  states.keyframes = function(type, stream, state) {
-    if (type == "word") { override = "variable"; return "keyframes"; }
-    if (type == "{") return pushContext(state, stream, "top");
-    return pass(type, stream, state);
-  };
-
-  states.at = function(type, stream, state) {
-    if (type == ";") return popContext(state);
-    if (type == "{" || type == "}") return popAndPass(type, stream, state);
-    if (type == "word") override = "tag";
-    else if (type == "hash") override = "builtin";
-    return "at";
-  };
-
-  states.interpolation = function(type, stream, state) {
-    if (type == "}") return popContext(state);
-    if (type == "{" || type == ";") return popAndPass(type, stream, state);
-    if (type == "word") override = "variable";
-    else if (type != "variable" && type != "(" && type != ")") override = "error";
-    return "interpolation";
-  };
-
-  return {
-    startState: function(base) {
-      return {tokenize: null,
-              state: parserConfig.inline ? "block" : "top",
-              stateArg: null,
-              context: new Context(parserConfig.inline ? "block" : "top", base || 0, null)};
-    },
-
-    token: function(stream, state) {
-      if (!state.tokenize && stream.eatSpace()) return null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style && typeof style == "object") {
-        type = style[1];
-        style = style[0];
-      }
-      override = style;
-      state.state = states[state.state](type, stream, state);
-      return override;
-    },
-
-    indent: function(state, textAfter) {
-      var cx = state.context, ch = textAfter && textAfter.charAt(0);
-      var indent = cx.indent;
-      if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev;
-      if (cx.prev) {
-        if (ch == "}" && (cx.type == "block" || cx.type == "top" ||
-                          cx.type == "interpolation" || cx.type == "restricted_atBlock")) {
-          // Resume indentation from parent context.
-          cx = cx.prev;
-          indent = cx.indent;
-        } else if (ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
-            ch == "{" && (cx.type == "at" || cx.type == "atBlock")) {
-          // Dedent relative to current context.
-          indent = Math.max(0, cx.indent - indentUnit);
-          cx = cx.prev;
-        }
-      }
-      return indent;
-    },
-
-    electricChars: "}",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    fold: "brace"
-  };
-});
-
-  function keySet(array) {
-    var keys = {};
-    for (var i = 0; i < array.length; ++i) {
-      keys[array[i]] = true;
-    }
-    return keys;
-  }
-
-  var documentTypes_ = [
-    "domain", "regexp", "url", "url-prefix"
-  ], documentTypes = keySet(documentTypes_);
-
-  var mediaTypes_ = [
-    "all", "aural", "braille", "handheld", "print", "projection", "screen",
-    "tty", "tv", "embossed"
-  ], mediaTypes = keySet(mediaTypes_);
-
-  var mediaFeatures_ = [
-    "width", "min-width", "max-width", "height", "min-height", "max-height",
-    "device-width", "min-device-width", "max-device-width", "device-height",
-    "min-device-height", "max-device-height", "aspect-ratio",
-    "min-aspect-ratio", "max-aspect-ratio", "device-aspect-ratio",
-    "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color",
-    "max-color", "color-index", "min-color-index", "max-color-index",
-    "monochrome", "min-monochrome", "max-monochrome", "resolution",
-    "min-resolution", "max-resolution", "scan", "grid", "orientation",
-    "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio",
-    "pointer", "any-pointer", "hover", "any-hover"
-  ], mediaFeatures = keySet(mediaFeatures_);
-
-  var mediaValueKeywords_ = [
-    "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover",
-    "interlace", "progressive"
-  ], mediaValueKeywords = keySet(mediaValueKeywords_);
-
-  var propertyKeywords_ = [
-    "align-content", "align-items", "align-self", "alignment-adjust",
-    "alignment-baseline", "anchor-point", "animation", "animation-delay",
-    "animation-direction", "animation-duration", "animation-fill-mode",
-    "animation-iteration-count", "animation-name", "animation-play-state",
-    "animation-timing-function", "appearance", "azimuth", "backface-visibility",
-    "background", "background-attachment", "background-clip", "background-color",
-    "background-image", "background-origin", "background-position",
-    "background-repeat", "background-size", "baseline-shift", "binding",
-    "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
-    "bookmark-target", "border", "border-bottom", "border-bottom-color",
-    "border-bottom-left-radius", "border-bottom-right-radius",
-    "border-bottom-style", "border-bottom-width", "border-collapse",
-    "border-color", "border-image", "border-image-outset",
-    "border-image-repeat", "border-image-slice", "border-image-source",
-    "border-image-width", "border-left", "border-left-color",
-    "border-left-style", "border-left-width", "border-radius", "border-right",
-    "border-right-color", "border-right-style", "border-right-width",
-    "border-spacing", "border-style", "border-top", "border-top-color",
-    "border-top-left-radius", "border-top-right-radius", "border-top-style",
-    "border-top-width", "border-width", "bottom", "box-decoration-break",
-    "box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
-    "caption-side", "clear", "clip", "color", "color-profile", "column-count",
-    "column-fill", "column-gap", "column-rule", "column-rule-color",
-    "column-rule-style", "column-rule-width", "column-span", "column-width",
-    "columns", "content", "counter-increment", "counter-reset", "crop", "cue",
-    "cue-after", "cue-before", "cursor", "direction", "display",
-    "dominant-baseline", "drop-initial-after-adjust",
-    "drop-initial-after-align", "drop-initial-before-adjust",
-    "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
-    "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
-    "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
-    "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings",
-    "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust",
-    "font-stretch", "font-style", "font-synthesis", "font-variant",
-    "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
-    "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
-    "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow",
-    "grid-auto-position", "grid-auto-rows", "grid-column", "grid-column-end",
-    "grid-column-start", "grid-row", "grid-row-end", "grid-row-start",
-    "grid-template", "grid-template-areas", "grid-template-columns",
-    "grid-template-rows", "hanging-punctuation", "height", "hyphens",
-    "icon", "image-orientation", "image-rendering", "image-resolution",
-    "inline-box-align", "justify-content", "left", "letter-spacing",
-    "line-break", "line-height", "line-stacking", "line-stacking-ruby",
-    "line-stacking-shift", "line-stacking-strategy", "list-style",
-    "list-style-image", "list-style-position", "list-style-type", "margin",
-    "margin-bottom", "margin-left", "margin-right", "margin-top",
-    "marker-offset", "marks", "marquee-direction", "marquee-loop",
-    "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
-    "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index",
-    "nav-left", "nav-right", "nav-up", "object-fit", "object-position",
-    "opacity", "order", "orphans", "outline",
-    "outline-color", "outline-offset", "outline-style", "outline-width",
-    "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y",
-    "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
-    "page", "page-break-after", "page-break-before", "page-break-inside",
-    "page-policy", "pause", "pause-after", "pause-before", "perspective",
-    "perspective-origin", "pitch", "pitch-range", "play-during", "position",
-    "presentation-level", "punctuation-trim", "quotes", "region-break-after",
-    "region-break-before", "region-break-inside", "region-fragment",
-    "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
-    "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang",
-    "ruby-position", "ruby-span", "shape-image-threshold", "shape-inside", "shape-margin",
-    "shape-outside", "size", "speak", "speak-as", "speak-header",
-    "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
-    "tab-size", "table-layout", "target", "target-name", "target-new",
-    "target-position", "text-align", "text-align-last", "text-decoration",
-    "text-decoration-color", "text-decoration-line", "text-decoration-skip",
-    "text-decoration-style", "text-emphasis", "text-emphasis-color",
-    "text-emphasis-position", "text-emphasis-style", "text-height",
-    "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow",
-    "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position",
-    "text-wrap", "top", "transform", "transform-origin", "transform-style",
-    "transition", "transition-delay", "transition-duration",
-    "transition-property", "transition-timing-function", "unicode-bidi",
-    "vertical-align", "visibility", "voice-balance", "voice-duration",
-    "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
-    "voice-volume", "volume", "white-space", "widows", "width", "word-break",
-    "word-spacing", "word-wrap", "z-index",
-    // SVG-specific
-    "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
-    "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
-    "color-interpolation", "color-interpolation-filters",
-    "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering",
-    "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke",
-    "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin",
-    "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering",
-    "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal",
-    "glyph-orientation-vertical", "text-anchor", "writing-mode"
-  ], propertyKeywords = keySet(propertyKeywords_);
-
-  var nonStandardPropertyKeywords_ = [
-    "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",
-    "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color",
-    "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside",
-    "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button",
-    "searchfield-results-decoration", "zoom"
-  ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_);
-
-  var fontProperties_ = [
-    "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
-    "font-stretch", "font-weight", "font-style"
-  ], fontProperties = keySet(fontProperties_);
-
-  var counterDescriptors_ = [
-    "additive-symbols", "fallback", "negative", "pad", "prefix", "range",
-    "speak-as", "suffix", "symbols", "system"
-  ], counterDescriptors = keySet(counterDescriptors_);
-
-  var colorKeywords_ = [
-    "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
-    "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
-    "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue",
-    "cornsilk", "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod",
-    "darkgray", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen",
-    "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen",
-    "darkslateblue", "darkslategray", "darkturquoise", "darkviolet",
-    "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick",
-    "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite",
-    "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew",
-    "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender",
-    "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral",
-    "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightpink",
-    "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray",
-    "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta",
-    "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple",
-    "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise",
-    "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin",
-    "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered",
-    "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred",
-    "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue",
-    "purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown",
-    "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",
-    "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan",
-    "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white",
-    "whitesmoke", "yellow", "yellowgreen"
-  ], colorKeywords = keySet(colorKeywords_);
-
-  var valueKeywords_ = [
-    "above", "absolute", "activeborder", "additive", "activecaption", "afar",
-    "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
-    "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
-    "arabic-indic", "armenian", "asterisks", "attr", "auto", "avoid", "avoid-column", "avoid-page",
-    "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
-    "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
-    "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",
-    "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian",
-    "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
-    "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
-    "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
-    "col-resize", "collapse", "column", "column-reverse", "compact", "condensed", "contain", "content",
-    "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
-    "cross", "crosshair", "currentcolor", "cursive", "cyclic", "dashed", "decimal",
-    "decimal-leading-zero", "default", "default-button", "destination-atop",
-    "destination-in", "destination-out", "destination-over", "devanagari",
-    "disc", "discard", "disclosure-closed", "disclosure-open", "document",
-    "dot-dash", "dot-dot-dash",
-    "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
-    "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
-    "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
-    "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
-    "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et",
-    "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
-    "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
-    "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
-    "ethiopic-numeric", "ew-resize", "expanded", "extends", "extra-condensed",
-    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
-    "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
-    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hebrew",
-    "help", "hidden", "hide", "higher", "highlight", "highlighttext",
-    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "icon", "ignore",
-    "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
-    "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
-    "inline-block", "inline-flex", "inline-table", "inset", "inside", "intrinsic", "invert",
-    "italic", "japanese-formal", "japanese-informal", "justify", "kannada",
-    "katakana", "katakana-iroha", "keep-all", "khmer",
-    "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal",
-    "landscape", "lao", "large", "larger", "left", "level", "lighter",
-    "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem",
-    "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
-    "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
-    "lower-roman", "lowercase", "ltr", "malayalam", "match", "matrix", "matrix3d",
-    "media-controls-background", "media-current-time-display",
-    "media-fullscreen-button", "media-mute-button", "media-play-button",
-    "media-return-to-realtime-button", "media-rewind-button",
-    "media-seek-back-button", "media-seek-forward-button", "media-slider",
-    "media-sliderthumb", "media-time-remaining-display", "media-volume-slider",
-    "media-volume-slider-container", "media-volume-sliderthumb", "medium",
-    "menu", "menulist", "menulist-button", "menulist-text",
-    "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
-    "mix", "mongolian", "monospace", "move", "multiple", "myanmar", "n-resize",
-    "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
-    "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
-    "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
-    "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
-    "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
-    "painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter",
-    "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d",
-    "progress", "push-button", "radial-gradient", "radio", "read-only",
-    "read-write", "read-write-plaintext-only", "rectangle", "region",
-    "relative", "repeat", "repeating-linear-gradient",
-    "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
-    "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
-    "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
-    "s-resize", "sans-serif", "scale", "scale3d", "scaleX", "scaleY", "scaleZ",
-    "scroll", "scrollbar", "se-resize", "searchfield",
-    "searchfield-cancel-button", "searchfield-decoration",
-    "searchfield-results-button", "searchfield-results-decoration",
-    "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
-    "simp-chinese-formal", "simp-chinese-informal", "single",
-    "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
-    "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
-    "small", "small-caps", "small-caption", "smaller", "solid", "somali",
-    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
-    "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
-    "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table",
-    "table-caption", "table-cell", "table-column", "table-column-group",
-    "table-footer-group", "table-header-group", "table-row", "table-row-group",
-    "tamil",
-    "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai",
-    "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
-    "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
-    "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
-    "trad-chinese-formal", "trad-chinese-informal",
-    "translate", "translate3d", "translateX", "translateY", "translateZ",
-    "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
-    "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
-    "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
-    "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
-    "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
-    "window", "windowframe", "windowtext", "words", "wrap", "wrap-reverse", "x-large", "x-small", "xor",
-    "xx-large", "xx-small"
-  ], valueKeywords = keySet(valueKeywords_);
-
-  var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(mediaValueKeywords_)
-    .concat(propertyKeywords_).concat(nonStandardPropertyKeywords_).concat(colorKeywords_)
-    .concat(valueKeywords_);
-  CodeMirror.registerHelper("hintWords", "css", allWords);
-
-  function tokenCComment(stream, state) {
-    var maybeEnd = false, ch;
-    while ((ch = stream.next()) != null) {
-      if (maybeEnd && ch == "/") {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ["comment", "comment"];
-  }
-
-  CodeMirror.defineMIME("text/css", {
-    documentTypes: documentTypes,
-    mediaTypes: mediaTypes,
-    mediaFeatures: mediaFeatures,
-    mediaValueKeywords: mediaValueKeywords,
-    propertyKeywords: propertyKeywords,
-    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
-    fontProperties: fontProperties,
-    counterDescriptors: counterDescriptors,
-    colorKeywords: colorKeywords,
-    valueKeywords: valueKeywords,
-    tokenHooks: {
-      "/": function(stream, state) {
-        if (!stream.eat("*")) return false;
-        state.tokenize = tokenCComment;
-        return tokenCComment(stream, state);
-      }
-    },
-    name: "css"
-  });
-
-  CodeMirror.defineMIME("text/x-scss", {
-    mediaTypes: mediaTypes,
-    mediaFeatures: mediaFeatures,
-    mediaValueKeywords: mediaValueKeywords,
-    propertyKeywords: propertyKeywords,
-    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
-    colorKeywords: colorKeywords,
-    valueKeywords: valueKeywords,
-    fontProperties: fontProperties,
-    allowNested: true,
-    tokenHooks: {
-      "/": function(stream, state) {
-        if (stream.eat("/")) {
-          stream.skipToEnd();
-          return ["comment", "comment"];
-        } else if (stream.eat("*")) {
-          state.tokenize = tokenCComment;
-          return tokenCComment(stream, state);
-        } else {
-          return ["operator", "operator"];
-        }
-      },
-      ":": function(stream) {
-        if (stream.match(/\s*\{/))
-          return [null, "{"];
-        return false;
-      },
-      "$": function(stream) {
-        stream.match(/^[\w-]+/);
-        if (stream.match(/^\s*:/, false))
-          return ["variable-2", "variable-definition"];
-        return ["variable-2", "variable"];
-      },
-      "#": function(stream) {
-        if (!stream.eat("{")) return false;
-        return [null, "interpolation"];
-      }
-    },
-    name: "css",
-    helperType: "scss"
-  });
-
-  CodeMirror.defineMIME("text/x-less", {
-    mediaTypes: mediaTypes,
-    mediaFeatures: mediaFeatures,
-    mediaValueKeywords: mediaValueKeywords,
-    propertyKeywords: propertyKeywords,
-    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
-    colorKeywords: colorKeywords,
-    valueKeywords: valueKeywords,
-    fontProperties: fontProperties,
-    allowNested: true,
-    tokenHooks: {
-      "/": function(stream, state) {
-        if (stream.eat("/")) {
-          stream.skipToEnd();
-          return ["comment", "comment"];
-        } else if (stream.eat("*")) {
-          state.tokenize = tokenCComment;
-          return tokenCComment(stream, state);
-        } else {
-          return ["operator", "operator"];
-        }
-      },
-      "@": function(stream) {
-        if (stream.eat("{")) return [null, "interpolation"];
-        if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/, false)) return false;
-        stream.eatWhile(/[\w\\\-]/);
-        if (stream.match(/^\s*:/, false))
-          return ["variable-2", "variable-definition"];
-        return ["variable-2", "variable"];
-      },
-      "&": function() {
-        return ["atom", "atom"];
-      }
-    },
-    name: "css",
-    helperType: "less"
-  });
-
-  CodeMirror.defineMIME("text/x-gss", {
-    documentTypes: documentTypes,
-    mediaTypes: mediaTypes,
-    mediaFeatures: mediaFeatures,
-    propertyKeywords: propertyKeywords,
-    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
-    fontProperties: fontProperties,
-    counterDescriptors: counterDescriptors,
-    colorKeywords: colorKeywords,
-    valueKeywords: valueKeywords,
-    supportsAtComponent: true,
-    tokenHooks: {
-      "/": function(stream, state) {
-        if (!stream.eat("*")) return false;
-        state.tokenize = tokenCComment;
-        return tokenCComment(stream, state);
-      }
-    },
-    name: "css",
-    helperType: "gss"
-  });
-
-});
diff --git a/www/code/codemirror-5.7/mode/css/gss.html b/www/code/codemirror-5.7/mode/css/gss.html
deleted file mode 100644
index 232fe8c12..000000000
--- a/www/code/codemirror-5.7/mode/css/gss.html
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-CodeMirror: Closure Stylesheets (GSS) mode
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Closure Stylesheets (GSS) mode
    
-
    
-    
-
-    
    A mode for Closure Stylesheets (GSS).
    
-    
    MIME type defined: text/x-gss.
    
-
-    
    Parsing/Highlighting Tests: normal,  verbose.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/css/gss_test.js b/www/code/codemirror-5.7/mode/css/gss_test.js
deleted file mode 100644
index d56e59280..000000000
--- a/www/code/codemirror-5.7/mode/css/gss_test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  "use strict";
-
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-gss");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "gss"); }
-
-  MT("atComponent",
-     "[def @component] {",
-     "[tag foo] {",
-     "  [property color]: [keyword black];",
-     "}",
-     "}");
-
-})();
diff --git a/www/code/codemirror-5.7/mode/css/index.html b/www/code/codemirror-5.7/mode/css/index.html
deleted file mode 100644
index 2d2b9b073..000000000
--- a/www/code/codemirror-5.7/mode/css/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-CodeMirror: CSS mode
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    CSS mode
    
-
    
-    
-
-    
    MIME types defined: text/css, text/x-scss (demo), text/x-less (demo).
    
-
-    
    Parsing/Highlighting Tests: normal,  verbose.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/css/less.html b/www/code/codemirror-5.7/mode/css/less.html
deleted file mode 100644
index adf7427d3..000000000
--- a/www/code/codemirror-5.7/mode/css/less.html
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-CodeMirror: LESS mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    LESS mode
    
-
    
-    
-
-    
    The LESS mode is a sub-mode of the CSS mode (defined in css.js).
    
-
-    
    Parsing/Highlighting Tests: normal,  verbose.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/css/less_test.js b/www/code/codemirror-5.7/mode/css/less_test.js
deleted file mode 100644
index 7b77f5848..000000000
--- a/www/code/codemirror-5.7/mode/css/less_test.js
+++ /dev/null
@@ -1,54 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  "use strict";
-
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-less");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "less"); }
-
-  MT("variable",
-     "[variable-2 @base]: [atom #f04615];",
-     "[qualifier .class] {",
-     "  [property width]: [variable percentage]([number 0.5]); [comment // returns `50%`]",
-     "  [property color]: [variable saturate]([variable-2 @base], [number 5%]);",
-     "}");
-
-  MT("amp",
-     "[qualifier .child], [qualifier .sibling] {",
-     "  [qualifier .parent] [atom &] {",
-     "    [property color]: [keyword black];",
-     "  }",
-     "  [atom &] + [atom &] {",
-     "    [property color]: [keyword red];",
-     "  }",
-     "}");
-
-  MT("mixin",
-     "[qualifier .mixin] ([variable dark]; [variable-2 @color]) {",
-     "  [property color]: [variable darken]([variable-2 @color], [number 10%]);",
-     "}",
-     "[qualifier .mixin] ([variable light]; [variable-2 @color]) {",
-     "  [property color]: [variable lighten]([variable-2 @color], [number 10%]);",
-     "}",
-     "[qualifier .mixin] ([variable-2 @_]; [variable-2 @color]) {",
-     "  [property display]: [atom block];",
-     "}",
-     "[variable-2 @switch]: [variable light];",
-     "[qualifier .class] {",
-     "  [qualifier .mixin]([variable-2 @switch]; [atom #888]);",
-     "}");
-
-  MT("nest",
-     "[qualifier .one] {",
-     "  [def @media] ([property width]: [number 400px]) {",
-     "    [property font-size]: [number 1.2em];",
-     "    [def @media] [attribute print] [keyword and] [property color] {",
-     "      [property color]: [keyword blue];",
-     "    }",
-     "  }",
-     "}");
-
-
-  MT("interpolation", ".@{[variable foo]} { [property font-weight]: [atom bold]; }");
-})();
diff --git a/www/code/codemirror-5.7/mode/css/scss.html b/www/code/codemirror-5.7/mode/css/scss.html
deleted file mode 100644
index f8e4d3736..000000000
--- a/www/code/codemirror-5.7/mode/css/scss.html
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-CodeMirror: SCSS mode
-
-
-
-
-
-
-
-
-
-
    
-
    SCSS mode
    
-
    
-    
-
-    
    The SCSS mode is a sub-mode of the CSS mode (defined in css.js).
    
-
-    
    Parsing/Highlighting Tests: normal,  verbose.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/css/scss_test.js b/www/code/codemirror-5.7/mode/css/scss_test.js
deleted file mode 100644
index 26c226a1e..000000000
--- a/www/code/codemirror-5.7/mode/css/scss_test.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-scss");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "scss"); }
-
-  MT('url_with_quotation',
-    "[tag foo] { [property background]:[atom url]([string test.jpg]) }");
-
-  MT('url_with_double_quotes',
-    "[tag foo] { [property background]:[atom url]([string \"test.jpg\"]) }");
-
-  MT('url_with_single_quotes',
-    "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) }");
-
-  MT('string',
-    "[def @import] [string \"compass/css3\"]");
-
-  MT('important_keyword',
-    "[tag foo] { [property background]:[atom url]([string \'test.jpg\']) [keyword !important] }");
-
-  MT('variable',
-    "[variable-2 $blue]:[atom #333]");
-
-  MT('variable_as_attribute',
-    "[tag foo] { [property color]:[variable-2 $blue] }");
-
-  MT('numbers',
-    "[tag foo] { [property padding]:[number 10px] [number 10] [number 10em] [number 8in] }");
-
-  MT('number_percentage',
-    "[tag foo] { [property width]:[number 80%] }");
-
-  MT('selector',
-    "[builtin #hello][qualifier .world]{}");
-
-  MT('singleline_comment',
-    "[comment // this is a comment]");
-
-  MT('multiline_comment',
-    "[comment /*foobar*/]");
-
-  MT('attribute_with_hyphen',
-    "[tag foo] { [property font-size]:[number 10px] }");
-
-  MT('string_after_attribute',
-    "[tag foo] { [property content]:[string \"::\"] }");
-
-  MT('directives',
-    "[def @include] [qualifier .mixin]");
-
-  MT('basic_structure',
-    "[tag p] { [property background]:[keyword red]; }");
-
-  MT('nested_structure',
-    "[tag p] { [tag a] { [property color]:[keyword red]; } }");
-
-  MT('mixin',
-    "[def @mixin] [tag table-base] {}");
-
-  MT('number_without_semicolon',
-    "[tag p] {[property width]:[number 12]}",
-    "[tag a] {[property color]:[keyword red];}");
-
-  MT('atom_in_nested_block',
-    "[tag p] { [tag a] { [property color]:[atom #000]; } }");
-
-  MT('interpolation_in_property',
-    "[tag foo] { #{[variable-2 $hello]}:[number 2]; }");
-
-  MT('interpolation_in_selector',
-    "[tag foo]#{[variable-2 $hello]} { [property color]:[atom #000]; }");
-
-  MT('interpolation_error',
-    "[tag foo]#{[variable foo]} { [property color]:[atom #000]; }");
-
-  MT("divide_operator",
-    "[tag foo] { [property width]:[number 4] [operator /] [number 2] }");
-
-  MT('nested_structure_with_id_selector',
-    "[tag p] { [builtin #hello] { [property color]:[keyword red]; } }");
-
-  MT('indent_mixin',
-     "[def @mixin] [tag container] (",
-     "  [variable-2 $a]: [number 10],",
-     "  [variable-2 $b]: [number 10])",
-     "{}");
-
-  MT('indent_nested',
-     "[tag foo] {",
-     "  [tag bar] {",
-     "  }",
-     "}");
-
-  MT('indent_parentheses',
-     "[tag foo] {",
-     "  [property color]: [variable darken]([variable-2 $blue],",
-     "    [number 9%]);",
-     "}");
-
-  MT('indent_vardef',
-     "[variable-2 $name]:",
-     "  [string 'val'];",
-     "[tag tag] {",
-     "  [tag inner] {",
-     "    [property margin]: [number 3px];",
-     "  }",
-     "}");
-})();
diff --git a/www/code/codemirror-5.7/mode/css/test.js b/www/code/codemirror-5.7/mode/css/test.js
deleted file mode 100644
index 60f9c837f..000000000
--- a/www/code/codemirror-5.7/mode/css/test.js
+++ /dev/null
@@ -1,194 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "css");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  // Error, because "foobarhello" is neither a known type or property, but
-  // property was expected (after "and"), and it should be in parentheses.
-  MT("atMediaUnknownType",
-     "[def @media] [attribute screen] [keyword and] [error foobarhello] { }");
-
-  // Soft error, because "foobarhello" is not a known property or type.
-  MT("atMediaUnknownProperty",
-     "[def @media] [attribute screen] [keyword and] ([error foobarhello]) { }");
-
-  // Make sure nesting works with media queries
-  MT("atMediaMaxWidthNested",
-     "[def @media] [attribute screen] [keyword and] ([property max-width]: [number 25px]) { [tag foo] { } }");
-
-  MT("atMediaFeatureValueKeyword",
-     "[def @media] ([property orientation]: [keyword landscape]) { }");
-
-  MT("atMediaUnknownFeatureValueKeyword",
-     "[def @media] ([property orientation]: [error upsidedown]) { }");
-
-  MT("tagSelector",
-     "[tag foo] { }");
-
-  MT("classSelector",
-     "[qualifier .foo-bar_hello] { }");
-
-  MT("idSelector",
-     "[builtin #foo] { [error #foo] }");
-
-  MT("tagSelectorUnclosed",
-     "[tag foo] { [property margin]: [number 0] } [tag bar] { }");
-
-  MT("tagStringNoQuotes",
-     "[tag foo] { [property font-family]: [variable hello] [variable world]; }");
-
-  MT("tagStringDouble",
-     "[tag foo] { [property font-family]: [string \"hello world\"]; }");
-
-  MT("tagStringSingle",
-     "[tag foo] { [property font-family]: [string 'hello world']; }");
-
-  MT("tagColorKeyword",
-     "[tag foo] {",
-     "  [property color]: [keyword black];",
-     "  [property color]: [keyword navy];",
-     "  [property color]: [keyword yellow];",
-     "}");
-
-  MT("tagColorHex3",
-     "[tag foo] { [property background]: [atom #fff]; }");
-
-  MT("tagColorHex6",
-     "[tag foo] { [property background]: [atom #ffffff]; }");
-
-  MT("tagColorHex4",
-     "[tag foo] { [property background]: [atom&error #ffff]; }");
-
-  MT("tagColorHexInvalid",
-     "[tag foo] { [property background]: [atom&error #ffg]; }");
-
-  MT("tagNegativeNumber",
-     "[tag foo] { [property margin]: [number -5px]; }");
-
-  MT("tagPositiveNumber",
-     "[tag foo] { [property padding]: [number 5px]; }");
-
-  MT("tagVendor",
-     "[tag foo] { [meta -foo-][property box-sizing]: [meta -foo-][atom border-box]; }");
-
-  MT("tagBogusProperty",
-     "[tag foo] { [property&error barhelloworld]: [number 0]; }");
-
-  MT("tagTwoProperties",
-     "[tag foo] { [property margin]: [number 0]; [property padding]: [number 0]; }");
-
-  MT("tagTwoPropertiesURL",
-     "[tag foo] { [property background]: [atom url]([string //example.com/foo.png]); [property padding]: [number 0]; }");
-
-  MT("indent_tagSelector",
-     "[tag strong], [tag em] {",
-     "  [property background]: [atom rgba](",
-     "    [number 255], [number 255], [number 0], [number .2]",
-     "  );",
-     "}");
-
-  MT("indent_atMedia",
-     "[def @media] {",
-     "  [tag foo] {",
-     "    [property color]:",
-     "      [keyword yellow];",
-     "  }",
-     "}");
-
-  MT("indent_comma",
-     "[tag foo] {",
-     "  [property font-family]: [variable verdana],",
-     "    [atom sans-serif];",
-     "}");
-
-  MT("indent_parentheses",
-     "[tag foo]:[variable-3 before] {",
-     "  [property background]: [atom url](",
-     "[string     blahblah]",
-     "[string     etc]",
-     "[string   ]) [keyword !important];",
-     "}");
-
-  MT("font_face",
-     "[def @font-face] {",
-     "  [property font-family]: [string 'myfont'];",
-     "  [error nonsense]: [string 'abc'];",
-     "  [property src]: [atom url]([string http://blah]),",
-     "    [atom url]([string http://foo]);",
-     "}");
-
-  MT("empty_url",
-     "[def @import] [atom url]() [attribute screen];");
-
-  MT("parens",
-     "[qualifier .foo] {",
-     "  [property background-image]: [variable fade]([atom #000], [number 20%]);",
-     "  [property border-image]: [atom linear-gradient](",
-     "    [atom to] [atom bottom],",
-     "    [variable fade]([atom #000], [number 20%]) [number 0%],",
-     "    [variable fade]([atom #000], [number 20%]) [number 100%]",
-     "  );",
-     "}");
-
-  MT("css_variable",
-     ":[variable-3 root] {",
-     "  [variable-2 --main-color]: [atom #06c];",
-     "}",
-     "[tag h1][builtin #foo] {",
-     "  [property color]: [atom var]([variable-2 --main-color]);",
-     "}");
-
-  MT("supports",
-     "[def @supports] ([keyword not] (([property text-align-last]: [atom justify]) [keyword or] ([meta -moz-][property text-align-last]: [atom justify])) {",
-     "  [property text-align-last]: [atom justify];",
-     "}");
-
-   MT("document",
-      "[def @document] [tag url]([string http://blah]),",
-      "  [tag url-prefix]([string https://]),",
-      "  [tag domain]([string blah.com]),",
-      "  [tag regexp]([string \".*blah.+\"]) {",
-      "    [builtin #id] {",
-      "      [property background-color]: [keyword white];",
-      "    }",
-      "    [tag foo] {",
-      "      [property font-family]: [variable Verdana], [atom sans-serif];",
-      "    }",
-      "}");
-
-   MT("document_url",
-      "[def @document] [tag url]([string http://blah]) { [qualifier .class] { } }");
-
-   MT("document_urlPrefix",
-      "[def @document] [tag url-prefix]([string https://]) { [builtin #id] { } }");
-
-   MT("document_domain",
-      "[def @document] [tag domain]([string blah.com]) { [tag foo] { } }");
-
-   MT("document_regexp",
-      "[def @document] [tag regexp]([string \".*blah.+\"]) { [builtin #id] { } }");
-
-   MT("counter-style",
-      "[def @counter-style] [variable binary] {",
-      "  [property system]: [atom numeric];",
-      "  [property symbols]: [number 0] [number 1];",
-      "  [property suffix]: [string \".\"];",
-      "  [property range]: [atom infinite];",
-      "  [property speak-as]: [atom numeric];",
-      "}");
-
-   MT("counter-style-additive-symbols",
-      "[def @counter-style] [variable simple-roman] {",
-      "  [property system]: [atom additive];",
-      "  [property additive-symbols]: [number 10] [variable X], [number 5] [variable V], [number 1] [variable I];",
-      "  [property range]: [number 1] [number 49];",
-      "}");
-
-   MT("counter-style-use",
-      "[tag ol][qualifier .roman] { [property list-style]: [variable simple-roman]; }");
-
-   MT("counter-style-symbols",
-      "[tag ol] { [property list-style]: [atom symbols]([atom cyclic] [string \"*\"] [string \"\\2020\"] [string \"\\2021\"] [string \"\\A7\"]); }");
-})();
diff --git a/www/code/codemirror-5.7/mode/cypher/cypher.js b/www/code/codemirror-5.7/mode/cypher/cypher.js
deleted file mode 100644
index 79048b440..000000000
--- a/www/code/codemirror-5.7/mode/cypher/cypher.js
+++ /dev/null
@@ -1,146 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// By the Neo4j Team and contributors.
-// https://github.com/neo4j-contrib/CodeMirror
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-  var wordRegexp = function(words) {
-    return new RegExp("^(?:" + words.join("|") + ")$", "i");
-  };
-
-  CodeMirror.defineMode("cypher", function(config) {
-    var tokenBase = function(stream/*, state*/) {
-      var ch = stream.next();
-      if (ch === "\"" || ch === "'") {
-        stream.match(/.+?["']/);
-        return "string";
-      }
-      if (/[{}\(\),\.;\[\]]/.test(ch)) {
-        curPunc = ch;
-        return "node";
-      } else if (ch === "/" && stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      } else if (operatorChars.test(ch)) {
-        stream.eatWhile(operatorChars);
-        return null;
-      } else {
-        stream.eatWhile(/[_\w\d]/);
-        if (stream.eat(":")) {
-          stream.eatWhile(/[\w\d_\-]/);
-          return "atom";
-        }
-        var word = stream.current();
-        if (funcs.test(word)) return "builtin";
-        if (preds.test(word)) return "def";
-        if (keywords.test(word)) return "keyword";
-        return "variable";
-      }
-    };
-    var pushContext = function(state, type, col) {
-      return state.context = {
-        prev: state.context,
-        indent: state.indent,
-        col: col,
-        type: type
-      };
-    };
-    var popContext = function(state) {
-      state.indent = state.context.indent;
-      return state.context = state.context.prev;
-    };
-    var indentUnit = config.indentUnit;
-    var curPunc;
-    var funcs = wordRegexp(["abs", "acos", "allShortestPaths", "asin", "atan", "atan2", "avg", "ceil", "coalesce", "collect", "cos", "cot", "count", "degrees", "e", "endnode", "exp", "extract", "filter", "floor", "haversin", "head", "id", "keys", "labels", "last", "left", "length", "log", "log10", "lower", "ltrim", "max", "min", "node", "nodes", "percentileCont", "percentileDisc", "pi", "radians", "rand", "range", "reduce", "rel", "relationship", "relationships", "replace", "right", "round", "rtrim", "shortestPath", "sign", "sin", "split", "sqrt", "startnode", "stdev", "stdevp", "str", "substring", "sum", "tail", "tan", "timestamp", "toFloat", "toInt", "trim", "type", "upper"]);
-    var preds = wordRegexp(["all", "and", "any", "has", "in", "none", "not", "or", "single", "xor", "like", "ilike", "exists"]);
-    var keywords = wordRegexp(["as", "asc", "ascending", "assert", "by", "case", "commit", "constraint", "create", "csv", "cypher", "delete", "desc", "descending", "distinct", "drop", "else", "end", "explain", "false", "fieldterminator", "foreach", "from", "headers", "in", "index", "is", "join", "limit", "load", "match", "merge", "null", "on", "optional", "order", "periodic", "profile", "remove", "return", "scan", "set", "skip", "start", "then", "true", "union", "unique", "unwind", "using", "when", "where", "with"]);
-    var operatorChars = /[*+\-<>=&|~%^]/;
-
-    return {
-      startState: function(/*base*/) {
-        return {
-          tokenize: tokenBase,
-          context: null,
-          indent: 0,
-          col: 0
-        };
-      },
-      token: function(stream, state) {
-        if (stream.sol()) {
-          if (state.context && (state.context.align == null)) {
-            state.context.align = false;
-          }
-          state.indent = stream.indentation();
-        }
-        if (stream.eatSpace()) {
-          return null;
-        }
-        var style = state.tokenize(stream, state);
-        if (style !== "comment" && state.context && (state.context.align == null) && state.context.type !== "pattern") {
-          state.context.align = true;
-        }
-        if (curPunc === "(") {
-          pushContext(state, ")", stream.column());
-        } else if (curPunc === "[") {
-          pushContext(state, "]", stream.column());
-        } else if (curPunc === "{") {
-          pushContext(state, "}", stream.column());
-        } else if (/[\]\}\)]/.test(curPunc)) {
-          while (state.context && state.context.type === "pattern") {
-            popContext(state);
-          }
-          if (state.context && curPunc === state.context.type) {
-            popContext(state);
-          }
-        } else if (curPunc === "." && state.context && state.context.type === "pattern") {
-          popContext(state);
-        } else if (/atom|string|variable/.test(style) && state.context) {
-          if (/[\}\]]/.test(state.context.type)) {
-            pushContext(state, "pattern", stream.column());
-          } else if (state.context.type === "pattern" && !state.context.align) {
-            state.context.align = true;
-            state.context.col = stream.column();
-          }
-        }
-        return style;
-      },
-      indent: function(state, textAfter) {
-        var firstChar = textAfter && textAfter.charAt(0);
-        var context = state.context;
-        if (/[\]\}]/.test(firstChar)) {
-          while (context && context.type === "pattern") {
-            context = context.prev;
-          }
-        }
-        var closing = context && firstChar === context.type;
-        if (!context) return 0;
-        if (context.type === "keywords") return CodeMirror.commands.newlineAndIndent;
-        if (context.align) return context.col + (closing ? 0 : 1);
-        return context.indent + (closing ? 0 : indentUnit);
-      }
-    };
-  });
-
-  CodeMirror.modeExtensions["cypher"] = {
-    autoFormatLineBreaks: function(text) {
-      var i, lines, reProcessedPortion;
-      var lines = text.split("\n");
-      var reProcessedPortion = /\s+\b(return|where|order by|match|with|skip|limit|create|delete|set)\b\s/g;
-      for (var i = 0; i < lines.length; i++)
-        lines[i] = lines[i].replace(reProcessedPortion, " \n$1 ").trim();
-      return lines.join("\n");
-    }
-  };
-
-  CodeMirror.defineMIME("application/x-cypher-query", "cypher");
-
-});
diff --git a/www/code/codemirror-5.7/mode/cypher/index.html b/www/code/codemirror-5.7/mode/cypher/index.html
deleted file mode 100644
index b8bd75c8b..000000000
--- a/www/code/codemirror-5.7/mode/cypher/index.html
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-CodeMirror: Cypher Mode for CodeMirror
-
-
-
-
-
-
-
-
-
-
-
    
-
    Cypher Mode for CodeMirror
    
-
    
-            
-            
    
-            
    MIME types defined: 
-            application/x-cypher-query
-        
    
-
-
-
    
diff --git a/www/code/codemirror-5.7/mode/d/d.js b/www/code/codemirror-5.7/mode/d/d.js
deleted file mode 100644
index c927a7e35..000000000
--- a/www/code/codemirror-5.7/mode/d/d.js
+++ /dev/null
@@ -1,218 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("d", function(config, parserConfig) {
-  var indentUnit = config.indentUnit,
-      statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
-      keywords = parserConfig.keywords || {},
-      builtin = parserConfig.builtin || {},
-      blockKeywords = parserConfig.blockKeywords || {},
-      atoms = parserConfig.atoms || {},
-      hooks = parserConfig.hooks || {},
-      multiLineStrings = parserConfig.multiLineStrings;
-  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
-
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-    if (ch == '"' || ch == "'" || ch == "`") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("+")) {
-        state.tokenize = tokenComment;
-        return tokenNestedComment(stream, state);
-      }
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
-    var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "keyword";
-    }
-    if (builtin.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "builtin";
-    }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return "variable";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !(escaped || multiLineStrings))
-        state.tokenize = null;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function tokenNestedComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch == "+");
-    }
-    return "comment";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function pushContext(state, col, type) {
-    var indent = state.indented;
-    if (state.context && state.context.type == "statement")
-      indent = state.context.indented;
-    return state.context = new Context(indent, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true
-      };
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if ((curPunc == ";" || curPunc == ":" || curPunc == ",") && ctx.type == "statement") popContext(state);
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') || (ctx.type == "statement" && curPunc == "newstatement"))
-        pushContext(state, stream.column(), "statement");
-      state.startOfLine = false;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
-      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
-      var closing = firstChar == ctx.type;
-      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: "{}"
-  };
-});
-
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  var blockKeywords = "body catch class do else enum for foreach foreach_reverse if in interface mixin " +
-                      "out scope struct switch try union unittest version while with";
-
-  CodeMirror.defineMIME("text/x-d", {
-    name: "d",
-    keywords: words("abstract alias align asm assert auto break case cast cdouble cent cfloat const continue " +
-                    "debug default delegate delete deprecated export extern final finally function goto immutable " +
-                    "import inout invariant is lazy macro module new nothrow override package pragma private " +
-                    "protected public pure ref return shared short static super synchronized template this " +
-                    "throw typedef typeid typeof volatile __FILE__ __LINE__ __gshared __traits __vector __parameters " +
-                    blockKeywords),
-    blockKeywords: words(blockKeywords),
-    builtin: words("bool byte char creal dchar double float idouble ifloat int ireal long real short ubyte " +
-                   "ucent uint ulong ushort wchar wstring void size_t sizediff_t"),
-    atoms: words("exit failure success true false null"),
-    hooks: {
-      "@": function(stream, _state) {
-        stream.eatWhile(/[\w\$_]/);
-        return "meta";
-      }
-    }
-  });
-
-});
diff --git a/www/code/codemirror-5.7/mode/d/index.html b/www/code/codemirror-5.7/mode/d/index.html
deleted file mode 100644
index 08cabd8a2..000000000
--- a/www/code/codemirror-5.7/mode/d/index.html
+++ /dev/null
@@ -1,273 +0,0 @@
-
-
-CodeMirror: D mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    D mode
    
-
    
-
-    
-
-    
    Simple mode that handle D-Syntax (DLang Homepage).
    
-
-    
    MIME types defined: text/x-d
-    .
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/dart/dart.js b/www/code/codemirror-5.7/mode/dart/dart.js
deleted file mode 100644
index a49e218c3..000000000
--- a/www/code/codemirror-5.7/mode/dart/dart.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../clike/clike"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../clike/clike"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var keywords = ("this super static final const abstract class extends external factory " +
-    "implements get native operator set typedef with enum throw rethrow " +
-    "assert break case continue default in return new deferred async await " +
-    "try catch finally do else for if switch while import library export " +
-    "part of show hide is").split(" ");
-  var blockKeywords = "try catch finally do else for if switch while".split(" ");
-  var atoms = "true false null".split(" ");
-  var builtins = "void bool num int double dynamic var String".split(" ");
-
-  function set(words) {
-    var obj = {};
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  CodeMirror.defineMIME("application/dart", {
-    name: "clike",
-    keywords: set(keywords),
-    multiLineStrings: true,
-    blockKeywords: set(blockKeywords),
-    builtin: set(builtins),
-    atoms: set(atoms),
-    hooks: {
-      "@": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
-        return "meta";
-      }
-    }
-  });
-
-  CodeMirror.registerHelper("hintWords", "application/dart", keywords.concat(atoms).concat(builtins));
-
-  // This is needed to make loading through meta.js work.
-  CodeMirror.defineMode("dart", function(conf) {
-    return CodeMirror.getMode(conf, "application/dart");
-  }, "clike");
-});
diff --git a/www/code/codemirror-5.7/mode/dart/index.html b/www/code/codemirror-5.7/mode/dart/index.html
deleted file mode 100644
index e79da5a8b..000000000
--- a/www/code/codemirror-5.7/mode/dart/index.html
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-CodeMirror: Dart mode
-
-
-
-
-
-
-
-
-
-
    
-
    Dart mode
    
-
    
-
-
    
-
-
-
-
    
diff --git a/www/code/codemirror-5.7/mode/diff/diff.js b/www/code/codemirror-5.7/mode/diff/diff.js
deleted file mode 100644
index fe0305e7b..000000000
--- a/www/code/codemirror-5.7/mode/diff/diff.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("diff", function() {
-
-  var TOKEN_NAMES = {
-    '+': 'positive',
-    '-': 'negative',
-    '@': 'meta'
-  };
-
-  return {
-    token: function(stream) {
-      var tw_pos = stream.string.search(/[\t ]+?$/);
-
-      if (!stream.sol() || tw_pos === 0) {
-        stream.skipToEnd();
-        return ("error " + (
-          TOKEN_NAMES[stream.string.charAt(0)] || '')).replace(/ $/, '');
-      }
-
-      var token_name = TOKEN_NAMES[stream.peek()] || stream.skipToEnd();
-
-      if (tw_pos === -1) {
-        stream.skipToEnd();
-      } else {
-        stream.pos = tw_pos;
-      }
-
-      return token_name;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-diff", "diff");
-
-});
diff --git a/www/code/codemirror-5.7/mode/diff/index.html b/www/code/codemirror-5.7/mode/diff/index.html
deleted file mode 100644
index 0af611fa4..000000000
--- a/www/code/codemirror-5.7/mode/diff/index.html
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-CodeMirror: Diff mode
-
-
-
-
-
-
-
-
-
-
    
-
    Diff mode
    
-
    
-    
-
-    
    MIME types defined: text/x-diff.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/django/django.js b/www/code/codemirror-5.7/mode/django/django.js
deleted file mode 100644
index 2f08b0631..000000000
--- a/www/code/codemirror-5.7/mode/django/django.js
+++ /dev/null
@@ -1,350 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"),
-        require("../../addon/mode/overlay"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
-            "../../addon/mode/overlay"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("django:inner", function() {
-    var keywords = ["block", "endblock", "for", "endfor", "true", "false",
-                    "loop", "none", "self", "super", "if", "endif", "as",
-                    "else", "import", "with", "endwith", "without", "context", "ifequal", "endifequal",
-                    "ifnotequal", "endifnotequal", "extends", "include", "load", "comment",
-                    "endcomment", "empty", "url", "static", "trans", "blocktrans", "now", "regroup",
-                    "lorem", "ifchanged", "endifchanged", "firstof", "debug", "cycle", "csrf_token",
-                    "autoescape", "endautoescape", "spaceless", "ssi", "templatetag",
-                    "verbatim", "endverbatim", "widthratio"],
-        filters = ["add", "addslashes", "capfirst", "center", "cut", "date",
-                   "default", "default_if_none", "dictsort",
-                   "dictsortreversed", "divisibleby", "escape", "escapejs",
-                   "filesizeformat", "first", "floatformat", "force_escape",
-                   "get_digit", "iriencode", "join", "last", "length",
-                   "length_is", "linebreaks", "linebreaksbr", "linenumbers",
-                   "ljust", "lower", "make_list", "phone2numeric", "pluralize",
-                   "pprint", "random", "removetags", "rjust", "safe",
-                   "safeseq", "slice", "slugify", "stringformat", "striptags",
-                   "time", "timesince", "timeuntil", "title", "truncatechars",
-                   "truncatechars_html", "truncatewords", "truncatewords_html",
-                   "unordered_list", "upper", "urlencode", "urlize",
-                   "urlizetrunc", "wordcount", "wordwrap", "yesno"],
-        operators = ["==", "!=", "<", ">", "<=", ">=", "in", "not", "or", "and"];
-
-    keywords = new RegExp("^\\b(" + keywords.join("|") + ")\\b");
-    filters = new RegExp("^\\b(" + filters.join("|") + ")\\b");
-    operators = new RegExp("^\\b(" + operators.join("|") + ")\\b");
-
-    // We have to return "null" instead of null, in order to avoid string
-    // styling as the default, when using Django templates inside HTML
-    // element attributes
-    function tokenBase (stream, state) {
-      // Attempt to identify a variable, template or comment tag respectively
-      if (stream.match("{{")) {
-        state.tokenize = inVariable;
-        return "tag";
-      } else if (stream.match("{%")) {
-        state.tokenize = inTag;
-        return "tag";
-      } else if (stream.match("{#")) {
-        state.tokenize = inComment;
-        return "comment";
-      }
-
-      // Ignore completely any stream series that do not match the
-      // Django template opening tags.
-      while (stream.next() != null && !stream.match("{{", false) && !stream.match("{%", false)) {}
-      return null;
-    }
-
-    // A string can be included in either single or double quotes (this is
-    // the delimeter). Mark everything as a string until the start delimeter
-    // occurs again.
-    function inString (delimeter, previousTokenizer) {
-      return function (stream, state) {
-        if (!state.escapeNext && stream.eat(delimeter)) {
-          state.tokenize = previousTokenizer;
-        } else {
-          if (state.escapeNext) {
-            state.escapeNext = false;
-          }
-
-          var ch = stream.next();
-
-          // Take into account the backslash for escaping characters, such as
-          // the string delimeter.
-          if (ch == "\\") {
-            state.escapeNext = true;
-          }
-        }
-
-        return "string";
-      };
-    }
-
-    // Apply Django template variable syntax highlighting
-    function inVariable (stream, state) {
-      // Attempt to match a dot that precedes a property
-      if (state.waitDot) {
-        state.waitDot = false;
-
-        if (stream.peek() != ".") {
-          return "null";
-        }
-
-        // Dot folowed by a non-word character should be considered an error.
-        if (stream.match(/\.\W+/)) {
-          return "error";
-        } else if (stream.eat(".")) {
-          state.waitProperty = true;
-          return "null";
-        } else {
-          throw Error ("Unexpected error while waiting for property.");
-        }
-      }
-
-      // Attempt to match a pipe that precedes a filter
-      if (state.waitPipe) {
-        state.waitPipe = false;
-
-        if (stream.peek() != "|") {
-          return "null";
-        }
-
-        // Pipe folowed by a non-word character should be considered an error.
-        if (stream.match(/\.\W+/)) {
-          return "error";
-        } else if (stream.eat("|")) {
-          state.waitFilter = true;
-          return "null";
-        } else {
-          throw Error ("Unexpected error while waiting for filter.");
-        }
-      }
-
-      // Highlight properties
-      if (state.waitProperty) {
-        state.waitProperty = false;
-        if (stream.match(/\b(\w+)\b/)) {
-          state.waitDot = true;  // A property can be followed by another property
-          state.waitPipe = true;  // A property can be followed by a filter
-          return "property";
-        }
-      }
-
-      // Highlight filters
-      if (state.waitFilter) {
-          state.waitFilter = false;
-        if (stream.match(filters)) {
-          return "variable-2";
-        }
-      }
-
-      // Ignore all white spaces
-      if (stream.eatSpace()) {
-        state.waitProperty = false;
-        return "null";
-      }
-
-      // Identify numbers
-      if (stream.match(/\b\d+(\.\d+)?\b/)) {
-        return "number";
-      }
-
-      // Identify strings
-      if (stream.match("'")) {
-        state.tokenize = inString("'", state.tokenize);
-        return "string";
-      } else if (stream.match('"')) {
-        state.tokenize = inString('"', state.tokenize);
-        return "string";
-      }
-
-      // Attempt to find the variable
-      if (stream.match(/\b(\w+)\b/) && !state.foundVariable) {
-        state.waitDot = true;
-        state.waitPipe = true;  // A property can be followed by a filter
-        return "variable";
-      }
-
-      // If found closing tag reset
-      if (stream.match("}}")) {
-        state.waitProperty = null;
-        state.waitFilter = null;
-        state.waitDot = null;
-        state.waitPipe = null;
-        state.tokenize = tokenBase;
-        return "tag";
-      }
-
-      // If nothing was found, advance to the next character
-      stream.next();
-      return "null";
-    }
-
-    function inTag (stream, state) {
-      // Attempt to match a dot that precedes a property
-      if (state.waitDot) {
-        state.waitDot = false;
-
-        if (stream.peek() != ".") {
-          return "null";
-        }
-
-        // Dot folowed by a non-word character should be considered an error.
-        if (stream.match(/\.\W+/)) {
-          return "error";
-        } else if (stream.eat(".")) {
-          state.waitProperty = true;
-          return "null";
-        } else {
-          throw Error ("Unexpected error while waiting for property.");
-        }
-      }
-
-      // Attempt to match a pipe that precedes a filter
-      if (state.waitPipe) {
-        state.waitPipe = false;
-
-        if (stream.peek() != "|") {
-          return "null";
-        }
-
-        // Pipe folowed by a non-word character should be considered an error.
-        if (stream.match(/\.\W+/)) {
-          return "error";
-        } else if (stream.eat("|")) {
-          state.waitFilter = true;
-          return "null";
-        } else {
-          throw Error ("Unexpected error while waiting for filter.");
-        }
-      }
-
-      // Highlight properties
-      if (state.waitProperty) {
-        state.waitProperty = false;
-        if (stream.match(/\b(\w+)\b/)) {
-          state.waitDot = true;  // A property can be followed by another property
-          state.waitPipe = true;  // A property can be followed by a filter
-          return "property";
-        }
-      }
-
-      // Highlight filters
-      if (state.waitFilter) {
-          state.waitFilter = false;
-        if (stream.match(filters)) {
-          return "variable-2";
-        }
-      }
-
-      // Ignore all white spaces
-      if (stream.eatSpace()) {
-        state.waitProperty = false;
-        return "null";
-      }
-
-      // Identify numbers
-      if (stream.match(/\b\d+(\.\d+)?\b/)) {
-        return "number";
-      }
-
-      // Identify strings
-      if (stream.match("'")) {
-        state.tokenize = inString("'", state.tokenize);
-        return "string";
-      } else if (stream.match('"')) {
-        state.tokenize = inString('"', state.tokenize);
-        return "string";
-      }
-
-      // Attempt to match an operator
-      if (stream.match(operators)) {
-        return "operator";
-      }
-
-      // Attempt to match a keyword
-      var keywordMatch = stream.match(keywords);
-      if (keywordMatch) {
-        if (keywordMatch[0] == "comment") {
-          state.blockCommentTag = true;
-        }
-        return "keyword";
-      }
-
-      // Attempt to match a variable
-      if (stream.match(/\b(\w+)\b/)) {
-        state.waitDot = true;
-        state.waitPipe = true;  // A property can be followed by a filter
-        return "variable";
-      }
-
-      // If found closing tag reset
-      if (stream.match("%}")) {
-        state.waitProperty = null;
-        state.waitFilter = null;
-        state.waitDot = null;
-        state.waitPipe = null;
-        // If the tag that closes is a block comment tag, we want to mark the
-        // following code as comment, until the tag closes.
-        if (state.blockCommentTag) {
-          state.blockCommentTag = false;  // Release the "lock"
-          state.tokenize = inBlockComment;
-        } else {
-          state.tokenize = tokenBase;
-        }
-        return "tag";
-      }
-
-      // If nothing was found, advance to the next character
-      stream.next();
-      return "null";
-    }
-
-    // Mark everything as comment inside the tag and the tag itself.
-    function inComment (stream, state) {
-      if (stream.match("#}")) {
-        state.tokenize = tokenBase;
-      }
-      return "comment";
-    }
-
-    // Mark everything as a comment until the `blockcomment` tag closes.
-    function inBlockComment (stream, state) {
-      if (stream.match(/\{%\s*endcomment\s*%\}/, false)) {
-        state.tokenize = inTag;
-        stream.match("{%");
-        return "tag";
-      } else {
-        stream.next();
-        return "comment";
-      }
-    }
-
-    return {
-      startState: function () {
-        return {tokenize: tokenBase};
-      },
-      token: function (stream, state) {
-        return state.tokenize(stream, state);
-      },
-      blockCommentStart: "{% comment %}",
-      blockCommentEnd: "{% endcomment %}"
-    };
-  });
-
-  CodeMirror.defineMode("django", function(config) {
-    var htmlBase = CodeMirror.getMode(config, "text/html");
-    var djangoInner = CodeMirror.getMode(config, "django:inner");
-    return CodeMirror.overlayMode(htmlBase, djangoInner);
-  });
-
-  CodeMirror.defineMIME("text/x-django", "django");
-});
diff --git a/www/code/codemirror-5.7/mode/django/index.html b/www/code/codemirror-5.7/mode/django/index.html
deleted file mode 100644
index 41ea07c91..000000000
--- a/www/code/codemirror-5.7/mode/django/index.html
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-CodeMirror: Django template mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Django template mode
    
-
    
-
-    
-
-    
    Mode for HTML with embedded Django template markup.
    
-
-    
    MIME types defined: text/x-django
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/dockerfile/dockerfile.js b/www/code/codemirror-5.7/mode/dockerfile/dockerfile.js
deleted file mode 100644
index 4419009af..000000000
--- a/www/code/codemirror-5.7/mode/dockerfile/dockerfile.js
+++ /dev/null
@@ -1,79 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  // Collect all Dockerfile directives
-  var instructions = ["from", "maintainer", "run", "cmd", "expose", "env",
-                      "add", "copy", "entrypoint", "volume", "user",
-                      "workdir", "onbuild"],
-      instructionRegex = "(" + instructions.join('|') + ")",
-      instructionOnlyLine = new RegExp(instructionRegex + "\\s*$", "i"),
-      instructionWithArguments = new RegExp(instructionRegex + "(\\s+)", "i");
-
-  CodeMirror.defineSimpleMode("dockerfile", {
-    start: [
-      // Block comment: This is a line starting with a comment
-      {
-        regex: /#.*$/,
-        token: "comment"
-      },
-      // Highlight an instruction without any arguments (for convenience)
-      {
-        regex: instructionOnlyLine,
-        token: "variable-2"
-      },
-      // Highlight an instruction followed by arguments
-      {
-        regex: instructionWithArguments,
-        token: ["variable-2", null],
-        next: "arguments"
-      },
-      {
-        regex: /./,
-        token: null
-      }
-    ],
-    arguments: [
-      {
-        // Line comment without instruction arguments is an error
-        regex: /#.*$/,
-        token: "error",
-        next: "start"
-      },
-      {
-        regex: /[^#]+\\$/,
-        token: null
-      },
-      {
-        // Match everything except for the inline comment
-        regex: /[^#]+/,
-        token: null,
-        next: "start"
-      },
-      {
-        regex: /$/,
-        token: null,
-        next: "start"
-      },
-      // Fail safe return to start
-      {
-        token: null,
-        next: "start"
-      }
-    ],
-      meta: {
-          lineComment: "#"
-      }
-  });
-
-  CodeMirror.defineMIME("text/x-dockerfile", "dockerfile");
-});
diff --git a/www/code/codemirror-5.7/mode/dockerfile/index.html b/www/code/codemirror-5.7/mode/dockerfile/index.html
deleted file mode 100644
index a31759bce..000000000
--- a/www/code/codemirror-5.7/mode/dockerfile/index.html
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-CodeMirror: Dockerfile mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Dockerfile mode
    
-
    
-
-    
-
-    
    Dockerfile syntax highlighting for CodeMirror. Depends on
-    the simplemode addon.
    
-
-    
    MIME types defined: text/x-dockerfile
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/dtd/dtd.js b/www/code/codemirror-5.7/mode/dtd/dtd.js
deleted file mode 100644
index f37029a77..000000000
--- a/www/code/codemirror-5.7/mode/dtd/dtd.js
+++ /dev/null
@@ -1,142 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/*
-  DTD mode
-  Ported to CodeMirror by Peter Kroon 
-  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
-  GitHub: @peterkroon
-*/
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("dtd", function(config) {
-  var indentUnit = config.indentUnit, type;
-  function ret(style, tp) {type = tp; return style;}
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-
-    if (ch == "<" && stream.eat("!") ) {
-      if (stream.eatWhile(/[\-]/)) {
-        state.tokenize = tokenSGMLComment;
-        return tokenSGMLComment(stream, state);
-      } else if (stream.eatWhile(/[\w]/)) return ret("keyword", "doindent");
-    } else if (ch == "<" && stream.eat("?")) { //xml declaration
-      state.tokenize = inBlock("meta", "?>");
-      return ret("meta", ch);
-    } else if (ch == "#" && stream.eatWhile(/[\w]/)) return ret("atom", "tag");
-    else if (ch == "|") return ret("keyword", "seperator");
-    else if (ch.match(/[\(\)\[\]\-\.,\+\?>]/)) return ret(null, ch);//if(ch === ">") return ret(null, "endtag"); else
-    else if (ch.match(/[\[\]]/)) return ret("rule", ch);
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    } else if (stream.eatWhile(/[a-zA-Z\?\+\d]/)) {
-      var sc = stream.current();
-      if( sc.substr(sc.length-1,sc.length).match(/\?|\+/) !== null )stream.backUp(1);
-      return ret("tag", "tag");
-    } else if (ch == "%" || ch == "*" ) return ret("number", "number");
-    else {
-      stream.eatWhile(/[\w\\\-_%.{,]/);
-      return ret(null, null);
-    }
-  }
-
-  function tokenSGMLComment(stream, state) {
-    var dashes = 0, ch;
-    while ((ch = stream.next()) != null) {
-      if (dashes >= 2 && ch == ">") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      dashes = (ch == "-") ? dashes + 1 : 0;
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      return ret("string", "tag");
-    };
-  }
-
-  function inBlock(style, terminator) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.match(terminator)) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        stream.next();
-      }
-      return style;
-    };
-  }
-
-  return {
-    startState: function(base) {
-      return {tokenize: tokenBase,
-              baseIndent: base || 0,
-              stack: []};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-
-      var context = state.stack[state.stack.length-1];
-      if (stream.current() == "[" || type === "doindent" || type == "[") state.stack.push("rule");
-      else if (type === "endtag") state.stack[state.stack.length-1] = "endtag";
-      else if (stream.current() == "]" || type == "]" || (type == ">" && context == "rule")) state.stack.pop();
-      else if (type == "[") state.stack.push("[");
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var n = state.stack.length;
-
-      if( textAfter.match(/\]\s+|\]/) )n=n-1;
-      else if(textAfter.substr(textAfter.length-1, textAfter.length) === ">"){
-        if(textAfter.substr(0,1) === "<")n;
-        else if( type == "doindent" && textAfter.length > 1 )n;
-        else if( type == "doindent")n--;
-        else if( type == ">" && textAfter.length > 1)n;
-        else if( type == "tag" && textAfter !== ">")n;
-        else if( type == "tag" && state.stack[state.stack.length-1] == "rule")n--;
-        else if( type == "tag")n++;
-        else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule" && type === ">")n--;
-        else if( textAfter === ">" && state.stack[state.stack.length-1] == "rule")n;
-        else if( textAfter.substr(0,1) !== "<" && textAfter.substr(0,1) === ">" )n=n-1;
-        else if( textAfter === ">")n;
-        else n=n-1;
-        //over rule them all
-        if(type == null || type == "]")n--;
-      }
-
-      return state.baseIndent + n * indentUnit;
-    },
-
-    electricChars: "]>"
-  };
-});
-
-CodeMirror.defineMIME("application/xml-dtd", "dtd");
-
-});
diff --git a/www/code/codemirror-5.7/mode/dtd/index.html b/www/code/codemirror-5.7/mode/dtd/index.html
deleted file mode 100644
index e6798a748..000000000
--- a/www/code/codemirror-5.7/mode/dtd/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-CodeMirror: DTD mode
-
-
-
-
-
-
-
-
-
-
    
-
    DTD mode
    
-
    
-    
-
-    
    MIME types defined: application/xml-dtd.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/dylan/dylan.js b/www/code/codemirror-5.7/mode/dylan/dylan.js
deleted file mode 100644
index 85f0166c1..000000000
--- a/www/code/codemirror-5.7/mode/dylan/dylan.js
+++ /dev/null
@@ -1,291 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("dylan", function(_config) {
-  // Words
-  var words = {
-    // Words that introduce unnamed definitions like "define interface"
-    unnamedDefinition: ["interface"],
-
-    // Words that introduce simple named definitions like "define library"
-    namedDefinition: ["module", "library", "macro",
-                      "C-struct", "C-union",
-                      "C-function", "C-callable-wrapper"
-                     ],
-
-    // Words that introduce type definitions like "define class".
-    // These are also parameterized like "define method" and are
-    // appended to otherParameterizedDefinitionWords
-    typeParameterizedDefinition: ["class", "C-subtype", "C-mapped-subtype"],
-
-    // Words that introduce trickier definitions like "define method".
-    // These require special definitions to be added to startExpressions
-    otherParameterizedDefinition: ["method", "function",
-                                   "C-variable", "C-address"
-                                  ],
-
-    // Words that introduce module constant definitions.
-    // These must also be simple definitions and are
-    // appended to otherSimpleDefinitionWords
-    constantSimpleDefinition: ["constant"],
-
-    // Words that introduce module variable definitions.
-    // These must also be simple definitions and are
-    // appended to otherSimpleDefinitionWords
-    variableSimpleDefinition: ["variable"],
-
-    // Other words that introduce simple definitions
-    // (without implicit bodies).
-    otherSimpleDefinition: ["generic", "domain",
-                            "C-pointer-type",
-                            "table"
-                           ],
-
-    // Words that begin statements with implicit bodies.
-    statement: ["if", "block", "begin", "method", "case",
-                "for", "select", "when", "unless", "until",
-                "while", "iterate", "profiling", "dynamic-bind"
-               ],
-
-    // Patterns that act as separators in compound statements.
-    // This may include any general pattern that must be indented
-    // specially.
-    separator: ["finally", "exception", "cleanup", "else",
-                "elseif", "afterwards"
-               ],
-
-    // Keywords that do not require special indentation handling,
-    // but which should be highlighted
-    other: ["above", "below", "by", "from", "handler", "in",
-            "instance", "let", "local", "otherwise", "slot",
-            "subclass", "then", "to", "keyed-by", "virtual"
-           ],
-
-    // Condition signaling function calls
-    signalingCalls: ["signal", "error", "cerror",
-                     "break", "check-type", "abort"
-                    ]
-  };
-
-  words["otherDefinition"] =
-    words["unnamedDefinition"]
-    .concat(words["namedDefinition"])
-    .concat(words["otherParameterizedDefinition"]);
-
-  words["definition"] =
-    words["typeParameterizedDefinition"]
-    .concat(words["otherDefinition"]);
-
-  words["parameterizedDefinition"] =
-    words["typeParameterizedDefinition"]
-    .concat(words["otherParameterizedDefinition"]);
-
-  words["simpleDefinition"] =
-    words["constantSimpleDefinition"]
-    .concat(words["variableSimpleDefinition"])
-    .concat(words["otherSimpleDefinition"]);
-
-  words["keyword"] =
-    words["statement"]
-    .concat(words["separator"])
-    .concat(words["other"]);
-
-  // Patterns
-  var symbolPattern = "[-_a-zA-Z?!*@<>$%]+";
-  var symbol = new RegExp("^" + symbolPattern);
-  var patterns = {
-    // Symbols with special syntax
-    symbolKeyword: symbolPattern + ":",
-    symbolClass: "<" + symbolPattern + ">",
-    symbolGlobal: "\\*" + symbolPattern + "\\*",
-    symbolConstant: "\\$" + symbolPattern
-  };
-  var patternStyles = {
-    symbolKeyword: "atom",
-    symbolClass: "tag",
-    symbolGlobal: "variable-2",
-    symbolConstant: "variable-3"
-  };
-
-  // Compile all patterns to regular expressions
-  for (var patternName in patterns)
-    if (patterns.hasOwnProperty(patternName))
-      patterns[patternName] = new RegExp("^" + patterns[patternName]);
-
-  // Names beginning "with-" and "without-" are commonly
-  // used as statement macro
-  patterns["keyword"] = [/^with(?:out)?-[-_a-zA-Z?!*@<>$%]+/];
-
-  var styles = {};
-  styles["keyword"] = "keyword";
-  styles["definition"] = "def";
-  styles["simpleDefinition"] = "def";
-  styles["signalingCalls"] = "builtin";
-
-  // protected words lookup table
-  var wordLookup = {};
-  var styleLookup = {};
-
-  [
-    "keyword",
-    "definition",
-    "simpleDefinition",
-    "signalingCalls"
-  ].forEach(function(type) {
-    words[type].forEach(function(word) {
-      wordLookup[word] = type;
-      styleLookup[word] = styles[type];
-    });
-  });
-
-
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-
-  function tokenBase(stream, state) {
-    // String
-    var ch = stream.peek();
-    if (ch == "'" || ch == '"') {
-      stream.next();
-      return chain(stream, state, tokenString(ch, "string"));
-    }
-    // Comment
-    else if (ch == "/") {
-      stream.next();
-      if (stream.eat("*")) {
-        return chain(stream, state, tokenComment);
-      } else if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      } else {
-        stream.skipTo(" ");
-        return "operator";
-      }
-    }
-    // Decimal
-    else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:\.\d*)?(?:e[+\-]?\d+)?/);
-      return "number";
-    }
-    // Hash
-    else if (ch == "#") {
-      stream.next();
-      // Symbol with string syntax
-      ch = stream.peek();
-      if (ch == '"') {
-        stream.next();
-        return chain(stream, state, tokenString('"', "string-2"));
-      }
-      // Binary number
-      else if (ch == "b") {
-        stream.next();
-        stream.eatWhile(/[01]/);
-        return "number";
-      }
-      // Hex number
-      else if (ch == "x") {
-        stream.next();
-        stream.eatWhile(/[\da-f]/i);
-        return "number";
-      }
-      // Octal number
-      else if (ch == "o") {
-        stream.next();
-        stream.eatWhile(/[0-7]/);
-        return "number";
-      }
-      // Hash symbol
-      else {
-        stream.eatWhile(/[-a-zA-Z]/);
-        return "keyword";
-      }
-    } else if (stream.match("end")) {
-      return "keyword";
-    }
-    for (var name in patterns) {
-      if (patterns.hasOwnProperty(name)) {
-        var pattern = patterns[name];
-        if ((pattern instanceof Array && pattern.some(function(p) {
-          return stream.match(p);
-        })) || stream.match(pattern))
-          return patternStyles[name];
-      }
-    }
-    if (stream.match("define")) {
-      return "def";
-    } else {
-      stream.eatWhile(/[\w\-]/);
-      // Keyword
-      if (wordLookup[stream.current()]) {
-        return styleLookup[stream.current()];
-      } else if (stream.current().match(symbol)) {
-        return "variable";
-      } else {
-        stream.next();
-        return "variable-2";
-      }
-    }
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false,
-    ch;
-    while ((ch = stream.next())) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function tokenString(quote, style) {
-    return function(stream, state) {
-      var next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote) {
-          end = true;
-          break;
-        }
-      }
-      if (end)
-        state.tokenize = tokenBase;
-      return style;
-    };
-  }
-
-  // Interface
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        currentIndent: 0
-      };
-    },
-    token: function(stream, state) {
-      if (stream.eatSpace())
-        return null;
-      var style = state.tokenize(stream, state);
-      return style;
-    },
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/"
-  };
-});
-
-CodeMirror.defineMIME("text/x-dylan", "dylan");
-
-});
diff --git a/www/code/codemirror-5.7/mode/dylan/index.html b/www/code/codemirror-5.7/mode/dylan/index.html
deleted file mode 100644
index ddf5ad067..000000000
--- a/www/code/codemirror-5.7/mode/dylan/index.html
+++ /dev/null
@@ -1,407 +0,0 @@
-
-
-CodeMirror: Dylan mode
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Dylan mode
    
-
-
-
    
-
-    
-
-    
    MIME types defined: text/x-dylan.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/ebnf/ebnf.js b/www/code/codemirror-5.7/mode/ebnf/ebnf.js
deleted file mode 100644
index 6b51aba07..000000000
--- a/www/code/codemirror-5.7/mode/ebnf/ebnf.js
+++ /dev/null
@@ -1,195 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("ebnf", function (config) {
-    var commentType = {slash: 0, parenthesis: 1};
-    var stateType = {comment: 0, _string: 1, characterClass: 2};
-    var bracesMode = null;
-
-    if (config.bracesMode)
-      bracesMode = CodeMirror.getMode(config, config.bracesMode);
-
-    return {
-      startState: function () {
-        return {
-          stringType: null,
-          commentType: null,
-          braced: 0,
-          lhs: true,
-          localState: null,
-          stack: [],
-          inDefinition: false
-        };
-      },
-      token: function (stream, state) {
-        if (!stream) return;
-
-        //check for state changes
-        if (state.stack.length === 0) {
-          //strings
-          if ((stream.peek() == '"') || (stream.peek() == "'")) {
-            state.stringType = stream.peek();
-            stream.next(); // Skip quote
-            state.stack.unshift(stateType._string);
-          } else if (stream.match(/^\/\*/)) { //comments starting with /*
-            state.stack.unshift(stateType.comment);
-            state.commentType = commentType.slash;
-          } else if (stream.match(/^\(\*/)) { //comments starting with (*
-            state.stack.unshift(stateType.comment);
-            state.commentType = commentType.parenthesis;
-          }
-        }
-
-        //return state
-        //stack has
-        switch (state.stack[0]) {
-        case stateType._string:
-          while (state.stack[0] === stateType._string && !stream.eol()) {
-            if (stream.peek() === state.stringType) {
-              stream.next(); // Skip quote
-              state.stack.shift(); // Clear flag
-            } else if (stream.peek() === "\\") {
-              stream.next();
-              stream.next();
-            } else {
-              stream.match(/^.[^\\\"\']*/);
-            }
-          }
-          return state.lhs ? "property string" : "string"; // Token style
-
-        case stateType.comment:
-          while (state.stack[0] === stateType.comment && !stream.eol()) {
-            if (state.commentType === commentType.slash && stream.match(/\*\//)) {
-              state.stack.shift(); // Clear flag
-              state.commentType = null;
-            } else if (state.commentType === commentType.parenthesis && stream.match(/\*\)/)) {
-              state.stack.shift(); // Clear flag
-              state.commentType = null;
-            } else {
-              stream.match(/^.[^\*]*/);
-            }
-          }
-          return "comment";
-
-        case stateType.characterClass:
-          while (state.stack[0] === stateType.characterClass && !stream.eol()) {
-            if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) {
-              state.stack.shift();
-            }
-          }
-          return "operator";
-        }
-
-        var peek = stream.peek();
-
-        if (bracesMode !== null && (state.braced || peek === "{")) {
-          if (state.localState === null)
-            state.localState = bracesMode.startState();
-
-          var token = bracesMode.token(stream, state.localState),
-          text = stream.current();
-
-          if (!token) {
-            for (var i = 0; i < text.length; i++) {
-              if (text[i] === "{") {
-                if (state.braced === 0) {
-                  token = "matchingbracket";
-                }
-                state.braced++;
-              } else if (text[i] === "}") {
-                state.braced--;
-                if (state.braced === 0) {
-                  token = "matchingbracket";
-                }
-              }
-            }
-          }
-          return token;
-        }
-
-        //no stack
-        switch (peek) {
-        case "[":
-          stream.next();
-          state.stack.unshift(stateType.characterClass);
-          return "bracket";
-        case ":":
-        case "|":
-        case ";":
-          stream.next();
-          return "operator";
-        case "%":
-          if (stream.match("%%")) {
-            return "header";
-          } else if (stream.match(/[%][A-Za-z]+/)) {
-            return "keyword";
-          } else if (stream.match(/[%][}]/)) {
-            return "matchingbracket";
-          }
-          break;
-        case "/":
-          if (stream.match(/[\/][A-Za-z]+/)) {
-          return "keyword";
-        }
-        case "\\":
-          if (stream.match(/[\][a-z]+/)) {
-            return "string-2";
-          }
-        case ".":
-          if (stream.match(".")) {
-            return "atom";
-          }
-        case "*":
-        case "-":
-        case "+":
-        case "^":
-          if (stream.match(peek)) {
-            return "atom";
-          }
-        case "$":
-          if (stream.match("$$")) {
-            return "builtin";
-          } else if (stream.match(/[$][0-9]+/)) {
-            return "variable-3";
-          }
-        case "<":
-          if (stream.match(/<<[a-zA-Z_]+>>/)) {
-            return "builtin";
-          }
-        }
-
-        if (stream.match(/^\/\//)) {
-          stream.skipToEnd();
-          return "comment";
-        } else if (stream.match(/return/)) {
-          return "operator";
-        } else if (stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/)) {
-          if (stream.match(/(?=[\(.])/)) {
-            return "variable";
-          } else if (stream.match(/(?=[\s\n]*[:=])/)) {
-            return "def";
-          }
-          return "variable-2";
-        } else if (["[", "]", "(", ")"].indexOf(stream.peek()) != -1) {
-          stream.next();
-          return "bracket";
-        } else if (!stream.eatSpace()) {
-          stream.next();
-        }
-        return null;
-      }
-    };
-  });
-
-  CodeMirror.defineMIME("text/x-ebnf", "ebnf");
-});
diff --git a/www/code/codemirror-5.7/mode/ebnf/index.html b/www/code/codemirror-5.7/mode/ebnf/index.html
deleted file mode 100644
index 13845629b..000000000
--- a/www/code/codemirror-5.7/mode/ebnf/index.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-  
-    CodeMirror: EBNF Mode
-    
-    
-
-    
-    
-    
-    
-    
-  
-  
-    
-
-    
    
-      
    EBNF Mode (bracesMode setting = "javascript")
    
-      
    
-      
-      
    The EBNF Mode
    
-      
     Created by Robert Plummer
    
-    
    
-  
-
diff --git a/www/code/codemirror-5.7/mode/ecl/ecl.js b/www/code/codemirror-5.7/mode/ecl/ecl.js
deleted file mode 100644
index 8df7ebe4a..000000000
--- a/www/code/codemirror-5.7/mode/ecl/ecl.js
+++ /dev/null
@@ -1,206 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("ecl", function(config) {
-
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  function metaHook(stream, state) {
-    if (!state.startOfLine) return false;
-    stream.skipToEnd();
-    return "meta";
-  }
-
-  var indentUnit = config.indentUnit;
-  var keyword = words("abs acos allnodes ascii asin asstring atan atan2 ave case choose choosen choosesets clustersize combine correlation cos cosh count covariance cron dataset dedup define denormalize distribute distributed distribution ebcdic enth error evaluate event eventextra eventname exists exp failcode failmessage fetch fromunicode getisvalid global graph group hash hash32 hash64 hashcrc hashmd5 having if index intformat isvalid iterate join keyunicode length library limit ln local log loop map matched matchlength matchposition matchtext matchunicode max merge mergejoin min nolocal nonempty normalize parse pipe power preload process project pull random range rank ranked realformat recordof regexfind regexreplace regroup rejected rollup round roundup row rowdiff sample set sin sinh sizeof soapcall sort sorted sqrt stepped stored sum table tan tanh thisnode topn tounicode transfer trim truncate typeof ungroup unicodeorder variance which workunit xmldecode xmlencode xmltext xmlunicode");
-  var variable = words("apply assert build buildindex evaluate fail keydiff keypatch loadxml nothor notify output parallel sequential soapcall wait");
-  var variable_2 = words("__compressed__ all and any as atmost before beginc++ best between case const counter csv descend encrypt end endc++ endmacro except exclusive expire export extend false few first flat from full function group header heading hole ifblock import in interface joined keep keyed last left limit load local locale lookup macro many maxcount maxlength min skew module named nocase noroot noscan nosort not of only opt or outer overwrite packed partition penalty physicallength pipe quote record relationship repeat return right scan self separator service shared skew skip sql store terminator thor threshold token transform trim true type unicodeorder unsorted validate virtual whole wild within xml xpath");
-  var variable_3 = words("ascii big_endian boolean data decimal ebcdic integer pattern qstring real record rule set of string token udecimal unicode unsigned varstring varunicode");
-  var builtin = words("checkpoint deprecated failcode failmessage failure global independent onwarning persist priority recovery stored success wait when");
-  var blockKeywords = words("catch class do else finally for if switch try while");
-  var atoms = words("true false null");
-  var hooks = {"#": metaHook};
-  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
-
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    var cur = stream.current().toLowerCase();
-    if (keyword.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "keyword";
-    } else if (variable.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "variable";
-    } else if (variable_2.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "variable-2";
-    } else if (variable_3.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "variable-3";
-    } else if (builtin.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "builtin";
-    } else { //Data types are of from KEYWORD##
-                var i = cur.length - 1;
-                while(i >= 0 && (!isNaN(cur[i]) || cur[i] == '_'))
-                        --i;
-
-                if (i > 0) {
-                        var cur2 = cur.substr(0, i + 1);
-                if (variable_3.propertyIsEnumerable(cur2)) {
-                        if (blockKeywords.propertyIsEnumerable(cur2)) curPunc = "newstatement";
-                        return "variable-3";
-                }
-            }
-    }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return null;
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !escaped)
-        state.tokenize = tokenBase;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function pushContext(state, col, type) {
-    return state.context = new Context(state.indented, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true
-      };
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
-        pushContext(state, stream.column(), "statement");
-      state.startOfLine = false;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
-      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
-      var closing = firstChar == ctx.type;
-      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : indentUnit);
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: "{}"
-  };
-});
-
-CodeMirror.defineMIME("text/x-ecl", "ecl");
-
-});
diff --git a/www/code/codemirror-5.7/mode/ecl/index.html b/www/code/codemirror-5.7/mode/ecl/index.html
deleted file mode 100644
index 2306860dc..000000000
--- a/www/code/codemirror-5.7/mode/ecl/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-CodeMirror: ECL mode
-
-
-
-
-
-
-
-
-
-
    
-
    ECL mode
    
-
    
-    
-
-    
    Based on CodeMirror's clike mode.  For more information see HPCC Systems web site.
    
-    
    MIME types defined: text/x-ecl.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/eiffel/eiffel.js b/www/code/codemirror-5.7/mode/eiffel/eiffel.js
deleted file mode 100644
index b8b70e36e..000000000
--- a/www/code/codemirror-5.7/mode/eiffel/eiffel.js
+++ /dev/null
@@ -1,160 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("eiffel", function() {
-  function wordObj(words) {
-    var o = {};
-    for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
-    return o;
-  }
-  var keywords = wordObj([
-    'note',
-    'across',
-    'when',
-    'variant',
-    'until',
-    'unique',
-    'undefine',
-    'then',
-    'strip',
-    'select',
-    'retry',
-    'rescue',
-    'require',
-    'rename',
-    'reference',
-    'redefine',
-    'prefix',
-    'once',
-    'old',
-    'obsolete',
-    'loop',
-    'local',
-    'like',
-    'is',
-    'inspect',
-    'infix',
-    'include',
-    'if',
-    'frozen',
-    'from',
-    'external',
-    'export',
-    'ensure',
-    'end',
-    'elseif',
-    'else',
-    'do',
-    'creation',
-    'create',
-    'check',
-    'alias',
-    'agent',
-    'separate',
-    'invariant',
-    'inherit',
-    'indexing',
-    'feature',
-    'expanded',
-    'deferred',
-    'class',
-    'Void',
-    'True',
-    'Result',
-    'Precursor',
-    'False',
-    'Current',
-    'create',
-    'attached',
-    'detachable',
-    'as',
-    'and',
-    'implies',
-    'not',
-    'or'
-  ]);
-  var operators = wordObj([":=", "and then","and", "or","<<",">>"]);
-
-  function chain(newtok, stream, state) {
-    state.tokenize.push(newtok);
-    return newtok(stream, state);
-  }
-
-  function tokenBase(stream, state) {
-    if (stream.eatSpace()) return null;
-    var ch = stream.next();
-    if (ch == '"'||ch == "'") {
-      return chain(readQuoted(ch, "string"), stream, state);
-    } else if (ch == "-"&&stream.eat("-")) {
-      stream.skipToEnd();
-      return "comment";
-    } else if (ch == ":"&&stream.eat("=")) {
-      return "operator";
-    } else if (/[0-9]/.test(ch)) {
-      stream.eatWhile(/[xXbBCc0-9\.]/);
-      stream.eat(/[\?\!]/);
-      return "ident";
-    } else if (/[a-zA-Z_0-9]/.test(ch)) {
-      stream.eatWhile(/[a-zA-Z_0-9]/);
-      stream.eat(/[\?\!]/);
-      return "ident";
-    } else if (/[=+\-\/*^%<>~]/.test(ch)) {
-      stream.eatWhile(/[=+\-\/*^%<>~]/);
-      return "operator";
-    } else {
-      return null;
-    }
-  }
-
-  function readQuoted(quote, style,  unescaped) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && (unescaped || !escaped)) {
-          state.tokenize.pop();
-          break;
-        }
-        escaped = !escaped && ch == "%";
-      }
-      return style;
-    };
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: [tokenBase]};
-    },
-
-    token: function(stream, state) {
-      var style = state.tokenize[state.tokenize.length-1](stream, state);
-      if (style == "ident") {
-        var word = stream.current();
-        style = keywords.propertyIsEnumerable(stream.current()) ? "keyword"
-          : operators.propertyIsEnumerable(stream.current()) ? "operator"
-          : /^[A-Z][A-Z_0-9]*$/g.test(word) ? "tag"
-          : /^0[bB][0-1]+$/g.test(word) ? "number"
-          : /^0[cC][0-7]+$/g.test(word) ? "number"
-          : /^0[xX][a-fA-F0-9]+$/g.test(word) ? "number"
-          : /^([0-9]+\.[0-9]*)|([0-9]*\.[0-9]+)$/g.test(word) ? "number"
-          : /^[0-9]+$/g.test(word) ? "number"
-          : "variable";
-      }
-      return style;
-    },
-    lineComment: "--"
-  };
-});
-
-CodeMirror.defineMIME("text/x-eiffel", "eiffel");
-
-});
diff --git a/www/code/codemirror-5.7/mode/eiffel/index.html b/www/code/codemirror-5.7/mode/eiffel/index.html
deleted file mode 100644
index 108a71bec..000000000
--- a/www/code/codemirror-5.7/mode/eiffel/index.html
+++ /dev/null
@@ -1,429 +0,0 @@
-
-
-CodeMirror: Eiffel mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Eiffel mode
    
-
    
-    
-
-    
    MIME types defined: text/x-eiffel.
    
- 
- 
     Created by YNH.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/elm/elm.js b/www/code/codemirror-5.7/mode/elm/elm.js
deleted file mode 100644
index b31e66375..000000000
--- a/www/code/codemirror-5.7/mode/elm/elm.js
+++ /dev/null
@@ -1,205 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("elm", function() {
-
-    function switchState(source, setState, f) {
-      setState(f);
-      return f(source, setState);
-    }
-
-    // These should all be Unicode extended, as per the Haskell 2010 report
-    var smallRE = /[a-z_]/;
-    var largeRE = /[A-Z]/;
-    var digitRE = /[0-9]/;
-    var hexitRE = /[0-9A-Fa-f]/;
-    var octitRE = /[0-7]/;
-    var idRE = /[a-z_A-Z0-9\']/;
-    var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:\u03BB\u2192]/;
-    var specialRE = /[(),;[\]`{}]/;
-    var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer
-
-    function normal() {
-      return function (source, setState) {
-        if (source.eatWhile(whiteCharRE)) {
-          return null;
-        }
-
-        var ch = source.next();
-        if (specialRE.test(ch)) {
-          if (ch == '{' && source.eat('-')) {
-            var t = "comment";
-            if (source.eat('#')) t = "meta";
-            return switchState(source, setState, ncomment(t, 1));
-          }
-          return null;
-        }
-
-        if (ch == '\'') {
-          if (source.eat('\\'))
-            source.next();  // should handle other escapes here
-          else
-            source.next();
-
-          if (source.eat('\''))
-            return "string";
-          return "error";
-        }
-
-        if (ch == '"') {
-          return switchState(source, setState, stringLiteral);
-        }
-
-        if (largeRE.test(ch)) {
-          source.eatWhile(idRE);
-          if (source.eat('.'))
-            return "qualifier";
-          return "variable-2";
-        }
-
-        if (smallRE.test(ch)) {
-          var isDef = source.pos === 1;
-          source.eatWhile(idRE);
-          return isDef ? "variable-3" : "variable";
-        }
-
-        if (digitRE.test(ch)) {
-          if (ch == '0') {
-            if (source.eat(/[xX]/)) {
-              source.eatWhile(hexitRE); // should require at least 1
-              return "integer";
-            }
-            if (source.eat(/[oO]/)) {
-              source.eatWhile(octitRE); // should require at least 1
-              return "number";
-            }
-          }
-          source.eatWhile(digitRE);
-          var t = "number";
-          if (source.eat('.')) {
-            t = "number";
-            source.eatWhile(digitRE); // should require at least 1
-          }
-          if (source.eat(/[eE]/)) {
-            t = "number";
-            source.eat(/[-+]/);
-            source.eatWhile(digitRE); // should require at least 1
-          }
-          return t;
-        }
-
-        if (symbolRE.test(ch)) {
-          if (ch == '-' && source.eat(/-/)) {
-            source.eatWhile(/-/);
-            if (!source.eat(symbolRE)) {
-              source.skipToEnd();
-              return "comment";
-            }
-          }
-          source.eatWhile(symbolRE);
-          return "builtin";
-        }
-
-        return "error";
-      }
-    }
-
-    function ncomment(type, nest) {
-      if (nest == 0) {
-        return normal();
-      }
-      return function(source, setState) {
-        var currNest = nest;
-        while (!source.eol()) {
-          var ch = source.next();
-          if (ch == '{' && source.eat('-')) {
-            ++currNest;
-          } else if (ch == '-' && source.eat('}')) {
-            --currNest;
-            if (currNest == 0) {
-              setState(normal());
-              return type;
-            }
-          }
-        }
-        setState(ncomment(type, currNest));
-        return type;
-      }
-    }
-
-    function stringLiteral(source, setState) {
-      while (!source.eol()) {
-        var ch = source.next();
-        if (ch == '"') {
-          setState(normal());
-          return "string";
-        }
-        if (ch == '\\') {
-          if (source.eol() || source.eat(whiteCharRE)) {
-            setState(stringGap);
-            return "string";
-          }
-          if (!source.eat('&')) source.next(); // should handle other escapes here
-        }
-      }
-      setState(normal());
-      return "error";
-    }
-
-    function stringGap(source, setState) {
-      if (source.eat('\\')) {
-        return switchState(source, setState, stringLiteral);
-      }
-      source.next();
-      setState(normal());
-      return "error";
-    }
-
-
-    var wellKnownWords = (function() {
-      var wkw = {};
-
-      var keywords = [
-        "case", "of", "as",
-        "if", "then", "else",
-        "let", "in",
-        "infix", "infixl", "infixr",
-        "type", "alias",
-        "input", "output", "foreign", "loopback",
-        "module", "where", "import", "exposing",
-        "_", "..", "|", ":", "=", "\\", "\"", "->", "<-"
-      ];
-
-      for (var i = keywords.length; i--;)
-        wkw[keywords[i]] = "keyword";
-
-      return wkw;
-    })();
-
-
-
-    return {
-      startState: function ()  { return { f: normal() }; },
-      copyState:  function (s) { return { f: s.f }; },
-
-      token: function(stream, state) {
-        var t = state.f(stream, function(s) { state.f = s; });
-        var w = stream.current();
-        return (wellKnownWords.hasOwnProperty(w)) ? wellKnownWords[w] : t;
-      }
-    };
-
-  });
-
-  CodeMirror.defineMIME("text/x-elm", "elm");
-});
diff --git a/www/code/codemirror-5.7/mode/elm/index.html b/www/code/codemirror-5.7/mode/elm/index.html
deleted file mode 100644
index d5cb16abf..000000000
--- a/www/code/codemirror-5.7/mode/elm/index.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-CodeMirror: Elm mode
-
-
-
-
-
-
-
-
-
-
    
-
    Elm mode
    
-
-
    
-
-    
-
-    
    MIME types defined: text/x-elm.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/erlang/erlang.js b/www/code/codemirror-5.7/mode/erlang/erlang.js
deleted file mode 100644
index 5aed76a52..000000000
--- a/www/code/codemirror-5.7/mode/erlang/erlang.js
+++ /dev/null
@@ -1,618 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/*jshint unused:true, eqnull:true, curly:true, bitwise:true */
-/*jshint undef:true, latedef:true, trailing:true */
-/*global CodeMirror:true */
-
-// erlang mode.
-// tokenizer -> token types -> CodeMirror styles
-// tokenizer maintains a parse stack
-// indenter uses the parse stack
-
-// TODO indenter:
-//   bit syntax
-//   old guard/bif/conversion clashes (e.g. "float/1")
-//   type/spec/opaque
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMIME("text/x-erlang", "erlang");
-
-CodeMirror.defineMode("erlang", function(cmCfg) {
-  "use strict";
-
-/////////////////////////////////////////////////////////////////////////////
-// constants
-
-  var typeWords = [
-    "-type", "-spec", "-export_type", "-opaque"];
-
-  var keywordWords = [
-    "after","begin","catch","case","cond","end","fun","if",
-    "let","of","query","receive","try","when"];
-
-  var separatorRE    = /[\->,;]/;
-  var separatorWords = [
-    "->",";",","];
-
-  var operatorAtomWords = [
-    "and","andalso","band","bnot","bor","bsl","bsr","bxor",
-    "div","not","or","orelse","rem","xor"];
-
-  var operatorSymbolRE    = /[\+\-\*\/<>=\|:!]/;
-  var operatorSymbolWords = [
-    "=","+","-","*","/",">",">=","<","=<","=:=","==","=/=","/=","||","<-","!"];
-
-  var openParenRE    = /[<\(\[\{]/;
-  var openParenWords = [
-    "<<","(","[","{"];
-
-  var closeParenRE    = /[>\)\]\}]/;
-  var closeParenWords = [
-    "}","]",")",">>"];
-
-  var guardWords = [
-    "is_atom","is_binary","is_bitstring","is_boolean","is_float",
-    "is_function","is_integer","is_list","is_number","is_pid",
-    "is_port","is_record","is_reference","is_tuple",
-    "atom","binary","bitstring","boolean","function","integer","list",
-    "number","pid","port","record","reference","tuple"];
-
-  var bifWords = [
-    "abs","adler32","adler32_combine","alive","apply","atom_to_binary",
-    "atom_to_list","binary_to_atom","binary_to_existing_atom",
-    "binary_to_list","binary_to_term","bit_size","bitstring_to_list",
-    "byte_size","check_process_code","contact_binary","crc32",
-    "crc32_combine","date","decode_packet","delete_module",
-    "disconnect_node","element","erase","exit","float","float_to_list",
-    "garbage_collect","get","get_keys","group_leader","halt","hd",
-    "integer_to_list","internal_bif","iolist_size","iolist_to_binary",
-    "is_alive","is_atom","is_binary","is_bitstring","is_boolean",
-    "is_float","is_function","is_integer","is_list","is_number","is_pid",
-    "is_port","is_process_alive","is_record","is_reference","is_tuple",
-    "length","link","list_to_atom","list_to_binary","list_to_bitstring",
-    "list_to_existing_atom","list_to_float","list_to_integer",
-    "list_to_pid","list_to_tuple","load_module","make_ref","module_loaded",
-    "monitor_node","node","node_link","node_unlink","nodes","notalive",
-    "now","open_port","pid_to_list","port_close","port_command",
-    "port_connect","port_control","pre_loaded","process_flag",
-    "process_info","processes","purge_module","put","register",
-    "registered","round","self","setelement","size","spawn","spawn_link",
-    "spawn_monitor","spawn_opt","split_binary","statistics",
-    "term_to_binary","time","throw","tl","trunc","tuple_size",
-    "tuple_to_list","unlink","unregister","whereis"];
-
-// upper case: [A-Z] [Ø-Þ] [À-Ö]
-// lower case: [a-z] [ß-ö] [ø-ÿ]
-  var anumRE       = /[\w@Ø-ÞÀ-Öß-öø-ÿ]/;
-  var escapesRE    =
-    /[0-7]{1,3}|[bdefnrstv\\"']|\^[a-zA-Z]|x[0-9a-zA-Z]{2}|x{[0-9a-zA-Z]+}/;
-
-/////////////////////////////////////////////////////////////////////////////
-// tokenizer
-
-  function tokenizer(stream,state) {
-    // in multi-line string
-    if (state.in_string) {
-      state.in_string = (!doubleQuote(stream));
-      return rval(state,stream,"string");
-    }
-
-    // in multi-line atom
-    if (state.in_atom) {
-      state.in_atom = (!singleQuote(stream));
-      return rval(state,stream,"atom");
-    }
-
-    // whitespace
-    if (stream.eatSpace()) {
-      return rval(state,stream,"whitespace");
-    }
-
-    // attributes and type specs
-    if (!peekToken(state) &&
-        stream.match(/-\s*[a-zß-öø-ÿ][\wØ-ÞÀ-Öß-öø-ÿ]*/)) {
-      if (is_member(stream.current(),typeWords)) {
-        return rval(state,stream,"type");
-      }else{
-        return rval(state,stream,"attribute");
-      }
-    }
-
-    var ch = stream.next();
-
-    // comment
-    if (ch == '%') {
-      stream.skipToEnd();
-      return rval(state,stream,"comment");
-    }
-
-    // colon
-    if (ch == ":") {
-      return rval(state,stream,"colon");
-    }
-
-    // macro
-    if (ch == '?') {
-      stream.eatSpace();
-      stream.eatWhile(anumRE);
-      return rval(state,stream,"macro");
-    }
-
-    // record
-    if (ch == "#") {
-      stream.eatSpace();
-      stream.eatWhile(anumRE);
-      return rval(state,stream,"record");
-    }
-
-    // dollar escape
-    if (ch == "$") {
-      if (stream.next() == "\\" && !stream.match(escapesRE)) {
-        return rval(state,stream,"error");
-      }
-      return rval(state,stream,"number");
-    }
-
-    // dot
-    if (ch == ".") {
-      return rval(state,stream,"dot");
-    }
-
-    // quoted atom
-    if (ch == '\'') {
-      if (!(state.in_atom = (!singleQuote(stream)))) {
-        if (stream.match(/\s*\/\s*[0-9]/,false)) {
-          stream.match(/\s*\/\s*[0-9]/,true);
-          return rval(state,stream,"fun");      // 'f'/0 style fun
-        }
-        if (stream.match(/\s*\(/,false) || stream.match(/\s*:/,false)) {
-          return rval(state,stream,"function");
-        }
-      }
-      return rval(state,stream,"atom");
-    }
-
-    // string
-    if (ch == '"') {
-      state.in_string = (!doubleQuote(stream));
-      return rval(state,stream,"string");
-    }
-
-    // variable
-    if (/[A-Z_Ø-ÞÀ-Ö]/.test(ch)) {
-      stream.eatWhile(anumRE);
-      return rval(state,stream,"variable");
-    }
-
-    // atom/keyword/BIF/function
-    if (/[a-z_ß-öø-ÿ]/.test(ch)) {
-      stream.eatWhile(anumRE);
-
-      if (stream.match(/\s*\/\s*[0-9]/,false)) {
-        stream.match(/\s*\/\s*[0-9]/,true);
-        return rval(state,stream,"fun");      // f/0 style fun
-      }
-
-      var w = stream.current();
-
-      if (is_member(w,keywordWords)) {
-        return rval(state,stream,"keyword");
-      }else if (is_member(w,operatorAtomWords)) {
-        return rval(state,stream,"operator");
-      }else if (stream.match(/\s*\(/,false)) {
-        // 'put' and 'erlang:put' are bifs, 'foo:put' is not
-        if (is_member(w,bifWords) &&
-            ((peekToken(state).token != ":") ||
-             (peekToken(state,2).token == "erlang"))) {
-          return rval(state,stream,"builtin");
-        }else if (is_member(w,guardWords)) {
-          return rval(state,stream,"guard");
-        }else{
-          return rval(state,stream,"function");
-        }
-      }else if (lookahead(stream) == ":") {
-        if (w == "erlang") {
-          return rval(state,stream,"builtin");
-        } else {
-          return rval(state,stream,"function");
-        }
-      }else if (is_member(w,["true","false"])) {
-        return rval(state,stream,"boolean");
-      }else{
-        return rval(state,stream,"atom");
-      }
-    }
-
-    // number
-    var digitRE      = /[0-9]/;
-    var radixRE      = /[0-9a-zA-Z]/;         // 36#zZ style int
-    if (digitRE.test(ch)) {
-      stream.eatWhile(digitRE);
-      if (stream.eat('#')) {                // 36#aZ  style integer
-        if (!stream.eatWhile(radixRE)) {
-          stream.backUp(1);                 //"36#" - syntax error
-        }
-      } else if (stream.eat('.')) {       // float
-        if (!stream.eatWhile(digitRE)) {
-          stream.backUp(1);        // "3." - probably end of function
-        } else {
-          if (stream.eat(/[eE]/)) {        // float with exponent
-            if (stream.eat(/[-+]/)) {
-              if (!stream.eatWhile(digitRE)) {
-                stream.backUp(2);            // "2e-" - syntax error
-              }
-            } else {
-              if (!stream.eatWhile(digitRE)) {
-                stream.backUp(1);            // "2e" - syntax error
-              }
-            }
-          }
-        }
-      }
-      return rval(state,stream,"number");   // normal integer
-    }
-
-    // open parens
-    if (nongreedy(stream,openParenRE,openParenWords)) {
-      return rval(state,stream,"open_paren");
-    }
-
-    // close parens
-    if (nongreedy(stream,closeParenRE,closeParenWords)) {
-      return rval(state,stream,"close_paren");
-    }
-
-    // separators
-    if (greedy(stream,separatorRE,separatorWords)) {
-      return rval(state,stream,"separator");
-    }
-
-    // operators
-    if (greedy(stream,operatorSymbolRE,operatorSymbolWords)) {
-      return rval(state,stream,"operator");
-    }
-
-    return rval(state,stream,null);
-  }
-
-/////////////////////////////////////////////////////////////////////////////
-// utilities
-  function nongreedy(stream,re,words) {
-    if (stream.current().length == 1 && re.test(stream.current())) {
-      stream.backUp(1);
-      while (re.test(stream.peek())) {
-        stream.next();
-        if (is_member(stream.current(),words)) {
-          return true;
-        }
-      }
-      stream.backUp(stream.current().length-1);
-    }
-    return false;
-  }
-
-  function greedy(stream,re,words) {
-    if (stream.current().length == 1 && re.test(stream.current())) {
-      while (re.test(stream.peek())) {
-        stream.next();
-      }
-      while (0 < stream.current().length) {
-        if (is_member(stream.current(),words)) {
-          return true;
-        }else{
-          stream.backUp(1);
-        }
-      }
-      stream.next();
-    }
-    return false;
-  }
-
-  function doubleQuote(stream) {
-    return quote(stream, '"', '\\');
-  }
-
-  function singleQuote(stream) {
-    return quote(stream,'\'','\\');
-  }
-
-  function quote(stream,quoteChar,escapeChar) {
-    while (!stream.eol()) {
-      var ch = stream.next();
-      if (ch == quoteChar) {
-        return true;
-      }else if (ch == escapeChar) {
-        stream.next();
-      }
-    }
-    return false;
-  }
-
-  function lookahead(stream) {
-    var m = stream.match(/([\n\s]+|%[^\n]*\n)*(.)/,false);
-    return m ? m.pop() : "";
-  }
-
-  function is_member(element,list) {
-    return (-1 < list.indexOf(element));
-  }
-
-  function rval(state,stream,type) {
-
-    // parse stack
-    pushToken(state,realToken(type,stream));
-
-    // map erlang token type to CodeMirror style class
-    //     erlang             -> CodeMirror tag
-    switch (type) {
-      case "atom":        return "atom";
-      case "attribute":   return "attribute";
-      case "boolean":     return "atom";
-      case "builtin":     return "builtin";
-      case "close_paren": return null;
-      case "colon":       return null;
-      case "comment":     return "comment";
-      case "dot":         return null;
-      case "error":       return "error";
-      case "fun":         return "meta";
-      case "function":    return "tag";
-      case "guard":       return "property";
-      case "keyword":     return "keyword";
-      case "macro":       return "variable-2";
-      case "number":      return "number";
-      case "open_paren":  return null;
-      case "operator":    return "operator";
-      case "record":      return "bracket";
-      case "separator":   return null;
-      case "string":      return "string";
-      case "type":        return "def";
-      case "variable":    return "variable";
-      default:            return null;
-    }
-  }
-
-  function aToken(tok,col,ind,typ) {
-    return {token:  tok,
-            column: col,
-            indent: ind,
-            type:   typ};
-  }
-
-  function realToken(type,stream) {
-    return aToken(stream.current(),
-                 stream.column(),
-                 stream.indentation(),
-                 type);
-  }
-
-  function fakeToken(type) {
-    return aToken(type,0,0,type);
-  }
-
-  function peekToken(state,depth) {
-    var len = state.tokenStack.length;
-    var dep = (depth ? depth : 1);
-
-    if (len < dep) {
-      return false;
-    }else{
-      return state.tokenStack[len-dep];
-    }
-  }
-
-  function pushToken(state,token) {
-
-    if (!(token.type == "comment" || token.type == "whitespace")) {
-      state.tokenStack = maybe_drop_pre(state.tokenStack,token);
-      state.tokenStack = maybe_drop_post(state.tokenStack);
-    }
-  }
-
-  function maybe_drop_pre(s,token) {
-    var last = s.length-1;
-
-    if (0 < last && s[last].type === "record" && token.type === "dot") {
-      s.pop();
-    }else if (0 < last && s[last].type === "group") {
-      s.pop();
-      s.push(token);
-    }else{
-      s.push(token);
-    }
-    return s;
-  }
-
-  function maybe_drop_post(s) {
-    var last = s.length-1;
-
-    if (s[last].type === "dot") {
-      return [];
-    }
-    if (s[last].type === "fun" && s[last-1].token === "fun") {
-      return s.slice(0,last-1);
-    }
-    switch (s[s.length-1].token) {
-      case "}":    return d(s,{g:["{"]});
-      case "]":    return d(s,{i:["["]});
-      case ")":    return d(s,{i:["("]});
-      case ">>":   return d(s,{i:["<<"]});
-      case "end":  return d(s,{i:["begin","case","fun","if","receive","try"]});
-      case ",":    return d(s,{e:["begin","try","when","->",
-                                  ",","(","[","{","<<"]});
-      case "->":   return d(s,{r:["when"],
-                               m:["try","if","case","receive"]});
-      case ";":    return d(s,{E:["case","fun","if","receive","try","when"]});
-      case "catch":return d(s,{e:["try"]});
-      case "of":   return d(s,{e:["case"]});
-      case "after":return d(s,{e:["receive","try"]});
-      default:     return s;
-    }
-  }
-
-  function d(stack,tt) {
-    // stack is a stack of Token objects.
-    // tt is an object; {type:tokens}
-    // type is a char, tokens is a list of token strings.
-    // The function returns (possibly truncated) stack.
-    // It will descend the stack, looking for a Token such that Token.token
-    //  is a member of tokens. If it does not find that, it will normally (but
-    //  see "E" below) return stack. If it does find a match, it will remove
-    //  all the Tokens between the top and the matched Token.
-    // If type is "m", that is all it does.
-    // If type is "i", it will also remove the matched Token and the top Token.
-    // If type is "g", like "i", but add a fake "group" token at the top.
-    // If type is "r", it will remove the matched Token, but not the top Token.
-    // If type is "e", it will keep the matched Token but not the top Token.
-    // If type is "E", it behaves as for type "e", except if there is no match,
-    //  in which case it will return an empty stack.
-
-    for (var type in tt) {
-      var len = stack.length-1;
-      var tokens = tt[type];
-      for (var i = len-1; -1 < i ; i--) {
-        if (is_member(stack[i].token,tokens)) {
-          var ss = stack.slice(0,i);
-          switch (type) {
-              case "m": return ss.concat(stack[i]).concat(stack[len]);
-              case "r": return ss.concat(stack[len]);
-              case "i": return ss;
-              case "g": return ss.concat(fakeToken("group"));
-              case "E": return ss.concat(stack[i]);
-              case "e": return ss.concat(stack[i]);
-          }
-        }
-      }
-    }
-    return (type == "E" ? [] : stack);
-  }
-
-/////////////////////////////////////////////////////////////////////////////
-// indenter
-
-  function indenter(state,textAfter) {
-    var t;
-    var unit = cmCfg.indentUnit;
-    var wordAfter = wordafter(textAfter);
-    var currT = peekToken(state,1);
-    var prevT = peekToken(state,2);
-
-    if (state.in_string || state.in_atom) {
-      return CodeMirror.Pass;
-    }else if (!prevT) {
-      return 0;
-    }else if (currT.token == "when") {
-      return currT.column+unit;
-    }else if (wordAfter === "when" && prevT.type === "function") {
-      return prevT.indent+unit;
-    }else if (wordAfter === "(" && currT.token === "fun") {
-      return  currT.column+3;
-    }else if (wordAfter === "catch" && (t = getToken(state,["try"]))) {
-      return t.column;
-    }else if (is_member(wordAfter,["end","after","of"])) {
-      t = getToken(state,["begin","case","fun","if","receive","try"]);
-      return t ? t.column : CodeMirror.Pass;
-    }else if (is_member(wordAfter,closeParenWords)) {
-      t = getToken(state,openParenWords);
-      return t ? t.column : CodeMirror.Pass;
-    }else if (is_member(currT.token,[",","|","||"]) ||
-              is_member(wordAfter,[",","|","||"])) {
-      t = postcommaToken(state);
-      return t ? t.column+t.token.length : unit;
-    }else if (currT.token == "->") {
-      if (is_member(prevT.token, ["receive","case","if","try"])) {
-        return prevT.column+unit+unit;
-      }else{
-        return prevT.column+unit;
-      }
-    }else if (is_member(currT.token,openParenWords)) {
-      return currT.column+currT.token.length;
-    }else{
-      t = defaultToken(state);
-      return truthy(t) ? t.column+unit : 0;
-    }
-  }
-
-  function wordafter(str) {
-    var m = str.match(/,|[a-z]+|\}|\]|\)|>>|\|+|\(/);
-
-    return truthy(m) && (m.index === 0) ? m[0] : "";
-  }
-
-  function postcommaToken(state) {
-    var objs = state.tokenStack.slice(0,-1);
-    var i = getTokenIndex(objs,"type",["open_paren"]);
-
-    return truthy(objs[i]) ? objs[i] : false;
-  }
-
-  function defaultToken(state) {
-    var objs = state.tokenStack;
-    var stop = getTokenIndex(objs,"type",["open_paren","separator","keyword"]);
-    var oper = getTokenIndex(objs,"type",["operator"]);
-
-    if (truthy(stop) && truthy(oper) && stop < oper) {
-      return objs[stop+1];
-    } else if (truthy(stop)) {
-      return objs[stop];
-    } else {
-      return false;
-    }
-  }
-
-  function getToken(state,tokens) {
-    var objs = state.tokenStack;
-    var i = getTokenIndex(objs,"token",tokens);
-
-    return truthy(objs[i]) ? objs[i] : false;
-  }
-
-  function getTokenIndex(objs,propname,propvals) {
-
-    for (var i = objs.length-1; -1 < i ; i--) {
-      if (is_member(objs[i][propname],propvals)) {
-        return i;
-      }
-    }
-    return false;
-  }
-
-  function truthy(x) {
-    return (x !== false) && (x != null);
-  }
-
-/////////////////////////////////////////////////////////////////////////////
-// this object defines the mode
-
-  return {
-    startState:
-      function() {
-        return {tokenStack: [],
-                in_string:  false,
-                in_atom:    false};
-      },
-
-    token:
-      function(stream, state) {
-        return tokenizer(stream, state);
-      },
-
-    indent:
-      function(state, textAfter) {
-        return indenter(state,textAfter);
-      },
-
-    lineComment: "%"
-  };
-});
-
-});
diff --git a/www/code/codemirror-5.7/mode/erlang/index.html b/www/code/codemirror-5.7/mode/erlang/index.html
deleted file mode 100644
index 6d06a890a..000000000
--- a/www/code/codemirror-5.7/mode/erlang/index.html
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-CodeMirror: Erlang mode
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Erlang mode
    
-
    
-
-    
-
-    
    MIME types defined: text/x-erlang.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/factor/factor.js b/www/code/codemirror-5.7/mode/factor/factor.js
deleted file mode 100644
index 86d7adf62..000000000
--- a/www/code/codemirror-5.7/mode/factor/factor.js
+++ /dev/null
@@ -1,83 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Factor syntax highlight - simple mode
-//
-// by Dimage Sapelkin (https://github.com/kerabromsmu)
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineSimpleMode("factor", {
-    // The start state contains the rules that are intially used
-    start: [
-      // comments
-      {regex: /#?!.*/, token: "comment"},
-      // strings """, multiline --> state
-      {regex: /"""/, token: "string", next: "string3"},
-      {regex: /"/, token: "string", next: "string"},
-      // numbers: dec, hex, unicode, bin, fractional, complex
-      {regex: /(?:[+-]?)(?:0x[\d,a-f]+)|(?:0o[0-7]+)|(?:0b[0,1]+)|(?:\d+.?\d*)/, token: "number"},
-      //{regex: /[+-]?/} //fractional
-      // definition: defining word, defined word, etc
-      {regex: /(\:)(\s+)(\S+)(\s+)(\()/, token: ["keyword", null, "def", null, "keyword"], next: "stack"},
-      // vocabulary using --> state
-      {regex: /USING\:/, token: "keyword", next: "vocabulary"},
-      // vocabulary definition/use
-      {regex: /(USE\:|IN\:)(\s+)(\S+)/, token: ["keyword", null, "variable-2"]},
-      // 
-      {regex: /<\S+>/, token: "builtin"},
-      // "keywords", incl. ; t f . [ ] { } defining words
-      {regex: /;|t|f|if|\.|\[|\]|\{|\}|MAIN:/, token: "keyword"},
-      // any id (?)
-      {regex: /\S+/, token: "variable"},
-
-      {
-        regex: /./,
-        token: null
-      }
-    ],
-    vocabulary: [
-      {regex: /;/, token: "keyword", next: "start"},
-      {regex: /\S+/, token: "variable-2"},
-      {
-        regex: /./,
-        token: null
-      }
-    ],
-    string: [
-      {regex: /(?:[^\\]|\\.)*?"/, token: "string", next: "start"},
-      {regex: /.*/, token: "string"}
-    ],
-    string3: [
-      {regex: /(?:[^\\]|\\.)*?"""/, token: "string", next: "start"},
-      {regex: /.*/, token: "string"}
-    ],
-    stack: [
-      {regex: /\)/, token: "meta", next: "start"},
-      {regex: /--/, token: "meta"},
-      {regex: /\S+/, token: "variable-3"},
-      {
-        regex: /./,
-        token: null
-      }
-    ],
-    // The meta property contains global information about the mode. It
-    // can contain properties like lineComment, which are supported by
-    // all modes, and also directives like dontIndentStates, which are
-    // specific to simple modes.
-    meta: {
-      dontIndentStates: ["start", "vocabulary", "string", "string3", "stack"],
-      lineComment: [ "!", "#!" ]
-    }
-  });
-
-  CodeMirror.defineMIME("text/x-factor", "factor");
-});
diff --git a/www/code/codemirror-5.7/mode/factor/index.html b/www/code/codemirror-5.7/mode/factor/index.html
deleted file mode 100644
index 9f1548914..000000000
--- a/www/code/codemirror-5.7/mode/factor/index.html
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-CodeMirror: Factor mode
-
-
-
-
-
-
-
-
-
-
-
-
    
-
-
    Factor mode
    
-
-
    
-  
    
-
-
-
    
-
    Simple mode that handles Factor Syntax (Factor on WikiPedia).
    
-
-
    MIME types defined: text/x-factor.
    
-
-
    
diff --git a/www/code/codemirror-5.7/mode/forth/forth.js b/www/code/codemirror-5.7/mode/forth/forth.js
deleted file mode 100644
index 1f519d886..000000000
--- a/www/code/codemirror-5.7/mode/forth/forth.js
+++ /dev/null
@@ -1,180 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Author: Aliaksei Chapyzhenka
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  function toWordList(words) {
-    var ret = [];
-    words.split(' ').forEach(function(e){
-      ret.push({name: e});
-    });
-    return ret;
-  }
-
-  var coreWordList = toWordList(
-'INVERT AND OR XOR\
- 2* 2/ LSHIFT RSHIFT\
- 0= = 0< < > U< MIN MAX\
- 2DROP 2DUP 2OVER 2SWAP ?DUP DEPTH DROP DUP OVER ROT SWAP\
- >R R> R@\
- + - 1+ 1- ABS NEGATE\
- S>D * M* UM*\
- FM/MOD SM/REM UM/MOD */ */MOD / /MOD MOD\
- HERE , @ ! CELL+ CELLS C, C@ C! CHARS 2@ 2!\
- ALIGN ALIGNED +! ALLOT\
- CHAR [CHAR] [ ] BL\
- FIND EXECUTE IMMEDIATE COUNT LITERAL STATE\
- ; DOES> >BODY\
- EVALUATE\
- SOURCE >IN\
- <# # #S #> HOLD SIGN BASE >NUMBER HEX DECIMAL\
- FILL MOVE\
- . CR EMIT SPACE SPACES TYPE U. .R U.R\
- ACCEPT\
- TRUE FALSE\
- <> U> 0<> 0>\
- NIP TUCK ROLL PICK\
- 2>R 2R@ 2R>\
- WITHIN UNUSED MARKER\
- I J\
- TO\
- COMPILE, [COMPILE]\
- SAVE-INPUT RESTORE-INPUT\
- PAD ERASE\
- 2LITERAL DNEGATE\
- D- D+ D0< D0= D2* D2/ D< D= DMAX DMIN D>S DABS\
- M+ M*/ D. D.R 2ROT DU<\
- CATCH THROW\
- FREE RESIZE ALLOCATE\
- CS-PICK CS-ROLL\
- GET-CURRENT SET-CURRENT FORTH-WORDLIST GET-ORDER SET-ORDER\
- PREVIOUS SEARCH-WORDLIST WORDLIST FIND ALSO ONLY FORTH DEFINITIONS ORDER\
- -TRAILING /STRING SEARCH COMPARE CMOVE CMOVE> BLANK SLITERAL');
-
-  var immediateWordList = toWordList('IF ELSE THEN BEGIN WHILE REPEAT UNTIL RECURSE [IF] [ELSE] [THEN] ?DO DO LOOP +LOOP UNLOOP LEAVE EXIT AGAIN CASE OF ENDOF ENDCASE');
-
-  CodeMirror.defineMode('forth', function() {
-    function searchWordList (wordList, word) {
-      var i;
-      for (i = wordList.length - 1; i >= 0; i--) {
-        if (wordList[i].name === word.toUpperCase()) {
-          return wordList[i];
-        }
-      }
-      return undefined;
-    }
-  return {
-    startState: function() {
-      return {
-        state: '',
-        base: 10,
-        coreWordList: coreWordList,
-        immediateWordList: immediateWordList,
-        wordList: []
-      };
-    },
-    token: function (stream, stt) {
-      var mat;
-      if (stream.eatSpace()) {
-        return null;
-      }
-      if (stt.state === '') { // interpretation
-        if (stream.match(/^(\]|:NONAME)(\s|$)/i)) {
-          stt.state = ' compilation';
-          return 'builtin compilation';
-        }
-        mat = stream.match(/^(\:)\s+(\S+)(\s|$)+/);
-        if (mat) {
-          stt.wordList.push({name: mat[2].toUpperCase()});
-          stt.state = ' compilation';
-          return 'def' + stt.state;
-        }
-        mat = stream.match(/^(VARIABLE|2VARIABLE|CONSTANT|2CONSTANT|CREATE|POSTPONE|VALUE|WORD)\s+(\S+)(\s|$)+/i);
-        if (mat) {
-          stt.wordList.push({name: mat[2].toUpperCase()});
-          return 'def' + stt.state;
-        }
-        mat = stream.match(/^(\'|\[\'\])\s+(\S+)(\s|$)+/);
-        if (mat) {
-          return 'builtin' + stt.state;
-        }
-        } else { // compilation
-        // ; [
-        if (stream.match(/^(\;|\[)(\s)/)) {
-          stt.state = '';
-          stream.backUp(1);
-          return 'builtin compilation';
-        }
-        if (stream.match(/^(\;|\[)($)/)) {
-          stt.state = '';
-          return 'builtin compilation';
-        }
-        if (stream.match(/^(POSTPONE)\s+\S+(\s|$)+/)) {
-          return 'builtin';
-        }
-      }
-
-      // dynamic wordlist
-      mat = stream.match(/^(\S+)(\s+|$)/);
-      if (mat) {
-        if (searchWordList(stt.wordList, mat[1]) !== undefined) {
-          return 'variable' + stt.state;
-        }
-
-        // comments
-        if (mat[1] === '\\') {
-          stream.skipToEnd();
-            return 'comment' + stt.state;
-          }
-
-          // core words
-          if (searchWordList(stt.coreWordList, mat[1]) !== undefined) {
-            return 'builtin' + stt.state;
-          }
-          if (searchWordList(stt.immediateWordList, mat[1]) !== undefined) {
-            return 'keyword' + stt.state;
-          }
-
-          if (mat[1] === '(') {
-            stream.eatWhile(function (s) { return s !== ')'; });
-            stream.eat(')');
-            return 'comment' + stt.state;
-          }
-
-          // // strings
-          if (mat[1] === '.(') {
-            stream.eatWhile(function (s) { return s !== ')'; });
-            stream.eat(')');
-            return 'string' + stt.state;
-          }
-          if (mat[1] === 'S"' || mat[1] === '."' || mat[1] === 'C"') {
-            stream.eatWhile(function (s) { return s !== '"'; });
-            stream.eat('"');
-            return 'string' + stt.state;
-          }
-
-          // numbers
-          if (mat[1] - 0xfffffffff) {
-            return 'number' + stt.state;
-          }
-          // if (mat[1].match(/^[-+]?[0-9]+\.[0-9]*/)) {
-          //     return 'number' + stt.state;
-          // }
-
-          return 'atom' + stt.state;
-        }
-      }
-    };
-  });
-  CodeMirror.defineMIME("text/x-forth", "forth");
-});
diff --git a/www/code/codemirror-5.7/mode/forth/index.html b/www/code/codemirror-5.7/mode/forth/index.html
deleted file mode 100644
index ae8cd3458..000000000
--- a/www/code/codemirror-5.7/mode/forth/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-CodeMirror: Forth mode
-
-
-
-
-
-
-
-
-
-
-
-
    
-
-
    Forth mode
    
-
-
    
-  
    
-
-
-
-
    Simple mode that handle Forth-Syntax (Forth on WikiPedia).
    
-
-
    MIME types defined: text/x-forth.
    
-
-
    
diff --git a/www/code/codemirror-5.7/mode/fortran/fortran.js b/www/code/codemirror-5.7/mode/fortran/fortran.js
deleted file mode 100644
index 4d88f006a..000000000
--- a/www/code/codemirror-5.7/mode/fortran/fortran.js
+++ /dev/null
@@ -1,188 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("fortran", function() {
-  function words(array) {
-    var keys = {};
-    for (var i = 0; i < array.length; ++i) {
-      keys[array[i]] = true;
-    }
-    return keys;
-  }
-
-  var keywords = words([
-                  "abstract", "accept", "allocatable", "allocate",
-                  "array", "assign", "asynchronous", "backspace",
-                  "bind", "block", "byte", "call", "case",
-                  "class", "close", "common", "contains",
-                  "continue", "cycle", "data", "deallocate",
-                  "decode", "deferred", "dimension", "do",
-                  "elemental", "else", "encode", "end",
-                  "endif", "entry", "enumerator", "equivalence",
-                  "exit", "external", "extrinsic", "final",
-                  "forall", "format", "function", "generic",
-                  "go", "goto", "if", "implicit", "import", "include",
-                  "inquire", "intent", "interface", "intrinsic",
-                  "module", "namelist", "non_intrinsic",
-                  "non_overridable", "none", "nopass",
-                  "nullify", "open", "optional", "options",
-                  "parameter", "pass", "pause", "pointer",
-                  "print", "private", "program", "protected",
-                  "public", "pure", "read", "recursive", "result",
-                  "return", "rewind", "save", "select", "sequence",
-                  "stop", "subroutine", "target", "then", "to", "type",
-                  "use", "value", "volatile", "where", "while",
-                  "write"]);
-  var builtins = words(["abort", "abs", "access", "achar", "acos",
-                          "adjustl", "adjustr", "aimag", "aint", "alarm",
-                          "all", "allocated", "alog", "amax", "amin",
-                          "amod", "and", "anint", "any", "asin",
-                          "associated", "atan", "besj", "besjn", "besy",
-                          "besyn", "bit_size", "btest", "cabs", "ccos",
-                          "ceiling", "cexp", "char", "chdir", "chmod",
-                          "clog", "cmplx", "command_argument_count",
-                          "complex", "conjg", "cos", "cosh", "count",
-                          "cpu_time", "cshift", "csin", "csqrt", "ctime",
-                          "c_funloc", "c_loc", "c_associated", "c_null_ptr",
-                          "c_null_funptr", "c_f_pointer", "c_null_char",
-                          "c_alert", "c_backspace", "c_form_feed",
-                          "c_new_line", "c_carriage_return",
-                          "c_horizontal_tab", "c_vertical_tab", "dabs",
-                          "dacos", "dasin", "datan", "date_and_time",
-                          "dbesj", "dbesj", "dbesjn", "dbesy", "dbesy",
-                          "dbesyn", "dble", "dcos", "dcosh", "ddim", "derf",
-                          "derfc", "dexp", "digits", "dim", "dint", "dlog",
-                          "dlog", "dmax", "dmin", "dmod", "dnint",
-                          "dot_product", "dprod", "dsign", "dsinh",
-                          "dsin", "dsqrt", "dtanh", "dtan", "dtime",
-                          "eoshift", "epsilon", "erf", "erfc", "etime",
-                          "exit", "exp", "exponent", "extends_type_of",
-                          "fdate", "fget", "fgetc", "float", "floor",
-                          "flush", "fnum", "fputc", "fput", "fraction",
-                          "fseek", "fstat", "ftell", "gerror", "getarg",
-                          "get_command", "get_command_argument",
-                          "get_environment_variable", "getcwd",
-                          "getenv", "getgid", "getlog", "getpid",
-                          "getuid", "gmtime", "hostnm", "huge", "iabs",
-                          "iachar", "iand", "iargc", "ibclr", "ibits",
-                          "ibset", "ichar", "idate", "idim", "idint",
-                          "idnint", "ieor", "ierrno", "ifix", "imag",
-                          "imagpart", "index", "int", "ior", "irand",
-                          "isatty", "ishft", "ishftc", "isign",
-                          "iso_c_binding", "is_iostat_end", "is_iostat_eor",
-                          "itime", "kill", "kind", "lbound", "len", "len_trim",
-                          "lge", "lgt", "link", "lle", "llt", "lnblnk", "loc",
-                          "log", "logical", "long", "lshift", "lstat", "ltime",
-                          "matmul", "max", "maxexponent", "maxloc", "maxval",
-                          "mclock", "merge", "move_alloc", "min", "minexponent",
-                          "minloc", "minval", "mod", "modulo", "mvbits",
-                          "nearest", "new_line", "nint", "not", "or", "pack",
-                          "perror", "precision", "present", "product", "radix",
-                          "rand", "random_number", "random_seed", "range",
-                          "real", "realpart", "rename", "repeat", "reshape",
-                          "rrspacing", "rshift", "same_type_as", "scale",
-                          "scan", "second", "selected_int_kind",
-                          "selected_real_kind", "set_exponent", "shape",
-                          "short", "sign", "signal", "sinh", "sin", "sleep",
-                          "sngl", "spacing", "spread", "sqrt", "srand", "stat",
-                          "sum", "symlnk", "system", "system_clock", "tan",
-                          "tanh", "time", "tiny", "transfer", "transpose",
-                          "trim", "ttynam", "ubound", "umask", "unlink",
-                          "unpack", "verify", "xor", "zabs", "zcos", "zexp",
-                          "zlog", "zsin", "zsqrt"]);
-
-    var dataTypes =  words(["c_bool", "c_char", "c_double", "c_double_complex",
-                     "c_float", "c_float_complex", "c_funptr", "c_int",
-                     "c_int16_t", "c_int32_t", "c_int64_t", "c_int8_t",
-                     "c_int_fast16_t", "c_int_fast32_t", "c_int_fast64_t",
-                     "c_int_fast8_t", "c_int_least16_t", "c_int_least32_t",
-                     "c_int_least64_t", "c_int_least8_t", "c_intmax_t",
-                     "c_intptr_t", "c_long", "c_long_double",
-                     "c_long_double_complex", "c_long_long", "c_ptr",
-                     "c_short", "c_signed_char", "c_size_t", "character",
-                     "complex", "double", "integer", "logical", "real"]);
-  var isOperatorChar = /[+\-*&=<>\/\:]/;
-  var litOperator = new RegExp("(\.and\.|\.or\.|\.eq\.|\.lt\.|\.le\.|\.gt\.|\.ge\.|\.ne\.|\.not\.|\.eqv\.|\.neqv\.)", "i");
-
-  function tokenBase(stream, state) {
-
-    if (stream.match(litOperator)){
-        return 'operator';
-    }
-
-    var ch = stream.next();
-    if (ch == "!") {
-      stream.skipToEnd();
-      return "comment";
-    }
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (/[\[\]\(\),]/.test(ch)) {
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    var word = stream.current().toLowerCase();
-
-    if (keywords.hasOwnProperty(word)){
-            return 'keyword';
-    }
-    if (builtins.hasOwnProperty(word) || dataTypes.hasOwnProperty(word)) {
-            return 'builtin';
-    }
-    return "variable";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-            end = true;
-            break;
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !escaped) state.tokenize = null;
-      return "string";
-    };
-  }
-
-  // Interface
-
-  return {
-    startState: function() {
-      return {tokenize: null};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
-      return style;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-fortran", "fortran");
-
-});
diff --git a/www/code/codemirror-5.7/mode/fortran/index.html b/www/code/codemirror-5.7/mode/fortran/index.html
deleted file mode 100644
index 102e8f826..000000000
--- a/www/code/codemirror-5.7/mode/fortran/index.html
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-CodeMirror: Fortran mode
-
-
-
-
-
-
-
-
-
-
    
-
    Fortran mode
    
-
-
-
    
-
-    
-
-    
    MIME types defined: text/x-Fortran.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/gas/gas.js b/www/code/codemirror-5.7/mode/gas/gas.js
deleted file mode 100644
index 0c74bedc5..000000000
--- a/www/code/codemirror-5.7/mode/gas/gas.js
+++ /dev/null
@@ -1,345 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("gas", function(_config, parserConfig) {
-  'use strict';
-
-  // If an architecture is specified, its initialization function may
-  // populate this array with custom parsing functions which will be
-  // tried in the event that the standard functions do not find a match.
-  var custom = [];
-
-  // The symbol used to start a line comment changes based on the target
-  // architecture.
-  // If no architecture is pased in "parserConfig" then only multiline
-  // comments will have syntax support.
-  var lineCommentStartSymbol = "";
-
-  // These directives are architecture independent.
-  // Machine specific directives should go in their respective
-  // architecture initialization function.
-  // Reference:
-  // http://sourceware.org/binutils/docs/as/Pseudo-Ops.html#Pseudo-Ops
-  var directives = {
-    ".abort" : "builtin",
-    ".align" : "builtin",
-    ".altmacro" : "builtin",
-    ".ascii" : "builtin",
-    ".asciz" : "builtin",
-    ".balign" : "builtin",
-    ".balignw" : "builtin",
-    ".balignl" : "builtin",
-    ".bundle_align_mode" : "builtin",
-    ".bundle_lock" : "builtin",
-    ".bundle_unlock" : "builtin",
-    ".byte" : "builtin",
-    ".cfi_startproc" : "builtin",
-    ".comm" : "builtin",
-    ".data" : "builtin",
-    ".def" : "builtin",
-    ".desc" : "builtin",
-    ".dim" : "builtin",
-    ".double" : "builtin",
-    ".eject" : "builtin",
-    ".else" : "builtin",
-    ".elseif" : "builtin",
-    ".end" : "builtin",
-    ".endef" : "builtin",
-    ".endfunc" : "builtin",
-    ".endif" : "builtin",
-    ".equ" : "builtin",
-    ".equiv" : "builtin",
-    ".eqv" : "builtin",
-    ".err" : "builtin",
-    ".error" : "builtin",
-    ".exitm" : "builtin",
-    ".extern" : "builtin",
-    ".fail" : "builtin",
-    ".file" : "builtin",
-    ".fill" : "builtin",
-    ".float" : "builtin",
-    ".func" : "builtin",
-    ".global" : "builtin",
-    ".gnu_attribute" : "builtin",
-    ".hidden" : "builtin",
-    ".hword" : "builtin",
-    ".ident" : "builtin",
-    ".if" : "builtin",
-    ".incbin" : "builtin",
-    ".include" : "builtin",
-    ".int" : "builtin",
-    ".internal" : "builtin",
-    ".irp" : "builtin",
-    ".irpc" : "builtin",
-    ".lcomm" : "builtin",
-    ".lflags" : "builtin",
-    ".line" : "builtin",
-    ".linkonce" : "builtin",
-    ".list" : "builtin",
-    ".ln" : "builtin",
-    ".loc" : "builtin",
-    ".loc_mark_labels" : "builtin",
-    ".local" : "builtin",
-    ".long" : "builtin",
-    ".macro" : "builtin",
-    ".mri" : "builtin",
-    ".noaltmacro" : "builtin",
-    ".nolist" : "builtin",
-    ".octa" : "builtin",
-    ".offset" : "builtin",
-    ".org" : "builtin",
-    ".p2align" : "builtin",
-    ".popsection" : "builtin",
-    ".previous" : "builtin",
-    ".print" : "builtin",
-    ".protected" : "builtin",
-    ".psize" : "builtin",
-    ".purgem" : "builtin",
-    ".pushsection" : "builtin",
-    ".quad" : "builtin",
-    ".reloc" : "builtin",
-    ".rept" : "builtin",
-    ".sbttl" : "builtin",
-    ".scl" : "builtin",
-    ".section" : "builtin",
-    ".set" : "builtin",
-    ".short" : "builtin",
-    ".single" : "builtin",
-    ".size" : "builtin",
-    ".skip" : "builtin",
-    ".sleb128" : "builtin",
-    ".space" : "builtin",
-    ".stab" : "builtin",
-    ".string" : "builtin",
-    ".struct" : "builtin",
-    ".subsection" : "builtin",
-    ".symver" : "builtin",
-    ".tag" : "builtin",
-    ".text" : "builtin",
-    ".title" : "builtin",
-    ".type" : "builtin",
-    ".uleb128" : "builtin",
-    ".val" : "builtin",
-    ".version" : "builtin",
-    ".vtable_entry" : "builtin",
-    ".vtable_inherit" : "builtin",
-    ".warning" : "builtin",
-    ".weak" : "builtin",
-    ".weakref" : "builtin",
-    ".word" : "builtin"
-  };
-
-  var registers = {};
-
-  function x86(_parserConfig) {
-    lineCommentStartSymbol = "#";
-
-    registers.ax  = "variable";
-    registers.eax = "variable-2";
-    registers.rax = "variable-3";
-
-    registers.bx  = "variable";
-    registers.ebx = "variable-2";
-    registers.rbx = "variable-3";
-
-    registers.cx  = "variable";
-    registers.ecx = "variable-2";
-    registers.rcx = "variable-3";
-
-    registers.dx  = "variable";
-    registers.edx = "variable-2";
-    registers.rdx = "variable-3";
-
-    registers.si  = "variable";
-    registers.esi = "variable-2";
-    registers.rsi = "variable-3";
-
-    registers.di  = "variable";
-    registers.edi = "variable-2";
-    registers.rdi = "variable-3";
-
-    registers.sp  = "variable";
-    registers.esp = "variable-2";
-    registers.rsp = "variable-3";
-
-    registers.bp  = "variable";
-    registers.ebp = "variable-2";
-    registers.rbp = "variable-3";
-
-    registers.ip  = "variable";
-    registers.eip = "variable-2";
-    registers.rip = "variable-3";
-
-    registers.cs  = "keyword";
-    registers.ds  = "keyword";
-    registers.ss  = "keyword";
-    registers.es  = "keyword";
-    registers.fs  = "keyword";
-    registers.gs  = "keyword";
-  }
-
-  function armv6(_parserConfig) {
-    // Reference:
-    // http://infocenter.arm.com/help/topic/com.arm.doc.qrc0001l/QRC0001_UAL.pdf
-    // http://infocenter.arm.com/help/topic/com.arm.doc.ddi0301h/DDI0301H_arm1176jzfs_r0p7_trm.pdf
-    lineCommentStartSymbol = "@";
-    directives.syntax = "builtin";
-
-    registers.r0  = "variable";
-    registers.r1  = "variable";
-    registers.r2  = "variable";
-    registers.r3  = "variable";
-    registers.r4  = "variable";
-    registers.r5  = "variable";
-    registers.r6  = "variable";
-    registers.r7  = "variable";
-    registers.r8  = "variable";
-    registers.r9  = "variable";
-    registers.r10 = "variable";
-    registers.r11 = "variable";
-    registers.r12 = "variable";
-
-    registers.sp  = "variable-2";
-    registers.lr  = "variable-2";
-    registers.pc  = "variable-2";
-    registers.r13 = registers.sp;
-    registers.r14 = registers.lr;
-    registers.r15 = registers.pc;
-
-    custom.push(function(ch, stream) {
-      if (ch === '#') {
-        stream.eatWhile(/\w/);
-        return "number";
-      }
-    });
-  }
-
-  var arch = (parserConfig.architecture || "x86").toLowerCase();
-  if (arch === "x86") {
-    x86(parserConfig);
-  } else if (arch === "arm" || arch === "armv6") {
-    armv6(parserConfig);
-  }
-
-  function nextUntilUnescaped(stream, end) {
-    var escaped = false, next;
-    while ((next = stream.next()) != null) {
-      if (next === end && !escaped) {
-        return false;
-      }
-      escaped = !escaped && next === "\\";
-    }
-    return escaped;
-  }
-
-  function clikeComment(stream, state) {
-    var maybeEnd = false, ch;
-    while ((ch = stream.next()) != null) {
-      if (ch === "/" && maybeEnd) {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch === "*");
-    }
-    return "comment";
-  }
-
-  return {
-    startState: function() {
-      return {
-        tokenize: null
-      };
-    },
-
-    token: function(stream, state) {
-      if (state.tokenize) {
-        return state.tokenize(stream, state);
-      }
-
-      if (stream.eatSpace()) {
-        return null;
-      }
-
-      var style, cur, ch = stream.next();
-
-      if (ch === "/") {
-        if (stream.eat("*")) {
-          state.tokenize = clikeComment;
-          return clikeComment(stream, state);
-        }
-      }
-
-      if (ch === lineCommentStartSymbol) {
-        stream.skipToEnd();
-        return "comment";
-      }
-
-      if (ch === '"') {
-        nextUntilUnescaped(stream, '"');
-        return "string";
-      }
-
-      if (ch === '.') {
-        stream.eatWhile(/\w/);
-        cur = stream.current().toLowerCase();
-        style = directives[cur];
-        return style || null;
-      }
-
-      if (ch === '=') {
-        stream.eatWhile(/\w/);
-        return "tag";
-      }
-
-      if (ch === '{') {
-        return "braket";
-      }
-
-      if (ch === '}') {
-        return "braket";
-      }
-
-      if (/\d/.test(ch)) {
-        if (ch === "0" && stream.eat("x")) {
-          stream.eatWhile(/[0-9a-fA-F]/);
-          return "number";
-        }
-        stream.eatWhile(/\d/);
-        return "number";
-      }
-
-      if (/\w/.test(ch)) {
-        stream.eatWhile(/\w/);
-        if (stream.eat(":")) {
-          return 'tag';
-        }
-        cur = stream.current().toLowerCase();
-        style = registers[cur];
-        return style || null;
-      }
-
-      for (var i = 0; i < custom.length; i++) {
-        style = custom[i](ch, stream, state);
-        if (style) {
-          return style;
-        }
-      }
-    },
-
-    lineComment: lineCommentStartSymbol,
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/"
-  };
-});
-
-});
diff --git a/www/code/codemirror-5.7/mode/gas/index.html b/www/code/codemirror-5.7/mode/gas/index.html
deleted file mode 100644
index df75ca2db..000000000
--- a/www/code/codemirror-5.7/mode/gas/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-CodeMirror: Gas mode
-
-
-
-
-
-
-
-
-
-
    
-
    Gas mode
    
-
    
-
-        
    
-
-        
-
-        
    Handles AT&T assembler syntax (more specifically this handles
-        the GNU Assembler (gas) syntax.)
-        It takes a single optional configuration parameter:
-        architecture, which can be one of "ARM",
-        "ARMv6" or "x86".
-        Including the parameter adds syntax for the registers and special
-        directives for the supplied architecture.
-
-        
    MIME types defined: text/x-gas
    
-    
    
diff --git a/www/code/codemirror-5.7/mode/gfm/gfm.js b/www/code/codemirror-5.7/mode/gfm/gfm.js
deleted file mode 100644
index 6e74ad4fd..000000000
--- a/www/code/codemirror-5.7/mode/gfm/gfm.js
+++ /dev/null
@@ -1,130 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../markdown/markdown"), require("../../addon/mode/overlay"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../markdown/markdown", "../../addon/mode/overlay"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-var urlRE = /^((?:(?:aaas?|about|acap|adiumxtra|af[ps]|aim|apt|attachment|aw|beshare|bitcoin|bolo|callto|cap|chrome(?:-extension)?|cid|coap|com-eventbrite-attendee|content|crid|cvs|data|dav|dict|dlna-(?:playcontainer|playsingle)|dns|doi|dtn|dvb|ed2k|facetime|feed|file|finger|fish|ftp|geo|gg|git|gizmoproject|go|gopher|gtalk|h323|hcp|https?|iax|icap|icon|im|imap|info|ipn|ipp|irc[6s]?|iris(?:\.beep|\.lwz|\.xpc|\.xpcs)?|itms|jar|javascript|jms|keyparc|lastfm|ldaps?|magnet|mailto|maps|market|message|mid|mms|ms-help|msnim|msrps?|mtqp|mumble|mupdate|mvn|news|nfs|nih?|nntp|notes|oid|opaquelocktoken|palm|paparazzi|platform|pop|pres|proxy|psyc|query|res(?:ource)?|rmi|rsync|rtmp|rtsp|secondlife|service|session|sftp|sgn|shttp|sieve|sips?|skype|sm[bs]|snmp|soap\.beeps?|soldat|spotify|ssh|steam|svn|tag|teamspeak|tel(?:net)?|tftp|things|thismessage|tip|tn3270|tv|udp|unreal|urn|ut2004|vemmi|ventrilo|view-source|webcal|wss?|wtai|wyciwyg|xcon(?:-userid)?|xfire|xmlrpc\.beeps?|xmpp|xri|ymsgr|z39\.50[rs]?):(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]|\([^\s()<>]*\))+(?:\([^\s()<>]*\)|[^\s`*!()\[\]{};:'".,<>?«»“”‘’]))/i
-
-CodeMirror.defineMode("gfm", function(config, modeConfig) {
-  var codeDepth = 0;
-  function blankLine(state) {
-    state.code = false;
-    return null;
-  }
-  var gfmOverlay = {
-    startState: function() {
-      return {
-        code: false,
-        codeBlock: false,
-        ateSpace: false
-      };
-    },
-    copyState: function(s) {
-      return {
-        code: s.code,
-        codeBlock: s.codeBlock,
-        ateSpace: s.ateSpace
-      };
-    },
-    token: function(stream, state) {
-      state.combineTokens = null;
-
-      // Hack to prevent formatting override inside code blocks (block and inline)
-      if (state.codeBlock) {
-        if (stream.match(/^```+/)) {
-          state.codeBlock = false;
-          return null;
-        }
-        stream.skipToEnd();
-        return null;
-      }
-      if (stream.sol()) {
-        state.code = false;
-      }
-      if (stream.sol() && stream.match(/^```+/)) {
-        stream.skipToEnd();
-        state.codeBlock = true;
-        return null;
-      }
-      // If this block is changed, it may need to be updated in Markdown mode
-      if (stream.peek() === '`') {
-        stream.next();
-        var before = stream.pos;
-        stream.eatWhile('`');
-        var difference = 1 + stream.pos - before;
-        if (!state.code) {
-          codeDepth = difference;
-          state.code = true;
-        } else {
-          if (difference === codeDepth) { // Must be exact
-            state.code = false;
-          }
-        }
-        return null;
-      } else if (state.code) {
-        stream.next();
-        return null;
-      }
-      // Check if space. If so, links can be formatted later on
-      if (stream.eatSpace()) {
-        state.ateSpace = true;
-        return null;
-      }
-      if (stream.sol() || state.ateSpace) {
-        state.ateSpace = false;
-        if (modeConfig.gitHubSpice !== false) {
-          if(stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+@)?(?:[a-f0-9]{7,40}\b)/)) {
-            // User/Project@SHA
-            // User@SHA
-            // SHA
-            state.combineTokens = true;
-            return "link";
-          } else if (stream.match(/^(?:[a-zA-Z0-9\-_]+\/)?(?:[a-zA-Z0-9\-_]+)?#[0-9]+\b/)) {
-            // User/Project#Num
-            // User#Num
-            // #Num
-            state.combineTokens = true;
-            return "link";
-          }
-        }
-      }
-      if (stream.match(urlRE) &&
-          stream.string.slice(stream.start - 2, stream.start) != "](" &&
-          (stream.start == 0 || /\W/.test(stream.string.charAt(stream.start - 1)))) {
-        // URLs
-        // Taken from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
-        // And then (issue #1160) simplified to make it not crash the Chrome Regexp engine
-        // And then limited url schemes to the CommonMark list, so foo:bar isn't matched as a URL
-        state.combineTokens = true;
-        return "link";
-      }
-      stream.next();
-      return null;
-    },
-    blankLine: blankLine
-  };
-
-  var markdownConfig = {
-    underscoresBreakWords: false,
-    taskLists: true,
-    fencedCodeBlocks: '```',
-    strikethrough: true
-  };
-  for (var attr in modeConfig) {
-    markdownConfig[attr] = modeConfig[attr];
-  }
-  markdownConfig.name = "markdown";
-  return CodeMirror.overlayMode(CodeMirror.getMode(config, markdownConfig), gfmOverlay);
-
-}, "markdown");
-
-  CodeMirror.defineMIME("text/x-gfm", "gfm");
-});
diff --git a/www/code/codemirror-5.7/mode/gfm/index.html b/www/code/codemirror-5.7/mode/gfm/index.html
deleted file mode 100644
index 7e38c52d6..000000000
--- a/www/code/codemirror-5.7/mode/gfm/index.html
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-CodeMirror: GFM mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    GFM mode
    
-
    
-
-    
-
-    
    Optionally depends on other modes for properly highlighted code blocks.
    
-
-    
    Parsing/Highlighting Tests: normal,  verbose.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/gfm/test.js b/www/code/codemirror-5.7/mode/gfm/test.js
deleted file mode 100644
index 0dcd3619a..000000000
--- a/www/code/codemirror-5.7/mode/gfm/test.js
+++ /dev/null
@@ -1,230 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "gfm");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-  var modeHighlightFormatting = CodeMirror.getMode({tabSize: 4}, {name: "gfm", highlightFormatting: true});
-  function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); }
-
-  FT("codeBackticks",
-     "[comment&formatting&formatting-code `][comment foo][comment&formatting&formatting-code `]");
-
-  FT("doubleBackticks",
-     "[comment&formatting&formatting-code ``][comment foo ` bar][comment&formatting&formatting-code ``]");
-
-  FT("codeBlock",
-     "[comment&formatting&formatting-code-block ```css]",
-     "[tag foo]",
-     "[comment&formatting&formatting-code-block ```]");
-
-  FT("taskList",
-     "[variable-2&formatting&formatting-list&formatting-list-ul - ][meta&formatting&formatting-task [ ]]][variable-2  foo]",
-     "[variable-2&formatting&formatting-list&formatting-list-ul - ][property&formatting&formatting-task [x]]][variable-2  foo]");
-
-  FT("formatting_strikethrough",
-     "[strikethrough&formatting&formatting-strikethrough ~~][strikethrough foo][strikethrough&formatting&formatting-strikethrough ~~]");
-
-  FT("formatting_strikethrough",
-     "foo [strikethrough&formatting&formatting-strikethrough ~~][strikethrough bar][strikethrough&formatting&formatting-strikethrough ~~]");
-
-  MT("emInWordAsterisk",
-     "foo[em *bar*]hello");
-
-  MT("emInWordUnderscore",
-     "foo_bar_hello");
-
-  MT("emStrongUnderscore",
-     "[strong __][em&strong _foo__][em _] bar");
-
-  MT("fencedCodeBlocks",
-     "[comment ```]",
-     "[comment foo]",
-     "",
-     "[comment ```]",
-     "bar");
-
-  MT("fencedCodeBlockModeSwitching",
-     "[comment ```javascript]",
-     "[variable foo]",
-     "",
-     "[comment ```]",
-     "bar");
-
-  MT("fencedCodeBlocksNoTildes",
-     "~~~",
-     "foo",
-     "~~~");
-
-  MT("taskListAsterisk",
-     "[variable-2 * []] foo]", // Invalid; must have space or x between []
-     "[variable-2 * [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 * [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 * ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
-     "    [variable-3 * ][property [x]]][variable-3  foo]"); // Valid; can be nested
-
-  MT("taskListPlus",
-     "[variable-2 + []] foo]", // Invalid; must have space or x between []
-     "[variable-2 + [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 + [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 + ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
-     "    [variable-3 + ][property [x]]][variable-3  foo]"); // Valid; can be nested
-
-  MT("taskListDash",
-     "[variable-2 - []] foo]", // Invalid; must have space or x between []
-     "[variable-2 - [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 - [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 - ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
-     "    [variable-3 - ][property [x]]][variable-3  foo]"); // Valid; can be nested
-
-  MT("taskListNumber",
-     "[variable-2 1. []] foo]", // Invalid; must have space or x between []
-     "[variable-2 2. [ ]]bar]", // Invalid; must have space after ]
-     "[variable-2 3. [x]]hello]", // Invalid; must have space after ]
-     "[variable-2 4. ][meta [ ]]][variable-2  [world]]]", // Valid; tests reference style links
-     "    [variable-3 1. ][property [x]]][variable-3  foo]"); // Valid; can be nested
-
-  MT("SHA",
-     "foo [link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] bar");
-
-  MT("SHAEmphasis",
-     "[em *foo ][em&link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2][em *]");
-
-  MT("shortSHA",
-     "foo [link be6a8cc] bar");
-
-  MT("tooShortSHA",
-     "foo be6a8c bar");
-
-  MT("longSHA",
-     "foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd22 bar");
-
-  MT("badSHA",
-     "foo be6a8cc1c1ecfe9489fb51e4869af15a13fc2cg2 bar");
-
-  MT("userSHA",
-     "foo [link bar@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] hello");
-
-  MT("userSHAEmphasis",
-     "[em *foo ][em&link bar@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2][em *]");
-
-  MT("userProjectSHA",
-     "foo [link bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2] world");
-
-  MT("userProjectSHAEmphasis",
-     "[em *foo ][em&link bar/hello@be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2][em *]");
-
-  MT("num",
-     "foo [link #1] bar");
-
-  MT("numEmphasis",
-     "[em *foo ][em&link #1][em *]");
-
-  MT("badNum",
-     "foo #1bar hello");
-
-  MT("userNum",
-     "foo [link bar#1] hello");
-
-  MT("userNumEmphasis",
-     "[em *foo ][em&link bar#1][em *]");
-
-  MT("userProjectNum",
-     "foo [link bar/hello#1] world");
-
-  MT("userProjectNumEmphasis",
-     "[em *foo ][em&link bar/hello#1][em *]");
-
-  MT("vanillaLink",
-     "foo [link http://www.example.com/] bar");
-
-  MT("vanillaLinkNoScheme",
-     "foo [link www.example.com] bar");
-
-  MT("vanillaLinkHttps",
-     "foo [link https://www.example.com/] bar");
-
-  MT("vanillaLinkDataSchema",
-     "foo [link data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==] bar");
-
-  MT("vanillaLinkPunctuation",
-     "foo [link http://www.example.com/]. bar");
-
-  MT("vanillaLinkExtension",
-     "foo [link http://www.example.com/index.html] bar");
-
-  MT("vanillaLinkEmphasis",
-     "foo [em *][em&link http://www.example.com/index.html][em *] bar");
-
-  MT("notALink",
-     "foo asfd:asdf bar");
-
-  MT("notALink",
-     "[comment ```css]",
-     "[tag foo] {[property color]:[keyword black];}",
-     "[comment ```][link http://www.example.com/]");
-
-  MT("notALink",
-     "[comment ``foo `bar` http://www.example.com/``] hello");
-
-  MT("notALink",
-     "[comment `foo]",
-     "[comment&link http://www.example.com/]",
-     "[comment `] foo",
-     "",
-     "[link http://www.example.com/]");
-
-  MT("headerCodeBlockGithub",
-     "[header&header-1 # heading]",
-     "",
-     "[comment ```]",
-     "[comment code]",
-     "[comment ```]",
-     "",
-     "Commit: [link be6a8cc1c1ecfe9489fb51e4869af15a13fc2cd2]",
-     "Issue: [link #1]",
-     "Link: [link http://www.example.com/]");
-
-  MT("strikethrough",
-     "[strikethrough ~~foo~~]");
-
-  MT("strikethroughWithStartingSpace",
-     "~~ foo~~");
-
-  MT("strikethroughUnclosedStrayTildes",
-    "[strikethrough ~~foo~~~]");
-
-  MT("strikethroughUnclosedStrayTildes",
-     "[strikethrough ~~foo ~~]");
-
-  MT("strikethroughUnclosedStrayTildes",
-    "[strikethrough ~~foo ~~ bar]");
-
-  MT("strikethroughUnclosedStrayTildes",
-    "[strikethrough ~~foo ~~ bar~~]hello");
-
-  MT("strikethroughOneLetter",
-     "[strikethrough ~~a~~]");
-
-  MT("strikethroughWrapped",
-     "[strikethrough ~~foo]",
-     "[strikethrough foo~~]");
-
-  MT("strikethroughParagraph",
-     "[strikethrough ~~foo]",
-     "",
-     "foo[strikethrough ~~bar]");
-
-  MT("strikethroughEm",
-     "[strikethrough ~~foo][em&strikethrough *bar*][strikethrough ~~]");
-
-  MT("strikethroughEm",
-     "[em *][em&strikethrough ~~foo~~][em *]");
-
-  MT("strikethroughStrong",
-     "[strikethrough ~~][strong&strikethrough **foo**][strikethrough ~~]");
-
-  MT("strikethroughStrong",
-     "[strong **][strong&strikethrough ~~foo~~][strong **]");
-
-})();
diff --git a/www/code/codemirror-5.7/mode/gherkin/gherkin.js b/www/code/codemirror-5.7/mode/gherkin/gherkin.js
deleted file mode 100644
index fc2ebee16..000000000
--- a/www/code/codemirror-5.7/mode/gherkin/gherkin.js
+++ /dev/null
@@ -1,178 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/*
-Gherkin mode - http://www.cukes.info/
-Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
-*/
-
-// Following Objs from Brackets implementation: https://github.com/tregusti/brackets-gherkin/blob/master/main.js
-//var Quotes = {
-//  SINGLE: 1,
-//  DOUBLE: 2
-//};
-
-//var regex = {
-//  keywords: /(Feature| {2}(Scenario|In order to|As|I)| {4}(Given|When|Then|And))/
-//};
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("gherkin", function () {
-  return {
-    startState: function () {
-      return {
-        lineNumber: 0,
-        tableHeaderLine: false,
-        allowFeature: true,
-        allowBackground: false,
-        allowScenario: false,
-        allowSteps: false,
-        allowPlaceholders: false,
-        allowMultilineArgument: false,
-        inMultilineString: false,
-        inMultilineTable: false,
-        inKeywordLine: false
-      };
-    },
-    token: function (stream, state) {
-      if (stream.sol()) {
-        state.lineNumber++;
-        state.inKeywordLine = false;
-        if (state.inMultilineTable) {
-            state.tableHeaderLine = false;
-            if (!stream.match(/\s*\|/, false)) {
-              state.allowMultilineArgument = false;
-              state.inMultilineTable = false;
-            }
-        }
-      }
-
-      stream.eatSpace();
-
-      if (state.allowMultilineArgument) {
-
-        // STRING
-        if (state.inMultilineString) {
-          if (stream.match('"""')) {
-            state.inMultilineString = false;
-            state.allowMultilineArgument = false;
-          } else {
-            stream.match(/.*/);
-          }
-          return "string";
-        }
-
-        // TABLE
-        if (state.inMultilineTable) {
-          if (stream.match(/\|\s*/)) {
-            return "bracket";
-          } else {
-            stream.match(/[^\|]*/);
-            return state.tableHeaderLine ? "header" : "string";
-          }
-        }
-
-        // DETECT START
-        if (stream.match('"""')) {
-          // String
-          state.inMultilineString = true;
-          return "string";
-        } else if (stream.match("|")) {
-          // Table
-          state.inMultilineTable = true;
-          state.tableHeaderLine = true;
-          return "bracket";
-        }
-
-      }
-
-      // LINE COMMENT
-      if (stream.match(/#.*/)) {
-        return "comment";
-
-      // TAG
-      } else if (!state.inKeywordLine && stream.match(/@\S+/)) {
-        return "tag";
-
-      // FEATURE
-      } else if (!state.inKeywordLine && state.allowFeature && stream.match(/(機能|功能|フィーチャ|기능|โครงหลัก|ความสามารถ|ความต้องการทางธุรกิจ|ಹೆಚ್ಚಳ|గుణము|ਮੁਹਾਂਦਰਾ|ਨਕਸ਼ ਨੁਹਾਰ|ਖਾਸੀਅਤ|रूप लेख|وِیژگی|خاصية|תכונה|Функціонал|Функция|Функционалност|Функционал|Үзенчәлеклелек|Свойство|Особина|Мөмкинлек|Могућност|Λειτουργία|Δυνατότητα|Właściwość|Vlastnosť|Trajto|Tính năng|Savybė|Pretty much|Požiadavka|Požadavek|Potrzeba biznesowa|Özellik|Osobina|Ominaisuus|Omadus|OH HAI|Mogućnost|Mogucnost|Jellemző|Hwæt|Hwaet|Funzionalità|Funktionalitéit|Funktionalität|Funkcja|Funkcionalnost|Funkcionalitāte|Funkcia|Fungsi|Functionaliteit|Funcționalitate|Funcţionalitate|Functionalitate|Funcionalitat|Funcionalidade|Fonctionnalité|Fitur|Fīča|Feature|Eiginleiki|Egenskap|Egenskab|Característica|Caracteristica|Business Need|Aspekt|Arwedd|Ahoy matey!|Ability):/)) {
-        state.allowScenario = true;
-        state.allowBackground = true;
-        state.allowPlaceholders = false;
-        state.allowSteps = false;
-        state.allowMultilineArgument = false;
-        state.inKeywordLine = true;
-        return "keyword";
-
-      // BACKGROUND
-      } else if (!state.inKeywordLine && state.allowBackground && stream.match(/(背景|배경|แนวคิด|ಹಿನ್ನೆಲೆ|నేపథ్యం|ਪਿਛੋਕੜ|पृष्ठभूमि|زمینه|الخلفية|רקע|Тарих|Предыстория|Предистория|Позадина|Передумова|Основа|Контекст|Кереш|Υπόβαθρο|Założenia|Yo\-ho\-ho|Tausta|Taust|Situācija|Rerefons|Pozadina|Pozadie|Pozadí|Osnova|Latar Belakang|Kontext|Konteksts|Kontekstas|Kontekst|Háttér|Hannergrond|Grundlage|Geçmiş|Fundo|Fono|First off|Dis is what went down|Dasar|Contexto|Contexte|Context|Contesto|Cenário de Fundo|Cenario de Fundo|Cefndir|Bối cảnh|Bakgrunnur|Bakgrunn|Bakgrund|Baggrund|Background|B4|Antecedents|Antecedentes|Ær|Aer|Achtergrond):/)) {
-        state.allowPlaceholders = false;
-        state.allowSteps = true;
-        state.allowBackground = false;
-        state.allowMultilineArgument = false;
-        state.inKeywordLine = true;
-        return "keyword";
-
-      // SCENARIO OUTLINE
-      } else if (!state.inKeywordLine && state.allowScenario && stream.match(/(場景大綱|场景大纲|劇本大綱|剧本大纲|テンプレ|シナリオテンプレート|シナリオテンプレ|シナリオアウトライン|시나리오 개요|สรุปเหตุการณ์|โครงสร้างของเหตุการณ์|ವಿವರಣೆ|కథనం|ਪਟਕਥਾ ਰੂਪ ਰੇਖਾ|ਪਟਕਥਾ ਢਾਂਚਾ|परिदृश्य रूपरेखा|سيناريو مخطط|الگوی سناریو|תבנית תרחיש|Сценарийның төзелеше|Сценарий структураси|Структура сценарію|Структура сценария|Структура сценарија|Скица|Рамка на сценарий|Концепт|Περιγραφή Σεναρίου|Wharrimean is|Template Situai|Template Senario|Template Keadaan|Tapausaihio|Szenariogrundriss|Szablon scenariusza|Swa hwær swa|Swa hwaer swa|Struktura scenarija|Structură scenariu|Structura scenariu|Skica|Skenario konsep|Shiver me timbers|Senaryo taslağı|Schema dello scenario|Scenariomall|Scenariomal|Scenario Template|Scenario Outline|Scenario Amlinellol|Scenārijs pēc parauga|Scenarijaus šablonas|Reckon it's like|Raamstsenaarium|Plang vum Szenario|Plan du Scénario|Plan du scénario|Osnova scénáře|Osnova Scenára|Náčrt Scenáru|Náčrt Scénáře|Náčrt Scenára|MISHUN SRSLY|Menggariskan Senario|Lýsing Dæma|Lýsing Atburðarásar|Konturo de la scenaro|Koncept|Khung tình huống|Khung kịch bản|Forgatókönyv vázlat|Esquema do Cenário|Esquema do Cenario|Esquema del escenario|Esquema de l'escenari|Esbozo do escenario|Delineação do Cenário|Delineacao do Cenario|All y'all|Abstrakt Scenario|Abstract Scenario):/)) {
-        state.allowPlaceholders = true;
-        state.allowSteps = true;
-        state.allowMultilineArgument = false;
-        state.inKeywordLine = true;
-        return "keyword";
-
-      // EXAMPLES
-      } else if (state.allowScenario && stream.match(/(例子|例|サンプル|예|ชุดของเหตุการณ์|ชุดของตัวอย่าง|ಉದಾಹರಣೆಗಳು|ఉదాహరణలు|ਉਦਾਹਰਨਾਂ|उदाहरण|نمونه ها|امثلة|דוגמאות|Үрнәкләр|Сценарији|Примеры|Примери|Приклади|Мисоллар|Мисаллар|Σενάρια|Παραδείγματα|You'll wanna|Voorbeelden|Variantai|Tapaukset|Se þe|Se the|Se ðe|Scenarios|Scenariji|Scenarijai|Przykłady|Primjeri|Primeri|Příklady|Príklady|Piemēri|Példák|Pavyzdžiai|Paraugs|Örnekler|Juhtumid|Exemplos|Exemples|Exemple|Exempel|EXAMPLZ|Examples|Esempi|Enghreifftiau|Ekzemploj|Eksempler|Ejemplos|Dữ liệu|Dead men tell no tales|Dæmi|Contoh|Cenários|Cenarios|Beispiller|Beispiele|Atburðarásir):/)) {
-        state.allowPlaceholders = false;
-        state.allowSteps = true;
-        state.allowBackground = false;
-        state.allowMultilineArgument = true;
-        return "keyword";
-
-      // SCENARIO
-      } else if (!state.inKeywordLine && state.allowScenario && stream.match(/(場景|场景|劇本|剧本|シナリオ|시나리오|เหตุการณ์|ಕಥಾಸಾರಾಂಶ|సన్నివేశం|ਪਟਕਥਾ|परिदृश्य|سيناريو|سناریو|תרחיש|Сценарій|Сценарио|Сценарий|Пример|Σενάριο|Tình huống|The thing of it is|Tapaus|Szenario|Swa|Stsenaarium|Skenario|Situai|Senaryo|Senario|Scenaro|Scenariusz|Scenariu|Scénario|Scenario|Scenarijus|Scenārijs|Scenarij|Scenarie|Scénář|Scenár|Primer|MISHUN|Kịch bản|Keadaan|Heave to|Forgatókönyv|Escenario|Escenari|Cenário|Cenario|Awww, look mate|Atburðarás):/)) {
-        state.allowPlaceholders = false;
-        state.allowSteps = true;
-        state.allowBackground = false;
-        state.allowMultilineArgument = false;
-        state.inKeywordLine = true;
-        return "keyword";
-
-      // STEPS
-      } else if (!state.inKeywordLine && state.allowSteps && stream.match(/(那麼|那么|而且|當|当|并且|同時|同时|前提|假设|假設|假定|假如|但是|但し|並且|もし|ならば|ただし|しかし|かつ|하지만|조건|먼저|만일|만약|단|그리고|그러면|และ |เมื่อ |แต่ |ดังนั้น |กำหนดให้ |ಸ್ಥಿತಿಯನ್ನು |ಮತ್ತು |ನೀಡಿದ |ನಂತರ |ಆದರೆ |మరియు |చెప్పబడినది |కాని |ఈ పరిస్థితిలో |అప్పుడు |ਪਰ |ਤਦ |ਜੇਕਰ |ਜਿਵੇਂ ਕਿ |ਜਦੋਂ |ਅਤੇ |यदि |परन्तु |पर |तब |तदा |तथा |जब |चूंकि |किन्तु |कदा |और |अगर |و |هنگامی |متى |لكن |عندما |ثم |بفرض |با فرض |اما |اذاً |آنگاه |כאשר |וגם |בהינתן |אזי |אז |אבל |Якщо |Һәм |Унда |Тоді |Тогда |То |Также |Та |Пусть |Припустимо, що |Припустимо |Онда |Но |Нехай |Нәтиҗәдә |Лекин |Ләкин |Коли |Когда |Когато |Када |Кад |К тому же |І |И |Задато |Задати |Задате |Если |Допустим |Дано |Дадено |Вә |Ва |Бирок |Әмма |Әйтик |Әгәр |Аммо |Али |Але |Агар |А також |А |Τότε |Όταν |Και |Δεδομένου |Αλλά |Þurh |Þegar |Þa þe |Þá |Þa |Zatati |Zakładając |Zadato |Zadate |Zadano |Zadani |Zadan |Za předpokladu |Za predpokladu |Youse know when youse got |Youse know like when |Yna |Yeah nah |Y'know |Y |Wun |Wtedy |When y'all |When |Wenn |WEN |wann |Ve |Và |Und |Un |ugeholl |Too right |Thurh |Thì |Then y'all |Then |Tha the |Tha |Tetapi |Tapi |Tak |Tada |Tad |Stel |Soit |Siis |Și |Şi |Si |Sed |Se |Så |Quando |Quand |Quan |Pryd |Potom |Pokud |Pokiaľ |Però |Pero |Pak |Oraz |Onda |Ond |Oletetaan |Og |Och |O zaman |Niin |Nhưng |När |Når |Mutta |Men |Mas |Maka |Majd |Mając |Mais |Maar |mä |Ma |Lorsque |Lorsqu'|Logo |Let go and haul |Kun |Kuid |Kui |Kiedy |Khi |Ketika |Kemudian |Keď |Když |Kaj |Kai |Kada |Kad |Jeżeli |Jeśli |Ja |It's just unbelievable |Ir |I CAN HAZ |I |Ha |Givun |Givet |Given y'all |Given |Gitt |Gegeven |Gegeben seien |Gegeben sei |Gdy |Gangway! |Fakat |Étant donnés |Etant donnés |Étant données |Etant données |Étant donnée |Etant donnée |Étant donné |Etant donné |Et |És |Entonces |Entón |Então |Entao |En |Eğer ki |Ef |Eeldades |E |Ðurh |Duota |Dun |Donitaĵo |Donat |Donada |Do |Diyelim ki |Diberi |Dengan |Den youse gotta |DEN |De |Dato |Dați fiind |Daţi fiind |Dati fiind |Dati |Date fiind |Date |Data |Dat fiind |Dar |Dann |dann |Dan |Dados |Dado |Dadas |Dada |Ða ðe |Ða |Cuando |Cho |Cando |Când |Cand |Cal |But y'all |But at the end of the day I reckon |BUT |But |Buh |Blimey! |Biết |Bet |Bagi |Aye |awer |Avast! |Atunci |Atesa |Atès |Apabila |Anrhegedig a |Angenommen |And y'all |And |AN |An |an |Amikor |Amennyiben |Ama |Als |Alors |Allora |Ali |Aleshores |Ale |Akkor |Ak |Adott |Ac |Aber |A zároveň |A tiež |A taktiež |A také |A |a |7 |\* )/)) {
-        state.inStep = true;
-        state.allowPlaceholders = true;
-        state.allowMultilineArgument = true;
-        state.inKeywordLine = true;
-        return "keyword";
-
-      // INLINE STRING
-      } else if (stream.match(/"[^"]*"?/)) {
-        return "string";
-
-      // PLACEHOLDER
-      } else if (state.allowPlaceholders && stream.match(/<[^>]*>?/)) {
-        return "variable";
-
-      // Fall through
-      } else {
-        stream.next();
-        stream.eatWhile(/[^@"<#]/);
-        return null;
-      }
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-feature", "gherkin");
-
-});
diff --git a/www/code/codemirror-5.7/mode/gherkin/index.html b/www/code/codemirror-5.7/mode/gherkin/index.html
deleted file mode 100644
index af8184c98..000000000
--- a/www/code/codemirror-5.7/mode/gherkin/index.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-CodeMirror: Gherkin mode
-
-
-
-
-
-
-
-
-
-
    
-
    Gherkin mode
    
-
    
-    
-
-    
    MIME types defined: text/x-feature.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/go/go.js b/www/code/codemirror-5.7/mode/go/go.js
deleted file mode 100644
index 21fe9a2d6..000000000
--- a/www/code/codemirror-5.7/mode/go/go.js
+++ /dev/null
@@ -1,185 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("go", function(config) {
-  var indentUnit = config.indentUnit;
-
-  var keywords = {
-    "break":true, "case":true, "chan":true, "const":true, "continue":true,
-    "default":true, "defer":true, "else":true, "fallthrough":true, "for":true,
-    "func":true, "go":true, "goto":true, "if":true, "import":true,
-    "interface":true, "map":true, "package":true, "range":true, "return":true,
-    "select":true, "struct":true, "switch":true, "type":true, "var":true,
-    "bool":true, "byte":true, "complex64":true, "complex128":true,
-    "float32":true, "float64":true, "int8":true, "int16":true, "int32":true,
-    "int64":true, "string":true, "uint8":true, "uint16":true, "uint32":true,
-    "uint64":true, "int":true, "uint":true, "uintptr":true
-  };
-
-  var atoms = {
-    "true":true, "false":true, "iota":true, "nil":true, "append":true,
-    "cap":true, "close":true, "complex":true, "copy":true, "imag":true,
-    "len":true, "make":true, "new":true, "panic":true, "print":true,
-    "println":true, "real":true, "recover":true
-  };
-
-  var isOperatorChar = /[+\-*&^%:=<>!|\/]/;
-
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'" || ch == "`") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (/[\d\.]/.test(ch)) {
-      if (ch == ".") {
-        stream.match(/^[0-9]+([eE][\-+]?[0-9]+)?/);
-      } else if (ch == "0") {
-        stream.match(/^[xX][0-9a-fA-F]+/) || stream.match(/^0[0-7]+/);
-      } else {
-        stream.match(/^[0-9]*\.?[0-9]*([eE][\-+]?[0-9]+)?/);
-      }
-      return "number";
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_\xa1-\uffff]/);
-    var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (cur == "case" || cur == "default") curPunc = "case";
-      return "keyword";
-    }
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return "variable";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && quote != "`" && next == "\\";
-      }
-      if (end || !(escaped || quote == "`"))
-        state.tokenize = tokenBase;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function pushContext(state, col, type) {
-    return state.context = new Context(state.indented, col, type, null, state.context);
-  }
-  function popContext(state) {
-    if (!state.context.prev) return;
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true
-      };
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-        if (ctx.type == "case") ctx.type = "}";
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "case") ctx.type = "case";
-      else if (curPunc == "}" && ctx.type == "}") ctx = popContext(state);
-      else if (curPunc == ctx.type) popContext(state);
-      state.startOfLine = false;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return 0;
-      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (ctx.type == "case" && /^(?:case|default)\b/.test(textAfter)) {
-        state.context.type = "}";
-        return ctx.indented;
-      }
-      var closing = firstChar == ctx.type;
-      if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: "{}):",
-    fold: "brace",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//"
-  };
-});
-
-CodeMirror.defineMIME("text/x-go", "go");
-
-});
diff --git a/www/code/codemirror-5.7/mode/go/index.html b/www/code/codemirror-5.7/mode/go/index.html
deleted file mode 100644
index 72e3b364c..000000000
--- a/www/code/codemirror-5.7/mode/go/index.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-CodeMirror: Go mode
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Go mode
    
-
    
-
-    
-
-    
    MIME type: text/x-go
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/groovy/groovy.js b/www/code/codemirror-5.7/mode/groovy/groovy.js
deleted file mode 100644
index 721933b01..000000000
--- a/www/code/codemirror-5.7/mode/groovy/groovy.js
+++ /dev/null
@@ -1,230 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("groovy", function(config) {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var keywords = words(
-    "abstract as assert boolean break byte case catch char class const continue def default " +
-    "do double else enum extends final finally float for goto if implements import in " +
-    "instanceof int interface long native new package private protected public return " +
-    "short static strictfp super switch synchronized threadsafe throw throws transient " +
-    "try void volatile while");
-  var blockKeywords = words("catch class do else finally for if switch try while enum interface def");
-  var standaloneKeywords = words("return break continue");
-  var atoms = words("null true false this");
-
-  var curPunc;
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'") {
-      return startString(ch, stream, state);
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      if (stream.eat(/eE/)) { stream.eat(/\+\-/); stream.eatWhile(/\d/); }
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize.push(tokenComment);
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      if (expectExpression(state.lastToken, false)) {
-        return startString(ch, stream, state);
-      }
-    }
-    if (ch == "-" && stream.eat(">")) {
-      curPunc = "->";
-      return null;
-    }
-    if (/[+\-*&%=<>!?|\/~]/.test(ch)) {
-      stream.eatWhile(/[+\-*&%=<>|~]/);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    if (ch == "@") { stream.eatWhile(/[\w\$_\.]/); return "meta"; }
-    if (state.lastToken == ".") return "property";
-    if (stream.eat(":")) { curPunc = "proplabel"; return "property"; }
-    var cur = stream.current();
-    if (atoms.propertyIsEnumerable(cur)) { return "atom"; }
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      else if (standaloneKeywords.propertyIsEnumerable(cur)) curPunc = "standalone";
-      return "keyword";
-    }
-    return "variable";
-  }
-  tokenBase.isBase = true;
-
-  function startString(quote, stream, state) {
-    var tripleQuoted = false;
-    if (quote != "/" && stream.eat(quote)) {
-      if (stream.eat(quote)) tripleQuoted = true;
-      else return "string";
-    }
-    function t(stream, state) {
-      var escaped = false, next, end = !tripleQuoted;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-          if (!tripleQuoted) { break; }
-          if (stream.match(quote + quote)) { end = true; break; }
-        }
-        if (quote == '"' && next == "$" && !escaped && stream.eat("{")) {
-          state.tokenize.push(tokenBaseUntilBrace());
-          return "string";
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (end) state.tokenize.pop();
-      return "string";
-    }
-    state.tokenize.push(t);
-    return t(stream, state);
-  }
-
-  function tokenBaseUntilBrace() {
-    var depth = 1;
-    function t(stream, state) {
-      if (stream.peek() == "}") {
-        depth--;
-        if (depth == 0) {
-          state.tokenize.pop();
-          return state.tokenize[state.tokenize.length-1](stream, state);
-        }
-      } else if (stream.peek() == "{") {
-        depth++;
-      }
-      return tokenBase(stream, state);
-    }
-    t.isBase = true;
-    return t;
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize.pop();
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function expectExpression(last, newline) {
-    return !last || last == "operator" || last == "->" || /[\.\[\{\(,;:]/.test(last) ||
-      last == "newstatement" || last == "keyword" || last == "proplabel" ||
-      (last == "standalone" && !newline);
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function pushContext(state, col, type) {
-    return state.context = new Context(state.indented, col, type, null, state.context);
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      return {
-        tokenize: [tokenBase],
-        context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true,
-        lastToken: null
-      };
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-        // Automatic semicolon insertion
-        if (ctx.type == "statement" && !expectExpression(state.lastToken, true)) {
-          popContext(state); ctx = state.context;
-        }
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = state.tokenize[state.tokenize.length-1](stream, state);
-      if (style == "comment") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
-      // Handle indentation for {x -> \n ... }
-      else if (curPunc == "->" && ctx.type == "statement" && ctx.prev.type == "}") {
-        popContext(state);
-        state.context.align = false;
-      }
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
-        pushContext(state, stream.column(), "statement");
-      state.startOfLine = false;
-      state.lastToken = curPunc || style;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (!state.tokenize[state.tokenize.length-1].isBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
-      if (ctx.type == "statement" && !expectExpression(state.lastToken, true)) ctx = ctx.prev;
-      var closing = firstChar == ctx.type;
-      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : config.indentUnit);
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : config.indentUnit);
-    },
-
-    electricChars: "{}",
-    closeBrackets: {triples: "'\""},
-    fold: "brace"
-  };
-});
-
-CodeMirror.defineMIME("text/x-groovy", "groovy");
-
-});
diff --git a/www/code/codemirror-5.7/mode/groovy/index.html b/www/code/codemirror-5.7/mode/groovy/index.html
deleted file mode 100644
index bb0df078c..000000000
--- a/www/code/codemirror-5.7/mode/groovy/index.html
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-CodeMirror: Groovy mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Groovy mode
    
-
    
-
-    
-
-    
    MIME types defined: text/x-groovy
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/haml/haml.js b/www/code/codemirror-5.7/mode/haml/haml.js
deleted file mode 100644
index 8fe63b020..000000000
--- a/www/code/codemirror-5.7/mode/haml/haml.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../ruby/ruby"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../ruby/ruby"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-  // full haml mode. This handled embeded ruby and html fragments too
-  CodeMirror.defineMode("haml", function(config) {
-    var htmlMode = CodeMirror.getMode(config, {name: "htmlmixed"});
-    var rubyMode = CodeMirror.getMode(config, "ruby");
-
-    function rubyInQuote(endQuote) {
-      return function(stream, state) {
-        var ch = stream.peek();
-        if (ch == endQuote && state.rubyState.tokenize.length == 1) {
-          // step out of ruby context as it seems to complete processing all the braces
-          stream.next();
-          state.tokenize = html;
-          return "closeAttributeTag";
-        } else {
-          return ruby(stream, state);
-        }
-      };
-    }
-
-    function ruby(stream, state) {
-      if (stream.match("-#")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      return rubyMode.token(stream, state.rubyState);
-    }
-
-    function html(stream, state) {
-      var ch = stream.peek();
-
-      // handle haml declarations. All declarations that cant be handled here
-      // will be passed to html mode
-      if (state.previousToken.style == "comment" ) {
-        if (state.indented > state.previousToken.indented) {
-          stream.skipToEnd();
-          return "commentLine";
-        }
-      }
-
-      if (state.startOfLine) {
-        if (ch == "!" && stream.match("!!")) {
-          stream.skipToEnd();
-          return "tag";
-        } else if (stream.match(/^%[\w:#\.]+=/)) {
-          state.tokenize = ruby;
-          return "hamlTag";
-        } else if (stream.match(/^%[\w:]+/)) {
-          return "hamlTag";
-        } else if (ch == "/" ) {
-          stream.skipToEnd();
-          return "comment";
-        }
-      }
-
-      if (state.startOfLine || state.previousToken.style == "hamlTag") {
-        if ( ch == "#" || ch == ".") {
-          stream.match(/[\w-#\.]*/);
-          return "hamlAttribute";
-        }
-      }
-
-      // donot handle --> as valid ruby, make it HTML close comment instead
-      if (state.startOfLine && !stream.match("-->", false) && (ch == "=" || ch == "-" )) {
-        state.tokenize = ruby;
-        return state.tokenize(stream, state);
-      }
-
-      if (state.previousToken.style == "hamlTag" ||
-          state.previousToken.style == "closeAttributeTag" ||
-          state.previousToken.style == "hamlAttribute") {
-        if (ch == "(") {
-          state.tokenize = rubyInQuote(")");
-          return state.tokenize(stream, state);
-        } else if (ch == "{") {
-          state.tokenize = rubyInQuote("}");
-          return state.tokenize(stream, state);
-        }
-      }
-
-      return htmlMode.token(stream, state.htmlState);
-    }
-
-    return {
-      // default to html mode
-      startState: function() {
-        var htmlState = htmlMode.startState();
-        var rubyState = rubyMode.startState();
-        return {
-          htmlState: htmlState,
-          rubyState: rubyState,
-          indented: 0,
-          previousToken: { style: null, indented: 0},
-          tokenize: html
-        };
-      },
-
-      copyState: function(state) {
-        return {
-          htmlState : CodeMirror.copyState(htmlMode, state.htmlState),
-          rubyState: CodeMirror.copyState(rubyMode, state.rubyState),
-          indented: state.indented,
-          previousToken: state.previousToken,
-          tokenize: state.tokenize
-        };
-      },
-
-      token: function(stream, state) {
-        if (stream.sol()) {
-          state.indented = stream.indentation();
-          state.startOfLine = true;
-        }
-        if (stream.eatSpace()) return null;
-        var style = state.tokenize(stream, state);
-        state.startOfLine = false;
-        // dont record comment line as we only want to measure comment line with
-        // the opening comment block
-        if (style && style != "commentLine") {
-          state.previousToken = { style: style, indented: state.indented };
-        }
-        // if current state is ruby and the previous token is not `,` reset the
-        // tokenize to html
-        if (stream.eol() && state.tokenize == ruby) {
-          stream.backUp(1);
-          var ch = stream.peek();
-          stream.next();
-          if (ch && ch != ",") {
-            state.tokenize = html;
-          }
-        }
-        // reprocess some of the specific style tag when finish setting previousToken
-        if (style == "hamlTag") {
-          style = "tag";
-        } else if (style == "commentLine") {
-          style = "comment";
-        } else if (style == "hamlAttribute") {
-          style = "attribute";
-        } else if (style == "closeAttributeTag") {
-          style = null;
-        }
-        return style;
-      }
-    };
-  }, "htmlmixed", "ruby");
-
-  CodeMirror.defineMIME("text/x-haml", "haml");
-});
diff --git a/www/code/codemirror-5.7/mode/haml/index.html b/www/code/codemirror-5.7/mode/haml/index.html
deleted file mode 100644
index 2894a938e..000000000
--- a/www/code/codemirror-5.7/mode/haml/index.html
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-CodeMirror: HAML mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    HAML mode
    
-
    
-    
-
-    
    MIME types defined: text/x-haml.
    
-
-    
    Parsing/Highlighting Tests: normal,  verbose.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/haml/test.js b/www/code/codemirror-5.7/mode/haml/test.js
deleted file mode 100644
index 508458a43..000000000
--- a/www/code/codemirror-5.7/mode/haml/test.js
+++ /dev/null
@@ -1,97 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "haml");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  // Requires at least one media query
-  MT("elementName",
-     "[tag %h1] Hey There");
-
-  MT("oneElementPerLine",
-     "[tag %h1] Hey There %h2");
-
-  MT("idSelector",
-     "[tag %h1][attribute #test] Hey There");
-
-  MT("classSelector",
-     "[tag %h1][attribute .hello] Hey There");
-
-  MT("docType",
-     "[tag !!! XML]");
-
-  MT("comment",
-     "[comment / Hello WORLD]");
-
-  MT("notComment",
-     "[tag %h1] This is not a / comment ");
-
-  MT("attributes",
-     "[tag %a]([variable title][operator =][string \"test\"]){[atom :title] [operator =>] [string \"test\"]}");
-
-  MT("htmlCode",
-     "[tag&bracket <][tag h1][tag&bracket >]Title[tag&bracket ]");
-
-  MT("rubyBlock",
-     "[operator =][variable-2 @item]");
-
-  MT("selectorRubyBlock",
-     "[tag %a.selector=] [variable-2 @item]");
-
-  MT("nestedRubyBlock",
-      "[tag %a]",
-      "   [operator =][variable puts] [string \"test\"]");
-
-  MT("multilinePlaintext",
-      "[tag %p]",
-      "  Hello,",
-      "  World");
-
-  MT("multilineRuby",
-      "[tag %p]",
-      "  [comment -# this is a comment]",
-      "     [comment and this is a comment too]",
-      "  Date/Time",
-      "  [operator -] [variable now] [operator =] [tag DateTime][operator .][property now]",
-      "  [tag %strong=] [variable now]",
-      "  [operator -] [keyword if] [variable now] [operator >] [tag DateTime][operator .][property parse]([string \"December 31, 2006\"])",
-      "     [operator =][string \"Happy\"]",
-      "     [operator =][string \"Belated\"]",
-      "     [operator =][string \"Birthday\"]");
-
-  MT("multilineComment",
-      "[comment /]",
-      "  [comment Multiline]",
-      "  [comment Comment]");
-
-  MT("hamlComment",
-     "[comment -# this is a comment]");
-
-  MT("multilineHamlComment",
-     "[comment -# this is a comment]",
-     "   [comment and this is a comment too]");
-
-  MT("multilineHTMLComment",
-    "[comment ]");
-
-  MT("hamlAfterRubyTag",
-    "[attribute .block]",
-    "  [tag %strong=] [variable now]",
-    "  [attribute .test]",
-    "     [operator =][variable now]",
-    "  [attribute .right]");
-
-  MT("stretchedRuby",
-     "[operator =] [variable puts] [string \"Hello\"],",
-     "   [string \"World\"]");
-
-  MT("interpolationInHashAttribute",
-     //"[tag %div]{[atom :id] [operator =>] [string \"#{][variable test][string }_#{][variable ting][string }\"]} test");
-     "[tag %div]{[atom :id] [operator =>] [string \"#{][variable test][string }_#{][variable ting][string }\"]} test");
-
-  MT("interpolationInHTMLAttribute",
-     "[tag %div]([variable title][operator =][string \"#{][variable test][string }_#{][variable ting]()[string }\"]) Test");
-})();
diff --git a/www/code/codemirror-5.7/mode/handlebars/handlebars.js b/www/code/codemirror-5.7/mode/handlebars/handlebars.js
deleted file mode 100644
index 40dfea42a..000000000
--- a/www/code/codemirror-5.7/mode/handlebars/handlebars.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineSimpleMode("handlebars", {
-    start: [
-      { regex: /\{\{!--/, push: "dash_comment", token: "comment" },
-      { regex: /\{\{!/,   push: "comment", token: "comment" },
-      { regex: /\{\{/,    push: "handlebars", token: "tag" }
-    ],
-    handlebars: [
-      { regex: /\}\}/, pop: true, token: "tag" },
-
-      // Double and single quotes
-      { regex: /"(?:[^\\]|\\.)*?"/, token: "string" },
-      { regex: /'(?:[^\\]|\\.)*?'/, token: "string" },
-
-      // Handlebars keywords
-      { regex: />|[#\/]([A-Za-z_]\w*)/, token: "keyword" },
-      { regex: /(?:else|this)\b/, token: "keyword" },
-
-      // Numeral
-      { regex: /\d+/i, token: "number" },
-
-      // Atoms like = and .
-      { regex: /=|~|@|true|false/, token: "atom" },
-
-      // Paths
-      { regex: /(?:\.\.\/)*(?:[A-Za-z_][\w\.]*)+/, token: "variable-2" }
-    ],
-    dash_comment: [
-      { regex: /--\}\}/, pop: true, token: "comment" },
-
-      // Commented code
-      { regex: /./, token: "comment"}
-    ],
-    comment: [
-      { regex: /\}\}/, pop: true, token: "comment" },
-      { regex: /./, token: "comment" }
-    ]
-  });
-
-  CodeMirror.defineMIME("text/x-handlebars-template", "handlebars");
-});
diff --git a/www/code/codemirror-5.7/mode/handlebars/index.html b/www/code/codemirror-5.7/mode/handlebars/index.html
deleted file mode 100644
index beaef87a1..000000000
--- a/www/code/codemirror-5.7/mode/handlebars/index.html
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-CodeMirror: Handlebars mode
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Handlebars
    
-
    
-    
-    
-
-    
    Handlebars syntax highlighting for CodeMirror.
    
-
-    
    MIME types defined: text/x-handlebars-template
    
-
    
diff --git a/www/code/codemirror-5.7/mode/haskell/haskell.js b/www/code/codemirror-5.7/mode/haskell/haskell.js
deleted file mode 100644
index fe0bab67e..000000000
--- a/www/code/codemirror-5.7/mode/haskell/haskell.js
+++ /dev/null
@@ -1,267 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("haskell", function(_config, modeConfig) {
-
-  function switchState(source, setState, f) {
-    setState(f);
-    return f(source, setState);
-  }
-
-  // These should all be Unicode extended, as per the Haskell 2010 report
-  var smallRE = /[a-z_]/;
-  var largeRE = /[A-Z]/;
-  var digitRE = /\d/;
-  var hexitRE = /[0-9A-Fa-f]/;
-  var octitRE = /[0-7]/;
-  var idRE = /[a-z_A-Z0-9'\xa1-\uffff]/;
-  var symbolRE = /[-!#$%&*+.\/<=>?@\\^|~:]/;
-  var specialRE = /[(),;[\]`{}]/;
-  var whiteCharRE = /[ \t\v\f]/; // newlines are handled in tokenizer
-
-  function normal(source, setState) {
-    if (source.eatWhile(whiteCharRE)) {
-      return null;
-    }
-
-    var ch = source.next();
-    if (specialRE.test(ch)) {
-      if (ch == '{' && source.eat('-')) {
-        var t = "comment";
-        if (source.eat('#')) {
-          t = "meta";
-        }
-        return switchState(source, setState, ncomment(t, 1));
-      }
-      return null;
-    }
-
-    if (ch == '\'') {
-      if (source.eat('\\')) {
-        source.next();  // should handle other escapes here
-      }
-      else {
-        source.next();
-      }
-      if (source.eat('\'')) {
-        return "string";
-      }
-      return "error";
-    }
-
-    if (ch == '"') {
-      return switchState(source, setState, stringLiteral);
-    }
-
-    if (largeRE.test(ch)) {
-      source.eatWhile(idRE);
-      if (source.eat('.')) {
-        return "qualifier";
-      }
-      return "variable-2";
-    }
-
-    if (smallRE.test(ch)) {
-      source.eatWhile(idRE);
-      return "variable";
-    }
-
-    if (digitRE.test(ch)) {
-      if (ch == '0') {
-        if (source.eat(/[xX]/)) {
-          source.eatWhile(hexitRE); // should require at least 1
-          return "integer";
-        }
-        if (source.eat(/[oO]/)) {
-          source.eatWhile(octitRE); // should require at least 1
-          return "number";
-        }
-      }
-      source.eatWhile(digitRE);
-      var t = "number";
-      if (source.match(/^\.\d+/)) {
-        t = "number";
-      }
-      if (source.eat(/[eE]/)) {
-        t = "number";
-        source.eat(/[-+]/);
-        source.eatWhile(digitRE); // should require at least 1
-      }
-      return t;
-    }
-
-    if (ch == "." && source.eat("."))
-      return "keyword";
-
-    if (symbolRE.test(ch)) {
-      if (ch == '-' && source.eat(/-/)) {
-        source.eatWhile(/-/);
-        if (!source.eat(symbolRE)) {
-          source.skipToEnd();
-          return "comment";
-        }
-      }
-      var t = "variable";
-      if (ch == ':') {
-        t = "variable-2";
-      }
-      source.eatWhile(symbolRE);
-      return t;
-    }
-
-    return "error";
-  }
-
-  function ncomment(type, nest) {
-    if (nest == 0) {
-      return normal;
-    }
-    return function(source, setState) {
-      var currNest = nest;
-      while (!source.eol()) {
-        var ch = source.next();
-        if (ch == '{' && source.eat('-')) {
-          ++currNest;
-        }
-        else if (ch == '-' && source.eat('}')) {
-          --currNest;
-          if (currNest == 0) {
-            setState(normal);
-            return type;
-          }
-        }
-      }
-      setState(ncomment(type, currNest));
-      return type;
-    };
-  }
-
-  function stringLiteral(source, setState) {
-    while (!source.eol()) {
-      var ch = source.next();
-      if (ch == '"') {
-        setState(normal);
-        return "string";
-      }
-      if (ch == '\\') {
-        if (source.eol() || source.eat(whiteCharRE)) {
-          setState(stringGap);
-          return "string";
-        }
-        if (source.eat('&')) {
-        }
-        else {
-          source.next(); // should handle other escapes here
-        }
-      }
-    }
-    setState(normal);
-    return "error";
-  }
-
-  function stringGap(source, setState) {
-    if (source.eat('\\')) {
-      return switchState(source, setState, stringLiteral);
-    }
-    source.next();
-    setState(normal);
-    return "error";
-  }
-
-
-  var wellKnownWords = (function() {
-    var wkw = {};
-    function setType(t) {
-      return function () {
-        for (var i = 0; i < arguments.length; i++)
-          wkw[arguments[i]] = t;
-      };
-    }
-
-    setType("keyword")(
-      "case", "class", "data", "default", "deriving", "do", "else", "foreign",
-      "if", "import", "in", "infix", "infixl", "infixr", "instance", "let",
-      "module", "newtype", "of", "then", "type", "where", "_");
-
-    setType("keyword")(
-      "\.\.", ":", "::", "=", "\\", "\"", "<-", "->", "@", "~", "=>");
-
-    setType("builtin")(
-      "!!", "$!", "$", "&&", "+", "++", "-", ".", "/", "/=", "<", "<=", "=<<",
-      "==", ">", ">=", ">>", ">>=", "^", "^^", "||", "*", "**");
-
-    setType("builtin")(
-      "Bool", "Bounded", "Char", "Double", "EQ", "Either", "Enum", "Eq",
-      "False", "FilePath", "Float", "Floating", "Fractional", "Functor", "GT",
-      "IO", "IOError", "Int", "Integer", "Integral", "Just", "LT", "Left",
-      "Maybe", "Monad", "Nothing", "Num", "Ord", "Ordering", "Rational", "Read",
-      "ReadS", "Real", "RealFloat", "RealFrac", "Right", "Show", "ShowS",
-      "String", "True");
-
-    setType("builtin")(
-      "abs", "acos", "acosh", "all", "and", "any", "appendFile", "asTypeOf",
-      "asin", "asinh", "atan", "atan2", "atanh", "break", "catch", "ceiling",
-      "compare", "concat", "concatMap", "const", "cos", "cosh", "curry",
-      "cycle", "decodeFloat", "div", "divMod", "drop", "dropWhile", "either",
-      "elem", "encodeFloat", "enumFrom", "enumFromThen", "enumFromThenTo",
-      "enumFromTo", "error", "even", "exp", "exponent", "fail", "filter",
-      "flip", "floatDigits", "floatRadix", "floatRange", "floor", "fmap",
-      "foldl", "foldl1", "foldr", "foldr1", "fromEnum", "fromInteger",
-      "fromIntegral", "fromRational", "fst", "gcd", "getChar", "getContents",
-      "getLine", "head", "id", "init", "interact", "ioError", "isDenormalized",
-      "isIEEE", "isInfinite", "isNaN", "isNegativeZero", "iterate", "last",
-      "lcm", "length", "lex", "lines", "log", "logBase", "lookup", "map",
-      "mapM", "mapM_", "max", "maxBound", "maximum", "maybe", "min", "minBound",
-      "minimum", "mod", "negate", "not", "notElem", "null", "odd", "or",
-      "otherwise", "pi", "pred", "print", "product", "properFraction",
-      "putChar", "putStr", "putStrLn", "quot", "quotRem", "read", "readFile",
-      "readIO", "readList", "readLn", "readParen", "reads", "readsPrec",
-      "realToFrac", "recip", "rem", "repeat", "replicate", "return", "reverse",
-      "round", "scaleFloat", "scanl", "scanl1", "scanr", "scanr1", "seq",
-      "sequence", "sequence_", "show", "showChar", "showList", "showParen",
-      "showString", "shows", "showsPrec", "significand", "signum", "sin",
-      "sinh", "snd", "span", "splitAt", "sqrt", "subtract", "succ", "sum",
-      "tail", "take", "takeWhile", "tan", "tanh", "toEnum", "toInteger",
-      "toRational", "truncate", "uncurry", "undefined", "unlines", "until",
-      "unwords", "unzip", "unzip3", "userError", "words", "writeFile", "zip",
-      "zip3", "zipWith", "zipWith3");
-
-    var override = modeConfig.overrideKeywords;
-    if (override) for (var word in override) if (override.hasOwnProperty(word))
-      wkw[word] = override[word];
-
-    return wkw;
-  })();
-
-
-
-  return {
-    startState: function ()  { return { f: normal }; },
-    copyState:  function (s) { return { f: s.f }; },
-
-    token: function(stream, state) {
-      var t = state.f(stream, function(s) { state.f = s; });
-      var w = stream.current();
-      return wellKnownWords.hasOwnProperty(w) ? wellKnownWords[w] : t;
-    },
-
-    blockCommentStart: "{-",
-    blockCommentEnd: "-}",
-    lineComment: "--"
-  };
-
-});
-
-CodeMirror.defineMIME("text/x-haskell", "haskell");
-
-});
diff --git a/www/code/codemirror-5.7/mode/haskell/index.html b/www/code/codemirror-5.7/mode/haskell/index.html
deleted file mode 100644
index 42240b0f2..000000000
--- a/www/code/codemirror-5.7/mode/haskell/index.html
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-CodeMirror: Haskell mode
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Haskell mode
    
-
    
-
-    
-
-    
    MIME types defined: text/x-haskell.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/haxe/haxe.js b/www/code/codemirror-5.7/mode/haxe/haxe.js
deleted file mode 100644
index 73cd6213a..000000000
--- a/www/code/codemirror-5.7/mode/haxe/haxe.js
+++ /dev/null
@@ -1,506 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("haxe", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-
-  // Tokenizer
-
-  function kw(type) {return {type: type, style: "keyword"};}
-  var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
-  var operator = kw("operator"), atom = {type: "atom", style: "atom"}, attribute = {type:"attribute", style: "attribute"};
-  var type = kw("typedef");
-  var keywords = {
-    "if": A, "while": A, "else": B, "do": B, "try": B,
-    "return": C, "break": C, "continue": C, "new": C, "throw": C,
-    "var": kw("var"), "inline":attribute, "static": attribute, "using":kw("import"),
-    "public": attribute, "private": attribute, "cast": kw("cast"), "import": kw("import"), "macro": kw("macro"),
-    "function": kw("function"), "catch": kw("catch"), "untyped": kw("untyped"), "callback": kw("cb"),
-    "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-    "in": operator, "never": kw("property_access"), "trace":kw("trace"),
-    "class": type, "abstract":type, "enum":type, "interface":type, "typedef":type, "extends":type, "implements":type, "dynamic":type,
-    "true": atom, "false": atom, "null": atom
-  };
-
-  var isOperatorChar = /[+\-*&%=<>!?|]/;
-
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-
-  function toUnescaped(stream, end) {
-    var escaped = false, next;
-    while ((next = stream.next()) != null) {
-      if (next == end && !escaped)
-        return true;
-      escaped = !escaped && next == "\\";
-    }
-  }
-
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-  function ret(tp, style, cont) {
-    type = tp; content = cont;
-    return style;
-  }
-
-  function haxeTokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'") {
-      return chain(stream, state, haxeTokenString(ch));
-    } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      return ret(ch);
-    } else if (ch == "0" && stream.eat(/x/i)) {
-      stream.eatWhile(/[\da-f]/i);
-      return ret("number", "number");
-    } else if (/\d/.test(ch) || ch == "-" && stream.eat(/\d/)) {
-      stream.match(/^\d*(?:\.\d*(?!\.))?(?:[eE][+\-]?\d+)?/);
-      return ret("number", "number");
-    } else if (state.reAllowed && (ch == "~" && stream.eat(/\//))) {
-      toUnescaped(stream, "/");
-      stream.eatWhile(/[gimsu]/);
-      return ret("regexp", "string-2");
-    } else if (ch == "/") {
-      if (stream.eat("*")) {
-        return chain(stream, state, haxeTokenComment);
-      } else if (stream.eat("/")) {
-        stream.skipToEnd();
-        return ret("comment", "comment");
-      } else {
-        stream.eatWhile(isOperatorChar);
-        return ret("operator", null, stream.current());
-      }
-    } else if (ch == "#") {
-        stream.skipToEnd();
-        return ret("conditional", "meta");
-    } else if (ch == "@") {
-      stream.eat(/:/);
-      stream.eatWhile(/[\w_]/);
-      return ret ("metadata", "meta");
-    } else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return ret("operator", null, stream.current());
-    } else {
-      var word;
-      if(/[A-Z]/.test(ch)) {
-        stream.eatWhile(/[\w_<>]/);
-        word = stream.current();
-        return ret("type", "variable-3", word);
-      } else {
-        stream.eatWhile(/[\w_]/);
-        var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
-        return (known && state.kwAllowed) ? ret(known.type, known.style, word) :
-                       ret("variable", "variable", word);
-      }
-    }
-  }
-
-  function haxeTokenString(quote) {
-    return function(stream, state) {
-      if (toUnescaped(stream, quote))
-        state.tokenize = haxeTokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  function haxeTokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = haxeTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  // Parser
-
-  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true};
-
-  function HaxeLexical(indented, column, type, align, prev, info) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.prev = prev;
-    this.info = info;
-    if (align != null) this.align = align;
-  }
-
-  function inScope(state, varname) {
-    for (var v = state.localVars; v; v = v.next)
-      if (v.name == varname) return true;
-  }
-
-  function parseHaxe(state, style, type, content, stream) {
-    var cc = state.cc;
-    // Communicate our context to the combinators.
-    // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
-
-    if (!state.lexical.hasOwnProperty("align"))
-      state.lexical.align = true;
-
-    while(true) {
-      var combinator = cc.length ? cc.pop() : statement;
-      if (combinator(type, content)) {
-        while(cc.length && cc[cc.length - 1].lex)
-          cc.pop()();
-        if (cx.marked) return cx.marked;
-        if (type == "variable" && inScope(state, content)) return "variable-2";
-        if (type == "variable" && imported(state, content)) return "variable-3";
-        return style;
-      }
-    }
-  }
-
-  function imported(state, typename) {
-    if (/[a-z]/.test(typename.charAt(0)))
-      return false;
-    var len = state.importedtypes.length;
-    for (var i = 0; i= 0; i--) cx.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-  function register(varname) {
-    var state = cx.state;
-    if (state.context) {
-      cx.marked = "def";
-      for (var v = state.localVars; v; v = v.next)
-        if (v.name == varname) return;
-      state.localVars = {name: varname, next: state.localVars};
-    }
-  }
-
-  // Combinators
-
-  var defaultVars = {name: "this", next: null};
-  function pushcontext() {
-    if (!cx.state.context) cx.state.localVars = defaultVars;
-    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
-  }
-  function popcontext() {
-    cx.state.localVars = cx.state.context.vars;
-    cx.state.context = cx.state.context.prev;
-  }
-  popcontext.lex = true;
-  function pushlex(type, info) {
-    var result = function() {
-      var state = cx.state;
-      state.lexical = new HaxeLexical(state.indented, cx.stream.column(), type, null, state.lexical, info);
-    };
-    result.lex = true;
-    return result;
-  }
-  function poplex() {
-    var state = cx.state;
-    if (state.lexical.prev) {
-      if (state.lexical.type == ")")
-        state.indented = state.lexical.indented;
-      state.lexical = state.lexical.prev;
-    }
-  }
-  poplex.lex = true;
-
-  function expect(wanted) {
-    function f(type) {
-      if (type == wanted) return cont();
-      else if (wanted == ";") return pass();
-      else return cont(f);
-    }
-    return f;
-  }
-
-  function statement(type) {
-    if (type == "@") return cont(metadef);
-    if (type == "var") return cont(pushlex("vardef"), vardef1, expect(";"), poplex);
-    if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex);
-    if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
-    if (type == "{") return cont(pushlex("}"), pushcontext, block, poplex, popcontext);
-    if (type == ";") return cont();
-    if (type == "attribute") return cont(maybeattribute);
-    if (type == "function") return cont(functiondef);
-    if (type == "for") return cont(pushlex("form"), expect("("), pushlex(")"), forspec1, expect(")"),
-                                   poplex, statement, poplex);
-    if (type == "variable") return cont(pushlex("stat"), maybelabel);
-    if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
-                                      block, poplex, poplex);
-    if (type == "case") return cont(expression, expect(":"));
-    if (type == "default") return cont(expect(":"));
-    if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
-                                     statement, poplex, popcontext);
-    if (type == "import") return cont(importdef, expect(";"));
-    if (type == "typedef") return cont(typedef);
-    return pass(pushlex("stat"), expression, expect(";"), poplex);
-  }
-  function expression(type) {
-    if (atomicTypes.hasOwnProperty(type)) return cont(maybeoperator);
-    if (type == "type" ) return cont(maybeoperator);
-    if (type == "function") return cont(functiondef);
-    if (type == "keyword c") return cont(maybeexpression);
-    if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeoperator);
-    if (type == "operator") return cont(expression);
-    if (type == "[") return cont(pushlex("]"), commasep(maybeexpression, "]"), poplex, maybeoperator);
-    if (type == "{") return cont(pushlex("}"), commasep(objprop, "}"), poplex, maybeoperator);
-    return cont();
-  }
-  function maybeexpression(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expression);
-  }
-
-  function maybeoperator(type, value) {
-    if (type == "operator" && /\+\+|--/.test(value)) return cont(maybeoperator);
-    if (type == "operator" || type == ":") return cont(expression);
-    if (type == ";") return;
-    if (type == "(") return cont(pushlex(")"), commasep(expression, ")"), poplex, maybeoperator);
-    if (type == ".") return cont(property, maybeoperator);
-    if (type == "[") return cont(pushlex("]"), expression, expect("]"), poplex, maybeoperator);
-  }
-
-  function maybeattribute(type) {
-    if (type == "attribute") return cont(maybeattribute);
-    if (type == "function") return cont(functiondef);
-    if (type == "var") return cont(vardef1);
-  }
-
-  function metadef(type) {
-    if(type == ":") return cont(metadef);
-    if(type == "variable") return cont(metadef);
-    if(type == "(") return cont(pushlex(")"), commasep(metaargs, ")"), poplex, statement);
-  }
-  function metaargs(type) {
-    if(type == "variable") return cont();
-  }
-
-  function importdef (type, value) {
-    if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
-    else if(type == "variable" || type == "property" || type == "." || value == "*") return cont(importdef);
-  }
-
-  function typedef (type, value)
-  {
-    if(type == "variable" && /[A-Z]/.test(value.charAt(0))) { registerimport(value); return cont(); }
-    else if (type == "type" && /[A-Z]/.test(value.charAt(0))) { return cont(); }
-  }
-
-  function maybelabel(type) {
-    if (type == ":") return cont(poplex, statement);
-    return pass(maybeoperator, expect(";"), poplex);
-  }
-  function property(type) {
-    if (type == "variable") {cx.marked = "property"; return cont();}
-  }
-  function objprop(type) {
-    if (type == "variable") cx.marked = "property";
-    if (atomicTypes.hasOwnProperty(type)) return cont(expect(":"), expression);
-  }
-  function commasep(what, end) {
-    function proceed(type) {
-      if (type == ",") return cont(what, proceed);
-      if (type == end) return cont();
-      return cont(expect(end));
-    }
-    return function(type) {
-      if (type == end) return cont();
-      else return pass(what, proceed);
-    };
-  }
-  function block(type) {
-    if (type == "}") return cont();
-    return pass(statement, block);
-  }
-  function vardef1(type, value) {
-    if (type == "variable"){register(value); return cont(typeuse, vardef2);}
-    return cont();
-  }
-  function vardef2(type, value) {
-    if (value == "=") return cont(expression, vardef2);
-    if (type == ",") return cont(vardef1);
-  }
-  function forspec1(type, value) {
-    if (type == "variable") {
-      register(value);
-      return cont(forin, expression)
-    } else {
-      return pass()
-    }
-  }
-  function forin(_type, value) {
-    if (value == "in") return cont();
-  }
-  function functiondef(type, value) {
-    //function names starting with upper-case letters are recognised as types, so cludging them together here.
-    if (type == "variable" || type == "type") {register(value); return cont(functiondef);}
-    if (value == "new") return cont(functiondef);
-    if (type == "(") return cont(pushlex(")"), pushcontext, commasep(funarg, ")"), poplex, typeuse, statement, popcontext);
-  }
-  function typeuse(type) {
-    if(type == ":") return cont(typestring);
-  }
-  function typestring(type) {
-    if(type == "type") return cont();
-    if(type == "variable") return cont();
-    if(type == "{") return cont(pushlex("}"), commasep(typeprop, "}"), poplex);
-  }
-  function typeprop(type) {
-    if(type == "variable") return cont(typeuse);
-  }
-  function funarg(type, value) {
-    if (type == "variable") {register(value); return cont(typeuse);}
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      var defaulttypes = ["Int", "Float", "String", "Void", "Std", "Bool", "Dynamic", "Array"];
-      return {
-        tokenize: haxeTokenBase,
-        reAllowed: true,
-        kwAllowed: true,
-        cc: [],
-        lexical: new HaxeLexical((basecolumn || 0) - indentUnit, 0, "block", false),
-        localVars: parserConfig.localVars,
-        importedtypes: defaulttypes,
-        context: parserConfig.localVars && {vars: parserConfig.localVars},
-        indented: 0
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (!state.lexical.hasOwnProperty("align"))
-          state.lexical.align = false;
-        state.indented = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (type == "comment") return style;
-      state.reAllowed = !!(type == "operator" || type == "keyword c" || type.match(/^[\[{}\(,;:]$/));
-      state.kwAllowed = type != '.';
-      return parseHaxe(state, style, type, content, stream);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != haxeTokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
-      if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
-      var type = lexical.type, closing = firstChar == type;
-      if (type == "vardef") return lexical.indented + 4;
-      else if (type == "form" && firstChar == "{") return lexical.indented;
-      else if (type == "stat" || type == "form") return lexical.indented + indentUnit;
-      else if (lexical.info == "switch" && !closing)
-        return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
-      else if (lexical.align) return lexical.column + (closing ? 0 : 1);
-      else return lexical.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricChars: "{}",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//"
-  };
-});
-
-CodeMirror.defineMIME("text/x-haxe", "haxe");
-
-CodeMirror.defineMode("hxml", function () {
-
-  return {
-    startState: function () {
-      return {
-        define: false,
-        inString: false
-      };
-    },
-    token: function (stream, state) {
-      var ch = stream.peek();
-      var sol = stream.sol();
-
-      ///* comments */
-      if (ch == "#") {
-        stream.skipToEnd();
-        return "comment";
-      }
-      if (sol && ch == "-") {
-        var style = "variable-2";
-
-        stream.eat(/-/);
-
-        if (stream.peek() == "-") {
-          stream.eat(/-/);
-          style = "keyword a";
-        }
-
-        if (stream.peek() == "D") {
-          stream.eat(/[D]/);
-          style = "keyword c";
-          state.define = true;
-        }
-
-        stream.eatWhile(/[A-Z]/i);
-        return style;
-      }
-
-      var ch = stream.peek();
-
-      if (state.inString == false && ch == "'") {
-        state.inString = true;
-        ch = stream.next();
-      }
-
-      if (state.inString == true) {
-        if (stream.skipTo("'")) {
-
-        } else {
-          stream.skipToEnd();
-        }
-
-        if (stream.peek() == "'") {
-          stream.next();
-          state.inString = false;
-        }
-
-        return "string";
-      }
-
-      stream.next();
-      return null;
-    },
-    lineComment: "#"
-  };
-});
-
-CodeMirror.defineMIME("text/x-hxml", "hxml");
-
-});
diff --git a/www/code/codemirror-5.7/mode/haxe/index.html b/www/code/codemirror-5.7/mode/haxe/index.html
deleted file mode 100644
index d415b5e10..000000000
--- a/www/code/codemirror-5.7/mode/haxe/index.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-CodeMirror: Haxe mode
-
-
-
-
-
-
-
-
-
-
    
-
    Haxe mode
    
-
-
-
    
-
-
    Hxml mode:
    
-
-
    
-
    
-
-    
-
-    
    MIME types defined: text/x-haxe, text/x-hxml.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/htmlembedded/htmlembedded.js b/www/code/codemirror-5.7/mode/htmlembedded/htmlembedded.js
deleted file mode 100644
index 464dc57f8..000000000
--- a/www/code/codemirror-5.7/mode/htmlembedded/htmlembedded.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"),
-        require("../../addon/mode/multiplex"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
-            "../../addon/mode/multiplex"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
-    return CodeMirror.multiplexingMode(CodeMirror.getMode(config, "htmlmixed"), {
-      open: parserConfig.open || parserConfig.scriptStartRegex || "<%",
-      close: parserConfig.close || parserConfig.scriptEndRegex || "%>",
-      mode: CodeMirror.getMode(config, parserConfig.scriptingModeSpec)
-    });
-  }, "htmlmixed");
-
-  CodeMirror.defineMIME("application/x-ejs", {name: "htmlembedded", scriptingModeSpec:"javascript"});
-  CodeMirror.defineMIME("application/x-aspx", {name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
-  CodeMirror.defineMIME("application/x-jsp", {name: "htmlembedded", scriptingModeSpec:"text/x-java"});
-  CodeMirror.defineMIME("application/x-erb", {name: "htmlembedded", scriptingModeSpec:"ruby"});
-});
diff --git a/www/code/codemirror-5.7/mode/htmlembedded/index.html b/www/code/codemirror-5.7/mode/htmlembedded/index.html
deleted file mode 100644
index 365ef8f36..000000000
--- a/www/code/codemirror-5.7/mode/htmlembedded/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-CodeMirror: Html Embedded Scripts mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Html Embedded Scripts mode
    
-
    
-
-    
-
-    
    Mode for html embedded scripts like JSP and ASP.NET. Depends on HtmlMixed which in turn depends on
-    JavaScript, CSS and XML.
    Other dependancies include those of the scriping language chosen.
    
-
-    
    MIME types defined: application/x-aspx (ASP.NET), 
-    application/x-ejs (Embedded Javascript), application/x-jsp (JavaServer Pages)
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/htmlmixed/htmlmixed.js b/www/code/codemirror-5.7/mode/htmlmixed/htmlmixed.js
deleted file mode 100644
index 670fd62bf..000000000
--- a/www/code/codemirror-5.7/mode/htmlmixed/htmlmixed.js
+++ /dev/null
@@ -1,150 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"), require("../css/css"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript", "../css/css"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var defaultTags = {
-    script: [
-      ["lang", /(javascript|babel)/i, "javascript"],
-      ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i, "javascript"],
-      ["type", /./, "text/plain"],
-      [null, null, "javascript"]
-    ],
-    style:  [
-      ["lang", /^css$/i, "css"],
-      ["type", /^(text\/)?(x-)?(stylesheet|css)$/i, "css"],
-      ["type", /./, "text/plain"],
-      [null, null, "css"]
-    ]
-  };
-
-  function maybeBackup(stream, pat, style) {
-    var cur = stream.current(), close = cur.search(pat);
-    if (close > -1) {
-      stream.backUp(cur.length - close);
-    } else if (cur.match(/<\/?$/)) {
-      stream.backUp(cur.length);
-      if (!stream.match(pat, false)) stream.match(cur);
-    }
-    return style;
-  }
-
-  var attrRegexpCache = {};
-  function getAttrRegexp(attr) {
-    var regexp = attrRegexpCache[attr];
-    if (regexp) return regexp;
-    return attrRegexpCache[attr] = new RegExp("\\s+" + attr + "\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*");
-  }
-
-  function getAttrValue(stream, attr) {
-    var pos = stream.pos, match;
-    while (pos >= 0 && stream.string.charAt(pos) !== "<") pos--;
-    if (pos < 0) return pos;
-    if (match = stream.string.slice(pos, stream.pos).match(getAttrRegexp(attr)))
-      return match[2];
-    return "";
-  }
-
-  function getTagRegexp(tagName, anchored) {
-    return new RegExp((anchored ? "^" : "") + "<\/\s*" + tagName + "\s*>", "i");
-  }
-
-  function addTags(from, to) {
-    for (var tag in from) {
-      var dest = to[tag] || (to[tag] = []);
-      var source = from[tag];
-      for (var i = source.length - 1; i >= 0; i--)
-        dest.unshift(source[i])
-    }
-  }
-
-  function findMatchingMode(tagInfo, stream) {
-    for (var i = 0; i < tagInfo.length; i++) {
-      var spec = tagInfo[i];
-      if (!spec[0] || spec[1].test(getAttrValue(stream, spec[0]))) return spec[2];
-    }
-  }
-
-  CodeMirror.defineMode("htmlmixed", function (config, parserConfig) {
-    var htmlMode = CodeMirror.getMode(config, {
-      name: "xml",
-      htmlMode: true,
-      multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
-      multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag
-    });
-
-    var tags = {};
-    var configTags = parserConfig && parserConfig.tags, configScript = parserConfig && parserConfig.scriptTypes;
-    addTags(defaultTags, tags);
-    if (configTags) addTags(configTags, tags);
-    if (configScript) for (var i = configScript.length - 1; i >= 0; i--)
-      tags.script.unshift(["type", configScript[i].matches, configScript[i].mode])
-
-    function html(stream, state) {
-      var tagName = state.htmlState.tagName;
-      var tagInfo = tagName && tags[tagName.toLowerCase()];
-
-      var style = htmlMode.token(stream, state.htmlState), modeSpec;
-
-      if (tagInfo && /\btag\b/.test(style) && stream.current() === ">" &&
-          (modeSpec = findMatchingMode(tagInfo, stream))) {
-        var mode = CodeMirror.getMode(config, modeSpec);
-        var endTagA = getTagRegexp(tagName, true), endTag = getTagRegexp(tagName, false);
-        state.token = function (stream, state) {
-          if (stream.match(endTagA, false)) {
-            state.token = html;
-            state.localState = state.localMode = null;
-            return null;
-          }
-          return maybeBackup(stream, endTag, state.localMode.token(stream, state.localState));
-        };
-        state.localMode = mode;
-        state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, ""));
-      }
-      return style;
-    };
-
-    return {
-      startState: function () {
-        var state = htmlMode.startState();
-        return {token: html, localMode: null, localState: null, htmlState: state};
-      },
-
-      copyState: function (state) {
-        var local;
-        if (state.localState) {
-          local = CodeMirror.copyState(state.localMode, state.localState);
-        }
-        return {token: state.token, localMode: state.localMode, localState: local,
-                htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
-      },
-
-      token: function (stream, state) {
-        return state.token(stream, state);
-      },
-
-      indent: function (state, textAfter) {
-        if (!state.localMode || /^\s*<\//.test(textAfter))
-          return htmlMode.indent(state.htmlState, textAfter);
-        else if (state.localMode.indent)
-          return state.localMode.indent(state.localState, textAfter);
-        else
-          return CodeMirror.Pass;
-      },
-
-      innerMode: function (state) {
-        return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode};
-      }
-    };
-  }, "xml", "javascript", "css");
-
-  CodeMirror.defineMIME("text/html", "htmlmixed");
-});
diff --git a/www/code/codemirror-5.7/mode/htmlmixed/index.html b/www/code/codemirror-5.7/mode/htmlmixed/index.html
deleted file mode 100644
index f94df9e21..000000000
--- a/www/code/codemirror-5.7/mode/htmlmixed/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-CodeMirror: HTML mixed mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    HTML mixed mode
    
-
    
-    
-
-    
    The HTML mixed mode depends on the XML, JavaScript, and CSS modes.
    
-
-    
    It takes an optional mode configuration
-    option, scriptTypes, which can be used to add custom
-    behavior for specific <script type="..."> tags. If
-    given, it should hold an array of {matches, mode}
-    objects, where matches is a string or regexp that
-    matches the script type, and mode is
-    either null, for script types that should stay in
-    HTML mode, or a mode
-    spec corresponding to the mode that should be used for the
-    script.
    
-
-    
    MIME types defined: text/html
-    (redefined, only takes effect if you load this parser after the
-    XML parser).
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/http/http.js b/www/code/codemirror-5.7/mode/http/http.js
deleted file mode 100644
index 9a3c5f9fd..000000000
--- a/www/code/codemirror-5.7/mode/http/http.js
+++ /dev/null
@@ -1,113 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("http", function() {
-  function failFirstLine(stream, state) {
-    stream.skipToEnd();
-    state.cur = header;
-    return "error";
-  }
-
-  function start(stream, state) {
-    if (stream.match(/^HTTP\/\d\.\d/)) {
-      state.cur = responseStatusCode;
-      return "keyword";
-    } else if (stream.match(/^[A-Z]+/) && /[ \t]/.test(stream.peek())) {
-      state.cur = requestPath;
-      return "keyword";
-    } else {
-      return failFirstLine(stream, state);
-    }
-  }
-
-  function responseStatusCode(stream, state) {
-    var code = stream.match(/^\d+/);
-    if (!code) return failFirstLine(stream, state);
-
-    state.cur = responseStatusText;
-    var status = Number(code[0]);
-    if (status >= 100 && status < 200) {
-      return "positive informational";
-    } else if (status >= 200 && status < 300) {
-      return "positive success";
-    } else if (status >= 300 && status < 400) {
-      return "positive redirect";
-    } else if (status >= 400 && status < 500) {
-      return "negative client-error";
-    } else if (status >= 500 && status < 600) {
-      return "negative server-error";
-    } else {
-      return "error";
-    }
-  }
-
-  function responseStatusText(stream, state) {
-    stream.skipToEnd();
-    state.cur = header;
-    return null;
-  }
-
-  function requestPath(stream, state) {
-    stream.eatWhile(/\S/);
-    state.cur = requestProtocol;
-    return "string-2";
-  }
-
-  function requestProtocol(stream, state) {
-    if (stream.match(/^HTTP\/\d\.\d$/)) {
-      state.cur = header;
-      return "keyword";
-    } else {
-      return failFirstLine(stream, state);
-    }
-  }
-
-  function header(stream) {
-    if (stream.sol() && !stream.eat(/[ \t]/)) {
-      if (stream.match(/^.*?:/)) {
-        return "atom";
-      } else {
-        stream.skipToEnd();
-        return "error";
-      }
-    } else {
-      stream.skipToEnd();
-      return "string";
-    }
-  }
-
-  function body(stream) {
-    stream.skipToEnd();
-    return null;
-  }
-
-  return {
-    token: function(stream, state) {
-      var cur = state.cur;
-      if (cur != header && cur != body && stream.eatSpace()) return null;
-      return cur(stream, state);
-    },
-
-    blankLine: function(state) {
-      state.cur = body;
-    },
-
-    startState: function() {
-      return {cur: start};
-    }
-  };
-});
-
-CodeMirror.defineMIME("message/http", "http");
-
-});
diff --git a/www/code/codemirror-5.7/mode/http/index.html b/www/code/codemirror-5.7/mode/http/index.html
deleted file mode 100644
index 0b8d5315d..000000000
--- a/www/code/codemirror-5.7/mode/http/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-CodeMirror: HTTP mode
-
-
-
-
-
-
-
-
-
-
    
-
    HTTP mode
    
-
-
-
    
-
-    
-
-    
    MIME types defined: message/http.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/idl/idl.js b/www/code/codemirror-5.7/mode/idl/idl.js
deleted file mode 100644
index 07308d71d..000000000
--- a/www/code/codemirror-5.7/mode/idl/idl.js
+++ /dev/null
@@ -1,290 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  function wordRegexp(words) {
-    return new RegExp('^((' + words.join(')|(') + '))\\b', 'i');
-  };
-
-  var builtinArray = [
-    'a_correlate', 'abs', 'acos', 'adapt_hist_equal', 'alog',
-    'alog2', 'alog10', 'amoeba', 'annotate', 'app_user_dir',
-    'app_user_dir_query', 'arg_present', 'array_equal', 'array_indices',
-    'arrow', 'ascii_template', 'asin', 'assoc', 'atan',
-    'axis', 'axis', 'bandpass_filter', 'bandreject_filter', 'barplot',
-    'bar_plot', 'beseli', 'beselj', 'beselk', 'besely',
-    'beta', 'biginteger', 'bilinear', 'bin_date', 'binary_template',
-    'bindgen', 'binomial', 'bit_ffs', 'bit_population', 'blas_axpy',
-    'blk_con', 'boolarr', 'boolean', 'boxplot', 'box_cursor',
-    'breakpoint', 'broyden', 'bubbleplot', 'butterworth', 'bytarr',
-    'byte', 'byteorder', 'bytscl', 'c_correlate', 'calendar',
-    'caldat', 'call_external', 'call_function', 'call_method',
-    'call_procedure', 'canny', 'catch', 'cd', 'cdf', 'ceil',
-    'chebyshev', 'check_math', 'chisqr_cvf', 'chisqr_pdf', 'choldc',
-    'cholsol', 'cindgen', 'cir_3pnt', 'clipboard', 'close',
-    'clust_wts', 'cluster', 'cluster_tree', 'cmyk_convert', 'code_coverage',
-    'color_convert', 'color_exchange', 'color_quan', 'color_range_map',
-    'colorbar', 'colorize_sample', 'colormap_applicable',
-    'colormap_gradient', 'colormap_rotation', 'colortable',
-    'comfit', 'command_line_args', 'common', 'compile_opt', 'complex',
-    'complexarr', 'complexround', 'compute_mesh_normals', 'cond', 'congrid',
-    'conj', 'constrained_min', 'contour', 'contour', 'convert_coord',
-    'convol', 'convol_fft', 'coord2to3', 'copy_lun', 'correlate',
-    'cos', 'cosh', 'cpu', 'cramer', 'createboxplotdata',
-    'create_cursor', 'create_struct', 'create_view', 'crossp', 'crvlength',
-    'ct_luminance', 'cti_test', 'cursor', 'curvefit', 'cv_coord',
-    'cvttobm', 'cw_animate', 'cw_animate_getp', 'cw_animate_load',
-    'cw_animate_run', 'cw_arcball', 'cw_bgroup', 'cw_clr_index',
-    'cw_colorsel', 'cw_defroi', 'cw_field', 'cw_filesel', 'cw_form',
-    'cw_fslider', 'cw_light_editor', 'cw_light_editor_get',
-    'cw_light_editor_set', 'cw_orient', 'cw_palette_editor',
-    'cw_palette_editor_get', 'cw_palette_editor_set', 'cw_pdmenu',
-    'cw_rgbslider', 'cw_tmpl', 'cw_zoom', 'db_exists',
-    'dblarr', 'dcindgen', 'dcomplex', 'dcomplexarr', 'define_key',
-    'define_msgblk', 'define_msgblk_from_file', 'defroi', 'defsysv',
-    'delvar', 'dendro_plot', 'dendrogram', 'deriv', 'derivsig',
-    'determ', 'device', 'dfpmin', 'diag_matrix', 'dialog_dbconnect',
-    'dialog_message', 'dialog_pickfile', 'dialog_printersetup',
-    'dialog_printjob', 'dialog_read_image',
-    'dialog_write_image', 'dictionary', 'digital_filter', 'dilate', 'dindgen',
-    'dissolve', 'dist', 'distance_measure', 'dlm_load', 'dlm_register',
-    'doc_library', 'double', 'draw_roi', 'edge_dog', 'efont',
-    'eigenql', 'eigenvec', 'ellipse', 'elmhes', 'emboss',
-    'empty', 'enable_sysrtn', 'eof', 'eos', 'erase',
-    'erf', 'erfc', 'erfcx', 'erode', 'errorplot',
-    'errplot', 'estimator_filter', 'execute', 'exit', 'exp',
-    'expand', 'expand_path', 'expint', 'extrac', 'extract_slice',
-    'f_cvf', 'f_pdf', 'factorial', 'fft', 'file_basename',
-    'file_chmod', 'file_copy', 'file_delete', 'file_dirname',
-    'file_expand_path', 'file_gunzip', 'file_gzip', 'file_info',
-    'file_lines', 'file_link', 'file_mkdir', 'file_move',
-    'file_poll_input', 'file_readlink', 'file_same',
-    'file_search', 'file_tar', 'file_test', 'file_untar', 'file_unzip',
-    'file_which', 'file_zip', 'filepath', 'findgen', 'finite',
-    'fix', 'flick', 'float', 'floor', 'flow3',
-    'fltarr', 'flush', 'format_axis_values', 'forward_function', 'free_lun',
-    'fstat', 'fulstr', 'funct', 'function', 'fv_test',
-    'fx_root', 'fz_roots', 'gamma', 'gamma_ct', 'gauss_cvf',
-    'gauss_pdf', 'gauss_smooth', 'gauss2dfit', 'gaussfit',
-    'gaussian_function', 'gaussint', 'get_drive_list', 'get_dxf_objects',
-    'get_kbrd', 'get_login_info',
-    'get_lun', 'get_screen_size', 'getenv', 'getwindows', 'greg2jul',
-    'grib', 'grid_input', 'grid_tps', 'grid3', 'griddata',
-    'gs_iter', 'h_eq_ct', 'h_eq_int', 'hanning', 'hash',
-    'hdf', 'hdf5', 'heap_free', 'heap_gc', 'heap_nosave',
-    'heap_refcount', 'heap_save', 'help', 'hilbert', 'hist_2d',
-    'hist_equal', 'histogram', 'hls', 'hough', 'hqr',
-    'hsv', 'i18n_multibytetoutf8',
-    'i18n_multibytetowidechar', 'i18n_utf8tomultibyte',
-    'i18n_widechartomultibyte',
-    'ibeta', 'icontour', 'iconvertcoord', 'idelete', 'identity',
-    'idl_base64', 'idl_container', 'idl_validname',
-    'idlexbr_assistant', 'idlitsys_createtool',
-    'idlunit', 'iellipse', 'igamma', 'igetcurrent', 'igetdata',
-    'igetid', 'igetproperty', 'iimage', 'image', 'image_cont',
-    'image_statistics', 'image_threshold', 'imaginary', 'imap', 'indgen',
-    'int_2d', 'int_3d', 'int_tabulated', 'intarr', 'interpol',
-    'interpolate', 'interval_volume', 'invert', 'ioctl', 'iopen',
-    'ir_filter', 'iplot', 'ipolygon', 'ipolyline', 'iputdata',
-    'iregister', 'ireset', 'iresolve', 'irotate', 'isa',
-    'isave', 'iscale', 'isetcurrent', 'isetproperty', 'ishft',
-    'isocontour', 'isosurface', 'isurface', 'itext', 'itranslate',
-    'ivector', 'ivolume', 'izoom', 'journal', 'json_parse',
-    'json_serialize', 'jul2greg', 'julday', 'keyword_set', 'krig2d',
-    'kurtosis', 'kw_test', 'l64indgen', 'la_choldc', 'la_cholmprove',
-    'la_cholsol', 'la_determ', 'la_eigenproblem', 'la_eigenql', 'la_eigenvec',
-    'la_elmhes', 'la_gm_linear_model', 'la_hqr', 'la_invert',
-    'la_least_square_equality', 'la_least_squares', 'la_linear_equation',
-    'la_ludc', 'la_lumprove', 'la_lusol',
-    'la_svd', 'la_tridc', 'la_trimprove', 'la_triql', 'la_trired',
-    'la_trisol', 'label_date', 'label_region', 'ladfit', 'laguerre',
-    'lambda', 'lambdap', 'lambertw', 'laplacian', 'least_squares_filter',
-    'leefilt', 'legend', 'legendre', 'linbcg', 'lindgen',
-    'linfit', 'linkimage', 'list', 'll_arc_distance', 'lmfit',
-    'lmgr', 'lngamma', 'lnp_test', 'loadct', 'locale_get',
-    'logical_and', 'logical_or', 'logical_true', 'lon64arr', 'lonarr',
-    'long', 'long64', 'lsode', 'lu_complex', 'ludc',
-    'lumprove', 'lusol', 'm_correlate', 'machar', 'make_array',
-    'make_dll', 'make_rt', 'map', 'mapcontinents', 'mapgrid',
-    'map_2points', 'map_continents', 'map_grid', 'map_image', 'map_patch',
-    'map_proj_forward', 'map_proj_image', 'map_proj_info',
-    'map_proj_init', 'map_proj_inverse',
-    'map_set', 'matrix_multiply', 'matrix_power', 'max', 'md_test',
-    'mean', 'meanabsdev', 'mean_filter', 'median', 'memory',
-    'mesh_clip', 'mesh_decimate', 'mesh_issolid',
-    'mesh_merge', 'mesh_numtriangles',
-    'mesh_obj', 'mesh_smooth', 'mesh_surfacearea',
-    'mesh_validate', 'mesh_volume',
-    'message', 'min', 'min_curve_surf', 'mk_html_help', 'modifyct',
-    'moment', 'morph_close', 'morph_distance',
-    'morph_gradient', 'morph_hitormiss',
-    'morph_open', 'morph_thin', 'morph_tophat', 'multi', 'n_elements',
-    'n_params', 'n_tags', 'ncdf', 'newton', 'noise_hurl',
-    'noise_pick', 'noise_scatter', 'noise_slur', 'norm', 'obj_class',
-    'obj_destroy', 'obj_hasmethod', 'obj_isa', 'obj_new', 'obj_valid',
-    'objarr', 'on_error', 'on_ioerror', 'online_help', 'openr',
-    'openu', 'openw', 'oplot', 'oploterr', 'orderedhash',
-    'p_correlate', 'parse_url', 'particle_trace', 'path_cache', 'path_sep',
-    'pcomp', 'plot', 'plot3d', 'plot', 'plot_3dbox',
-    'plot_field', 'ploterr', 'plots', 'polar_contour', 'polar_surface',
-    'polyfill', 'polyshade', 'pnt_line', 'point_lun', 'polarplot',
-    'poly', 'poly_2d', 'poly_area', 'poly_fit', 'polyfillv',
-    'polygon', 'polyline', 'polywarp', 'popd', 'powell',
-    'pref_commit', 'pref_get', 'pref_set', 'prewitt', 'primes',
-    'print', 'printf', 'printd', 'pro', 'product',
-    'profile', 'profiler', 'profiles', 'project_vol', 'ps_show_fonts',
-    'psafm', 'pseudo', 'ptr_free', 'ptr_new', 'ptr_valid',
-    'ptrarr', 'pushd', 'qgrid3', 'qhull', 'qromb',
-    'qromo', 'qsimp', 'query_*', 'query_ascii', 'query_bmp',
-    'query_csv', 'query_dicom', 'query_gif', 'query_image', 'query_jpeg',
-    'query_jpeg2000', 'query_mrsid', 'query_pict', 'query_png', 'query_ppm',
-    'query_srf', 'query_tiff', 'query_video', 'query_wav', 'r_correlate',
-    'r_test', 'radon', 'randomn', 'randomu', 'ranks',
-    'rdpix', 'read', 'readf', 'read_ascii', 'read_binary',
-    'read_bmp', 'read_csv', 'read_dicom', 'read_gif', 'read_image',
-    'read_interfile', 'read_jpeg', 'read_jpeg2000', 'read_mrsid', 'read_pict',
-    'read_png', 'read_ppm', 'read_spr', 'read_srf', 'read_sylk',
-    'read_tiff', 'read_video', 'read_wav', 'read_wave', 'read_x11_bitmap',
-    'read_xwd', 'reads', 'readu', 'real_part', 'rebin',
-    'recall_commands', 'recon3', 'reduce_colors', 'reform', 'region_grow',
-    'register_cursor', 'regress', 'replicate',
-    'replicate_inplace', 'resolve_all',
-    'resolve_routine', 'restore', 'retall', 'return', 'reverse',
-    'rk4', 'roberts', 'rot', 'rotate', 'round',
-    'routine_filepath', 'routine_info', 'rs_test', 's_test', 'save',
-    'savgol', 'scale3', 'scale3d', 'scatterplot', 'scatterplot3d',
-    'scope_level', 'scope_traceback', 'scope_varfetch',
-    'scope_varname', 'search2d',
-    'search3d', 'sem_create', 'sem_delete', 'sem_lock', 'sem_release',
-    'set_plot', 'set_shading', 'setenv', 'sfit', 'shade_surf',
-    'shade_surf_irr', 'shade_volume', 'shift', 'shift_diff', 'shmdebug',
-    'shmmap', 'shmunmap', 'shmvar', 'show3', 'showfont',
-    'signum', 'simplex', 'sin', 'sindgen', 'sinh',
-    'size', 'skewness', 'skip_lun', 'slicer3', 'slide_image',
-    'smooth', 'sobel', 'socket', 'sort', 'spawn',
-    'sph_4pnt', 'sph_scat', 'spher_harm', 'spl_init', 'spl_interp',
-    'spline', 'spline_p', 'sprsab', 'sprsax', 'sprsin',
-    'sprstp', 'sqrt', 'standardize', 'stddev', 'stop',
-    'strarr', 'strcmp', 'strcompress', 'streamline', 'streamline',
-    'stregex', 'stretch', 'string', 'strjoin', 'strlen',
-    'strlowcase', 'strmatch', 'strmessage', 'strmid', 'strpos',
-    'strput', 'strsplit', 'strtrim', 'struct_assign', 'struct_hide',
-    'strupcase', 'surface', 'surface', 'surfr', 'svdc',
-    'svdfit', 'svsol', 'swap_endian', 'swap_endian_inplace', 'symbol',
-    'systime', 't_cvf', 't_pdf', 't3d', 'tag_names',
-    'tan', 'tanh', 'tek_color', 'temporary', 'terminal_size',
-    'tetra_clip', 'tetra_surface', 'tetra_volume', 'text', 'thin',
-    'thread', 'threed', 'tic', 'time_test2', 'timegen',
-    'timer', 'timestamp', 'timestamptovalues', 'tm_test', 'toc',
-    'total', 'trace', 'transpose', 'tri_surf', 'triangulate',
-    'trigrid', 'triql', 'trired', 'trisol', 'truncate_lun',
-    'ts_coef', 'ts_diff', 'ts_fcast', 'ts_smooth', 'tv',
-    'tvcrs', 'tvlct', 'tvrd', 'tvscl', 'typename',
-    'uindgen', 'uint', 'uintarr', 'ul64indgen', 'ulindgen',
-    'ulon64arr', 'ulonarr', 'ulong', 'ulong64', 'uniq',
-    'unsharp_mask', 'usersym', 'value_locate', 'variance', 'vector',
-    'vector_field', 'vel', 'velovect', 'vert_t3d', 'voigt',
-    'volume', 'voronoi', 'voxel_proj', 'wait', 'warp_tri',
-    'watershed', 'wdelete', 'wf_draw', 'where', 'widget_base',
-    'widget_button', 'widget_combobox', 'widget_control',
-    'widget_displaycontextmenu', 'widget_draw',
-    'widget_droplist', 'widget_event', 'widget_info',
-    'widget_label', 'widget_list',
-    'widget_propertysheet', 'widget_slider', 'widget_tab',
-    'widget_table', 'widget_text',
-    'widget_tree', 'widget_tree_move', 'widget_window',
-    'wiener_filter', 'window',
-    'window', 'write_bmp', 'write_csv', 'write_gif', 'write_image',
-    'write_jpeg', 'write_jpeg2000', 'write_nrif', 'write_pict', 'write_png',
-    'write_ppm', 'write_spr', 'write_srf', 'write_sylk', 'write_tiff',
-    'write_video', 'write_wav', 'write_wave', 'writeu', 'wset',
-    'wshow', 'wtn', 'wv_applet', 'wv_cwt', 'wv_cw_wavelet',
-    'wv_denoise', 'wv_dwt', 'wv_fn_coiflet',
-    'wv_fn_daubechies', 'wv_fn_gaussian',
-    'wv_fn_haar', 'wv_fn_morlet', 'wv_fn_paul',
-    'wv_fn_symlet', 'wv_import_data',
-    'wv_import_wavelet', 'wv_plot3d_wps', 'wv_plot_multires',
-    'wv_pwt', 'wv_tool_denoise',
-    'xbm_edit', 'xdisplayfile', 'xdxf', 'xfont', 'xinteranimate',
-    'xloadct', 'xmanager', 'xmng_tmpl', 'xmtool', 'xobjview',
-    'xobjview_rotate', 'xobjview_write_image',
-    'xpalette', 'xpcolor', 'xplot3d',
-    'xregistered', 'xroi', 'xsq_test', 'xsurface', 'xvaredit',
-    'xvolume', 'xvolume_rotate', 'xvolume_write_image',
-    'xyouts', 'zlib_compress', 'zlib_uncompress', 'zoom', 'zoom_24'
-  ];
-  var builtins = wordRegexp(builtinArray);
-
-  var keywordArray = [
-    'begin', 'end', 'endcase', 'endfor',
-    'endwhile', 'endif', 'endrep', 'endforeach',
-    'break', 'case', 'continue', 'for',
-    'foreach', 'goto', 'if', 'then', 'else',
-    'repeat', 'until', 'switch', 'while',
-    'do', 'pro', 'function'
-  ];
-  var keywords = wordRegexp(keywordArray);
-
-  CodeMirror.registerHelper("hintWords", "idl", builtinArray.concat(keywordArray));
-
-  var identifiers = new RegExp('^[_a-z\xa1-\uffff][_a-z0-9\xa1-\uffff]*', 'i');
-
-  var singleOperators = /[+\-*&=<>\/@#~$]/;
-  var boolOperators = new RegExp('(and|or|eq|lt|le|gt|ge|ne|not)', 'i');
-
-  function tokenBase(stream) {
-    // whitespaces
-    if (stream.eatSpace()) return null;
-
-    // Handle one line Comments
-    if (stream.match(';')) {
-      stream.skipToEnd();
-      return 'comment';
-    }
-
-    // Handle Number Literals
-    if (stream.match(/^[0-9\.+-]/, false)) {
-      if (stream.match(/^[+-]?0x[0-9a-fA-F]+/))
-        return 'number';
-      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?/))
-        return 'number';
-      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?/))
-        return 'number';
-    }
-
-    // Handle Strings
-    if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; }
-    if (stream.match(/^'([^']|(''))*'/)) { return 'string'; }
-
-    // Handle words
-    if (stream.match(keywords)) { return 'keyword'; }
-    if (stream.match(builtins)) { return 'builtin'; }
-    if (stream.match(identifiers)) { return 'variable'; }
-
-    if (stream.match(singleOperators) || stream.match(boolOperators)) {
-      return 'operator'; }
-
-    // Handle non-detected items
-    stream.next();
-    return null;
-  };
-
-  CodeMirror.defineMode('idl', function() {
-    return {
-      token: function(stream) {
-        return tokenBase(stream);
-      }
-    };
-  });
-
-  CodeMirror.defineMIME('text/x-idl', 'idl');
-});
diff --git a/www/code/codemirror-5.7/mode/idl/index.html b/www/code/codemirror-5.7/mode/idl/index.html
deleted file mode 100644
index 4c169e2d6..000000000
--- a/www/code/codemirror-5.7/mode/idl/index.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-CodeMirror: IDL mode
-
-
-
-
-
-
-
-
-
-
    
-
    IDL mode
    
-
-    
    
-    
-
-    
    MIME types defined: text/x-idl.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/index.html b/www/code/codemirror-5.7/mode/index.html
deleted file mode 100644
index f63e83684..000000000
--- a/www/code/codemirror-5.7/mode/index.html
+++ /dev/null
@@ -1,152 +0,0 @@
-
-
-CodeMirror: Language Modes
-
-
-
-
-
-
    
-
-  
    Language modes
    
-
-  
    This is a list of every mode in the distribution. Each mode lives
-in a subdirectory of the mode/ directory, and typically
-defines a single JavaScript file that implements the mode. Loading
-such file will make the language available to CodeMirror, through
-the mode
-option.
    
-
-  
    
-    
-  
    
-
-
    
diff --git a/www/code/codemirror-5.7/mode/jade/index.html b/www/code/codemirror-5.7/mode/jade/index.html
deleted file mode 100644
index e534981b2..000000000
--- a/www/code/codemirror-5.7/mode/jade/index.html
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-CodeMirror: Jade Templating Mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Jade Templating Mode
    
-
    
-    
-    
    The Jade Templating Mode
    
-      
     Created by Forbes Lindesay. Managed as part of a Brackets extension at https://github.com/ForbesLindesay/jade-brackets.
    
-    
    MIME type defined: text/x-jade.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/jade/jade.js b/www/code/codemirror-5.7/mode/jade/jade.js
deleted file mode 100644
index 96fadb19e..000000000
--- a/www/code/codemirror-5.7/mode/jade/jade.js
+++ /dev/null
@@ -1,590 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../javascript/javascript"), require("../css/css"), require("../htmlmixed/htmlmixed"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../javascript/javascript", "../css/css", "../htmlmixed/htmlmixed"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode('jade', function (config) {
-  // token types
-  var KEYWORD = 'keyword';
-  var DOCTYPE = 'meta';
-  var ID = 'builtin';
-  var CLASS = 'qualifier';
-
-  var ATTRS_NEST = {
-    '{': '}',
-    '(': ')',
-    '[': ']'
-  };
-
-  var jsMode = CodeMirror.getMode(config, 'javascript');
-
-  function State() {
-    this.javaScriptLine = false;
-    this.javaScriptLineExcludesColon = false;
-
-    this.javaScriptArguments = false;
-    this.javaScriptArgumentsDepth = 0;
-
-    this.isInterpolating = false;
-    this.interpolationNesting = 0;
-
-    this.jsState = jsMode.startState();
-
-    this.restOfLine = '';
-
-    this.isIncludeFiltered = false;
-    this.isEach = false;
-
-    this.lastTag = '';
-    this.scriptType = '';
-
-    // Attributes Mode
-    this.isAttrs = false;
-    this.attrsNest = [];
-    this.inAttributeName = true;
-    this.attributeIsType = false;
-    this.attrValue = '';
-
-    // Indented Mode
-    this.indentOf = Infinity;
-    this.indentToken = '';
-
-    this.innerMode = null;
-    this.innerState = null;
-
-    this.innerModeForLine = false;
-  }
-  /**
-   * Safely copy a state
-   *
-   * @return {State}
-   */
-  State.prototype.copy = function () {
-    var res = new State();
-    res.javaScriptLine = this.javaScriptLine;
-    res.javaScriptLineExcludesColon = this.javaScriptLineExcludesColon;
-    res.javaScriptArguments = this.javaScriptArguments;
-    res.javaScriptArgumentsDepth = this.javaScriptArgumentsDepth;
-    res.isInterpolating = this.isInterpolating;
-    res.interpolationNesting = this.intpolationNesting;
-
-    res.jsState = CodeMirror.copyState(jsMode, this.jsState);
-
-    res.innerMode = this.innerMode;
-    if (this.innerMode && this.innerState) {
-      res.innerState = CodeMirror.copyState(this.innerMode, this.innerState);
-    }
-
-    res.restOfLine = this.restOfLine;
-
-    res.isIncludeFiltered = this.isIncludeFiltered;
-    res.isEach = this.isEach;
-    res.lastTag = this.lastTag;
-    res.scriptType = this.scriptType;
-    res.isAttrs = this.isAttrs;
-    res.attrsNest = this.attrsNest.slice();
-    res.inAttributeName = this.inAttributeName;
-    res.attributeIsType = this.attributeIsType;
-    res.attrValue = this.attrValue;
-    res.indentOf = this.indentOf;
-    res.indentToken = this.indentToken;
-
-    res.innerModeForLine = this.innerModeForLine;
-
-    return res;
-  };
-
-  function javaScript(stream, state) {
-    if (stream.sol()) {
-      // if javaScriptLine was set at end of line, ignore it
-      state.javaScriptLine = false;
-      state.javaScriptLineExcludesColon = false;
-    }
-    if (state.javaScriptLine) {
-      if (state.javaScriptLineExcludesColon && stream.peek() === ':') {
-        state.javaScriptLine = false;
-        state.javaScriptLineExcludesColon = false;
-        return;
-      }
-      var tok = jsMode.token(stream, state.jsState);
-      if (stream.eol()) state.javaScriptLine = false;
-      return tok || true;
-    }
-  }
-  function javaScriptArguments(stream, state) {
-    if (state.javaScriptArguments) {
-      if (state.javaScriptArgumentsDepth === 0 && stream.peek() !== '(') {
-        state.javaScriptArguments = false;
-        return;
-      }
-      if (stream.peek() === '(') {
-        state.javaScriptArgumentsDepth++;
-      } else if (stream.peek() === ')') {
-        state.javaScriptArgumentsDepth--;
-      }
-      if (state.javaScriptArgumentsDepth === 0) {
-        state.javaScriptArguments = false;
-        return;
-      }
-
-      var tok = jsMode.token(stream, state.jsState);
-      return tok || true;
-    }
-  }
-
-  function yieldStatement(stream) {
-    if (stream.match(/^yield\b/)) {
-        return 'keyword';
-    }
-  }
-
-  function doctype(stream) {
-    if (stream.match(/^(?:doctype) *([^\n]+)?/)) {
-        return DOCTYPE;
-    }
-  }
-
-  function interpolation(stream, state) {
-    if (stream.match('#{')) {
-      state.isInterpolating = true;
-      state.interpolationNesting = 0;
-      return 'punctuation';
-    }
-  }
-
-  function interpolationContinued(stream, state) {
-    if (state.isInterpolating) {
-      if (stream.peek() === '}') {
-        state.interpolationNesting--;
-        if (state.interpolationNesting < 0) {
-          stream.next();
-          state.isInterpolating = false;
-          return 'puncutation';
-        }
-      } else if (stream.peek() === '{') {
-        state.interpolationNesting++;
-      }
-      return jsMode.token(stream, state.jsState) || true;
-    }
-  }
-
-  function caseStatement(stream, state) {
-    if (stream.match(/^case\b/)) {
-      state.javaScriptLine = true;
-      return KEYWORD;
-    }
-  }
-
-  function when(stream, state) {
-    if (stream.match(/^when\b/)) {
-      state.javaScriptLine = true;
-      state.javaScriptLineExcludesColon = true;
-      return KEYWORD;
-    }
-  }
-
-  function defaultStatement(stream) {
-    if (stream.match(/^default\b/)) {
-      return KEYWORD;
-    }
-  }
-
-  function extendsStatement(stream, state) {
-    if (stream.match(/^extends?\b/)) {
-      state.restOfLine = 'string';
-      return KEYWORD;
-    }
-  }
-
-  function append(stream, state) {
-    if (stream.match(/^append\b/)) {
-      state.restOfLine = 'variable';
-      return KEYWORD;
-    }
-  }
-  function prepend(stream, state) {
-    if (stream.match(/^prepend\b/)) {
-      state.restOfLine = 'variable';
-      return KEYWORD;
-    }
-  }
-  function block(stream, state) {
-    if (stream.match(/^block\b *(?:(prepend|append)\b)?/)) {
-      state.restOfLine = 'variable';
-      return KEYWORD;
-    }
-  }
-
-  function include(stream, state) {
-    if (stream.match(/^include\b/)) {
-      state.restOfLine = 'string';
-      return KEYWORD;
-    }
-  }
-
-  function includeFiltered(stream, state) {
-    if (stream.match(/^include:([a-zA-Z0-9\-]+)/, false) && stream.match('include')) {
-      state.isIncludeFiltered = true;
-      return KEYWORD;
-    }
-  }
-
-  function includeFilteredContinued(stream, state) {
-    if (state.isIncludeFiltered) {
-      var tok = filter(stream, state);
-      state.isIncludeFiltered = false;
-      state.restOfLine = 'string';
-      return tok;
-    }
-  }
-
-  function mixin(stream, state) {
-    if (stream.match(/^mixin\b/)) {
-      state.javaScriptLine = true;
-      return KEYWORD;
-    }
-  }
-
-  function call(stream, state) {
-    if (stream.match(/^\+([-\w]+)/)) {
-      if (!stream.match(/^\( *[-\w]+ *=/, false)) {
-        state.javaScriptArguments = true;
-        state.javaScriptArgumentsDepth = 0;
-      }
-      return 'variable';
-    }
-    if (stream.match(/^\+#{/, false)) {
-      stream.next();
-      state.mixinCallAfter = true;
-      return interpolation(stream, state);
-    }
-  }
-  function callArguments(stream, state) {
-    if (state.mixinCallAfter) {
-      state.mixinCallAfter = false;
-      if (!stream.match(/^\( *[-\w]+ *=/, false)) {
-        state.javaScriptArguments = true;
-        state.javaScriptArgumentsDepth = 0;
-      }
-      return true;
-    }
-  }
-
-  function conditional(stream, state) {
-    if (stream.match(/^(if|unless|else if|else)\b/)) {
-      state.javaScriptLine = true;
-      return KEYWORD;
-    }
-  }
-
-  function each(stream, state) {
-    if (stream.match(/^(- *)?(each|for)\b/)) {
-      state.isEach = true;
-      return KEYWORD;
-    }
-  }
-  function eachContinued(stream, state) {
-    if (state.isEach) {
-      if (stream.match(/^ in\b/)) {
-        state.javaScriptLine = true;
-        state.isEach = false;
-        return KEYWORD;
-      } else if (stream.sol() || stream.eol()) {
-        state.isEach = false;
-      } else if (stream.next()) {
-        while (!stream.match(/^ in\b/, false) && stream.next());
-        return 'variable';
-      }
-    }
-  }
-
-  function whileStatement(stream, state) {
-    if (stream.match(/^while\b/)) {
-      state.javaScriptLine = true;
-      return KEYWORD;
-    }
-  }
-
-  function tag(stream, state) {
-    var captures;
-    if (captures = stream.match(/^(\w(?:[-:\w]*\w)?)\/?/)) {
-      state.lastTag = captures[1].toLowerCase();
-      if (state.lastTag === 'script') {
-        state.scriptType = 'application/javascript';
-      }
-      return 'tag';
-    }
-  }
-
-  function filter(stream, state) {
-    if (stream.match(/^:([\w\-]+)/)) {
-      var innerMode;
-      if (config && config.innerModes) {
-        innerMode = config.innerModes(stream.current().substring(1));
-      }
-      if (!innerMode) {
-        innerMode = stream.current().substring(1);
-      }
-      if (typeof innerMode === 'string') {
-        innerMode = CodeMirror.getMode(config, innerMode);
-      }
-      setInnerMode(stream, state, innerMode);
-      return 'atom';
-    }
-  }
-
-  function code(stream, state) {
-    if (stream.match(/^(!?=|-)/)) {
-      state.javaScriptLine = true;
-      return 'punctuation';
-    }
-  }
-
-  function id(stream) {
-    if (stream.match(/^#([\w-]+)/)) {
-      return ID;
-    }
-  }
-
-  function className(stream) {
-    if (stream.match(/^\.([\w-]+)/)) {
-      return CLASS;
-    }
-  }
-
-  function attrs(stream, state) {
-    if (stream.peek() == '(') {
-      stream.next();
-      state.isAttrs = true;
-      state.attrsNest = [];
-      state.inAttributeName = true;
-      state.attrValue = '';
-      state.attributeIsType = false;
-      return 'punctuation';
-    }
-  }
-
-  function attrsContinued(stream, state) {
-    if (state.isAttrs) {
-      if (ATTRS_NEST[stream.peek()]) {
-        state.attrsNest.push(ATTRS_NEST[stream.peek()]);
-      }
-      if (state.attrsNest[state.attrsNest.length - 1] === stream.peek()) {
-        state.attrsNest.pop();
-      } else  if (stream.eat(')')) {
-        state.isAttrs = false;
-        return 'punctuation';
-      }
-      if (state.inAttributeName && stream.match(/^[^=,\)!]+/)) {
-        if (stream.peek() === '=' || stream.peek() === '!') {
-          state.inAttributeName = false;
-          state.jsState = jsMode.startState();
-          if (state.lastTag === 'script' && stream.current().trim().toLowerCase() === 'type') {
-            state.attributeIsType = true;
-          } else {
-            state.attributeIsType = false;
-          }
-        }
-        return 'attribute';
-      }
-
-      var tok = jsMode.token(stream, state.jsState);
-      if (state.attributeIsType && tok === 'string') {
-        state.scriptType = stream.current().toString();
-      }
-      if (state.attrsNest.length === 0 && (tok === 'string' || tok === 'variable' || tok === 'keyword')) {
-        try {
-          Function('', 'var x ' + state.attrValue.replace(/,\s*$/, '').replace(/^!/, ''));
-          state.inAttributeName = true;
-          state.attrValue = '';
-          stream.backUp(stream.current().length);
-          return attrsContinued(stream, state);
-        } catch (ex) {
-          //not the end of an attribute
-        }
-      }
-      state.attrValue += stream.current();
-      return tok || true;
-    }
-  }
-
-  function attributesBlock(stream, state) {
-    if (stream.match(/^&attributes\b/)) {
-      state.javaScriptArguments = true;
-      state.javaScriptArgumentsDepth = 0;
-      return 'keyword';
-    }
-  }
-
-  function indent(stream) {
-    if (stream.sol() && stream.eatSpace()) {
-      return 'indent';
-    }
-  }
-
-  function comment(stream, state) {
-    if (stream.match(/^ *\/\/(-)?([^\n]*)/)) {
-      state.indentOf = stream.indentation();
-      state.indentToken = 'comment';
-      return 'comment';
-    }
-  }
-
-  function colon(stream) {
-    if (stream.match(/^: */)) {
-      return 'colon';
-    }
-  }
-
-  function text(stream, state) {
-    if (stream.match(/^(?:\| ?| )([^\n]+)/)) {
-      return 'string';
-    }
-    if (stream.match(/^(<[^\n]*)/, false)) {
-      // html string
-      setInnerMode(stream, state, 'htmlmixed');
-      state.innerModeForLine = true;
-      return innerMode(stream, state, true);
-    }
-  }
-
-  function dot(stream, state) {
-    if (stream.eat('.')) {
-      var innerMode = null;
-      if (state.lastTag === 'script' && state.scriptType.toLowerCase().indexOf('javascript') != -1) {
-        innerMode = state.scriptType.toLowerCase().replace(/"|'/g, '');
-      } else if (state.lastTag === 'style') {
-        innerMode = 'css';
-      }
-      setInnerMode(stream, state, innerMode);
-      return 'dot';
-    }
-  }
-
-  function fail(stream) {
-    stream.next();
-    return null;
-  }
-
-
-  function setInnerMode(stream, state, mode) {
-    mode = CodeMirror.mimeModes[mode] || mode;
-    mode = config.innerModes ? config.innerModes(mode) || mode : mode;
-    mode = CodeMirror.mimeModes[mode] || mode;
-    mode = CodeMirror.getMode(config, mode);
-    state.indentOf = stream.indentation();
-
-    if (mode && mode.name !== 'null') {
-      state.innerMode = mode;
-    } else {
-      state.indentToken = 'string';
-    }
-  }
-  function innerMode(stream, state, force) {
-    if (stream.indentation() > state.indentOf || (state.innerModeForLine && !stream.sol()) || force) {
-      if (state.innerMode) {
-        if (!state.innerState) {
-          state.innerState = state.innerMode.startState ? state.innerMode.startState(stream.indentation()) : {};
-        }
-        return stream.hideFirstChars(state.indentOf + 2, function () {
-          return state.innerMode.token(stream, state.innerState) || true;
-        });
-      } else {
-        stream.skipToEnd();
-        return state.indentToken;
-      }
-    } else if (stream.sol()) {
-      state.indentOf = Infinity;
-      state.indentToken = null;
-      state.innerMode = null;
-      state.innerState = null;
-    }
-  }
-  function restOfLine(stream, state) {
-    if (stream.sol()) {
-      // if restOfLine was set at end of line, ignore it
-      state.restOfLine = '';
-    }
-    if (state.restOfLine) {
-      stream.skipToEnd();
-      var tok = state.restOfLine;
-      state.restOfLine = '';
-      return tok;
-    }
-  }
-
-
-  function startState() {
-    return new State();
-  }
-  function copyState(state) {
-    return state.copy();
-  }
-  /**
-   * Get the next token in the stream
-   *
-   * @param {Stream} stream
-   * @param {State} state
-   */
-  function nextToken(stream, state) {
-    var tok = innerMode(stream, state)
-      || restOfLine(stream, state)
-      || interpolationContinued(stream, state)
-      || includeFilteredContinued(stream, state)
-      || eachContinued(stream, state)
-      || attrsContinued(stream, state)
-      || javaScript(stream, state)
-      || javaScriptArguments(stream, state)
-      || callArguments(stream, state)
-
-      || yieldStatement(stream, state)
-      || doctype(stream, state)
-      || interpolation(stream, state)
-      || caseStatement(stream, state)
-      || when(stream, state)
-      || defaultStatement(stream, state)
-      || extendsStatement(stream, state)
-      || append(stream, state)
-      || prepend(stream, state)
-      || block(stream, state)
-      || include(stream, state)
-      || includeFiltered(stream, state)
-      || mixin(stream, state)
-      || call(stream, state)
-      || conditional(stream, state)
-      || each(stream, state)
-      || whileStatement(stream, state)
-      || tag(stream, state)
-      || filter(stream, state)
-      || code(stream, state)
-      || id(stream, state)
-      || className(stream, state)
-      || attrs(stream, state)
-      || attributesBlock(stream, state)
-      || indent(stream, state)
-      || text(stream, state)
-      || comment(stream, state)
-      || colon(stream, state)
-      || dot(stream, state)
-      || fail(stream, state);
-
-    return tok === true ? null : tok;
-  }
-  return {
-    startState: startState,
-    copyState: copyState,
-    token: nextToken
-  };
-});
-
-CodeMirror.defineMIME('text/x-jade', 'jade');
-
-});
diff --git a/www/code/codemirror-5.7/mode/javascript/index.html b/www/code/codemirror-5.7/mode/javascript/index.html
deleted file mode 100644
index 592a133d8..000000000
--- a/www/code/codemirror-5.7/mode/javascript/index.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-CodeMirror: JavaScript mode
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    JavaScript mode
    
-
-
-
    
-
-    
-
-    
    
-      JavaScript mode supports several configuration options:
-      
      
-        
    • json which will set the mode to expect JSON
-        data rather than a JavaScript program.
      • 
-        
    • jsonld which will set the mode to expect
-        JSON-LD linked data rather
-        than a JavaScript program (demo).
      • 
-        
    • typescript which will activate additional
-        syntax highlighting and some other things for TypeScript code
-        (demo).
      • 
-        
    • statementIndent which (given a number) will
-        determine the amount of indentation to use for statements
-        continued on a new line.
      • 
-        
    • wordCharacters, a regexp that indicates which
-        characters should be considered part of an identifier.
-        Defaults to /[\w$]/, which does not handle
-        non-ASCII identifiers. Can be set to something more elaborate
-        to improve Unicode support.
      • 
-      
    
-    
    
-
-    
    MIME types defined: text/javascript, application/json, application/ld+json, text/typescript, application/typescript.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/javascript/javascript.js b/www/code/codemirror-5.7/mode/javascript/javascript.js
deleted file mode 100644
index 032c20759..000000000
--- a/www/code/codemirror-5.7/mode/javascript/javascript.js
+++ /dev/null
@@ -1,708 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// TODO actually recognize syntax of TypeScript constructs
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("javascript", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var statementIndent = parserConfig.statementIndent;
-  var jsonldMode = parserConfig.jsonld;
-  var jsonMode = parserConfig.json || jsonldMode;
-  var isTS = parserConfig.typescript;
-  var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
-
-  // Tokenizer
-
-  var keywords = function(){
-    function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c");
-    var operator = kw("operator"), atom = {type: "atom", style: "atom"};
-
-    var jsKeywords = {
-      "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C, "debugger": C,
-      "var": kw("var"), "const": kw("var"), "let": kw("var"),
-      "async": kw("async"), "function": kw("function"), "catch": kw("catch"),
-      "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-      "in": operator, "typeof": operator, "instanceof": operator,
-      "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
-      "this": kw("this"), "class": kw("class"), "super": kw("atom"),
-      "await": C, "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
-    };
-
-    // Extend the 'normal' keywords with the TypeScript language extensions
-    if (isTS) {
-      var type = {type: "variable", style: "variable-3"};
-      var tsKeywords = {
-        // object-like things
-        "interface": kw("interface"),
-        "extends": kw("extends"),
-        "constructor": kw("constructor"),
-
-        // scope modifiers
-        "public": kw("public"),
-        "private": kw("private"),
-        "protected": kw("protected"),
-        "static": kw("static"),
-
-        // types
-        "string": type, "number": type, "bool": type, "any": type
-      };
-
-      for (var attr in tsKeywords) {
-        jsKeywords[attr] = tsKeywords[attr];
-      }
-    }
-
-    return jsKeywords;
-  }();
-
-  var isOperatorChar = /[+\-*&%=<>!?|~^]/;
-  var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;
-
-  function readRegexp(stream) {
-    var escaped = false, next, inSet = false;
-    while ((next = stream.next()) != null) {
-      if (!escaped) {
-        if (next == "/" && !inSet) return;
-        if (next == "[") inSet = true;
-        else if (inSet && next == "]") inSet = false;
-      }
-      escaped = !escaped && next == "\\";
-    }
-  }
-
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-  function ret(tp, style, cont) {
-    type = tp; content = cont;
-    return style;
-  }
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) {
-      return ret("number", "number");
-    } else if (ch == "." && stream.match("..")) {
-      return ret("spread", "meta");
-    } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      return ret(ch);
-    } else if (ch == "=" && stream.eat(">")) {
-      return ret("=>", "operator");
-    } else if (ch == "0" && stream.eat(/x/i)) {
-      stream.eatWhile(/[\da-f]/i);
-      return ret("number", "number");
-    } else if (ch == "0" && stream.eat(/o/i)) {
-      stream.eatWhile(/[0-7]/i);
-      return ret("number", "number");
-    } else if (ch == "0" && stream.eat(/b/i)) {
-      stream.eatWhile(/[01]/i);
-      return ret("number", "number");
-    } else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
-      return ret("number", "number");
-    } else if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      } else if (stream.eat("/")) {
-        stream.skipToEnd();
-        return ret("comment", "comment");
-      } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
-               state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
-        readRegexp(stream);
-        stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
-        return ret("regexp", "string-2");
-      } else {
-        stream.eatWhile(isOperatorChar);
-        return ret("operator", "operator", stream.current());
-      }
-    } else if (ch == "`") {
-      state.tokenize = tokenQuasi;
-      return tokenQuasi(stream, state);
-    } else if (ch == "#") {
-      stream.skipToEnd();
-      return ret("error", "error");
-    } else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return ret("operator", "operator", stream.current());
-    } else if (wordRE.test(ch)) {
-      stream.eatWhile(wordRE);
-      var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
-      return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
-                     ret("variable", "variable", word);
-    }
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next;
-      if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){
-        state.tokenize = tokenBase;
-        return ret("jsonld-keyword", "meta");
-      }
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) break;
-        escaped = !escaped && next == "\\";
-      }
-      if (!escaped) state.tokenize = tokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenQuasi(stream, state) {
-    var escaped = false, next;
-    while ((next = stream.next()) != null) {
-      if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      escaped = !escaped && next == "\\";
-    }
-    return ret("quasi", "string-2", stream.current());
-  }
-
-  var brackets = "([{}])";
-  // This is a crude lookahead trick to try and notice that we're
-  // parsing the argument patterns for a fat-arrow function before we
-  // actually hit the arrow token. It only works if the arrow is on
-  // the same line as the arguments and there's no strange noise
-  // (comments) in between. Fallback is to only notice when we hit the
-  // arrow, and not declare the arguments as locals for the arrow
-  // body.
-  function findFatArrow(stream, state) {
-    if (state.fatArrowAt) state.fatArrowAt = null;
-    var arrow = stream.string.indexOf("=>", stream.start);
-    if (arrow < 0) return;
-
-    var depth = 0, sawSomething = false;
-    for (var pos = arrow - 1; pos >= 0; --pos) {
-      var ch = stream.string.charAt(pos);
-      var bracket = brackets.indexOf(ch);
-      if (bracket >= 0 && bracket < 3) {
-        if (!depth) { ++pos; break; }
-        if (--depth == 0) break;
-      } else if (bracket >= 3 && bracket < 6) {
-        ++depth;
-      } else if (wordRE.test(ch)) {
-        sawSomething = true;
-      } else if (/["'\/]/.test(ch)) {
-        return;
-      } else if (sawSomething && !depth) {
-        ++pos;
-        break;
-      }
-    }
-    if (sawSomething && !depth) state.fatArrowAt = pos;
-  }
-
-  // Parser
-
-  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true};
-
-  function JSLexical(indented, column, type, align, prev, info) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.prev = prev;
-    this.info = info;
-    if (align != null) this.align = align;
-  }
-
-  function inScope(state, varname) {
-    for (var v = state.localVars; v; v = v.next)
-      if (v.name == varname) return true;
-    for (var cx = state.context; cx; cx = cx.prev) {
-      for (var v = cx.vars; v; v = v.next)
-        if (v.name == varname) return true;
-    }
-  }
-
-  function parseJS(state, style, type, content, stream) {
-    var cc = state.cc;
-    // Communicate our context to the combinators.
-    // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style;
-
-    if (!state.lexical.hasOwnProperty("align"))
-      state.lexical.align = true;
-
-    while(true) {
-      var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement;
-      if (combinator(type, content)) {
-        while(cc.length && cc[cc.length - 1].lex)
-          cc.pop()();
-        if (cx.marked) return cx.marked;
-        if (type == "variable" && inScope(state, content)) return "variable-2";
-        return style;
-      }
-    }
-  }
-
-  // Combinator utils
-
-  var cx = {state: null, column: null, marked: null, cc: null};
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-  function register(varname) {
-    function inList(list) {
-      for (var v = list; v; v = v.next)
-        if (v.name == varname) return true;
-      return false;
-    }
-    var state = cx.state;
-    if (state.context) {
-      cx.marked = "def";
-      if (inList(state.localVars)) return;
-      state.localVars = {name: varname, next: state.localVars};
-    } else {
-      if (inList(state.globalVars)) return;
-      if (parserConfig.globalVars)
-        state.globalVars = {name: varname, next: state.globalVars};
-    }
-  }
-
-  // Combinators
-
-  var defaultVars = {name: "this", next: {name: "arguments"}};
-  function pushcontext() {
-    cx.state.context = {prev: cx.state.context, vars: cx.state.localVars};
-    cx.state.localVars = defaultVars;
-  }
-  function popcontext() {
-    cx.state.localVars = cx.state.context.vars;
-    cx.state.context = cx.state.context.prev;
-  }
-  function pushlex(type, info) {
-    var result = function() {
-      var state = cx.state, indent = state.indented;
-      if (state.lexical.type == "stat") indent = state.lexical.indented;
-      else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev)
-        indent = outer.indented;
-      state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info);
-    };
-    result.lex = true;
-    return result;
-  }
-  function poplex() {
-    var state = cx.state;
-    if (state.lexical.prev) {
-      if (state.lexical.type == ")")
-        state.indented = state.lexical.indented;
-      state.lexical = state.lexical.prev;
-    }
-  }
-  poplex.lex = true;
-
-  function expect(wanted) {
-    function exp(type) {
-      if (type == wanted) return cont();
-      else if (wanted == ";") return pass();
-      else return cont(exp);
-    };
-    return exp;
-  }
-
-  function statement(type, value) {
-    if (type == "var") return cont(pushlex("vardef", value.length), vardef, expect(";"), poplex);
-    if (type == "keyword a") return cont(pushlex("form"), expression, statement, poplex);
-    if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
-    if (type == "{") return cont(pushlex("}"), block, poplex);
-    if (type == ";") return cont();
-    if (type == "if") {
-      if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex)
-        cx.state.cc.pop()();
-      return cont(pushlex("form"), expression, statement, poplex, maybeelse);
-    }
-    if (type == "function") return cont(functiondef);
-    if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
-    if (type == "variable") return cont(pushlex("stat"), maybelabel);
-    if (type == "switch") return cont(pushlex("form"), expression, pushlex("}", "switch"), expect("{"),
-                                      block, poplex, poplex);
-    if (type == "case") return cont(expression, expect(":"));
-    if (type == "default") return cont(expect(":"));
-    if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
-                                     statement, poplex, popcontext);
-    if (type == "class") return cont(pushlex("form"), className, poplex);
-    if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
-    if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
-    return pass(pushlex("stat"), expression, expect(";"), poplex);
-  }
-  function expression(type) {
-    return expressionInner(type, false);
-  }
-  function expressionNoComma(type) {
-    return expressionInner(type, true);
-  }
-  function expressionInner(type, noComma) {
-    if (cx.state.fatArrowAt == cx.stream.start) {
-      var body = noComma ? arrowBodyNoComma : arrowBody;
-      if (type == "(") return cont(pushcontext, pushlex(")"), commasep(pattern, ")"), poplex, expect("=>"), body, popcontext);
-      else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext);
-    }
-
-    var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
-    if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
-    if (type == "async") return cont(expression);
-    if (type == "function") return cont(functiondef, maybeop);
-    if (type == "keyword c") return cont(noComma ? maybeexpressionNoComma : maybeexpression);
-    if (type == "(") return cont(pushlex(")"), maybeexpression, comprehension, expect(")"), poplex, maybeop);
-    if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
-    if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
-    if (type == "{") return contCommasep(objprop, "}", null, maybeop);
-    if (type == "quasi") { return pass(quasi, maybeop); }
-    return cont();
-  }
-  function maybeexpression(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expression);
-  }
-  function maybeexpressionNoComma(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expressionNoComma);
-  }
-
-  function maybeoperatorComma(type, value) {
-    if (type == ",") return cont(expression);
-    return maybeoperatorNoComma(type, value, false);
-  }
-  function maybeoperatorNoComma(type, value, noComma) {
-    var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
-    var expr = noComma == false ? expression : expressionNoComma;
-    if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
-    if (type == "operator") {
-      if (/\+\+|--/.test(value)) return cont(me);
-      if (value == "?") return cont(expression, expect(":"), expr);
-      return cont(expr);
-    }
-    if (type == "quasi") { return pass(quasi, me); }
-    if (type == ";") return;
-    if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
-    if (type == ".") return cont(property, me);
-    if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
-  }
-  function quasi(type, value) {
-    if (type != "quasi") return pass();
-    if (value.slice(value.length - 2) != "${") return cont(quasi);
-    return cont(expression, continueQuasi);
-  }
-  function continueQuasi(type) {
-    if (type == "}") {
-      cx.marked = "string-2";
-      cx.state.tokenize = tokenQuasi;
-      return cont(quasi);
-    }
-  }
-  function arrowBody(type) {
-    findFatArrow(cx.stream, cx.state);
-    return pass(type == "{" ? statement : expression);
-  }
-  function arrowBodyNoComma(type) {
-    findFatArrow(cx.stream, cx.state);
-    return pass(type == "{" ? statement : expressionNoComma);
-  }
-  function maybelabel(type) {
-    if (type == ":") return cont(poplex, statement);
-    return pass(maybeoperatorComma, expect(";"), poplex);
-  }
-  function property(type) {
-    if (type == "variable") {cx.marked = "property"; return cont();}
-  }
-  function objprop(type, value) {
-    if (type == "async") {
-      return cont(objprop);
-    } else if (type == "variable" || cx.style == "keyword") {
-      cx.marked = "property";
-      if (value == "get" || value == "set") return cont(getterSetter);
-      return cont(afterprop);
-    } else if (type == "number" || type == "string") {
-      cx.marked = jsonldMode ? "property" : (cx.style + " property");
-      return cont(afterprop);
-    } else if (type == "jsonld-keyword") {
-      return cont(afterprop);
-    } else if (type == "[") {
-      return cont(expression, expect("]"), afterprop);
-    }
-  }
-  function getterSetter(type) {
-    if (type != "variable") return pass(afterprop);
-    cx.marked = "property";
-    return cont(functiondef);
-  }
-  function afterprop(type) {
-    if (type == ":") return cont(expressionNoComma);
-    if (type == "(") return pass(functiondef);
-  }
-  function commasep(what, end) {
-    function proceed(type) {
-      if (type == ",") {
-        var lex = cx.state.lexical;
-        if (lex.info == "call") lex.pos = (lex.pos || 0) + 1;
-        return cont(what, proceed);
-      }
-      if (type == end) return cont();
-      return cont(expect(end));
-    }
-    return function(type) {
-      if (type == end) return cont();
-      return pass(what, proceed);
-    };
-  }
-  function contCommasep(what, end, info) {
-    for (var i = 3; i < arguments.length; i++)
-      cx.cc.push(arguments[i]);
-    return cont(pushlex(end, info), commasep(what, end), poplex);
-  }
-  function block(type) {
-    if (type == "}") return cont();
-    return pass(statement, block);
-  }
-  function maybetype(type) {
-    if (isTS && type == ":") return cont(typedef);
-  }
-  function maybedefault(_, value) {
-    if (value == "=") return cont(expressionNoComma);
-  }
-  function typedef(type) {
-    if (type == "variable") {cx.marked = "variable-3"; return cont();}
-  }
-  function vardef() {
-    return pass(pattern, maybetype, maybeAssign, vardefCont);
-  }
-  function pattern(type, value) {
-    if (type == "variable") { register(value); return cont(); }
-    if (type == "[") return contCommasep(pattern, "]");
-    if (type == "{") return contCommasep(proppattern, "}");
-  }
-  function proppattern(type, value) {
-    if (type == "variable" && !cx.stream.match(/^\s*:/, false)) {
-      register(value);
-      return cont(maybeAssign);
-    }
-    if (type == "variable") cx.marked = "property";
-    return cont(expect(":"), pattern, maybeAssign);
-  }
-  function maybeAssign(_type, value) {
-    if (value == "=") return cont(expressionNoComma);
-  }
-  function vardefCont(type) {
-    if (type == ",") return cont(vardef);
-  }
-  function maybeelse(type, value) {
-    if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex);
-  }
-  function forspec(type) {
-    if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
-  }
-  function forspec1(type) {
-    if (type == "var") return cont(vardef, expect(";"), forspec2);
-    if (type == ";") return cont(forspec2);
-    if (type == "variable") return cont(formaybeinof);
-    return pass(expression, expect(";"), forspec2);
-  }
-  function formaybeinof(_type, value) {
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return cont(maybeoperatorComma, forspec2);
-  }
-  function forspec2(type, value) {
-    if (type == ";") return cont(forspec3);
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return pass(expression, expect(";"), forspec3);
-  }
-  function forspec3(type) {
-    if (type != ")") cont(expression);
-  }
-  function functiondef(type, value) {
-    if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
-    if (type == "variable") {register(value); return cont(functiondef);}
-    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, statement, popcontext);
-  }
-  function funarg(type) {
-    if (type == "spread") return cont(funarg);
-    return pass(pattern, maybetype, maybedefault);
-  }
-  function className(type, value) {
-    if (type == "variable") {register(value); return cont(classNameAfter);}
-  }
-  function classNameAfter(type, value) {
-    if (value == "extends") return cont(expression, classNameAfter);
-    if (type == "{") return cont(pushlex("}"), classBody, poplex);
-  }
-  function classBody(type, value) {
-    if (type == "variable" || cx.style == "keyword") {
-      if (value == "static") {
-        cx.marked = "keyword";
-        return cont(classBody);
-      }
-      cx.marked = "property";
-      if (value == "get" || value == "set") return cont(classGetterSetter, functiondef, classBody);
-      return cont(functiondef, classBody);
-    }
-    if (value == "*") {
-      cx.marked = "keyword";
-      return cont(classBody);
-    }
-    if (type == ";") return cont(classBody);
-    if (type == "}") return cont();
-  }
-  function classGetterSetter(type) {
-    if (type != "variable") return pass();
-    cx.marked = "property";
-    return cont();
-  }
-  function afterExport(_type, value) {
-    if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
-    if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }
-    return pass(statement);
-  }
-  function afterImport(type) {
-    if (type == "string") return cont();
-    return pass(importSpec, maybeFrom);
-  }
-  function importSpec(type, value) {
-    if (type == "{") return contCommasep(importSpec, "}");
-    if (type == "variable") register(value);
-    if (value == "*") cx.marked = "keyword";
-    return cont(maybeAs);
-  }
-  function maybeAs(_type, value) {
-    if (value == "as") { cx.marked = "keyword"; return cont(importSpec); }
-  }
-  function maybeFrom(_type, value) {
-    if (value == "from") { cx.marked = "keyword"; return cont(expression); }
-  }
-  function arrayLiteral(type) {
-    if (type == "]") return cont();
-    return pass(expressionNoComma, maybeArrayComprehension);
-  }
-  function maybeArrayComprehension(type) {
-    if (type == "for") return pass(comprehension, expect("]"));
-    if (type == ",") return cont(commasep(maybeexpressionNoComma, "]"));
-    return pass(commasep(expressionNoComma, "]"));
-  }
-  function comprehension(type) {
-    if (type == "for") return cont(forspec, comprehension);
-    if (type == "if") return cont(expression, comprehension);
-  }
-
-  function isContinuedStatement(state, textAfter) {
-    return state.lastType == "operator" || state.lastType == "," ||
-      isOperatorChar.test(textAfter.charAt(0)) ||
-      /[,.]/.test(textAfter.charAt(0));
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      var state = {
-        tokenize: tokenBase,
-        lastType: "sof",
-        cc: [],
-        lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
-        localVars: parserConfig.localVars,
-        context: parserConfig.localVars && {vars: parserConfig.localVars},
-        indented: 0
-      };
-      if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
-        state.globalVars = parserConfig.globalVars;
-      return state;
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (!state.lexical.hasOwnProperty("align"))
-          state.lexical.align = false;
-        state.indented = stream.indentation();
-        findFatArrow(stream, state);
-      }
-      if (state.tokenize != tokenComment && stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (type == "comment") return style;
-      state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type;
-      return parseJS(state, style, type, content, stream);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize == tokenComment) return CodeMirror.Pass;
-      if (state.tokenize != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical;
-      // Kludge to prevent 'maybelse' from blocking lexical scope pops
-      if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) {
-        var c = state.cc[i];
-        if (c == poplex) lexical = lexical.prev;
-        else if (c != maybeelse) break;
-      }
-      if (lexical.type == "stat" && firstChar == "}") lexical = lexical.prev;
-      if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
-        lexical = lexical.prev;
-      var type = lexical.type, closing = firstChar == type;
-
-      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info + 1 : 0);
-      else if (type == "form" && firstChar == "{") return lexical.indented;
-      else if (type == "form") return lexical.indented + indentUnit;
-      else if (type == "stat")
-        return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0);
-      else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false)
-        return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
-      else if (lexical.align) return lexical.column + (closing ? 0 : 1);
-      else return lexical.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
-    blockCommentStart: jsonMode ? null : "/*",
-    blockCommentEnd: jsonMode ? null : "*/",
-    lineComment: jsonMode ? null : "//",
-    fold: "brace",
-    closeBrackets: "()[]{}''\"\"``",
-
-    helperType: jsonMode ? "json" : "javascript",
-    jsonldMode: jsonldMode,
-    jsonMode: jsonMode
-  };
-});
-
-CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/);
-
-CodeMirror.defineMIME("text/javascript", "javascript");
-CodeMirror.defineMIME("text/ecmascript", "javascript");
-CodeMirror.defineMIME("application/javascript", "javascript");
-CodeMirror.defineMIME("application/x-javascript", "javascript");
-CodeMirror.defineMIME("application/ecmascript", "javascript");
-CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
-CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
-CodeMirror.defineMIME("application/ld+json", {name: "javascript", jsonld: true});
-CodeMirror.defineMIME("text/typescript", { name: "javascript", typescript: true });
-CodeMirror.defineMIME("application/typescript", { name: "javascript", typescript: true });
-
-});
diff --git a/www/code/codemirror-5.7/mode/javascript/json-ld.html b/www/code/codemirror-5.7/mode/javascript/json-ld.html
deleted file mode 100644
index 3a37f0bce..000000000
--- a/www/code/codemirror-5.7/mode/javascript/json-ld.html
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-CodeMirror: JSON-LD mode
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    JSON-LD mode
    
-
-
-
    
-
-    
-    
-    
    This is a specialization of the JavaScript mode.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/javascript/test.js b/www/code/codemirror-5.7/mode/javascript/test.js
deleted file mode 100644
index 452de5fd6..000000000
--- a/www/code/codemirror-5.7/mode/javascript/test.js
+++ /dev/null
@@ -1,198 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "javascript");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("locals",
-     "[keyword function] [variable foo]([def a], [def b]) { [keyword var] [def c] [operator =] [number 10]; [keyword return] [variable-2 a] [operator +] [variable-2 c] [operator +] [variable d]; }");
-
-  MT("comma-and-binop",
-     "[keyword function](){ [keyword var] [def x] [operator =] [number 1] [operator +] [number 2], [def y]; }");
-
-  MT("destructuring",
-     "([keyword function]([def a], [[[def b], [def c] ]]) {",
-     "  [keyword let] {[def d], [property foo]: [def c][operator =][number 10], [def x]} [operator =] [variable foo]([variable-2 a]);",
-     "  [[[variable-2 c], [variable y] ]] [operator =] [variable-2 c];",
-     "})();");
-
-  MT("class_body",
-     "[keyword class] [variable Foo] {",
-     "  [property constructor]() {}",
-     "  [property sayName]() {",
-     "    [keyword return] [string-2 `foo${][variable foo][string-2 }oo`];",
-     "  }",
-     "}");
-
-  MT("class",
-     "[keyword class] [variable Point] [keyword extends] [variable SuperThing] {",
-     "  [property get] [property prop]() { [keyword return] [number 24]; }",
-     "  [property constructor]([def x], [def y]) {",
-     "    [keyword super]([string 'something']);",
-     "    [keyword this].[property x] [operator =] [variable-2 x];",
-     "  }",
-     "}");
-
-  MT("import",
-     "[keyword function] [variable foo]() {",
-     "  [keyword import] [def $] [keyword from] [string 'jquery'];",
-     "  [keyword import] { [def encrypt], [def decrypt] } [keyword from] [string 'crypto'];",
-     "}");
-
-  MT("const",
-     "[keyword function] [variable f]() {",
-     "  [keyword const] [[ [def a], [def b] ]] [operator =] [[ [number 1], [number 2] ]];",
-     "}");
-
-  MT("for/of",
-     "[keyword for]([keyword let] [variable of] [keyword of] [variable something]) {}");
-
-  MT("generator",
-     "[keyword function*] [variable repeat]([def n]) {",
-     "  [keyword for]([keyword var] [def i] [operator =] [number 0]; [variable-2 i] [operator <] [variable-2 n]; [operator ++][variable-2 i])",
-     "    [keyword yield] [variable-2 i];",
-     "}");
-
-  MT("quotedStringAddition",
-     "[keyword let] [variable f] [operator =] [variable a] [operator +] [string 'fatarrow'] [operator +] [variable c];");
-
-  MT("quotedFatArrow",
-     "[keyword let] [variable f] [operator =] [variable a] [operator +] [string '=>'] [operator +] [variable c];");
-
-  MT("fatArrow",
-     "[variable array].[property filter]([def a] [operator =>] [variable-2 a] [operator +] [number 1]);",
-     "[variable a];", // No longer in scope
-     "[keyword let] [variable f] [operator =] ([[ [def a], [def b] ]], [def c]) [operator =>] [variable-2 a] [operator +] [variable-2 c];",
-     "[variable c];");
-
-  MT("spread",
-     "[keyword function] [variable f]([def a], [meta ...][def b]) {",
-     "  [variable something]([variable-2 a], [meta ...][variable-2 b]);",
-     "}");
-
-  MT("comprehension",
-     "[keyword function] [variable f]() {",
-     "  [[([variable x] [operator +] [number 1]) [keyword for] ([keyword var] [def x] [keyword in] [variable y]) [keyword if] [variable pred]([variable-2 x]) ]];",
-     "  ([variable u] [keyword for] ([keyword var] [def u] [keyword of] [variable generateValues]()) [keyword if] ([variable-2 u].[property color] [operator ===] [string 'blue']));",
-     "}");
-
-  MT("quasi",
-     "[variable re][string-2 `fofdlakj${][variable x] [operator +] ([variable re][string-2 `foo`]) [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");
-
-  MT("quasi_no_function",
-     "[variable x] [operator =] [string-2 `fofdlakj${][variable x] [operator +] [string-2 `foo`] [operator +] [number 1][string-2 }fdsa`] [operator +] [number 2]");
-
-  MT("indent_statement",
-     "[keyword var] [variable x] [operator =] [number 10]",
-     "[variable x] [operator +=] [variable y] [operator +]",
-     "  [atom Infinity]",
-     "[keyword debugger];");
-
-  MT("indent_if",
-     "[keyword if] ([number 1])",
-     "  [keyword break];",
-     "[keyword else] [keyword if] ([number 2])",
-     "  [keyword continue];",
-     "[keyword else]",
-     "  [number 10];",
-     "[keyword if] ([number 1]) {",
-     "  [keyword break];",
-     "} [keyword else] [keyword if] ([number 2]) {",
-     "  [keyword continue];",
-     "} [keyword else] {",
-     "  [number 10];",
-     "}");
-
-  MT("indent_for",
-     "[keyword for] ([keyword var] [variable i] [operator =] [number 0];",
-     "     [variable i] [operator <] [number 100];",
-     "     [variable i][operator ++])",
-     "  [variable doSomething]([variable i]);",
-     "[keyword debugger];");
-
-  MT("indent_c_style",
-     "[keyword function] [variable foo]()",
-     "{",
-     "  [keyword debugger];",
-     "}");
-
-  MT("indent_else",
-     "[keyword for] (;;)",
-     "  [keyword if] ([variable foo])",
-     "    [keyword if] ([variable bar])",
-     "      [number 1];",
-     "    [keyword else]",
-     "      [number 2];",
-     "  [keyword else]",
-     "    [number 3];");
-
-  MT("indent_funarg",
-     "[variable foo]([number 10000],",
-     "    [keyword function]([def a]) {",
-     "  [keyword debugger];",
-     "};");
-
-  MT("indent_below_if",
-     "[keyword for] (;;)",
-     "  [keyword if] ([variable foo])",
-     "    [number 1];",
-     "[number 2];");
-
-  MT("multilinestring",
-     "[keyword var] [variable x] [operator =] [string 'foo\\]",
-     "[string bar'];");
-
-  MT("scary_regexp",
-     "[string-2 /foo[[/]]bar/];");
-
-  MT("indent_strange_array",
-     "[keyword var] [variable x] [operator =] [[",
-     "  [number 1],,",
-     "  [number 2],",
-     "]];",
-     "[number 10];");
-
-  MT("param_default",
-     "[keyword function] [variable foo]([def x] [operator =] [string-2 `foo${][number 10][string-2 }bar`]) {",
-     "  [keyword return] [variable-2 x];",
-     "}");
-
-  var jsonld_mode = CodeMirror.getMode(
-    {indentUnit: 2},
-    {name: "javascript", jsonld: true}
-  );
-  function LD(name) {
-    test.mode(name, jsonld_mode, Array.prototype.slice.call(arguments, 1));
-  }
-
-  LD("json_ld_keywords",
-    '{',
-    '  [meta "@context"]: {',
-    '    [meta "@base"]: [string "http://example.com"],',
-    '    [meta "@vocab"]: [string "http://xmlns.com/foaf/0.1/"],',
-    '    [property "likesFlavor"]: {',
-    '      [meta "@container"]: [meta "@list"]',
-    '      [meta "@reverse"]: [string "@beFavoriteOf"]',
-    '    },',
-    '    [property "nick"]: { [meta "@container"]: [meta "@set"] },',
-    '    [property "nick"]: { [meta "@container"]: [meta "@index"] }',
-    '  },',
-    '  [meta "@graph"]: [[ {',
-    '    [meta "@id"]: [string "http://dbpedia.org/resource/John_Lennon"],',
-    '    [property "name"]: [string "John Lennon"],',
-    '    [property "modified"]: {',
-    '      [meta "@value"]: [string "2010-05-29T14:17:39+02:00"],',
-    '      [meta "@type"]: [string "http://www.w3.org/2001/XMLSchema#dateTime"]',
-    '    }',
-    '  } ]]',
-    '}');
-
-  LD("json_ld_fake",
-    '{',
-    '  [property "@fake"]: [string "@fake"],',
-    '  [property "@contextual"]: [string "@identifier"],',
-    '  [property "user@domain.com"]: [string "@graphical"],',
-    '  [property "@ID"]: [string "@@ID"]',
-    '}');
-})();
diff --git a/www/code/codemirror-5.7/mode/javascript/typescript.html b/www/code/codemirror-5.7/mode/javascript/typescript.html
deleted file mode 100644
index 2cfc5381f..000000000
--- a/www/code/codemirror-5.7/mode/javascript/typescript.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-CodeMirror: TypeScript mode
-
-
-
-
-
-
-
-
-
-
    
-
    TypeScript mode
    
-
-
-
    
-
-    
-
-    
    This is a specialization of the JavaScript mode.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/jinja2/index.html b/www/code/codemirror-5.7/mode/jinja2/index.html
deleted file mode 100644
index 5a70e9153..000000000
--- a/www/code/codemirror-5.7/mode/jinja2/index.html
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-CodeMirror: Jinja2 mode
-
-
-
-
-
-
-
-
-
-
    
-
    Jinja2 mode
    
-
    
-    
-  
    
diff --git a/www/code/codemirror-5.7/mode/jinja2/jinja2.js b/www/code/codemirror-5.7/mode/jinja2/jinja2.js
deleted file mode 100644
index ed195581c..000000000
--- a/www/code/codemirror-5.7/mode/jinja2/jinja2.js
+++ /dev/null
@@ -1,142 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("jinja2", function() {
-    var keywords = ["and", "as", "block", "endblock", "by", "cycle", "debug", "else", "elif",
-      "extends", "filter", "endfilter", "firstof", "for",
-      "endfor", "if", "endif", "ifchanged", "endifchanged",
-      "ifequal", "endifequal", "ifnotequal",
-      "endifnotequal", "in", "include", "load", "not", "now", "or",
-      "parsed", "regroup", "reversed", "spaceless",
-      "endspaceless", "ssi", "templatetag", "openblock",
-      "closeblock", "openvariable", "closevariable",
-      "openbrace", "closebrace", "opencomment",
-      "closecomment", "widthratio", "url", "with", "endwith",
-      "get_current_language", "trans", "endtrans", "noop", "blocktrans",
-      "endblocktrans", "get_available_languages",
-      "get_current_language_bidi", "plural"],
-    operator = /^[+\-*&%=<>!?|~^]/,
-    sign = /^[:\[\(\{]/,
-    atom = ["true", "false"],
-    number = /^(\d[+\-\*\/])?\d+(\.\d+)?/;
-
-    keywords = new RegExp("((" + keywords.join(")|(") + "))\\b");
-    atom = new RegExp("((" + atom.join(")|(") + "))\\b");
-
-    function tokenBase (stream, state) {
-      var ch = stream.peek();
-
-      //Comment
-      if (state.incomment) {
-        if(!stream.skipTo("#}")) {
-          stream.skipToEnd();
-        } else {
-          stream.eatWhile(/\#|}/);
-          state.incomment = false;
-        }
-        return "comment";
-      //Tag
-      } else if (state.intag) {
-        //After operator
-        if(state.operator) {
-          state.operator = false;
-          if(stream.match(atom)) {
-            return "atom";
-          }
-          if(stream.match(number)) {
-            return "number";
-          }
-        }
-        //After sign
-        if(state.sign) {
-          state.sign = false;
-          if(stream.match(atom)) {
-            return "atom";
-          }
-          if(stream.match(number)) {
-            return "number";
-          }
-        }
-
-        if(state.instring) {
-          if(ch == state.instring) {
-            state.instring = false;
-          }
-          stream.next();
-          return "string";
-        } else if(ch == "'" || ch == '"') {
-          state.instring = ch;
-          stream.next();
-          return "string";
-        } else if(stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}")) {
-          state.intag = false;
-          return "tag";
-        } else if(stream.match(operator)) {
-          state.operator = true;
-          return "operator";
-        } else if(stream.match(sign)) {
-          state.sign = true;
-        } else {
-          if(stream.eat(" ") || stream.sol()) {
-            if(stream.match(keywords)) {
-              return "keyword";
-            }
-            if(stream.match(atom)) {
-              return "atom";
-            }
-            if(stream.match(number)) {
-              return "number";
-            }
-            if(stream.sol()) {
-              stream.next();
-            }
-          } else {
-            stream.next();
-          }
-
-        }
-        return "variable";
-      } else if (stream.eat("{")) {
-        if (ch = stream.eat("#")) {
-          state.incomment = true;
-          if(!stream.skipTo("#}")) {
-            stream.skipToEnd();
-          } else {
-            stream.eatWhile(/\#|}/);
-            state.incomment = false;
-          }
-          return "comment";
-        //Open tag
-        } else if (ch = stream.eat(/\{|%/)) {
-          //Cache close tag
-          state.intag = ch;
-          if(ch == "{") {
-            state.intag = "}";
-          }
-          stream.eat("-");
-          return "tag";
-        }
-      }
-      stream.next();
-    };
-
-    return {
-      startState: function () {
-        return {tokenize: tokenBase};
-      },
-      token: function (stream, state) {
-        return state.tokenize(stream, state);
-      }
-    };
-  });
-});
diff --git a/www/code/codemirror-5.7/mode/julia/index.html b/www/code/codemirror-5.7/mode/julia/index.html
deleted file mode 100644
index e1492c210..000000000
--- a/www/code/codemirror-5.7/mode/julia/index.html
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-CodeMirror: Julia mode
-
-
-
-
-
-
-
-
-
-
    
-
    Julia mode
    
-
-    
    
-    
-
-    
    MIME types defined: text/x-julia.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/julia/julia.js b/www/code/codemirror-5.7/mode/julia/julia.js
deleted file mode 100644
index d0a74cef5..000000000
--- a/www/code/codemirror-5.7/mode/julia/julia.js
+++ /dev/null
@@ -1,299 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("julia", function(_conf, parserConf) {
-  var ERRORCLASS = 'error';
-
-  function wordRegexp(words) {
-    return new RegExp("^((" + words.join(")|(") + "))\\b");
-  }
-
-  var operators = parserConf.operators || /^\.?[|&^\\%*+\-<>!=\/]=?|\?|~|:|\$|\.[<>]|<<=?|>>>?=?|\.[<>=]=|->?|\/\/|\bin\b/;
-  var delimiters = parserConf.delimiters || /^[;,()[\]{}]/;
-  var identifiers = parserConf.identifiers|| /^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*!*/;
-  var blockOpeners = ["begin", "function", "type", "immutable", "let", "macro", "for", "while", "quote", "if", "else", "elseif", "try", "finally", "catch", "do"];
-  var blockClosers = ["end", "else", "elseif", "catch", "finally"];
-  var keywordList = ['if', 'else', 'elseif', 'while', 'for', 'begin', 'let', 'end', 'do', 'try', 'catch', 'finally', 'return', 'break', 'continue', 'global', 'local', 'const', 'export', 'import', 'importall', 'using', 'function', 'macro', 'module', 'baremodule', 'type', 'immutable', 'quote', 'typealias', 'abstract', 'bitstype', 'ccall'];
-  var builtinList = ['true', 'false', 'enumerate', 'open', 'close', 'nothing', 'NaN', 'Inf', 'print', 'println', 'Int', 'Int8', 'Uint8', 'Int16', 'Uint16', 'Int32', 'Uint32', 'Int64', 'Uint64', 'Int128', 'Uint128', 'Bool', 'Char', 'Float16', 'Float32', 'Float64', 'Array', 'Vector', 'Matrix', 'String', 'UTF8String', 'ASCIIString', 'error', 'warn', 'info', '@printf'];
-
-  //var stringPrefixes = new RegExp("^[br]?('|\")")
-  var stringPrefixes = /^(`|'|"{3}|([br]?"))/;
-  var keywords = wordRegexp(keywordList);
-  var builtins = wordRegexp(builtinList);
-  var openers = wordRegexp(blockOpeners);
-  var closers = wordRegexp(blockClosers);
-  var macro = /^@[_A-Za-z][_A-Za-z0-9]*/;
-  var symbol = /^:[_A-Za-z][_A-Za-z0-9]*/;
-
-  function in_array(state) {
-    var ch = cur_scope(state);
-    if(ch=="[" || ch=="{") {
-      return true;
-    }
-    else {
-      return false;
-    }
-  }
-
-  function cur_scope(state) {
-    if(state.scopes.length==0) {
-      return null;
-    }
-    return state.scopes[state.scopes.length - 1];
-  }
-
-  // tokenizers
-  function tokenBase(stream, state) {
-    // Handle scope changes
-    var leaving_expr = state.leaving_expr;
-    if(stream.sol()) {
-      leaving_expr = false;
-    }
-    state.leaving_expr = false;
-    if(leaving_expr) {
-      if(stream.match(/^'+/)) {
-        return 'operator';
-      }
-
-    }
-
-    if(stream.match(/^\.{2,3}/)) {
-      return 'operator';
-    }
-
-    if (stream.eatSpace()) {
-      return null;
-    }
-
-    var ch = stream.peek();
-    // Handle Comments
-    if (ch === '#') {
-        stream.skipToEnd();
-        return 'comment';
-    }
-    if(ch==='[') {
-      state.scopes.push("[");
-    }
-
-    if(ch==='{') {
-      state.scopes.push("{");
-    }
-
-    var scope=cur_scope(state);
-
-    if(scope==='[' && ch===']') {
-      state.scopes.pop();
-      state.leaving_expr=true;
-    }
-
-    if(scope==='{' && ch==='}') {
-      state.scopes.pop();
-      state.leaving_expr=true;
-    }
-
-    if(ch===')') {
-      state.leaving_expr = true;
-    }
-
-    var match;
-    if(!in_array(state) && (match=stream.match(openers, false))) {
-      state.scopes.push(match);
-    }
-
-    if(!in_array(state) && stream.match(closers, false)) {
-      state.scopes.pop();
-    }
-
-    if(in_array(state)) {
-      if(stream.match(/^end/)) {
-        return 'number';
-      }
-
-    }
-
-    if(stream.match(/^=>/)) {
-      return 'operator';
-    }
-
-
-    // Handle Number Literals
-    if (stream.match(/^[0-9\.]/, false)) {
-      var imMatcher = RegExp(/^im\b/);
-      var floatLiteral = false;
-      // Floats
-      if (stream.match(/^\d*\.(?!\.)\d+([ef][\+\-]?\d+)?/i)) { floatLiteral = true; }
-      if (stream.match(/^\d+\.(?!\.)\d*/)) { floatLiteral = true; }
-      if (stream.match(/^\.\d+/)) { floatLiteral = true; }
-      if (floatLiteral) {
-          // Float literals may be "imaginary"
-          stream.match(imMatcher);
-          state.leaving_expr = true;
-          return 'number';
-      }
-      // Integers
-      var intLiteral = false;
-      // Hex
-      if (stream.match(/^0x[0-9a-f]+/i)) { intLiteral = true; }
-      // Binary
-      if (stream.match(/^0b[01]+/i)) { intLiteral = true; }
-      // Octal
-      if (stream.match(/^0o[0-7]+/i)) { intLiteral = true; }
-      // Decimal
-      if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
-          intLiteral = true;
-      }
-      // Zero by itself with no other piece of number.
-      if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
-      if (intLiteral) {
-          // Integer literals may be "long"
-          stream.match(imMatcher);
-          state.leaving_expr = true;
-          return 'number';
-      }
-    }
-
-    if(stream.match(/^(::)|(<:)/)) {
-      return 'operator';
-    }
-
-    // Handle symbols
-    if(!leaving_expr && stream.match(symbol)) {
-      return 'string';
-    }
-
-    // Handle operators and Delimiters
-    if (stream.match(operators)) {
-      return 'operator';
-    }
-
-
-    // Handle Strings
-    if (stream.match(stringPrefixes)) {
-      state.tokenize = tokenStringFactory(stream.current());
-      return state.tokenize(stream, state);
-    }
-
-    if (stream.match(macro)) {
-      return 'meta';
-    }
-
-
-    if (stream.match(delimiters)) {
-      return null;
-    }
-
-    if (stream.match(keywords)) {
-      return 'keyword';
-    }
-
-    if (stream.match(builtins)) {
-      return 'builtin';
-    }
-
-
-    if (stream.match(identifiers)) {
-      state.leaving_expr=true;
-      return 'variable';
-    }
-    // Handle non-detected items
-    stream.next();
-    return ERRORCLASS;
-  }
-
-  function tokenStringFactory(delimiter) {
-    while ('rub'.indexOf(delimiter.charAt(0).toLowerCase()) >= 0) {
-      delimiter = delimiter.substr(1);
-    }
-    var singleline = delimiter.length == 1;
-    var OUTCLASS = 'string';
-
-    function tokenString(stream, state) {
-      while (!stream.eol()) {
-        stream.eatWhile(/[^'"\\]/);
-        if (stream.eat('\\')) {
-            stream.next();
-            if (singleline && stream.eol()) {
-              return OUTCLASS;
-            }
-        } else if (stream.match(delimiter)) {
-            state.tokenize = tokenBase;
-            return OUTCLASS;
-        } else {
-            stream.eat(/['"]/);
-        }
-      }
-      if (singleline) {
-        if (parserConf.singleLineStringErrors) {
-            return ERRORCLASS;
-        } else {
-            state.tokenize = tokenBase;
-        }
-      }
-      return OUTCLASS;
-    }
-    tokenString.isString = true;
-    return tokenString;
-  }
-
-  function tokenLexer(stream, state) {
-    var style = state.tokenize(stream, state);
-    var current = stream.current();
-
-    // Handle '.' connected identifiers
-    if (current === '.') {
-      style = stream.match(identifiers, false) ? null : ERRORCLASS;
-      if (style === null && state.lastStyle === 'meta') {
-          // Apply 'meta' style to '.' connected identifiers when
-          // appropriate.
-        style = 'meta';
-      }
-      return style;
-    }
-
-    return style;
-  }
-
-  var external = {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        scopes: [],
-        leaving_expr: false
-      };
-    },
-
-    token: function(stream, state) {
-      var style = tokenLexer(stream, state);
-      state.lastStyle = style;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var delta = 0;
-      if(textAfter=="end" || textAfter=="]" || textAfter=="}" || textAfter=="else" || textAfter=="elseif" || textAfter=="catch" || textAfter=="finally") {
-        delta = -1;
-      }
-      return (state.scopes.length + delta) * 4;
-    },
-
-    lineComment: "#",
-    fold: "indent",
-    electricChars: "edlsifyh]}"
-  };
-  return external;
-});
-
-
-CodeMirror.defineMIME("text/x-julia", "julia");
-
-});
diff --git a/www/code/codemirror-5.7/mode/kotlin/index.html b/www/code/codemirror-5.7/mode/kotlin/index.html
deleted file mode 100644
index 859e109fb..000000000
--- a/www/code/codemirror-5.7/mode/kotlin/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-CodeMirror: Kotlin mode
-
-
-
-
-
-
-
-
-
-
    
-
    Kotlin mode
    
-
-
-
    
-
-    
-    
    Mode for Kotlin (http://kotlin.jetbrains.org/)
    
-    
    Developed by Hadi Hariri (https://github.com/hhariri).
    
-    
    MIME type defined: text/x-kotlin.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/kotlin/kotlin.js b/www/code/codemirror-5.7/mode/kotlin/kotlin.js
deleted file mode 100644
index e9a6a94e6..000000000
--- a/www/code/codemirror-5.7/mode/kotlin/kotlin.js
+++ /dev/null
@@ -1,284 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("kotlin", function (config, parserConfig) {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  var multiLineStrings = parserConfig.multiLineStrings;
-
-  var keywords = words(
-          "package continue return object while break class data trait interface throw super" +
-          " when type this else This try val var fun for is in if do as true false null get set");
-  var softKeywords = words("import" +
-      " where by get set abstract enum open annotation override private public internal" +
-      " protected catch out vararg inline finally final ref");
-  var blockKeywords = words("catch class do else finally for if where try while enum");
-  var atoms = words("null true false this");
-
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'") {
-      return startString(ch, stream, state);
-    }
-    // Wildcard import w/o trailing semicolon (import smth.*)
-    if (ch == "." && stream.eat("*")) {
-      return "word";
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      if (stream.eat(/eE/)) {
-        stream.eat(/\+\-/);
-        stream.eatWhile(/\d/);
-      }
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize.push(tokenComment);
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      if (expectExpression(state.lastToken)) {
-        return startString(ch, stream, state);
-      }
-    }
-    // Commented
-    if (ch == "-" && stream.eat(">")) {
-      curPunc = "->";
-      return null;
-    }
-    if (/[\-+*&%=<>!?|\/~]/.test(ch)) {
-      stream.eatWhile(/[\-+*&%=<>|~]/);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-
-    var cur = stream.current();
-    if (atoms.propertyIsEnumerable(cur)) {
-      return "atom";
-    }
-    if (softKeywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "softKeyword";
-    }
-
-    if (keywords.propertyIsEnumerable(cur)) {
-      if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
-      return "keyword";
-    }
-    return "word";
-  }
-
-  tokenBase.isBase = true;
-
-  function startString(quote, stream, state) {
-    var tripleQuoted = false;
-    if (quote != "/" && stream.eat(quote)) {
-      if (stream.eat(quote)) tripleQuoted = true;
-      else return "string";
-    }
-    function t(stream, state) {
-      var escaped = false, next, end = !tripleQuoted;
-
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-          if (!tripleQuoted) {
-            break;
-          }
-          if (stream.match(quote + quote)) {
-            end = true;
-            break;
-          }
-        }
-
-        if (quote == '"' && next == "$" && !escaped && stream.eat("{")) {
-          state.tokenize.push(tokenBaseUntilBrace());
-          return "string";
-        }
-
-        if (next == "$" && !escaped && !stream.eat(" ")) {
-          state.tokenize.push(tokenBaseUntilSpace());
-          return "string";
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (multiLineStrings)
-        state.tokenize.push(t);
-      if (end) state.tokenize.pop();
-      return "string";
-    }
-
-    state.tokenize.push(t);
-    return t(stream, state);
-  }
-
-  function tokenBaseUntilBrace() {
-    var depth = 1;
-
-    function t(stream, state) {
-      if (stream.peek() == "}") {
-        depth--;
-        if (depth == 0) {
-          state.tokenize.pop();
-          return state.tokenize[state.tokenize.length - 1](stream, state);
-        }
-      } else if (stream.peek() == "{") {
-        depth++;
-      }
-      return tokenBase(stream, state);
-    }
-
-    t.isBase = true;
-    return t;
-  }
-
-  function tokenBaseUntilSpace() {
-    function t(stream, state) {
-      if (stream.eat(/[\w]/)) {
-        var isWord = stream.eatWhile(/[\w]/);
-        if (isWord) {
-          state.tokenize.pop();
-          return "word";
-        }
-      }
-      state.tokenize.pop();
-      return "string";
-    }
-
-    t.isBase = true;
-    return t;
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize.pop();
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function expectExpression(last) {
-    return !last || last == "operator" || last == "->" || /[\.\[\{\(,;:]/.test(last) ||
-        last == "newstatement" || last == "keyword" || last == "proplabel";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-
-  function pushContext(state, col, type) {
-    return state.context = new Context(state.indented, col, type, null, state.context);
-  }
-
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}")
-      state.indented = state.context.indented;
-    return state.context = state.context.prev;
-  }
-
-  // Interface
-
-  return {
-    startState: function (basecolumn) {
-      return {
-        tokenize: [tokenBase],
-        context: new Context((basecolumn || 0) - config.indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true,
-        lastToken: null
-      };
-    },
-
-    token: function (stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-        // Automatic semicolon insertion
-        if (ctx.type == "statement" && !expectExpression(state.lastToken)) {
-          popContext(state);
-          ctx = state.context;
-        }
-      }
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      var style = state.tokenize[state.tokenize.length - 1](stream, state);
-      if (style == "comment") return style;
-      if (ctx.align == null) ctx.align = true;
-      if ((curPunc == ";" || curPunc == ":") && ctx.type == "statement") popContext(state);
-      // Handle indentation for {x -> \n ... }
-      else if (curPunc == "->" && ctx.type == "statement" && ctx.prev.type == "}") {
-        popContext(state);
-        state.context.align = false;
-      }
-      else if (curPunc == "{") pushContext(state, stream.column(), "}");
-      else if (curPunc == "[") pushContext(state, stream.column(), "]");
-      else if (curPunc == "(") pushContext(state, stream.column(), ")");
-      else if (curPunc == "}") {
-        while (ctx.type == "statement") ctx = popContext(state);
-        if (ctx.type == "}") ctx = popContext(state);
-        while (ctx.type == "statement") ctx = popContext(state);
-      }
-      else if (curPunc == ctx.type) popContext(state);
-      else if (ctx.type == "}" || ctx.type == "top" || (ctx.type == "statement" && curPunc == "newstatement"))
-        pushContext(state, stream.column(), "statement");
-      state.startOfLine = false;
-      state.lastToken = curPunc || style;
-      return style;
-    },
-
-    indent: function (state, textAfter) {
-      if (!state.tokenize[state.tokenize.length - 1].isBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), ctx = state.context;
-      if (ctx.type == "statement" && !expectExpression(state.lastToken)) ctx = ctx.prev;
-      var closing = firstChar == ctx.type;
-      if (ctx.type == "statement") {
-        return ctx.indented + (firstChar == "{" ? 0 : config.indentUnit);
-      }
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indented + (closing ? 0 : config.indentUnit);
-    },
-
-    closeBrackets: {triples: "'\""},
-    electricChars: "{}",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//"
-  };
-});
-
-CodeMirror.defineMIME("text/x-kotlin", "kotlin");
-
-});
diff --git a/www/code/codemirror-5.7/mode/livescript/index.html b/www/code/codemirror-5.7/mode/livescript/index.html
deleted file mode 100644
index f41547987..000000000
--- a/www/code/codemirror-5.7/mode/livescript/index.html
+++ /dev/null
@@ -1,459 +0,0 @@
-
-
-CodeMirror: LiveScript mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    LiveScript mode
    
-
    
-    
-
-    
    MIME types defined: text/x-livescript.
    
-
-    
    The LiveScript mode was written by Kenneth Bentley.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/livescript/livescript.js b/www/code/codemirror-5.7/mode/livescript/livescript.js
deleted file mode 100644
index 4b26e0461..000000000
--- a/www/code/codemirror-5.7/mode/livescript/livescript.js
+++ /dev/null
@@ -1,280 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**
- * Link to the project's GitHub page:
- * https://github.com/duralog/CodeMirror
- */
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode('livescript', function(){
-    var tokenBase = function(stream, state) {
-      var next_rule = state.next || "start";
-      if (next_rule) {
-        state.next = state.next;
-        var nr = Rules[next_rule];
-        if (nr.splice) {
-          for (var i$ = 0; i$ < nr.length; ++i$) {
-            var r = nr[i$];
-            if (r.regex && stream.match(r.regex)) {
-              state.next = r.next || state.next;
-              return r.token;
-            }
-          }
-          stream.next();
-          return 'error';
-        }
-        if (stream.match(r = Rules[next_rule])) {
-          if (r.regex && stream.match(r.regex)) {
-            state.next = r.next;
-            return r.token;
-          } else {
-            stream.next();
-            return 'error';
-          }
-        }
-      }
-      stream.next();
-      return 'error';
-    };
-    var external = {
-      startState: function(){
-        return {
-          next: 'start',
-          lastToken: null
-        };
-      },
-      token: function(stream, state){
-        while (stream.pos == stream.start)
-          var style = tokenBase(stream, state);
-        state.lastToken = {
-          style: style,
-          indent: stream.indentation(),
-          content: stream.current()
-        };
-        return style.replace(/\./g, ' ');
-      },
-      indent: function(state){
-        var indentation = state.lastToken.indent;
-        if (state.lastToken.content.match(indenter)) {
-          indentation += 2;
-        }
-        return indentation;
-      }
-    };
-    return external;
-  });
-
-  var identifier = '(?![\\d\\s])[$\\w\\xAA-\\uFFDC](?:(?!\\s)[$\\w\\xAA-\\uFFDC]|-[A-Za-z])*';
-  var indenter = RegExp('(?:[({[=:]|[-~]>|\\b(?:e(?:lse|xport)|d(?:o|efault)|t(?:ry|hen)|finally|import(?:\\s*all)?|const|var|let|new|catch(?:\\s*' + identifier + ')?))\\s*$');
-  var keywordend = '(?![$\\w]|-[A-Za-z]|\\s*:(?![:=]))';
-  var stringfill = {
-    token: 'string',
-    regex: '.+'
-  };
-  var Rules = {
-    start: [
-      {
-        token: 'comment.doc',
-        regex: '/\\*',
-        next: 'comment'
-      }, {
-        token: 'comment',
-        regex: '#.*'
-      }, {
-        token: 'keyword',
-        regex: '(?:t(?:h(?:is|row|en)|ry|ypeof!?)|c(?:on(?:tinue|st)|a(?:se|tch)|lass)|i(?:n(?:stanceof)?|mp(?:ort(?:\\s+all)?|lements)|[fs])|d(?:e(?:fault|lete|bugger)|o)|f(?:or(?:\\s+own)?|inally|unction)|s(?:uper|witch)|e(?:lse|x(?:tends|port)|val)|a(?:nd|rguments)|n(?:ew|ot)|un(?:less|til)|w(?:hile|ith)|o[fr]|return|break|let|var|loop)' + keywordend
-      }, {
-        token: 'constant.language',
-        regex: '(?:true|false|yes|no|on|off|null|void|undefined)' + keywordend
-      }, {
-        token: 'invalid.illegal',
-        regex: '(?:p(?:ackage|r(?:ivate|otected)|ublic)|i(?:mplements|nterface)|enum|static|yield)' + keywordend
-      }, {
-        token: 'language.support.class',
-        regex: '(?:R(?:e(?:gExp|ferenceError)|angeError)|S(?:tring|yntaxError)|E(?:rror|valError)|Array|Boolean|Date|Function|Number|Object|TypeError|URIError)' + keywordend
-      }, {
-        token: 'language.support.function',
-        regex: '(?:is(?:NaN|Finite)|parse(?:Int|Float)|Math|JSON|(?:en|de)codeURI(?:Component)?)' + keywordend
-      }, {
-        token: 'variable.language',
-        regex: '(?:t(?:hat|il|o)|f(?:rom|allthrough)|it|by|e)' + keywordend
-      }, {
-        token: 'identifier',
-        regex: identifier + '\\s*:(?![:=])'
-      }, {
-        token: 'variable',
-        regex: identifier
-      }, {
-        token: 'keyword.operator',
-        regex: '(?:\\.{3}|\\s+\\?)'
-      }, {
-        token: 'keyword.variable',
-        regex: '(?:@+|::|\\.\\.)',
-        next: 'key'
-      }, {
-        token: 'keyword.operator',
-        regex: '\\.\\s*',
-        next: 'key'
-      }, {
-        token: 'string',
-        regex: '\\\\\\S[^\\s,;)}\\]]*'
-      }, {
-        token: 'string.doc',
-        regex: '\'\'\'',
-        next: 'qdoc'
-      }, {
-        token: 'string.doc',
-        regex: '"""',
-        next: 'qqdoc'
-      }, {
-        token: 'string',
-        regex: '\'',
-        next: 'qstring'
-      }, {
-        token: 'string',
-        regex: '"',
-        next: 'qqstring'
-      }, {
-        token: 'string',
-        regex: '`',
-        next: 'js'
-      }, {
-        token: 'string',
-        regex: '<\\[',
-        next: 'words'
-      }, {
-        token: 'string.regex',
-        regex: '//',
-        next: 'heregex'
-      }, {
-        token: 'string.regex',
-        regex: '\\/(?:[^[\\/\\n\\\\]*(?:(?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[\\/\\n\\\\]*)*)\\/[gimy$]{0,4}',
-        next: 'key'
-      }, {
-        token: 'constant.numeric',
-        regex: '(?:0x[\\da-fA-F][\\da-fA-F_]*|(?:[2-9]|[12]\\d|3[0-6])r[\\da-zA-Z][\\da-zA-Z_]*|(?:\\d[\\d_]*(?:\\.\\d[\\d_]*)?|\\.\\d[\\d_]*)(?:e[+-]?\\d[\\d_]*)?[\\w$]*)'
-      }, {
-        token: 'lparen',
-        regex: '[({[]'
-      }, {
-        token: 'rparen',
-        regex: '[)}\\]]',
-        next: 'key'
-      }, {
-        token: 'keyword.operator',
-        regex: '\\S+'
-      }, {
-        token: 'text',
-        regex: '\\s+'
-      }
-    ],
-    heregex: [
-      {
-        token: 'string.regex',
-        regex: '.*?//[gimy$?]{0,4}',
-        next: 'start'
-      }, {
-        token: 'string.regex',
-        regex: '\\s*#{'
-      }, {
-        token: 'comment.regex',
-        regex: '\\s+(?:#.*)?'
-      }, {
-        token: 'string.regex',
-        regex: '\\S+'
-      }
-    ],
-    key: [
-      {
-        token: 'keyword.operator',
-        regex: '[.?@!]+'
-      }, {
-        token: 'identifier',
-        regex: identifier,
-        next: 'start'
-      }, {
-        token: 'text',
-        regex: '',
-        next: 'start'
-      }
-    ],
-    comment: [
-      {
-        token: 'comment.doc',
-        regex: '.*?\\*/',
-        next: 'start'
-      }, {
-        token: 'comment.doc',
-        regex: '.+'
-      }
-    ],
-    qdoc: [
-      {
-        token: 'string',
-        regex: ".*?'''",
-        next: 'key'
-      }, stringfill
-    ],
-    qqdoc: [
-      {
-        token: 'string',
-        regex: '.*?"""',
-        next: 'key'
-      }, stringfill
-    ],
-    qstring: [
-      {
-        token: 'string',
-        regex: '[^\\\\\']*(?:\\\\.[^\\\\\']*)*\'',
-        next: 'key'
-      }, stringfill
-    ],
-    qqstring: [
-      {
-        token: 'string',
-        regex: '[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',
-        next: 'key'
-      }, stringfill
-    ],
-    js: [
-      {
-        token: 'string',
-        regex: '[^\\\\`]*(?:\\\\.[^\\\\`]*)*`',
-        next: 'key'
-      }, stringfill
-    ],
-    words: [
-      {
-        token: 'string',
-        regex: '.*?\\]>',
-        next: 'key'
-      }, stringfill
-    ]
-  };
-  for (var idx in Rules) {
-    var r = Rules[idx];
-    if (r.splice) {
-      for (var i = 0, len = r.length; i < len; ++i) {
-        var rr = r[i];
-        if (typeof rr.regex === 'string') {
-          Rules[idx][i].regex = new RegExp('^' + rr.regex);
-        }
-      }
-    } else if (typeof rr.regex === 'string') {
-      Rules[idx].regex = new RegExp('^' + r.regex);
-    }
-  }
-
-  CodeMirror.defineMIME('text/x-livescript', 'livescript');
-
-});
diff --git a/www/code/codemirror-5.7/mode/lua/index.html b/www/code/codemirror-5.7/mode/lua/index.html
deleted file mode 100644
index fc98b9446..000000000
--- a/www/code/codemirror-5.7/mode/lua/index.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-CodeMirror: Lua mode
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Lua mode
    
-
    
-    
-
-    
    Loosely based on Franciszek
-    Wawrzak's CodeMirror
-    1 mode. One configuration parameter is
-    supported, specials, to which you can provide an
-    array of strings to have those identifiers highlighted with
-    the lua-special style.
    
-    
    MIME types defined: text/x-lua.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/lua/lua.js b/www/code/codemirror-5.7/mode/lua/lua.js
deleted file mode 100644
index 0b19abd30..000000000
--- a/www/code/codemirror-5.7/mode/lua/lua.js
+++ /dev/null
@@ -1,159 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// LUA mode. Ported to CodeMirror 2 from Franciszek Wawrzak's
-// CodeMirror 1 mode.
-// highlights keywords, strings, comments (no leveling supported! ("[==[")), tokens, basic indenting
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("lua", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-
-  function prefixRE(words) {
-    return new RegExp("^(?:" + words.join("|") + ")", "i");
-  }
-  function wordRE(words) {
-    return new RegExp("^(?:" + words.join("|") + ")$", "i");
-  }
-  var specials = wordRE(parserConfig.specials || []);
-
-  // long list of standard functions from lua manual
-  var builtins = wordRE([
-    "_G","_VERSION","assert","collectgarbage","dofile","error","getfenv","getmetatable","ipairs","load",
-    "loadfile","loadstring","module","next","pairs","pcall","print","rawequal","rawget","rawset","require",
-    "select","setfenv","setmetatable","tonumber","tostring","type","unpack","xpcall",
-
-    "coroutine.create","coroutine.resume","coroutine.running","coroutine.status","coroutine.wrap","coroutine.yield",
-
-    "debug.debug","debug.getfenv","debug.gethook","debug.getinfo","debug.getlocal","debug.getmetatable",
-    "debug.getregistry","debug.getupvalue","debug.setfenv","debug.sethook","debug.setlocal","debug.setmetatable",
-    "debug.setupvalue","debug.traceback",
-
-    "close","flush","lines","read","seek","setvbuf","write",
-
-    "io.close","io.flush","io.input","io.lines","io.open","io.output","io.popen","io.read","io.stderr","io.stdin",
-    "io.stdout","io.tmpfile","io.type","io.write",
-
-    "math.abs","math.acos","math.asin","math.atan","math.atan2","math.ceil","math.cos","math.cosh","math.deg",
-    "math.exp","math.floor","math.fmod","math.frexp","math.huge","math.ldexp","math.log","math.log10","math.max",
-    "math.min","math.modf","math.pi","math.pow","math.rad","math.random","math.randomseed","math.sin","math.sinh",
-    "math.sqrt","math.tan","math.tanh",
-
-    "os.clock","os.date","os.difftime","os.execute","os.exit","os.getenv","os.remove","os.rename","os.setlocale",
-    "os.time","os.tmpname",
-
-    "package.cpath","package.loaded","package.loaders","package.loadlib","package.path","package.preload",
-    "package.seeall",
-
-    "string.byte","string.char","string.dump","string.find","string.format","string.gmatch","string.gsub",
-    "string.len","string.lower","string.match","string.rep","string.reverse","string.sub","string.upper",
-
-    "table.concat","table.insert","table.maxn","table.remove","table.sort"
-  ]);
-  var keywords = wordRE(["and","break","elseif","false","nil","not","or","return",
-                         "true","function", "end", "if", "then", "else", "do",
-                         "while", "repeat", "until", "for", "in", "local" ]);
-
-  var indentTokens = wordRE(["function", "if","repeat","do", "\\(", "{"]);
-  var dedentTokens = wordRE(["end", "until", "\\)", "}"]);
-  var dedentPartial = prefixRE(["end", "until", "\\)", "}", "else", "elseif"]);
-
-  function readBracket(stream) {
-    var level = 0;
-    while (stream.eat("=")) ++level;
-    stream.eat("[");
-    return level;
-  }
-
-  function normal(stream, state) {
-    var ch = stream.next();
-    if (ch == "-" && stream.eat("-")) {
-      if (stream.eat("[") && stream.eat("["))
-        return (state.cur = bracketed(readBracket(stream), "comment"))(stream, state);
-      stream.skipToEnd();
-      return "comment";
-    }
-    if (ch == "\"" || ch == "'")
-      return (state.cur = string(ch))(stream, state);
-    if (ch == "[" && /[\[=]/.test(stream.peek()))
-      return (state.cur = bracketed(readBracket(stream), "string"))(stream, state);
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w.%]/);
-      return "number";
-    }
-    if (/[\w_]/.test(ch)) {
-      stream.eatWhile(/[\w\\\-_.]/);
-      return "variable";
-    }
-    return null;
-  }
-
-  function bracketed(level, style) {
-    return function(stream, state) {
-      var curlev = null, ch;
-      while ((ch = stream.next()) != null) {
-        if (curlev == null) {if (ch == "]") curlev = 0;}
-        else if (ch == "=") ++curlev;
-        else if (ch == "]" && curlev == level) { state.cur = normal; break; }
-        else curlev = null;
-      }
-      return style;
-    };
-  }
-
-  function string(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) break;
-        escaped = !escaped && ch == "\\";
-      }
-      if (!escaped) state.cur = normal;
-      return "string";
-    };
-  }
-
-  return {
-    startState: function(basecol) {
-      return {basecol: basecol || 0, indentDepth: 0, cur: normal};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = state.cur(stream, state);
-      var word = stream.current();
-      if (style == "variable") {
-        if (keywords.test(word)) style = "keyword";
-        else if (builtins.test(word)) style = "builtin";
-        else if (specials.test(word)) style = "variable-2";
-      }
-      if ((style != "comment") && (style != "string")){
-        if (indentTokens.test(word)) ++state.indentDepth;
-        else if (dedentTokens.test(word)) --state.indentDepth;
-      }
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var closing = dedentPartial.test(textAfter);
-      return state.basecol + indentUnit * (state.indentDepth - (closing ? 1 : 0));
-    },
-
-    lineComment: "--",
-    blockCommentStart: "--[[",
-    blockCommentEnd: "]]"
-  };
-});
-
-CodeMirror.defineMIME("text/x-lua", "lua");
-
-});
diff --git a/www/code/codemirror-5.7/mode/markdown/index.html b/www/code/codemirror-5.7/mode/markdown/index.html
deleted file mode 100644
index 15660c261..000000000
--- a/www/code/codemirror-5.7/mode/markdown/index.html
+++ /dev/null
@@ -1,361 +0,0 @@
-
-
-CodeMirror: Markdown mode
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Markdown mode
    
-
    
-
-    
-
-    
    You might want to use the Github-Flavored Markdown mode instead, which adds support for fenced code blocks and a few other things.
    
-
-    
    Optionally depends on the XML mode for properly highlighted inline XML blocks.
    
-    
-    
    MIME types defined: text/x-markdown.
    
-
-    
    Parsing/Highlighting Tests: normal,  verbose.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/markdown/markdown.js b/www/code/codemirror-5.7/mode/markdown/markdown.js
deleted file mode 100644
index 9d4036818..000000000
--- a/www/code/codemirror-5.7/mode/markdown/markdown.js
+++ /dev/null
@@ -1,792 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../meta"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../xml/xml", "../meta"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
-
-  var htmlFound = CodeMirror.modes.hasOwnProperty("xml");
-  var htmlMode = CodeMirror.getMode(cmCfg, htmlFound ? {name: "xml", htmlMode: true} : "text/plain");
-
-  function getMode(name) {
-    if (CodeMirror.findModeByName) {
-      var found = CodeMirror.findModeByName(name);
-      if (found) name = found.mime || found.mimes[0];
-    }
-    var mode = CodeMirror.getMode(cmCfg, name);
-    return mode.name == "null" ? null : mode;
-  }
-
-  // Should characters that affect highlighting be highlighted separate?
-  // Does not include characters that will be output (such as `1.` and `-` for lists)
-  if (modeCfg.highlightFormatting === undefined)
-    modeCfg.highlightFormatting = false;
-
-  // Maximum number of nested blockquotes. Set to 0 for infinite nesting.
-  // Excess `>` will emit `error` token.
-  if (modeCfg.maxBlockquoteDepth === undefined)
-    modeCfg.maxBlockquoteDepth = 0;
-
-  // Should underscores in words open/close em/strong?
-  if (modeCfg.underscoresBreakWords === undefined)
-    modeCfg.underscoresBreakWords = true;
-
-  // Use `fencedCodeBlocks` to configure fenced code blocks. false to
-  // disable, string to specify a precise regexp that the fence should
-  // match, and true to allow three or more backticks or tildes (as
-  // per CommonMark).
-
-  // Turn on task lists? ("- [ ] " and "- [x] ")
-  if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
-
-  // Turn on strikethrough syntax
-  if (modeCfg.strikethrough === undefined)
-    modeCfg.strikethrough = false;
-
-  var codeDepth = 0;
-
-  var header   = 'header'
-  ,   code     = 'comment'
-  ,   quote    = 'quote'
-  ,   list1    = 'variable-2'
-  ,   list2    = 'variable-3'
-  ,   list3    = 'keyword'
-  ,   hr       = 'hr'
-  ,   image    = 'tag'
-  ,   formatting = 'formatting'
-  ,   linkinline = 'link'
-  ,   linkemail = 'link'
-  ,   linktext = 'link'
-  ,   linkhref = 'string'
-  ,   em       = 'em'
-  ,   strong   = 'strong'
-  ,   strikethrough = 'strikethrough';
-
-  var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/
-  ,   ulRE = /^[*\-+]\s+/
-  ,   olRE = /^[0-9]+([.)])\s+/
-  ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
-  ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
-  ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
-  ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/
-  ,   fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
-                                ")[ \\t]*([\\w+#]*)");
-
-  function switchInline(stream, state, f) {
-    state.f = state.inline = f;
-    return f(stream, state);
-  }
-
-  function switchBlock(stream, state, f) {
-    state.f = state.block = f;
-    return f(stream, state);
-  }
-
-  function lineIsEmpty(line) {
-    return !line || !/\S/.test(line.string)
-  }
-
-  // Blocks
-
-  function blankLine(state) {
-    // Reset linkTitle state
-    state.linkTitle = false;
-    // Reset EM state
-    state.em = false;
-    // Reset STRONG state
-    state.strong = false;
-    // Reset strikethrough state
-    state.strikethrough = false;
-    // Reset state.quote
-    state.quote = 0;
-    // Reset state.indentedCode
-    state.indentedCode = false;
-    if (!htmlFound && state.f == htmlBlock) {
-      state.f = inlineNormal;
-      state.block = blockNormal;
-    }
-    // Reset state.trailingSpace
-    state.trailingSpace = 0;
-    state.trailingSpaceNewLine = false;
-    // Mark this line as blank
-    state.prevLine = state.thisLine
-    state.thisLine = null
-    return null;
-  }
-
-  function blockNormal(stream, state) {
-
-    var sol = stream.sol();
-
-    var prevLineIsList = state.list !== false,
-        prevLineIsIndentedCode = state.indentedCode;
-
-    state.indentedCode = false;
-
-    if (prevLineIsList) {
-      if (state.indentationDiff >= 0) { // Continued list
-        if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block
-          state.indentation -= state.indentationDiff;
-        }
-        state.list = null;
-      } else if (state.indentation > 0) {
-        state.list = null;
-        state.listDepth = Math.floor(state.indentation / 4);
-      } else { // No longer a list
-        state.list = false;
-        state.listDepth = 0;
-      }
-    }
-
-    var match = null;
-    if (state.indentationDiff >= 4) {
-      stream.skipToEnd();
-      if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) {
-        state.indentation -= 4;
-        state.indentedCode = true;
-        return code;
-      } else {
-        return null;
-      }
-    } else if (stream.eatSpace()) {
-      return null;
-    } else if ((match = stream.match(atxHeaderRE)) && match[1].length <= 6) {
-      state.header = match[1].length;
-      if (modeCfg.highlightFormatting) state.formatting = "header";
-      state.f = state.inline;
-      return getType(state);
-    } else if (!lineIsEmpty(state.prevLine) && !state.quote && !prevLineIsList &&
-               !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) {
-      state.header = match[0].charAt(0) == '=' ? 1 : 2;
-      if (modeCfg.highlightFormatting) state.formatting = "header";
-      state.f = state.inline;
-      return getType(state);
-    } else if (stream.eat('>')) {
-      state.quote = sol ? 1 : state.quote + 1;
-      if (modeCfg.highlightFormatting) state.formatting = "quote";
-      stream.eatSpace();
-      return getType(state);
-    } else if (stream.peek() === '[') {
-      return switchInline(stream, state, footnoteLink);
-    } else if (stream.match(hrRE, true)) {
-      state.hr = true;
-      return hr;
-    } else if ((lineIsEmpty(state.prevLine) || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
-      var listType = null;
-      if (stream.match(ulRE, true)) {
-        listType = 'ul';
-      } else {
-        stream.match(olRE, true);
-        listType = 'ol';
-      }
-      state.indentation = stream.column() + stream.current().length;
-      state.list = true;
-      state.listDepth++;
-      if (modeCfg.taskLists && stream.match(taskListRE, false)) {
-        state.taskList = true;
-      }
-      state.f = state.inline;
-      if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
-      return getType(state);
-    } else if (modeCfg.fencedCodeBlocks && (match = stream.match(fencedCodeRE, true))) {
-      state.fencedChars = match[1]
-      // try switching mode
-      state.localMode = getMode(match[2]);
-      if (state.localMode) state.localState = state.localMode.startState();
-      state.f = state.block = local;
-      if (modeCfg.highlightFormatting) state.formatting = "code-block";
-      state.code = true;
-      return getType(state);
-    }
-
-    return switchInline(stream, state, state.inline);
-  }
-
-  function htmlBlock(stream, state) {
-    var style = htmlMode.token(stream, state.htmlState);
-    if ((htmlFound && state.htmlState.tagStart === null &&
-         (!state.htmlState.context && state.htmlState.tokenize.isInText)) ||
-        (state.md_inside && stream.current().indexOf(">") > -1)) {
-      state.f = inlineNormal;
-      state.block = blockNormal;
-      state.htmlState = null;
-    }
-    return style;
-  }
-
-  function local(stream, state) {
-    if (stream.sol() && state.fencedChars && stream.match(state.fencedChars, false)) {
-      state.localMode = state.localState = null;
-      state.f = state.block = leavingLocal;
-      return null;
-    } else if (state.localMode) {
-      return state.localMode.token(stream, state.localState);
-    } else {
-      stream.skipToEnd();
-      return code;
-    }
-  }
-
-  function leavingLocal(stream, state) {
-    stream.match(state.fencedChars);
-    state.block = blockNormal;
-    state.f = inlineNormal;
-    state.fencedChars = null;
-    if (modeCfg.highlightFormatting) state.formatting = "code-block";
-    state.code = true;
-    var returnType = getType(state);
-    state.code = false;
-    return returnType;
-  }
-
-  // Inline
-  function getType(state) {
-    var styles = [];
-
-    if (state.formatting) {
-      styles.push(formatting);
-
-      if (typeof state.formatting === "string") state.formatting = [state.formatting];
-
-      for (var i = 0; i < state.formatting.length; i++) {
-        styles.push(formatting + "-" + state.formatting[i]);
-
-        if (state.formatting[i] === "header") {
-          styles.push(formatting + "-" + state.formatting[i] + "-" + state.header);
-        }
-
-        // Add `formatting-quote` and `formatting-quote-#` for blockquotes
-        // Add `error` instead if the maximum blockquote nesting depth is passed
-        if (state.formatting[i] === "quote") {
-          if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
-            styles.push(formatting + "-" + state.formatting[i] + "-" + state.quote);
-          } else {
-            styles.push("error");
-          }
-        }
-      }
-    }
-
-    if (state.taskOpen) {
-      styles.push("meta");
-      return styles.length ? styles.join(' ') : null;
-    }
-    if (state.taskClosed) {
-      styles.push("property");
-      return styles.length ? styles.join(' ') : null;
-    }
-
-    if (state.linkHref) {
-      styles.push(linkhref, "url");
-    } else { // Only apply inline styles to non-url text
-      if (state.strong) { styles.push(strong); }
-      if (state.em) { styles.push(em); }
-      if (state.strikethrough) { styles.push(strikethrough); }
-
-      if (state.linkText) { styles.push(linktext); }
-
-      if (state.code) { styles.push(code); }
-    }
-
-    if (state.header) { styles.push(header); styles.push(header + "-" + state.header); }
-
-    if (state.quote) {
-      styles.push(quote);
-
-      // Add `quote-#` where the maximum for `#` is modeCfg.maxBlockquoteDepth
-      if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
-        styles.push(quote + "-" + state.quote);
-      } else {
-        styles.push(quote + "-" + modeCfg.maxBlockquoteDepth);
-      }
-    }
-
-    if (state.list !== false) {
-      var listMod = (state.listDepth - 1) % 3;
-      if (!listMod) {
-        styles.push(list1);
-      } else if (listMod === 1) {
-        styles.push(list2);
-      } else {
-        styles.push(list3);
-      }
-    }
-
-    if (state.trailingSpaceNewLine) {
-      styles.push("trailing-space-new-line");
-    } else if (state.trailingSpace) {
-      styles.push("trailing-space-" + (state.trailingSpace % 2 ? "a" : "b"));
-    }
-
-    return styles.length ? styles.join(' ') : null;
-  }
-
-  function handleText(stream, state) {
-    if (stream.match(textRE, true)) {
-      return getType(state);
-    }
-    return undefined;
-  }
-
-  function inlineNormal(stream, state) {
-    var style = state.text(stream, state);
-    if (typeof style !== 'undefined')
-      return style;
-
-    if (state.list) { // List marker (*, +, -, 1., etc)
-      state.list = null;
-      return getType(state);
-    }
-
-    if (state.taskList) {
-      var taskOpen = stream.match(taskListRE, true)[1] !== "x";
-      if (taskOpen) state.taskOpen = true;
-      else state.taskClosed = true;
-      if (modeCfg.highlightFormatting) state.formatting = "task";
-      state.taskList = false;
-      return getType(state);
-    }
-
-    state.taskOpen = false;
-    state.taskClosed = false;
-
-    if (state.header && stream.match(/^#+$/, true)) {
-      if (modeCfg.highlightFormatting) state.formatting = "header";
-      return getType(state);
-    }
-
-    // Get sol() value now, before character is consumed
-    var sol = stream.sol();
-
-    var ch = stream.next();
-
-    if (ch === '\\') {
-      stream.next();
-      if (modeCfg.highlightFormatting) {
-        var type = getType(state);
-        return type ? type + " formatting-escape" : "formatting-escape";
-      }
-    }
-
-    // Matches link titles present on next line
-    if (state.linkTitle) {
-      state.linkTitle = false;
-      var matchCh = ch;
-      if (ch === '(') {
-        matchCh = ')';
-      }
-      matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
-      var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh;
-      if (stream.match(new RegExp(regex), true)) {
-        return linkhref;
-      }
-    }
-
-    // If this block is changed, it may need to be updated in GFM mode
-    if (ch === '`') {
-      var previousFormatting = state.formatting;
-      if (modeCfg.highlightFormatting) state.formatting = "code";
-      var t = getType(state);
-      var before = stream.pos;
-      stream.eatWhile('`');
-      var difference = 1 + stream.pos - before;
-      if (!state.code) {
-        codeDepth = difference;
-        state.code = true;
-        return getType(state);
-      } else {
-        if (difference === codeDepth) { // Must be exact
-          state.code = false;
-          return t;
-        }
-        state.formatting = previousFormatting;
-        return getType(state);
-      }
-    } else if (state.code) {
-      return getType(state);
-    }
-
-    if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
-      stream.match(/\[[^\]]*\]/);
-      state.inline = state.f = linkHref;
-      return image;
-    }
-
-    if (ch === '[' && stream.match(/.*\](\(.*\)| ?\[.*\])/, false)) {
-      state.linkText = true;
-      if (modeCfg.highlightFormatting) state.formatting = "link";
-      return getType(state);
-    }
-
-    if (ch === ']' && state.linkText && stream.match(/\(.*\)| ?\[.*\]/, false)) {
-      if (modeCfg.highlightFormatting) state.formatting = "link";
-      var type = getType(state);
-      state.linkText = false;
-      state.inline = state.f = linkHref;
-      return type;
-    }
-
-    if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, false)) {
-      state.f = state.inline = linkInline;
-      if (modeCfg.highlightFormatting) state.formatting = "link";
-      var type = getType(state);
-      if (type){
-        type += " ";
-      } else {
-        type = "";
-      }
-      return type + linkinline;
-    }
-
-    if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) {
-      state.f = state.inline = linkInline;
-      if (modeCfg.highlightFormatting) state.formatting = "link";
-      var type = getType(state);
-      if (type){
-        type += " ";
-      } else {
-        type = "";
-      }
-      return type + linkemail;
-    }
-
-    if (ch === '<' && stream.match(/^(!--|\w)/, false)) {
-      var end = stream.string.indexOf(">", stream.pos);
-      if (end != -1) {
-        var atts = stream.string.substring(stream.start, end);
-        if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) state.md_inside = true;
-      }
-      stream.backUp(1);
-      state.htmlState = CodeMirror.startState(htmlMode);
-      return switchBlock(stream, state, htmlBlock);
-    }
-
-    if (ch === '<' && stream.match(/^\/\w*?>/)) {
-      state.md_inside = false;
-      return "tag";
-    }
-
-    var ignoreUnderscore = false;
-    if (!modeCfg.underscoresBreakWords) {
-      if (ch === '_' && stream.peek() !== '_' && stream.match(/(\w)/, false)) {
-        var prevPos = stream.pos - 2;
-        if (prevPos >= 0) {
-          var prevCh = stream.string.charAt(prevPos);
-          if (prevCh !== '_' && prevCh.match(/(\w)/, false)) {
-            ignoreUnderscore = true;
-          }
-        }
-      }
-    }
-    if (ch === '*' || (ch === '_' && !ignoreUnderscore)) {
-      if (sol && stream.peek() === ' ') {
-        // Do nothing, surrounded by newline and space
-      } else if (state.strong === ch && stream.eat(ch)) { // Remove STRONG
-        if (modeCfg.highlightFormatting) state.formatting = "strong";
-        var t = getType(state);
-        state.strong = false;
-        return t;
-      } else if (!state.strong && stream.eat(ch)) { // Add STRONG
-        state.strong = ch;
-        if (modeCfg.highlightFormatting) state.formatting = "strong";
-        return getType(state);
-      } else if (state.em === ch) { // Remove EM
-        if (modeCfg.highlightFormatting) state.formatting = "em";
-        var t = getType(state);
-        state.em = false;
-        return t;
-      } else if (!state.em) { // Add EM
-        state.em = ch;
-        if (modeCfg.highlightFormatting) state.formatting = "em";
-        return getType(state);
-      }
-    } else if (ch === ' ') {
-      if (stream.eat('*') || stream.eat('_')) { // Probably surrounded by spaces
-        if (stream.peek() === ' ') { // Surrounded by spaces, ignore
-          return getType(state);
-        } else { // Not surrounded by spaces, back up pointer
-          stream.backUp(1);
-        }
-      }
-    }
-
-    if (modeCfg.strikethrough) {
-      if (ch === '~' && stream.eatWhile(ch)) {
-        if (state.strikethrough) {// Remove strikethrough
-          if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
-          var t = getType(state);
-          state.strikethrough = false;
-          return t;
-        } else if (stream.match(/^[^\s]/, false)) {// Add strikethrough
-          state.strikethrough = true;
-          if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
-          return getType(state);
-        }
-      } else if (ch === ' ') {
-        if (stream.match(/^~~/, true)) { // Probably surrounded by space
-          if (stream.peek() === ' ') { // Surrounded by spaces, ignore
-            return getType(state);
-          } else { // Not surrounded by spaces, back up pointer
-            stream.backUp(2);
-          }
-        }
-      }
-    }
-
-    if (ch === ' ') {
-      if (stream.match(/ +$/, false)) {
-        state.trailingSpace++;
-      } else if (state.trailingSpace) {
-        state.trailingSpaceNewLine = true;
-      }
-    }
-
-    return getType(state);
-  }
-
-  function linkInline(stream, state) {
-    var ch = stream.next();
-
-    if (ch === ">") {
-      state.f = state.inline = inlineNormal;
-      if (modeCfg.highlightFormatting) state.formatting = "link";
-      var type = getType(state);
-      if (type){
-        type += " ";
-      } else {
-        type = "";
-      }
-      return type + linkinline;
-    }
-
-    stream.match(/^[^>]+/, true);
-
-    return linkinline;
-  }
-
-  function linkHref(stream, state) {
-    // Check if space, and return NULL if so (to avoid marking the space)
-    if(stream.eatSpace()){
-      return null;
-    }
-    var ch = stream.next();
-    if (ch === '(' || ch === '[') {
-      state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]");
-      if (modeCfg.highlightFormatting) state.formatting = "link-string";
-      state.linkHref = true;
-      return getType(state);
-    }
-    return 'error';
-  }
-
-  function getLinkHrefInside(endChar) {
-    return function(stream, state) {
-      var ch = stream.next();
-
-      if (ch === endChar) {
-        state.f = state.inline = inlineNormal;
-        if (modeCfg.highlightFormatting) state.formatting = "link-string";
-        var returnState = getType(state);
-        state.linkHref = false;
-        return returnState;
-      }
-
-      if (stream.match(inlineRE(endChar), true)) {
-        stream.backUp(1);
-      }
-
-      state.linkHref = true;
-      return getType(state);
-    };
-  }
-
-  function footnoteLink(stream, state) {
-    if (stream.match(/^[^\]]*\]:/, false)) {
-      state.f = footnoteLinkInside;
-      stream.next(); // Consume [
-      if (modeCfg.highlightFormatting) state.formatting = "link";
-      state.linkText = true;
-      return getType(state);
-    }
-    return switchInline(stream, state, inlineNormal);
-  }
-
-  function footnoteLinkInside(stream, state) {
-    if (stream.match(/^\]:/, true)) {
-      state.f = state.inline = footnoteUrl;
-      if (modeCfg.highlightFormatting) state.formatting = "link";
-      var returnType = getType(state);
-      state.linkText = false;
-      return returnType;
-    }
-
-    stream.match(/^[^\]]+/, true);
-
-    return linktext;
-  }
-
-  function footnoteUrl(stream, state) {
-    // Check if space, and return NULL if so (to avoid marking the space)
-    if(stream.eatSpace()){
-      return null;
-    }
-    // Match URL
-    stream.match(/^[^\s]+/, true);
-    // Check for link title
-    if (stream.peek() === undefined) { // End of line, set flag to check next line
-      state.linkTitle = true;
-    } else { // More content on line, check if link title
-      stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
-    }
-    state.f = state.inline = inlineNormal;
-    return linkhref + " url";
-  }
-
-  var savedInlineRE = [];
-  function inlineRE(endChar) {
-    if (!savedInlineRE[endChar]) {
-      // Escape endChar for RegExp (taken from http://stackoverflow.com/a/494122/526741)
-      endChar = (endChar+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
-      // Match any non-endChar, escaped character, as well as the closing
-      // endChar.
-      savedInlineRE[endChar] = new RegExp('^(?:[^\\\\]|\\\\.)*?(' + endChar + ')');
-    }
-    return savedInlineRE[endChar];
-  }
-
-  var mode = {
-    startState: function() {
-      return {
-        f: blockNormal,
-
-        prevLine: null,
-        thisLine: null,
-
-        block: blockNormal,
-        htmlState: null,
-        indentation: 0,
-
-        inline: inlineNormal,
-        text: handleText,
-
-        formatting: false,
-        linkText: false,
-        linkHref: false,
-        linkTitle: false,
-        em: false,
-        strong: false,
-        header: 0,
-        hr: false,
-        taskList: false,
-        list: false,
-        listDepth: 0,
-        quote: 0,
-        trailingSpace: 0,
-        trailingSpaceNewLine: false,
-        strikethrough: false,
-        fencedChars: null
-      };
-    },
-
-    copyState: function(s) {
-      return {
-        f: s.f,
-
-        prevLine: s.prevLine,
-        thisLine: s.this,
-
-        block: s.block,
-        htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState),
-        indentation: s.indentation,
-
-        localMode: s.localMode,
-        localState: s.localMode ? CodeMirror.copyState(s.localMode, s.localState) : null,
-
-        inline: s.inline,
-        text: s.text,
-        formatting: false,
-        linkTitle: s.linkTitle,
-        code: s.code,
-        em: s.em,
-        strong: s.strong,
-        strikethrough: s.strikethrough,
-        header: s.header,
-        hr: s.hr,
-        taskList: s.taskList,
-        list: s.list,
-        listDepth: s.listDepth,
-        quote: s.quote,
-        indentedCode: s.indentedCode,
-        trailingSpace: s.trailingSpace,
-        trailingSpaceNewLine: s.trailingSpaceNewLine,
-        md_inside: s.md_inside,
-        fencedChars: s.fencedChars
-      };
-    },
-
-    token: function(stream, state) {
-
-      // Reset state.formatting
-      state.formatting = false;
-
-      if (stream != state.thisLine) {
-        var forceBlankLine = state.header || state.hr;
-
-        // Reset state.header and state.hr
-        state.header = 0;
-        state.hr = false;
-
-        if (stream.match(/^\s*$/, true) || forceBlankLine) {
-          blankLine(state);
-          if (!forceBlankLine) return null
-          state.prevLine = null
-        }
-
-        state.prevLine = state.thisLine
-        state.thisLine = stream
-
-        // Reset state.taskList
-        state.taskList = false;
-
-        // Reset state.trailingSpace
-        state.trailingSpace = 0;
-        state.trailingSpaceNewLine = false;
-
-        state.f = state.block;
-        var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
-        var difference = Math.floor((indentation - state.indentation) / 4) * 4;
-        if (difference > 4) difference = 4;
-        var adjustedIndentation = state.indentation + difference;
-        state.indentationDiff = adjustedIndentation - state.indentation;
-        state.indentation = adjustedIndentation;
-        if (indentation > 0) return null;
-      }
-      return state.f(stream, state);
-    },
-
-    innerMode: function(state) {
-      if (state.block == htmlBlock) return {state: state.htmlState, mode: htmlMode};
-      if (state.localState) return {state: state.localState, mode: state.localMode};
-      return {state: state, mode: mode};
-    },
-
-    blankLine: blankLine,
-
-    getType: getType,
-
-    fold: "markdown"
-  };
-  return mode;
-}, "xml");
-
-CodeMirror.defineMIME("text/x-markdown", "markdown");
-
-});
diff --git a/www/code/codemirror-5.7/mode/markdown/test.js b/www/code/codemirror-5.7/mode/markdown/test.js
deleted file mode 100644
index 78b6c685a..000000000
--- a/www/code/codemirror-5.7/mode/markdown/test.js
+++ /dev/null
@@ -1,848 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "markdown");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-  var modeHighlightFormatting = CodeMirror.getMode({tabSize: 4}, {name: "markdown", highlightFormatting: true});
-  function FT(name) { test.mode(name, modeHighlightFormatting, Array.prototype.slice.call(arguments, 1)); }
-  var modeAtxNoSpace = CodeMirror.getMode({tabSize: 4}, {name: "markdown", allowAtxHeaderWithoutSpace: true});
-  function AtxNoSpaceTest(name) { test.mode(name, modeAtxNoSpace, Array.prototype.slice.call(arguments, 1)); }
-  var modeFenced = CodeMirror.getMode({tabSize: 4}, {name: "markdown", fencedCodeBlocks: true});
-  function FencedTest(name) { test.mode(name, modeFenced, Array.prototype.slice.call(arguments, 1)); }
-
-  FT("formatting_emAsterisk",
-     "[em&formatting&formatting-em *][em foo][em&formatting&formatting-em *]");
-
-  FT("formatting_emUnderscore",
-     "[em&formatting&formatting-em _][em foo][em&formatting&formatting-em _]");
-
-  FT("formatting_strongAsterisk",
-     "[strong&formatting&formatting-strong **][strong foo][strong&formatting&formatting-strong **]");
-
-  FT("formatting_strongUnderscore",
-     "[strong&formatting&formatting-strong __][strong foo][strong&formatting&formatting-strong __]");
-
-  FT("formatting_codeBackticks",
-     "[comment&formatting&formatting-code `][comment foo][comment&formatting&formatting-code `]");
-
-  FT("formatting_doubleBackticks",
-     "[comment&formatting&formatting-code ``][comment foo ` bar][comment&formatting&formatting-code ``]");
-
-  FT("formatting_atxHeader",
-     "[header&header-1&formatting&formatting-header&formatting-header-1 # ][header&header-1 foo # bar ][header&header-1&formatting&formatting-header&formatting-header-1 #]");
-
-  FT("formatting_setextHeader",
-     "foo",
-     "[header&header-1&formatting&formatting-header&formatting-header-1 =]");
-
-  FT("formatting_blockquote",
-     "[quote"e-1&formatting&formatting-quote&formatting-quote-1 > ][quote"e-1 foo]");
-
-  FT("formatting_list",
-     "[variable-2&formatting&formatting-list&formatting-list-ul - ][variable-2 foo]");
-  FT("formatting_list",
-     "[variable-2&formatting&formatting-list&formatting-list-ol 1. ][variable-2 foo]");
-
-  FT("formatting_link",
-     "[link&formatting&formatting-link [][link foo][link&formatting&formatting-link ]]][string&formatting&formatting-link-string&url (][string&url http://example.com/][string&formatting&formatting-link-string&url )]");
-
-  FT("formatting_linkReference",
-     "[link&formatting&formatting-link [][link foo][link&formatting&formatting-link ]]][string&formatting&formatting-link-string&url [][string&url bar][string&formatting&formatting-link-string&url ]]]",
-     "[link&formatting&formatting-link [][link bar][link&formatting&formatting-link ]]:] [string&url http://example.com/]");
-
-  FT("formatting_linkWeb",
-     "[link&formatting&formatting-link <][link http://example.com/][link&formatting&formatting-link >]");
-
-  FT("formatting_linkEmail",
-     "[link&formatting&formatting-link <][link user@example.com][link&formatting&formatting-link >]");
-
-  FT("formatting_escape",
-     "[formatting-escape \\*]");
-
-  MT("plainText",
-     "foo");
-
-  // Don't style single trailing space
-  MT("trailingSpace1",
-     "foo ");
-
-  // Two or more trailing spaces should be styled with line break character
-  MT("trailingSpace2",
-     "foo[trailing-space-a  ][trailing-space-new-line  ]");
-
-  MT("trailingSpace3",
-     "foo[trailing-space-a  ][trailing-space-b  ][trailing-space-new-line  ]");
-
-  MT("trailingSpace4",
-     "foo[trailing-space-a  ][trailing-space-b  ][trailing-space-a  ][trailing-space-new-line  ]");
-
-  // Code blocks using 4 spaces (regardless of CodeMirror.tabSize value)
-  MT("codeBlocksUsing4Spaces",
-     "    [comment foo]");
-
-  // Code blocks using 4 spaces with internal indentation
-  MT("codeBlocksUsing4SpacesIndentation",
-     "    [comment bar]",
-     "        [comment hello]",
-     "            [comment world]",
-     "    [comment foo]",
-     "bar");
-
-  // Code blocks should end even after extra indented lines
-  MT("codeBlocksWithTrailingIndentedLine",
-     "    [comment foo]",
-     "        [comment bar]",
-     "    [comment baz]",
-     "    ",
-     "hello");
-
-  // Code blocks using 1 tab (regardless of CodeMirror.indentWithTabs value)
-  MT("codeBlocksUsing1Tab",
-     "\t[comment foo]");
-
-  // No code blocks directly after paragraph
-  // http://spec.commonmark.org/0.19/#example-65
-  MT("noCodeBlocksAfterParagraph",
-     "Foo",
-     "    Bar");
-
-  // Inline code using backticks
-  MT("inlineCodeUsingBackticks",
-     "foo [comment `bar`]");
-
-  // Block code using single backtick (shouldn't work)
-  MT("blockCodeSingleBacktick",
-     "[comment `]",
-     "[comment foo]",
-     "[comment `]");
-
-  // Unclosed backticks
-  // Instead of simply marking as CODE, it would be nice to have an
-  // incomplete flag for CODE, that is styled slightly different.
-  MT("unclosedBackticks",
-     "foo [comment `bar]");
-
-  // Per documentation: "To include a literal backtick character within a
-  // code span, you can use multiple backticks as the opening and closing
-  // delimiters"
-  MT("doubleBackticks",
-     "[comment ``foo ` bar``]");
-
-  // Tests based on Dingus
-  // http://daringfireball.net/projects/markdown/dingus
-  //
-  // Multiple backticks within an inline code block
-  MT("consecutiveBackticks",
-     "[comment `foo```bar`]");
-
-  // Multiple backticks within an inline code block with a second code block
-  MT("consecutiveBackticks",
-     "[comment `foo```bar`] hello [comment `world`]");
-
-  // Unclosed with several different groups of backticks
-  MT("unclosedBackticks",
-     "[comment ``foo ``` bar` hello]");
-
-  // Closed with several different groups of backticks
-  MT("closedBackticks",
-     "[comment ``foo ``` bar` hello``] world");
-
-  // atx headers
-  // http://daringfireball.net/projects/markdown/syntax#header
-
-  MT("atxH1",
-     "[header&header-1 # foo]");
-
-  MT("atxH2",
-     "[header&header-2 ## foo]");
-
-  MT("atxH3",
-     "[header&header-3 ### foo]");
-
-  MT("atxH4",
-     "[header&header-4 #### foo]");
-
-  MT("atxH5",
-     "[header&header-5 ##### foo]");
-
-  MT("atxH6",
-     "[header&header-6 ###### foo]");
-
-  // http://spec.commonmark.org/0.19/#example-24
-  MT("noAtxH7",
-     "####### foo");
-
-  // http://spec.commonmark.org/0.19/#example-25
-  MT("noAtxH1WithoutSpace",
-     "#5 bolt");
-
-  // CommonMark requires a space after # but most parsers don't
-  AtxNoSpaceTest("atxNoSpaceAllowed_H1NoSpace",
-     "[header&header-1 #foo]");
-
-  AtxNoSpaceTest("atxNoSpaceAllowed_H4NoSpace",
-     "[header&header-4 ####foo]");
-
-  AtxNoSpaceTest("atxNoSpaceAllowed_H1Space",
-     "[header&header-1 # foo]");
-
-  // Inline styles should be parsed inside headers
-  MT("atxH1inline",
-     "[header&header-1 # foo ][header&header-1&em *bar*]");
-
-  // Setext headers - H1, H2
-  // Per documentation, "Any number of underlining =’s or -’s will work."
-  // http://daringfireball.net/projects/markdown/syntax#header
-  // Ideally, the text would be marked as `header` as well, but this is
-  // not really feasible at the moment. So, instead, we're testing against
-  // what works today, to avoid any regressions.
-  //
-  // Check if single underlining = works
-  MT("setextH1",
-     "foo",
-     "[header&header-1 =]");
-
-  // Check if 3+ ='s work
-  MT("setextH1",
-     "foo",
-     "[header&header-1 ===]");
-
-  // Check if single underlining - works
-  MT("setextH2",
-     "foo",
-     "[header&header-2 -]");
-
-  // Check if 3+ -'s work
-  MT("setextH2",
-     "foo",
-     "[header&header-2 ---]");
-
-  // http://spec.commonmark.org/0.19/#example-45
-  MT("setextH2AllowSpaces",
-     "foo",
-     "   [header&header-2 ----      ]");
-
-  // http://spec.commonmark.org/0.19/#example-44
-  MT("noSetextAfterIndentedCodeBlock",
-     "     [comment foo]",
-     "[hr ---]");
-
-  // http://spec.commonmark.org/0.19/#example-51
-  MT("noSetextAfterQuote",
-     "[quote"e-1 > foo]",
-     "[hr ---]");
-
-  MT("noSetextAfterList",
-     "[variable-2 - foo]",
-     "[hr ---]");
-
-  // Single-line blockquote with trailing space
-  MT("blockquoteSpace",
-     "[quote"e-1 > foo]");
-
-  // Single-line blockquote
-  MT("blockquoteNoSpace",
-     "[quote"e-1 >foo]");
-
-  // No blank line before blockquote
-  MT("blockquoteNoBlankLine",
-     "foo",
-     "[quote"e-1 > bar]");
-
-  // Nested blockquote
-  MT("blockquoteSpace",
-     "[quote"e-1 > foo]",
-     "[quote"e-1 >][quote"e-2 > foo]",
-     "[quote"e-1 >][quote"e-2 >][quote"e-3 > foo]");
-
-  // Single-line blockquote followed by normal paragraph
-  MT("blockquoteThenParagraph",
-     "[quote"e-1 >foo]",
-     "",
-     "bar");
-
-  // Multi-line blockquote (lazy mode)
-  MT("multiBlockquoteLazy",
-     "[quote"e-1 >foo]",
-     "[quote"e-1 bar]");
-
-  // Multi-line blockquote followed by normal paragraph (lazy mode)
-  MT("multiBlockquoteLazyThenParagraph",
-     "[quote"e-1 >foo]",
-     "[quote"e-1 bar]",
-     "",
-     "hello");
-
-  // Multi-line blockquote (non-lazy mode)
-  MT("multiBlockquote",
-     "[quote"e-1 >foo]",
-     "[quote"e-1 >bar]");
-
-  // Multi-line blockquote followed by normal paragraph (non-lazy mode)
-  MT("multiBlockquoteThenParagraph",
-     "[quote"e-1 >foo]",
-     "[quote"e-1 >bar]",
-     "",
-     "hello");
-
-  // Header with leading space after continued blockquote (#3287, negative indentation)
-  MT("headerAfterContinuedBlockquote",
-     "[quote"e-1 > foo]",
-     "[quote"e-1 bar]",
-     "",
-     " [header&header-1 # hello]");
-
-  // Check list types
-
-  MT("listAsterisk",
-     "foo",
-     "bar",
-     "",
-     "[variable-2 * foo]",
-     "[variable-2 * bar]");
-
-  MT("listPlus",
-     "foo",
-     "bar",
-     "",
-     "[variable-2 + foo]",
-     "[variable-2 + bar]");
-
-  MT("listDash",
-     "foo",
-     "bar",
-     "",
-     "[variable-2 - foo]",
-     "[variable-2 - bar]");
-
-  MT("listNumber",
-     "foo",
-     "bar",
-     "",
-     "[variable-2 1. foo]",
-     "[variable-2 2. bar]");
-
-  // Lists require a preceding blank line (per Dingus)
-  MT("listBogus",
-     "foo",
-     "1. bar",
-     "2. hello");
-
-  // List after hr
-  MT("listAfterHr",
-     "[hr ---]",
-     "[variable-2 - bar]");
-
-  // List after header
-  MT("listAfterHeader",
-     "[header&header-1 # foo]",
-     "[variable-2 - bar]");
-
-  // hr after list
-  MT("hrAfterList",
-     "[variable-2 - foo]",
-     "[hr -----]");
-
-  // Formatting in lists (*)
-  MT("listAsteriskFormatting",
-     "[variable-2 * ][variable-2&em *foo*][variable-2  bar]",
-     "[variable-2 * ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 * ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
-     "[variable-2 * ][variable-2&comment `foo`][variable-2  bar]");
-
-  // Formatting in lists (+)
-  MT("listPlusFormatting",
-     "[variable-2 + ][variable-2&em *foo*][variable-2  bar]",
-     "[variable-2 + ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 + ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
-     "[variable-2 + ][variable-2&comment `foo`][variable-2  bar]");
-
-  // Formatting in lists (-)
-  MT("listDashFormatting",
-     "[variable-2 - ][variable-2&em *foo*][variable-2  bar]",
-     "[variable-2 - ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 - ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
-     "[variable-2 - ][variable-2&comment `foo`][variable-2  bar]");
-
-  // Formatting in lists (1.)
-  MT("listNumberFormatting",
-     "[variable-2 1. ][variable-2&em *foo*][variable-2  bar]",
-     "[variable-2 2. ][variable-2&strong **foo**][variable-2  bar]",
-     "[variable-2 3. ][variable-2&strong **][variable-2&em&strong *foo**][variable-2&em *][variable-2  bar]",
-     "[variable-2 4. ][variable-2&comment `foo`][variable-2  bar]");
-
-  // Paragraph lists
-  MT("listParagraph",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]");
-
-  // Multi-paragraph lists
-  //
-  // 4 spaces
-  MT("listMultiParagraph",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "    [variable-2 hello]");
-
-  // 4 spaces, extra blank lines (should still be list, per Dingus)
-  MT("listMultiParagraphExtra",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "",
-     "    [variable-2 hello]");
-
-  // 4 spaces, plus 1 space (should still be list, per Dingus)
-  MT("listMultiParagraphExtraSpace",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "     [variable-2 hello]",
-     "",
-     "    [variable-2 world]");
-
-  // 1 tab
-  MT("listTab",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "\t[variable-2 hello]");
-
-  // No indent
-  MT("listNoIndent",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "hello");
-
-  // Blockquote
-  MT("blockquote",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "    [variable-2"e"e-1 > hello]");
-
-  // Code block
-  MT("blockquoteCode",
-     "[variable-2 * foo]",
-     "",
-     "[variable-2 * bar]",
-     "",
-     "        [comment > hello]",
-     "",
-     "    [variable-2 world]");
-
-  // Code block followed by text
-  MT("blockquoteCodeText",
-     "[variable-2 * foo]",
-     "",
-     "    [variable-2 bar]",
-     "",
-     "        [comment hello]",
-     "",
-     "    [variable-2 world]");
-
-  // Nested list
-
-  MT("listAsteriskNested",
-     "[variable-2 * foo]",
-     "",
-     "    [variable-3 * bar]");
-
-  MT("listPlusNested",
-     "[variable-2 + foo]",
-     "",
-     "    [variable-3 + bar]");
-
-  MT("listDashNested",
-     "[variable-2 - foo]",
-     "",
-     "    [variable-3 - bar]");
-
-  MT("listNumberNested",
-     "[variable-2 1. foo]",
-     "",
-     "    [variable-3 2. bar]");
-
-  MT("listMixed",
-     "[variable-2 * foo]",
-     "",
-     "    [variable-3 + bar]",
-     "",
-     "        [keyword - hello]",
-     "",
-     "            [variable-2 1. world]");
-
-  MT("listBlockquote",
-     "[variable-2 * foo]",
-     "",
-     "    [variable-3 + bar]",
-     "",
-     "        [quote"e-1&variable-3 > hello]");
-
-  MT("listCode",
-     "[variable-2 * foo]",
-     "",
-     "    [variable-3 + bar]",
-     "",
-     "            [comment hello]");
-
-  // Code with internal indentation
-  MT("listCodeIndentation",
-     "[variable-2 * foo]",
-     "",
-     "        [comment bar]",
-     "            [comment hello]",
-     "                [comment world]",
-     "        [comment foo]",
-     "    [variable-2 bar]");
-
-  // List nesting edge cases
-  MT("listNested",
-    "[variable-2 * foo]",
-    "",
-    "    [variable-3 * bar]",
-    "",
-    "       [variable-3 hello]"
-  );
-  MT("listNested",
-    "[variable-2 * foo]",
-    "",
-    "    [variable-3 * bar]",
-    "",
-    "      [keyword * foo]"
-  );
-
-  // Code followed by text
-  MT("listCodeText",
-     "[variable-2 * foo]",
-     "",
-     "        [comment bar]",
-     "",
-     "hello");
-
-  // Following tests directly from official Markdown documentation
-  // http://daringfireball.net/projects/markdown/syntax#hr
-
-  MT("hrSpace",
-     "[hr * * *]");
-
-  MT("hr",
-     "[hr ***]");
-
-  MT("hrLong",
-     "[hr *****]");
-
-  MT("hrSpaceDash",
-     "[hr - - -]");
-
-  MT("hrDashLong",
-     "[hr ---------------------------------------]");
-
-  // Inline link with title
-  MT("linkTitle",
-     "[link [[foo]]][string&url (http://example.com/ \"bar\")] hello");
-
-  // Inline link without title
-  MT("linkNoTitle",
-     "[link [[foo]]][string&url (http://example.com/)] bar");
-
-  // Inline link with image
-  MT("linkImage",
-     "[link [[][tag ![[foo]]][string&url (http://example.com/)][link ]]][string&url (http://example.com/)] bar");
-
-  // Inline link with Em
-  MT("linkEm",
-     "[link [[][link&em *foo*][link ]]][string&url (http://example.com/)] bar");
-
-  // Inline link with Strong
-  MT("linkStrong",
-     "[link [[][link&strong **foo**][link ]]][string&url (http://example.com/)] bar");
-
-  // Inline link with EmStrong
-  MT("linkEmStrong",
-     "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string&url (http://example.com/)] bar");
-
-  // Image with title
-  MT("imageTitle",
-     "[tag ![[foo]]][string&url (http://example.com/ \"bar\")] hello");
-
-  // Image without title
-  MT("imageNoTitle",
-     "[tag ![[foo]]][string&url (http://example.com/)] bar");
-
-  // Image with asterisks
-  MT("imageAsterisks",
-     "[tag ![[*foo*]]][string&url (http://example.com/)] bar");
-
-  // Not a link. Should be normal text due to square brackets being used
-  // regularly in text, especially in quoted material, and no space is allowed
-  // between square brackets and parentheses (per Dingus).
-  MT("notALink",
-     "[[foo]] (bar)");
-
-  // Reference-style links
-  MT("linkReference",
-     "[link [[foo]]][string&url [[bar]]] hello");
-
-  // Reference-style links with Em
-  MT("linkReferenceEm",
-     "[link [[][link&em *foo*][link ]]][string&url [[bar]]] hello");
-
-  // Reference-style links with Strong
-  MT("linkReferenceStrong",
-     "[link [[][link&strong **foo**][link ]]][string&url [[bar]]] hello");
-
-  // Reference-style links with EmStrong
-  MT("linkReferenceEmStrong",
-     "[link [[][link&strong **][link&em&strong *foo**][link&em *][link ]]][string&url [[bar]]] hello");
-
-  // Reference-style links with optional space separator (per docuentation)
-  // "You can optionally use a space to separate the sets of brackets"
-  MT("linkReferenceSpace",
-     "[link [[foo]]] [string&url [[bar]]] hello");
-
-  // Should only allow a single space ("...use *a* space...")
-  MT("linkReferenceDoubleSpace",
-     "[[foo]]  [[bar]] hello");
-
-  // Reference-style links with implicit link name
-  MT("linkImplicit",
-     "[link [[foo]]][string&url [[]]] hello");
-
-  // @todo It would be nice if, at some point, the document was actually
-  // checked to see if the referenced link exists
-
-  // Link label, for reference-style links (taken from documentation)
-
-  MT("labelNoTitle",
-     "[link [[foo]]:] [string&url http://example.com/]");
-
-  MT("labelIndented",
-     "   [link [[foo]]:] [string&url http://example.com/]");
-
-  MT("labelSpaceTitle",
-     "[link [[foo bar]]:] [string&url http://example.com/ \"hello\"]");
-
-  MT("labelDoubleTitle",
-     "[link [[foo bar]]:] [string&url http://example.com/ \"hello\"] \"world\"");
-
-  MT("labelTitleDoubleQuotes",
-     "[link [[foo]]:] [string&url http://example.com/  \"bar\"]");
-
-  MT("labelTitleSingleQuotes",
-     "[link [[foo]]:] [string&url http://example.com/  'bar']");
-
-  MT("labelTitleParenthese",
-     "[link [[foo]]:] [string&url http://example.com/  (bar)]");
-
-  MT("labelTitleInvalid",
-     "[link [[foo]]:] [string&url http://example.com/] bar");
-
-  MT("labelLinkAngleBrackets",
-     "[link [[foo]]:] [string&url   \"bar\"]");
-
-  MT("labelTitleNextDoubleQuotes",
-     "[link [[foo]]:] [string&url http://example.com/]",
-     "[string \"bar\"] hello");
-
-  MT("labelTitleNextSingleQuotes",
-     "[link [[foo]]:] [string&url http://example.com/]",
-     "[string 'bar'] hello");
-
-  MT("labelTitleNextParenthese",
-     "[link [[foo]]:] [string&url http://example.com/]",
-     "[string (bar)] hello");
-
-  MT("labelTitleNextMixed",
-     "[link [[foo]]:] [string&url http://example.com/]",
-     "(bar\" hello");
-
-  MT("linkWeb",
-     "[link ] foo");
-
-  MT("linkWebDouble",
-     "[link ] foo [link ]");
-
-  MT("linkEmail",
-     "[link ] foo");
-
-  MT("linkEmailDouble",
-     "[link ] foo [link ]");
-
-  MT("emAsterisk",
-     "[em *foo*] bar");
-
-  MT("emUnderscore",
-     "[em _foo_] bar");
-
-  MT("emInWordAsterisk",
-     "foo[em *bar*]hello");
-
-  MT("emInWordUnderscore",
-     "foo[em _bar_]hello");
-
-  // Per documentation: "...surround an * or _ with spaces, it’ll be
-  // treated as a literal asterisk or underscore."
-
-  MT("emEscapedBySpaceIn",
-     "foo [em _bar _ hello_] world");
-
-  MT("emEscapedBySpaceOut",
-     "foo _ bar[em _hello_]world");
-
-  MT("emEscapedByNewline",
-     "foo",
-     "_ bar[em _hello_]world");
-
-  // Unclosed emphasis characters
-  // Instead of simply marking as EM / STRONG, it would be nice to have an
-  // incomplete flag for EM and STRONG, that is styled slightly different.
-  MT("emIncompleteAsterisk",
-     "foo [em *bar]");
-
-  MT("emIncompleteUnderscore",
-     "foo [em _bar]");
-
-  MT("strongAsterisk",
-     "[strong **foo**] bar");
-
-  MT("strongUnderscore",
-     "[strong __foo__] bar");
-
-  MT("emStrongAsterisk",
-     "[em *foo][em&strong **bar*][strong hello**] world");
-
-  MT("emStrongUnderscore",
-     "[em _foo][em&strong __bar_][strong hello__] world");
-
-  // "...same character must be used to open and close an emphasis span.""
-  MT("emStrongMixed",
-     "[em _foo][em&strong **bar*hello__ world]");
-
-  MT("emStrongMixed",
-     "[em *foo][em&strong __bar_hello** world]");
-
-  // These characters should be escaped:
-  // \   backslash
-  // `   backtick
-  // *   asterisk
-  // _   underscore
-  // {}  curly braces
-  // []  square brackets
-  // ()  parentheses
-  // #   hash mark
-  // +   plus sign
-  // -   minus sign (hyphen)
-  // .   dot
-  // !   exclamation mark
-
-  MT("escapeBacktick",
-     "foo \\`bar\\`");
-
-  MT("doubleEscapeBacktick",
-     "foo \\\\[comment `bar\\\\`]");
-
-  MT("escapeAsterisk",
-     "foo \\*bar\\*");
-
-  MT("doubleEscapeAsterisk",
-     "foo \\\\[em *bar\\\\*]");
-
-  MT("escapeUnderscore",
-     "foo \\_bar\\_");
-
-  MT("doubleEscapeUnderscore",
-     "foo \\\\[em _bar\\\\_]");
-
-  MT("escapeHash",
-     "\\# foo");
-
-  MT("doubleEscapeHash",
-     "\\\\# foo");
-
-  MT("escapeNewline",
-     "\\",
-     "[em *foo*]");
-
-
-  // Tests to make sure GFM-specific things aren't getting through
-
-  MT("taskList",
-     "[variable-2 * [ ]] bar]");
-
-  MT("noFencedCodeBlocks",
-     "~~~",
-     "foo",
-     "~~~");
-
-  FencedTest("fencedCodeBlocks",
-     "[comment ```]",
-     "[comment foo]",
-     "[comment ```]",
-     "bar");
-
-  FencedTest("fencedCodeBlocksMultipleChars",
-     "[comment `````]",
-     "[comment foo]",
-     "[comment ```]",
-     "[comment foo]",
-     "[comment `````]",
-     "bar");
-
-  FencedTest("fencedCodeBlocksTildes",
-     "[comment ~~~]",
-     "[comment foo]",
-     "[comment ~~~]",
-     "bar");
-
-  FencedTest("fencedCodeBlocksTildesMultipleChars",
-     "[comment ~~~~~]",
-     "[comment ~~~]",
-     "[comment foo]",
-     "[comment ~~~~~]",
-     "bar");
-
-  FencedTest("fencedCodeBlocksMultipleChars",
-     "[comment `````]",
-     "[comment foo]",
-     "[comment ```]",
-     "[comment foo]",
-     "[comment `````]",
-     "bar");
-
-  FencedTest("fencedCodeBlocksMixed",
-     "[comment ~~~]",
-     "[comment ```]",
-     "[comment foo]",
-     "[comment ~~~]",
-     "bar");
-
-  // Tests that require XML mode
-
-  MT("xmlMode",
-     "[tag&bracket <][tag div][tag&bracket >]",
-     "*foo*",
-     "[tag&bracket <][tag http://github.com][tag&bracket />]",
-     "[tag&bracket ]",
-     "[link ]");
-
-  MT("xmlModeWithMarkdownInside",
-     "[tag&bracket <][tag div] [attribute markdown]=[string 1][tag&bracket >]",
-     "[em *foo*]",
-     "[link ]",
-     "[tag 
    ]",
-     "[link ]",
-     "[tag&bracket <][tag div][tag&bracket >]",
-     "[tag&bracket ]");
-
-})();
diff --git a/www/code/codemirror-5.7/mode/mathematica/index.html b/www/code/codemirror-5.7/mode/mathematica/index.html
deleted file mode 100644
index 57c429853..000000000
--- a/www/code/codemirror-5.7/mode/mathematica/index.html
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-CodeMirror: Mathematica mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Mathematica mode
    
-
-
-
-
-
-
-
    MIME types defined: text/x-mathematica (Mathematica).
    
-
    
diff --git a/www/code/codemirror-5.7/mode/mathematica/mathematica.js b/www/code/codemirror-5.7/mode/mathematica/mathematica.js
deleted file mode 100644
index 5ae6f55cb..000000000
--- a/www/code/codemirror-5.7/mode/mathematica/mathematica.js
+++ /dev/null
@@ -1,175 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Mathematica mode copyright (c) 2015 by Calin Barbat
-// Based on code by Patrick Scheibe (halirutan)
-// See: https://github.com/halirutan/Mathematica-Source-Highlighting/tree/master/src/lang-mma.js
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode('mathematica', function(_config, _parserConfig) {
-
-  // used pattern building blocks
-  var Identifier = '[a-zA-Z\\$][a-zA-Z0-9\\$]*';
-  var pBase      = "(?:\\d+)";
-  var pFloat     = "(?:\\.\\d+|\\d+\\.\\d*|\\d+)";
-  var pFloatBase = "(?:\\.\\w+|\\w+\\.\\w*|\\w+)";
-  var pPrecision = "(?:`(?:`?"+pFloat+")?)";
-
-  // regular expressions
-  var reBaseForm        = new RegExp('(?:'+pBase+'(?:\\^\\^'+pFloatBase+pPrecision+'?(?:\\*\\^[+-]?\\d+)?))');
-  var reFloatForm       = new RegExp('(?:' + pFloat + pPrecision + '?(?:\\*\\^[+-]?\\d+)?)');
-  var reIdInContext     = new RegExp('(?:`?)(?:' + Identifier + ')(?:`(?:' + Identifier + '))*(?:`?)');
-
-  function tokenBase(stream, state) {
-    var ch;
-
-    // get next character
-    ch = stream.next();
-
-    // string
-    if (ch === '"') {
-      state.tokenize = tokenString;
-      return state.tokenize(stream, state);
-    }
-
-    // comment
-    if (ch === '(') {
-      if (stream.eat('*')) {
-        state.commentLevel++;
-        state.tokenize = tokenComment;
-        return state.tokenize(stream, state);
-      }
-    }
-
-    // go back one character
-    stream.backUp(1);
-
-    // look for numbers
-    // Numbers in a baseform
-    if (stream.match(reBaseForm, true, false)) {
-      return 'number';
-    }
-
-    // Mathematica numbers. Floats (1.2, .2, 1.) can have optionally a precision (`float) or an accuracy definition
-    // (``float). Note: while 1.2` is possible 1.2`` is not. At the end an exponent (float*^+12) can follow.
-    if (stream.match(reFloatForm, true, false)) {
-      return 'number';
-    }
-
-    /* In[23] and Out[34] */
-    if (stream.match(/(?:In|Out)\[[0-9]*\]/, true, false)) {
-      return 'atom';
-    }
-
-    // usage
-    if (stream.match(/([a-zA-Z\$]+(?:`?[a-zA-Z0-9\$])*::usage)/, true, false)) {
-      return 'meta';
-    }
-
-    // message
-    if (stream.match(/([a-zA-Z\$]+(?:`?[a-zA-Z0-9\$])*::[a-zA-Z\$][a-zA-Z0-9\$]*):?/, true, false)) {
-      return 'string-2';
-    }
-
-    // this makes a look-ahead match for something like variable:{_Integer}
-    // the match is then forwarded to the mma-patterns tokenizer.
-    if (stream.match(/([a-zA-Z\$][a-zA-Z0-9\$]*\s*:)(?:(?:[a-zA-Z\$][a-zA-Z0-9\$]*)|(?:[^:=>~@\^\&\*\)\[\]'\?,\|])).*/, true, false)) {
-      return 'variable-2';
-    }
-
-    // catch variables which are used together with Blank (_), BlankSequence (__) or BlankNullSequence (___)
-    // Cannot start with a number, but can have numbers at any other position. Examples
-    // blub__Integer, a1_, b34_Integer32
-    if (stream.match(/[a-zA-Z\$][a-zA-Z0-9\$]*_+[a-zA-Z\$][a-zA-Z0-9\$]*/, true, false)) {
-      return 'variable-2';
-    }
-    if (stream.match(/[a-zA-Z\$][a-zA-Z0-9\$]*_+/, true, false)) {
-      return 'variable-2';
-    }
-    if (stream.match(/_+[a-zA-Z\$][a-zA-Z0-9\$]*/, true, false)) {
-      return 'variable-2';
-    }
-
-    // Named characters in Mathematica, like \[Gamma].
-    if (stream.match(/\\\[[a-zA-Z\$][a-zA-Z0-9\$]*\]/, true, false)) {
-      return 'variable-3';
-    }
-
-    // Match all braces separately
-    if (stream.match(/(?:\[|\]|{|}|\(|\))/, true, false)) {
-      return 'bracket';
-    }
-
-    // Catch Slots (#, ##, #3, ##9 and the V10 named slots #name). I have never seen someone using more than one digit after #, so we match
-    // only one.
-    if (stream.match(/(?:#[a-zA-Z\$][a-zA-Z0-9\$]*|#+[0-9]?)/, true, false)) {
-      return 'variable-2';
-    }
-
-    // Literals like variables, keywords, functions
-    if (stream.match(reIdInContext, true, false)) {
-      return 'keyword';
-    }
-
-    // operators. Note that operators like @@ or /; are matched separately for each symbol.
-    if (stream.match(/(?:\\|\+|\-|\*|\/|,|;|\.|:|@|~|=|>|<|&|\||_|`|'|\^|\?|!|%)/, true, false)) {
-      return 'operator';
-    }
-
-    // everything else is an error
-    return 'error';
-  }
-
-  function tokenString(stream, state) {
-    var next, end = false, escaped = false;
-    while ((next = stream.next()) != null) {
-      if (next === '"' && !escaped) {
-        end = true;
-        break;
-      }
-      escaped = !escaped && next === '\\';
-    }
-    if (end && !escaped) {
-      state.tokenize = tokenBase;
-    }
-    return 'string';
-  };
-
-  function tokenComment(stream, state) {
-    var prev, next;
-    while(state.commentLevel > 0 && (next = stream.next()) != null) {
-      if (prev === '(' && next === '*') state.commentLevel++;
-      if (prev === '*' && next === ')') state.commentLevel--;
-      prev = next;
-    }
-    if (state.commentLevel <= 0) {
-      state.tokenize = tokenBase;
-    }
-    return 'comment';
-  }
-
-  return {
-    startState: function() {return {tokenize: tokenBase, commentLevel: 0};},
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      return state.tokenize(stream, state);
-    },
-    blockCommentStart: "(*",
-    blockCommentEnd: "*)"
-  };
-});
-
-CodeMirror.defineMIME('text/x-mathematica', {
-  name: 'mathematica'
-});
-
-});
diff --git a/www/code/codemirror-5.7/mode/meta.js b/www/code/codemirror-5.7/mode/meta.js
deleted file mode 100644
index 3a14dfc58..000000000
--- a/www/code/codemirror-5.7/mode/meta.js
+++ /dev/null
@@ -1,196 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.modeInfo = [
-    {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
-    {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]},
-    {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
-    {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
-    {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
-    {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
-    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
-    {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
-    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
-    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj"]},
-    {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
-    {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
-    {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
-    {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
-    {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
-    {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
-    {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
-    {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
-    {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
-    {name: "Dart", mimes: ["application/dart", "text/x-dart"], mode: "dart", ext: ["dart"]},
-    {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
-    {name: "Django", mime: "text/x-django", mode: "django"},
-    {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile", file: /^Dockerfile$/},
-    {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
-    {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
-    {name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
-    {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
-    {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
-    {name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
-    {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
-    {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
-    {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
-    {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
-    {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
-    {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
-    {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
-    {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
-    {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
-    {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
-    {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
-    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy"]},
-    {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
-    {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
-    {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
-    {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
-    {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
-    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
-    {name: "HTTP", mime: "message/http", mode: "http"},
-    {name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
-    {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]},
-    {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
-    {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},
-    {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
-     mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
-    {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
-    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
-    {name: "Jinja2", mime: "null", mode: "jinja2"},
-    {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
-    {name: "Kotlin", mime: "text/x-kotlin", mode: "kotlin", ext: ["kt"]},
-    {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
-    {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
-    {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
-    {name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
-    {name: "mIRC", mime: "text/mirc", mode: "mirc"},
-    {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
-    {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
-    {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
-    {name: "MUMPS", mime: "text/x-mumps", mode: "mumps"},
-    {name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
-    {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
-    {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
-    {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
-    {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]},
-    {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
-    {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
-    {name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
-    {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
-    {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
-    {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
-    {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]},
-    {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
-    {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
-    {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
-    {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
-    {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
-    {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
-    {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
-    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"], alias: ["rscript"]},
-    {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"], alias: ["rst"]},
-    {name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
-    {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
-    {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"], alias: ["jruby", "macruby", "rake", "rb", "rbx"]},
-    {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
-    {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},
-    {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
-    {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
-    {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
-    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"]},
-    {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
-    {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
-    {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
-    {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
-    {name: "Solr", mime: "text/x-solr", mode: "solr"},
-    {name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
-    {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
-    {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
-    {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
-    {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
-    {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
-    {name: "MariaDB", mime: "text/x-mariadb", mode: "sql"},
-    {name: "sTeX", mime: "text/x-stex", mode: "stex"},
-    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
-    {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
-    {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
-    {name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
-    {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
-    {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
-    {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
-    {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
-    {name: "troff", mime: "troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
-    {name: "TTCN", mime: "text/x-ttcn", mode: "ttcn", ext: ["ttcn", "ttcn3", "ttcnpp"]},
-    {name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
-    {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
-    {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
-    {name: "Twig", mime: "text/x-twig", mode: "twig"},
-    {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
-    {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]},
-    {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
-    {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
-    {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
-    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
-    {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
-    {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
-    {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
-    {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
-    {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
-    {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]}
-  ];
-  // Ensure all modes have a mime property for backwards compatibility
-  for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
-    var info = CodeMirror.modeInfo[i];
-    if (info.mimes) info.mime = info.mimes[0];
-  }
-
-  CodeMirror.findModeByMIME = function(mime) {
-    mime = mime.toLowerCase();
-    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
-      var info = CodeMirror.modeInfo[i];
-      if (info.mime == mime) return info;
-      if (info.mimes) for (var j = 0; j < info.mimes.length; j++)
-        if (info.mimes[j] == mime) return info;
-    }
-  };
-
-  CodeMirror.findModeByExtension = function(ext) {
-    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
-      var info = CodeMirror.modeInfo[i];
-      if (info.ext) for (var j = 0; j < info.ext.length; j++)
-        if (info.ext[j] == ext) return info;
-    }
-  };
-
-  CodeMirror.findModeByFileName = function(filename) {
-    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
-      var info = CodeMirror.modeInfo[i];
-      if (info.file && info.file.test(filename)) return info;
-    }
-    var dot = filename.lastIndexOf(".");
-    var ext = dot > -1 && filename.substring(dot + 1, filename.length);
-    if (ext) return CodeMirror.findModeByExtension(ext);
-  };
-
-  CodeMirror.findModeByName = function(name) {
-    name = name.toLowerCase();
-    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
-      var info = CodeMirror.modeInfo[i];
-      if (info.name.toLowerCase() == name) return info;
-      if (info.alias) for (var j = 0; j < info.alias.length; j++)
-        if (info.alias[j].toLowerCase() == name) return info;
-    }
-  };
-});
diff --git a/www/code/codemirror-5.7/mode/mirc/index.html b/www/code/codemirror-5.7/mode/mirc/index.html
deleted file mode 100644
index fd2f34e4b..000000000
--- a/www/code/codemirror-5.7/mode/mirc/index.html
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-CodeMirror: mIRC mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    mIRC mode
    
-
    
-    
-
-    
    MIME types defined: text/mirc.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/mirc/mirc.js b/www/code/codemirror-5.7/mode/mirc/mirc.js
deleted file mode 100644
index f0d5c6ad5..000000000
--- a/www/code/codemirror-5.7/mode/mirc/mirc.js
+++ /dev/null
@@ -1,193 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-//mIRC mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMIME("text/mirc", "mirc");
-CodeMirror.defineMode("mirc", function() {
-  function parseWords(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var specials = parseWords("$! $$ $& $? $+ $abook $abs $active $activecid " +
-                            "$activewid $address $addtok $agent $agentname $agentstat $agentver " +
-                            "$alias $and $anick $ansi2mirc $aop $appactive $appstate $asc $asctime " +
-                            "$asin $atan $avoice $away $awaymsg $awaytime $banmask $base $bfind " +
-                            "$binoff $biton $bnick $bvar $bytes $calc $cb $cd $ceil $chan $chanmodes " +
-                            "$chantypes $chat $chr $cid $clevel $click $cmdbox $cmdline $cnick $color " +
-                            "$com $comcall $comchan $comerr $compact $compress $comval $cos $count " +
-                            "$cr $crc $creq $crlf $ctime $ctimer $ctrlenter $date $day $daylight " +
-                            "$dbuh $dbuw $dccignore $dccport $dde $ddename $debug $decode $decompress " +
-                            "$deltok $devent $dialog $did $didreg $didtok $didwm $disk $dlevel $dll " +
-                            "$dllcall $dname $dns $duration $ebeeps $editbox $emailaddr $encode $error " +
-                            "$eval $event $exist $feof $ferr $fgetc $file $filename $filtered $finddir " +
-                            "$finddirn $findfile $findfilen $findtok $fline $floor $fopen $fread $fserve " +
-                            "$fulladdress $fulldate $fullname $fullscreen $get $getdir $getdot $gettok $gmt " +
-                            "$group $halted $hash $height $hfind $hget $highlight $hnick $hotline " +
-                            "$hotlinepos $ial $ialchan $ibl $idle $iel $ifmatch $ignore $iif $iil " +
-                            "$inelipse $ini $inmidi $inpaste $inpoly $input $inrect $inroundrect " +
-                            "$insong $instok $int $inwave $ip $isalias $isbit $isdde $isdir $isfile " +
-                            "$isid $islower $istok $isupper $keychar $keyrpt $keyval $knick $lactive " +
-                            "$lactivecid $lactivewid $left $len $level $lf $line $lines $link $lock " +
-                            "$lock $locked $log $logstamp $logstampfmt $longfn $longip $lower $ltimer " +
-                            "$maddress $mask $matchkey $matchtok $md5 $me $menu $menubar $menucontext " +
-                            "$menutype $mid $middir $mircdir $mircexe $mircini $mklogfn $mnick $mode " +
-                            "$modefirst $modelast $modespl $mouse $msfile $network $newnick $nick $nofile " +
-                            "$nopath $noqt $not $notags $notify $null $numeric $numok $oline $onpoly " +
-                            "$opnick $or $ord $os $passivedcc $pic $play $pnick $port $portable $portfree " +
-                            "$pos $prefix $prop $protect $puttok $qt $query $rand $r $rawmsg $read $readomo " +
-                            "$readn $regex $regml $regsub $regsubex $remove $remtok $replace $replacex " +
-                            "$reptok $result $rgb $right $round $scid $scon $script $scriptdir $scriptline " +
-                            "$sdir $send $server $serverip $sfile $sha1 $shortfn $show $signal $sin " +
-                            "$site $sline $snick $snicks $snotify $sock $sockbr $sockerr $sockname " +
-                            "$sorttok $sound $sqrt $ssl $sreq $sslready $status $strip $str $stripped " +
-                            "$syle $submenu $switchbar $tan $target $ticks $time $timer $timestamp " +
-                            "$timestampfmt $timezone $tip $titlebar $toolbar $treebar $trust $ulevel " +
-                            "$ulist $upper $uptime $url $usermode $v1 $v2 $var $vcmd $vcmdstat $vcmdver " +
-                            "$version $vnick $vol $wid $width $wildsite $wildtok $window $wrap $xor");
-  var keywords = parseWords("abook ajinvite alias aline ame amsg anick aop auser autojoin avoice " +
-                            "away background ban bcopy beep bread break breplace bset btrunc bunset bwrite " +
-                            "channel clear clearall cline clipboard close cnick color comclose comopen " +
-                            "comreg continue copy creq ctcpreply ctcps dcc dccserver dde ddeserver " +
-                            "debug dec describe dialog did didtok disable disconnect dlevel dline dll " +
-                            "dns dqwindow drawcopy drawdot drawfill drawline drawpic drawrect drawreplace " +
-                            "drawrot drawsave drawscroll drawtext ebeeps echo editbox emailaddr enable " +
-                            "events exit fclose filter findtext finger firewall flash flist flood flush " +
-                            "flushini font fopen fseek fsend fserve fullname fwrite ghide gload gmove " +
-                            "gopts goto gplay gpoint gqreq groups gshow gsize gstop gtalk gunload hadd " +
-                            "halt haltdef hdec hdel help hfree hinc hload hmake hop hsave ial ialclear " +
-                            "ialmark identd if ignore iline inc invite iuser join kick linesep links list " +
-                            "load loadbuf localinfo log mdi me menubar mkdir mnick mode msg nick noop notice " +
-                            "notify omsg onotice part partall pdcc perform play playctrl pop protect pvoice " +
-                            "qme qmsg query queryn quit raw reload remini remote remove rename renwin " +
-                            "reseterror resetidle return rlevel rline rmdir run ruser save savebuf saveini " +
-                            "say scid scon server set showmirc signam sline sockaccept sockclose socklist " +
-                            "socklisten sockmark sockopen sockpause sockread sockrename sockudp sockwrite " +
-                            "sound speak splay sreq strip switchbar timer timestamp titlebar tnick tokenize " +
-                            "toolbar topic tray treebar ulist unload unset unsetall updatenl url uwho " +
-                            "var vcadd vcmd vcrem vol while whois window winhelp write writeint if isalnum " +
-                            "isalpha isaop isavoice isban ischan ishop isignore isin isincs isletter islower " +
-                            "isnotify isnum ison isop isprotect isreg isupper isvoice iswm iswmcs " +
-                            "elseif else goto menu nicklist status title icon size option text edit " +
-                            "button check radio box scroll list combo link tab item");
-  var functions = parseWords("if elseif else and not or eq ne in ni for foreach while switch");
-  var isOperatorChar = /[+\-*&%=<>!?^\/\|]/;
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-  function tokenBase(stream, state) {
-    var beforeParams = state.beforeParams;
-    state.beforeParams = false;
-    var ch = stream.next();
-    if (/[\[\]{}\(\),\.]/.test(ch)) {
-      if (ch == "(" && beforeParams) state.inParams = true;
-      else if (ch == ")") state.inParams = false;
-      return null;
-    }
-    else if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    else if (ch == "\\") {
-      stream.eat("\\");
-      stream.eat(/./);
-      return "number";
-    }
-    else if (ch == "/" && stream.eat("*")) {
-      return chain(stream, state, tokenComment);
-    }
-    else if (ch == ";" && stream.match(/ *\( *\(/)) {
-      return chain(stream, state, tokenUnparsed);
-    }
-    else if (ch == ";" && !state.inParams) {
-      stream.skipToEnd();
-      return "comment";
-    }
-    else if (ch == '"') {
-      stream.eat(/"/);
-      return "keyword";
-    }
-    else if (ch == "$") {
-      stream.eatWhile(/[$_a-z0-9A-Z\.:]/);
-      if (specials && specials.propertyIsEnumerable(stream.current().toLowerCase())) {
-        return "keyword";
-      }
-      else {
-        state.beforeParams = true;
-        return "builtin";
-      }
-    }
-    else if (ch == "%") {
-      stream.eatWhile(/[^,^\s^\(^\)]/);
-      state.beforeParams = true;
-      return "string";
-    }
-    else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    else {
-      stream.eatWhile(/[\w\$_{}]/);
-      var word = stream.current().toLowerCase();
-      if (keywords && keywords.propertyIsEnumerable(word))
-        return "keyword";
-      if (functions && functions.propertyIsEnumerable(word)) {
-        state.beforeParams = true;
-        return "keyword";
-      }
-      return null;
-    }
-  }
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-  function tokenUnparsed(stream, state) {
-    var maybeEnd = 0, ch;
-    while (ch = stream.next()) {
-      if (ch == ";" && maybeEnd == 2) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      if (ch == ")")
-        maybeEnd++;
-      else if (ch != " ")
-        maybeEnd = 0;
-    }
-    return "meta";
-  }
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        beforeParams: false,
-        inParams: false
-      };
-    },
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      return state.tokenize(stream, state);
-    }
-  };
-});
-
-});
diff --git a/www/code/codemirror-5.7/mode/mllike/index.html b/www/code/codemirror-5.7/mode/mllike/index.html
deleted file mode 100644
index 5923af8f8..000000000
--- a/www/code/codemirror-5.7/mode/mllike/index.html
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-CodeMirror: ML-like mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    OCaml mode
    
-
-
-
-
-
    F# mode
    
-
-
-
-
-
-
    MIME types defined: text/x-ocaml (OCaml) and text/x-fsharp (F#).
    
-
    
diff --git a/www/code/codemirror-5.7/mode/mllike/mllike.js b/www/code/codemirror-5.7/mode/mllike/mllike.js
deleted file mode 100644
index bf0b8a674..000000000
--- a/www/code/codemirror-5.7/mode/mllike/mllike.js
+++ /dev/null
@@ -1,205 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode('mllike', function(_config, parserConfig) {
-  var words = {
-    'let': 'keyword',
-    'rec': 'keyword',
-    'in': 'keyword',
-    'of': 'keyword',
-    'and': 'keyword',
-    'if': 'keyword',
-    'then': 'keyword',
-    'else': 'keyword',
-    'for': 'keyword',
-    'to': 'keyword',
-    'while': 'keyword',
-    'do': 'keyword',
-    'done': 'keyword',
-    'fun': 'keyword',
-    'function': 'keyword',
-    'val': 'keyword',
-    'type': 'keyword',
-    'mutable': 'keyword',
-    'match': 'keyword',
-    'with': 'keyword',
-    'try': 'keyword',
-    'open': 'builtin',
-    'ignore': 'builtin',
-    'begin': 'keyword',
-    'end': 'keyword'
-  };
-
-  var extraWords = parserConfig.extraWords || {};
-  for (var prop in extraWords) {
-    if (extraWords.hasOwnProperty(prop)) {
-      words[prop] = parserConfig.extraWords[prop];
-    }
-  }
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-
-    if (ch === '"') {
-      state.tokenize = tokenString;
-      return state.tokenize(stream, state);
-    }
-    if (ch === '(') {
-      if (stream.eat('*')) {
-        state.commentLevel++;
-        state.tokenize = tokenComment;
-        return state.tokenize(stream, state);
-      }
-    }
-    if (ch === '~') {
-      stream.eatWhile(/\w/);
-      return 'variable-2';
-    }
-    if (ch === '`') {
-      stream.eatWhile(/\w/);
-      return 'quote';
-    }
-    if (ch === '/' && parserConfig.slashComments && stream.eat('/')) {
-      stream.skipToEnd();
-      return 'comment';
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\d]/);
-      if (stream.eat('.')) {
-        stream.eatWhile(/[\d]/);
-      }
-      return 'number';
-    }
-    if ( /[+\-*&%=<>!?|]/.test(ch)) {
-      return 'operator';
-    }
-    stream.eatWhile(/\w/);
-    var cur = stream.current();
-    return words.hasOwnProperty(cur) ? words[cur] : 'variable';
-  }
-
-  function tokenString(stream, state) {
-    var next, end = false, escaped = false;
-    while ((next = stream.next()) != null) {
-      if (next === '"' && !escaped) {
-        end = true;
-        break;
-      }
-      escaped = !escaped && next === '\\';
-    }
-    if (end && !escaped) {
-      state.tokenize = tokenBase;
-    }
-    return 'string';
-  };
-
-  function tokenComment(stream, state) {
-    var prev, next;
-    while(state.commentLevel > 0 && (next = stream.next()) != null) {
-      if (prev === '(' && next === '*') state.commentLevel++;
-      if (prev === '*' && next === ')') state.commentLevel--;
-      prev = next;
-    }
-    if (state.commentLevel <= 0) {
-      state.tokenize = tokenBase;
-    }
-    return 'comment';
-  }
-
-  return {
-    startState: function() {return {tokenize: tokenBase, commentLevel: 0};},
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      return state.tokenize(stream, state);
-    },
-
-    blockCommentStart: "(*",
-    blockCommentEnd: "*)",
-    lineComment: parserConfig.slashComments ? "//" : null
-  };
-});
-
-CodeMirror.defineMIME('text/x-ocaml', {
-  name: 'mllike',
-  extraWords: {
-    'succ': 'keyword',
-    'trace': 'builtin',
-    'exit': 'builtin',
-    'print_string': 'builtin',
-    'print_endline': 'builtin',
-    'true': 'atom',
-    'false': 'atom',
-    'raise': 'keyword'
-  }
-});
-
-CodeMirror.defineMIME('text/x-fsharp', {
-  name: 'mllike',
-  extraWords: {
-    'abstract': 'keyword',
-    'as': 'keyword',
-    'assert': 'keyword',
-    'base': 'keyword',
-    'class': 'keyword',
-    'default': 'keyword',
-    'delegate': 'keyword',
-    'downcast': 'keyword',
-    'downto': 'keyword',
-    'elif': 'keyword',
-    'exception': 'keyword',
-    'extern': 'keyword',
-    'finally': 'keyword',
-    'global': 'keyword',
-    'inherit': 'keyword',
-    'inline': 'keyword',
-    'interface': 'keyword',
-    'internal': 'keyword',
-    'lazy': 'keyword',
-    'let!': 'keyword',
-    'member' : 'keyword',
-    'module': 'keyword',
-    'namespace': 'keyword',
-    'new': 'keyword',
-    'null': 'keyword',
-    'override': 'keyword',
-    'private': 'keyword',
-    'public': 'keyword',
-    'return': 'keyword',
-    'return!': 'keyword',
-    'select': 'keyword',
-    'static': 'keyword',
-    'struct': 'keyword',
-    'upcast': 'keyword',
-    'use': 'keyword',
-    'use!': 'keyword',
-    'val': 'keyword',
-    'when': 'keyword',
-    'yield': 'keyword',
-    'yield!': 'keyword',
-
-    'List': 'builtin',
-    'Seq': 'builtin',
-    'Map': 'builtin',
-    'Set': 'builtin',
-    'int': 'builtin',
-    'string': 'builtin',
-    'raise': 'builtin',
-    'failwith': 'builtin',
-    'not': 'builtin',
-    'true': 'builtin',
-    'false': 'builtin'
-  },
-  slashComments: true
-});
-
-});
diff --git a/www/code/codemirror-5.7/mode/modelica/index.html b/www/code/codemirror-5.7/mode/modelica/index.html
deleted file mode 100644
index 408c3b17e..000000000
--- a/www/code/codemirror-5.7/mode/modelica/index.html
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-CodeMirror: Modelica mode
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Modelica mode
    
-
-
    
-
-    
-
-    
    Simple mode that tries to handle Modelica as well as it can.
    
-
-    
    MIME types defined: text/x-modelica
-    (Modlica code).
    
-
    
diff --git a/www/code/codemirror-5.7/mode/modelica/modelica.js b/www/code/codemirror-5.7/mode/modelica/modelica.js
deleted file mode 100644
index 77ec7a3c1..000000000
--- a/www/code/codemirror-5.7/mode/modelica/modelica.js
+++ /dev/null
@@ -1,245 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Modelica support for CodeMirror, copyright (c) by Lennart Ochel
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})
-
-(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("modelica", function(config, parserConfig) {
-
-    var indentUnit = config.indentUnit;
-    var keywords = parserConfig.keywords || {};
-    var builtin = parserConfig.builtin || {};
-    var atoms = parserConfig.atoms || {};
-
-    var isSingleOperatorChar = /[;=\(:\),{}.*<>+\-\/^\[\]]/;
-    var isDoubleOperatorChar = /(:=|<=|>=|==|<>|\.\+|\.\-|\.\*|\.\/|\.\^)/;
-    var isDigit = /[0-9]/;
-    var isNonDigit = /[_a-zA-Z]/;
-
-    function tokenLineComment(stream, state) {
-      stream.skipToEnd();
-      state.tokenize = null;
-      return "comment";
-    }
-
-    function tokenBlockComment(stream, state) {
-      var maybeEnd = false, ch;
-      while (ch = stream.next()) {
-        if (maybeEnd && ch == "/") {
-          state.tokenize = null;
-          break;
-        }
-        maybeEnd = (ch == "*");
-      }
-      return "comment";
-    }
-
-    function tokenString(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == '"' && !escaped) {
-          state.tokenize = null;
-          state.sol = false;
-          break;
-        }
-        escaped = !escaped && ch == "\\";
-      }
-
-      return "string";
-    }
-
-    function tokenIdent(stream, state) {
-      stream.eatWhile(isDigit);
-      while (stream.eat(isDigit) || stream.eat(isNonDigit)) { }
-
-
-      var cur = stream.current();
-
-      if(state.sol && (cur == "package" || cur == "model" || cur == "when" || cur == "connector")) state.level++;
-      else if(state.sol && cur == "end" && state.level > 0) state.level--;
-
-      state.tokenize = null;
-      state.sol = false;
-
-      if (keywords.propertyIsEnumerable(cur)) return "keyword";
-      else if (builtin.propertyIsEnumerable(cur)) return "builtin";
-      else if (atoms.propertyIsEnumerable(cur)) return "atom";
-      else return "variable";
-    }
-
-    function tokenQIdent(stream, state) {
-      while (stream.eat(/[^']/)) { }
-
-      state.tokenize = null;
-      state.sol = false;
-
-      if(stream.eat("'"))
-        return "variable";
-      else
-        return "error";
-    }
-
-    function tokenUnsignedNuber(stream, state) {
-      stream.eatWhile(isDigit);
-      if (stream.eat('.')) {
-        stream.eatWhile(isDigit);
-      }
-      if (stream.eat('e') || stream.eat('E')) {
-        if (!stream.eat('-'))
-          stream.eat('+');
-        stream.eatWhile(isDigit);
-      }
-
-      state.tokenize = null;
-      state.sol = false;
-      return "number";
-    }
-
-    // Interface
-    return {
-      startState: function() {
-        return {
-          tokenize: null,
-          level: 0,
-          sol: true
-        };
-      },
-
-      token: function(stream, state) {
-        if(state.tokenize != null) {
-          return state.tokenize(stream, state);
-        }
-
-        if(stream.sol()) {
-          state.sol = true;
-        }
-
-        // WHITESPACE
-        if(stream.eatSpace()) {
-          state.tokenize = null;
-          return null;
-        }
-
-        var ch = stream.next();
-
-        // LINECOMMENT
-        if(ch == '/' && stream.eat('/')) {
-          state.tokenize = tokenLineComment;
-        }
-        // BLOCKCOMMENT
-        else if(ch == '/' && stream.eat('*')) {
-          state.tokenize = tokenBlockComment;
-        }
-        // TWO SYMBOL TOKENS
-        else if(isDoubleOperatorChar.test(ch+stream.peek())) {
-          stream.next();
-          state.tokenize = null;
-          return "operator";
-        }
-        // SINGLE SYMBOL TOKENS
-        else if(isSingleOperatorChar.test(ch)) {
-          state.tokenize = null;
-          return "operator";
-        }
-        // IDENT
-        else if(isNonDigit.test(ch)) {
-          state.tokenize = tokenIdent;
-        }
-        // Q-IDENT
-        else if(ch == "'" && stream.peek() && stream.peek() != "'") {
-          state.tokenize = tokenQIdent;
-        }
-        // STRING
-        else if(ch == '"') {
-          state.tokenize = tokenString;
-        }
-        // UNSIGNED_NUBER
-        else if(isDigit.test(ch)) {
-          state.tokenize = tokenUnsignedNuber;
-        }
-        // ERROR
-        else {
-          state.tokenize = null;
-          return "error";
-        }
-
-        return state.tokenize(stream, state);
-      },
-
-      indent: function(state, textAfter) {
-        if (state.tokenize != null) return CodeMirror.Pass;
-
-        var level = state.level;
-        if(/(algorithm)/.test(textAfter)) level--;
-        if(/(equation)/.test(textAfter)) level--;
-        if(/(initial algorithm)/.test(textAfter)) level--;
-        if(/(initial equation)/.test(textAfter)) level--;
-        if(/(end)/.test(textAfter)) level--;
-
-        if(level > 0)
-          return indentUnit*level;
-        else
-          return 0;
-      },
-
-      blockCommentStart: "/*",
-      blockCommentEnd: "*/",
-      lineComment: "//"
-    };
-  });
-
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i=0; i
-
-CodeMirror: Oz mode
-
-
-
-
-
-
-
-
-
-
    
-
    MscGen mode
    
-
-
    
-
-    
-
-    
    MIME types defined: text/x-mscgen
    
-
    
diff --git a/www/code/codemirror-5.7/mode/mscgen/index_msgenny.html b/www/code/codemirror-5.7/mode/mscgen/index_msgenny.html
deleted file mode 100644
index 1664f3051..000000000
--- a/www/code/codemirror-5.7/mode/mscgen/index_msgenny.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-  
-    
-    CodeMirror: msgenny mode
-    
-    
-    
-    
-  
-  
-    
    CodeMirror: msgenny mode
    
-
-
    
-
-    
-
-    
    MIME types defined: text/x-msgenny
    
-  
-
diff --git a/www/code/codemirror-5.7/mode/mscgen/index_xu.html b/www/code/codemirror-5.7/mode/mscgen/index_xu.html
deleted file mode 100644
index 2f7bf9ec0..000000000
--- a/www/code/codemirror-5.7/mode/mscgen/index_xu.html
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-  
-    
-    CodeMirror: xu mode
-    
-    
-    
-    
-  
-  
-    
    CodeMirror: xù mode
    
-
-
    
-
-    
-
-    
    MIME types defined: text/x-xu
    
-  
-
diff --git a/www/code/codemirror-5.7/mode/mscgen/mscgen.js b/www/code/codemirror-5.7/mode/mscgen/mscgen.js
deleted file mode 100644
index 3cf4eb089..000000000
--- a/www/code/codemirror-5.7/mode/mscgen/mscgen.js
+++ /dev/null
@@ -1,169 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// mode(s) for the sequence chart dsl's mscgen, xù and msgenny
-// For more information on mscgen, see the site of the original author:
-// http://www.mcternan.me.uk/mscgen
-//
-// This mode for mscgen and the two derivative languages were
-// originally made for use in the mscgen_js interpreter
-// (https://sverweij.github.io/mscgen_js)
-
-(function(mod) {
-  if ( typeof exports == "object" && typeof module == "object")// CommonJS
-    mod(require("../../lib/codemirror"));
-  else if ( typeof define == "function" && define.amd)// AMD
-    define(["../../lib/codemirror"], mod);
-  else// Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var languages = {
-    mscgen: {
-      "keywords" : ["msc"],
-      "options" : ["hscale", "width", "arcgradient", "wordwraparcs"],
-      "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
-      "brackets" : ["\\{", "\\}"], // [ and  ] are brackets too, but these get handled in with lists
-      "arcsWords" : ["note", "abox", "rbox", "box"],
-      "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
-      "singlecomment" : ["//", "#"],
-      "operators" : ["="]
-    },
-    xu: {
-      "keywords" : ["msc"],
-      "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
-      "attributes" : ["label", "idurl", "id", "url", "linecolor", "linecolour", "textcolor", "textcolour", "textbgcolor", "textbgcolour", "arclinecolor", "arclinecolour", "arctextcolor", "arctextcolour", "arctextbgcolor", "arctextbgcolour", "arcskip"],
-      "brackets" : ["\\{", "\\}"],  // [ and  ] are brackets too, but these get handled in with lists
-      "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
-      "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
-      "singlecomment" : ["//", "#"],
-      "operators" : ["="]
-    },
-    msgenny: {
-      "keywords" : null,
-      "options" : ["hscale", "width", "arcgradient", "wordwraparcs", "watermark"],
-      "attributes" : null,
-      "brackets" : ["\\{", "\\}"],
-      "arcsWords" : ["note", "abox", "rbox", "box", "alt", "else", "opt", "break", "par", "seq", "strict", "neg", "critical", "ignore", "consider", "assert", "loop", "ref", "exc"],
-      "arcsOthers" : ["\\|\\|\\|", "\\.\\.\\.", "---", "--", "<->", "==", "<<=>>", "<=>", "\\.\\.", "<<>>", "::", "<:>", "->", "=>>", "=>", ">>", ":>", "<-", "<<=", "<=", "<<", "<:", "x-", "-x"],
-      "singlecomment" : ["//", "#"],
-      "operators" : ["="]
-    }
-  }
-
-  CodeMirror.defineMode("mscgen", function(_, modeConfig) {
-    var language = languages[modeConfig && modeConfig.language || "mscgen"]
-    return {
-      startState: startStateFn,
-      copyState: copyStateFn,
-      token: produceTokenFunction(language),
-      lineComment : "#",
-      blockCommentStart : "/*",
-      blockCommentEnd : "*/"
-    };
-  });
-
-  CodeMirror.defineMIME("text/x-mscgen", "mscgen");
-  CodeMirror.defineMIME("text/x-xu", {name: "mscgen", language: "xu"});
-  CodeMirror.defineMIME("text/x-msgenny", {name: "mscgen", language: "msgenny"});
-
-  function wordRegexpBoundary(pWords) {
-    return new RegExp("\\b((" + pWords.join(")|(") + "))\\b", "i");
-  }
-
-  function wordRegexp(pWords) {
-    return new RegExp("((" + pWords.join(")|(") + "))", "i");
-  }
-
-  function startStateFn() {
-    return {
-      inComment : false,
-      inString : false,
-      inAttributeList : false,
-      inScript : false
-    };
-  }
-
-  function copyStateFn(pState) {
-    return {
-      inComment : pState.inComment,
-      inString : pState.inString,
-      inAttributeList : pState.inAttributeList,
-      inScript : pState.inScript
-    };
-  }
-
-  function produceTokenFunction(pConfig) {
-
-    return function(pStream, pState) {
-      if (pStream.match(wordRegexp(pConfig.brackets), true, true)) {
-        return "bracket";
-      }
-      /* comments */
-      if (!pState.inComment) {
-        if (pStream.match(/\/\*[^\*\/]*/, true, true)) {
-          pState.inComment = true;
-          return "comment";
-        }
-        if (pStream.match(wordRegexp(pConfig.singlecomment), true, true)) {
-          pStream.skipToEnd();
-          return "comment";
-        }
-      }
-      if (pState.inComment) {
-        if (pStream.match(/[^\*\/]*\*\//, true, true))
-          pState.inComment = false;
-        else
-          pStream.skipToEnd();
-        return "comment";
-      }
-      /* strings */
-      if (!pState.inString && pStream.match(/\"(\\\"|[^\"])*/, true, true)) {
-        pState.inString = true;
-        return "string";
-      }
-      if (pState.inString) {
-        if (pStream.match(/[^\"]*\"/, true, true))
-          pState.inString = false;
-        else
-          pStream.skipToEnd();
-        return "string";
-      }
-      /* keywords & operators */
-      if (!!pConfig.keywords && pStream.match(wordRegexpBoundary(pConfig.keywords), true, true))
-        return "keyword";
-
-      if (pStream.match(wordRegexpBoundary(pConfig.options), true, true))
-        return "keyword";
-
-      if (pStream.match(wordRegexpBoundary(pConfig.arcsWords), true, true))
-        return "keyword";
-
-      if (pStream.match(wordRegexp(pConfig.arcsOthers), true, true))
-        return "keyword";
-
-      if (!!pConfig.operators && pStream.match(wordRegexp(pConfig.operators), true, true))
-        return "operator";
-
-      /* attribute lists */
-      if (!pConfig.inAttributeList && !!pConfig.attributes && pStream.match(/\[/, true, true)) {
-        pConfig.inAttributeList = true;
-        return "bracket";
-      }
-      if (pConfig.inAttributeList) {
-        if (pConfig.attributes !== null && pStream.match(wordRegexpBoundary(pConfig.attributes), true, true)) {
-          return "attribute";
-        }
-        if (pStream.match(/]/, true, true)) {
-          pConfig.inAttributeList = false;
-          return "bracket";
-        }
-      }
-
-      pStream.next();
-      return "base";
-    };
-  }
-
-});
diff --git a/www/code/codemirror-5.7/mode/mscgen/mscgen_test.js b/www/code/codemirror-5.7/mode/mscgen/mscgen_test.js
deleted file mode 100644
index e319a3997..000000000
--- a/www/code/codemirror-5.7/mode/mscgen/mscgen_test.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "mscgen");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("empty chart",
-     "[keyword msc][bracket {]",
-     "[base   ]",
-     "[bracket }]"
-   );
-
-  MT("comments",
-    "[comment // a single line comment]",
-    "[comment # another  single line comment /* and */ ignored here]",
-    "[comment /* A multi-line comment even though it contains]",
-    "[comment msc keywords and \"quoted text\"*/]");
-
-  MT("strings",
-    "[string \"// a string\"]",
-    "[string \"a string running over]",
-    "[string two lines\"]",
-    "[string \"with \\\"escaped quote\"]"
-  );
-
-  MT("xù/ msgenny keywords classify as 'base'",
-    "[base watermark]",
-    "[base alt loop opt ref else break par seq assert]"
-  );
-
-  MT("mscgen options classify as keyword",
-    "[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
-  );
-
-  MT("mscgen arcs classify as keyword",
-    "[keyword note]","[keyword abox]","[keyword rbox]","[keyword box]",
-    "[keyword |||...---]", "[keyword ..--==::]",
-    "[keyword ->]", "[keyword <-]", "[keyword <->]",
-    "[keyword =>]", "[keyword <=]", "[keyword <=>]",
-    "[keyword =>>]", "[keyword <<=]", "[keyword <<=>>]",
-    "[keyword >>]", "[keyword <<]", "[keyword <<>>]",
-    "[keyword -x]", "[keyword x-]", "[keyword -X]", "[keyword X-]",
-    "[keyword :>]", "[keyword <:]", "[keyword <:>]"
-  );
-
-  MT("within an attribute list, attributes classify as attribute",
-    "[bracket [[][attribute label]",
-    "[attribute id]","[attribute url]","[attribute idurl]",
-    "[attribute linecolor]","[attribute linecolour]","[attribute textcolor]","[attribute textcolour]","[attribute textbgcolor]","[attribute textbgcolour]",
-    "[attribute arclinecolor]","[attribute arclinecolour]","[attribute arctextcolor]","[attribute arctextcolour]","[attribute arctextbgcolor]","[attribute arctextbgcolour]",
-    "[attribute arcskip][bracket ]]]"
-  );
-
-  MT("outside an attribute list, attributes classify as base",
-    "[base label]",
-    "[base id]","[base url]","[base idurl]",
-    "[base linecolor]","[base linecolour]","[base textcolor]","[base textcolour]","[base textbgcolor]","[base textbgcolour]",
-    "[base arclinecolor]","[base arclinecolour]","[base arctextcolor]","[base arctextcolour]","[base arctextbgcolor]","[base arctextbgcolour]",
-    "[base arcskip]"
-  );
-
-  MT("a typical program",
-    "[comment # typical mscgen program]",
-    "[keyword msc][base  ][bracket {]",
-    "[keyword wordwraparcs][operator =][string \"true\"][base , ][keyword hscale][operator =][string \"0.8\"][keyword arcgradient][operator =][base 30;]",
-    "[base   a][bracket [[][attribute label][operator =][string \"Entity A\"][bracket ]]][base ,]",
-    "[base   b][bracket [[][attribute label][operator =][string \"Entity B\"][bracket ]]][base ,]",
-    "[base   c][bracket [[][attribute label][operator =][string \"Entity C\"][bracket ]]][base ;]",
-    "[base   a ][keyword =>>][base  b][bracket [[][attribute label][operator =][string \"Hello entity B\"][bracket ]]][base ;]",
-    "[base   a ][keyword <<][base  b][bracket [[][attribute label][operator =][string \"Here's an answer dude!\"][bracket ]]][base ;]",
-    "[base   c ][keyword :>][base  *][bracket [[][attribute label][operator =][string \"What about me?\"][base , ][attribute textcolor][operator =][base red][bracket ]]][base ;]",
-    "[bracket }]"
-  );
-})();
diff --git a/www/code/codemirror-5.7/mode/mscgen/msgenny_test.js b/www/code/codemirror-5.7/mode/mscgen/msgenny_test.js
deleted file mode 100644
index 80173de08..000000000
--- a/www/code/codemirror-5.7/mode/mscgen/msgenny_test.js
+++ /dev/null
@@ -1,71 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-msgenny");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "msgenny"); }
-
-  MT("comments",
-    "[comment // a single line comment]",
-    "[comment # another  single line comment /* and */ ignored here]",
-    "[comment /* A multi-line comment even though it contains]",
-    "[comment msc keywords and \"quoted text\"*/]");
-
-  MT("strings",
-    "[string \"// a string\"]",
-    "[string \"a string running over]",
-    "[string two lines\"]",
-    "[string \"with \\\"escaped quote\"]"
-  );
-
-  MT("xù/ msgenny keywords classify as 'keyword'",
-    "[keyword watermark]",
-    "[keyword alt]","[keyword loop]","[keyword opt]","[keyword ref]","[keyword else]","[keyword break]","[keyword par]","[keyword seq]","[keyword assert]"
-  );
-
-  MT("mscgen options classify as keyword",
-    "[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
-  );
-
-  MT("mscgen arcs classify as keyword",
-    "[keyword note]","[keyword abox]","[keyword rbox]","[keyword box]",
-    "[keyword |||...---]", "[keyword ..--==::]",
-    "[keyword ->]", "[keyword <-]", "[keyword <->]",
-    "[keyword =>]", "[keyword <=]", "[keyword <=>]",
-    "[keyword =>>]", "[keyword <<=]", "[keyword <<=>>]",
-    "[keyword >>]", "[keyword <<]", "[keyword <<>>]",
-    "[keyword -x]", "[keyword x-]", "[keyword -X]", "[keyword X-]",
-    "[keyword :>]", "[keyword <:]", "[keyword <:>]"
-  );
-
-  MT("within an attribute list, mscgen/ xù attributes classify as base",
-    "[base [[label]",
-    "[base idurl id url]",
-    "[base linecolor linecolour textcolor textcolour textbgcolor textbgcolour]",
-    "[base arclinecolor arclinecolour arctextcolor arctextcolour arctextbgcolor arctextbgcolour]",
-    "[base arcskip]]]"
-  );
-
-  MT("outside an attribute list, mscgen/ xù attributes classify as base",
-    "[base label]",
-    "[base idurl id url]",
-    "[base linecolor linecolour textcolor textcolour textbgcolor textbgcolour]",
-    "[base arclinecolor arclinecolour arctextcolor arctextcolour arctextbgcolor arctextbgcolour]",
-    "[base arcskip]"
-  );
-
-  MT("a typical program",
-    "[comment # typical msgenny program]",
-    "[keyword wordwraparcs][operator =][string \"true\"][base , ][keyword hscale][operator =][string \"0.8\"][base , ][keyword arcgradient][operator =][base 30;]",
-    "[base   a : ][string \"Entity A\"][base ,]",
-    "[base   b : Entity B,]",
-    "[base   c : Entity C;]",
-    "[base   a ][keyword =>>][base  b: ][string \"Hello entity B\"][base ;]",
-    "[base   a ][keyword alt][base  c][bracket {]",
-    "[base     a ][keyword <<][base  b: ][string \"Here's an answer dude!\"][base ;]",
-    "[keyword ---][base : ][string \"sorry, won't march - comm glitch\"]",
-    "[base     a ][keyword x-][base  b: ][string \"Here's an answer dude! (won't arrive...)\"][base ;]",
-    "[bracket }]",
-    "[base   c ][keyword :>][base  *: What about me?;]"
-  );
-})();
diff --git a/www/code/codemirror-5.7/mode/mscgen/xu_test.js b/www/code/codemirror-5.7/mode/mscgen/xu_test.js
deleted file mode 100644
index f9a50f0af..000000000
--- a/www/code/codemirror-5.7/mode/mscgen/xu_test.js
+++ /dev/null
@@ -1,75 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-xu");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "xu"); }
-
-  MT("empty chart",
-     "[keyword msc][bracket {]",
-     "[base   ]",
-     "[bracket }]"
-   );
-
-  MT("comments",
-    "[comment // a single line comment]",
-    "[comment # another  single line comment /* and */ ignored here]",
-    "[comment /* A multi-line comment even though it contains]",
-    "[comment msc keywords and \"quoted text\"*/]");
-
-  MT("strings",
-    "[string \"// a string\"]",
-    "[string \"a string running over]",
-    "[string two lines\"]",
-    "[string \"with \\\"escaped quote\"]"
-  );
-
-  MT("xù/ msgenny keywords classify as 'keyword'",
-    "[keyword watermark]",
-    "[keyword alt]","[keyword loop]","[keyword opt]","[keyword ref]","[keyword else]","[keyword break]","[keyword par]","[keyword seq]","[keyword assert]"
-  );
-
-  MT("mscgen options classify as keyword",
-    "[keyword hscale]", "[keyword width]", "[keyword arcgradient]", "[keyword wordwraparcs]"
-  );
-
-  MT("mscgen arcs classify as keyword",
-    "[keyword note]","[keyword abox]","[keyword rbox]","[keyword box]",
-    "[keyword |||...---]", "[keyword ..--==::]",
-    "[keyword ->]", "[keyword <-]", "[keyword <->]",
-    "[keyword =>]", "[keyword <=]", "[keyword <=>]",
-    "[keyword =>>]", "[keyword <<=]", "[keyword <<=>>]",
-    "[keyword >>]", "[keyword <<]", "[keyword <<>>]",
-    "[keyword -x]", "[keyword x-]", "[keyword -X]", "[keyword X-]",
-    "[keyword :>]", "[keyword <:]", "[keyword <:>]"
-  );
-
-  MT("within an attribute list, attributes classify as attribute",
-    "[bracket [[][attribute label]",
-    "[attribute id]","[attribute url]","[attribute idurl]",
-    "[attribute linecolor]","[attribute linecolour]","[attribute textcolor]","[attribute textcolour]","[attribute textbgcolor]","[attribute textbgcolour]",
-    "[attribute arclinecolor]","[attribute arclinecolour]","[attribute arctextcolor]","[attribute arctextcolour]","[attribute arctextbgcolor]","[attribute arctextbgcolour]",
-    "[attribute arcskip][bracket ]]]"
-  );
-
-  MT("outside an attribute list, attributes classify as base",
-    "[base label]",
-    "[base id]","[base url]","[base idurl]",
-    "[base linecolor]","[base linecolour]","[base textcolor]","[base textcolour]","[base textbgcolor]","[base textbgcolour]",
-    "[base arclinecolor]","[base arclinecolour]","[base arctextcolor]","[base arctextcolour]","[base arctextbgcolor]","[base arctextbgcolour]",
-    "[base arcskip]"
-  );
-
-  MT("a typical program",
-    "[comment # typical mscgen program]",
-    "[keyword msc][base  ][bracket {]",
-    "[keyword wordwraparcs][operator =][string \"true\"][keyword hscale][operator =][string \"0.8\"][keyword arcgradient][operator =][base 30;]",
-    "[base   a][bracket [[][attribute label][operator =][string \"Entity A\"][bracket ]]][base ,]",
-    "[base   b][bracket [[][attribute label][operator =][string \"Entity B\"][bracket ]]][base ,]",
-    "[base   c][bracket [[][attribute label][operator =][string \"Entity C\"][bracket ]]][base ;]",
-    "[base   a ][keyword =>>][base  b][bracket [[][attribute label][operator =][string \"Hello entity B\"][bracket ]]][base ;]",
-    "[base   a ][keyword <<][base  b][bracket [[][attribute label][operator =][string \"Here's an answer dude!\"][bracket ]]][base ;]",
-    "[base   c ][keyword :>][base  *][bracket [[][attribute label][operator =][string \"What about me?\"][base , ][attribute textcolor][operator =][base red][bracket ]]][base ;]",
-    "[bracket }]"
-  );
-})();
diff --git a/www/code/codemirror-5.7/mode/mumps/index.html b/www/code/codemirror-5.7/mode/mumps/index.html
deleted file mode 100644
index bd1f69aef..000000000
--- a/www/code/codemirror-5.7/mode/mumps/index.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-CodeMirror: MUMPS mode
-
-
-
-
-
-
-
-
-
-
    
-
    MUMPS mode
    
-
-
-
    
-    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/mumps/mumps.js b/www/code/codemirror-5.7/mode/mumps/mumps.js
deleted file mode 100644
index 469f8c3d1..000000000
--- a/www/code/codemirror-5.7/mode/mumps/mumps.js
+++ /dev/null
@@ -1,148 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/*
-  This MUMPS Language script was constructed using vbscript.js as a template.
-*/
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("mumps", function() {
-    function wordRegexp(words) {
-      return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
-    }
-
-    var singleOperators = new RegExp("^[\\+\\-\\*/&#!_?\\\\<>=\\'\\[\\]]");
-    var doubleOperators = new RegExp("^(('=)|(<=)|(>=)|('>)|('<)|([[)|(]])|(^$))");
-    var singleDelimiters = new RegExp("^[\\.,:]");
-    var brackets = new RegExp("[()]");
-    var identifiers = new RegExp("^[%A-Za-z][A-Za-z0-9]*");
-    var commandKeywords = ["break","close","do","else","for","goto", "halt", "hang", "if", "job","kill","lock","merge","new","open", "quit", "read", "set", "tcommit", "trollback", "tstart", "use", "view", "write", "xecute", "b","c","d","e","f","g", "h", "i", "j","k","l","m","n","o", "q", "r", "s", "tc", "tro", "ts", "u", "v", "w", "x"];
-    // The following list includes instrinsic functions _and_ special variables
-    var intrinsicFuncsWords = ["\\$ascii", "\\$char", "\\$data", "\\$ecode", "\\$estack", "\\$etrap", "\\$extract", "\\$find", "\\$fnumber", "\\$get", "\\$horolog", "\\$io", "\\$increment", "\\$job", "\\$justify", "\\$length", "\\$name", "\\$next", "\\$order", "\\$piece", "\\$qlength", "\\$qsubscript", "\\$query", "\\$quit", "\\$random", "\\$reverse", "\\$select", "\\$stack", "\\$test", "\\$text", "\\$translate", "\\$view", "\\$x", "\\$y", "\\$a", "\\$c", "\\$d", "\\$e", "\\$ec", "\\$es", "\\$et", "\\$f", "\\$fn", "\\$g", "\\$h", "\\$i", "\\$j", "\\$l", "\\$n", "\\$na", "\\$o", "\\$p", "\\$q", "\\$ql", "\\$qs", "\\$r", "\\$re", "\\$s", "\\$st", "\\$t", "\\$tr", "\\$v", "\\$z"];
-    var intrinsicFuncs = wordRegexp(intrinsicFuncsWords);
-    var command = wordRegexp(commandKeywords);
-
-    function tokenBase(stream, state) {
-      if (stream.sol()) {
-        state.label = true;
-        state.commandMode = 0;
-      }
-
-      // The  character has meaning in MUMPS. Ignoring consecutive
-      // spaces would interfere with interpreting whether the next non-space
-      // character belongs to the command or argument context.
-
-      // Examine each character and update a mode variable whose interpretation is:
-      //   >0 => command    0 => argument    <0 => command post-conditional
-      var ch = stream.peek();
-
-      if (ch == " " || ch == "\t") { // Pre-process 
-        state.label = false;
-        if (state.commandMode == 0)
-          state.commandMode = 1;
-        else if ((state.commandMode < 0) || (state.commandMode == 2))
-          state.commandMode = 0;
-      } else if ((ch != ".") && (state.commandMode > 0)) {
-        if (ch == ":")
-          state.commandMode = -1;   // SIS - Command post-conditional
-        else
-          state.commandMode = 2;
-      }
-
-      // Do not color parameter list as line tag
-      if ((ch === "(") || (ch === "\u0009"))
-        state.label = false;
-
-      // MUMPS comment starts with ";"
-      if (ch === ";") {
-        stream.skipToEnd();
-        return "comment";
-      }
-
-      // Number Literals // SIS/RLM - MUMPS permits canonic number followed by concatenate operator
-      if (stream.match(/^[-+]?\d+(\.\d+)?([eE][-+]?\d+)?/))
-        return "number";
-
-      // Handle Strings
-      if (ch == '"') {
-        if (stream.skipTo('"')) {
-          stream.next();
-          return "string";
-        } else {
-          stream.skipToEnd();
-          return "error";
-        }
-      }
-
-      // Handle operators and Delimiters
-      if (stream.match(doubleOperators) || stream.match(singleOperators))
-        return "operator";
-
-      // Prevents leading "." in DO block from falling through to error
-      if (stream.match(singleDelimiters))
-        return null;
-
-      if (brackets.test(ch)) {
-        stream.next();
-        return "bracket";
-      }
-
-      if (state.commandMode > 0 && stream.match(command))
-        return "variable-2";
-
-      if (stream.match(intrinsicFuncs))
-        return "builtin";
-
-      if (stream.match(identifiers))
-        return "variable";
-
-      // Detect dollar-sign when not a documented intrinsic function
-      // "^" may introduce a GVN or SSVN - Color same as function
-      if (ch === "$" || ch === "^") {
-        stream.next();
-        return "builtin";
-      }
-
-      // MUMPS Indirection
-      if (ch === "@") {
-        stream.next();
-        return "string-2";
-      }
-
-      if (/[\w%]/.test(ch)) {
-        stream.eatWhile(/[\w%]/);
-        return "variable";
-      }
-
-      // Handle non-detected items
-      stream.next();
-      return "error";
-    }
-
-    return {
-      startState: function() {
-        return {
-          label: false,
-          commandMode: 0
-        };
-      },
-
-      token: function(stream, state) {
-        var style = tokenBase(stream, state);
-        if (state.label) return "tag";
-        return style;
-      }
-    };
-  });
-
-  CodeMirror.defineMIME("text/x-mumps", "mumps");
-});
diff --git a/www/code/codemirror-5.7/mode/nginx/index.html b/www/code/codemirror-5.7/mode/nginx/index.html
deleted file mode 100644
index 5ffdc081c..000000000
--- a/www/code/codemirror-5.7/mode/nginx/index.html
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-CodeMirror: NGINX mode
-
-
-
-
-
-
-
-    
-  
-
-  
-
-
-
    
-
    NGINX mode
    
-
    
-    
-
-    
    MIME types defined: text/nginx.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/nginx/nginx.js b/www/code/codemirror-5.7/mode/nginx/nginx.js
deleted file mode 100644
index 135b9cc7f..000000000
--- a/www/code/codemirror-5.7/mode/nginx/nginx.js
+++ /dev/null
@@ -1,178 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("nginx", function(config) {
-
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  var keywords = words(
-    /* ngxDirectiveControl */ "break return rewrite set" +
-    /* ngxDirective */ " accept_mutex accept_mutex_delay access_log add_after_body add_before_body add_header addition_types aio alias allow ancient_browser ancient_browser_value auth_basic auth_basic_user_file auth_http auth_http_header auth_http_timeout autoindex autoindex_exact_size autoindex_localtime charset charset_types client_body_buffer_size client_body_in_file_only client_body_in_single_buffer client_body_temp_path client_body_timeout client_header_buffer_size client_header_timeout client_max_body_size connection_pool_size create_full_put_path daemon dav_access dav_methods debug_connection debug_points default_type degradation degrade deny devpoll_changes devpoll_events directio directio_alignment empty_gif env epoll_events error_log eventport_events expires fastcgi_bind fastcgi_buffer_size fastcgi_buffers fastcgi_busy_buffers_size fastcgi_cache fastcgi_cache_key fastcgi_cache_methods fastcgi_cache_min_uses fastcgi_cache_path fastcgi_cache_use_stale fastcgi_cache_valid fastcgi_catch_stderr fastcgi_connect_timeout fastcgi_hide_header fastcgi_ignore_client_abort fastcgi_ignore_headers fastcgi_index fastcgi_intercept_errors fastcgi_max_temp_file_size fastcgi_next_upstream fastcgi_param fastcgi_pass_header fastcgi_pass_request_body fastcgi_pass_request_headers fastcgi_read_timeout fastcgi_send_lowat fastcgi_send_timeout fastcgi_split_path_info fastcgi_store fastcgi_store_access fastcgi_temp_file_write_size fastcgi_temp_path fastcgi_upstream_fail_timeout fastcgi_upstream_max_fails flv geoip_city geoip_country google_perftools_profiles gzip gzip_buffers gzip_comp_level gzip_disable gzip_hash gzip_http_version gzip_min_length gzip_no_buffer gzip_proxied gzip_static gzip_types gzip_vary gzip_window if_modified_since ignore_invalid_headers image_filter image_filter_buffer image_filter_jpeg_quality image_filter_transparency imap_auth imap_capabilities imap_client_buffer index ip_hash keepalive_requests keepalive_timeout kqueue_changes kqueue_events large_client_header_buffers limit_conn limit_conn_log_level limit_rate limit_rate_after limit_req limit_req_log_level limit_req_zone limit_zone lingering_time lingering_timeout lock_file log_format log_not_found log_subrequest map_hash_bucket_size map_hash_max_size master_process memcached_bind memcached_buffer_size memcached_connect_timeout memcached_next_upstream memcached_read_timeout memcached_send_timeout memcached_upstream_fail_timeout memcached_upstream_max_fails merge_slashes min_delete_depth modern_browser modern_browser_value msie_padding msie_refresh multi_accept open_file_cache open_file_cache_errors open_file_cache_events open_file_cache_min_uses open_file_cache_valid open_log_file_cache output_buffers override_charset perl perl_modules perl_require perl_set pid pop3_auth pop3_capabilities port_in_redirect postpone_gzipping postpone_output protocol proxy proxy_bind proxy_buffer proxy_buffer_size proxy_buffering proxy_buffers proxy_busy_buffers_size proxy_cache proxy_cache_key proxy_cache_methods proxy_cache_min_uses proxy_cache_path proxy_cache_use_stale proxy_cache_valid proxy_connect_timeout proxy_headers_hash_bucket_size proxy_headers_hash_max_size proxy_hide_header proxy_ignore_client_abort proxy_ignore_headers proxy_intercept_errors proxy_max_temp_file_size proxy_method proxy_next_upstream proxy_pass_error_message proxy_pass_header proxy_pass_request_body proxy_pass_request_headers proxy_read_timeout proxy_redirect proxy_send_lowat proxy_send_timeout proxy_set_body proxy_set_header proxy_ssl_session_reuse proxy_store proxy_store_access proxy_temp_file_write_size proxy_temp_path proxy_timeout proxy_upstream_fail_timeout proxy_upstream_max_fails random_index read_ahead real_ip_header recursive_error_pages request_pool_size reset_timedout_connection resolver resolver_timeout rewrite_log rtsig_overflow_events rtsig_overflow_test rtsig_overflow_threshold rtsig_signo satisfy secure_link_secret send_lowat send_timeout sendfile sendfile_max_chunk server_name_in_redirect server_names_hash_bucket_size server_names_hash_max_size server_tokens set_real_ip_from smtp_auth smtp_capabilities smtp_client_buffer smtp_greeting_delay so_keepalive source_charset ssi ssi_ignore_recycled_buffers ssi_min_file_chunk ssi_silent_errors ssi_types ssi_value_length ssl ssl_certificate ssl_certificate_key ssl_ciphers ssl_client_certificate ssl_crl ssl_dhparam ssl_engine ssl_prefer_server_ciphers ssl_protocols ssl_session_cache ssl_session_timeout ssl_verify_client ssl_verify_depth starttls stub_status sub_filter sub_filter_once sub_filter_types tcp_nodelay tcp_nopush thread_stack_size timeout timer_resolution types_hash_bucket_size types_hash_max_size underscores_in_headers uninitialized_variable_warn use user userid userid_domain userid_expires userid_mark userid_name userid_p3p userid_path userid_service valid_referers variables_hash_bucket_size variables_hash_max_size worker_connections worker_cpu_affinity worker_priority worker_processes worker_rlimit_core worker_rlimit_nofile worker_rlimit_sigpending worker_threads working_directory xclient xml_entities xslt_stylesheet xslt_typesdrew@li229-23"
-    );
-
-  var keywords_block = words(
-    /* ngxDirectiveBlock */ "http mail events server types location upstream charset_map limit_except if geo map"
-    );
-
-  var keywords_important = words(
-    /* ngxDirectiveImportant */ "include root server server_name listen internal proxy_pass memcached_pass fastcgi_pass try_files"
-    );
-
-  var indentUnit = config.indentUnit, type;
-  function ret(style, tp) {type = tp; return style;}
-
-  function tokenBase(stream, state) {
-
-
-    stream.eatWhile(/[\w\$_]/);
-
-    var cur = stream.current();
-
-
-    if (keywords.propertyIsEnumerable(cur)) {
-      return "keyword";
-    }
-    else if (keywords_block.propertyIsEnumerable(cur)) {
-      return "variable-2";
-    }
-    else if (keywords_important.propertyIsEnumerable(cur)) {
-      return "string-2";
-    }
-    /**/
-
-    var ch = stream.next();
-    if (ch == "@") {stream.eatWhile(/[\w\\\-]/); return ret("meta", stream.current());}
-    else if (ch == "/" && stream.eat("*")) {
-      state.tokenize = tokenCComment;
-      return tokenCComment(stream, state);
-    }
-    else if (ch == "<" && stream.eat("!")) {
-      state.tokenize = tokenSGMLComment;
-      return tokenSGMLComment(stream, state);
-    }
-    else if (ch == "=") ret(null, "compare");
-    else if ((ch == "~" || ch == "|") && stream.eat("=")) return ret(null, "compare");
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    else if (ch == "#") {
-      stream.skipToEnd();
-      return ret("comment", "comment");
-    }
-    else if (ch == "!") {
-      stream.match(/^\s*\w*/);
-      return ret("keyword", "important");
-    }
-    else if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w.%]/);
-      return ret("number", "unit");
-    }
-    else if (/[,.+>*\/]/.test(ch)) {
-      return ret(null, "select-op");
-    }
-    else if (/[;{}:\[\]]/.test(ch)) {
-      return ret(null, ch);
-    }
-    else {
-      stream.eatWhile(/[\w\\\-]/);
-      return ret("variable", "variable");
-    }
-  }
-
-  function tokenCComment(stream, state) {
-    var maybeEnd = false, ch;
-    while ((ch = stream.next()) != null) {
-      if (maybeEnd && ch == "/") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenSGMLComment(stream, state) {
-    var dashes = 0, ch;
-    while ((ch = stream.next()) != null) {
-      if (dashes >= 2 && ch == ">") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      dashes = (ch == "-") ? dashes + 1 : 0;
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped)
-          break;
-        escaped = !escaped && ch == "\\";
-      }
-      if (!escaped) state.tokenize = tokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  return {
-    startState: function(base) {
-      return {tokenize: tokenBase,
-              baseIndent: base || 0,
-              stack: []};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      type = null;
-      var style = state.tokenize(stream, state);
-
-      var context = state.stack[state.stack.length-1];
-      if (type == "hash" && context == "rule") style = "atom";
-      else if (style == "variable") {
-        if (context == "rule") style = "number";
-        else if (!context || context == "@media{") style = "tag";
-      }
-
-      if (context == "rule" && /^[\{\};]$/.test(type))
-        state.stack.pop();
-      if (type == "{") {
-        if (context == "@media") state.stack[state.stack.length-1] = "@media{";
-        else state.stack.push("{");
-      }
-      else if (type == "}") state.stack.pop();
-      else if (type == "@media") state.stack.push("@media");
-      else if (context == "{" && type != "comment") state.stack.push("rule");
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var n = state.stack.length;
-      if (/^\}/.test(textAfter))
-        n -= state.stack[state.stack.length-1] == "rule" ? 2 : 1;
-      return state.baseIndent + n * indentUnit;
-    },
-
-    electricChars: "}"
-  };
-});
-
-CodeMirror.defineMIME("text/nginx", "text/x-nginx-conf");
-
-});
diff --git a/www/code/codemirror-5.7/mode/ntriples/index.html b/www/code/codemirror-5.7/mode/ntriples/index.html
deleted file mode 100644
index 1355e7189..000000000
--- a/www/code/codemirror-5.7/mode/ntriples/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-CodeMirror: NTriples mode
-
-
-
-
-
-
-
-
-
-
    
-
    NTriples mode
    
-
    
-
-
    
-
-    
-    
    MIME types defined: text/n-triples.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/ntriples/ntriples.js b/www/code/codemirror-5.7/mode/ntriples/ntriples.js
deleted file mode 100644
index 0524b1e8a..000000000
--- a/www/code/codemirror-5.7/mode/ntriples/ntriples.js
+++ /dev/null
@@ -1,186 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**********************************************************
-* This script provides syntax highlighting support for
-* the Ntriples format.
-* Ntriples format specification:
-*     http://www.w3.org/TR/rdf-testcases/#ntriples
-***********************************************************/
-
-/*
-    The following expression defines the defined ASF grammar transitions.
-
-    pre_subject ->
-        {
-        ( writing_subject_uri | writing_bnode_uri )
-            -> pre_predicate
-                -> writing_predicate_uri
-                    -> pre_object
-                        -> writing_object_uri | writing_object_bnode |
-                          (
-                            writing_object_literal
-                                -> writing_literal_lang | writing_literal_type
-                          )
-                            -> post_object
-                                -> BEGIN
-         } otherwise {
-             -> ERROR
-         }
-*/
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("ntriples", function() {
-
-  var Location = {
-    PRE_SUBJECT         : 0,
-    WRITING_SUB_URI     : 1,
-    WRITING_BNODE_URI   : 2,
-    PRE_PRED            : 3,
-    WRITING_PRED_URI    : 4,
-    PRE_OBJ             : 5,
-    WRITING_OBJ_URI     : 6,
-    WRITING_OBJ_BNODE   : 7,
-    WRITING_OBJ_LITERAL : 8,
-    WRITING_LIT_LANG    : 9,
-    WRITING_LIT_TYPE    : 10,
-    POST_OBJ            : 11,
-    ERROR               : 12
-  };
-  function transitState(currState, c) {
-    var currLocation = currState.location;
-    var ret;
-
-    // Opening.
-    if     (currLocation == Location.PRE_SUBJECT && c == '<') ret = Location.WRITING_SUB_URI;
-    else if(currLocation == Location.PRE_SUBJECT && c == '_') ret = Location.WRITING_BNODE_URI;
-    else if(currLocation == Location.PRE_PRED    && c == '<') ret = Location.WRITING_PRED_URI;
-    else if(currLocation == Location.PRE_OBJ     && c == '<') ret = Location.WRITING_OBJ_URI;
-    else if(currLocation == Location.PRE_OBJ     && c == '_') ret = Location.WRITING_OBJ_BNODE;
-    else if(currLocation == Location.PRE_OBJ     && c == '"') ret = Location.WRITING_OBJ_LITERAL;
-
-    // Closing.
-    else if(currLocation == Location.WRITING_SUB_URI     && c == '>') ret = Location.PRE_PRED;
-    else if(currLocation == Location.WRITING_BNODE_URI   && c == ' ') ret = Location.PRE_PRED;
-    else if(currLocation == Location.WRITING_PRED_URI    && c == '>') ret = Location.PRE_OBJ;
-    else if(currLocation == Location.WRITING_OBJ_URI     && c == '>') ret = Location.POST_OBJ;
-    else if(currLocation == Location.WRITING_OBJ_BNODE   && c == ' ') ret = Location.POST_OBJ;
-    else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '"') ret = Location.POST_OBJ;
-    else if(currLocation == Location.WRITING_LIT_LANG && c == ' ') ret = Location.POST_OBJ;
-    else if(currLocation == Location.WRITING_LIT_TYPE && c == '>') ret = Location.POST_OBJ;
-
-    // Closing typed and language literal.
-    else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '@') ret = Location.WRITING_LIT_LANG;
-    else if(currLocation == Location.WRITING_OBJ_LITERAL && c == '^') ret = Location.WRITING_LIT_TYPE;
-
-    // Spaces.
-    else if( c == ' ' &&
-             (
-               currLocation == Location.PRE_SUBJECT ||
-               currLocation == Location.PRE_PRED    ||
-               currLocation == Location.PRE_OBJ     ||
-               currLocation == Location.POST_OBJ
-             )
-           ) ret = currLocation;
-
-    // Reset.
-    else if(currLocation == Location.POST_OBJ && c == '.') ret = Location.PRE_SUBJECT;
-
-    // Error
-    else ret = Location.ERROR;
-
-    currState.location=ret;
-  }
-
-  return {
-    startState: function() {
-       return {
-           location : Location.PRE_SUBJECT,
-           uris     : [],
-           anchors  : [],
-           bnodes   : [],
-           langs    : [],
-           types    : []
-       };
-    },
-    token: function(stream, state) {
-      var ch = stream.next();
-      if(ch == '<') {
-         transitState(state, ch);
-         var parsedURI = '';
-         stream.eatWhile( function(c) { if( c != '#' && c != '>' ) { parsedURI += c; return true; } return false;} );
-         state.uris.push(parsedURI);
-         if( stream.match('#', false) ) return 'variable';
-         stream.next();
-         transitState(state, '>');
-         return 'variable';
-      }
-      if(ch == '#') {
-        var parsedAnchor = '';
-        stream.eatWhile(function(c) { if(c != '>' && c != ' ') { parsedAnchor+= c; return true; } return false;});
-        state.anchors.push(parsedAnchor);
-        return 'variable-2';
-      }
-      if(ch == '>') {
-          transitState(state, '>');
-          return 'variable';
-      }
-      if(ch == '_') {
-          transitState(state, ch);
-          var parsedBNode = '';
-          stream.eatWhile(function(c) { if( c != ' ' ) { parsedBNode += c; return true; } return false;});
-          state.bnodes.push(parsedBNode);
-          stream.next();
-          transitState(state, ' ');
-          return 'builtin';
-      }
-      if(ch == '"') {
-          transitState(state, ch);
-          stream.eatWhile( function(c) { return c != '"'; } );
-          stream.next();
-          if( stream.peek() != '@' && stream.peek() != '^' ) {
-              transitState(state, '"');
-          }
-          return 'string';
-      }
-      if( ch == '@' ) {
-          transitState(state, '@');
-          var parsedLang = '';
-          stream.eatWhile(function(c) { if( c != ' ' ) { parsedLang += c; return true; } return false;});
-          state.langs.push(parsedLang);
-          stream.next();
-          transitState(state, ' ');
-          return 'string-2';
-      }
-      if( ch == '^' ) {
-          stream.next();
-          transitState(state, '^');
-          var parsedType = '';
-          stream.eatWhile(function(c) { if( c != '>' ) { parsedType += c; return true; } return false;} );
-          state.types.push(parsedType);
-          stream.next();
-          transitState(state, '>');
-          return 'variable';
-      }
-      if( ch == ' ' ) {
-          transitState(state, ch);
-      }
-      if( ch == '.' ) {
-          transitState(state, ch);
-      }
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/n-triples", "ntriples");
-
-});
diff --git a/www/code/codemirror-5.7/mode/octave/index.html b/www/code/codemirror-5.7/mode/octave/index.html
deleted file mode 100644
index 79df58119..000000000
--- a/www/code/codemirror-5.7/mode/octave/index.html
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-CodeMirror: Octave mode
-
-
-
-
-
-
-
-
-
-
    
-
    Octave mode
    
-
-    
    
-    
-
-    
    MIME types defined: text/x-octave.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/octave/octave.js b/www/code/codemirror-5.7/mode/octave/octave.js
deleted file mode 100644
index a7bec030c..000000000
--- a/www/code/codemirror-5.7/mode/octave/octave.js
+++ /dev/null
@@ -1,135 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("octave", function() {
-  function wordRegexp(words) {
-    return new RegExp("^((" + words.join(")|(") + "))\\b");
-  }
-
-  var singleOperators = new RegExp("^[\\+\\-\\*/&|\\^~<>!@'\\\\]");
-  var singleDelimiters = new RegExp('^[\\(\\[\\{\\},:=;]');
-  var doubleOperators = new RegExp("^((==)|(~=)|(<=)|(>=)|(<<)|(>>)|(\\.[\\+\\-\\*/\\^\\\\]))");
-  var doubleDelimiters = new RegExp("^((!=)|(\\+=)|(\\-=)|(\\*=)|(/=)|(&=)|(\\|=)|(\\^=))");
-  var tripleDelimiters = new RegExp("^((>>=)|(<<=))");
-  var expressionEnd = new RegExp("^[\\]\\)]");
-  var identifiers = new RegExp("^[_A-Za-z\xa1-\uffff][_A-Za-z0-9\xa1-\uffff]*");
-
-  var builtins = wordRegexp([
-    'error', 'eval', 'function', 'abs', 'acos', 'atan', 'asin', 'cos',
-    'cosh', 'exp', 'log', 'prod', 'sum', 'log10', 'max', 'min', 'sign', 'sin', 'sinh',
-    'sqrt', 'tan', 'reshape', 'break', 'zeros', 'default', 'margin', 'round', 'ones',
-    'rand', 'syn', 'ceil', 'floor', 'size', 'clear', 'zeros', 'eye', 'mean', 'std', 'cov',
-    'det', 'eig', 'inv', 'norm', 'rank', 'trace', 'expm', 'logm', 'sqrtm', 'linspace', 'plot',
-    'title', 'xlabel', 'ylabel', 'legend', 'text', 'grid', 'meshgrid', 'mesh', 'num2str',
-    'fft', 'ifft', 'arrayfun', 'cellfun', 'input', 'fliplr', 'flipud', 'ismember'
-  ]);
-
-  var keywords = wordRegexp([
-    'return', 'case', 'switch', 'else', 'elseif', 'end', 'endif', 'endfunction',
-    'if', 'otherwise', 'do', 'for', 'while', 'try', 'catch', 'classdef', 'properties', 'events',
-    'methods', 'global', 'persistent', 'endfor', 'endwhile', 'printf', 'sprintf', 'disp', 'until',
-    'continue', 'pkg'
-  ]);
-
-
-  // tokenizers
-  function tokenTranspose(stream, state) {
-    if (!stream.sol() && stream.peek() === '\'') {
-      stream.next();
-      state.tokenize = tokenBase;
-      return 'operator';
-    }
-    state.tokenize = tokenBase;
-    return tokenBase(stream, state);
-  }
-
-
-  function tokenComment(stream, state) {
-    if (stream.match(/^.*%}/)) {
-      state.tokenize = tokenBase;
-      return 'comment';
-    };
-    stream.skipToEnd();
-    return 'comment';
-  }
-
-  function tokenBase(stream, state) {
-    // whitespaces
-    if (stream.eatSpace()) return null;
-
-    // Handle one line Comments
-    if (stream.match('%{')){
-      state.tokenize = tokenComment;
-      stream.skipToEnd();
-      return 'comment';
-    }
-
-    if (stream.match(/^[%#]/)){
-      stream.skipToEnd();
-      return 'comment';
-    }
-
-    // Handle Number Literals
-    if (stream.match(/^[0-9\.+-]/, false)) {
-      if (stream.match(/^[+-]?0x[0-9a-fA-F]+[ij]?/)) {
-        stream.tokenize = tokenBase;
-        return 'number'; };
-      if (stream.match(/^[+-]?\d*\.\d+([EeDd][+-]?\d+)?[ij]?/)) { return 'number'; };
-      if (stream.match(/^[+-]?\d+([EeDd][+-]?\d+)?[ij]?/)) { return 'number'; };
-    }
-    if (stream.match(wordRegexp(['nan','NaN','inf','Inf']))) { return 'number'; };
-
-    // Handle Strings
-    if (stream.match(/^"([^"]|(""))*"/)) { return 'string'; } ;
-    if (stream.match(/^'([^']|(''))*'/)) { return 'string'; } ;
-
-    // Handle words
-    if (stream.match(keywords)) { return 'keyword'; } ;
-    if (stream.match(builtins)) { return 'builtin'; } ;
-    if (stream.match(identifiers)) { return 'variable'; } ;
-
-    if (stream.match(singleOperators) || stream.match(doubleOperators)) { return 'operator'; };
-    if (stream.match(singleDelimiters) || stream.match(doubleDelimiters) || stream.match(tripleDelimiters)) { return null; };
-
-    if (stream.match(expressionEnd)) {
-      state.tokenize = tokenTranspose;
-      return null;
-    };
-
-
-    // Handle non-detected items
-    stream.next();
-    return 'error';
-  };
-
-
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase
-      };
-    },
-
-    token: function(stream, state) {
-      var style = state.tokenize(stream, state);
-      if (style === 'number' || style === 'variable'){
-        state.tokenize = tokenTranspose;
-      }
-      return style;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-octave", "octave");
-
-});
diff --git a/www/code/codemirror-5.7/mode/oz/index.html b/www/code/codemirror-5.7/mode/oz/index.html
deleted file mode 100644
index febd82a59..000000000
--- a/www/code/codemirror-5.7/mode/oz/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-CodeMirror: Oz mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Oz mode
    
-
-
    MIME type defined: text/x-oz.
    
-
-
-
    
diff --git a/www/code/codemirror-5.7/mode/oz/oz.js b/www/code/codemirror-5.7/mode/oz/oz.js
deleted file mode 100644
index ee8cb0ad1..000000000
--- a/www/code/codemirror-5.7/mode/oz/oz.js
+++ /dev/null
@@ -1,252 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("oz", function (conf) {
-
-  function wordRegexp(words) {
-    return new RegExp("^((" + words.join(")|(") + "))\\b");
-  }
-
-  var singleOperators = /[\^@!\|<>#~\.\*\-\+\\/,=]/;
-  var doubleOperators = /(<-)|(:=)|(=<)|(>=)|(<=)|(<:)|(>:)|(=:)|(\\=)|(\\=:)|(!!)|(==)|(::)/;
-  var tripleOperators = /(:::)|(\.\.\.)|(=<:)|(>=:)/;
-
-  var middle = ["in", "then", "else", "of", "elseof", "elsecase", "elseif", "catch",
-    "finally", "with", "require", "prepare", "import", "export", "define", "do"];
-  var end = ["end"];
-
-  var atoms = wordRegexp(["true", "false", "nil", "unit"]);
-  var commonKeywords = wordRegexp(["andthen", "at", "attr", "declare", "feat", "from", "lex",
-    "mod", "mode", "orelse", "parser", "prod", "prop", "scanner", "self", "syn", "token"]);
-  var openingKeywords = wordRegexp(["local", "proc", "fun", "case", "class", "if", "cond", "or", "dis",
-    "choice", "not", "thread", "try", "raise", "lock", "for", "suchthat", "meth", "functor"]);
-  var middleKeywords = wordRegexp(middle);
-  var endKeywords = wordRegexp(end);
-
-  // Tokenizers
-  function tokenBase(stream, state) {
-    if (stream.eatSpace()) {
-      return null;
-    }
-
-    // Brackets
-    if(stream.match(/[{}]/)) {
-      return "bracket";
-    }
-
-    // Special [] keyword
-    if (stream.match(/(\[])/)) {
-        return "keyword"
-    }
-
-    // Operators
-    if (stream.match(tripleOperators) || stream.match(doubleOperators)) {
-      return "operator";
-    }
-
-    // Atoms
-    if(stream.match(atoms)) {
-      return 'atom';
-    }
-
-    // Opening keywords
-    var matched = stream.match(openingKeywords);
-    if (matched) {
-      if (!state.doInCurrentLine)
-        state.currentIndent++;
-      else
-        state.doInCurrentLine = false;
-
-      // Special matching for signatures
-      if(matched[0] == "proc" || matched[0] == "fun")
-        state.tokenize = tokenFunProc;
-      else if(matched[0] == "class")
-        state.tokenize = tokenClass;
-      else if(matched[0] == "meth")
-        state.tokenize = tokenMeth;
-
-      return 'keyword';
-    }
-
-    // Middle and other keywords
-    if (stream.match(middleKeywords) || stream.match(commonKeywords)) {
-      return "keyword"
-    }
-
-    // End keywords
-    if (stream.match(endKeywords)) {
-      state.currentIndent--;
-      return 'keyword';
-    }
-
-    // Eat the next char for next comparisons
-    var ch = stream.next();
-
-    // Strings
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-
-    // Numbers
-    if (/[~\d]/.test(ch)) {
-      if (ch == "~") {
-        if(! /^[0-9]/.test(stream.peek()))
-          return null;
-        else if (( stream.next() == "0" && stream.match(/^[xX][0-9a-fA-F]+/)) || stream.match(/^[0-9]*(\.[0-9]+)?([eE][~+]?[0-9]+)?/))
-          return "number";
-      }
-
-      if ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/)) || stream.match(/^[0-9]*(\.[0-9]+)?([eE][~+]?[0-9]+)?/))
-        return "number";
-
-      return null;
-    }
-
-    // Comments
-    if (ch == "%") {
-      stream.skipToEnd();
-      return 'comment';
-    }
-    else if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      }
-    }
-
-    // Single operators
-    if(singleOperators.test(ch)) {
-      return "operator";
-    }
-
-    // If nothing match, we skip the entire alphanumerical block
-    stream.eatWhile(/\w/);
-
-    return "variable";
-  }
-
-  function tokenClass(stream, state) {
-    if (stream.eatSpace()) {
-      return null;
-    }
-    stream.match(/([A-Z][A-Za-z0-9_]*)|(`.+`)/);
-    state.tokenize = tokenBase;
-    return "variable-3"
-  }
-
-  function tokenMeth(stream, state) {
-    if (stream.eatSpace()) {
-      return null;
-    }
-    stream.match(/([a-zA-Z][A-Za-z0-9_]*)|(`.+`)/);
-    state.tokenize = tokenBase;
-    return "def"
-  }
-
-  function tokenFunProc(stream, state) {
-    if (stream.eatSpace()) {
-      return null;
-    }
-
-    if(!state.hasPassedFirstStage && stream.eat("{")) {
-      state.hasPassedFirstStage = true;
-      return "bracket";
-    }
-    else if(state.hasPassedFirstStage) {
-      stream.match(/([A-Z][A-Za-z0-9_]*)|(`.+`)|\$/);
-      state.hasPassedFirstStage = false;
-      state.tokenize = tokenBase;
-      return "def"
-    }
-    else {
-      state.tokenize = tokenBase;
-      return null;
-    }
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function tokenString(quote) {
-    return function (stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-          end = true;
-          break;
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !escaped)
-        state.tokenize = tokenBase;
-      return "string";
-    };
-  }
-
-  function buildElectricInputRegEx() {
-    // Reindentation should occur on [] or on a match of any of
-    // the block closing keywords, at the end of a line.
-    var allClosings = middle.concat(end);
-    return new RegExp("[\\[\\]]|(" + allClosings.join("|") + ")$");
-  }
-
-  return {
-
-    startState: function () {
-      return {
-        tokenize: tokenBase,
-        currentIndent: 0,
-        doInCurrentLine: false,
-        hasPassedFirstStage: false
-      };
-    },
-
-    token: function (stream, state) {
-      if (stream.sol())
-        state.doInCurrentLine = 0;
-
-      return state.tokenize(stream, state);
-    },
-
-    indent: function (state, textAfter) {
-      var trueText = textAfter.replace(/^\s+|\s+$/g, '');
-
-      if (trueText.match(endKeywords) || trueText.match(middleKeywords) || trueText.match(/(\[])/))
-        return conf.indentUnit * (state.currentIndent - 1);
-
-      if (state.currentIndent < 0)
-        return 0;
-
-      return state.currentIndent * conf.indentUnit;
-    },
-    fold: "indent",
-    electricInput: buildElectricInputRegEx(),
-    lineComment: "%",
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/"
-  };
-});
-
-CodeMirror.defineMIME("text/x-oz", "oz");
-
-});
diff --git a/www/code/codemirror-5.7/mode/pascal/index.html b/www/code/codemirror-5.7/mode/pascal/index.html
deleted file mode 100644
index f8a99ad01..000000000
--- a/www/code/codemirror-5.7/mode/pascal/index.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-CodeMirror: Pascal mode
-
-
-
-
-
-
-
-
-
-
    
-
    Pascal mode
    
-
-
-
    
-
-    
-
-    
    MIME types defined: text/x-pascal.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/pascal/pascal.js b/www/code/codemirror-5.7/mode/pascal/pascal.js
deleted file mode 100644
index 2d0c3d424..000000000
--- a/www/code/codemirror-5.7/mode/pascal/pascal.js
+++ /dev/null
@@ -1,109 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("pascal", function() {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var keywords = words("and array begin case const div do downto else end file for forward integer " +
-                       "boolean char function goto if in label mod nil not of or packed procedure " +
-                       "program record repeat set string then to type until var while with");
-  var atoms = {"null": true};
-
-  var isOperatorChar = /[+\-*&%=<>!?|\/]/;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == "#" && state.startOfLine) {
-      stream.skipToEnd();
-      return "meta";
-    }
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    if (ch == "(" && stream.eat("*")) {
-      state.tokenize = tokenComment;
-      return tokenComment(stream, state);
-    }
-    if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      return null;
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    if (ch == "/") {
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-    }
-    if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    stream.eatWhile(/[\w\$_]/);
-    var cur = stream.current();
-    if (keywords.propertyIsEnumerable(cur)) return "keyword";
-    if (atoms.propertyIsEnumerable(cur)) return "atom";
-    return "variable";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !escaped) state.tokenize = null;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == ")" && maybeEnd) {
-        state.tokenize = null;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  // Interface
-
-  return {
-    startState: function() {
-      return {tokenize: null};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta") return style;
-      return style;
-    },
-
-    electricChars: "{}"
-  };
-});
-
-CodeMirror.defineMIME("text/x-pascal", "pascal");
-
-});
diff --git a/www/code/codemirror-5.7/mode/pegjs/index.html b/www/code/codemirror-5.7/mode/pegjs/index.html
deleted file mode 100644
index 0c7460488..000000000
--- a/www/code/codemirror-5.7/mode/pegjs/index.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-  
-    CodeMirror: PEG.js Mode
-    
-    
-
-    
-    
-    
-    
-    
-  
-  
-    
-
-    
    
-      
    PEG.js Mode
    
-      
    
-      
-      
    The PEG.js Mode
    
-      
     Created by Forbes Lindesay.
    
-    
    
-  
-
diff --git a/www/code/codemirror-5.7/mode/pegjs/pegjs.js b/www/code/codemirror-5.7/mode/pegjs/pegjs.js
deleted file mode 100644
index 306e3768c..000000000
--- a/www/code/codemirror-5.7/mode/pegjs/pegjs.js
+++ /dev/null
@@ -1,114 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../javascript/javascript"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../javascript/javascript"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("pegjs", function (config) {
-  var jsMode = CodeMirror.getMode(config, "javascript");
-
-  function identifier(stream) {
-    return stream.match(/^[a-zA-Z_][a-zA-Z0-9_]*/);
-  }
-
-  return {
-    startState: function () {
-      return {
-        inString: false,
-        stringType: null,
-        inComment: false,
-        inChracterClass: false,
-        braced: 0,
-        lhs: true,
-        localState: null
-      };
-    },
-    token: function (stream, state) {
-      if (stream)
-
-      //check for state changes
-      if (!state.inString && !state.inComment && ((stream.peek() == '"') || (stream.peek() == "'"))) {
-        state.stringType = stream.peek();
-        stream.next(); // Skip quote
-        state.inString = true; // Update state
-      }
-      if (!state.inString && !state.inComment && stream.match(/^\/\*/)) {
-        state.inComment = true;
-      }
-
-      //return state
-      if (state.inString) {
-        while (state.inString && !stream.eol()) {
-          if (stream.peek() === state.stringType) {
-            stream.next(); // Skip quote
-            state.inString = false; // Clear flag
-          } else if (stream.peek() === '\\') {
-            stream.next();
-            stream.next();
-          } else {
-            stream.match(/^.[^\\\"\']*/);
-          }
-        }
-        return state.lhs ? "property string" : "string"; // Token style
-      } else if (state.inComment) {
-        while (state.inComment && !stream.eol()) {
-          if (stream.match(/\*\//)) {
-            state.inComment = false; // Clear flag
-          } else {
-            stream.match(/^.[^\*]*/);
-          }
-        }
-        return "comment";
-      } else if (state.inChracterClass) {
-          while (state.inChracterClass && !stream.eol()) {
-            if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./))) {
-              state.inChracterClass = false;
-            }
-          }
-      } else if (stream.peek() === '[') {
-        stream.next();
-        state.inChracterClass = true;
-        return 'bracket';
-      } else if (stream.match(/^\/\//)) {
-        stream.skipToEnd();
-        return "comment";
-      } else if (state.braced || stream.peek() === '{') {
-        if (state.localState === null) {
-          state.localState = jsMode.startState();
-        }
-        var token = jsMode.token(stream, state.localState);
-        var text = stream.current();
-        if (!token) {
-          for (var i = 0; i < text.length; i++) {
-            if (text[i] === '{') {
-              state.braced++;
-            } else if (text[i] === '}') {
-              state.braced--;
-            }
-          };
-        }
-        return token;
-      } else if (identifier(stream)) {
-        if (stream.peek() === ':') {
-          return 'variable';
-        }
-        return 'variable-2';
-      } else if (['[', ']', '(', ')'].indexOf(stream.peek()) != -1) {
-        stream.next();
-        return 'bracket';
-      } else if (!stream.eatSpace()) {
-        stream.next();
-      }
-      return null;
-    }
-  };
-}, "javascript");
-
-});
diff --git a/www/code/codemirror-5.7/mode/perl/index.html b/www/code/codemirror-5.7/mode/perl/index.html
deleted file mode 100644
index 8c1021c42..000000000
--- a/www/code/codemirror-5.7/mode/perl/index.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-CodeMirror: Perl mode
-
-
-
-
-
-
-
-
-
-
    
-
    Perl mode
    
-
-
-
    
-
-    
-
-    
    MIME types defined: text/x-perl.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/perl/perl.js b/www/code/codemirror-5.7/mode/perl/perl.js
deleted file mode 100644
index bef62bc7d..000000000
--- a/www/code/codemirror-5.7/mode/perl/perl.js
+++ /dev/null
@@ -1,837 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// CodeMirror2 mode/perl/perl.js (text/x-perl) beta 0.10 (2011-11-08)
-// This is a part of CodeMirror from https://github.com/sabaca/CodeMirror_mode_perl (mail@sabaca.com)
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("perl",function(){
-        // http://perldoc.perl.org
-        var PERL={                                      //   null - magic touch
-                                                        //   1 - keyword
-                                                        //   2 - def
-                                                        //   3 - atom
-                                                        //   4 - operator
-                                                        //   5 - variable-2 (predefined)
-                                                        //   [x,y] - x=1,2,3; y=must be defined if x{...}
-                                                //      PERL operators
-                '->'                            :   4,
-                '++'                            :   4,
-                '--'                            :   4,
-                '**'                            :   4,
-                                                        //   ! ~ \ and unary + and -
-                '=~'                            :   4,
-                '!~'                            :   4,
-                '*'                             :   4,
-                '/'                             :   4,
-                '%'                             :   4,
-                'x'                             :   4,
-                '+'                             :   4,
-                '-'                             :   4,
-                '.'                             :   4,
-                '<<'                            :   4,
-                '>>'                            :   4,
-                                                        //   named unary operators
-                '<'                             :   4,
-                '>'                             :   4,
-                '<='                            :   4,
-                '>='                            :   4,
-                'lt'                            :   4,
-                'gt'                            :   4,
-                'le'                            :   4,
-                'ge'                            :   4,
-                '=='                            :   4,
-                '!='                            :   4,
-                '<=>'                           :   4,
-                'eq'                            :   4,
-                'ne'                            :   4,
-                'cmp'                           :   4,
-                '~~'                            :   4,
-                '&'                             :   4,
-                '|'                             :   4,
-                '^'                             :   4,
-                '&&'                            :   4,
-                '||'                            :   4,
-                '//'                            :   4,
-                '..'                            :   4,
-                '...'                           :   4,
-                '?'                             :   4,
-                ':'                             :   4,
-                '='                             :   4,
-                '+='                            :   4,
-                '-='                            :   4,
-                '*='                            :   4,  //   etc. ???
-                ','                             :   4,
-                '=>'                            :   4,
-                '::'                            :   4,
-                                                        //   list operators (rightward)
-                'not'                           :   4,
-                'and'                           :   4,
-                'or'                            :   4,
-                'xor'                           :   4,
-                                                //      PERL predefined variables (I know, what this is a paranoid idea, but may be needed for people, who learn PERL, and for me as well, ...and may be for you?;)
-                'BEGIN'                         :   [5,1],
-                'END'                           :   [5,1],
-                'PRINT'                         :   [5,1],
-                'PRINTF'                        :   [5,1],
-                'GETC'                          :   [5,1],
-                'READ'                          :   [5,1],
-                'READLINE'                      :   [5,1],
-                'DESTROY'                       :   [5,1],
-                'TIE'                           :   [5,1],
-                'TIEHANDLE'                     :   [5,1],
-                'UNTIE'                         :   [5,1],
-                'STDIN'                         :    5,
-                'STDIN_TOP'                     :    5,
-                'STDOUT'                        :    5,
-                'STDOUT_TOP'                    :    5,
-                'STDERR'                        :    5,
-                'STDERR_TOP'                    :    5,
-                '$ARG'                          :    5,
-                '$_'                            :    5,
-                '@ARG'                          :    5,
-                '@_'                            :    5,
-                '$LIST_SEPARATOR'               :    5,
-                '$"'                            :    5,
-                '$PROCESS_ID'                   :    5,
-                '$PID'                          :    5,
-                '$$'                            :    5,
-                '$REAL_GROUP_ID'                :    5,
-                '$GID'                          :    5,
-                '$('                            :    5,
-                '$EFFECTIVE_GROUP_ID'           :    5,
-                '$EGID'                         :    5,
-                '$)'                            :    5,
-                '$PROGRAM_NAME'                 :    5,
-                '$0'                            :    5,
-                '$SUBSCRIPT_SEPARATOR'          :    5,
-                '$SUBSEP'                       :    5,
-                '$;'                            :    5,
-                '$REAL_USER_ID'                 :    5,
-                '$UID'                          :    5,
-                '$<'                            :    5,
-                '$EFFECTIVE_USER_ID'            :    5,
-                '$EUID'                         :    5,
-                '$>'                            :    5,
-                '$a'                            :    5,
-                '$b'                            :    5,
-                '$COMPILING'                    :    5,
-                '$^C'                           :    5,
-                '$DEBUGGING'                    :    5,
-                '$^D'                           :    5,
-                '${^ENCODING}'                  :    5,
-                '$ENV'                          :    5,
-                '%ENV'                          :    5,
-                '$SYSTEM_FD_MAX'                :    5,
-                '$^F'                           :    5,
-                '@F'                            :    5,
-                '${^GLOBAL_PHASE}'              :    5,
-                '$^H'                           :    5,
-                '%^H'                           :    5,
-                '@INC'                          :    5,
-                '%INC'                          :    5,
-                '$INPLACE_EDIT'                 :    5,
-                '$^I'                           :    5,
-                '$^M'                           :    5,
-                '$OSNAME'                       :    5,
-                '$^O'                           :    5,
-                '${^OPEN}'                      :    5,
-                '$PERLDB'                       :    5,
-                '$^P'                           :    5,
-                '$SIG'                          :    5,
-                '%SIG'                          :    5,
-                '$BASETIME'                     :    5,
-                '$^T'                           :    5,
-                '${^TAINT}'                     :    5,
-                '${^UNICODE}'                   :    5,
-                '${^UTF8CACHE}'                 :    5,
-                '${^UTF8LOCALE}'                :    5,
-                '$PERL_VERSION'                 :    5,
-                '$^V'                           :    5,
-                '${^WIN32_SLOPPY_STAT}'         :    5,
-                '$EXECUTABLE_NAME'              :    5,
-                '$^X'                           :    5,
-                '$1'                            :    5, // - regexp $1, $2...
-                '$MATCH'                        :    5,
-                '$&'                            :    5,
-                '${^MATCH}'                     :    5,
-                '$PREMATCH'                     :    5,
-                '$`'                            :    5,
-                '${^PREMATCH}'                  :    5,
-                '$POSTMATCH'                    :    5,
-                "$'"                            :    5,
-                '${^POSTMATCH}'                 :    5,
-                '$LAST_PAREN_MATCH'             :    5,
-                '$+'                            :    5,
-                '$LAST_SUBMATCH_RESULT'         :    5,
-                '$^N'                           :    5,
-                '@LAST_MATCH_END'               :    5,
-                '@+'                            :    5,
-                '%LAST_PAREN_MATCH'             :    5,
-                '%+'                            :    5,
-                '@LAST_MATCH_START'             :    5,
-                '@-'                            :    5,
-                '%LAST_MATCH_START'             :    5,
-                '%-'                            :    5,
-                '$LAST_REGEXP_CODE_RESULT'      :    5,
-                '$^R'                           :    5,
-                '${^RE_DEBUG_FLAGS}'            :    5,
-                '${^RE_TRIE_MAXBUF}'            :    5,
-                '$ARGV'                         :    5,
-                '@ARGV'                         :    5,
-                'ARGV'                          :    5,
-                'ARGVOUT'                       :    5,
-                '$OUTPUT_FIELD_SEPARATOR'       :    5,
-                '$OFS'                          :    5,
-                '$,'                            :    5,
-                '$INPUT_LINE_NUMBER'            :    5,
-                '$NR'                           :    5,
-                '$.'                            :    5,
-                '$INPUT_RECORD_SEPARATOR'       :    5,
-                '$RS'                           :    5,
-                '$/'                            :    5,
-                '$OUTPUT_RECORD_SEPARATOR'      :    5,
-                '$ORS'                          :    5,
-                '$\\'                           :    5,
-                '$OUTPUT_AUTOFLUSH'             :    5,
-                '$|'                            :    5,
-                '$ACCUMULATOR'                  :    5,
-                '$^A'                           :    5,
-                '$FORMAT_FORMFEED'              :    5,
-                '$^L'                           :    5,
-                '$FORMAT_PAGE_NUMBER'           :    5,
-                '$%'                            :    5,
-                '$FORMAT_LINES_LEFT'            :    5,
-                '$-'                            :    5,
-                '$FORMAT_LINE_BREAK_CHARACTERS' :    5,
-                '$:'                            :    5,
-                '$FORMAT_LINES_PER_PAGE'        :    5,
-                '$='                            :    5,
-                '$FORMAT_TOP_NAME'              :    5,
-                '$^'                            :    5,
-                '$FORMAT_NAME'                  :    5,
-                '$~'                            :    5,
-                '${^CHILD_ERROR_NATIVE}'        :    5,
-                '$EXTENDED_OS_ERROR'            :    5,
-                '$^E'                           :    5,
-                '$EXCEPTIONS_BEING_CAUGHT'      :    5,
-                '$^S'                           :    5,
-                '$WARNING'                      :    5,
-                '$^W'                           :    5,
-                '${^WARNING_BITS}'              :    5,
-                '$OS_ERROR'                     :    5,
-                '$ERRNO'                        :    5,
-                '$!'                            :    5,
-                '%OS_ERROR'                     :    5,
-                '%ERRNO'                        :    5,
-                '%!'                            :    5,
-                '$CHILD_ERROR'                  :    5,
-                '$?'                            :    5,
-                '$EVAL_ERROR'                   :    5,
-                '$@'                            :    5,
-                '$OFMT'                         :    5,
-                '$#'                            :    5,
-                '$*'                            :    5,
-                '$ARRAY_BASE'                   :    5,
-                '$['                            :    5,
-                '$OLD_PERL_VERSION'             :    5,
-                '$]'                            :    5,
-                                                //      PERL blocks
-                'if'                            :[1,1],
-                elsif                           :[1,1],
-                'else'                          :[1,1],
-                'while'                         :[1,1],
-                unless                          :[1,1],
-                'for'                           :[1,1],
-                foreach                         :[1,1],
-                                                //      PERL functions
-                'abs'                           :1,     // - absolute value function
-                accept                          :1,     // - accept an incoming socket connect
-                alarm                           :1,     // - schedule a SIGALRM
-                'atan2'                         :1,     // - arctangent of Y/X in the range -PI to PI
-                bind                            :1,     // - binds an address to a socket
-                binmode                         :1,     // - prepare binary files for I/O
-                bless                           :1,     // - create an object
-                bootstrap                       :1,     //
-                'break'                         :1,     // - break out of a "given" block
-                caller                          :1,     // - get context of the current subroutine call
-                chdir                           :1,     // - change your current working directory
-                chmod                           :1,     // - changes the permissions on a list of files
-                chomp                           :1,     // - remove a trailing record separator from a string
-                chop                            :1,     // - remove the last character from a string
-                chown                           :1,     // - change the owership on a list of files
-                chr                             :1,     // - get character this number represents
-                chroot                          :1,     // - make directory new root for path lookups
-                close                           :1,     // - close file (or pipe or socket) handle
-                closedir                        :1,     // - close directory handle
-                connect                         :1,     // - connect to a remote socket
-                'continue'                      :[1,1], // - optional trailing block in a while or foreach
-                'cos'                           :1,     // - cosine function
-                crypt                           :1,     // - one-way passwd-style encryption
-                dbmclose                        :1,     // - breaks binding on a tied dbm file
-                dbmopen                         :1,     // - create binding on a tied dbm file
-                'default'                       :1,     //
-                defined                         :1,     // - test whether a value, variable, or function is defined
-                'delete'                        :1,     // - deletes a value from a hash
-                die                             :1,     // - raise an exception or bail out
-                'do'                            :1,     // - turn a BLOCK into a TERM
-                dump                            :1,     // - create an immediate core dump
-                each                            :1,     // - retrieve the next key/value pair from a hash
-                endgrent                        :1,     // - be done using group file
-                endhostent                      :1,     // - be done using hosts file
-                endnetent                       :1,     // - be done using networks file
-                endprotoent                     :1,     // - be done using protocols file
-                endpwent                        :1,     // - be done using passwd file
-                endservent                      :1,     // - be done using services file
-                eof                             :1,     // - test a filehandle for its end
-                'eval'                          :1,     // - catch exceptions or compile and run code
-                'exec'                          :1,     // - abandon this program to run another
-                exists                          :1,     // - test whether a hash key is present
-                exit                            :1,     // - terminate this program
-                'exp'                           :1,     // - raise I to a power
-                fcntl                           :1,     // - file control system call
-                fileno                          :1,     // - return file descriptor from filehandle
-                flock                           :1,     // - lock an entire file with an advisory lock
-                fork                            :1,     // - create a new process just like this one
-                format                          :1,     // - declare a picture format with use by the write() function
-                formline                        :1,     // - internal function used for formats
-                getc                            :1,     // - get the next character from the filehandle
-                getgrent                        :1,     // - get next group record
-                getgrgid                        :1,     // - get group record given group user ID
-                getgrnam                        :1,     // - get group record given group name
-                gethostbyaddr                   :1,     // - get host record given its address
-                gethostbyname                   :1,     // - get host record given name
-                gethostent                      :1,     // - get next hosts record
-                getlogin                        :1,     // - return who logged in at this tty
-                getnetbyaddr                    :1,     // - get network record given its address
-                getnetbyname                    :1,     // - get networks record given name
-                getnetent                       :1,     // - get next networks record
-                getpeername                     :1,     // - find the other end of a socket connection
-                getpgrp                         :1,     // - get process group
-                getppid                         :1,     // - get parent process ID
-                getpriority                     :1,     // - get current nice value
-                getprotobyname                  :1,     // - get protocol record given name
-                getprotobynumber                :1,     // - get protocol record numeric protocol
-                getprotoent                     :1,     // - get next protocols record
-                getpwent                        :1,     // - get next passwd record
-                getpwnam                        :1,     // - get passwd record given user login name
-                getpwuid                        :1,     // - get passwd record given user ID
-                getservbyname                   :1,     // - get services record given its name
-                getservbyport                   :1,     // - get services record given numeric port
-                getservent                      :1,     // - get next services record
-                getsockname                     :1,     // - retrieve the sockaddr for a given socket
-                getsockopt                      :1,     // - get socket options on a given socket
-                given                           :1,     //
-                glob                            :1,     // - expand filenames using wildcards
-                gmtime                          :1,     // - convert UNIX time into record or string using Greenwich time
-                'goto'                          :1,     // - create spaghetti code
-                grep                            :1,     // - locate elements in a list test true against a given criterion
-                hex                             :1,     // - convert a string to a hexadecimal number
-                'import'                        :1,     // - patch a module's namespace into your own
-                index                           :1,     // - find a substring within a string
-                'int'                           :1,     // - get the integer portion of a number
-                ioctl                           :1,     // - system-dependent device control system call
-                'join'                          :1,     // - join a list into a string using a separator
-                keys                            :1,     // - retrieve list of indices from a hash
-                kill                            :1,     // - send a signal to a process or process group
-                last                            :1,     // - exit a block prematurely
-                lc                              :1,     // - return lower-case version of a string
-                lcfirst                         :1,     // - return a string with just the next letter in lower case
-                length                          :1,     // - return the number of bytes in a string
-                'link'                          :1,     // - create a hard link in the filesytem
-                listen                          :1,     // - register your socket as a server
-                local                           : 2,    // - create a temporary value for a global variable (dynamic scoping)
-                localtime                       :1,     // - convert UNIX time into record or string using local time
-                lock                            :1,     // - get a thread lock on a variable, subroutine, or method
-                'log'                           :1,     // - retrieve the natural logarithm for a number
-                lstat                           :1,     // - stat a symbolic link
-                m                               :null,  // - match a string with a regular expression pattern
-                map                             :1,     // - apply a change to a list to get back a new list with the changes
-                mkdir                           :1,     // - create a directory
-                msgctl                          :1,     // - SysV IPC message control operations
-                msgget                          :1,     // - get SysV IPC message queue
-                msgrcv                          :1,     // - receive a SysV IPC message from a message queue
-                msgsnd                          :1,     // - send a SysV IPC message to a message queue
-                my                              : 2,    // - declare and assign a local variable (lexical scoping)
-                'new'                           :1,     //
-                next                            :1,     // - iterate a block prematurely
-                no                              :1,     // - unimport some module symbols or semantics at compile time
-                oct                             :1,     // - convert a string to an octal number
-                open                            :1,     // - open a file, pipe, or descriptor
-                opendir                         :1,     // - open a directory
-                ord                             :1,     // - find a character's numeric representation
-                our                             : 2,    // - declare and assign a package variable (lexical scoping)
-                pack                            :1,     // - convert a list into a binary representation
-                'package'                       :1,     // - declare a separate global namespace
-                pipe                            :1,     // - open a pair of connected filehandles
-                pop                             :1,     // - remove the last element from an array and return it
-                pos                             :1,     // - find or set the offset for the last/next m//g search
-                print                           :1,     // - output a list to a filehandle
-                printf                          :1,     // - output a formatted list to a filehandle
-                prototype                       :1,     // - get the prototype (if any) of a subroutine
-                push                            :1,     // - append one or more elements to an array
-                q                               :null,  // - singly quote a string
-                qq                              :null,  // - doubly quote a string
-                qr                              :null,  // - Compile pattern
-                quotemeta                       :null,  // - quote regular expression magic characters
-                qw                              :null,  // - quote a list of words
-                qx                              :null,  // - backquote quote a string
-                rand                            :1,     // - retrieve the next pseudorandom number
-                read                            :1,     // - fixed-length buffered input from a filehandle
-                readdir                         :1,     // - get a directory from a directory handle
-                readline                        :1,     // - fetch a record from a file
-                readlink                        :1,     // - determine where a symbolic link is pointing
-                readpipe                        :1,     // - execute a system command and collect standard output
-                recv                            :1,     // - receive a message over a Socket
-                redo                            :1,     // - start this loop iteration over again
-                ref                             :1,     // - find out the type of thing being referenced
-                rename                          :1,     // - change a filename
-                require                         :1,     // - load in external functions from a library at runtime
-                reset                           :1,     // - clear all variables of a given name
-                'return'                        :1,     // - get out of a function early
-                reverse                         :1,     // - flip a string or a list
-                rewinddir                       :1,     // - reset directory handle
-                rindex                          :1,     // - right-to-left substring search
-                rmdir                           :1,     // - remove a directory
-                s                               :null,  // - replace a pattern with a string
-                say                             :1,     // - print with newline
-                scalar                          :1,     // - force a scalar context
-                seek                            :1,     // - reposition file pointer for random-access I/O
-                seekdir                         :1,     // - reposition directory pointer
-                select                          :1,     // - reset default output or do I/O multiplexing
-                semctl                          :1,     // - SysV semaphore control operations
-                semget                          :1,     // - get set of SysV semaphores
-                semop                           :1,     // - SysV semaphore operations
-                send                            :1,     // - send a message over a socket
-                setgrent                        :1,     // - prepare group file for use
-                sethostent                      :1,     // - prepare hosts file for use
-                setnetent                       :1,     // - prepare networks file for use
-                setpgrp                         :1,     // - set the process group of a process
-                setpriority                     :1,     // - set a process's nice value
-                setprotoent                     :1,     // - prepare protocols file for use
-                setpwent                        :1,     // - prepare passwd file for use
-                setservent                      :1,     // - prepare services file for use
-                setsockopt                      :1,     // - set some socket options
-                shift                           :1,     // - remove the first element of an array, and return it
-                shmctl                          :1,     // - SysV shared memory operations
-                shmget                          :1,     // - get SysV shared memory segment identifier
-                shmread                         :1,     // - read SysV shared memory
-                shmwrite                        :1,     // - write SysV shared memory
-                shutdown                        :1,     // - close down just half of a socket connection
-                'sin'                           :1,     // - return the sine of a number
-                sleep                           :1,     // - block for some number of seconds
-                socket                          :1,     // - create a socket
-                socketpair                      :1,     // - create a pair of sockets
-                'sort'                          :1,     // - sort a list of values
-                splice                          :1,     // - add or remove elements anywhere in an array
-                'split'                         :1,     // - split up a string using a regexp delimiter
-                sprintf                         :1,     // - formatted print into a string
-                'sqrt'                          :1,     // - square root function
-                srand                           :1,     // - seed the random number generator
-                stat                            :1,     // - get a file's status information
-                state                           :1,     // - declare and assign a state variable (persistent lexical scoping)
-                study                           :1,     // - optimize input data for repeated searches
-                'sub'                           :1,     // - declare a subroutine, possibly anonymously
-                'substr'                        :1,     // - get or alter a portion of a stirng
-                symlink                         :1,     // - create a symbolic link to a file
-                syscall                         :1,     // - execute an arbitrary system call
-                sysopen                         :1,     // - open a file, pipe, or descriptor
-                sysread                         :1,     // - fixed-length unbuffered input from a filehandle
-                sysseek                         :1,     // - position I/O pointer on handle used with sysread and syswrite
-                system                          :1,     // - run a separate program
-                syswrite                        :1,     // - fixed-length unbuffered output to a filehandle
-                tell                            :1,     // - get current seekpointer on a filehandle
-                telldir                         :1,     // - get current seekpointer on a directory handle
-                tie                             :1,     // - bind a variable to an object class
-                tied                            :1,     // - get a reference to the object underlying a tied variable
-                time                            :1,     // - return number of seconds since 1970
-                times                           :1,     // - return elapsed time for self and child processes
-                tr                              :null,  // - transliterate a string
-                truncate                        :1,     // - shorten a file
-                uc                              :1,     // - return upper-case version of a string
-                ucfirst                         :1,     // - return a string with just the next letter in upper case
-                umask                           :1,     // - set file creation mode mask
-                undef                           :1,     // - remove a variable or function definition
-                unlink                          :1,     // - remove one link to a file
-                unpack                          :1,     // - convert binary structure into normal perl variables
-                unshift                         :1,     // - prepend more elements to the beginning of a list
-                untie                           :1,     // - break a tie binding to a variable
-                use                             :1,     // - load in a module at compile time
-                utime                           :1,     // - set a file's last access and modify times
-                values                          :1,     // - return a list of the values in a hash
-                vec                             :1,     // - test or set particular bits in a string
-                wait                            :1,     // - wait for any child process to die
-                waitpid                         :1,     // - wait for a particular child process to die
-                wantarray                       :1,     // - get void vs scalar vs list context of current subroutine call
-                warn                            :1,     // - print debugging info
-                when                            :1,     //
-                write                           :1,     // - print a picture record
-                y                               :null}; // - transliterate a string
-
-        var RXstyle="string-2";
-        var RXmodifiers=/[goseximacplud]/;              // NOTE: "m", "s", "y" and "tr" need to correct real modifiers for each regexp type
-
-        function tokenChain(stream,state,chain,style,tail){     // NOTE: chain.length > 2 is not working now (it's for s[...][...]geos;)
-                state.chain=null;                               //                                                          12   3tail
-                state.style=null;
-                state.tail=null;
-                state.tokenize=function(stream,state){
-                        var e=false,c,i=0;
-                        while(c=stream.next()){
-                                if(c===chain[i]&&!e){
-                                        if(chain[++i]!==undefined){
-                                                state.chain=chain[i];
-                                                state.style=style;
-                                                state.tail=tail;}
-                                        else if(tail)
-                                                stream.eatWhile(tail);
-                                        state.tokenize=tokenPerl;
-                                        return style;}
-                                e=!e&&c=="\\";}
-                        return style;};
-                return state.tokenize(stream,state);}
-
-        function tokenSOMETHING(stream,state,string){
-                state.tokenize=function(stream,state){
-                        if(stream.string==string)
-                                state.tokenize=tokenPerl;
-                        stream.skipToEnd();
-                        return "string";};
-                return state.tokenize(stream,state);}
-
-        function tokenPerl(stream,state){
-                if(stream.eatSpace())
-                        return null;
-                if(state.chain)
-                        return tokenChain(stream,state,state.chain,state.style,state.tail);
-                if(stream.match(/^\-?[\d\.]/,false))
-                        if(stream.match(/^(\-?(\d*\.\d+(e[+-]?\d+)?|\d+\.\d*)|0x[\da-fA-F]+|0b[01]+|\d+(e[+-]?\d+)?)/))
-                                return 'number';
-                if(stream.match(/^<<(?=\w)/)){                  // NOTE: <"],RXstyle,RXmodifiers);}
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                eatSuffix(stream, 1);
-                                                return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
-                                else if(c=="q"){
-                                        c=look(stream, 1);
-                                        if(c=="("){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,[")"],"string");}
-                                        if(c=="["){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,["]"],"string");}
-                                        if(c=="{"){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,["}"],"string");}
-                                        if(c=="<"){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,[">"],"string");}
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                eatSuffix(stream, 1);
-                                                return tokenChain(stream,state,[stream.eat(c)],"string");}}
-                                else if(c=="w"){
-                                        c=look(stream, 1);
-                                        if(c=="("){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,[")"],"bracket");}
-                                        if(c=="["){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,["]"],"bracket");}
-                                        if(c=="{"){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,["}"],"bracket");}
-                                        if(c=="<"){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,[">"],"bracket");}
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                eatSuffix(stream, 1);
-                                                return tokenChain(stream,state,[stream.eat(c)],"bracket");}}
-                                else if(c=="r"){
-                                        c=look(stream, 1);
-                                        if(c=="("){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
-                                        if(c=="["){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
-                                        if(c=="{"){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
-                                        if(c=="<"){
-                                                eatSuffix(stream, 2);
-                                                return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                eatSuffix(stream, 1);
-                                                return tokenChain(stream,state,[stream.eat(c)],RXstyle,RXmodifiers);}}
-                                else if(/[\^'"!~\/(\[{<]/.test(c)){
-                                        if(c=="("){
-                                                eatSuffix(stream, 1);
-                                                return tokenChain(stream,state,[")"],"string");}
-                                        if(c=="["){
-                                                eatSuffix(stream, 1);
-                                                return tokenChain(stream,state,["]"],"string");}
-                                        if(c=="{"){
-                                                eatSuffix(stream, 1);
-                                                return tokenChain(stream,state,["}"],"string");}
-                                        if(c=="<"){
-                                                eatSuffix(stream, 1);
-                                                return tokenChain(stream,state,[">"],"string");}
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                return tokenChain(stream,state,[stream.eat(c)],"string");}}}}
-                if(ch=="m"){
-                        var c=look(stream, -2);
-                        if(!(c&&/\w/.test(c))){
-                                c=stream.eat(/[(\[{<\^'"!~\/]/);
-                                if(c){
-                                        if(/[\^'"!~\/]/.test(c)){
-                                                return tokenChain(stream,state,[c],RXstyle,RXmodifiers);}
-                                        if(c=="("){
-                                                return tokenChain(stream,state,[")"],RXstyle,RXmodifiers);}
-                                        if(c=="["){
-                                                return tokenChain(stream,state,["]"],RXstyle,RXmodifiers);}
-                                        if(c=="{"){
-                                                return tokenChain(stream,state,["}"],RXstyle,RXmodifiers);}
-                                        if(c=="<"){
-                                                return tokenChain(stream,state,[">"],RXstyle,RXmodifiers);}}}}
-                if(ch=="s"){
-                        var c=/[\/>\]})\w]/.test(look(stream, -2));
-                        if(!c){
-                                c=stream.eat(/[(\[{<\^'"!~\/]/);
-                                if(c){
-                                        if(c=="[")
-                                                return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers);
-                                        if(c=="{")
-                                                return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers);
-                                        if(c=="<")
-                                                return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
-                                        if(c=="(")
-                                                return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
-                                        return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
-                if(ch=="y"){
-                        var c=/[\/>\]})\w]/.test(look(stream, -2));
-                        if(!c){
-                                c=stream.eat(/[(\[{<\^'"!~\/]/);
-                                if(c){
-                                        if(c=="[")
-                                                return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers);
-                                        if(c=="{")
-                                                return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers);
-                                        if(c=="<")
-                                                return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
-                                        if(c=="(")
-                                                return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
-                                        return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}
-                if(ch=="t"){
-                        var c=/[\/>\]})\w]/.test(look(stream, -2));
-                        if(!c){
-                                c=stream.eat("r");if(c){
-                                c=stream.eat(/[(\[{<\^'"!~\/]/);
-                                if(c){
-                                        if(c=="[")
-                                                return tokenChain(stream,state,["]","]"],RXstyle,RXmodifiers);
-                                        if(c=="{")
-                                                return tokenChain(stream,state,["}","}"],RXstyle,RXmodifiers);
-                                        if(c=="<")
-                                                return tokenChain(stream,state,[">",">"],RXstyle,RXmodifiers);
-                                        if(c=="(")
-                                                return tokenChain(stream,state,[")",")"],RXstyle,RXmodifiers);
-                                        return tokenChain(stream,state,[c,c],RXstyle,RXmodifiers);}}}}
-                if(ch=="`"){
-                        return tokenChain(stream,state,[ch],"variable-2");}
-                if(ch=="/"){
-                        if(!/~\s*$/.test(prefix(stream)))
-                                return "operator";
-                        else
-                                return tokenChain(stream,state,[ch],RXstyle,RXmodifiers);}
-                if(ch=="$"){
-                        var p=stream.pos;
-                        if(stream.eatWhile(/\d/)||stream.eat("{")&&stream.eatWhile(/\d/)&&stream.eat("}"))
-                                return "variable-2";
-                        else
-                                stream.pos=p;}
-                if(/[$@%]/.test(ch)){
-                        var p=stream.pos;
-                        if(stream.eat("^")&&stream.eat(/[A-Z]/)||!/[@$%&]/.test(look(stream, -2))&&stream.eat(/[=|\\\-#?@;:&`~\^!\[\]*'"$+.,\/<>()]/)){
-                                var c=stream.current();
-                                if(PERL[c])
-                                        return "variable-2";}
-                        stream.pos=p;}
-                if(/[$@%&]/.test(ch)){
-                        if(stream.eatWhile(/[\w$\[\]]/)||stream.eat("{")&&stream.eatWhile(/[\w$\[\]]/)&&stream.eat("}")){
-                                var c=stream.current();
-                                if(PERL[c])
-                                        return "variable-2";
-                                else
-                                        return "variable";}}
-                if(ch=="#"){
-                        if(look(stream, -2)!="$"){
-                                stream.skipToEnd();
-                                return "comment";}}
-                if(/[:+\-\^*$&%@=<>!?|\/~\.]/.test(ch)){
-                        var p=stream.pos;
-                        stream.eatWhile(/[:+\-\^*$&%@=<>!?|\/~\.]/);
-                        if(PERL[stream.current()])
-                                return "operator";
-                        else
-                                stream.pos=p;}
-                if(ch=="_"){
-                        if(stream.pos==1){
-                                if(suffix(stream, 6)=="_END__"){
-                                        return tokenChain(stream,state,['\0'],"comment");}
-                                else if(suffix(stream, 7)=="_DATA__"){
-                                        return tokenChain(stream,state,['\0'],"variable-2");}
-                                else if(suffix(stream, 7)=="_C__"){
-                                        return tokenChain(stream,state,['\0'],"string");}}}
-                if(/\w/.test(ch)){
-                        var p=stream.pos;
-                        if(look(stream, -2)=="{"&&(look(stream, 0)=="}"||stream.eatWhile(/\w/)&&look(stream, 0)=="}"))
-                                return "string";
-                        else
-                                stream.pos=p;}
-                if(/[A-Z]/.test(ch)){
-                        var l=look(stream, -2);
-                        var p=stream.pos;
-                        stream.eatWhile(/[A-Z_]/);
-                        if(/[\da-z]/.test(look(stream, 0))){
-                                stream.pos=p;}
-                        else{
-                                var c=PERL[stream.current()];
-                                if(!c)
-                                        return "meta";
-                                if(c[1])
-                                        c=c[0];
-                                if(l!=":"){
-                                        if(c==1)
-                                                return "keyword";
-                                        else if(c==2)
-                                                return "def";
-                                        else if(c==3)
-                                                return "atom";
-                                        else if(c==4)
-                                                return "operator";
-                                        else if(c==5)
-                                                return "variable-2";
-                                        else
-                                                return "meta";}
-                                else
-                                        return "meta";}}
-                if(/[a-zA-Z_]/.test(ch)){
-                        var l=look(stream, -2);
-                        stream.eatWhile(/\w/);
-                        var c=PERL[stream.current()];
-                        if(!c)
-                                return "meta";
-                        if(c[1])
-                                c=c[0];
-                        if(l!=":"){
-                                if(c==1)
-                                        return "keyword";
-                                else if(c==2)
-                                        return "def";
-                                else if(c==3)
-                                        return "atom";
-                                else if(c==4)
-                                        return "operator";
-                                else if(c==5)
-                                        return "variable-2";
-                                else
-                                        return "meta";}
-                        else
-                                return "meta";}
-                return null;}
-
-        return {
-            startState: function() {
-                return {
-                    tokenize: tokenPerl,
-                    chain: null,
-                    style: null,
-                    tail: null
-                };
-            },
-            token: function(stream, state) {
-                return (state.tokenize || tokenPerl)(stream, state);
-            },
-            lineComment: '#'
-        };
-});
-
-CodeMirror.registerHelper("wordChars", "perl", /[\w$]/);
-
-CodeMirror.defineMIME("text/x-perl", "perl");
-
-// it's like "peek", but need for look-ahead or look-behind if index < 0
-function look(stream, c){
-  return stream.string.charAt(stream.pos+(c||0));
-}
-
-// return a part of prefix of current stream from current position
-function prefix(stream, c){
-  if(c){
-    var x=stream.pos-c;
-    return stream.string.substr((x>=0?x:0),c);}
-  else{
-    return stream.string.substr(0,stream.pos-1);
-  }
-}
-
-// return a part of suffix of current stream from current position
-function suffix(stream, c){
-  var y=stream.string.length;
-  var x=y-stream.pos+1;
-  return stream.string.substr(stream.pos,(c&&c=(y=stream.string.length-1))
-    stream.pos=y;
-  else
-    stream.pos=x;
-}
-
-});
diff --git a/www/code/codemirror-5.7/mode/php/index.html b/www/code/codemirror-5.7/mode/php/index.html
deleted file mode 100644
index adf6b1be2..000000000
--- a/www/code/codemirror-5.7/mode/php/index.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-CodeMirror: PHP mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    PHP mode
    
-
    
-
-    
-
-    
    Simple HTML/PHP mode based on
-    the C-like mode. Depends on XML,
-    JavaScript, CSS, HTMLMixed, and C-like modes.
    
-
-    
    MIME types defined: application/x-httpd-php (HTML with PHP code), text/x-php (plain, non-wrapped PHP code).
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/php/php.js b/www/code/codemirror-5.7/mode/php/php.js
deleted file mode 100644
index 22494467b..000000000
--- a/www/code/codemirror-5.7/mode/php/php.js
+++ /dev/null
@@ -1,234 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../clike/clike"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../clike/clike"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  function keywords(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  // Helper for phpString
-  function matchSequence(list, end, escapes) {
-    if (list.length == 0) return phpString(end);
-    return function (stream, state) {
-      var patterns = list[0];
-      for (var i = 0; i < patterns.length; i++) if (stream.match(patterns[i][0])) {
-        state.tokenize = matchSequence(list.slice(1), end);
-        return patterns[i][1];
-      }
-      state.tokenize = phpString(end, escapes);
-      return "string";
-    };
-  }
-  function phpString(closing, escapes) {
-    return function(stream, state) { return phpString_(stream, state, closing, escapes); };
-  }
-  function phpString_(stream, state, closing, escapes) {
-    // "Complex" syntax
-    if (escapes !== false && stream.match("${", false) || stream.match("{$", false)) {
-      state.tokenize = null;
-      return "string";
-    }
-
-    // Simple syntax
-    if (escapes !== false && stream.match(/^\$[a-zA-Z_][a-zA-Z0-9_]*/)) {
-      // After the variable name there may appear array or object operator.
-      if (stream.match("[", false)) {
-        // Match array operator
-        state.tokenize = matchSequence([
-          [["[", null]],
-          [[/\d[\w\.]*/, "number"],
-           [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
-           [/[\w\$]+/, "variable"]],
-          [["]", null]]
-        ], closing, escapes);
-      }
-      if (stream.match(/\-\>\w/, false)) {
-        // Match object operator
-        state.tokenize = matchSequence([
-          [["->", null]],
-          [[/[\w]+/, "variable"]]
-        ], closing, escapes);
-      }
-      return "variable-2";
-    }
-
-    var escaped = false;
-    // Normal string
-    while (!stream.eol() &&
-           (escaped || escapes === false ||
-            (!stream.match("{$", false) &&
-             !stream.match(/^(\$[a-zA-Z_][a-zA-Z0-9_]*|\$\{)/, false)))) {
-      if (!escaped && stream.match(closing)) {
-        state.tokenize = null;
-        state.tokStack.pop(); state.tokStack.pop();
-        break;
-      }
-      escaped = stream.next() == "\\" && !escaped;
-    }
-    return "string";
-  }
-
-  var phpKeywords = "abstract and array as break case catch class clone const continue declare default " +
-    "do else elseif enddeclare endfor endforeach endif endswitch endwhile extends final " +
-    "for foreach function global goto if implements interface instanceof namespace " +
-    "new or private protected public static switch throw trait try use var while xor " +
-    "die echo empty exit eval include include_once isset list require require_once return " +
-    "print unset __halt_compiler self static parent yield insteadof finally";
-  var phpAtoms = "true false null TRUE FALSE NULL __CLASS__ __DIR__ __FILE__ __LINE__ __METHOD__ __FUNCTION__ __NAMESPACE__ __TRAIT__";
-  var phpBuiltin = "func_num_args func_get_arg func_get_args strlen strcmp strncmp strcasecmp strncasecmp each error_reporting define defined trigger_error user_error set_error_handler restore_error_handler get_declared_classes get_loaded_extensions extension_loaded get_extension_funcs debug_backtrace constant bin2hex hex2bin sleep usleep time mktime gmmktime strftime gmstrftime strtotime date gmdate getdate localtime checkdate flush wordwrap htmlspecialchars htmlentities html_entity_decode md5 md5_file crc32 getimagesize image_type_to_mime_type phpinfo phpversion phpcredits strnatcmp strnatcasecmp substr_count strspn strcspn strtok strtoupper strtolower strpos strrpos strrev hebrev hebrevc nl2br basename dirname pathinfo stripslashes stripcslashes strstr stristr strrchr str_shuffle str_word_count strcoll substr substr_replace quotemeta ucfirst ucwords strtr addslashes addcslashes rtrim str_replace str_repeat count_chars chunk_split trim ltrim strip_tags similar_text explode implode setlocale localeconv parse_str str_pad chop strchr sprintf printf vprintf vsprintf sscanf fscanf parse_url urlencode urldecode rawurlencode rawurldecode readlink linkinfo link unlink exec system escapeshellcmd escapeshellarg passthru shell_exec proc_open proc_close rand srand getrandmax mt_rand mt_srand mt_getrandmax base64_decode base64_encode abs ceil floor round is_finite is_nan is_infinite bindec hexdec octdec decbin decoct dechex base_convert number_format fmod ip2long long2ip getenv putenv getopt microtime gettimeofday getrusage uniqid quoted_printable_decode set_time_limit get_cfg_var magic_quotes_runtime set_magic_quotes_runtime get_magic_quotes_gpc get_magic_quotes_runtime import_request_variables error_log serialize unserialize memory_get_usage var_dump var_export debug_zval_dump print_r highlight_file show_source highlight_string ini_get ini_get_all ini_set ini_alter ini_restore get_include_path set_include_path restore_include_path setcookie header headers_sent connection_aborted connection_status ignore_user_abort parse_ini_file is_uploaded_file move_uploaded_file intval floatval doubleval strval gettype settype is_null is_resource is_bool is_long is_float is_int is_integer is_double is_real is_numeric is_string is_array is_object is_scalar ereg ereg_replace eregi eregi_replace split spliti join sql_regcase dl pclose popen readfile rewind rmdir umask fclose feof fgetc fgets fgetss fread fopen fpassthru ftruncate fstat fseek ftell fflush fwrite fputs mkdir rename copy tempnam tmpfile file file_get_contents file_put_contents stream_select stream_context_create stream_context_set_params stream_context_set_option stream_context_get_options stream_filter_prepend stream_filter_append fgetcsv flock get_meta_tags stream_set_write_buffer set_file_buffer set_socket_blocking stream_set_blocking socket_set_blocking stream_get_meta_data stream_register_wrapper stream_wrapper_register stream_set_timeout socket_set_timeout socket_get_status realpath fnmatch fsockopen pfsockopen pack unpack get_browser crypt opendir closedir chdir getcwd rewinddir readdir dir glob fileatime filectime filegroup fileinode filemtime fileowner fileperms filesize filetype file_exists is_writable is_writeable is_readable is_executable is_file is_dir is_link stat lstat chown touch clearstatcache mail ob_start ob_flush ob_clean ob_end_flush ob_end_clean ob_get_flush ob_get_clean ob_get_length ob_get_level ob_get_status ob_get_contents ob_implicit_flush ob_list_handlers ksort krsort natsort natcasesort asort arsort sort rsort usort uasort uksort shuffle array_walk count end prev next reset current key min max in_array array_search extract compact array_fill range array_multisort array_push array_pop array_shift array_unshift array_splice array_slice array_merge array_merge_recursive array_keys array_values array_count_values array_reverse array_reduce array_pad array_flip array_change_key_case array_rand array_unique array_intersect array_intersect_assoc array_diff array_diff_assoc array_sum array_filter array_map array_chunk array_key_exists pos sizeof key_exists assert assert_options version_compare ftok str_rot13 aggregate session_name session_module_name session_save_path session_id session_regenerate_id session_decode session_register session_unregister session_is_registered session_encode session_start session_destroy session_unset session_set_save_handler session_cache_limiter session_cache_expire session_set_cookie_params session_get_cookie_params session_write_close preg_match preg_match_all preg_replace preg_replace_callback preg_split preg_quote preg_grep overload ctype_alnum ctype_alpha ctype_cntrl ctype_digit ctype_lower ctype_graph ctype_print ctype_punct ctype_space ctype_upper ctype_xdigit virtual apache_request_headers apache_note apache_lookup_uri apache_child_terminate apache_setenv apache_response_headers apache_get_version getallheaders mysql_connect mysql_pconnect mysql_close mysql_select_db mysql_create_db mysql_drop_db mysql_query mysql_unbuffered_query mysql_db_query mysql_list_dbs mysql_list_tables mysql_list_fields mysql_list_processes mysql_error mysql_errno mysql_affected_rows mysql_insert_id mysql_result mysql_num_rows mysql_num_fields mysql_fetch_row mysql_fetch_array mysql_fetch_assoc mysql_fetch_object mysql_data_seek mysql_fetch_lengths mysql_fetch_field mysql_field_seek mysql_free_result mysql_field_name mysql_field_table mysql_field_len mysql_field_type mysql_field_flags mysql_escape_string mysql_real_escape_string mysql_stat mysql_thread_id mysql_client_encoding mysql_get_client_info mysql_get_host_info mysql_get_proto_info mysql_get_server_info mysql_info mysql mysql_fieldname mysql_fieldtable mysql_fieldlen mysql_fieldtype mysql_fieldflags mysql_selectdb mysql_createdb mysql_dropdb mysql_freeresult mysql_numfields mysql_numrows mysql_listdbs mysql_listtables mysql_listfields mysql_db_name mysql_dbname mysql_tablename mysql_table_name pg_connect pg_pconnect pg_close pg_connection_status pg_connection_busy pg_connection_reset pg_host pg_dbname pg_port pg_tty pg_options pg_ping pg_query pg_send_query pg_cancel_query pg_fetch_result pg_fetch_row pg_fetch_assoc pg_fetch_array pg_fetch_object pg_fetch_all pg_affected_rows pg_get_result pg_result_seek pg_result_status pg_free_result pg_last_oid pg_num_rows pg_num_fields pg_field_name pg_field_num pg_field_size pg_field_type pg_field_prtlen pg_field_is_null pg_get_notify pg_get_pid pg_result_error pg_last_error pg_last_notice pg_put_line pg_end_copy pg_copy_to pg_copy_from pg_trace pg_untrace pg_lo_create pg_lo_unlink pg_lo_open pg_lo_close pg_lo_read pg_lo_write pg_lo_read_all pg_lo_import pg_lo_export pg_lo_seek pg_lo_tell pg_escape_string pg_escape_bytea pg_unescape_bytea pg_client_encoding pg_set_client_encoding pg_meta_data pg_convert pg_insert pg_update pg_delete pg_select pg_exec pg_getlastoid pg_cmdtuples pg_errormessage pg_numrows pg_numfields pg_fieldname pg_fieldsize pg_fieldtype pg_fieldnum pg_fieldprtlen pg_fieldisnull pg_freeresult pg_result pg_loreadall pg_locreate pg_lounlink pg_loopen pg_loclose pg_loread pg_lowrite pg_loimport pg_loexport http_response_code get_declared_traits getimagesizefromstring socket_import_stream stream_set_chunk_size trait_exists header_register_callback class_uses session_status session_register_shutdown echo print global static exit array empty eval isset unset die include require include_once require_once json_decode json_encode json_last_error json_last_error_msg curl_close curl_copy_handle curl_errno curl_error curl_escape curl_exec curl_file_create curl_getinfo curl_init curl_multi_add_handle curl_multi_close curl_multi_exec curl_multi_getcontent curl_multi_info_read curl_multi_init curl_multi_remove_handle curl_multi_select curl_multi_setopt curl_multi_strerror curl_pause curl_reset curl_setopt_array curl_setopt curl_share_close curl_share_init curl_share_setopt curl_strerror curl_unescape curl_version mysqli_affected_rows mysqli_autocommit mysqli_change_user mysqli_character_set_name mysqli_close mysqli_commit mysqli_connect_errno mysqli_connect_error mysqli_connect mysqli_data_seek mysqli_debug mysqli_dump_debug_info mysqli_errno mysqli_error_list mysqli_error mysqli_fetch_all mysqli_fetch_array mysqli_fetch_assoc mysqli_fetch_field_direct mysqli_fetch_field mysqli_fetch_fields mysqli_fetch_lengths mysqli_fetch_object mysqli_fetch_row mysqli_field_count mysqli_field_seek mysqli_field_tell mysqli_free_result mysqli_get_charset mysqli_get_client_info mysqli_get_client_stats mysqli_get_client_version mysqli_get_connection_stats mysqli_get_host_info mysqli_get_proto_info mysqli_get_server_info mysqli_get_server_version mysqli_info mysqli_init mysqli_insert_id mysqli_kill mysqli_more_results mysqli_multi_query mysqli_next_result mysqli_num_fields mysqli_num_rows mysqli_options mysqli_ping mysqli_prepare mysqli_query mysqli_real_connect mysqli_real_escape_string mysqli_real_query mysqli_reap_async_query mysqli_refresh mysqli_rollback mysqli_select_db mysqli_set_charset mysqli_set_local_infile_default mysqli_set_local_infile_handler mysqli_sqlstate mysqli_ssl_set mysqli_stat mysqli_stmt_init mysqli_store_result mysqli_thread_id mysqli_thread_safe mysqli_use_result mysqli_warning_count";
-  CodeMirror.registerHelper("hintWords", "php", [phpKeywords, phpAtoms, phpBuiltin].join(" ").split(" "));
-  CodeMirror.registerHelper("wordChars", "php", /[\w$]/);
-
-  var phpConfig = {
-    name: "clike",
-    helperType: "php",
-    keywords: keywords(phpKeywords),
-    blockKeywords: keywords("catch do else elseif for foreach if switch try while finally"),
-    defKeywords: keywords("class function interface namespace trait"),
-    atoms: keywords(phpAtoms),
-    builtin: keywords(phpBuiltin),
-    multiLineStrings: true,
-    hooks: {
-      "$": function(stream) {
-        stream.eatWhile(/[\w\$_]/);
-        return "variable-2";
-      },
-      "<": function(stream, state) {
-        var before;
-        if (before = stream.match(/<<\s*/)) {
-          var quoted = stream.eat(/['"]/);
-          stream.eatWhile(/[\w\.]/);
-          var delim = stream.current().slice(before[0].length + (quoted ? 2 : 1));
-          if (quoted) stream.eat(quoted);
-          if (delim) {
-            (state.tokStack || (state.tokStack = [])).push(delim, 0);
-            state.tokenize = phpString(delim, quoted != "'");
-            return "string";
-          }
-        }
-        return false;
-      },
-      "#": function(stream) {
-        while (!stream.eol() && !stream.match("?>", false)) stream.next();
-        return "comment";
-      },
-      "/": function(stream) {
-        if (stream.eat("/")) {
-          while (!stream.eol() && !stream.match("?>", false)) stream.next();
-          return "comment";
-        }
-        return false;
-      },
-      '"': function(_stream, state) {
-        (state.tokStack || (state.tokStack = [])).push('"', 0);
-        state.tokenize = phpString('"');
-        return "string";
-      },
-      "{": function(_stream, state) {
-        if (state.tokStack && state.tokStack.length)
-          state.tokStack[state.tokStack.length - 1]++;
-        return false;
-      },
-      "}": function(_stream, state) {
-        if (state.tokStack && state.tokStack.length > 0 &&
-            !--state.tokStack[state.tokStack.length - 1]) {
-          state.tokenize = phpString(state.tokStack[state.tokStack.length - 2]);
-        }
-        return false;
-      }
-    }
-  };
-
-  CodeMirror.defineMode("php", function(config, parserConfig) {
-    var htmlMode = CodeMirror.getMode(config, "text/html");
-    var phpMode = CodeMirror.getMode(config, phpConfig);
-
-    function dispatch(stream, state) {
-      var isPHP = state.curMode == phpMode;
-      if (stream.sol() && state.pending && state.pending != '"' && state.pending != "'") state.pending = null;
-      if (!isPHP) {
-        if (stream.match(/^<\?\w*/)) {
-          state.curMode = phpMode;
-          if (!state.php) state.php = CodeMirror.startState(phpMode, htmlMode.indent(state.html, ""))
-          state.curState = state.php;
-          return "meta";
-        }
-        if (state.pending == '"' || state.pending == "'") {
-          while (!stream.eol() && stream.next() != state.pending) {}
-          var style = "string";
-        } else if (state.pending && stream.pos < state.pending.end) {
-          stream.pos = state.pending.end;
-          var style = state.pending.style;
-        } else {
-          var style = htmlMode.token(stream, state.curState);
-        }
-        if (state.pending) state.pending = null;
-        var cur = stream.current(), openPHP = cur.search(/<\?/), m;
-        if (openPHP != -1) {
-          if (style == "string" && (m = cur.match(/[\'\"]$/)) && !/\?>/.test(cur)) state.pending = m[0];
-          else state.pending = {end: stream.pos, style: style};
-          stream.backUp(cur.length - openPHP);
-        }
-        return style;
-      } else if (isPHP && state.php.tokenize == null && stream.match("?>")) {
-        state.curMode = htmlMode;
-        state.curState = state.html;
-        if (!state.php.context.prev) state.php = null;
-        return "meta";
-      } else {
-        return phpMode.token(stream, state.curState);
-      }
-    }
-
-    return {
-      startState: function() {
-        var html = CodeMirror.startState(htmlMode)
-        var php = parserConfig.startOpen ? CodeMirror.startState(phpMode) : null
-        return {html: html,
-                php: php,
-                curMode: parserConfig.startOpen ? phpMode : htmlMode,
-                curState: parserConfig.startOpen ? php : html,
-                pending: null};
-      },
-
-      copyState: function(state) {
-        var html = state.html, htmlNew = CodeMirror.copyState(htmlMode, html),
-            php = state.php, phpNew = php && CodeMirror.copyState(phpMode, php), cur;
-        if (state.curMode == htmlMode) cur = htmlNew;
-        else cur = phpNew;
-        return {html: htmlNew, php: phpNew, curMode: state.curMode, curState: cur,
-                pending: state.pending};
-      },
-
-      token: dispatch,
-
-      indent: function(state, textAfter) {
-        if ((state.curMode != phpMode && /^\s*<\//.test(textAfter)) ||
-            (state.curMode == phpMode && /^\?>/.test(textAfter)))
-          return htmlMode.indent(state.html, textAfter);
-        return state.curMode.indent(state.curState, textAfter);
-      },
-
-      blockCommentStart: "/*",
-      blockCommentEnd: "*/",
-      lineComment: "//",
-
-      innerMode: function(state) { return {state: state.curState, mode: state.curMode}; }
-    };
-  }, "htmlmixed", "clike");
-
-  CodeMirror.defineMIME("application/x-httpd-php", "php");
-  CodeMirror.defineMIME("application/x-httpd-php-open", {name: "php", startOpen: true});
-  CodeMirror.defineMIME("text/x-php", phpConfig);
-});
diff --git a/www/code/codemirror-5.7/mode/php/test.js b/www/code/codemirror-5.7/mode/php/test.js
deleted file mode 100644
index e2ecefc18..000000000
--- a/www/code/codemirror-5.7/mode/php/test.js
+++ /dev/null
@@ -1,154 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "php");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT('simple_test',
-     '[meta ]');
-
-  MT('variable_interpolation_non_alphanumeric',
-     '[meta $/$\\$}$\\\"$:$;$?$|$[[$]]$+$=aaa"]',
-     '[meta ?>]');
-
-  MT('variable_interpolation_digits',
-     '[meta ]');
-
-  MT('variable_interpolation_simple_syntax_1',
-     '[meta ]');
-
-  MT('variable_interpolation_simple_syntax_2',
-     '[meta ]');
-
-  MT('variable_interpolation_simple_syntax_3',
-     '[meta [variable aaaaa][string .aaaaaa"];',
-     '[keyword echo] [string "aaa][variable-2 $aaaa][string ->][variable-2 $aaaaa][string .aaaaaa"];',
-     '[keyword echo] [string "aaa][variable-2 $aaaa]->[variable aaaaa][string [[2]].aaaaaa"];',
-     '[keyword echo] [string "aaa][variable-2 $aaaa]->[variable aaaaa][string ->aaaa2.aaaaaa"];',
-     '[meta ?>]');
-
-  MT('variable_interpolation_escaping',
-     '[meta aaa.aaa"];',
-     '[keyword echo] [string "aaa\\$aaaa[[2]]aaa.aaa"];',
-     '[keyword echo] [string "aaa\\$aaaa[[asd]]aaa.aaa"];',
-     '[keyword echo] [string "aaa{\\$aaaa->aaa.aaa"];',
-     '[keyword echo] [string "aaa{\\$aaaa[[2]]aaa.aaa"];',
-     '[keyword echo] [string "aaa{\\aaaaa[[asd]]aaa.aaa"];',
-     '[keyword echo] [string "aaa\\${aaaa->aaa.aaa"];',
-     '[keyword echo] [string "aaa\\${aaaa[[2]]aaa.aaa"];',
-     '[keyword echo] [string "aaa\\${aaaa[[asd]]aaa.aaa"];',
-     '[meta ?>]');
-
-  MT('variable_interpolation_complex_syntax_1',
-     '[meta aaa.aaa"];',
-     '[keyword echo] [string "aaa][variable-2 $]{[variable-2 $aaaa]}[string ->aaa.aaa"];',
-     '[keyword echo] [string "aaa][variable-2 $]{[variable-2 $aaaa][[','  [number 42]',']]}[string ->aaa.aaa"];',
-     '[keyword echo] [string "aaa][variable-2 $]{[variable aaaa][meta ?>]aaaaaa');
-
-  MT('variable_interpolation_complex_syntax_2',
-     '[meta } $aaaaaa.aaa"];',
-     '[keyword echo] [string "][variable-2 $]{[variable aaa][comment /*}?>*/][[','  [string "aaa][variable-2 $aaa][string {}][variable-2 $]{[variable aaa]}[string "]',']]}[string ->aaa.aaa"];',
-     '[keyword echo] [string "][variable-2 $]{[variable aaa][comment /*} } $aaa } */]}[string ->aaa.aaa"];');
-
-
-  function build_recursive_monsters(nt, t, n){
-    var monsters = [t];
-    for (var i = 1; i <= n; ++i)
-      monsters[i] = nt.join(monsters[i - 1]);
-    return monsters;
-  }
-
-  var m1 = build_recursive_monsters(
-    ['[string "][variable-2 $]{[variable aaa] [operator +] ', '}[string "]'],
-    '[comment /* }?>} */] [string "aaa][variable-2 $aaa][string .aaa"]',
-    10
-  );
-
-  MT('variable_interpolation_complex_syntax_3_1',
-     '[meta ]');
-
-  var m2 = build_recursive_monsters(
-    ['[string "a][variable-2 $]{[variable aaa] [operator +] ', ' [operator +] ', '}[string .a"]'],
-    '[comment /* }?>{{ */] [string "a?>}{{aa][variable-2 $aaa][string .a}a?>a"]',
-    5
-  );
-
-  MT('variable_interpolation_complex_syntax_3_2',
-     '[meta ]');
-
-  function build_recursive_monsters_2(mf1, mf2, nt, t, n){
-    var monsters = [t];
-    for (var i = 1; i <= n; ++i)
-      monsters[i] = nt[0] + mf1[i - 1] + nt[1] + mf2[i - 1] + nt[2] + monsters[i - 1] + nt[3];
-    return monsters;
-  }
-
-  var m3 = build_recursive_monsters_2(
-    m1,
-    m2,
-    ['[string "a][variable-2 $]{[variable aaa] [operator +] ', ' [operator +] ', ' [operator +] ', '}[string .a"]'],
-    '[comment /* }?>{{ */] [string "a?>}{{aa][variable-2 $aaa][string .a}a?>a"]',
-    4
-  );
-
-  MT('variable_interpolation_complex_syntax_3_3',
-     '[meta ]');
-
-  MT("variable_interpolation_heredoc",
-     "[meta 
-
-CodeMirror: Pig Latin mode
-
-
-
-
-
-
-
-
-
-
    
-
    Pig Latin mode
    
-
    
-
-    
-
-    
    
-        Simple mode that handles Pig Latin language.
-    
    
-
-    
    MIME type defined: text/x-pig
-    (PIG code)
-
-
    
diff --git a/www/code/codemirror-5.7/mode/pig/pig.js b/www/code/codemirror-5.7/mode/pig/pig.js
deleted file mode 100644
index 5b567272e..000000000
--- a/www/code/codemirror-5.7/mode/pig/pig.js
+++ /dev/null
@@ -1,178 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/*
- *      Pig Latin Mode for CodeMirror 2
- *      @author Prasanth Jayachandran
- *      @link   https://github.com/prasanthj/pig-codemirror-2
- *  This implementation is adapted from PL/SQL mode in CodeMirror 2.
- */
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("pig", function(_config, parserConfig) {
-  var keywords = parserConfig.keywords,
-  builtins = parserConfig.builtins,
-  types = parserConfig.types,
-  multiLineStrings = parserConfig.multiLineStrings;
-
-  var isOperatorChar = /[*+\-%<>=&?:\/!|]/;
-
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-
-  function tokenComment(stream, state) {
-    var isEnd = false;
-    var ch;
-    while(ch = stream.next()) {
-      if(ch == "/" && isEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      isEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-          end = true; break;
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !(escaped || multiLineStrings))
-        state.tokenize = tokenBase;
-      return "error";
-    };
-  }
-
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-
-    // is a start of string?
-    if (ch == '"' || ch == "'")
-      return chain(stream, state, tokenString(ch));
-    // is it one of the special chars
-    else if(/[\[\]{}\(\),;\.]/.test(ch))
-      return null;
-    // is it a number?
-    else if(/\d/.test(ch)) {
-      stream.eatWhile(/[\w\.]/);
-      return "number";
-    }
-    // multi line comment or operator
-    else if (ch == "/") {
-      if (stream.eat("*")) {
-        return chain(stream, state, tokenComment);
-      }
-      else {
-        stream.eatWhile(isOperatorChar);
-        return "operator";
-      }
-    }
-    // single line comment or operator
-    else if (ch=="-") {
-      if(stream.eat("-")){
-        stream.skipToEnd();
-        return "comment";
-      }
-      else {
-        stream.eatWhile(isOperatorChar);
-        return "operator";
-      }
-    }
-    // is it an operator
-    else if (isOperatorChar.test(ch)) {
-      stream.eatWhile(isOperatorChar);
-      return "operator";
-    }
-    else {
-      // get the while word
-      stream.eatWhile(/[\w\$_]/);
-      // is it one of the listed keywords?
-      if (keywords && keywords.propertyIsEnumerable(stream.current().toUpperCase())) {
-        //keywords can be used as variables like flatten(group), group.$0 etc..
-        if (!stream.eat(")") && !stream.eat("."))
-          return "keyword";
-      }
-      // is it one of the builtin functions?
-      if (builtins && builtins.propertyIsEnumerable(stream.current().toUpperCase()))
-        return "variable-2";
-      // is it one of the listed types?
-      if (types && types.propertyIsEnumerable(stream.current().toUpperCase()))
-        return "variable-3";
-      // default is a 'variable'
-      return "variable";
-    }
-  }
-
-  // Interface
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        startOfLine: true
-      };
-    },
-
-    token: function(stream, state) {
-      if(stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      return style;
-    }
-  };
-});
-
-(function() {
-  function keywords(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  // builtin funcs taken from trunk revision 1303237
-  var pBuiltins = "ABS ACOS ARITY ASIN ATAN AVG BAGSIZE BINSTORAGE BLOOM BUILDBLOOM CBRT CEIL "
-    + "CONCAT COR COS COSH COUNT COUNT_STAR COV CONSTANTSIZE CUBEDIMENSIONS DIFF DISTINCT DOUBLEABS "
-    + "DOUBLEAVG DOUBLEBASE DOUBLEMAX DOUBLEMIN DOUBLEROUND DOUBLESUM EXP FLOOR FLOATABS FLOATAVG "
-    + "FLOATMAX FLOATMIN FLOATROUND FLOATSUM GENERICINVOKER INDEXOF INTABS INTAVG INTMAX INTMIN "
-    + "INTSUM INVOKEFORDOUBLE INVOKEFORFLOAT INVOKEFORINT INVOKEFORLONG INVOKEFORSTRING INVOKER "
-    + "ISEMPTY JSONLOADER JSONMETADATA JSONSTORAGE LAST_INDEX_OF LCFIRST LOG LOG10 LOWER LONGABS "
-    + "LONGAVG LONGMAX LONGMIN LONGSUM MAX MIN MAPSIZE MONITOREDUDF NONDETERMINISTIC OUTPUTSCHEMA  "
-    + "PIGSTORAGE PIGSTREAMING RANDOM REGEX_EXTRACT REGEX_EXTRACT_ALL REPLACE ROUND SIN SINH SIZE "
-    + "SQRT STRSPLIT SUBSTRING SUM STRINGCONCAT STRINGMAX STRINGMIN STRINGSIZE TAN TANH TOBAG "
-    + "TOKENIZE TOMAP TOP TOTUPLE TRIM TEXTLOADER TUPLESIZE UCFIRST UPPER UTF8STORAGECONVERTER ";
-
-  // taken from QueryLexer.g
-  var pKeywords = "VOID IMPORT RETURNS DEFINE LOAD FILTER FOREACH ORDER CUBE DISTINCT COGROUP "
-    + "JOIN CROSS UNION SPLIT INTO IF OTHERWISE ALL AS BY USING INNER OUTER ONSCHEMA PARALLEL "
-    + "PARTITION GROUP AND OR NOT GENERATE FLATTEN ASC DESC IS STREAM THROUGH STORE MAPREDUCE "
-    + "SHIP CACHE INPUT OUTPUT STDERROR STDIN STDOUT LIMIT SAMPLE LEFT RIGHT FULL EQ GT LT GTE LTE "
-    + "NEQ MATCHES TRUE FALSE DUMP";
-
-  // data types
-  var pTypes = "BOOLEAN INT LONG FLOAT DOUBLE CHARARRAY BYTEARRAY BAG TUPLE MAP ";
-
-  CodeMirror.defineMIME("text/x-pig", {
-    name: "pig",
-    builtins: keywords(pBuiltins),
-    keywords: keywords(pKeywords),
-    types: keywords(pTypes)
-  });
-
-  CodeMirror.registerHelper("hintWords", "pig", (pBuiltins + pTypes + pKeywords).split(" "));
-}());
-
-});
diff --git a/www/code/codemirror-5.7/mode/properties/index.html b/www/code/codemirror-5.7/mode/properties/index.html
deleted file mode 100644
index f885302de..000000000
--- a/www/code/codemirror-5.7/mode/properties/index.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-CodeMirror: Properties files mode
-
-
-
-
-
-
-
-
-
-
    
-
    Properties files mode
    
-
    
-    
-
-    
    MIME types defined: text/x-properties,
-    text/x-ini.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/properties/properties.js b/www/code/codemirror-5.7/mode/properties/properties.js
deleted file mode 100644
index 9da5baf42..000000000
--- a/www/code/codemirror-5.7/mode/properties/properties.js
+++ /dev/null
@@ -1,78 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("properties", function() {
-  return {
-    token: function(stream, state) {
-      var sol = stream.sol() || state.afterSection;
-      var eol = stream.eol();
-
-      state.afterSection = false;
-
-      if (sol) {
-        if (state.nextMultiline) {
-          state.inMultiline = true;
-          state.nextMultiline = false;
-        } else {
-          state.position = "def";
-        }
-      }
-
-      if (eol && ! state.nextMultiline) {
-        state.inMultiline = false;
-        state.position = "def";
-      }
-
-      if (sol) {
-        while(stream.eatSpace());
-      }
-
-      var ch = stream.next();
-
-      if (sol && (ch === "#" || ch === "!" || ch === ";")) {
-        state.position = "comment";
-        stream.skipToEnd();
-        return "comment";
-      } else if (sol && ch === "[") {
-        state.afterSection = true;
-        stream.skipTo("]"); stream.eat("]");
-        return "header";
-      } else if (ch === "=" || ch === ":") {
-        state.position = "quote";
-        return null;
-      } else if (ch === "\\" && state.position === "quote") {
-        if (stream.eol()) {  // end of line?
-          // Multiline value
-          state.nextMultiline = true;
-        }
-      }
-
-      return state.position;
-    },
-
-    startState: function() {
-      return {
-        position : "def",       // Current position, "def", "quote" or "comment"
-        nextMultiline : false,  // Is the next line multiline value
-        inMultiline : false,    // Is the current line a multiline value
-        afterSection : false    // Did we just open a section
-      };
-    }
-
-  };
-});
-
-CodeMirror.defineMIME("text/x-properties", "properties");
-CodeMirror.defineMIME("text/x-ini", "properties");
-
-});
diff --git a/www/code/codemirror-5.7/mode/puppet/index.html b/www/code/codemirror-5.7/mode/puppet/index.html
deleted file mode 100644
index 5614c3695..000000000
--- a/www/code/codemirror-5.7/mode/puppet/index.html
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-CodeMirror: Puppet mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Puppet mode
    
-
    
-    
-
-    
    MIME types defined: text/x-puppet.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/puppet/puppet.js b/www/code/codemirror-5.7/mode/puppet/puppet.js
deleted file mode 100644
index e7f799f78..000000000
--- a/www/code/codemirror-5.7/mode/puppet/puppet.js
+++ /dev/null
@@ -1,220 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("puppet", function () {
-  // Stores the words from the define method
-  var words = {};
-  // Taken, mostly, from the Puppet official variable standards regex
-  var variable_regex = /({)?([a-z][a-z0-9_]*)?((::[a-z][a-z0-9_]*)*::)?[a-zA-Z0-9_]+(})?/;
-
-  // Takes a string of words separated by spaces and adds them as
-  // keys with the value of the first argument 'style'
-  function define(style, string) {
-    var split = string.split(' ');
-    for (var i = 0; i < split.length; i++) {
-      words[split[i]] = style;
-    }
-  }
-
-  // Takes commonly known puppet types/words and classifies them to a style
-  define('keyword', 'class define site node include import inherits');
-  define('keyword', 'case if else in and elsif default or');
-  define('atom', 'false true running present absent file directory undef');
-  define('builtin', 'action augeas burst chain computer cron destination dport exec ' +
-    'file filebucket group host icmp iniface interface jump k5login limit log_level ' +
-    'log_prefix macauthorization mailalias maillist mcx mount nagios_command ' +
-    'nagios_contact nagios_contactgroup nagios_host nagios_hostdependency ' +
-    'nagios_hostescalation nagios_hostextinfo nagios_hostgroup nagios_service ' +
-    'nagios_servicedependency nagios_serviceescalation nagios_serviceextinfo ' +
-    'nagios_servicegroup nagios_timeperiod name notify outiface package proto reject ' +
-    'resources router schedule scheduled_task selboolean selmodule service source ' +
-    'sport ssh_authorized_key sshkey stage state table tidy todest toports tosource ' +
-    'user vlan yumrepo zfs zone zpool');
-
-  // After finding a start of a string ('|") this function attempts to find the end;
-  // If a variable is encountered along the way, we display it differently when it
-  // is encapsulated in a double-quoted string.
-  function tokenString(stream, state) {
-    var current, prev, found_var = false;
-    while (!stream.eol() && (current = stream.next()) != state.pending) {
-      if (current === '$' && prev != '\\' && state.pending == '"') {
-        found_var = true;
-        break;
-      }
-      prev = current;
-    }
-    if (found_var) {
-      stream.backUp(1);
-    }
-    if (current == state.pending) {
-      state.continueString = false;
-    } else {
-      state.continueString = true;
-    }
-    return "string";
-  }
-
-  // Main function
-  function tokenize(stream, state) {
-    // Matches one whole word
-    var word = stream.match(/[\w]+/, false);
-    // Matches attributes (i.e. ensure => present ; 'ensure' would be matched)
-    var attribute = stream.match(/(\s+)?\w+\s+=>.*/, false);
-    // Matches non-builtin resource declarations
-    // (i.e. "apache::vhost {" or "mycustomclasss {" would be matched)
-    var resource = stream.match(/(\s+)?[\w:_]+(\s+)?{/, false);
-    // Matches virtual and exported resources (i.e. @@user { ; and the like)
-    var special_resource = stream.match(/(\s+)?[@]{1,2}[\w:_]+(\s+)?{/, false);
-
-    // Finally advance the stream
-    var ch = stream.next();
-
-    // Have we found a variable?
-    if (ch === '$') {
-      if (stream.match(variable_regex)) {
-        // If so, and its in a string, assign it a different color
-        return state.continueString ? 'variable-2' : 'variable';
-      }
-      // Otherwise return an invalid variable
-      return "error";
-    }
-    // Should we still be looking for the end of a string?
-    if (state.continueString) {
-      // If so, go through the loop again
-      stream.backUp(1);
-      return tokenString(stream, state);
-    }
-    // Are we in a definition (class, node, define)?
-    if (state.inDefinition) {
-      // If so, return def (i.e. for 'class myclass {' ; 'myclass' would be matched)
-      if (stream.match(/(\s+)?[\w:_]+(\s+)?/)) {
-        return 'def';
-      }
-      // Match the rest it the next time around
-      stream.match(/\s+{/);
-      state.inDefinition = false;
-    }
-    // Are we in an 'include' statement?
-    if (state.inInclude) {
-      // Match and return the included class
-      stream.match(/(\s+)?\S+(\s+)?/);
-      state.inInclude = false;
-      return 'def';
-    }
-    // Do we just have a function on our hands?
-    // In 'ensure_resource("myclass")', 'ensure_resource' is matched
-    if (stream.match(/(\s+)?\w+\(/)) {
-      stream.backUp(1);
-      return 'def';
-    }
-    // Have we matched the prior attribute regex?
-    if (attribute) {
-      stream.match(/(\s+)?\w+/);
-      return 'tag';
-    }
-    // Do we have Puppet specific words?
-    if (word && words.hasOwnProperty(word)) {
-      // Negates the initial next()
-      stream.backUp(1);
-      // Acutally move the stream
-      stream.match(/[\w]+/);
-      // We want to process these words differently
-      // do to the importance they have in Puppet
-      if (stream.match(/\s+\S+\s+{/, false)) {
-        state.inDefinition = true;
-      }
-      if (word == 'include') {
-        state.inInclude = true;
-      }
-      // Returns their value as state in the prior define methods
-      return words[word];
-    }
-    // Is there a match on a reference?
-    if (/(^|\s+)[A-Z][\w:_]+/.test(word)) {
-      // Negate the next()
-      stream.backUp(1);
-      // Match the full reference
-      stream.match(/(^|\s+)[A-Z][\w:_]+/);
-      return 'def';
-    }
-    // Have we matched the prior resource regex?
-    if (resource) {
-      stream.match(/(\s+)?[\w:_]+/);
-      return 'def';
-    }
-    // Have we matched the prior special_resource regex?
-    if (special_resource) {
-      stream.match(/(\s+)?[@]{1,2}/);
-      return 'special';
-    }
-    // Match all the comments. All of them.
-    if (ch == "#") {
-      stream.skipToEnd();
-      return "comment";
-    }
-    // Have we found a string?
-    if (ch == "'" || ch == '"') {
-      // Store the type (single or double)
-      state.pending = ch;
-      // Perform the looping function to find the end
-      return tokenString(stream, state);
-    }
-    // Match all the brackets
-    if (ch == '{' || ch == '}') {
-      return 'bracket';
-    }
-    // Match characters that we are going to assume
-    // are trying to be regex
-    if (ch == '/') {
-      stream.match(/.*?\//);
-      return 'variable-3';
-    }
-    // Match all the numbers
-    if (ch.match(/[0-9]/)) {
-      stream.eatWhile(/[0-9]+/);
-      return 'number';
-    }
-    // Match the '=' and '=>' operators
-    if (ch == '=') {
-      if (stream.peek() == '>') {
-          stream.next();
-      }
-      return "operator";
-    }
-    // Keep advancing through all the rest
-    stream.eatWhile(/[\w-]/);
-    // Return a blank line for everything else
-    return null;
-  }
-  // Start it all
-  return {
-    startState: function () {
-      var state = {};
-      state.inDefinition = false;
-      state.inInclude = false;
-      state.continueString = false;
-      state.pending = false;
-      return state;
-    },
-    token: function (stream, state) {
-      // Strip the spaces, but regex will account for them eitherway
-      if (stream.eatSpace()) return null;
-      // Go through the main process
-      return tokenize(stream, state);
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-puppet", "puppet");
-
-});
diff --git a/www/code/codemirror-5.7/mode/python/index.html b/www/code/codemirror-5.7/mode/python/index.html
deleted file mode 100644
index 86eb3d52f..000000000
--- a/www/code/codemirror-5.7/mode/python/index.html
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
-CodeMirror: Python mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Python mode
    
-
-    
    
-
-
-
    Cython mode
    
-
-
    
-
-    
-    
    Configuration Options for Python mode:
    
-    
      
-      
    • version - 2/3 - The version of Python to recognize.  Default is 2.
      • 
-      
    • singleLineStringErrors - true/false - If you have a single-line string that is not terminated at the end of the line, this will show subsequent lines as errors if true, otherwise it will consider the newline as the end of the string. Default is false.
      • 
-      
    • hangingIndent - int - If you want to write long arguments to a function starting on a new line, how much that line should be indented. Defaults to one normal indentation unit.
      • 
-    
    
-    
    Advanced Configuration Options:
    
-    
    Usefull for superset of python syntax like Enthought enaml, IPython magics and  questionmark help
    
-    
      
-      
    • singleOperators - RegEx - Regular Expression for single operator matching,  default : 
      ^[\\+\\-\\*/%&|\\^~<>!]
       including 
      @
       on Python 3
      • 
-      
    • singleDelimiters - RegEx - Regular Expression for single delimiter matching, default :  
      ^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]
      • 
-      
    • doubleOperators - RegEx - Regular Expression for double operators matching, default : 
      ^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))
      • 
-      
    • doubleDelimiters - RegEx - Regular Expressoin for double delimiters matching, default : 
      ^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))
      • 
-      
    • tripleDelimiters - RegEx - Regular Expression for triple delimiters matching, default : 
      ^((//=)|(>>=)|(<<=)|(\\*\\*=))
      • 
-      
    • identifiers - RegEx - Regular Expression for identifier, default : 
      ^[_A-Za-z][_A-Za-z0-9]*
       on Python 2 and 
      ^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*
       on Python 3.
      • 
-      
    • extra_keywords - list of string - List of extra words ton consider as keywords
      • 
-      
    • extra_builtins - list of string - List of extra words ton consider as builtins
      • 
-    
    
-
-
-    
    MIME types defined: text/x-python and text/x-cython.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/python/python.js b/www/code/codemirror-5.7/mode/python/python.js
deleted file mode 100644
index e5a09719b..000000000
--- a/www/code/codemirror-5.7/mode/python/python.js
+++ /dev/null
@@ -1,358 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  function wordRegexp(words) {
-    return new RegExp("^((" + words.join(")|(") + "))\\b");
-  }
-
-  var wordOperators = wordRegexp(["and", "or", "not", "is"]);
-  var commonKeywords = ["as", "assert", "break", "class", "continue",
-                        "def", "del", "elif", "else", "except", "finally",
-                        "for", "from", "global", "if", "import",
-                        "lambda", "pass", "raise", "return",
-                        "try", "while", "with", "yield", "in"];
-  var commonBuiltins = ["abs", "all", "any", "bin", "bool", "bytearray", "callable", "chr",
-                        "classmethod", "compile", "complex", "delattr", "dict", "dir", "divmod",
-                        "enumerate", "eval", "filter", "float", "format", "frozenset",
-                        "getattr", "globals", "hasattr", "hash", "help", "hex", "id",
-                        "input", "int", "isinstance", "issubclass", "iter", "len",
-                        "list", "locals", "map", "max", "memoryview", "min", "next",
-                        "object", "oct", "open", "ord", "pow", "property", "range",
-                        "repr", "reversed", "round", "set", "setattr", "slice",
-                        "sorted", "staticmethod", "str", "sum", "super", "tuple",
-                        "type", "vars", "zip", "__import__", "NotImplemented",
-                        "Ellipsis", "__debug__"];
-  var py2 = {builtins: ["apply", "basestring", "buffer", "cmp", "coerce", "execfile",
-                        "file", "intern", "long", "raw_input", "reduce", "reload",
-                        "unichr", "unicode", "xrange", "False", "True", "None"],
-             keywords: ["exec", "print"]};
-  var py3 = {builtins: ["ascii", "bytes", "exec", "print"],
-             keywords: ["nonlocal", "False", "True", "None", "async", "await"]};
-
-  CodeMirror.registerHelper("hintWords", "python", commonKeywords.concat(commonBuiltins));
-
-  function top(state) {
-    return state.scopes[state.scopes.length - 1];
-  }
-
-  CodeMirror.defineMode("python", function(conf, parserConf) {
-    var ERRORCLASS = "error";
-
-    var singleDelimiters = parserConf.singleDelimiters || new RegExp("^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]");
-    var doubleOperators = parserConf.doubleOperators || new RegExp("^((==)|(!=)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
-    var doubleDelimiters = parserConf.doubleDelimiters || new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
-    var tripleDelimiters = parserConf.tripleDelimiters || new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
-
-    if (parserConf.version && parseInt(parserConf.version, 10) == 3){
-        // since http://legacy.python.org/dev/peps/pep-0465/ @ is also an operator
-        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!@]");
-        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z\u00A1-\uFFFF][_A-Za-z0-9\u00A1-\uFFFF]*");
-    } else {
-        var singleOperators = parserConf.singleOperators || new RegExp("^[\\+\\-\\*/%&|\\^~<>!]");
-        var identifiers = parserConf.identifiers|| new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
-    }
-
-    var hangingIndent = parserConf.hangingIndent || conf.indentUnit;
-
-    var myKeywords = commonKeywords, myBuiltins = commonBuiltins;
-    if(parserConf.extra_keywords != undefined){
-      myKeywords = myKeywords.concat(parserConf.extra_keywords);
-    }
-    if(parserConf.extra_builtins != undefined){
-      myBuiltins = myBuiltins.concat(parserConf.extra_builtins);
-    }
-    if (parserConf.version && parseInt(parserConf.version, 10) == 3) {
-      myKeywords = myKeywords.concat(py3.keywords);
-      myBuiltins = myBuiltins.concat(py3.builtins);
-      var stringPrefixes = new RegExp("^(([rb]|(br))?('{3}|\"{3}|['\"]))", "i");
-    } else {
-      myKeywords = myKeywords.concat(py2.keywords);
-      myBuiltins = myBuiltins.concat(py2.builtins);
-      var stringPrefixes = new RegExp("^(([rub]|(ur)|(br))?('{3}|\"{3}|['\"]))", "i");
-    }
-    var keywords = wordRegexp(myKeywords);
-    var builtins = wordRegexp(myBuiltins);
-
-    // tokenizers
-    function tokenBase(stream, state) {
-      // Handle scope changes
-      if (stream.sol() && top(state).type == "py") {
-        var scopeOffset = top(state).offset;
-        if (stream.eatSpace()) {
-          var lineOffset = stream.indentation();
-          if (lineOffset > scopeOffset)
-            pushScope(stream, state, "py");
-          else if (lineOffset < scopeOffset && dedent(stream, state))
-            state.errorToken = true;
-          return null;
-        } else {
-          var style = tokenBaseInner(stream, state);
-          if (scopeOffset > 0 && dedent(stream, state))
-            style += " " + ERRORCLASS;
-          return style;
-        }
-      }
-      return tokenBaseInner(stream, state);
-    }
-
-    function tokenBaseInner(stream, state) {
-      if (stream.eatSpace()) return null;
-
-      var ch = stream.peek();
-
-      // Handle Comments
-      if (ch == "#") {
-        stream.skipToEnd();
-        return "comment";
-      }
-
-      // Handle Number Literals
-      if (stream.match(/^[0-9\.]/, false)) {
-        var floatLiteral = false;
-        // Floats
-        if (stream.match(/^\d*\.\d+(e[\+\-]?\d+)?/i)) { floatLiteral = true; }
-        if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
-        if (stream.match(/^\.\d+/)) { floatLiteral = true; }
-        if (floatLiteral) {
-          // Float literals may be "imaginary"
-          stream.eat(/J/i);
-          return "number";
-        }
-        // Integers
-        var intLiteral = false;
-        // Hex
-        if (stream.match(/^0x[0-9a-f]+/i)) intLiteral = true;
-        // Binary
-        if (stream.match(/^0b[01]+/i)) intLiteral = true;
-        // Octal
-        if (stream.match(/^0o[0-7]+/i)) intLiteral = true;
-        // Decimal
-        if (stream.match(/^[1-9]\d*(e[\+\-]?\d+)?/)) {
-          // Decimal literals may be "imaginary"
-          stream.eat(/J/i);
-          // TODO - Can you have imaginary longs?
-          intLiteral = true;
-        }
-        // Zero by itself with no other piece of number.
-        if (stream.match(/^0(?![\dx])/i)) intLiteral = true;
-        if (intLiteral) {
-          // Integer literals may be "long"
-          stream.eat(/L/i);
-          return "number";
-        }
-      }
-
-      // Handle Strings
-      if (stream.match(stringPrefixes)) {
-        state.tokenize = tokenStringFactory(stream.current());
-        return state.tokenize(stream, state);
-      }
-
-      // Handle operators and Delimiters
-      if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters))
-        return null;
-
-      if (stream.match(doubleOperators) || stream.match(singleOperators))
-        return "operator";
-
-      if (stream.match(singleDelimiters))
-        return null;
-
-      if (stream.match(keywords) || stream.match(wordOperators))
-        return "keyword";
-
-      if (stream.match(builtins))
-        return "builtin";
-
-      if (stream.match(/^(self|cls)\b/))
-        return "variable-2";
-
-      if (stream.match(identifiers)) {
-        if (state.lastToken == "def" || state.lastToken == "class")
-          return "def";
-        return "variable";
-      }
-
-      // Handle non-detected items
-      stream.next();
-      return ERRORCLASS;
-    }
-
-    function tokenStringFactory(delimiter) {
-      while ("rub".indexOf(delimiter.charAt(0).toLowerCase()) >= 0)
-        delimiter = delimiter.substr(1);
-
-      var singleline = delimiter.length == 1;
-      var OUTCLASS = "string";
-
-      function tokenString(stream, state) {
-        while (!stream.eol()) {
-          stream.eatWhile(/[^'"\\]/);
-          if (stream.eat("\\")) {
-            stream.next();
-            if (singleline && stream.eol())
-              return OUTCLASS;
-          } else if (stream.match(delimiter)) {
-            state.tokenize = tokenBase;
-            return OUTCLASS;
-          } else {
-            stream.eat(/['"]/);
-          }
-        }
-        if (singleline) {
-          if (parserConf.singleLineStringErrors)
-            return ERRORCLASS;
-          else
-            state.tokenize = tokenBase;
-        }
-        return OUTCLASS;
-      }
-      tokenString.isString = true;
-      return tokenString;
-    }
-
-    function pushScope(stream, state, type) {
-      var offset = 0, align = null;
-      if (type == "py") {
-        while (top(state).type != "py")
-          state.scopes.pop();
-      }
-      offset = top(state).offset + (type == "py" ? conf.indentUnit : hangingIndent);
-      if (type != "py" && !stream.match(/^(\s|#.*)*$/, false))
-        align = stream.column() + 1;
-      state.scopes.push({offset: offset, type: type, align: align});
-    }
-
-    function dedent(stream, state) {
-      var indented = stream.indentation();
-      while (top(state).offset > indented) {
-        if (top(state).type != "py") return true;
-        state.scopes.pop();
-      }
-      return top(state).offset != indented;
-    }
-
-    function tokenLexer(stream, state) {
-      var style = state.tokenize(stream, state);
-      var current = stream.current();
-
-      // Handle '.' connected identifiers
-      if (current == ".") {
-        style = stream.match(identifiers, false) ? null : ERRORCLASS;
-        if (style == null && state.lastStyle == "meta") {
-          // Apply 'meta' style to '.' connected identifiers when
-          // appropriate.
-          style = "meta";
-        }
-        return style;
-      }
-
-      // Handle decorators
-      if (current == "@"){
-        if(parserConf.version && parseInt(parserConf.version, 10) == 3){
-            return stream.match(identifiers, false) ? "meta" : "operator";
-        } else {
-            return stream.match(identifiers, false) ? "meta" : ERRORCLASS;
-        }
-      }
-
-      if ((style == "variable" || style == "builtin")
-          && state.lastStyle == "meta")
-        style = "meta";
-
-      // Handle scope changes.
-      if (current == "pass" || current == "return")
-        state.dedent += 1;
-
-      if (current == "lambda") state.lambda = true;
-      if (current == ":" && !state.lambda && top(state).type == "py")
-        pushScope(stream, state, "py");
-
-      var delimiter_index = current.length == 1 ? "[({".indexOf(current) : -1;
-      if (delimiter_index != -1)
-        pushScope(stream, state, "])}".slice(delimiter_index, delimiter_index+1));
-
-      delimiter_index = "])}".indexOf(current);
-      if (delimiter_index != -1) {
-        if (top(state).type == current) state.scopes.pop();
-        else return ERRORCLASS;
-      }
-      if (state.dedent > 0 && stream.eol() && top(state).type == "py") {
-        if (state.scopes.length > 1) state.scopes.pop();
-        state.dedent -= 1;
-      }
-
-      return style;
-    }
-
-    var external = {
-      startState: function(basecolumn) {
-        return {
-          tokenize: tokenBase,
-          scopes: [{offset: basecolumn || 0, type: "py", align: null}],
-          lastStyle: null,
-          lastToken: null,
-          lambda: false,
-          dedent: 0
-        };
-      },
-
-      token: function(stream, state) {
-        var addErr = state.errorToken;
-        if (addErr) state.errorToken = false;
-        var style = tokenLexer(stream, state);
-
-        state.lastStyle = style;
-
-        var current = stream.current();
-        if (current && style)
-          state.lastToken = current;
-
-        if (stream.eol() && state.lambda)
-          state.lambda = false;
-        return addErr ? style + " " + ERRORCLASS : style;
-      },
-
-      indent: function(state, textAfter) {
-        if (state.tokenize != tokenBase)
-          return state.tokenize.isString ? CodeMirror.Pass : 0;
-
-        var scope = top(state);
-        var closing = textAfter && textAfter.charAt(0) == scope.type;
-        if (scope.align != null)
-          return scope.align - (closing ? 1 : 0);
-        else if (closing && state.scopes.length > 1)
-          return state.scopes[state.scopes.length - 2].offset;
-        else
-          return scope.offset;
-      },
-
-      closeBrackets: {triples: "'\""},
-      lineComment: "#",
-      fold: "indent"
-    };
-    return external;
-  });
-
-  CodeMirror.defineMIME("text/x-python", "python");
-
-  var words = function(str) { return str.split(" "); };
-
-  CodeMirror.defineMIME("text/x-cython", {
-    name: "python",
-    extra_keywords: words("by cdef cimport cpdef ctypedef enum except"+
-                          "extern gil include nogil property public"+
-                          "readonly struct union DEF IF ELIF ELSE")
-  });
-
-});
diff --git a/www/code/codemirror-5.7/mode/q/index.html b/www/code/codemirror-5.7/mode/q/index.html
deleted file mode 100644
index 72785ba3b..000000000
--- a/www/code/codemirror-5.7/mode/q/index.html
+++ /dev/null
@@ -1,144 +0,0 @@
-
-
-CodeMirror: Q mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Q mode
    
-
-
-
    
-
-    
-
-    
    MIME type defined: text/x-q.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/q/q.js b/www/code/codemirror-5.7/mode/q/q.js
deleted file mode 100644
index a4af9383e..000000000
--- a/www/code/codemirror-5.7/mode/q/q.js
+++ /dev/null
@@ -1,139 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("q",function(config){
-  var indentUnit=config.indentUnit,
-      curPunc,
-      keywords=buildRE(["abs","acos","aj","aj0","all","and","any","asc","asin","asof","atan","attr","avg","avgs","bin","by","ceiling","cols","cor","cos","count","cov","cross","csv","cut","delete","deltas","desc","dev","differ","distinct","div","do","each","ej","enlist","eval","except","exec","exit","exp","fby","fills","first","fkeys","flip","floor","from","get","getenv","group","gtime","hclose","hcount","hdel","hopen","hsym","iasc","idesc","if","ij","in","insert","inter","inv","key","keys","last","like","list","lj","load","log","lower","lsq","ltime","ltrim","mavg","max","maxs","mcount","md5","mdev","med","meta","min","mins","mmax","mmin","mmu","mod","msum","neg","next","not","null","or","over","parse","peach","pj","plist","prd","prds","prev","prior","rand","rank","ratios","raze","read0","read1","reciprocal","reverse","rload","rotate","rsave","rtrim","save","scan","select","set","setenv","show","signum","sin","sqrt","ss","ssr","string","sublist","sum","sums","sv","system","tables","tan","til","trim","txf","type","uj","ungroup","union","update","upper","upsert","value","var","view","views","vs","wavg","where","where","while","within","wj","wj1","wsum","xasc","xbar","xcol","xcols","xdesc","xexp","xgroup","xkey","xlog","xprev","xrank"]),
-      E=/[|/&^!+:\\\-*%$=~#;@><,?_\'\"\[\(\]\)\s{}]/;
-  function buildRE(w){return new RegExp("^("+w.join("|")+")$");}
-  function tokenBase(stream,state){
-    var sol=stream.sol(),c=stream.next();
-    curPunc=null;
-    if(sol)
-      if(c=="/")
-        return(state.tokenize=tokenLineComment)(stream,state);
-      else if(c=="\\"){
-        if(stream.eol()||/\s/.test(stream.peek()))
-          return stream.skipToEnd(),/^\\\s*$/.test(stream.current())?(state.tokenize=tokenCommentToEOF)(stream, state):state.tokenize=tokenBase,"comment";
-        else
-          return state.tokenize=tokenBase,"builtin";
-      }
-    if(/\s/.test(c))
-      return stream.peek()=="/"?(stream.skipToEnd(),"comment"):"whitespace";
-    if(c=='"')
-      return(state.tokenize=tokenString)(stream,state);
-    if(c=='`')
-      return stream.eatWhile(/[A-Z|a-z|\d|_|:|\/|\.]/),"symbol";
-    if(("."==c&&/\d/.test(stream.peek()))||/\d/.test(c)){
-      var t=null;
-      stream.backUp(1);
-      if(stream.match(/^\d{4}\.\d{2}(m|\.\d{2}([D|T](\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)?)?)/)
-      || stream.match(/^\d+D(\d{2}(:\d{2}(:\d{2}(\.\d{1,9})?)?)?)/)
-      || stream.match(/^\d{2}:\d{2}(:\d{2}(\.\d{1,9})?)?/)
-      || stream.match(/^\d+[ptuv]{1}/))
-        t="temporal";
-      else if(stream.match(/^0[NwW]{1}/)
-      || stream.match(/^0x[\d|a-f|A-F]*/)
-      || stream.match(/^[0|1]+[b]{1}/)
-      || stream.match(/^\d+[chijn]{1}/)
-      || stream.match(/-?\d*(\.\d*)?(e[+\-]?\d+)?(e|f)?/))
-        t="number";
-      return(t&&(!(c=stream.peek())||E.test(c)))?t:(stream.next(),"error");
-    }
-    if(/[A-Z|a-z]|\./.test(c))
-      return stream.eatWhile(/[A-Z|a-z|\.|_|\d]/),keywords.test(stream.current())?"keyword":"variable";
-    if(/[|/&^!+:\\\-*%$=~#;@><\.,?_\']/.test(c))
-      return null;
-    if(/[{}\(\[\]\)]/.test(c))
-      return null;
-    return"error";
-  }
-  function tokenLineComment(stream,state){
-    return stream.skipToEnd(),/\/\s*$/.test(stream.current())?(state.tokenize=tokenBlockComment)(stream,state):(state.tokenize=tokenBase),"comment";
-  }
-  function tokenBlockComment(stream,state){
-    var f=stream.sol()&&stream.peek()=="\\";
-    stream.skipToEnd();
-    if(f&&/^\\\s*$/.test(stream.current()))
-      state.tokenize=tokenBase;
-    return"comment";
-  }
-  function tokenCommentToEOF(stream){return stream.skipToEnd(),"comment";}
-  function tokenString(stream,state){
-    var escaped=false,next,end=false;
-    while((next=stream.next())){
-      if(next=="\""&&!escaped){end=true;break;}
-      escaped=!escaped&&next=="\\";
-    }
-    if(end)state.tokenize=tokenBase;
-    return"string";
-  }
-  function pushContext(state,type,col){state.context={prev:state.context,indent:state.indent,col:col,type:type};}
-  function popContext(state){state.indent=state.context.indent;state.context=state.context.prev;}
-  return{
-    startState:function(){
-      return{tokenize:tokenBase,
-             context:null,
-             indent:0,
-             col:0};
-    },
-    token:function(stream,state){
-      if(stream.sol()){
-        if(state.context&&state.context.align==null)
-          state.context.align=false;
-        state.indent=stream.indentation();
-      }
-      //if (stream.eatSpace()) return null;
-      var style=state.tokenize(stream,state);
-      if(style!="comment"&&state.context&&state.context.align==null&&state.context.type!="pattern"){
-        state.context.align=true;
-      }
-      if(curPunc=="(")pushContext(state,")",stream.column());
-      else if(curPunc=="[")pushContext(state,"]",stream.column());
-      else if(curPunc=="{")pushContext(state,"}",stream.column());
-      else if(/[\]\}\)]/.test(curPunc)){
-        while(state.context&&state.context.type=="pattern")popContext(state);
-        if(state.context&&curPunc==state.context.type)popContext(state);
-      }
-      else if(curPunc=="."&&state.context&&state.context.type=="pattern")popContext(state);
-      else if(/atom|string|variable/.test(style)&&state.context){
-        if(/[\}\]]/.test(state.context.type))
-          pushContext(state,"pattern",stream.column());
-        else if(state.context.type=="pattern"&&!state.context.align){
-          state.context.align=true;
-          state.context.col=stream.column();
-        }
-      }
-      return style;
-    },
-    indent:function(state,textAfter){
-      var firstChar=textAfter&&textAfter.charAt(0);
-      var context=state.context;
-      if(/[\]\}]/.test(firstChar))
-        while (context&&context.type=="pattern")context=context.prev;
-      var closing=context&&firstChar==context.type;
-      if(!context)
-        return 0;
-      else if(context.type=="pattern")
-        return context.col;
-      else if(context.align)
-        return context.col+(closing?0:1);
-      else
-        return context.indent+(closing?0:indentUnit);
-    }
-  };
-});
-CodeMirror.defineMIME("text/x-q","q");
-
-});
diff --git a/www/code/codemirror-5.7/mode/r/index.html b/www/code/codemirror-5.7/mode/r/index.html
deleted file mode 100644
index 6dd963465..000000000
--- a/www/code/codemirror-5.7/mode/r/index.html
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-CodeMirror: R mode
-
-
-
-
-
-
-
-
-
-
    
-
    R mode
    
-
    
-    
-
-    
    MIME types defined: text/x-rsrc.
    
-
-    
    Development of the CodeMirror R mode was kindly sponsored
-    by Ubalo.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/r/r.js b/www/code/codemirror-5.7/mode/r/r.js
deleted file mode 100644
index 1ab4a9565..000000000
--- a/www/code/codemirror-5.7/mode/r/r.js
+++ /dev/null
@@ -1,162 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("r", function(config) {
-  function wordObj(str) {
-    var words = str.split(" "), res = {};
-    for (var i = 0; i < words.length; ++i) res[words[i]] = true;
-    return res;
-  }
-  var atoms = wordObj("NULL NA Inf NaN NA_integer_ NA_real_ NA_complex_ NA_character_");
-  var builtins = wordObj("list quote bquote eval return call parse deparse");
-  var keywords = wordObj("if else repeat while function for in next break");
-  var blockkeywords = wordObj("if else repeat while function for");
-  var opChars = /[+\-*\/^<>=!&|~$:]/;
-  var curPunc;
-
-  function tokenBase(stream, state) {
-    curPunc = null;
-    var ch = stream.next();
-    if (ch == "#") {
-      stream.skipToEnd();
-      return "comment";
-    } else if (ch == "0" && stream.eat("x")) {
-      stream.eatWhile(/[\da-f]/i);
-      return "number";
-    } else if (ch == "." && stream.eat(/\d/)) {
-      stream.match(/\d*(?:e[+\-]?\d+)?/);
-      return "number";
-    } else if (/\d/.test(ch)) {
-      stream.match(/\d*(?:\.\d+)?(?:e[+\-]\d+)?L?/);
-      return "number";
-    } else if (ch == "'" || ch == '"') {
-      state.tokenize = tokenString(ch);
-      return "string";
-    } else if (ch == "." && stream.match(/.[.\d]+/)) {
-      return "keyword";
-    } else if (/[\w\.]/.test(ch) && ch != "_") {
-      stream.eatWhile(/[\w\.]/);
-      var word = stream.current();
-      if (atoms.propertyIsEnumerable(word)) return "atom";
-      if (keywords.propertyIsEnumerable(word)) {
-        // Block keywords start new blocks, except 'else if', which only starts
-        // one new block for the 'if', no block for the 'else'.
-        if (blockkeywords.propertyIsEnumerable(word) &&
-            !stream.match(/\s*if(\s+|$)/, false))
-          curPunc = "block";
-        return "keyword";
-      }
-      if (builtins.propertyIsEnumerable(word)) return "builtin";
-      return "variable";
-    } else if (ch == "%") {
-      if (stream.skipTo("%")) stream.next();
-      return "variable-2";
-    } else if (ch == "<" && stream.eat("-")) {
-      return "arrow";
-    } else if (ch == "=" && state.ctx.argList) {
-      return "arg-is";
-    } else if (opChars.test(ch)) {
-      if (ch == "$") return "dollar";
-      stream.eatWhile(opChars);
-      return "operator";
-    } else if (/[\(\){}\[\];]/.test(ch)) {
-      curPunc = ch;
-      if (ch == ";") return "semi";
-      return null;
-    } else {
-      return null;
-    }
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      if (stream.eat("\\")) {
-        var ch = stream.next();
-        if (ch == "x") stream.match(/^[a-f0-9]{2}/i);
-        else if ((ch == "u" || ch == "U") && stream.eat("{") && stream.skipTo("}")) stream.next();
-        else if (ch == "u") stream.match(/^[a-f0-9]{4}/i);
-        else if (ch == "U") stream.match(/^[a-f0-9]{8}/i);
-        else if (/[0-7]/.test(ch)) stream.match(/^[0-7]{1,2}/);
-        return "string-2";
-      } else {
-        var next;
-        while ((next = stream.next()) != null) {
-          if (next == quote) { state.tokenize = tokenBase; break; }
-          if (next == "\\") { stream.backUp(1); break; }
-        }
-        return "string";
-      }
-    };
-  }
-
-  function push(state, type, stream) {
-    state.ctx = {type: type,
-                 indent: state.indent,
-                 align: null,
-                 column: stream.column(),
-                 prev: state.ctx};
-  }
-  function pop(state) {
-    state.indent = state.ctx.indent;
-    state.ctx = state.ctx.prev;
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: tokenBase,
-              ctx: {type: "top",
-                    indent: -config.indentUnit,
-                    align: false},
-              indent: 0,
-              afterIdent: false};
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (state.ctx.align == null) state.ctx.align = false;
-        state.indent = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (style != "comment" && state.ctx.align == null) state.ctx.align = true;
-
-      var ctype = state.ctx.type;
-      if ((curPunc == ";" || curPunc == "{" || curPunc == "}") && ctype == "block") pop(state);
-      if (curPunc == "{") push(state, "}", stream);
-      else if (curPunc == "(") {
-        push(state, ")", stream);
-        if (state.afterIdent) state.ctx.argList = true;
-      }
-      else if (curPunc == "[") push(state, "]", stream);
-      else if (curPunc == "block") push(state, "block", stream);
-      else if (curPunc == ctype) pop(state);
-      state.afterIdent = style == "variable" || style == "keyword";
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), ctx = state.ctx,
-          closing = firstChar == ctx.type;
-      if (ctx.type == "block") return ctx.indent + (firstChar == "{" ? 0 : config.indentUnit);
-      else if (ctx.align) return ctx.column + (closing ? 0 : 1);
-      else return ctx.indent + (closing ? 0 : config.indentUnit);
-    },
-
-    lineComment: "#"
-  };
-});
-
-CodeMirror.defineMIME("text/x-rsrc", "r");
-
-});
diff --git a/www/code/codemirror-5.7/mode/rpm/changes/index.html b/www/code/codemirror-5.7/mode/rpm/changes/index.html
deleted file mode 100644
index 6e5031bd1..000000000
--- a/www/code/codemirror-5.7/mode/rpm/changes/index.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-CodeMirror: RPM changes mode
-
-
-
-    
-    
-    
-    
-    
-
-
-
-
    
-
    RPM changes mode
    
-
-    
    
-    
-
-    
    MIME types defined: text/x-rpm-changes.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/rpm/index.html b/www/code/codemirror-5.7/mode/rpm/index.html
deleted file mode 100644
index 9a34e6dfb..000000000
--- a/www/code/codemirror-5.7/mode/rpm/index.html
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-CodeMirror: RPM changes mode
-
-
-
-    
-    
-    
-    
-    
-
-
-
-
    
-
    RPM changes mode
    
-
-    
    
-    
-
-
    RPM spec mode
    
-    
-    
    
-    
-
-    
    MIME types defined: text/x-rpm-spec, text/x-rpm-changes.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/rpm/rpm.js b/www/code/codemirror-5.7/mode/rpm/rpm.js
deleted file mode 100644
index 3bb7cd2f6..000000000
--- a/www/code/codemirror-5.7/mode/rpm/rpm.js
+++ /dev/null
@@ -1,101 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("rpm-changes", function() {
-  var headerSeperator = /^-+$/;
-  var headerLine = /^(Mon|Tue|Wed|Thu|Fri|Sat|Sun) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)  ?\d{1,2} \d{2}:\d{2}(:\d{2})? [A-Z]{3,4} \d{4} - /;
-  var simpleEmail = /^[\w+.-]+@[\w.-]+/;
-
-  return {
-    token: function(stream) {
-      if (stream.sol()) {
-        if (stream.match(headerSeperator)) { return 'tag'; }
-        if (stream.match(headerLine)) { return 'tag'; }
-      }
-      if (stream.match(simpleEmail)) { return 'string'; }
-      stream.next();
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-rpm-changes", "rpm-changes");
-
-// Quick and dirty spec file highlighting
-
-CodeMirror.defineMode("rpm-spec", function() {
-  var arch = /^(i386|i586|i686|x86_64|ppc64|ppc|ia64|s390x|s390|sparc64|sparcv9|sparc|noarch|alphaev6|alpha|hppa|mipsel)/;
-
-  var preamble = /^(Name|Version|Release|License|Summary|Url|Group|Source|BuildArch|BuildRequires|BuildRoot|AutoReqProv|Provides|Requires(\(\w+\))?|Obsoletes|Conflicts|Recommends|Source\d*|Patch\d*|ExclusiveArch|NoSource|Supplements):/;
-  var section = /^%(debug_package|package|description|prep|build|install|files|clean|changelog|preinstall|preun|postinstall|postun|pre|post|triggerin|triggerun|pretrans|posttrans|verifyscript|check|triggerpostun|triggerprein|trigger)/;
-  var control_flow_complex = /^%(ifnarch|ifarch|if)/; // rpm control flow macros
-  var control_flow_simple = /^%(else|endif)/; // rpm control flow macros
-  var operators = /^(\!|\?|\<\=|\<|\>\=|\>|\=\=|\&\&|\|\|)/; // operators in control flow macros
-
-  return {
-    startState: function () {
-        return {
-          controlFlow: false,
-          macroParameters: false,
-          section: false
-        };
-    },
-    token: function (stream, state) {
-      var ch = stream.peek();
-      if (ch == "#") { stream.skipToEnd(); return "comment"; }
-
-      if (stream.sol()) {
-        if (stream.match(preamble)) { return "preamble"; }
-        if (stream.match(section)) { return "section"; }
-      }
-
-      if (stream.match(/^\$\w+/)) { return "def"; } // Variables like '$RPM_BUILD_ROOT'
-      if (stream.match(/^\$\{\w+\}/)) { return "def"; } // Variables like '${RPM_BUILD_ROOT}'
-
-      if (stream.match(control_flow_simple)) { return "keyword"; }
-      if (stream.match(control_flow_complex)) {
-        state.controlFlow = true;
-        return "keyword";
-      }
-      if (state.controlFlow) {
-        if (stream.match(operators)) { return "operator"; }
-        if (stream.match(/^(\d+)/)) { return "number"; }
-        if (stream.eol()) { state.controlFlow = false; }
-      }
-
-      if (stream.match(arch)) { return "number"; }
-
-      // Macros like '%make_install' or '%attr(0775,root,root)'
-      if (stream.match(/^%[\w]+/)) {
-        if (stream.match(/^\(/)) { state.macroParameters = true; }
-        return "macro";
-      }
-      if (state.macroParameters) {
-        if (stream.match(/^\d+/)) { return "number";}
-        if (stream.match(/^\)/)) {
-          state.macroParameters = false;
-          return "macro";
-        }
-      }
-      if (stream.match(/^%\{\??[\w \-]+\}/)) { return "macro"; } // Macros like '%{defined fedora}'
-
-      //TODO: Include bash script sub-parser (CodeMirror supports that)
-      stream.next();
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-rpm-spec", "rpm-spec");
-
-});
diff --git a/www/code/codemirror-5.7/mode/rst/index.html b/www/code/codemirror-5.7/mode/rst/index.html
deleted file mode 100644
index 2902dea23..000000000
--- a/www/code/codemirror-5.7/mode/rst/index.html
+++ /dev/null
@@ -1,535 +0,0 @@
-
-
-CodeMirror: reStructuredText mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    reStructuredText mode
    
-
    
-
-    
-    
    
-        The python mode will be used for highlighting blocks
-        containing Python/IPython terminal sessions: blocks starting with
-        >>> (for Python) or In [num]: (for
-        IPython).
-
-        Further, the stex mode will be used for highlighting
-        blocks containing LaTex code.
-    
    
-
-    
    MIME types defined: text/x-rst.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/rst/rst.js b/www/code/codemirror-5.7/mode/rst/rst.js
deleted file mode 100644
index bcf110c1a..000000000
--- a/www/code/codemirror-5.7/mode/rst/rst.js
+++ /dev/null
@@ -1,557 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../python/python"), require("../stex/stex"), require("../../addon/mode/overlay"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../python/python", "../stex/stex", "../../addon/mode/overlay"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode('rst', function (config, options) {
-
-  var rx_strong = /^\*\*[^\*\s](?:[^\*]*[^\*\s])?\*\*/;
-  var rx_emphasis = /^\*[^\*\s](?:[^\*]*[^\*\s])?\*/;
-  var rx_literal = /^``[^`\s](?:[^`]*[^`\s])``/;
-
-  var rx_number = /^(?:[\d]+(?:[\.,]\d+)*)/;
-  var rx_positive = /^(?:\s\+[\d]+(?:[\.,]\d+)*)/;
-  var rx_negative = /^(?:\s\-[\d]+(?:[\.,]\d+)*)/;
-
-  var rx_uri_protocol = "[Hh][Tt][Tt][Pp][Ss]?://";
-  var rx_uri_domain = "(?:[\\d\\w.-]+)\\.(?:\\w{2,6})";
-  var rx_uri_path = "(?:/[\\d\\w\\#\\%\\&\\-\\.\\,\\/\\:\\=\\?\\~]+)*";
-  var rx_uri = new RegExp("^" + rx_uri_protocol + rx_uri_domain + rx_uri_path);
-
-  var overlay = {
-    token: function (stream) {
-
-      if (stream.match(rx_strong) && stream.match (/\W+|$/, false))
-        return 'strong';
-      if (stream.match(rx_emphasis) && stream.match (/\W+|$/, false))
-        return 'em';
-      if (stream.match(rx_literal) && stream.match (/\W+|$/, false))
-        return 'string-2';
-      if (stream.match(rx_number))
-        return 'number';
-      if (stream.match(rx_positive))
-        return 'positive';
-      if (stream.match(rx_negative))
-        return 'negative';
-      if (stream.match(rx_uri))
-        return 'link';
-
-      while (stream.next() != null) {
-        if (stream.match(rx_strong, false)) break;
-        if (stream.match(rx_emphasis, false)) break;
-        if (stream.match(rx_literal, false)) break;
-        if (stream.match(rx_number, false)) break;
-        if (stream.match(rx_positive, false)) break;
-        if (stream.match(rx_negative, false)) break;
-        if (stream.match(rx_uri, false)) break;
-      }
-
-      return null;
-    }
-  };
-
-  var mode = CodeMirror.getMode(
-    config, options.backdrop || 'rst-base'
-  );
-
-  return CodeMirror.overlayMode(mode, overlay, true); // combine
-}, 'python', 'stex');
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-CodeMirror.defineMode('rst-base', function (config) {
-
-  ///////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////
-
-  function format(string) {
-    var args = Array.prototype.slice.call(arguments, 1);
-    return string.replace(/{(\d+)}/g, function (match, n) {
-      return typeof args[n] != 'undefined' ? args[n] : match;
-    });
-  }
-
-  ///////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////
-
-  var mode_python = CodeMirror.getMode(config, 'python');
-  var mode_stex = CodeMirror.getMode(config, 'stex');
-
-  ///////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////
-
-  var SEPA = "\\s+";
-  var TAIL = "(?:\\s*|\\W|$)",
-  rx_TAIL = new RegExp(format('^{0}', TAIL));
-
-  var NAME =
-    "(?:[^\\W\\d_](?:[\\w!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)",
-  rx_NAME = new RegExp(format('^{0}', NAME));
-  var NAME_WWS =
-    "(?:[^\\W\\d_](?:[\\w\\s!\"#$%&'()\\*\\+,\\-\\.\/:;<=>\\?]*[^\\W_])?)";
-  var REF_NAME = format('(?:{0}|`{1}`)', NAME, NAME_WWS);
-
-  var TEXT1 = "(?:[^\\s\\|](?:[^\\|]*[^\\s\\|])?)";
-  var TEXT2 = "(?:[^\\`]+)",
-  rx_TEXT2 = new RegExp(format('^{0}', TEXT2));
-
-  var rx_section = new RegExp(
-    "^([!'#$%&\"()*+,-./:;<=>?@\\[\\\\\\]^_`{|}~])\\1{3,}\\s*$");
-  var rx_explicit = new RegExp(
-    format('^\\.\\.{0}', SEPA));
-  var rx_link = new RegExp(
-    format('^_{0}:{1}|^__:{1}', REF_NAME, TAIL));
-  var rx_directive = new RegExp(
-    format('^{0}::{1}', REF_NAME, TAIL));
-  var rx_substitution = new RegExp(
-    format('^\\|{0}\\|{1}{2}::{3}', TEXT1, SEPA, REF_NAME, TAIL));
-  var rx_footnote = new RegExp(
-    format('^\\[(?:\\d+|#{0}?|\\*)]{1}', REF_NAME, TAIL));
-  var rx_citation = new RegExp(
-    format('^\\[{0}\\]{1}', REF_NAME, TAIL));
-
-  var rx_substitution_ref = new RegExp(
-    format('^\\|{0}\\|', TEXT1));
-  var rx_footnote_ref = new RegExp(
-    format('^\\[(?:\\d+|#{0}?|\\*)]_', REF_NAME));
-  var rx_citation_ref = new RegExp(
-    format('^\\[{0}\\]_', REF_NAME));
-  var rx_link_ref1 = new RegExp(
-    format('^{0}__?', REF_NAME));
-  var rx_link_ref2 = new RegExp(
-    format('^`{0}`_', TEXT2));
-
-  var rx_role_pre = new RegExp(
-    format('^:{0}:`{1}`{2}', NAME, TEXT2, TAIL));
-  var rx_role_suf = new RegExp(
-    format('^`{1}`:{0}:{2}', NAME, TEXT2, TAIL));
-  var rx_role = new RegExp(
-    format('^:{0}:{1}', NAME, TAIL));
-
-  var rx_directive_name = new RegExp(format('^{0}', REF_NAME));
-  var rx_directive_tail = new RegExp(format('^::{0}', TAIL));
-  var rx_substitution_text = new RegExp(format('^\\|{0}\\|', TEXT1));
-  var rx_substitution_sepa = new RegExp(format('^{0}', SEPA));
-  var rx_substitution_name = new RegExp(format('^{0}', REF_NAME));
-  var rx_substitution_tail = new RegExp(format('^::{0}', TAIL));
-  var rx_link_head = new RegExp("^_");
-  var rx_link_name = new RegExp(format('^{0}|_', REF_NAME));
-  var rx_link_tail = new RegExp(format('^:{0}', TAIL));
-
-  var rx_verbatim = new RegExp('^::\\s*$');
-  var rx_examples = new RegExp('^\\s+(?:>>>|In \\[\\d+\\]:)\\s');
-
-  ///////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////
-
-  function to_normal(stream, state) {
-    var token = null;
-
-    if (stream.sol() && stream.match(rx_examples, false)) {
-      change(state, to_mode, {
-        mode: mode_python, local: CodeMirror.startState(mode_python)
-      });
-    } else if (stream.sol() && stream.match(rx_explicit)) {
-      change(state, to_explicit);
-      token = 'meta';
-    } else if (stream.sol() && stream.match(rx_section)) {
-      change(state, to_normal);
-      token = 'header';
-    } else if (phase(state) == rx_role_pre ||
-               stream.match(rx_role_pre, false)) {
-
-      switch (stage(state)) {
-      case 0:
-        change(state, to_normal, context(rx_role_pre, 1));
-        stream.match(/^:/);
-        token = 'meta';
-        break;
-      case 1:
-        change(state, to_normal, context(rx_role_pre, 2));
-        stream.match(rx_NAME);
-        token = 'keyword';
-
-        if (stream.current().match(/^(?:math|latex)/)) {
-          state.tmp_stex = true;
-        }
-        break;
-      case 2:
-        change(state, to_normal, context(rx_role_pre, 3));
-        stream.match(/^:`/);
-        token = 'meta';
-        break;
-      case 3:
-        if (state.tmp_stex) {
-          state.tmp_stex = undefined; state.tmp = {
-            mode: mode_stex, local: CodeMirror.startState(mode_stex)
-          };
-        }
-
-        if (state.tmp) {
-          if (stream.peek() == '`') {
-            change(state, to_normal, context(rx_role_pre, 4));
-            state.tmp = undefined;
-            break;
-          }
-
-          token = state.tmp.mode.token(stream, state.tmp.local);
-          break;
-        }
-
-        change(state, to_normal, context(rx_role_pre, 4));
-        stream.match(rx_TEXT2);
-        token = 'string';
-        break;
-      case 4:
-        change(state, to_normal, context(rx_role_pre, 5));
-        stream.match(/^`/);
-        token = 'meta';
-        break;
-      case 5:
-        change(state, to_normal, context(rx_role_pre, 6));
-        stream.match(rx_TAIL);
-        break;
-      default:
-        change(state, to_normal);
-      }
-    } else if (phase(state) == rx_role_suf ||
-               stream.match(rx_role_suf, false)) {
-
-      switch (stage(state)) {
-      case 0:
-        change(state, to_normal, context(rx_role_suf, 1));
-        stream.match(/^`/);
-        token = 'meta';
-        break;
-      case 1:
-        change(state, to_normal, context(rx_role_suf, 2));
-        stream.match(rx_TEXT2);
-        token = 'string';
-        break;
-      case 2:
-        change(state, to_normal, context(rx_role_suf, 3));
-        stream.match(/^`:/);
-        token = 'meta';
-        break;
-      case 3:
-        change(state, to_normal, context(rx_role_suf, 4));
-        stream.match(rx_NAME);
-        token = 'keyword';
-        break;
-      case 4:
-        change(state, to_normal, context(rx_role_suf, 5));
-        stream.match(/^:/);
-        token = 'meta';
-        break;
-      case 5:
-        change(state, to_normal, context(rx_role_suf, 6));
-        stream.match(rx_TAIL);
-        break;
-      default:
-        change(state, to_normal);
-      }
-    } else if (phase(state) == rx_role || stream.match(rx_role, false)) {
-
-      switch (stage(state)) {
-      case 0:
-        change(state, to_normal, context(rx_role, 1));
-        stream.match(/^:/);
-        token = 'meta';
-        break;
-      case 1:
-        change(state, to_normal, context(rx_role, 2));
-        stream.match(rx_NAME);
-        token = 'keyword';
-        break;
-      case 2:
-        change(state, to_normal, context(rx_role, 3));
-        stream.match(/^:/);
-        token = 'meta';
-        break;
-      case 3:
-        change(state, to_normal, context(rx_role, 4));
-        stream.match(rx_TAIL);
-        break;
-      default:
-        change(state, to_normal);
-      }
-    } else if (phase(state) == rx_substitution_ref ||
-               stream.match(rx_substitution_ref, false)) {
-
-      switch (stage(state)) {
-      case 0:
-        change(state, to_normal, context(rx_substitution_ref, 1));
-        stream.match(rx_substitution_text);
-        token = 'variable-2';
-        break;
-      case 1:
-        change(state, to_normal, context(rx_substitution_ref, 2));
-        if (stream.match(/^_?_?/)) token = 'link';
-        break;
-      default:
-        change(state, to_normal);
-      }
-    } else if (stream.match(rx_footnote_ref)) {
-      change(state, to_normal);
-      token = 'quote';
-    } else if (stream.match(rx_citation_ref)) {
-      change(state, to_normal);
-      token = 'quote';
-    } else if (stream.match(rx_link_ref1)) {
-      change(state, to_normal);
-      if (!stream.peek() || stream.peek().match(/^\W$/)) {
-        token = 'link';
-      }
-    } else if (phase(state) == rx_link_ref2 ||
-               stream.match(rx_link_ref2, false)) {
-
-      switch (stage(state)) {
-      case 0:
-        if (!stream.peek() || stream.peek().match(/^\W$/)) {
-          change(state, to_normal, context(rx_link_ref2, 1));
-        } else {
-          stream.match(rx_link_ref2);
-        }
-        break;
-      case 1:
-        change(state, to_normal, context(rx_link_ref2, 2));
-        stream.match(/^`/);
-        token = 'link';
-        break;
-      case 2:
-        change(state, to_normal, context(rx_link_ref2, 3));
-        stream.match(rx_TEXT2);
-        break;
-      case 3:
-        change(state, to_normal, context(rx_link_ref2, 4));
-        stream.match(/^`_/);
-        token = 'link';
-        break;
-      default:
-        change(state, to_normal);
-      }
-    } else if (stream.match(rx_verbatim)) {
-      change(state, to_verbatim);
-    }
-
-    else {
-      if (stream.next()) change(state, to_normal);
-    }
-
-    return token;
-  }
-
-  ///////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////
-
-  function to_explicit(stream, state) {
-    var token = null;
-
-    if (phase(state) == rx_substitution ||
-        stream.match(rx_substitution, false)) {
-
-      switch (stage(state)) {
-      case 0:
-        change(state, to_explicit, context(rx_substitution, 1));
-        stream.match(rx_substitution_text);
-        token = 'variable-2';
-        break;
-      case 1:
-        change(state, to_explicit, context(rx_substitution, 2));
-        stream.match(rx_substitution_sepa);
-        break;
-      case 2:
-        change(state, to_explicit, context(rx_substitution, 3));
-        stream.match(rx_substitution_name);
-        token = 'keyword';
-        break;
-      case 3:
-        change(state, to_explicit, context(rx_substitution, 4));
-        stream.match(rx_substitution_tail);
-        token = 'meta';
-        break;
-      default:
-        change(state, to_normal);
-      }
-    } else if (phase(state) == rx_directive ||
-               stream.match(rx_directive, false)) {
-
-      switch (stage(state)) {
-      case 0:
-        change(state, to_explicit, context(rx_directive, 1));
-        stream.match(rx_directive_name);
-        token = 'keyword';
-
-        if (stream.current().match(/^(?:math|latex)/))
-          state.tmp_stex = true;
-        else if (stream.current().match(/^python/))
-          state.tmp_py = true;
-        break;
-      case 1:
-        change(state, to_explicit, context(rx_directive, 2));
-        stream.match(rx_directive_tail);
-        token = 'meta';
-
-        if (stream.match(/^latex\s*$/) || state.tmp_stex) {
-          state.tmp_stex = undefined; change(state, to_mode, {
-            mode: mode_stex, local: CodeMirror.startState(mode_stex)
-          });
-        }
-        break;
-      case 2:
-        change(state, to_explicit, context(rx_directive, 3));
-        if (stream.match(/^python\s*$/) || state.tmp_py) {
-          state.tmp_py = undefined; change(state, to_mode, {
-            mode: mode_python, local: CodeMirror.startState(mode_python)
-          });
-        }
-        break;
-      default:
-        change(state, to_normal);
-      }
-    } else if (phase(state) == rx_link || stream.match(rx_link, false)) {
-
-      switch (stage(state)) {
-      case 0:
-        change(state, to_explicit, context(rx_link, 1));
-        stream.match(rx_link_head);
-        stream.match(rx_link_name);
-        token = 'link';
-        break;
-      case 1:
-        change(state, to_explicit, context(rx_link, 2));
-        stream.match(rx_link_tail);
-        token = 'meta';
-        break;
-      default:
-        change(state, to_normal);
-      }
-    } else if (stream.match(rx_footnote)) {
-      change(state, to_normal);
-      token = 'quote';
-    } else if (stream.match(rx_citation)) {
-      change(state, to_normal);
-      token = 'quote';
-    }
-
-    else {
-      stream.eatSpace();
-      if (stream.eol()) {
-        change(state, to_normal);
-      } else {
-        stream.skipToEnd();
-        change(state, to_comment);
-        token = 'comment';
-      }
-    }
-
-    return token;
-  }
-
-  ///////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////
-
-  function to_comment(stream, state) {
-    return as_block(stream, state, 'comment');
-  }
-
-  function to_verbatim(stream, state) {
-    return as_block(stream, state, 'meta');
-  }
-
-  function as_block(stream, state, token) {
-    if (stream.eol() || stream.eatSpace()) {
-      stream.skipToEnd();
-      return token;
-    } else {
-      change(state, to_normal);
-      return null;
-    }
-  }
-
-  ///////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////
-
-  function to_mode(stream, state) {
-
-    if (state.ctx.mode && state.ctx.local) {
-
-      if (stream.sol()) {
-        if (!stream.eatSpace()) change(state, to_normal);
-        return null;
-      }
-
-      return state.ctx.mode.token(stream, state.ctx.local);
-    }
-
-    change(state, to_normal);
-    return null;
-  }
-
-  ///////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////
-
-  function context(phase, stage, mode, local) {
-    return {phase: phase, stage: stage, mode: mode, local: local};
-  }
-
-  function change(state, tok, ctx) {
-    state.tok = tok;
-    state.ctx = ctx || {};
-  }
-
-  function stage(state) {
-    return state.ctx.stage || 0;
-  }
-
-  function phase(state) {
-    return state.ctx.phase;
-  }
-
-  ///////////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////////
-
-  return {
-    startState: function () {
-      return {tok: to_normal, ctx: context(undefined, 0)};
-    },
-
-    copyState: function (state) {
-      var ctx = state.ctx, tmp = state.tmp;
-      if (ctx.local)
-        ctx = {mode: ctx.mode, local: CodeMirror.copyState(ctx.mode, ctx.local)};
-      if (tmp)
-        tmp = {mode: tmp.mode, local: CodeMirror.copyState(tmp.mode, tmp.local)};
-      return {tok: state.tok, ctx: ctx, tmp: tmp};
-    },
-
-    innerMode: function (state) {
-      return state.tmp      ? {state: state.tmp.local, mode: state.tmp.mode}
-      : state.ctx.mode ? {state: state.ctx.local, mode: state.ctx.mode}
-      : null;
-    },
-
-    token: function (stream, state) {
-      return state.tok(stream, state);
-    }
-  };
-}, 'python', 'stex');
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-CodeMirror.defineMIME('text/x-rst', 'rst');
-
-///////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////////
-
-});
diff --git a/www/code/codemirror-5.7/mode/ruby/index.html b/www/code/codemirror-5.7/mode/ruby/index.html
deleted file mode 100644
index 97544babc..000000000
--- a/www/code/codemirror-5.7/mode/ruby/index.html
+++ /dev/null
@@ -1,183 +0,0 @@
-
-
-CodeMirror: Ruby mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Ruby mode
    
-
    
-    
-
-    
    MIME types defined: text/x-ruby.
    
-
-    
    Development of the CodeMirror Ruby mode was kindly sponsored
-    by Ubalo.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/ruby/ruby.js b/www/code/codemirror-5.7/mode/ruby/ruby.js
deleted file mode 100644
index 089a971d4..000000000
--- a/www/code/codemirror-5.7/mode/ruby/ruby.js
+++ /dev/null
@@ -1,285 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("ruby", function(config) {
-  function wordObj(words) {
-    var o = {};
-    for (var i = 0, e = words.length; i < e; ++i) o[words[i]] = true;
-    return o;
-  }
-  var keywords = wordObj([
-    "alias", "and", "BEGIN", "begin", "break", "case", "class", "def", "defined?", "do", "else",
-    "elsif", "END", "end", "ensure", "false", "for", "if", "in", "module", "next", "not", "or",
-    "redo", "rescue", "retry", "return", "self", "super", "then", "true", "undef", "unless",
-    "until", "when", "while", "yield", "nil", "raise", "throw", "catch", "fail", "loop", "callcc",
-    "caller", "lambda", "proc", "public", "protected", "private", "require", "load",
-    "require_relative", "extend", "autoload", "__END__", "__FILE__", "__LINE__", "__dir__"
-  ]);
-  var indentWords = wordObj(["def", "class", "case", "for", "while", "until", "module", "then",
-                             "catch", "loop", "proc", "begin"]);
-  var dedentWords = wordObj(["end", "until"]);
-  var matching = {"[": "]", "{": "}", "(": ")"};
-  var curPunc;
-
-  function chain(newtok, stream, state) {
-    state.tokenize.push(newtok);
-    return newtok(stream, state);
-  }
-
-  function tokenBase(stream, state) {
-    if (stream.sol() && stream.match("=begin") && stream.eol()) {
-      state.tokenize.push(readBlockComment);
-      return "comment";
-    }
-    if (stream.eatSpace()) return null;
-    var ch = stream.next(), m;
-    if (ch == "`" || ch == "'" || ch == '"') {
-      return chain(readQuoted(ch, "string", ch == '"' || ch == "`"), stream, state);
-    } else if (ch == "/") {
-      var currentIndex = stream.current().length;
-      if (stream.skipTo("/")) {
-        var search_till = stream.current().length;
-        stream.backUp(stream.current().length - currentIndex);
-        var balance = 0;  // balance brackets
-        while (stream.current().length < search_till) {
-          var chchr = stream.next();
-          if (chchr == "(") balance += 1;
-          else if (chchr == ")") balance -= 1;
-          if (balance < 0) break;
-        }
-        stream.backUp(stream.current().length - currentIndex);
-        if (balance == 0)
-          return chain(readQuoted(ch, "string-2", true), stream, state);
-      }
-      return "operator";
-    } else if (ch == "%") {
-      var style = "string", embed = true;
-      if (stream.eat("s")) style = "atom";
-      else if (stream.eat(/[WQ]/)) style = "string";
-      else if (stream.eat(/[r]/)) style = "string-2";
-      else if (stream.eat(/[wxq]/)) { style = "string"; embed = false; }
-      var delim = stream.eat(/[^\w\s=]/);
-      if (!delim) return "operator";
-      if (matching.propertyIsEnumerable(delim)) delim = matching[delim];
-      return chain(readQuoted(delim, style, embed, true), stream, state);
-    } else if (ch == "#") {
-      stream.skipToEnd();
-      return "comment";
-    } else if (ch == "<" && (m = stream.match(/^<-?[\`\"\']?([a-zA-Z_?]\w*)[\`\"\']?(?:;|$)/))) {
-      return chain(readHereDoc(m[1]), stream, state);
-    } else if (ch == "0") {
-      if (stream.eat("x")) stream.eatWhile(/[\da-fA-F]/);
-      else if (stream.eat("b")) stream.eatWhile(/[01]/);
-      else stream.eatWhile(/[0-7]/);
-      return "number";
-    } else if (/\d/.test(ch)) {
-      stream.match(/^[\d_]*(?:\.[\d_]+)?(?:[eE][+\-]?[\d_]+)?/);
-      return "number";
-    } else if (ch == "?") {
-      while (stream.match(/^\\[CM]-/)) {}
-      if (stream.eat("\\")) stream.eatWhile(/\w/);
-      else stream.next();
-      return "string";
-    } else if (ch == ":") {
-      if (stream.eat("'")) return chain(readQuoted("'", "atom", false), stream, state);
-      if (stream.eat('"')) return chain(readQuoted('"', "atom", true), stream, state);
-
-      // :> :>> :< :<< are valid symbols
-      if (stream.eat(/[\<\>]/)) {
-        stream.eat(/[\<\>]/);
-        return "atom";
-      }
-
-      // :+ :- :/ :* :| :& :! are valid symbols
-      if (stream.eat(/[\+\-\*\/\&\|\:\!]/)) {
-        return "atom";
-      }
-
-      // Symbols can't start by a digit
-      if (stream.eat(/[a-zA-Z$@_\xa1-\uffff]/)) {
-        stream.eatWhile(/[\w$\xa1-\uffff]/);
-        // Only one ? ! = is allowed and only as the last character
-        stream.eat(/[\?\!\=]/);
-        return "atom";
-      }
-      return "operator";
-    } else if (ch == "@" && stream.match(/^@?[a-zA-Z_\xa1-\uffff]/)) {
-      stream.eat("@");
-      stream.eatWhile(/[\w\xa1-\uffff]/);
-      return "variable-2";
-    } else if (ch == "$") {
-      if (stream.eat(/[a-zA-Z_]/)) {
-        stream.eatWhile(/[\w]/);
-      } else if (stream.eat(/\d/)) {
-        stream.eat(/\d/);
-      } else {
-        stream.next(); // Must be a special global like $: or $!
-      }
-      return "variable-3";
-    } else if (/[a-zA-Z_\xa1-\uffff]/.test(ch)) {
-      stream.eatWhile(/[\w\xa1-\uffff]/);
-      stream.eat(/[\?\!]/);
-      if (stream.eat(":")) return "atom";
-      return "ident";
-    } else if (ch == "|" && (state.varList || state.lastTok == "{" || state.lastTok == "do")) {
-      curPunc = "|";
-      return null;
-    } else if (/[\(\)\[\]{}\\;]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    } else if (ch == "-" && stream.eat(">")) {
-      return "arrow";
-    } else if (/[=+\-\/*:\.^%<>~|]/.test(ch)) {
-      var more = stream.eatWhile(/[=+\-\/*:\.^%<>~|]/);
-      if (ch == "." && !more) curPunc = ".";
-      return "operator";
-    } else {
-      return null;
-    }
-  }
-
-  function tokenBaseUntilBrace(depth) {
-    if (!depth) depth = 1;
-    return function(stream, state) {
-      if (stream.peek() == "}") {
-        if (depth == 1) {
-          state.tokenize.pop();
-          return state.tokenize[state.tokenize.length-1](stream, state);
-        } else {
-          state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth - 1);
-        }
-      } else if (stream.peek() == "{") {
-        state.tokenize[state.tokenize.length - 1] = tokenBaseUntilBrace(depth + 1);
-      }
-      return tokenBase(stream, state);
-    };
-  }
-  function tokenBaseOnce() {
-    var alreadyCalled = false;
-    return function(stream, state) {
-      if (alreadyCalled) {
-        state.tokenize.pop();
-        return state.tokenize[state.tokenize.length-1](stream, state);
-      }
-      alreadyCalled = true;
-      return tokenBase(stream, state);
-    };
-  }
-  function readQuoted(quote, style, embed, unescaped) {
-    return function(stream, state) {
-      var escaped = false, ch;
-
-      if (state.context.type === 'read-quoted-paused') {
-        state.context = state.context.prev;
-        stream.eat("}");
-      }
-
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && (unescaped || !escaped)) {
-          state.tokenize.pop();
-          break;
-        }
-        if (embed && ch == "#" && !escaped) {
-          if (stream.eat("{")) {
-            if (quote == "}") {
-              state.context = {prev: state.context, type: 'read-quoted-paused'};
-            }
-            state.tokenize.push(tokenBaseUntilBrace());
-            break;
-          } else if (/[@\$]/.test(stream.peek())) {
-            state.tokenize.push(tokenBaseOnce());
-            break;
-          }
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      return style;
-    };
-  }
-  function readHereDoc(phrase) {
-    return function(stream, state) {
-      if (stream.match(phrase)) state.tokenize.pop();
-      else stream.skipToEnd();
-      return "string";
-    };
-  }
-  function readBlockComment(stream, state) {
-    if (stream.sol() && stream.match("=end") && stream.eol())
-      state.tokenize.pop();
-    stream.skipToEnd();
-    return "comment";
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: [tokenBase],
-              indented: 0,
-              context: {type: "top", indented: -config.indentUnit},
-              continuedLine: false,
-              lastTok: null,
-              varList: false};
-    },
-
-    token: function(stream, state) {
-      curPunc = null;
-      if (stream.sol()) state.indented = stream.indentation();
-      var style = state.tokenize[state.tokenize.length-1](stream, state), kwtype;
-      var thisTok = curPunc;
-      if (style == "ident") {
-        var word = stream.current();
-        style = state.lastTok == "." ? "property"
-          : keywords.propertyIsEnumerable(stream.current()) ? "keyword"
-          : /^[A-Z]/.test(word) ? "tag"
-          : (state.lastTok == "def" || state.lastTok == "class" || state.varList) ? "def"
-          : "variable";
-        if (style == "keyword") {
-          thisTok = word;
-          if (indentWords.propertyIsEnumerable(word)) kwtype = "indent";
-          else if (dedentWords.propertyIsEnumerable(word)) kwtype = "dedent";
-          else if ((word == "if" || word == "unless") && stream.column() == stream.indentation())
-            kwtype = "indent";
-          else if (word == "do" && state.context.indented < state.indented)
-            kwtype = "indent";
-        }
-      }
-      if (curPunc || (style && style != "comment")) state.lastTok = thisTok;
-      if (curPunc == "|") state.varList = !state.varList;
-
-      if (kwtype == "indent" || /[\(\[\{]/.test(curPunc))
-        state.context = {prev: state.context, type: curPunc || style, indented: state.indented};
-      else if ((kwtype == "dedent" || /[\)\]\}]/.test(curPunc)) && state.context.prev)
-        state.context = state.context.prev;
-
-      if (stream.eol())
-        state.continuedLine = (curPunc == "\\" || style == "operator");
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize[state.tokenize.length-1] != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0);
-      var ct = state.context;
-      var closing = ct.type == matching[firstChar] ||
-        ct.type == "keyword" && /^(?:end|until|else|elsif|when|rescue)\b/.test(textAfter);
-      return ct.indented + (closing ? 0 : config.indentUnit) +
-        (state.continuedLine ? config.indentUnit : 0);
-    },
-
-    electricChars: "}de", // enD and rescuE
-    lineComment: "#"
-  };
-});
-
-CodeMirror.defineMIME("text/x-ruby", "ruby");
-
-});
diff --git a/www/code/codemirror-5.7/mode/ruby/test.js b/www/code/codemirror-5.7/mode/ruby/test.js
deleted file mode 100644
index cade864ff..000000000
--- a/www/code/codemirror-5.7/mode/ruby/test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "ruby");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("divide_equal_operator",
-     "[variable bar] [operator /=] [variable foo]");
-
-  MT("divide_equal_operator_no_spacing",
-     "[variable foo][operator /=][number 42]");
-
-})();
diff --git a/www/code/codemirror-5.7/mode/rust/index.html b/www/code/codemirror-5.7/mode/rust/index.html
deleted file mode 100644
index 1fe0ad1e6..000000000
--- a/www/code/codemirror-5.7/mode/rust/index.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-CodeMirror: Rust mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Rust mode
    
-
-
-
    
-
-    
-
-    
    MIME types defined: text/x-rustsrc.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/rust/rust.js b/www/code/codemirror-5.7/mode/rust/rust.js
deleted file mode 100644
index 1ce0c01ee..000000000
--- a/www/code/codemirror-5.7/mode/rust/rust.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../../addon/mode/simple"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../../addon/mode/simple"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineSimpleMode("rust",{
-  start:[
-    // string and byte string
-    {regex: /b?"(?:[^\\]|\\.)*?"/, token: "string"},
-    // raw string and raw byte string
-    {regex: /(b?r)(#*)(".*?)("\2)/, token: ["string", "string", "string", "string"]},
-    // character
-    {regex: /'(?:[^'\\]|\\(?:[nrt0'"]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\}))'/, token: "string-2"},
-    // byte
-    {regex: /b'(?:[^']|\\(?:['\\nrt0]|x[\da-fA-F]{2}))'/, token: "string-2"},
-
-    {regex: /(?:(?:[0-9][0-9_]*)(?:(?:[Ee][+-]?[0-9_]+)|\.[0-9_]+(?:[Ee][+-]?[0-9_]+)?)(?:f32|f64)?)|(?:0(?:b[01_]+|(?:o[0-7_]+)|(?:x[0-9a-fA-F_]+))|(?:[0-9][0-9_]*))(?:u8|u16|u32|u64|i8|i16|i32|i64|isize|usize)?/,
-     token: "number"},
-    {regex: /(let(?:\s+mut)?|fn|enum|mod|struct|type)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/, token: ["keyword", null, "def"]},
-    {regex: /(?:abstract|alignof|as|box|break|continue|const|crate|do|else|enum|extern|fn|for|final|if|impl|in|loop|macro|match|mod|move|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/, token: "keyword"},
-    {regex: /\b(?:Self|isize|usize|char|bool|u8|u16|u32|u64|f16|f32|f64|i8|i16|i32|i64|str|Option)\b/, token: "atom"},
-    {regex: /\b(?:true|false|Some|None|Ok|Err)\b/, token: "builtin"},
-    {regex: /\b(fn)(\s+)([a-zA-Z_][a-zA-Z0-9_]*)/,
-     token: ["keyword", null ,"def"]},
-    {regex: /#!?\[.*\]/, token: "meta"},
-    {regex: /\/\/.*/, token: "comment"},
-    {regex: /\/\*/, token: "comment", next: "comment"},
-    {regex: /[-+\/*=<>!]+/, token: "operator"},
-    {regex: /[a-zA-Z_]\w*!/,token: "variable-3"},
-    {regex: /[a-zA-Z_]\w*/, token: "variable"},
-    {regex: /[\{\[\(]/, indent: true},
-    {regex: /[\}\]\)]/, dedent: true}
-  ],
-  comment: [
-    {regex: /.*?\*\//, token: "comment", next: "start"},
-    {regex: /.*/, token: "comment"}
-  ],
-  meta: {
-    dontIndentStates: ["comment"],
-    electricInput: /^\s*\}$/,
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//",
-    fold: "brace"
-  }
-});
-
-
-CodeMirror.defineMIME("text/x-rustsrc", "rust");
-});
diff --git a/www/code/codemirror-5.7/mode/rust/test.js b/www/code/codemirror-5.7/mode/rust/test.js
deleted file mode 100644
index 1a3c6e720..000000000
--- a/www/code/codemirror-5.7/mode/rust/test.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 4}, "rust");
-  function MT(name) {test.mode(name, mode, Array.prototype.slice.call(arguments, 1));}
-
-  MT('integer_test',
-     '[number 123i32]',
-     '[number 123u32]',
-     '[number 123_u32]',
-     '[number 0xff_u8]',
-     '[number 0o70_i16]',
-     '[number 0b1111_1111_1001_0000_i32]',
-     '[number 0usize]');
-
-  MT('float_test',
-     '[number 123.0f64]',
-     '[number 0.1f64]',
-     '[number 0.1f32]',
-     '[number 12E+99_f64]');
-
-  MT('string-literals-test',
-     '[string "foo"]',
-     '[string r"foo"]',
-     '[string "\\"foo\\""]',
-     '[string r#""foo""#]',
-     '[string "foo #\\"# bar"]',
-     '[string r##"foo #"# bar"##]',
-
-     '[string b"foo"]',
-     '[string br"foo"]',
-     '[string b"\\"foo\\""]',
-     '[string br#""foo""#]',
-     '[string br##"foo #" bar"##]',
-
-     "[string-2 'h']",
-     "[string-2 b'h']");
-
-})();
diff --git a/www/code/codemirror-5.7/mode/sass/index.html b/www/code/codemirror-5.7/mode/sass/index.html
deleted file mode 100644
index 9f4a79022..000000000
--- a/www/code/codemirror-5.7/mode/sass/index.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-CodeMirror: Sass mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Sass mode
    
-
    
-    
-
-    
    MIME types defined: text/x-sass.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/sass/sass.js b/www/code/codemirror-5.7/mode/sass/sass.js
deleted file mode 100644
index 6973ece29..000000000
--- a/www/code/codemirror-5.7/mode/sass/sass.js
+++ /dev/null
@@ -1,414 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("sass", function(config) {
-  function tokenRegexp(words) {
-    return new RegExp("^" + words.join("|"));
-  }
-
-  var keywords = ["true", "false", "null", "auto"];
-  var keywordsRegexp = new RegExp("^" + keywords.join("|"));
-
-  var operators = ["\\(", "\\)", "=", ">", "<", "==", ">=", "<=", "\\+", "-",
-                   "\\!=", "/", "\\*", "%", "and", "or", "not", ";","\\{","\\}",":"];
-  var opRegexp = tokenRegexp(operators);
-
-  var pseudoElementsRegexp = /^::?[a-zA-Z_][\w\-]*/;
-
-  function urlTokens(stream, state) {
-    var ch = stream.peek();
-
-    if (ch === ")") {
-      stream.next();
-      state.tokenizer = tokenBase;
-      return "operator";
-    } else if (ch === "(") {
-      stream.next();
-      stream.eatSpace();
-
-      return "operator";
-    } else if (ch === "'" || ch === '"') {
-      state.tokenizer = buildStringTokenizer(stream.next());
-      return "string";
-    } else {
-      state.tokenizer = buildStringTokenizer(")", false);
-      return "string";
-    }
-  }
-  function comment(indentation, multiLine) {
-    return function(stream, state) {
-      if (stream.sol() && stream.indentation() <= indentation) {
-        state.tokenizer = tokenBase;
-        return tokenBase(stream, state);
-      }
-
-      if (multiLine && stream.skipTo("*/")) {
-        stream.next();
-        stream.next();
-        state.tokenizer = tokenBase;
-      } else {
-        stream.skipToEnd();
-      }
-
-      return "comment";
-    };
-  }
-
-  function buildStringTokenizer(quote, greedy) {
-    if (greedy == null) { greedy = true; }
-
-    function stringTokenizer(stream, state) {
-      var nextChar = stream.next();
-      var peekChar = stream.peek();
-      var previousChar = stream.string.charAt(stream.pos-2);
-
-      var endingString = ((nextChar !== "\\" && peekChar === quote) || (nextChar === quote && previousChar !== "\\"));
-
-      if (endingString) {
-        if (nextChar !== quote && greedy) { stream.next(); }
-        state.tokenizer = tokenBase;
-        return "string";
-      } else if (nextChar === "#" && peekChar === "{") {
-        state.tokenizer = buildInterpolationTokenizer(stringTokenizer);
-        stream.next();
-        return "operator";
-      } else {
-        return "string";
-      }
-    }
-
-    return stringTokenizer;
-  }
-
-  function buildInterpolationTokenizer(currentTokenizer) {
-    return function(stream, state) {
-      if (stream.peek() === "}") {
-        stream.next();
-        state.tokenizer = currentTokenizer;
-        return "operator";
-      } else {
-        return tokenBase(stream, state);
-      }
-    };
-  }
-
-  function indent(state) {
-    if (state.indentCount == 0) {
-      state.indentCount++;
-      var lastScopeOffset = state.scopes[0].offset;
-      var currentOffset = lastScopeOffset + config.indentUnit;
-      state.scopes.unshift({ offset:currentOffset });
-    }
-  }
-
-  function dedent(state) {
-    if (state.scopes.length == 1) return;
-
-    state.scopes.shift();
-  }
-
-  function tokenBase(stream, state) {
-    var ch = stream.peek();
-
-    // Comment
-    if (stream.match("/*")) {
-      state.tokenizer = comment(stream.indentation(), true);
-      return state.tokenizer(stream, state);
-    }
-    if (stream.match("//")) {
-      state.tokenizer = comment(stream.indentation(), false);
-      return state.tokenizer(stream, state);
-    }
-
-    // Interpolation
-    if (stream.match("#{")) {
-      state.tokenizer = buildInterpolationTokenizer(tokenBase);
-      return "operator";
-    }
-
-    // Strings
-    if (ch === '"' || ch === "'") {
-      stream.next();
-      state.tokenizer = buildStringTokenizer(ch);
-      return "string";
-    }
-
-    if(!state.cursorHalf){// state.cursorHalf === 0
-    // first half i.e. before : for key-value pairs
-    // including selectors
-
-      if (ch === ".") {
-        stream.next();
-        if (stream.match(/^[\w-]+/)) {
-          indent(state);
-          return "atom";
-        } else if (stream.peek() === "#") {
-          indent(state);
-          return "atom";
-        }
-      }
-
-      if (ch === "#") {
-        stream.next();
-        // ID selectors
-        if (stream.match(/^[\w-]+/)) {
-          indent(state);
-          return "atom";
-        }
-        if (stream.peek() === "#") {
-          indent(state);
-          return "atom";
-        }
-      }
-
-      // Variables
-      if (ch === "$") {
-        stream.next();
-        stream.eatWhile(/[\w-]/);
-        return "variable-2";
-      }
-
-      // Numbers
-      if (stream.match(/^-?[0-9\.]+/))
-        return "number";
-
-      // Units
-      if (stream.match(/^(px|em|in)\b/))
-        return "unit";
-
-      if (stream.match(keywordsRegexp))
-        return "keyword";
-
-      if (stream.match(/^url/) && stream.peek() === "(") {
-        state.tokenizer = urlTokens;
-        return "atom";
-      }
-
-      if (ch === "=") {
-        // Match shortcut mixin definition
-        if (stream.match(/^=[\w-]+/)) {
-          indent(state);
-          return "meta";
-        }
-      }
-
-      if (ch === "+") {
-        // Match shortcut mixin definition
-        if (stream.match(/^\+[\w-]+/)){
-          return "variable-3";
-        }
-      }
-
-      if(ch === "@"){
-        if(stream.match(/@extend/)){
-          if(!stream.match(/\s*[\w]/))
-            dedent(state);
-        }
-      }
-
-
-      // Indent Directives
-      if (stream.match(/^@(else if|if|media|else|for|each|while|mixin|function)/)) {
-        indent(state);
-        return "meta";
-      }
-
-      // Other Directives
-      if (ch === "@") {
-        stream.next();
-        stream.eatWhile(/[\w-]/);
-        return "meta";
-      }
-
-      if (stream.eatWhile(/[\w-]/)){
-        if(stream.match(/ *: *[\w-\+\$#!\("']/,false)){
-          return "property";
-        }
-        else if(stream.match(/ *:/,false)){
-          indent(state);
-          state.cursorHalf = 1;
-          return "atom";
-        }
-        else if(stream.match(/ *,/,false)){
-          return "atom";
-        }
-        else{
-          indent(state);
-          return "atom";
-        }
-      }
-
-      if(ch === ":"){
-        if (stream.match(pseudoElementsRegexp)){ // could be a pseudo-element
-          return "keyword";
-        }
-        stream.next();
-        state.cursorHalf=1;
-        return "operator";
-      }
-
-    } // cursorHalf===0 ends here
-    else{
-
-      if (ch === "#") {
-        stream.next();
-        // Hex numbers
-        if (stream.match(/[0-9a-fA-F]{6}|[0-9a-fA-F]{3}/)){
-          if(!stream.peek()){
-            state.cursorHalf = 0;
-          }
-          return "number";
-        }
-      }
-
-      // Numbers
-      if (stream.match(/^-?[0-9\.]+/)){
-        if(!stream.peek()){
-          state.cursorHalf = 0;
-        }
-        return "number";
-      }
-
-      // Units
-      if (stream.match(/^(px|em|in)\b/)){
-        if(!stream.peek()){
-          state.cursorHalf = 0;
-        }
-        return "unit";
-      }
-
-      if (stream.match(keywordsRegexp)){
-        if(!stream.peek()){
-          state.cursorHalf = 0;
-        }
-        return "keyword";
-      }
-
-      if (stream.match(/^url/) && stream.peek() === "(") {
-        state.tokenizer = urlTokens;
-        if(!stream.peek()){
-          state.cursorHalf = 0;
-        }
-        return "atom";
-      }
-
-      // Variables
-      if (ch === "$") {
-        stream.next();
-        stream.eatWhile(/[\w-]/);
-        if(!stream.peek()){
-          state.cursorHalf = 0;
-        }
-        return "variable-3";
-      }
-
-      // bang character for !important, !default, etc.
-      if (ch === "!") {
-        stream.next();
-        if(!stream.peek()){
-          state.cursorHalf = 0;
-        }
-        return stream.match(/^[\w]+/) ? "keyword": "operator";
-      }
-
-      if (stream.match(opRegexp)){
-        if(!stream.peek()){
-          state.cursorHalf = 0;
-        }
-        return "operator";
-      }
-
-      // attributes
-      if (stream.eatWhile(/[\w-]/)) {
-        if(!stream.peek()){
-          state.cursorHalf = 0;
-        }
-        return "attribute";
-      }
-
-      //stream.eatSpace();
-      if(!stream.peek()){
-        state.cursorHalf = 0;
-        return null;
-      }
-
-    } // else ends here
-
-    if (stream.match(opRegexp))
-      return "operator";
-
-    // If we haven't returned by now, we move 1 character
-    // and return an error
-    stream.next();
-    return null;
-  }
-
-  function tokenLexer(stream, state) {
-    if (stream.sol()) state.indentCount = 0;
-    var style = state.tokenizer(stream, state);
-    var current = stream.current();
-
-    if (current === "@return" || current === "}"){
-      dedent(state);
-    }
-
-    if (style !== null) {
-      var startOfToken = stream.pos - current.length;
-
-      var withCurrentIndent = startOfToken + (config.indentUnit * state.indentCount);
-
-      var newScopes = [];
-
-      for (var i = 0; i < state.scopes.length; i++) {
-        var scope = state.scopes[i];
-
-        if (scope.offset <= withCurrentIndent)
-          newScopes.push(scope);
-      }
-
-      state.scopes = newScopes;
-    }
-
-
-    return style;
-  }
-
-  return {
-    startState: function() {
-      return {
-        tokenizer: tokenBase,
-        scopes: [{offset: 0, type: "sass"}],
-        indentCount: 0,
-        cursorHalf: 0,  // cursor half tells us if cursor lies after (1)
-                        // or before (0) colon (well... more or less)
-        definedVars: [],
-        definedMixins: []
-      };
-    },
-    token: function(stream, state) {
-      var style = tokenLexer(stream, state);
-
-      state.lastToken = { style: style, content: stream.current() };
-
-      return style;
-    },
-
-    indent: function(state) {
-      return state.scopes[0].offset;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-sass", "sass");
-
-});
diff --git a/www/code/codemirror-5.7/mode/scheme/index.html b/www/code/codemirror-5.7/mode/scheme/index.html
deleted file mode 100644
index 04d5c6a2a..000000000
--- a/www/code/codemirror-5.7/mode/scheme/index.html
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-CodeMirror: Scheme mode
-
-
-
-
-
-
-
-
-
-
    
-
    Scheme mode
    
-
    
-    
-
-    
    MIME types defined: text/x-scheme.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/scheme/scheme.js b/www/code/codemirror-5.7/mode/scheme/scheme.js
deleted file mode 100644
index 223464591..000000000
--- a/www/code/codemirror-5.7/mode/scheme/scheme.js
+++ /dev/null
@@ -1,249 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**
- * Author: Koh Zi Han, based on implementation by Koh Zi Chun
- */
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("scheme", function () {
-    var BUILTIN = "builtin", COMMENT = "comment", STRING = "string",
-        ATOM = "atom", NUMBER = "number", BRACKET = "bracket";
-    var INDENT_WORD_SKIP = 2;
-
-    function makeKeywords(str) {
-        var obj = {}, words = str.split(" ");
-        for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-        return obj;
-    }
-
-    var keywords = makeKeywords("λ case-lambda call/cc class define-class exit-handler field import inherit init-field interface let*-values let-values let/ec mixin opt-lambda override protect provide public rename require require-for-syntax syntax syntax-case syntax-error unit/sig unless when with-syntax and begin call-with-current-continuation call-with-input-file call-with-output-file case cond define define-syntax delay do dynamic-wind else for-each if lambda let let* let-syntax letrec letrec-syntax map or syntax-rules abs acos angle append apply asin assoc assq assv atan boolean? caar cadr call-with-input-file call-with-output-file call-with-values car cdddar cddddr cdr ceiling char->integer char-alphabetic? char-ci<=? char-ci=? char-ci>? char-downcase char-lower-case? char-numeric? char-ready? char-upcase char-upper-case? char-whitespace? char<=? char=? char>? char? close-input-port close-output-port complex? cons cos current-input-port current-output-port denominator display eof-object? eq? equal? eqv? eval even? exact->inexact exact? exp expt #f floor force gcd imag-part inexact->exact inexact? input-port? integer->char integer? interaction-environment lcm length list list->string list->vector list-ref list-tail list? load log magnitude make-polar make-rectangular make-string make-vector max member memq memv min modulo negative? newline not null-environment null? number->string number? numerator odd? open-input-file open-output-file output-port? pair? peek-char port? positive? procedure? quasiquote quote quotient rational? rationalize read read-char real-part real? remainder reverse round scheme-report-environment set! set-car! set-cdr! sin sqrt string string->list string->number string->symbol string-append string-ci<=? string-ci=? string-ci>? string-copy string-fill! string-length string-ref string-set! string<=? string=? string>? string? substring symbol->string symbol? #t tan transcript-off transcript-on truncate values vector vector->list vector-fill! vector-length vector-ref vector-set! with-input-from-file with-output-to-file write write-char zero?");
-    var indentKeys = makeKeywords("define let letrec let* lambda");
-
-    function stateStack(indent, type, prev) { // represents a state stack object
-        this.indent = indent;
-        this.type = type;
-        this.prev = prev;
-    }
-
-    function pushStack(state, indent, type) {
-        state.indentStack = new stateStack(indent, type, state.indentStack);
-    }
-
-    function popStack(state) {
-        state.indentStack = state.indentStack.prev;
-    }
-
-    var binaryMatcher = new RegExp(/^(?:[-+]i|[-+][01]+#*(?:\/[01]+#*)?i|[-+]?[01]+#*(?:\/[01]+#*)?@[-+]?[01]+#*(?:\/[01]+#*)?|[-+]?[01]+#*(?:\/[01]+#*)?[-+](?:[01]+#*(?:\/[01]+#*)?)?i|[-+]?[01]+#*(?:\/[01]+#*)?)(?=[()\s;"]|$)/i);
-    var octalMatcher = new RegExp(/^(?:[-+]i|[-+][0-7]+#*(?:\/[0-7]+#*)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?@[-+]?[0-7]+#*(?:\/[0-7]+#*)?|[-+]?[0-7]+#*(?:\/[0-7]+#*)?[-+](?:[0-7]+#*(?:\/[0-7]+#*)?)?i|[-+]?[0-7]+#*(?:\/[0-7]+#*)?)(?=[()\s;"]|$)/i);
-    var hexMatcher = new RegExp(/^(?:[-+]i|[-+][\da-f]+#*(?:\/[\da-f]+#*)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?@[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?[-+](?:[\da-f]+#*(?:\/[\da-f]+#*)?)?i|[-+]?[\da-f]+#*(?:\/[\da-f]+#*)?)(?=[()\s;"]|$)/i);
-    var decimalMatcher = new RegExp(/^(?:[-+]i|[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)i|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)@[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)|[-+]?(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)[-+](?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*)?i|(?:(?:(?:\d+#+\.?#*|\d+\.\d*#*|\.\d+#*|\d+)(?:[esfdl][-+]?\d+)?)|\d+#*\/\d+#*))(?=[()\s;"]|$)/i);
-
-    function isBinaryNumber (stream) {
-        return stream.match(binaryMatcher);
-    }
-
-    function isOctalNumber (stream) {
-        return stream.match(octalMatcher);
-    }
-
-    function isDecimalNumber (stream, backup) {
-        if (backup === true) {
-            stream.backUp(1);
-        }
-        return stream.match(decimalMatcher);
-    }
-
-    function isHexNumber (stream) {
-        return stream.match(hexMatcher);
-    }
-
-    return {
-        startState: function () {
-            return {
-                indentStack: null,
-                indentation: 0,
-                mode: false,
-                sExprComment: false
-            };
-        },
-
-        token: function (stream, state) {
-            if (state.indentStack == null && stream.sol()) {
-                // update indentation, but only if indentStack is empty
-                state.indentation = stream.indentation();
-            }
-
-            // skip spaces
-            if (stream.eatSpace()) {
-                return null;
-            }
-            var returnType = null;
-
-            switch(state.mode){
-                case "string": // multi-line string parsing mode
-                    var next, escaped = false;
-                    while ((next = stream.next()) != null) {
-                        if (next == "\"" && !escaped) {
-
-                            state.mode = false;
-                            break;
-                        }
-                        escaped = !escaped && next == "\\";
-                    }
-                    returnType = STRING; // continue on in scheme-string mode
-                    break;
-                case "comment": // comment parsing mode
-                    var next, maybeEnd = false;
-                    while ((next = stream.next()) != null) {
-                        if (next == "#" && maybeEnd) {
-
-                            state.mode = false;
-                            break;
-                        }
-                        maybeEnd = (next == "|");
-                    }
-                    returnType = COMMENT;
-                    break;
-                case "s-expr-comment": // s-expr commenting mode
-                    state.mode = false;
-                    if(stream.peek() == "(" || stream.peek() == "["){
-                        // actually start scheme s-expr commenting mode
-                        state.sExprComment = 0;
-                    }else{
-                        // if not we just comment the entire of the next token
-                        stream.eatWhile(/[^/s]/); // eat non spaces
-                        returnType = COMMENT;
-                        break;
-                    }
-                default: // default parsing mode
-                    var ch = stream.next();
-
-                    if (ch == "\"") {
-                        state.mode = "string";
-                        returnType = STRING;
-
-                    } else if (ch == "'") {
-                        returnType = ATOM;
-                    } else if (ch == '#') {
-                        if (stream.eat("|")) {                    // Multi-line comment
-                            state.mode = "comment"; // toggle to comment mode
-                            returnType = COMMENT;
-                        } else if (stream.eat(/[tf]/i)) {            // #t/#f (atom)
-                            returnType = ATOM;
-                        } else if (stream.eat(';')) {                // S-Expr comment
-                            state.mode = "s-expr-comment";
-                            returnType = COMMENT;
-                        } else {
-                            var numTest = null, hasExactness = false, hasRadix = true;
-                            if (stream.eat(/[ei]/i)) {
-                                hasExactness = true;
-                            } else {
-                                stream.backUp(1);       // must be radix specifier
-                            }
-                            if (stream.match(/^#b/i)) {
-                                numTest = isBinaryNumber;
-                            } else if (stream.match(/^#o/i)) {
-                                numTest = isOctalNumber;
-                            } else if (stream.match(/^#x/i)) {
-                                numTest = isHexNumber;
-                            } else if (stream.match(/^#d/i)) {
-                                numTest = isDecimalNumber;
-                            } else if (stream.match(/^[-+0-9.]/, false)) {
-                                hasRadix = false;
-                                numTest = isDecimalNumber;
-                            // re-consume the intial # if all matches failed
-                            } else if (!hasExactness) {
-                                stream.eat('#');
-                            }
-                            if (numTest != null) {
-                                if (hasRadix && !hasExactness) {
-                                    // consume optional exactness after radix
-                                    stream.match(/^#[ei]/i);
-                                }
-                                if (numTest(stream))
-                                    returnType = NUMBER;
-                            }
-                        }
-                    } else if (/^[-+0-9.]/.test(ch) && isDecimalNumber(stream, true)) { // match non-prefixed number, must be decimal
-                        returnType = NUMBER;
-                    } else if (ch == ";") { // comment
-                        stream.skipToEnd(); // rest of the line is a comment
-                        returnType = COMMENT;
-                    } else if (ch == "(" || ch == "[") {
-                      var keyWord = ''; var indentTemp = stream.column(), letter;
-                        /**
-                        Either
-                        (indent-word ..
-                        (non-indent-word ..
-                        (;something else, bracket, etc.
-                        */
-
-                        while ((letter = stream.eat(/[^\s\(\[\;\)\]]/)) != null) {
-                            keyWord += letter;
-                        }
-
-                        if (keyWord.length > 0 && indentKeys.propertyIsEnumerable(keyWord)) { // indent-word
-
-                            pushStack(state, indentTemp + INDENT_WORD_SKIP, ch);
-                        } else { // non-indent word
-                            // we continue eating the spaces
-                            stream.eatSpace();
-                            if (stream.eol() || stream.peek() == ";") {
-                                // nothing significant after
-                                // we restart indentation 1 space after
-                                pushStack(state, indentTemp + 1, ch);
-                            } else {
-                                pushStack(state, indentTemp + stream.current().length, ch); // else we match
-                            }
-                        }
-                        stream.backUp(stream.current().length - 1); // undo all the eating
-
-                        if(typeof state.sExprComment == "number") state.sExprComment++;
-
-                        returnType = BRACKET;
-                    } else if (ch == ")" || ch == "]") {
-                        returnType = BRACKET;
-                        if (state.indentStack != null && state.indentStack.type == (ch == ")" ? "(" : "[")) {
-                            popStack(state);
-
-                            if(typeof state.sExprComment == "number"){
-                                if(--state.sExprComment == 0){
-                                    returnType = COMMENT; // final closing bracket
-                                    state.sExprComment = false; // turn off s-expr commenting mode
-                                }
-                            }
-                        }
-                    } else {
-                        stream.eatWhile(/[\w\$_\-!$%&*+\.\/:<=>?@\^~]/);
-
-                        if (keywords && keywords.propertyIsEnumerable(stream.current())) {
-                            returnType = BUILTIN;
-                        } else returnType = "variable";
-                    }
-            }
-            return (typeof state.sExprComment == "number") ? COMMENT : returnType;
-        },
-
-        indent: function (state) {
-            if (state.indentStack == null) return state.indentation;
-            return state.indentStack.indent;
-        },
-
-        closeBrackets: {pairs: "()[]{}\"\""},
-        lineComment: ";;"
-    };
-});
-
-CodeMirror.defineMIME("text/x-scheme", "scheme");
-
-});
diff --git a/www/code/codemirror-5.7/mode/shell/index.html b/www/code/codemirror-5.7/mode/shell/index.html
deleted file mode 100644
index 0b56300b1..000000000
--- a/www/code/codemirror-5.7/mode/shell/index.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-CodeMirror: Shell mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Shell mode
    
-
-
-
-
-
-
-
    MIME types defined: text/x-sh.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/shell/shell.js b/www/code/codemirror-5.7/mode/shell/shell.js
deleted file mode 100644
index a684e8c23..000000000
--- a/www/code/codemirror-5.7/mode/shell/shell.js
+++ /dev/null
@@ -1,139 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode('shell', function() {
-
-  var words = {};
-  function define(style, string) {
-    var split = string.split(' ');
-    for(var i = 0; i < split.length; i++) {
-      words[split[i]] = style;
-    }
-  };
-
-  // Atoms
-  define('atom', 'true false');
-
-  // Keywords
-  define('keyword', 'if then do else elif while until for in esac fi fin ' +
-    'fil done exit set unset export function');
-
-  // Commands
-  define('builtin', 'ab awk bash beep cat cc cd chown chmod chroot clear cp ' +
-    'curl cut diff echo find gawk gcc get git grep kill killall ln ls make ' +
-    'mkdir openssl mv nc node npm ping ps restart rm rmdir sed service sh ' +
-    'shopt shred source sort sleep ssh start stop su sudo tee telnet top ' +
-    'touch vi vim wall wc wget who write yes zsh');
-
-  function tokenBase(stream, state) {
-    if (stream.eatSpace()) return null;
-
-    var sol = stream.sol();
-    var ch = stream.next();
-
-    if (ch === '\\') {
-      stream.next();
-      return null;
-    }
-    if (ch === '\'' || ch === '"' || ch === '`') {
-      state.tokens.unshift(tokenString(ch));
-      return tokenize(stream, state);
-    }
-    if (ch === '#') {
-      if (sol && stream.eat('!')) {
-        stream.skipToEnd();
-        return 'meta'; // 'comment'?
-      }
-      stream.skipToEnd();
-      return 'comment';
-    }
-    if (ch === '$') {
-      state.tokens.unshift(tokenDollar);
-      return tokenize(stream, state);
-    }
-    if (ch === '+' || ch === '=') {
-      return 'operator';
-    }
-    if (ch === '-') {
-      stream.eat('-');
-      stream.eatWhile(/\w/);
-      return 'attribute';
-    }
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/\d/);
-      if(stream.eol() || !/\w/.test(stream.peek())) {
-        return 'number';
-      }
-    }
-    stream.eatWhile(/[\w-]/);
-    var cur = stream.current();
-    if (stream.peek() === '=' && /\w+/.test(cur)) return 'def';
-    return words.hasOwnProperty(cur) ? words[cur] : null;
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var next, end = false, escaped = false;
-      while ((next = stream.next()) != null) {
-        if (next === quote && !escaped) {
-          end = true;
-          break;
-        }
-        if (next === '$' && !escaped && quote !== '\'') {
-          escaped = true;
-          stream.backUp(1);
-          state.tokens.unshift(tokenDollar);
-          break;
-        }
-        escaped = !escaped && next === '\\';
-      }
-      if (end || !escaped) {
-        state.tokens.shift();
-      }
-      return (quote === '`' || quote === ')' ? 'quote' : 'string');
-    };
-  };
-
-  var tokenDollar = function(stream, state) {
-    if (state.tokens.length > 1) stream.eat('$');
-    var ch = stream.next(), hungry = /\w/;
-    if (ch === '{') hungry = /[^}]/;
-    if (ch === '(') {
-      state.tokens[0] = tokenString(')');
-      return tokenize(stream, state);
-    }
-    if (!/\d/.test(ch)) {
-      stream.eatWhile(hungry);
-      stream.eat('}');
-    }
-    state.tokens.shift();
-    return 'def';
-  };
-
-  function tokenize(stream, state) {
-    return (state.tokens[0] || tokenBase) (stream, state);
-  };
-
-  return {
-    startState: function() {return {tokens:[]};},
-    token: function(stream, state) {
-      return tokenize(stream, state);
-    },
-    lineComment: '#',
-    fold: "brace"
-  };
-});
-
-CodeMirror.defineMIME('text/x-sh', 'shell');
-
-});
diff --git a/www/code/codemirror-5.7/mode/shell/test.js b/www/code/codemirror-5.7/mode/shell/test.js
deleted file mode 100644
index a413b5a40..000000000
--- a/www/code/codemirror-5.7/mode/shell/test.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({}, "shell");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("var",
-     "text [def $var] text");
-  MT("varBraces",
-     "text[def ${var}]text");
-  MT("varVar",
-     "text [def $a$b] text");
-  MT("varBracesVarBraces",
-     "text[def ${a}${b}]text");
-
-  MT("singleQuotedVar",
-     "[string 'text $var text']");
-  MT("singleQuotedVarBraces",
-     "[string 'text ${var} text']");
-
-  MT("doubleQuotedVar",
-     '[string "text ][def $var][string  text"]');
-  MT("doubleQuotedVarBraces",
-     '[string "text][def ${var}][string text"]');
-  MT("doubleQuotedVarPunct",
-     '[string "text ][def $@][string  text"]');
-  MT("doubleQuotedVarVar",
-     '[string "][def $a$b][string "]');
-  MT("doubleQuotedVarBracesVarBraces",
-     '[string "][def ${a}${b}][string "]');
-
-  MT("notAString",
-     "text\\'text");
-  MT("escapes",
-     "outside\\'\\\"\\`\\\\[string \"inside\\`\\'\\\"\\\\`\\$notAVar\"]outside\\$\\(notASubShell\\)");
-
-  MT("subshell",
-     "[builtin echo] [quote $(whoami)] s log, stardate [quote `date`].");
-  MT("doubleQuotedSubshell",
-     "[builtin echo] [string \"][quote $(whoami)][string 's log, stardate `date`.\"]");
-
-  MT("hashbang",
-     "[meta #!/bin/bash]");
-  MT("comment",
-     "text [comment # Blurb]");
-
-  MT("numbers",
-     "[number 0] [number 1] [number 2]");
-  MT("keywords",
-     "[keyword while] [atom true]; [keyword do]",
-     "  [builtin sleep] [number 3]",
-     "[keyword done]");
-  MT("options",
-     "[builtin ls] [attribute -l] [attribute --human-readable]");
-  MT("operator",
-     "[def var][operator =]value");
-})();
diff --git a/www/code/codemirror-5.7/mode/sieve/index.html b/www/code/codemirror-5.7/mode/sieve/index.html
deleted file mode 100644
index 6f029b623..000000000
--- a/www/code/codemirror-5.7/mode/sieve/index.html
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-CodeMirror: Sieve (RFC5228) mode
-
-
-
-
-
-
-
-
-
-
    
-
    Sieve (RFC5228) mode
    
-
    
-    
-
-    
    MIME types defined: application/sieve.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/sieve/sieve.js b/www/code/codemirror-5.7/mode/sieve/sieve.js
deleted file mode 100644
index f67db2f55..000000000
--- a/www/code/codemirror-5.7/mode/sieve/sieve.js
+++ /dev/null
@@ -1,193 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("sieve", function(config) {
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  var keywords = words("if elsif else stop require");
-  var atoms = words("true false not");
-  var indentUnit = config.indentUnit;
-
-  function tokenBase(stream, state) {
-
-    var ch = stream.next();
-    if (ch == "/" && stream.eat("*")) {
-      state.tokenize = tokenCComment;
-      return tokenCComment(stream, state);
-    }
-
-    if (ch === '#') {
-      stream.skipToEnd();
-      return "comment";
-    }
-
-    if (ch == "\"") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-
-    if (ch == "(") {
-      state._indent.push("(");
-      // add virtual angel wings so that editor behaves...
-      // ...more sane incase of broken brackets
-      state._indent.push("{");
-      return null;
-    }
-
-    if (ch === "{") {
-      state._indent.push("{");
-      return null;
-    }
-
-    if (ch == ")")  {
-      state._indent.pop();
-      state._indent.pop();
-    }
-
-    if (ch === "}") {
-      state._indent.pop();
-      return null;
-    }
-
-    if (ch == ",")
-      return null;
-
-    if (ch == ";")
-      return null;
-
-
-    if (/[{}\(\),;]/.test(ch))
-      return null;
-
-    // 1*DIGIT "K" / "M" / "G"
-    if (/\d/.test(ch)) {
-      stream.eatWhile(/[\d]/);
-      stream.eat(/[KkMmGg]/);
-      return "number";
-    }
-
-    // ":" (ALPHA / "_") *(ALPHA / DIGIT / "_")
-    if (ch == ":") {
-      stream.eatWhile(/[a-zA-Z_]/);
-      stream.eatWhile(/[a-zA-Z0-9_]/);
-
-      return "operator";
-    }
-
-    stream.eatWhile(/\w/);
-    var cur = stream.current();
-
-    // "text:" *(SP / HTAB) (hash-comment / CRLF)
-    // *(multiline-literal / multiline-dotstart)
-    // "." CRLF
-    if ((cur == "text") && stream.eat(":"))
-    {
-      state.tokenize = tokenMultiLineString;
-      return "string";
-    }
-
-    if (keywords.propertyIsEnumerable(cur))
-      return "keyword";
-
-    if (atoms.propertyIsEnumerable(cur))
-      return "atom";
-
-    return null;
-  }
-
-  function tokenMultiLineString(stream, state)
-  {
-    state._multiLineString = true;
-    // the first line is special it may contain a comment
-    if (!stream.sol()) {
-      stream.eatSpace();
-
-      if (stream.peek() == "#") {
-        stream.skipToEnd();
-        return "comment";
-      }
-
-      stream.skipToEnd();
-      return "string";
-    }
-
-    if ((stream.next() == ".")  && (stream.eol()))
-    {
-      state._multiLineString = false;
-      state.tokenize = tokenBase;
-    }
-
-    return "string";
-  }
-
-  function tokenCComment(stream, state) {
-    var maybeEnd = false, ch;
-    while ((ch = stream.next()) != null) {
-      if (maybeEnd && ch == "/") {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped)
-          break;
-        escaped = !escaped && ch == "\\";
-      }
-      if (!escaped) state.tokenize = tokenBase;
-      return "string";
-    };
-  }
-
-  return {
-    startState: function(base) {
-      return {tokenize: tokenBase,
-              baseIndent: base || 0,
-              _indent: []};
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace())
-        return null;
-
-      return (state.tokenize || tokenBase)(stream, state);;
-    },
-
-    indent: function(state, _textAfter) {
-      var length = state._indent.length;
-      if (_textAfter && (_textAfter[0] == "}"))
-        length--;
-
-      if (length <0)
-        length = 0;
-
-      return length * indentUnit;
-    },
-
-    electricChars: "}"
-  };
-});
-
-CodeMirror.defineMIME("application/sieve", "sieve");
-
-});
diff --git a/www/code/codemirror-5.7/mode/slim/index.html b/www/code/codemirror-5.7/mode/slim/index.html
deleted file mode 100644
index 7fa4e50df..000000000
--- a/www/code/codemirror-5.7/mode/slim/index.html
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-CodeMirror: SLIM mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-  
    SLIM mode
    
-  
    
-  
-
-  
    MIME types defined: application/x-slim.
    
-
-  
    
-    Parsing/Highlighting Tests:
-    normal,
-    verbose.
-  
    
-
    
diff --git a/www/code/codemirror-5.7/mode/slim/slim.js b/www/code/codemirror-5.7/mode/slim/slim.js
deleted file mode 100644
index 164464d06..000000000
--- a/www/code/codemirror-5.7/mode/slim/slim.js
+++ /dev/null
@@ -1,575 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"), require("../ruby/ruby"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../htmlmixed/htmlmixed", "../ruby/ruby"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-  CodeMirror.defineMode("slim", function(config) {
-    var htmlMode = CodeMirror.getMode(config, {name: "htmlmixed"});
-    var rubyMode = CodeMirror.getMode(config, "ruby");
-    var modes = { html: htmlMode, ruby: rubyMode };
-    var embedded = {
-      ruby: "ruby",
-      javascript: "javascript",
-      css: "text/css",
-      sass: "text/x-sass",
-      scss: "text/x-scss",
-      less: "text/x-less",
-      styl: "text/x-styl", // no highlighting so far
-      coffee: "coffeescript",
-      asciidoc: "text/x-asciidoc",
-      markdown: "text/x-markdown",
-      textile: "text/x-textile", // no highlighting so far
-      creole: "text/x-creole", // no highlighting so far
-      wiki: "text/x-wiki", // no highlighting so far
-      mediawiki: "text/x-mediawiki", // no highlighting so far
-      rdoc: "text/x-rdoc", // no highlighting so far
-      builder: "text/x-builder", // no highlighting so far
-      nokogiri: "text/x-nokogiri", // no highlighting so far
-      erb: "application/x-erb"
-    };
-    var embeddedRegexp = function(map){
-      var arr = [];
-      for(var key in map) arr.push(key);
-      return new RegExp("^("+arr.join('|')+"):");
-    }(embedded);
-
-    var styleMap = {
-      "commentLine": "comment",
-      "slimSwitch": "operator special",
-      "slimTag": "tag",
-      "slimId": "attribute def",
-      "slimClass": "attribute qualifier",
-      "slimAttribute": "attribute",
-      "slimSubmode": "keyword special",
-      "closeAttributeTag": null,
-      "slimDoctype": null,
-      "lineContinuation": null
-    };
-    var closing = {
-      "{": "}",
-      "[": "]",
-      "(": ")"
-    };
-
-    var nameStartChar = "_a-zA-Z\xC0-\xD6\xD8-\xF6\xF8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD";
-    var nameChar = nameStartChar + "\\-0-9\xB7\u0300-\u036F\u203F-\u2040";
-    var nameRegexp = new RegExp("^[:"+nameStartChar+"](?::["+nameChar+"]|["+nameChar+"]*)");
-    var attributeNameRegexp = new RegExp("^[:"+nameStartChar+"][:\\."+nameChar+"]*(?=\\s*=)");
-    var wrappedAttributeNameRegexp = new RegExp("^[:"+nameStartChar+"][:\\."+nameChar+"]*");
-    var classNameRegexp = /^\.-?[_a-zA-Z]+[\w\-]*/;
-    var classIdRegexp = /^#[_a-zA-Z]+[\w\-]*/;
-
-    function backup(pos, tokenize, style) {
-      var restore = function(stream, state) {
-        state.tokenize = tokenize;
-        if (stream.pos < pos) {
-          stream.pos = pos;
-          return style;
-        }
-        return state.tokenize(stream, state);
-      };
-      return function(stream, state) {
-        state.tokenize = restore;
-        return tokenize(stream, state);
-      };
-    }
-
-    function maybeBackup(stream, state, pat, offset, style) {
-      var cur = stream.current();
-      var idx = cur.search(pat);
-      if (idx > -1) {
-        state.tokenize = backup(stream.pos, state.tokenize, style);
-        stream.backUp(cur.length - idx - offset);
-      }
-      return style;
-    }
-
-    function continueLine(state, column) {
-      state.stack = {
-        parent: state.stack,
-        style: "continuation",
-        indented: column,
-        tokenize: state.line
-      };
-      state.line = state.tokenize;
-    }
-    function finishContinue(state) {
-      if (state.line == state.tokenize) {
-        state.line = state.stack.tokenize;
-        state.stack = state.stack.parent;
-      }
-    }
-
-    function lineContinuable(column, tokenize) {
-      return function(stream, state) {
-        finishContinue(state);
-        if (stream.match(/^\\$/)) {
-          continueLine(state, column);
-          return "lineContinuation";
-        }
-        var style = tokenize(stream, state);
-        if (stream.eol() && stream.current().match(/(?:^|[^\\])(?:\\\\)*\\$/)) {
-          stream.backUp(1);
-        }
-        return style;
-      };
-    }
-    function commaContinuable(column, tokenize) {
-      return function(stream, state) {
-        finishContinue(state);
-        var style = tokenize(stream, state);
-        if (stream.eol() && stream.current().match(/,$/)) {
-          continueLine(state, column);
-        }
-        return style;
-      };
-    }
-
-    function rubyInQuote(endQuote, tokenize) {
-      // TODO: add multi line support
-      return function(stream, state) {
-        var ch = stream.peek();
-        if (ch == endQuote && state.rubyState.tokenize.length == 1) {
-          // step out of ruby context as it seems to complete processing all the braces
-          stream.next();
-          state.tokenize = tokenize;
-          return "closeAttributeTag";
-        } else {
-          return ruby(stream, state);
-        }
-      };
-    }
-    function startRubySplat(tokenize) {
-      var rubyState;
-      var runSplat = function(stream, state) {
-        if (state.rubyState.tokenize.length == 1 && !state.rubyState.context.prev) {
-          stream.backUp(1);
-          if (stream.eatSpace()) {
-            state.rubyState = rubyState;
-            state.tokenize = tokenize;
-            return tokenize(stream, state);
-          }
-          stream.next();
-        }
-        return ruby(stream, state);
-      };
-      return function(stream, state) {
-        rubyState = state.rubyState;
-        state.rubyState = rubyMode.startState();
-        state.tokenize = runSplat;
-        return ruby(stream, state);
-      };
-    }
-
-    function ruby(stream, state) {
-      return rubyMode.token(stream, state.rubyState);
-    }
-
-    function htmlLine(stream, state) {
-      if (stream.match(/^\\$/)) {
-        return "lineContinuation";
-      }
-      return html(stream, state);
-    }
-    function html(stream, state) {
-      if (stream.match(/^#\{/)) {
-        state.tokenize = rubyInQuote("}", state.tokenize);
-        return null;
-      }
-      return maybeBackup(stream, state, /[^\\]#\{/, 1, htmlMode.token(stream, state.htmlState));
-    }
-
-    function startHtmlLine(lastTokenize) {
-      return function(stream, state) {
-        var style = htmlLine(stream, state);
-        if (stream.eol()) state.tokenize = lastTokenize;
-        return style;
-      };
-    }
-
-    function startHtmlMode(stream, state, offset) {
-      state.stack = {
-        parent: state.stack,
-        style: "html",
-        indented: stream.column() + offset, // pipe + space
-        tokenize: state.line
-      };
-      state.line = state.tokenize = html;
-      return null;
-    }
-
-    function comment(stream, state) {
-      stream.skipToEnd();
-      return state.stack.style;
-    }
-
-    function commentMode(stream, state) {
-      state.stack = {
-        parent: state.stack,
-        style: "comment",
-        indented: state.indented + 1,
-        tokenize: state.line
-      };
-      state.line = comment;
-      return comment(stream, state);
-    }
-
-    function attributeWrapper(stream, state) {
-      if (stream.eat(state.stack.endQuote)) {
-        state.line = state.stack.line;
-        state.tokenize = state.stack.tokenize;
-        state.stack = state.stack.parent;
-        return null;
-      }
-      if (stream.match(wrappedAttributeNameRegexp)) {
-        state.tokenize = attributeWrapperAssign;
-        return "slimAttribute";
-      }
-      stream.next();
-      return null;
-    }
-    function attributeWrapperAssign(stream, state) {
-      if (stream.match(/^==?/)) {
-        state.tokenize = attributeWrapperValue;
-        return null;
-      }
-      return attributeWrapper(stream, state);
-    }
-    function attributeWrapperValue(stream, state) {
-      var ch = stream.peek();
-      if (ch == '"' || ch == "\'") {
-        state.tokenize = readQuoted(ch, "string", true, false, attributeWrapper);
-        stream.next();
-        return state.tokenize(stream, state);
-      }
-      if (ch == '[') {
-        return startRubySplat(attributeWrapper)(stream, state);
-      }
-      if (stream.match(/^(true|false|nil)\b/)) {
-        state.tokenize = attributeWrapper;
-        return "keyword";
-      }
-      return startRubySplat(attributeWrapper)(stream, state);
-    }
-
-    function startAttributeWrapperMode(state, endQuote, tokenize) {
-      state.stack = {
-        parent: state.stack,
-        style: "wrapper",
-        indented: state.indented + 1,
-        tokenize: tokenize,
-        line: state.line,
-        endQuote: endQuote
-      };
-      state.line = state.tokenize = attributeWrapper;
-      return null;
-    }
-
-    function sub(stream, state) {
-      if (stream.match(/^#\{/)) {
-        state.tokenize = rubyInQuote("}", state.tokenize);
-        return null;
-      }
-      var subStream = new CodeMirror.StringStream(stream.string.slice(state.stack.indented), stream.tabSize);
-      subStream.pos = stream.pos - state.stack.indented;
-      subStream.start = stream.start - state.stack.indented;
-      subStream.lastColumnPos = stream.lastColumnPos - state.stack.indented;
-      subStream.lastColumnValue = stream.lastColumnValue - state.stack.indented;
-      var style = state.subMode.token(subStream, state.subState);
-      stream.pos = subStream.pos + state.stack.indented;
-      return style;
-    }
-    function firstSub(stream, state) {
-      state.stack.indented = stream.column();
-      state.line = state.tokenize = sub;
-      return state.tokenize(stream, state);
-    }
-
-    function createMode(mode) {
-      var query = embedded[mode];
-      var spec = CodeMirror.mimeModes[query];
-      if (spec) {
-        return CodeMirror.getMode(config, spec);
-      }
-      var factory = CodeMirror.modes[query];
-      if (factory) {
-        return factory(config, {name: query});
-      }
-      return CodeMirror.getMode(config, "null");
-    }
-
-    function getMode(mode) {
-      if (!modes.hasOwnProperty(mode)) {
-        return modes[mode] = createMode(mode);
-      }
-      return modes[mode];
-    }
-
-    function startSubMode(mode, state) {
-      var subMode = getMode(mode);
-      var subState = subMode.startState && subMode.startState();
-
-      state.subMode = subMode;
-      state.subState = subState;
-
-      state.stack = {
-        parent: state.stack,
-        style: "sub",
-        indented: state.indented + 1,
-        tokenize: state.line
-      };
-      state.line = state.tokenize = firstSub;
-      return "slimSubmode";
-    }
-
-    function doctypeLine(stream, _state) {
-      stream.skipToEnd();
-      return "slimDoctype";
-    }
-
-    function startLine(stream, state) {
-      var ch = stream.peek();
-      if (ch == '<') {
-        return (state.tokenize = startHtmlLine(state.tokenize))(stream, state);
-      }
-      if (stream.match(/^[|']/)) {
-        return startHtmlMode(stream, state, 1);
-      }
-      if (stream.match(/^\/(!|\[\w+])?/)) {
-        return commentMode(stream, state);
-      }
-      if (stream.match(/^(-|==?[<>]?)/)) {
-        state.tokenize = lineContinuable(stream.column(), commaContinuable(stream.column(), ruby));
-        return "slimSwitch";
-      }
-      if (stream.match(/^doctype\b/)) {
-        state.tokenize = doctypeLine;
-        return "keyword";
-      }
-
-      var m = stream.match(embeddedRegexp);
-      if (m) {
-        return startSubMode(m[1], state);
-      }
-
-      return slimTag(stream, state);
-    }
-
-    function slim(stream, state) {
-      if (state.startOfLine) {
-        return startLine(stream, state);
-      }
-      return slimTag(stream, state);
-    }
-
-    function slimTag(stream, state) {
-      if (stream.eat('*')) {
-        state.tokenize = startRubySplat(slimTagExtras);
-        return null;
-      }
-      if (stream.match(nameRegexp)) {
-        state.tokenize = slimTagExtras;
-        return "slimTag";
-      }
-      return slimClass(stream, state);
-    }
-    function slimTagExtras(stream, state) {
-      if (stream.match(/^(<>?|> state.indented && state.last != "slimSubmode") {
-            state.line = state.tokenize = state.stack.tokenize;
-            state.stack = state.stack.parent;
-            state.subMode = null;
-            state.subState = null;
-          }
-        }
-        if (stream.eatSpace()) return null;
-        var style = state.tokenize(stream, state);
-        state.startOfLine = false;
-        if (style) state.last = style;
-        return styleMap.hasOwnProperty(style) ? styleMap[style] : style;
-      },
-
-      blankLine: function(state) {
-        if (state.subMode && state.subMode.blankLine) {
-          return state.subMode.blankLine(state.subState);
-        }
-      },
-
-      innerMode: function(state) {
-        if (state.subMode) return {state: state.subState, mode: state.subMode};
-        return {state: state, mode: mode};
-      }
-
-      //indent: function(state) {
-      //  return state.indented;
-      //}
-    };
-    return mode;
-  }, "htmlmixed", "ruby");
-
-  CodeMirror.defineMIME("text/x-slim", "slim");
-  CodeMirror.defineMIME("application/x-slim", "slim");
-});
diff --git a/www/code/codemirror-5.7/mode/slim/test.js b/www/code/codemirror-5.7/mode/slim/test.js
deleted file mode 100644
index be4ddacb6..000000000
--- a/www/code/codemirror-5.7/mode/slim/test.js
+++ /dev/null
@@ -1,96 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Slim Highlighting for CodeMirror copyright (c) HicknHack Software Gmbh
-
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4, indentUnit: 2}, "slim");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  // Requires at least one media query
-  MT("elementName",
-     "[tag h1] Hey There");
-
-  MT("oneElementPerLine",
-     "[tag h1] Hey There .h2");
-
-  MT("idShortcut",
-     "[attribute&def #test] Hey There");
-
-  MT("tagWithIdShortcuts",
-     "[tag h1][attribute&def #test] Hey There");
-
-  MT("classShortcut",
-     "[attribute&qualifier .hello] Hey There");
-
-  MT("tagWithIdAndClassShortcuts",
-     "[tag h1][attribute&def #test][attribute&qualifier .hello] Hey There");
-
-  MT("docType",
-     "[keyword doctype] xml");
-
-  MT("comment",
-     "[comment / Hello WORLD]");
-
-  MT("notComment",
-     "[tag h1] This is not a / comment ");
-
-  MT("attributes",
-     "[tag a]([attribute title]=[string \"test\"]) [attribute href]=[string \"link\"]}");
-
-  MT("multiLineAttributes",
-     "[tag a]([attribute title]=[string \"test\"]",
-     "  ) [attribute href]=[string \"link\"]}");
-
-  MT("htmlCode",
-     "[tag&bracket <][tag h1][tag&bracket >]Title[tag&bracket ]");
-
-  MT("rubyBlock",
-     "[operator&special =][variable-2 @item]");
-
-  MT("selectorRubyBlock",
-     "[tag a][attribute&qualifier .test][operator&special =] [variable-2 @item]");
-
-  MT("nestedRubyBlock",
-      "[tag a]",
-      "  [operator&special =][variable puts] [string \"test\"]");
-
-  MT("multilinePlaintext",
-      "[tag p]",
-      "  | Hello,",
-      "    World");
-
-  MT("multilineRuby",
-      "[tag p]",
-      "  [comment /# this is a comment]",
-      "     [comment and this is a comment too]",
-      "  | Date/Time",
-      "  [operator&special -] [variable now] [operator =] [tag DateTime][operator .][property now]",
-      "  [tag strong][operator&special =] [variable now]",
-      "  [operator&special -] [keyword if] [variable now] [operator >] [tag DateTime][operator .][property parse]([string \"December 31, 2006\"])",
-      "     [operator&special =][string \"Happy\"]",
-      "     [operator&special =][string \"Belated\"]",
-      "     [operator&special =][string \"Birthday\"]");
-
-  MT("multilineComment",
-      "[comment /]",
-      "  [comment Multiline]",
-      "  [comment Comment]");
-
-  MT("hamlAfterRubyTag",
-    "[attribute&qualifier .block]",
-    "  [tag strong][operator&special =] [variable now]",
-    "  [attribute&qualifier .test]",
-    "     [operator&special =][variable now]",
-    "  [attribute&qualifier .right]");
-
-  MT("stretchedRuby",
-     "[operator&special =] [variable puts] [string \"Hello\"],",
-     "   [string \"World\"]");
-
-  MT("interpolationInHashAttribute",
-     "[tag div]{[attribute id] = [string \"]#{[variable test]}[string _]#{[variable ting]}[string \"]} test");
-
-  MT("interpolationInHTMLAttribute",
-     "[tag div]([attribute title]=[string \"]#{[variable test]}[string _]#{[variable ting]()}[string \"]) Test");
-})();
diff --git a/www/code/codemirror-5.7/mode/smalltalk/index.html b/www/code/codemirror-5.7/mode/smalltalk/index.html
deleted file mode 100644
index 2155ebc2a..000000000
--- a/www/code/codemirror-5.7/mode/smalltalk/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-CodeMirror: Smalltalk mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Smalltalk mode
    
-
    
-
-    
-
-    
    Simple Smalltalk mode.
    
-
-    
    MIME types defined: text/x-stsrc.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/smalltalk/smalltalk.js b/www/code/codemirror-5.7/mode/smalltalk/smalltalk.js
deleted file mode 100644
index bb510ba2e..000000000
--- a/www/code/codemirror-5.7/mode/smalltalk/smalltalk.js
+++ /dev/null
@@ -1,168 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode('smalltalk', function(config) {
-
-  var specialChars = /[+\-\/\\*~<>=@%|&?!.,:;^]/;
-  var keywords = /true|false|nil|self|super|thisContext/;
-
-  var Context = function(tokenizer, parent) {
-    this.next = tokenizer;
-    this.parent = parent;
-  };
-
-  var Token = function(name, context, eos) {
-    this.name = name;
-    this.context = context;
-    this.eos = eos;
-  };
-
-  var State = function() {
-    this.context = new Context(next, null);
-    this.expectVariable = true;
-    this.indentation = 0;
-    this.userIndentationDelta = 0;
-  };
-
-  State.prototype.userIndent = function(indentation) {
-    this.userIndentationDelta = indentation > 0 ? (indentation / config.indentUnit - this.indentation) : 0;
-  };
-
-  var next = function(stream, context, state) {
-    var token = new Token(null, context, false);
-    var aChar = stream.next();
-
-    if (aChar === '"') {
-      token = nextComment(stream, new Context(nextComment, context));
-
-    } else if (aChar === '\'') {
-      token = nextString(stream, new Context(nextString, context));
-
-    } else if (aChar === '#') {
-      if (stream.peek() === '\'') {
-        stream.next();
-        token = nextSymbol(stream, new Context(nextSymbol, context));
-      } else {
-        if (stream.eatWhile(/[^\s.{}\[\]()]/))
-          token.name = 'string-2';
-        else
-          token.name = 'meta';
-      }
-
-    } else if (aChar === '$') {
-      if (stream.next() === '<') {
-        stream.eatWhile(/[^\s>]/);
-        stream.next();
-      }
-      token.name = 'string-2';
-
-    } else if (aChar === '|' && state.expectVariable) {
-      token.context = new Context(nextTemporaries, context);
-
-    } else if (/[\[\]{}()]/.test(aChar)) {
-      token.name = 'bracket';
-      token.eos = /[\[{(]/.test(aChar);
-
-      if (aChar === '[') {
-        state.indentation++;
-      } else if (aChar === ']') {
-        state.indentation = Math.max(0, state.indentation - 1);
-      }
-
-    } else if (specialChars.test(aChar)) {
-      stream.eatWhile(specialChars);
-      token.name = 'operator';
-      token.eos = aChar !== ';'; // ; cascaded message expression
-
-    } else if (/\d/.test(aChar)) {
-      stream.eatWhile(/[\w\d]/);
-      token.name = 'number';
-
-    } else if (/[\w_]/.test(aChar)) {
-      stream.eatWhile(/[\w\d_]/);
-      token.name = state.expectVariable ? (keywords.test(stream.current()) ? 'keyword' : 'variable') : null;
-
-    } else {
-      token.eos = state.expectVariable;
-    }
-
-    return token;
-  };
-
-  var nextComment = function(stream, context) {
-    stream.eatWhile(/[^"]/);
-    return new Token('comment', stream.eat('"') ? context.parent : context, true);
-  };
-
-  var nextString = function(stream, context) {
-    stream.eatWhile(/[^']/);
-    return new Token('string', stream.eat('\'') ? context.parent : context, false);
-  };
-
-  var nextSymbol = function(stream, context) {
-    stream.eatWhile(/[^']/);
-    return new Token('string-2', stream.eat('\'') ? context.parent : context, false);
-  };
-
-  var nextTemporaries = function(stream, context) {
-    var token = new Token(null, context, false);
-    var aChar = stream.next();
-
-    if (aChar === '|') {
-      token.context = context.parent;
-      token.eos = true;
-
-    } else {
-      stream.eatWhile(/[^|]/);
-      token.name = 'variable';
-    }
-
-    return token;
-  };
-
-  return {
-    startState: function() {
-      return new State;
-    },
-
-    token: function(stream, state) {
-      state.userIndent(stream.indentation());
-
-      if (stream.eatSpace()) {
-        return null;
-      }
-
-      var token = state.context.next(stream, state.context, state);
-      state.context = token.context;
-      state.expectVariable = token.eos;
-
-      return token.name;
-    },
-
-    blankLine: function(state) {
-      state.userIndent(0);
-    },
-
-    indent: function(state, textAfter) {
-      var i = state.context.next === next && textAfter && textAfter.charAt(0) === ']' ? -1 : state.userIndentationDelta;
-      return (state.indentation + i) * config.indentUnit;
-    },
-
-    electricChars: ']'
-  };
-
-});
-
-CodeMirror.defineMIME('text/x-stsrc', {name: 'smalltalk'});
-
-});
diff --git a/www/code/codemirror-5.7/mode/smarty/index.html b/www/code/codemirror-5.7/mode/smarty/index.html
deleted file mode 100644
index b19c8f09b..000000000
--- a/www/code/codemirror-5.7/mode/smarty/index.html
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-CodeMirror: Smarty mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Smarty mode
    
-
    
-
-
    Mode for Smarty version 2 or 3, which allows for custom delimiter tags.
    
-
-
    Several configuration parameters are supported:
    
-
-
      
-  
    • leftDelimiter and rightDelimiter,
-  which should be strings that determine where the Smarty syntax
-  starts and ends.
      • 
-  
    • version, which should be 2 or 3.
      • 
-  
    • baseMode, which can be a mode spec
-  like "text/html" to set a different background mode.
      • 
-
    
-
-
    MIME types defined: text/x-smarty
    
-
-
    Smarty 2, custom delimiters
    
-
-
    
-
-
    Smarty 3
    
-
-
-
-
-
-
    
diff --git a/www/code/codemirror-5.7/mode/smarty/smarty.js b/www/code/codemirror-5.7/mode/smarty/smarty.js
deleted file mode 100644
index 6e0fbed42..000000000
--- a/www/code/codemirror-5.7/mode/smarty/smarty.js
+++ /dev/null
@@ -1,225 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/**
- * Smarty 2 and 3 mode.
- */
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("smarty", function(config, parserConf) {
-    var rightDelimiter = parserConf.rightDelimiter || "}";
-    var leftDelimiter = parserConf.leftDelimiter || "{";
-    var version = parserConf.version || 2;
-    var baseMode = CodeMirror.getMode(config, parserConf.baseMode || "null");
-
-    var keyFunctions = ["debug", "extends", "function", "include", "literal"];
-    var regs = {
-      operatorChars: /[+\-*&%=<>!?]/,
-      validIdentifier: /[a-zA-Z0-9_]/,
-      stringChar: /['"]/
-    };
-
-    var last;
-    function cont(style, lastType) {
-      last = lastType;
-      return style;
-    }
-
-    function chain(stream, state, parser) {
-      state.tokenize = parser;
-      return parser(stream, state);
-    }
-
-    // Smarty 3 allows { and } surrounded by whitespace to NOT slip into Smarty mode
-    function doesNotCount(stream, pos) {
-      if (pos == null) pos = stream.pos;
-      return version === 3 && leftDelimiter == "{" &&
-        (pos == stream.string.length || /\s/.test(stream.string.charAt(pos)));
-    }
-
-    function tokenTop(stream, state) {
-      var string = stream.string;
-      for (var scan = stream.pos;;) {
-        var nextMatch = string.indexOf(leftDelimiter, scan);
-        scan = nextMatch + leftDelimiter.length;
-        if (nextMatch == -1 || !doesNotCount(stream, nextMatch + leftDelimiter.length)) break;
-      }
-      if (nextMatch == stream.pos) {
-        stream.match(leftDelimiter);
-        if (stream.eat("*")) {
-          return chain(stream, state, tokenBlock("comment", "*" + rightDelimiter));
-        } else {
-          state.depth++;
-          state.tokenize = tokenSmarty;
-          last = "startTag";
-          return "tag";
-        }
-      }
-
-      if (nextMatch > -1) stream.string = string.slice(0, nextMatch);
-      var token = baseMode.token(stream, state.base);
-      if (nextMatch > -1) stream.string = string;
-      return token;
-    }
-
-    // parsing Smarty content
-    function tokenSmarty(stream, state) {
-      if (stream.match(rightDelimiter, true)) {
-        if (version === 3) {
-          state.depth--;
-          if (state.depth <= 0) {
-            state.tokenize = tokenTop;
-          }
-        } else {
-          state.tokenize = tokenTop;
-        }
-        return cont("tag", null);
-      }
-
-      if (stream.match(leftDelimiter, true)) {
-        state.depth++;
-        return cont("tag", "startTag");
-      }
-
-      var ch = stream.next();
-      if (ch == "$") {
-        stream.eatWhile(regs.validIdentifier);
-        return cont("variable-2", "variable");
-      } else if (ch == "|") {
-        return cont("operator", "pipe");
-      } else if (ch == ".") {
-        return cont("operator", "property");
-      } else if (regs.stringChar.test(ch)) {
-        state.tokenize = tokenAttribute(ch);
-        return cont("string", "string");
-      } else if (regs.operatorChars.test(ch)) {
-        stream.eatWhile(regs.operatorChars);
-        return cont("operator", "operator");
-      } else if (ch == "[" || ch == "]") {
-        return cont("bracket", "bracket");
-      } else if (ch == "(" || ch == ")") {
-        return cont("bracket", "operator");
-      } else if (/\d/.test(ch)) {
-        stream.eatWhile(/\d/);
-        return cont("number", "number");
-      } else {
-
-        if (state.last == "variable") {
-          if (ch == "@") {
-            stream.eatWhile(regs.validIdentifier);
-            return cont("property", "property");
-          } else if (ch == "|") {
-            stream.eatWhile(regs.validIdentifier);
-            return cont("qualifier", "modifier");
-          }
-        } else if (state.last == "pipe") {
-          stream.eatWhile(regs.validIdentifier);
-          return cont("qualifier", "modifier");
-        } else if (state.last == "whitespace") {
-          stream.eatWhile(regs.validIdentifier);
-          return cont("attribute", "modifier");
-        } if (state.last == "property") {
-          stream.eatWhile(regs.validIdentifier);
-          return cont("property", null);
-        } else if (/\s/.test(ch)) {
-          last = "whitespace";
-          return null;
-        }
-
-        var str = "";
-        if (ch != "/") {
-          str += ch;
-        }
-        var c = null;
-        while (c = stream.eat(regs.validIdentifier)) {
-          str += c;
-        }
-        for (var i=0, j=keyFunctions.length; i
-
-CodeMirror: Solr mode
-
-
-
-
-
-
-
-
-
-
    
-  
    Solr mode
    
-
-  
    
-    
-  
    
-
-  
-
-  
    MIME types defined: text/x-solr.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/solr/solr.js b/www/code/codemirror-5.7/mode/solr/solr.js
deleted file mode 100644
index f7f708789..000000000
--- a/www/code/codemirror-5.7/mode/solr/solr.js
+++ /dev/null
@@ -1,104 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("solr", function() {
-  "use strict";
-
-  var isStringChar = /[^\s\|\!\+\-\*\?\~\^\&\:\(\)\[\]\{\}\^\"\\]/;
-  var isOperatorChar = /[\|\!\+\-\*\?\~\^\&]/;
-  var isOperatorString = /^(OR|AND|NOT|TO)$/i;
-
-  function isNumber(word) {
-    return parseFloat(word, 10).toString() === word;
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) break;
-        escaped = !escaped && next == "\\";
-      }
-
-      if (!escaped) state.tokenize = tokenBase;
-      return "string";
-    };
-  }
-
-  function tokenOperator(operator) {
-    return function(stream, state) {
-      var style = "operator";
-      if (operator == "+")
-        style += " positive";
-      else if (operator == "-")
-        style += " negative";
-      else if (operator == "|")
-        stream.eat(/\|/);
-      else if (operator == "&")
-        stream.eat(/\&/);
-      else if (operator == "^")
-        style += " boost";
-
-      state.tokenize = tokenBase;
-      return style;
-    };
-  }
-
-  function tokenWord(ch) {
-    return function(stream, state) {
-      var word = ch;
-      while ((ch = stream.peek()) && ch.match(isStringChar) != null) {
-        word += stream.next();
-      }
-
-      state.tokenize = tokenBase;
-      if (isOperatorString.test(word))
-        return "operator";
-      else if (isNumber(word))
-        return "number";
-      else if (stream.peek() == ":")
-        return "field";
-      else
-        return "string";
-    };
-  }
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"')
-      state.tokenize = tokenString(ch);
-    else if (isOperatorChar.test(ch))
-      state.tokenize = tokenOperator(ch);
-    else if (isStringChar.test(ch))
-      state.tokenize = tokenWord(ch);
-
-    return (state.tokenize != tokenBase) ? state.tokenize(stream, state) : null;
-  }
-
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      return state.tokenize(stream, state);
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-solr", "solr");
-
-});
diff --git a/www/code/codemirror-5.7/mode/soy/index.html b/www/code/codemirror-5.7/mode/soy/index.html
deleted file mode 100644
index f0216f097..000000000
--- a/www/code/codemirror-5.7/mode/soy/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-CodeMirror: Soy (Closure Template) mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Soy (Closure Template) mode
    
-
    
-
-    
-
-    
    A mode for Closure Templates (Soy).
    
-    
    MIME type defined: text/x-soy.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/soy/soy.js b/www/code/codemirror-5.7/mode/soy/soy.js
deleted file mode 100644
index 79bfc24df..000000000
--- a/www/code/codemirror-5.7/mode/soy/soy.js
+++ /dev/null
@@ -1,198 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../htmlmixed/htmlmixed"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  var indentingTags = ["template", "literal", "msg", "fallbackmsg", "let", "if", "elseif",
-                       "else", "switch", "case", "default", "foreach", "ifempty", "for",
-                       "call", "param", "deltemplate", "delcall", "log"];
-
-  CodeMirror.defineMode("soy", function(config) {
-    var textMode = CodeMirror.getMode(config, "text/plain");
-    var modes = {
-      html: CodeMirror.getMode(config, {name: "text/html", multilineTagIndentFactor: 2, multilineTagIndentPastTag: false}),
-      attributes: textMode,
-      text: textMode,
-      uri: textMode,
-      css: CodeMirror.getMode(config, "text/css"),
-      js: CodeMirror.getMode(config, {name: "text/javascript", statementIndent: 2 * config.indentUnit})
-    };
-
-    function last(array) {
-      return array[array.length - 1];
-    }
-
-    function tokenUntil(stream, state, untilRegExp) {
-      var oldString = stream.string;
-      var match = untilRegExp.exec(oldString.substr(stream.pos));
-      if (match) {
-        // We don't use backUp because it backs up just the position, not the state.
-        // This uses an undocumented API.
-        stream.string = oldString.substr(0, stream.pos + match.index);
-      }
-      var result = stream.hideFirstChars(state.indent, function() {
-        return state.localMode.token(stream, state.localState);
-      });
-      stream.string = oldString;
-      return result;
-    }
-
-    return {
-      startState: function() {
-        return {
-          kind: [],
-          kindTag: [],
-          soyState: [],
-          indent: 0,
-          localMode: modes.html,
-          localState: CodeMirror.startState(modes.html)
-        };
-      },
-
-      copyState: function(state) {
-        return {
-          tag: state.tag, // Last seen Soy tag.
-          kind: state.kind.concat([]), // Values of kind="" attributes.
-          kindTag: state.kindTag.concat([]), // Opened tags with kind="" attributes.
-          soyState: state.soyState.concat([]),
-          indent: state.indent, // Indentation of the following line.
-          localMode: state.localMode,
-          localState: CodeMirror.copyState(state.localMode, state.localState)
-        };
-      },
-
-      token: function(stream, state) {
-        var match;
-
-        switch (last(state.soyState)) {
-          case "comment":
-            if (stream.match(/^.*?\*\//)) {
-              state.soyState.pop();
-            } else {
-              stream.skipToEnd();
-            }
-            return "comment";
-
-          case "variable":
-            if (stream.match(/^}/)) {
-              state.indent -= 2 * config.indentUnit;
-              state.soyState.pop();
-              return "variable-2";
-            }
-            stream.next();
-            return null;
-
-          case "tag":
-            if (stream.match(/^\/?}/)) {
-              if (state.tag == "/template" || state.tag == "/deltemplate") state.indent = 0;
-              else state.indent -= (stream.current() == "/}" || indentingTags.indexOf(state.tag) == -1 ? 2 : 1) * config.indentUnit;
-              state.soyState.pop();
-              return "keyword";
-            } else if (stream.match(/^([\w?]+)(?==)/)) {
-              if (stream.current() == "kind" && (match = stream.match(/^="([^"]+)/, false))) {
-                var kind = match[1];
-                state.kind.push(kind);
-                state.kindTag.push(state.tag);
-                state.localMode = modes[kind] || modes.html;
-                state.localState = CodeMirror.startState(state.localMode);
-              }
-              return "attribute";
-            } else if (stream.match(/^"/)) {
-              state.soyState.push("string");
-              return "string";
-            }
-            stream.next();
-            return null;
-
-          case "literal":
-            if (stream.match(/^(?=\{\/literal})/)) {
-              state.indent -= config.indentUnit;
-              state.soyState.pop();
-              return this.token(stream, state);
-            }
-            return tokenUntil(stream, state, /\{\/literal}/);
-
-          case "string":
-            if (stream.match(/^.*?"/)) {
-              state.soyState.pop();
-            } else {
-              stream.skipToEnd();
-            }
-            return "string";
-        }
-
-        if (stream.match(/^\/\*/)) {
-          state.soyState.push("comment");
-          return "comment";
-        } else if (stream.match(stream.sol() ? /^\s*\/\/.*/ : /^\s+\/\/.*/)) {
-          return "comment";
-        } else if (stream.match(/^\{\$[\w?]*/)) {
-          state.indent += 2 * config.indentUnit;
-          state.soyState.push("variable");
-          return "variable-2";
-        } else if (stream.match(/^\{literal}/)) {
-          state.indent += config.indentUnit;
-          state.soyState.push("literal");
-          return "keyword";
-        } else if (match = stream.match(/^\{([\/@\\]?[\w?]*)/)) {
-          if (match[1] != "/switch")
-            state.indent += (/^(\/|(else|elseif|case|default)$)/.test(match[1]) && state.tag != "switch" ? 1 : 2) * config.indentUnit;
-          state.tag = match[1];
-          if (state.tag == "/" + last(state.kindTag)) {
-            // We found the tag that opened the current kind="".
-            state.kind.pop();
-            state.kindTag.pop();
-            state.localMode = modes[last(state.kind)] || modes.html;
-            state.localState = CodeMirror.startState(state.localMode);
-          }
-          state.soyState.push("tag");
-          return "keyword";
-        }
-
-        return tokenUntil(stream, state, /\{|\s+\/\/|\/\*/);
-      },
-
-      indent: function(state, textAfter) {
-        var indent = state.indent, top = last(state.soyState);
-        if (top == "comment") return CodeMirror.Pass;
-
-        if (top == "literal") {
-          if (/^\{\/literal}/.test(textAfter)) indent -= config.indentUnit;
-        } else {
-          if (/^\s*\{\/(template|deltemplate)\b/.test(textAfter)) return 0;
-          if (/^\{(\/|(fallbackmsg|elseif|else|ifempty)\b)/.test(textAfter)) indent -= config.indentUnit;
-          if (state.tag != "switch" && /^\{(case|default)\b/.test(textAfter)) indent -= config.indentUnit;
-          if (/^\{\/switch\b/.test(textAfter)) indent -= config.indentUnit;
-        }
-        if (indent && state.localMode.indent)
-          indent += state.localMode.indent(state.localState, textAfter);
-        return indent;
-      },
-
-      innerMode: function(state) {
-        if (state.soyState.length && last(state.soyState) != "literal") return null;
-        else return {state: state.localState, mode: state.localMode};
-      },
-
-      electricInput: /^\s*\{(\/|\/template|\/deltemplate|\/switch|fallbackmsg|elseif|else|case|default|ifempty|\/literal\})$/,
-      lineComment: "//",
-      blockCommentStart: "/*",
-      blockCommentEnd: "*/",
-      blockCommentContinue: " * ",
-      fold: "indent"
-    };
-  }, "htmlmixed");
-
-  CodeMirror.registerHelper("hintWords", "soy", indentingTags.concat(
-      ["delpackage", "namespace", "alias", "print", "css", "debugger"]));
-
-  CodeMirror.defineMIME("text/x-soy", "soy");
-});
diff --git a/www/code/codemirror-5.7/mode/sparql/index.html b/www/code/codemirror-5.7/mode/sparql/index.html
deleted file mode 100644
index 84ef4d363..000000000
--- a/www/code/codemirror-5.7/mode/sparql/index.html
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-CodeMirror: SPARQL mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    SPARQL mode
    
-
    
-    
-
-    
    MIME types defined: application/sparql-query.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/sparql/sparql.js b/www/code/codemirror-5.7/mode/sparql/sparql.js
deleted file mode 100644
index bbf8a76a0..000000000
--- a/www/code/codemirror-5.7/mode/sparql/sparql.js
+++ /dev/null
@@ -1,174 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("sparql", function(config) {
-  var indentUnit = config.indentUnit;
-  var curPunc;
-
-  function wordRegexp(words) {
-    return new RegExp("^(?:" + words.join("|") + ")$", "i");
-  }
-  var ops = wordRegexp(["str", "lang", "langmatches", "datatype", "bound", "sameterm", "isiri", "isuri",
-                        "iri", "uri", "bnode", "count", "sum", "min", "max", "avg", "sample",
-                        "group_concat", "rand", "abs", "ceil", "floor", "round", "concat", "substr", "strlen",
-                        "replace", "ucase", "lcase", "encode_for_uri", "contains", "strstarts", "strends",
-                        "strbefore", "strafter", "year", "month", "day", "hours", "minutes", "seconds",
-                        "timezone", "tz", "now", "uuid", "struuid", "md5", "sha1", "sha256", "sha384",
-                        "sha512", "coalesce", "if", "strlang", "strdt", "isnumeric", "regex", "exists",
-                        "isblank", "isliteral", "a"]);
-  var keywords = wordRegexp(["base", "prefix", "select", "distinct", "reduced", "construct", "describe",
-                             "ask", "from", "named", "where", "order", "limit", "offset", "filter", "optional",
-                             "graph", "by", "asc", "desc", "as", "having", "undef", "values", "group",
-                             "minus", "in", "not", "service", "silent", "using", "insert", "delete", "union",
-                             "true", "false", "with",
-                             "data", "copy", "to", "move", "add", "create", "drop", "clear", "load"]);
-  var operatorChars = /[*+\-<>=&|\^\/!\?]/;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    curPunc = null;
-    if (ch == "$" || ch == "?") {
-      if(ch == "?" && stream.match(/\s/, false)){
-        return "operator";
-      }
-      stream.match(/^[\w\d]*/);
-      return "variable-2";
-    }
-    else if (ch == "<" && !stream.match(/^[\s\u00a0=]/, false)) {
-      stream.match(/^[^\s\u00a0>]*>?/);
-      return "atom";
-    }
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenLiteral(ch);
-      return state.tokenize(stream, state);
-    }
-    else if (/[{}\(\),\.;\[\]]/.test(ch)) {
-      curPunc = ch;
-      return "bracket";
-    }
-    else if (ch == "#") {
-      stream.skipToEnd();
-      return "comment";
-    }
-    else if (operatorChars.test(ch)) {
-      stream.eatWhile(operatorChars);
-      return "operator";
-    }
-    else if (ch == ":") {
-      stream.eatWhile(/[\w\d\._\-]/);
-      return "atom";
-    }
-    else if (ch == "@") {
-      stream.eatWhile(/[a-z\d\-]/i);
-      return "meta";
-    }
-    else {
-      stream.eatWhile(/[_\w\d]/);
-      if (stream.eat(":")) {
-        stream.eatWhile(/[\w\d_\-]/);
-        return "atom";
-      }
-      var word = stream.current();
-      if (ops.test(word))
-        return "builtin";
-      else if (keywords.test(word))
-        return "keyword";
-      else
-        return "variable";
-    }
-  }
-
-  function tokenLiteral(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      return "string";
-    };
-  }
-
-  function pushContext(state, type, col) {
-    state.context = {prev: state.context, indent: state.indent, col: col, type: type};
-  }
-  function popContext(state) {
-    state.indent = state.context.indent;
-    state.context = state.context.prev;
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: tokenBase,
-              context: null,
-              indent: 0,
-              col: 0};
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (state.context && state.context.align == null) state.context.align = false;
-        state.indent = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-
-      if (style != "comment" && state.context && state.context.align == null && state.context.type != "pattern") {
-        state.context.align = true;
-      }
-
-      if (curPunc == "(") pushContext(state, ")", stream.column());
-      else if (curPunc == "[") pushContext(state, "]", stream.column());
-      else if (curPunc == "{") pushContext(state, "}", stream.column());
-      else if (/[\]\}\)]/.test(curPunc)) {
-        while (state.context && state.context.type == "pattern") popContext(state);
-        if (state.context && curPunc == state.context.type) popContext(state);
-      }
-      else if (curPunc == "." && state.context && state.context.type == "pattern") popContext(state);
-      else if (/atom|string|variable/.test(style) && state.context) {
-        if (/[\}\]]/.test(state.context.type))
-          pushContext(state, "pattern", stream.column());
-        else if (state.context.type == "pattern" && !state.context.align) {
-          state.context.align = true;
-          state.context.col = stream.column();
-        }
-      }
-
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var firstChar = textAfter && textAfter.charAt(0);
-      var context = state.context;
-      if (/[\]\}]/.test(firstChar))
-        while (context && context.type == "pattern") context = context.prev;
-
-      var closing = context && firstChar == context.type;
-      if (!context)
-        return 0;
-      else if (context.type == "pattern")
-        return context.col;
-      else if (context.align)
-        return context.col + (closing ? 0 : 1);
-      else
-        return context.indent + (closing ? 0 : indentUnit);
-    }
-  };
-});
-
-CodeMirror.defineMIME("application/sparql-query", "sparql");
-
-});
diff --git a/www/code/codemirror-5.7/mode/spreadsheet/index.html b/www/code/codemirror-5.7/mode/spreadsheet/index.html
deleted file mode 100644
index a52f76f05..000000000
--- a/www/code/codemirror-5.7/mode/spreadsheet/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-CodeMirror: Spreadsheet mode
-
-
-
-
-
-
-
-
-
-
-
    
-  
    Spreadsheet mode
    
-  
    
-
-  
-
-  
    MIME types defined: text/x-spreadsheet.
    
-  
-  
    The Spreadsheet Mode
    
-  
     Created by Robert Plummer
    
-
    
diff --git a/www/code/codemirror-5.7/mode/spreadsheet/spreadsheet.js b/www/code/codemirror-5.7/mode/spreadsheet/spreadsheet.js
deleted file mode 100644
index 6fab00fdd..000000000
--- a/www/code/codemirror-5.7/mode/spreadsheet/spreadsheet.js
+++ /dev/null
@@ -1,109 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("spreadsheet", function () {
-    return {
-      startState: function () {
-        return {
-          stringType: null,
-          stack: []
-        };
-      },
-      token: function (stream, state) {
-        if (!stream) return;
-
-        //check for state changes
-        if (state.stack.length === 0) {
-          //strings
-          if ((stream.peek() == '"') || (stream.peek() == "'")) {
-            state.stringType = stream.peek();
-            stream.next(); // Skip quote
-            state.stack.unshift("string");
-          }
-        }
-
-        //return state
-        //stack has
-        switch (state.stack[0]) {
-        case "string":
-          while (state.stack[0] === "string" && !stream.eol()) {
-            if (stream.peek() === state.stringType) {
-              stream.next(); // Skip quote
-              state.stack.shift(); // Clear flag
-            } else if (stream.peek() === "\\") {
-              stream.next();
-              stream.next();
-            } else {
-              stream.match(/^.[^\\\"\']*/);
-            }
-          }
-          return "string";
-
-        case "characterClass":
-          while (state.stack[0] === "characterClass" && !stream.eol()) {
-            if (!(stream.match(/^[^\]\\]+/) || stream.match(/^\\./)))
-              state.stack.shift();
-          }
-          return "operator";
-        }
-
-        var peek = stream.peek();
-
-        //no stack
-        switch (peek) {
-        case "[":
-          stream.next();
-          state.stack.unshift("characterClass");
-          return "bracket";
-        case ":":
-          stream.next();
-          return "operator";
-        case "\\":
-          if (stream.match(/\\[a-z]+/)) return "string-2";
-          else return null;
-        case ".":
-        case ",":
-        case ";":
-        case "*":
-        case "-":
-        case "+":
-        case "^":
-        case "<":
-        case "/":
-        case "=":
-          stream.next();
-          return "atom";
-        case "$":
-          stream.next();
-          return "builtin";
-        }
-
-        if (stream.match(/\d+/)) {
-          if (stream.match(/^\w+/)) return "error";
-          return "number";
-        } else if (stream.match(/^[a-zA-Z_]\w*/)) {
-          if (stream.match(/(?=[\(.])/, false)) return "keyword";
-          return "variable-2";
-        } else if (["[", "]", "(", ")", "{", "}"].indexOf(peek) != -1) {
-          stream.next();
-          return "bracket";
-        } else if (!stream.eatSpace()) {
-          stream.next();
-        }
-        return null;
-      }
-    };
-  });
-
-  CodeMirror.defineMIME("text/x-spreadsheet", "spreadsheet");
-});
diff --git a/www/code/codemirror-5.7/mode/sql/index.html b/www/code/codemirror-5.7/mode/sql/index.html
deleted file mode 100644
index a0d8d9e1b..000000000
--- a/www/code/codemirror-5.7/mode/sql/index.html
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-CodeMirror: SQL Mode for CodeMirror
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    SQL Mode for CodeMirror
    
-
    
-            
-            
    
-            
    MIME types defined: 
-            text/x-sql,
-            text/x-mysql,
-            text/x-mariadb,
-            text/x-cassandra,
-            text/x-plsql,
-            text/x-mssql,
-            text/x-hive.
-        
    
-
-
-
    
diff --git a/www/code/codemirror-5.7/mode/sql/sql.js b/www/code/codemirror-5.7/mode/sql/sql.js
deleted file mode 100644
index a90827715..000000000
--- a/www/code/codemirror-5.7/mode/sql/sql.js
+++ /dev/null
@@ -1,391 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("sql", function(config, parserConfig) {
-  "use strict";
-
-  var client         = parserConfig.client || {},
-      atoms          = parserConfig.atoms || {"false": true, "true": true, "null": true},
-      builtin        = parserConfig.builtin || {},
-      keywords       = parserConfig.keywords || {},
-      operatorChars  = parserConfig.operatorChars || /^[*+\-%<>!=&|~^]/,
-      support        = parserConfig.support || {},
-      hooks          = parserConfig.hooks || {},
-      dateSQL        = parserConfig.dateSQL || {"date" : true, "time" : true, "timestamp" : true};
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-
-    // call hooks from the mime type
-    if (hooks[ch]) {
-      var result = hooks[ch](stream, state);
-      if (result !== false) return result;
-    }
-
-    if (support.hexNumber == true &&
-      ((ch == "0" && stream.match(/^[xX][0-9a-fA-F]+/))
-      || (ch == "x" || ch == "X") && stream.match(/^'[0-9a-fA-F]+'/))) {
-      // hex
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/hexadecimal-literals.html
-      return "number";
-    } else if (support.binaryNumber == true &&
-      (((ch == "b" || ch == "B") && stream.match(/^'[01]+'/))
-      || (ch == "0" && stream.match(/^b[01]+/)))) {
-      // bitstring
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/bit-field-literals.html
-      return "number";
-    } else if (ch.charCodeAt(0) > 47 && ch.charCodeAt(0) < 58) {
-      // numbers
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/number-literals.html
-          stream.match(/^[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?/);
-      support.decimallessFloat == true && stream.eat('.');
-      return "number";
-    } else if (ch == "?" && (stream.eatSpace() || stream.eol() || stream.eat(";"))) {
-      // placeholders
-      return "variable-3";
-    } else if (ch == "'" || (ch == '"' && support.doubleQuote)) {
-      // strings
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
-      state.tokenize = tokenLiteral(ch);
-      return state.tokenize(stream, state);
-    } else if ((((support.nCharCast == true && (ch == "n" || ch == "N"))
-        || (support.charsetCast == true && ch == "_" && stream.match(/[a-z][a-z0-9]*/i)))
-        && (stream.peek() == "'" || stream.peek() == '"'))) {
-      // charset casting: _utf8'str', N'str', n'str'
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/string-literals.html
-      return "keyword";
-    } else if (/^[\(\),\;\[\]]/.test(ch)) {
-      // no highlightning
-      return null;
-    } else if (support.commentSlashSlash && ch == "/" && stream.eat("/")) {
-      // 1-line comment
-      stream.skipToEnd();
-      return "comment";
-    } else if ((support.commentHash && ch == "#")
-        || (ch == "-" && stream.eat("-") && (!support.commentSpaceRequired || stream.eat(" ")))) {
-      // 1-line comments
-      // ref: https://kb.askmonty.org/en/comment-syntax/
-      stream.skipToEnd();
-      return "comment";
-    } else if (ch == "/" && stream.eat("*")) {
-      // multi-line comments
-      // ref: https://kb.askmonty.org/en/comment-syntax/
-      state.tokenize = tokenComment;
-      return state.tokenize(stream, state);
-    } else if (ch == ".") {
-      // .1 for 0.1
-      if (support.zerolessFloat == true && stream.match(/^(?:\d+(?:e[+-]?\d+)?)/i)) {
-        return "number";
-      }
-      // .table_name (ODBC)
-      // // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
-      if (support.ODBCdotTable == true && stream.match(/^[a-zA-Z_]+/)) {
-        return "variable-2";
-      }
-    } else if (operatorChars.test(ch)) {
-      // operators
-      stream.eatWhile(operatorChars);
-      return null;
-    } else if (ch == '{' &&
-        (stream.match(/^( )*(d|D|t|T|ts|TS)( )*'[^']*'( )*}/) || stream.match(/^( )*(d|D|t|T|ts|TS)( )*"[^"]*"( )*}/))) {
-      // dates (weird ODBC syntax)
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
-      return "number";
-    } else {
-      stream.eatWhile(/^[_\w\d]/);
-      var word = stream.current().toLowerCase();
-      // dates (standard SQL syntax)
-      // ref: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-literals.html
-      if (dateSQL.hasOwnProperty(word) && (stream.match(/^( )+'[^']*'/) || stream.match(/^( )+"[^"]*"/)))
-        return "number";
-      if (atoms.hasOwnProperty(word)) return "atom";
-      if (builtin.hasOwnProperty(word)) return "builtin";
-      if (keywords.hasOwnProperty(word)) return "keyword";
-      if (client.hasOwnProperty(word)) return "string-2";
-      return null;
-    }
-  }
-
-  // 'string', with char specified in quote escaped by '\'
-  function tokenLiteral(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      return "string";
-    };
-  }
-  function tokenComment(stream, state) {
-    while (true) {
-      if (stream.skipTo("*")) {
-        stream.next();
-        if (stream.eat("/")) {
-          state.tokenize = tokenBase;
-          break;
-        }
-      } else {
-        stream.skipToEnd();
-        break;
-      }
-    }
-    return "comment";
-  }
-
-  function pushContext(stream, state, type) {
-    state.context = {
-      prev: state.context,
-      indent: stream.indentation(),
-      col: stream.column(),
-      type: type
-    };
-  }
-
-  function popContext(state) {
-    state.indent = state.context.indent;
-    state.context = state.context.prev;
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: tokenBase, context: null};
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (state.context && state.context.align == null)
-          state.context.align = false;
-      }
-      if (stream.eatSpace()) return null;
-
-      var style = state.tokenize(stream, state);
-      if (style == "comment") return style;
-
-      if (state.context && state.context.align == null)
-        state.context.align = true;
-
-      var tok = stream.current();
-      if (tok == "(")
-        pushContext(stream, state, ")");
-      else if (tok == "[")
-        pushContext(stream, state, "]");
-      else if (state.context && state.context.type == tok)
-        popContext(state);
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var cx = state.context;
-      if (!cx) return CodeMirror.Pass;
-      var closing = textAfter.charAt(0) == cx.type;
-      if (cx.align) return cx.col + (closing ? 0 : 1);
-      else return cx.indent + (closing ? 0 : config.indentUnit);
-    },
-
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: support.commentSlashSlash ? "//" : support.commentHash ? "#" : null
-  };
-});
-
-(function() {
-  "use strict";
-
-  // `identifier`
-  function hookIdentifier(stream) {
-    // MySQL/MariaDB identifiers
-    // ref: http://dev.mysql.com/doc/refman/5.6/en/identifier-qualifiers.html
-    var ch;
-    while ((ch = stream.next()) != null) {
-      if (ch == "`" && !stream.eat("`")) return "variable-2";
-    }
-    stream.backUp(stream.current().length - 1);
-    return stream.eatWhile(/\w/) ? "variable-2" : null;
-  }
-
-  // variable token
-  function hookVar(stream) {
-    // variables
-    // @@prefix.varName @varName
-    // varName can be quoted with ` or ' or "
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/user-variables.html
-    if (stream.eat("@")) {
-      stream.match(/^session\./);
-      stream.match(/^local\./);
-      stream.match(/^global\./);
-    }
-
-    if (stream.eat("'")) {
-      stream.match(/^.*'/);
-      return "variable-2";
-    } else if (stream.eat('"')) {
-      stream.match(/^.*"/);
-      return "variable-2";
-    } else if (stream.eat("`")) {
-      stream.match(/^.*`/);
-      return "variable-2";
-    } else if (stream.match(/^[0-9a-zA-Z$\.\_]+/)) {
-      return "variable-2";
-    }
-    return null;
-  };
-
-  // short client keyword token
-  function hookClient(stream) {
-    // \N means NULL
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/null-values.html
-    if (stream.eat("N")) {
-        return "atom";
-    }
-    // \g, etc
-    // ref: http://dev.mysql.com/doc/refman/5.5/en/mysql-commands.html
-    return stream.match(/^[a-zA-Z.#!?]/) ? "variable-2" : null;
-  }
-
-  // these keywords are used by all SQL dialects (however, a mode can still overwrite it)
-  var sqlKeywords = "alter and as asc between by count create delete desc distinct drop from group having in insert into is join like not on or order select set table union update values where ";
-
-  // turn a space-separated list into an array
-  function set(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  // A generic SQL Mode. It's not a standard, it just try to support what is generally supported
-  CodeMirror.defineMIME("text/x-sql", {
-    name: "sql",
-    keywords: set(sqlKeywords + "begin"),
-    builtin: set("bool boolean bit blob enum long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision real date datetime year unsigned signed decimal numeric"),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=]/,
-    dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
-  });
-
-  CodeMirror.defineMIME("text/x-mssql", {
-    name: "sql",
-    client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
-    keywords: set(sqlKeywords + "begin trigger proc view index for add constraint key primary foreign collate clustered nonclustered declare"),
-    builtin: set("bigint numeric bit smallint decimal smallmoney int tinyint money float real char varchar text nchar nvarchar ntext binary varbinary image cursor timestamp hierarchyid uniqueidentifier sql_variant xml table "),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=]/,
-    dateSQL: set("date datetimeoffset datetime2 smalldatetime datetime time"),
-    hooks: {
-      "@":   hookVar
-    }
-  });
-
-  CodeMirror.defineMIME("text/x-mysql", {
-    name: "sql",
-    client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
-    keywords: set(sqlKeywords + "accessible action add after algorithm all analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general get global grant grants group group_concat handler hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show signal slave slow smallint snapshot soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
-    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=&|^]/,
-    dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
-    hooks: {
-      "@":   hookVar,
-      "`":   hookIdentifier,
-      "\\":  hookClient
-    }
-  });
-
-  CodeMirror.defineMIME("text/x-mariadb", {
-    name: "sql",
-    client: set("charset clear connect edit ego exit go help nopager notee nowarning pager print prompt quit rehash source status system tee"),
-    keywords: set(sqlKeywords + "accessible action add after algorithm all always analyze asensitive at authors auto_increment autocommit avg avg_row_length before binary binlog both btree cache call cascade cascaded case catalog_name chain change changed character check checkpoint checksum class_origin client_statistics close coalesce code collate collation collations column columns comment commit committed completion concurrent condition connection consistent constraint contains continue contributors convert cross current current_date current_time current_timestamp current_user cursor data database databases day_hour day_microsecond day_minute day_second deallocate dec declare default delay_key_write delayed delimiter des_key_file describe deterministic dev_pop dev_samp deviance diagnostics directory disable discard distinctrow div dual dumpfile each elseif enable enclosed end ends engine engines enum errors escape escaped even event events every execute exists exit explain extended fast fetch field fields first flush for force foreign found_rows full fulltext function general generated get global grant grants group groupby_concat handler hard hash help high_priority hosts hour_microsecond hour_minute hour_second if ignore ignore_server_ids import index index_statistics infile inner innodb inout insensitive insert_method install interval invoker isolation iterate key keys kill language last leading leave left level limit linear lines list load local localtime localtimestamp lock logs low_priority master master_heartbeat_period master_ssl_verify_server_cert masters match max max_rows maxvalue message_text middleint migrate min min_rows minute_microsecond minute_second mod mode modifies modify mutex mysql_errno natural next no no_write_to_binlog offline offset one online open optimize option optionally out outer outfile pack_keys parser partition partitions password persistent phase plugin plugins prepare preserve prev primary privileges procedure processlist profile profiles purge query quick range read read_write reads real rebuild recover references regexp relaylog release remove rename reorganize repair repeatable replace require resignal restrict resume return returns revoke right rlike rollback rollup row row_format rtree savepoint schedule schema schema_name schemas second_microsecond security sensitive separator serializable server session share show shutdown signal slave slow smallint snapshot soft soname spatial specific sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sqlexception sqlstate sqlwarning ssl start starting starts status std stddev stddev_pop stddev_samp storage straight_join subclass_origin sum suspend table_name table_statistics tables tablespace temporary terminated to trailing transaction trigger triggers truncate uncommitted undo uninstall unique unlock upgrade usage use use_frm user user_resources user_statistics using utc_date utc_time utc_timestamp value variables varying view views virtual warnings when while with work write xa xor year_month zerofill begin do then else loop repeat"),
-    builtin: set("bool boolean bit blob decimal double float long longblob longtext medium mediumblob mediumint mediumtext time timestamp tinyblob tinyint tinytext text bigint int int1 int2 int3 int4 int8 integer float float4 float8 double char varbinary varchar varcharacter precision date datetime year unsigned signed numeric"),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=&|^]/,
-    dateSQL: set("date time timestamp"),
-    support: set("ODBCdotTable decimallessFloat zerolessFloat binaryNumber hexNumber doubleQuote nCharCast charsetCast commentHash commentSpaceRequired"),
-    hooks: {
-      "@":   hookVar,
-      "`":   hookIdentifier,
-      "\\":  hookClient
-    }
-  });
-
-  // the query language used by Apache Cassandra is called CQL, but this mime type
-  // is called Cassandra to avoid confusion with Contextual Query Language
-  CodeMirror.defineMIME("text/x-cassandra", {
-    name: "sql",
-    client: { },
-    keywords: set("add all allow alter and any apply as asc authorize batch begin by clustering columnfamily compact consistency count create custom delete desc distinct drop each_quorum exists filtering from grant if in index insert into key keyspace keyspaces level limit local_one local_quorum modify nan norecursive nosuperuser not of on one order password permission permissions primary quorum rename revoke schema select set storage superuser table three to token truncate ttl two type unlogged update use user users using values where with writetime"),
-    builtin: set("ascii bigint blob boolean counter decimal double float frozen inet int list map static text timestamp timeuuid tuple uuid varchar varint"),
-    atoms: set("false true infinity NaN"),
-    operatorChars: /^[<>=]/,
-    dateSQL: { },
-    support: set("commentSlashSlash decimallessFloat"),
-    hooks: { }
-  });
-
-  // this is based on Peter Raganitsch's 'plsql' mode
-  CodeMirror.defineMIME("text/x-plsql", {
-    name:       "sql",
-    client:     set("appinfo arraysize autocommit autoprint autorecovery autotrace blockterminator break btitle cmdsep colsep compatibility compute concat copycommit copytypecheck define describe echo editfile embedded escape exec execute feedback flagger flush heading headsep instance linesize lno loboffset logsource long longchunksize markup native newpage numformat numwidth pagesize pause pno recsep recsepchar release repfooter repheader serveroutput shiftinout show showmode size spool sqlblanklines sqlcase sqlcode sqlcontinue sqlnumber sqlpluscompatibility sqlprefix sqlprompt sqlterminator suffix tab term termout time timing trimout trimspool ttitle underline verify version wrap"),
-    keywords:   set("abort accept access add all alter and any array arraylen as asc assert assign at attributes audit authorization avg base_table begin between binary_integer body boolean by case cast char char_base check close cluster clusters colauth column comment commit compress connect connected constant constraint crash create current currval cursor data_base database date dba deallocate debugoff debugon decimal declare default definition delay delete desc digits dispose distinct do drop else elseif elsif enable end entry escape exception exception_init exchange exclusive exists exit external fast fetch file for force form from function generic goto grant group having identified if immediate in increment index indexes indicator initial initrans insert interface intersect into is key level library like limited local lock log logging long loop master maxextents maxtrans member minextents minus mislabel mode modify multiset new next no noaudit nocompress nologging noparallel not nowait number_base object of off offline on online only open option or order out package parallel partition pctfree pctincrease pctused pls_integer positive positiven pragma primary prior private privileges procedure public raise range raw read rebuild record ref references refresh release rename replace resource restrict return returning returns reverse revoke rollback row rowid rowlabel rownum rows run savepoint schema segment select separate session set share snapshot some space split sql start statement storage subtype successful synonym tabauth table tables tablespace task terminate then to trigger truncate type union unique unlimited unrecoverable unusable update use using validate value values variable view views when whenever where while with work"),
-    builtin:    set("abs acos add_months ascii asin atan atan2 average bfile bfilename bigserial bit blob ceil character chartorowid chr clob concat convert cos cosh count dec decode deref dual dump dup_val_on_index empty error exp false float floor found glb greatest hextoraw initcap instr instrb int integer isopen last_day least lenght lenghtb ln lower lpad ltrim lub make_ref max min mlslabel mod months_between natural naturaln nchar nclob new_time next_day nextval nls_charset_decl_len nls_charset_id nls_charset_name nls_initcap nls_lower nls_sort nls_upper nlssort no_data_found notfound null number numeric nvarchar2 nvl others power rawtohex real reftohex round rowcount rowidtochar rowtype rpad rtrim serial sign signtype sin sinh smallint soundex sqlcode sqlerrm sqrt stddev string substr substrb sum sysdate tan tanh to_char text to_date to_label to_multi_byte to_number to_single_byte translate true trunc uid unlogged upper user userenv varchar varchar2 variance varying vsize xml"),
-    operatorChars: /^[*+\-%<>!=~]/,
-    dateSQL:    set("date time timestamp"),
-    support:    set("doubleQuote nCharCast zerolessFloat binaryNumber hexNumber")
-  });
-
-  // Created to support specific hive keywords
-  CodeMirror.defineMIME("text/x-hive", {
-    name: "sql",
-    keywords: set("select alter $elem$ $key$ $value$ add after all analyze and archive as asc before between binary both bucket buckets by cascade case cast change cluster clustered clusterstatus collection column columns comment compute concatenate continue create cross cursor data database databases dbproperties deferred delete delimited desc describe directory disable distinct distribute drop else enable end escaped exclusive exists explain export extended external false fetch fields fileformat first format formatted from full function functions grant group having hold_ddltime idxproperties if import in index indexes inpath inputdriver inputformat insert intersect into is items join keys lateral left like limit lines load local location lock locks mapjoin materialized minus msck no_drop nocompress not of offline on option or order out outer outputdriver outputformat overwrite partition partitioned partitions percent plus preserve procedure purge range rcfile read readonly reads rebuild recordreader recordwriter recover reduce regexp rename repair replace restrict revoke right rlike row schema schemas semi sequencefile serde serdeproperties set shared show show_database sort sorted ssl statistics stored streamtable table tables tablesample tblproperties temporary terminated textfile then tmp to touch transform trigger true unarchive undo union uniquejoin unlock update use using utc utc_tmestamp view when where while with"),
-    builtin: set("bool boolean long timestamp tinyint smallint bigint int float double date datetime unsigned string array struct map uniontype"),
-    atoms: set("false true null unknown"),
-    operatorChars: /^[*+\-%<>!=]/,
-    dateSQL: set("date timestamp"),
-    support: set("ODBCdotTable doubleQuote binaryNumber hexNumber")
-  });
-}());
-
-});
-
-/*
-  How Properties of Mime Types are used by SQL Mode
-  =================================================
-
-  keywords:
-    A list of keywords you want to be highlighted.
-  builtin:
-    A list of builtin types you want to be highlighted (if you want types to be of class "builtin" instead of "keyword").
-  operatorChars:
-    All characters that must be handled as operators.
-  client:
-    Commands parsed and executed by the client (not the server).
-  support:
-    A list of supported syntaxes which are not common, but are supported by more than 1 DBMS.
-    * ODBCdotTable: .tableName
-    * zerolessFloat: .1
-    * doubleQuote
-    * nCharCast: N'string'
-    * charsetCast: _utf8'string'
-    * commentHash: use # char for comments
-    * commentSlashSlash: use // for comments
-    * commentSpaceRequired: require a space after -- for comments
-  atoms:
-    Keywords that must be highlighted as atoms,. Some DBMS's support more atoms than others:
-    UNKNOWN, INFINITY, UNDERFLOW, NaN...
-  dateSQL:
-    Used for date/time SQL standard syntax, because not all DBMS's support same temporal types.
-*/
diff --git a/www/code/codemirror-5.7/mode/stex/index.html b/www/code/codemirror-5.7/mode/stex/index.html
deleted file mode 100644
index 14679da4f..000000000
--- a/www/code/codemirror-5.7/mode/stex/index.html
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-CodeMirror: sTeX mode
-
-
-
-
-
-
-
-
-
-
    
-
    sTeX mode
    
-
    
-    
-
-    
    MIME types defined: text/x-stex.
    
-
-    
    Parsing/Highlighting Tests: normal,  verbose.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/stex/stex.js b/www/code/codemirror-5.7/mode/stex/stex.js
deleted file mode 100644
index 835ed46d1..000000000
--- a/www/code/codemirror-5.7/mode/stex/stex.js
+++ /dev/null
@@ -1,251 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/*
- * Author: Constantin Jucovschi (c.jucovschi@jacobs-university.de)
- * Licence: MIT
- */
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("stex", function() {
-    "use strict";
-
-    function pushCommand(state, command) {
-      state.cmdState.push(command);
-    }
-
-    function peekCommand(state) {
-      if (state.cmdState.length > 0) {
-        return state.cmdState[state.cmdState.length - 1];
-      } else {
-        return null;
-      }
-    }
-
-    function popCommand(state) {
-      var plug = state.cmdState.pop();
-      if (plug) {
-        plug.closeBracket();
-      }
-    }
-
-    // returns the non-default plugin closest to the end of the list
-    function getMostPowerful(state) {
-      var context = state.cmdState;
-      for (var i = context.length - 1; i >= 0; i--) {
-        var plug = context[i];
-        if (plug.name == "DEFAULT") {
-          continue;
-        }
-        return plug;
-      }
-      return { styleIdentifier: function() { return null; } };
-    }
-
-    function addPluginPattern(pluginName, cmdStyle, styles) {
-      return function () {
-        this.name = pluginName;
-        this.bracketNo = 0;
-        this.style = cmdStyle;
-        this.styles = styles;
-        this.argument = null;   // \begin and \end have arguments that follow. These are stored in the plugin
-
-        this.styleIdentifier = function() {
-          return this.styles[this.bracketNo - 1] || null;
-        };
-        this.openBracket = function() {
-          this.bracketNo++;
-          return "bracket";
-        };
-        this.closeBracket = function() {};
-      };
-    }
-
-    var plugins = {};
-
-    plugins["importmodule"] = addPluginPattern("importmodule", "tag", ["string", "builtin"]);
-    plugins["documentclass"] = addPluginPattern("documentclass", "tag", ["", "atom"]);
-    plugins["usepackage"] = addPluginPattern("usepackage", "tag", ["atom"]);
-    plugins["begin"] = addPluginPattern("begin", "tag", ["atom"]);
-    plugins["end"] = addPluginPattern("end", "tag", ["atom"]);
-
-    plugins["DEFAULT"] = function () {
-      this.name = "DEFAULT";
-      this.style = "tag";
-
-      this.styleIdentifier = this.openBracket = this.closeBracket = function() {};
-    };
-
-    function setState(state, f) {
-      state.f = f;
-    }
-
-    // called when in a normal (no environment) context
-    function normal(source, state) {
-      var plug;
-      // Do we look like '\command' ?  If so, attempt to apply the plugin 'command'
-      if (source.match(/^\\[a-zA-Z@]+/)) {
-        var cmdName = source.current().slice(1);
-        plug = plugins[cmdName] || plugins["DEFAULT"];
-        plug = new plug();
-        pushCommand(state, plug);
-        setState(state, beginParams);
-        return plug.style;
-      }
-
-      // escape characters
-      if (source.match(/^\\[$&%#{}_]/)) {
-        return "tag";
-      }
-
-      // white space control characters
-      if (source.match(/^\\[,;!\/\\]/)) {
-        return "tag";
-      }
-
-      // find if we're starting various math modes
-      if (source.match("\\[")) {
-        setState(state, function(source, state){ return inMathMode(source, state, "\\]"); });
-        return "keyword";
-      }
-      if (source.match("$$")) {
-        setState(state, function(source, state){ return inMathMode(source, state, "$$"); });
-        return "keyword";
-      }
-      if (source.match("$")) {
-        setState(state, function(source, state){ return inMathMode(source, state, "$"); });
-        return "keyword";
-      }
-
-      var ch = source.next();
-      if (ch == "%") {
-        source.skipToEnd();
-        return "comment";
-      } else if (ch == '}' || ch == ']') {
-        plug = peekCommand(state);
-        if (plug) {
-          plug.closeBracket(ch);
-          setState(state, beginParams);
-        } else {
-          return "error";
-        }
-        return "bracket";
-      } else if (ch == '{' || ch == '[') {
-        plug = plugins["DEFAULT"];
-        plug = new plug();
-        pushCommand(state, plug);
-        return "bracket";
-      } else if (/\d/.test(ch)) {
-        source.eatWhile(/[\w.%]/);
-        return "atom";
-      } else {
-        source.eatWhile(/[\w\-_]/);
-        plug = getMostPowerful(state);
-        if (plug.name == 'begin') {
-          plug.argument = source.current();
-        }
-        return plug.styleIdentifier();
-      }
-    }
-
-    function inMathMode(source, state, endModeSeq) {
-      if (source.eatSpace()) {
-        return null;
-      }
-      if (source.match(endModeSeq)) {
-        setState(state, normal);
-        return "keyword";
-      }
-      if (source.match(/^\\[a-zA-Z@]+/)) {
-        return "tag";
-      }
-      if (source.match(/^[a-zA-Z]+/)) {
-        return "variable-2";
-      }
-      // escape characters
-      if (source.match(/^\\[$&%#{}_]/)) {
-        return "tag";
-      }
-      // white space control characters
-      if (source.match(/^\\[,;!\/]/)) {
-        return "tag";
-      }
-      // special math-mode characters
-      if (source.match(/^[\^_&]/)) {
-        return "tag";
-      }
-      // non-special characters
-      if (source.match(/^[+\-<>|=,\/@!*:;'"`~#?]/)) {
-        return null;
-      }
-      if (source.match(/^(\d+\.\d*|\d*\.\d+|\d+)/)) {
-        return "number";
-      }
-      var ch = source.next();
-      if (ch == "{" || ch == "}" || ch == "[" || ch == "]" || ch == "(" || ch == ")") {
-        return "bracket";
-      }
-
-      if (ch == "%") {
-        source.skipToEnd();
-        return "comment";
-      }
-      return "error";
-    }
-
-    function beginParams(source, state) {
-      var ch = source.peek(), lastPlug;
-      if (ch == '{' || ch == '[') {
-        lastPlug = peekCommand(state);
-        lastPlug.openBracket(ch);
-        source.eat(ch);
-        setState(state, normal);
-        return "bracket";
-      }
-      if (/[ \t\r]/.test(ch)) {
-        source.eat(ch);
-        return null;
-      }
-      setState(state, normal);
-      popCommand(state);
-
-      return normal(source, state);
-    }
-
-    return {
-      startState: function() {
-        return {
-          cmdState: [],
-          f: normal
-        };
-      },
-      copyState: function(s) {
-        return {
-          cmdState: s.cmdState.slice(),
-          f: s.f
-        };
-      },
-      token: function(stream, state) {
-        return state.f(stream, state);
-      },
-      blankLine: function(state) {
-        state.f = normal;
-        state.cmdState.length = 0;
-      },
-      lineComment: "%"
-    };
-  });
-
-  CodeMirror.defineMIME("text/x-stex", "stex");
-  CodeMirror.defineMIME("text/x-latex", "stex");
-
-});
diff --git a/www/code/codemirror-5.7/mode/stex/test.js b/www/code/codemirror-5.7/mode/stex/test.js
deleted file mode 100644
index 22f027ec7..000000000
--- a/www/code/codemirror-5.7/mode/stex/test.js
+++ /dev/null
@@ -1,123 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "stex");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("word",
-     "foo");
-
-  MT("twoWords",
-     "foo bar");
-
-  MT("beginEndDocument",
-     "[tag \\begin][bracket {][atom document][bracket }]",
-     "[tag \\end][bracket {][atom document][bracket }]");
-
-  MT("beginEndEquation",
-     "[tag \\begin][bracket {][atom equation][bracket }]",
-     "  E=mc^2",
-     "[tag \\end][bracket {][atom equation][bracket }]");
-
-  MT("beginModule",
-     "[tag \\begin][bracket {][atom module][bracket }[[]]]");
-
-  MT("beginModuleId",
-     "[tag \\begin][bracket {][atom module][bracket }[[]id=bbt-size[bracket ]]]");
-
-  MT("importModule",
-     "[tag \\importmodule][bracket [[][string b-b-t][bracket ]]{][builtin b-b-t][bracket }]");
-
-  MT("importModulePath",
-     "[tag \\importmodule][bracket [[][tag \\KWARCslides][bracket {][string dmath/en/cardinality][bracket }]]{][builtin card][bracket }]");
-
-  MT("psForPDF",
-     "[tag \\PSforPDF][bracket [[][atom 1][bracket ]]{]#1[bracket }]");
-
-  MT("comment",
-     "[comment % foo]");
-
-  MT("tagComment",
-     "[tag \\item][comment % bar]");
-
-  MT("commentTag",
-     " [comment % \\item]");
-
-  MT("commentLineBreak",
-     "[comment %]",
-     "foo");
-
-  MT("tagErrorCurly",
-     "[tag \\begin][error }][bracket {]");
-
-  MT("tagErrorSquare",
-     "[tag \\item][error ]]][bracket {]");
-
-  MT("commentCurly",
-     "[comment % }]");
-
-  MT("tagHash",
-     "the [tag \\#] key");
-
-  MT("tagNumber",
-     "a [tag \\$][atom 5] stetson");
-
-  MT("tagPercent",
-     "[atom 100][tag \\%] beef");
-
-  MT("tagAmpersand",
-     "L [tag \\&] N");
-
-  MT("tagUnderscore",
-     "foo[tag \\_]bar");
-
-  MT("tagBracketOpen",
-     "[tag \\emph][bracket {][tag \\{][bracket }]");
-
-  MT("tagBracketClose",
-     "[tag \\emph][bracket {][tag \\}][bracket }]");
-
-  MT("tagLetterNumber",
-     "section [tag \\S][atom 1]");
-
-  MT("textTagNumber",
-     "para [tag \\P][atom 2]");
-
-  MT("thinspace",
-     "x[tag \\,]y");
-
-  MT("thickspace",
-     "x[tag \\;]y");
-
-  MT("negativeThinspace",
-     "x[tag \\!]y");
-
-  MT("periodNotSentence",
-     "J.\\ L.\\ is");
-
-  MT("periodSentence",
-     "X[tag \\@]. The");
-
-  MT("italicCorrection",
-     "[bracket {][tag \\em] If[tag \\/][bracket }] I");
-
-  MT("tagBracket",
-     "[tag \\newcommand][bracket {][tag \\pop][bracket }]");
-
-  MT("inlineMathTagFollowedByNumber",
-     "[keyword $][tag \\pi][number 2][keyword $]");
-
-  MT("inlineMath",
-     "[keyword $][number 3][variable-2 x][tag ^][number 2.45]-[tag \\sqrt][bracket {][tag \\$\\alpha][bracket }] = [number 2][keyword $] other text");
-
-  MT("displayMath",
-     "More [keyword $$]\t[variable-2 S][tag ^][variable-2 n][tag \\sum] [variable-2 i][keyword $$] other text");
-
-  MT("mathWithComment",
-     "[keyword $][variable-2 x] [comment % $]",
-     "[variable-2 y][keyword $] other text");
-
-  MT("lineBreakArgument",
-    "[tag \\\\][bracket [[][atom 1cm][bracket ]]]");
-})();
diff --git a/www/code/codemirror-5.7/mode/stylus/index.html b/www/code/codemirror-5.7/mode/stylus/index.html
deleted file mode 100644
index 862c18f25..000000000
--- a/www/code/codemirror-5.7/mode/stylus/index.html
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-CodeMirror: Stylus mode
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Stylus mode
    
-
    
-
    
-
-
-
    MIME types defined: text/x-styl.
    
-
    Created by Dmitry Kiselyov
    
-
    
diff --git a/www/code/codemirror-5.7/mode/stylus/stylus.js b/www/code/codemirror-5.7/mode/stylus/stylus.js
deleted file mode 100644
index 662cd03c0..000000000
--- a/www/code/codemirror-5.7/mode/stylus/stylus.js
+++ /dev/null
@@ -1,769 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Stylus mode created by Dmitry Kiselyov http://git.io/AaRB
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("stylus", function(config) {
-    var indentUnit = config.indentUnit,
-        tagKeywords = keySet(tagKeywords_),
-        tagVariablesRegexp = /^(a|b|i|s|col|em)$/i,
-        propertyKeywords = keySet(propertyKeywords_),
-        nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_),
-        valueKeywords = keySet(valueKeywords_),
-        colorKeywords = keySet(colorKeywords_),
-        documentTypes = keySet(documentTypes_),
-        documentTypesRegexp = wordRegexp(documentTypes_),
-        mediaFeatures = keySet(mediaFeatures_),
-        mediaTypes = keySet(mediaTypes_),
-        fontProperties = keySet(fontProperties_),
-        operatorsRegexp = /^\s*([.]{2,3}|&&|\|\||\*\*|[?!=:]?=|[-+*\/%<>]=?|\?:|\~)/,
-        wordOperatorKeywordsRegexp = wordRegexp(wordOperatorKeywords_),
-        blockKeywords = keySet(blockKeywords_),
-        vendorPrefixesRegexp = new RegExp(/^\-(moz|ms|o|webkit)-/i),
-        commonAtoms = keySet(commonAtoms_),
-        firstWordMatch = "",
-        states = {},
-        ch,
-        style,
-        type,
-        override;
-
-    /**
-     * Tokenizers
-     */
-    function tokenBase(stream, state) {
-      firstWordMatch = stream.string.match(/(^[\w-]+\s*=\s*$)|(^\s*[\w-]+\s*=\s*[\w-])|(^\s*(\.|#|@|\$|\&|\[|\d|\+|::?|\{|\>|~|\/)?\s*[\w-]*([a-z0-9-]|\*|\/\*)(\(|,)?)/);
-      state.context.line.firstWord = firstWordMatch ? firstWordMatch[0].replace(/^\s*/, "") : "";
-      state.context.line.indent = stream.indentation();
-      ch = stream.peek();
-
-      // Line comment
-      if (stream.match("//")) {
-        stream.skipToEnd();
-        return ["comment", "comment"];
-      }
-      // Block comment
-      if (stream.match("/*")) {
-        state.tokenize = tokenCComment;
-        return tokenCComment(stream, state);
-      }
-      // String
-      if (ch == "\"" || ch == "'") {
-        stream.next();
-        state.tokenize = tokenString(ch);
-        return state.tokenize(stream, state);
-      }
-      // Def
-      if (ch == "@") {
-        stream.next();
-        stream.eatWhile(/[\w\\-]/);
-        return ["def", stream.current()];
-      }
-      // ID selector or Hex color
-      if (ch == "#") {
-        stream.next();
-        // Hex color
-        if (stream.match(/^[0-9a-f]{6}|[0-9a-f]{3}/i)) {
-          return ["atom", "atom"];
-        }
-        // ID selector
-        if (stream.match(/^[a-z][\w-]*/i)) {
-          return ["builtin", "hash"];
-        }
-      }
-      // Vendor prefixes
-      if (stream.match(vendorPrefixesRegexp)) {
-        return ["meta", "vendor-prefixes"];
-      }
-      // Numbers
-      if (stream.match(/^-?[0-9]?\.?[0-9]/)) {
-        stream.eatWhile(/[a-z%]/i);
-        return ["number", "unit"];
-      }
-      // !important|optional
-      if (ch == "!") {
-        stream.next();
-        return [stream.match(/^(important|optional)/i) ? "keyword": "operator", "important"];
-      }
-      // Class
-      if (ch == "." && stream.match(/^\.[a-z][\w-]*/i)) {
-        return ["qualifier", "qualifier"];
-      }
-      // url url-prefix domain regexp
-      if (stream.match(documentTypesRegexp)) {
-        if (stream.peek() == "(") state.tokenize = tokenParenthesized;
-        return ["property", "word"];
-      }
-      // Mixins / Functions
-      if (stream.match(/^[a-z][\w-]*\(/i)) {
-        stream.backUp(1);
-        return ["keyword", "mixin"];
-      }
-      // Block mixins
-      if (stream.match(/^(\+|-)[a-z][\w-]*\(/i)) {
-        stream.backUp(1);
-        return ["keyword", "block-mixin"];
-      }
-      // Parent Reference BEM naming
-      if (stream.string.match(/^\s*&/) && stream.match(/^[-_]+[a-z][\w-]*/)) {
-        return ["qualifier", "qualifier"];
-      }
-      // / Root Reference & Parent Reference
-      if (stream.match(/^(\/|&)(-|_|:|\.|#|[a-z])/)) {
-        stream.backUp(1);
-        return ["variable-3", "reference"];
-      }
-      if (stream.match(/^&{1}\s*$/)) {
-        return ["variable-3", "reference"];
-      }
-      // Word operator
-      if (stream.match(wordOperatorKeywordsRegexp)) {
-        return ["operator", "operator"];
-      }
-      // Word
-      if (stream.match(/^\$?[-_]*[a-z0-9]+[\w-]*/i)) {
-        // Variable
-        if (stream.match(/^(\.|\[)[\w-\'\"\]]+/i, false)) {
-          if (!wordIsTag(stream.current())) {
-            stream.match(/\./);
-            return ["variable-2", "variable-name"];
-          }
-        }
-        return ["variable-2", "word"];
-      }
-      // Operators
-      if (stream.match(operatorsRegexp)) {
-        return ["operator", stream.current()];
-      }
-      // Delimiters
-      if (/[:;,{}\[\]\(\)]/.test(ch)) {
-        stream.next();
-        return [null, ch];
-      }
-      // Non-detected items
-      stream.next();
-      return [null, null];
-    }
-
-    /**
-     * Token comment
-     */
-    function tokenCComment(stream, state) {
-      var maybeEnd = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (maybeEnd && ch == "/") {
-          state.tokenize = null;
-          break;
-        }
-        maybeEnd = (ch == "*");
-      }
-      return ["comment", "comment"];
-    }
-
-    /**
-     * Token string
-     */
-    function tokenString(quote) {
-      return function(stream, state) {
-        var escaped = false, ch;
-        while ((ch = stream.next()) != null) {
-          if (ch == quote && !escaped) {
-            if (quote == ")") stream.backUp(1);
-            break;
-          }
-          escaped = !escaped && ch == "\\";
-        }
-        if (ch == quote || !escaped && quote != ")") state.tokenize = null;
-        return ["string", "string"];
-      };
-    }
-
-    /**
-     * Token parenthesized
-     */
-    function tokenParenthesized(stream, state) {
-      stream.next(); // Must be "("
-      if (!stream.match(/\s*[\"\')]/, false))
-        state.tokenize = tokenString(")");
-      else
-        state.tokenize = null;
-      return [null, "("];
-    }
-
-    /**
-     * Context management
-     */
-    function Context(type, indent, prev, line) {
-      this.type = type;
-      this.indent = indent;
-      this.prev = prev;
-      this.line = line || {firstWord: "", indent: 0};
-    }
-
-    function pushContext(state, stream, type, indent) {
-      indent = indent >= 0 ? indent : indentUnit;
-      state.context = new Context(type, stream.indentation() + indent, state.context);
-      return type;
-    }
-
-    function popContext(state, currentIndent) {
-      var contextIndent = state.context.indent - indentUnit;
-      currentIndent = currentIndent || false;
-      state.context = state.context.prev;
-      if (currentIndent) state.context.indent = contextIndent;
-      return state.context.type;
-    }
-
-    function pass(type, stream, state) {
-      return states[state.context.type](type, stream, state);
-    }
-
-    function popAndPass(type, stream, state, n) {
-      for (var i = n || 1; i > 0; i--)
-        state.context = state.context.prev;
-      return pass(type, stream, state);
-    }
-
-
-    /**
-     * Parser
-     */
-    function wordIsTag(word) {
-      return word.toLowerCase() in tagKeywords;
-    }
-
-    function wordIsProperty(word) {
-      word = word.toLowerCase();
-      return word in propertyKeywords || word in fontProperties;
-    }
-
-    function wordIsBlock(word) {
-      return word.toLowerCase() in blockKeywords;
-    }
-
-    function wordIsVendorPrefix(word) {
-      return word.toLowerCase().match(vendorPrefixesRegexp);
-    }
-
-    function wordAsValue(word) {
-      var wordLC = word.toLowerCase();
-      var override = "variable-2";
-      if (wordIsTag(word)) override = "tag";
-      else if (wordIsBlock(word)) override = "block-keyword";
-      else if (wordIsProperty(word)) override = "property";
-      else if (wordLC in valueKeywords || wordLC in commonAtoms) override = "atom";
-      else if (wordLC == "return" || wordLC in colorKeywords) override = "keyword";
-
-      // Font family
-      else if (word.match(/^[A-Z]/)) override = "string";
-      return override;
-    }
-
-    function typeIsBlock(type, stream) {
-      return ((endOfLine(stream) && (type == "{" || type == "]" || type == "hash" || type == "qualifier")) || type == "block-mixin");
-    }
-
-    function typeIsInterpolation(type, stream) {
-      return type == "{" && stream.match(/^\s*\$?[\w-]+/i, false);
-    }
-
-    function typeIsPseudo(type, stream) {
-      return type == ":" && stream.match(/^[a-z-]+/, false);
-    }
-
-    function startOfLine(stream) {
-      return stream.sol() || stream.string.match(new RegExp("^\\s*" + escapeRegExp(stream.current())));
-    }
-
-    function endOfLine(stream) {
-      return stream.eol() || stream.match(/^\s*$/, false);
-    }
-
-    function firstWordOfLine(line) {
-      var re = /^\s*[-_]*[a-z0-9]+[\w-]*/i;
-      var result = typeof line == "string" ? line.match(re) : line.string.match(re);
-      return result ? result[0].replace(/^\s*/, "") : "";
-    }
-
-
-    /**
-     * Block
-     */
-    states.block = function(type, stream, state) {
-      if ((type == "comment" && startOfLine(stream)) ||
-          (type == "," && endOfLine(stream)) ||
-          type == "mixin") {
-        return pushContext(state, stream, "block", 0);
-      }
-      if (typeIsInterpolation(type, stream)) {
-        return pushContext(state, stream, "interpolation");
-      }
-      if (endOfLine(stream) && type == "]") {
-        if (!/^\s*(\.|#|:|\[|\*|&)/.test(stream.string) && !wordIsTag(firstWordOfLine(stream))) {
-          return pushContext(state, stream, "block", 0);
-        }
-      }
-      if (typeIsBlock(type, stream, state)) {
-        return pushContext(state, stream, "block");
-      }
-      if (type == "}" && endOfLine(stream)) {
-        return pushContext(state, stream, "block", 0);
-      }
-      if (type == "variable-name") {
-        if (stream.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/) || wordIsBlock(firstWordOfLine(stream))) {
-          return pushContext(state, stream, "variableName");
-        }
-        else {
-          return pushContext(state, stream, "variableName", 0);
-        }
-      }
-      if (type == "=") {
-        if (!endOfLine(stream) && !wordIsBlock(firstWordOfLine(stream))) {
-          return pushContext(state, stream, "block", 0);
-        }
-        return pushContext(state, stream, "block");
-      }
-      if (type == "*") {
-        if (endOfLine(stream) || stream.match(/\s*(,|\.|#|\[|:|{)/,false)) {
-          override = "tag";
-          return pushContext(state, stream, "block");
-        }
-      }
-      if (typeIsPseudo(type, stream)) {
-        return pushContext(state, stream, "pseudo");
-      }
-      if (/@(font-face|media|supports|(-moz-)?document)/.test(type)) {
-        return pushContext(state, stream, endOfLine(stream) ? "block" : "atBlock");
-      }
-      if (/@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
-        return pushContext(state, stream, "keyframes");
-      }
-      if (/@extends?/.test(type)) {
-        return pushContext(state, stream, "extend", 0);
-      }
-      if (type && type.charAt(0) == "@") {
-
-        // Property Lookup
-        if (stream.indentation() > 0 && wordIsProperty(stream.current().slice(1))) {
-          override = "variable-2";
-          return "block";
-        }
-        if (/(@import|@require|@charset)/.test(type)) {
-          return pushContext(state, stream, "block", 0);
-        }
-        return pushContext(state, stream, "block");
-      }
-      if (type == "reference" && endOfLine(stream)) {
-        return pushContext(state, stream, "block");
-      }
-      if (type == "(") {
-        return pushContext(state, stream, "parens");
-      }
-
-      if (type == "vendor-prefixes") {
-        return pushContext(state, stream, "vendorPrefixes");
-      }
-      if (type == "word") {
-        var word = stream.current();
-        override = wordAsValue(word);
-
-        if (override == "property") {
-          if (startOfLine(stream)) {
-            return pushContext(state, stream, "block", 0);
-          } else {
-            override = "atom";
-            return "block";
-          }
-        }
-
-        if (override == "tag") {
-
-          // tag is a css value
-          if (/embed|menu|pre|progress|sub|table/.test(word)) {
-            if (wordIsProperty(firstWordOfLine(stream))) {
-              override = "atom";
-              return "block";
-            }
-          }
-
-          // tag is an attribute
-          if (stream.string.match(new RegExp("\\[\\s*" + word + "|" + word +"\\s*\\]"))) {
-            override = "atom";
-            return "block";
-          }
-
-          // tag is a variable
-          if (tagVariablesRegexp.test(word)) {
-            if ((startOfLine(stream) && stream.string.match(/=/)) ||
-                (!startOfLine(stream) &&
-                 !stream.string.match(/^(\s*\.|#|\&|\[|\/|>|\*)/) &&
-                 !wordIsTag(firstWordOfLine(stream)))) {
-              override = "variable-2";
-              if (wordIsBlock(firstWordOfLine(stream)))  return "block";
-              return pushContext(state, stream, "block", 0);
-            }
-          }
-
-          if (endOfLine(stream)) return pushContext(state, stream, "block");
-        }
-        if (override == "block-keyword") {
-          override = "keyword";
-
-          // Postfix conditionals
-          if (stream.current(/(if|unless)/) && !startOfLine(stream)) {
-            return "block";
-          }
-          return pushContext(state, stream, "block");
-        }
-        if (word == "return") return pushContext(state, stream, "block", 0);
-
-        // Placeholder selector
-        if (override == "variable-2" && stream.string.match(/^\s?\$[\w-\.\[\]\'\"]+$/)) {
-          return pushContext(state, stream, "block");
-        }
-      }
-      return state.context.type;
-    };
-
-
-    /**
-     * Parens
-     */
-    states.parens = function(type, stream, state) {
-      if (type == "(") return pushContext(state, stream, "parens");
-      if (type == ")") {
-        if (state.context.prev.type == "parens") {
-          return popContext(state);
-        }
-        if ((stream.string.match(/^[a-z][\w-]*\(/i) && endOfLine(stream)) ||
-            wordIsBlock(firstWordOfLine(stream)) ||
-            /(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(firstWordOfLine(stream)) ||
-            (!stream.string.match(/^-?[a-z][\w-\.\[\]\'\"]*\s*=/) &&
-             wordIsTag(firstWordOfLine(stream)))) {
-          return pushContext(state, stream, "block");
-        }
-        if (stream.string.match(/^[\$-]?[a-z][\w-\.\[\]\'\"]*\s*=/) ||
-            stream.string.match(/^\s*(\(|\)|[0-9])/) ||
-            stream.string.match(/^\s+[a-z][\w-]*\(/i) ||
-            stream.string.match(/^\s+[\$-]?[a-z]/i)) {
-          return pushContext(state, stream, "block", 0);
-        }
-        if (endOfLine(stream)) return pushContext(state, stream, "block");
-        else return pushContext(state, stream, "block", 0);
-      }
-      if (type && type.charAt(0) == "@" && wordIsProperty(stream.current().slice(1))) {
-        override = "variable-2";
-      }
-      if (type == "word") {
-        var word = stream.current();
-        override = wordAsValue(word);
-        if (override == "tag" && tagVariablesRegexp.test(word)) {
-          override = "variable-2";
-        }
-        if (override == "property" || word == "to") override = "atom";
-      }
-      if (type == "variable-name") {
-        return pushContext(state, stream, "variableName");
-      }
-      if (typeIsPseudo(type, stream)) {
-        return pushContext(state, stream, "pseudo");
-      }
-      return state.context.type;
-    };
-
-
-    /**
-     * Vendor prefixes
-     */
-    states.vendorPrefixes = function(type, stream, state) {
-      if (type == "word") {
-        override = "property";
-        return pushContext(state, stream, "block", 0);
-      }
-      return popContext(state);
-    };
-
-
-    /**
-     * Pseudo
-     */
-    states.pseudo = function(type, stream, state) {
-      if (!wordIsProperty(firstWordOfLine(stream.string))) {
-        stream.match(/^[a-z-]+/);
-        override = "variable-3";
-        if (endOfLine(stream)) return pushContext(state, stream, "block");
-        return popContext(state);
-      }
-      return popAndPass(type, stream, state);
-    };
-
-
-    /**
-     * atBlock
-     */
-    states.atBlock = function(type, stream, state) {
-      if (type == "(") return pushContext(state, stream, "atBlock_parens");
-      if (typeIsBlock(type, stream, state)) {
-        return pushContext(state, stream, "block");
-      }
-      if (typeIsInterpolation(type, stream)) {
-        return pushContext(state, stream, "interpolation");
-      }
-      if (type == "word") {
-        var word = stream.current().toLowerCase();
-        if (/^(only|not|and|or)$/.test(word))
-          override = "keyword";
-        else if (documentTypes.hasOwnProperty(word))
-          override = "tag";
-        else if (mediaTypes.hasOwnProperty(word))
-          override = "attribute";
-        else if (mediaFeatures.hasOwnProperty(word))
-          override = "property";
-        else if (nonStandardPropertyKeywords.hasOwnProperty(word))
-          override = "string-2";
-        else override = wordAsValue(stream.current());
-        if (override == "tag" && endOfLine(stream)) {
-          return pushContext(state, stream, "block");
-        }
-      }
-      if (type == "operator" && /^(not|and|or)$/.test(stream.current())) {
-        override = "keyword";
-      }
-      return state.context.type;
-    };
-
-    states.atBlock_parens = function(type, stream, state) {
-      if (type == "{" || type == "}") return state.context.type;
-      if (type == ")") {
-        if (endOfLine(stream)) return pushContext(state, stream, "block");
-        else return pushContext(state, stream, "atBlock");
-      }
-      if (type == "word") {
-        var word = stream.current().toLowerCase();
-        override = wordAsValue(word);
-        if (/^(max|min)/.test(word)) override = "property";
-        if (override == "tag") {
-          tagVariablesRegexp.test(word) ? override = "variable-2" : override = "atom";
-        }
-        return state.context.type;
-      }
-      return states.atBlock(type, stream, state);
-    };
-
-
-    /**
-     * Keyframes
-     */
-    states.keyframes = function(type, stream, state) {
-      if (stream.indentation() == "0" && ((type == "}" && startOfLine(stream)) || type == "]" || type == "hash"
-                                          || type == "qualifier" || wordIsTag(stream.current()))) {
-        return popAndPass(type, stream, state);
-      }
-      if (type == "{") return pushContext(state, stream, "keyframes");
-      if (type == "}") {
-        if (startOfLine(stream)) return popContext(state, true);
-        else return pushContext(state, stream, "keyframes");
-      }
-      if (type == "unit" && /^[0-9]+\%$/.test(stream.current())) {
-        return pushContext(state, stream, "keyframes");
-      }
-      if (type == "word") {
-        override = wordAsValue(stream.current());
-        if (override == "block-keyword") {
-          override = "keyword";
-          return pushContext(state, stream, "keyframes");
-        }
-      }
-      if (/@(font-face|media|supports|(-moz-)?document)/.test(type)) {
-        return pushContext(state, stream, endOfLine(stream) ? "block" : "atBlock");
-      }
-      if (type == "mixin") {
-        return pushContext(state, stream, "block", 0);
-      }
-      return state.context.type;
-    };
-
-
-    /**
-     * Interpolation
-     */
-    states.interpolation = function(type, stream, state) {
-      if (type == "{") popContext(state) && pushContext(state, stream, "block");
-      if (type == "}") {
-        if (stream.string.match(/^\s*(\.|#|:|\[|\*|&|>|~|\+|\/)/i) ||
-            (stream.string.match(/^\s*[a-z]/i) && wordIsTag(firstWordOfLine(stream)))) {
-          return pushContext(state, stream, "block");
-        }
-        if (!stream.string.match(/^(\{|\s*\&)/) ||
-            stream.match(/\s*[\w-]/,false)) {
-          return pushContext(state, stream, "block", 0);
-        }
-        return pushContext(state, stream, "block");
-      }
-      if (type == "variable-name") {
-        return pushContext(state, stream, "variableName", 0);
-      }
-      if (type == "word") {
-        override = wordAsValue(stream.current());
-        if (override == "tag") override = "atom";
-      }
-      return state.context.type;
-    };
-
-
-    /**
-     * Extend/s
-     */
-    states.extend = function(type, stream, state) {
-      if (type == "[" || type == "=") return "extend";
-      if (type == "]") return popContext(state);
-      if (type == "word") {
-        override = wordAsValue(stream.current());
-        return "extend";
-      }
-      return popContext(state);
-    };
-
-
-    /**
-     * Variable name
-     */
-    states.variableName = function(type, stream, state) {
-      if (type == "string" || type == "[" || type == "]" || stream.current().match(/^(\.|\$)/)) {
-        if (stream.current().match(/^\.[\w-]+/i)) override = "variable-2";
-        return "variableName";
-      }
-      return popAndPass(type, stream, state);
-    };
-
-
-    return {
-      startState: function(base) {
-        return {
-          tokenize: null,
-          state: "block",
-          context: new Context("block", base || 0, null)
-        };
-      },
-      token: function(stream, state) {
-        if (!state.tokenize && stream.eatSpace()) return null;
-        style = (state.tokenize || tokenBase)(stream, state);
-        if (style && typeof style == "object") {
-          type = style[1];
-          style = style[0];
-        }
-        override = style;
-        state.state = states[state.state](type, stream, state);
-        return override;
-      },
-      indent: function(state, textAfter, line) {
-
-        var cx = state.context,
-            ch = textAfter && textAfter.charAt(0),
-            indent = cx.indent,
-            lineFirstWord = firstWordOfLine(textAfter),
-            lineIndent = line.length - line.replace(/^\s*/, "").length,
-            prevLineFirstWord = state.context.prev ? state.context.prev.line.firstWord : "",
-            prevLineIndent = state.context.prev ? state.context.prev.line.indent : lineIndent;
-
-        if (cx.prev &&
-            (ch == "}" && (cx.type == "block" || cx.type == "atBlock" || cx.type == "keyframes") ||
-             ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
-             ch == "{" && (cx.type == "at"))) {
-          indent = cx.indent - indentUnit;
-          cx = cx.prev;
-        } else if (!(/(\})/.test(ch))) {
-          if (/@|\$|\d/.test(ch) ||
-              /^\{/.test(textAfter) ||
-/^\s*\/(\/|\*)/.test(textAfter) ||
-              /^\s*\/\*/.test(prevLineFirstWord) ||
-              /^\s*[\w-\.\[\]\'\"]+\s*(\?|:|\+)?=/i.test(textAfter) ||
-/^(\+|-)?[a-z][\w-]*\(/i.test(textAfter) ||
-/^return/.test(textAfter) ||
-              wordIsBlock(lineFirstWord)) {
-            indent = lineIndent;
-          } else if (/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(ch) || wordIsTag(lineFirstWord)) {
-            if (/\,\s*$/.test(prevLineFirstWord)) {
-              indent = prevLineIndent;
-            } else if (/^\s+/.test(line) && (/(\.|#|:|\[|\*|&|>|~|\+|\/)/.test(prevLineFirstWord) || wordIsTag(prevLineFirstWord))) {
-              indent = lineIndent <= prevLineIndent ? prevLineIndent : prevLineIndent + indentUnit;
-            } else {
-              indent = lineIndent;
-            }
-          } else if (!/,\s*$/.test(line) && (wordIsVendorPrefix(lineFirstWord) || wordIsProperty(lineFirstWord))) {
-            if (wordIsBlock(prevLineFirstWord)) {
-              indent = lineIndent <= prevLineIndent ? prevLineIndent : prevLineIndent + indentUnit;
-            } else if (/^\{/.test(prevLineFirstWord)) {
-              indent = lineIndent <= prevLineIndent ? lineIndent : prevLineIndent + indentUnit;
-            } else if (wordIsVendorPrefix(prevLineFirstWord) || wordIsProperty(prevLineFirstWord)) {
-              indent = lineIndent >= prevLineIndent ? prevLineIndent : lineIndent;
-            } else if (/^(\.|#|:|\[|\*|&|@|\+|\-|>|~|\/)/.test(prevLineFirstWord) ||
-                      /=\s*$/.test(prevLineFirstWord) ||
-                      wordIsTag(prevLineFirstWord) ||
-                      /^\$[\w-\.\[\]\'\"]/.test(prevLineFirstWord)) {
-              indent = prevLineIndent + indentUnit;
-            } else {
-              indent = lineIndent;
-            }
-          }
-        }
-        return indent;
-      },
-      electricChars: "}",
-      lineComment: "//",
-      fold: "indent"
-    };
-  });
-
-  // developer.mozilla.org/en-US/docs/Web/HTML/Element
-  var tagKeywords_ = ["a","abbr","address","area","article","aside","audio", "b", "base","bdi", "bdo","bgsound","blockquote","body","br","button","canvas","caption","cite", "code","col","colgroup","data","datalist","dd","del","details","dfn","div", "dl","dt","em","embed","fieldset","figcaption","figure","footer","form","h1", "h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","iframe", "img","input","ins","kbd","keygen","label","legend","li","link","main","map", "mark","marquee","menu","menuitem","meta","meter","nav","nobr","noframes", "noscript","object","ol","optgroup","option","output","p","param","pre", "progress","q","rp","rt","ruby","s","samp","script","section","select", "small","source","span","strong","style","sub","summary","sup","table","tbody","td","textarea","tfoot","th","thead","time","tr","track", "u","ul","var","video"];
-
-  // github.com/codemirror/CodeMirror/blob/master/mode/css/css.js
-  var documentTypes_ = ["domain", "regexp", "url", "url-prefix"];
-  var mediaTypes_ = ["all","aural","braille","handheld","print","projection","screen","tty","tv","embossed"];
-  var mediaFeatures_ = ["width","min-width","max-width","height","min-height","max-height","device-width","min-device-width","max-device-width","device-height","min-device-height","max-device-height","aspect-ratio","min-aspect-ratio","max-aspect-ratio","device-aspect-ratio","min-device-aspect-ratio","max-device-aspect-ratio","color","min-color","max-color","color-index","min-color-index","max-color-index","monochrome","min-monochrome","max-monochrome","resolution","min-resolution","max-resolution","scan","grid"];
-  var propertyKeywords_ = ["align-content","align-items","align-self","alignment-adjust","alignment-baseline","anchor-point","animation","animation-delay","animation-direction","animation-duration","animation-fill-mode","animation-iteration-count","animation-name","animation-play-state","animation-timing-function","appearance","azimuth","backface-visibility","background","background-attachment","background-clip","background-color","background-image","background-origin","background-position","background-repeat","background-size","baseline-shift","binding","bleed","bookmark-label","bookmark-level","bookmark-state","bookmark-target","border","border-bottom","border-bottom-color","border-bottom-left-radius","border-bottom-right-radius","border-bottom-style","border-bottom-width","border-collapse","border-color","border-image","border-image-outset","border-image-repeat","border-image-slice","border-image-source","border-image-width","border-left","border-left-color","border-left-style","border-left-width","border-radius","border-right","border-right-color","border-right-style","border-right-width","border-spacing","border-style","border-top","border-top-color","border-top-left-radius","border-top-right-radius","border-top-style","border-top-width","border-width","bottom","box-decoration-break","box-shadow","box-sizing","break-after","break-before","break-inside","caption-side","clear","clip","color","color-profile","column-count","column-fill","column-gap","column-rule","column-rule-color","column-rule-style","column-rule-width","column-span","column-width","columns","content","counter-increment","counter-reset","crop","cue","cue-after","cue-before","cursor","direction","display","dominant-baseline","drop-initial-after-adjust","drop-initial-after-align","drop-initial-before-adjust","drop-initial-before-align","drop-initial-size","drop-initial-value","elevation","empty-cells","fit","fit-position","flex","flex-basis","flex-direction","flex-flow","flex-grow","flex-shrink","flex-wrap","float","float-offset","flow-from","flow-into","font","font-feature-settings","font-family","font-kerning","font-language-override","font-size","font-size-adjust","font-stretch","font-style","font-synthesis","font-variant","font-variant-alternates","font-variant-caps","font-variant-east-asian","font-variant-ligatures","font-variant-numeric","font-variant-position","font-weight","grid","grid-area","grid-auto-columns","grid-auto-flow","grid-auto-position","grid-auto-rows","grid-column","grid-column-end","grid-column-start","grid-row","grid-row-end","grid-row-start","grid-template","grid-template-areas","grid-template-columns","grid-template-rows","hanging-punctuation","height","hyphens","icon","image-orientation","image-rendering","image-resolution","inline-box-align","justify-content","left","letter-spacing","line-break","line-height","line-stacking","line-stacking-ruby","line-stacking-shift","line-stacking-strategy","list-style","list-style-image","list-style-position","list-style-type","margin","margin-bottom","margin-left","margin-right","margin-top","marker-offset","marks","marquee-direction","marquee-loop","marquee-play-count","marquee-speed","marquee-style","max-height","max-width","min-height","min-width","move-to","nav-down","nav-index","nav-left","nav-right","nav-up","object-fit","object-position","opacity","order","orphans","outline","outline-color","outline-offset","outline-style","outline-width","overflow","overflow-style","overflow-wrap","overflow-x","overflow-y","padding","padding-bottom","padding-left","padding-right","padding-top","page","page-break-after","page-break-before","page-break-inside","page-policy","pause","pause-after","pause-before","perspective","perspective-origin","pitch","pitch-range","play-during","position","presentation-level","punctuation-trim","quotes","region-break-after","region-break-before","region-break-inside","region-fragment","rendering-intent","resize","rest","rest-after","rest-before","richness","right","rotation","rotation-point","ruby-align","ruby-overhang","ruby-position","ruby-span","shape-image-threshold","shape-inside","shape-margin","shape-outside","size","speak","speak-as","speak-header","speak-numeral","speak-punctuation","speech-rate","stress","string-set","tab-size","table-layout","target","target-name","target-new","target-position","text-align","text-align-last","text-decoration","text-decoration-color","text-decoration-line","text-decoration-skip","text-decoration-style","text-emphasis","text-emphasis-color","text-emphasis-position","text-emphasis-style","text-height","text-indent","text-justify","text-outline","text-overflow","text-shadow","text-size-adjust","text-space-collapse","text-transform","text-underline-position","text-wrap","top","transform","transform-origin","transform-style","transition","transition-delay","transition-duration","transition-property","transition-timing-function","unicode-bidi","vertical-align","visibility","voice-balance","voice-duration","voice-family","voice-pitch","voice-range","voice-rate","voice-stress","voice-volume","volume","white-space","widows","width","word-break","word-spacing","word-wrap","z-index","clip-path","clip-rule","mask","enable-background","filter","flood-color","flood-opacity","lighting-color","stop-color","stop-opacity","pointer-events","color-interpolation","color-interpolation-filters","color-rendering","fill","fill-opacity","fill-rule","image-rendering","marker","marker-end","marker-mid","marker-start","shape-rendering","stroke","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke-width","text-rendering","baseline-shift","dominant-baseline","glyph-orientation-horizontal","glyph-orientation-vertical","text-anchor","writing-mode","font-smoothing","osx-font-smoothing"];
-  var nonStandardPropertyKeywords_ = ["scrollbar-arrow-color","scrollbar-base-color","scrollbar-dark-shadow-color","scrollbar-face-color","scrollbar-highlight-color","scrollbar-shadow-color","scrollbar-3d-light-color","scrollbar-track-color","shape-inside","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","zoom"];
-  var fontProperties_ = ["font-family","src","unicode-range","font-variant","font-feature-settings","font-stretch","font-weight","font-style"];
-  var colorKeywords_ = ["aliceblue","antiquewhite","aqua","aquamarine","azure","beige","bisque","black","blanchedalmond","blue","blueviolet","brown","burlywood","cadetblue","chartreuse","chocolate","coral","cornflowerblue","cornsilk","crimson","cyan","darkblue","darkcyan","darkgoldenrod","darkgray","darkgreen","darkkhaki","darkmagenta","darkolivegreen","darkorange","darkorchid","darkred","darksalmon","darkseagreen","darkslateblue","darkslategray","darkturquoise","darkviolet","deeppink","deepskyblue","dimgray","dodgerblue","firebrick","floralwhite","forestgreen","fuchsia","gainsboro","ghostwhite","gold","goldenrod","gray","grey","green","greenyellow","honeydew","hotpink","indianred","indigo","ivory","khaki","lavender","lavenderblush","lawngreen","lemonchiffon","lightblue","lightcoral","lightcyan","lightgoldenrodyellow","lightgray","lightgreen","lightpink","lightsalmon","lightseagreen","lightskyblue","lightslategray","lightsteelblue","lightyellow","lime","limegreen","linen","magenta","maroon","mediumaquamarine","mediumblue","mediumorchid","mediumpurple","mediumseagreen","mediumslateblue","mediumspringgreen","mediumturquoise","mediumvioletred","midnightblue","mintcream","mistyrose","moccasin","navajowhite","navy","oldlace","olive","olivedrab","orange","orangered","orchid","palegoldenrod","palegreen","paleturquoise","palevioletred","papayawhip","peachpuff","peru","pink","plum","powderblue","purple","rebeccapurple","red","rosybrown","royalblue","saddlebrown","salmon","sandybrown","seagreen","seashell","sienna","silver","skyblue","slateblue","slategray","snow","springgreen","steelblue","tan","teal","thistle","tomato","turquoise","violet","wheat","white","whitesmoke","yellow","yellowgreen"];
-  var valueKeywords_ = ["above","absolute","activeborder","additive","activecaption","afar","after-white-space","ahead","alias","all","all-scroll","alphabetic","alternate","always","amharic","amharic-abegede","antialiased","appworkspace","arabic-indic","armenian","asterisks","attr","auto","avoid","avoid-column","avoid-page","avoid-region","background","backwards","baseline","below","bidi-override","binary","bengali","blink","block","block-axis","bold","bolder","border","border-box","both","bottom","break","break-all","break-word","bullets","button","button-bevel","buttonface","buttonhighlight","buttonshadow","buttontext","calc","cambodian","capitalize","caps-lock-indicator","caption","captiontext","caret","cell","center","checkbox","circle","cjk-decimal","cjk-earthly-branch","cjk-heavenly-stem","cjk-ideographic","clear","clip","close-quote","col-resize","collapse","column","compact","condensed","contain","content","content-box","context-menu","continuous","copy","counter","counters","cover","crop","cross","crosshair","currentcolor","cursive","cyclic","dashed","decimal","decimal-leading-zero","default","default-button","destination-atop","destination-in","destination-out","destination-over","devanagari","disc","discard","disclosure-closed","disclosure-open","document","dot-dash","dot-dot-dash","dotted","double","down","e-resize","ease","ease-in","ease-in-out","ease-out","element","ellipse","ellipsis","embed","end","ethiopic","ethiopic-abegede","ethiopic-abegede-am-et","ethiopic-abegede-gez","ethiopic-abegede-ti-er","ethiopic-abegede-ti-et","ethiopic-halehame-aa-er","ethiopic-halehame-aa-et","ethiopic-halehame-am-et","ethiopic-halehame-gez","ethiopic-halehame-om-et","ethiopic-halehame-sid-et","ethiopic-halehame-so-et","ethiopic-halehame-ti-er","ethiopic-halehame-ti-et","ethiopic-halehame-tig","ethiopic-numeric","ew-resize","expanded","extends","extra-condensed","extra-expanded","fantasy","fast","fill","fixed","flat","flex","footnotes","forwards","from","geometricPrecision","georgian","graytext","groove","gujarati","gurmukhi","hand","hangul","hangul-consonant","hebrew","help","hidden","hide","higher","highlight","highlighttext","hiragana","hiragana-iroha","horizontal","hsl","hsla","icon","ignore","inactiveborder","inactivecaption","inactivecaptiontext","infinite","infobackground","infotext","inherit","initial","inline","inline-axis","inline-block","inline-flex","inline-table","inset","inside","intrinsic","invert","italic","japanese-formal","japanese-informal","justify","kannada","katakana","katakana-iroha","keep-all","khmer","korean-hangul-formal","korean-hanja-formal","korean-hanja-informal","landscape","lao","large","larger","left","level","lighter","line-through","linear","linear-gradient","lines","list-item","listbox","listitem","local","logical","loud","lower","lower-alpha","lower-armenian","lower-greek","lower-hexadecimal","lower-latin","lower-norwegian","lower-roman","lowercase","ltr","malayalam","match","matrix","matrix3d","media-controls-background","media-current-time-display","media-fullscreen-button","media-mute-button","media-play-button","media-return-to-realtime-button","media-rewind-button","media-seek-back-button","media-seek-forward-button","media-slider","media-sliderthumb","media-time-remaining-display","media-volume-slider","media-volume-slider-container","media-volume-sliderthumb","medium","menu","menulist","menulist-button","menulist-text","menulist-textfield","menutext","message-box","middle","min-intrinsic","mix","mongolian","monospace","move","multiple","myanmar","n-resize","narrower","ne-resize","nesw-resize","no-close-quote","no-drop","no-open-quote","no-repeat","none","normal","not-allowed","nowrap","ns-resize","numbers","numeric","nw-resize","nwse-resize","oblique","octal","open-quote","optimizeLegibility","optimizeSpeed","oriya","oromo","outset","outside","outside-shape","overlay","overline","padding","padding-box","painted","page","paused","persian","perspective","plus-darker","plus-lighter","pointer","polygon","portrait","pre","pre-line","pre-wrap","preserve-3d","progress","push-button","radial-gradient","radio","read-only","read-write","read-write-plaintext-only","rectangle","region","relative","repeat","repeating-linear-gradient","repeating-radial-gradient","repeat-x","repeat-y","reset","reverse","rgb","rgba","ridge","right","rotate","rotate3d","rotateX","rotateY","rotateZ","round","row-resize","rtl","run-in","running","s-resize","sans-serif","scale","scale3d","scaleX","scaleY","scaleZ","scroll","scrollbar","se-resize","searchfield","searchfield-cancel-button","searchfield-decoration","searchfield-results-button","searchfield-results-decoration","semi-condensed","semi-expanded","separate","serif","show","sidama","simp-chinese-formal","simp-chinese-informal","single","skew","skewX","skewY","skip-white-space","slide","slider-horizontal","slider-vertical","sliderthumb-horizontal","sliderthumb-vertical","slow","small","small-caps","small-caption","smaller","solid","somali","source-atop","source-in","source-out","source-over","space","spell-out","square","square-button","start","static","status-bar","stretch","stroke","sub","subpixel-antialiased","super","sw-resize","symbolic","symbols","table","table-caption","table-cell","table-column","table-column-group","table-footer-group","table-header-group","table-row","table-row-group","tamil","telugu","text","text-bottom","text-top","textarea","textfield","thai","thick","thin","threeddarkshadow","threedface","threedhighlight","threedlightshadow","threedshadow","tibetan","tigre","tigrinya-er","tigrinya-er-abegede","tigrinya-et","tigrinya-et-abegede","to","top","trad-chinese-formal","trad-chinese-informal","translate","translate3d","translateX","translateY","translateZ","transparent","ultra-condensed","ultra-expanded","underline","up","upper-alpha","upper-armenian","upper-greek","upper-hexadecimal","upper-latin","upper-norwegian","upper-roman","uppercase","urdu","url","var","vertical","vertical-text","visible","visibleFill","visiblePainted","visibleStroke","visual","w-resize","wait","wave","wider","window","windowframe","windowtext","words","x-large","x-small","xor","xx-large","xx-small","bicubic","optimizespeed","grayscale","row","row-reverse","wrap","wrap-reverse","column-reverse","flex-start","flex-end","space-between","space-around"];
-
-  var wordOperatorKeywords_ = ["in","and","or","not","is not","is a","is","isnt","defined","if unless"],
-      blockKeywords_ = ["for","if","else","unless", "from", "to"],
-      commonAtoms_ = ["null","true","false","href","title","type","not-allowed","readonly","disabled"],
-      commonDef_ = ["@font-face", "@keyframes", "@media", "@viewport", "@page", "@host", "@supports", "@block", "@css"];
-
-  var hintWords = tagKeywords_.concat(documentTypes_,mediaTypes_,mediaFeatures_,
-                                      propertyKeywords_,nonStandardPropertyKeywords_,
-                                      colorKeywords_,valueKeywords_,fontProperties_,
-                                      wordOperatorKeywords_,blockKeywords_,
-                                      commonAtoms_,commonDef_);
-
-  function wordRegexp(words) {
-    words = words.sort(function(a,b){return b > a;});
-    return new RegExp("^((" + words.join(")|(") + "))\\b");
-  }
-
-  function keySet(array) {
-    var keys = {};
-    for (var i = 0; i < array.length; ++i) keys[array[i]] = true;
-    return keys;
-  }
-
-  function escapeRegExp(text) {
-    return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-  }
-
-  CodeMirror.registerHelper("hintWords", "stylus", hintWords);
-  CodeMirror.defineMIME("text/x-styl", "stylus");
-});
diff --git a/www/code/codemirror-5.7/mode/swift/index.html b/www/code/codemirror-5.7/mode/swift/index.html
deleted file mode 100644
index 2649dc37c..000000000
--- a/www/code/codemirror-5.7/mode/swift/index.html
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-CodeMirror: Swift mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Swift mode
    
-
    
-
-    
-
-    
    A simple mode for Swift
    
-
-    
    MIME types defined: text/x-swift (Swift code)
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/swift/swift.js b/www/code/codemirror-5.7/mode/swift/swift.js
deleted file mode 100644
index cf784feff..000000000
--- a/www/code/codemirror-5.7/mode/swift/swift.js
+++ /dev/null
@@ -1,203 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Swift mode created by Michael Kaminsky https://github.com/mkaminsky11
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object")
-    mod(require("../../lib/codemirror"))
-  else if (typeof define == "function" && define.amd)
-    define(["../../lib/codemirror"], mod)
-  else
-    mod(CodeMirror)
-})(function(CodeMirror) {
-  "use strict"
-
-  function trim(str) { return /^\s*(.*?)\s*$/.exec(str)[1] }
-
-  var separators = [" ","\\\+","\\\-","\\\(","\\\)","\\\*","/",":","\\\?","\\\<","\\\>"," ","\\\."]
-  var tokens = new RegExp(separators.join("|"),"g")
-
-  function getWord(string, pos) {
-    var index = -1, count = 1
-    var words = string.split(tokens)
-    for (var i = 0; i < words.length; i++) {
-      for(var j = 1; j <= words[i].length; j++) {
-        if (count==pos) index = i
-        count++
-      }
-      count++
-    }
-    var ret = ["", ""]
-    if (pos == 0) {
-      ret[1] = words[0]
-      ret[0] = null
-    } else {
-      ret[1] = words[index]
-      ret[0] = words[index-1]
-    }
-    return ret
-  }
-
-  CodeMirror.defineMode("swift", function() {
-    var keywords=["var","let","class","deinit","enum","extension","func","import","init","let","protocol","static","struct","subscript","typealias","var","as","dynamicType","is","new","super","self","Self","Type","__COLUMN__","__FILE__","__FUNCTION__","__LINE__","break","case","continue","default","do","else","fallthrough","if","in","for","return","switch","where","while","associativity","didSet","get","infix","inout","left","mutating","none","nonmutating","operator","override","postfix","precedence","prefix","right","set","unowned","unowned(safe)","unowned(unsafe)","weak","willSet"]
-    var commonConstants=["Infinity","NaN","undefined","null","true","false","on","off","yes","no","nil","null","this","super"]
-    var types=["String","bool","int","string","double","Double","Int","Float","float","public","private","extension"]
-    var numbers=["0","1","2","3","4","5","6","7","8","9"]
-    var operators=["+","-","/","*","%","=","|","&","<",">"]
-    var punc=[";",",",".","(",")","{","}","[","]"]
-    var delimiters=/^(?:[()\[\]{},:`=;]|\.\.?\.?)/
-    var identifiers=/^[_A-Za-z$][_A-Za-z$0-9]*/
-    var properties=/^(@|this\.)[_A-Za-z$][_A-Za-z$0-9]*/
-    var regexPrefixes=/^(\/{3}|\/)/
-
-    return {
-      startState: function() {
-        return {
-          prev: false,
-          string: false,
-          escape: false,
-          inner: false,
-          comment: false,
-          num_left: 0,
-          num_right: 0,
-          doubleString: false,
-          singleString: false
-        }
-      },
-      token: function(stream, state) {
-        if (stream.eatSpace()) return null
-
-        var ch = stream.next()
-        if (state.string) {
-          if (state.escape) {
-            state.escape = false
-            return "string"
-          } else {
-            if ((ch == "\"" && (state.doubleString && !state.singleString) ||
-                 (ch == "'" && (!state.doubleString && state.singleString))) &&
-                !state.escape) {
-              state.string = false
-              state.doubleString = false
-              state.singleString = false
-              return "string"
-            } else if (ch == "\\" && stream.peek() == "(") {
-              state.inner = true
-              state.string = false
-              return "keyword"
-            } else if (ch == "\\" && stream.peek() != "(") {
-              state.escape = true
-              state.string = true
-              return "string"
-            } else {
-              return "string"
-            }
-          }
-        } else if (state.comment) {
-          if (ch == "*" && stream.peek() == "/") {
-            state.prev = "*"
-            return "comment"
-          } else if (ch == "/" && state.prev == "*") {
-            state.prev = false
-            state.comment = false
-            return "comment"
-          }
-          return "comment"
-        } else {
-          if (ch == "/") {
-            if (stream.peek() == "/") {
-              stream.skipToEnd()
-              return "comment"
-            }
-            if (stream.peek() == "*") {
-              state.comment = true
-              return "comment"
-            }
-          }
-          if (ch == "(" && state.inner) {
-            state.num_left++
-            return null
-          }
-          if (ch == ")" && state.inner) {
-            state.num_right++
-            if (state.num_left == state.num_right) {
-              state.inner=false
-              state.string=true
-            }
-            return null
-          }
-
-          var ret = getWord(stream.string, stream.pos)
-          var the_word = ret[1]
-          var prev_word = ret[0]
-
-          if (operators.indexOf(ch + "") > -1) return "operator"
-          if (punc.indexOf(ch) > -1) return "punctuation"
-
-          if (typeof the_word != "undefined") {
-            the_word = trim(the_word)
-            if (typeof prev_word != "undefined") prev_word = trim(prev_word)
-            if (the_word.charAt(0) == "#") return null
-
-            if (types.indexOf(the_word) > -1) return "def"
-            if (commonConstants.indexOf(the_word) > -1) return "atom"
-            if (numbers.indexOf(the_word) > -1) return "number"
-
-            if ((numbers.indexOf(the_word.charAt(0) + "") > -1 ||
-                 operators.indexOf(the_word.charAt(0) + "") > -1) &&
-                numbers.indexOf(ch) > -1) {
-              return "number"
-            }
-
-            if (keywords.indexOf(the_word) > -1 ||
-                keywords.indexOf(the_word.split(tokens)[0]) > -1)
-              return "keyword"
-            if (keywords.indexOf(prev_word) > -1) return "def"
-          }
-          if (ch == '"' && !state.doubleString) {
-            state.string = true
-            state.doubleString = true
-            return "string"
-          }
-          if (ch == "'" && !state.singleString) {
-            state.string = true
-            state.singleString = true
-            return "string"
-          }
-          if (ch == "(" && state.inner)
-            state.num_left++
-          if (ch == ")" && state.inner) {
-            state.num_right++
-            if (state.num_left == state.num_right) {
-              state.inner = false
-              state.string = true
-            }
-            return null
-          }
-          if (stream.match(/^-?[0-9\.]/, false)) {
-            if (stream.match(/^-?\d*\.\d+(e[\+\-]?\d+)?/i) ||
-                stream.match(/^-?\d+\.\d*/) ||
-                stream.match(/^-?\.\d+/)) {
-              if (stream.peek() == ".") stream.backUp(1)
-              return "number"
-            }
-            if (stream.match(/^-?0x[0-9a-f]+/i) ||
-                stream.match(/^-?[1-9]\d*(e[\+\-]?\d+)?/) ||
-                stream.match(/^-?0(?![\dx])/i))
-              return "number"
-          }
-          if (stream.match(regexPrefixes)) {
-            if (stream.current()!="/" || stream.match(/^.*\//,false)) return "string"
-            else stream.backUp(1)
-          }
-          if (stream.match(delimiters)) return "punctuation"
-          if (stream.match(identifiers)) return "variable"
-          if (stream.match(properties)) return "property"
-          return "variable"
-        }
-      }
-    }
-  })
-
-  CodeMirror.defineMIME("text/x-swift","swift")
-})
diff --git a/www/code/codemirror-5.7/mode/tcl/index.html b/www/code/codemirror-5.7/mode/tcl/index.html
deleted file mode 100644
index ce4ad3423..000000000
--- a/www/code/codemirror-5.7/mode/tcl/index.html
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-CodeMirror: Tcl mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Tcl mode
    
-
    
-    
-
-    
    MIME types defined: text/x-tcl.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/tcl/tcl.js b/www/code/codemirror-5.7/mode/tcl/tcl.js
deleted file mode 100644
index 056accb2d..000000000
--- a/www/code/codemirror-5.7/mode/tcl/tcl.js
+++ /dev/null
@@ -1,147 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-//tcl mode by Ford_Lawnmower :: Based on Velocity mode by Steve O'Hara
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("tcl", function() {
-  function parseWords(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-  var keywords = parseWords("Tcl safe after append array auto_execok auto_import auto_load " +
-        "auto_mkindex auto_mkindex_old auto_qualify auto_reset bgerror " +
-        "binary break catch cd close concat continue dde eof encoding error " +
-        "eval exec exit expr fblocked fconfigure fcopy file fileevent filename " +
-        "filename flush for foreach format gets glob global history http if " +
-        "incr info interp join lappend lindex linsert list llength load lrange " +
-        "lreplace lsearch lset lsort memory msgcat namespace open package parray " +
-        "pid pkg::create pkg_mkIndex proc puts pwd re_syntax read regex regexp " +
-        "registry regsub rename resource return scan seek set socket source split " +
-        "string subst switch tcl_endOfWord tcl_findLibrary tcl_startOfNextWord " +
-        "tcl_wordBreakAfter tcl_startOfPreviousWord tcl_wordBreakBefore tcltest " +
-        "tclvars tell time trace unknown unset update uplevel upvar variable " +
-    "vwait");
-    var functions = parseWords("if elseif else and not or eq ne in ni for foreach while switch");
-    var isOperatorChar = /[+\-*&%=<>!?^\/\|]/;
-    function chain(stream, state, f) {
-      state.tokenize = f;
-      return f(stream, state);
-    }
-    function tokenBase(stream, state) {
-      var beforeParams = state.beforeParams;
-      state.beforeParams = false;
-      var ch = stream.next();
-      if ((ch == '"' || ch == "'") && state.inParams)
-        return chain(stream, state, tokenString(ch));
-      else if (/[\[\]{}\(\),;\.]/.test(ch)) {
-        if (ch == "(" && beforeParams) state.inParams = true;
-        else if (ch == ")") state.inParams = false;
-          return null;
-      }
-      else if (/\d/.test(ch)) {
-        stream.eatWhile(/[\w\.]/);
-        return "number";
-      }
-      else if (ch == "#" && stream.eat("*")) {
-        return chain(stream, state, tokenComment);
-      }
-      else if (ch == "#" && stream.match(/ *\[ *\[/)) {
-        return chain(stream, state, tokenUnparsed);
-      }
-      else if (ch == "#" && stream.eat("#")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      else if (ch == '"') {
-        stream.skipTo(/"/);
-        return "comment";
-      }
-      else if (ch == "$") {
-        stream.eatWhile(/[$_a-z0-9A-Z\.{:]/);
-        stream.eatWhile(/}/);
-        state.beforeParams = true;
-        return "builtin";
-      }
-      else if (isOperatorChar.test(ch)) {
-        stream.eatWhile(isOperatorChar);
-        return "comment";
-      }
-      else {
-        stream.eatWhile(/[\w\$_{}\xa1-\uffff]/);
-        var word = stream.current().toLowerCase();
-        if (keywords && keywords.propertyIsEnumerable(word))
-          return "keyword";
-        if (functions && functions.propertyIsEnumerable(word)) {
-          state.beforeParams = true;
-          return "keyword";
-        }
-        return null;
-      }
-    }
-    function tokenString(quote) {
-      return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {
-          end = true;
-          break;
-        }
-        escaped = !escaped && next == "\\";
-      }
-      if (end) state.tokenize = tokenBase;
-        return "string";
-      };
-    }
-    function tokenComment(stream, state) {
-      var maybeEnd = false, ch;
-      while (ch = stream.next()) {
-        if (ch == "#" && maybeEnd) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        maybeEnd = (ch == "*");
-      }
-      return "comment";
-    }
-    function tokenUnparsed(stream, state) {
-      var maybeEnd = 0, ch;
-      while (ch = stream.next()) {
-        if (ch == "#" && maybeEnd == 2) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        if (ch == "]")
-          maybeEnd++;
-        else if (ch != " ")
-          maybeEnd = 0;
-      }
-      return "meta";
-    }
-    return {
-      startState: function() {
-        return {
-          tokenize: tokenBase,
-          beforeParams: false,
-          inParams: false
-        };
-      },
-      token: function(stream, state) {
-        if (stream.eatSpace()) return null;
-        return state.tokenize(stream, state);
-      }
-    };
-});
-CodeMirror.defineMIME("text/x-tcl", "tcl");
-
-});
diff --git a/www/code/codemirror-5.7/mode/textile/index.html b/www/code/codemirror-5.7/mode/textile/index.html
deleted file mode 100644
index 42b156b1e..000000000
--- a/www/code/codemirror-5.7/mode/textile/index.html
+++ /dev/null
@@ -1,191 +0,0 @@
-
-
-CodeMirror: Textile mode
-
-
-
-
-
-
-
-
-
-
    
-    
    Textile mode
    
-    
    
-    
-
-    
    MIME types defined: text/x-textile.
    
-
-    
    Parsing/Highlighting Tests: normal,  verbose.
    
-
-
    
diff --git a/www/code/codemirror-5.7/mode/textile/test.js b/www/code/codemirror-5.7/mode/textile/test.js
deleted file mode 100644
index 49cdaf9c9..000000000
--- a/www/code/codemirror-5.7/mode/textile/test.js
+++ /dev/null
@@ -1,417 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, 'textile');
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT('simpleParagraphs',
-      'Some text.',
-      '',
-      'Some more text.');
-
-  /*
-   * Phrase Modifiers
-   */
-
-  MT('em',
-      'foo [em _bar_]');
-
-  MT('emBoogus',
-      'code_mirror');
-
-  MT('strong',
-      'foo [strong *bar*]');
-
-  MT('strongBogus',
-      '3 * 3 = 9');
-
-  MT('italic',
-      'foo [em __bar__]');
-
-  MT('italicBogus',
-      'code__mirror');
-
-  MT('bold',
-      'foo [strong **bar**]');
-
-  MT('boldBogus',
-      '3 ** 3 = 27');
-
-  MT('simpleLink',
-      '[link "CodeMirror":http://codemirror.net]');
-
-  MT('referenceLink',
-      '[link "CodeMirror":code_mirror]',
-      'Normal Text.',
-      '[link [[code_mirror]]http://codemirror.net]');
-
-  MT('footCite',
-      'foo bar[qualifier [[1]]]');
-
-  MT('footCiteBogus',
-      'foo bar[[1a2]]');
-
-  MT('special-characters',
-          'Registered [tag (r)], ' +
-          'Trademark [tag (tm)], and ' +
-          'Copyright [tag (c)] 2008');
-
-  MT('cite',
-      "A book is [keyword ??The Count of Monte Cristo??] by Dumas.");
-
-  MT('additionAndDeletion',
-      'The news networks declared [negative -Al Gore-] ' +
-        '[positive +George W. Bush+] the winner in Florida.');
-
-  MT('subAndSup',
-      'f(x, n) = log [builtin ~4~] x [builtin ^n^]');
-
-  MT('spanAndCode',
-      'A [quote %span element%] and [atom @code element@]');
-
-  MT('spanBogus',
-      'Percentage 25% is not a span.');
-
-  MT('citeBogus',
-      'Question? is not a citation.');
-
-  MT('codeBogus',
-      'user@example.com');
-
-  MT('subBogus',
-      '~username');
-
-  MT('supBogus',
-      'foo ^ bar');
-
-  MT('deletionBogus',
-      '3 - 3 = 0');
-
-  MT('additionBogus',
-      '3 + 3 = 6');
-
-  MT('image',
-      'An image: [string !http://www.example.com/image.png!]');
-
-  MT('imageWithAltText',
-      'An image: [string !http://www.example.com/image.png (Alt Text)!]');
-
-  MT('imageWithUrl',
-      'An image: [string !http://www.example.com/image.png!:http://www.example.com/]');
-
-  /*
-   * Headers
-   */
-
-  MT('h1',
-      '[header&header-1 h1. foo]');
-
-  MT('h2',
-      '[header&header-2 h2. foo]');
-
-  MT('h3',
-      '[header&header-3 h3. foo]');
-
-  MT('h4',
-      '[header&header-4 h4. foo]');
-
-  MT('h5',
-      '[header&header-5 h5. foo]');
-
-  MT('h6',
-      '[header&header-6 h6. foo]');
-
-  MT('h7Bogus',
-      'h7. foo');
-
-  MT('multipleHeaders',
-      '[header&header-1 h1. Heading 1]',
-      '',
-      'Some text.',
-      '',
-      '[header&header-2 h2. Heading 2]',
-      '',
-      'More text.');
-
-  MT('h1inline',
-      '[header&header-1 h1. foo ][header&header-1&em _bar_][header&header-1  baz]');
-
-  /*
-   * Lists
-   */
-
-  MT('ul',
-      'foo',
-      'bar',
-      '',
-      '[variable-2 * foo]',
-      '[variable-2 * bar]');
-
-  MT('ulNoBlank',
-      'foo',
-      'bar',
-      '[variable-2 * foo]',
-      '[variable-2 * bar]');
-
-  MT('ol',
-      'foo',
-      'bar',
-      '',
-      '[variable-2 # foo]',
-      '[variable-2 # bar]');
-
-  MT('olNoBlank',
-      'foo',
-      'bar',
-      '[variable-2 # foo]',
-      '[variable-2 # bar]');
-
-  MT('ulFormatting',
-      '[variable-2 * ][variable-2&em _foo_][variable-2  bar]',
-      '[variable-2 * ][variable-2&strong *][variable-2&em&strong _foo_]' +
-        '[variable-2&strong *][variable-2  bar]',
-      '[variable-2 * ][variable-2&strong *foo*][variable-2  bar]');
-
-  MT('olFormatting',
-      '[variable-2 # ][variable-2&em _foo_][variable-2  bar]',
-      '[variable-2 # ][variable-2&strong *][variable-2&em&strong _foo_]' +
-        '[variable-2&strong *][variable-2  bar]',
-      '[variable-2 # ][variable-2&strong *foo*][variable-2  bar]');
-
-  MT('ulNested',
-      '[variable-2 * foo]',
-      '[variable-3 ** bar]',
-      '[keyword *** bar]',
-      '[variable-2 **** bar]',
-      '[variable-3 ** bar]');
-
-  MT('olNested',
-      '[variable-2 # foo]',
-      '[variable-3 ## bar]',
-      '[keyword ### bar]',
-      '[variable-2 #### bar]',
-      '[variable-3 ## bar]');
-
-  MT('ulNestedWithOl',
-      '[variable-2 * foo]',
-      '[variable-3 ## bar]',
-      '[keyword *** bar]',
-      '[variable-2 #### bar]',
-      '[variable-3 ** bar]');
-
-  MT('olNestedWithUl',
-      '[variable-2 # foo]',
-      '[variable-3 ** bar]',
-      '[keyword ### bar]',
-      '[variable-2 **** bar]',
-      '[variable-3 ## bar]');
-
-  MT('definitionList',
-      '[number - coffee := Hot ][number&em _and_][number  black]',
-      '',
-      'Normal text.');
-
-  MT('definitionListSpan',
-      '[number - coffee :=]',
-      '',
-      '[number Hot ][number&em _and_][number  black =:]',
-      '',
-      'Normal text.');
-
-  MT('boo',
-      '[number - dog := woof woof]',
-      '[number - cat := meow meow]',
-      '[number - whale :=]',
-      '[number Whale noises.]',
-      '',
-      '[number Also, ][number&em _splashing_][number . =:]');
-
-  /*
-   * Attributes
-   */
-
-  MT('divWithAttribute',
-      '[punctuation div][punctuation&attribute (#my-id)][punctuation . foo bar]');
-
-  MT('divWithAttributeAnd2emRightPadding',
-      '[punctuation div][punctuation&attribute (#my-id)((][punctuation . foo bar]');
-
-  MT('divWithClassAndId',
-      '[punctuation div][punctuation&attribute (my-class#my-id)][punctuation . foo bar]');
-
-  MT('paragraphWithCss',
-      'p[attribute {color:red;}]. foo bar');
-
-  MT('paragraphNestedStyles',
-      'p. [strong *foo ][strong&em _bar_][strong *]');
-
-  MT('paragraphWithLanguage',
-      'p[attribute [[fr]]]. Parlez-vous français?');
-
-  MT('paragraphLeftAlign',
-      'p[attribute <]. Left');
-
-  MT('paragraphRightAlign',
-      'p[attribute >]. Right');
-
-  MT('paragraphRightAlign',
-      'p[attribute =]. Center');
-
-  MT('paragraphJustified',
-      'p[attribute <>]. Justified');
-
-  MT('paragraphWithLeftIndent1em',
-      'p[attribute (]. Left');
-
-  MT('paragraphWithRightIndent1em',
-      'p[attribute )]. Right');
-
-  MT('paragraphWithLeftIndent2em',
-      'p[attribute ((]. Left');
-
-  MT('paragraphWithRightIndent2em',
-      'p[attribute ))]. Right');
-
-  MT('paragraphWithLeftIndent3emRightIndent2em',
-      'p[attribute ((())]. Right');
-
-  MT('divFormatting',
-      '[punctuation div. ][punctuation&strong *foo ]' +
-        '[punctuation&strong&em _bar_][punctuation&strong *]');
-
-  MT('phraseModifierAttributes',
-      'p[attribute (my-class)]. This is a paragraph that has a class and' +
-      ' this [em _][em&attribute (#special-phrase)][em emphasized phrase_]' +
-      ' has an id.');
-
-  MT('linkWithClass',
-      '[link "(my-class). This is a link with class":http://redcloth.org]');
-
-  /*
-   * Layouts
-   */
-
-  MT('paragraphLayouts',
-      'p. This is one paragraph.',
-      '',
-      'p. This is another.');
-
-  MT('div',
-      '[punctuation div. foo bar]');
-
-  MT('pre',
-      '[operator pre. Text]');
-
-  MT('bq.',
-      '[bracket bq. foo bar]',
-      '',
-      'Normal text.');
-
-  MT('footnote',
-      '[variable fn123. foo ][variable&strong *bar*]');
-
-  /*
-   * Spanning Layouts
-   */
-
-  MT('bq..ThenParagraph',
-      '[bracket bq.. foo bar]',
-      '',
-      '[bracket More quote.]',
-      'p. Normal Text');
-
-  MT('bq..ThenH1',
-      '[bracket bq.. foo bar]',
-      '',
-      '[bracket More quote.]',
-      '[header&header-1 h1. Header Text]');
-
-  MT('bc..ThenParagraph',
-      '[atom bc.. # Some ruby code]',
-      '[atom obj = {foo: :bar}]',
-      '[atom puts obj]',
-      '',
-      '[atom obj[[:love]] = "*love*"]',
-      '[atom puts obj.love.upcase]',
-      '',
-      'p. Normal text.');
-
-  MT('fn1..ThenParagraph',
-      '[variable fn1.. foo bar]',
-      '',
-      '[variable More.]',
-      'p. Normal Text');
-
-  MT('pre..ThenParagraph',
-      '[operator pre.. foo bar]',
-      '',
-      '[operator More.]',
-      'p. Normal Text');
-
-  /*
-   * Tables
-   */
-
-  MT('table',
-      '[variable-3&operator |_. name |_. age|]',
-      '[variable-3 |][variable-3&strong *Walter*][variable-3 |   5  |]',
-      '[variable-3 |Florence|   6  |]',
-      '',
-      'p. Normal text.');
-
-  MT('tableWithAttributes',
-      '[variable-3&operator |_. name |_. age|]',
-      '[variable-3 |][variable-3&attribute /2.][variable-3  Jim |]',
-      '[variable-3 |][variable-3&attribute \\2{color: red}.][variable-3  Sam |]');
-
-  /*
-   * HTML
-   */
-
-  MT('html',
-      '[comment 
    ]',
-      '[comment 
    ]',
-      '',
-      '[header&header-1 h1. Welcome]',
-      '',
-      '[variable-2 * Item one]',
-      '[variable-2 * Item two]',
-      '',
-      '[comment Example]',
-      '',
-      '[comment 
    ]',
-      '[comment 
    ]');
-
-  MT('inlineHtml',
-      'I can use HTML directly in my [comment Textile].');
-
-  /*
-   * No-Textile
-   */
-
-  MT('notextile',
-    '[string-2 notextile. *No* formatting]');
-
-  MT('notextileInline',
-      'Use [string-2 ==*asterisks*==] for [strong *strong*] text.');
-
-  MT('notextileWithPre',
-      '[operator pre. *No* formatting]');
-
-  MT('notextileWithSpanningPre',
-      '[operator pre.. *No* formatting]',
-      '',
-      '[operator *No* formatting]');
-
-  /* Only toggling phrases between non-word chars. */
-
-  MT('phrase-in-word',
-     'foo_bar_baz');
-
-  MT('phrase-non-word',
-     '[negative -x-] aaa-bbb ccc-ddd [negative -eee-] fff [negative -ggg-]');
-
-  MT('phrase-lone-dash',
-     'foo - bar - baz');
-})();
diff --git a/www/code/codemirror-5.7/mode/textile/textile.js b/www/code/codemirror-5.7/mode/textile/textile.js
deleted file mode 100644
index a6f757658..000000000
--- a/www/code/codemirror-5.7/mode/textile/textile.js
+++ /dev/null
@@ -1,469 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") { // CommonJS
-    mod(require("../../lib/codemirror"));
-  } else if (typeof define == "function" && define.amd) { // AMD
-    define(["../../lib/codemirror"], mod);
-  } else { // Plain browser env
-    mod(CodeMirror);
-  }
-})(function(CodeMirror) {
-  "use strict";
-
-  var TOKEN_STYLES = {
-    addition: "positive",
-    attributes: "attribute",
-    bold: "strong",
-    cite: "keyword",
-    code: "atom",
-    definitionList: "number",
-    deletion: "negative",
-    div: "punctuation",
-    em: "em",
-    footnote: "variable",
-    footCite: "qualifier",
-    header: "header",
-    html: "comment",
-    image: "string",
-    italic: "em",
-    link: "link",
-    linkDefinition: "link",
-    list1: "variable-2",
-    list2: "variable-3",
-    list3: "keyword",
-    notextile: "string-2",
-    pre: "operator",
-    p: "property",
-    quote: "bracket",
-    span: "quote",
-    specialChar: "tag",
-    strong: "strong",
-    sub: "builtin",
-    sup: "builtin",
-    table: "variable-3",
-    tableHeading: "operator"
-  };
-
-  function startNewLine(stream, state) {
-    state.mode = Modes.newLayout;
-    state.tableHeading = false;
-
-    if (state.layoutType === "definitionList" && state.spanningLayout &&
-        stream.match(RE("definitionListEnd"), false))
-      state.spanningLayout = false;
-  }
-
-  function handlePhraseModifier(stream, state, ch) {
-    if (ch === "_") {
-      if (stream.eat("_"))
-        return togglePhraseModifier(stream, state, "italic", /__/, 2);
-      else
-        return togglePhraseModifier(stream, state, "em", /_/, 1);
-    }
-
-    if (ch === "*") {
-      if (stream.eat("*")) {
-        return togglePhraseModifier(stream, state, "bold", /\*\*/, 2);
-      }
-      return togglePhraseModifier(stream, state, "strong", /\*/, 1);
-    }
-
-    if (ch === "[") {
-      if (stream.match(/\d+\]/)) state.footCite = true;
-      return tokenStyles(state);
-    }
-
-    if (ch === "(") {
-      var spec = stream.match(/^(r|tm|c)\)/);
-      if (spec)
-        return tokenStylesWith(state, TOKEN_STYLES.specialChar);
-    }
-
-    if (ch === "<" && stream.match(/(\w+)[^>]+>[^<]+<\/\1>/))
-      return tokenStylesWith(state, TOKEN_STYLES.html);
-
-    if (ch === "?" && stream.eat("?"))
-      return togglePhraseModifier(stream, state, "cite", /\?\?/, 2);
-
-    if (ch === "=" && stream.eat("="))
-      return togglePhraseModifier(stream, state, "notextile", /==/, 2);
-
-    if (ch === "-" && !stream.eat("-"))
-      return togglePhraseModifier(stream, state, "deletion", /-/, 1);
-
-    if (ch === "+")
-      return togglePhraseModifier(stream, state, "addition", /\+/, 1);
-
-    if (ch === "~")
-      return togglePhraseModifier(stream, state, "sub", /~/, 1);
-
-    if (ch === "^")
-      return togglePhraseModifier(stream, state, "sup", /\^/, 1);
-
-    if (ch === "%")
-      return togglePhraseModifier(stream, state, "span", /%/, 1);
-
-    if (ch === "@")
-      return togglePhraseModifier(stream, state, "code", /@/, 1);
-
-    if (ch === "!") {
-      var type = togglePhraseModifier(stream, state, "image", /(?:\([^\)]+\))?!/, 1);
-      stream.match(/^:\S+/); // optional Url portion
-      return type;
-    }
-    return tokenStyles(state);
-  }
-
-  function togglePhraseModifier(stream, state, phraseModifier, closeRE, openSize) {
-    var charBefore = stream.pos > openSize ? stream.string.charAt(stream.pos - openSize - 1) : null;
-    var charAfter = stream.peek();
-    if (state[phraseModifier]) {
-      if ((!charAfter || /\W/.test(charAfter)) && charBefore && /\S/.test(charBefore)) {
-        var type = tokenStyles(state);
-        state[phraseModifier] = false;
-        return type;
-      }
-    } else if ((!charBefore || /\W/.test(charBefore)) && charAfter && /\S/.test(charAfter) &&
-               stream.match(new RegExp("^.*\\S" + closeRE.source + "(?:\\W|$)"), false)) {
-      state[phraseModifier] = true;
-      state.mode = Modes.attributes;
-    }
-    return tokenStyles(state);
-  };
-
-  function tokenStyles(state) {
-    var disabled = textileDisabled(state);
-    if (disabled) return disabled;
-
-    var styles = [];
-    if (state.layoutType) styles.push(TOKEN_STYLES[state.layoutType]);
-
-    styles = styles.concat(activeStyles(
-      state, "addition", "bold", "cite", "code", "deletion", "em", "footCite",
-      "image", "italic", "link", "span", "strong", "sub", "sup", "table", "tableHeading"));
-
-    if (state.layoutType === "header")
-      styles.push(TOKEN_STYLES.header + "-" + state.header);
-
-    return styles.length ? styles.join(" ") : null;
-  }
-
-  function textileDisabled(state) {
-    var type = state.layoutType;
-
-    switch(type) {
-    case "notextile":
-    case "code":
-    case "pre":
-      return TOKEN_STYLES[type];
-    default:
-      if (state.notextile)
-        return TOKEN_STYLES.notextile + (type ? (" " + TOKEN_STYLES[type]) : "");
-      return null;
-    }
-  }
-
-  function tokenStylesWith(state, extraStyles) {
-    var disabled = textileDisabled(state);
-    if (disabled) return disabled;
-
-    var type = tokenStyles(state);
-    if (extraStyles)
-      return type ? (type + " " + extraStyles) : extraStyles;
-    else
-      return type;
-  }
-
-  function activeStyles(state) {
-    var styles = [];
-    for (var i = 1; i < arguments.length; ++i) {
-      if (state[arguments[i]])
-        styles.push(TOKEN_STYLES[arguments[i]]);
-    }
-    return styles;
-  }
-
-  function blankLine(state) {
-    var spanningLayout = state.spanningLayout, type = state.layoutType;
-
-    for (var key in state) if (state.hasOwnProperty(key))
-      delete state[key];
-
-    state.mode = Modes.newLayout;
-    if (spanningLayout) {
-      state.layoutType = type;
-      state.spanningLayout = true;
-    }
-  }
-
-  var REs = {
-    cache: {},
-    single: {
-      bc: "bc",
-      bq: "bq",
-      definitionList: /- [^(?::=)]+:=+/,
-      definitionListEnd: /.*=:\s*$/,
-      div: "div",
-      drawTable: /\|.*\|/,
-      foot: /fn\d+/,
-      header: /h[1-6]/,
-      html: /\s*<(?:\/)?(\w+)(?:[^>]+)?>(?:[^<]+<\/\1>)?/,
-      link: /[^"]+":\S/,
-      linkDefinition: /\[[^\s\]]+\]\S+/,
-      list: /(?:#+|\*+)/,
-      notextile: "notextile",
-      para: "p",
-      pre: "pre",
-      table: "table",
-      tableCellAttributes: /[\/\\]\d+/,
-      tableHeading: /\|_\./,
-      tableText: /[^"_\*\[\(\?\+~\^%@|-]+/,
-      text: /[^!"_=\*\[\(<\?\+~\^%@-]+/
-    },
-    attributes: {
-      align: /(?:<>|<|>|=)/,
-      selector: /\([^\(][^\)]+\)/,
-      lang: /\[[^\[\]]+\]/,
-      pad: /(?:\(+|\)+){1,2}/,
-      css: /\{[^\}]+\}/
-    },
-    createRe: function(name) {
-      switch (name) {
-      case "drawTable":
-        return REs.makeRe("^", REs.single.drawTable, "$");
-      case "html":
-        return REs.makeRe("^", REs.single.html, "(?:", REs.single.html, ")*", "$");
-      case "linkDefinition":
-        return REs.makeRe("^", REs.single.linkDefinition, "$");
-      case "listLayout":
-        return REs.makeRe("^", REs.single.list, RE("allAttributes"), "*\\s+");
-      case "tableCellAttributes":
-        return REs.makeRe("^", REs.choiceRe(REs.single.tableCellAttributes,
-                                            RE("allAttributes")), "+\\.");
-      case "type":
-        return REs.makeRe("^", RE("allTypes"));
-      case "typeLayout":
-        return REs.makeRe("^", RE("allTypes"), RE("allAttributes"),
-                          "*\\.\\.?", "(\\s+|$)");
-      case "attributes":
-        return REs.makeRe("^", RE("allAttributes"), "+");
-
-      case "allTypes":
-        return REs.choiceRe(REs.single.div, REs.single.foot,
-                            REs.single.header, REs.single.bc, REs.single.bq,
-                            REs.single.notextile, REs.single.pre, REs.single.table,
-                            REs.single.para);
-
-      case "allAttributes":
-        return REs.choiceRe(REs.attributes.selector, REs.attributes.css,
-                            REs.attributes.lang, REs.attributes.align, REs.attributes.pad);
-
-      default:
-        return REs.makeRe("^", REs.single[name]);
-      }
-    },
-    makeRe: function() {
-      var pattern = "";
-      for (var i = 0; i < arguments.length; ++i) {
-        var arg = arguments[i];
-        pattern += (typeof arg === "string") ? arg : arg.source;
-      }
-      return new RegExp(pattern);
-    },
-    choiceRe: function() {
-      var parts = [arguments[0]];
-      for (var i = 1; i < arguments.length; ++i) {
-        parts[i * 2 - 1] = "|";
-        parts[i * 2] = arguments[i];
-      }
-
-      parts.unshift("(?:");
-      parts.push(")");
-      return REs.makeRe.apply(null, parts);
-    }
-  };
-
-  function RE(name) {
-    return (REs.cache[name] || (REs.cache[name] = REs.createRe(name)));
-  }
-
-  var Modes = {
-    newLayout: function(stream, state) {
-      if (stream.match(RE("typeLayout"), false)) {
-        state.spanningLayout = false;
-        return (state.mode = Modes.blockType)(stream, state);
-      }
-      var newMode;
-      if (!textileDisabled(state)) {
-        if (stream.match(RE("listLayout"), false))
-          newMode = Modes.list;
-        else if (stream.match(RE("drawTable"), false))
-          newMode = Modes.table;
-        else if (stream.match(RE("linkDefinition"), false))
-          newMode = Modes.linkDefinition;
-        else if (stream.match(RE("definitionList")))
-          newMode = Modes.definitionList;
-        else if (stream.match(RE("html"), false))
-          newMode = Modes.html;
-      }
-      return (state.mode = (newMode || Modes.text))(stream, state);
-    },
-
-    blockType: function(stream, state) {
-      var match, type;
-      state.layoutType = null;
-
-      if (match = stream.match(RE("type")))
-        type = match[0];
-      else
-        return (state.mode = Modes.text)(stream, state);
-
-      if (match = type.match(RE("header"))) {
-        state.layoutType = "header";
-        state.header = parseInt(match[0][1]);
-      } else if (type.match(RE("bq"))) {
-        state.layoutType = "quote";
-      } else if (type.match(RE("bc"))) {
-        state.layoutType = "code";
-      } else if (type.match(RE("foot"))) {
-        state.layoutType = "footnote";
-      } else if (type.match(RE("notextile"))) {
-        state.layoutType = "notextile";
-      } else if (type.match(RE("pre"))) {
-        state.layoutType = "pre";
-      } else if (type.match(RE("div"))) {
-        state.layoutType = "div";
-      } else if (type.match(RE("table"))) {
-        state.layoutType = "table";
-      }
-
-      state.mode = Modes.attributes;
-      return tokenStyles(state);
-    },
-
-    text: function(stream, state) {
-      if (stream.match(RE("text"))) return tokenStyles(state);
-
-      var ch = stream.next();
-      if (ch === '"')
-        return (state.mode = Modes.link)(stream, state);
-      return handlePhraseModifier(stream, state, ch);
-    },
-
-    attributes: function(stream, state) {
-      state.mode = Modes.layoutLength;
-
-      if (stream.match(RE("attributes")))
-        return tokenStylesWith(state, TOKEN_STYLES.attributes);
-      else
-        return tokenStyles(state);
-    },
-
-    layoutLength: function(stream, state) {
-      if (stream.eat(".") && stream.eat("."))
-        state.spanningLayout = true;
-
-      state.mode = Modes.text;
-      return tokenStyles(state);
-    },
-
-    list: function(stream, state) {
-      var match = stream.match(RE("list"));
-      state.listDepth = match[0].length;
-      var listMod = (state.listDepth - 1) % 3;
-      if (!listMod)
-        state.layoutType = "list1";
-      else if (listMod === 1)
-        state.layoutType = "list2";
-      else
-        state.layoutType = "list3";
-
-      state.mode = Modes.attributes;
-      return tokenStyles(state);
-    },
-
-    link: function(stream, state) {
-      state.mode = Modes.text;
-      if (stream.match(RE("link"))) {
-        stream.match(/\S+/);
-        return tokenStylesWith(state, TOKEN_STYLES.link);
-      }
-      return tokenStyles(state);
-    },
-
-    linkDefinition: function(stream, state) {
-      stream.skipToEnd();
-      return tokenStylesWith(state, TOKEN_STYLES.linkDefinition);
-    },
-
-    definitionList: function(stream, state) {
-      stream.match(RE("definitionList"));
-
-      state.layoutType = "definitionList";
-
-      if (stream.match(/\s*$/))
-        state.spanningLayout = true;
-      else
-        state.mode = Modes.attributes;
-
-      return tokenStyles(state);
-    },
-
-    html: function(stream, state) {
-      stream.skipToEnd();
-      return tokenStylesWith(state, TOKEN_STYLES.html);
-    },
-
-    table: function(stream, state) {
-      state.layoutType = "table";
-      return (state.mode = Modes.tableCell)(stream, state);
-    },
-
-    tableCell: function(stream, state) {
-      if (stream.match(RE("tableHeading")))
-        state.tableHeading = true;
-      else
-        stream.eat("|");
-
-      state.mode = Modes.tableCellAttributes;
-      return tokenStyles(state);
-    },
-
-    tableCellAttributes: function(stream, state) {
-      state.mode = Modes.tableText;
-
-      if (stream.match(RE("tableCellAttributes")))
-        return tokenStylesWith(state, TOKEN_STYLES.attributes);
-      else
-        return tokenStyles(state);
-    },
-
-    tableText: function(stream, state) {
-      if (stream.match(RE("tableText")))
-        return tokenStyles(state);
-
-      if (stream.peek() === "|") { // end of cell
-        state.mode = Modes.tableCell;
-        return tokenStyles(state);
-      }
-      return handlePhraseModifier(stream, state, stream.next());
-    }
-  };
-
-  CodeMirror.defineMode("textile", function() {
-    return {
-      startState: function() {
-        return { mode: Modes.newLayout };
-      },
-      token: function(stream, state) {
-        if (stream.sol()) startNewLine(stream, state);
-        return state.mode(stream, state);
-      },
-      blankLine: blankLine
-    };
-  });
-
-  CodeMirror.defineMIME("text/x-textile", "textile");
-});
diff --git a/www/code/codemirror-5.7/mode/tiddlywiki/index.html b/www/code/codemirror-5.7/mode/tiddlywiki/index.html
deleted file mode 100644
index 77dd0457c..000000000
--- a/www/code/codemirror-5.7/mode/tiddlywiki/index.html
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-CodeMirror: TiddlyWiki mode
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    TiddlyWiki mode
    
-
-
-
    
-
-    
-
-    
    TiddlyWiki mode supports a single configuration.
    
-
-    
    MIME types defined: text/x-tiddlywiki.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/tiddlywiki/tiddlywiki.css b/www/code/codemirror-5.7/mode/tiddlywiki/tiddlywiki.css
deleted file mode 100644
index 9a69b639f..000000000
--- a/www/code/codemirror-5.7/mode/tiddlywiki/tiddlywiki.css
+++ /dev/null
@@ -1,14 +0,0 @@
-span.cm-underlined {
-  text-decoration: underline;
-}
-span.cm-strikethrough {
-  text-decoration: line-through;
-}
-span.cm-brace {
-  color: #170;
-  font-weight: bold;
-}
-span.cm-table {
-  color: blue;
-  font-weight: bold;
-}
diff --git a/www/code/codemirror-5.7/mode/tiddlywiki/tiddlywiki.js b/www/code/codemirror-5.7/mode/tiddlywiki/tiddlywiki.js
deleted file mode 100644
index 1df01647a..000000000
--- a/www/code/codemirror-5.7/mode/tiddlywiki/tiddlywiki.js
+++ /dev/null
@@ -1,358 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/***
-    |''Name''|tiddlywiki.js|
-    |''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror|
-    |''Author''|PMario|
-    |''Version''|0.1.7|
-    |''Status''|''stable''|
-    |''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]|
-    |''Documentation''|http://codemirror.tiddlyspace.com/|
-    |''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]|
-    |''CoreVersion''|2.5.0|
-    |''Requires''|codemirror.js|
-    |''Keywords''|syntax highlighting color code mirror codemirror|
-    ! Info
-    CoreVersion parameter is needed for TiddlyWiki only!
-***/
-//{{{
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("tiddlywiki", function () {
-  // Tokenizer
-  var textwords = {};
-
-  var keywords = function () {
-    function kw(type) {
-      return { type: type, style: "macro"};
-    }
-    return {
-      "allTags": kw('allTags'), "closeAll": kw('closeAll'), "list": kw('list'),
-      "newJournal": kw('newJournal'), "newTiddler": kw('newTiddler'),
-      "permaview": kw('permaview'), "saveChanges": kw('saveChanges'),
-      "search": kw('search'), "slider": kw('slider'),   "tabs": kw('tabs'),
-      "tag": kw('tag'), "tagging": kw('tagging'),       "tags": kw('tags'),
-      "tiddler": kw('tiddler'), "timeline": kw('timeline'),
-      "today": kw('today'), "version": kw('version'),   "option": kw('option'),
-
-      "with": kw('with'),
-      "filter": kw('filter')
-    };
-  }();
-
-  var isSpaceName = /[\w_\-]/i,
-  reHR = /^\-\-\-\-+$/,                                 // 
    
-  reWikiCommentStart = /^\/\*\*\*$/,            // /***
-  reWikiCommentStop = /^\*\*\*\/$/,             // ***/
-  reBlockQuote = /^<<<$/,
-
-  reJsCodeStart = /^\/\/\{\{\{$/,                       // //{{{ js block start
-  reJsCodeStop = /^\/\/\}\}\}$/,                        // //}}} js stop
-  reXmlCodeStart = /^$/,           // xml block start
-  reXmlCodeStop = /^$/,            // xml stop
-
-  reCodeBlockStart = /^\{\{\{$/,                        // {{{ TW text div block start
-  reCodeBlockStop = /^\}\}\}$/,                 // }}} TW text stop
-
-  reUntilCodeStop = /.*?\}\}\}/;
-
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-
-  function jsTokenBase(stream, state) {
-    var sol = stream.sol(), ch;
-
-    state.block = false;        // indicates the start of a code block.
-
-    ch = stream.peek();         // don't eat, to make matching simpler
-
-    // check start of  blocks
-    if (sol && /[<\/\*{}\-]/.test(ch)) {
-      if (stream.match(reCodeBlockStart)) {
-        state.block = true;
-        return chain(stream, state, twTokenCode);
-      }
-      if (stream.match(reBlockQuote)) {
-        return 'quote';
-      }
-      if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop)) {
-        return 'comment';
-      }
-      if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop)) {
-        return 'comment';
-      }
-      if (stream.match(reHR)) {
-        return 'hr';
-      }
-    } // sol
-    ch = stream.next();
-
-    if (sol && /[\/\*!#;:>|]/.test(ch)) {
-      if (ch == "!") { // tw header
-        stream.skipToEnd();
-        return "header";
-      }
-      if (ch == "*") { // tw list
-        stream.eatWhile('*');
-        return "comment";
-      }
-      if (ch == "#") { // tw numbered list
-        stream.eatWhile('#');
-        return "comment";
-      }
-      if (ch == ";") { // definition list, term
-        stream.eatWhile(';');
-        return "comment";
-      }
-      if (ch == ":") { // definition list, description
-        stream.eatWhile(':');
-        return "comment";
-      }
-      if (ch == ">") { // single line quote
-        stream.eatWhile(">");
-        return "quote";
-      }
-      if (ch == '|') {
-        return 'header';
-      }
-    }
-
-    if (ch == '{' && stream.match(/\{\{/)) {
-      return chain(stream, state, twTokenCode);
-    }
-
-    // rudimentary html:// file:// link matching. TW knows much more ...
-    if (/[hf]/i.test(ch)) {
-      if (/[ti]/i.test(stream.peek()) && stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i)) {
-        return "link";
-      }
-    }
-    // just a little string indicator, don't want to have the whole string covered
-    if (ch == '"') {
-      return 'string';
-    }
-    if (ch == '~') {    // _no_ CamelCase indicator should be bold
-      return 'brace';
-    }
-    if (/[\[\]]/.test(ch)) { // check for [[..]]
-      if (stream.peek() == ch) {
-        stream.next();
-        return 'brace';
-      }
-    }
-    if (ch == "@") {    // check for space link. TODO fix @@...@@ highlighting
-      stream.eatWhile(isSpaceName);
-      return "link";
-    }
-    if (/\d/.test(ch)) {        // numbers
-      stream.eatWhile(/\d/);
-      return "number";
-    }
-    if (ch == "/") { // tw invisible comment
-      if (stream.eat("%")) {
-        return chain(stream, state, twTokenComment);
-      }
-      else if (stream.eat("/")) { //
-        return chain(stream, state, twTokenEm);
-      }
-    }
-    if (ch == "_") { // tw underline
-      if (stream.eat("_")) {
-        return chain(stream, state, twTokenUnderline);
-      }
-    }
-    // strikethrough and mdash handling
-    if (ch == "-") {
-      if (stream.eat("-")) {
-        // if strikethrough looks ugly, change CSS.
-        if (stream.peek() != ' ')
-          return chain(stream, state, twTokenStrike);
-        // mdash
-        if (stream.peek() == ' ')
-          return 'brace';
-      }
-    }
-    if (ch == "'") { // tw bold
-      if (stream.eat("'")) {
-        return chain(stream, state, twTokenStrong);
-      }
-    }
-    if (ch == "<") { // tw macro
-      if (stream.eat("<")) {
-        return chain(stream, state, twTokenMacro);
-      }
-    }
-    else {
-      return null;
-    }
-
-    // core macro handling
-    stream.eatWhile(/[\w\$_]/);
-    var word = stream.current(),
-    known = textwords.propertyIsEnumerable(word) && textwords[word];
-
-    return known ? known.style : null;
-  } // jsTokenBase()
-
-  // tw invisible comment
-  function twTokenComment(stream, state) {
-    var maybeEnd = false,
-    ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = jsTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "%");
-    }
-    return "comment";
-  }
-
-  // tw strong / bold
-  function twTokenStrong(stream, state) {
-    var maybeEnd = false,
-    ch;
-    while (ch = stream.next()) {
-      if (ch == "'" && maybeEnd) {
-        state.tokenize = jsTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "'");
-    }
-    return "strong";
-  }
-
-  // tw code
-  function twTokenCode(stream, state) {
-    var sb = state.block;
-
-    if (sb && stream.current()) {
-      return "comment";
-    }
-
-    if (!sb && stream.match(reUntilCodeStop)) {
-      state.tokenize = jsTokenBase;
-      return "comment";
-    }
-
-    if (sb && stream.sol() && stream.match(reCodeBlockStop)) {
-      state.tokenize = jsTokenBase;
-      return "comment";
-    }
-
-    stream.next();
-    return "comment";
-  }
-
-  // tw em / italic
-  function twTokenEm(stream, state) {
-    var maybeEnd = false,
-    ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = jsTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "/");
-    }
-    return "em";
-  }
-
-  // tw underlined text
-  function twTokenUnderline(stream, state) {
-    var maybeEnd = false,
-    ch;
-    while (ch = stream.next()) {
-      if (ch == "_" && maybeEnd) {
-        state.tokenize = jsTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "_");
-    }
-    return "underlined";
-  }
-
-  // tw strike through text looks ugly
-  // change CSS if needed
-  function twTokenStrike(stream, state) {
-    var maybeEnd = false, ch;
-
-    while (ch = stream.next()) {
-      if (ch == "-" && maybeEnd) {
-        state.tokenize = jsTokenBase;
-        break;
-      }
-      maybeEnd = (ch == "-");
-    }
-    return "strikethrough";
-  }
-
-  // macro
-  function twTokenMacro(stream, state) {
-    var ch, word, known;
-
-    if (stream.current() == '<<') {
-      return 'macro';
-    }
-
-    ch = stream.next();
-    if (!ch) {
-      state.tokenize = jsTokenBase;
-      return null;
-    }
-    if (ch == ">") {
-      if (stream.peek() == '>') {
-        stream.next();
-        state.tokenize = jsTokenBase;
-        return "macro";
-      }
-    }
-
-    stream.eatWhile(/[\w\$_]/);
-    word = stream.current();
-    known = keywords.propertyIsEnumerable(word) && keywords[word];
-
-    if (known) {
-      return known.style, word;
-    }
-    else {
-      return null, word;
-    }
-  }
-
-  // Interface
-  return {
-    startState: function () {
-      return {
-        tokenize: jsTokenBase,
-        indented: 0,
-        level: 0
-      };
-    },
-
-    token: function (stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      return style;
-    },
-
-    electricChars: ""
-  };
-});
-
-CodeMirror.defineMIME("text/x-tiddlywiki", "tiddlywiki");
-});
-
-//}}}
diff --git a/www/code/codemirror-5.7/mode/tiki/index.html b/www/code/codemirror-5.7/mode/tiki/index.html
deleted file mode 100644
index 091c5fb2a..000000000
--- a/www/code/codemirror-5.7/mode/tiki/index.html
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-CodeMirror: Tiki wiki mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Tiki wiki mode
    
-
-
-
    
-
-
-
-
    
diff --git a/www/code/codemirror-5.7/mode/tiki/tiki.css b/www/code/codemirror-5.7/mode/tiki/tiki.css
deleted file mode 100644
index 0dbc3ea0e..000000000
--- a/www/code/codemirror-5.7/mode/tiki/tiki.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.cm-tw-syntaxerror {
-	color: #FFF;
-	background-color: #900;
-}
-
-.cm-tw-deleted {
-	text-decoration: line-through;
-}
-
-.cm-tw-header5 {
-	font-weight: bold;
-}
-.cm-tw-listitem:first-child { /*Added first child to fix duplicate padding when highlighting*/
-	padding-left: 10px;
-}
-
-.cm-tw-box {
-	border-top-width: 0px ! important;
-	border-style: solid;
-	border-width: 1px;
-	border-color: inherit;
-}
-
-.cm-tw-underline {
-	text-decoration: underline;
-}
\ No newline at end of file
diff --git a/www/code/codemirror-5.7/mode/tiki/tiki.js b/www/code/codemirror-5.7/mode/tiki/tiki.js
deleted file mode 100644
index 5e05b1ff0..000000000
--- a/www/code/codemirror-5.7/mode/tiki/tiki.js
+++ /dev/null
@@ -1,312 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode('tiki', function(config) {
-  function inBlock(style, terminator, returnTokenizer) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.match(terminator)) {
-          state.tokenize = inText;
-          break;
-        }
-        stream.next();
-      }
-
-      if (returnTokenizer) state.tokenize = returnTokenizer;
-
-      return style;
-    };
-  }
-
-  function inLine(style) {
-    return function(stream, state) {
-      while(!stream.eol()) {
-        stream.next();
-      }
-      state.tokenize = inText;
-      return style;
-    };
-  }
-
-  function inText(stream, state) {
-    function chain(parser) {
-      state.tokenize = parser;
-      return parser(stream, state);
-    }
-
-    var sol = stream.sol();
-    var ch = stream.next();
-
-    //non start of line
-    switch (ch) { //switch is generally much faster than if, so it is used here
-    case "{": //plugin
-      stream.eat("/");
-      stream.eatSpace();
-      stream.eatWhile(/[^\s\u00a0=\"\'\/?(}]/);
-      state.tokenize = inPlugin;
-      return "tag";
-    case "_": //bold
-      if (stream.eat("_"))
-        return chain(inBlock("strong", "__", inText));
-      break;
-    case "'": //italics
-      if (stream.eat("'"))
-        return chain(inBlock("em", "''", inText));
-      break;
-    case "(":// Wiki Link
-      if (stream.eat("("))
-        return chain(inBlock("variable-2", "))", inText));
-      break;
-    case "[":// Weblink
-      return chain(inBlock("variable-3", "]", inText));
-      break;
-    case "|": //table
-      if (stream.eat("|"))
-        return chain(inBlock("comment", "||"));
-      break;
-    case "-":
-      if (stream.eat("=")) {//titleBar
-        return chain(inBlock("header string", "=-", inText));
-      } else if (stream.eat("-")) {//deleted
-        return chain(inBlock("error tw-deleted", "--", inText));
-      }
-      break;
-    case "=": //underline
-      if (stream.match("=="))
-        return chain(inBlock("tw-underline", "===", inText));
-      break;
-    case ":":
-      if (stream.eat(":"))
-        return chain(inBlock("comment", "::"));
-      break;
-    case "^": //box
-      return chain(inBlock("tw-box", "^"));
-      break;
-    case "~": //np
-      if (stream.match("np~"))
-        return chain(inBlock("meta", "~/np~"));
-      break;
-    }
-
-    //start of line types
-    if (sol) {
-      switch (ch) {
-      case "!": //header at start of line
-        if (stream.match('!!!!!')) {
-          return chain(inLine("header string"));
-        } else if (stream.match('!!!!')) {
-          return chain(inLine("header string"));
-        } else if (stream.match('!!!')) {
-          return chain(inLine("header string"));
-        } else if (stream.match('!!')) {
-          return chain(inLine("header string"));
-        } else {
-          return chain(inLine("header string"));
-        }
-        break;
-      case "*": //unordered list line item, or 
  •  at start of line
-      case "#": //ordered list line item, or 
  •  at start of line
-      case "+": //ordered list line item, or 
  •  at start of line
-        return chain(inLine("tw-listitem bracket"));
-        break;
-      }
-    }
-
-    //stream.eatWhile(/[&{]/); was eating up plugins, turned off to act less like html and more like tiki
-    return null;
-  }
-
-  var indentUnit = config.indentUnit;
-
-  // Return variables for tokenizers
-  var pluginName, type;
-  function inPlugin(stream, state) {
-    var ch = stream.next();
-    var peek = stream.peek();
-
-    if (ch == "}") {
-      state.tokenize = inText;
-      //type = ch == ")" ? "endPlugin" : "selfclosePlugin"; inPlugin
-      return "tag";
-    } else if (ch == "(" || ch == ")") {
-      return "bracket";
-    } else if (ch == "=") {
-      type = "equals";
-
-      if (peek == ">") {
-        ch = stream.next();
-        peek = stream.peek();
-      }
-
-      //here we detect values directly after equal character with no quotes
-      if (!/[\'\"]/.test(peek)) {
-        state.tokenize = inAttributeNoQuote();
-      }
-      //end detect values
-
-      return "operator";
-    } else if (/[\'\"]/.test(ch)) {
-      state.tokenize = inAttribute(ch);
-      return state.tokenize(stream, state);
-    } else {
-      stream.eatWhile(/[^\s\u00a0=\"\'\/?]/);
-      return "keyword";
-    }
-  }
-
-  function inAttribute(quote) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.next() == quote) {
-          state.tokenize = inPlugin;
-          break;
-        }
-      }
-      return "string";
-    };
-  }
-
-  function inAttributeNoQuote() {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        var ch = stream.next();
-        var peek = stream.peek();
-        if (ch == " " || ch == "," || /[ )}]/.test(peek)) {
-      state.tokenize = inPlugin;
-      break;
-    }
-  }
-  return "string";
-};
-                     }
-
-var curState, setStyle;
-function pass() {
-  for (var i = arguments.length - 1; i >= 0; i--) curState.cc.push(arguments[i]);
-}
-
-function cont() {
-  pass.apply(null, arguments);
-  return true;
-}
-
-function pushContext(pluginName, startOfLine) {
-  var noIndent = curState.context && curState.context.noIndent;
-  curState.context = {
-    prev: curState.context,
-    pluginName: pluginName,
-    indent: curState.indented,
-    startOfLine: startOfLine,
-    noIndent: noIndent
-  };
-}
-
-function popContext() {
-  if (curState.context) curState.context = curState.context.prev;
-}
-
-function element(type) {
-  if (type == "openPlugin") {curState.pluginName = pluginName; return cont(attributes, endplugin(curState.startOfLine));}
-  else if (type == "closePlugin") {
-    var err = false;
-    if (curState.context) {
-      err = curState.context.pluginName != pluginName;
-      popContext();
-    } else {
-      err = true;
-    }
-    if (err) setStyle = "error";
-    return cont(endcloseplugin(err));
-  }
-  else if (type == "string") {
-    if (!curState.context || curState.context.name != "!cdata") pushContext("!cdata");
-    if (curState.tokenize == inText) popContext();
-    return cont();
-  }
-  else return cont();
-}
-
-function endplugin(startOfLine) {
-  return function(type) {
-    if (
-      type == "selfclosePlugin" ||
-        type == "endPlugin"
-    )
-      return cont();
-    if (type == "endPlugin") {pushContext(curState.pluginName, startOfLine); return cont();}
-    return cont();
-  };
-}
-
-function endcloseplugin(err) {
-  return function(type) {
-    if (err) setStyle = "error";
-    if (type == "endPlugin") return cont();
-    return pass();
-  };
-}
-
-function attributes(type) {
-  if (type == "keyword") {setStyle = "attribute"; return cont(attributes);}
-  if (type == "equals") return cont(attvalue, attributes);
-  return pass();
-}
-function attvalue(type) {
-  if (type == "keyword") {setStyle = "string"; return cont();}
-  if (type == "string") return cont(attvaluemaybe);
-  return pass();
-}
-function attvaluemaybe(type) {
-  if (type == "string") return cont(attvaluemaybe);
-  else return pass();
-}
-return {
-  startState: function() {
-    return {tokenize: inText, cc: [], indented: 0, startOfLine: true, pluginName: null, context: null};
-  },
-  token: function(stream, state) {
-    if (stream.sol()) {
-      state.startOfLine = true;
-      state.indented = stream.indentation();
-    }
-    if (stream.eatSpace()) return null;
-
-    setStyle = type = pluginName = null;
-    var style = state.tokenize(stream, state);
-    if ((style || type) && style != "comment") {
-      curState = state;
-      while (true) {
-        var comb = state.cc.pop() || element;
-        if (comb(type || style)) break;
-      }
-    }
-    state.startOfLine = false;
-    return setStyle || style;
-  },
-  indent: function(state, textAfter) {
-    var context = state.context;
-    if (context && context.noIndent) return 0;
-    if (context && /^{\//.test(textAfter))
-        context = context.prev;
-        while (context && !context.startOfLine)
-          context = context.prev;
-        if (context) return context.indent + indentUnit;
-        else return 0;
-       },
-    electricChars: "/"
-  };
-});
-
-CodeMirror.defineMIME("text/tiki", "tiki");
-
-});
diff --git a/www/code/codemirror-5.7/mode/toml/index.html b/www/code/codemirror-5.7/mode/toml/index.html
deleted file mode 100644
index 90a2a0215..000000000
--- a/www/code/codemirror-5.7/mode/toml/index.html
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-CodeMirror: TOML Mode
-
-
-
-
-
-
-
-
-
-
    
-
    TOML Mode
    
-
    
-    
-    
    The TOML Mode
    
-      
     Created by Forbes Lindesay.
    
-    
    MIME type defined: text/x-toml.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/toml/toml.js b/www/code/codemirror-5.7/mode/toml/toml.js
deleted file mode 100644
index baeca1556..000000000
--- a/www/code/codemirror-5.7/mode/toml/toml.js
+++ /dev/null
@@ -1,88 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("toml", function () {
-  return {
-    startState: function () {
-      return {
-        inString: false,
-        stringType: "",
-        lhs: true,
-        inArray: 0
-      };
-    },
-    token: function (stream, state) {
-      //check for state changes
-      if (!state.inString && ((stream.peek() == '"') || (stream.peek() == "'"))) {
-        state.stringType = stream.peek();
-        stream.next(); // Skip quote
-        state.inString = true; // Update state
-      }
-      if (stream.sol() && state.inArray === 0) {
-        state.lhs = true;
-      }
-      //return state
-      if (state.inString) {
-        while (state.inString && !stream.eol()) {
-          if (stream.peek() === state.stringType) {
-            stream.next(); // Skip quote
-            state.inString = false; // Clear flag
-          } else if (stream.peek() === '\\') {
-            stream.next();
-            stream.next();
-          } else {
-            stream.match(/^.[^\\\"\']*/);
-          }
-        }
-        return state.lhs ? "property string" : "string"; // Token style
-      } else if (state.inArray && stream.peek() === ']') {
-        stream.next();
-        state.inArray--;
-        return 'bracket';
-      } else if (state.lhs && stream.peek() === '[' && stream.skipTo(']')) {
-        stream.next();//skip closing ]
-        // array of objects has an extra open & close []
-        if (stream.peek() === ']') stream.next();
-        return "atom";
-      } else if (stream.peek() === "#") {
-        stream.skipToEnd();
-        return "comment";
-      } else if (stream.eatSpace()) {
-        return null;
-      } else if (state.lhs && stream.eatWhile(function (c) { return c != '=' && c != ' '; })) {
-        return "property";
-      } else if (state.lhs && stream.peek() === "=") {
-        stream.next();
-        state.lhs = false;
-        return null;
-      } else if (!state.lhs && stream.match(/^\d\d\d\d[\d\-\:\.T]*Z/)) {
-        return 'atom'; //date
-      } else if (!state.lhs && (stream.match('true') || stream.match('false'))) {
-        return 'atom';
-      } else if (!state.lhs && stream.peek() === '[') {
-        state.inArray++;
-        stream.next();
-        return 'bracket';
-      } else if (!state.lhs && stream.match(/^\-?\d+(?:\.\d+)?/)) {
-        return 'number';
-      } else if (!stream.eatSpace()) {
-        stream.next();
-      }
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME('text/x-toml', 'toml');
-
-});
diff --git a/www/code/codemirror-5.7/mode/tornado/index.html b/www/code/codemirror-5.7/mode/tornado/index.html
deleted file mode 100644
index 8ee7ef56c..000000000
--- a/www/code/codemirror-5.7/mode/tornado/index.html
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-CodeMirror: Tornado template mode
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Tornado template mode
    
-
    
-
-    
-
-    
    Mode for HTML with embedded Tornado template markup.
    
-
-    
    MIME types defined: text/x-tornado
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/tornado/tornado.js b/www/code/codemirror-5.7/mode/tornado/tornado.js
deleted file mode 100644
index dbfbc3489..000000000
--- a/www/code/codemirror-5.7/mode/tornado/tornado.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"),
-        require("../../addon/mode/overlay"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
-            "../../addon/mode/overlay"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("tornado:inner", function() {
-    var keywords = ["and","as","assert","autoescape","block","break","class","comment","context",
-                    "continue","datetime","def","del","elif","else","end","escape","except",
-                    "exec","extends","false","finally","for","from","global","if","import","in",
-                    "include","is","json_encode","lambda","length","linkify","load","module",
-                    "none","not","or","pass","print","put","raise","raw","return","self","set",
-                    "squeeze","super","true","try","url_escape","while","with","without","xhtml_escape","yield"];
-    keywords = new RegExp("^((" + keywords.join(")|(") + "))\\b");
-
-    function tokenBase (stream, state) {
-      stream.eatWhile(/[^\{]/);
-      var ch = stream.next();
-      if (ch == "{") {
-        if (ch = stream.eat(/\{|%|#/)) {
-          state.tokenize = inTag(ch);
-          return "tag";
-        }
-      }
-    }
-    function inTag (close) {
-      if (close == "{") {
-        close = "}";
-      }
-      return function (stream, state) {
-        var ch = stream.next();
-        if ((ch == close) && stream.eat("}")) {
-          state.tokenize = tokenBase;
-          return "tag";
-        }
-        if (stream.match(keywords)) {
-          return "keyword";
-        }
-        return close == "#" ? "comment" : "string";
-      };
-    }
-    return {
-      startState: function () {
-        return {tokenize: tokenBase};
-      },
-      token: function (stream, state) {
-        return state.tokenize(stream, state);
-      }
-    };
-  });
-
-  CodeMirror.defineMode("tornado", function(config) {
-    var htmlBase = CodeMirror.getMode(config, "text/html");
-    var tornadoInner = CodeMirror.getMode(config, "tornado:inner");
-    return CodeMirror.overlayMode(htmlBase, tornadoInner);
-  });
-
-  CodeMirror.defineMIME("text/x-tornado", "tornado");
-});
diff --git a/www/code/codemirror-5.7/mode/troff/index.html b/www/code/codemirror-5.7/mode/troff/index.html
deleted file mode 100644
index 7c5a54e54..000000000
--- a/www/code/codemirror-5.7/mode/troff/index.html
+++ /dev/null
@@ -1,146 +0,0 @@
-
-
-CodeMirror: troff mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    troff
    
-
-
-
-
-
-
-
    MIME types defined: troff.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/troff/troff.js b/www/code/codemirror-5.7/mode/troff/troff.js
deleted file mode 100644
index beca778ee..000000000
--- a/www/code/codemirror-5.7/mode/troff/troff.js
+++ /dev/null
@@ -1,82 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object")
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd)
-    define(["../../lib/codemirror"], mod);
-  else
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode('troff', function() {
-
-  var words = {};
-
-  function tokenBase(stream) {
-    if (stream.eatSpace()) return null;
-
-    var sol = stream.sol();
-    var ch = stream.next();
-
-    if (ch === '\\') {
-      if (stream.match('fB') || stream.match('fR') || stream.match('fI') ||
-          stream.match('u')  || stream.match('d')  ||
-          stream.match('%')  || stream.match('&')) {
-        return 'string';
-      }
-      if (stream.match('m[')) {
-        stream.skipTo(']');
-        stream.next();
-        return 'string';
-      }
-      if (stream.match('s+') || stream.match('s-')) {
-        stream.eatWhile(/[\d-]/);
-        return 'string';
-      }
-      if (stream.match('\(') || stream.match('*\(')) {
-        stream.eatWhile(/[\w-]/);
-        return 'string';
-      }
-      return 'string';
-    }
-    if (sol && (ch === '.' || ch === '\'')) {
-      if (stream.eat('\\') && stream.eat('\"')) {
-        stream.skipToEnd();
-        return 'comment';
-      }
-    }
-    if (sol && ch === '.') {
-      if (stream.match('B ') || stream.match('I ') || stream.match('R ')) {
-        return 'attribute';
-      }
-      if (stream.match('TH ') || stream.match('SH ') || stream.match('SS ') || stream.match('HP ')) {
-        stream.skipToEnd();
-        return 'quote';
-      }
-      if ((stream.match(/[A-Z]/) && stream.match(/[A-Z]/)) || (stream.match(/[a-z]/) && stream.match(/[a-z]/))) {
-        return 'attribute';
-      }
-    }
-    stream.eatWhile(/[\w-]/);
-    var cur = stream.current();
-    return words.hasOwnProperty(cur) ? words[cur] : null;
-  }
-
-  function tokenize(stream, state) {
-    return (state.tokens[0] || tokenBase) (stream, state);
-  };
-
-  return {
-    startState: function() {return {tokens:[]};},
-    token: function(stream, state) {
-      return tokenize(stream, state);
-    }
-  };
-});
-
-CodeMirror.defineMIME('troff', 'troff');
-
-});
diff --git a/www/code/codemirror-5.7/mode/ttcn-cfg/index.html b/www/code/codemirror-5.7/mode/ttcn-cfg/index.html
deleted file mode 100644
index 4a4cd4571..000000000
--- a/www/code/codemirror-5.7/mode/ttcn-cfg/index.html
+++ /dev/null
@@ -1,115 +0,0 @@
-
-
-CodeMirror: TTCN-CFG mode
-
-
-
-
-
-
-
-
-
    
-    
    TTCN-CFG example
    
-    
    
-        
-    
    
-
-    
-    
    
-    
    Language: Testing and Test Control Notation -
-        Configuration files
-        (TTCN-CFG)
-    
    
-    
    MIME types defined: text/x-ttcn-cfg.
    
-
-    
    
-    
    The development of this mode has been sponsored by Ericsson
-    .
    
-    
    Coded by Asmelash Tsegay Gebretsadkan 
    
-
    
-
diff --git a/www/code/codemirror-5.7/mode/ttcn-cfg/ttcn-cfg.js b/www/code/codemirror-5.7/mode/ttcn-cfg/ttcn-cfg.js
deleted file mode 100644
index e10805119..000000000
--- a/www/code/codemirror-5.7/mode/ttcn-cfg/ttcn-cfg.js
+++ /dev/null
@@ -1,214 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("ttcn-cfg", function(config, parserConfig) {
-    var indentUnit = config.indentUnit,
-        keywords = parserConfig.keywords || {},
-        fileNCtrlMaskOptions = parserConfig.fileNCtrlMaskOptions || {},
-        externalCommands = parserConfig.externalCommands || {},
-        multiLineStrings = parserConfig.multiLineStrings,
-        indentStatements = parserConfig.indentStatements !== false;
-    var isOperatorChar = /[\|]/;
-    var curPunc;
-
-    function tokenBase(stream, state) {
-      var ch = stream.next();
-      if (ch == '"' || ch == "'") {
-        state.tokenize = tokenString(ch);
-        return state.tokenize(stream, state);
-      }
-      if (/[:=]/.test(ch)) {
-        curPunc = ch;
-        return "punctuation";
-      }
-      if (ch == "#"){
-        stream.skipToEnd();
-        return "comment";
-      }
-      if (/\d/.test(ch)) {
-        stream.eatWhile(/[\w\.]/);
-        return "number";
-      }
-      if (isOperatorChar.test(ch)) {
-        stream.eatWhile(isOperatorChar);
-        return "operator";
-      }
-      if (ch == "["){
-        stream.eatWhile(/[\w_\]]/);
-        return "number sectionTitle";
-      }
-
-      stream.eatWhile(/[\w\$_]/);
-      var cur = stream.current();
-      if (keywords.propertyIsEnumerable(cur)) return "keyword";
-      if (fileNCtrlMaskOptions.propertyIsEnumerable(cur))
-        return "negative fileNCtrlMaskOptions";
-      if (externalCommands.propertyIsEnumerable(cur)) return "negative externalCommands";
-
-      return "variable";
-    }
-
-    function tokenString(quote) {
-      return function(stream, state) {
-        var escaped = false, next, end = false;
-        while ((next = stream.next()) != null) {
-          if (next == quote && !escaped){
-            var afterNext = stream.peek();
-            //look if the character if the quote is like the B in '10100010'B
-            if (afterNext){
-              afterNext = afterNext.toLowerCase();
-              if(afterNext == "b" || afterNext == "h" || afterNext == "o")
-                stream.next();
-            }
-            end = true; break;
-          }
-          escaped = !escaped && next == "\\";
-        }
-        if (end || !(escaped || multiLineStrings))
-          state.tokenize = null;
-        return "string";
-      };
-    }
-
-    function Context(indented, column, type, align, prev) {
-      this.indented = indented;
-      this.column = column;
-      this.type = type;
-      this.align = align;
-      this.prev = prev;
-    }
-    function pushContext(state, col, type) {
-      var indent = state.indented;
-      if (state.context && state.context.type == "statement")
-        indent = state.context.indented;
-      return state.context = new Context(indent, col, type, null, state.context);
-    }
-    function popContext(state) {
-      var t = state.context.type;
-      if (t == ")" || t == "]" || t == "}")
-        state.indented = state.context.indented;
-      return state.context = state.context.prev;
-    }
-
-    //Interface
-    return {
-      startState: function(basecolumn) {
-        return {
-          tokenize: null,
-          context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-          indented: 0,
-          startOfLine: true
-        };
-      },
-
-      token: function(stream, state) {
-        var ctx = state.context;
-        if (stream.sol()) {
-          if (ctx.align == null) ctx.align = false;
-          state.indented = stream.indentation();
-          state.startOfLine = true;
-        }
-        if (stream.eatSpace()) return null;
-        curPunc = null;
-        var style = (state.tokenize || tokenBase)(stream, state);
-        if (style == "comment") return style;
-        if (ctx.align == null) ctx.align = true;
-
-        if ((curPunc == ";" || curPunc == ":" || curPunc == ",")
-            && ctx.type == "statement"){
-          popContext(state);
-        }
-        else if (curPunc == "{") pushContext(state, stream.column(), "}");
-        else if (curPunc == "[") pushContext(state, stream.column(), "]");
-        else if (curPunc == "(") pushContext(state, stream.column(), ")");
-        else if (curPunc == "}") {
-          while (ctx.type == "statement") ctx = popContext(state);
-          if (ctx.type == "}") ctx = popContext(state);
-          while (ctx.type == "statement") ctx = popContext(state);
-        }
-        else if (curPunc == ctx.type) popContext(state);
-        else if (indentStatements && (((ctx.type == "}" || ctx.type == "top")
-            && curPunc != ';') || (ctx.type == "statement"
-            && curPunc == "newstatement")))
-          pushContext(state, stream.column(), "statement");
-        state.startOfLine = false;
-        return style;
-      },
-
-      electricChars: "{}",
-      lineComment: "#",
-      fold: "brace"
-    };
-  });
-
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i)
-      obj[words[i]] = true;
-    return obj;
-  }
-
-  CodeMirror.defineMIME("text/x-ttcn-cfg", {
-    name: "ttcn-cfg",
-    keywords: words("Yes No LogFile FileMask ConsoleMask AppendFile" +
-    " TimeStampFormat LogEventTypes SourceInfoFormat" +
-    " LogEntityName LogSourceInfo DiskFullAction" +
-    " LogFileNumber LogFileSize MatchingHints Detailed" +
-    " Compact SubCategories Stack Single None Seconds" +
-    " DateTime Time Stop Error Retry Delete TCPPort KillTimer" +
-    " NumHCs UnixSocketsEnabled LocalAddress"),
-    fileNCtrlMaskOptions: words("TTCN_EXECUTOR TTCN_ERROR TTCN_WARNING" +
-    " TTCN_PORTEVENT TTCN_TIMEROP TTCN_VERDICTOP" +
-    " TTCN_DEFAULTOP TTCN_TESTCASE TTCN_ACTION" +
-    " TTCN_USER TTCN_FUNCTION TTCN_STATISTICS" +
-    " TTCN_PARALLEL TTCN_MATCHING TTCN_DEBUG" +
-    " EXECUTOR ERROR WARNING PORTEVENT TIMEROP" +
-    " VERDICTOP DEFAULTOP TESTCASE ACTION USER" +
-    " FUNCTION STATISTICS PARALLEL MATCHING DEBUG" +
-    " LOG_ALL LOG_NOTHING ACTION_UNQUALIFIED" +
-    " DEBUG_ENCDEC DEBUG_TESTPORT" +
-    " DEBUG_UNQUALIFIED DEFAULTOP_ACTIVATE" +
-    " DEFAULTOP_DEACTIVATE DEFAULTOP_EXIT" +
-    " DEFAULTOP_UNQUALIFIED ERROR_UNQUALIFIED" +
-    " EXECUTOR_COMPONENT EXECUTOR_CONFIGDATA" +
-    " EXECUTOR_EXTCOMMAND EXECUTOR_LOGOPTIONS" +
-    " EXECUTOR_RUNTIME EXECUTOR_UNQUALIFIED" +
-    " FUNCTION_RND FUNCTION_UNQUALIFIED" +
-    " MATCHING_DONE MATCHING_MCSUCCESS" +
-    " MATCHING_MCUNSUCC MATCHING_MMSUCCESS" +
-    " MATCHING_MMUNSUCC MATCHING_PCSUCCESS" +
-    " MATCHING_PCUNSUCC MATCHING_PMSUCCESS" +
-    " MATCHING_PMUNSUCC MATCHING_PROBLEM" +
-    " MATCHING_TIMEOUT MATCHING_UNQUALIFIED" +
-    " PARALLEL_PORTCONN PARALLEL_PORTMAP" +
-    " PARALLEL_PTC PARALLEL_UNQUALIFIED" +
-    " PORTEVENT_DUALRECV PORTEVENT_DUALSEND" +
-    " PORTEVENT_MCRECV PORTEVENT_MCSEND" +
-    " PORTEVENT_MMRECV PORTEVENT_MMSEND" +
-    " PORTEVENT_MQUEUE PORTEVENT_PCIN" +
-    " PORTEVENT_PCOUT PORTEVENT_PMIN" +
-    " PORTEVENT_PMOUT PORTEVENT_PQUEUE" +
-    " PORTEVENT_STATE PORTEVENT_UNQUALIFIED" +
-    " STATISTICS_UNQUALIFIED STATISTICS_VERDICT" +
-    " TESTCASE_FINISH TESTCASE_START" +
-    " TESTCASE_UNQUALIFIED TIMEROP_GUARD" +
-    " TIMEROP_READ TIMEROP_START TIMEROP_STOP" +
-    " TIMEROP_TIMEOUT TIMEROP_UNQUALIFIED" +
-    " USER_UNQUALIFIED VERDICTOP_FINAL" +
-    " VERDICTOP_GETVERDICT VERDICTOP_SETVERDICT" +
-    " VERDICTOP_UNQUALIFIED WARNING_UNQUALIFIED"),
-    externalCommands: words("BeginControlPart EndControlPart BeginTestCase" +
-    " EndTestCase"),
-    multiLineStrings: true
-  });
-});
\ No newline at end of file
diff --git a/www/code/codemirror-5.7/mode/ttcn/index.html b/www/code/codemirror-5.7/mode/ttcn/index.html
deleted file mode 100644
index f1ef81131..000000000
--- a/www/code/codemirror-5.7/mode/ttcn/index.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-CodeMirror: TTCN mode
-
-
-
-
-
-
-
-
-
    
-    
    TTCN example
    
-    
    
-        
-    
    
-
-    
-    
    
-    
    Language: Testing and Test Control Notation
-        (TTCN)
-    
    
-    
    MIME types defined: text/x-ttcn,
-        text/x-ttcn3, text/x-ttcnpp.
    
-    
    
-    
    The development of this mode has been sponsored by Ericsson
-    .
    
-    
    Coded by Asmelash Tsegay Gebretsadkan 
    
-
    
-
diff --git a/www/code/codemirror-5.7/mode/ttcn/ttcn.js b/www/code/codemirror-5.7/mode/ttcn/ttcn.js
deleted file mode 100644
index 305185177..000000000
--- a/www/code/codemirror-5.7/mode/ttcn/ttcn.js
+++ /dev/null
@@ -1,283 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("ttcn", function(config, parserConfig) {
-    var indentUnit = config.indentUnit,
-        keywords = parserConfig.keywords || {},
-        builtin = parserConfig.builtin || {},
-        timerOps = parserConfig.timerOps || {},
-        portOps  = parserConfig.portOps || {},
-        configOps = parserConfig.configOps || {},
-        verdictOps = parserConfig.verdictOps || {},
-        sutOps = parserConfig.sutOps || {},
-        functionOps = parserConfig.functionOps || {},
-
-        verdictConsts = parserConfig.verdictConsts || {},
-        booleanConsts = parserConfig.booleanConsts || {},
-        otherConsts   = parserConfig.otherConsts || {},
-
-        types = parserConfig.types || {},
-        visibilityModifiers = parserConfig.visibilityModifiers || {},
-        templateMatch = parserConfig.templateMatch || {},
-        multiLineStrings = parserConfig.multiLineStrings,
-        indentStatements = parserConfig.indentStatements !== false;
-    var isOperatorChar = /[+\-*&@=<>!\/]/;
-    var curPunc;
-
-    function tokenBase(stream, state) {
-      var ch = stream.next();
-
-      if (ch == '"' || ch == "'") {
-        state.tokenize = tokenString(ch);
-        return state.tokenize(stream, state);
-      }
-      if (/[\[\]{}\(\),;\\:\?\.]/.test(ch)) {
-        curPunc = ch;
-        return "punctuation";
-      }
-      if (ch == "#"){
-        stream.skipToEnd();
-        return "atom preprocessor";
-      }
-      if (ch == "%"){
-        stream.eatWhile(/\b/);
-        return "atom ttcn3Macros";
-      }
-      if (/\d/.test(ch)) {
-        stream.eatWhile(/[\w\.]/);
-        return "number";
-      }
-      if (ch == "/") {
-        if (stream.eat("*")) {
-          state.tokenize = tokenComment;
-          return tokenComment(stream, state);
-        }
-        if (stream.eat("/")) {
-          stream.skipToEnd();
-          return "comment";
-        }
-      }
-      if (isOperatorChar.test(ch)) {
-        if(ch == "@"){
-          if(stream.match("try") || stream.match("catch")
-              || stream.match("lazy")){
-            return "keyword";
-          }
-        }
-        stream.eatWhile(isOperatorChar);
-        return "operator";
-      }
-      stream.eatWhile(/[\w\$_\xa1-\uffff]/);
-      var cur = stream.current();
-
-      if (keywords.propertyIsEnumerable(cur)) return "keyword";
-      if (builtin.propertyIsEnumerable(cur)) return "builtin";
-
-      if (timerOps.propertyIsEnumerable(cur)) return "def timerOps";
-      if (configOps.propertyIsEnumerable(cur)) return "def configOps";
-      if (verdictOps.propertyIsEnumerable(cur)) return "def verdictOps";
-      if (portOps.propertyIsEnumerable(cur)) return "def portOps";
-      if (sutOps.propertyIsEnumerable(cur)) return "def sutOps";
-      if (functionOps.propertyIsEnumerable(cur)) return "def functionOps";
-
-      if (verdictConsts.propertyIsEnumerable(cur)) return "string verdictConsts";
-      if (booleanConsts.propertyIsEnumerable(cur)) return "string booleanConsts";
-      if (otherConsts.propertyIsEnumerable(cur)) return "string otherConsts";
-
-      if (types.propertyIsEnumerable(cur)) return "builtin types";
-      if (visibilityModifiers.propertyIsEnumerable(cur))
-        return "builtin visibilityModifiers";
-      if (templateMatch.propertyIsEnumerable(cur)) return "atom templateMatch";
-
-      return "variable";
-    }
-
-    function tokenString(quote) {
-      return function(stream, state) {
-        var escaped = false, next, end = false;
-        while ((next = stream.next()) != null) {
-          if (next == quote && !escaped){
-            var afterQuote = stream.peek();
-            //look if the character after the quote is like the B in '10100010'B
-            if (afterQuote){
-              afterQuote = afterQuote.toLowerCase();
-              if(afterQuote == "b" || afterQuote == "h" || afterQuote == "o")
-                stream.next();
-            }
-            end = true; break;
-          }
-          escaped = !escaped && next == "\\";
-        }
-        if (end || !(escaped || multiLineStrings))
-          state.tokenize = null;
-        return "string";
-      };
-    }
-
-    function tokenComment(stream, state) {
-      var maybeEnd = false, ch;
-      while (ch = stream.next()) {
-        if (ch == "/" && maybeEnd) {
-          state.tokenize = null;
-          break;
-        }
-        maybeEnd = (ch == "*");
-      }
-      return "comment";
-    }
-
-    function Context(indented, column, type, align, prev) {
-      this.indented = indented;
-      this.column = column;
-      this.type = type;
-      this.align = align;
-      this.prev = prev;
-    }
-
-    function pushContext(state, col, type) {
-      var indent = state.indented;
-      if (state.context && state.context.type == "statement")
-        indent = state.context.indented;
-      return state.context = new Context(indent, col, type, null, state.context);
-    }
-
-    function popContext(state) {
-      var t = state.context.type;
-      if (t == ")" || t == "]" || t == "}")
-        state.indented = state.context.indented;
-      return state.context = state.context.prev;
-    }
-
-    //Interface
-    return {
-      startState: function(basecolumn) {
-        return {
-          tokenize: null,
-          context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-          indented: 0,
-          startOfLine: true
-        };
-      },
-
-      token: function(stream, state) {
-        var ctx = state.context;
-        if (stream.sol()) {
-          if (ctx.align == null) ctx.align = false;
-          state.indented = stream.indentation();
-          state.startOfLine = true;
-        }
-        if (stream.eatSpace()) return null;
-        curPunc = null;
-        var style = (state.tokenize || tokenBase)(stream, state);
-        if (style == "comment") return style;
-        if (ctx.align == null) ctx.align = true;
-
-        if ((curPunc == ";" || curPunc == ":" || curPunc == ",")
-            && ctx.type == "statement"){
-          popContext(state);
-        }
-        else if (curPunc == "{") pushContext(state, stream.column(), "}");
-        else if (curPunc == "[") pushContext(state, stream.column(), "]");
-        else if (curPunc == "(") pushContext(state, stream.column(), ")");
-        else if (curPunc == "}") {
-          while (ctx.type == "statement") ctx = popContext(state);
-          if (ctx.type == "}") ctx = popContext(state);
-          while (ctx.type == "statement") ctx = popContext(state);
-        }
-        else if (curPunc == ctx.type) popContext(state);
-        else if (indentStatements &&
-            (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') ||
-            (ctx.type == "statement" && curPunc == "newstatement")))
-          pushContext(state, stream.column(), "statement");
-
-        state.startOfLine = false;
-
-        return style;
-      },
-
-      electricChars: "{}",
-      blockCommentStart: "/*",
-      blockCommentEnd: "*/",
-      lineComment: "//",
-      fold: "brace"
-    };
-  });
-
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  function def(mimes, mode) {
-    if (typeof mimes == "string") mimes = [mimes];
-    var words = [];
-    function add(obj) {
-      if (obj) for (var prop in obj) if (obj.hasOwnProperty(prop))
-        words.push(prop);
-    }
-
-    add(mode.keywords);
-    add(mode.builtin);
-    add(mode.timerOps);
-    add(mode.portOps);
-
-    if (words.length) {
-      mode.helperType = mimes[0];
-      CodeMirror.registerHelper("hintWords", mimes[0], words);
-    }
-
-    for (var i = 0; i < mimes.length; ++i)
-      CodeMirror.defineMIME(mimes[i], mode);
-  }
-
-  def(["text/x-ttcn", "text/x-ttcn3", "text/x-ttcnpp"], {
-    name: "ttcn",
-    keywords: words("activate address alive all alt altstep and and4b any" +
-    " break case component const continue control deactivate" +
-    " display do else encode enumerated except exception" +
-    " execute extends extension external for from function" +
-    " goto group if import in infinity inout interleave" +
-    " label language length log match message mixed mod" +
-    " modifies module modulepar mtc noblock not not4b nowait" +
-    " of on optional or or4b out override param pattern port" +
-    " procedure record recursive rem repeat return runs select" +
-    " self sender set signature system template testcase to" +
-    " type union value valueof var variant while with xor xor4b"),
-    builtin: words("bit2hex bit2int bit2oct bit2str char2int char2oct encvalue" +
-    " decomp decvalue float2int float2str hex2bit hex2int" +
-    " hex2oct hex2str int2bit int2char int2float int2hex" +
-    " int2oct int2str int2unichar isbound ischosen ispresent" +
-    " isvalue lengthof log2str oct2bit oct2char oct2hex oct2int" +
-    " oct2str regexp replace rnd sizeof str2bit str2float" +
-    " str2hex str2int str2oct substr unichar2int unichar2char" +
-    " enum2int"),
-    types: words("anytype bitstring boolean char charstring default float" +
-    " hexstring integer objid octetstring universal verdicttype timer"),
-    timerOps: words("read running start stop timeout"),
-    portOps: words("call catch check clear getcall getreply halt raise receive" +
-    " reply send trigger"),
-    configOps: words("create connect disconnect done kill killed map unmap"),
-    verdictOps: words("getverdict setverdict"),
-    sutOps: words("action"),
-    functionOps: words("apply derefers refers"),
-
-    verdictConsts: words("error fail inconc none pass"),
-    booleanConsts: words("true false"),
-    otherConsts: words("null NULL omit"),
-
-    visibilityModifiers: words("private public friend"),
-    templateMatch: words("complement ifpresent subset superset permutation"),
-    multiLineStrings: true
-  });
-});
diff --git a/www/code/codemirror-5.7/mode/turtle/index.html b/www/code/codemirror-5.7/mode/turtle/index.html
deleted file mode 100644
index a4962b617..000000000
--- a/www/code/codemirror-5.7/mode/turtle/index.html
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-CodeMirror: Turtle mode
-
-
-
-
-
-
-
-
-
-
    
-
    Turtle mode
    
-
    
-    
-
-    
    MIME types defined: text/turtle.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/turtle/turtle.js b/www/code/codemirror-5.7/mode/turtle/turtle.js
deleted file mode 100644
index 0988f0a44..000000000
--- a/www/code/codemirror-5.7/mode/turtle/turtle.js
+++ /dev/null
@@ -1,162 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("turtle", function(config) {
-  var indentUnit = config.indentUnit;
-  var curPunc;
-
-  function wordRegexp(words) {
-    return new RegExp("^(?:" + words.join("|") + ")$", "i");
-  }
-  var ops = wordRegexp([]);
-  var keywords = wordRegexp(["@prefix", "@base", "a"]);
-  var operatorChars = /[*+\-<>=&|]/;
-
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    curPunc = null;
-    if (ch == "<" && !stream.match(/^[\s\u00a0=]/, false)) {
-      stream.match(/^[^\s\u00a0>]*>?/);
-      return "atom";
-    }
-    else if (ch == "\"" || ch == "'") {
-      state.tokenize = tokenLiteral(ch);
-      return state.tokenize(stream, state);
-    }
-    else if (/[{}\(\),\.;\[\]]/.test(ch)) {
-      curPunc = ch;
-      return null;
-    }
-    else if (ch == "#") {
-      stream.skipToEnd();
-      return "comment";
-    }
-    else if (operatorChars.test(ch)) {
-      stream.eatWhile(operatorChars);
-      return null;
-    }
-    else if (ch == ":") {
-          return "operator";
-        } else {
-      stream.eatWhile(/[_\w\d]/);
-      if(stream.peek() == ":") {
-        return "variable-3";
-      } else {
-             var word = stream.current();
-
-             if(keywords.test(word)) {
-                        return "meta";
-             }
-
-             if(ch >= "A" && ch <= "Z") {
-                    return "comment";
-                 } else {
-                        return "keyword";
-                 }
-      }
-      var word = stream.current();
-      if (ops.test(word))
-        return null;
-      else if (keywords.test(word))
-        return "meta";
-      else
-        return "variable";
-    }
-  }
-
-  function tokenLiteral(quote) {
-    return function(stream, state) {
-      var escaped = false, ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == quote && !escaped) {
-          state.tokenize = tokenBase;
-          break;
-        }
-        escaped = !escaped && ch == "\\";
-      }
-      return "string";
-    };
-  }
-
-  function pushContext(state, type, col) {
-    state.context = {prev: state.context, indent: state.indent, col: col, type: type};
-  }
-  function popContext(state) {
-    state.indent = state.context.indent;
-    state.context = state.context.prev;
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: tokenBase,
-              context: null,
-              indent: 0,
-              col: 0};
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (state.context && state.context.align == null) state.context.align = false;
-        state.indent = stream.indentation();
-      }
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-
-      if (style != "comment" && state.context && state.context.align == null && state.context.type != "pattern") {
-        state.context.align = true;
-      }
-
-      if (curPunc == "(") pushContext(state, ")", stream.column());
-      else if (curPunc == "[") pushContext(state, "]", stream.column());
-      else if (curPunc == "{") pushContext(state, "}", stream.column());
-      else if (/[\]\}\)]/.test(curPunc)) {
-        while (state.context && state.context.type == "pattern") popContext(state);
-        if (state.context && curPunc == state.context.type) popContext(state);
-      }
-      else if (curPunc == "." && state.context && state.context.type == "pattern") popContext(state);
-      else if (/atom|string|variable/.test(style) && state.context) {
-        if (/[\}\]]/.test(state.context.type))
-          pushContext(state, "pattern", stream.column());
-        else if (state.context.type == "pattern" && !state.context.align) {
-          state.context.align = true;
-          state.context.col = stream.column();
-        }
-      }
-
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      var firstChar = textAfter && textAfter.charAt(0);
-      var context = state.context;
-      if (/[\]\}]/.test(firstChar))
-        while (context && context.type == "pattern") context = context.prev;
-
-      var closing = context && firstChar == context.type;
-      if (!context)
-        return 0;
-      else if (context.type == "pattern")
-        return context.col;
-      else if (context.align)
-        return context.col + (closing ? 0 : 1);
-      else
-        return context.indent + (closing ? 0 : indentUnit);
-    },
-
-    lineComment: "#"
-  };
-});
-
-CodeMirror.defineMIME("text/turtle", "turtle");
-
-});
diff --git a/www/code/codemirror-5.7/mode/twig/index.html b/www/code/codemirror-5.7/mode/twig/index.html
deleted file mode 100644
index 02493a5cb..000000000
--- a/www/code/codemirror-5.7/mode/twig/index.html
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-CodeMirror: Twig mode
-
-
-
-
-
-
-
-
-
-
    
-
    Twig mode
    
-
    
-    
-  
    
diff --git a/www/code/codemirror-5.7/mode/twig/twig.js b/www/code/codemirror-5.7/mode/twig/twig.js
deleted file mode 100644
index aa676dc48..000000000
--- a/www/code/codemirror-5.7/mode/twig/twig.js
+++ /dev/null
@@ -1,132 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  CodeMirror.defineMode("twig", function() {
-    var keywords = ["and", "as", "autoescape", "endautoescape", "block", "do", "endblock", "else", "elseif", "extends", "for", "endfor", "embed", "endembed", "filter", "endfilter", "flush", "from", "if", "endif", "in", "is", "include", "import", "not", "or", "set", "spaceless", "endspaceless", "with", "endwith", "trans", "endtrans", "blocktrans", "endblocktrans", "macro", "endmacro", "use", "verbatim", "endverbatim"],
-        operator = /^[+\-*&%=<>!?|~^]/,
-        sign = /^[:\[\(\{]/,
-        atom = ["true", "false", "null", "empty", "defined", "divisibleby", "divisible by", "even", "odd", "iterable", "sameas", "same as"],
-        number = /^(\d[+\-\*\/])?\d+(\.\d+)?/;
-
-    keywords = new RegExp("((" + keywords.join(")|(") + "))\\b");
-    atom = new RegExp("((" + atom.join(")|(") + "))\\b");
-
-    function tokenBase (stream, state) {
-      var ch = stream.peek();
-
-      //Comment
-      if (state.incomment) {
-        if (!stream.skipTo("#}")) {
-          stream.skipToEnd();
-        } else {
-          stream.eatWhile(/\#|}/);
-          state.incomment = false;
-        }
-        return "comment";
-      //Tag
-      } else if (state.intag) {
-        //After operator
-        if (state.operator) {
-          state.operator = false;
-          if (stream.match(atom)) {
-            return "atom";
-          }
-          if (stream.match(number)) {
-            return "number";
-          }
-        }
-        //After sign
-        if (state.sign) {
-          state.sign = false;
-          if (stream.match(atom)) {
-            return "atom";
-          }
-          if (stream.match(number)) {
-            return "number";
-          }
-        }
-
-        if (state.instring) {
-          if (ch == state.instring) {
-            state.instring = false;
-          }
-          stream.next();
-          return "string";
-        } else if (ch == "'" || ch == '"') {
-          state.instring = ch;
-          stream.next();
-          return "string";
-        } else if (stream.match(state.intag + "}") || stream.eat("-") && stream.match(state.intag + "}")) {
-          state.intag = false;
-          return "tag";
-        } else if (stream.match(operator)) {
-          state.operator = true;
-          return "operator";
-        } else if (stream.match(sign)) {
-          state.sign = true;
-        } else {
-          if (stream.eat(" ") || stream.sol()) {
-            if (stream.match(keywords)) {
-              return "keyword";
-            }
-            if (stream.match(atom)) {
-              return "atom";
-            }
-            if (stream.match(number)) {
-              return "number";
-            }
-            if (stream.sol()) {
-              stream.next();
-            }
-          } else {
-            stream.next();
-          }
-
-        }
-        return "variable";
-      } else if (stream.eat("{")) {
-        if (ch = stream.eat("#")) {
-          state.incomment = true;
-          if (!stream.skipTo("#}")) {
-            stream.skipToEnd();
-          } else {
-            stream.eatWhile(/\#|}/);
-            state.incomment = false;
-          }
-          return "comment";
-        //Open tag
-        } else if (ch = stream.eat(/\{|%/)) {
-          //Cache close tag
-          state.intag = ch;
-          if (ch == "{") {
-            state.intag = "}";
-          }
-          stream.eat("-");
-          return "tag";
-        }
-      }
-      stream.next();
-    };
-
-    return {
-      startState: function () {
-        return {};
-      },
-      token: function (stream, state) {
-        return tokenBase(stream, state);
-      }
-    };
-  });
-
-  CodeMirror.defineMIME("text/x-twig", "twig");
-});
diff --git a/www/code/codemirror-5.7/mode/vb/index.html b/www/code/codemirror-5.7/mode/vb/index.html
deleted file mode 100644
index adcc44fd3..000000000
--- a/www/code/codemirror-5.7/mode/vb/index.html
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-CodeMirror: VB.NET mode
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    VB.NET mode
    
-
-
-
-  
    
-  
-  
    
-  
    
-  
    MIME type defined: text/x-vb.
    
-
-
    
diff --git a/www/code/codemirror-5.7/mode/vb/vb.js b/www/code/codemirror-5.7/mode/vb/vb.js
deleted file mode 100644
index d78f91f70..000000000
--- a/www/code/codemirror-5.7/mode/vb/vb.js
+++ /dev/null
@@ -1,276 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("vb", function(conf, parserConf) {
-    var ERRORCLASS = 'error';
-
-    function wordRegexp(words) {
-        return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
-    }
-
-    var singleOperators = new RegExp("^[\\+\\-\\*/%&\\\\|\\^~<>!]");
-    var singleDelimiters = new RegExp('^[\\(\\)\\[\\]\\{\\}@,:`=;\\.]');
-    var doubleOperators = new RegExp("^((==)|(<>)|(<=)|(>=)|(<>)|(<<)|(>>)|(//)|(\\*\\*))");
-    var doubleDelimiters = new RegExp("^((\\+=)|(\\-=)|(\\*=)|(%=)|(/=)|(&=)|(\\|=)|(\\^=))");
-    var tripleDelimiters = new RegExp("^((//=)|(>>=)|(<<=)|(\\*\\*=))");
-    var identifiers = new RegExp("^[_A-Za-z][_A-Za-z0-9]*");
-
-    var openingKeywords = ['class','module', 'sub','enum','select','while','if','function',  'get','set','property', 'try'];
-    var middleKeywords = ['else','elseif','case', 'catch'];
-    var endKeywords = ['next','loop'];
-
-    var operatorKeywords = ['and', 'or', 'not', 'xor', 'in'];
-    var wordOperators = wordRegexp(operatorKeywords);
-    var commonKeywords = ['as', 'dim', 'break',  'continue','optional', 'then',  'until',
-                          'goto', 'byval','byref','new','handles','property', 'return',
-                          'const','private', 'protected', 'friend', 'public', 'shared', 'static', 'true','false'];
-    var commontypes = ['integer','string','double','decimal','boolean','short','char', 'float','single'];
-
-    var keywords = wordRegexp(commonKeywords);
-    var types = wordRegexp(commontypes);
-    var stringPrefixes = '"';
-
-    var opening = wordRegexp(openingKeywords);
-    var middle = wordRegexp(middleKeywords);
-    var closing = wordRegexp(endKeywords);
-    var doubleClosing = wordRegexp(['end']);
-    var doOpening = wordRegexp(['do']);
-
-    var indentInfo = null;
-
-    CodeMirror.registerHelper("hintWords", "vb", openingKeywords.concat(middleKeywords).concat(endKeywords)
-                                .concat(operatorKeywords).concat(commonKeywords).concat(commontypes));
-
-    function indent(_stream, state) {
-      state.currentIndent++;
-    }
-
-    function dedent(_stream, state) {
-      state.currentIndent--;
-    }
-    // tokenizers
-    function tokenBase(stream, state) {
-        if (stream.eatSpace()) {
-            return null;
-        }
-
-        var ch = stream.peek();
-
-        // Handle Comments
-        if (ch === "'") {
-            stream.skipToEnd();
-            return 'comment';
-        }
-
-
-        // Handle Number Literals
-        if (stream.match(/^((&H)|(&O))?[0-9\.a-f]/i, false)) {
-            var floatLiteral = false;
-            // Floats
-            if (stream.match(/^\d*\.\d+F?/i)) { floatLiteral = true; }
-            else if (stream.match(/^\d+\.\d*F?/)) { floatLiteral = true; }
-            else if (stream.match(/^\.\d+F?/)) { floatLiteral = true; }
-
-            if (floatLiteral) {
-                // Float literals may be "imaginary"
-                stream.eat(/J/i);
-                return 'number';
-            }
-            // Integers
-            var intLiteral = false;
-            // Hex
-            if (stream.match(/^&H[0-9a-f]+/i)) { intLiteral = true; }
-            // Octal
-            else if (stream.match(/^&O[0-7]+/i)) { intLiteral = true; }
-            // Decimal
-            else if (stream.match(/^[1-9]\d*F?/)) {
-                // Decimal literals may be "imaginary"
-                stream.eat(/J/i);
-                // TODO - Can you have imaginary longs?
-                intLiteral = true;
-            }
-            // Zero by itself with no other piece of number.
-            else if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
-            if (intLiteral) {
-                // Integer literals may be "long"
-                stream.eat(/L/i);
-                return 'number';
-            }
-        }
-
-        // Handle Strings
-        if (stream.match(stringPrefixes)) {
-            state.tokenize = tokenStringFactory(stream.current());
-            return state.tokenize(stream, state);
-        }
-
-        // Handle operators and Delimiters
-        if (stream.match(tripleDelimiters) || stream.match(doubleDelimiters)) {
-            return null;
-        }
-        if (stream.match(doubleOperators)
-            || stream.match(singleOperators)
-            || stream.match(wordOperators)) {
-            return 'operator';
-        }
-        if (stream.match(singleDelimiters)) {
-            return null;
-        }
-        if (stream.match(doOpening)) {
-            indent(stream,state);
-            state.doInCurrentLine = true;
-            return 'keyword';
-        }
-        if (stream.match(opening)) {
-            if (! state.doInCurrentLine)
-              indent(stream,state);
-            else
-              state.doInCurrentLine = false;
-            return 'keyword';
-        }
-        if (stream.match(middle)) {
-            return 'keyword';
-        }
-
-        if (stream.match(doubleClosing)) {
-            dedent(stream,state);
-            dedent(stream,state);
-            return 'keyword';
-        }
-        if (stream.match(closing)) {
-            dedent(stream,state);
-            return 'keyword';
-        }
-
-        if (stream.match(types)) {
-            return 'keyword';
-        }
-
-        if (stream.match(keywords)) {
-            return 'keyword';
-        }
-
-        if (stream.match(identifiers)) {
-            return 'variable';
-        }
-
-        // Handle non-detected items
-        stream.next();
-        return ERRORCLASS;
-    }
-
-    function tokenStringFactory(delimiter) {
-        var singleline = delimiter.length == 1;
-        var OUTCLASS = 'string';
-
-        return function(stream, state) {
-            while (!stream.eol()) {
-                stream.eatWhile(/[^'"]/);
-                if (stream.match(delimiter)) {
-                    state.tokenize = tokenBase;
-                    return OUTCLASS;
-                } else {
-                    stream.eat(/['"]/);
-                }
-            }
-            if (singleline) {
-                if (parserConf.singleLineStringErrors) {
-                    return ERRORCLASS;
-                } else {
-                    state.tokenize = tokenBase;
-                }
-            }
-            return OUTCLASS;
-        };
-    }
-
-
-    function tokenLexer(stream, state) {
-        var style = state.tokenize(stream, state);
-        var current = stream.current();
-
-        // Handle '.' connected identifiers
-        if (current === '.') {
-            style = state.tokenize(stream, state);
-            current = stream.current();
-            if (style === 'variable') {
-                return 'variable';
-            } else {
-                return ERRORCLASS;
-            }
-        }
-
-
-        var delimiter_index = '[({'.indexOf(current);
-        if (delimiter_index !== -1) {
-            indent(stream, state );
-        }
-        if (indentInfo === 'dedent') {
-            if (dedent(stream, state)) {
-                return ERRORCLASS;
-            }
-        }
-        delimiter_index = '])}'.indexOf(current);
-        if (delimiter_index !== -1) {
-            if (dedent(stream, state)) {
-                return ERRORCLASS;
-            }
-        }
-
-        return style;
-    }
-
-    var external = {
-        electricChars:"dDpPtTfFeE ",
-        startState: function() {
-            return {
-              tokenize: tokenBase,
-              lastToken: null,
-              currentIndent: 0,
-              nextLineIndent: 0,
-              doInCurrentLine: false
-
-
-          };
-        },
-
-        token: function(stream, state) {
-            if (stream.sol()) {
-              state.currentIndent += state.nextLineIndent;
-              state.nextLineIndent = 0;
-              state.doInCurrentLine = 0;
-            }
-            var style = tokenLexer(stream, state);
-
-            state.lastToken = {style:style, content: stream.current()};
-
-
-
-            return style;
-        },
-
-        indent: function(state, textAfter) {
-            var trueText = textAfter.replace(/^\s+|\s+$/g, '') ;
-            if (trueText.match(closing) || trueText.match(doubleClosing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1);
-            if(state.currentIndent < 0) return 0;
-            return state.currentIndent * conf.indentUnit;
-        },
-
-        lineComment: "'"
-    };
-    return external;
-});
-
-CodeMirror.defineMIME("text/x-vb", "vb");
-
-});
diff --git a/www/code/codemirror-5.7/mode/vbscript/index.html b/www/code/codemirror-5.7/mode/vbscript/index.html
deleted file mode 100644
index ad7532d7d..000000000
--- a/www/code/codemirror-5.7/mode/vbscript/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-CodeMirror: VBScript mode
-
-
-
-
-
-
-
-
-
-
    
-
    VBScript mode
    
-
-
-
    
-
-    
-
-    
    MIME types defined: text/vbscript.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/vbscript/vbscript.js b/www/code/codemirror-5.7/mode/vbscript/vbscript.js
deleted file mode 100644
index b66df2239..000000000
--- a/www/code/codemirror-5.7/mode/vbscript/vbscript.js
+++ /dev/null
@@ -1,350 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-/*
-For extra ASP classic objects, initialize CodeMirror instance with this option:
-    isASP: true
-
-E.G.:
-    var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        isASP: true
-      });
-*/
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("vbscript", function(conf, parserConf) {
-    var ERRORCLASS = 'error';
-
-    function wordRegexp(words) {
-        return new RegExp("^((" + words.join(")|(") + "))\\b", "i");
-    }
-
-    var singleOperators = new RegExp("^[\\+\\-\\*/&\\\\\\^<>=]");
-    var doubleOperators = new RegExp("^((<>)|(<=)|(>=))");
-    var singleDelimiters = new RegExp('^[\\.,]');
-    var brakets = new RegExp('^[\\(\\)]');
-    var identifiers = new RegExp("^[A-Za-z][_A-Za-z0-9]*");
-
-    var openingKeywords = ['class','sub','select','while','if','function', 'property', 'with', 'for'];
-    var middleKeywords = ['else','elseif','case'];
-    var endKeywords = ['next','loop','wend'];
-
-    var wordOperators = wordRegexp(['and', 'or', 'not', 'xor', 'is', 'mod', 'eqv', 'imp']);
-    var commonkeywords = ['dim', 'redim', 'then',  'until', 'randomize',
-                          'byval','byref','new','property', 'exit', 'in',
-                          'const','private', 'public',
-                          'get','set','let', 'stop', 'on error resume next', 'on error goto 0', 'option explicit', 'call', 'me'];
-
-    //This list was from: http://msdn.microsoft.com/en-us/library/f8tbc79x(v=vs.84).aspx
-    var atomWords = ['true', 'false', 'nothing', 'empty', 'null'];
-    //This list was from: http://msdn.microsoft.com/en-us/library/3ca8tfek(v=vs.84).aspx
-    var builtinFuncsWords = ['abs', 'array', 'asc', 'atn', 'cbool', 'cbyte', 'ccur', 'cdate', 'cdbl', 'chr', 'cint', 'clng', 'cos', 'csng', 'cstr', 'date', 'dateadd', 'datediff', 'datepart',
-                        'dateserial', 'datevalue', 'day', 'escape', 'eval', 'execute', 'exp', 'filter', 'formatcurrency', 'formatdatetime', 'formatnumber', 'formatpercent', 'getlocale', 'getobject',
-                        'getref', 'hex', 'hour', 'inputbox', 'instr', 'instrrev', 'int', 'fix', 'isarray', 'isdate', 'isempty', 'isnull', 'isnumeric', 'isobject', 'join', 'lbound', 'lcase', 'left',
-                        'len', 'loadpicture', 'log', 'ltrim', 'rtrim', 'trim', 'maths', 'mid', 'minute', 'month', 'monthname', 'msgbox', 'now', 'oct', 'replace', 'rgb', 'right', 'rnd', 'round',
-                        'scriptengine', 'scriptenginebuildversion', 'scriptenginemajorversion', 'scriptengineminorversion', 'second', 'setlocale', 'sgn', 'sin', 'space', 'split', 'sqr', 'strcomp',
-                        'string', 'strreverse', 'tan', 'time', 'timer', 'timeserial', 'timevalue', 'typename', 'ubound', 'ucase', 'unescape', 'vartype', 'weekday', 'weekdayname', 'year'];
-
-    //This list was from: http://msdn.microsoft.com/en-us/library/ydz4cfk3(v=vs.84).aspx
-    var builtinConsts = ['vbBlack', 'vbRed', 'vbGreen', 'vbYellow', 'vbBlue', 'vbMagenta', 'vbCyan', 'vbWhite', 'vbBinaryCompare', 'vbTextCompare',
-                         'vbSunday', 'vbMonday', 'vbTuesday', 'vbWednesday', 'vbThursday', 'vbFriday', 'vbSaturday', 'vbUseSystemDayOfWeek', 'vbFirstJan1', 'vbFirstFourDays', 'vbFirstFullWeek',
-                         'vbGeneralDate', 'vbLongDate', 'vbShortDate', 'vbLongTime', 'vbShortTime', 'vbObjectError',
-                         'vbOKOnly', 'vbOKCancel', 'vbAbortRetryIgnore', 'vbYesNoCancel', 'vbYesNo', 'vbRetryCancel', 'vbCritical', 'vbQuestion', 'vbExclamation', 'vbInformation', 'vbDefaultButton1', 'vbDefaultButton2',
-                         'vbDefaultButton3', 'vbDefaultButton4', 'vbApplicationModal', 'vbSystemModal', 'vbOK', 'vbCancel', 'vbAbort', 'vbRetry', 'vbIgnore', 'vbYes', 'vbNo',
-                         'vbCr', 'VbCrLf', 'vbFormFeed', 'vbLf', 'vbNewLine', 'vbNullChar', 'vbNullString', 'vbTab', 'vbVerticalTab', 'vbUseDefault', 'vbTrue', 'vbFalse',
-                         'vbEmpty', 'vbNull', 'vbInteger', 'vbLong', 'vbSingle', 'vbDouble', 'vbCurrency', 'vbDate', 'vbString', 'vbObject', 'vbError', 'vbBoolean', 'vbVariant', 'vbDataObject', 'vbDecimal', 'vbByte', 'vbArray'];
-    //This list was from: http://msdn.microsoft.com/en-us/library/hkc375ea(v=vs.84).aspx
-    var builtinObjsWords = ['WScript', 'err', 'debug', 'RegExp'];
-    var knownProperties = ['description', 'firstindex', 'global', 'helpcontext', 'helpfile', 'ignorecase', 'length', 'number', 'pattern', 'source', 'value', 'count'];
-    var knownMethods = ['clear', 'execute', 'raise', 'replace', 'test', 'write', 'writeline', 'close', 'open', 'state', 'eof', 'update', 'addnew', 'end', 'createobject', 'quit'];
-
-    var aspBuiltinObjsWords = ['server', 'response', 'request', 'session', 'application'];
-    var aspKnownProperties = ['buffer', 'cachecontrol', 'charset', 'contenttype', 'expires', 'expiresabsolute', 'isclientconnected', 'pics', 'status', //response
-                              'clientcertificate', 'cookies', 'form', 'querystring', 'servervariables', 'totalbytes', //request
-                              'contents', 'staticobjects', //application
-                              'codepage', 'lcid', 'sessionid', 'timeout', //session
-                              'scripttimeout']; //server
-    var aspKnownMethods = ['addheader', 'appendtolog', 'binarywrite', 'end', 'flush', 'redirect', //response
-                           'binaryread', //request
-                           'remove', 'removeall', 'lock', 'unlock', //application
-                           'abandon', //session
-                           'getlasterror', 'htmlencode', 'mappath', 'transfer', 'urlencode']; //server
-
-    var knownWords = knownMethods.concat(knownProperties);
-
-    builtinObjsWords = builtinObjsWords.concat(builtinConsts);
-
-    if (conf.isASP){
-        builtinObjsWords = builtinObjsWords.concat(aspBuiltinObjsWords);
-        knownWords = knownWords.concat(aspKnownMethods, aspKnownProperties);
-    };
-
-    var keywords = wordRegexp(commonkeywords);
-    var atoms = wordRegexp(atomWords);
-    var builtinFuncs = wordRegexp(builtinFuncsWords);
-    var builtinObjs = wordRegexp(builtinObjsWords);
-    var known = wordRegexp(knownWords);
-    var stringPrefixes = '"';
-
-    var opening = wordRegexp(openingKeywords);
-    var middle = wordRegexp(middleKeywords);
-    var closing = wordRegexp(endKeywords);
-    var doubleClosing = wordRegexp(['end']);
-    var doOpening = wordRegexp(['do']);
-    var noIndentWords = wordRegexp(['on error resume next', 'exit']);
-    var comment = wordRegexp(['rem']);
-
-
-    function indent(_stream, state) {
-      state.currentIndent++;
-    }
-
-    function dedent(_stream, state) {
-      state.currentIndent--;
-    }
-    // tokenizers
-    function tokenBase(stream, state) {
-        if (stream.eatSpace()) {
-            return 'space';
-            //return null;
-        }
-
-        var ch = stream.peek();
-
-        // Handle Comments
-        if (ch === "'") {
-            stream.skipToEnd();
-            return 'comment';
-        }
-        if (stream.match(comment)){
-            stream.skipToEnd();
-            return 'comment';
-        }
-
-
-        // Handle Number Literals
-        if (stream.match(/^((&H)|(&O))?[0-9\.]/i, false) && !stream.match(/^((&H)|(&O))?[0-9\.]+[a-z_]/i, false)) {
-            var floatLiteral = false;
-            // Floats
-            if (stream.match(/^\d*\.\d+/i)) { floatLiteral = true; }
-            else if (stream.match(/^\d+\.\d*/)) { floatLiteral = true; }
-            else if (stream.match(/^\.\d+/)) { floatLiteral = true; }
-
-            if (floatLiteral) {
-                // Float literals may be "imaginary"
-                stream.eat(/J/i);
-                return 'number';
-            }
-            // Integers
-            var intLiteral = false;
-            // Hex
-            if (stream.match(/^&H[0-9a-f]+/i)) { intLiteral = true; }
-            // Octal
-            else if (stream.match(/^&O[0-7]+/i)) { intLiteral = true; }
-            // Decimal
-            else if (stream.match(/^[1-9]\d*F?/)) {
-                // Decimal literals may be "imaginary"
-                stream.eat(/J/i);
-                // TODO - Can you have imaginary longs?
-                intLiteral = true;
-            }
-            // Zero by itself with no other piece of number.
-            else if (stream.match(/^0(?![\dx])/i)) { intLiteral = true; }
-            if (intLiteral) {
-                // Integer literals may be "long"
-                stream.eat(/L/i);
-                return 'number';
-            }
-        }
-
-        // Handle Strings
-        if (stream.match(stringPrefixes)) {
-            state.tokenize = tokenStringFactory(stream.current());
-            return state.tokenize(stream, state);
-        }
-
-        // Handle operators and Delimiters
-        if (stream.match(doubleOperators)
-            || stream.match(singleOperators)
-            || stream.match(wordOperators)) {
-            return 'operator';
-        }
-        if (stream.match(singleDelimiters)) {
-            return null;
-        }
-
-        if (stream.match(brakets)) {
-            return "bracket";
-        }
-
-        if (stream.match(noIndentWords)) {
-            state.doInCurrentLine = true;
-
-            return 'keyword';
-        }
-
-        if (stream.match(doOpening)) {
-            indent(stream,state);
-            state.doInCurrentLine = true;
-
-            return 'keyword';
-        }
-        if (stream.match(opening)) {
-            if (! state.doInCurrentLine)
-              indent(stream,state);
-            else
-              state.doInCurrentLine = false;
-
-            return 'keyword';
-        }
-        if (stream.match(middle)) {
-            return 'keyword';
-        }
-
-
-        if (stream.match(doubleClosing)) {
-            dedent(stream,state);
-            dedent(stream,state);
-
-            return 'keyword';
-        }
-        if (stream.match(closing)) {
-            if (! state.doInCurrentLine)
-              dedent(stream,state);
-            else
-              state.doInCurrentLine = false;
-
-            return 'keyword';
-        }
-
-        if (stream.match(keywords)) {
-            return 'keyword';
-        }
-
-        if (stream.match(atoms)) {
-            return 'atom';
-        }
-
-        if (stream.match(known)) {
-            return 'variable-2';
-        }
-
-        if (stream.match(builtinFuncs)) {
-            return 'builtin';
-        }
-
-        if (stream.match(builtinObjs)){
-            return 'variable-2';
-        }
-
-        if (stream.match(identifiers)) {
-            return 'variable';
-        }
-
-        // Handle non-detected items
-        stream.next();
-        return ERRORCLASS;
-    }
-
-    function tokenStringFactory(delimiter) {
-        var singleline = delimiter.length == 1;
-        var OUTCLASS = 'string';
-
-        return function(stream, state) {
-            while (!stream.eol()) {
-                stream.eatWhile(/[^'"]/);
-                if (stream.match(delimiter)) {
-                    state.tokenize = tokenBase;
-                    return OUTCLASS;
-                } else {
-                    stream.eat(/['"]/);
-                }
-            }
-            if (singleline) {
-                if (parserConf.singleLineStringErrors) {
-                    return ERRORCLASS;
-                } else {
-                    state.tokenize = tokenBase;
-                }
-            }
-            return OUTCLASS;
-        };
-    }
-
-
-    function tokenLexer(stream, state) {
-        var style = state.tokenize(stream, state);
-        var current = stream.current();
-
-        // Handle '.' connected identifiers
-        if (current === '.') {
-            style = state.tokenize(stream, state);
-
-            current = stream.current();
-            if (style && (style.substr(0, 8) === 'variable' || style==='builtin' || style==='keyword')){//|| knownWords.indexOf(current.substring(1)) > -1) {
-                if (style === 'builtin' || style === 'keyword') style='variable';
-                if (knownWords.indexOf(current.substr(1)) > -1) style='variable-2';
-
-                return style;
-            } else {
-                return ERRORCLASS;
-            }
-        }
-
-        return style;
-    }
-
-    var external = {
-        electricChars:"dDpPtTfFeE ",
-        startState: function() {
-            return {
-              tokenize: tokenBase,
-              lastToken: null,
-              currentIndent: 0,
-              nextLineIndent: 0,
-              doInCurrentLine: false,
-              ignoreKeyword: false
-
-
-          };
-        },
-
-        token: function(stream, state) {
-            if (stream.sol()) {
-              state.currentIndent += state.nextLineIndent;
-              state.nextLineIndent = 0;
-              state.doInCurrentLine = 0;
-            }
-            var style = tokenLexer(stream, state);
-
-            state.lastToken = {style:style, content: stream.current()};
-
-            if (style==='space') style=null;
-
-            return style;
-        },
-
-        indent: function(state, textAfter) {
-            var trueText = textAfter.replace(/^\s+|\s+$/g, '') ;
-            if (trueText.match(closing) || trueText.match(doubleClosing) || trueText.match(middle)) return conf.indentUnit*(state.currentIndent-1);
-            if(state.currentIndent < 0) return 0;
-            return state.currentIndent * conf.indentUnit;
-        }
-
-    };
-    return external;
-});
-
-CodeMirror.defineMIME("text/vbscript", "vbscript");
-
-});
diff --git a/www/code/codemirror-5.7/mode/velocity/index.html b/www/code/codemirror-5.7/mode/velocity/index.html
deleted file mode 100644
index 274787866..000000000
--- a/www/code/codemirror-5.7/mode/velocity/index.html
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-CodeMirror: Velocity mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    Velocity mode
    
-
    
-    
-
-    
    MIME types defined: text/velocity.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/velocity/velocity.js b/www/code/codemirror-5.7/mode/velocity/velocity.js
deleted file mode 100644
index 8fc4f95d0..000000000
--- a/www/code/codemirror-5.7/mode/velocity/velocity.js
+++ /dev/null
@@ -1,201 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("velocity", function() {
-    function parseWords(str) {
-        var obj = {}, words = str.split(" ");
-        for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-        return obj;
-    }
-
-    var keywords = parseWords("#end #else #break #stop #[[ #]] " +
-                              "#{end} #{else} #{break} #{stop}");
-    var functions = parseWords("#if #elseif #foreach #set #include #parse #macro #define #evaluate " +
-                               "#{if} #{elseif} #{foreach} #{set} #{include} #{parse} #{macro} #{define} #{evaluate}");
-    var specials = parseWords("$foreach.count $foreach.hasNext $foreach.first $foreach.last $foreach.topmost $foreach.parent.count $foreach.parent.hasNext $foreach.parent.first $foreach.parent.last $foreach.parent $velocityCount $!bodyContent $bodyContent");
-    var isOperatorChar = /[+\-*&%=<>!?:\/|]/;
-
-    function chain(stream, state, f) {
-        state.tokenize = f;
-        return f(stream, state);
-    }
-    function tokenBase(stream, state) {
-        var beforeParams = state.beforeParams;
-        state.beforeParams = false;
-        var ch = stream.next();
-        // start of unparsed string?
-        if ((ch == "'") && state.inParams) {
-            state.lastTokenWasBuiltin = false;
-            return chain(stream, state, tokenString(ch));
-        }
-        // start of parsed string?
-        else if ((ch == '"')) {
-            state.lastTokenWasBuiltin = false;
-            if (state.inString) {
-                state.inString = false;
-                return "string";
-            }
-            else if (state.inParams)
-                return chain(stream, state, tokenString(ch));
-        }
-        // is it one of the special signs []{}().,;? Seperator?
-        else if (/[\[\]{}\(\),;\.]/.test(ch)) {
-            if (ch == "(" && beforeParams)
-                state.inParams = true;
-            else if (ch == ")") {
-                state.inParams = false;
-                state.lastTokenWasBuiltin = true;
-            }
-            return null;
-        }
-        // start of a number value?
-        else if (/\d/.test(ch)) {
-            state.lastTokenWasBuiltin = false;
-            stream.eatWhile(/[\w\.]/);
-            return "number";
-        }
-        // multi line comment?
-        else if (ch == "#" && stream.eat("*")) {
-            state.lastTokenWasBuiltin = false;
-            return chain(stream, state, tokenComment);
-        }
-        // unparsed content?
-        else if (ch == "#" && stream.match(/ *\[ *\[/)) {
-            state.lastTokenWasBuiltin = false;
-            return chain(stream, state, tokenUnparsed);
-        }
-        // single line comment?
-        else if (ch == "#" && stream.eat("#")) {
-            state.lastTokenWasBuiltin = false;
-            stream.skipToEnd();
-            return "comment";
-        }
-        // variable?
-        else if (ch == "$") {
-            stream.eatWhile(/[\w\d\$_\.{}]/);
-            // is it one of the specials?
-            if (specials && specials.propertyIsEnumerable(stream.current())) {
-                return "keyword";
-            }
-            else {
-                state.lastTokenWasBuiltin = true;
-                state.beforeParams = true;
-                return "builtin";
-            }
-        }
-        // is it a operator?
-        else if (isOperatorChar.test(ch)) {
-            state.lastTokenWasBuiltin = false;
-            stream.eatWhile(isOperatorChar);
-            return "operator";
-        }
-        else {
-            // get the whole word
-            stream.eatWhile(/[\w\$_{}@]/);
-            var word = stream.current();
-            // is it one of the listed keywords?
-            if (keywords && keywords.propertyIsEnumerable(word))
-                return "keyword";
-            // is it one of the listed functions?
-            if (functions && functions.propertyIsEnumerable(word) ||
-                    (stream.current().match(/^#@?[a-z0-9_]+ *$/i) && stream.peek()=="(") &&
-                     !(functions && functions.propertyIsEnumerable(word.toLowerCase()))) {
-                state.beforeParams = true;
-                state.lastTokenWasBuiltin = false;
-                return "keyword";
-            }
-            if (state.inString) {
-                state.lastTokenWasBuiltin = false;
-                return "string";
-            }
-            if (stream.pos > word.length && stream.string.charAt(stream.pos-word.length-1)=="." && state.lastTokenWasBuiltin)
-                return "builtin";
-            // default: just a "word"
-            state.lastTokenWasBuiltin = false;
-            return null;
-        }
-    }
-
-    function tokenString(quote) {
-        return function(stream, state) {
-            var escaped = false, next, end = false;
-            while ((next = stream.next()) != null) {
-                if ((next == quote) && !escaped) {
-                    end = true;
-                    break;
-                }
-                if (quote=='"' && stream.peek() == '$' && !escaped) {
-                    state.inString = true;
-                    end = true;
-                    break;
-                }
-                escaped = !escaped && next == "\\";
-            }
-            if (end) state.tokenize = tokenBase;
-            return "string";
-        };
-    }
-
-    function tokenComment(stream, state) {
-        var maybeEnd = false, ch;
-        while (ch = stream.next()) {
-            if (ch == "#" && maybeEnd) {
-                state.tokenize = tokenBase;
-                break;
-            }
-            maybeEnd = (ch == "*");
-        }
-        return "comment";
-    }
-
-    function tokenUnparsed(stream, state) {
-        var maybeEnd = 0, ch;
-        while (ch = stream.next()) {
-            if (ch == "#" && maybeEnd == 2) {
-                state.tokenize = tokenBase;
-                break;
-            }
-            if (ch == "]")
-                maybeEnd++;
-            else if (ch != " ")
-                maybeEnd = 0;
-        }
-        return "meta";
-    }
-    // Interface
-
-    return {
-        startState: function() {
-            return {
-                tokenize: tokenBase,
-                beforeParams: false,
-                inParams: false,
-                inString: false,
-                lastTokenWasBuiltin: false
-            };
-        },
-
-        token: function(stream, state) {
-            if (stream.eatSpace()) return null;
-            return state.tokenize(stream, state);
-        },
-        blockCommentStart: "#*",
-        blockCommentEnd: "*#",
-        lineComment: "##",
-        fold: "velocity"
-    };
-});
-
-CodeMirror.defineMIME("text/velocity", "velocity");
-
-});
diff --git a/www/code/codemirror-5.7/mode/verilog/index.html b/www/code/codemirror-5.7/mode/verilog/index.html
deleted file mode 100644
index 96b3d6476..000000000
--- a/www/code/codemirror-5.7/mode/verilog/index.html
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-CodeMirror: Verilog/SystemVerilog mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    SystemVerilog mode
    
-
-
    
-
-
-
-
    
-Syntax highlighting and indentation for the Verilog and SystemVerilog languages (IEEE 1800).
-
    Configuration options:
    
-  
      
-    
    • noIndentKeywords - List of keywords which should not cause identation to increase. E.g. ["package", "module"]. Default: None
      • 
-  
    
-
    
-
-
    MIME types defined: text/x-verilog and text/x-systemverilog.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/verilog/test.js b/www/code/codemirror-5.7/mode/verilog/test.js
deleted file mode 100644
index 9c8c09494..000000000
--- a/www/code/codemirror-5.7/mode/verilog/test.js
+++ /dev/null
@@ -1,273 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 4}, "verilog");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("binary_literals",
-     "[number 1'b0]",
-     "[number 1'b1]",
-     "[number 1'bx]",
-     "[number 1'bz]",
-     "[number 1'bX]",
-     "[number 1'bZ]",
-     "[number 1'B0]",
-     "[number 1'B1]",
-     "[number 1'Bx]",
-     "[number 1'Bz]",
-     "[number 1'BX]",
-     "[number 1'BZ]",
-     "[number 1'b0]",
-     "[number 1'b1]",
-     "[number 2'b01]",
-     "[number 2'bxz]",
-     "[number 2'b11]",
-     "[number 2'b10]",
-     "[number 2'b1Z]",
-     "[number 12'b0101_0101_0101]",
-     "[number 1'b 0]",
-     "[number 'b0101]"
-  );
-
-  MT("octal_literals",
-     "[number 3'o7]",
-     "[number 3'O7]",
-     "[number 3'so7]",
-     "[number 3'SO7]"
-  );
-
-  MT("decimal_literals",
-     "[number 0]",
-     "[number 1]",
-     "[number 7]",
-     "[number 123_456]",
-     "[number 'd33]",
-     "[number 8'd255]",
-     "[number 8'D255]",
-     "[number 8'sd255]",
-     "[number 8'SD255]",
-     "[number 32'd123]",
-     "[number 32 'd123]",
-     "[number 32 'd 123]"
-  );
-
-  MT("hex_literals",
-     "[number 4'h0]",
-     "[number 4'ha]",
-     "[number 4'hF]",
-     "[number 4'hx]",
-     "[number 4'hz]",
-     "[number 4'hX]",
-     "[number 4'hZ]",
-     "[number 32'hdc78]",
-     "[number 32'hDC78]",
-     "[number 32 'hDC78]",
-     "[number 32'h DC78]",
-     "[number 32 'h DC78]",
-     "[number 32'h44x7]",
-     "[number 32'hFFF?]"
-  );
-
-  MT("real_number_literals",
-     "[number 1.2]",
-     "[number 0.1]",
-     "[number 2394.26331]",
-     "[number 1.2E12]",
-     "[number 1.2e12]",
-     "[number 1.30e-2]",
-     "[number 0.1e-0]",
-     "[number 23E10]",
-     "[number 29E-2]",
-     "[number 236.123_763_e-12]"
-  );
-
-  MT("operators",
-     "[meta ^]"
-  );
-
-  MT("keywords",
-     "[keyword logic]",
-     "[keyword logic] [variable foo]",
-     "[keyword reg] [variable abc]"
-  );
-
-  MT("variables",
-     "[variable _leading_underscore]",
-     "[variable _if]",
-     "[number 12] [variable foo]",
-     "[variable foo] [number 14]"
-  );
-
-  MT("tick_defines",
-     "[def `FOO]",
-     "[def `foo]",
-     "[def `FOO_bar]"
-  );
-
-  MT("system_calls",
-     "[meta $display]",
-     "[meta $vpi_printf]"
-  );
-
-  MT("line_comment", "[comment // Hello world]");
-
-  // Alignment tests
-  MT("align_port_map_style1",
-     /**
-      * mod mod(.a(a),
-      *         .b(b)
-      *        );
-      */
-     "[variable mod] [variable mod][bracket (].[variable a][bracket (][variable a][bracket )],",
-     "        .[variable b][bracket (][variable b][bracket )]",
-     "       [bracket )];",
-     ""
-  );
-
-  MT("align_port_map_style2",
-     /**
-      * mod mod(
-      *     .a(a),
-      *     .b(b)
-      * );
-      */
-     "[variable mod] [variable mod][bracket (]",
-     "    .[variable a][bracket (][variable a][bracket )],",
-     "    .[variable b][bracket (][variable b][bracket )]",
-     "[bracket )];",
-     ""
-  );
-
-  // Indentation tests
-  MT("indent_single_statement_if",
-      "[keyword if] [bracket (][variable foo][bracket )]",
-      "    [keyword break];",
-      ""
-  );
-
-  MT("no_indent_after_single_line_if",
-      "[keyword if] [bracket (][variable foo][bracket )] [keyword break];",
-      ""
-  );
-
-  MT("indent_after_if_begin_same_line",
-      "[keyword if] [bracket (][variable foo][bracket )] [keyword begin]",
-      "    [keyword break];",
-      "    [keyword break];",
-      "[keyword end]",
-      ""
-  );
-
-  MT("indent_after_if_begin_next_line",
-      "[keyword if] [bracket (][variable foo][bracket )]",
-      "    [keyword begin]",
-      "        [keyword break];",
-      "        [keyword break];",
-      "    [keyword end]",
-      ""
-  );
-
-  MT("indent_single_statement_if_else",
-      "[keyword if] [bracket (][variable foo][bracket )]",
-      "    [keyword break];",
-      "[keyword else]",
-      "    [keyword break];",
-      ""
-  );
-
-  MT("indent_if_else_begin_same_line",
-      "[keyword if] [bracket (][variable foo][bracket )] [keyword begin]",
-      "    [keyword break];",
-      "    [keyword break];",
-      "[keyword end] [keyword else] [keyword begin]",
-      "    [keyword break];",
-      "    [keyword break];",
-      "[keyword end]",
-      ""
-  );
-
-  MT("indent_if_else_begin_next_line",
-      "[keyword if] [bracket (][variable foo][bracket )]",
-      "    [keyword begin]",
-      "        [keyword break];",
-      "        [keyword break];",
-      "    [keyword end]",
-      "[keyword else]",
-      "    [keyword begin]",
-      "        [keyword break];",
-      "        [keyword break];",
-      "    [keyword end]",
-      ""
-  );
-
-  MT("indent_if_nested_without_begin",
-      "[keyword if] [bracket (][variable foo][bracket )]",
-      "    [keyword if] [bracket (][variable foo][bracket )]",
-      "        [keyword if] [bracket (][variable foo][bracket )]",
-      "            [keyword break];",
-      ""
-  );
-
-  MT("indent_case",
-      "[keyword case] [bracket (][variable state][bracket )]",
-      "    [variable FOO]:",
-      "        [keyword break];",
-      "    [variable BAR]:",
-      "        [keyword break];",
-      "[keyword endcase]",
-      ""
-  );
-
-  MT("unindent_after_end_with_preceding_text",
-      "[keyword begin]",
-      "    [keyword break]; [keyword end]",
-      ""
-  );
-
-  MT("export_function_one_line_does_not_indent",
-     "[keyword export] [string \"DPI-C\"] [keyword function] [variable helloFromSV];",
-     ""
-  );
-
-  MT("export_task_one_line_does_not_indent",
-     "[keyword export] [string \"DPI-C\"] [keyword task] [variable helloFromSV];",
-     ""
-  );
-
-  MT("export_function_two_lines_indents_properly",
-    "[keyword export]",
-    "    [string \"DPI-C\"] [keyword function] [variable helloFromSV];",
-    ""
-  );
-
-  MT("export_task_two_lines_indents_properly",
-    "[keyword export]",
-    "    [string \"DPI-C\"] [keyword task] [variable helloFromSV];",
-    ""
-  );
-
-  MT("import_function_one_line_does_not_indent",
-    "[keyword import] [string \"DPI-C\"] [keyword function] [variable helloFromC];",
-    ""
-  );
-
-  MT("import_task_one_line_does_not_indent",
-    "[keyword import] [string \"DPI-C\"] [keyword task] [variable helloFromC];",
-    ""
-  );
-
-  MT("import_package_single_line_does_not_indent",
-    "[keyword import] [variable p]::[variable x];",
-    "[keyword import] [variable p]::[variable y];",
-    ""
-  );
-
-  MT("covergoup_with_function_indents_properly",
-    "[keyword covergroup] [variable cg] [keyword with] [keyword function] [variable sample][bracket (][keyword bit] [variable b][bracket )];",
-    "    [variable c] : [keyword coverpoint] [variable c];",
-    "[keyword endgroup]: [variable cg]",
-    ""
-  );
-
-})();
diff --git a/www/code/codemirror-5.7/mode/verilog/verilog.js b/www/code/codemirror-5.7/mode/verilog/verilog.js
deleted file mode 100644
index 9d2a4cd58..000000000
--- a/www/code/codemirror-5.7/mode/verilog/verilog.js
+++ /dev/null
@@ -1,537 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("verilog", function(config, parserConfig) {
-
-  var indentUnit = config.indentUnit,
-      statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
-      dontAlignCalls = parserConfig.dontAlignCalls,
-      noIndentKeywords = parserConfig.noIndentKeywords || [],
-      multiLineStrings = parserConfig.multiLineStrings,
-      hooks = parserConfig.hooks || {};
-
-  function words(str) {
-    var obj = {}, words = str.split(" ");
-    for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
-    return obj;
-  }
-
-  /**
-   * Keywords from IEEE 1800-2012
-   */
-  var keywords = words(
-    "accept_on alias always always_comb always_ff always_latch and assert assign assume automatic before begin bind " +
-    "bins binsof bit break buf bufif0 bufif1 byte case casex casez cell chandle checker class clocking cmos config " +
-    "const constraint context continue cover covergroup coverpoint cross deassign default defparam design disable " +
-    "dist do edge else end endcase endchecker endclass endclocking endconfig endfunction endgenerate endgroup " +
-    "endinterface endmodule endpackage endprimitive endprogram endproperty endspecify endsequence endtable endtask " +
-    "enum event eventually expect export extends extern final first_match for force foreach forever fork forkjoin " +
-    "function generate genvar global highz0 highz1 if iff ifnone ignore_bins illegal_bins implements implies import " +
-    "incdir include initial inout input inside instance int integer interconnect interface intersect join join_any " +
-    "join_none large let liblist library local localparam logic longint macromodule matches medium modport module " +
-    "nand negedge nettype new nexttime nmos nor noshowcancelled not notif0 notif1 null or output package packed " +
-    "parameter pmos posedge primitive priority program property protected pull0 pull1 pulldown pullup " +
-    "pulsestyle_ondetect pulsestyle_onevent pure rand randc randcase randsequence rcmos real realtime ref reg " +
-    "reject_on release repeat restrict return rnmos rpmos rtran rtranif0 rtranif1 s_always s_eventually s_nexttime " +
-    "s_until s_until_with scalared sequence shortint shortreal showcancelled signed small soft solve specify " +
-    "specparam static string strong strong0 strong1 struct super supply0 supply1 sync_accept_on sync_reject_on " +
-    "table tagged task this throughout time timeprecision timeunit tran tranif0 tranif1 tri tri0 tri1 triand trior " +
-    "trireg type typedef union unique unique0 unsigned until until_with untyped use uwire var vectored virtual void " +
-    "wait wait_order wand weak weak0 weak1 while wildcard wire with within wor xnor xor");
-
-  /** Operators from IEEE 1800-2012
-     unary_operator ::=
-       + | - | ! | ~ | & | ~& | | | ~| | ^ | ~^ | ^~
-     binary_operator ::=
-       + | - | * | / | % | == | != | === | !== | ==? | !=? | && | || | **
-       | < | <= | > | >= | & | | | ^ | ^~ | ~^ | >> | << | >>> | <<<
-       | -> | <->
-     inc_or_dec_operator ::= ++ | --
-     unary_module_path_operator ::=
-       ! | ~ | & | ~& | | | ~| | ^ | ~^ | ^~
-     binary_module_path_operator ::=
-       == | != | && | || | & | | | ^ | ^~ | ~^
-  */
-  var isOperatorChar = /[\+\-\*\/!~&|^%=?:]/;
-  var isBracketChar = /[\[\]{}()]/;
-
-  var unsignedNumber = /\d[0-9_]*/;
-  var decimalLiteral = /\d*\s*'s?d\s*\d[0-9_]*/i;
-  var binaryLiteral = /\d*\s*'s?b\s*[xz01][xz01_]*/i;
-  var octLiteral = /\d*\s*'s?o\s*[xz0-7][xz0-7_]*/i;
-  var hexLiteral = /\d*\s*'s?h\s*[0-9a-fxz?][0-9a-fxz?_]*/i;
-  var realLiteral = /(\d[\d_]*(\.\d[\d_]*)?E-?[\d_]+)|(\d[\d_]*\.\d[\d_]*)/i;
-
-  var closingBracketOrWord = /^((\w+)|[)}\]])/;
-  var closingBracket = /[)}\]]/;
-
-  var curPunc;
-  var curKeyword;
-
-  // Block openings which are closed by a matching keyword in the form of ("end" + keyword)
-  // E.g. "task" => "endtask"
-  var blockKeywords = words(
-    "case checker class clocking config function generate interface module package" +
-    "primitive program property specify sequence table task"
-  );
-
-  // Opening/closing pairs
-  var openClose = {};
-  for (var keyword in blockKeywords) {
-    openClose[keyword] = "end" + keyword;
-  }
-  openClose["begin"] = "end";
-  openClose["casex"] = "endcase";
-  openClose["casez"] = "endcase";
-  openClose["do"   ] = "while";
-  openClose["fork" ] = "join;join_any;join_none";
-  openClose["covergroup"] = "endgroup";
-
-  for (var i in noIndentKeywords) {
-    var keyword = noIndentKeywords[i];
-    if (openClose[keyword]) {
-      openClose[keyword] = undefined;
-    }
-  }
-
-  // Keywords which open statements that are ended with a semi-colon
-  var statementKeywords = words("always always_comb always_ff always_latch assert assign assume else export for foreach forever if import initial repeat while");
-
-  function tokenBase(stream, state) {
-    var ch = stream.peek(), style;
-    if (hooks[ch] && (style = hooks[ch](stream, state)) != false) return style;
-    if (hooks.tokenBase && (style = hooks.tokenBase(stream, state)) != false)
-      return style;
-
-    if (/[,;:\.]/.test(ch)) {
-      curPunc = stream.next();
-      return null;
-    }
-    if (isBracketChar.test(ch)) {
-      curPunc = stream.next();
-      return "bracket";
-    }
-    // Macros (tick-defines)
-    if (ch == '`') {
-      stream.next();
-      if (stream.eatWhile(/[\w\$_]/)) {
-        return "def";
-      } else {
-        return null;
-      }
-    }
-    // System calls
-    if (ch == '$') {
-      stream.next();
-      if (stream.eatWhile(/[\w\$_]/)) {
-        return "meta";
-      } else {
-        return null;
-      }
-    }
-    // Time literals
-    if (ch == '#') {
-      stream.next();
-      stream.eatWhile(/[\d_.]/);
-      return "def";
-    }
-    // Strings
-    if (ch == '"') {
-      stream.next();
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    }
-    // Comments
-    if (ch == "/") {
-      stream.next();
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      }
-      if (stream.eat("/")) {
-        stream.skipToEnd();
-        return "comment";
-      }
-      stream.backUp(1);
-    }
-
-    // Numeric literals
-    if (stream.match(realLiteral) ||
-        stream.match(decimalLiteral) ||
-        stream.match(binaryLiteral) ||
-        stream.match(octLiteral) ||
-        stream.match(hexLiteral) ||
-        stream.match(unsignedNumber) ||
-        stream.match(realLiteral)) {
-      return "number";
-    }
-
-    // Operators
-    if (stream.eatWhile(isOperatorChar)) {
-      return "meta";
-    }
-
-    // Keywords / plain variables
-    if (stream.eatWhile(/[\w\$_]/)) {
-      var cur = stream.current();
-      if (keywords[cur]) {
-        if (openClose[cur]) {
-          curPunc = "newblock";
-        }
-        if (statementKeywords[cur]) {
-          curPunc = "newstatement";
-        }
-        curKeyword = cur;
-        return "keyword";
-      }
-      return "variable";
-    }
-
-    stream.next();
-    return null;
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next, end = false;
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) {end = true; break;}
-        escaped = !escaped && next == "\\";
-      }
-      if (end || !(escaped || multiLineStrings))
-        state.tokenize = tokenBase;
-      return "string";
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return "comment";
-  }
-
-  function Context(indented, column, type, align, prev) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.align = align;
-    this.prev = prev;
-  }
-  function pushContext(state, col, type) {
-    var indent = state.indented;
-    var c = new Context(indent, col, type, null, state.context);
-    return state.context = c;
-  }
-  function popContext(state) {
-    var t = state.context.type;
-    if (t == ")" || t == "]" || t == "}") {
-      state.indented = state.context.indented;
-    }
-    return state.context = state.context.prev;
-  }
-
-  function isClosing(text, contextClosing) {
-    if (text == contextClosing) {
-      return true;
-    } else {
-      // contextClosing may be mulitple keywords separated by ;
-      var closingKeywords = contextClosing.split(";");
-      for (var i in closingKeywords) {
-        if (text == closingKeywords[i]) {
-          return true;
-        }
-      }
-      return false;
-    }
-  }
-
-  function buildElectricInputRegEx() {
-    // Reindentation should occur on any bracket char: {}()[]
-    // or on a match of any of the block closing keywords, at
-    // the end of a line
-    var allClosings = [];
-    for (var i in openClose) {
-      if (openClose[i]) {
-        var closings = openClose[i].split(";");
-        for (var j in closings) {
-          allClosings.push(closings[j]);
-        }
-      }
-    }
-    var re = new RegExp("[{}()\\[\\]]|(" + allClosings.join("|") + ")$");
-    return re;
-  }
-
-  // Interface
-  return {
-
-    // Regex to force current line to reindent
-    electricInput: buildElectricInputRegEx(),
-
-    startState: function(basecolumn) {
-      var state = {
-        tokenize: null,
-        context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
-        indented: 0,
-        startOfLine: true
-      };
-      if (hooks.startState) hooks.startState(state);
-      return state;
-    },
-
-    token: function(stream, state) {
-      var ctx = state.context;
-      if (stream.sol()) {
-        if (ctx.align == null) ctx.align = false;
-        state.indented = stream.indentation();
-        state.startOfLine = true;
-      }
-      if (hooks.token) hooks.token(stream, state);
-      if (stream.eatSpace()) return null;
-      curPunc = null;
-      curKeyword = null;
-      var style = (state.tokenize || tokenBase)(stream, state);
-      if (style == "comment" || style == "meta" || style == "variable") return style;
-      if (ctx.align == null) ctx.align = true;
-
-      if (curPunc == ctx.type) {
-        popContext(state);
-      } else if ((curPunc == ";" && ctx.type == "statement") ||
-               (ctx.type && isClosing(curKeyword, ctx.type))) {
-        ctx = popContext(state);
-        while (ctx && ctx.type == "statement") ctx = popContext(state);
-      } else if (curPunc == "{") {
-        pushContext(state, stream.column(), "}");
-      } else if (curPunc == "[") {
-        pushContext(state, stream.column(), "]");
-      } else if (curPunc == "(") {
-        pushContext(state, stream.column(), ")");
-      } else if (ctx && ctx.type == "endcase" && curPunc == ":") {
-        pushContext(state, stream.column(), "statement");
-      } else if (curPunc == "newstatement") {
-        pushContext(state, stream.column(), "statement");
-      } else if (curPunc == "newblock") {
-        if (curKeyword == "function" && ctx && (ctx.type == "statement" || ctx.type == "endgroup")) {
-          // The 'function' keyword can appear in some other contexts where it actually does not
-          // indicate a function (import/export DPI and covergroup definitions).
-          // Do nothing in this case
-        } else if (curKeyword == "task" && ctx && ctx.type == "statement") {
-          // Same thing for task
-        } else {
-          var close = openClose[curKeyword];
-          pushContext(state, stream.column(), close);
-        }
-      }
-
-      state.startOfLine = false;
-      return style;
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
-      if (hooks.indent) {
-        var fromHook = hooks.indent(state);
-        if (fromHook >= 0) return fromHook;
-      }
-      var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
-      if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
-      var closing = false;
-      var possibleClosing = textAfter.match(closingBracketOrWord);
-      if (possibleClosing)
-        closing = isClosing(possibleClosing[0], ctx.type);
-      if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
-      else if (closingBracket.test(ctx.type) && ctx.align && !dontAlignCalls) return ctx.column + (closing ? 0 : 1);
-      else if (ctx.type == ")" && !closing) return ctx.indented + statementIndentUnit;
-      else return ctx.indented + (closing ? 0 : indentUnit);
-    },
-
-    blockCommentStart: "/*",
-    blockCommentEnd: "*/",
-    lineComment: "//"
-  };
-});
-
-  CodeMirror.defineMIME("text/x-verilog", {
-    name: "verilog"
-  });
-
-  CodeMirror.defineMIME("text/x-systemverilog", {
-    name: "verilog"
-  });
-
-  // TLVVerilog mode
-
-  var tlvchScopePrefixes = {
-    ">": "property", "->": "property", "-": "hr", "|": "link", "?$": "qualifier", "?*": "qualifier",
-    "@-": "variable-3", "@": "variable-3", "?": "qualifier"
-  };
-
-  function tlvGenIndent(stream, state) {
-    var tlvindentUnit = 2;
-    var rtnIndent = -1, indentUnitRq = 0, curIndent = stream.indentation();
-    switch (state.tlvCurCtlFlowChar) {
-    case "\\":
-      curIndent = 0;
-      break;
-    case "|":
-      if (state.tlvPrevPrevCtlFlowChar == "@") {
-        indentUnitRq = -2; //-2 new pipe rq after cur pipe
-        break;
-      }
-      if (tlvchScopePrefixes[state.tlvPrevCtlFlowChar])
-        indentUnitRq = 1; // +1 new scope
-      break;
-    case "M":  // m4
-      if (state.tlvPrevPrevCtlFlowChar == "@") {
-        indentUnitRq = -2; //-2 new inst rq after  pipe
-        break;
-      }
-      if (tlvchScopePrefixes[state.tlvPrevCtlFlowChar])
-        indentUnitRq = 1; // +1 new scope
-      break;
-    case "@":
-      if (state.tlvPrevCtlFlowChar == "S")
-        indentUnitRq = -1; // new pipe stage after stmts
-      if (state.tlvPrevCtlFlowChar == "|")
-        indentUnitRq = 1; // 1st pipe stage
-      break;
-    case "S":
-      if (state.tlvPrevCtlFlowChar == "@")
-        indentUnitRq = 1; // flow in pipe stage
-      if (tlvchScopePrefixes[state.tlvPrevCtlFlowChar])
-        indentUnitRq = 1; // +1 new scope
-      break;
-    }
-    var statementIndentUnit = tlvindentUnit;
-    rtnIndent = curIndent + (indentUnitRq*statementIndentUnit);
-    return rtnIndent >= 0 ? rtnIndent : curIndent;
-  }
-
-  CodeMirror.defineMIME("text/x-tlv", {
-    name: "verilog",
-    hooks: {
-      "\\": function(stream, state) {
-        var vxIndent = 0, style = false;
-        var curPunc  = stream.string;
-        if ((stream.sol()) && ((/\\SV/.test(stream.string)) || (/\\TLV/.test(stream.string)))) {
-          curPunc = (/\\TLV_version/.test(stream.string))
-            ? "\\TLV_version" : stream.string;
-          stream.skipToEnd();
-          if (curPunc == "\\SV" && state.vxCodeActive) {state.vxCodeActive = false;};
-          if ((/\\TLV/.test(curPunc) && !state.vxCodeActive)
-            || (curPunc=="\\TLV_version" && state.vxCodeActive)) {state.vxCodeActive = true;};
-          style = "keyword";
-          state.tlvCurCtlFlowChar  = state.tlvPrevPrevCtlFlowChar
-            = state.tlvPrevCtlFlowChar = "";
-          if (state.vxCodeActive == true) {
-            state.tlvCurCtlFlowChar  = "\\";
-            vxIndent = tlvGenIndent(stream, state);
-          }
-          state.vxIndentRq = vxIndent;
-        }
-        return style;
-      },
-      tokenBase: function(stream, state) {
-        var vxIndent = 0, style = false;
-        var tlvisOperatorChar = /[\[\]=:]/;
-        var tlvkpScopePrefixs = {
-          "**":"variable-2", "*":"variable-2", "$$":"variable", "$":"variable",
-          "^^":"attribute", "^":"attribute"};
-        var ch = stream.peek();
-        var vxCurCtlFlowCharValueAtStart = state.tlvCurCtlFlowChar;
-        if (state.vxCodeActive == true) {
-          if (/[\[\]{}\(\);\:]/.test(ch)) {
-            // bypass nesting and 1 char punc
-            style = "meta";
-            stream.next();
-          } else if (ch == "/") {
-            stream.next();
-            if (stream.eat("/")) {
-              stream.skipToEnd();
-              style = "comment";
-              state.tlvCurCtlFlowChar = "S";
-            } else {
-              stream.backUp(1);
-            }
-          } else if (ch == "@") {
-            // pipeline stage
-            style = tlvchScopePrefixes[ch];
-            state.tlvCurCtlFlowChar = "@";
-            stream.next();
-            stream.eatWhile(/[\w\$_]/);
-          } else if (stream.match(/\b[mM]4+/, true)) { // match: function(pattern, consume, caseInsensitive)
-            // m4 pre proc
-            stream.skipTo("(");
-            style = "def";
-            state.tlvCurCtlFlowChar = "M";
-          } else if (ch == "!" && stream.sol()) {
-            // v stmt in tlv region
-            // state.tlvCurCtlFlowChar  = "S";
-            style = "comment";
-            stream.next();
-          } else if (tlvisOperatorChar.test(ch)) {
-            // operators
-            stream.eatWhile(tlvisOperatorChar);
-            style = "operator";
-          } else if (ch == "#") {
-            // phy hier
-            state.tlvCurCtlFlowChar  = (state.tlvCurCtlFlowChar == "")
-              ? ch : state.tlvCurCtlFlowChar;
-            stream.next();
-            stream.eatWhile(/[+-]\d/);
-            style = "tag";
-          } else if (tlvkpScopePrefixs.propertyIsEnumerable(ch)) {
-            // special TLV operators
-            style = tlvkpScopePrefixs[ch];
-            state.tlvCurCtlFlowChar = state.tlvCurCtlFlowChar == "" ? "S" : state.tlvCurCtlFlowChar;  // stmt
-            stream.next();
-            stream.match(/[a-zA-Z_0-9]+/);
-          } else if (style = tlvchScopePrefixes[ch] || false) {
-            // special TLV operators
-            state.tlvCurCtlFlowChar = state.tlvCurCtlFlowChar == "" ? ch : state.tlvCurCtlFlowChar;
-            stream.next();
-            stream.match(/[a-zA-Z_0-9]+/);
-          }
-          if (state.tlvCurCtlFlowChar != vxCurCtlFlowCharValueAtStart) { // flow change
-            vxIndent = tlvGenIndent(stream, state);
-            state.vxIndentRq = vxIndent;
-          }
-        }
-        return style;
-      },
-      token: function(stream, state) {
-        if (state.vxCodeActive == true && stream.sol() && state.tlvCurCtlFlowChar != "") {
-          state.tlvPrevPrevCtlFlowChar = state.tlvPrevCtlFlowChar;
-          state.tlvPrevCtlFlowChar = state.tlvCurCtlFlowChar;
-          state.tlvCurCtlFlowChar = "";
-        }
-      },
-      indent: function(state) {
-        return (state.vxCodeActive == true) ? state.vxIndentRq : -1;
-      },
-      startState: function(state) {
-        state.tlvCurCtlFlowChar = "";
-        state.tlvPrevCtlFlowChar = "";
-        state.tlvPrevPrevCtlFlowChar = "";
-        state.vxCodeActive = true;
-        state.vxIndentRq = 0;
-      }
-    }
-  });
-});
diff --git a/www/code/codemirror-5.7/mode/vhdl/index.html b/www/code/codemirror-5.7/mode/vhdl/index.html
deleted file mode 100644
index 3051bc37e..000000000
--- a/www/code/codemirror-5.7/mode/vhdl/index.html
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-CodeMirror: VHDL mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    VHDL mode
    
-
-
    
-
-
-
-
    
-Syntax highlighting and indentation for the VHDL language.
-
    Configuration options:
    
-  
      
-    
    • atoms - List of atom words. Default: "null"
      • 
-    
    • hooks - List of meta hooks. Default: ["`", "$"]
      • 
-    
    • multiLineStrings - Whether multi-line strings are accepted. Default: false
      • 
-  
    
-
    
-
-
    MIME types defined: text/x-vhdl.
    
-
    
diff --git a/www/code/codemirror-5.7/mode/vhdl/vhdl.js b/www/code/codemirror-5.7/mode/vhdl/vhdl.js
deleted file mode 100644
index d3b555aa0..000000000
--- a/www/code/codemirror-5.7/mode/vhdl/vhdl.js
+++ /dev/null
@@ -1,189 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Originally written by Alf Nielsen, re-written by Michael Zhou
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-function words(str) {
-  var obj = {}, words = str.split(",");
-  for (var i = 0; i < words.length; ++i) {
-    var allCaps = words[i].toUpperCase();
-    var firstCap = words[i].charAt(0).toUpperCase() + words[i].slice(1);
-    obj[words[i]] = true;
-    obj[allCaps] = true;
-    obj[firstCap] = true;
-  }
-  return obj;
-}
-
-function metaHook(stream) {
-  stream.eatWhile(/[\w\$_]/);
-  return "meta";
-}
-
-CodeMirror.defineMode("vhdl", function(config, parserConfig) {
-  var indentUnit = config.indentUnit,
-      atoms = parserConfig.atoms || words("null"),
-      hooks = parserConfig.hooks || {"`": metaHook, "$": metaHook},
-      multiLineStrings = parserConfig.multiLineStrings;
-
-  var keywords = words("abs,access,after,alias,all,and,architecture,array,assert,attribute,begin,block," +
-      "body,buffer,bus,case,component,configuration,constant,disconnent,downto,else,elsif,end,end block,end case," +
-      "end component,end for,end generate,end if,end loop,end process,end record,end units,entity,exit,file,for," +
-      "function,generate,generic,generic map,group,guarded,if,impure,in,inertial,inout,is,label,library,linkage," +
-      "literal,loop,map,mod,nand,new,next,nor,null,of,on,open,or,others,out,package,package body,port,port map," +
-      "postponed,procedure,process,pure,range,record,register,reject,rem,report,return,rol,ror,select,severity,signal," +
-      "sla,sll,sra,srl,subtype,then,to,transport,type,unaffected,units,until,use,variable,wait,when,while,with,xnor,xor");
-
-  var blockKeywords = words("architecture,entity,begin,case,port,else,elsif,end,for,function,if");
-
-  var isOperatorChar = /[&|~>
-
-CodeMirror: Vue.js mode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-
    Vue.js mode
    
-
    
-    
-
-    
    MIME types defined: text/x-vue
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/vue/vue.js b/www/code/codemirror-5.7/mode/vue/vue.js
deleted file mode 100644
index d89a55238..000000000
--- a/www/code/codemirror-5.7/mode/vue/vue.js
+++ /dev/null
@@ -1,69 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function (mod) {
-  "use strict";
-  if (typeof exports === "object" && typeof module === "object") {// CommonJS
-    mod(require("../../lib/codemirror"),
-        require("../../addon/mode/overlay"),
-        require("../xml/xml"),
-        require("../javascript/javascript"),
-        require("../coffeescript/coffeescript"),
-        require("../css/css"),
-        require("../sass/sass"),
-        require("../stylus/stylus"),
-        require("../jade/jade"),
-        require("../handlebars/handlebars"));
-  } else if (typeof define === "function" && define.amd) { // AMD
-    define(["../../lib/codemirror",
-            "../../addon/mode/overlay",
-            "../xml/xml",
-            "../javascript/javascript",
-            "../coffeescript/coffeescript",
-            "../css/css",
-            "../sass/sass",
-            "../stylus/stylus",
-            "../jade/jade",
-            "../handlebars/handlebars"], mod);
-  } else { // Plain browser env
-    mod(CodeMirror);
-  }
-})(function (CodeMirror) {
-  var tagLanguages = {
-    script: [
-      ["lang", /coffee(script)?/, "coffeescript"],
-      ["type", /^(?:text|application)\/(?:x-)?coffee(?:script)?$/, "coffeescript"]
-    ],
-    style: [
-      ["lang", /^stylus$/i, "stylus"],
-      ["lang", /^sass$/i, "sass"],
-      ["type", /^(text\/)?(x-)?styl(us)?$/i, "stylus"],
-      ["type", /^text\/sass/i, "sass"]
-    ],
-    template: [
-      ["lang", /^vue-template$/i, "vue"],
-      ["lang", /^jade$/i, "jade"],
-      ["lang", /^handlebars$/i, "handlebars"],
-      ["type", /^(text\/)?(x-)?jade$/i, "jade"],
-      ["type", /^text\/x-handlebars-template$/i, "handlebars"],
-      [null, null, "vue-template"]
-    ]
-  };
-
-  CodeMirror.defineMode("vue-template", function (config, parserConfig) {
-    var mustacheOverlay = {
-      token: function (stream) {
-        if (stream.match(/^\{\{.*?\}\}/)) return "meta mustache";
-        while (stream.next() && !stream.match("{{", false)) {}
-        return null;
-      }
-    };
-    return CodeMirror.overlayMode(CodeMirror.getMode(config, parserConfig.backdrop || "text/html"), mustacheOverlay);
-  });
-
-  CodeMirror.defineMode("vue", function (config) {
-    return CodeMirror.getMode(config, {name: "htmlmixed", tags: tagLanguages});
-  }, "htmlmixed", "xml", "javascript", "coffeescript", "css", "sass", "stylus", "jade", "handlebars");
-
-  CodeMirror.defineMIME("script/x-vue", "vue");
-});
diff --git a/www/code/codemirror-5.7/mode/xml/index.html b/www/code/codemirror-5.7/mode/xml/index.html
deleted file mode 100644
index 7149f06b2..000000000
--- a/www/code/codemirror-5.7/mode/xml/index.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-CodeMirror: XML mode
-
-
-
-
-
-
-
-
-
-
    
-
    XML mode
    
-
    
-    
-    
    The XML mode supports two configuration parameters:
    
-    
    
-      
    htmlMode (boolean)
    
-      
    This switches the mode to parse HTML instead of XML. This
-      means attributes do not have to be quoted, and some elements
-      (such as br) do not require a closing tag.
    
-      
    alignCDATA (boolean)
    
-      
    Setting this to true will force the opening tag of CDATA
-      blocks to not be indented.
    
-    
    
-
-    
    MIME types defined: application/xml, text/html.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/xml/test.js b/www/code/codemirror-5.7/mode/xml/test.js
deleted file mode 100644
index f48156b51..000000000
--- a/www/code/codemirror-5.7/mode/xml/test.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "xml"), mname = "xml";
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), mname); }
-
-  MT("matching",
-     "[tag&bracket <][tag top][tag&bracket >]",
-     "  text",
-     "  [tag&bracket <][tag inner][tag&bracket />]",
-     "[tag&bracket ]");
-
-  MT("nonmatching",
-     "[tag&bracket <][tag top][tag&bracket >]",
-     "  [tag&bracket <][tag inner][tag&bracket />]",
-     "  [tag&bracket ]");
-
-  MT("doctype",
-     "[meta ]",
-     "[tag&bracket <][tag top][tag&bracket />]");
-
-  MT("cdata",
-     "[tag&bracket <][tag top][tag&bracket >]",
-     "  [atom ]",
-     "[tag&bracket ]");
-
-  // HTML tests
-  mode = CodeMirror.getMode({indentUnit: 2}, "text/html");
-
-  MT("selfclose",
-     "[tag&bracket <][tag html][tag&bracket >]",
-     "  [tag&bracket <][tag link] [attribute rel]=[string stylesheet] [attribute href]=[string \"/foobar\"][tag&bracket >]",
-     "[tag&bracket ]");
-
-  MT("list",
-     "[tag&bracket <][tag ol][tag&bracket >]",
-     "  [tag&bracket <][tag li][tag&bracket >]one",
-     "  [tag&bracket <][tag li][tag&bracket >]two",
-     "[tag&bracket ]");
-
-  MT("valueless",
-     "[tag&bracket <][tag input] [attribute type]=[string checkbox] [attribute checked][tag&bracket />]");
-
-  MT("pThenArticle",
-     "[tag&bracket <][tag p][tag&bracket >]",
-     "  foo",
-     "[tag&bracket <][tag article][tag&bracket >]bar");
-
-})();
diff --git a/www/code/codemirror-5.7/mode/xml/xml.js b/www/code/codemirror-5.7/mode/xml/xml.js
deleted file mode 100644
index 5ad21720f..000000000
--- a/www/code/codemirror-5.7/mode/xml/xml.js
+++ /dev/null
@@ -1,385 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("xml", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var multilineTagIndentFactor = parserConfig.multilineTagIndentFactor || 1;
-  var multilineTagIndentPastTag = parserConfig.multilineTagIndentPastTag;
-  if (multilineTagIndentPastTag == null) multilineTagIndentPastTag = true;
-
-  var Kludges = parserConfig.htmlMode ? {
-    autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
-                      'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
-                      'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
-                      'track': true, 'wbr': true, 'menuitem': true},
-    implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
-                       'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
-                       'th': true, 'tr': true},
-    contextGrabbers: {
-      'dd': {'dd': true, 'dt': true},
-      'dt': {'dd': true, 'dt': true},
-      'li': {'li': true},
-      'option': {'option': true, 'optgroup': true},
-      'optgroup': {'optgroup': true},
-      'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
-            'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
-            'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
-            'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
-            'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
-      'rp': {'rp': true, 'rt': true},
-      'rt': {'rp': true, 'rt': true},
-      'tbody': {'tbody': true, 'tfoot': true},
-      'td': {'td': true, 'th': true},
-      'tfoot': {'tbody': true},
-      'th': {'td': true, 'th': true},
-      'thead': {'tbody': true, 'tfoot': true},
-      'tr': {'tr': true}
-    },
-    doNotIndent: {"pre": true},
-    allowUnquoted: true,
-    allowMissing: true,
-    caseFold: true
-  } : {
-    autoSelfClosers: {},
-    implicitlyClosed: {},
-    contextGrabbers: {},
-    doNotIndent: {},
-    allowUnquoted: false,
-    allowMissing: false,
-    caseFold: false
-  };
-  var alignCDATA = parserConfig.alignCDATA;
-
-  // Return variables for tokenizers
-  var type, setStyle;
-
-  function inText(stream, state) {
-    function chain(parser) {
-      state.tokenize = parser;
-      return parser(stream, state);
-    }
-
-    var ch = stream.next();
-    if (ch == "<") {
-      if (stream.eat("!")) {
-        if (stream.eat("[")) {
-          if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>"));
-          else return null;
-        } else if (stream.match("--")) {
-          return chain(inBlock("comment", "-->"));
-        } else if (stream.match("DOCTYPE", true, true)) {
-          stream.eatWhile(/[\w\._\-]/);
-          return chain(doctype(1));
-        } else {
-          return null;
-        }
-      } else if (stream.eat("?")) {
-        stream.eatWhile(/[\w\._\-]/);
-        state.tokenize = inBlock("meta", "?>");
-        return "meta";
-      } else {
-        type = stream.eat("/") ? "closeTag" : "openTag";
-        state.tokenize = inTag;
-        return "tag bracket";
-      }
-    } else if (ch == "&") {
-      var ok;
-      if (stream.eat("#")) {
-        if (stream.eat("x")) {
-          ok = stream.eatWhile(/[a-fA-F\d]/) && stream.eat(";");
-        } else {
-          ok = stream.eatWhile(/[\d]/) && stream.eat(";");
-        }
-      } else {
-        ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";");
-      }
-      return ok ? "atom" : "error";
-    } else {
-      stream.eatWhile(/[^&<]/);
-      return null;
-    }
-  }
-  inText.isInText = true;
-
-  function inTag(stream, state) {
-    var ch = stream.next();
-    if (ch == ">" || (ch == "/" && stream.eat(">"))) {
-      state.tokenize = inText;
-      type = ch == ">" ? "endTag" : "selfcloseTag";
-      return "tag bracket";
-    } else if (ch == "=") {
-      type = "equals";
-      return null;
-    } else if (ch == "<") {
-      state.tokenize = inText;
-      state.state = baseState;
-      state.tagName = state.tagStart = null;
-      var next = state.tokenize(stream, state);
-      return next ? next + " tag error" : "tag error";
-    } else if (/[\'\"]/.test(ch)) {
-      state.tokenize = inAttribute(ch);
-      state.stringStartCol = stream.column();
-      return state.tokenize(stream, state);
-    } else {
-      stream.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/);
-      return "word";
-    }
-  }
-
-  function inAttribute(quote) {
-    var closure = function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.next() == quote) {
-          state.tokenize = inTag;
-          break;
-        }
-      }
-      return "string";
-    };
-    closure.isInAttribute = true;
-    return closure;
-  }
-
-  function inBlock(style, terminator) {
-    return function(stream, state) {
-      while (!stream.eol()) {
-        if (stream.match(terminator)) {
-          state.tokenize = inText;
-          break;
-        }
-        stream.next();
-      }
-      return style;
-    };
-  }
-  function doctype(depth) {
-    return function(stream, state) {
-      var ch;
-      while ((ch = stream.next()) != null) {
-        if (ch == "<") {
-          state.tokenize = doctype(depth + 1);
-          return state.tokenize(stream, state);
-        } else if (ch == ">") {
-          if (depth == 1) {
-            state.tokenize = inText;
-            break;
-          } else {
-            state.tokenize = doctype(depth - 1);
-            return state.tokenize(stream, state);
-          }
-        }
-      }
-      return "meta";
-    };
-  }
-
-  function Context(state, tagName, startOfLine) {
-    this.prev = state.context;
-    this.tagName = tagName;
-    this.indent = state.indented;
-    this.startOfLine = startOfLine;
-    if (Kludges.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
-      this.noIndent = true;
-  }
-  function popContext(state) {
-    if (state.context) state.context = state.context.prev;
-  }
-  function maybePopContext(state, nextTagName) {
-    var parentTagName;
-    while (true) {
-      if (!state.context) {
-        return;
-      }
-      parentTagName = state.context.tagName;
-      if (!Kludges.contextGrabbers.hasOwnProperty(parentTagName) ||
-          !Kludges.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
-        return;
-      }
-      popContext(state);
-    }
-  }
-
-  function baseState(type, stream, state) {
-    if (type == "openTag") {
-      state.tagStart = stream.column();
-      return tagNameState;
-    } else if (type == "closeTag") {
-      return closeTagNameState;
-    } else {
-      return baseState;
-    }
-  }
-  function tagNameState(type, stream, state) {
-    if (type == "word") {
-      state.tagName = stream.current();
-      setStyle = "tag";
-      return attrState;
-    } else {
-      setStyle = "error";
-      return tagNameState;
-    }
-  }
-  function closeTagNameState(type, stream, state) {
-    if (type == "word") {
-      var tagName = stream.current();
-      if (state.context && state.context.tagName != tagName &&
-          Kludges.implicitlyClosed.hasOwnProperty(state.context.tagName))
-        popContext(state);
-      if (state.context && state.context.tagName == tagName) {
-        setStyle = "tag";
-        return closeState;
-      } else {
-        setStyle = "tag error";
-        return closeStateErr;
-      }
-    } else {
-      setStyle = "error";
-      return closeStateErr;
-    }
-  }
-
-  function closeState(type, _stream, state) {
-    if (type != "endTag") {
-      setStyle = "error";
-      return closeState;
-    }
-    popContext(state);
-    return baseState;
-  }
-  function closeStateErr(type, stream, state) {
-    setStyle = "error";
-    return closeState(type, stream, state);
-  }
-
-  function attrState(type, _stream, state) {
-    if (type == "word") {
-      setStyle = "attribute";
-      return attrEqState;
-    } else if (type == "endTag" || type == "selfcloseTag") {
-      var tagName = state.tagName, tagStart = state.tagStart;
-      state.tagName = state.tagStart = null;
-      if (type == "selfcloseTag" ||
-          Kludges.autoSelfClosers.hasOwnProperty(tagName)) {
-        maybePopContext(state, tagName);
-      } else {
-        maybePopContext(state, tagName);
-        state.context = new Context(state, tagName, tagStart == state.indented);
-      }
-      return baseState;
-    }
-    setStyle = "error";
-    return attrState;
-  }
-  function attrEqState(type, stream, state) {
-    if (type == "equals") return attrValueState;
-    if (!Kludges.allowMissing) setStyle = "error";
-    return attrState(type, stream, state);
-  }
-  function attrValueState(type, stream, state) {
-    if (type == "string") return attrContinuedState;
-    if (type == "word" && Kludges.allowUnquoted) {setStyle = "string"; return attrState;}
-    setStyle = "error";
-    return attrState(type, stream, state);
-  }
-  function attrContinuedState(type, stream, state) {
-    if (type == "string") return attrContinuedState;
-    return attrState(type, stream, state);
-  }
-
-  return {
-    startState: function() {
-      return {tokenize: inText,
-              state: baseState,
-              indented: 0,
-              tagName: null, tagStart: null,
-              context: null};
-    },
-
-    token: function(stream, state) {
-      if (!state.tagName && stream.sol())
-        state.indented = stream.indentation();
-
-      if (stream.eatSpace()) return null;
-      type = null;
-      var style = state.tokenize(stream, state);
-      if ((style || type) && style != "comment") {
-        setStyle = null;
-        state.state = state.state(type || style, stream, state);
-        if (setStyle)
-          style = setStyle == "error" ? style + " error" : setStyle;
-      }
-      return style;
-    },
-
-    indent: function(state, textAfter, fullLine) {
-      var context = state.context;
-      // Indent multi-line strings (e.g. css).
-      if (state.tokenize.isInAttribute) {
-        if (state.tagStart == state.indented)
-          return state.stringStartCol + 1;
-        else
-          return state.indented + indentUnit;
-      }
-      if (context && context.noIndent) return CodeMirror.Pass;
-      if (state.tokenize != inTag && state.tokenize != inText)
-        return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
-      // Indent the starts of attribute names.
-      if (state.tagName) {
-        if (multilineTagIndentPastTag)
-          return state.tagStart + state.tagName.length + 2;
-        else
-          return state.tagStart + indentUnit * multilineTagIndentFactor;
-      }
-      if (alignCDATA && /$/,
-    blockCommentStart: "",
-
-    configuration: parserConfig.htmlMode ? "html" : "xml",
-    helperType: parserConfig.htmlMode ? "html" : "xml"
-  };
-});
-
-CodeMirror.defineMIME("text/xml", "xml");
-CodeMirror.defineMIME("application/xml", "xml");
-if (!CodeMirror.mimeModes.hasOwnProperty("text/html"))
-  CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});
-
-});
diff --git a/www/code/codemirror-5.7/mode/xquery/index.html b/www/code/codemirror-5.7/mode/xquery/index.html
deleted file mode 100644
index 7ac5aaeff..000000000
--- a/www/code/codemirror-5.7/mode/xquery/index.html
+++ /dev/null
@@ -1,210 +0,0 @@
-
-
-CodeMirror: XQuery mode
-
-
-
-
-
-
-
-
-
-
-
    
-
    XQuery mode
    
- 
- 
-
     
-	 
-
     
- 
-     
- 
-    
    MIME types defined: application/xquery.
     
- 
-    
    Development of the CodeMirror XQuery mode was sponsored by 
-      MarkLogic and developed by 
-      Mike Brevoort.
-    
    
- 
-  
    
diff --git a/www/code/codemirror-5.7/mode/xquery/test.js b/www/code/codemirror-5.7/mode/xquery/test.js
deleted file mode 100644
index 1f148cdbb..000000000
--- a/www/code/codemirror-5.7/mode/xquery/test.js
+++ /dev/null
@@ -1,67 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-// Don't take these too seriously -- the expected results appear to be
-// based on the results of actual runs without any serious manual
-// verification. If a change you made causes them to fail, the test is
-// as likely to wrong as the code.
-
-(function() {
-  var mode = CodeMirror.getMode({tabSize: 4}, "xquery");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("eviltest",
-     "[keyword xquery] [keyword version] [variable "1][keyword .][atom 0][keyword -][variable ml"][def&variable ;]      [comment (: this is       : a          \"comment\" :)]",
-     "      [keyword let] [variable $let] [keyword :=] [variable <x] [variable attr][keyword =][variable "value">"test"<func>][def&variable ;function]() [variable $var] {[keyword function]()} {[variable $var]}[variable <][keyword /][variable func><][keyword /][variable x>]",
-     "      [keyword let] [variable $joe][keyword :=][atom 1]",
-     "      [keyword return] [keyword element] [variable element] {",
-     "          [keyword attribute] [variable attribute] { [atom 1] },",
-     "          [keyword element] [variable test] { [variable 'a'] },           [keyword attribute] [variable foo] { [variable "bar"] },",
-     "          [def&variable fn:doc]()[[ [variable foo][keyword /][variable @bar] [keyword eq] [variable $let] ]],",
-     "          [keyword //][variable x] }                 [comment (: a more 'evil' test :)]",
-     "      [comment (: Modified Blakeley example (: with nested comment :) ... :)]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:declare]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:private]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:function]() {()}[variable ;]",
-     "      [keyword declare] [keyword private] [keyword function] [def&variable local:local]() {()}[variable ;]",
-     "      [keyword let] [variable $let] [keyword :=] [variable <let>let] [variable $let] [keyword :=] [variable "let"<][keyword /let][variable >]",
-     "      [keyword return] [keyword element] [variable element] {",
-     "          [keyword attribute] [variable attribute] { [keyword try] { [def&variable xdmp:version]() } [keyword catch]([variable $e]) { [def&variable xdmp:log]([variable $e]) } },",
-     "          [keyword attribute] [variable fn:doc] { [variable "bar"] [variable castable] [keyword as] [atom xs:string] },",
-     "          [keyword element] [variable text] { [keyword text] { [variable "text"] } },",
-     "          [def&variable fn:doc]()[[ [qualifier child::][variable eq][keyword /]([variable @bar] [keyword |] [qualifier attribute::][variable attribute]) [keyword eq] [variable $let] ]],",
-     "          [keyword //][variable fn:doc]",
-     "      }");
-
-  MT("testEmptySequenceKeyword",
-     "[string \"foo\"] [keyword instance] [keyword of] [keyword empty-sequence]()");
-
-  MT("testMultiAttr",
-     "[tag 
    ][variable hello] [variable world][tag 
    ]");
-
-  MT("test namespaced variable",
-     "[keyword declare] [keyword namespace] [variable e] [keyword =] [string \"http://example.com/ANamespace\"][variable ;declare] [keyword variable] [variable $e:exampleComThisVarIsNotRecognized] [keyword as] [keyword element]([keyword *]) [variable external;]");
-
-  MT("test EQName variable",
-     "[keyword declare] [keyword variable] [variable $\"http://www.example.com/ns/my\":var] [keyword :=] [atom 12][variable ;]",
-     "[tag ]{[variable $\"http://www.example.com/ns/my\":var]}[tag ]");
-
-  MT("test EQName function",
-     "[keyword declare] [keyword function] [def&variable \"http://www.example.com/ns/my\":fn] ([variable $a] [keyword as] [atom xs:integer]) [keyword as] [atom xs:integer] {",
-     "   [variable $a] [keyword +] [atom 2]",
-     "}[variable ;]",
-     "[tag ]{[def&variable \"http://www.example.com/ns/my\":fn]([atom 12])}[tag ]");
-
-  MT("test EQName function with single quotes",
-     "[keyword declare] [keyword function] [def&variable 'http://www.example.com/ns/my':fn] ([variable $a] [keyword as] [atom xs:integer]) [keyword as] [atom xs:integer] {",
-     "   [variable $a] [keyword +] [atom 2]",
-     "}[variable ;]",
-     "[tag ]{[def&variable 'http://www.example.com/ns/my':fn]([atom 12])}[tag ]");
-
-  MT("testProcessingInstructions",
-     "[def&variable data]([comment&meta ]) [keyword instance] [keyword of] [atom xs:string]");
-
-  MT("testQuoteEscapeDouble",
-     "[keyword let] [variable $rootfolder] [keyword :=] [string \"c:\\builds\\winnt\\HEAD\\qa\\scripts\\\"]",
-     "[keyword let] [variable $keysfolder] [keyword :=] [def&variable concat]([variable $rootfolder], [string \"keys\\\"])");
-})();
diff --git a/www/code/codemirror-5.7/mode/xquery/xquery.js b/www/code/codemirror-5.7/mode/xquery/xquery.js
deleted file mode 100644
index c642ee58f..000000000
--- a/www/code/codemirror-5.7/mode/xquery/xquery.js
+++ /dev/null
@@ -1,437 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("xquery", function() {
-
-  // The keywords object is set to the result of this self executing
-  // function. Each keyword is a property of the keywords object whose
-  // value is {type: atype, style: astyle}
-  var keywords = function(){
-    // conveinence functions used to build keywords object
-    function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a")
-      , B = kw("keyword b")
-      , C = kw("keyword c")
-      , operator = kw("operator")
-      , atom = {type: "atom", style: "atom"}
-      , punctuation = {type: "punctuation", style: null}
-      , qualifier = {type: "axis_specifier", style: "qualifier"};
-
-    // kwObj is what is return from this function at the end
-    var kwObj = {
-      'if': A, 'switch': A, 'while': A, 'for': A,
-      'else': B, 'then': B, 'try': B, 'finally': B, 'catch': B,
-      'element': C, 'attribute': C, 'let': C, 'implements': C, 'import': C, 'module': C, 'namespace': C,
-      'return': C, 'super': C, 'this': C, 'throws': C, 'where': C, 'private': C,
-      ',': punctuation,
-      'null': atom, 'fn:false()': atom, 'fn:true()': atom
-    };
-
-    // a list of 'basic' keywords. For each add a property to kwObj with the value of
-    // {type: basic[i], style: "keyword"} e.g. 'after' --> {type: "after", style: "keyword"}
-    var basic = ['after','ancestor','ancestor-or-self','and','as','ascending','assert','attribute','before',
-    'by','case','cast','child','comment','declare','default','define','descendant','descendant-or-self',
-    'descending','document','document-node','element','else','eq','every','except','external','following',
-    'following-sibling','follows','for','function','if','import','in','instance','intersect','item',
-    'let','module','namespace','node','node','of','only','or','order','parent','precedes','preceding',
-    'preceding-sibling','processing-instruction','ref','return','returns','satisfies','schema','schema-element',
-    'self','some','sortby','stable','text','then','to','treat','typeswitch','union','variable','version','where',
-    'xquery', 'empty-sequence'];
-    for(var i=0, l=basic.length; i < l; i++) { kwObj[basic[i]] = kw(basic[i]);};
-
-    // a list of types. For each add a property to kwObj with the value of
-    // {type: "atom", style: "atom"}
-    var types = ['xs:string', 'xs:float', 'xs:decimal', 'xs:double', 'xs:integer', 'xs:boolean', 'xs:date', 'xs:dateTime',
-    'xs:time', 'xs:duration', 'xs:dayTimeDuration', 'xs:time', 'xs:yearMonthDuration', 'numeric', 'xs:hexBinary',
-    'xs:base64Binary', 'xs:anyURI', 'xs:QName', 'xs:byte','xs:boolean','xs:anyURI','xf:yearMonthDuration'];
-    for(var i=0, l=types.length; i < l; i++) { kwObj[types[i]] = atom;};
-
-    // each operator will add a property to kwObj with value of {type: "operator", style: "keyword"}
-    var operators = ['eq', 'ne', 'lt', 'le', 'gt', 'ge', ':=', '=', '>', '>=', '<', '<=', '.', '|', '?', 'and', 'or', 'div', 'idiv', 'mod', '*', '/', '+', '-'];
-    for(var i=0, l=operators.length; i < l; i++) { kwObj[operators[i]] = operator;};
-
-    // each axis_specifiers will add a property to kwObj with value of {type: "axis_specifier", style: "qualifier"}
-    var axis_specifiers = ["self::", "attribute::", "child::", "descendant::", "descendant-or-self::", "parent::",
-    "ancestor::", "ancestor-or-self::", "following::", "preceding::", "following-sibling::", "preceding-sibling::"];
-    for(var i=0, l=axis_specifiers.length; i < l; i++) { kwObj[axis_specifiers[i]] = qualifier; };
-
-    return kwObj;
-  }();
-
-  function chain(stream, state, f) {
-    state.tokenize = f;
-    return f(stream, state);
-  }
-
-  // the primary mode tokenizer
-  function tokenBase(stream, state) {
-    var ch = stream.next(),
-        mightBeFunction = false,
-        isEQName = isEQNameAhead(stream);
-
-    // an XML tag (if not in some sub, chained tokenizer)
-    if (ch == "<") {
-      if(stream.match("!--", true))
-        return chain(stream, state, tokenXMLComment);
-
-      if(stream.match("![CDATA", false)) {
-        state.tokenize = tokenCDATA;
-        return "tag";
-      }
-
-      if(stream.match("?", false)) {
-        return chain(stream, state, tokenPreProcessing);
-      }
-
-      var isclose = stream.eat("/");
-      stream.eatSpace();
-      var tagName = "", c;
-      while ((c = stream.eat(/[^\s\u00a0=<>\"\'\/?]/))) tagName += c;
-
-      return chain(stream, state, tokenTag(tagName, isclose));
-    }
-    // start code block
-    else if(ch == "{") {
-      pushStateStack(state,{ type: "codeblock"});
-      return null;
-    }
-    // end code block
-    else if(ch == "}") {
-      popStateStack(state);
-      return null;
-    }
-    // if we're in an XML block
-    else if(isInXmlBlock(state)) {
-      if(ch == ">")
-        return "tag";
-      else if(ch == "/" && stream.eat(">")) {
-        popStateStack(state);
-        return "tag";
-      }
-      else
-        return "variable";
-    }
-    // if a number
-    else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:\.\d*)?(?:E[+\-]?\d+)?/);
-      return "atom";
-    }
-    // comment start
-    else if (ch === "(" && stream.eat(":")) {
-      pushStateStack(state, { type: "comment"});
-      return chain(stream, state, tokenComment);
-    }
-    // quoted string
-    else if (  !isEQName && (ch === '"' || ch === "'"))
-      return chain(stream, state, tokenString(ch));
-    // variable
-    else if(ch === "$") {
-      return chain(stream, state, tokenVariable);
-    }
-    // assignment
-    else if(ch ===":" && stream.eat("=")) {
-      return "keyword";
-    }
-    // open paren
-    else if(ch === "(") {
-      pushStateStack(state, { type: "paren"});
-      return null;
-    }
-    // close paren
-    else if(ch === ")") {
-      popStateStack(state);
-      return null;
-    }
-    // open paren
-    else if(ch === "[") {
-      pushStateStack(state, { type: "bracket"});
-      return null;
-    }
-    // close paren
-    else if(ch === "]") {
-      popStateStack(state);
-      return null;
-    }
-    else {
-      var known = keywords.propertyIsEnumerable(ch) && keywords[ch];
-
-      // if there's a EQName ahead, consume the rest of the string portion, it's likely a function
-      if(isEQName && ch === '\"') while(stream.next() !== '"'){}
-      if(isEQName && ch === '\'') while(stream.next() !== '\''){}
-
-      // gobble up a word if the character is not known
-      if(!known) stream.eatWhile(/[\w\$_-]/);
-
-      // gobble a colon in the case that is a lib func type call fn:doc
-      var foundColon = stream.eat(":");
-
-      // if there's not a second colon, gobble another word. Otherwise, it's probably an axis specifier
-      // which should get matched as a keyword
-      if(!stream.eat(":") && foundColon) {
-        stream.eatWhile(/[\w\$_-]/);
-      }
-      // if the next non whitespace character is an open paren, this is probably a function (if not a keyword of other sort)
-      if(stream.match(/^[ \t]*\(/, false)) {
-        mightBeFunction = true;
-      }
-      // is the word a keyword?
-      var word = stream.current();
-      known = keywords.propertyIsEnumerable(word) && keywords[word];
-
-      // if we think it's a function call but not yet known,
-      // set style to variable for now for lack of something better
-      if(mightBeFunction && !known) known = {type: "function_call", style: "variable def"};
-
-      // if the previous word was element, attribute, axis specifier, this word should be the name of that
-      if(isInXmlConstructor(state)) {
-        popStateStack(state);
-        return "variable";
-      }
-      // as previously checked, if the word is element,attribute, axis specifier, call it an "xmlconstructor" and
-      // push the stack so we know to look for it on the next word
-      if(word == "element" || word == "attribute" || known.type == "axis_specifier") pushStateStack(state, {type: "xmlconstructor"});
-
-      // if the word is known, return the details of that else just call this a generic 'word'
-      return known ? known.style : "variable";
-    }
-  }
-
-  // handle comments, including nested
-  function tokenComment(stream, state) {
-    var maybeEnd = false, maybeNested = false, nestedCount = 0, ch;
-    while (ch = stream.next()) {
-      if (ch == ")" && maybeEnd) {
-        if(nestedCount > 0)
-          nestedCount--;
-        else {
-          popStateStack(state);
-          break;
-        }
-      }
-      else if(ch == ":" && maybeNested) {
-        nestedCount++;
-      }
-      maybeEnd = (ch == ":");
-      maybeNested = (ch == "(");
-    }
-
-    return "comment";
-  }
-
-  // tokenizer for string literals
-  // optionally pass a tokenizer function to set state.tokenize back to when finished
-  function tokenString(quote, f) {
-    return function(stream, state) {
-      var ch;
-
-      if(isInString(state) && stream.current() == quote) {
-        popStateStack(state);
-        if(f) state.tokenize = f;
-        return "string";
-      }
-
-      pushStateStack(state, { type: "string", name: quote, tokenize: tokenString(quote, f) });
-
-      // if we're in a string and in an XML block, allow an embedded code block
-      if(stream.match("{", false) && isInXmlAttributeBlock(state)) {
-        state.tokenize = tokenBase;
-        return "string";
-      }
-
-
-      while (ch = stream.next()) {
-        if (ch ==  quote) {
-          popStateStack(state);
-          if(f) state.tokenize = f;
-          break;
-        }
-        else {
-          // if we're in a string and in an XML block, allow an embedded code block in an attribute
-          if(stream.match("{", false) && isInXmlAttributeBlock(state)) {
-            state.tokenize = tokenBase;
-            return "string";
-          }
-
-        }
-      }
-
-      return "string";
-    };
-  }
-
-  // tokenizer for variables
-  function tokenVariable(stream, state) {
-    var isVariableChar = /[\w\$_-]/;
-
-    // a variable may start with a quoted EQName so if the next character is quote, consume to the next quote
-    if(stream.eat("\"")) {
-      while(stream.next() !== '\"'){};
-      stream.eat(":");
-    } else {
-      stream.eatWhile(isVariableChar);
-      if(!stream.match(":=", false)) stream.eat(":");
-    }
-    stream.eatWhile(isVariableChar);
-    state.tokenize = tokenBase;
-    return "variable";
-  }
-
-  // tokenizer for XML tags
-  function tokenTag(name, isclose) {
-    return function(stream, state) {
-      stream.eatSpace();
-      if(isclose && stream.eat(">")) {
-        popStateStack(state);
-        state.tokenize = tokenBase;
-        return "tag";
-      }
-      // self closing tag without attributes?
-      if(!stream.eat("/"))
-        pushStateStack(state, { type: "tag", name: name, tokenize: tokenBase});
-      if(!stream.eat(">")) {
-        state.tokenize = tokenAttribute;
-        return "tag";
-      }
-      else {
-        state.tokenize = tokenBase;
-      }
-      return "tag";
-    };
-  }
-
-  // tokenizer for XML attributes
-  function tokenAttribute(stream, state) {
-    var ch = stream.next();
-
-    if(ch == "/" && stream.eat(">")) {
-      if(isInXmlAttributeBlock(state)) popStateStack(state);
-      if(isInXmlBlock(state)) popStateStack(state);
-      return "tag";
-    }
-    if(ch == ">") {
-      if(isInXmlAttributeBlock(state)) popStateStack(state);
-      return "tag";
-    }
-    if(ch == "=")
-      return null;
-    // quoted string
-    if (ch == '"' || ch == "'")
-      return chain(stream, state, tokenString(ch, tokenAttribute));
-
-    if(!isInXmlAttributeBlock(state))
-      pushStateStack(state, { type: "attribute", tokenize: tokenAttribute});
-
-    stream.eat(/[a-zA-Z_:]/);
-    stream.eatWhile(/[-a-zA-Z0-9_:.]/);
-    stream.eatSpace();
-
-    // the case where the attribute has not value and the tag was closed
-    if(stream.match(">", false) || stream.match("/", false)) {
-      popStateStack(state);
-      state.tokenize = tokenBase;
-    }
-
-    return "attribute";
-  }
-
-  // handle comments, including nested
-  function tokenXMLComment(stream, state) {
-    var ch;
-    while (ch = stream.next()) {
-      if (ch == "-" && stream.match("->", true)) {
-        state.tokenize = tokenBase;
-        return "comment";
-      }
-    }
-  }
-
-
-  // handle CDATA
-  function tokenCDATA(stream, state) {
-    var ch;
-    while (ch = stream.next()) {
-      if (ch == "]" && stream.match("]", true)) {
-        state.tokenize = tokenBase;
-        return "comment";
-      }
-    }
-  }
-
-  // handle preprocessing instructions
-  function tokenPreProcessing(stream, state) {
-    var ch;
-    while (ch = stream.next()) {
-      if (ch == "?" && stream.match(">", true)) {
-        state.tokenize = tokenBase;
-        return "comment meta";
-      }
-    }
-  }
-
-
-  // functions to test the current context of the state
-  function isInXmlBlock(state) { return isIn(state, "tag"); }
-  function isInXmlAttributeBlock(state) { return isIn(state, "attribute"); }
-  function isInXmlConstructor(state) { return isIn(state, "xmlconstructor"); }
-  function isInString(state) { return isIn(state, "string"); }
-
-  function isEQNameAhead(stream) {
-    // assume we've already eaten a quote (")
-    if(stream.current() === '"')
-      return stream.match(/^[^\"]+\"\:/, false);
-    else if(stream.current() === '\'')
-      return stream.match(/^[^\"]+\'\:/, false);
-    else
-      return false;
-  }
-
-  function isIn(state, type) {
-    return (state.stack.length && state.stack[state.stack.length - 1].type == type);
-  }
-
-  function pushStateStack(state, newState) {
-    state.stack.push(newState);
-  }
-
-  function popStateStack(state) {
-    state.stack.pop();
-    var reinstateTokenize = state.stack.length && state.stack[state.stack.length-1].tokenize;
-    state.tokenize = reinstateTokenize || tokenBase;
-  }
-
-  // the interface for the mode API
-  return {
-    startState: function() {
-      return {
-        tokenize: tokenBase,
-        cc: [],
-        stack: []
-      };
-    },
-
-    token: function(stream, state) {
-      if (stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      return style;
-    },
-
-    blockCommentStart: "(:",
-    blockCommentEnd: ":)"
-
-  };
-
-});
-
-CodeMirror.defineMIME("application/xquery", "xquery");
-
-});
diff --git a/www/code/codemirror-5.7/mode/yaml/index.html b/www/code/codemirror-5.7/mode/yaml/index.html
deleted file mode 100644
index be9b63236..000000000
--- a/www/code/codemirror-5.7/mode/yaml/index.html
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-CodeMirror: YAML mode
-
-
-
-
-
-
-
-
-
-
    
-
    YAML mode
    
-
    
-    
-
-    
    MIME types defined: text/x-yaml.
    
-
-  
    
diff --git a/www/code/codemirror-5.7/mode/yaml/yaml.js b/www/code/codemirror-5.7/mode/yaml/yaml.js
deleted file mode 100644
index b7015e599..000000000
--- a/www/code/codemirror-5.7/mode/yaml/yaml.js
+++ /dev/null
@@ -1,117 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("yaml", function() {
-
-  var cons = ['true', 'false', 'on', 'off', 'yes', 'no'];
-  var keywordRegex = new RegExp("\\b(("+cons.join(")|(")+"))$", 'i');
-
-  return {
-    token: function(stream, state) {
-      var ch = stream.peek();
-      var esc = state.escaped;
-      state.escaped = false;
-      /* comments */
-      if (ch == "#" && (stream.pos == 0 || /\s/.test(stream.string.charAt(stream.pos - 1)))) {
-        stream.skipToEnd();
-        return "comment";
-      }
-
-      if (stream.match(/^('([^']|\\.)*'?|"([^"]|\\.)*"?)/))
-        return "string";
-
-      if (state.literal && stream.indentation() > state.keyCol) {
-        stream.skipToEnd(); return "string";
-      } else if (state.literal) { state.literal = false; }
-      if (stream.sol()) {
-        state.keyCol = 0;
-        state.pair = false;
-        state.pairStart = false;
-        /* document start */
-        if(stream.match(/---/)) { return "def"; }
-        /* document end */
-        if (stream.match(/\.\.\./)) { return "def"; }
-        /* array list item */
-        if (stream.match(/\s*-\s+/)) { return 'meta'; }
-      }
-      /* inline pairs/lists */
-      if (stream.match(/^(\{|\}|\[|\])/)) {
-        if (ch == '{')
-          state.inlinePairs++;
-        else if (ch == '}')
-          state.inlinePairs--;
-        else if (ch == '[')
-          state.inlineList++;
-        else
-          state.inlineList--;
-        return 'meta';
-      }
-
-      /* list seperator */
-      if (state.inlineList > 0 && !esc && ch == ',') {
-        stream.next();
-        return 'meta';
-      }
-      /* pairs seperator */
-      if (state.inlinePairs > 0 && !esc && ch == ',') {
-        state.keyCol = 0;
-        state.pair = false;
-        state.pairStart = false;
-        stream.next();
-        return 'meta';
-      }
-
-      /* start of value of a pair */
-      if (state.pairStart) {
-        /* block literals */
-        if (stream.match(/^\s*(\||\>)\s*/)) { state.literal = true; return 'meta'; };
-        /* references */
-        if (stream.match(/^\s*(\&|\*)[a-z0-9\._-]+\b/i)) { return 'variable-2'; }
-        /* numbers */
-        if (state.inlinePairs == 0 && stream.match(/^\s*-?[0-9\.\,]+\s?$/)) { return 'number'; }
-        if (state.inlinePairs > 0 && stream.match(/^\s*-?[0-9\.\,]+\s?(?=(,|}))/)) { return 'number'; }
-        /* keywords */
-        if (stream.match(keywordRegex)) { return 'keyword'; }
-      }
-
-      /* pairs (associative arrays) -> key */
-      if (!state.pair && stream.match(/^\s*(?:[,\[\]{}&*!|>'"%@`][^\s'":]|[^,\[\]{}#&*!|>'"%@`])[^#]*?(?=\s*:($|\s))/)) {
-        state.pair = true;
-        state.keyCol = stream.indentation();
-        return "atom";
-      }
-      if (state.pair && stream.match(/^:\s*/)) { state.pairStart = true; return 'meta'; }
-
-      /* nothing found, continue */
-      state.pairStart = false;
-      state.escaped = (ch == '\\');
-      stream.next();
-      return null;
-    },
-    startState: function() {
-      return {
-        pair: false,
-        pairStart: false,
-        keyCol: 0,
-        inlinePairs: 0,
-        inlineList: 0,
-        literal: false,
-        escaped: false
-      };
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-yaml", "yaml");
-
-});
diff --git a/www/code/codemirror-5.7/mode/z80/index.html b/www/code/codemirror-5.7/mode/z80/index.html
deleted file mode 100644
index a41b7473e..000000000
--- a/www/code/codemirror-5.7/mode/z80/index.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-CodeMirror: Z80 assembly mode
-
-
-
-
-
-
-
-
-
-
    
-
    Z80 assembly mode
    
-
-
-
    
-
-    
-
-    
    MIME types defined: text/x-z80, text/x-ez80.
    
-  
    
diff --git a/www/code/codemirror-5.7/mode/z80/z80.js b/www/code/codemirror-5.7/mode/z80/z80.js
deleted file mode 100644
index aae70216f..000000000
--- a/www/code/codemirror-5.7/mode/z80/z80.js
+++ /dev/null
@@ -1,116 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-  mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-  define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-  mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode('z80', function(_config, parserConfig) {
-  var ez80 = parserConfig.ez80;
-  var keywords1, keywords2;
-  if (ez80) {
-    keywords1 = /^(exx?|(ld|cp)([di]r?)?|[lp]ea|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|[de]i|halt|im|in([di]mr?|ir?|irx|2r?)|ot(dmr?|[id]rx|imr?)|out(0?|[di]r?|[di]2r?)|tst(io)?|slp)(\.([sl]?i)?[sl])?\b/i;
-    keywords2 = /^(((call|j[pr]|rst|ret[in]?)(\.([sl]?i)?[sl])?)|(rs|st)mix)\b/i;
-  } else {
-    keywords1 = /^(exx?|(ld|cp|in)([di]r?)?|pop|push|ad[cd]|cpl|daa|dec|inc|neg|sbc|sub|and|bit|[cs]cf|x?or|res|set|r[lr]c?a?|r[lr]d|s[lr]a|srl|djnz|nop|rst|[de]i|halt|im|ot[di]r|out[di]?)\b/i;
-    keywords2 = /^(call|j[pr]|ret[in]?|b_?(call|jump))\b/i;
-  }
-
-  var variables1 = /^(af?|bc?|c|de?|e|hl?|l|i[xy]?|r|sp)\b/i;
-  var variables2 = /^(n?[zc]|p[oe]?|m)\b/i;
-  var errors = /^([hl][xy]|i[xy][hl]|slia|sll)\b/i;
-  var numbers = /^([\da-f]+h|[0-7]+o|[01]+b|\d+d?)\b/i;
-
-  return {
-    startState: function() {
-      return {
-        context: 0
-      };
-    },
-    token: function(stream, state) {
-      if (!stream.column())
-        state.context = 0;
-
-      if (stream.eatSpace())
-        return null;
-
-      var w;
-
-      if (stream.eatWhile(/\w/)) {
-        if (ez80 && stream.eat('.')) {
-          stream.eatWhile(/\w/);
-        }
-        w = stream.current();
-
-        if (stream.indentation()) {
-          if ((state.context == 1 || state.context == 4) && variables1.test(w)) {
-            state.context = 4;
-            return 'var2';
-          }
-
-          if (state.context == 2 && variables2.test(w)) {
-            state.context = 4;
-            return 'var3';
-          }
-
-          if (keywords1.test(w)) {
-            state.context = 1;
-            return 'keyword';
-          } else if (keywords2.test(w)) {
-            state.context = 2;
-            return 'keyword';
-          } else if (state.context == 4 && numbers.test(w)) {
-            return 'number';
-          }
-
-          if (errors.test(w))
-            return 'error';
-        } else if (stream.match(numbers)) {
-          return 'number';
-        } else {
-          return null;
-        }
-      } else if (stream.eat(';')) {
-        stream.skipToEnd();
-        return 'comment';
-      } else if (stream.eat('"')) {
-        while (w = stream.next()) {
-          if (w == '"')
-            break;
-
-          if (w == '\\')
-            stream.next();
-        }
-        return 'string';
-      } else if (stream.eat('\'')) {
-        if (stream.match(/\\?.'/))
-          return 'number';
-      } else if (stream.eat('.') || stream.sol() && stream.eat('#')) {
-        state.context = 5;
-
-        if (stream.eatWhile(/\w/))
-          return 'def';
-      } else if (stream.eat('$')) {
-        if (stream.eatWhile(/[\da-f]/i))
-          return 'number';
-      } else if (stream.eat('%')) {
-        if (stream.eatWhile(/[01]/))
-          return 'number';
-      } else {
-        stream.next();
-      }
-      return null;
-    }
-  };
-});
-
-CodeMirror.defineMIME("text/x-z80", "z80");
-CodeMirror.defineMIME("text/x-ez80", { name: "z80", ez80: true });
-
-});
diff --git a/www/code/codemirror-5.7/package.json b/www/code/codemirror-5.7/package.json
deleted file mode 100644
index dc064040b..000000000
--- a/www/code/codemirror-5.7/package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "name": "codemirror",
-    "version":"5.7.0",
-    "main": "lib/codemirror.js",
-    "description": "In-browser code editing made bearable",
-    "license": "MIT",
-    "directories": {"lib": "./lib"},
-    "scripts": {"test": "node ./test/run.js"},
-    "devDependencies": {"node-static": "0.6.0",
-                        "phantomjs": "1.9.2-5",
-                        "blint": ">=0.1.1"},
-    "bugs": "http://github.com/codemirror/CodeMirror/issues",
-    "keywords": ["JavaScript", "CodeMirror", "Editor"],
-    "homepage": "http://codemirror.net",
-    "maintainers":[{"name": "Marijn Haverbeke",
-                    "email": "marijnh@gmail.com",
-                    "web": "http://marijnhaverbeke.nl"}],
-    "repository": {"type": "git",
-                   "url": "https://github.com/codemirror/CodeMirror.git"}
-}
diff --git a/www/code/codemirror-5.7/test/comment_test.js b/www/code/codemirror-5.7/test/comment_test.js
deleted file mode 100644
index 8bd3959ee..000000000
--- a/www/code/codemirror-5.7/test/comment_test.js
+++ /dev/null
@@ -1,100 +0,0 @@
-namespace = "comment_";
-
-(function() {
-  function test(name, mode, run, before, after) {
-    return testCM(name, function(cm) {
-      run(cm);
-      eq(cm.getValue(), after);
-    }, {value: before, mode: mode});
-  }
-
-  var simpleProg = "function foo() {\n  return bar;\n}";
-  var inlineBlock = "foo(/* bar */ true);";
-  var inlineBlocks = "foo(/* bar */ true, /* baz */ false);";
-  var multiLineInlineBlock = ["above();", "foo(/* bar */ true);", "below();"];
-
-  test("block", "javascript", function(cm) {
-    cm.blockComment(Pos(0, 3), Pos(3, 0), {blockCommentLead: " *"});
-  }, simpleProg + "\n", "/* function foo() {\n *   return bar;\n * }\n */");
-
-  test("blockToggle", "javascript", function(cm) {
-    cm.blockComment(Pos(0, 3), Pos(2, 0), {blockCommentLead: " *"});
-    cm.uncomment(Pos(0, 3), Pos(2, 0), {blockCommentLead: " *"});
-  }, simpleProg, simpleProg);
-
-  test("blockToggle2", "javascript", function(cm) {
-    cm.setCursor({line: 0, ch: 7 /* inside the block comment */});
-    cm.execCommand("toggleComment");
-  }, inlineBlock, "foo(bar true);");
-
-  // This test should work but currently fails.
-  // test("blockToggle3", "javascript", function(cm) {
-  //   cm.setCursor({line: 0, ch: 7 /* inside the first block comment */});
-  //   cm.execCommand("toggleComment");
-  // }, inlineBlocks, "foo(bar true, /* baz */ false);");
-
-  test("line", "javascript", function(cm) {
-    cm.lineComment(Pos(1, 1), Pos(1, 1));
-  }, simpleProg, "function foo() {\n//   return bar;\n}");
-
-  test("lineToggle", "javascript", function(cm) {
-    cm.lineComment(Pos(0, 0), Pos(2, 1));
-    cm.uncomment(Pos(0, 0), Pos(2, 1));
-  }, simpleProg, simpleProg);
-
-  test("fallbackToBlock", "css", function(cm) {
-    cm.lineComment(Pos(0, 0), Pos(2, 1));
-  }, "html {\n  border: none;\n}", "/* html {\n  border: none;\n} */");
-
-  test("fallbackToLine", "ruby", function(cm) {
-    cm.blockComment(Pos(0, 0), Pos(1));
-  }, "def blah()\n  return hah\n", "# def blah()\n#   return hah\n");
-
-  test("ignoreExternalBlockComments", "javascript", function(cm) {
-    cm.execCommand("toggleComment");
-  }, inlineBlocks, "// " + inlineBlocks);
-
-  test("ignoreExternalBlockComments2", "javascript", function(cm) {
-    cm.setCursor({line: 0, ch: null /* eol */});
-    cm.execCommand("toggleComment");
-  }, inlineBlocks, "// " + inlineBlocks);
-
-  test("ignoreExternalBlockCommentsMultiLineAbove", "javascript", function(cm) {
-    cm.setSelection({line: 0, ch: 0}, {line: 1, ch: 1});
-    cm.execCommand("toggleComment");
-  }, multiLineInlineBlock.join("\n"), ["// " + multiLineInlineBlock[0],
-                                       "// " + multiLineInlineBlock[1],
-                                       multiLineInlineBlock[2]].join("\n"));
-
-  test("ignoreExternalBlockCommentsMultiLineBelow", "javascript", function(cm) {
-    cm.setSelection({line: 1, ch: 13 /* after end of block comment */}, {line: 2, ch: 1});
-    cm.execCommand("toggleComment");
-  }, multiLineInlineBlock.join("\n"), [multiLineInlineBlock[0],
-                                       "// " + multiLineInlineBlock[1],
-                                       "// " + multiLineInlineBlock[2]].join("\n"));
-
-  test("commentRange", "javascript", function(cm) {
-    cm.blockComment(Pos(1, 2), Pos(1, 13), {fullLines: false});
-  }, simpleProg, "function foo() {\n  /*return bar;*/\n}");
-
-  test("indented", "javascript", function(cm) {
-    cm.lineComment(Pos(1, 0), Pos(2), {indent: true});
-  }, simpleProg, "function foo() {\n  // return bar;\n  // }");
-
-  test("singleEmptyLine", "javascript", function(cm) {
-    cm.setCursor(1);
-    cm.execCommand("toggleComment");
-  }, "a;\n\nb;", "a;\n// \nb;");
-
-  test("dontMessWithStrings", "javascript", function(cm) {
-    cm.execCommand("toggleComment");
-  }, "console.log(\"/*string*/\");", "// console.log(\"/*string*/\");");
-
-  test("dontMessWithStrings2", "javascript", function(cm) {
-    cm.execCommand("toggleComment");
-  }, "console.log(\"// string\");", "// console.log(\"// string\");");
-
-  test("dontMessWithStrings3", "javascript", function(cm) {
-    cm.execCommand("toggleComment");
-  }, "// console.log(\"// string\");", "console.log(\"// string\");");
-})();
diff --git a/www/code/codemirror-5.7/test/doc_test.js b/www/code/codemirror-5.7/test/doc_test.js
deleted file mode 100644
index 5f242f658..000000000
--- a/www/code/codemirror-5.7/test/doc_test.js
+++ /dev/null
@@ -1,371 +0,0 @@
-(function() {
-  // A minilanguage for instantiating linked CodeMirror instances and Docs
-  function instantiateSpec(spec, place, opts) {
-    var names = {}, pos = 0, l = spec.length, editors = [];
-    while (spec) {
-      var m = spec.match(/^(\w+)(\*?)(?:='([^\']*)'|<(~?)(\w+)(?:\/(\d+)-(\d+))?)\s*/);
-      var name = m[1], isDoc = m[2], cur;
-      if (m[3]) {
-        cur = isDoc ? CodeMirror.Doc(m[3]) : CodeMirror(place, clone(opts, {value: m[3]}));
-      } else {
-        var other = m[5];
-        if (!names.hasOwnProperty(other)) {
-          names[other] = editors.length;
-          editors.push(CodeMirror(place, opts));
-        }
-        var doc = editors[names[other]].linkedDoc({
-          sharedHist: !m[4],
-          from: m[6] ? Number(m[6]) : null,
-          to: m[7] ? Number(m[7]) : null
-        });
-        cur = isDoc ? doc : CodeMirror(place, clone(opts, {value: doc}));
-      }
-      names[name] = editors.length;
-      editors.push(cur);
-      spec = spec.slice(m[0].length);
-    }
-    return editors;
-  }
-
-  function clone(obj, props) {
-    if (!obj) return;
-    clone.prototype = obj;
-    var inst = new clone();
-    if (props) for (var n in props) if (props.hasOwnProperty(n))
-      inst[n] = props[n];
-    return inst;
-  }
-
-  function eqAll(val) {
-    var end = arguments.length, msg = null;
-    if (typeof arguments[end-1] == "string")
-      msg = arguments[--end];
-    if (i == end) throw new Error("No editors provided to eqAll");
-    for (var i = 1; i < end; ++i)
-      eq(arguments[i].getValue(), val, msg)
-  }
-
-  function testDoc(name, spec, run, opts, expectFail) {
-    if (!opts) opts = {};
-
-    return test("doc_" + name, function() {
-      var place = document.getElementById("testground");
-      var editors = instantiateSpec(spec, place, opts);
-      var successful = false;
-
-      try {
-        run.apply(null, editors);
-        successful = true;
-      } finally {
-        if (!successful || verbose) {
-          place.style.visibility = "visible";
-        } else {
-          for (var i = 0; i < editors.length; ++i)
-            if (editors[i] instanceof CodeMirror)
-              place.removeChild(editors[i].getWrapperElement());
-        }
-      }
-    }, expectFail);
-  }
-
-  var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
-
-  function testBasic(a, b) {
-    eqAll("x", a, b);
-    a.setValue("hey");
-    eqAll("hey", a, b);
-    b.setValue("wow");
-    eqAll("wow", a, b);
-    a.replaceRange("u\nv\nw", Pos(0, 3));
-    b.replaceRange("i", Pos(0, 4));
-    b.replaceRange("j", Pos(2, 1));
-    eqAll("wowui\nv\nwj", a, b);
-  }
-
-  testDoc("basic", "A='x' B 0, "not at left");
-    is(pos.top > 0, "not at top");
-  });
-
-  testDoc("copyDoc", "A='u'", function(a) {
-    var copy = a.getDoc().copy(true);
-    a.setValue("foo");
-    copy.setValue("bar");
-    var old = a.swapDoc(copy);
-    eq(a.getValue(), "bar");
-    a.undo();
-    eq(a.getValue(), "u");
-    a.swapDoc(old);
-    eq(a.getValue(), "foo");
-    eq(old.historySize().undo, 1);
-    eq(old.copy(false).historySize().undo, 0);
-  });
-
-  testDoc("docKeepsMode", "A='1+1'", function(a) {
-    var other = CodeMirror.Doc("hi", "text/x-markdown");
-    a.setOption("mode", "text/javascript");
-    var old = a.swapDoc(other);
-    eq(a.getOption("mode"), "text/x-markdown");
-    eq(a.getMode().name, "markdown");
-    a.swapDoc(old);
-    eq(a.getOption("mode"), "text/javascript");
-    eq(a.getMode().name, "javascript");
-  });
-
-  testDoc("subview", "A='1\n2\n3\n4\n5' B<~A/1-3", function(a, b) {
-    eq(b.getValue(), "2\n3");
-    eq(b.firstLine(), 1);
-    b.setCursor(Pos(4));
-    eqPos(b.getCursor(), Pos(2, 1));
-    a.replaceRange("-1\n0\n", Pos(0, 0));
-    eq(b.firstLine(), 3);
-    eqPos(b.getCursor(), Pos(4, 1));
-    a.undo();
-    eqPos(b.getCursor(), Pos(2, 1));
-    b.replaceRange("oyoy\n", Pos(2, 0));
-    eq(a.getValue(), "1\n2\noyoy\n3\n4\n5");
-    b.undo();
-    eq(a.getValue(), "1\n2\n3\n4\n5");
-  });
-
-  testDoc("subviewEditOnBoundary", "A='11\n22\n33\n44\n55' B<~A/1-4", function(a, b) {
-    a.replaceRange("x\nyy\nz", Pos(0, 1), Pos(2, 1));
-    eq(b.firstLine(), 2);
-    eq(b.lineCount(), 2);
-    eq(b.getValue(), "z3\n44");
-    a.replaceRange("q\nrr\ns", Pos(3, 1), Pos(4, 1));
-    eq(b.firstLine(), 2);
-    eq(b.getValue(), "z3\n4q");
-    eq(a.getValue(), "1x\nyy\nz3\n4q\nrr\ns5");
-    a.execCommand("selectAll");
-    a.replaceSelection("!");
-    eqAll("!", a, b);
-  });
-
-
-  testDoc("sharedMarker", "A='ab\ncd\nef\ngh' B 500){
-        totalTime = 0;
-        delay = 50;
-      }
-      setTimeout(function(){step(i + 1);}, delay);
-    } else { // Quit tests
-      running = false;
-      return null;
-    }
-  }
-  step(0);
-}
-
-function label(str, msg) {
-  if (msg) return str + " (" + msg + ")";
-  return str;
-}
-function eq(a, b, msg) {
-  if (a != b) throw new Failure(label(a + " != " + b, msg));
-}
-function near(a, b, margin, msg) {
-  if (Math.abs(a - b) > margin)
-    throw new Failure(label(a + " is not close to " + b + " (" + margin + ")", msg));
-}
-function eqPos(a, b, msg) {
-  function str(p) { return "{line:" + p.line + ",ch:" + p.ch + "}"; }
-  if (a == b) return;
-  if (a == null) throw new Failure(label("comparing null to " + str(b), msg));
-  if (b == null) throw new Failure(label("comparing " + str(a) + " to null", msg));
-  if (a.line != b.line || a.ch != b.ch) throw new Failure(label(str(a) + " != " + str(b), msg));
-}
-function is(a, msg) {
-  if (!a) throw new Failure(label("assertion failed", msg));
-}
-
-function countTests() {
-  if (!filters.length) return tests.length;
-  var sum = 0;
-  for (var i = 0; i < tests.length; ++i) {
-    var name = tests[i].name;
-    for (var j = 0; j < filters.length; j++) {
-      if (name.match(filters[j])) {
-        ++sum;
-        break;
-      }
-    }
-  }
-  return sum;
-}
-
-function parseTestFilter(s) {
-  if (/_\*$/.test(s)) return new RegExp("^" + s.slice(0, s.length - 2), "i");
-  else return new RegExp(s, "i");
-}
diff --git a/www/code/codemirror-5.7/test/emacs_test.js b/www/code/codemirror-5.7/test/emacs_test.js
deleted file mode 100644
index 01db618b2..000000000
--- a/www/code/codemirror-5.7/test/emacs_test.js
+++ /dev/null
@@ -1,147 +0,0 @@
-(function() {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-  namespace = "emacs_";
-
-  var eventCache = {};
-  function fakeEvent(keyName) {
-    var event = eventCache[key];
-    if (event) return event;
-
-    var ctrl, shift, alt;
-    var key = keyName.replace(/\w+-/g, function(type) {
-      if (type == "Ctrl-") ctrl = true;
-      else if (type == "Alt-") alt = true;
-      else if (type == "Shift-") shift = true;
-      return "";
-    });
-    var code;
-    for (var c in CodeMirror.keyNames)
-      if (CodeMirror.keyNames[c] == key) { code = c; break; }
-    if (c == null) throw new Error("Unknown key: " + key);
-
-    return eventCache[keyName] = {
-      type: "keydown", keyCode: code, ctrlKey: ctrl, shiftKey: shift, altKey: alt,
-      preventDefault: function(){}, stopPropagation: function(){}
-    };
-  }
-
-  function sim(name, start /*, actions... */) {
-    var keys = Array.prototype.slice.call(arguments, 2);
-    testCM(name, function(cm) {
-      for (var i = 0; i < keys.length; ++i) {
-        var cur = keys[i];
-        if (cur instanceof Pos) cm.setCursor(cur);
-        else if (cur.call) cur(cm);
-        else cm.triggerOnKeyDown(fakeEvent(cur));
-      }
-    }, {keyMap: "emacs", value: start, mode: "javascript"});
-  }
-
-  function at(line, ch) { return function(cm) { eqPos(cm.getCursor(), Pos(line, ch)); }; }
-  function txt(str) { return function(cm) { eq(cm.getValue(), str); }; }
-
-  sim("motionHSimple", "abc", "Ctrl-F", "Ctrl-F", "Ctrl-B", at(0, 1));
-  sim("motionHMulti", "abcde",
-      "Ctrl-4", "Ctrl-F", at(0, 4), "Ctrl--", "Ctrl-2", "Ctrl-F", at(0, 2),
-      "Ctrl-5", "Ctrl-B", at(0, 0));
-
-  sim("motionHWord", "abc. def ghi",
-      "Alt-F", at(0, 3), "Alt-F", at(0, 8),
-      "Ctrl-B", "Alt-B", at(0, 5), "Alt-B", at(0, 0));
-  sim("motionHWordMulti", "abc. def ghi ",
-      "Ctrl-3", "Alt-F", at(0, 12), "Ctrl-2", "Alt-B", at(0, 5),
-      "Ctrl--", "Alt-B", at(0, 8));
-
-  sim("motionVSimple", "a\nb\nc\n", "Ctrl-N", "Ctrl-N", "Ctrl-P", at(1, 0));
-  sim("motionVMulti", "a\nb\nc\nd\ne\n",
-      "Ctrl-2", "Ctrl-N", at(2, 0), "Ctrl-F", "Ctrl--", "Ctrl-N", at(1, 1),
-      "Ctrl--", "Ctrl-3", "Ctrl-P", at(4, 1));
-
-  sim("killYank", "abc\ndef\nghi",
-      "Ctrl-F", "Ctrl-Space", "Ctrl-N", "Ctrl-N", "Ctrl-W", "Ctrl-E", "Ctrl-Y",
-      txt("ahibc\ndef\ng"));
-  sim("killRing", "abcdef",
-      "Ctrl-Space", "Ctrl-F", "Ctrl-W", "Ctrl-Space", "Ctrl-F", "Ctrl-W",
-      "Ctrl-Y", "Alt-Y",
-      txt("acdef"));
-  sim("copyYank", "abcd",
-      "Ctrl-Space", "Ctrl-E", "Alt-W", "Ctrl-Y",
-      txt("abcdabcd"));
-
-  sim("killLineSimple", "foo\nbar", "Ctrl-F", "Ctrl-K", txt("f\nbar"));
-  sim("killLineEmptyLine", "foo\n  \nbar", "Ctrl-N", "Ctrl-K", txt("foo\nbar"));
-  sim("killLineMulti", "foo\nbar\nbaz",
-      "Ctrl-F", "Ctrl-F", "Ctrl-K", "Ctrl-K", "Ctrl-K", "Ctrl-A", "Ctrl-Y",
-      txt("o\nbarfo\nbaz"));
-
-  sim("moveByParagraph", "abc\ndef\n\n\nhij\nklm\n\n",
-      "Ctrl-F", "Ctrl-Down", at(2, 0), "Ctrl-Down", at(6, 0),
-      "Ctrl-N", "Ctrl-Up", at(3, 0), "Ctrl-Up", at(0, 0),
-      Pos(1, 2), "Ctrl-Down", at(2, 0), Pos(4, 2), "Ctrl-Up", at(3, 0));
-  sim("moveByParagraphMulti", "abc\n\ndef\n\nhij\n\nklm",
-      "Ctrl-U", "2", "Ctrl-Down", at(3, 0),
-      "Shift-Alt-.", "Ctrl-3", "Ctrl-Up", at(1, 0));
-
-  sim("moveBySentence", "sentence one! sentence\ntwo\n\nparagraph two",
-      "Alt-E", at(0, 13), "Alt-E", at(1, 3), "Ctrl-F", "Alt-A", at(0, 13));
-
-  sim("moveByExpr", "function foo(a, b) {}",
-      "Ctrl-Alt-F", at(0, 8), "Ctrl-Alt-F", at(0, 12), "Ctrl-Alt-F", at(0, 18),
-      "Ctrl-Alt-B", at(0, 12), "Ctrl-Alt-B", at(0, 9));
-  sim("moveByExprMulti", "foo bar baz bug",
-      "Ctrl-2", "Ctrl-Alt-F", at(0, 7),
-      "Ctrl--", "Ctrl-Alt-F", at(0, 4),
-      "Ctrl--", "Ctrl-2", "Ctrl-Alt-B", at(0, 11));
-  sim("delExpr", "var x = [\n  a,\n  b\n  c\n];",
-      Pos(0, 8), "Ctrl-Alt-K", txt("var x = ;"), "Ctrl-/",
-      Pos(4, 1), "Ctrl-Alt-Backspace", txt("var x = ;"));
-  sim("delExprMulti", "foo bar baz",
-      "Ctrl-2", "Ctrl-Alt-K", txt(" baz"),
-      "Ctrl-/", "Ctrl-E", "Ctrl-2", "Ctrl-Alt-Backspace", txt("foo "));
-
-  sim("justOneSpace", "hi      bye  ",
-      Pos(0, 4), "Alt-Space", txt("hi bye  "),
-      Pos(0, 4), "Alt-Space", txt("hi b ye  "),
-      "Ctrl-A", "Alt-Space", "Ctrl-E", "Alt-Space", txt(" hi b ye "));
-
-  sim("openLine", "foo bar", "Alt-F", "Ctrl-O", txt("foo\n bar"))
-
-  sim("transposeChar", "abcd\ne",
-      "Ctrl-F", "Ctrl-T", "Ctrl-T", txt("bcad\ne"), at(0, 3),
-      "Ctrl-F", "Ctrl-T", "Ctrl-T", "Ctrl-T", txt("bcda\ne"), at(0, 4),
-      "Ctrl-F", "Ctrl-T", txt("bcde\na"), at(1, 0));
-
-  sim("manipWordCase", "foo BAR bAZ",
-      "Alt-C", "Alt-L", "Alt-U", txt("Foo bar BAZ"),
-      "Ctrl-A", "Alt-U", "Alt-L", "Alt-C", txt("FOO bar Baz"));
-  sim("manipWordCaseMulti", "foo Bar bAz",
-      "Ctrl-2", "Alt-U", txt("FOO BAR bAz"),
-      "Ctrl-A", "Ctrl-3", "Alt-C", txt("Foo Bar Baz"));
-
-  sim("upExpr", "foo {\n  bar[];\n  baz(blah);\n}",
-      Pos(2, 7), "Ctrl-Alt-U", at(2, 5), "Ctrl-Alt-U", at(0, 4));
-  sim("transposeExpr", "do foo[bar] dah",
-      Pos(0, 6), "Ctrl-Alt-T", txt("do [bar]foo dah"));
-
-  sim("clearMark", "abcde", Pos(0, 2), "Ctrl-Space", "Ctrl-F", "Ctrl-F",
-      "Ctrl-G", "Ctrl-W", txt("abcde"));
-
-  sim("delRegion", "abcde", "Ctrl-Space", "Ctrl-F", "Ctrl-F", "Delete", txt("cde"));
-  sim("backspaceRegion", "abcde", "Ctrl-Space", "Ctrl-F", "Ctrl-F", "Backspace", txt("cde"));
-
-  testCM("save", function(cm) {
-    var saved = false;
-    CodeMirror.commands.save = function(cm) { saved = cm.getValue(); };
-    cm.triggerOnKeyDown(fakeEvent("Ctrl-X"));
-    cm.triggerOnKeyDown(fakeEvent("Ctrl-S"));
-    is(saved, "hi");
-  }, {value: "hi", keyMap: "emacs"});
-
-  testCM("gotoInvalidLineFloat", function(cm) {
-    cm.openDialog = function(_, cb) { cb("2.2"); };
-    cm.triggerOnKeyDown(fakeEvent("Alt-G"));
-    cm.triggerOnKeyDown(fakeEvent("G"));
-  }, {value: "1\n2\n3\n4", keyMap: "emacs"});
-})();
diff --git a/www/code/codemirror-5.7/test/index.html b/www/code/codemirror-5.7/test/index.html
deleted file mode 100644
index b0b1fa976..000000000
--- a/www/code/codemirror-5.7/test/index.html
+++ /dev/null
@@ -1,249 +0,0 @@
-
-
-
-CodeMirror: Test Suite
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
    
-  
    Test Suite
    
-
-    
    A limited set of programmatic sanity tests for CodeMirror.
    
-
-    
    
-      
    Ran 0 of 0 tests
    
-    
    
-    
    Please enable JavaScript...
    
-    
    
-
-    
    
-
-    
-    
-    
-    
-    
-    
-    
-    
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-
    
diff --git a/www/code/codemirror-5.7/test/lint.js b/www/code/codemirror-5.7/test/lint.js
deleted file mode 100644
index 35777562e..000000000
--- a/www/code/codemirror-5.7/test/lint.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var blint = require("blint");
-
-["mode", "lib", "addon", "keymap"].forEach(function(dir) {
-  blint.checkDir(dir, {
-    browser: true,
-    allowedGlobals: ["CodeMirror", "define", "test", "requirejs"],
-    blob: "// CodeMirror, copyright (c) by Marijn Haverbeke and others\n// Distributed under an MIT license: http:\/\/codemirror.net\/LICENSE\n\n"
-  });
-});
-
-module.exports = {ok: blint.success()};
diff --git a/www/code/codemirror-5.7/test/mode_test.css b/www/code/codemirror-5.7/test/mode_test.css
deleted file mode 100644
index f83271b4e..000000000
--- a/www/code/codemirror-5.7/test/mode_test.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.mt-output .mt-token {
-  border: 1px solid #ddd;
-  white-space: pre;
-  font-family: "Consolas", monospace;
-  text-align: center;
-}
-
-.mt-output .mt-style {
-  font-size: x-small;
-}
-
-.mt-output .mt-state {
-  font-size: x-small;
-  vertical-align: top;
-}
-
-.mt-output .mt-state-row {
-  display: none;
-}
-
-.mt-state-unhide .mt-output .mt-state-row {
-  display: table-row;
-}
diff --git a/www/code/codemirror-5.7/test/mode_test.js b/www/code/codemirror-5.7/test/mode_test.js
deleted file mode 100644
index 2e16eba0e..000000000
--- a/www/code/codemirror-5.7/test/mode_test.js
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * Helper to test CodeMirror highlighting modes. It pretty prints output of the
- * highlighter and can check against expected styles.
- *
- * Mode tests are registered by calling test.mode(testName, mode,
- * tokens), where mode is a mode object as returned by
- * CodeMirror.getMode, and tokens is an array of lines that make up
- * the test.
- *
- * These lines are strings, in which styled stretches of code are
- * enclosed in brackets `[]`, and prefixed by their style. For
- * example, `[keyword if]`. Brackets in the code itself must be
- * duplicated to prevent them from being interpreted as token
- * boundaries. For example `a[[i]]` for `a[i]`. If a token has
- * multiple styles, the styles must be separated by ampersands, for
- * example `[tag&error ]`.
- *
- * See the test.js files in the css, markdown, gfm, and stex mode
- * directories for examples.
- */
-(function() {
-  function findSingle(str, pos, ch) {
-    for (;;) {
-      var found = str.indexOf(ch, pos);
-      if (found == -1) return null;
-      if (str.charAt(found + 1) != ch) return found;
-      pos = found + 2;
-    }
-  }
-
-  var styleName = /[\w&-_]+/g;
-  function parseTokens(strs) {
-    var tokens = [], plain = "";
-    for (var i = 0; i < strs.length; ++i) {
-      if (i) plain += "\n";
-      var str = strs[i], pos = 0;
-      while (pos < str.length) {
-        var style = null, text;
-        if (str.charAt(pos) == "[" && str.charAt(pos+1) != "[") {
-          styleName.lastIndex = pos + 1;
-          var m = styleName.exec(str);
-          style = m[0].replace(/&/g, " ");
-          var textStart = pos + style.length + 2;
-          var end = findSingle(str, textStart, "]");
-          if (end == null) throw new Error("Unterminated token at " + pos + " in '" + str + "'" + style);
-          text = str.slice(textStart, end);
-          pos = end + 1;
-        } else {
-          var end = findSingle(str, pos, "[");
-          if (end == null) end = str.length;
-          text = str.slice(pos, end);
-          pos = end;
-        }
-        text = text.replace(/\[\[|\]\]/g, function(s) {return s.charAt(0);});
-        tokens.push({style: style, text: text});
-        plain += text;
-      }
-    }
-    return {tokens: tokens, plain: plain};
-  }
-
-  test.mode = function(name, mode, tokens, modeName) {
-    var data = parseTokens(tokens);
-    return test((modeName || mode.name) + "_" + name, function() {
-      return compare(data.plain, data.tokens, mode);
-    });
-  };
-
-  function esc(str) {
-    return str.replace('&', '&').replace('<', '<').replace(/>/g, ">").replace(/"/g, """).replace(/'/g, "'");
-;
-  }
-
-  function compare(text, expected, mode) {
-
-    var expectedOutput = [];
-    for (var i = 0; i < expected.length; ++i) {
-      var sty = expected[i].style;
-      if (sty && sty.indexOf(" ")) sty = sty.split(' ').sort().join(' ');
-      expectedOutput.push({style: sty, text: expected[i].text});
-    }
-
-    var observedOutput = highlight(text, mode);
-
-    var s = "";
-    var diff = highlightOutputsDifferent(expectedOutput, observedOutput);
-    if (diff != null) {
-      s += '
    ';
-      s +=   '
    ' + esc(text) + '
    ';
-      s +=   '
    ';
-      s += 'expected:';
-      s +=   prettyPrintOutputTable(expectedOutput, diff);
-      s += 'observed: [display states]';
-      s +=   prettyPrintOutputTable(observedOutput, diff);
-      s +=   '
    ';
-      s += '
    ';
-    }
-    if (observedOutput.indentFailures) {
-      for (var i = 0; i < observedOutput.indentFailures.length; i++)
-        s += "
    " + esc(observedOutput.indentFailures[i]) + "
    ";
-    }
-    if (s) throw new Failure(s);
-  }
-
-  function stringify(obj) {
-    function replacer(key, obj) {
-      if (typeof obj == "function") {
-        var m = obj.toString().match(/function\s*[^\s(]*/);
-        return m ? m[0] : "function";
-      }
-      return obj;
-    }
-    if (window.JSON && JSON.stringify)
-      return JSON.stringify(obj, replacer, 2);
-    return "[unsupported]";  // Fail safely if no native JSON.
-  }
-
-  function highlight(string, mode) {
-    var state = mode.startState();
-
-    var lines = string.replace(/\r\n/g,'\n').split('\n');
-    var st = [], pos = 0;
-    for (var i = 0; i < lines.length; ++i) {
-      var line = lines[i], newLine = true;
-      if (mode.indent) {
-        var ws = line.match(/^\s*/)[0];
-        var indent = mode.indent(state, line.slice(ws.length));
-        if (indent != CodeMirror.Pass && indent != ws.length)
-          (st.indentFailures || (st.indentFailures = [])).push(
-            "Indentation of line " + (i + 1) + " is " + indent + " (expected " + ws.length + ")");
-      }
-      var stream = new CodeMirror.StringStream(line);
-      if (line == "" && mode.blankLine) mode.blankLine(state);
-      /* Start copied code from CodeMirror.highlight */
-      while (!stream.eol()) {
-        for (var j = 0; j < 10 && stream.start >= stream.pos; j++)
-          var compare = mode.token(stream, state);
-        if (j == 10)
-          throw new Failure("Failed to advance the stream." + stream.string + " " + stream.pos);
-        var substr = stream.current();
-        if (compare && compare.indexOf(" ") > -1) compare = compare.split(' ').sort().join(' ');
-        stream.start = stream.pos;
-        if (pos && st[pos-1].style == compare && !newLine) {
-          st[pos-1].text += substr;
-        } else if (substr) {
-          st[pos++] = {style: compare, text: substr, state: stringify(state)};
-        }
-        // Give up when line is ridiculously long
-        if (stream.pos > 5000) {
-          st[pos++] = {style: null, text: this.text.slice(stream.pos)};
-          break;
-        }
-        newLine = false;
-      }
-    }
-
-    return st;
-  }
-
-  function highlightOutputsDifferent(o1, o2) {
-    var minLen = Math.min(o1.length, o2.length);
-    for (var i = 0; i < minLen; ++i)
-      if (o1[i].style != o2[i].style || o1[i].text != o2[i].text) return i;
-    if (o1.length > minLen || o2.length > minLen) return minLen;
-  }
-
-  function prettyPrintOutputTable(output, diffAt) {
-    var s = '';
-    s += '';
-    for (var i = 0; i < output.length; ++i) {
-      var style = output[i].style, val = output[i].text;
-      s +=
-      '';
-    }
-    s += '';
-    for (var i = 0; i < output.length; ++i) {
-      s += '';
-    }
-    if(output[0].state) {
-      s += '';
-      for (var i = 0; i < output.length; ++i) {
-        s += '';
-      }
-    }
-    s += '
    ' +
-        '' +
-        esc(val.replace(/ /g,'\xb7')) +  // · MIDDLE DOT
-        '' +
-        '
    ' + (output[i].style || null) + '
    ' + esc(output[i].state) + '
    ';
-    return s;
-  }
-})();
diff --git a/www/code/codemirror-5.7/test/multi_test.js b/www/code/codemirror-5.7/test/multi_test.js
deleted file mode 100644
index a8e760d27..000000000
--- a/www/code/codemirror-5.7/test/multi_test.js
+++ /dev/null
@@ -1,285 +0,0 @@
-(function() {
-  namespace = "multi_";
-
-  function hasSelections(cm) {
-    var sels = cm.listSelections();
-    var given = (arguments.length - 1) / 4;
-    if (sels.length != given)
-      throw new Failure("expected " + given + " selections, found " + sels.length);
-    for (var i = 0, p = 1; i < given; i++, p += 4) {
-      var anchor = Pos(arguments[p], arguments[p + 1]);
-      var head = Pos(arguments[p + 2], arguments[p + 3]);
-      eqPos(sels[i].anchor, anchor, "anchor of selection " + i);
-      eqPos(sels[i].head, head, "head of selection " + i);
-    }
-  }
-  function hasCursors(cm) {
-    var sels = cm.listSelections();
-    var given = (arguments.length - 1) / 2;
-    if (sels.length != given)
-      throw new Failure("expected " + given + " selections, found " + sels.length);
-    for (var i = 0, p = 1; i < given; i++, p += 2) {
-      eqPos(sels[i].anchor, sels[i].head, "something selected for " + i);
-      var head = Pos(arguments[p], arguments[p + 1]);
-      eqPos(sels[i].head, head, "selection " + i);
-    }
-  }
-
-  testCM("getSelection", function(cm) {
-    select(cm, {anchor: Pos(0, 0), head: Pos(1, 2)}, {anchor: Pos(2, 2), head: Pos(2, 0)});
-    eq(cm.getSelection(), "1234\n56\n90");
-    eq(cm.getSelection(false).join("|"), "1234|56|90");
-    eq(cm.getSelections().join("|"), "1234\n56|90");
-  }, {value: "1234\n5678\n90"});
-
-  testCM("setSelection", function(cm) {
-    select(cm, Pos(3, 0), Pos(0, 0), {anchor: Pos(2, 5), head: Pos(1, 0)});
-    hasSelections(cm, 0, 0, 0, 0,
-                  2, 5, 1, 0,
-                  3, 0, 3, 0);
-    cm.setSelection(Pos(1, 2), Pos(1, 1));
-    hasSelections(cm, 1, 2, 1, 1);
-    select(cm, {anchor: Pos(1, 1), head: Pos(2, 4)},
-           {anchor: Pos(0, 0), head: Pos(1, 3)},
-           Pos(3, 0), Pos(2, 2));
-    hasSelections(cm, 0, 0, 2, 4,
-                  3, 0, 3, 0);
-    cm.setSelections([{anchor: Pos(0, 1), head: Pos(0, 2)},
-                      {anchor: Pos(1, 1), head: Pos(1, 2)},
-                      {anchor: Pos(2, 1), head: Pos(2, 2)}], 1);
-    eqPos(cm.getCursor("head"), Pos(1, 2));
-    eqPos(cm.getCursor("anchor"), Pos(1, 1));
-    eqPos(cm.getCursor("from"), Pos(1, 1));
-    eqPos(cm.getCursor("to"), Pos(1, 2));
-    cm.setCursor(Pos(1, 1));
-    hasCursors(cm, 1, 1);
-  }, {value: "abcde\nabcde\nabcde\n"});
-
-  testCM("somethingSelected", function(cm) {
-    select(cm, Pos(0, 1), {anchor: Pos(0, 3), head: Pos(0, 5)});
-    eq(cm.somethingSelected(), true);
-    select(cm, Pos(0, 1), Pos(0, 3), Pos(0, 5));
-    eq(cm.somethingSelected(), false);
-  }, {value: "123456789"});
-
-  testCM("extendSelection", function(cm) {
-    select(cm, Pos(0, 1), Pos(1, 1), Pos(2, 1));
-    cm.setExtending(true);
-    cm.extendSelections([Pos(0, 2), Pos(1, 0), Pos(2, 3)]);
-    hasSelections(cm, 0, 1, 0, 2,
-                  1, 1, 1, 0,
-                  2, 1, 2, 3);
-    cm.extendSelection(Pos(2, 4), Pos(2, 0));
-    hasSelections(cm, 2, 4, 2, 0);
-  }, {value: "1234\n1234\n1234"});
-
-  testCM("addSelection", function(cm) {
-    select(cm, Pos(0, 1), Pos(1, 1));
-    cm.addSelection(Pos(0, 0), Pos(0, 4));
-    hasSelections(cm, 0, 0, 0, 4,
-                  1, 1, 1, 1);
-    cm.addSelection(Pos(2, 2));
-    hasSelections(cm, 0, 0, 0, 4,
-                  1, 1, 1, 1,
-                  2, 2, 2, 2);
-  }, {value: "1234\n1234\n1234"});
-
-  testCM("replaceSelection", function(cm) {
-    var selections = [{anchor: Pos(0, 0), head: Pos(0, 1)},
-                      {anchor: Pos(0, 2), head: Pos(0, 3)},
-                      {anchor: Pos(0, 4), head: Pos(0, 5)},
-                      {anchor: Pos(2, 1), head: Pos(2, 4)},
-                      {anchor: Pos(2, 5), head: Pos(2, 6)}];
-    var val = "123456\n123456\n123456";
-    cm.setValue(val);
-    cm.setSelections(selections);
-    cm.replaceSelection("ab", "around");
-    eq(cm.getValue(), "ab2ab4ab6\n123456\n1ab5ab");
-    hasSelections(cm, 0, 0, 0, 2,
-                  0, 3, 0, 5,
-                  0, 6, 0, 8,
-                  2, 1, 2, 3,
-                  2, 4, 2, 6);
-    cm.setValue(val);
-    cm.setSelections(selections);
-    cm.replaceSelection("", "around");
-    eq(cm.getValue(), "246\n123456\n15");
-    hasSelections(cm, 0, 0, 0, 0,
-                  0, 1, 0, 1,
-                  0, 2, 0, 2,
-                  2, 1, 2, 1,
-                  2, 2, 2, 2);
-    cm.setValue(val);
-    cm.setSelections(selections);
-    cm.replaceSelection("X\nY\nZ", "around");
-    hasSelections(cm, 0, 0, 2, 1,
-                  2, 2, 4, 1,
-                  4, 2, 6, 1,
-                  8, 1, 10, 1,
-                  10, 2, 12, 1);
-    cm.replaceSelection("a", "around");
-    hasSelections(cm, 0, 0, 0, 1,
-                  0, 2, 0, 3,
-                  0, 4, 0, 5,
-                  2, 1, 2, 2,
-                  2, 3, 2, 4);
-    cm.replaceSelection("xy", "start");
-    hasSelections(cm, 0, 0, 0, 0,
-                  0, 3, 0, 3,
-                  0, 6, 0, 6,
-                  2, 1, 2, 1,
-                  2, 4, 2, 4);
-    cm.replaceSelection("z\nf");
-    hasSelections(cm, 1, 1, 1, 1,
-                  2, 1, 2, 1,
-                  3, 1, 3, 1,
-                  6, 1, 6, 1,
-                  7, 1, 7, 1);
-    eq(cm.getValue(), "z\nfxy2z\nfxy4z\nfxy6\n123456\n1z\nfxy5z\nfxy");
-  });
-
-  function select(cm) {
-    var sels = [];
-    for (var i = 1; i < arguments.length; i++) {
-      var arg = arguments[i];
-      if (arg.head) sels.push(arg);
-      else sels.push({head: arg, anchor: arg});
-    }
-    cm.setSelections(sels, sels.length - 1);
-  }
-
-  testCM("indentSelection", function(cm) {
-    select(cm, Pos(0, 1), Pos(1, 1));
-    cm.indentSelection(4);
-    eq(cm.getValue(), "    foo\n    bar\nbaz");
-
-    select(cm, Pos(0, 2), Pos(0, 3), Pos(0, 4));
-    cm.indentSelection(-2);
-    eq(cm.getValue(), "  foo\n    bar\nbaz");
-
-    select(cm, {anchor: Pos(0, 0), head: Pos(1, 2)},
-           {anchor: Pos(1, 3), head: Pos(2, 0)});
-    cm.indentSelection(-2);
-    eq(cm.getValue(), "foo\n  bar\nbaz");
-  }, {value: "foo\nbar\nbaz"});
-
-  testCM("killLine", function(cm) {
-    select(cm, Pos(0, 1), Pos(0, 2), Pos(1, 1));
-    cm.execCommand("killLine");
-    eq(cm.getValue(), "f\nb\nbaz");
-    cm.execCommand("killLine");
-    eq(cm.getValue(), "fbbaz");
-    cm.setValue("foo\nbar\nbaz");
-    select(cm, Pos(0, 1), {anchor: Pos(0, 2), head: Pos(2, 1)});
-    cm.execCommand("killLine");
-    eq(cm.getValue(), "faz");
-  }, {value: "foo\nbar\nbaz"});
-
-  testCM("deleteLine", function(cm) {
-    select(cm, Pos(0, 0),
-           {head: Pos(0, 1), anchor: Pos(2, 0)},
-           Pos(4, 0));
-    cm.execCommand("deleteLine");
-    eq(cm.getValue(), "4\n6\n7");
-    select(cm, Pos(2, 1));
-    cm.execCommand("deleteLine");
-    eq(cm.getValue(), "4\n6\n");
-  }, {value: "1\n2\n3\n4\n5\n6\n7"});
-
-  testCM("deleteH", function(cm) {
-    select(cm, Pos(0, 4), {anchor: Pos(1, 4), head: Pos(1, 5)});
-    cm.execCommand("delWordAfter");
-    eq(cm.getValue(), "foo bar baz\nabc ef ghi\n");
-    cm.execCommand("delWordAfter");
-    eq(cm.getValue(), "foo  baz\nabc  ghi\n");
-    cm.execCommand("delCharBefore");
-    cm.execCommand("delCharBefore");
-    eq(cm.getValue(), "fo baz\nab ghi\n");
-    select(cm, Pos(0, 3), Pos(0, 4), Pos(0, 5));
-    cm.execCommand("delWordAfter");
-    eq(cm.getValue(), "fo \nab ghi\n");
-  }, {value: "foo bar baz\nabc def ghi\n"});
-
-  testCM("goLineStart", function(cm) {
-    select(cm, Pos(0, 2), Pos(0, 3), Pos(1, 1));
-    cm.execCommand("goLineStart");
-    hasCursors(cm, 0, 0, 1, 0);
-    select(cm, Pos(1, 1), Pos(0, 1));
-    cm.setExtending(true);
-    cm.execCommand("goLineStart");
-    hasSelections(cm, 0, 1, 0, 0,
-                  1, 1, 1, 0);
-  }, {value: "foo\nbar\nbaz"});
-
-  testCM("moveV", function(cm) {
-    select(cm, Pos(0, 2), Pos(1, 2));
-    cm.execCommand("goLineDown");
-    hasCursors(cm, 1, 2, 2, 2);
-    cm.execCommand("goLineUp");
-    hasCursors(cm, 0, 2, 1, 2);
-    cm.execCommand("goLineUp");
-    hasCursors(cm, 0, 0, 0, 2);
-    cm.execCommand("goLineUp");
-    hasCursors(cm, 0, 0);
-    select(cm, Pos(0, 2), Pos(1, 2));
-    cm.setExtending(true);
-    cm.execCommand("goLineDown");
-    hasSelections(cm, 0, 2, 2, 2);
-  }, {value: "12345\n12345\n12345"});
-
-  testCM("moveH", function(cm) {
-    select(cm, Pos(0, 1), Pos(0, 3), Pos(0, 5), Pos(2, 3));
-    cm.execCommand("goCharRight");
-    hasCursors(cm, 0, 2, 0, 4, 1, 0, 2, 4);
-    cm.execCommand("goCharLeft");
-    hasCursors(cm, 0, 1, 0, 3, 0, 5, 2, 3);
-    for (var i = 0; i < 15; i++)
-      cm.execCommand("goCharRight");
-    hasCursors(cm, 2, 4, 2, 5);
-  }, {value: "12345\n12345\n12345"});
-
-  testCM("newlineAndIndent", function(cm) {
-    select(cm, Pos(0, 5), Pos(1, 5));
-    cm.execCommand("newlineAndIndent");
-    hasCursors(cm, 1, 2, 3, 2);
-    eq(cm.getValue(), "x = [\n  1];\ny = [\n  2];");
-    cm.undo();
-    eq(cm.getValue(), "x = [1];\ny = [2];");
-    hasCursors(cm, 0, 5, 1, 5);
-    select(cm, Pos(0, 5), Pos(0, 6));
-    cm.execCommand("newlineAndIndent");
-    hasCursors(cm, 1, 2, 2, 0);
-    eq(cm.getValue(), "x = [\n  1\n];\ny = [2];");
-  }, {value: "x = [1];\ny = [2];", mode: "javascript"});
-
-  testCM("goDocStartEnd", function(cm) {
-    select(cm, Pos(0, 1), Pos(1, 1));
-    cm.execCommand("goDocStart");
-    hasCursors(cm, 0, 0);
-    select(cm, Pos(0, 1), Pos(1, 1));
-    cm.execCommand("goDocEnd");
-    hasCursors(cm, 1, 3);
-    select(cm, Pos(0, 1), Pos(1, 1));
-    cm.setExtending(true);
-    cm.execCommand("goDocEnd");
-    hasSelections(cm, 1, 1, 1, 3);
-  }, {value: "abc\ndef"});
-
-  testCM("selectionHistory", function(cm) {
-    for (var i = 0; i < 3; ++i)
-      cm.addSelection(Pos(0, i * 2), Pos(0, i * 2 + 1));
-    cm.execCommand("undoSelection");
-    eq(cm.getSelection(), "1\n2");
-    cm.execCommand("undoSelection");
-    eq(cm.getSelection(), "1");
-    cm.execCommand("undoSelection");
-    eq(cm.getSelection(), "");
-    eqPos(cm.getCursor(), Pos(0, 0));
-    cm.execCommand("redoSelection");
-    eq(cm.getSelection(), "1");
-    cm.execCommand("redoSelection");
-    eq(cm.getSelection(), "1\n2");
-    cm.execCommand("redoSelection");
-    eq(cm.getSelection(), "1\n2\n3");
-  }, {value: "1 2 3"});
-})();
diff --git a/www/code/codemirror-5.7/test/phantom_driver.js b/www/code/codemirror-5.7/test/phantom_driver.js
deleted file mode 100644
index dbad08db6..000000000
--- a/www/code/codemirror-5.7/test/phantom_driver.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var page = require('webpage').create();
-
-page.open("http://localhost:3000/test/index.html", function (status) {
-  if (status != "success") {
-    console.log("page couldn't be loaded successfully");
-    phantom.exit(1);
-  }
-  waitFor(function () {
-    return page.evaluate(function () {
-      var output = document.getElementById('status');
-      if (!output) { return false; }
-      return (/^(\d+ failures?|all passed)/i).test(output.innerText);
-    });
-  }, function () {
-    var failed = page.evaluate(function () { return window.failed; });
-    var output = page.evaluate(function () {
-      return document.getElementById('output').innerText + "\n" +
-        document.getElementById('status').innerText;
-    });
-    console.log(output);
-    phantom.exit(failed > 0 ? 1 : 0);
-  });
-});
-
-function waitFor (test, cb) {
-  if (test()) {
-    cb();
-  } else {
-    setTimeout(function () { waitFor(test, cb); }, 250);
-  }
-}
diff --git a/www/code/codemirror-5.7/test/run.js b/www/code/codemirror-5.7/test/run.js
deleted file mode 100644
index 24b835c37..000000000
--- a/www/code/codemirror-5.7/test/run.js
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env node
-
-var ok = require("./lint").ok;
-
-var files = new (require('node-static').Server)();
-
-var server = require('http').createServer(function (req, res) {
-  req.addListener('end', function () {
-    files.serve(req, res, function (err/*, result */) {
-      if (err) {
-        console.error(err);
-        process.exit(1);
-      }
-    });
-  }).resume();
-}).addListener('error', function (err) {
-  throw err;
-}).listen(3000, function () {
-  var childProcess = require('child_process');
-  var phantomjs = require("phantomjs");
-  var childArgs = [
-    require("path").join(__dirname, 'phantom_driver.js')
-  ];
-  childProcess.execFile(phantomjs.path, childArgs, function (err, stdout, stderr) {
-    server.close();
-    console.log(stdout);
-    if (err) console.error(err);
-    if (stderr) console.error(stderr);
-    process.exit(err || stderr || !ok ? 1 : 0);
-  });
-});
diff --git a/www/code/codemirror-5.7/test/scroll_test.js b/www/code/codemirror-5.7/test/scroll_test.js
deleted file mode 100644
index 82fd126c4..000000000
--- a/www/code/codemirror-5.7/test/scroll_test.js
+++ /dev/null
@@ -1,115 +0,0 @@
-(function() {
-  "use strict";
-
-  namespace = "scroll_";
-
-  testCM("bars_hidden", function(cm) {
-    for (var i = 0;; i++) {
-      var wrapBox = cm.getWrapperElement().getBoundingClientRect();
-      var scrollBox = cm.getScrollerElement().getBoundingClientRect();
-      is(wrapBox.bottom < scrollBox.bottom - 10);
-      is(wrapBox.right < scrollBox.right - 10);
-      if (i == 1) break;
-      cm.getWrapperElement().style.height = "auto";
-      cm.refresh();
-    }
-  });
-  
-  function barH(cm) { return byClassName(cm.getWrapperElement(), "CodeMirror-hscrollbar")[0]; }
-  function barV(cm) { return byClassName(cm.getWrapperElement(), "CodeMirror-vscrollbar")[0]; }
-
-  function displayBottom(cm, scrollbar) {
-    if (scrollbar)
-      return barH(cm).getBoundingClientRect().top;
-    else
-      return cm.getWrapperElement().getBoundingClientRect().bottom - 1;
-  }
-
-  function displayRight(cm, scrollbar) {
-    if (scrollbar)
-      return barV(cm).getBoundingClientRect().left;
-    else
-      return cm.getWrapperElement().getBoundingClientRect().right - 1;
-  }
-
-  function testMovedownFixed(cm, hScroll) {
-    cm.setSize("100px", "100px");
-    if (hScroll) cm.setValue(new Array(100).join("x"));
-    var bottom = displayBottom(cm, hScroll);
-    for (var i = 0; i < 30; i++) {
-      cm.replaceSelection("x\n");
-      var cursorBottom = cm.cursorCoords(null, "window").bottom;
-      is(cursorBottom <= bottom);
-    }
-    is(cursorBottom >= bottom - 5);
-  }
-
-  testCM("movedown_fixed", function(cm) {testMovedownFixed(cm, false);});
-  testCM("movedown_hscroll_fixed", function(cm) {testMovedownFixed(cm, true);});
-
-  function testMovedownResize(cm, hScroll) {
-    cm.getWrapperElement().style.height = "auto";
-    if (hScroll) cm.setValue(new Array(100).join("x"));
-    cm.refresh();
-    for (var i = 0; i < 30; i++) {
-      cm.replaceSelection("x\n");
-      var bottom = displayBottom(cm, hScroll);
-      var cursorBottom = cm.cursorCoords(null, "window").bottom;
-      is(cursorBottom <= bottom);
-      is(cursorBottom >= bottom - 5);
-    }
-  }
-
-  testCM("movedown_resize", function(cm) {testMovedownResize(cm, false);});
-  testCM("movedown_hscroll_resize", function(cm) {testMovedownResize(cm, true);});
-
-  function testMoveright(cm, wrap, scroll) {
-    cm.setSize("100px", "100px");
-    if (wrap) cm.setOption("lineWrapping", true);
-    if (scroll) {
-      cm.setValue("\n" + new Array(100).join("x\n"));
-      cm.setCursor(Pos(0, 0));
-    }
-    var right = displayRight(cm, scroll);
-    for (var i = 0; i < 10; i++) {
-      cm.replaceSelection("xxxxxxxxxx");
-      var cursorRight = cm.cursorCoords(null, "window").right;
-      is(cursorRight < right);
-    }
-    if (!wrap) is(cursorRight > right - 20);
-  }
-
-  testCM("moveright", function(cm) {testMoveright(cm, false, false);});
-  testCM("moveright_wrap", function(cm) {testMoveright(cm, true, false);});
-  testCM("moveright_scroll", function(cm) {testMoveright(cm, false, true);});
-  testCM("moveright_scroll_wrap", function(cm) {testMoveright(cm, true, true);});
-
-  testCM("suddenly_wide", function(cm) {
-    addDoc(cm, 100, 100);
-    cm.replaceSelection(new Array(600).join("l ") + "\n");
-    cm.execCommand("goLineUp");
-    cm.execCommand("goLineEnd");
-    is(barH(cm).scrollLeft > cm.getScrollerElement().scrollLeft - 1);
-  });
-
-  testCM("wrap_changes_height", function(cm) {
-    var line = new Array(20).join("a ") + "\n";
-    cm.setValue(new Array(20).join(line));
-    var box = cm.getWrapperElement().getBoundingClientRect();
-    cm.setSize(cm.cursorCoords(Pos(0), "window").right - box.left + 2,
-               cm.cursorCoords(Pos(19, 0), "window").bottom - box.top + 2);
-    cm.setCursor(Pos(19, 0));
-    cm.replaceSelection("\n");
-    is(cm.cursorCoords(null, "window").bottom < displayBottom(cm, false));
-  }, {lineWrapping: true});
-
-  testCM("height_auto_with_gutter_expect_no_scroll_after_line_delete", function(cm) {
-    cm.setSize(null, "auto");
-    cm.setValue("x\n");
-    cm.execCommand("goDocEnd");
-    cm.execCommand("delCharBefore");
-    eq(cm.getScrollInfo().top, 0);
-    cm.scrollTo(null, 10);
-    is(cm.getScrollInfo().top < 5);
-  }, {lineNumbers: true});
-})();
diff --git a/www/code/codemirror-5.7/test/search_test.js b/www/code/codemirror-5.7/test/search_test.js
deleted file mode 100644
index 04a1e685a..000000000
--- a/www/code/codemirror-5.7/test/search_test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-(function() {
-  "use strict";
-
-  function test(name) {
-    var text = Array.prototype.slice.call(arguments, 1, arguments.length - 1).join("\n");
-    var body = arguments[arguments.length - 1];
-    return window.test("search_" + name, function() {
-      body(new CodeMirror.Doc(text));
-    });
-  }
-
-  function run(doc, query, insensitive) {
-    var cursor = doc.getSearchCursor(query, null, insensitive);
-    for (var i = 3; i < arguments.length; i += 4) {
-      var found = cursor.findNext();
-      is(found, "not enough results (forward)");
-      eqPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, forward, " + (i - 3) / 4);
-      eqPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, forward, " + (i - 3) / 4);
-    }
-    is(!cursor.findNext(), "too many matches (forward)");
-    for (var i = arguments.length - 4; i >= 3; i -= 4) {
-      var found = cursor.findPrevious();
-      is(found, "not enough results (backwards)");
-      eqPos(Pos(arguments[i], arguments[i + 1]), cursor.from(), "from, backwards, " + (i - 3) / 4);
-      eqPos(Pos(arguments[i + 2], arguments[i + 3]), cursor.to(), "to, backwards, " + (i - 3) / 4);
-    }
-    is(!cursor.findPrevious(), "too many matches (backwards)");
-  }
-
-  test("simple", "abcdefg", "abcdefg", function(doc) {
-    run(doc, "cde", false, 0, 2, 0, 5, 1, 2, 1, 5);
-  });
-
-  test("multiline", "hallo", "goodbye", function(doc) {
-    run(doc, "llo\ngoo", false, 0, 2, 1, 3);
-    run(doc, "blah\nhall", false);
-    run(doc, "bye\neye", false);
-  });
-
-  test("regexp", "abcde", "abcde", function(doc) {
-    run(doc, /bcd/, false, 0, 1, 0, 4, 1, 1, 1, 4);
-    run(doc, /BCD/, false);
-    run(doc, /BCD/i, false, 0, 1, 0, 4, 1, 1, 1, 4);
-  });
-
-  test("insensitive", "hallo", "HALLO", "oink", "hAllO", function(doc) {
-    run(doc, "All", false, 3, 1, 3, 4);
-    run(doc, "All", true, 0, 1, 0, 4, 1, 1, 1, 4, 3, 1, 3, 4);
-  });
-
-  test("multilineInsensitive", "zie ginds komT", "De Stoomboot", "uit Spanje weer aan", function(doc) {
-    run(doc, "komt\nde stoomboot\nuit", false);
-    run(doc, "komt\nde stoomboot\nuit", true, 0, 10, 2, 3);
-    run(doc, "kOMt\ndE stOOmboot\nuiT", true, 0, 10, 2, 3);
-  });
-
-  test("expandingCaseFold", "İİ İİ", "uu uu", function(doc) {
-    if (phantom) return; // A Phantom bug makes this hang
-    run(doc, "", true, 0, 8, 0, 12, 1, 8, 1, 12);
-    run(doc, "İİ", true, 0, 3, 0, 5, 0, 6, 0, 8);
-  });
-})();
diff --git a/www/code/codemirror-5.7/test/sql-hint-test.js b/www/code/codemirror-5.7/test/sql-hint-test.js
deleted file mode 100644
index 39f2172e1..000000000
--- a/www/code/codemirror-5.7/test/sql-hint-test.js
+++ /dev/null
@@ -1,189 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function() {
-  var Pos = CodeMirror.Pos;
-
-  var simpleTables = {
-    "users": ["name", "score", "birthDate"],
-    "xcountries": ["name", "population", "size"]
-  };
-
-  var schemaTables = {
-    "schema.users": ["name", "score", "birthDate"],
-    "schema.countries": ["name", "population", "size"]
-  };
-
-  var displayTextTables = [{
-    text: "mytable",
-    displayText: "mytable | The main table",
-    columns: [{text: "id", displayText: "id | Unique ID"},
-              {text: "name", displayText: "name | The name"}]
-  }];
-
-  namespace = "sql-hint_";
-
-  function test(name, spec) {
-    testCM(name, function(cm) {
-      cm.setValue(spec.value);
-      cm.setCursor(spec.cursor);
-      var completion = CodeMirror.hint.sql(cm, {tables: spec.tables});
-      if (!deepCompare(completion.list, spec.list))
-        throw new Failure("Wrong completion results " + JSON.stringify(completion.list) + " vs " + JSON.stringify(spec.list));
-      eqPos(completion.from, spec.from);
-      eqPos(completion.to, spec.to);
-    }, {
-      value: spec.value,
-      mode: "text/x-mysql"
-    });
-  }
-
-  test("keywords", {
-    value: "SEL",
-    cursor: Pos(0, 3),
-    list: ["SELECT"],
-    from: Pos(0, 0),
-    to: Pos(0, 3)
-  });
-
-  test("from", {
-    value: "SELECT * fr",
-    cursor: Pos(0, 11),
-    list: ["FROM"],
-    from: Pos(0, 9),
-    to: Pos(0, 11)
-  });
-
-  test("table", {
-    value: "SELECT xc",
-    cursor: Pos(0, 9),
-    tables: simpleTables,
-    list: ["xcountries"],
-    from: Pos(0, 7),
-    to: Pos(0, 9)
-  });
-
-  test("columns", {
-    value: "SELECT users.",
-    cursor: Pos(0, 13),
-    tables: simpleTables,
-    list: ["users.name", "users.score", "users.birthDate"],
-    from: Pos(0, 7),
-    to: Pos(0, 13)
-  });
-
-  test("singlecolumn", {
-    value: "SELECT users.na",
-    cursor: Pos(0, 15),
-    tables: simpleTables,
-    list: ["users.name"],
-    from: Pos(0, 7),
-    to: Pos(0, 15)
-  });
-
-  test("quoted", {
-    value: "SELECT `users`.`na",
-    cursor: Pos(0, 18),
-    tables: simpleTables,
-    list: ["`users`.`name`"],
-    from: Pos(0, 7),
-    to: Pos(0, 18)
-  });
-
-  test("quotedcolumn", {
-    value: "SELECT users.`na",
-    cursor: Pos(0, 16),
-    tables: simpleTables,
-    list: ["`users`.`name`"],
-    from: Pos(0, 7),
-    to: Pos(0, 16)
-  });
-
-  test("schema", {
-    value: "SELECT schem",
-    cursor: Pos(0, 12),
-    tables: schemaTables,
-    list: ["schema.users", "schema.countries",
-           "SCHEMA", "SCHEMA_NAME", "SCHEMAS"],
-    from: Pos(0, 7),
-    to: Pos(0, 12)
-  });
-
-  test("schemaquoted", {
-    value: "SELECT `sch",
-    cursor: Pos(0, 11),
-    tables: schemaTables,
-    list: ["`schema`.`users`", "`schema`.`countries`"],
-    from: Pos(0, 7),
-    to: Pos(0, 11)
-  });
-
-  test("schemacolumn", {
-    value: "SELECT schema.users.",
-    cursor: Pos(0, 20),
-    tables: schemaTables,
-    list: ["schema.users.name",
-           "schema.users.score",
-           "schema.users.birthDate"],
-    from: Pos(0, 7),
-    to: Pos(0, 20)
-  });
-
-  test("schemacolumnquoted", {
-    value: "SELECT `schema`.`users`.",
-    cursor: Pos(0, 24),
-    tables: schemaTables,
-    list: ["`schema`.`users`.`name`",
-           "`schema`.`users`.`score`",
-           "`schema`.`users`.`birthDate`"],
-    from: Pos(0, 7),
-    to: Pos(0, 24)
-  });
-
-  test("displayText_table", {
-    value: "SELECT myt",
-    cursor: Pos(0, 10),
-    tables: displayTextTables,
-    list: displayTextTables,
-    from: Pos(0, 7),
-    to: Pos(0, 10)
-  });
-
-  test("displayText_column", {
-    value: "SELECT mytable.",
-    cursor: Pos(0, 15),
-    tables: displayTextTables,
-    list: [{text: "mytable.id", displayText: "id | Unique ID"},
-           {text: "mytable.name", displayText: "name | The name"}],
-    from: Pos(0, 7),
-    to: Pos(0, 15)
-  });
-
-  test("alias_complete", {
-    value: "SELECT t. FROM users t",
-    cursor: Pos(0, 9),
-    tables: simpleTables,
-    list: ["t.name", "t.score", "t.birthDate"],
-    from: Pos(0, 7),
-    to: Pos(0, 9)
-  });
-
-  test("alias_complete_with_displayText", {
-    value: "SELECT t. FROM mytable t",
-    cursor: Pos(0, 9),
-    tables: displayTextTables,
-    list: [{text: "t.id", displayText: "id | Unique ID"},
-           {text: "t.name", displayText: "name | The name"}],
-    from: Pos(0, 7),
-    to: Pos(0, 9)
-  })
-
-  function deepCompare(a, b) {
-    if (!a || typeof a != "object")
-      return a === b;
-    if (!b || typeof b != "object")
-      return false;
-    for (var prop in a) if (!deepCompare(a[prop], b[prop])) return false;
-    return true;
-  }
-})();
diff --git a/www/code/codemirror-5.7/test/sublime_test.js b/www/code/codemirror-5.7/test/sublime_test.js
deleted file mode 100644
index c93e041b8..000000000
--- a/www/code/codemirror-5.7/test/sublime_test.js
+++ /dev/null
@@ -1,303 +0,0 @@
-(function() {
-  "use strict";
-  
-  var Pos = CodeMirror.Pos;
-  namespace = "sublime_";
-
-  function stTest(name) {
-    var actions = Array.prototype.slice.call(arguments, 1);
-    testCM(name, function(cm) {
-      for (var i = 0; i < actions.length; i++) {
-        var action = actions[i];
-        if (typeof action == "string" && i == 0)
-          cm.setValue(action);
-        else if (typeof action == "string")
-          cm.execCommand(action);
-        else if (action instanceof Pos)
-          cm.setCursor(action);
-        else
-          action(cm);
-      }
-    });
-  }
-
-  function at(line, ch, msg) {
-    return function(cm) {
-      eq(cm.listSelections().length, 1);
-      eqPos(cm.getCursor("head"), Pos(line, ch), msg);
-      eqPos(cm.getCursor("anchor"), Pos(line, ch), msg);
-    };
-  }
-
-  function val(content, msg) {
-    return function(cm) { eq(cm.getValue(), content, msg); };
-  }
-
-  function argsToRanges(args) {
-    if (args.length % 4) throw new Error("Wrong number of arguments for ranges.");
-    var ranges = [];
-    for (var i = 0; i < args.length; i += 4)
-      ranges.push({anchor: Pos(args[i], args[i + 1]),
-                   head: Pos(args[i + 2], args[i + 3])});
-    return ranges;
-  }
-
-  function setSel() {
-    var ranges = argsToRanges(arguments);
-    return function(cm) { cm.setSelections(ranges, 0); };
-  }
-
-  function hasSel() {
-    var ranges = argsToRanges(arguments);
-    return function(cm) {
-      var sels = cm.listSelections();
-      if (sels.length != ranges.length)
-        throw new Failure("Expected " + ranges.length + " selections, but found " + sels.length);
-      for (var i = 0; i < sels.length; i++) {
-        eqPos(sels[i].anchor, ranges[i].anchor, "anchor " + i);
-        eqPos(sels[i].head, ranges[i].head, "head " + i);
-      }
-    };
-  }
-
-  stTest("bySubword", "the foo_bar DooDahBah \n a",
-         "goSubwordLeft", at(0, 0),
-         "goSubwordRight", at(0, 3),
-         "goSubwordRight", at(0, 7),
-         "goSubwordRight", at(0, 11),
-         "goSubwordRight", at(0, 15),
-         "goSubwordRight", at(0, 18),
-         "goSubwordRight", at(0, 21),
-         "goSubwordRight", at(0, 22),
-         "goSubwordRight", at(1, 0),
-         "goSubwordRight", at(1, 2),
-         "goSubwordRight", at(1, 2),
-         "goSubwordLeft", at(1, 1),
-         "goSubwordLeft", at(1, 0),
-         "goSubwordLeft", at(0, 22),
-         "goSubwordLeft", at(0, 18),
-         "goSubwordLeft", at(0, 15),
-         "goSubwordLeft", at(0, 12),
-         "goSubwordLeft", at(0, 8),
-         "goSubwordLeft", at(0, 4),
-         "goSubwordLeft", at(0, 0));
-
-  stTest("splitSelectionByLine", "abc\ndef\nghi",
-         setSel(0, 1, 2, 2),
-         "splitSelectionByLine",
-         hasSel(0, 1, 0, 3,
-                1, 0, 1, 3,
-                2, 0, 2, 2));
-
-  stTest("splitSelectionByLineMulti", "abc\ndef\nghi\njkl",
-         setSel(0, 1, 1, 1,
-                1, 2, 3, 2,
-                3, 3, 3, 3),
-         "splitSelectionByLine",
-         hasSel(0, 1, 0, 3,
-                1, 0, 1, 1,
-                1, 2, 1, 3,
-                2, 0, 2, 3,
-                3, 0, 3, 2,
-                3, 3, 3, 3));
-
-  stTest("selectLine", "abc\ndef\nghi",
-         setSel(0, 1, 0, 1,
-                2, 0, 2, 1),
-         "selectLine",
-         hasSel(0, 0, 1, 0,
-                2, 0, 2, 3),
-         setSel(0, 1, 1, 0),
-         "selectLine",
-         hasSel(0, 0, 2, 0));
-
-  stTest("insertLineAfter", "abcde\nfghijkl\nmn",
-         setSel(0, 1, 0, 1,
-                0, 3, 0, 3,
-                1, 2, 1, 2,
-                1, 3, 1, 5), "insertLineAfter",
-         hasSel(1, 0, 1, 0,
-                3, 0, 3, 0), val("abcde\n\nfghijkl\n\nmn"));
-
-  stTest("insertLineBefore", "abcde\nfghijkl\nmn",
-         setSel(0, 1, 0, 1,
-                0, 3, 0, 3,
-                1, 2, 1, 2,
-                1, 3, 1, 5), "insertLineBefore",
-         hasSel(0, 0, 0, 0,
-                2, 0, 2, 0), val("\nabcde\n\nfghijkl\nmn"));
-
-  stTest("selectNextOccurrence", "a foo bar\nfoobar foo",
-         setSel(0, 2, 0, 5),
-         "selectNextOccurrence", hasSel(0, 2, 0, 5,
-                                        1, 0, 1, 3),
-         "selectNextOccurrence", hasSel(0, 2, 0, 5,
-                                        1, 0, 1, 3,
-                                        1, 7, 1, 10),
-         "selectNextOccurrence", hasSel(0, 2, 0, 5,
-                                        1, 0, 1, 3,
-                                        1, 7, 1, 10),
-         Pos(0, 3), "selectNextOccurrence", hasSel(0, 2, 0, 5),
-        "selectNextOccurrence", hasSel(0, 2, 0, 5,
-                                       1, 7, 1, 10),
-         setSel(0, 6, 0, 9),
-         "selectNextOccurrence", hasSel(0, 6, 0, 9,
-                                        1, 3, 1, 6));
-
-  stTest("selectScope", "foo(a) {\n  bar[1, 2];\n}",
-         "selectScope", hasSel(0, 0, 2, 1),
-         Pos(0, 4), "selectScope", hasSel(0, 4, 0, 5),
-         Pos(0, 5), "selectScope", hasSel(0, 4, 0, 5),
-         Pos(0, 6), "selectScope", hasSel(0, 0, 2, 1),
-         Pos(0, 8), "selectScope", hasSel(0, 8, 2, 0),
-         Pos(1, 2), "selectScope", hasSel(0, 8, 2, 0),
-         Pos(1, 6), "selectScope", hasSel(1, 6, 1, 10),
-         Pos(1, 9), "selectScope", hasSel(1, 6, 1, 10));
-
-  stTest("goToBracket", "foo(a) {\n  bar[1, 2];\n}",
-         Pos(0, 0), "goToBracket", at(0, 0),
-         Pos(0, 4), "goToBracket", at(0, 5), "goToBracket", at(0, 4),
-         Pos(0, 8), "goToBracket", at(2, 0), "goToBracket", at(0, 8),
-         Pos(1, 2), "goToBracket", at(2, 0),
-         Pos(1, 7), "goToBracket", at(1, 10), "goToBracket", at(1, 6));
-
-  stTest("swapLine", "1\n2\n3---\n4\n5",
-         "swapLineDown", val("2\n1\n3---\n4\n5"),
-         "swapLineUp", val("1\n2\n3---\n4\n5"),
-         "swapLineUp", val("1\n2\n3---\n4\n5"),
-         Pos(4, 1), "swapLineDown", val("1\n2\n3---\n4\n5"),
-         setSel(0, 1, 0, 1,
-                1, 0, 2, 0,
-                2, 2, 2, 2),
-         "swapLineDown", val("4\n1\n2\n3---\n5"),
-         hasSel(1, 1, 1, 1,
-                2, 0, 3, 0,
-                3, 2, 3, 2),
-         "swapLineUp", val("1\n2\n3---\n4\n5"),
-         hasSel(0, 1, 0, 1,
-                1, 0, 2, 0,
-                2, 2, 2, 2));
-
-  stTest("swapLineEmptyBottomSel", "1\n2\n3",
-         setSel(0, 1, 1, 0),
-         "swapLineDown", val("2\n1\n3"), hasSel(1, 1, 2, 0),
-         "swapLineUp", val("1\n2\n3"), hasSel(0, 1, 1, 0),
-         "swapLineUp", val("1\n2\n3"), hasSel(0, 0, 0, 0));
-
-  stTest("swapLineUpFromEnd", "a\nb\nc",
-         Pos(2, 1), "swapLineUp",
-         hasSel(1, 1, 1, 1), val("a\nc\nb"));
-
-  stTest("joinLines", "abc\ndef\nghi\njkl",
-         "joinLines", val("abc def\nghi\njkl"), at(0, 4),
-         "undo",
-         setSel(0, 2, 1, 1), "joinLines",
-         val("abc def ghi\njkl"), hasSel(0, 2, 0, 8),
-         "undo",
-         setSel(0, 1, 0, 1,
-                1, 1, 1, 1,
-                3, 1, 3, 1), "joinLines",
-         val("abc def ghi\njkl"), hasSel(0, 4, 0, 4,
-                                         0, 8, 0, 8,
-                                         1, 3, 1, 3));
-
-  stTest("duplicateLine", "abc\ndef\nghi",
-         Pos(1, 0), "duplicateLine", val("abc\ndef\ndef\nghi"), at(2, 0),
-         "undo",
-         setSel(0, 1, 0, 1,
-                1, 1, 1, 1,
-                2, 1, 2, 1), "duplicateLine",
-         val("abc\nabc\ndef\ndef\nghi\nghi"), hasSel(1, 1, 1, 1,
-                                                     3, 1, 3, 1,
-                                                     5, 1, 5, 1));
-  stTest("duplicateLineSelection", "abcdef",
-         setSel(0, 1, 0, 1,
-                0, 2, 0, 4,
-                0, 5, 0, 5),
-         "duplicateLine",
-         val("abcdef\nabcdcdef\nabcdcdef"), hasSel(2, 1, 2, 1,
-                                                   2, 4, 2, 6,
-                                                   2, 7, 2, 7));
-
-  stTest("selectLinesUpward", "123\n345\n789\n012",
-         setSel(0, 1, 0, 1,
-                1, 1, 1, 3,
-                2, 0, 2, 0,
-                3, 0, 3, 0),
-         "selectLinesUpward",
-         hasSel(0, 1, 0, 1,
-                0, 3, 0, 3,
-                1, 0, 1, 0,
-                1, 1, 1, 3,
-                2, 0, 2, 0,
-                3, 0, 3, 0));
-
-  stTest("selectLinesDownward", "123\n345\n789\n012",
-         setSel(0, 1, 0, 1,
-                1, 1, 1, 3,
-                2, 0, 2, 0,
-                3, 0, 3, 0),
-         "selectLinesDownward",
-         hasSel(0, 1, 0, 1,
-                1, 1, 1, 3,
-                2, 0, 2, 0,
-                2, 3, 2, 3,
-                3, 0, 3, 0));
-
-  stTest("sortLines", "c\nb\na\nC\nB\nA",
-         "sortLines", val("A\nB\nC\na\nb\nc"),
-         "undo",
-         setSel(0, 0, 2, 0,
-                3, 0, 5, 0),
-         "sortLines", val("a\nb\nc\nA\nB\nC"),
-         hasSel(0, 0, 2, 1,
-                3, 0, 5, 1),
-         "undo",
-         setSel(1, 0, 4, 0), "sortLinesInsensitive", val("c\na\nB\nb\nC\nA"));
-
-  stTest("bookmarks", "abc\ndef\nghi\njkl",
-         Pos(0, 1), "toggleBookmark",
-         setSel(1, 1, 1, 2), "toggleBookmark",
-         setSel(2, 1, 2, 2), "toggleBookmark",
-         "nextBookmark", hasSel(0, 1, 0, 1),
-         "nextBookmark", hasSel(1, 1, 1, 2),
-         "nextBookmark", hasSel(2, 1, 2, 2),
-         "prevBookmark", hasSel(1, 1, 1, 2),
-         "prevBookmark", hasSel(0, 1, 0, 1),
-         "prevBookmark", hasSel(2, 1, 2, 2),
-         "prevBookmark", hasSel(1, 1, 1, 2),
-         "toggleBookmark",
-         "prevBookmark", hasSel(2, 1, 2, 2),
-         "prevBookmark", hasSel(0, 1, 0, 1),
-         "selectBookmarks", hasSel(0, 1, 0, 1,
-                                   2, 1, 2, 2),
-         "clearBookmarks",
-         Pos(0, 0), "selectBookmarks", at(0, 0));
-
-  stTest("upAndDowncaseAtCursor", "abc\ndef  x\nghI",
-         setSel(0, 1, 0, 3,
-                1, 1, 1, 1,
-                1, 4, 1, 4), "upcaseAtCursor",
-         val("aBC\nDEF  x\nghI"), hasSel(0, 1, 0, 3,
-                                         1, 3, 1, 3,
-                                         1, 4, 1, 4),
-         "downcaseAtCursor",
-         val("abc\ndef  x\nghI"), hasSel(0, 1, 0, 3,
-                                         1, 3, 1, 3,
-                                         1, 4, 1, 4));
-
-  stTest("mark", "abc\ndef\nghi",
-         Pos(1, 1), "setSublimeMark",
-         Pos(2, 1), "selectToSublimeMark", hasSel(2, 1, 1, 1),
-         Pos(0, 1), "swapWithSublimeMark", at(1, 1), "swapWithSublimeMark", at(0, 1),
-         "deleteToSublimeMark", val("aef\nghi"),
-         "sublimeYank", val("abc\ndef\nghi"), at(1, 1));
-
-  stTest("findUnder", "foo foobar  a",
-         "findUnder", hasSel(0, 4, 0, 7),
-         "findUnder", hasSel(0, 0, 0, 3),
-         "findUnderPrevious", hasSel(0, 4, 0, 7),
-         "findUnderPrevious", hasSel(0, 0, 0, 3),
-         Pos(0, 4), "findUnder", hasSel(0, 4, 0, 10),
-         Pos(0, 11), "findUnder", hasSel(0, 11, 0, 11));
-})();
diff --git a/www/code/codemirror-5.7/test/test.js b/www/code/codemirror-5.7/test/test.js
deleted file mode 100644
index 7bc2c8e95..000000000
--- a/www/code/codemirror-5.7/test/test.js
+++ /dev/null
@@ -1,2142 +0,0 @@
-var Pos = CodeMirror.Pos;
-
-CodeMirror.defaults.rtlMoveVisually = true;
-
-function forEach(arr, f) {
-  for (var i = 0, e = arr.length; i < e; ++i) f(arr[i], i);
-}
-
-function addDoc(cm, width, height) {
-  var content = [], line = "";
-  for (var i = 0; i < width; ++i) line += "x";
-  for (var i = 0; i < height; ++i) content.push(line);
-  cm.setValue(content.join("\n"));
-}
-
-function byClassName(elt, cls) {
-  if (elt.getElementsByClassName) return elt.getElementsByClassName(cls);
-  var found = [], re = new RegExp("\\b" + cls + "\\b");
-  function search(elt) {
-    if (elt.nodeType == 3) return;
-    if (re.test(elt.className)) found.push(elt);
-    for (var i = 0, e = elt.childNodes.length; i < e; ++i)
-      search(elt.childNodes[i]);
-  }
-  search(elt);
-  return found;
-}
-
-var ie_lt8 = /MSIE [1-7]\b/.test(navigator.userAgent);
-var ie_lt9 = /MSIE [1-8]\b/.test(navigator.userAgent);
-var mac = /Mac/.test(navigator.platform);
-var phantom = /PhantomJS/.test(navigator.userAgent);
-var opera = /Opera\/\./.test(navigator.userAgent);
-var opera_version = opera && navigator.userAgent.match(/Version\/(\d+\.\d+)/);
-if (opera_version) opera_version = Number(opera_version);
-var opera_lt10 = opera && (!opera_version || opera_version < 10);
-
-namespace = "core_";
-
-test("core_fromTextArea", function() {
-  var te = document.getElementById("code");
-  te.value = "CONTENT";
-  var cm = CodeMirror.fromTextArea(te);
-  is(!te.offsetHeight);
-  eq(cm.getValue(), "CONTENT");
-  cm.setValue("foo\nbar");
-  eq(cm.getValue(), "foo\nbar");
-  cm.save();
-  is(/^foo\r?\nbar$/.test(te.value));
-  cm.setValue("xxx");
-  cm.toTextArea();
-  is(te.offsetHeight);
-  eq(te.value, "xxx");
-});
-
-testCM("getRange", function(cm) {
-  eq(cm.getLine(0), "1234");
-  eq(cm.getLine(1), "5678");
-  eq(cm.getLine(2), null);
-  eq(cm.getLine(-1), null);
-  eq(cm.getRange(Pos(0, 0), Pos(0, 3)), "123");
-  eq(cm.getRange(Pos(0, -1), Pos(0, 200)), "1234");
-  eq(cm.getRange(Pos(0, 2), Pos(1, 2)), "34\n56");
-  eq(cm.getRange(Pos(1, 2), Pos(100, 0)), "78");
-}, {value: "1234\n5678"});
-
-testCM("replaceRange", function(cm) {
-  eq(cm.getValue(), "");
-  cm.replaceRange("foo\n", Pos(0, 0));
-  eq(cm.getValue(), "foo\n");
-  cm.replaceRange("a\nb", Pos(0, 1));
-  eq(cm.getValue(), "fa\nboo\n");
-  eq(cm.lineCount(), 3);
-  cm.replaceRange("xyzzy", Pos(0, 0), Pos(1, 1));
-  eq(cm.getValue(), "xyzzyoo\n");
-  cm.replaceRange("abc", Pos(0, 0), Pos(10, 0));
-  eq(cm.getValue(), "abc");
-  eq(cm.lineCount(), 1);
-});
-
-testCM("selection", function(cm) {
-  cm.setSelection(Pos(0, 4), Pos(2, 2));
-  is(cm.somethingSelected());
-  eq(cm.getSelection(), "11\n222222\n33");
-  eqPos(cm.getCursor(false), Pos(2, 2));
-  eqPos(cm.getCursor(true), Pos(0, 4));
-  cm.setSelection(Pos(1, 0));
-  is(!cm.somethingSelected());
-  eq(cm.getSelection(), "");
-  eqPos(cm.getCursor(true), Pos(1, 0));
-  cm.replaceSelection("abc", "around");
-  eq(cm.getSelection(), "abc");
-  eq(cm.getValue(), "111111\nabc222222\n333333");
-  cm.replaceSelection("def", "end");
-  eq(cm.getSelection(), "");
-  eqPos(cm.getCursor(true), Pos(1, 3));
-  cm.setCursor(Pos(2, 1));
-  eqPos(cm.getCursor(true), Pos(2, 1));
-  cm.setCursor(1, 2);
-  eqPos(cm.getCursor(true), Pos(1, 2));
-}, {value: "111111\n222222\n333333"});
-
-testCM("extendSelection", function(cm) {
-  cm.setExtending(true);
-  addDoc(cm, 10, 10);
-  cm.setSelection(Pos(3, 5));
-  eqPos(cm.getCursor("head"), Pos(3, 5));
-  eqPos(cm.getCursor("anchor"), Pos(3, 5));
-  cm.setSelection(Pos(2, 5), Pos(5, 5));
-  eqPos(cm.getCursor("head"), Pos(5, 5));
-  eqPos(cm.getCursor("anchor"), Pos(2, 5));
-  eqPos(cm.getCursor("start"), Pos(2, 5));
-  eqPos(cm.getCursor("end"), Pos(5, 5));
-  cm.setSelection(Pos(5, 5), Pos(2, 5));
-  eqPos(cm.getCursor("head"), Pos(2, 5));
-  eqPos(cm.getCursor("anchor"), Pos(5, 5));
-  eqPos(cm.getCursor("start"), Pos(2, 5));
-  eqPos(cm.getCursor("end"), Pos(5, 5));
-  cm.extendSelection(Pos(3, 2));
-  eqPos(cm.getCursor("head"), Pos(3, 2));
-  eqPos(cm.getCursor("anchor"), Pos(5, 5));
-  cm.extendSelection(Pos(6, 2));
-  eqPos(cm.getCursor("head"), Pos(6, 2));
-  eqPos(cm.getCursor("anchor"), Pos(5, 5));
-  cm.extendSelection(Pos(6, 3), Pos(6, 4));
-  eqPos(cm.getCursor("head"), Pos(6, 4));
-  eqPos(cm.getCursor("anchor"), Pos(5, 5));
-  cm.extendSelection(Pos(0, 3), Pos(0, 4));
-  eqPos(cm.getCursor("head"), Pos(0, 3));
-  eqPos(cm.getCursor("anchor"), Pos(5, 5));
-  cm.extendSelection(Pos(4, 5), Pos(6, 5));
-  eqPos(cm.getCursor("head"), Pos(6, 5));
-  eqPos(cm.getCursor("anchor"), Pos(4, 5));
-  cm.setExtending(false);
-  cm.extendSelection(Pos(0, 3), Pos(0, 4));
-  eqPos(cm.getCursor("head"), Pos(0, 3));
-  eqPos(cm.getCursor("anchor"), Pos(0, 4));
-});
-
-testCM("lines", function(cm) {
-  eq(cm.getLine(0), "111111");
-  eq(cm.getLine(1), "222222");
-  eq(cm.getLine(-1), null);
-  cm.replaceRange("", Pos(1, 0), Pos(2, 0))
-  cm.replaceRange("abc", Pos(1, 0), Pos(1));
-  eq(cm.getValue(), "111111\nabc");
-}, {value: "111111\n222222\n333333"});
-
-testCM("indent", function(cm) {
-  cm.indentLine(1);
-  eq(cm.getLine(1), "   blah();");
-  cm.setOption("indentUnit", 8);
-  cm.indentLine(1);
-  eq(cm.getLine(1), "\tblah();");
-  cm.setOption("indentUnit", 10);
-  cm.setOption("tabSize", 4);
-  cm.indentLine(1);
-  eq(cm.getLine(1), "\t\t  blah();");
-}, {value: "if (x) {\nblah();\n}", indentUnit: 3, indentWithTabs: true, tabSize: 8});
-
-testCM("indentByNumber", function(cm) {
-  cm.indentLine(0, 2);
-  eq(cm.getLine(0), "  foo");
-  cm.indentLine(0, -200);
-  eq(cm.getLine(0), "foo");
-  cm.setSelection(Pos(0, 0), Pos(1, 2));
-  cm.indentSelection(3);
-  eq(cm.getValue(), "   foo\n   bar\nbaz");
-}, {value: "foo\nbar\nbaz"});
-
-test("core_defaults", function() {
-  var defsCopy = {}, defs = CodeMirror.defaults;
-  for (var opt in defs) defsCopy[opt] = defs[opt];
-  defs.indentUnit = 5;
-  defs.value = "uu";
-  defs.indentWithTabs = true;
-  defs.tabindex = 55;
-  var place = document.getElementById("testground"), cm = CodeMirror(place);
-  try {
-    eq(cm.getOption("indentUnit"), 5);
-    cm.setOption("indentUnit", 10);
-    eq(defs.indentUnit, 5);
-    eq(cm.getValue(), "uu");
-    eq(cm.getOption("indentWithTabs"), true);
-    eq(cm.getInputField().tabIndex, 55);
-  }
-  finally {
-    for (var opt in defsCopy) defs[opt] = defsCopy[opt];
-    place.removeChild(cm.getWrapperElement());
-  }
-});
-
-testCM("lineInfo", function(cm) {
-  eq(cm.lineInfo(-1), null);
-  var mark = document.createElement("span");
-  var lh = cm.setGutterMarker(1, "FOO", mark);
-  var info = cm.lineInfo(1);
-  eq(info.text, "222222");
-  eq(info.gutterMarkers.FOO, mark);
-  eq(info.line, 1);
-  eq(cm.lineInfo(2).gutterMarkers, null);
-  cm.setGutterMarker(lh, "FOO", null);
-  eq(cm.lineInfo(1).gutterMarkers, null);
-  cm.setGutterMarker(1, "FOO", mark);
-  cm.setGutterMarker(0, "FOO", mark);
-  cm.clearGutter("FOO");
-  eq(cm.lineInfo(0).gutterMarkers, null);
-  eq(cm.lineInfo(1).gutterMarkers, null);
-}, {value: "111111\n222222\n333333"});
-
-testCM("coords", function(cm) {
-  cm.setSize(null, 100);
-  addDoc(cm, 32, 200);
-  var top = cm.charCoords(Pos(0, 0));
-  var bot = cm.charCoords(Pos(200, 30));
-  is(top.left < bot.left);
-  is(top.top < bot.top);
-  is(top.top < top.bottom);
-  cm.scrollTo(null, 100);
-  var top2 = cm.charCoords(Pos(0, 0));
-  is(top.top > top2.top);
-  eq(top.left, top2.left);
-});
-
-testCM("coordsChar", function(cm) {
-  addDoc(cm, 35, 70);
-  for (var i = 0; i < 2; ++i) {
-    var sys = i ? "local" : "page";
-    for (var ch = 0; ch <= 35; ch += 5) {
-      for (var line = 0; line < 70; line += 5) {
-        cm.setCursor(line, ch);
-        var coords = cm.charCoords(Pos(line, ch), sys);
-        var pos = cm.coordsChar({left: coords.left + 1, top: coords.top + 1}, sys);
-        eqPos(pos, Pos(line, ch));
-      }
-    }
-  }
-}, {lineNumbers: true});
-
-testCM("posFromIndex", function(cm) {
-  cm.setValue(
-    "This function should\n" +
-    "convert a zero based index\n" +
-    "to line and ch."
-  );
-
-  var examples = [
-    { index: -1, line: 0, ch: 0  }, // <- Tests clipping
-    { index: 0,  line: 0, ch: 0  },
-    { index: 10, line: 0, ch: 10 },
-    { index: 39, line: 1, ch: 18 },
-    { index: 55, line: 2, ch: 7  },
-    { index: 63, line: 2, ch: 15 },
-    { index: 64, line: 2, ch: 15 }  // <- Tests clipping
-  ];
-
-  for (var i = 0; i < examples.length; i++) {
-    var example = examples[i];
-    var pos = cm.posFromIndex(example.index);
-    eq(pos.line, example.line);
-    eq(pos.ch, example.ch);
-    if (example.index >= 0 && example.index < 64)
-      eq(cm.indexFromPos(pos), example.index);
-  }
-});
-
-testCM("undo", function(cm) {
-  cm.replaceRange("def", Pos(0, 0), Pos(0));
-  eq(cm.historySize().undo, 1);
-  cm.undo();
-  eq(cm.getValue(), "abc");
-  eq(cm.historySize().undo, 0);
-  eq(cm.historySize().redo, 1);
-  cm.redo();
-  eq(cm.getValue(), "def");
-  eq(cm.historySize().undo, 1);
-  eq(cm.historySize().redo, 0);
-  cm.setValue("1\n\n\n2");
-  cm.clearHistory();
-  eq(cm.historySize().undo, 0);
-  for (var i = 0; i < 20; ++i) {
-    cm.replaceRange("a", Pos(0, 0));
-    cm.replaceRange("b", Pos(3, 0));
-  }
-  eq(cm.historySize().undo, 40);
-  for (var i = 0; i < 40; ++i)
-    cm.undo();
-  eq(cm.historySize().redo, 40);
-  eq(cm.getValue(), "1\n\n\n2");
-}, {value: "abc"});
-
-testCM("undoDepth", function(cm) {
-  cm.replaceRange("d", Pos(0));
-  cm.replaceRange("e", Pos(0));
-  cm.replaceRange("f", Pos(0));
-  cm.undo(); cm.undo(); cm.undo();
-  eq(cm.getValue(), "abcd");
-}, {value: "abc", undoDepth: 4});
-
-testCM("undoDoesntClearValue", function(cm) {
-  cm.undo();
-  eq(cm.getValue(), "x");
-}, {value: "x"});
-
-testCM("undoMultiLine", function(cm) {
-  cm.operation(function() {
-    cm.replaceRange("x", Pos(0, 0));
-    cm.replaceRange("y", Pos(1, 0));
-  });
-  cm.undo();
-  eq(cm.getValue(), "abc\ndef\nghi");
-  cm.operation(function() {
-    cm.replaceRange("y", Pos(1, 0));
-    cm.replaceRange("x", Pos(0, 0));
-  });
-  cm.undo();
-  eq(cm.getValue(), "abc\ndef\nghi");
-  cm.operation(function() {
-    cm.replaceRange("y", Pos(2, 0));
-    cm.replaceRange("x", Pos(1, 0));
-    cm.replaceRange("z", Pos(2, 0));
-  });
-  cm.undo();
-  eq(cm.getValue(), "abc\ndef\nghi", 3);
-}, {value: "abc\ndef\nghi"});
-
-testCM("undoComposite", function(cm) {
-  cm.replaceRange("y", Pos(1));
-  cm.operation(function() {
-    cm.replaceRange("x", Pos(0));
-    cm.replaceRange("z", Pos(2));
-  });
-  eq(cm.getValue(), "ax\nby\ncz\n");
-  cm.undo();
-  eq(cm.getValue(), "a\nby\nc\n");
-  cm.undo();
-  eq(cm.getValue(), "a\nb\nc\n");
-  cm.redo(); cm.redo();
-  eq(cm.getValue(), "ax\nby\ncz\n");
-}, {value: "a\nb\nc\n"});
-
-testCM("undoSelection", function(cm) {
-  cm.setSelection(Pos(0, 2), Pos(0, 4));
-  cm.replaceSelection("");
-  cm.setCursor(Pos(1, 0));
-  cm.undo();
-  eqPos(cm.getCursor(true), Pos(0, 2));
-  eqPos(cm.getCursor(false), Pos(0, 4));
-  cm.setCursor(Pos(1, 0));
-  cm.redo();
-  eqPos(cm.getCursor(true), Pos(0, 2));
-  eqPos(cm.getCursor(false), Pos(0, 2));
-}, {value: "abcdefgh\n"});
-
-testCM("undoSelectionAsBefore", function(cm) {
-  cm.replaceSelection("abc", "around");
-  cm.undo();
-  cm.redo();
-  eq(cm.getSelection(), "abc");
-});
-
-testCM("selectionChangeConfusesHistory", function(cm) {
-  cm.replaceSelection("abc", null, "dontmerge");
-  cm.operation(function() {
-    cm.setCursor(Pos(0, 0));
-    cm.replaceSelection("abc", null, "dontmerge");
-  });
-  eq(cm.historySize().undo, 2);
-});
-
-testCM("markTextSingleLine", function(cm) {
-  forEach([{a: 0, b: 1, c: "", f: 2, t: 5},
-           {a: 0, b: 4, c: "", f: 0, t: 2},
-           {a: 1, b: 2, c: "x", f: 3, t: 6},
-           {a: 4, b: 5, c: "", f: 3, t: 5},
-           {a: 4, b: 5, c: "xx", f: 3, t: 7},
-           {a: 2, b: 5, c: "", f: 2, t: 3},
-           {a: 2, b: 5, c: "abcd", f: 6, t: 7},
-           {a: 2, b: 6, c: "x", f: null, t: null},
-           {a: 3, b: 6, c: "", f: null, t: null},
-           {a: 0, b: 9, c: "hallo", f: null, t: null},
-           {a: 4, b: 6, c: "x", f: 3, t: 4},
-           {a: 4, b: 8, c: "", f: 3, t: 4},
-           {a: 6, b: 6, c: "a", f: 3, t: 6},
-           {a: 8, b: 9, c: "", f: 3, t: 6}], function(test) {
-    cm.setValue("1234567890");
-    var r = cm.markText(Pos(0, 3), Pos(0, 6), {className: "foo"});
-    cm.replaceRange(test.c, Pos(0, test.a), Pos(0, test.b));
-    var f = r.find();
-    eq(f && f.from.ch, test.f); eq(f && f.to.ch, test.t);
-  });
-});
-
-testCM("markTextMultiLine", function(cm) {
-  function p(v) { return v && Pos(v[0], v[1]); }
-  forEach([{a: [0, 0], b: [0, 5], c: "", f: [0, 0], t: [2, 5]},
-           {a: [0, 0], b: [0, 5], c: "foo\n", f: [1, 0], t: [3, 5]},
-           {a: [0, 1], b: [0, 10], c: "", f: [0, 1], t: [2, 5]},
-           {a: [0, 5], b: [0, 6], c: "x", f: [0, 6], t: [2, 5]},
-           {a: [0, 0], b: [1, 0], c: "", f: [0, 0], t: [1, 5]},
-           {a: [0, 6], b: [2, 4], c: "", f: [0, 5], t: [0, 7]},
-           {a: [0, 6], b: [2, 4], c: "aa", f: [0, 5], t: [0, 9]},
-           {a: [1, 2], b: [1, 8], c: "", f: [0, 5], t: [2, 5]},
-           {a: [0, 5], b: [2, 5], c: "xx", f: null, t: null},
-           {a: [0, 0], b: [2, 10], c: "x", f: null, t: null},
-           {a: [1, 5], b: [2, 5], c: "", f: [0, 5], t: [1, 5]},
-           {a: [2, 0], b: [2, 3], c: "", f: [0, 5], t: [2, 2]},
-           {a: [2, 5], b: [3, 0], c: "a\nb", f: [0, 5], t: [2, 5]},
-           {a: [2, 3], b: [3, 0], c: "x", f: [0, 5], t: [2, 3]},
-           {a: [1, 1], b: [1, 9], c: "1\n2\n3", f: [0, 5], t: [4, 5]}], function(test) {
-    cm.setValue("aaaaaaaaaa\nbbbbbbbbbb\ncccccccccc\ndddddddd\n");
-    var r = cm.markText(Pos(0, 5), Pos(2, 5),
-                        {className: "CodeMirror-matchingbracket"});
-    cm.replaceRange(test.c, p(test.a), p(test.b));
-    var f = r.find();
-    eqPos(f && f.from, p(test.f)); eqPos(f && f.to, p(test.t));
-  });
-});
-
-testCM("markTextUndo", function(cm) {
-  var marker1, marker2, bookmark;
-  marker1 = cm.markText(Pos(0, 1), Pos(0, 3),
-                        {className: "CodeMirror-matchingbracket"});
-  marker2 = cm.markText(Pos(0, 0), Pos(2, 1),
-                        {className: "CodeMirror-matchingbracket"});
-  bookmark = cm.setBookmark(Pos(1, 5));
-  cm.operation(function(){
-    cm.replaceRange("foo", Pos(0, 2));
-    cm.replaceRange("bar\nbaz\nbug\n", Pos(2, 0), Pos(3, 0));
-  });
-  var v1 = cm.getValue();
-  cm.setValue("");
-  eq(marker1.find(), null); eq(marker2.find(), null); eq(bookmark.find(), null);
-  cm.undo();
-  eqPos(bookmark.find(), Pos(1, 5), "still there");
-  cm.undo();
-  var m1Pos = marker1.find(), m2Pos = marker2.find();
-  eqPos(m1Pos.from, Pos(0, 1)); eqPos(m1Pos.to, Pos(0, 3));
-  eqPos(m2Pos.from, Pos(0, 0)); eqPos(m2Pos.to, Pos(2, 1));
-  eqPos(bookmark.find(), Pos(1, 5));
-  cm.redo(); cm.redo();
-  eq(bookmark.find(), null);
-  cm.undo();
-  eqPos(bookmark.find(), Pos(1, 5));
-  eq(cm.getValue(), v1);
-}, {value: "1234\n56789\n00\n"});
-
-testCM("markTextStayGone", function(cm) {
-  var m1 = cm.markText(Pos(0, 0), Pos(0, 1));
-  cm.replaceRange("hi", Pos(0, 2));
-  m1.clear();
-  cm.undo();
-  eq(m1.find(), null);
-}, {value: "hello"});
-
-testCM("markTextAllowEmpty", function(cm) {
-  var m1 = cm.markText(Pos(0, 1), Pos(0, 2), {clearWhenEmpty: false});
-  is(m1.find());
-  cm.replaceRange("x", Pos(0, 0));
-  is(m1.find());
-  cm.replaceRange("y", Pos(0, 2));
-  is(m1.find());
-  cm.replaceRange("z", Pos(0, 3), Pos(0, 4));
-  is(!m1.find());
-  var m2 = cm.markText(Pos(0, 1), Pos(0, 2), {clearWhenEmpty: false,
-                                              inclusiveLeft: true,
-                                              inclusiveRight: true});
-  cm.replaceRange("q", Pos(0, 1), Pos(0, 2));
-  is(m2.find());
-  cm.replaceRange("", Pos(0, 0), Pos(0, 3));
-  is(!m2.find());
-  var m3 = cm.markText(Pos(0, 1), Pos(0, 1), {clearWhenEmpty: false});
-  cm.replaceRange("a", Pos(0, 3));
-  is(m3.find());
-  cm.replaceRange("b", Pos(0, 1));
-  is(!m3.find());
-}, {value: "abcde"});
-
-testCM("markTextStacked", function(cm) {
-  var m1 = cm.markText(Pos(0, 0), Pos(0, 0), {clearWhenEmpty: false});
-  var m2 = cm.markText(Pos(0, 0), Pos(0, 0), {clearWhenEmpty: false});
-  cm.replaceRange("B", Pos(0, 1));
-  is(m1.find() && m2.find());
-}, {value: "A"});
-
-testCM("undoPreservesNewMarks", function(cm) {
-  cm.markText(Pos(0, 3), Pos(0, 4));
-  cm.markText(Pos(1, 1), Pos(1, 3));
-  cm.replaceRange("", Pos(0, 3), Pos(3, 1));
-  var mBefore = cm.markText(Pos(0, 0), Pos(0, 1));
-  var mAfter = cm.markText(Pos(0, 5), Pos(0, 6));
-  var mAround = cm.markText(Pos(0, 2), Pos(0, 4));
-  cm.undo();
-  eqPos(mBefore.find().from, Pos(0, 0));
-  eqPos(mBefore.find().to, Pos(0, 1));
-  eqPos(mAfter.find().from, Pos(3, 3));
-  eqPos(mAfter.find().to, Pos(3, 4));
-  eqPos(mAround.find().from, Pos(0, 2));
-  eqPos(mAround.find().to, Pos(3, 2));
-  var found = cm.findMarksAt(Pos(2, 2));
-  eq(found.length, 1);
-  eq(found[0], mAround);
-}, {value: "aaaa\nbbbb\ncccc\ndddd"});
-
-testCM("markClearBetween", function(cm) {
-  cm.setValue("aaa\nbbb\nccc\nddd\n");
-  cm.markText(Pos(0, 0), Pos(2));
-  cm.replaceRange("aaa\nbbb\nccc", Pos(0, 0), Pos(2));
-  eq(cm.findMarksAt(Pos(1, 1)).length, 0);
-});
-
-testCM("deleteSpanCollapsedInclusiveLeft", function(cm) {
-  var from = Pos(1, 0), to = Pos(1, 1);
-  var m = cm.markText(from, to, {collapsed: true, inclusiveLeft: true});
-  // Delete collapsed span.
-  cm.replaceRange("", from, to);
-}, {value: "abc\nX\ndef"});
-
-testCM("markTextCSS", function(cm) {
-  function present() {
-    var spans = cm.display.lineDiv.getElementsByTagName("span");
-    for (var i = 0; i < spans.length; i++)
-      if (spans[i].style.color == "cyan" && span[i].textContent == "cdefg") return true;
-  }
-  var m = cm.markText(Pos(0, 2), Pos(0, 6), {css: "color: cyan"});
-  m.clear();
-  is(!present());
-}, {value: "abcdefgh"});
-
-testCM("bookmark", function(cm) {
-  function p(v) { return v && Pos(v[0], v[1]); }
-  forEach([{a: [1, 0], b: [1, 1], c: "", d: [1, 4]},
-           {a: [1, 1], b: [1, 1], c: "xx", d: [1, 7]},
-           {a: [1, 4], b: [1, 5], c: "ab", d: [1, 6]},
-           {a: [1, 4], b: [1, 6], c: "", d: null},
-           {a: [1, 5], b: [1, 6], c: "abc", d: [1, 5]},
-           {a: [1, 6], b: [1, 8], c: "", d: [1, 5]},
-           {a: [1, 4], b: [1, 4], c: "\n\n", d: [3, 1]},
-           {bm: [1, 9], a: [1, 1], b: [1, 1], c: "\n", d: [2, 8]}], function(test) {
-    cm.setValue("1234567890\n1234567890\n1234567890");
-    var b = cm.setBookmark(p(test.bm) || Pos(1, 5));
-    cm.replaceRange(test.c, p(test.a), p(test.b));
-    eqPos(b.find(), p(test.d));
-  });
-});
-
-testCM("bookmarkInsertLeft", function(cm) {
-  var br = cm.setBookmark(Pos(0, 2), {insertLeft: false});
-  var bl = cm.setBookmark(Pos(0, 2), {insertLeft: true});
-  cm.setCursor(Pos(0, 2));
-  cm.replaceSelection("hi");
-  eqPos(br.find(), Pos(0, 2));
-  eqPos(bl.find(), Pos(0, 4));
-  cm.replaceRange("", Pos(0, 4), Pos(0, 5));
-  cm.replaceRange("", Pos(0, 2), Pos(0, 4));
-  cm.replaceRange("", Pos(0, 1), Pos(0, 2));
-  // Verify that deleting next to bookmarks doesn't kill them
-  eqPos(br.find(), Pos(0, 1));
-  eqPos(bl.find(), Pos(0, 1));
-}, {value: "abcdef"});
-
-testCM("bookmarkCursor", function(cm) {
-  var pos01 = cm.cursorCoords(Pos(0, 1)), pos11 = cm.cursorCoords(Pos(1, 1)),
-      pos20 = cm.cursorCoords(Pos(2, 0)), pos30 = cm.cursorCoords(Pos(3, 0)),
-      pos41 = cm.cursorCoords(Pos(4, 1));
-  cm.setBookmark(Pos(0, 1), {widget: document.createTextNode("←"), insertLeft: true});
-  cm.setBookmark(Pos(2, 0), {widget: document.createTextNode("←"), insertLeft: true});
-  cm.setBookmark(Pos(1, 1), {widget: document.createTextNode("→")});
-  cm.setBookmark(Pos(3, 0), {widget: document.createTextNode("→")});
-  var new01 = cm.cursorCoords(Pos(0, 1)), new11 = cm.cursorCoords(Pos(1, 1)),
-      new20 = cm.cursorCoords(Pos(2, 0)), new30 = cm.cursorCoords(Pos(3, 0));
-  near(new01.left, pos01.left, 1);
-  near(new01.top, pos01.top, 1);
-  is(new11.left > pos11.left, "at right, middle of line");
-  near(new11.top == pos11.top, 1);
-  near(new20.left, pos20.left, 1);
-  near(new20.top, pos20.top, 1);
-  is(new30.left > pos30.left, "at right, empty line");
-  near(new30.top, pos30, 1);
-  cm.setBookmark(Pos(4, 0), {widget: document.createTextNode("→")});
-  is(cm.cursorCoords(Pos(4, 1)).left > pos41.left, "single-char bug");
-}, {value: "foo\nbar\n\n\nx\ny"});
-
-testCM("multiBookmarkCursor", function(cm) {
-  if (phantom) return;
-  var ms = [], m;
-  function add(insertLeft) {
-    for (var i = 0; i < 3; ++i) {
-      var node = document.createElement("span");
-      node.innerHTML = "X";
-      ms.push(cm.setBookmark(Pos(0, 1), {widget: node, insertLeft: insertLeft}));
-    }
-  }
-  var base1 = cm.cursorCoords(Pos(0, 1)).left, base4 = cm.cursorCoords(Pos(0, 4)).left;
-  add(true);
-  near(base1, cm.cursorCoords(Pos(0, 1)).left, 1);
-  while (m = ms.pop()) m.clear();
-  add(false);
-  near(base4, cm.cursorCoords(Pos(0, 1)).left, 1);
-}, {value: "abcdefg"});
-
-testCM("getAllMarks", function(cm) {
-  addDoc(cm, 10, 10);
-  var m1 = cm.setBookmark(Pos(0, 2));
-  var m2 = cm.markText(Pos(0, 2), Pos(3, 2));
-  var m3 = cm.markText(Pos(1, 2), Pos(1, 8));
-  var m4 = cm.markText(Pos(8, 0), Pos(9, 0));
-  eq(cm.getAllMarks().length, 4);
-  m1.clear();
-  m3.clear();
-  eq(cm.getAllMarks().length, 2);
-});
-
-testCM("setValueClears", function(cm) {
-  cm.addLineClass(0, "wrap", "foo");
-  var mark = cm.markText(Pos(0, 0), Pos(1, 1), {inclusiveLeft: true, inclusiveRight: true});
-  cm.setValue("foo");
-  is(!cm.lineInfo(0).wrapClass);
-  is(!mark.find());
-}, {value: "a\nb"});
-
-testCM("bug577", function(cm) {
-  cm.setValue("a\nb");
-  cm.clearHistory();
-  cm.setValue("fooooo");
-  cm.undo();
-});
-
-testCM("scrollSnap", function(cm) {
-  cm.setSize(100, 100);
-  addDoc(cm, 200, 200);
-  cm.setCursor(Pos(100, 180));
-  var info = cm.getScrollInfo();
-  is(info.left > 0 && info.top > 0);
-  cm.setCursor(Pos(0, 0));
-  info = cm.getScrollInfo();
-  is(info.left == 0 && info.top == 0, "scrolled clean to top");
-  cm.setCursor(Pos(100, 180));
-  cm.setCursor(Pos(199, 0));
-  info = cm.getScrollInfo();
-  is(info.left == 0 && info.top + 2 > info.height - cm.getScrollerElement().clientHeight, "scrolled clean to bottom");
-});
-
-testCM("scrollIntoView", function(cm) {
-  if (phantom) return;
-  var outer = cm.getWrapperElement().getBoundingClientRect();
-  function test(line, ch, msg) {
-    var pos = Pos(line, ch);
-    cm.scrollIntoView(pos);
-    var box = cm.charCoords(pos, "window");
-    is(box.left >= outer.left, msg + " (left)");
-    is(box.right <= outer.right, msg + " (right)");
-    is(box.top >= outer.top, msg + " (top)");
-    is(box.bottom <= outer.bottom, msg + " (bottom)");
-  }
-  addDoc(cm, 200, 200);
-  test(199, 199, "bottom right");
-  test(0, 0, "top left");
-  test(100, 100, "center");
-  test(199, 0, "bottom left");
-  test(0, 199, "top right");
-  test(100, 100, "center again");
-});
-
-testCM("scrollBackAndForth", function(cm) {
-  addDoc(cm, 1, 200);
-  cm.operation(function() {
-    cm.scrollIntoView(Pos(199, 0));
-    cm.scrollIntoView(Pos(4, 0));
-  });
-  is(cm.getScrollInfo().top > 0);
-});
-
-testCM("selectAllNoScroll", function(cm) {
-  addDoc(cm, 1, 200);
-  cm.execCommand("selectAll");
-  eq(cm.getScrollInfo().top, 0);
-  cm.setCursor(199);
-  cm.execCommand("selectAll");
-  is(cm.getScrollInfo().top > 0);
-});
-
-testCM("selectionPos", function(cm) {
-  if (phantom || cm.getOption("inputStyle") != "textarea") return;
-  cm.setSize(100, 100);
-  addDoc(cm, 200, 100);
-  cm.setSelection(Pos(1, 100), Pos(98, 100));
-  var lineWidth = cm.charCoords(Pos(0, 200), "local").left;
-  var lineHeight = (cm.charCoords(Pos(99)).top - cm.charCoords(Pos(0)).top) / 100;
-  cm.scrollTo(0, 0);
-  var selElt = byClassName(cm.getWrapperElement(), "CodeMirror-selected");
-  var outer = cm.getWrapperElement().getBoundingClientRect();
-  var sawMiddle, sawTop, sawBottom;
-  for (var i = 0, e = selElt.length; i < e; ++i) {
-    var box = selElt[i].getBoundingClientRect();
-    var atLeft = box.left - outer.left < 30;
-    var width = box.right - box.left;
-    var atRight = box.right - outer.left > .8 * lineWidth;
-    if (atLeft && atRight) {
-      sawMiddle = true;
-      is(box.bottom - box.top > 90 * lineHeight, "middle high");
-      is(width > .9 * lineWidth, "middle wide");
-    } else {
-      is(width > .4 * lineWidth, "top/bot wide enough");
-      is(width < .6 * lineWidth, "top/bot slim enough");
-      if (atLeft) {
-        sawBottom = true;
-        is(box.top - outer.top > 96 * lineHeight, "bot below");
-      } else if (atRight) {
-        sawTop = true;
-        is(box.top - outer.top < 2.1 * lineHeight, "top above");
-      }
-    }
-  }
-  is(sawTop && sawBottom && sawMiddle, "all parts");
-}, null);
-
-testCM("restoreHistory", function(cm) {
-  cm.setValue("abc\ndef");
-  cm.replaceRange("hello", Pos(1, 0), Pos(1));
-  cm.replaceRange("goop", Pos(0, 0), Pos(0));
-  cm.undo();
-  var storedVal = cm.getValue(), storedHist = cm.getHistory();
-  if (window.JSON) storedHist = JSON.parse(JSON.stringify(storedHist));
-  eq(storedVal, "abc\nhello");
-  cm.setValue("");
-  cm.clearHistory();
-  eq(cm.historySize().undo, 0);
-  cm.setValue(storedVal);
-  cm.setHistory(storedHist);
-  cm.redo();
-  eq(cm.getValue(), "goop\nhello");
-  cm.undo(); cm.undo();
-  eq(cm.getValue(), "abc\ndef");
-});
-
-testCM("doubleScrollbar", function(cm) {
-  var dummy = document.body.appendChild(document.createElement("p"));
-  dummy.style.cssText = "height: 50px; overflow: scroll; width: 50px";
-  var scrollbarWidth = dummy.offsetWidth + 1 - dummy.clientWidth;
-  document.body.removeChild(dummy);
-  if (scrollbarWidth < 2) return;
-  cm.setSize(null, 100);
-  addDoc(cm, 1, 300);
-  var wrap = cm.getWrapperElement();
-  is(wrap.offsetWidth - byClassName(wrap, "CodeMirror-lines")[0].offsetWidth <= scrollbarWidth * 1.5);
-});
-
-testCM("weirdLinebreaks", function(cm) {
-  cm.setValue("foo\nbar\rbaz\r\nquux\n\rplop");
-  is(cm.getValue(), "foo\nbar\nbaz\nquux\n\nplop");
-  is(cm.lineCount(), 6);
-  cm.setValue("\n\n");
-  is(cm.lineCount(), 3);
-});
-
-testCM("setSize", function(cm) {
-  cm.setSize(100, 100);
-  var wrap = cm.getWrapperElement();
-  is(wrap.offsetWidth, 100);
-  is(wrap.offsetHeight, 100);
-  cm.setSize("100%", "3em");
-  is(wrap.style.width, "100%");
-  is(wrap.style.height, "3em");
-  cm.setSize(null, 40);
-  is(wrap.style.width, "100%");
-  is(wrap.style.height, "40px");
-});
-
-function foldLines(cm, start, end, autoClear) {
-  return cm.markText(Pos(start, 0), Pos(end - 1), {
-    inclusiveLeft: true,
-    inclusiveRight: true,
-    collapsed: true,
-    clearOnEnter: autoClear
-  });
-}
-
-testCM("collapsedLines", function(cm) {
-  addDoc(cm, 4, 10);
-  var range = foldLines(cm, 4, 5), cleared = 0;
-  CodeMirror.on(range, "clear", function() {cleared++;});
-  cm.setCursor(Pos(3, 0));
-  CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(5, 0));
-  cm.replaceRange("abcdefg", Pos(3, 0), Pos(3));
-  cm.setCursor(Pos(3, 6));
-  CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(5, 4));
-  cm.replaceRange("ab", Pos(3, 0), Pos(3));
-  cm.setCursor(Pos(3, 2));
-  CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(5, 2));
-  cm.operation(function() {range.clear(); range.clear();});
-  eq(cleared, 1);
-});
-
-testCM("collapsedRangeCoordsChar", function(cm) {
-  var pos_1_3 = cm.charCoords(Pos(1, 3));
-  pos_1_3.left += 2; pos_1_3.top += 2;
-  var opts = {collapsed: true, inclusiveLeft: true, inclusiveRight: true};
-  var m1 = cm.markText(Pos(0, 0), Pos(2, 0), opts);
-  eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
-  m1.clear();
-  var m1 = cm.markText(Pos(0, 0), Pos(1, 1), {collapsed: true, inclusiveLeft: true});
-  var m2 = cm.markText(Pos(1, 1), Pos(2, 0), {collapsed: true, inclusiveRight: true});
-  eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
-  m1.clear(); m2.clear();
-  var m1 = cm.markText(Pos(0, 0), Pos(1, 6), opts);
-  eqPos(cm.coordsChar(pos_1_3), Pos(3, 3));
-}, {value: "123456\nabcdef\nghijkl\nmnopqr\n"});
-
-testCM("collapsedRangeBetweenLinesSelected", function(cm) {
-  if (cm.getOption("inputStyle") != "textarea") return;
-  var widget = document.createElement("span");
-  widget.textContent = "\u2194";
-  cm.markText(Pos(0, 3), Pos(1, 0), {replacedWith: widget});
-  cm.setSelection(Pos(0, 3), Pos(1, 0));
-  var selElts = byClassName(cm.getWrapperElement(), "CodeMirror-selected");
-  for (var i = 0, w = 0; i < selElts.length; i++)
-    w += selElts[i].offsetWidth;
-  is(w > 0);
-}, {value: "one\ntwo"});
-
-testCM("randomCollapsedRanges", function(cm) {
-  addDoc(cm, 20, 500);
-  cm.operation(function() {
-    for (var i = 0; i < 200; i++) {
-      var start = Pos(Math.floor(Math.random() * 500), Math.floor(Math.random() * 20));
-      if (i % 4)
-        try { cm.markText(start, Pos(start.line + 2, 1), {collapsed: true}); }
-        catch(e) { if (!/overlapping/.test(String(e))) throw e; }
-      else
-        cm.markText(start, Pos(start.line, start.ch + 4), {"className": "foo"});
-    }
-  });
-});
-
-testCM("hiddenLinesAutoUnfold", function(cm) {
-  var range = foldLines(cm, 1, 3, true), cleared = 0;
-  CodeMirror.on(range, "clear", function() {cleared++;});
-  cm.setCursor(Pos(3, 0));
-  eq(cleared, 0);
-  cm.execCommand("goCharLeft");
-  eq(cleared, 1);
-  range = foldLines(cm, 1, 3, true);
-  CodeMirror.on(range, "clear", function() {cleared++;});
-  eqPos(cm.getCursor(), Pos(3, 0));
-  cm.setCursor(Pos(0, 3));
-  cm.execCommand("goCharRight");
-  eq(cleared, 2);
-}, {value: "abc\ndef\nghi\njkl"});
-
-testCM("hiddenLinesSelectAll", function(cm) {  // Issue #484
-  addDoc(cm, 4, 20);
-  foldLines(cm, 0, 10);
-  foldLines(cm, 11, 20);
-  CodeMirror.commands.selectAll(cm);
-  eqPos(cm.getCursor(true), Pos(10, 0));
-  eqPos(cm.getCursor(false), Pos(10, 4));
-});
-
-
-testCM("everythingFolded", function(cm) {
-  addDoc(cm, 2, 2);
-  function enterPress() {
-    cm.triggerOnKeyDown({type: "keydown", keyCode: 13, preventDefault: function(){}, stopPropagation: function(){}});
-  }
-  var fold = foldLines(cm, 0, 2);
-  enterPress();
-  eq(cm.getValue(), "xx\nxx");
-  fold.clear();
-  fold = foldLines(cm, 0, 2, true);
-  eq(fold.find(), null);
-  enterPress();
-  eq(cm.getValue(), "\nxx\nxx");
-});
-
-testCM("structuredFold", function(cm) {
-  if (phantom) return;
-  addDoc(cm, 4, 8);
-  var range = cm.markText(Pos(1, 2), Pos(6, 2), {
-    replacedWith: document.createTextNode("Q")
-  });
-  cm.setCursor(0, 3);
-  CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(6, 2));
-  CodeMirror.commands.goCharLeft(cm);
-  eqPos(cm.getCursor(), Pos(1, 2));
-  CodeMirror.commands.delCharAfter(cm);
-  eq(cm.getValue(), "xxxx\nxxxx\nxxxx");
-  addDoc(cm, 4, 8);
-  range = cm.markText(Pos(1, 2), Pos(6, 2), {
-    replacedWith: document.createTextNode("M"),
-    clearOnEnter: true
-  });
-  var cleared = 0;
-  CodeMirror.on(range, "clear", function(){++cleared;});
-  cm.setCursor(0, 3);
-  CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(6, 2));
-  CodeMirror.commands.goCharLeft(cm);
-  eqPos(cm.getCursor(), Pos(6, 1));
-  eq(cleared, 1);
-  range.clear();
-  eq(cleared, 1);
-  range = cm.markText(Pos(1, 2), Pos(6, 2), {
-    replacedWith: document.createTextNode("Q"),
-    clearOnEnter: true
-  });
-  range.clear();
-  cm.setCursor(1, 2);
-  CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(1, 3));
-  range = cm.markText(Pos(2, 0), Pos(4, 4), {
-    replacedWith: document.createTextNode("M")
-  });
-  cm.setCursor(1, 0);
-  CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(2, 0));
-}, null);
-
-testCM("nestedFold", function(cm) {
-  addDoc(cm, 10, 3);
-  function fold(ll, cl, lr, cr) {
-    return cm.markText(Pos(ll, cl), Pos(lr, cr), {collapsed: true});
-  }
-  var inner1 = fold(0, 6, 1, 3), inner2 = fold(0, 2, 1, 8), outer = fold(0, 1, 2, 3), inner0 = fold(0, 5, 0, 6);
-  cm.setCursor(0, 1);
-  CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(2, 3));
-  inner0.clear();
-  CodeMirror.commands.goCharLeft(cm);
-  eqPos(cm.getCursor(), Pos(0, 1));
-  outer.clear();
-  CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(0, 2));
-  CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(1, 8));
-  inner2.clear();
-  CodeMirror.commands.goCharLeft(cm);
-  eqPos(cm.getCursor(), Pos(1, 7));
-  cm.setCursor(0, 5);
-  CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(0, 6));
-  CodeMirror.commands.goCharRight(cm);
-  eqPos(cm.getCursor(), Pos(1, 3));
-});
-
-testCM("badNestedFold", function(cm) {
-  addDoc(cm, 4, 4);
-  cm.markText(Pos(0, 2), Pos(3, 2), {collapsed: true});
-  var caught;
-  try {cm.markText(Pos(0, 1), Pos(0, 3), {collapsed: true});}
-  catch(e) {caught = e;}
-  is(caught instanceof Error, "no error");
-  is(/overlap/i.test(caught.message), "wrong error");
-});
-
-testCM("nestedFoldOnSide", function(cm) {
-  var m1 = cm.markText(Pos(0, 1), Pos(2, 1), {collapsed: true, inclusiveRight: true});
-  var m2 = cm.markText(Pos(0, 1), Pos(0, 2), {collapsed: true});
-  cm.markText(Pos(0, 1), Pos(0, 2), {collapsed: true}).clear();
-  try { cm.markText(Pos(0, 1), Pos(0, 2), {collapsed: true, inclusiveLeft: true}); }
-  catch(e) { var caught = e; }
-  is(caught && /overlap/i.test(caught.message));
-  var m3 = cm.markText(Pos(2, 0), Pos(2, 1), {collapsed: true});
-  var m4 = cm.markText(Pos(2, 0), Pos(2, 1), {collapse: true, inclusiveRight: true});
-  m1.clear(); m4.clear();
-  m1 = cm.markText(Pos(0, 1), Pos(2, 1), {collapsed: true});
-  cm.markText(Pos(2, 0), Pos(2, 1), {collapsed: true}).clear();
-  try { cm.markText(Pos(2, 0), Pos(2, 1), {collapsed: true, inclusiveRight: true}); }
-  catch(e) { var caught = e; }
-  is(caught && /overlap/i.test(caught.message));
-}, {value: "ab\ncd\ef"});
-
-testCM("editInFold", function(cm) {
-  addDoc(cm, 4, 6);
-  var m = cm.markText(Pos(1, 2), Pos(3, 2), {collapsed: true});
-  cm.replaceRange("", Pos(0, 0), Pos(1, 3));
-  cm.replaceRange("", Pos(2, 1), Pos(3, 3));
-  cm.replaceRange("a\nb\nc\nd", Pos(0, 1), Pos(1, 0));
-  cm.cursorCoords(Pos(0, 0));
-});
-
-testCM("wrappingInlineWidget", function(cm) {
-  cm.setSize("11em");
-  var w = document.createElement("span");
-  w.style.color = "red";
-  w.innerHTML = "one two three four";
-  cm.markText(Pos(0, 6), Pos(0, 9), {replacedWith: w});
-  var cur0 = cm.cursorCoords(Pos(0, 0)), cur1 = cm.cursorCoords(Pos(0, 10));
-  is(cur0.top < cur1.top);
-  is(cur0.bottom < cur1.bottom);
-  var curL = cm.cursorCoords(Pos(0, 6)), curR = cm.cursorCoords(Pos(0, 9));
-  eq(curL.top, cur0.top);
-  eq(curL.bottom, cur0.bottom);
-  eq(curR.top, cur1.top);
-  eq(curR.bottom, cur1.bottom);
-  cm.replaceRange("", Pos(0, 9), Pos(0));
-  curR = cm.cursorCoords(Pos(0, 9));
-  if (phantom) return;
-  eq(curR.top, cur1.top);
-  eq(curR.bottom, cur1.bottom);
-}, {value: "1 2 3 xxx 4", lineWrapping: true});
-
-testCM("showEmptyWidgetSpan", function(cm) {
-  var marker = cm.markText(Pos(0, 2), Pos(0, 2), {
-    clearWhenEmpty: false,
-    replacedWith: document.createTextNode("X")
-  });
-  eq(cm.display.view[0].text.textContent, "abXc");
-}, {value: "abc"});
-
-testCM("changedInlineWidget", function(cm) {
-  cm.setSize("10em");
-  var w = document.createElement("span");
-  w.innerHTML = "x";
-  var m = cm.markText(Pos(0, 4), Pos(0, 5), {replacedWith: w});
-  w.innerHTML = "and now the widget is really really long all of a sudden and a scrollbar is needed";
-  m.changed();
-  var hScroll = byClassName(cm.getWrapperElement(), "CodeMirror-hscrollbar")[0];
-  is(hScroll.scrollWidth > hScroll.clientWidth);
-}, {value: "hello there"});
-
-testCM("changedBookmark", function(cm) {
-  cm.setSize("10em");
-  var w = document.createElement("span");
-  w.innerHTML = "x";
-  var m = cm.setBookmark(Pos(0, 4), {widget: w});
-  w.innerHTML = "and now the widget is really really long all of a sudden and a scrollbar is needed";
-  m.changed();
-  var hScroll = byClassName(cm.getWrapperElement(), "CodeMirror-hscrollbar")[0];
-  is(hScroll.scrollWidth > hScroll.clientWidth);
-}, {value: "abcdefg"});
-
-testCM("inlineWidget", function(cm) {
-  var w = cm.setBookmark(Pos(0, 2), {widget: document.createTextNode("uu")});
-  cm.setCursor(0, 2);
-  CodeMirror.commands.goLineDown(cm);
-  eqPos(cm.getCursor(), Pos(1, 4));
-  cm.setCursor(0, 2);
-  cm.replaceSelection("hi");
-  eqPos(w.find(), Pos(0, 2));
-  cm.setCursor(0, 1);
-  cm.replaceSelection("ay");
-  eqPos(w.find(), Pos(0, 4));
-  eq(cm.getLine(0), "uayuhiuu");
-}, {value: "uuuu\nuuuuuu"});
-
-testCM("wrappingAndResizing", function(cm) {
-  cm.setSize(null, "auto");
-  cm.setOption("lineWrapping", true);
-  var wrap = cm.getWrapperElement(), h0 = wrap.offsetHeight;
-  var doc = "xxx xxx xxx xxx xxx";
-  cm.setValue(doc);
-  for (var step = 10, w = cm.charCoords(Pos(0, 18), "div").right;; w += step) {
-    cm.setSize(w);
-    if (wrap.offsetHeight <= h0 * (opera_lt10 ? 1.2 : 1.5)) {
-      if (step == 10) { w -= 10; step = 1; }
-      else break;
-    }
-  }
-  // Ensure that putting the cursor at the end of the maximally long
-  // line doesn't cause wrapping to happen.
-  cm.setCursor(Pos(0, doc.length));
-  eq(wrap.offsetHeight, h0);
-  cm.replaceSelection("x");
-  is(wrap.offsetHeight > h0, "wrapping happens");
-  // Now add a max-height and, in a document consisting of
-  // almost-wrapped lines, go over it so that a scrollbar appears.
-  cm.setValue(doc + "\n" + doc + "\n");
-  cm.getScrollerElement().style.maxHeight = "100px";
-  cm.replaceRange("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n!\n", Pos(2, 0));
-  forEach([Pos(0, doc.length), Pos(0, doc.length - 1),
-           Pos(0, 0), Pos(1, doc.length), Pos(1, doc.length - 1)],
-          function(pos) {
-    var coords = cm.charCoords(pos);
-    eqPos(pos, cm.coordsChar({left: coords.left + 2, top: coords.top + 5}));
-  });
-}, null, ie_lt8);
-
-testCM("measureEndOfLine", function(cm) {
-  cm.setSize(null, "auto");
-  var inner = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild;
-  var lh = inner.offsetHeight;
-  for (var step = 10, w = cm.charCoords(Pos(0, 7), "div").right;; w += step) {
-    cm.setSize(w);
-    if (inner.offsetHeight < 2.5 * lh) {
-      if (step == 10) { w -= 10; step = 1; }
-      else break;
-    }
-  }
-  cm.setValue(cm.getValue() + "\n\n");
-  var endPos = cm.charCoords(Pos(0, 18), "local");
-  is(endPos.top > lh * .8, "not at top");
-  is(endPos.left > w - 20, "not at right");
-  endPos = cm.charCoords(Pos(0, 18));
-  eqPos(cm.coordsChar({left: endPos.left, top: endPos.top + 5}), Pos(0, 18));
-}, {mode: "text/html", value: "", lineWrapping: true}, ie_lt8 || opera_lt10);
-
-testCM("scrollVerticallyAndHorizontally", function(cm) {
-  if (cm.getOption("inputStyle") != "textarea") return;
-  cm.setSize(100, 100);
-  addDoc(cm, 40, 40);
-  cm.setCursor(39);
-  var wrap = cm.getWrapperElement(), bar = byClassName(wrap, "CodeMirror-vscrollbar")[0];
-  is(bar.offsetHeight < wrap.offsetHeight, "vertical scrollbar limited by horizontal one");
-  var cursorBox = byClassName(wrap, "CodeMirror-cursor")[0].getBoundingClientRect();
-  var editorBox = wrap.getBoundingClientRect();
-  is(cursorBox.bottom < editorBox.top + cm.getScrollerElement().clientHeight,
-     "bottom line visible");
-}, {lineNumbers: true});
-
-testCM("moveVstuck", function(cm) {
-  var lines = byClassName(cm.getWrapperElement(), "CodeMirror-lines")[0].firstChild, h0 = lines.offsetHeight;
-  var val = "fooooooooooooooooooooooooo baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar\n";
-  cm.setValue(val);
-  for (var w = cm.charCoords(Pos(0, 26), "div").right * 2.8;; w += 5) {
-    cm.setSize(w);
-    if (lines.offsetHeight <= 3.5 * h0) break;
-  }
-  cm.setCursor(Pos(0, val.length - 1));
-  cm.moveV(-1, "line");
-  eqPos(cm.getCursor(), Pos(0, 26));
-}, {lineWrapping: true}, ie_lt8 || opera_lt10);
-
-testCM("collapseOnMove", function(cm) {
-  cm.setSelection(Pos(0, 1), Pos(2, 4));
-  cm.execCommand("goLineUp");
-  is(!cm.somethingSelected());
-  eqPos(cm.getCursor(), Pos(0, 1));
-  cm.setSelection(Pos(0, 1), Pos(2, 4));
-  cm.execCommand("goPageDown");
-  is(!cm.somethingSelected());
-  eqPos(cm.getCursor(), Pos(2, 4));
-  cm.execCommand("goLineUp");
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(0, 4));
-  cm.setSelection(Pos(0, 1), Pos(2, 4));
-  cm.execCommand("goCharLeft");
-  is(!cm.somethingSelected());
-  eqPos(cm.getCursor(), Pos(0, 1));
-}, {value: "aaaaa\nb\nccccc"});
-
-testCM("clickTab", function(cm) {
-  var p0 = cm.charCoords(Pos(0, 0));
-  eqPos(cm.coordsChar({left: p0.left + 5, top: p0.top + 5}), Pos(0, 0));
-  eqPos(cm.coordsChar({left: p0.right - 5, top: p0.top + 5}), Pos(0, 1));
-}, {value: "\t\n\n", lineWrapping: true, tabSize: 8});
-
-testCM("verticalScroll", function(cm) {
-  cm.setSize(100, 200);
-  cm.setValue("foo\nbar\nbaz\n");
-  var sc = cm.getScrollerElement(), baseWidth = sc.scrollWidth;
-  cm.replaceRange("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah", Pos(0, 0), Pos(0));
-  is(sc.scrollWidth > baseWidth, "scrollbar present");
-  cm.replaceRange("foo", Pos(0, 0), Pos(0));
-  if (!phantom) eq(sc.scrollWidth, baseWidth, "scrollbar gone");
-  cm.replaceRange("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaah", Pos(0, 0), Pos(0));
-  cm.replaceRange("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbh", Pos(1, 0), Pos(1));
-  is(sc.scrollWidth > baseWidth, "present again");
-  var curWidth = sc.scrollWidth;
-  cm.replaceRange("foo", Pos(0, 0), Pos(0));
-  is(sc.scrollWidth < curWidth, "scrollbar smaller");
-  is(sc.scrollWidth > baseWidth, "but still present");
-});
-
-testCM("extraKeys", function(cm) {
-  var outcome;
-  function fakeKey(expected, code, props) {
-    if (typeof code == "string") code = code.charCodeAt(0);
-    var e = {type: "keydown", keyCode: code, preventDefault: function(){}, stopPropagation: function(){}};
-    if (props) for (var n in props) e[n] = props[n];
-    outcome = null;
-    cm.triggerOnKeyDown(e);
-    eq(outcome, expected);
-  }
-  CodeMirror.commands.testCommand = function() {outcome = "tc";};
-  CodeMirror.commands.goTestCommand = function() {outcome = "gtc";};
-  cm.setOption("extraKeys", {"Shift-X": function() {outcome = "sx";},
-                             "X": function() {outcome = "x";},
-                             "Ctrl-Alt-U": function() {outcome = "cau";},
-                             "End": "testCommand",
-                             "Home": "goTestCommand",
-                             "Tab": false});
-  fakeKey(null, "U");
-  fakeKey("cau", "U", {ctrlKey: true, altKey: true});
-  fakeKey(null, "U", {shiftKey: true, ctrlKey: true, altKey: true});
-  fakeKey("x", "X");
-  fakeKey("sx", "X", {shiftKey: true});
-  fakeKey("tc", 35);
-  fakeKey(null, 35, {shiftKey: true});
-  fakeKey("gtc", 36);
-  fakeKey("gtc", 36, {shiftKey: true});
-  fakeKey(null, 9);
-}, null, window.opera && mac);
-
-testCM("wordMovementCommands", function(cm) {
-  cm.execCommand("goWordLeft");
-  eqPos(cm.getCursor(), Pos(0, 0));
-  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(0, 7));
-  cm.execCommand("goWordLeft");
-  eqPos(cm.getCursor(), Pos(0, 5));
-  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(0, 12));
-  cm.execCommand("goWordLeft");
-  eqPos(cm.getCursor(), Pos(0, 9));
-  cm.execCommand("goWordRight"); cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(0, 24));
-  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(1, 9));
-  cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(1, 13));
-  cm.execCommand("goWordRight"); cm.execCommand("goWordRight");
-  eqPos(cm.getCursor(), Pos(2, 0));
-}, {value: "this is (the) firstline.\na foo12\u00e9\u00f8\u00d7bar\n"});
-
-testCM("groupMovementCommands", function(cm) {
-  cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 0));
-  cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(0, 4));
-  cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(0, 7));
-  cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(0, 10));
-  cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 7));
-  cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(0, 15));
-  cm.setCursor(Pos(0, 17));
-  cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 16));
-  cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 14));
-  cm.execCommand("goGroupRight"); cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(0, 20));
-  cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(1, 0));
-  cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(1, 2));
-  cm.execCommand("goGroupRight");
-  eqPos(cm.getCursor(), Pos(1, 5));
-  cm.execCommand("goGroupLeft"); cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(1, 0));
-  cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 20));
-  cm.execCommand("goGroupLeft");
-  eqPos(cm.getCursor(), Pos(0, 16));
-}, {value: "booo ba---quux. ffff\n  abc d"});
-
-testCM("groupsAndWhitespace", function(cm) {
-  var positions = [Pos(0, 0), Pos(0, 2), Pos(0, 5), Pos(0, 9), Pos(0, 11),
-                   Pos(1, 0), Pos(1, 2), Pos(1, 5)];
-  for (var i = 1; i < positions.length; i++) {
-    cm.execCommand("goGroupRight");
-    eqPos(cm.getCursor(), positions[i]);
-  }
-  for (var i = positions.length - 2; i >= 0; i--) {
-    cm.execCommand("goGroupLeft");
-    eqPos(cm.getCursor(), i == 2 ? Pos(0, 6) : positions[i]);
-  }
-}, {value: "  foo +++  \n  bar"});
-
-testCM("charMovementCommands", function(cm) {
-  cm.execCommand("goCharLeft"); cm.execCommand("goColumnLeft");
-  eqPos(cm.getCursor(), Pos(0, 0));
-  cm.execCommand("goCharRight"); cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(0, 2));
-  cm.setCursor(Pos(1, 0));
-  cm.execCommand("goColumnLeft");
-  eqPos(cm.getCursor(), Pos(1, 0));
-  cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(0, 5));
-  cm.execCommand("goColumnRight");
-  eqPos(cm.getCursor(), Pos(0, 5));
-  cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(1, 0));
-  cm.execCommand("goLineEnd");
-  eqPos(cm.getCursor(), Pos(1, 5));
-  cm.execCommand("goLineStartSmart");
-  eqPos(cm.getCursor(), Pos(1, 1));
-  cm.execCommand("goLineStartSmart");
-  eqPos(cm.getCursor(), Pos(1, 0));
-  cm.setCursor(Pos(2, 0));
-  cm.execCommand("goCharRight"); cm.execCommand("goColumnRight");
-  eqPos(cm.getCursor(), Pos(2, 0));
-}, {value: "line1\n ine2\n"});
-
-testCM("verticalMovementCommands", function(cm) {
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(0, 0));
-  cm.execCommand("goLineDown");
-  if (!phantom) // This fails in PhantomJS, though not in a real Webkit
-    eqPos(cm.getCursor(), Pos(1, 0));
-  cm.setCursor(Pos(1, 12));
-  cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(2, 5));
-  cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(3, 0));
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(2, 5));
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(1, 12));
-  cm.execCommand("goPageDown");
-  eqPos(cm.getCursor(), Pos(5, 0));
-  cm.execCommand("goPageDown"); cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(5, 0));
-  cm.execCommand("goPageUp");
-  eqPos(cm.getCursor(), Pos(0, 0));
-}, {value: "line1\nlong long line2\nline3\n\nline5\n"});
-
-testCM("verticalMovementCommandsWrapping", function(cm) {
-  cm.setSize(120);
-  cm.setCursor(Pos(0, 5));
-  cm.execCommand("goLineDown");
-  eq(cm.getCursor().line, 0);
-  is(cm.getCursor().ch > 5, "moved beyond wrap");
-  for (var i = 0; ; ++i) {
-    is(i < 20, "no endless loop");
-    cm.execCommand("goLineDown");
-    var cur = cm.getCursor();
-    if (cur.line == 1) eq(cur.ch, 5);
-    if (cur.line == 2) { eq(cur.ch, 1); break; }
-  }
-}, {value: "a very long line that wraps around somehow so that we can test cursor movement\nshortone\nk",
-    lineWrapping: true});
-
-testCM("rtlMovement", function(cm) {
-  if (cm.getOption("inputStyle") != "textarea") return;
-  forEach(["خحج", "خحabcخحج", "abخحخحجcd", "abخde", "abخح2342خ1حج", "خ1ح2خح3حxج",
-           "خحcd", "1خحcd", "abcdeح1ج", "خمرحبها مها!", "foobarر", "خ ة ق",
-           "", "يتم السحب في 05 فبراير 2014"], function(line) {
-    var inv = line.charCodeAt(0) > 128;
-    cm.setValue(line + "\n"); cm.execCommand(inv ? "goLineEnd" : "goLineStart");
-    var cursors = byClassName(cm.getWrapperElement(), "CodeMirror-cursors")[0];
-    var cursor = cursors.firstChild;
-    var prevX = cursor.offsetLeft, prevY = cursor.offsetTop;
-    for (var i = 0; i <= line.length; ++i) {
-      cm.execCommand("goCharRight");
-      cursor = cursors.firstChild;
-      if (i == line.length) is(cursor.offsetTop > prevY, "next line");
-      else is(cursor.offsetLeft > prevX, "moved right");
-      prevX = cursor.offsetLeft; prevY = cursor.offsetTop;
-    }
-    cm.setCursor(0, 0); cm.execCommand(inv ? "goLineStart" : "goLineEnd");
-    prevX = cursors.firstChild.offsetLeft;
-    for (var i = 0; i < line.length; ++i) {
-      cm.execCommand("goCharLeft");
-      cursor = cursors.firstChild;
-      is(cursor.offsetLeft < prevX, "moved left");
-      prevX = cursor.offsetLeft;
-    }
-  });
-}, null, ie_lt9);
-
-// Verify that updating a line clears its bidi ordering
-testCM("bidiUpdate", function(cm) {
-  cm.setCursor(Pos(0, 2));
-  cm.replaceSelection("خحج", "start");
-  cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(0, 4));
-}, {value: "abcd\n"});
-
-testCM("movebyTextUnit", function(cm) {
-  cm.setValue("בְּרֵאשִ\nééé́\n");
-  cm.execCommand("goLineEnd");
-  for (var i = 0; i < 4; ++i) cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(0, 0));
-  cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(1, 0));
-  cm.execCommand("goCharRight");
-  cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(1, 4));
-  cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(1, 7));
-});
-
-testCM("lineChangeEvents", function(cm) {
-  addDoc(cm, 3, 5);
-  var log = [], want = ["ch 0", "ch 1", "del 2", "ch 0", "ch 0", "del 1", "del 3", "del 4"];
-  for (var i = 0; i < 5; ++i) {
-    CodeMirror.on(cm.getLineHandle(i), "delete", function(i) {
-      return function() {log.push("del " + i);};
-    }(i));
-    CodeMirror.on(cm.getLineHandle(i), "change", function(i) {
-      return function() {log.push("ch " + i);};
-    }(i));
-  }
-  cm.replaceRange("x", Pos(0, 1));
-  cm.replaceRange("xy", Pos(1, 1), Pos(2));
-  cm.replaceRange("foo\nbar", Pos(0, 1));
-  cm.replaceRange("", Pos(0, 0), Pos(cm.lineCount()));
-  eq(log.length, want.length, "same length");
-  for (var i = 0; i < log.length; ++i)
-    eq(log[i], want[i]);
-});
-
-testCM("scrollEntirelyToRight", function(cm) {
-  if (phantom || cm.getOption("inputStyle") != "textarea") return;
-  addDoc(cm, 500, 2);
-  cm.setCursor(Pos(0, 500));
-  var wrap = cm.getWrapperElement(), cur = byClassName(wrap, "CodeMirror-cursor")[0];
-  is(wrap.getBoundingClientRect().right > cur.getBoundingClientRect().left);
-});
-
-testCM("lineWidgets", function(cm) {
-  addDoc(cm, 500, 3);
-  var last = cm.charCoords(Pos(2, 0));
-  var node = document.createElement("div");
-  node.innerHTML = "hi";
-  var widget = cm.addLineWidget(1, node);
-  is(last.top < cm.charCoords(Pos(2, 0)).top, "took up space");
-  cm.setCursor(Pos(1, 1));
-  cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(2, 1));
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(1, 1));
-});
-
-testCM("lineWidgetFocus", function(cm) {
-  var place = document.getElementById("testground");
-  place.className = "offscreen";
-  try {
-    addDoc(cm, 500, 10);
-    var node = document.createElement("input");
-    var widget = cm.addLineWidget(1, node);
-    node.focus();
-    eq(document.activeElement, node);
-    cm.replaceRange("new stuff", Pos(1, 0));
-    eq(document.activeElement, node);
-  } finally {
-    place.className = "";
-  }
-});
-
-testCM("lineWidgetCautiousRedraw", function(cm) {
-  var node = document.createElement("div");
-  node.innerHTML = "hahah";
-  var w = cm.addLineWidget(0, node);
-  var redrawn = false;
-  w.on("redraw", function() { redrawn = true; });
-  cm.replaceSelection("0");
-  is(!redrawn);
-}, {value: "123\n456"});
-
-
-var knownScrollbarWidth;
-function scrollbarWidth(measure) {
-  if (knownScrollbarWidth != null) return knownScrollbarWidth;
-  var div = document.createElement('div');
-  div.style.cssText = "width: 50px; height: 50px; overflow-x: scroll";
-  document.body.appendChild(div);
-  knownScrollbarWidth = div.offsetHeight - div.clientHeight;
-  document.body.removeChild(div);
-  return knownScrollbarWidth || 0;
-}
-
-testCM("lineWidgetChanged", function(cm) {
-  addDoc(cm, 2, 300);
-  var halfScrollbarWidth = scrollbarWidth(cm.display.measure)/2;
-  cm.setOption('lineNumbers', true);
-  cm.setSize(600, cm.defaultTextHeight() * 50);
-  cm.scrollTo(null, cm.heightAtLine(125, "local"));
-
-  var expectedWidgetHeight = 60;
-  var expectedLinesInWidget = 3;
-  function w() {
-    var node = document.createElement("div");
-    // we use these children with just under half width of the line to check measurements are made with correct width
-    // when placed in the measure div.
-    // If the widget is measured at a width much narrower than it is displayed at, the underHalf children will span two lines and break the test.
-    // If the widget is measured at a width much wider than it is displayed at, the overHalf children will combine and break the test.
-    // Note that this test only checks widgets where coverGutter is true, because these require extra styling to get the width right.
-    // It may also be worthwhile to check this for non-coverGutter widgets.
-    // Visually:
-    // Good:
-    // | ------------- display width ------------- |
-    // | ------- widget-width when measured ------ |
-    // | | -- under-half -- | | -- under-half -- | | 
-    // | | --- over-half --- |                     |
-    // | | --- over-half --- |                     |
-    // Height: measured as 3 lines, same as it will be when actually displayed
-
-    // Bad (too narrow):
-    // | ------------- display width ------------- |
-    // | ------ widget-width when measured ----- |  < -- uh oh
-    // | | -- under-half -- |                    |
-    // | | -- under-half -- |                    |  < -- when measured, shoved to next line
-    // | | --- over-half --- |                   |
-    // | | --- over-half --- |                   |
-    // Height: measured as 4 lines, more than expected . Will be displayed as 3 lines!
-
-    // Bad (too wide):
-    // | ------------- display width ------------- |
-    // | -------- widget-width when measured ------- | < -- uh oh
-    // | | -- under-half -- | | -- under-half -- |   | 
-    // | | --- over-half --- | | --- over-half --- | | < -- when measured, combined on one line
-    // Height: measured as 2 lines, less than expected. Will be displayed as 3 lines!
-
-    var barelyUnderHalfWidthHtml = '
    ';
-    var barelyOverHalfWidthHtml = '
    ';
-    node.innerHTML = new Array(3).join(barelyUnderHalfWidthHtml) + new Array(3).join(barelyOverHalfWidthHtml);
-    node.style.cssText = "background: yellow;font-size:0;line-height: " + (expectedWidgetHeight/expectedLinesInWidget) + "px;";
-    return node;
-  }
-  var info0 = cm.getScrollInfo();
-  var w0 = cm.addLineWidget(0, w(), { coverGutter: true });
-  var w150 = cm.addLineWidget(150, w(), { coverGutter: true });
-  var w300 = cm.addLineWidget(300, w(), { coverGutter: true });
-  var info1 = cm.getScrollInfo();
-  eq(info0.height + (3 * expectedWidgetHeight), info1.height);
-  eq(info0.top + expectedWidgetHeight, info1.top);
-  expectedWidgetHeight = 12;
-  w0.node.style.lineHeight = w150.node.style.lineHeight = w300.node.style.lineHeight = (expectedWidgetHeight/expectedLinesInWidget) + "px";
-  w0.changed(); w150.changed(); w300.changed();
-  var info2 = cm.getScrollInfo();
-  eq(info0.height + (3 * expectedWidgetHeight), info2.height);
-  eq(info0.top + expectedWidgetHeight, info2.top);
-});
-
-testCM("getLineNumber", function(cm) {
-  addDoc(cm, 2, 20);
-  var h1 = cm.getLineHandle(1);
-  eq(cm.getLineNumber(h1), 1);
-  cm.replaceRange("hi\nbye\n", Pos(0, 0));
-  eq(cm.getLineNumber(h1), 3);
-  cm.setValue("");
-  eq(cm.getLineNumber(h1), null);
-});
-
-testCM("jumpTheGap", function(cm) {
-  if (phantom) return;
-  var longLine = "abcdef ghiklmnop qrstuvw xyz ";
-  longLine += longLine; longLine += longLine; longLine += longLine;
-  cm.replaceRange(longLine, Pos(2, 0), Pos(2));
-  cm.setSize("200px", null);
-  cm.getWrapperElement().style.lineHeight = 2;
-  cm.refresh();
-  cm.setCursor(Pos(0, 1));
-  cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(1, 1));
-  cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(2, 1));
-  cm.execCommand("goLineDown");
-  eq(cm.getCursor().line, 2);
-  is(cm.getCursor().ch > 1);
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(2, 1));
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(1, 1));
-  var node = document.createElement("div");
-  node.innerHTML = "hi"; node.style.height = "30px";
-  cm.addLineWidget(0, node);
-  cm.addLineWidget(1, node.cloneNode(true), {above: true});
-  cm.setCursor(Pos(0, 2));
-  cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(1, 2));
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(0, 2));
-}, {lineWrapping: true, value: "abc\ndef\nghi\njkl\n"});
-
-testCM("addLineClass", function(cm) {
-  function cls(line, text, bg, wrap, gutter) {
-    var i = cm.lineInfo(line);
-    eq(i.textClass, text);
-    eq(i.bgClass, bg);
-    eq(i.wrapClass, wrap);
-    if (typeof i.handle.gutterClass !== 'undefined') {
-        eq(i.handle.gutterClass, gutter);
-    }
-  }
-  cm.addLineClass(0, "text", "foo");
-  cm.addLineClass(0, "text", "bar");
-  cm.addLineClass(1, "background", "baz");
-  cm.addLineClass(1, "wrap", "foo");
-  cm.addLineClass(1, "gutter", "gutter-class");
-  cls(0, "foo bar", null, null, null);
-  cls(1, null, "baz", "foo", "gutter-class");
-  var lines = cm.display.lineDiv;
-  eq(byClassName(lines, "foo").length, 2);
-  eq(byClassName(lines, "bar").length, 1);
-  eq(byClassName(lines, "baz").length, 1);
-  eq(byClassName(lines, "gutter-class").length, 2); // Gutter classes are reflected in 2 nodes
-  cm.removeLineClass(0, "text", "foo");
-  cls(0, "bar", null, null, null);
-  cm.removeLineClass(0, "text", "foo");
-  cls(0, "bar", null, null, null);
-  cm.removeLineClass(0, "text", "bar");
-  cls(0, null, null, null);
-
-  cm.addLineClass(1, "wrap", "quux");
-  cls(1, null, "baz", "foo quux", "gutter-class");
-  cm.removeLineClass(1, "wrap");
-  cls(1, null, "baz", null, "gutter-class");
-  cm.removeLineClass(1, "gutter", "gutter-class");
-  eq(byClassName(lines, "gutter-class").length, 0);
-  cls(1, null, "baz", null, null);
-
-  cm.addLineClass(1, "gutter", "gutter-class");
-  cls(1, null, "baz", null, "gutter-class");
-  cm.removeLineClass(1, "gutter", "gutter-class");
-  cls(1, null, "baz", null, null);
-
-}, {value: "hohoho\n", lineNumbers: true});
-
-testCM("atomicMarker", function(cm) {
-  addDoc(cm, 10, 10);
-  function atom(ll, cl, lr, cr, li, ri) {
-    return cm.markText(Pos(ll, cl), Pos(lr, cr),
-                       {atomic: true, inclusiveLeft: li, inclusiveRight: ri});
-  }
-  var m = atom(0, 1, 0, 5);
-  cm.setCursor(Pos(0, 1));
-  cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(0, 5));
-  cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(0, 1));
-  m.clear();
-  m = atom(0, 0, 0, 5, true);
-  eqPos(cm.getCursor(), Pos(0, 5), "pushed out");
-  cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(0, 5));
-  m.clear();
-  m = atom(8, 4, 9, 10, false, true);
-  cm.setCursor(Pos(9, 8));
-  eqPos(cm.getCursor(), Pos(8, 4), "set");
-  cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(8, 4), "char right");
-  cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(8, 4), "line down");
-  cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(8, 3));
-  m.clear();
-  m = atom(1, 1, 3, 8);
-  cm.setCursor(Pos(0, 0));
-  cm.setCursor(Pos(2, 0));
-  eqPos(cm.getCursor(), Pos(3, 8));
-  cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(1, 1));
-  cm.execCommand("goCharRight");
-  eqPos(cm.getCursor(), Pos(3, 8));
-  cm.execCommand("goLineUp");
-  eqPos(cm.getCursor(), Pos(1, 1));
-  cm.execCommand("goLineDown");
-  eqPos(cm.getCursor(), Pos(3, 8));
-  cm.execCommand("delCharBefore");
-  eq(cm.getValue().length, 80, "del chunk");
-  m = atom(3, 0, 5, 5);
-  cm.setCursor(Pos(3, 0));
-  cm.execCommand("delWordAfter");
-  eq(cm.getValue().length, 53, "del chunk");
-});
-
-testCM("selectionBias", function(cm) {
-  cm.markText(Pos(0, 1), Pos(0, 3), {atomic: true});
-  cm.setCursor(Pos(0, 2));
-  eqPos(cm.getCursor(), Pos(0, 3));
-  cm.setCursor(Pos(0, 2));
-  eqPos(cm.getCursor(), Pos(0, 1));
-  cm.setCursor(Pos(0, 2), null, {bias: -1});
-  eqPos(cm.getCursor(), Pos(0, 1));
-  cm.setCursor(Pos(0, 4));
-  cm.setCursor(Pos(0, 2), null, {bias: 1});
-  eqPos(cm.getCursor(), Pos(0, 3));
-}, {value: "12345"});
-
-testCM("selectionHomeEnd", function(cm) {
-  cm.markText(Pos(1, 0), Pos(1, 1), {atomic: true, inclusiveLeft: true});
-  cm.markText(Pos(1, 3), Pos(1, 4), {atomic: true, inclusiveRight: true});
-  cm.setCursor(Pos(1, 2));
-  cm.execCommand("goLineStart");
-  eqPos(cm.getCursor(), Pos(1, 1));
-  cm.execCommand("goLineEnd");
-  eqPos(cm.getCursor(), Pos(1, 3));
-}, {value: "ab\ncdef\ngh"});
-
-testCM("readOnlyMarker", function(cm) {
-  function mark(ll, cl, lr, cr, at) {
-    return cm.markText(Pos(ll, cl), Pos(lr, cr),
-                       {readOnly: true, atomic: at});
-  }
-  var m = mark(0, 1, 0, 4);
-  cm.setCursor(Pos(0, 2));
-  cm.replaceSelection("hi", "end");
-  eqPos(cm.getCursor(), Pos(0, 2));
-  eq(cm.getLine(0), "abcde");
-  cm.execCommand("selectAll");
-  cm.replaceSelection("oops", "around");
-  eq(cm.getValue(), "oopsbcd");
-  cm.undo();
-  eqPos(m.find().from, Pos(0, 1));
-  eqPos(m.find().to, Pos(0, 4));
-  m.clear();
-  cm.setCursor(Pos(0, 2));
-  cm.replaceSelection("hi", "around");
-  eq(cm.getLine(0), "abhicde");
-  eqPos(cm.getCursor(), Pos(0, 4));
-  m = mark(0, 2, 2, 2, true);
-  cm.setSelection(Pos(1, 1), Pos(2, 4));
-  cm.replaceSelection("t", "end");
-  eqPos(cm.getCursor(), Pos(2, 3));
-  eq(cm.getLine(2), "klto");
-  cm.execCommand("goCharLeft");
-  cm.execCommand("goCharLeft");
-  eqPos(cm.getCursor(), Pos(0, 2));
-  cm.setSelection(Pos(0, 1), Pos(0, 3));
-  cm.replaceSelection("xx", "around");
-  eqPos(cm.getCursor(), Pos(0, 3));
-  eq(cm.getLine(0), "axxhicde");
-}, {value: "abcde\nfghij\nklmno\n"});
-
-testCM("dirtyBit", function(cm) {
-  eq(cm.isClean(), true);
-  cm.replaceSelection("boo", null, "test");
-  eq(cm.isClean(), false);
-  cm.undo();
-  eq(cm.isClean(), true);
-  cm.replaceSelection("boo", null, "test");
-  cm.replaceSelection("baz", null, "test");
-  cm.undo();
-  eq(cm.isClean(), false);
-  cm.markClean();
-  eq(cm.isClean(), true);
-  cm.undo();
-  eq(cm.isClean(), false);
-  cm.redo();
-  eq(cm.isClean(), true);
-});
-
-testCM("changeGeneration", function(cm) {
-  cm.replaceSelection("x");
-  var softGen = cm.changeGeneration();
-  cm.replaceSelection("x");
-  cm.undo();
-  eq(cm.getValue(), "");
-  is(!cm.isClean(softGen));
-  cm.replaceSelection("x");
-  var hardGen = cm.changeGeneration(true);
-  cm.replaceSelection("x");
-  cm.undo();
-  eq(cm.getValue(), "x");
-  is(cm.isClean(hardGen));
-});
-
-testCM("addKeyMap", function(cm) {
-  function sendKey(code) {
-    cm.triggerOnKeyDown({type: "keydown", keyCode: code,
-                         preventDefault: function(){}, stopPropagation: function(){}});
-  }
-
-  sendKey(39);
-  eqPos(cm.getCursor(), Pos(0, 1));
-  var test = 0;
-  var map1 = {Right: function() { ++test; }}, map2 = {Right: function() { test += 10; }}
-  cm.addKeyMap(map1);
-  sendKey(39);
-  eqPos(cm.getCursor(), Pos(0, 1));
-  eq(test, 1);
-  cm.addKeyMap(map2, true);
-  sendKey(39);
-  eq(test, 2);
-  cm.removeKeyMap(map1);
-  sendKey(39);
-  eq(test, 12);
-  cm.removeKeyMap(map2);
-  sendKey(39);
-  eq(test, 12);
-  eqPos(cm.getCursor(), Pos(0, 2));
-  cm.addKeyMap({Right: function() { test = 55; }, name: "mymap"});
-  sendKey(39);
-  eq(test, 55);
-  cm.removeKeyMap("mymap");
-  sendKey(39);
-  eqPos(cm.getCursor(), Pos(0, 3));
-}, {value: "abc"});
-
-testCM("findPosH", function(cm) {
-  forEach([{from: Pos(0, 0), to: Pos(0, 1), by: 1},
-           {from: Pos(0, 0), to: Pos(0, 0), by: -1, hitSide: true},
-           {from: Pos(0, 0), to: Pos(0, 4), by: 1, unit: "word"},
-           {from: Pos(0, 0), to: Pos(0, 8), by: 2, unit: "word"},
-           {from: Pos(0, 0), to: Pos(2, 0), by: 20, unit: "word", hitSide: true},
-           {from: Pos(0, 7), to: Pos(0, 5), by: -1, unit: "word"},
-           {from: Pos(0, 4), to: Pos(0, 8), by: 1, unit: "word"},
-           {from: Pos(1, 0), to: Pos(1, 18), by: 3, unit: "word"},
-           {from: Pos(1, 22), to: Pos(1, 5), by: -3, unit: "word"},
-           {from: Pos(1, 15), to: Pos(1, 10), by: -5},
-           {from: Pos(1, 15), to: Pos(1, 10), by: -5, unit: "column"},
-           {from: Pos(1, 15), to: Pos(1, 0), by: -50, unit: "column", hitSide: true},
-           {from: Pos(1, 15), to: Pos(1, 24), by: 50, unit: "column", hitSide: true},
-           {from: Pos(1, 15), to: Pos(2, 0), by: 50, hitSide: true}], function(t) {
-    var r = cm.findPosH(t.from, t.by, t.unit || "char");
-    eqPos(r, t.to);
-    eq(!!r.hitSide, !!t.hitSide);
-  });
-}, {value: "line one\nline two.something.other\n"});
-
-testCM("beforeChange", function(cm) {
-  cm.on("beforeChange", function(cm, change) {
-    var text = [];
-    for (var i = 0; i < change.text.length; ++i)
-      text.push(change.text[i].replace(/\s/g, "_"));
-    change.update(null, null, text);
-  });
-  cm.setValue("hello, i am a\nnew document\n");
-  eq(cm.getValue(), "hello,_i_am_a\nnew_document\n");
-  CodeMirror.on(cm.getDoc(), "beforeChange", function(doc, change) {
-    if (change.from.line == 0) change.cancel();
-  });
-  cm.setValue("oops"); // Canceled
-  eq(cm.getValue(), "hello,_i_am_a\nnew_document\n");
-  cm.replaceRange("hey hey hey", Pos(1, 0), Pos(2, 0));
-  eq(cm.getValue(), "hello,_i_am_a\nhey_hey_hey");
-}, {value: "abcdefghijk"});
-
-testCM("beforeChangeUndo", function(cm) {
-  cm.replaceRange("hi", Pos(0, 0), Pos(0));
-  cm.replaceRange("bye", Pos(0, 0), Pos(0));
-  eq(cm.historySize().undo, 2);
-  cm.on("beforeChange", function(cm, change) {
-    is(!change.update);
-    change.cancel();
-  });
-  cm.undo();
-  eq(cm.historySize().undo, 0);
-  eq(cm.getValue(), "bye\ntwo");
-}, {value: "one\ntwo"});
-
-testCM("beforeSelectionChange", function(cm) {
-  function notAtEnd(cm, pos) {
-    var len = cm.getLine(pos.line).length;
-    if (!len || pos.ch == len) return Pos(pos.line, pos.ch - 1);
-    return pos;
-  }
-  cm.on("beforeSelectionChange", function(cm, obj) {
-    obj.update([{anchor: notAtEnd(cm, obj.ranges[0].anchor),
-                 head: notAtEnd(cm, obj.ranges[0].head)}]);
-  });
-
-  addDoc(cm, 10, 10);
-  cm.execCommand("goLineEnd");
-  eqPos(cm.getCursor(), Pos(0, 9));
-  cm.execCommand("selectAll");
-  eqPos(cm.getCursor("start"), Pos(0, 0));
-  eqPos(cm.getCursor("end"), Pos(9, 9));
-});
-
-testCM("change_removedText", function(cm) {
-  cm.setValue("abc\ndef");
-
-  var removedText = [];
-  cm.on("change", function(cm, change) {
-    removedText.push(change.removed);
-  });
-
-  cm.operation(function() {
-    cm.replaceRange("xyz", Pos(0, 0), Pos(1,1));
-    cm.replaceRange("123", Pos(0,0));
-  });
-
-  eq(removedText.length, 2);
-  eq(removedText[0].join("\n"), "abc\nd");
-  eq(removedText[1].join("\n"), "");
-
-  var removedText = [];
-  cm.undo();
-  eq(removedText.length, 2);
-  eq(removedText[0].join("\n"), "123");
-  eq(removedText[1].join("\n"), "xyz");
-
-  var removedText = [];
-  cm.redo();
-  eq(removedText.length, 2);
-  eq(removedText[0].join("\n"), "abc\nd");
-  eq(removedText[1].join("\n"), "");
-});
-
-testCM("lineStyleFromMode", function(cm) {
-  CodeMirror.defineMode("test_mode", function() {
-    return {token: function(stream) {
-      if (stream.match(/^\[[^\]]*\]/)) return "  line-brackets  ";
-      if (stream.match(/^\([^\)]*\)/)) return "  line-background-parens  ";
-      if (stream.match(/^<[^>]*>/)) return "  span  line-line  line-background-bg  ";
-      stream.match(/^\s+|^\S+/);
-    }};
-  });
-  cm.setOption("mode", "test_mode");
-  var bracketElts = byClassName(cm.getWrapperElement(), "brackets");
-  eq(bracketElts.length, 1, "brackets count");
-  eq(bracketElts[0].nodeName, "PRE");
-  is(!/brackets.*brackets/.test(bracketElts[0].className));
-  var parenElts = byClassName(cm.getWrapperElement(), "parens");
-  eq(parenElts.length, 1, "parens count");
-  eq(parenElts[0].nodeName, "DIV");
-  is(!/parens.*parens/.test(parenElts[0].className));
-  eq(parenElts[0].parentElement.nodeName, "DIV");
-
-  eq(byClassName(cm.getWrapperElement(), "bg").length, 1);
-  eq(byClassName(cm.getWrapperElement(), "line").length, 1);
-  var spanElts = byClassName(cm.getWrapperElement(), "cm-span");
-  eq(spanElts.length, 2);
-  is(/^\s*cm-span\s*$/.test(spanElts[0].className));
-}, {value: "line1: [br] [br]\nline2: (par) (par)\nline3:  "});
-
-testCM("lineStyleFromBlankLine", function(cm) {
-  CodeMirror.defineMode("lineStyleFromBlankLine_mode", function() {
-    return {token: function(stream) { stream.skipToEnd(); return "comment"; },
-            blankLine: function() { return "line-blank"; }};
-  });
-  cm.setOption("mode", "lineStyleFromBlankLine_mode");
-  var blankElts = byClassName(cm.getWrapperElement(), "blank");
-  eq(blankElts.length, 1);
-  eq(blankElts[0].nodeName, "PRE");
-  cm.replaceRange("x", Pos(1, 0));
-  blankElts = byClassName(cm.getWrapperElement(), "blank");
-  eq(blankElts.length, 0);
-}, {value: "foo\n\nbar"});
-
-CodeMirror.registerHelper("xxx", "a", "A");
-CodeMirror.registerHelper("xxx", "b", "B");
-CodeMirror.defineMode("yyy", function() {
-  return {
-    token: function(stream) { stream.skipToEnd(); },
-    xxx: ["a", "b", "q"]
-  };
-});
-CodeMirror.registerGlobalHelper("xxx", "c", function(m) { return m.enableC; }, "C");
-
-testCM("helpers", function(cm) {
-  cm.setOption("mode", "yyy");
-  eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "A/B");
-  cm.setOption("mode", {name: "yyy", modeProps: {xxx: "b", enableC: true}});
-  eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "B/C");
-  cm.setOption("mode", "javascript");
-  eq(cm.getHelpers(Pos(0, 0), "xxx").join("/"), "");
-});
-
-testCM("selectionHistory", function(cm) {
-  for (var i = 0; i < 3; i++) {
-    cm.setExtending(true);
-    cm.execCommand("goCharRight");
-    cm.setExtending(false);
-    cm.execCommand("goCharRight");
-    cm.execCommand("goCharRight");
-  }
-  cm.execCommand("undoSelection");
-  eq(cm.getSelection(), "c");
-  cm.execCommand("undoSelection");
-  eq(cm.getSelection(), "");
-  eqPos(cm.getCursor(), Pos(0, 4));
-  cm.execCommand("undoSelection");
-  eq(cm.getSelection(), "b");
-  cm.execCommand("redoSelection");
-  eq(cm.getSelection(), "");
-  eqPos(cm.getCursor(), Pos(0, 4));
-  cm.execCommand("redoSelection");
-  eq(cm.getSelection(), "c");
-  cm.execCommand("redoSelection");
-  eq(cm.getSelection(), "");
-  eqPos(cm.getCursor(), Pos(0, 6));
-}, {value: "a b c d"});
-
-testCM("selectionChangeReducesRedo", function(cm) {
-  cm.replaceSelection("X");
-  cm.execCommand("goCharRight");
-  cm.undoSelection();
-  cm.execCommand("selectAll");
-  cm.undoSelection();
-  eq(cm.getValue(), "Xabc");
-  eqPos(cm.getCursor(), Pos(0, 1));
-  cm.undoSelection();
-  eq(cm.getValue(), "abc");
-}, {value: "abc"});
-
-testCM("selectionHistoryNonOverlapping", function(cm) {
-  cm.setSelection(Pos(0, 0), Pos(0, 1));
-  cm.setSelection(Pos(0, 2), Pos(0, 3));
-  cm.execCommand("undoSelection");
-  eqPos(cm.getCursor("anchor"), Pos(0, 0));
-  eqPos(cm.getCursor("head"), Pos(0, 1));
-}, {value: "1234"});
-
-testCM("cursorMotionSplitsHistory", function(cm) {
-  cm.replaceSelection("a");
-  cm.execCommand("goCharRight");
-  cm.replaceSelection("b");
-  cm.replaceSelection("c");
-  cm.undo();
-  eq(cm.getValue(), "a1234");
-  eqPos(cm.getCursor(), Pos(0, 2));
-  cm.undo();
-  eq(cm.getValue(), "1234");
-  eqPos(cm.getCursor(), Pos(0, 0));
-}, {value: "1234"});
-
-testCM("selChangeInOperationDoesNotSplit", function(cm) {
-  for (var i = 0; i < 4; i++) {
-    cm.operation(function() {
-      cm.replaceSelection("x");
-      cm.setCursor(Pos(0, cm.getCursor().ch - 1));
-    });
-  }
-  eqPos(cm.getCursor(), Pos(0, 0));
-  eq(cm.getValue(), "xxxxa");
-  cm.undo();
-  eq(cm.getValue(), "a");
-}, {value: "a"});
-
-testCM("alwaysMergeSelEventWithChangeOrigin", function(cm) {
-  cm.replaceSelection("U", null, "foo");
-  cm.setSelection(Pos(0, 0), Pos(0, 1), {origin: "foo"});
-  cm.undoSelection();
-  eq(cm.getValue(), "a");
-  cm.replaceSelection("V", null, "foo");
-  cm.setSelection(Pos(0, 0), Pos(0, 1), {origin: "bar"});
-  cm.undoSelection();
-  eq(cm.getValue(), "Va");
-}, {value: "a"});
-
-testCM("getTokenAt", function(cm) {
-  var tokPlus = cm.getTokenAt(Pos(0, 2));
-  eq(tokPlus.type, "operator");
-  eq(tokPlus.string, "+");
-  var toks = cm.getLineTokens(0);
-  eq(toks.length, 3);
-  forEach([["number", "1"], ["operator", "+"], ["number", "2"]], function(expect, i) {
-    eq(toks[i].type, expect[0]);
-    eq(toks[i].string, expect[1]);
-  });
-}, {value: "1+2", mode: "javascript"});
-
-testCM("getTokenTypeAt", function(cm) {
-  eq(cm.getTokenTypeAt(Pos(0, 0)), "number");
-  eq(cm.getTokenTypeAt(Pos(0, 6)), "string");
-  cm.addOverlay({
-    token: function(stream) {
-      if (stream.match("foo")) return "foo";
-      else stream.next();
-    }
-  });
-  eq(byClassName(cm.getWrapperElement(), "cm-foo").length, 1);
-  eq(cm.getTokenTypeAt(Pos(0, 6)), "string");
-}, {value: "1 + 'foo'", mode: "javascript"});
-
-testCM("resizeLineWidget", function(cm) {
-  addDoc(cm, 200, 3);
-  var widget = document.createElement("pre");
-  widget.innerHTML = "imwidget";
-  widget.style.background = "yellow";
-  cm.addLineWidget(1, widget, {noHScroll: true});
-  cm.setSize(40);
-  is(widget.parentNode.offsetWidth < 42);
-});
-
-testCM("combinedOperations", function(cm) {
-  var place = document.getElementById("testground");
-  var other = CodeMirror(place, {value: "123"});
-  try {
-    cm.operation(function() {
-      cm.addLineClass(0, "wrap", "foo");
-      other.addLineClass(0, "wrap", "foo");
-    });
-    eq(byClassName(cm.getWrapperElement(), "foo").length, 1);
-    eq(byClassName(other.getWrapperElement(), "foo").length, 1);
-    cm.operation(function() {
-      cm.removeLineClass(0, "wrap", "foo");
-      other.removeLineClass(0, "wrap", "foo");
-    });
-    eq(byClassName(cm.getWrapperElement(), "foo").length, 0);
-    eq(byClassName(other.getWrapperElement(), "foo").length, 0);
-  } finally {
-    place.removeChild(other.getWrapperElement());
-  }
-}, {value: "abc"});
-
-testCM("eventOrder", function(cm) {
-  var seen = [];
-  cm.on("change", function() {
-    if (!seen.length) cm.replaceSelection(".");
-    seen.push("change");
-  });
-  cm.on("cursorActivity", function() {
-    cm.replaceSelection("!");
-    seen.push("activity");
-  });
-  cm.replaceSelection("/");
-  eq(seen.join(","), "change,change,activity,change");
-});
-
-testCM("splitSpaces_nonspecial", function(cm) {
-  eq(byClassName(cm.getWrapperElement(), "cm-invalidchar").length, 0);
-}, {
-  specialChars: /[\u00a0]/,
-  value: "spaces ->            <- between"
-});
-
-test("core_rmClass", function() {
-  var node = document.createElement("div");
-  node.className = "foo-bar baz-quux yadda";
-  CodeMirror.rmClass(node, "quux");
-  eq(node.className, "foo-bar baz-quux yadda");
-  CodeMirror.rmClass(node, "baz-quux");
-  eq(node.className, "foo-bar yadda");
-  CodeMirror.rmClass(node, "yadda");
-  eq(node.className, "foo-bar");
-  CodeMirror.rmClass(node, "foo-bar");
-  eq(node.className, "");
-  node.className = " foo ";
-  CodeMirror.rmClass(node, "foo");
-  eq(node.className, "");
-});
-
-test("core_addClass", function() {
-  var node = document.createElement("div");
-  CodeMirror.addClass(node, "a");
-  eq(node.className, "a");
-  CodeMirror.addClass(node, "a");
-  eq(node.className, "a");
-  CodeMirror.addClass(node, "b");
-  eq(node.className, "a b");
-  CodeMirror.addClass(node, "a");
-  CodeMirror.addClass(node, "b");
-  eq(node.className, "a b");
-});
-
-testCM("lineSeparator", function(cm) {
-  eq(cm.lineCount(), 3);
-  eq(cm.getLine(1), "bar\r");
-  eq(cm.getLine(2), "baz\rquux");
-  cm.setOption("lineSeparator", "\r");
-  eq(cm.lineCount(), 5);
-  eq(cm.getLine(4), "quux");
-  eq(cm.getValue(), "foo\rbar\r\rbaz\rquux");
-  eq(cm.getValue("\n"), "foo\nbar\n\nbaz\nquux");
-  cm.setOption("lineSeparator", null);
-  cm.setValue("foo\nbar\r\nbaz\rquux");
-  eq(cm.lineCount(), 4);
-}, {value: "foo\nbar\r\nbaz\rquux",
-    lineSeparator: "\n"});
diff --git a/www/code/codemirror-5.7/test/vim_test.js b/www/code/codemirror-5.7/test/vim_test.js
deleted file mode 100644
index 855cb8825..000000000
--- a/www/code/codemirror-5.7/test/vim_test.js
+++ /dev/null
@@ -1,3955 +0,0 @@
-CodeMirror.Vim.suppressErrorLogging = true;
-
-var code = '' +
-' wOrd1 (#%\n' +
-' word3] \n' +
-'aopop pop 0 1 2 3 4\n' +
-' (a) [b] {c} \n' +
-'int getchar(void) {\n' +
-'  static char buf[BUFSIZ];\n' +
-'  static char *bufp = buf;\n' +
-'  if (n == 0) {  /* buffer is empty */\n' +
-'    n = read(0, buf, sizeof buf);\n' +
-'    bufp = buf;\n' +
-'  }\n' +
-'\n' +
-'  return (--n >= 0) ? (unsigned char) *bufp++ : EOF;\n' +
-' \n' +
-'}\n';
-
-var lines = (function() {
-  lineText = code.split('\n');
-  var ret = [];
-  for (var i = 0; i < lineText.length; i++) {
-    ret[i] = {
-      line: i,
-      length: lineText[i].length,
-      lineText: lineText[i],
-      textStart: /^\s*/.exec(lineText[i])[0].length
-    };
-  }
-  return ret;
-})();
-var endOfDocument = makeCursor(lines.length - 1,
-    lines[lines.length - 1].length);
-var wordLine = lines[0];
-var bigWordLine = lines[1];
-var charLine = lines[2];
-var bracesLine = lines[3];
-var seekBraceLine = lines[4];
-
-var word1 = {
-  start: { line: wordLine.line, ch: 1 },
-  end: { line: wordLine.line, ch: 5 }
-};
-var word2 = {
-  start: { line: wordLine.line, ch: word1.end.ch + 2 },
-  end: { line: wordLine.line, ch: word1.end.ch + 4 }
-};
-var word3 = {
-  start: { line: bigWordLine.line, ch: 1 },
-  end: { line: bigWordLine.line, ch: 5 }
-};
-var bigWord1 = word1;
-var bigWord2 = word2;
-var bigWord3 = {
-  start: { line: bigWordLine.line, ch: 1 },
-  end: { line: bigWordLine.line, ch: 7 }
-};
-var bigWord4 = {
-  start: { line: bigWordLine.line, ch: bigWord1.end.ch + 3 },
-  end: { line: bigWordLine.line, ch: bigWord1.end.ch + 7 }
-};
-
-var oChars = [ { line: charLine.line, ch: 1 },
-    { line: charLine.line, ch: 3 },
-    { line: charLine.line, ch: 7 } ];
-var pChars = [ { line: charLine.line, ch: 2 },
-    { line: charLine.line, ch: 4 },
-    { line: charLine.line, ch: 6 },
-    { line: charLine.line, ch: 8 } ];
-var numChars = [ { line: charLine.line, ch: 10 },
-    { line: charLine.line, ch: 12 },
-    { line: charLine.line, ch: 14 },
-    { line: charLine.line, ch: 16 },
-    { line: charLine.line, ch: 18 }];
-var parens1 = {
-  start: { line: bracesLine.line, ch: 1 },
-  end: { line: bracesLine.line, ch: 3 }
-};
-var squares1 = {
-  start: { line: bracesLine.line, ch: 5 },
-  end: { line: bracesLine.line, ch: 7 }
-};
-var curlys1 = {
-  start: { line: bracesLine.line, ch: 9 },
-  end: { line: bracesLine.line, ch: 11 }
-};
-var seekOutside = {
-  start: { line: seekBraceLine.line, ch: 1 },
-  end: { line: seekBraceLine.line, ch: 16 }
-};
-var seekInside = {
-  start: { line: seekBraceLine.line, ch: 14 },
-  end: { line: seekBraceLine.line, ch: 11 }
-};
-
-function copyCursor(cur) {
-  return { ch: cur.ch, line: cur.line };
-}
-
-function forEach(arr, func) {
-  for (var i = 0; i < arr.length; i++) {
-    func(arr[i], i, arr);
-  }
-}
-
-function testVim(name, run, opts, expectedFail) {
-  var vimOpts = {
-    lineNumbers: true,
-    vimMode: true,
-    showCursorWhenSelecting: true,
-    value: code
-  };
-  for (var prop in opts) {
-    if (opts.hasOwnProperty(prop)) {
-      vimOpts[prop] = opts[prop];
-    }
-  }
-  return test('vim_' + name, function() {
-    var place = document.getElementById("testground");
-    var cm = CodeMirror(place, vimOpts);
-    var vim = CodeMirror.Vim.maybeInitVimState_(cm);
-
-    function doKeysFn(cm) {
-      return function(args) {
-        if (args instanceof Array) {
-          arguments = args;
-        }
-        for (var i = 0; i < arguments.length; i++) {
-          CodeMirror.Vim.handleKey(cm, arguments[i]);
-        }
-      }
-    }
-    function doInsertModeKeysFn(cm) {
-      return function(args) {
-        if (args instanceof Array) { arguments = args; }
-        function executeHandler(handler) {
-          if (typeof handler == 'string') {
-            CodeMirror.commands[handler](cm);
-          } else {
-            handler(cm);
-          }
-          return true;
-        }
-        for (var i = 0; i < arguments.length; i++) {
-          var key = arguments[i];
-          // Find key in keymap and handle.
-          var handled = CodeMirror.lookupKey(key, 'vim-insert', executeHandler);
-          // Record for insert mode.
-          if (handled == "handled" && cm.state.vim.insertMode && arguments[i] != 'Esc') {
-            var lastChange = CodeMirror.Vim.getVimGlobalState_().macroModeState.lastInsertModeChanges;
-            if (lastChange) {
-              lastChange.changes.push(new CodeMirror.Vim.InsertModeKey(key));
-            }
-          }
-        }
-      }
-    }
-    function doExFn(cm) {
-      return function(command) {
-        cm.openDialog = helpers.fakeOpenDialog(command);
-        helpers.doKeys(':');
-      }
-    }
-    function assertCursorAtFn(cm) {
-      return function(line, ch) {
-        var pos;
-        if (ch == null && typeof line.line == 'number') {
-          pos = line;
-        } else {
-          pos = makeCursor(line, ch);
-        }
-        eqPos(pos, cm.getCursor());
-      }
-    }
-    function fakeOpenDialog(result) {
-      return function(text, callback) {
-        return callback(result);
-      }
-    }
-    function fakeOpenNotification(matcher) {
-      return function(text) {
-        matcher(text);
-      }
-    }
-    var helpers = {
-      doKeys: doKeysFn(cm),
-      // Warning: Only emulates keymap events, not character insertions. Use
-      // replaceRange to simulate character insertions.
-      // Keys are in CodeMirror format, NOT vim format.
-      doInsertModeKeys: doInsertModeKeysFn(cm),
-      doEx: doExFn(cm),
-      assertCursorAt: assertCursorAtFn(cm),
-      fakeOpenDialog: fakeOpenDialog,
-      fakeOpenNotification: fakeOpenNotification,
-      getRegisterController: function() {
-        return CodeMirror.Vim.getRegisterController();
-      }
-    }
-    CodeMirror.Vim.resetVimGlobalState_();
-    var successful = false;
-    var savedOpenNotification = cm.openNotification;
-    var savedOpenDialog = cm.openDialog;
-    try {
-      run(cm, vim, helpers);
-      successful = true;
-    } finally {
-      cm.openNotification = savedOpenNotification;
-      cm.openDialog = savedOpenDialog;
-      if (!successful || verbose) {
-        place.style.visibility = "visible";
-      } else {
-        place.removeChild(cm.getWrapperElement());
-      }
-    }
-  }, expectedFail);
-};
-testVim('qq@q', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'q', 'l', 'l', 'q');
-  helpers.assertCursorAt(0,2);
-  helpers.doKeys('@', 'q');
-  helpers.assertCursorAt(0,4);
-}, { value: '            '});
-testVim('@@', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'q', 'l', 'l', 'q');
-  helpers.assertCursorAt(0,2);
-  helpers.doKeys('@', 'q');
-  helpers.assertCursorAt(0,4);
-  helpers.doKeys('@', '@');
-  helpers.assertCursorAt(0,6);
-}, { value: '            '});
-var jumplistScene = ''+
-  'word\n'+
-  '(word)\n'+
-  '{word\n'+
-  'word.\n'+
-  '\n'+
-  'word search\n'+
-  '}word\n'+
-  'word\n'+
-  'word\n';
-function testJumplist(name, keys, endPos, startPos, dialog) {
-  endPos = makeCursor(endPos[0], endPos[1]);
-  startPos = makeCursor(startPos[0], startPos[1]);
-  testVim(name, function(cm, vim, helpers) {
-    CodeMirror.Vim.resetVimGlobalState_();
-    if(dialog)cm.openDialog = helpers.fakeOpenDialog('word');
-    cm.setCursor(startPos);
-    helpers.doKeys.apply(null, keys);
-    helpers.assertCursorAt(endPos);
-  }, {value: jumplistScene});
-};
-testJumplist('jumplist_H', ['H', ''], [5,2], [5,2]);
-testJumplist('jumplist_M', ['M', ''], [2,2], [2,2]);
-testJumplist('jumplist_L', ['L', ''], [2,2], [2,2]);
-testJumplist('jumplist_[[', ['[', '[', ''], [5,2], [5,2]);
-testJumplist('jumplist_]]', [']', ']', ''], [2,2], [2,2]);
-testJumplist('jumplist_G', ['G', ''], [5,2], [5,2]);
-testJumplist('jumplist_gg', ['g', 'g', ''], [5,2], [5,2]);
-testJumplist('jumplist_%', ['%', ''], [1,5], [1,5]);
-testJumplist('jumplist_{', ['{', ''], [1,5], [1,5]);
-testJumplist('jumplist_}', ['}', ''], [1,5], [1,5]);
-testJumplist('jumplist_\'', ['m', 'a', 'h', '\'', 'a', 'h', ''], [1,0], [1,5]);
-testJumplist('jumplist_`', ['m', 'a', 'h', '`', 'a', 'h', ''], [1,5], [1,5]);
-testJumplist('jumplist_*_cachedCursor', ['*', ''], [1,3], [1,3]);
-testJumplist('jumplist_#_cachedCursor', ['#', ''], [1,3], [1,3]);
-testJumplist('jumplist_n', ['#', 'n', ''], [1,1], [2,3]);
-testJumplist('jumplist_N', ['#', 'N', ''], [1,1], [2,3]);
-testJumplist('jumplist_repeat_', ['*', '*', '*', '3', ''], [2,3], [2,3]);
-testJumplist('jumplist_repeat_', ['*', '*', '*', '3', '', '2', ''], [5,0], [2,3]);
-testJumplist('jumplist_repeated_motion', ['3', '*', ''], [2,3], [2,3]);
-testJumplist('jumplist_/', ['/', ''], [2,3], [2,3], 'dialog');
-testJumplist('jumplist_?', ['?', ''], [2,3], [2,3], 'dialog');
-testJumplist('jumplist_skip_delted_mark',
-             ['*', 'n', 'n', 'k', 'd', 'k', '', '', ''],
-             [0,2], [0,2]);
-testJumplist('jumplist_skip_delted_mark',
-             ['*', 'n', 'n', 'k', 'd', 'k', '', '', ''],
-             [1,0], [0,2]);
-
-/**
- * @param name Name of the test
- * @param keys An array of keys or a string with a single key to simulate.
- * @param endPos The expected end position of the cursor.
- * @param startPos The position the cursor should start at, defaults to 0, 0.
- */
-function testMotion(name, keys, endPos, startPos) {
-  testVim(name, function(cm, vim, helpers) {
-    if (!startPos) {
-      startPos = { line: 0, ch: 0 };
-    }
-    cm.setCursor(startPos);
-    helpers.doKeys(keys);
-    helpers.assertCursorAt(endPos);
-  });
-};
-
-function makeCursor(line, ch) {
-  return { line: line, ch: ch };
-};
-
-function offsetCursor(cur, offsetLine, offsetCh) {
-  return { line: cur.line + offsetLine, ch: cur.ch + offsetCh };
-};
-
-// Motion tests
-testMotion('|', '|', makeCursor(0, 0), makeCursor(0,4));
-testMotion('|_repeat', ['3', '|'], makeCursor(0, 2), makeCursor(0,4));
-testMotion('h', 'h', makeCursor(0, 0), word1.start);
-testMotion('h_repeat', ['3', 'h'], offsetCursor(word1.end, 0, -3), word1.end);
-testMotion('l', 'l', makeCursor(0, 1));
-testMotion('l_repeat', ['2', 'l'], makeCursor(0, 2));
-testMotion('j', 'j', offsetCursor(word1.end, 1, 0), word1.end);
-testMotion('j_repeat', ['2', 'j'], offsetCursor(word1.end, 2, 0), word1.end);
-testMotion('j_repeat_clip', ['1000', 'j'], endOfDocument);
-testMotion('k', 'k', offsetCursor(word3.end, -1, 0), word3.end);
-testMotion('k_repeat', ['2', 'k'], makeCursor(0, 4), makeCursor(2, 4));
-testMotion('k_repeat_clip', ['1000', 'k'], makeCursor(0, 4), makeCursor(2, 4));
-testMotion('w', 'w', word1.start);
-testMotion('w_multiple_newlines_no_space', 'w', makeCursor(12, 2), makeCursor(11, 2));
-testMotion('w_multiple_newlines_with_space', 'w', makeCursor(14, 0), makeCursor(12, 51));
-testMotion('w_repeat', ['2', 'w'], word2.start);
-testMotion('w_wrap', ['w'], word3.start, word2.start);
-testMotion('w_endOfDocument', 'w', endOfDocument, endOfDocument);
-testMotion('w_start_to_end', ['1000', 'w'], endOfDocument, makeCursor(0, 0));
-testMotion('W', 'W', bigWord1.start);
-testMotion('W_repeat', ['2', 'W'], bigWord3.start, bigWord1.start);
-testMotion('e', 'e', word1.end);
-testMotion('e_repeat', ['2', 'e'], word2.end);
-testMotion('e_wrap', 'e', word3.end, word2.end);
-testMotion('e_endOfDocument', 'e', endOfDocument, endOfDocument);
-testMotion('e_start_to_end', ['1000', 'e'], endOfDocument, makeCursor(0, 0));
-testMotion('b', 'b', word3.start, word3.end);
-testMotion('b_repeat', ['2', 'b'], word2.start, word3.end);
-testMotion('b_wrap', 'b', word2.start, word3.start);
-testMotion('b_startOfDocument', 'b', makeCursor(0, 0), makeCursor(0, 0));
-testMotion('b_end_to_start', ['1000', 'b'], makeCursor(0, 0), endOfDocument);
-testMotion('ge', ['g', 'e'], word2.end, word3.end);
-testMotion('ge_repeat', ['2', 'g', 'e'], word1.end, word3.start);
-testMotion('ge_wrap', ['g', 'e'], word2.end, word3.start);
-testMotion('ge_startOfDocument', ['g', 'e'], makeCursor(0, 0),
-    makeCursor(0, 0));
-testMotion('ge_end_to_start', ['1000', 'g', 'e'], makeCursor(0, 0), endOfDocument);
-testMotion('gg', ['g', 'g'], makeCursor(lines[0].line, lines[0].textStart),
-    makeCursor(3, 1));
-testMotion('gg_repeat', ['3', 'g', 'g'],
-    makeCursor(lines[2].line, lines[2].textStart));
-testMotion('G', 'G',
-    makeCursor(lines[lines.length - 1].line, lines[lines.length - 1].textStart),
-    makeCursor(3, 1));
-testMotion('G_repeat', ['3', 'G'], makeCursor(lines[2].line,
-    lines[2].textStart));
-// TODO: Make the test code long enough to test Ctrl-F and Ctrl-B.
-testMotion('0', '0', makeCursor(0, 0), makeCursor(0, 8));
-testMotion('^', '^', makeCursor(0, lines[0].textStart), makeCursor(0, 8));
-testMotion('+', '+', makeCursor(1, lines[1].textStart), makeCursor(0, 8));
-testMotion('-', '-', makeCursor(0, lines[0].textStart), makeCursor(1, 4));
-testMotion('_', ['6','_'], makeCursor(5, lines[5].textStart), makeCursor(0, 8));
-testMotion('$', '$', makeCursor(0, lines[0].length - 1), makeCursor(0, 1));
-testMotion('$_repeat', ['2', '$'], makeCursor(1, lines[1].length - 1),
-    makeCursor(0, 3));
-testMotion('f', ['f', 'p'], pChars[0], makeCursor(charLine.line, 0));
-testMotion('f_repeat', ['2', 'f', 'p'], pChars[2], pChars[0]);
-testMotion('f_num', ['f', '2'], numChars[2], makeCursor(charLine.line, 0));
-testMotion('t', ['t','p'], offsetCursor(pChars[0], 0, -1),
-    makeCursor(charLine.line, 0));
-testMotion('t_repeat', ['2', 't', 'p'], offsetCursor(pChars[2], 0, -1),
-    pChars[0]);
-testMotion('F', ['F', 'p'], pChars[0], pChars[1]);
-testMotion('F_repeat', ['2', 'F', 'p'], pChars[0], pChars[2]);
-testMotion('T', ['T', 'p'], offsetCursor(pChars[0], 0, 1), pChars[1]);
-testMotion('T_repeat', ['2', 'T', 'p'], offsetCursor(pChars[0], 0, 1), pChars[2]);
-testMotion('%_parens', ['%'], parens1.end, parens1.start);
-testMotion('%_squares', ['%'], squares1.end, squares1.start);
-testMotion('%_braces', ['%'], curlys1.end, curlys1.start);
-testMotion('%_seek_outside', ['%'], seekOutside.end, seekOutside.start);
-testMotion('%_seek_inside', ['%'], seekInside.end, seekInside.start);
-testVim('%_seek_skip', function(cm, vim, helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys(['%']);
-  helpers.assertCursorAt(0,9);
-}, {value:'01234"("()'});
-testVim('%_skip_string', function(cm, vim, helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys(['%']);
-  helpers.assertCursorAt(0,4);
-  cm.setCursor(0,2);
-  helpers.doKeys(['%']);
-  helpers.assertCursorAt(0,0);
-}, {value:'(")")'});
-testVim('%_skip_comment', function(cm, vim, helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys(['%']);
-  helpers.assertCursorAt(0,6);
-  cm.setCursor(0,3);
-  helpers.doKeys(['%']);
-  helpers.assertCursorAt(0,0);
-}, {value:'(/*)*/)'});
-// Make sure that moving down after going to the end of a line always leaves you
-// at the end of a line, but preserves the offset in other cases
-testVim('Changing lines after Eol operation', function(cm, vim, helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys(['$']);
-  helpers.doKeys(['j']);
-  // After moving to Eol and then down, we should be at Eol of line 2
-  helpers.assertCursorAt({ line: 1, ch: lines[1].length - 1 });
-  helpers.doKeys(['j']);
-  // After moving down, we should be at Eol of line 3
-  helpers.assertCursorAt({ line: 2, ch: lines[2].length - 1 });
-  helpers.doKeys(['h']);
-  helpers.doKeys(['j']);
-  // After moving back one space and then down, since line 4 is shorter than line 2, we should
-  // be at Eol of line 2 - 1
-  helpers.assertCursorAt({ line: 3, ch: lines[3].length - 1 });
-  helpers.doKeys(['j']);
-  helpers.doKeys(['j']);
-  // After moving down again, since line 3 has enough characters, we should be back to the
-  // same place we were at on line 1
-  helpers.assertCursorAt({ line: 5, ch: lines[2].length - 2 });
-});
-//making sure gj and gk recover from clipping
-testVim('gj_gk_clipping', function(cm,vim,helpers){
-  cm.setCursor(0, 1);
-  helpers.doKeys('g','j','g','j');
-  helpers.assertCursorAt(2, 1);
-  helpers.doKeys('g','k','g','k');
-  helpers.assertCursorAt(0, 1);
-},{value: 'line 1\n\nline 2'});
-//testing a mix of j/k and gj/gk
-testVim('j_k_and_gj_gk', function(cm,vim,helpers){
-  cm.setSize(120);
-  cm.setCursor(0, 0);
-  //go to the last character on the first line
-  helpers.doKeys('$');
-  //move up/down on the column within the wrapped line
-  //side-effect: cursor is not locked to eol anymore
-  helpers.doKeys('g','k');
-  var cur=cm.getCursor();
-  eq(cur.line,0);
-  is((cur.ch<176),'gk didn\'t move cursor back (1)');
-  helpers.doKeys('g','j');
-  helpers.assertCursorAt(0, 176);
-  //should move to character 177 on line 2 (j/k preserve character index within line)
-  helpers.doKeys('j');
-  //due to different line wrapping, the cursor can be on a different screen-x now
-  //gj and gk preserve screen-x on movement, much like moveV
-  helpers.doKeys('3','g','k');
-  cur=cm.getCursor();
-  eq(cur.line,1);
-  is((cur.ch<176),'gk didn\'t move cursor back (2)');
-  helpers.doKeys('g','j','2','g','j');
-  //should return to the same character-index
-  helpers.doKeys('k');
-  helpers.assertCursorAt(0, 176);
-},{ lineWrapping:true, value: 'This line is intentially long to test movement of gj and gk over wrapped lines. I will start on the end of this line, then make a step up and back to set the origin for j and k.\nThis line is supposed to be even longer than the previous. I will jump here and make another wiggle with gj and gk, before I jump back to the line above. Both wiggles should not change my cursor\'s target character but both j/k and gj/gk change each other\'s reference position.'});
-testVim('gj_gk', function(cm, vim, helpers) {
-  if (phantom) return;
-  cm.setSize(120);
-  // Test top of document edge case.
-  cm.setCursor(0, 4);
-  helpers.doKeys('g', 'j');
-  helpers.doKeys('10', 'g', 'k');
-  helpers.assertCursorAt(0, 4);
-
-  // Test moving down preserves column position.
-  helpers.doKeys('g', 'j');
-  var pos1 = cm.getCursor();
-  var expectedPos2 = { line: 0, ch: (pos1.ch - 4) * 2 + 4};
-  helpers.doKeys('g', 'j');
-  helpers.assertCursorAt(expectedPos2);
-
-  // Move to the last character
-  cm.setCursor(0, 0);
-  // Move left to reset HSPos
-  helpers.doKeys('h');
-  // Test bottom of document edge case.
-  helpers.doKeys('100', 'g', 'j');
-  var endingPos = cm.getCursor();
-  is(endingPos != 0, 'gj should not be on wrapped line 0');
-  var topLeftCharCoords = cm.charCoords(makeCursor(0, 0));
-  var endingCharCoords = cm.charCoords(endingPos);
-  is(topLeftCharCoords.left == endingCharCoords.left, 'gj should end up on column 0');
-},{ lineNumbers: false, lineWrapping:true, value: 'Thislineisintentiallylongtotestmovementofgjandgkoverwrappedlines.' });
-testVim('}', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('}');
-  helpers.assertCursorAt(1, 0);
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', '}');
-  helpers.assertCursorAt(4, 0);
-  cm.setCursor(0, 0);
-  helpers.doKeys('6', '}');
-  helpers.assertCursorAt(5, 0);
-}, { value: 'a\n\nb\nc\n\nd' });
-testVim('{', function(cm, vim, helpers) {
-  cm.setCursor(5, 0);
-  helpers.doKeys('{');
-  helpers.assertCursorAt(4, 0);
-  cm.setCursor(5, 0);
-  helpers.doKeys('2', '{');
-  helpers.assertCursorAt(1, 0);
-  cm.setCursor(5, 0);
-  helpers.doKeys('6', '{');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'a\n\nb\nc\n\nd' });
-testVim('paragraph_motions', function(cm, vim, helpers) {
-  cm.setCursor(10, 0);
-  helpers.doKeys('{');
-  helpers.assertCursorAt(4, 0);
-  helpers.doKeys('{');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('2', '}');
-  helpers.assertCursorAt(7, 0);
-  helpers.doKeys('2', '}');
-  helpers.assertCursorAt(16, 0);
-
-  cm.setCursor(9, 0);
-  helpers.doKeys('}');
-  helpers.assertCursorAt(14, 0);
-
-  cm.setCursor(6, 0);
-  helpers.doKeys('}');
-  helpers.assertCursorAt(7, 0);
-
-  // ip inside empty space
-  cm.setCursor(10, 0);
-  helpers.doKeys('v', 'i', 'p');
-  eqPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqPos(Pos(12, 0), cm.getCursor('head'));
-  helpers.doKeys('i', 'p');
-  eqPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqPos(Pos(13, 1), cm.getCursor('head'));
-  helpers.doKeys('2', 'i', 'p');
-  eqPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqPos(Pos(16, 1), cm.getCursor('head'));
-
-  // should switch to visualLine mode
-  cm.setCursor(14, 0);
-  helpers.doKeys('', 'v', 'i', 'p');
-  helpers.assertCursorAt(14, 0);
-
-  cm.setCursor(14, 0);
-  helpers.doKeys('', 'V', 'i', 'p');
-  eqPos(Pos(16, 1), cm.getCursor('head'));
-
-  // ap inside empty space
-  cm.setCursor(10, 0);
-  helpers.doKeys('', 'v', 'a', 'p');
-  eqPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqPos(Pos(13, 1), cm.getCursor('head'));
-  helpers.doKeys('a', 'p');
-  eqPos(Pos(7, 0), cm.getCursor('anchor'));
-  eqPos(Pos(16, 1), cm.getCursor('head'));
-
-  cm.setCursor(13, 0);
-  helpers.doKeys('v', 'a', 'p');
-  eqPos(Pos(13, 0), cm.getCursor('anchor'));
-  eqPos(Pos(14, 0), cm.getCursor('head'));
-
-  cm.setCursor(16, 0);
-  helpers.doKeys('v', 'a', 'p');
-  eqPos(Pos(14, 0), cm.getCursor('anchor'));
-  eqPos(Pos(16, 1), cm.getCursor('head'));
-
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', 'a', 'p');
-  eqPos(Pos(0, 0), cm.getCursor('anchor'));
-  eqPos(Pos(4, 0), cm.getCursor('head'));
-
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'i', 'p');
-  var register = helpers.getRegisterController().getRegister();
-  eq('a\na\n', register.toString());
-  is(register.linewise);
-  helpers.doKeys('3', 'j', 'p');
-  helpers.doKeys('y', 'i', 'p');
-  is(register.linewise);
-  eq('b\na\na\nc\n', register.toString());
-}, { value: 'a\na\n\n\n\nb\nc\n\n\n\n\n\n\nd\n\ne\nf' });
-
-// Operator tests
-testVim('dl', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 0);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'l');
-  eq('word1 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' ', register.toString());
-  is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
-}, { value: ' word1 ' });
-testVim('dl_eol', function(cm, vim, helpers) {
-  cm.setCursor(0, 6);
-  helpers.doKeys('d', 'l');
-  eq(' word1', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' ', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 5);
-}, { value: ' word1 ' });
-testVim('dl_repeat', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 0);
-  cm.setCursor(curStart);
-  helpers.doKeys('2', 'd', 'l');
-  eq('ord1 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' w', register.toString());
-  is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
-}, { value: ' word1 ' });
-testVim('dh', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'h');
-  eq(' wrd1 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('o', register.toString());
-  is(!register.linewise);
-  eqPos(offsetCursor(curStart, 0 , -1), cm.getCursor());
-}, { value: ' word1 ' });
-testVim('dj', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'j');
-  eq(' word3', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' word1\nword2\n', register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, 1);
-}, { value: ' word1\nword2\n word3' });
-testVim('dj_end_of_document', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'j');
-  eq(' word1 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
-}, { value: ' word1 ' });
-testVim('dk', function(cm, vim, helpers) {
-  var curStart = makeCursor(1, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'k');
-  eq(' word3', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' word1\nword2\n', register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, 1);
-}, { value: ' word1\nword2\n word3' });
-testVim('dk_start_of_document', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'k');
-  eq(' word1 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
-}, { value: ' word1 ' });
-testVim('dw_space', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 0);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'w');
-  eq('word1 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(' ', register.toString());
-  is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
-}, { value: ' word1 ' });
-testVim('dw_word', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'w');
-  eq(' word2', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1 ', register.toString());
-  is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
-}, { value: ' word1 word2' });
-testVim('dw_unicode_word', function(cm, vim, helpers) {
-  helpers.doKeys('d', 'w');
-  eq(cm.getValue().length, 10);
-  helpers.doKeys('d', 'w');
-  eq(cm.getValue().length, 6);
-  helpers.doKeys('d', 'w');
-  eq(cm.getValue().length, 5);
-  helpers.doKeys('d', 'e');
-  eq(cm.getValue().length, 2);
-}, { value: '  \u0562\u0561\u0580\u0587\xbbe\xb5g  ' });
-testVim('dw_only_word', function(cm, vim, helpers) {
-  // Test that if there is only 1 word left, dw deletes till the end of the
-  // line.
-  cm.setCursor(0, 1);
-  helpers.doKeys('d', 'w');
-  eq(' ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1 ', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
-}, { value: ' word1 ' });
-testVim('dw_eol', function(cm, vim, helpers) {
-  // Assert that dw does not delete the newline if last word to delete is at end
-  // of line.
-  cm.setCursor(0, 1);
-  helpers.doKeys('d', 'w');
-  eq(' \nword2', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
-}, { value: ' word1\nword2' });
-testVim('dw_eol_with_multiple_newlines', function(cm, vim, helpers) {
-  // Assert that dw does not delete the newline if last word to delete is at end
-  // of line and it is followed by multiple newlines.
-  cm.setCursor(0, 1);
-  helpers.doKeys('d', 'w');
-  eq(' \n\nword2', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
-}, { value: ' word1\n\nword2' });
-testVim('dw_empty_line_followed_by_whitespace', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('  \nword', cm.getValue());
-}, { value: '\n  \nword' });
-testVim('dw_empty_line_followed_by_word', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('word', cm.getValue());
-}, { value: '\nword' });
-testVim('dw_empty_line_followed_by_empty_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('\n', cm.getValue());
-}, { value: '\n\n' });
-testVim('dw_whitespace_followed_by_whitespace', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('\n   \n', cm.getValue());
-}, { value: '  \n   \n' });
-testVim('dw_whitespace_followed_by_empty_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('\n\n', cm.getValue());
-}, { value: '  \n\n' });
-testVim('dw_word_whitespace_word', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'w');
-  eq('\n   \nword2', cm.getValue());
-}, { value: 'word1\n   \nword2'})
-testVim('dw_end_of_document', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('d', 'w');
-  eq('\nab', cm.getValue());
-}, { value: '\nabc' });
-testVim('dw_repeat', function(cm, vim, helpers) {
-  // Assert that dw does delete newline if it should go to the next line, and
-  // that repeat works properly.
-  cm.setCursor(0, 1);
-  helpers.doKeys('d', '2', 'w');
-  eq(' ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1\nword2', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 0);
-}, { value: ' word1\nword2' });
-testVim('de_word_start_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'e');
-  eq('\n\n', cm.getValue());
-}, { value: 'word\n\n' });
-testVim('de_word_end_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  helpers.doKeys('d', 'e');
-  eq('wor', cm.getValue());
-}, { value: 'word\n\n\n' });
-testVim('de_whitespace_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'e');
-  eq('', cm.getValue());
-}, { value: '   \n\n\n' });
-testVim('de_end_of_document', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('d', 'e');
-  eq('\nab', cm.getValue());
-}, { value: '\nabc' });
-testVim('db_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('d', 'b');
-  eq('\n\n', cm.getValue());
-}, { value: '\n\n\n' });
-testVim('db_word_start_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('d', 'b');
-  eq('\nword', cm.getValue());
-}, { value: '\n\nword' });
-testVim('db_word_end_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(2, 3);
-  helpers.doKeys('d', 'b');
-  eq('\n\nd', cm.getValue());
-}, { value: '\n\nword' });
-testVim('db_whitespace_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('d', 'b');
-  eq('', cm.getValue());
-}, { value: '\n   \n' });
-testVim('db_start_of_document', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'b');
-  eq('abc\n', cm.getValue());
-}, { value: 'abc\n' });
-testVim('dge_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doKeys('d', 'g', 'e');
-  // Note: In real VIM the result should be '', but it's not quite consistent,
-  // since 2 newlines are deleted. But in the similar case of word\n\n, only
-  // 1 newline is deleted. We'll diverge from VIM's behavior since it's much
-  // easier this way.
-  eq('\n', cm.getValue());
-}, { value: '\n\n' });
-testVim('dge_word_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doKeys('d', 'g', 'e');
-  eq('wor\n', cm.getValue());
-}, { value: 'word\n\n'});
-testVim('dge_whitespace_and_empty_lines', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('d', 'g', 'e');
-  eq('', cm.getValue());
-}, { value: '\n  \n' });
-testVim('dge_start_of_document', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', 'g', 'e');
-  eq('bc\n', cm.getValue());
-}, { value: 'abc\n' });
-testVim('d_inclusive', function(cm, vim, helpers) {
-  // Assert that when inclusive is set, the character the cursor is on gets
-  // deleted too.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
-  helpers.doKeys('d', 'e');
-  eq('  ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1', register.toString());
-  is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
-}, { value: ' word1 ' });
-testVim('d_reverse', function(cm, vim, helpers) {
-  // Test that deleting in reverse works.
-  cm.setCursor(1, 0);
-  helpers.doKeys('d', 'b');
-  eq(' word2 ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1\n', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 1);
-}, { value: ' word1\nword2 ' });
-testVim('dd', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 1, ch: 0 });
-  var expectedLineCount = cm.lineCount() - 1;
-  helpers.doKeys('d', 'd');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, lines[1].textStart);
-});
-testVim('dd_prefix_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 2, ch: 0 });
-  var expectedLineCount = cm.lineCount() - 2;
-  helpers.doKeys('2', 'd', 'd');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, lines[2].textStart);
-});
-testVim('dd_motion_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 2, ch: 0 });
-  var expectedLineCount = cm.lineCount() - 2;
-  helpers.doKeys('d', '2', 'd');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, lines[2].textStart);
-});
-testVim('dd_multiply_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 6, ch: 0 });
-  var expectedLineCount = cm.lineCount() - 6;
-  helpers.doKeys('2', 'd', '3', 'd');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  is(register.linewise);
-  helpers.assertCursorAt(0, lines[6].textStart);
-});
-testVim('dd_lastline', function(cm, vim, helpers) {
-  cm.setCursor(cm.lineCount(), 0);
-  var expectedLineCount = cm.lineCount() - 1;
-  helpers.doKeys('d', 'd');
-  eq(expectedLineCount, cm.lineCount());
-  helpers.assertCursorAt(cm.lineCount() - 1, 0);
-});
-testVim('dd_only_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  var expectedRegister = cm.getValue() + "\n";
-  helpers.doKeys('d','d');
-  eq(1, cm.lineCount());
-  eq('', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedRegister, register.toString());
-}, { value: "thisistheonlyline" });
-// Yank commands should behave the exact same as d commands, expect that nothing
-// gets deleted.
-testVim('yw_repeat', function(cm, vim, helpers) {
-  // Assert that yw does yank newline if it should go to the next line, and
-  // that repeat works properly.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
-  helpers.doKeys('y', '2', 'w');
-  eq(' word1\nword2', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1\nword2', register.toString());
-  is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
-}, { value: ' word1\nword2' });
-testVim('yy_multiply_repeat', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 6, ch: 0 });
-  var expectedLineCount = cm.lineCount();
-  helpers.doKeys('2', 'y', '3', 'y');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  is(register.linewise);
-  eqPos(curStart, cm.getCursor());
-});
-// Change commands behave like d commands except that it also enters insert
-// mode. In addition, when the change is linewise, an additional newline is
-// inserted so that insert mode starts on that line.
-testVim('cw', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', '2', 'w');
-  eq(' word3', cm.getValue());
-  helpers.assertCursorAt(0, 0);
-}, { value: 'word1 word2 word3'});
-testVim('cw_repeat', function(cm, vim, helpers) {
-  // Assert that cw does delete newline if it should go to the next line, and
-  // that repeat works properly.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
-  helpers.doKeys('c', '2', 'w');
-  eq(' ', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('word1\nword2', register.toString());
-  is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: ' word1\nword2' });
-testVim('cc_multiply_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedBuffer = cm.getRange({ line: 0, ch: 0 },
-    { line: 6, ch: 0 });
-  var expectedLineCount = cm.lineCount() - 5;
-  helpers.doKeys('2', 'c', '3', 'c');
-  eq(expectedLineCount, cm.lineCount());
-  var register = helpers.getRegisterController().getRegister();
-  eq(expectedBuffer, register.toString());
-  is(register.linewise);
-  eq('vim-insert', cm.getOption('keyMap'));
-});
-testVim('ct', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('c', 't', 'w');
-  eq('  word1  word3', cm.getValue());
-  helpers.doKeys('', 'c', '|');
-  eq(' word3', cm.getValue());
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('', '2', 'u', 'w', 'h');
-  helpers.doKeys('c', '2', 'g', 'e');
-  eq('  wordword3', cm.getValue());
-}, { value: '  word1  word2  word3'});
-testVim('cc_should_not_append_to_document', function(cm, vim, helpers) {
-  var expectedLineCount = cm.lineCount();
-  cm.setCursor(cm.lastLine(), 0);
-  helpers.doKeys('c', 'c');
-  eq(expectedLineCount, cm.lineCount());
-});
-function fillArray(val, times) {
-  var arr = [];
-  for (var i = 0; i < times; i++) {
-    arr.push(val);
-  }
-  return arr;
-}
-testVim('c_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('', '2', 'j', 'l', 'l', 'l', 'c');
-  var replacement = fillArray('hello', 3);
-  cm.replaceSelections(replacement);
-  eq('1hello\n5hello\nahellofg', cm.getValue());
-  helpers.doKeys('');
-  cm.setCursor(2, 3);
-  helpers.doKeys('', '2', 'k', 'h', 'C');
-  replacement = fillArray('world', 3);
-  cm.replaceSelections(replacement);
-  eq('1hworld\n5hworld\nahworld', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-testVim('c_visual_block_replay', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('', '2', 'j', 'l', 'c');
-  var replacement = fillArray('fo', 3);
-  cm.replaceSelections(replacement);
-  eq('1fo4\n5fo8\nafodefg', cm.getValue());
-  helpers.doKeys('');
-  cm.setCursor(0, 0);
-  helpers.doKeys('.');
-  eq('foo4\nfoo8\nfoodefg', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-
-testVim('d_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('', '2', 'j', 'l', 'l', 'l', 'd');
-  eq('1\n5\nafg', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-testVim('D_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('', '2', 'j', 'l', 'D');
-  eq('1\n5\na', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-
-// Swapcase commands edit in place and do not modify registers.
-testVim('g~w_repeat', function(cm, vim, helpers) {
-  // Assert that dw does delete newline if it should go to the next line, and
-  // that repeat works properly.
-  var curStart = makeCursor(0, 1);
-  cm.setCursor(curStart);
-  helpers.doKeys('g', '~', '2', 'w');
-  eq(' WORD1\nWORD2', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
-}, { value: ' word1\nword2' });
-testVim('g~g~', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  var expectedLineCount = cm.lineCount();
-  var expectedValue = cm.getValue().toUpperCase();
-  helpers.doKeys('2', 'g', '~', '3', 'g', '~');
-  eq(expectedValue, cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
-}, { value: ' word1\nword2\nword3\nword4\nword5\nword6' });
-testVim('gu_and_gU', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 7);
-  var value = cm.getValue();
-  cm.setCursor(curStart);
-  helpers.doKeys('2', 'g', 'U', 'w');
-  eq(cm.getValue(), 'wa wb xX WC wd');
-  eqPos(curStart, cm.getCursor());
-  helpers.doKeys('2', 'g', 'u', 'w');
-  eq(cm.getValue(), value);
-
-  helpers.doKeys('2', 'g', 'U', 'B');
-  eq(cm.getValue(), 'wa WB Xx wc wd');
-  eqPos(makeCursor(0, 3), cm.getCursor());
-
-  cm.setCursor(makeCursor(0, 4));
-  helpers.doKeys('g', 'u', 'i', 'w');
-  eq(cm.getValue(), 'wa wb Xx wc wd');
-  eqPos(makeCursor(0, 3), cm.getCursor());
-
-  // TODO: support gUgU guu
-  // eqPos(makeCursor(0, 0), cm.getCursor());
-
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-}, { value: 'wa wb xx wc wd' });
-testVim('visual_block_~', function(cm, vim, helpers) {
-  cm.setCursor(1, 1);
-  helpers.doKeys('', 'l', 'l', 'j', '~');
-  helpers.assertCursorAt(1, 1);
-  eq('hello\nwoRLd\naBCDe', cm.getValue());
-  cm.setCursor(2, 0);
-  helpers.doKeys('v', 'l', 'l', '~');
-  helpers.assertCursorAt(2, 0);
-  eq('hello\nwoRLd\nAbcDe', cm.getValue());
-},{value: 'hello\nwOrld\nabcde' });
-testVim('._swapCase_visualBlock', function(cm, vim, helpers) {
-  helpers.doKeys('', 'j', 'j', 'l', '~');
-  cm.setCursor(0, 3);
-  helpers.doKeys('.');
-  eq('HelLO\nWorLd\nAbcdE', cm.getValue());
-},{value: 'hEllo\nwOrlD\naBcDe' });
-testVim('._delete_visualBlock', function(cm, vim, helpers) {
-  helpers.doKeys('', 'j', 'x');
-  eq('ive\ne\nsome\nsugar', cm.getValue());
-  helpers.doKeys('.');
-  eq('ve\n\nsome\nsugar', cm.getValue());
-  helpers.doKeys('j', 'j', '.');
-  eq('ve\n\nome\nugar', cm.getValue());
-  helpers.doKeys('u', '', '.');
-  eq('ve\n\nme\ngar', cm.getValue());
-},{value: 'give\nme\nsome\nsugar' });
-testVim('>{motion}', function(cm, vim, helpers) {
-  cm.setCursor(1, 3);
-  var expectedLineCount = cm.lineCount();
-  var expectedValue = '   word1\n  word2\nword3 ';
-  helpers.doKeys('>', 'k');
-  eq(expectedValue, cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
-}, { value: ' word1\nword2\nword3 ', indentUnit: 2 });
-testVim('>>', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedLineCount = cm.lineCount();
-  var expectedValue = '   word1\n  word2\nword3 ';
-  helpers.doKeys('2', '>', '>');
-  eq(expectedValue, cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
-}, { value: ' word1\nword2\nword3 ', indentUnit: 2 });
-testVim('<{motion}', function(cm, vim, helpers) {
-  cm.setCursor(1, 3);
-  var expectedLineCount = cm.lineCount();
-  var expectedValue = ' word1\nword2\nword3 ';
-  helpers.doKeys('<', 'k');
-  eq(expectedValue, cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 1);
-}, { value: '   word1\n  word2\nword3 ', indentUnit: 2 });
-testVim('<<', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  var expectedLineCount = cm.lineCount();
-  var expectedValue = ' word1\nword2\nword3 ';
-  helpers.doKeys('2', '<', '<');
-  eq(expectedValue, cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 1);
-}, { value: '   word1\n  word2\nword3 ', indentUnit: 2 });
-
-// Edit tests
-function testEdit(name, before, pos, edit, after) {
-  return testVim(name, function(cm, vim, helpers) {
-             var ch = before.search(pos)
-             var line = before.substring(0, ch).split('\n').length - 1;
-             if (line) {
-               ch = before.substring(0, ch).split('\n').pop().length;
-             }
-             cm.setCursor(line, ch);
-             helpers.doKeys.apply(this, edit.split(''));
-             eq(after, cm.getValue());
-           }, {value: before});
-}
-
-// These Delete tests effectively cover word-wise Change, Visual & Yank.
-// Tabs are used as differentiated whitespace to catch edge cases.
-// Normal word:
-testEdit('diw_mid_spc', 'foo \tbAr\t baz', /A/, 'diw', 'foo \t\t baz');
-testEdit('daw_mid_spc', 'foo \tbAr\t baz', /A/, 'daw', 'foo \tbaz');
-testEdit('diw_mid_punct', 'foo \tbAr.\t baz', /A/, 'diw', 'foo \t.\t baz');
-testEdit('daw_mid_punct', 'foo \tbAr.\t baz', /A/, 'daw', 'foo.\t baz');
-testEdit('diw_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'diw', 'foo \t,.\t baz');
-testEdit('daw_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'daw', 'foo \t,.\t baz');
-testEdit('diw_start_spc', 'bAr \tbaz', /A/, 'diw', ' \tbaz');
-testEdit('daw_start_spc', 'bAr \tbaz', /A/, 'daw', 'baz');
-testEdit('diw_start_punct', 'bAr. \tbaz', /A/, 'diw', '. \tbaz');
-testEdit('daw_start_punct', 'bAr. \tbaz', /A/, 'daw', '. \tbaz');
-testEdit('diw_end_spc', 'foo \tbAr', /A/, 'diw', 'foo \t');
-testEdit('daw_end_spc', 'foo \tbAr', /A/, 'daw', 'foo');
-testEdit('diw_end_punct', 'foo \tbAr.', /A/, 'diw', 'foo \t.');
-testEdit('daw_end_punct', 'foo \tbAr.', /A/, 'daw', 'foo.');
-// Big word:
-testEdit('diW_mid_spc', 'foo \tbAr\t baz', /A/, 'diW', 'foo \t\t baz');
-testEdit('daW_mid_spc', 'foo \tbAr\t baz', /A/, 'daW', 'foo \tbaz');
-testEdit('diW_mid_punct', 'foo \tbAr.\t baz', /A/, 'diW', 'foo \t\t baz');
-testEdit('daW_mid_punct', 'foo \tbAr.\t baz', /A/, 'daW', 'foo \tbaz');
-testEdit('diW_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'diW', 'foo \t\t baz');
-testEdit('daW_mid_punct2', 'foo \t,bAr.\t baz', /A/, 'daW', 'foo \tbaz');
-testEdit('diW_start_spc', 'bAr\t baz', /A/, 'diW', '\t baz');
-testEdit('daW_start_spc', 'bAr\t baz', /A/, 'daW', 'baz');
-testEdit('diW_start_punct', 'bAr.\t baz', /A/, 'diW', '\t baz');
-testEdit('daW_start_punct', 'bAr.\t baz', /A/, 'daW', 'baz');
-testEdit('diW_end_spc', 'foo \tbAr', /A/, 'diW', 'foo \t');
-testEdit('daW_end_spc', 'foo \tbAr', /A/, 'daW', 'foo');
-testEdit('diW_end_punct', 'foo \tbAr.', /A/, 'diW', 'foo \t');
-testEdit('daW_end_punct', 'foo \tbAr.', /A/, 'daW', 'foo');
-// Deleting text objects
-//    Open and close on same line
-testEdit('di(_open_spc', 'foo (bAr) baz', /\(/, 'di(', 'foo () baz');
-testEdit('di)_open_spc', 'foo (bAr) baz', /\(/, 'di)', 'foo () baz');
-testEdit('dib_open_spc', 'foo (bAr) baz', /\(/, 'dib', 'foo () baz');
-testEdit('da(_open_spc', 'foo (bAr) baz', /\(/, 'da(', 'foo  baz');
-testEdit('da)_open_spc', 'foo (bAr) baz', /\(/, 'da)', 'foo  baz');
-
-testEdit('di(_middle_spc', 'foo (bAr) baz', /A/, 'di(', 'foo () baz');
-testEdit('di)_middle_spc', 'foo (bAr) baz', /A/, 'di)', 'foo () baz');
-testEdit('da(_middle_spc', 'foo (bAr) baz', /A/, 'da(', 'foo  baz');
-testEdit('da)_middle_spc', 'foo (bAr) baz', /A/, 'da)', 'foo  baz');
-
-testEdit('di(_close_spc', 'foo (bAr) baz', /\)/, 'di(', 'foo () baz');
-testEdit('di)_close_spc', 'foo (bAr) baz', /\)/, 'di)', 'foo () baz');
-testEdit('da(_close_spc', 'foo (bAr) baz', /\)/, 'da(', 'foo  baz');
-testEdit('da)_close_spc', 'foo (bAr) baz', /\)/, 'da)', 'foo  baz');
-
-//  delete around and inner b.
-testEdit('dab_on_(_should_delete_around_()block', 'o( in(abc) )', /\(a/, 'dab', 'o( in )');
-
-//  delete around and inner B.
-testEdit('daB_on_{_should_delete_around_{}block', 'o{ in{abc} }', /{a/, 'daB', 'o{ in }');
-testEdit('diB_on_{_should_delete_inner_{}block', 'o{ in{abc} }', /{a/, 'diB', 'o{ in{} }');
-
-testEdit('da{_on_{_should_delete_inner_block', 'o{ in{abc} }', /{a/, 'da{', 'o{ in }');
-testEdit('di[_on_(_should_not_delete', 'foo (bAr) baz', /\(/, 'di[', 'foo (bAr) baz');
-testEdit('di[_on_)_should_not_delete', 'foo (bAr) baz', /\)/, 'di[', 'foo (bAr) baz');
-testEdit('da[_on_(_should_not_delete', 'foo (bAr) baz', /\(/, 'da[', 'foo (bAr) baz');
-testEdit('da[_on_)_should_not_delete', 'foo (bAr) baz', /\)/, 'da[', 'foo (bAr) baz');
-testMotion('di(_outside_should_stay', ['d', 'i', '('], { line: 0, ch: 0}, { line: 0, ch: 0});
-
-//  Open and close on different lines, equally indented
-testEdit('di{_middle_spc', 'a{\n\tbar\n}b', /r/, 'di{', 'a{}b');
-testEdit('di}_middle_spc', 'a{\n\tbar\n}b', /r/, 'di}', 'a{}b');
-testEdit('da{_middle_spc', 'a{\n\tbar\n}b', /r/, 'da{', 'ab');
-testEdit('da}_middle_spc', 'a{\n\tbar\n}b', /r/, 'da}', 'ab');
-testEdit('daB_middle_spc', 'a{\n\tbar\n}b', /r/, 'daB', 'ab');
-
-// open and close on diff lines, open indented less than close
-testEdit('di{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di{', 'a{}b');
-testEdit('di}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'di}', 'a{}b');
-testEdit('da{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da{', 'ab');
-testEdit('da}_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'da}', 'ab');
-
-// open and close on diff lines, open indented more than close
-testEdit('di[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di[', 'a\t[]b');
-testEdit('di]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'di]', 'a\t[]b');
-testEdit('da[_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da[', 'a\tb');
-testEdit('da]_middle_spc', 'a\t[\n\tbar\n]b', /r/, 'da]', 'a\tb');
-
-function testSelection(name, before, pos, keys, sel) {
-  return testVim(name, function(cm, vim, helpers) {
-             var ch = before.search(pos)
-             var line = before.substring(0, ch).split('\n').length - 1;
-             if (line) {
-               ch = before.substring(0, ch).split('\n').pop().length;
-             }
-             cm.setCursor(line, ch);
-             helpers.doKeys.apply(this, keys.split(''));
-             eq(sel, cm.getSelection());
-           }, {value: before});
-}
-testSelection('viw_middle_spc', 'foo \tbAr\t baz', /A/, 'viw', 'bAr');
-testSelection('vaw_middle_spc', 'foo \tbAr\t baz', /A/, 'vaw', 'bAr\t ');
-testSelection('viw_middle_punct', 'foo \tbAr,\t baz', /A/, 'viw', 'bAr');
-testSelection('vaW_middle_punct', 'foo \tbAr,\t baz', /A/, 'vaW', 'bAr,\t ');
-testSelection('viw_start_spc', 'foo \tbAr\t baz', /b/, 'viw', 'bAr');
-testSelection('viw_end_spc', 'foo \tbAr\t baz', /r/, 'viw', 'bAr');
-testSelection('viw_eol', 'foo \tbAr', /r/, 'viw', 'bAr');
-testSelection('vi{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'vi{', '\n\tbar\n\t');
-testSelection('va{_middle_spc', 'a{\n\tbar\n\t}b', /r/, 'va{', '{\n\tbar\n\t}');
-
-testVim('mouse_select', function(cm, vim, helpers) {
-  cm.setSelection(Pos(0, 2), Pos(0, 4), {origin: '*mouse'});
-  is(cm.state.vim.visualMode);
-  is(!cm.state.vim.visualLine);
-  is(!cm.state.vim.visualBlock);
-  helpers.doKeys('');
-  is(!cm.somethingSelected());
-  helpers.doKeys('g', 'v');
-  eq('cd', cm.getSelection());
-}, {value: 'abcdef'});
-
-// Operator-motion tests
-testVim('D', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  helpers.doKeys('D');
-  eq(' wo\nword2\n word3', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('rd1', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 2);
-}, { value: ' word1\nword2\n word3' });
-testVim('C', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('C');
-  eq(' wo\nword2\n word3', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('rd1', register.toString());
-  is(!register.linewise);
-  eqPos(curStart, cm.getCursor());
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: ' word1\nword2\n word3' });
-testVim('Y', function(cm, vim, helpers) {
-  var curStart = makeCursor(0, 3);
-  cm.setCursor(curStart);
-  helpers.doKeys('Y');
-  eq(' word1\nword2\n word3', cm.getValue());
-  var register = helpers.getRegisterController().getRegister();
-  eq('rd1', register.toString());
-  is(!register.linewise);
-  helpers.assertCursorAt(0, 3);
-}, { value: ' word1\nword2\n word3' });
-testVim('~', function(cm, vim, helpers) {
-  helpers.doKeys('3', '~');
-  eq('ABCdefg', cm.getValue());
-  helpers.assertCursorAt(0, 3);
-}, { value: 'abcdefg' });
-
-// Action tests
-testVim('ctrl-a', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('');
-  eq('-9', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-  helpers.doKeys('2','');
-  eq('-7', cm.getValue());
-}, {value: '-10'});
-testVim('ctrl-x', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('');
-  eq('-1', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-  helpers.doKeys('2','');
-  eq('-3', cm.getValue());
-}, {value: '0'});
-testVim('/ search forward', function(cm, vim, helpers) {
-  forEach(['', ''], function(key) {
-    cm.setCursor(0, 0);
-    helpers.doKeys(key);
-    helpers.assertCursorAt(0, 5);
-    helpers.doKeys('l');
-    helpers.doKeys(key);
-    helpers.assertCursorAt(0, 10);
-    cm.setCursor(0, 11);
-    helpers.doKeys(key);
-    helpers.assertCursorAt(0, 11);
-  });
-}, {value: '__jmp1 jmp2 jmp'});
-testVim('a', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('a');
-  helpers.assertCursorAt(0, 2);
-  eq('vim-insert', cm.getOption('keyMap'));
-});
-testVim('a_eol', function(cm, vim, helpers) {
-  cm.setCursor(0, lines[0].length - 1);
-  helpers.doKeys('a');
-  helpers.assertCursorAt(0, lines[0].length);
-  eq('vim-insert', cm.getOption('keyMap'));
-});
-testVim('A_endOfSelectedArea', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', 'j', 'l');
-  helpers.doKeys('A');
-  helpers.assertCursorAt(1, 2);
-  eq('vim-insert', cm.getOption('keyMap'));
-}, {value: 'foo\nbar'});
-testVim('i', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('i');
-  helpers.assertCursorAt(0, 1);
-  eq('vim-insert', cm.getOption('keyMap'));
-});
-testVim('i_repeat', function(cm, vim, helpers) {
-  helpers.doKeys('3', 'i');
-  cm.replaceRange('test', cm.getCursor());
-  helpers.doKeys('');
-  eq('testtesttest', cm.getValue());
-  helpers.assertCursorAt(0, 11);
-}, { value: '' });
-testVim('i_repeat_delete', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('2', 'i');
-  cm.replaceRange('z', cm.getCursor());
-  helpers.doInsertModeKeys('Backspace', 'Backspace');
-  helpers.doKeys('');
-  eq('abe', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-}, { value: 'abcde' });
-testVim('A', function(cm, vim, helpers) {
-  helpers.doKeys('A');
-  helpers.assertCursorAt(0, lines[0].length);
-  eq('vim-insert', cm.getOption('keyMap'));
-});
-testVim('A_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('', '2', 'j', 'l', 'l', 'A');
-  var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
-  replacement.pop();
-  cm.replaceSelections(replacement);
-  eq('testhello\nmehello\npleahellose', cm.getValue());
-  helpers.doKeys('');
-  cm.setCursor(0, 0);
-  helpers.doKeys('.');
-  // TODO this doesn't work yet
-  // eq('teshellothello\nme hello hello\nplehelloahellose', cm.getValue());
-}, {value: 'test\nme\nplease'});
-testVim('I', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('I');
-  helpers.assertCursorAt(0, lines[0].textStart);
-  eq('vim-insert', cm.getOption('keyMap'));
-});
-testVim('I_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('3', 'I');
-  cm.replaceRange('test', cm.getCursor());
-  helpers.doKeys('');
-  eq('testtesttestblah', cm.getValue());
-  helpers.assertCursorAt(0, 11);
-}, { value: 'blah' });
-testVim('I_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('', '2', 'j', 'l', 'l', 'I');
-  var replacement = new Array(cm.listSelections().length+1).join('hello ').split(' ');
-  replacement.pop();
-  cm.replaceSelections(replacement);
-  eq('hellotest\nhellome\nhelloplease', cm.getValue());
-}, {value: 'test\nme\nplease'});
-testVim('o', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('o');
-  eq('word1\n\nword2', cm.getValue());
-  helpers.assertCursorAt(1, 0);
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: 'word1\nword2' });
-testVim('o_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('3', 'o');
-  cm.replaceRange('test', cm.getCursor());
-  helpers.doKeys('');
-  eq('\ntest\ntest\ntest', cm.getValue());
-  helpers.assertCursorAt(3, 3);
-}, { value: '' });
-testVim('O', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('O');
-  eq('\nword1\nword2', cm.getValue());
-  helpers.assertCursorAt(0, 0);
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: 'word1\nword2' });
-testVim('J', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('J');
-  var expectedValue = 'word1  word2\nword3\n word4';
-  eq(expectedValue, cm.getValue());
-  helpers.assertCursorAt(0, expectedValue.indexOf('word2') - 1);
-}, { value: 'word1 \n    word2\nword3\n word4' });
-testVim('J_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('3', 'J');
-  var expectedValue = 'word1  word2 word3\n word4';
-  eq(expectedValue, cm.getValue());
-  helpers.assertCursorAt(0, expectedValue.indexOf('word3') - 1);
-}, { value: 'word1 \n    word2\nword3\n word4' });
-testVim('p', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().pushText('"', 'yank', 'abc\ndef', false);
-  helpers.doKeys('p');
-  eq('__abc\ndef_', cm.getValue());
-  helpers.assertCursorAt(1, 2);
-}, { value: '___' });
-testVim('p_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().getRegister('a').setText('abc\ndef', false);
-  helpers.doKeys('"', 'a', 'p');
-  eq('__abc\ndef_', cm.getValue());
-  helpers.assertCursorAt(1, 2);
-}, { value: '___' });
-testVim('p_wrong_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().getRegister('a').setText('abc\ndef', false);
-  helpers.doKeys('p');
-  eq('___', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-}, { value: '___' });
-testVim('p_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().pushText('"', 'yank', '  a\nd\n', true);
-  helpers.doKeys('2', 'p');
-  eq('___\n  a\nd\n  a\nd', cm.getValue());
-  helpers.assertCursorAt(1, 2);
-}, { value: '___' });
-testVim('p_lastline', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().pushText('"', 'yank', '  a\nd', true);
-  helpers.doKeys('2', 'p');
-  eq('___\n  a\nd\n  a\nd', cm.getValue());
-  helpers.assertCursorAt(1, 2);
-}, { value: '___' });
-testVim(']p_first_indent_is_smaller', function(cm, vim, helpers) {
-  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
-  helpers.doKeys(']', 'p');
-  eq('  ___\n  abc\n    def', cm.getValue());
-}, { value: '  ___' });
-testVim(']p_first_indent_is_larger', function(cm, vim, helpers) {
-  helpers.getRegisterController().pushText('"', 'yank', '    abc\n  def\n', true);
-  helpers.doKeys(']', 'p');
-  eq('  ___\n  abc\ndef', cm.getValue());
-}, { value: '  ___' });
-testVim(']p_with_tab_indents', function(cm, vim, helpers) {
-  helpers.getRegisterController().pushText('"', 'yank', '\t\tabc\n\t\t\tdef\n', true);
-  helpers.doKeys(']', 'p');
-  eq('\t___\n\tabc\n\t\tdef', cm.getValue());
-}, { value: '\t___', indentWithTabs: true});
-testVim(']p_with_spaces_translated_to_tabs', function(cm, vim, helpers) {
-  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
-  helpers.doKeys(']', 'p');
-  eq('\t___\n\tabc\n\t\tdef', cm.getValue());
-}, { value: '\t___', indentWithTabs: true, tabSize: 2 });
-testVim('[p', function(cm, vim, helpers) {
-  helpers.getRegisterController().pushText('"', 'yank', '  abc\n    def\n', true);
-  helpers.doKeys('[', 'p');
-  eq('  abc\n    def\n  ___', cm.getValue());
-}, { value: '  ___' });
-testVim('P', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().pushText('"', 'yank', 'abc\ndef', false);
-  helpers.doKeys('P');
-  eq('_abc\ndef__', cm.getValue());
-  helpers.assertCursorAt(1, 3);
-}, { value: '___' });
-testVim('P_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.getRegisterController().pushText('"', 'yank', '  a\nd\n', true);
-  helpers.doKeys('2', 'P');
-  eq('  a\nd\n  a\nd\n___', cm.getValue());
-  helpers.assertCursorAt(0, 2);
-}, { value: '___' });
-testVim('r', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('3', 'r', 'u');
-  eq('wuuuet\nanother', cm.getValue(),'3r failed');
-  helpers.assertCursorAt(0, 3);
-  cm.setCursor(0, 4);
-  helpers.doKeys('v', 'j', 'h', 'r', '');
-  eq('wuuu  \n    her', cm.getValue(),'Replacing selection by space-characters failed');
-}, { value: 'wordet\nanother' });
-testVim('r_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(2, 3);
-  helpers.doKeys('', 'k', 'k', 'h', 'h', 'r', 'l');
-  eq('1lll\n5lll\nalllefg', cm.getValue());
-  helpers.doKeys('', 'l', 'j', 'r', '');
-  eq('1  l\n5  l\nalllefg', cm.getValue());
-  cm.setCursor(2, 0);
-  helpers.doKeys('o');
-  helpers.doKeys('');
-  cm.replaceRange('\t\t', cm.getCursor());
-  helpers.doKeys('', 'h', 'h', 'r', 'r');
-  eq('1  l\n5  l\nalllefg\nrrrrrrrr', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-testVim('R', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('R');
-  helpers.assertCursorAt(0, 1);
-  eq('vim-replace', cm.getOption('keyMap'));
-  is(cm.state.overwrite, 'Setting overwrite state failed');
-});
-testVim('mark', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 't');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 't');
-  helpers.assertCursorAt(2, 2);
-  cm.setCursor(2, 0);
-  cm.replaceRange('   h', cm.getCursor());
-  cm.setCursor(0, 0);
-  helpers.doKeys('\'', 't');
-  helpers.assertCursorAt(2, 3);
-});
-testVim('jumpToMark_next', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 't');
-  cm.setCursor(0, 0);
-  helpers.doKeys(']', '`');
-  helpers.assertCursorAt(2, 2);
-  cm.setCursor(0, 0);
-  helpers.doKeys(']', '\'');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_next_repeat', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', ']', '`');
-  helpers.assertCursorAt(3, 2);
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', ']', '\'');
-  helpers.assertCursorAt(3, 1);
-});
-testVim('jumpToMark_next_sameline', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 4);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(2, 2);
-  helpers.doKeys(']', '`');
-  helpers.assertCursorAt(2, 4);
-});
-testVim('jumpToMark_next_onlyprev', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(4, 0);
-  helpers.doKeys(']', '`');
-  helpers.assertCursorAt(4, 0);
-});
-testVim('jumpToMark_next_nomark', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys(']', '`');
-  helpers.assertCursorAt(2, 2);
-  helpers.doKeys(']', '\'');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_next_linewise_over', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(3, 4);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(2, 1);
-  helpers.doKeys(']', '\'');
-  helpers.assertCursorAt(3, 1);
-});
-testVim('jumpToMark_next_action', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 't');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ']', '`');
-  helpers.assertCursorAt(0, 0);
-  var actual = cm.getLine(0);
-  var expected = 'pop pop 0 1 2 3 4';
-  eq(actual, expected, "Deleting while jumping to the next mark failed.");
-});
-testVim('jumpToMark_next_line_action', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 't');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ']', '\'');
-  helpers.assertCursorAt(0, 1);
-  var actual = cm.getLine(0);
-  var expected = ' (a) [b] {c} '
-  eq(actual, expected, "Deleting while jumping to the next mark line failed.");
-});
-testVim('jumpToMark_prev', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 't');
-  cm.setCursor(4, 0);
-  helpers.doKeys('[', '`');
-  helpers.assertCursorAt(2, 2);
-  cm.setCursor(4, 0);
-  helpers.doKeys('[', '\'');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_prev_repeat', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(5, 0);
-  helpers.doKeys('2', '[', '`');
-  helpers.assertCursorAt(3, 2);
-  cm.setCursor(5, 0);
-  helpers.doKeys('2', '[', '\'');
-  helpers.assertCursorAt(3, 1);
-});
-testVim('jumpToMark_prev_sameline', function(cm, vim, helpers) {
-  cm.setCursor(2, 0);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 4);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(2, 2);
-  helpers.doKeys('[', '`');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_prev_onlynext', function(cm, vim, helpers) {
-  cm.setCursor(4, 4);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 0);
-  helpers.doKeys('[', '`');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_prev_nomark', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('[', '`');
-  helpers.assertCursorAt(2, 2);
-  helpers.doKeys('[', '\'');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('jumpToMark_prev_linewise_over', function(cm, vim, helpers) {
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(3, 4);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(3, 6);
-  helpers.doKeys('[', '\'');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('delmark_single', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('m', 't');
-  helpers.doEx('delmarks t');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 't');
-  helpers.assertCursorAt(0, 0);
-});
-testVim('delmark_range', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'd');
-  cm.setCursor(5, 2);
-  helpers.doKeys('m', 'e');
-  helpers.doEx('delmarks b-d');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 'a');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'b');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'c');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'd');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'e');
-  helpers.assertCursorAt(5, 2);
-});
-testVim('delmark_multi', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'd');
-  cm.setCursor(5, 2);
-  helpers.doKeys('m', 'e');
-  helpers.doEx('delmarks bcd');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 'a');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'b');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'c');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'd');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'e');
-  helpers.assertCursorAt(5, 2);
-});
-testVim('delmark_multi_space', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'd');
-  cm.setCursor(5, 2);
-  helpers.doKeys('m', 'e');
-  helpers.doEx('delmarks b c d');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 'a');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'b');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'c');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'd');
-  helpers.assertCursorAt(1, 2);
-  helpers.doKeys('`', 'e');
-  helpers.assertCursorAt(5, 2);
-});
-testVim('delmark_all', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('m', 'a');
-  cm.setCursor(2, 2);
-  helpers.doKeys('m', 'b');
-  cm.setCursor(3, 2);
-  helpers.doKeys('m', 'c');
-  cm.setCursor(4, 2);
-  helpers.doKeys('m', 'd');
-  cm.setCursor(5, 2);
-  helpers.doKeys('m', 'e');
-  helpers.doEx('delmarks a b-de');
-  cm.setCursor(0, 0);
-  helpers.doKeys('`', 'a');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('`', 'b');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('`', 'c');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('`', 'd');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('`', 'e');
-  helpers.assertCursorAt(0, 0);
-});
-testVim('visual', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'v', 'l', 'l');
-  helpers.assertCursorAt(0, 4);
-  eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
-  helpers.doKeys('d');
-  eq('15', cm.getValue());
-}, { value: '12345' });
-testVim('visual_yank', function(cm, vim, helpers) {
-  helpers.doKeys('v', '3', 'l', 'y');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('p');
-  eq('aa te test for yank', cm.getValue());
-}, { value: 'a test for yank' })
-testVim('visual_w', function(cm, vim, helpers) {
-  helpers.doKeys('v', 'w');
-  eq(cm.getSelection(), 'motion t');
-}, { value: 'motion test'});
-testVim('visual_initial_selection', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('v');
-  cm.getSelection('n');
-}, { value: 'init'});
-testVim('visual_crossover_left', function(cm, vim, helpers) {
-  cm.setCursor(0, 2);
-  helpers.doKeys('v', 'l', 'h', 'h');
-  cm.getSelection('ro');
-}, { value: 'cross'});
-testVim('visual_crossover_left', function(cm, vim, helpers) {
-  cm.setCursor(0, 2);
-  helpers.doKeys('v', 'h', 'l', 'l');
-  cm.getSelection('os');
-}, { value: 'cross'});
-testVim('visual_crossover_up', function(cm, vim, helpers) {
-  cm.setCursor(3, 2);
-  helpers.doKeys('v', 'j', 'k', 'k');
-  eqPos(Pos(2, 2), cm.getCursor('head'));
-  eqPos(Pos(3, 3), cm.getCursor('anchor'));
-  helpers.doKeys('k');
-  eqPos(Pos(1, 2), cm.getCursor('head'));
-  eqPos(Pos(3, 3), cm.getCursor('anchor'));
-}, { value: 'cross\ncross\ncross\ncross\ncross\n'});
-testVim('visual_crossover_down', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('v', 'k', 'j', 'j');
-  eqPos(Pos(2, 3), cm.getCursor('head'));
-  eqPos(Pos(1, 2), cm.getCursor('anchor'));
-  helpers.doKeys('j');
-  eqPos(Pos(3, 3), cm.getCursor('head'));
-  eqPos(Pos(1, 2), cm.getCursor('anchor'));
-}, { value: 'cross\ncross\ncross\ncross\ncross\n'});
-testVim('visual_exit', function(cm, vim, helpers) {
-  helpers.doKeys('', 'l', 'j', 'j', '');
-  eqPos(cm.getCursor('anchor'), cm.getCursor('head'));
-  eq(vim.visualMode, false);
-}, { value: 'hello\nworld\nfoo' });
-testVim('visual_line', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'V', 'l', 'j', 'j', 'd');
-  eq(' 4\n 5', cm.getValue());
-}, { value: ' 1\n 2\n 3\n 4\n 5' });
-testVim('visual_block_move_to_eol', function(cm, vim, helpers) {
-  // moveToEol should move all block cursors to end of line
-  cm.setCursor(0, 0);
-  helpers.doKeys('', 'G', '$');
-  var selections = cm.getSelections().join();
-  eq('123,45,6', selections);
-  // Checks that with cursor at Infinity, finding words backwards still works.
-  helpers.doKeys('2', 'k', 'b');
-  selections = cm.getSelections().join();
-  eq('1', selections);
-}, {value: '123\n45\n6'});
-testVim('visual_block_different_line_lengths', function(cm, vim, helpers) {
-  // test the block selection with lines of different length
-  // i.e. extending the selection
-  // till the end of the longest line.
-  helpers.doKeys('', 'l', 'j', 'j', '6', 'l', 'd');
-  helpers.doKeys('d', 'd', 'd', 'd');
-  eq('', cm.getValue());
-}, {value: '1234\n5678\nabcdefg'});
-testVim('visual_block_truncate_on_short_line', function(cm, vim, helpers) {
-  // check for left side selection in case
-  // of moving up to a shorter line.
-  cm.replaceRange('', cm.getCursor());
-  cm.setCursor(3, 4);
-  helpers.doKeys('', 'l', 'k', 'k', 'd');
-  eq('hello world\n{\ntis\nsa!', cm.getValue());
-}, {value: 'hello world\n{\nthis is\nsparta!'});
-testVim('visual_block_corners', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('', '2', 'l', 'k');
-  // circle around the anchor
-  // and check the selections
-  var selections = cm.getSelections();
-  eq('345891', selections.join(''));
-  helpers.doKeys('4', 'h');
-  selections = cm.getSelections();
-  eq('123678', selections.join(''));
-  helpers.doKeys('j', 'j');
-  selections = cm.getSelections();
-  eq('678abc', selections.join(''));
-  helpers.doKeys('4', 'l');
-  selections = cm.getSelections();
-  eq('891cde', selections.join(''));
-}, {value: '12345\n67891\nabcde'});
-testVim('visual_block_mode_switch', function(cm, vim, helpers) {
-  // switch between visual modes
-  cm.setCursor(1, 1);
-  // blockwise to characterwise visual
-  helpers.doKeys('', 'j', 'l', 'v');
-  selections = cm.getSelections();
-  eq('7891\nabc', selections.join(''));
-  // characterwise to blockwise
-  helpers.doKeys('');
-  selections = cm.getSelections();
-  eq('78bc', selections.join(''));
-  // blockwise to linewise visual
-  helpers.doKeys('V');
-  selections = cm.getSelections();
-  eq('67891\nabcde', selections.join(''));
-}, {value: '12345\n67891\nabcde'});
-testVim('visual_block_crossing_short_line', function(cm, vim, helpers) {
-  // visual block with long and short lines
-  cm.setCursor(0, 3);
-  helpers.doKeys('', 'j', 'j', 'j');
-  var selections = cm.getSelections().join();
-  eq('4,,d,b', selections);
-  helpers.doKeys('3', 'k');
-  selections = cm.getSelections().join();
-  eq('4', selections);
-  helpers.doKeys('5', 'j', 'k');
-  selections = cm.getSelections().join("");
-  eq(10, selections.length);
-}, {value: '123456\n78\nabcdefg\nfoobar\n}\n'});
-testVim('visual_block_curPos_on_exit', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('', '3' , 'l', '');
-  eqPos(makeCursor(0, 3), cm.getCursor());
-  helpers.doKeys('h', '', '2' , 'j' ,'3' , 'l');
-  eq(cm.getSelections().join(), "3456,,cdef");
-  helpers.doKeys('4' , 'h');
-  eq(cm.getSelections().join(), "23,8,bc");
-  helpers.doKeys('2' , 'l');
-  eq(cm.getSelections().join(), "34,,cd");
-}, {value: '123456\n78\nabcdefg\nfoobar'});
-
-testVim('visual_marks', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'v', 'l', 'l', 'j', 'j', 'v');
-  // Test visual mode marks
-  cm.setCursor(2, 1);
-  helpers.doKeys('\'', '<');
-  helpers.assertCursorAt(0, 1);
-  helpers.doKeys('\'', '>');
-  helpers.assertCursorAt(2, 0);
-});
-testVim('visual_join', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'V', 'l', 'j', 'j', 'J');
-  eq(' 1 2 3\n 4\n 5', cm.getValue());
-  is(!vim.visualMode);
-}, { value: ' 1\n 2\n 3\n 4\n 5' });
-testVim('visual_join_2', function(cm, vim, helpers) {
-  helpers.doKeys('G', 'V', 'g', 'g', 'J');
-  eq('1 2 3 4 5 6 ', cm.getValue());
-  is(!vim.visualMode);
-}, { value: '1\n2\n3\n4\n5\n6\n'});
-testVim('visual_blank', function(cm, vim, helpers) {
-  helpers.doKeys('v', 'k');
-  eq(vim.visualMode, true);
-}, { value: '\n' });
-testVim('reselect_visual', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'v', 'l', 'l', 'l', 'y', 'g', 'v');
-  helpers.assertCursorAt(0, 5);
-  eqPos(makeCursor(0, 1), cm.getCursor('anchor'));
-  helpers.doKeys('v');
-  cm.setCursor(1, 0);
-  helpers.doKeys('v', 'l', 'l', 'p');
-  eq('123456\n2345\nbar', cm.getValue());
-  cm.setCursor(0, 0);
-  helpers.doKeys('g', 'v');
-  // here the fake cursor is at (1, 3)
-  helpers.assertCursorAt(1, 4);
-  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
-  helpers.doKeys('v');
-  cm.setCursor(2, 0);
-  helpers.doKeys('v', 'l', 'l', 'g', 'v');
-  helpers.assertCursorAt(1, 4);
-  eqPos(makeCursor(1, 0), cm.getCursor('anchor'));
-  helpers.doKeys('g', 'v');
-  helpers.assertCursorAt(2, 3);
-  eqPos(makeCursor(2, 0), cm.getCursor('anchor'));
-  eq('123456\n2345\nbar', cm.getValue());
-}, { value: '123456\nfoo\nbar' });
-testVim('reselect_visual_line', function(cm, vim, helpers) {
-  helpers.doKeys('l', 'V', 'j', 'j', 'V', 'g', 'v', 'd');
-  eq('foo\nand\nbar', cm.getValue());
-  cm.setCursor(1, 0);
-  helpers.doKeys('V', 'y', 'j');
-  helpers.doKeys('V', 'p' , 'g', 'v', 'd');
-  eq('foo\nand', cm.getValue());
-}, { value: 'hello\nthis\nis\nfoo\nand\nbar' });
-testVim('reselect_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(1, 2);
-  helpers.doKeys('', 'k', 'h', '');
-  cm.setCursor(2, 1);
-  helpers.doKeys('v', 'l', 'g', 'v');
-  eqPos(Pos(1, 2), vim.sel.anchor);
-  eqPos(Pos(0, 1), vim.sel.head);
-  // Ensure selection is done with visual block mode rather than one
-  // continuous range.
-  eq(cm.getSelections().join(''), '23oo')
-  helpers.doKeys('g', 'v');
-  eqPos(Pos(2, 1), vim.sel.anchor);
-  eqPos(Pos(2, 2), vim.sel.head);
-  helpers.doKeys('');
-  // Ensure selection of deleted range
-  cm.setCursor(1, 1);
-  helpers.doKeys('v', '', 'j', 'd', 'g', 'v');
-  eq(cm.getSelections().join(''), 'or');
-}, { value: '123456\nfoo\nbar' });
-testVim('s_normal', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('s');
-  helpers.doKeys('');
-  eq('ac', cm.getValue());
-}, { value: 'abc'});
-testVim('s_visual', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('v', 's');
-  helpers.doKeys('');
-  helpers.assertCursorAt(0, 0);
-  eq('ac', cm.getValue());
-}, { value: 'abc'});
-testVim('o_visual', function(cm, vim, helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys('v','l','l','l','o');
-  helpers.assertCursorAt(0,0);
-  helpers.doKeys('v','v','j','j','j','o');
-  helpers.assertCursorAt(0,0);
-  helpers.doKeys('O');
-  helpers.doKeys('l','l')
-  helpers.assertCursorAt(3, 3);
-  helpers.doKeys('d');
-  eq('p',cm.getValue());
-}, { value: 'abcd\nefgh\nijkl\nmnop'});
-testVim('o_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('','3','j','l','l', 'o');
-  eqPos(Pos(3, 3), vim.sel.anchor);
-  eqPos(Pos(0, 1), vim.sel.head);
-  helpers.doKeys('O');
-  eqPos(Pos(3, 1), vim.sel.anchor);
-  eqPos(Pos(0, 3), vim.sel.head);
-  helpers.doKeys('o');
-  eqPos(Pos(0, 3), vim.sel.anchor);
-  eqPos(Pos(3, 1), vim.sel.head);
-}, { value: 'abcd\nefgh\nijkl\nmnop'});
-testVim('changeCase_visual', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', 'l', 'l');
-  helpers.doKeys('U');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('v', 'l', 'l');
-  helpers.doKeys('u');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('l', 'l', 'l', '.');
-  helpers.assertCursorAt(0, 3);
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', 'v', 'j', 'U', 'q');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('j', '@', 'a');
-  helpers.assertCursorAt(1, 0);
-  cm.setCursor(3, 0);
-  helpers.doKeys('V', 'U', 'j', '.');
-  eq('ABCDEF\nGHIJKL\nMnopq\nSHORT LINE\nLONG LINE OF TEXT', cm.getValue());
-}, { value: 'abcdef\nghijkl\nmnopq\nshort line\nlong line of text'});
-testVim('changeCase_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(2, 1);
-  helpers.doKeys('', 'k', 'k', 'h', 'U');
-  eq('ABcdef\nGHijkl\nMNopq\nfoo', cm.getValue());
-  cm.setCursor(0, 2);
-  helpers.doKeys('.');
-  eq('ABCDef\nGHIJkl\nMNOPq\nfoo', cm.getValue());
-  // check when last line is shorter.
-  cm.setCursor(2, 2);
-  helpers.doKeys('.');
-  eq('ABCDef\nGHIJkl\nMNOPq\nfoO', cm.getValue());
-}, { value: 'abcdef\nghijkl\nmnopq\nfoo'});
-testVim('visual_paste', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', 'l', 'l', 'y');
-  helpers.assertCursorAt(0, 0);
-  helpers.doKeys('3', 'l', 'j', 'v', 'l', 'p');
-  helpers.assertCursorAt(1, 5);
-  eq('this is a\nunithitest for visual paste', cm.getValue());
-  cm.setCursor(0, 0);
-  // in case of pasting whole line
-  helpers.doKeys('y', 'y');
-  cm.setCursor(1, 6);
-  helpers.doKeys('v', 'l', 'l', 'l', 'p');
-  helpers.assertCursorAt(2, 0);
-  eq('this is a\nunithi\nthis is a\n for visual paste', cm.getValue());
-}, { value: 'this is a\nunit test for visual paste'});
-
-// This checks the contents of the register used to paste the text
-testVim('v_paste_from_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'w');
-  cm.setCursor(1, 0);
-  helpers.doKeys('v', 'p');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+register/.test(text));
-  });
-}, { value: 'register contents\nare not erased'});
-testVim('S_normal', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('j', 'S');
-  helpers.doKeys('');
-  helpers.assertCursorAt(1, 0);
-  eq('aa\n\ncc', cm.getValue());
-}, { value: 'aa\nbb\ncc'});
-testVim('blockwise_paste', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('', '3', 'j', 'l', 'y');
-  cm.setCursor(0, 2);
-  // paste one char after the current cursor position
-  helpers.doKeys('p');
-  eq('helhelo\nworwold\nfoofo\nbarba', cm.getValue());
-  cm.setCursor(0, 0);
-  helpers.doKeys('v', '4', 'l', 'y');
-  cm.setCursor(0, 0);
-  helpers.doKeys('', '3', 'j', 'p');
-  eq('helheelhelo\norwold\noofo\narba', cm.getValue());
-}, { value: 'hello\nworld\nfoo\nbar'});
-testVim('blockwise_paste_long/short_line', function(cm, vim, helpers) {
-  // extend short lines in case of different line lengths.
-  cm.setCursor(0, 0);
-  helpers.doKeys('', 'j', 'j', 'y');
-  cm.setCursor(0, 3);
-  helpers.doKeys('p');
-  eq('hellho\nfoo f\nbar b', cm.getValue());
-}, { value: 'hello\nfoo\nbar'});
-testVim('blockwise_paste_cut_paste', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('', '2', 'j', 'x');
-  cm.setCursor(0, 0);
-  helpers.doKeys('P');
-  eq('cut\nand\npaste\nme', cm.getValue());
-}, { value: 'cut\nand\npaste\nme'});
-testVim('blockwise_paste_from_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('', '2', 'j', '"', 'a', 'y');
-  cm.setCursor(0, 3);
-  helpers.doKeys('"', 'a', 'p');
-  eq('foobfar\nhellho\nworlwd', cm.getValue());
-}, { value: 'foobar\nhello\nworld'});
-testVim('blockwise_paste_last_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('', '2', 'j', 'l', 'y');
-  cm.setCursor(3, 0);
-  helpers.doKeys('p');
-  eq('cut\nand\npaste\nmcue\n an\n pa', cm.getValue());
-}, { value: 'cut\nand\npaste\nme'});
-
-testVim('S_visual', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('v', 'j', 'S');
-  helpers.doKeys('');
-  helpers.assertCursorAt(0, 0);
-  eq('\ncc', cm.getValue());
-}, { value: 'aa\nbb\ncc'});
-
-testVim('d_/', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('2', 'd', '/');
-  helpers.assertCursorAt(0, 0);
-  eq('match \n next', cm.getValue());
-  cm.openDialog = helpers.fakeOpenDialog('2');
-  helpers.doKeys('d', ':');
-  // TODO eq(' next', cm.getValue());
-}, { value: 'text match match \n next' });
-testVim('/ and n/N', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('/');
-  helpers.assertCursorAt(0, 11);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 6);
-  helpers.doKeys('N');
-  helpers.assertCursorAt(0, 11);
-
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', '/');
-  helpers.assertCursorAt(1, 6);
-}, { value: 'match nope match \n nope Match' });
-testVim('/_case', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('Match');
-  helpers.doKeys('/');
-  helpers.assertCursorAt(1, 6);
-}, { value: 'match nope match \n nope Match' });
-testVim('/_2_pcre', function(cm, vim, helpers) {
-  CodeMirror.Vim.setOption('pcre', true);
-  cm.openDialog = helpers.fakeOpenDialog('(word){2}');
-  helpers.doKeys('/');
-  helpers.assertCursorAt(1, 9);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(2, 1);
-}, { value: 'word\n another wordword\n wordwordword\n' });
-testVim('/_2_nopcre', function(cm, vim, helpers) {
-  CodeMirror.Vim.setOption('pcre', false);
-  cm.openDialog = helpers.fakeOpenDialog('\\(word\\)\\{2}');
-  helpers.doKeys('/');
-  helpers.assertCursorAt(1, 9);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(2, 1);
-}, { value: 'word\n another wordword\n wordwordword\n' });
-testVim('/_nongreedy', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('aa');
-  helpers.doKeys('/');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 3);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'aaa aa \n a aa'});
-testVim('?_nongreedy', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('aa');
-  helpers.doKeys('?');
-  helpers.assertCursorAt(1, 3);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'aaa aa \n a aa'});
-testVim('/_greedy', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('a+');
-  helpers.doKeys('/');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 1);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 3);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'aaa aa \n a aa'});
-testVim('?_greedy', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('a+');
-  helpers.doKeys('?');
-  helpers.assertCursorAt(1, 3);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 1);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'aaa aa \n a aa'});
-testVim('/_greedy_0_or_more', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('a*');
-  helpers.doKeys('/');
-  helpers.assertCursorAt(0, 3);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 5);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 0);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 1);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'aaa  aa\n aa'});
-testVim('?_greedy_0_or_more', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('a*');
-  helpers.doKeys('?');
-  helpers.assertCursorAt(1, 1);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(1, 0);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 5);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 3);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 0);
-}, { value: 'aaa  aa\n aa'});
-testVim('? and n/N', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('?');
-  helpers.assertCursorAt(1, 6);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 11);
-  helpers.doKeys('N');
-  helpers.assertCursorAt(1, 6);
-
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', '?');
-  helpers.assertCursorAt(0, 11);
-}, { value: 'match nope match \n nope Match' });
-testVim('*', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('*');
-  helpers.assertCursorAt(0, 22);
-
-  cm.setCursor(0, 9);
-  helpers.doKeys('2', '*');
-  helpers.assertCursorAt(1, 8);
-}, { value: 'nomatch match nomatch match \nnomatch Match' });
-testVim('*_no_word', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('*');
-  helpers.assertCursorAt(0, 0);
-}, { value: ' \n match \n' });
-testVim('*_symbol', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('*');
-  helpers.assertCursorAt(1, 0);
-}, { value: ' /}\n/} match \n' });
-testVim('#', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('#');
-  helpers.assertCursorAt(1, 8);
-
-  cm.setCursor(0, 9);
-  helpers.doKeys('2', '#');
-  helpers.assertCursorAt(0, 22);
-}, { value: 'nomatch match nomatch match \nnomatch Match' });
-testVim('*_seek', function(cm, vim, helpers) {
-  // Should skip over space and symbols.
-  cm.setCursor(0, 3);
-  helpers.doKeys('*');
-  helpers.assertCursorAt(0, 22);
-}, { value: '    :=  match nomatch match \nnomatch Match' });
-testVim('#', function(cm, vim, helpers) {
-  // Should skip over space and symbols.
-  cm.setCursor(0, 3);
-  helpers.doKeys('#');
-  helpers.assertCursorAt(1, 8);
-}, { value: '    :=  match nomatch match \nnomatch Match' });
-testVim('g*', function(cm, vim, helpers) {
-  cm.setCursor(0, 8);
-  helpers.doKeys('g', '*');
-  helpers.assertCursorAt(0, 18);
-  cm.setCursor(0, 8);
-  helpers.doKeys('3', 'g', '*');
-  helpers.assertCursorAt(1, 8);
-}, { value: 'matches match alsoMatch\nmatchme matching' });
-testVim('g#', function(cm, vim, helpers) {
-  cm.setCursor(0, 8);
-  helpers.doKeys('g', '#');
-  helpers.assertCursorAt(0, 0);
-  cm.setCursor(0, 8);
-  helpers.doKeys('3', 'g', '#');
-  helpers.assertCursorAt(1, 0);
-}, { value: 'matches match alsoMatch\nmatchme matching' });
-testVim('macro_insert', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', '0', 'i');
-  cm.replaceRange('foo', cm.getCursor());
-  helpers.doKeys('');
-  helpers.doKeys('q', '@', 'a');
-  eq('foofoo', cm.getValue());
-}, { value: ''});
-testVim('macro_insert_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', '$', 'a');
-  cm.replaceRange('larry.', cm.getCursor());
-  helpers.doKeys('');
-  helpers.doKeys('a');
-  cm.replaceRange('curly.', cm.getCursor());
-  helpers.doKeys('');
-  helpers.doKeys('q');
-  helpers.doKeys('a');
-  cm.replaceRange('moe.', cm.getCursor());
-  helpers.doKeys('');
-  helpers.doKeys('@', 'a');
-  // At this point, the most recent edit should be the 2nd insert change
-  // inside the macro, i.e. "curly.".
-  helpers.doKeys('.');
-  eq('larry.curly.moe.larry.curly.curly.', cm.getValue());
-}, { value: ''});
-testVim('macro_space', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('', '');
-  helpers.assertCursorAt(0, 2);
-  helpers.doKeys('q', 'a', '', '', 'q');
-  helpers.assertCursorAt(0, 4);
-  helpers.doKeys('@', 'a');
-  helpers.assertCursorAt(0, 6);
-  helpers.doKeys('@', 'a');
-  helpers.assertCursorAt(0, 8);
-}, { value: 'one line of text.'});
-testVim('macro_t_search', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', 't', 'e', 'q');
-  helpers.assertCursorAt(0, 1);
-  helpers.doKeys('l', '@', 'a');
-  helpers.assertCursorAt(0, 6);
-  helpers.doKeys('l', ';');
-  helpers.assertCursorAt(0, 12);
-}, { value: 'one line of text.'});
-testVim('macro_f_search', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'b', 'f', 'e', 'q');
-  helpers.assertCursorAt(0, 2);
-  helpers.doKeys('@', 'b');
-  helpers.assertCursorAt(0, 7);
-  helpers.doKeys(';');
-  helpers.assertCursorAt(0, 13);
-}, { value: 'one line of text.'});
-testVim('macro_slash_search', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'c');
-  cm.openDialog = helpers.fakeOpenDialog('e');
-  helpers.doKeys('/', 'q');
-  helpers.assertCursorAt(0, 2);
-  helpers.doKeys('@', 'c');
-  helpers.assertCursorAt(0, 7);
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 13);
-}, { value: 'one line of text.'});
-testVim('macro_multislash_search', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'd');
-  cm.openDialog = helpers.fakeOpenDialog('e');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('t');
-  helpers.doKeys('/', 'q');
-  helpers.assertCursorAt(0, 12);
-  helpers.doKeys('@', 'd');
-  helpers.assertCursorAt(0, 15);
-}, { value: 'one line of text to rule them all.'});
-testVim('macro_last_ex_command_register', function (cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doEx('s/a/b');
-  helpers.doKeys('2', '@', ':');
-  eq('bbbaa', cm.getValue());
-  helpers.assertCursorAt(0, 2);
-}, { value: 'aaaaa'});
-testVim('macro_parens', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'z', 'i');
-  cm.replaceRange('(', cm.getCursor());
-  helpers.doKeys('');
-  helpers.doKeys('e', 'a');
-  cm.replaceRange(')', cm.getCursor());
-  helpers.doKeys('');
-  helpers.doKeys('q');
-  helpers.doKeys('w', '@', 'z');
-  helpers.doKeys('w', '@', 'z');
-  eq('(see) (spot) (run)', cm.getValue());
-}, { value: 'see spot run'});
-testVim('macro_overwrite', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'z', '0', 'i');
-  cm.replaceRange('I ', cm.getCursor());
-  helpers.doKeys('');
-  helpers.doKeys('q');
-  helpers.doKeys('e');
-  // Now replace the macro with something else.
-  helpers.doKeys('q', 'z', 'a');
-  cm.replaceRange('.', cm.getCursor());
-  helpers.doKeys('');
-  helpers.doKeys('q');
-  helpers.doKeys('e', '@', 'z');
-  helpers.doKeys('e', '@', 'z');
-  eq('I see. spot. run.', cm.getValue());
-}, { value: 'see spot run'});
-testVim('macro_search_f', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', 'f', ' ');
-  helpers.assertCursorAt(0,3);
-  helpers.doKeys('q', '0');
-  helpers.assertCursorAt(0,0);
-  helpers.doKeys('@', 'a');
-  helpers.assertCursorAt(0,3);
-}, { value: 'The quick brown fox jumped over the lazy dog.'});
-testVim('macro_search_2f', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', '2', 'f', ' ');
-  helpers.assertCursorAt(0,9);
-  helpers.doKeys('q', '0');
-  helpers.assertCursorAt(0,0);
-  helpers.doKeys('@', 'a');
-  helpers.assertCursorAt(0,9);
-}, { value: 'The quick brown fox jumped over the lazy dog.'});
-testVim('yank_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'y');
-  helpers.doKeys('j', '"', 'b', 'y', 'y');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+foo/.test(text));
-    is(/b\s+bar/.test(text));
-  });
-  helpers.doKeys(':');
-}, { value: 'foo\nbar'});
-testVim('yank_visual_block', function(cm, vim, helpers) {
-  cm.setCursor(0, 1);
-  helpers.doKeys('', 'l', 'j', '"', 'a', 'y');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+oo\nar/.test(text));
-  });
-  helpers.doKeys(':');
-}, { value: 'foo\nbar'});
-testVim('yank_append_line_to_line_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'y');
-  helpers.doKeys('j', '"', 'A', 'y', 'y');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+foo\nbar/.test(text));
-    is(/"\s+foo\nbar/.test(text));
-  });
-  helpers.doKeys(':');
-}, { value: 'foo\nbar'});
-testVim('yank_append_word_to_word_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'w');
-  helpers.doKeys('j', '"', 'A', 'y', 'w');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+foobar/.test(text));
-    is(/"\s+foobar/.test(text));
-  });
-  helpers.doKeys(':');
-}, { value: 'foo\nbar'});
-testVim('yank_append_line_to_word_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'w');
-  helpers.doKeys('j', '"', 'A', 'y', 'y');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+foo\nbar/.test(text));
-    is(/"\s+foo\nbar/.test(text));
-  });
-  helpers.doKeys(':');
-}, { value: 'foo\nbar'});
-testVim('yank_append_word_to_line_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('"', 'a', 'y', 'y');
-  helpers.doKeys('j', '"', 'A', 'y', 'w');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+foo\nbar/.test(text));
-    is(/"\s+foo\nbar/.test(text));
-  });
-  helpers.doKeys(':');
-}, { value: 'foo\nbar'});
-testVim('macro_register', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('q', 'a', 'i');
-  cm.replaceRange('gangnam', cm.getCursor());
-  helpers.doKeys('');
-  helpers.doKeys('q');
-  helpers.doKeys('q', 'b', 'o');
-  cm.replaceRange('style', cm.getCursor());
-  helpers.doKeys('');
-  helpers.doKeys('q');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/a\s+i/.test(text));
-    is(/b\s+o/.test(text));
-  });
-  helpers.doKeys(':');
-}, { value: ''});
-testVim('._register', function(cm,vim,helpers) {
-  cm.setCursor(0,0);
-  helpers.doKeys('i');
-  cm.replaceRange('foo',cm.getCursor());
-  helpers.doKeys('');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/\.\s+foo/.test(text));
-  });
-  helpers.doKeys(':');
-}, {value: ''});
-testVim(':_register', function(cm,vim,helpers) {
-  helpers.doEx('bar');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/:\s+bar/.test(text));
-  });
-  helpers.doKeys(':');
-}, {value: ''});
-testVim('search_register_escape', function(cm, vim, helpers) {
-  // Check that the register is restored if the user escapes rather than confirms.
-  cm.openDialog = helpers.fakeOpenDialog('waldo');
-  helpers.doKeys('/');
-  var onKeyDown;
-  var onKeyUp;
-  var KEYCODES = {
-    f: 70,
-    o: 79,
-    Esc: 27
-  };
-  cm.openDialog = function(template, callback, options) {
-    onKeyDown = options.onKeyDown;
-    onKeyUp = options.onKeyUp;
-  };
-  var close = function() {};
-  helpers.doKeys('/');
-  // Fake some keyboard events coming in.
-  onKeyDown({keyCode: KEYCODES.f}, '', close);
-  onKeyUp({keyCode: KEYCODES.f}, '', close);
-  onKeyDown({keyCode: KEYCODES.o}, 'f', close);
-  onKeyUp({keyCode: KEYCODES.o}, 'f', close);
-  onKeyDown({keyCode: KEYCODES.o}, 'fo', close);
-  onKeyUp({keyCode: KEYCODES.o}, 'fo', close);
-  onKeyDown({keyCode: KEYCODES.Esc}, 'foo', close);
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/waldo/.test(text));
-    is(!/foo/.test(text));
-  });
-  helpers.doKeys(':');
-}, {value: ''});
-testVim('search_register', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('foo');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    is(/\/\s+foo/.test(text));
-  });
-  helpers.doKeys(':');
-}, {value: ''});
-testVim('search_history', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('this');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('checks');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('search');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('history');
-  helpers.doKeys('/');
-  cm.openDialog = helpers.fakeOpenDialog('checks');
-  helpers.doKeys('/');
-  var onKeyDown;
-  var onKeyUp;
-  var query = '';
-  var keyCodes = {
-    Up: 38,
-    Down: 40
-  };
-  cm.openDialog = function(template, callback, options) {
-    onKeyUp = options.onKeyUp;
-    onKeyDown = options.onKeyDown;
-  };
-  var close = function(newVal) {
-    if (typeof newVal == 'string') query = newVal;
-  }
-  helpers.doKeys('/');
-  onKeyDown({keyCode: keyCodes.Up}, query, close);
-  onKeyUp({keyCode: keyCodes.Up}, query, close);
-  eq(query, 'checks');
-  onKeyDown({keyCode: keyCodes.Up}, query, close);
-  onKeyUp({keyCode: keyCodes.Up}, query, close);
-  eq(query, 'history');
-  onKeyDown({keyCode: keyCodes.Up}, query, close);
-  onKeyUp({keyCode: keyCodes.Up}, query, close);
-  eq(query, 'search');
-  onKeyDown({keyCode: keyCodes.Up}, query, close);
-  onKeyUp({keyCode: keyCodes.Up}, query, close);
-  eq(query, 'this');
-  onKeyDown({keyCode: keyCodes.Down}, query, close);
-  onKeyUp({keyCode: keyCodes.Down}, query, close);
-  eq(query, 'search');
-}, {value: ''});
-testVim('exCommand_history', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('registers');
-  helpers.doKeys(':');
-  cm.openDialog = helpers.fakeOpenDialog('sort');
-  helpers.doKeys(':');
-  cm.openDialog = helpers.fakeOpenDialog('map');
-  helpers.doKeys(':');
-  cm.openDialog = helpers.fakeOpenDialog('invalid');
-  helpers.doKeys(':');
-  var onKeyDown;
-  var onKeyUp;
-  var input = '';
-  var keyCodes = {
-    Up: 38,
-    Down: 40,
-    s: 115
-  };
-  cm.openDialog = function(template, callback, options) {
-    onKeyUp = options.onKeyUp;
-    onKeyDown = options.onKeyDown;
-  };
-  var close = function(newVal) {
-    if (typeof newVal == 'string') input = newVal;
-  }
-  helpers.doKeys(':');
-  onKeyDown({keyCode: keyCodes.Up}, input, close);
-  eq(input, 'invalid');
-  onKeyDown({keyCode: keyCodes.Up}, input, close);
-  eq(input, 'map');
-  onKeyDown({keyCode: keyCodes.Up}, input, close);
-  eq(input, 'sort');
-  onKeyDown({keyCode: keyCodes.Up}, input, close);
-  eq(input, 'registers');
-  onKeyDown({keyCode: keyCodes.s}, '', close);
-  input = 's';
-  onKeyDown({keyCode: keyCodes.Up}, input, close);
-  eq(input, 'sort');
-}, {value: ''});
-testVim('search_clear', function(cm, vim, helpers) {
-  var onKeyDown;
-  var input = '';
-  var keyCodes = {
-    Ctrl: 17,
-    u: 85
-  };
-  cm.openDialog = function(template, callback, options) {
-    onKeyDown = options.onKeyDown;
-  };
-  var close = function(newVal) {
-    if (typeof newVal == 'string') input = newVal;
-  }
-  helpers.doKeys('/');
-  input = 'foo';
-  onKeyDown({keyCode: keyCodes.Ctrl}, input, close);
-  onKeyDown({keyCode: keyCodes.u, ctrlKey: true}, input, close);
-  eq(input, '');
-});
-testVim('exCommand_clear', function(cm, vim, helpers) {
-  var onKeyDown;
-  var input = '';
-  var keyCodes = {
-    Ctrl: 17,
-    u: 85
-  };
-  cm.openDialog = function(template, callback, options) {
-    onKeyDown = options.onKeyDown;
-  };
-  var close = function(newVal) {
-    if (typeof newVal == 'string') input = newVal;
-  }
-  helpers.doKeys(':');
-  input = 'foo';
-  onKeyDown({keyCode: keyCodes.Ctrl}, input, close);
-  onKeyDown({keyCode: keyCodes.u, ctrlKey: true}, input, close);
-  eq(input, '');
-});
-testVim('.', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', 'd', 'w');
-  helpers.doKeys('.');
-  eq('5 6', cm.getValue());
-}, { value: '1 2 3 4 5 6'});
-testVim('._repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('2', 'd', 'w');
-  helpers.doKeys('3', '.');
-  eq('6', cm.getValue());
-}, { value: '1 2 3 4 5 6'});
-testVim('._insert', function(cm, vim, helpers) {
-  helpers.doKeys('i');
-  cm.replaceRange('test', cm.getCursor());
-  helpers.doKeys('');
-  helpers.doKeys('.');
-  eq('testestt', cm.getValue());
-  helpers.assertCursorAt(0, 6);
-}, { value: ''});
-testVim('._insert_repeat', function(cm, vim, helpers) {
-  helpers.doKeys('i');
-  cm.replaceRange('test', cm.getCursor());
-  cm.setCursor(0, 4);
-  helpers.doKeys('');
-  helpers.doKeys('2', '.');
-  eq('testesttestt', cm.getValue());
-  helpers.assertCursorAt(0, 10);
-}, { value: ''});
-testVim('._repeat_insert', function(cm, vim, helpers) {
-  helpers.doKeys('3', 'i');
-  cm.replaceRange('te', cm.getCursor());
-  cm.setCursor(0, 2);
-  helpers.doKeys('');
-  helpers.doKeys('.');
-  eq('tetettetetee', cm.getValue());
-  helpers.assertCursorAt(0, 10);
-}, { value: ''});
-testVim('._insert_o', function(cm, vim, helpers) {
-  helpers.doKeys('o');
-  cm.replaceRange('z', cm.getCursor());
-  cm.setCursor(1, 1);
-  helpers.doKeys('');
-  helpers.doKeys('.');
-  eq('\nz\nz', cm.getValue());
-  helpers.assertCursorAt(2, 0);
-}, { value: ''});
-testVim('._insert_o_repeat', function(cm, vim, helpers) {
-  helpers.doKeys('o');
-  cm.replaceRange('z', cm.getCursor());
-  helpers.doKeys('');
-  cm.setCursor(1, 0);
-  helpers.doKeys('2', '.');
-  eq('\nz\nz\nz', cm.getValue());
-  helpers.assertCursorAt(3, 0);
-}, { value: ''});
-testVim('._insert_o_indent', function(cm, vim, helpers) {
-  helpers.doKeys('o');
-  cm.replaceRange('z', cm.getCursor());
-  helpers.doKeys('');
-  cm.setCursor(1, 2);
-  helpers.doKeys('.');
-  eq('{\n  z\n  z', cm.getValue());
-  helpers.assertCursorAt(2, 2);
-}, { value: '{'});
-testVim('._insert_cw', function(cm, vim, helpers) {
-  helpers.doKeys('c', 'w');
-  cm.replaceRange('test', cm.getCursor());
-  helpers.doKeys('');
-  cm.setCursor(0, 3);
-  helpers.doKeys('2', 'l');
-  helpers.doKeys('.');
-  eq('test test word3', cm.getValue());
-  helpers.assertCursorAt(0, 8);
-}, { value: 'word1 word2 word3' });
-testVim('._insert_cw_repeat', function(cm, vim, helpers) {
-  // For some reason, repeat cw in desktop VIM will does not repeat insert mode
-  // changes. Will conform to that behavior.
-  helpers.doKeys('c', 'w');
-  cm.replaceRange('test', cm.getCursor());
-  helpers.doKeys('');
-  cm.setCursor(0, 4);
-  helpers.doKeys('l');
-  helpers.doKeys('2', '.');
-  eq('test test', cm.getValue());
-  helpers.assertCursorAt(0, 8);
-}, { value: 'word1 word2 word3' });
-testVim('._delete', function(cm, vim, helpers) {
-  cm.setCursor(0, 5);
-  helpers.doKeys('i');
-  helpers.doInsertModeKeys('Backspace');
-  helpers.doKeys('');
-  helpers.doKeys('.');
-  eq('zace', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-}, { value: 'zabcde'});
-testVim('._delete_repeat', function(cm, vim, helpers) {
-  cm.setCursor(0, 6);
-  helpers.doKeys('i');
-  helpers.doInsertModeKeys('Backspace');
-  helpers.doKeys('');
-  helpers.doKeys('2', '.');
-  eq('zzce', cm.getValue());
-  helpers.assertCursorAt(0, 1);
-}, { value: 'zzabcde'});
-testVim('._visual_>', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('V', 'j', '>');
-  cm.setCursor(2, 0)
-  helpers.doKeys('.');
-  eq('  1\n  2\n  3\n  4', cm.getValue());
-  helpers.assertCursorAt(2, 2);
-}, { value: '1\n2\n3\n4'});
-testVim('f;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('f', 'x');
-  helpers.doKeys(';');
-  helpers.doKeys('2', ';');
-  eq(9, cm.getCursor().ch);
-}, { value: '01x3xx678x'});
-testVim('F;', function(cm, vim, helpers) {
-  cm.setCursor(0, 8);
-  helpers.doKeys('F', 'x');
-  helpers.doKeys(';');
-  helpers.doKeys('2', ';');
-  eq(2, cm.getCursor().ch);
-}, { value: '01x3xx6x8x'});
-testVim('t;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('t', 'x');
-  helpers.doKeys(';');
-  helpers.doKeys('2', ';');
-  eq(8, cm.getCursor().ch);
-}, { value: '01x3xx678x'});
-testVim('T;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('T', 'x');
-  helpers.doKeys(';');
-  helpers.doKeys('2', ';');
-  eq(2, cm.getCursor().ch);
-}, { value: '0xx3xx678x'});
-testVim('f,', function(cm, vim, helpers) {
-  cm.setCursor(0, 6);
-  helpers.doKeys('f', 'x');
-  helpers.doKeys(',');
-  helpers.doKeys('2', ',');
-  eq(2, cm.getCursor().ch);
-}, { value: '01x3xx678x'});
-testVim('F,', function(cm, vim, helpers) {
-  cm.setCursor(0, 3);
-  helpers.doKeys('F', 'x');
-  helpers.doKeys(',');
-  helpers.doKeys('2', ',');
-  eq(9, cm.getCursor().ch);
-}, { value: '01x3xx678x'});
-testVim('t,', function(cm, vim, helpers) {
-  cm.setCursor(0, 6);
-  helpers.doKeys('t', 'x');
-  helpers.doKeys(',');
-  helpers.doKeys('2', ',');
-  eq(3, cm.getCursor().ch);
-}, { value: '01x3xx678x'});
-testVim('T,', function(cm, vim, helpers) {
-  cm.setCursor(0, 4);
-  helpers.doKeys('T', 'x');
-  helpers.doKeys(',');
-  helpers.doKeys('2', ',');
-  eq(8, cm.getCursor().ch);
-}, { value: '01x3xx67xx'});
-testVim('fd,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('f', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ';');
-  eq('56789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('d', ',');
-  eq('01239', cm.getValue());
-}, { value: '0123456789'});
-testVim('Fd,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('F', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('d', ';');
-  eq('01239', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ',');
-  eq('56789', cm.getValue());
-}, { value: '0123456789'});
-testVim('td,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('t', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ';');
-  eq('456789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('d', ',');
-  eq('012349', cm.getValue());
-}, { value: '0123456789'});
-testVim('Td,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('T', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('d', ';');
-  eq('012349', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('d', ',');
-  eq('456789', cm.getValue());
-}, { value: '0123456789'});
-testVim('fc,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('f', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', ';', '');
-  eq('56789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('c', ',');
-  eq('01239', cm.getValue());
-}, { value: '0123456789'});
-testVim('Fc,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('F', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('c', ';', '');
-  eq('01239', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', ',');
-  eq('56789', cm.getValue());
-}, { value: '0123456789'});
-testVim('tc,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('t', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', ';', '');
-  eq('456789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('c', ',');
-  eq('012349', cm.getValue());
-}, { value: '0123456789'});
-testVim('Tc,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('T', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('c', ';', '');
-  eq('012349', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('c', ',');
-  eq('456789', cm.getValue());
-}, { value: '0123456789'});
-testVim('fy,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('f', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('y', ';', 'P');
-  eq('012340123456789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('y', ',', 'P');
-  eq('012345678456789', cm.getValue());
-}, { value: '0123456789'});
-testVim('Fy,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('F', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('y', ';', 'p');
-  eq('012345678945678', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('y', ',', 'P');
-  eq('012340123456789', cm.getValue());
-}, { value: '0123456789'});
-testVim('ty,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys('t', '4');
-  cm.setCursor(0, 0);
-  helpers.doKeys('y', ';', 'P');
-  eq('01230123456789', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 9);
-  helpers.doKeys('y', ',', 'p');
-  eq('01234567895678', cm.getValue());
-}, { value: '0123456789'});
-testVim('Ty,;', function(cm, vim, helpers) {
-  cm.setCursor(0, 9);
-  helpers.doKeys('T', '4');
-  cm.setCursor(0, 9);
-  helpers.doKeys('y', ';', 'p');
-  eq('01234567895678', cm.getValue());
-  helpers.doKeys('u');
-  cm.setCursor(0, 0);
-  helpers.doKeys('y', ',', 'P');
-  eq('01230123456789', cm.getValue());
-}, { value: '0123456789'});
-testVim('HML', function(cm, vim, helpers) {
-  var lines = 35;
-  var textHeight = cm.defaultTextHeight();
-  cm.setSize(600, lines*textHeight);
-  cm.setCursor(120, 0);
-  helpers.doKeys('H');
-  helpers.assertCursorAt(86, 2);
-  helpers.doKeys('L');
-  helpers.assertCursorAt(120, 4);
-  helpers.doKeys('M');
-  helpers.assertCursorAt(103,4);
-}, { value: (function(){
-  var lines = new Array(100);
-  var upper = '  xx\n';
-  var lower = '    xx\n';
-  upper = lines.join(upper);
-  lower = lines.join(lower);
-  return upper + lower;
-})()});
-
-var zVals = [];
-forEach(['zb','zz','zt','z-','z.','z'], function(e, idx){
-  var lineNum = 250;
-  var lines = 35;
-  testVim(e, function(cm, vim, helpers) {
-    var k1 = e[0];
-    var k2 = e.substring(1);
-    var textHeight = cm.defaultTextHeight();
-    cm.setSize(600, lines*textHeight);
-    cm.setCursor(lineNum, 0);
-    helpers.doKeys(k1, k2);
-    zVals[idx] = cm.getScrollInfo().top;
-  }, { value: (function(){
-    return new Array(500).join('\n');
-  })()});
-});
-testVim('zb', function(cm, vim, helpers){
-  eq(zVals[2], zVals[5]);
-});
-
-var moveTillCharacterSandbox =
-  'The quick brown fox \n';
-testVim('moveTillCharacter', function(cm, vim, helpers){
-  cm.setCursor(0, 0);
-  // Search for the 'q'.
-  cm.openDialog = helpers.fakeOpenDialog('q');
-  helpers.doKeys('/');
-  eq(4, cm.getCursor().ch);
-  // Jump to just before the first o in the list.
-  helpers.doKeys('t');
-  helpers.doKeys('o');
-  eq('The quick brown fox \n', cm.getValue());
-  // Delete that one character.
-  helpers.doKeys('d');
-  helpers.doKeys('t');
-  helpers.doKeys('o');
-  eq('The quick bown fox \n', cm.getValue());
-  // Delete everything until the next 'o'.
-  helpers.doKeys('.');
-  eq('The quick box \n', cm.getValue());
-  // An unmatched character should have no effect.
-  helpers.doKeys('d');
-  helpers.doKeys('t');
-  helpers.doKeys('q');
-  eq('The quick box \n', cm.getValue());
-  // Matches should only be possible on single lines.
-  helpers.doKeys('d');
-  helpers.doKeys('t');
-  helpers.doKeys('z');
-  eq('The quick box \n', cm.getValue());
-  // After all that, the search for 'q' should still be active, so the 'N' command
-  // can run it again in reverse. Use that to delete everything back to the 'q'.
-  helpers.doKeys('d');
-  helpers.doKeys('N');
-  eq('The ox \n', cm.getValue());
-  eq(4, cm.getCursor().ch);
-}, { value: moveTillCharacterSandbox});
-testVim('searchForPipe', function(cm, vim, helpers){
-  CodeMirror.Vim.setOption('pcre', false);
-  cm.setCursor(0, 0);
-  // Search for the '|'.
-  cm.openDialog = helpers.fakeOpenDialog('|');
-  helpers.doKeys('/');
-  eq(4, cm.getCursor().ch);
-}, { value: 'this|that'});
-
-
-var scrollMotionSandbox =
-  '\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n';
-testVim('scrollMotion', function(cm, vim, helpers){
-  var prevCursor, prevScrollInfo;
-  cm.setCursor(0, 0);
-  // ctrl-y at the top of the file should have no effect.
-  helpers.doKeys('');
-  eq(0, cm.getCursor().line);
-  prevScrollInfo = cm.getScrollInfo();
-  helpers.doKeys('');
-  eq(1, cm.getCursor().line);
-  is(prevScrollInfo.top < cm.getScrollInfo().top);
-  // Jump to the end of the sandbox.
-  cm.setCursor(1000, 0);
-  prevCursor = cm.getCursor();
-  // ctrl-e at the bottom of the file should have no effect.
-  helpers.doKeys('');
-  eq(prevCursor.line, cm.getCursor().line);
-  prevScrollInfo = cm.getScrollInfo();
-  helpers.doKeys('');
-  eq(prevCursor.line - 1, cm.getCursor().line, "Y");
-  is(prevScrollInfo.top > cm.getScrollInfo().top);
-}, { value: scrollMotionSandbox});
-
-var squareBracketMotionSandbox = ''+
-  '({\n'+//0
-  '  ({\n'+//11
-  '  /*comment {\n'+//2
-  '            */(\n'+//3
-  '#else                \n'+//4
-  '  /*       )\n'+//5
-  '#if        }\n'+//6
-  '  )}*/\n'+//7
-  ')}\n'+//8
-  '{}\n'+//9
-  '#else {{\n'+//10
-  '{}\n'+//11
-  '}\n'+//12
-  '{\n'+//13
-  '#endif\n'+//14
-  '}\n'+//15
-  '}\n'+//16
-  '#else';//17
-testVim('[[, ]]', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys(']', ']');
-  helpers.assertCursorAt(9,0);
-  helpers.doKeys('2', ']', ']');
-  helpers.assertCursorAt(13,0);
-  helpers.doKeys(']', ']');
-  helpers.assertCursorAt(17,0);
-  helpers.doKeys('[', '[');
-  helpers.assertCursorAt(13,0);
-  helpers.doKeys('2', '[', '[');
-  helpers.assertCursorAt(9,0);
-  helpers.doKeys('[', '[');
-  helpers.assertCursorAt(0,0);
-}, { value: squareBracketMotionSandbox});
-testVim('[], ][', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doKeys(']', '[');
-  helpers.assertCursorAt(12,0);
-  helpers.doKeys('2', ']', '[');
-  helpers.assertCursorAt(16,0);
-  helpers.doKeys(']', '[');
-  helpers.assertCursorAt(17,0);
-  helpers.doKeys('[', ']');
-  helpers.assertCursorAt(16,0);
-  helpers.doKeys('2', '[', ']');
-  helpers.assertCursorAt(12,0);
-  helpers.doKeys('[', ']');
-  helpers.assertCursorAt(0,0);
-}, { value: squareBracketMotionSandbox});
-testVim('[{, ]}', function(cm, vim, helpers) {
-  cm.setCursor(4, 10);
-  helpers.doKeys('[', '{');
-  helpers.assertCursorAt(2,12);
-  helpers.doKeys('2', '[', '{');
-  helpers.assertCursorAt(0,1);
-  cm.setCursor(4, 10);
-  helpers.doKeys(']', '}');
-  helpers.assertCursorAt(6,11);
-  helpers.doKeys('2', ']', '}');
-  helpers.assertCursorAt(8,1);
-  cm.setCursor(0,1);
-  helpers.doKeys(']', '}');
-  helpers.assertCursorAt(8,1);
-  helpers.doKeys('[', '{');
-  helpers.assertCursorAt(0,1);
-}, { value: squareBracketMotionSandbox});
-testVim('[(, ])', function(cm, vim, helpers) {
-  cm.setCursor(4, 10);
-  helpers.doKeys('[', '(');
-  helpers.assertCursorAt(3,14);
-  helpers.doKeys('2', '[', '(');
-  helpers.assertCursorAt(0,0);
-  cm.setCursor(4, 10);
-  helpers.doKeys(']', ')');
-  helpers.assertCursorAt(5,11);
-  helpers.doKeys('2', ']', ')');
-  helpers.assertCursorAt(8,0);
-  helpers.doKeys('[', '(');
-  helpers.assertCursorAt(0,0);
-  helpers.doKeys(']', ')');
-  helpers.assertCursorAt(8,0);
-}, { value: squareBracketMotionSandbox});
-testVim('[*, ]*, [/, ]/', function(cm, vim, helpers) {
-  forEach(['*', '/'], function(key){
-    cm.setCursor(7, 0);
-    helpers.doKeys('2', '[', key);
-    helpers.assertCursorAt(2,2);
-    helpers.doKeys('2', ']', key);
-    helpers.assertCursorAt(7,5);
-  });
-}, { value: squareBracketMotionSandbox});
-testVim('[#, ]#', function(cm, vim, helpers) {
-  cm.setCursor(10, 3);
-  helpers.doKeys('2', '[', '#');
-  helpers.assertCursorAt(4,0);
-  helpers.doKeys('5', ']', '#');
-  helpers.assertCursorAt(17,0);
-  cm.setCursor(10, 3);
-  helpers.doKeys(']', '#');
-  helpers.assertCursorAt(14,0);
-}, { value: squareBracketMotionSandbox});
-testVim('[m, ]m, [M, ]M', function(cm, vim, helpers) {
-  cm.setCursor(11, 0);
-  helpers.doKeys('[', 'm');
-  helpers.assertCursorAt(10,7);
-  helpers.doKeys('4', '[', 'm');
-  helpers.assertCursorAt(1,3);
-  helpers.doKeys('5', ']', 'm');
-  helpers.assertCursorAt(11,0);
-  helpers.doKeys('[', 'M');
-  helpers.assertCursorAt(9,1);
-  helpers.doKeys('3', ']', 'M');
-  helpers.assertCursorAt(15,0);
-  helpers.doKeys('5', '[', 'M');
-  helpers.assertCursorAt(7,3);
-}, { value: squareBracketMotionSandbox});
-
-// Ex mode tests
-testVim('ex_go_to_line', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doEx('4');
-  helpers.assertCursorAt(3, 0);
-}, { value: 'a\nb\nc\nd\ne\n'});
-testVim('ex_write', function(cm, vim, helpers) {
-  var tmp = CodeMirror.commands.save;
-  var written;
-  var actualCm;
-  CodeMirror.commands.save = function(cm) {
-    written = true;
-    actualCm = cm;
-  };
-  // Test that w, wr, wri ... write all trigger :write.
-  var command = 'write';
-  for (var i = 1; i < command.length; i++) {
-    written = false;
-    actualCm = null;
-    helpers.doEx(command.substring(0, i));
-    eq(written, true);
-    eq(actualCm, cm);
-  }
-  CodeMirror.commands.save = tmp;
-});
-testVim('ex_sort', function(cm, vim, helpers) {
-  helpers.doEx('sort');
-  eq('Z\na\nb\nc\nd', cm.getValue());
-}, { value: 'b\nZ\nd\nc\na'});
-testVim('ex_sort_reverse', function(cm, vim, helpers) {
-  helpers.doEx('sort!');
-  eq('d\nc\nb\na', cm.getValue());
-}, { value: 'b\nd\nc\na'});
-testVim('ex_sort_range', function(cm, vim, helpers) {
-  helpers.doEx('2,3sort');
-  eq('b\nc\nd\na', cm.getValue());
-}, { value: 'b\nd\nc\na'});
-testVim('ex_sort_oneline', function(cm, vim, helpers) {
-  helpers.doEx('2sort');
-  // Expect no change.
-  eq('b\nd\nc\na', cm.getValue());
-}, { value: 'b\nd\nc\na'});
-testVim('ex_sort_ignoreCase', function(cm, vim, helpers) {
-  helpers.doEx('sort i');
-  eq('a\nb\nc\nd\nZ', cm.getValue());
-}, { value: 'b\nZ\nd\nc\na'});
-testVim('ex_sort_unique', function(cm, vim, helpers) {
-  helpers.doEx('sort u');
-  eq('Z\na\nb\nc\nd', cm.getValue());
-}, { value: 'b\nZ\na\na\nd\na\nc\na'});
-testVim('ex_sort_decimal', function(cm, vim, helpers) {
-  helpers.doEx('sort d');
-  eq('d3\n s5\n6\n.9', cm.getValue());
-}, { value: '6\nd3\n s5\n.9'});
-testVim('ex_sort_decimal_negative', function(cm, vim, helpers) {
-  helpers.doEx('sort d');
-  eq('z-9\nd3\n s5\n6\n.9', cm.getValue());
-}, { value: '6\nd3\n s5\n.9\nz-9'});
-testVim('ex_sort_decimal_reverse', function(cm, vim, helpers) {
-  helpers.doEx('sort! d');
-  eq('.9\n6\n s5\nd3', cm.getValue());
-}, { value: '6\nd3\n s5\n.9'});
-testVim('ex_sort_hex', function(cm, vim, helpers) {
-  helpers.doEx('sort x');
-  eq(' s5\n6\n.9\n&0xB\nd3', cm.getValue());
-}, { value: '6\nd3\n s5\n&0xB\n.9'});
-testVim('ex_sort_octal', function(cm, vim, helpers) {
-  helpers.doEx('sort o');
-  eq('.8\n.9\nd3\n s5\n6', cm.getValue());
-}, { value: '6\nd3\n s5\n.9\n.8'});
-testVim('ex_sort_decimal_mixed', function(cm, vim, helpers) {
-  helpers.doEx('sort d');
-  eq('y\nz\nc1\nb2\na3', cm.getValue());
-}, { value: 'a3\nz\nc1\ny\nb2'});
-testVim('ex_sort_decimal_mixed_reverse', function(cm, vim, helpers) {
-  helpers.doEx('sort! d');
-  eq('a3\nb2\nc1\nz\ny', cm.getValue());
-}, { value: 'a3\nz\nc1\ny\nb2'});
-testVim('ex_sort_patterns_not_supported', function(cm, vim, helpers) {
-  var notified = false;
-  cm.openNotification = helpers.fakeOpenNotification(function(text) {
-    notified = /patterns not supported/.test(text);
-  });
-  helpers.doEx('sort /abc/');
-  is(notified, 'No notification.');
-});
-// test for :global command
-testVim('ex_global', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  helpers.doEx('g/one/s//two');
-  eq('two two\n two two\n two two', cm.getValue());
-  helpers.doEx('1,2g/two/s//one');
-  eq('one one\n one one\n two two', cm.getValue());
-}, {value: 'one one\n one one\n one one'});
-testVim('ex_global_confirm', function(cm, vim, helpers) {
-  cm.setCursor(0, 0);
-  var onKeyDown;
-  var openDialogSave = cm.openDialog;
-  var KEYCODES = {
-    a: 65,
-    n: 78,
-    q: 81,
-    y: 89
-  };
-  // Intercept the ex command, 'global'
-  cm.openDialog = function(template, callback, options) {
-    // Intercept the prompt for the embedded ex command, 'substitute'
-    cm.openDialog = function(template, callback, options) {
-      onKeyDown = options.onKeyDown;
-    };
-    callback('g/one/s//two/gc');
-  };
-  helpers.doKeys(':');
-  var close = function() {};
-  onKeyDown({keyCode: KEYCODES.n}, '', close);
-  onKeyDown({keyCode: KEYCODES.y}, '', close);
-  onKeyDown({keyCode: KEYCODES.a}, '', close);
-  onKeyDown({keyCode: KEYCODES.q}, '', close);
-  onKeyDown({keyCode: KEYCODES.y}, '', close);
-  eq('one two\n two two\n one one\n two one\n one one', cm.getValue());
-}, {value: 'one one\n one one\n one one\n one one\n one one'});
-// Basic substitute tests.
-testVim('ex_substitute_same_line', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('s/one/two/g');
-  eq('one one\n two two', cm.getValue());
-}, { value: 'one one\n one one'});
-testVim('ex_substitute_full_file', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('%s/one/two/g');
-  eq('two two\n two two', cm.getValue());
-}, { value: 'one one\n one one'});
-testVim('ex_substitute_input_range', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  helpers.doEx('1,3s/\\d/0/g');
-  eq('0\n0\n0\n4', cm.getValue());
-}, { value: '1\n2\n3\n4' });
-testVim('ex_substitute_visual_range', function(cm, vim, helpers) {
-  cm.setCursor(1, 0);
-  // Set last visual mode selection marks '< and '> at lines 2 and 4
-  helpers.doKeys('V', '2', 'j', 'v');
-  helpers.doEx('\'<,\'>s/\\d/0/g');
-  eq('1\n0\n0\n0\n5', cm.getValue());
-}, { value: '1\n2\n3\n4\n5' });
-testVim('ex_substitute_empty_query', function(cm, vim, helpers) {
-  // If the query is empty, use last query.
-  cm.setCursor(1, 0);
-  cm.openDialog = helpers.fakeOpenDialog('1');
-  helpers.doKeys('/');
-  helpers.doEx('s//b/g');
-  eq('abb ab2 ab3', cm.getValue());
-}, { value: 'a11 a12 a13' });
-testVim('ex_substitute_javascript', function(cm, vim, helpers) {
-  CodeMirror.Vim.setOption('pcre', false);
-  cm.setCursor(1, 0);
-  // Throw all the things that javascript likes to treat as special values
-  // into the replace part. All should be literal (this is VIM).
-  helpers.doEx('s/\\(\\d+\\)/$$ $\' $` $& \\1/g')
-  eq('a $$ $\' $` $& 0 b', cm.getValue());
-}, { value: 'a 0 b' });
-testVim('ex_substitute_empty_arguments', function(cm,vim,helpers) {
-  cm.setCursor(0, 0);
-  helpers.doEx('s/a/b/g');
-  cm.setCursor(1, 0);
-  helpers.doEx('s');
-  eq('b b\nb a', cm.getValue());
-}, {value: 'a a\na a'});
-
-// More complex substitute tests that test both pcre and nopcre options.
-function testSubstitute(name, options) {
-  testVim(name + '_pcre', function(cm, vim, helpers) {
-    cm.setCursor(1, 0);
-    CodeMirror.Vim.setOption('pcre', true);
-    helpers.doEx(options.expr);
-    eq(options.expectedValue, cm.getValue());
-  }, options);
-  // If no noPcreExpr is defined, assume that it's the same as the expr.
-  var noPcreExpr = options.noPcreExpr ? options.noPcreExpr : options.expr;
-  testVim(name + '_nopcre', function(cm, vim, helpers) {
-    cm.setCursor(1, 0);
-    CodeMirror.Vim.setOption('pcre', false);
-    helpers.doEx(noPcreExpr);
-    eq(options.expectedValue, cm.getValue());
-  }, options);
-}
-testSubstitute('ex_substitute_capture', {
-  value: 'a11 a12 a13',
-  expectedValue: 'a1111 a1212 a1313',
-  // $n is a backreference
-  expr: 's/(\\d+)/$1$1/g',
-  // \n is a backreference.
-  noPcreExpr: 's/\\(\\d+\\)/\\1\\1/g'});
-testSubstitute('ex_substitute_capture2', {
-  value: 'a 0 b',
-  expectedValue: 'a $00 b',
-  expr: 's/(\\d+)/$$$1$1/g',
-  noPcreExpr: 's/\\(\\d+\\)/$\\1\\1/g'});
-testSubstitute('ex_substitute_nocapture', {
-  value: 'a11 a12 a13',
-  expectedValue: 'a$1$1 a$1$1 a$1$1',
-  expr: 's/(\\d+)/$$1$$1/g',
-  noPcreExpr: 's/\\(\\d+\\)/$1$1/g'});
-testSubstitute('ex_substitute_nocapture2', {
-  value: 'a 0 b',
-  expectedValue: 'a $10 b',
-  expr: 's/(\\d+)/$$1$1/g',
-  noPcreExpr: 's/\\(\\d+\\)/\\$1\\1/g'});
-testSubstitute('ex_substitute_nocapture', {
-  value: 'a b c',
-  expectedValue: 'a $ c',
-  expr: 's/b/$$/',
-  noPcreExpr: 's/b/$/'});
-testSubstitute('ex_substitute_slash_regex', {
-  value: 'one/two \n three/four',
-  expectedValue: 'one|two \n three|four',
-  expr: '%s/\\//|'});
-testSubstitute('ex_substitute_pipe_regex', {
-  value: 'one|two \n three|four',
-  expectedValue: 'one,two \n three,four',
-  expr: '%s/\\|/,/',
-  noPcreExpr: '%s/|/,/'});
-testSubstitute('ex_substitute_or_regex', {
-  value: 'one|two \n three|four',
-  expectedValue: 'ana|twa \n thraa|faar',
-  expr: '%s/o|e|u/a/g',
-  noPcreExpr: '%s/o\\|e\\|u/a/g'});
-testSubstitute('ex_substitute_or_word_regex', {
-  value: 'one|two \n three|four',
-  expectedValue: 'five|five \n three|four',
-  expr: '%s/(one|two)/five/g',
-  noPcreExpr: '%s/\\(one\\|two\\)/five/g'});
-testSubstitute('ex_substitute_backslashslash_regex', {
-  value: 'one\\two \n three\\four',
-  expectedValue: 'one,two \n three,four',
-  expr: '%s/\\\\/,'});
-testSubstitute('ex_substitute_slash_replacement', {
-  value: 'one,two \n three,four',
-  expectedValue: 'one/two \n three/four',
-  expr: '%s/,/\\/'});
-testSubstitute('ex_substitute_backslash_replacement', {
-  value: 'one,two \n three,four',
-  expectedValue: 'one\\two \n three\\four',
-  expr: '%s/,/\\\\/g'});
-testSubstitute('ex_substitute_multibackslash_replacement', {
-  value: 'one,two \n three,four',
-  expectedValue: 'one\\\\\\\\two \n three\\\\\\\\four', // 2*8 backslashes.
-  expr: '%s/,/\\\\\\\\\\\\\\\\/g'}); // 16 backslashes.
-testSubstitute('ex_substitute_newline_replacement', {
-  value: 'one,two \n three,four',
-  expectedValue: 'one\ntwo \n three\nfour',
-  expr: '%s/,/\\n/g'});
-testSubstitute('ex_substitute_braces_word', {
-  value: 'ababab abb ab{2}',
-  expectedValue: 'ab abb ab{2}',
-  expr: '%s/(ab){2}//g',
-  noPcreExpr: '%s/\\(ab\\)\\{2\\}//g'});
-testSubstitute('ex_substitute_braces_range', {
-  value: 'a aa aaa aaaa',
-  expectedValue: 'a   a',
-  expr: '%s/a{2,3}//g',
-  noPcreExpr: '%s/a\\{2,3\\}//g'});
-testSubstitute('ex_substitute_braces_literal', {
-  value: 'ababab abb ab{2}',
-  expectedValue: 'ababab abb ',
-  expr: '%s/ab\\{2\\}//g',
-  noPcreExpr: '%s/ab{2}//g'});
-testSubstitute('ex_substitute_braces_char', {
-  value: 'ababab abb ab{2}',
-  expectedValue: 'ababab  ab{2}',
-  expr: '%s/ab{2}//g',
-  noPcreExpr: '%s/ab\\{2\\}//g'});
-testSubstitute('ex_substitute_braces_no_escape', {
-  value: 'ababab abb ab{2}',
-  expectedValue: 'ababab  ab{2}',
-  expr: '%s/ab{2}//g',
-  noPcreExpr: '%s/ab\\{2}//g'});
-testSubstitute('ex_substitute_count', {
-  value: '1\n2\n3\n4',
-  expectedValue: '1\n0\n0\n4',
-  expr: 's/\\d/0/i 2'});
-testSubstitute('ex_substitute_count_with_range', {
-  value: '1\n2\n3\n4',
-  expectedValue: '1\n2\n0\n0',
-  expr: '1,3s/\\d/0/ 3'});
-testSubstitute('ex_substitute_not_global', {
-  value: 'aaa\nbaa\ncaa',
-  expectedValue: 'xaa\nbxa\ncxa',
-  expr: '%s/a/x/'});
-function testSubstituteConfirm(name, command, initialValue, expectedValue, keys, finalPos) {
-  testVim(name, function(cm, vim, helpers) {
-    var savedOpenDialog = cm.openDialog;
-    var savedKeyName = CodeMirror.keyName;
-    var onKeyDown;
-    var recordedCallback;
-    var closed = true; // Start out closed, set false on second openDialog.
-    function close() {
-      closed = true;
-    }
-    // First openDialog should save callback.
-    cm.openDialog = function(template, callback, options) {
-      recordedCallback = callback;
-    }
-    // Do first openDialog.
-    helpers.doKeys(':');
-    // Second openDialog should save keyDown handler.
-    cm.openDialog = function(template, callback, options) {
-      onKeyDown = options.onKeyDown;
-      closed = false;
-    };
-    // Return the command to Vim and trigger second openDialog.
-    recordedCallback(command);
-    // The event should really use keyCode, but here just mock it out and use
-    // key and replace keyName to just return key.
-    CodeMirror.keyName = function (e) { return e.key; }
-    keys = keys.toUpperCase();
-    for (var i = 0; i < keys.length; i++) {
-      is(!closed);
-      onKeyDown({ key: keys.charAt(i) }, '', close);
-    }
-    try {
-      eq(expectedValue, cm.getValue());
-      helpers.assertCursorAt(finalPos);
-      is(closed);
-    } catch(e) {
-      throw e
-    } finally {
-      // Restore overriden functions.
-      CodeMirror.keyName = savedKeyName;
-      cm.openDialog = savedOpenDialog;
-    }
-  }, { value: initialValue });
-};
-testSubstituteConfirm('ex_substitute_confirm_emptydoc',
-    '%s/x/b/c', '', '', '', makeCursor(0, 0));
-testSubstituteConfirm('ex_substitute_confirm_nomatch',
-    '%s/x/b/c', 'ba a\nbab', 'ba a\nbab', '', makeCursor(0, 0));
-testSubstituteConfirm('ex_substitute_confirm_accept',
-    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'yyy', makeCursor(1, 1));
-testSubstituteConfirm('ex_substitute_confirm_random_keys',
-    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'ysdkywerty', makeCursor(1, 1));
-testSubstituteConfirm('ex_substitute_confirm_some',
-    '%s/a/b/cg', 'ba a\nbab', 'bb a\nbbb', 'yny', makeCursor(1, 1));
-testSubstituteConfirm('ex_substitute_confirm_all',
-    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'a', makeCursor(1, 1));
-testSubstituteConfirm('ex_substitute_confirm_accept_then_all',
-    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbbb', 'ya', makeCursor(1, 1));
-testSubstituteConfirm('ex_substitute_confirm_quit',
-    '%s/a/b/cg', 'ba a\nbab', 'bb a\nbab', 'yq', makeCursor(0, 3));
-testSubstituteConfirm('ex_substitute_confirm_last',
-    '%s/a/b/cg', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
-testSubstituteConfirm('ex_substitute_confirm_oneline',
-    '1s/a/b/cg', 'ba a\nbab', 'bb b\nbab', 'yl', makeCursor(0, 3));
-testSubstituteConfirm('ex_substitute_confirm_range_accept',
-    '1,2s/a/b/cg', 'aa\na \na\na', 'bb\nb \na\na', 'yyy', makeCursor(1, 0));
-testSubstituteConfirm('ex_substitute_confirm_range_some',
-    '1,3s/a/b/cg', 'aa\na \na\na', 'ba\nb \nb\na', 'ynyy', makeCursor(2, 0));
-testSubstituteConfirm('ex_substitute_confirm_range_all',
-    '1,3s/a/b/cg', 'aa\na \na\na', 'bb\nb \nb\na', 'a', makeCursor(2, 0));
-testSubstituteConfirm('ex_substitute_confirm_range_last',
-    '1,3s/a/b/cg', 'aa\na \na\na', 'bb\nb \na\na', 'yyl', makeCursor(1, 0));
-//:noh should clear highlighting of search-results but allow to resume search through n
-testVim('ex_noh_clearSearchHighlight', function(cm, vim, helpers) {
-  cm.openDialog = helpers.fakeOpenDialog('match');
-  helpers.doKeys('?');
-  helpers.doEx('noh');
-  eq(vim.searchState_.getOverlay(),null,'match-highlighting wasn\'t cleared');
-  helpers.doKeys('n');
-  helpers.assertCursorAt(0, 11,'can\'t resume search after clearing highlighting');
-}, { value: 'match nope match \n nope Match' });
-testVim('set_boolean', function(cm, vim, helpers) {
-  CodeMirror.Vim.defineOption('testoption', true, 'boolean');
-  // Test default value is set.
-  is(CodeMirror.Vim.getOption('testoption'));
-  try {
-    // Test fail to set to non-boolean
-    CodeMirror.Vim.setOption('testoption', '5');
-    fail();
-  } catch (expected) {};
-  // Test setOption
-  CodeMirror.Vim.setOption('testoption', false);
-  is(!CodeMirror.Vim.getOption('testoption'));
-});
-testVim('ex_set_boolean', function(cm, vim, helpers) {
-  CodeMirror.Vim.defineOption('testoption', true, 'boolean');
-  // Test default value is set.
-  is(CodeMirror.Vim.getOption('testoption'));
-  try {
-    // Test fail to set to non-boolean
-    helpers.doEx('set testoption=22');
-    fail();
-  } catch (expected) {};
-  // Test setOption
-  helpers.doEx('set notestoption');
-  is(!CodeMirror.Vim.getOption('testoption'));
-});
-testVim('set_string', function(cm, vim, helpers) {
-  CodeMirror.Vim.defineOption('testoption', 'a', 'string');
-  // Test default value is set.
-  eq('a', CodeMirror.Vim.getOption('testoption'));
-  try {
-    // Test fail to set non-string.
-    CodeMirror.Vim.setOption('testoption', true);
-    fail();
-  } catch (expected) {};
-  try {
-    // Test fail to set 'notestoption'
-    CodeMirror.Vim.setOption('notestoption', 'b');
-    fail();
-  } catch (expected) {};
-  // Test setOption
-  CodeMirror.Vim.setOption('testoption', 'c');
-  eq('c', CodeMirror.Vim.getOption('testoption'));
-});
-testVim('ex_set_string', function(cm, vim, helpers) {
-  CodeMirror.Vim.defineOption('testopt', 'a', 'string');
-  // Test default value is set.
-  eq('a', CodeMirror.Vim.getOption('testopt'));
-  try {
-    // Test fail to set 'notestopt'
-    helpers.doEx('set notestopt=b');
-    fail();
-  } catch (expected) {};
-  // Test setOption
-  helpers.doEx('set testopt=c')
-  eq('c', CodeMirror.Vim.getOption('testopt'));
-  helpers.doEx('set testopt=c')
-  eq('c', CodeMirror.Vim.getOption('testopt', cm)); //local || global
-  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'})); // local
-  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'})); // global
-  eq('c', CodeMirror.Vim.getOption('testopt')); // global
-  // Test setOption global
-  helpers.doEx('setg testopt=d')
-  eq('c', CodeMirror.Vim.getOption('testopt', cm));
-  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
-  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
-  eq('d', CodeMirror.Vim.getOption('testopt'));
-  // Test setOption local
-  helpers.doEx('setl testopt=e')
-  eq('e', CodeMirror.Vim.getOption('testopt', cm));
-  eq('e', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
-  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
-  eq('d', CodeMirror.Vim.getOption('testopt'));
-});
-testVim('ex_set_callback', function(cm, vim, helpers) {
-  var global;
-
-  function cb(val, cm, cfg) {
-    if (val === undefined) {
-      // Getter
-      if (cm) {
-        return cm._local;
-      } else {
-        return global;
-      }
-    } else {
-      // Setter
-      if (cm) {
-        cm._local = val;
-      } else {
-        global = val;
-      }
-    }
-  }
-
-  CodeMirror.Vim.defineOption('testopt', 'a', 'string', cb);
-  // Test default value is set.
-  eq('a', CodeMirror.Vim.getOption('testopt'));
-  try {
-    // Test fail to set 'notestopt'
-    helpers.doEx('set notestopt=b');
-    fail();
-  } catch (expected) {};
-  // Test setOption (Identical to the string tests, but via callback instead)
-  helpers.doEx('set testopt=c')
-  eq('c', CodeMirror.Vim.getOption('testopt', cm)); //local || global
-  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'})); // local
-  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'})); // global
-  eq('c', CodeMirror.Vim.getOption('testopt')); // global
-  // Test setOption global
-  helpers.doEx('setg testopt=d')
-  eq('c', CodeMirror.Vim.getOption('testopt', cm));
-  eq('c', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
-  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
-  eq('d', CodeMirror.Vim.getOption('testopt'));
-  // Test setOption local
-  helpers.doEx('setl testopt=e')
-  eq('e', CodeMirror.Vim.getOption('testopt', cm));
-  eq('e', CodeMirror.Vim.getOption('testopt', cm, {scope: 'local'}));
-  eq('d', CodeMirror.Vim.getOption('testopt', cm, {scope: 'global'}));
-  eq('d', CodeMirror.Vim.getOption('testopt'));
-})
-testVim('ex_set_filetype', function(cm, vim, helpers) {
-  CodeMirror.defineMode('test_mode', function() {
-    return {token: function(stream) {
-      stream.match(/^\s+|^\S+/);
-    }};
-  });
-  CodeMirror.defineMode('test_mode_2', function() {
-    return {token: function(stream) {
-      stream.match(/^\s+|^\S+/);
-    }};
-  });
-  // Test mode is set.
-  helpers.doEx('set filetype=test_mode');
-  eq('test_mode', cm.getMode().name);
-  // Test 'ft' alias also sets mode.
-  helpers.doEx('set ft=test_mode_2');
-  eq('test_mode_2', cm.getMode().name);
-});
-testVim('ex_set_filetype_null', function(cm, vim, helpers) {
-  CodeMirror.defineMode('test_mode', function() {
-    return {token: function(stream) {
-      stream.match(/^\s+|^\S+/);
-    }};
-  });
-  cm.setOption('mode', 'test_mode');
-  // Test mode is set to null.
-  helpers.doEx('set filetype=');
-  eq('null', cm.getMode().name);
-});
-// TODO: Reset key maps after each test.
-testVim('ex_map_key2key', function(cm, vim, helpers) {
-  helpers.doEx('map a x');
-  helpers.doKeys('a');
-  helpers.assertCursorAt(0, 0);
-  eq('bc', cm.getValue());
-}, { value: 'abc' });
-testVim('ex_unmap_key2key', function(cm, vim, helpers) {
-  helpers.doEx('unmap a');
-  helpers.doKeys('a');
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: 'abc' });
-testVim('ex_unmap_key2key_does_not_remove_default', function(cm, vim, helpers) {
-  try {
-    helpers.doEx('unmap a');
-    fail();
-  } catch (expected) {}
-  helpers.doKeys('a');
-  eq('vim-insert', cm.getOption('keyMap'));
-}, { value: 'abc' });
-testVim('ex_map_key2key_to_colon', function(cm, vim, helpers) {
-  helpers.doEx('map ; :');
-  var dialogOpened = false;
-  cm.openDialog = function() {
-    dialogOpened = true;
-  }
-  helpers.doKeys(';');
-  eq(dialogOpened, true);
-});
-testVim('ex_map_ex2key:', function(cm, vim, helpers) {
-  helpers.doEx('map :del x');
-  helpers.doEx('del');
-  helpers.assertCursorAt(0, 0);
-  eq('bc', cm.getValue());
-}, { value: 'abc' });
-testVim('ex_map_ex2ex', function(cm, vim, helpers) {
-  helpers.doEx('map :del :w');
-  var tmp = CodeMirror.commands.save;
-  var written = false;
-  var actualCm;
-  CodeMirror.commands.save = function(cm) {
-    written = true;
-    actualCm = cm;
-  };
-  helpers.doEx('del');
-  CodeMirror.commands.save = tmp;
-  eq(written, true);
-  eq(actualCm, cm);
-});
-testVim('ex_map_key2ex', function(cm, vim, helpers) {
-  helpers.doEx('map a :w');
-  var tmp = CodeMirror.commands.save;
-  var written = false;
-  var actualCm;
-  CodeMirror.commands.save = function(cm) {
-    written = true;
-    actualCm = cm;
-  };
-  helpers.doKeys('a');
-  CodeMirror.commands.save = tmp;
-  eq(written, true);
-  eq(actualCm, cm);
-});
-testVim('ex_map_key2key_visual_api', function(cm, vim, helpers) {
-  CodeMirror.Vim.map('b', ':w', 'visual');
-  var tmp = CodeMirror.commands.save;
-  var written = false;
-  var actualCm;
-  CodeMirror.commands.save = function(cm) {
-    written = true;
-    actualCm = cm;
-  };
-  // Mapping should not work in normal mode.
-  helpers.doKeys('b');
-  eq(written, false);
-  // Mapping should work in visual mode.
-  helpers.doKeys('v', 'b');
-  eq(written, true);
-  eq(actualCm, cm);
-
-  CodeMirror.commands.save = tmp;
-});
-testVim('ex_imap', function(cm, vim, helpers) {
-  CodeMirror.Vim.map('jk', '', 'insert');
-  helpers.doKeys('i');
-  is(vim.insertMode);
-  helpers.doKeys('j', 'k');
-  is(!vim.insertMode);
-})
-
-// Testing registration of functions as ex-commands and mapping to -keys
-testVim('ex_api_test', function(cm, vim, helpers) {
-  var res=false;
-  var val='from';
-  CodeMirror.Vim.defineEx('extest','ext',function(cm,params){
-    if(params.args)val=params.args[0];
-    else res=true;
-  });
-  helpers.doEx(':ext to');
-  eq(val,'to','Defining ex-command failed');
-  CodeMirror.Vim.map('',':ext');
-  helpers.doKeys('','');
-  is(res,'Mapping to key failed');
-});
-// For now, this test needs to be last because it messes up : for future tests.
-testVim('ex_map_key2key_from_colon', function(cm, vim, helpers) {
-  helpers.doEx('map : x');
-  helpers.doKeys(':');
-  helpers.assertCursorAt(0, 0);
-  eq('bc', cm.getValue());
-}, { value: 'abc' });
-
-// Test event handlers
-testVim('beforeSelectionChange', function(cm, vim, helpers) {
-  cm.setCursor(0, 100);
-  eqPos(cm.getCursor('head'), cm.getCursor('anchor'));
-}, { value: 'abc' });
-
-
diff --git a/www/code/codemirror-5.7/theme/3024-day.css b/www/code/codemirror-5.7/theme/3024-day.css
deleted file mode 100644
index 713265530..000000000
--- a/www/code/codemirror-5.7/theme/3024-day.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-
-    Name:       3024 day
-    Author:     Jan T. Sott (http://github.com/idleberg)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-day.CodeMirror { background: #f7f7f7; color: #3a3432; }
-.cm-s-3024-day div.CodeMirror-selected { background: #d6d5d4; }
-
-.cm-s-3024-day .CodeMirror-line::selection, .cm-s-3024-day .CodeMirror-line > span::selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d6d5d4; }
-.cm-s-3024-day .CodeMirror-line::-moz-selection, .cm-s-3024-day .CodeMirror-line > span::-moz-selection, .cm-s-3024-day .CodeMirror-line > span > span::selection { background: #d9d9d9; }
-
-.cm-s-3024-day .CodeMirror-gutters { background: #f7f7f7; border-right: 0px; }
-.cm-s-3024-day .CodeMirror-guttermarker { color: #db2d20; }
-.cm-s-3024-day .CodeMirror-guttermarker-subtle { color: #807d7c; }
-.cm-s-3024-day .CodeMirror-linenumber { color: #807d7c; }
-
-.cm-s-3024-day .CodeMirror-cursor { border-left: 1px solid #5c5855; }
-
-.cm-s-3024-day span.cm-comment { color: #cdab53; }
-.cm-s-3024-day span.cm-atom { color: #a16a94; }
-.cm-s-3024-day span.cm-number { color: #a16a94; }
-
-.cm-s-3024-day span.cm-property, .cm-s-3024-day span.cm-attribute { color: #01a252; }
-.cm-s-3024-day span.cm-keyword { color: #db2d20; }
-.cm-s-3024-day span.cm-string { color: #fded02; }
-
-.cm-s-3024-day span.cm-variable { color: #01a252; }
-.cm-s-3024-day span.cm-variable-2 { color: #01a0e4; }
-.cm-s-3024-day span.cm-def { color: #e8bbd0; }
-.cm-s-3024-day span.cm-bracket { color: #3a3432; }
-.cm-s-3024-day span.cm-tag { color: #db2d20; }
-.cm-s-3024-day span.cm-link { color: #a16a94; }
-.cm-s-3024-day span.cm-error { background: #db2d20; color: #5c5855; }
-
-.cm-s-3024-day .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-3024-day .CodeMirror-matchingbracket { text-decoration: underline; color: #a16a94 !important; }
diff --git a/www/code/codemirror-5.7/theme/3024-night.css b/www/code/codemirror-5.7/theme/3024-night.css
deleted file mode 100644
index adc5900ad..000000000
--- a/www/code/codemirror-5.7/theme/3024-night.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-
-    Name:       3024 night
-    Author:     Jan T. Sott (http://github.com/idleberg)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-3024-night.CodeMirror { background: #090300; color: #d6d5d4; }
-.cm-s-3024-night div.CodeMirror-selected { background: #3a3432; }
-.cm-s-3024-night .CodeMirror-line::selection, .cm-s-3024-night .CodeMirror-line > span::selection, .cm-s-3024-night .CodeMirror-line > span > span::selection { background: rgba(58, 52, 50, .99); }
-.cm-s-3024-night .CodeMirror-line::-moz-selection, .cm-s-3024-night .CodeMirror-line > span::-moz-selection, .cm-s-3024-night .CodeMirror-line > span > span::-moz-selection { background: rgba(58, 52, 50, .99); }
-.cm-s-3024-night .CodeMirror-gutters { background: #090300; border-right: 0px; }
-.cm-s-3024-night .CodeMirror-guttermarker { color: #db2d20; }
-.cm-s-3024-night .CodeMirror-guttermarker-subtle { color: #5c5855; }
-.cm-s-3024-night .CodeMirror-linenumber { color: #5c5855; }
-
-.cm-s-3024-night .CodeMirror-cursor { border-left: 1px solid #807d7c; }
-
-.cm-s-3024-night span.cm-comment { color: #cdab53; }
-.cm-s-3024-night span.cm-atom { color: #a16a94; }
-.cm-s-3024-night span.cm-number { color: #a16a94; }
-
-.cm-s-3024-night span.cm-property, .cm-s-3024-night span.cm-attribute { color: #01a252; }
-.cm-s-3024-night span.cm-keyword { color: #db2d20; }
-.cm-s-3024-night span.cm-string { color: #fded02; }
-
-.cm-s-3024-night span.cm-variable { color: #01a252; }
-.cm-s-3024-night span.cm-variable-2 { color: #01a0e4; }
-.cm-s-3024-night span.cm-def { color: #e8bbd0; }
-.cm-s-3024-night span.cm-bracket { color: #d6d5d4; }
-.cm-s-3024-night span.cm-tag { color: #db2d20; }
-.cm-s-3024-night span.cm-link { color: #a16a94; }
-.cm-s-3024-night span.cm-error { background: #db2d20; color: #807d7c; }
-
-.cm-s-3024-night .CodeMirror-activeline-background { background: #2F2F2F; }
-.cm-s-3024-night .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.7/theme/abcdef.css b/www/code/codemirror-5.7/theme/abcdef.css
deleted file mode 100644
index 142d81370..000000000
--- a/www/code/codemirror-5.7/theme/abcdef.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.cm-s-abcdef.CodeMirror { background: #0f0f0f; color: #defdef; }
-.cm-s-abcdef div.CodeMirror-selected { background: #515151; }
-.cm-s-abcdef .CodeMirror-line::selection, .cm-s-abcdef .CodeMirror-line > span::selection, .cm-s-abcdef .CodeMirror-line > span > span::selection { background: rgba(56, 56, 56, 0.99); }
-.cm-s-abcdef .CodeMirror-line::-moz-selection, .cm-s-abcdef .CodeMirror-line > span::-moz-selection, .cm-s-abcdef .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 56, 56, 0.99); }
-.cm-s-abcdef .CodeMirror-gutters { background: #555; border-right: 2px solid #314151; }
-.cm-s-abcdef .CodeMirror-guttermarker { color: #222; }
-.cm-s-abcdef .CodeMirror-guttermarker-subtle { color: azure; }
-.cm-s-abcdef .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-abcdef .CodeMirror-cursor { border-left: 1px solid #00FF00; }
-
-.cm-s-abcdef span.cm-keyword { color: darkgoldenrod; font-weight: bold; }
-.cm-s-abcdef span.cm-atom { color: #77F; }
-.cm-s-abcdef span.cm-number { color: violet; }
-.cm-s-abcdef span.cm-def { color: #fffabc; }
-.cm-s-abcdef span.cm-variable { color: #abcdef; }
-.cm-s-abcdef span.cm-variable-2 { color: #cacbcc; }
-.cm-s-abcdef span.cm-variable-3 { color: #def; }
-.cm-s-abcdef span.cm-property { color: #fedcba; }
-.cm-s-abcdef span.cm-operator { color: #ff0; }
-.cm-s-abcdef span.cm-comment { color: #7a7b7c; font-style: italic;}
-.cm-s-abcdef span.cm-string { color: #2b4; }
-.cm-s-abcdef span.cm-meta { color: #C9F; }
-.cm-s-abcdef span.cm-qualifier { color: #FFF700; }
-.cm-s-abcdef span.cm-builtin { color: #30aabc; }
-.cm-s-abcdef span.cm-bracket { color: #8a8a8a; }
-.cm-s-abcdef span.cm-tag { color: #FFDD44; }
-.cm-s-abcdef span.cm-attribute { color: #DDFF00; }
-.cm-s-abcdef span.cm-error { color: #FF0000; }
-.cm-s-abcdef span.cm-header { color: aquamarine; font-weight: bold; }
-.cm-s-abcdef span.cm-link { color: blue; }
-
-.cm-s-abcdef .CodeMirror-activeline-background { background: #314151; }
diff --git a/www/code/codemirror-5.7/theme/ambiance-mobile.css b/www/code/codemirror-5.7/theme/ambiance-mobile.css
deleted file mode 100644
index 88d332e1a..000000000
--- a/www/code/codemirror-5.7/theme/ambiance-mobile.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.cm-s-ambiance.CodeMirror {
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-}
diff --git a/www/code/codemirror-5.7/theme/ambiance.css b/www/code/codemirror-5.7/theme/ambiance.css
deleted file mode 100644
index bce344649..000000000
--- a/www/code/codemirror-5.7/theme/ambiance.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ambiance theme for codemirror */
-
-/* Color scheme */
-
-.cm-s-ambiance .cm-header { color: blue; }
-.cm-s-ambiance .cm-quote { color: #24C2C7; }
-
-.cm-s-ambiance .cm-keyword { color: #cda869; }
-.cm-s-ambiance .cm-atom { color: #CF7EA9; }
-.cm-s-ambiance .cm-number { color: #78CF8A; }
-.cm-s-ambiance .cm-def { color: #aac6e3; }
-.cm-s-ambiance .cm-variable { color: #ffb795; }
-.cm-s-ambiance .cm-variable-2 { color: #eed1b3; }
-.cm-s-ambiance .cm-variable-3 { color: #faded3; }
-.cm-s-ambiance .cm-property { color: #eed1b3; }
-.cm-s-ambiance .cm-operator { color: #fa8d6a; }
-.cm-s-ambiance .cm-comment { color: #555; font-style:italic; }
-.cm-s-ambiance .cm-string { color: #8f9d6a; }
-.cm-s-ambiance .cm-string-2 { color: #9d937c; }
-.cm-s-ambiance .cm-meta { color: #D2A8A1; }
-.cm-s-ambiance .cm-qualifier { color: yellow; }
-.cm-s-ambiance .cm-builtin { color: #9999cc; }
-.cm-s-ambiance .cm-bracket { color: #24C2C7; }
-.cm-s-ambiance .cm-tag { color: #fee4ff; }
-.cm-s-ambiance .cm-attribute { color: #9B859D; }
-.cm-s-ambiance .cm-hr { color: pink; }
-.cm-s-ambiance .cm-link { color: #F4C20B; }
-.cm-s-ambiance .cm-special { color: #FF9D00; }
-.cm-s-ambiance .cm-error { color: #AF2018; }
-
-.cm-s-ambiance .CodeMirror-matchingbracket { color: #0f0; }
-.cm-s-ambiance .CodeMirror-nonmatchingbracket { color: #f22; }
-
-.cm-s-ambiance div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
-.cm-s-ambiance.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-ambiance .CodeMirror-line::selection, .cm-s-ambiance .CodeMirror-line > span::selection, .cm-s-ambiance .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-ambiance .CodeMirror-line::-moz-selection, .cm-s-ambiance .CodeMirror-line > span::-moz-selection, .cm-s-ambiance .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-
-/* Editor styling */
-
-.cm-s-ambiance.CodeMirror {
-  line-height: 1.40em;
-  color: #E6E1DC;
-  background-color: #202020;
-  -webkit-box-shadow: inset 0 0 10px black;
-  -moz-box-shadow: inset 0 0 10px black;
-  box-shadow: inset 0 0 10px black;
-}
-
-.cm-s-ambiance .CodeMirror-gutters {
-  background: #3D3D3D;
-  border-right: 1px solid #4D4D4D;
-  box-shadow: 0 10px 20px black;
-}
-
-.cm-s-ambiance .CodeMirror-linenumber {
-  text-shadow: 0px 1px 1px #4d4d4d;
-  color: #111;
-  padding: 0 5px;
-}
-
-.cm-s-ambiance .CodeMirror-guttermarker { color: #aaa; }
-.cm-s-ambiance .CodeMirror-guttermarker-subtle { color: #111; }
-
-.cm-s-ambiance .CodeMirror-cursor { border-left: 1px solid #7991E8; }
-
-.cm-s-ambiance .CodeMirror-activeline-background {
-  background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.031);
-}
-
-.cm-s-ambiance.CodeMirror,
-.cm-s-ambiance .CodeMirror-gutters {
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAQAAAAHUWYVAABFFUlEQVQYGbzBCeDVU/74/6fj9HIcx/FRHx9JCFmzMyGRURhLZIkUsoeRfUjS2FNDtr6WkMhO9sm+S8maJfu+Jcsg+/o/c+Z4z/t97/vezy3z+z8ekGlnYICG/o7gdk+wmSHZ1z4pJItqapjoKXWahm8NmV6eOTbWUOp6/6a/XIg6GQqmenJ2lDHyvCFZ2cBDbmtHA043VFhHwXxClWmeYAdLhV00Bd85go8VmaFCkbVkzlQENzfBDZ5gtN7HwF0KDrTwJ0dypSOzpaKCMwQHKTIreYIxlmhXTzTWkVm+LTynZhiSBT3RZQ7aGfjGEd3qyXQ1FDymqbKxpspERQN2MiRjNZlFFQXfCNFm9nM1zpAsoYjmtRTc5ajwuaXc5xrWskT97RaKzAGe5ARHhVUsDbjKklziiX5WROcJwSNCNI+9w1Jwv4Zb2r7lCMZ4oq5C0EdTx+2GzNuKpJ+iFf38JEWkHJn9DNF7mmBDITrWEg0VWL3pHU20tSZnuqWu+R3BtYa8XxV1HO7GyD32UkOpL/yDloINFTmvtId+nmAjxRw40VMwVKiwrKLE4bK5UOVntYwhOcSSXKrJHKPJedocpGjVz/ZMIbnYUPB10/eKCrs5apqpgVmWzBYWpmtKHecJPjaUuEgRDDaU0oZghCJ6zNMQ5ZhDYx05r5v2muQdM0EILtXUsaKiQX9WMEUotagQzFbUNN6NUPC2nm5pxEWGCjMc3GdJHjSU2kORLK/JGSrkfGEIjncU/CYUnOipoYemwj8tST9NsJmB7TUVXtbUtXATJVZXBMvYeTXJfobgJUPmGMP/yFaWonaa6BcFO3nqcIqCozSZoZoSr1g4zJOzuyGnxTEX3lUEJ7WcZgme8ddaWvWJo2AJR9DZU3CUIbhCSG6ybSwN6qtJVnCU2svDTP2ZInOw2cBTrqtQahtNZn9NcJ4l2NaSmSkkP1noZWnVwkLmdUPOwLZEwy2Z3S3R+4rIG9hcbpPXHFVWcQdZkn2FOta3cKWQnNRC5g1LsJah4GCzSVsKnCOY5OAFRTBekyyryeyilhFKva75r4Mc0aWanGEaThcy31s439KKxTzJYY5WTHPU1FtIHjQU3Oip4xlNzj/lBw23dYZVliQa7WAXf4shetcQfatI+jWRDBPmyNeW6A1P5kdDgyYJlba0BIM8BZu1JfrFwItyjcAMR3K0BWOIrtMEXyhyrlVEx3ui5dUBjmB/Q3CXW85R4mBD0s7B+4q5tKUjOlb9qqmhi5AZ6GFIC5HXtOobdYGlVdMVbNJ8toNTFcHxnoL+muBagcctjWnbNMuR00uI7nQESwg5q2qqrKWIfrNUmeQocY6HuyxJV02wj36w00yhpmUFenv4p6fUkZYqLyuinx2RGOjhCXYyJF84oiU00YMOOhhquNdfbOB7gU88pY4xJO8LVdp6/q2voeB4R04vIdhSE40xZObx1HGGJ/ja0LBthFInKaLPPFzuCaYaoj8JjPME8yoyxo6zlBqkiUZYgq00OYMswbWO5NGmq+xhipxHLRW29ARjNKXO0wRnear8XSg4XFPLKEPUS1GqvyLwiuBUoa7zpZ0l5xxFwWmWZC1H5h5FwU8eQ7K+g8UcVY6TMQreVQT/8uQ8Z+ALIXnSEa2pYZQneE9RZbSBNYXfWYJzW/h/4j4Dp1tYVcFIC5019Vyi4ThPqSFCzjGWaHQTBU8q6vrVwgxP9Lkm840imWKpcLCjYTtrKuwvsKSnrvHCXGkSMk9p6lhckfRpIeis+N2PiszT+mFLspyGleUhDwcLrZqmyeylxwjBcKHEapqkmyangyLZRVOijwOtCY5SsG5zL0OwlCJ4y5KznF3EUNDDrinwiyLZRzOXtlBbK5ITHFGLp8Q0R6ab6mS7enI2cFrxOyHvOCFaT1HThS1krjCwqWeurCkk+willhCC+RSZnRXBiZaC5RXRIZYKp2lyfrHwiKPKR0JDzrdU2EFgpidawlFDR6FgXUMNa+g1FY3bUQh2cLCwosRdnuQTS/S+JVrGLeWIvtQUvONJxlqSQYYKpwoN2kaocLjdVsis4Mk80ESF2YpSkzwldjHkjFCUutI/r+EHDU8oCs6yzL3PhWiEooZdFMkymlas4AcI3KmoMMNSQ3tHzjGWCrcJJdYyZC7QFGwjRL9p+MrRkAGWzIaWCn9W0F3TsK01c2ZvQw0byvxuQU0r1lM0qJO7wW0kRIMdDTtXEdzi4VIh+EoIHm0mWtAtpCixlabgn83fKTI7anJe9ST7WIK1DMGpQmYeA58ImV6ezOGOzK2Kgq01pd60cKWiUi9Lievb/0vIDPHQ05Kzt4ddPckQBQtoaurjyHnek/nKzpQLrVgKPjIkh2v4uyezpv+Xoo7fPFXaGFp1vaLKxQ4uUpQQS5VuQs7BCq4xRJv7fwpVvvFEB3j+620haOuocqMhWd6TTPAEx+mdFNGHdranFe95WrWmIvlY4F1Dle2ECgc6cto7SryuqGGGha0tFQ5V53migUKmg6XKAo4qS3mik+0OZpAhOLeZKicacgaYcyx5hypYQE02ZA4xi/pNhOQxR4klNKyqacj+mpxnLTnnGSo85++3ZCZq6lrZkXlGEX3o+C9FieccJbZWVFjC0Yo1FZnJhoYMFoI1hEZ9r6hwg75HwzBNhbZCdJEfJwTPGzJvaKImw1yYX1HDAmpXR+ZJQ/SmgqMNVQb5vgamGwLtt7VwvP7Qk1xpiM5x5Cyv93E06MZmgs0Nya2azIKOYKCGBQQW97RmhKNKF02JZqHEJ4o58qp7X5EcZmc56trXEqzjCBZ1MFGR87Ql2tSTs6CGxS05PTzRQorkbw7aKoKXFDXsYW42VJih/q+FP2BdTzDTwVqOYB13liM50vG7wy28qagyuIXMeQI/Oqq8bcn5wJI50xH00CRntyfpL1T4hydYpoXgNiFzoIUTDZnLNRzh4TBHwbYGDvZkxmlyJloyr6tRihpeUG94GnKtIznREF0tzJG/OOr73JBcrSh1k6WuTprgLU+mnSGnv6Zge0NNz+kTDdH8nuAuTdJDCNb21LCiIuqlYbqGzT3RAoZofQfjFazkqeNWdYaGvYTM001EW2oKPvVk1ldUGSgUtHFwjKM1h9jnFcmy5lChoLNaQMGGDsYbKixlaMBmmsx1QjCfflwTfO/gckW0ruZ3jugKR3R5W9hGUWqCgxuFgsuaCHorotGKzGaeZB9DMsaTnKCpMtwTvOzhYk0rdrArKCqcaWmVk1+F372ur1YkKxgatI8Qfe1gIX9wE9FgS8ESmuABIXnRUbCapcKe+nO7slClSZFzpV/LkLncEb1qiO42fS3R855Su2mCLh62t1SYZZYVmKwIHjREF2uihTzB20JOkz7dkxzYQnK0UOU494wh+VWRc6Un2kpTaVgLDFEkJ/uhzRcI0YKGgpGWOlocBU/a4fKoJ/pEaNV6jip3+Es9VXY078rGnmAdf7t9ylPXS34RBSuYPs1UecZTU78WanhBCHpZ5sAoTz0LGZKjPf9TRypqWEiTvOFglL1fCEY3wY/++rbk7C8bWebA6p6om6PgOL2kp44TFJlVNBXae2rqqdZztOJpT87GQsE9jqCPIe9VReZuQ/CIgacsyZdCpIScSYqcZk8r+nsyCzhyfhOqHGOIvrLknC8wTpFcaYiGC/RU1NRbUeUpocQOnkRpGOrIOcNRx+1uA0UrzhSSt+VyS3SJpnFWkzNDqOFGIWcfR86DnmARTQ1HKIL33ExPiemeOhYSSjzlSUZZuE4TveoJLnBUOFof6KiysCbnAEcZgcUNTDOwkqWu3RWtmGpZwlHhJENdZ3miGz0lJlsKnjbwqSHQjpxnFDlTLLwqJPMZMjd7KrzkSG7VsxXBZE+F8YZkb01Oe00yyRK9psh5SYh29ySPKBo2ylNht7ZkZnsKenjKNJu9PNEyZpaCHv4Kt6RQsLvAVp7M9kIimmCUwGeWqLMmGuIotYMmWNpSahkhZw9FqZsVnKJhsjAHvtHMsTM9fCI06Dx/u3vfUXCqfsKRc4oFY2jMsoo/7DJDwZ1CsIKnJu+J9ldkpmiCxQx1rWjI+T9FwcWWzOuaYH0Hj7klNRVWEQpmaqosakiGNTFHdjS/qnUdmf0NJW5xsL0HhimCCZZSRzmSPTXJQ4aaztAwtZnoabebJ+htCaZ7Cm535ByoqXKbX1WRc4Eh2MkRXWzImVc96Cj4VdOKVxR84VdQsIUM8Psoou2byVHyZFuq7O8otbSQ2UAoeEWTudATLGSpZzVLlXVkPU2Jc+27lsw2jmg5T5VhbeE3BT083K9WsTTkFU/Osi0rC5lRlpwRHUiesNS0sOvmqGML1aRbPAxTJD9ZKtxuob+hhl8cwYGWpJ8nub7t5p6coYbMovZ1BTdaKn1jYD6h4GFDNFyT/Kqe1XCXphXHOKLZmuRSRdBPEfVUXQzJm5YGPGGJdvAEr7hHNdGZnuBvrpciGmopOLf5N0uVMy0FfYToJk90uUCbJupaVpO53UJXR2bVpoU00V2KOo4zMFrBd0Jtz2pa0clT5Q5L8IpQ177mWQejPMEJhuQjS10ref6HHjdEhy1P1EYR7GtO0uSsKJQYLiTnG1rVScj5lyazpqWGl5uBbRWl7m6ixGOOnEsMJR7z8J0n6KMnCdxhiNYQCoZ6CmYLnO8omC3MkW3bktlPmEt/VQQHejL3+dOE5FlPdK/Mq8hZxxJtLyRrepLThYKbLZxkSb5W52vYxNOaOxUF0yxMUPwBTYqCzy01XayYK0sJyWBLqX0MwU5CzoymRzV0EjjeUeLgDpTo6ij42ZAzvD01dHUUTPLU96MdLbBME8nFBn7zJCMtJcZokn8YoqU0FS5WFKyniHobguMcmW8N0XkWZjkyN3hqOMtS08r+/xTBwpZSZ3qiVRX8SzMHHjfUNFjgHEPmY9PL3ykEzxkSre/1ZD6z/NuznuB0RcE1TWTm9zRgfUWVJiG6yrzgmWPXC8EAR4Wxhlad0ZbgQyEz3pG5RVEwwDJH2mgKpjcTiCOzn1lfUWANFbZ2BA8balnEweJC9J0iuaeZoI+ippFCztEKVvckR2iice1JvhVytrQwUAZpgsubCPaU7xUe9vWnaOpaSBEspalykhC9bUlOMpT42ZHca6hyrqKmw/wMR8H5ZmdFoBVJb03O4UL0tSNnvIeRmkrLWqrs78gcrEn2tpcboh0UPOW3UUR9PMk4T4nnNKWmCjlrefhCwxRNztfmIQVdDElvS4m1/WuOujoZCs5XVOjtKPGokJzsYCtFYoWonSPT21DheU/wWhM19FcElwqNGOsp9Q8N/cwXaiND1MmeL1Q5XROtYYgGeFq1aTMsoMmcrKjQrOFQTQ1fmBYhmW6o8Jkjc7iDJRTBIo5kgJD5yMEYA3srCg7VFKwiVJkmRCc5ohGOKhsYMn/XBLdo5taZjlb9YAlGWRimqbCsoY7HFAXLa5I1HPRxMMsQDHFkWtRNniqT9UEeNjcE7RUlrCJ4R2CSJuqlKHWvJXjAUNcITYkenuBRB84TbeepcqTj3zZyFJzgYQdHnqfgI0ddUwS6GqWpsKWhjq9cV0vBAEMN2znq+EBfIWT+pClYw5xsTlJU6GeIBsjGmmANTzJZiIYpgrM0Oa8ZMjd7NP87jxhqGOhJlnQtjuQpB+8aEE00wZFznSJPyHxgH3HkPOsJFvYk8zqCHzTs1BYOa4J3PFU+UVRZxlHDM4YavlNUuMoRveiZA2d7grMNc2g+RbSCEKzmgYsUmWmazFJyoiOZ4KnyhKOGRzWJa0+moyV4TVHDzn51Awtqaphfk/lRQ08FX1iiqxTB/kLwd0VynKfEvI6cd4XMV5bMhZ7gZUWVzYQ6Nm2BYzxJbw3bGthEUUMfgbGeorae6DxHtJoZ6alhZ0+ytiVoK1R4z5PTrOECT/SugseEOlb1MMNR4VRNcJy+V1Hg9ONClSZFZjdHlc6W6FBLdJja2MC5hhpu0DBYEY1TFGwiFAxRRCsYkiM9JRb0JNMVkW6CZYT/2EiTGWmo8k+h4FhDNE7BvppoTSFnmCV5xZKzvcCdDo7VVPnIU+I+Rc68juApC90MwcFCsJ5hDqxgScYKreruyQwTqrzoqDCmhWi4IbhB0Yrt3RGa6GfDv52rKXWhh28dyZaWUvcZeMTBaZoSGyiCtRU5J8iviioHaErs7Jkj61syVzTTgOcUOQ8buFBTYWdL5g3T4qlpe0+wvD63heAXRfCCIed9RbCsp2CiI7raUOYOTU13N8PNHvpaGvayo4a3LLT1lDrVEPT2zLUlheB1R+ZTRfKWJ+dcocLJfi11vyJ51lLqJ0WD7tRwryezjiV5W28uJO9qykzX8JDe2lHl/9oyBwa2UMfOngpXCixvKdXTk3wrsKmiVYdZIqsoWEERjbcUNDuiaQomGoIbFdEHmsyWnuR+IeriKDVLnlawlyNHKwKlSU631PKep8J4Q+ayjkSLKYLhalNHlYvttb6fHm0p6OApsZ4l2VfdqZkjuysy6ysKLlckf1KUutCTs39bmCgEyyoasIWlVaMF7mgmWtBT8Kol5xpH9IGllo8cJdopcvZ2sImlDmMIbtDk3KIpeNiS08lQw11NFPTwVFlPP6pJ2gvRfI7gQUfmNAtf6Gs0wQxDsKGlVBdF8rCa3jzdwMaGHOsItrZk7hAyOzpK9VS06j5F49b0VNGOOfKs3lDToMsMBe9ZWtHFEgxTJLs7qrygKZjUnmCYoeAqeU6jqWuLJup4WghOdvCYJnrSkSzoyRkm5M2StQwVltPkfCAk58tET/CSg+8MUecmotMEnhBKfWBIZsg2ihruMJQaoIm+tkTLKEqspMh00w95gvFCQRtDwTT1gVDDSEVdlwqZfxoQRbK0g+tbiBZxzKlpnpypejdDwTaeOvorMk/IJE10h9CqRe28hhLbe0pMsdSwv4ZbhKivo2BjDWfL8UKJgeavwlwb5KlwhyE4u4XkGE2ytZCznKLCDZZq42VzT8HLCrpruFbIfOIINmh/qCdZ1ZBc65kLHR1Bkyf5zn6pN3SvGKIlFNGplhrO9QSXanLOMQTLCa0YJCRrCZm/CZmrLTm7WzCK4GJDiWUdFeYx1LCFg3NMd0XmCuF3Y5rITLDUsYS9zoHVzwnJoYpSTQoObyEzr4cFBNqYTopoaU/wkyLZ2lPhX/5Y95ulxGTV7KjhWrOZgl8MyUUafjYraNjNU1N3IWcjT5WzWqjwtoarHSUObGYO3GCJZpsBlnJGPd6ZYLyl1GdCA2625IwwJDP8GUKymbzuyPlZlvTUsaUh5zFDhRWFzPKKZLAlWdcQbObgF9tOqOsmB1dqcqYJmWstFbZRRI9poolmqiLnU0POvxScpah2iSL5UJNzgScY5+AuIbpO0YD3NCW+dLMszFSdFCWGqG6eVq2uYVNDdICGD6W7EPRWZEY5gpsE9rUkS3mijzzJnm6UpUFXG1hCUeVoS5WfNcFpblELL2qqrCvMvRfd45oalvKU2tiQ6ePJOVMRXase9iTtLJztPxJKLWpo2CRDcJwn2sWSLKIO1WQWNTCvpVUvOZhgSC40JD0dOctaSqzkCRbXsKlb11Oip6PCJ0IwSJM31j3akRxlP7Rwn6aGaUL0qiLnJkvB3xWZ2+Q1TfCwpQH3G0o92UzmX4o/oJNQMMSQc547wVHhdk+VCw01DFYEnTxzZKAm74QmeNNR1w6WzEhNK15VJzuCdxQ53dRUDws5KvwgBMOEgpcVNe0hZI6RXT1Jd0cyj5nsaEAHgVmGaJIlWdsc5Ui2ElrRR6jrRAttNMEAIWrTDFubkZaok7/AkzfIwfuWVq0jHzuCK4QabtLUMVPB3kJ0oyHTSVFlqMALilJf2Rf8k5aaHtMfayocLBS8L89oKoxpJvnAkDPa0qp5DAUTHKWmCcnthlou8iCKaFFLHWcINd1nyIwXqrSxMNmSs6KmoL2QrKuWtlQ5V0120xQ5vRyZS1rgFkWwhiOwiuQbR0OOVhQM9iS3tiXp4RawRPMp5tDletOOBL95MpM01dZTBM9pkn5qF010rIeHFcFZhmSGpYpTsI6nwhqe5C9ynhlpp5ophuRb6WcJFldkVnVEwwxVfrVkvnWUuNLCg5bgboFHPDlDPDmnK7hUrWiIbjadDclujlZcaokOFup4Ri1kacV6jmrrK1hN9bGwpKEBQ4Q6DvIUXOmo6U5LqQM6EPyiKNjVkPnJkDPNEaxhiFay5ExW1NXVUGqcpYYdPcGiCq7z/TSlbhL4pplWXKd7NZO5QQFrefhRQW/NHOsqcIglc4UhWklR8K0QzbAw08CBDnpbgqXdeD/QUsM4RZXDFBW6WJKe/mFPdH0LtBgiq57wFLzlyQzz82qYx5D5WJP5yVJDW01BfyHnS6HKO/reZqId1WGa4Hkh2kWodJ8i6KoIPlAj2hPt76CzXsVR6koPRzWTfKqIentatYpQw2me4AA3y1Kind3SwoOKZDcFXTwl9tWU6mfgRk9d71sKtlNwrjnYw5tC5n5LdKiGry3JKNlHEd3oaMCFHrazBPMp/uNJ+V7IudcSbeOIdjUEdwl0VHCOZo5t6YluEuaC9mQeMgSfOyKnYGFHcIeQ84yQWbuJYJpZw5CzglDH7gKnWqqM9ZTaXcN0TeYhR84eQtJT76JJ1lREe7WnnvsMmRc9FQ7SBBM9mV3lCUdmHk/S2RAMt0QjFNFqQpWjDPQ01DXWUdDBkXziKPjGEP3VP+zIWU2t7im41FOloyWzn/L6dkUy3VLDaZ6appgDLHPjJEsyvJngWEPUyVBiAaHCTEXwrLvSEbV1e1gKJniicWorC1MUrVjB3uDhJE/wgSOzk1DXpk0k73qCM8xw2UvD5kJmDUfOomqMpWCkJRlvKXGmoeBm18USjVIk04SClxTB6YrgLAPLWYK9HLUt5cmc0vYES8GnTeRc6skZbQkWdxRsIcyBRzx1DbTk9FbU0caTPOgJHhJKnOGIVhQqvKmo0llRw9sabrZkDtdg3PqaKi9oatjY8B+G371paMg6+mZFNNtQ04mWBq3rYLOmtWWQp8KJnpy9DdFensyjdqZ+yY40VJlH8wcdLzC8PZnvHMFUTZUrDTkLyQaGus5X5LzpYAf3i+e/ZlhqGqWhh6Ou6xTR9Z6oi5AZZtp7Mj2EEm8oSpxiYZCHU/1fbGdNNNRRoZMhmilEb2gqHOEJDtXkHK/JnG6IrvbPCwV3NhONVdS1thBMs1T4QOBcTWa2IzhMk2nW5Kyn9tXUtpv9RsG2msxk+ZsQzRQacJncpgke0+T8y5Fzj8BiGo7XlJjaTIlpQs7KFjpqGnKuoyEPeIKnFMkZHvopgh81ySxNFWvJWcKRs70j2FOT012IllEEO1n4pD1513Yg2ssQPOThOkvyrqHUdEXOSEsihmBbTbKX1kLBPWqWkLOqJbjB3GBIZmoa8qWl4CG/iZ7oiA72ZL7TJNeZUY7kFQftDcHHluBzRbCegzMtrRjVQpX2lgoPKKLJAkcbMl01XK2p7yhL8pCBbQ3BN2avJgKvttcrWDK3CiUOVxQ8ZP+pqXKyIxnmBymCg5vJjNfkPK4+c8cIfK8ocVt7kmfd/I5SR1hKvCzUtb+lhgc00ZaO6CyhIQP1Uv4yIZjload72PXX0OIJvnFU+0Zf6MhsJwTfW0r0UwQfW4LNLZl5HK261JCZ4qnBaAreVAS3WrjV0LBnNDUNNDToCEeFfwgcb4gOEqLRhirWkexrCEYKVV711DLYEE1XBEsp5tpTGjorkomKYF9FDXv7fR3BGwbettSxnyL53MBPjsxDZjMh+VUW9NRxq1DhVk+FSxQcaGjV9Pawv6eGByw5qzoy7xk4RsOShqjJwWKe/1pEEfzkobeD/dQJmpqedcyBTy2sr4nGNRH0c0SPWTLrqAc0OQcb/gemKgqucQT7ySWKCn2EUotoCvpZct7RO2sy/QW0IWcXd7pQRQyZVwT2USRO87uhjioTLKV2brpMUcMQRbKH/N2T+UlTpaMls6cmc6CCNy3JdYYSUzzJQ4oSD3oKLncULOiJvjBEC2oqnCJkJluCYy2ZQ5so9YYlZ1VLlQU1mXEW1jZERwj/MUSRc24TdexlqLKfQBtDTScJUV8FszXBEY5ktpD5Ur9hYB4Nb1iikw3JoYpkKX+RodRKFt53MMuRnKSpY31PwYaGaILh3wxJGz9TkTPEETxoCWZrgvOlmyMzxFEwVJE5xZKzvyJ4WxEc16Gd4Xe3Weq4XH2jKRikqOkGQ87hQnC7wBmGYLAnesX3M+S87eFATauuN+Qcrh7xIxXJbUIdMw3JGE3ylCWzrieaqCn4zhGM19TQ3z1oH1AX+pWEqIc7wNGAkULBo/ZxRaV9NNyh4Br3rCHZzbzmSfawBL0dNRwpW1kK9mxPXR9povcdrGSZK9c2k0xwFGzjuniCtRSZCZ6ccZ7gaktmgAOtKbG/JnOkJrjcQTdFMsxRQ2cLY3WTIrlCw1eWKn8R6pvt4GFDso3QoL4a3nLk3G6JrtME3dSenpx7PNFTmga0EaJTLQ061sEeQoWXhSo9LTXsaSjoJQRXeZLtDclbCrYzfzHHeaKjHCVOUkQHO3JeEepr56mhiyaYYKjjNU+Fed1wS5VlhWSqI/hYUdDOkaxiKehoyOnrCV5yBHtbWFqTHCCwtpDcYolesVR5yUzTZBb3RNMd0d6WP+SvhuBmRcGxnuQzT95IC285cr41cLGQ6aJJhmi4TMGempxeimBRQw1tFKV+8jd6KuzoSTqqDxzRtpZkurvKEHxlqXKRIjjfUNNXQsNOsRScoWFLT+YeRZVD3GRN0MdQcKqQjHDMrdGGVu3iYJpQx3WGUvfbmxwFfR20WBq0oYY7LMFhhgYtr8jpaEnaOzjawWWaTP8mMr0t/EPDPoqcnxTBI5o58L7uoWnMrpoqPwgVrlAUWE+V+TQl9rawoyP6QGAlQw2TPRX+YSkxyBC8Z6jhHkXBgQL7WII3DVFnRfCrBfxewv9D6xsyjys4VkhWb9pUU627JllV0YDNHMku/ldNMMXDEo4aFnAkk4U6frNEU4XgZUPmEKHUl44KrzmYamjAbh0JFvGnaTLPu1s9jPCwjFpYiN7z1DTOk/nc07CfDFzmCf7i+bfNHXhDtLeBXzTBT5rkMvWOIxpl4EMh2LGJBu2syDnAEx2naEhHDWMMzPZEhygyS1mS5RTJr5ZkoKbEUoYqr2kqdDUE8ztK7OaIntJkFrIECwv8LJTaVx5XJE86go8dFeZ3FN3rjabCAYpoYEeC9zzJVULBbmZhDyd7ko09ydpNZ3nm2Kee4FPPXHnYEF1nqOFEC08LUVcDvYXkJHW8gTaKCk9YGOeIJhqiE4ToPEepdp7IWFjdwnWaufGMwJJCMtUTTBBK9BGCOy2tGGrJTHIwyEOzp6aPzNMOtlZkDvcEWpP5SVNhfkvDxhmSazTJXYrM9U1E0xwFVwqZQwzJxw6+kGGGUj2FglGGmnb1/G51udRSMNlTw6GGnCcUwVcOpmsqTHa06o72sw1RL02p9z0VbnMLOaIX3QKaYKSCFQzBKEUNHTSc48k53RH9wxGMtpQa5KjjW0W0n6XCCCG4yxNNdhQ4R4l1Ff+2sSd6UFHiIEOyqqFgT01mEUMD+joy75jPhOA+oVVLm309FR4yVOlp4RhLiScNmSmaYF5Pw0STrOIoWMSR2UkRXOMp+M4SHW8o8Zoi6OZgjKOaFar8zZDzkWzvKOjkKBjmCXby8JahhjXULY4KlzgKLvAwxVGhvyd4zxB1d9T0piazmKLCVZY5sKiD0y2ZSYrkUEPUbIk+dlQ4SJHTR50k1DPaUWIdTZW9NJwnJMOECgd7ou/MnppMJ02O1VT4Wsh85MnZzcFTngpXGKo84qmwgKbCL/orR/SzJ2crA+t6Mp94KvxJUeIbT3CQu1uIdlQEOzlKfS3UMcrTiFmOuroocrZrT2AcmamOKg8YomeEKm/rlT2sociMaybaUlFhuqHCM2qIJ+rg4EcDFymiDSxzaHdPcpE62pD5kyM5SBMoA1PaUtfIthS85ig1VPiPPYXgYEMNk4Qq7TXBgo7oT57gPUdwgCHzhIVFPFU6OYJzHAX9m5oNrVjeE61miDrqQ4VSa1oiURTsKHC0IfjNwU2WzK6eqK8jWln4g15TVBnqmDteCJ501PGAocJhhqjZdtBEB6lnhLreFJKxmlKbeGrqLiSThVIbCdGzloasa6lpMQXHCME2boLpJgT7yWaemu6wBONbqGNVRS0PKIL7LckbjmQtR7K8I5qtqel+T/ChJTNIKLjdUMNIRyvOEko9YYl2cwQveBikCNawJKcLBbc7+JM92mysNvd/Fqp8a0k6CNEe7cnZrxlW0wQXaXjaktnRwNOGZKYiONwS7a1JVheq3WgJHlQUGKHKmp4KAxXR/ULURcNgoa4zhKSLpZR3kxRRb0NmD0OFn+UCS7CzI1nbP6+o4x47QZE5xRCt3ZagnYcvmpYQktXdk5YKXTzBC57kKEe0VVuiSYqapssMS3C9p2CKkHOg8B8Pa8p5atrIw3qezIWanMGa5HRDNF6RM9wcacl0N+Q8Z8hsIkSnaIIdHRUOEebAPy1zbCkhM062FCJtif7PU+UtoVXzWKqM1PxXO8cfdruhFQ/a6x3JKYagvVDhQEtNiyiiSQ7OsuRsZUku0CRNDs4Sog6KKjsZgk2bYJqijgsEenoKeniinRXBn/U3lgpPdyDZynQx8IiioMnCep5Ky8mjGs6Wty0l1hUQTcNWswS3WRp2kCNZwJG8omG8JphPUaFbC8lEfabwP7VtM9yoaNCAjpR41VNhrD9LkbN722v0CoZMByFzhaW+MyzRYEWFDQwN2M4/JiT76PuljT3VU/A36eaIThb+R9oZGOAJ9tewkgGvqOMNRWYjT/Cwu99Q8LqDE4TgbLWxJ1jaDDAERsFOFrobgjUsBScaguXU8kKm2RL19tRypSHnHNlHiIZqgufs4opgQdVdwxBNNFBR6kVFqb8ogimOzB6a6HTzrlDHEpYaxjiiA4TMQobkDg2vejjfwJGWmnbVFAw3H3hq2NyQfG7hz4aC+w3BbwbesG0swYayvpAs6++Ri1Vfzx93mFChvyN5xVHTS+0p9aqCAxyZ6ZacZyw5+7uuQkFPR9DDk9NOiE7X1PCYJVjVUqq7JlrHwWALF5nfHNGjApdpqgzx5OwilDhCiDYTgnc9waGW4BdLNNUQvOtpzDOWHDH8D7TR/A/85KljEQu3NREc4Pl/6B1Hhc8Umb5CsKMmGC9EPcxoT2amwHNCmeOEnOPbklnMkbOgIvO5UMOpQrS9UGVdt6iH/fURjhI/WOpaW9OKLYRod6HCUEdOX000wpDZQ6hwg6LgZfOqo1RfT/CrJzjekXOGhpc1VW71ZLbXyyp+93ILbC1kPtIEYx0FIx1VDrLoVzXRKRYWk809yYlC9ImcrinxtabKnzRJk3lAU1OLEN1j2zrYzr2myHRXJFf4h4QKT1qSTzTB5+ZNTzTRkAxX8FcLV2uS8eoQQ2aAkFzvCM72sJIcJET3WPjRk5wi32uSS9rfZajpWEvj9hW42F4o5NytSXYy8IKHay10VYdrcl4SkqscrXpMwyGOgtkajheSxdQqmpxP1L3t4R5PqasFnrQEjytq6qgp9Y09Qx9o4S1FzhUCn1kyHSzBWLemoSGvOqLNhZyBjmCaAUYpMgt4Ck7wBBMMwWKWgjsUwTaGVsxWC1mYoKiyqqeGKYqonSIRQ3KIkHO0pmAxTdBHkbOvfllfr+AA+7gnc50huVKYK393FOyg7rbPO/izI7hE4CnHHHnJ0ogNPRUGeUpsrZZTBJcrovUcJe51BPsr6GkJdhCCsZ6aTtMEb2pqWkqeVtDXE/QVggsU/Nl86d9RMF3DxvZTA58agu810RWawCiSzzXBeU3MMW9oyJUedvNEvQyNu1f10BSMddR1vaLCYpYa/mGocLSiYDcLbQz8aMn5iyF4xBNMs1P0QEOV7o5gaWGuzSeLue4tt3ro7y4Tgm4G/mopdZgl6q0o6KzJWE3mMksNr3r+a6CbT8g5wZNzT9O7fi/zpaOmnz3BRoqos+tv9zMbdpxsqDBOEewtJLt7cg5wtKKbvldpSzRRCD43VFheCI7yZLppggMVBS/KMAdHODJvOwq2NQSbKKKPLdFWQs7Fqo+mpl01JXYRgq8dnGLhTiFzqmWsUMdpllZdbKlyvSdYxhI9YghOtxR8LgSLWHK62mGGVoxzBE8LNWzqH9CUesQzFy5RQzTc56mhi6fgXEWwpKfE5Z7M05ZgZUPmo6auiv8YKzDYwWBLMErIbKHJvOwIrvEdhOBcQ9JdU1NHQ7CXn2XIDFBKU2WAgcX9UAUzDXWd5alwuyJ41Z9rjKLCL4aCp4WarhPm2rH+SaHUYE001JDZ2ZAzXPjdMpZWvC9wmqIB2lLhQ01D5jO06hghWMndbM7yRJMsoCj1vYbnFQVrW9jak3OlEJ3s/96+p33dEPRV5GxiqaGjIthUU6FFEZyqCa5qJrpBdzSw95IUnOPIrCUUjRZQFrbw5PR0R1qiYx3cb6nrWUMrBmmiBQxVHtTew5ICP/ip6g4hed/Akob/32wvBHsIOX83cI8hGeNeNPCIkPmXe8fPKx84OMSRM1MTdXSwjCZ4S30jVGhvqTRak/OVhgGazHuOCud5onEO1lJr6ecVyaOK6H7zqlBlIaHE0oroCgfvGJIdPcmfLNGLjpz7hZwZQpUbFME0A1cIJa7VNORkgfsMBatbKgwwJM9bSvQXeNOvbIjelg6WWvo5kvbKaJJNHexkKNHL9xRyFlH8Ti2riB5wVPhUk7nGkJnoCe428LR/wRGdYIlmWebCyxou1rCk4g/ShugBDX0V0ZQWkh0dOVsagkM0yV6OoLd5ye+pRlsCr0n+KiQrGuq5yJDzrTAXHtLUMduTDBVKrSm3eHL+6ijxhFDX9Z5gVU/wliHYTMiMFpKLNMEywu80wd3meoFmt6VbRMPenhrOc6DVe4pgXU8DnnHakLOIIrlF4FZPIw6R+zxBP0dyq6OOZ4Q5sLKCcz084ok+VsMMyQhNZmmBgX5xIXOEJTmi7VsGTvMTNdHHhpzdbE8Du2oKxgvBqQKdDDnTFOylCFaxR1syz2iqrOI/FEpNc3C6f11/7+ASS6l2inq2ciTrCCzgyemrCL5SVPjQkdPZUmGy2c9Sw9FtR1sS30RmsKPCS4rkIC/2U0MduwucYolGaPjKEyhzmiPYXagyWbYz8LWBDdzRimAXzxx4z8K9hpzlhLq+NiQ97HuKorMUfK/OVvC2JfiHUPCQI/q7J2gjK+tTDNxkCc4TMssqCs4TGtLVwQihyoAWgj9bosU80XGW6Ac9TJGziaUh5+hnFcHOnlaM1iRn29NaqGENTTTSUHCH2tWTeV0osUhH6psuVLjRUmGWhm6OZEshGeNowABHcJ2Bpy2ZszRcKkRXd2QuKVEeXnbfaEq825FguqfgfE2whlChSRMdron+LATTPQ2Z369t4B9C5gs/ylzv+CMmepIDPclFQl13W0rspPd1JOcbghGOEutqCv5qacURQl3dDKyvyJlqKXGPgcM9FfawJAMVmdcspcYKOZc4GjDYkFlK05olNMHyHn4zFNykyOxt99RkHlfwmiHo60l2EKI+mhreEKp080Tbug08BVPcgoqC5zWt+NLDTZ7oNSF51N1qie7Va3uCCwyZbkINf/NED6jzOsBdZjFN8oqG3wxVunqCSYYKf3EdhJyf9YWGf7tRU2oH3VHgPr1fe5J9hOgHd7xQ0y7qBwXr23aGErP0cm64JVjZwsOGqL+mhNgZmhJLW2oY4UhedsyBgzrCKrq7BmcpNVhR6jBPq64Vgi+kn6XE68pp8J5/+0wRHGOpsKenQn9DZntPzjRLZpDAdD2fnSgkG9tmIXnUwQ6WVighs7Yi2MxQ0N3CqYaCXkJ0oyOztMDJjmSSpcpvlrk0RMMOjmArQ04PRV1DO1FwhCVaUVPpKUM03JK5SxPsIWRu8/CGHi8UHChiqGFDTbSRJWeYUDDcH6vJWUxR4k1FXbMUwV6e4AJFXS8oMqsZKqzvYQ9DDQdZckY4aGsIhtlubbd2r3j4QBMoTamdPZk7O/Bf62lacZwneNjQoGcdVU7zJOd7ghsUHOkosagic6cnWc8+4gg285R6zZP5s1/LUbCKIznTwK36PkdwlOrl4U1LwfdCCa+IrvFkmgw1PCAUXKWo0sURXWcI2muKJlgyFzhynCY4RBOsqCjoI1R5zREco0n2Vt09BQtYSizgKNHfUmUrQ5UOCh51BFcLmY7umhYqXKQomOop8bUnWNNQcIiBcYaC6xzMNOS8JQQfeqKBmmglB+97ok/lfk3ygaHSyZaCRTzRxQo6GzLfa2jWBPepw+UmT7SQEJyiyRkhBLMVOfcoMjcK0eZChfUNzFAUzCsEN5vP/X1uP/n/aoMX+K+nw/Hjr/9xOo7j7Pju61tLcgvJpTWXNbfN5jLpi6VfCOviTktKlFusQixdEKWmEBUKNaIpjZRSSOXSgzaaKLdabrm1/9nZ+/f+vd/vz/v9+Xy+zZ7PRorYoZqyLrCwQdEAixxVOEXNNnjX2nUSRlkqGmWowk8lxR50JPy9Bo6qJXaXwNvREBvnThPEPrewryLhcAnj5WE15Fqi8W7R1sAuEu86S4ENikItFN4xkv9Af4nXSnUVcLiA9xzesFpivRRVeFKtsMRaKBhuSbjOELnAUtlSQUpXgdfB4Z1oSbnFEetbQ0IrAe+Y+pqnDcEJFj6S8LDZzZHwY4e3XONNlARraomNEt2bkvGsosA3ioyHm+6jCMbI59wqt4eeara28IzEmyPgoRaUOEDhTVdEJhmCoTWfC0p8aNkCp0oYqih2iqGi4yXeMkOsn4LdLLnmKfh/YogjNsPebeFGR4m9BJHLzB61XQ3BtpISfS2FugsK9FAtLWX1dCRcrCnUp44CNzuCowUZmxSRgYaE6Za0W2u/E7CVXCiI/UOR8aAm1+OSyE3mOUcwyc1zBBeoX1kiKy0Zfxck1Gsyulti11i83QTBF5Kg3pDQThFMVHiPSlK+0cSedng/VaS8bOZbtsBcTcZAR8JP5KeqQ1OYKAi20njdNNRpgnsU//K+JnaXJaGTomr7aYIphoRn9aeShJWKEq9LcozSF7QleEfDI5LYm5bgVkFkRwVDBCVu0DDIkGupo8TZBq+/pMQURYErJQmPKGKjNDkWOLx7Jd5QizdUweIaKrlP7SwJDhZvONjLkOsBBX9UpGxnydhXkfBLQ8IxgojQbLFnJf81JytSljclYYyEFyx0kVBvKWOFJmONpshGAcsduQY5giVNCV51eOdJYo/pLhbvM0uDHSevNKRcrKZIqnCtJeEsO95RoqcgGK4ocZcho1tTYtcZvH41pNQ7vA0WrhIfOSraIIntIAi+NXWCErdbkvrWwjRLrt0NKUdL6KSOscTOdMSOUtBHwL6OLA0vNSdynaWQEnCpIvKaIrJJEbvHkmuNhn6OjM8VkSGSqn1uYJCGHnq9I3aLhNME3t6GjIkO7xrNFumpyTNX/NrwX7CrIRiqqWijI9JO4d1iieykyfiposQIQ8YjjsjlBh6oHWbwRjgYJQn2NgSnNycmJAk3NiXhx44Sxykihxm8ybUwT1OVKySc7vi3OXVkdBJ4AyXBeksDXG0IhgtYY0lY5ahCD0ehborIk5aUWRJviMA7Xt5kyRjonrXENkm8yYqgs8VzgrJmClK20uMM3jRJ0FiQICQF9hdETlLQWRIb5ki6WDfWRPobvO6a4GP5mcOrNzDFELtTkONLh9dXE8xypEg7z8A9jkhrQ6Fhjlg/QVktJXxt4WXzT/03Q8IaQWSqIuEvloQ2mqC9Jfi7wRul4RX3pSPlzpoVlmCtI2jvKHCFhjcM3sN6lqF6HxnKelLjXWbwrpR4xzuCrTUZx2qq9oAh8p6ixCUGr78g8oyjRAtB5CZFwi80VerVpI0h+IeBxa6Zg6kWvpDHaioYYuEsRbDC3eOmC2JvGYLeioxGknL2UATNJN6hmtj1DlpLvDVmocYbrGCVJKOrg4X6DgddLA203BKMFngdJJFtFd7vJLm6KEpc5yjQrkk7M80SGe34X24nSex1Ra5Omgb71JKyg8SrU3i/kARKwWpH0kOGhKkObyfd0ZGjvyXlAkVZ4xRbYJ2irFMkFY1SwyWxr2oo4zlNiV+7zmaweFpT4kR3kaDAFW6xpSqzJay05FtYR4HmZhc9UxKbbfF2V8RG1MBmSaE+kmC6JnaRXK9gsiXhJHl/U0qM0WTcbyhwkYIvFGwjSbjfwhiJt8ZSQU+Bd5+marPMOkVkD0muxYLIfEuhh60x/J92itguihJSEMySVPQnTewnEm+620rTQEMsOfo4/kP/0ARvWjitlpSX7GxBgcMEsd3EEeYWvdytd+Saawi6aCIj1CkGb6Aj9rwhx16Cf3vAwFy5pyLhVonXzy51FDpdEblbkdJbUcEPDEFzQ8qNmhzzLTmmKWKbFCXeEuRabp6rxbvAtLF442QjQ+wEA9eL1xSR7Q0JXzlSHjJ4exq89yR0laScJ/FW6z4a73pFMEfDiRZvuvijIt86RaSFOl01riV2mD1UEvxGk/Geg5aWwGki1zgKPG9J2U8PEg8qYvMsZeytiTRXBMslCU8JSlxi8EabjwUldlDNLfzTUmCgxWsjqWCOHavYAqsknKFIO0yQ61VL5AVFxk6WhEaCAkdJgt9aSkzXlKNX2jEa79waYuc7gq0N3GDJGCBhoiTXUEPsdknCUE1CK0fwsiaylSF2uiDyO4XX3pFhNd7R4itFGc0k/ElBZwWvq+GC6szVeEoS/MZ+qylwpKNKv9Z469UOjqCjwlusicyTxG6VpNxcQ8IncoR4RhLbR+NdpGGmJWOcIzJGUuKPGpQg8rrG21dOMqQssJQ4RxH5jaUqnZuQ0F4Q+cjxLwPtpZbIAk3QTJHQWBE5S1BokoVtDd6lhqr9UpHSUxMcIYl9pojsb8h4SBOsMQcqvOWC2E8EVehqiJ1hrrAEbQxeK0NGZ0Gkq+guSRgniM23bIHVkqwx4hiHd7smaOyglyIyQuM978j4VS08J/A2G1KeMBRo4fBaSNhKUEZfQewVQ/C1I+MgfbEleEzCUw7mKXI0M3hd1EESVji8x5uQ41nxs1q4RMJCCXs7Iq9acpxn22oSDnQ/sJTxsCbHIYZiLyhY05TY0ZLIOQrGaSJDDN4t8pVaIrsqqFdEegtizc1iTew5Q4ayBDMUsQMkXocaYkc0hZua412siZ1rSXlR460zRJ5SlHGe5j801RLMlJTxtaOM3Q1pvxJ45zUlWFD7rsAbpfEm1JHxG0eh8w2R7QQVzBUw28FhFp5QZzq8t2rx2joqulYTWSuJdTYfWwqMFMcovFmSyJPNyLhE4E10pHzYjOC3huArRa571ZsGajQpQx38SBP5pyZB6lMU3khDnp0MBV51BE9o2E+TY5Ml2E8S7C0o6w1xvCZjf0HkVEHCzFoyNmqC+9wdcqN+Tp7jSDheE9ws8Y5V0NJCn2bk2tqSY4okdrEhx1iDN8cSudwepWmAGXKcJXK65H9to8jYQRH7SBF01ESUJdd0TayVInaWhLkOjlXE5irKGOnI6GSWGCJa482zBI9rCr0jyTVcEuzriC1vcr6mwFGSiqy5zMwxBH/TJHwjSPhL8+01kaaSUuMFKTcLEvaUePcrSmwn8DZrgikWb7CGPxkSjhQwrRk57tctmxLsb9sZvL9LSlyuSLlWkqOjwduo8b6Uv1DkmudIeFF2dHCgxVtk8dpIvHpBxhEOdhKk7OLIUSdJ+cSRY57B+0DgGUUlNfpthTfGkauzxrvTsUUaCVhlKeteTXCoJDCa2NOKhOmC4G1H8JBd4OBZReSRGkqcb/CO1PyLJTLB4j1q8JYaIutEjSLX8YKM+a6phdMsdLFUoV5RTm9JSkuDN8WcIon0NZMNZWh1q8C7SJEwV5HxrmnnTrf3KoJBlmCYI2ilSLlfEvlE4011NNgjgthzEua0oKK7JLE7HZHlEl60BLMVFewg4EWNt0ThrVNEVkkiTwpKXSWJzdRENgvKGq4IhjsiezgSFtsfCUq8qki5S1LRQeYQQ4nemmCkImWMw3tFUoUBZk4NOeZYEp4XRKTGa6wJjrWNHBVJR4m3FCnbuD6aak2WsMTh3SZImGCIPKNgsDpVwnsa70K31lCFJZYcwwSMFcQulGTsZuEaSdBXkPGZhu0FsdUO73RHjq8MPGGIfaGIbVTk6iuI3GFgucHrIQkmWSJdBd7BBu+uOryWAhY7+Lki9rK5wtEQzWwvtbqGhIMFwWRJsElsY4m9IIg9L6lCX0VklaPAYkfkZEGDnOWowlBJjtMUkcGK4Lg6EtoZInMUBVYLgn0UsdmCyCz7gIGHFfk+k1QwTh5We7A9x+IdJ6CvIkEagms0hR50eH9UnTQJ+2oiKyVlLFUE+8gBGu8MQ3CppUHesnjTHN4QB/UGPhCTHLFPHMFrCqa73gqObUJGa03wgbhHkrCfpEpzNLE7JDS25FMKhlhKKWKfCgqstLCPu1zBXy0J2ztwjtixBu8UTRn9LVtkmCN2iyFhtME70JHRQ1KVZXqKI/KNIKYMCYs1GUMEKbM1bKOI9LDXC7zbHS+bt+1MTWS9odA9DtrYtpbImQJ2VHh/lisEwaHqUk1kjKTAKknkBEXkbkdMGwq0dnhzLJF3NJH3JVwrqOB4Sca2hti75nmJN0WzxS6UxDYoEpxpa4htVlRjkYE7DZGzJVU72uC9IyhQL4i8YfGWSYLLNcHXloyz7QhNifmKSE9JgfGmuyLhc403Xm9vqcp6gXe3xuuv8F6VJNxkyTHEkHG2g0aKXL0MsXc1bGfgas2//dCONXiNLCX+5mB7eZIl1kHh7ajwpikyzlUUWOVOsjSQlsS+M0R+pPje/dzBXRZGO0rMtgQrLLG9VSu9n6CMXS3BhwYmSoIBhsjNBmZbgusE9BCPCP5triU4VhNbJfE+swSP27aayE8tuTpYYjtrYjMVGZdp2NpS1s6aBnKSHDsbKuplKbHM4a0wMFd/5/DmGyKrJSUaW4IBrqUhx0vyfzTBBLPIUcnZdrAkNsKR0sWRspumSns6Ch0v/qqIbBYUWKvPU/CFoyrDJGwSNFhbA/MlzKqjrO80hRbpKx0Jewsi/STftwGSlKc1JZyAzx05dhLEdnfQvhZOqiHWWEAHC7+30FuRcZUgaO5gpaIK+xsiHRUsqaPElTV40xQZQ107Q9BZE1nryDVGU9ZSQ47bmhBpLcYpUt7S+xuK/FiT8qKjwXYw5ypS2iuCv7q1gtgjhuBuB8LCFY5cUuCNtsQOFcT+4Ih9JX+k8Ea6v0iCIRZOtCT0Et00JW5UeC85Cg0ScK0k411HcG1zKtre3SeITBRk7WfwDhEvaYLTHP9le0m8By0JDwn4TlLW/aJOvGHxdjYUes+ScZigCkYQdNdEOhkiezgShqkx8ueKjI8lDfK2oNiOFvrZH1hS+tk7NV7nOmLHicGWEgubkXKdwdtZknCLJXaCpkrjZBtLZFsDP9CdxWsSr05Sxl6CMmoFbCOgryX40uDtamB7SVmXW4Ihlgpmq+00tBKUUa83WbjLUNkzDmY7cow1JDygyPGlhgGKYKz4vcV7QBNbJIgM11TUqZaMdwTeSguH6rOaw1JRKzaaGyxVm2EJ/uCIrVWUcZUkcp2grMsEjK+DMwS59jQk3Kd6SEq1d0S6uVmO4Bc1lDXTUcHjluCXEq+1OlBDj1pi9zgiXxnKuE0SqTXwhqbETW6RggMEnGl/q49UT2iCzgJvRwVXS2K/d6+ZkyUl7jawSVLit46EwxVljDZwoSQ20sDBihztHfk2yA8NVZghiXwrYHQdfKAOtzsayjhY9bY0yE2CWEeJ9xfzO423xhL5syS2TFJofO2pboHob0nY4GiAgRrvGQEDa/FWSsoaaYl0syRsEt3kWoH3B01shCXhTUWe9w3Bt44SC9QCh3eShQctwbaK2ApLroGCMlZrYqvlY3qYhM0aXpFkPOuoqJ3Dm6fxXrGwVF9gCWZagjPqznfkuMKQ8DPTQRO8ZqG1hPGKEm9IgpGW4DZDgTNriTxvFiq+Lz+0cKfp4wj6OCK9JSnzNSn9LFU7UhKZZMnYwcJ8s8yRsECScK4j5UOB95HFO0CzhY4xJxuCix0lDlEUeMdS6EZBkTsUkZ4K74dugyTXS7aNgL8aqjDfkCE0ZbwkCXpaWCKhl8P7VD5jxykivSyxyZrYERbe168LYu9ZYh86IkscgVLE7tWPKmJv11CgoyJltMEbrohtVAQfO4ImltiHEroYEs7RxAarVpY8AwXMcMReFOTYWe5iiLRQxJ5Q8DtJ8LQhWOhIeFESPGsILhbNDRljNbHzNRlTFbk2S3L0NOS6V1KFJYKUbSTcIIhM0wQ/s2TM0SRMNcQmSap3jCH4yhJZKSkwyRHpYYgsFeQ4U7xoCB7VVOExhXepo9ABBsYbvGWKXPME3lyH95YioZ0gssQRWWbI+FaSMkXijZXwgiTlYdPdkNLaETxlyDVIwqeaEus0aTcYcg0RVOkpR3CSJqIddK+90JCxzsDVloyrFd5ZAr4TBKfaWa6boEA7C7s6EpYaeFPjveooY72mjIccLHJ9HUwVlDhKkmutJDJBwnp1rvulJZggKDRfbXAkvC/4l3ozQOG9a8lxjx0i7nV4jSXc7vhe3OwIxjgSHjdEhhsif9YkPGlus3iLFDnWOFhtCZbJg0UbQcIaR67JjthoCyMEZRwhiXWyxO5QxI6w5NhT4U1WsJvDO60J34fW9hwzwlKij6ZAW9ne4L0s8C6XeBMEkd/LQy1VucBRot6QMlbivaBhoBgjqGiCJNhsqVp/S2SsG6DIONCR0dXhvWbJ+MRRZJkkuEjgDXJjFQW6SSL7GXK8Z2CZg7cVsbWGoKmEpzQ5elpiy8Ryg7dMkLLUEauzeO86CuwlSOlgYLojZWeJ9xM3S1PWfEfKl5ISLQ0MEKR8YOB2QfCxJBjrKPCN4f9MkaSsqoVXJBmP7EpFZ9UQfOoOFwSzBN4MQ8LsGrymlipcJQhmy0GaQjPqCHaXRwuCZwRbqK2Fg9wlClZqYicrIgMdZfxTQ0c7TBIbrChxmuzoKG8XRaSrIhhiyNFJkrC7oIAWMEOQa5aBekPCRknCo4IKPrYkvCDI8aYmY7WFtprgekcJZ3oLIqssCSMtFbQTJKwXYy3BY5oCh2iKPCpJOE+zRdpYgi6O2KmOAgvVCYaU4ySRek1sgyFhJ403QFHiVEmJHwtybO1gs8Hr5+BETQX3War0qZngYGgtVZtoqd6vFSk/UwdZElYqyjrF4HXUeFspIi9IGKf4j92pKGAdCYMVsbcV3kRF0N+R8LUd5PCsIGWoxDtBkCI0nKofdJQxT+LtZflvuc8Q3CjwWkq8KwUpHzkK/NmSsclCL0nseQdj5FRH5CNHSgtLiW80Of5HU9Hhlsga9bnBq3fEVltKfO5IaSTmGjjc4J0otcP7QsJUSQM8pEj5/wCuUuC2DWz8AAAAAElFTkSuQmCC");
-}
diff --git a/www/code/codemirror-5.7/theme/base16-dark.css b/www/code/codemirror-5.7/theme/base16-dark.css
deleted file mode 100644
index 81dac0392..000000000
--- a/www/code/codemirror-5.7/theme/base16-dark.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-    Name:       Base16 Default Dark
-    Author:     Chris Kempson (http://chriskempson.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-chrome-devtools)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-dark.CodeMirror { background: #151515; color: #e0e0e0; }
-.cm-s-base16-dark div.CodeMirror-selected { background: #303030; }
-.cm-s-base16-dark .CodeMirror-line::selection, .cm-s-base16-dark .CodeMirror-line > span::selection, .cm-s-base16-dark .CodeMirror-line > span > span::selection { background: rgba(48, 48, 48, .99); }
-.cm-s-base16-dark .CodeMirror-line::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span::-moz-selection, .cm-s-base16-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(48, 48, 48, .99); }
-.cm-s-base16-dark .CodeMirror-gutters { background: #151515; border-right: 0px; }
-.cm-s-base16-dark .CodeMirror-guttermarker { color: #ac4142; }
-.cm-s-base16-dark .CodeMirror-guttermarker-subtle { color: #505050; }
-.cm-s-base16-dark .CodeMirror-linenumber { color: #505050; }
-.cm-s-base16-dark .CodeMirror-cursor { border-left: 1px solid #b0b0b0; }
-
-.cm-s-base16-dark span.cm-comment { color: #8f5536; }
-.cm-s-base16-dark span.cm-atom { color: #aa759f; }
-.cm-s-base16-dark span.cm-number { color: #aa759f; }
-
-.cm-s-base16-dark span.cm-property, .cm-s-base16-dark span.cm-attribute { color: #90a959; }
-.cm-s-base16-dark span.cm-keyword { color: #ac4142; }
-.cm-s-base16-dark span.cm-string { color: #f4bf75; }
-
-.cm-s-base16-dark span.cm-variable { color: #90a959; }
-.cm-s-base16-dark span.cm-variable-2 { color: #6a9fb5; }
-.cm-s-base16-dark span.cm-def { color: #d28445; }
-.cm-s-base16-dark span.cm-bracket { color: #e0e0e0; }
-.cm-s-base16-dark span.cm-tag { color: #ac4142; }
-.cm-s-base16-dark span.cm-link { color: #aa759f; }
-.cm-s-base16-dark span.cm-error { background: #ac4142; color: #b0b0b0; }
-
-.cm-s-base16-dark .CodeMirror-activeline-background { background: #202020; }
-.cm-s-base16-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.7/theme/base16-light.css b/www/code/codemirror-5.7/theme/base16-light.css
deleted file mode 100644
index e645678f8..000000000
--- a/www/code/codemirror-5.7/theme/base16-light.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-    Name:       Base16 Default Light
-    Author:     Chris Kempson (http://chriskempson.com)
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-chrome-devtools)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-base16-light.CodeMirror { background: #f5f5f5; color: #202020; }
-.cm-s-base16-light div.CodeMirror-selected { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-line::selection, .cm-s-base16-light .CodeMirror-line > span::selection, .cm-s-base16-light .CodeMirror-line > span > span::selection { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-line::-moz-selection, .cm-s-base16-light .CodeMirror-line > span::-moz-selection, .cm-s-base16-light .CodeMirror-line > span > span::-moz-selection { background: #e0e0e0; }
-.cm-s-base16-light .CodeMirror-gutters { background: #f5f5f5; border-right: 0px; }
-.cm-s-base16-light .CodeMirror-guttermarker { color: #ac4142; }
-.cm-s-base16-light .CodeMirror-guttermarker-subtle { color: #b0b0b0; }
-.cm-s-base16-light .CodeMirror-linenumber { color: #b0b0b0; }
-.cm-s-base16-light .CodeMirror-cursor { border-left: 1px solid #505050; }
-
-.cm-s-base16-light span.cm-comment { color: #8f5536; }
-.cm-s-base16-light span.cm-atom { color: #aa759f; }
-.cm-s-base16-light span.cm-number { color: #aa759f; }
-
-.cm-s-base16-light span.cm-property, .cm-s-base16-light span.cm-attribute { color: #90a959; }
-.cm-s-base16-light span.cm-keyword { color: #ac4142; }
-.cm-s-base16-light span.cm-string { color: #f4bf75; }
-
-.cm-s-base16-light span.cm-variable { color: #90a959; }
-.cm-s-base16-light span.cm-variable-2 { color: #6a9fb5; }
-.cm-s-base16-light span.cm-def { color: #d28445; }
-.cm-s-base16-light span.cm-bracket { color: #202020; }
-.cm-s-base16-light span.cm-tag { color: #ac4142; }
-.cm-s-base16-light span.cm-link { color: #aa759f; }
-.cm-s-base16-light span.cm-error { background: #ac4142; color: #505050; }
-
-.cm-s-base16-light .CodeMirror-activeline-background { background: #DDDCDC; }
-.cm-s-base16-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.7/theme/blackboard.css b/www/code/codemirror-5.7/theme/blackboard.css
deleted file mode 100644
index b6eaedb18..000000000
--- a/www/code/codemirror-5.7/theme/blackboard.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Port of TextMate's Blackboard theme */
-
-.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
-.cm-s-blackboard div.CodeMirror-selected { background: #253B76; }
-.cm-s-blackboard .CodeMirror-line::selection, .cm-s-blackboard .CodeMirror-line > span::selection, .cm-s-blackboard .CodeMirror-line > span > span::selection { background: rgba(37, 59, 118, .99); }
-.cm-s-blackboard .CodeMirror-line::-moz-selection, .cm-s-blackboard .CodeMirror-line > span::-moz-selection, .cm-s-blackboard .CodeMirror-line > span > span::-moz-selection { background: rgba(37, 59, 118, .99); }
-.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
-.cm-s-blackboard .CodeMirror-guttermarker { color: #FBDE2D; }
-.cm-s-blackboard .CodeMirror-guttermarker-subtle { color: #888; }
-.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
-.cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
-
-.cm-s-blackboard .cm-keyword { color: #FBDE2D; }
-.cm-s-blackboard .cm-atom { color: #D8FA3C; }
-.cm-s-blackboard .cm-number { color: #D8FA3C; }
-.cm-s-blackboard .cm-def { color: #8DA6CE; }
-.cm-s-blackboard .cm-variable { color: #FF6400; }
-.cm-s-blackboard .cm-operator { color: #FBDE2D; }
-.cm-s-blackboard .cm-comment { color: #AEAEAE; }
-.cm-s-blackboard .cm-string { color: #61CE3C; }
-.cm-s-blackboard .cm-string-2 { color: #61CE3C; }
-.cm-s-blackboard .cm-meta { color: #D8FA3C; }
-.cm-s-blackboard .cm-builtin { color: #8DA6CE; }
-.cm-s-blackboard .cm-tag { color: #8DA6CE; }
-.cm-s-blackboard .cm-attribute { color: #8DA6CE; }
-.cm-s-blackboard .cm-header { color: #FF6400; }
-.cm-s-blackboard .cm-hr { color: #AEAEAE; }
-.cm-s-blackboard .cm-link { color: #8DA6CE; }
-.cm-s-blackboard .cm-error { background: #9D1E15; color: #F8F8F8; }
-
-.cm-s-blackboard .CodeMirror-activeline-background { background: #3C3636; }
-.cm-s-blackboard .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/www/code/codemirror-5.7/theme/cobalt.css b/www/code/codemirror-5.7/theme/cobalt.css
deleted file mode 100644
index d88223ed8..000000000
--- a/www/code/codemirror-5.7/theme/cobalt.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.cm-s-cobalt.CodeMirror { background: #002240; color: white; }
-.cm-s-cobalt div.CodeMirror-selected { background: #b36539; }
-.cm-s-cobalt .CodeMirror-line::selection, .cm-s-cobalt .CodeMirror-line > span::selection, .cm-s-cobalt .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
-.cm-s-cobalt .CodeMirror-line::-moz-selection, .cm-s-cobalt .CodeMirror-line > span::-moz-selection, .cm-s-cobalt .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
-.cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-cobalt .CodeMirror-guttermarker { color: #ffee80; }
-.cm-s-cobalt .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-cobalt span.cm-comment { color: #08f; }
-.cm-s-cobalt span.cm-atom { color: #845dc4; }
-.cm-s-cobalt span.cm-number, .cm-s-cobalt span.cm-attribute { color: #ff80e1; }
-.cm-s-cobalt span.cm-keyword { color: #ffee80; }
-.cm-s-cobalt span.cm-string { color: #3ad900; }
-.cm-s-cobalt span.cm-meta { color: #ff9d00; }
-.cm-s-cobalt span.cm-variable-2, .cm-s-cobalt span.cm-tag { color: #9effff; }
-.cm-s-cobalt span.cm-variable-3, .cm-s-cobalt span.cm-def { color: white; }
-.cm-s-cobalt span.cm-bracket { color: #d8d8d8; }
-.cm-s-cobalt span.cm-builtin, .cm-s-cobalt span.cm-special { color: #ff9e59; }
-.cm-s-cobalt span.cm-link { color: #845dc4; }
-.cm-s-cobalt span.cm-error { color: #9d1e15; }
-
-.cm-s-cobalt .CodeMirror-activeline-background { background: #002D57; }
-.cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; }
diff --git a/www/code/codemirror-5.7/theme/colorforth.css b/www/code/codemirror-5.7/theme/colorforth.css
deleted file mode 100644
index 606899f30..000000000
--- a/www/code/codemirror-5.7/theme/colorforth.css
+++ /dev/null
@@ -1,33 +0,0 @@
-.cm-s-colorforth.CodeMirror { background: #000000; color: #f8f8f8; }
-.cm-s-colorforth .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-colorforth .CodeMirror-guttermarker { color: #FFBD40; }
-.cm-s-colorforth .CodeMirror-guttermarker-subtle { color: #78846f; }
-.cm-s-colorforth .CodeMirror-linenumber { color: #bababa; }
-.cm-s-colorforth .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-colorforth span.cm-comment     { color: #ededed; }
-.cm-s-colorforth span.cm-def         { color: #ff1c1c; font-weight:bold; }
-.cm-s-colorforth span.cm-keyword     { color: #ffd900; }
-.cm-s-colorforth span.cm-builtin     { color: #00d95a; }
-.cm-s-colorforth span.cm-variable    { color: #73ff00; }
-.cm-s-colorforth span.cm-string      { color: #007bff; }
-.cm-s-colorforth span.cm-number      { color: #00c4ff; }
-.cm-s-colorforth span.cm-atom        { color: #606060; }
-
-.cm-s-colorforth span.cm-variable-2  { color: #EEE; }
-.cm-s-colorforth span.cm-variable-3  { color: #DDD; }
-.cm-s-colorforth span.cm-property    {}
-.cm-s-colorforth span.cm-operator    {}
-
-.cm-s-colorforth span.cm-meta        { color: yellow; }
-.cm-s-colorforth span.cm-qualifier   { color: #FFF700; }
-.cm-s-colorforth span.cm-bracket     { color: #cc7; }
-.cm-s-colorforth span.cm-tag         { color: #FFBD40; }
-.cm-s-colorforth span.cm-attribute   { color: #FFF700; }
-.cm-s-colorforth span.cm-error       { color: #f00; }
-
-.cm-s-colorforth div.CodeMirror-selected { background: #333d53; }
-
-.cm-s-colorforth span.cm-compilation { background: rgba(255, 255, 255, 0.12); }
-
-.cm-s-colorforth .CodeMirror-activeline-background { background: #253540; }
diff --git a/www/code/codemirror-5.7/theme/dracula.css b/www/code/codemirror-5.7/theme/dracula.css
deleted file mode 100644
index 57f979ae6..000000000
--- a/www/code/codemirror-5.7/theme/dracula.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-
-    Name:       dracula
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original dracula color scheme by Zeno Rocha (https://github.com/zenorocha/dracula-theme)
-
-*/
-
-
-.cm-s-dracula.CodeMirror, .cm-s-dracula .CodeMirror-gutters {
-  background-color: #282a36 !important;
-  color: #f8f8f2 !important;
-  border: none;
-}
-.cm-s-dracula .CodeMirror-gutters { color: #282a36; }
-.cm-s-dracula .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
-.cm-s-dracula .CodeMirror-linenumber { color: #6D8A88; }
-.cm-s-dracula.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula .CodeMirror-line::selection, .cm-s-dracula .CodeMirror-line > span::selection, .cm-s-dracula .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula .CodeMirror-line::-moz-selection, .cm-s-dracula .CodeMirror-line > span::-moz-selection, .cm-s-dracula .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-dracula span.cm-comment { color: #6272a4; }
-.cm-s-dracula span.cm-string, .cm-s-dracula span.cm-string-2 { color: #f1fa8c; }
-.cm-s-dracula span.cm-number { color: #bd93f9; }
-.cm-s-dracula span.cm-variable { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-2 { color: white; }
-.cm-s-dracula span.cm-def { color: #ffb86c; }
-.cm-s-dracula span.cm-keyword { color: #ff79c6; }
-.cm-s-dracula span.cm-operator { color: #ff79c6; }
-.cm-s-dracula span.cm-keyword { color: #ff79c6; }
-.cm-s-dracula span.cm-atom { color: #bd93f9; }
-.cm-s-dracula span.cm-meta { color: #f8f8f2; }
-.cm-s-dracula span.cm-tag { color: #ff79c6; }
-.cm-s-dracula span.cm-attribute { color: #50fa7b; }
-.cm-s-dracula span.cm-qualifier { color: #50fa7b; }
-.cm-s-dracula span.cm-property { color: #66d9ef; }
-.cm-s-dracula span.cm-builtin { color: #50fa7b; }
-.cm-s-dracula span.cm-variable-3 { color: #50fa7b; }
-
-.cm-s-dracula .CodeMirror-activeline-background { background: rgba(255,255,255,0.1); }
-.cm-s-dracula .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.7/theme/eclipse.css b/www/code/codemirror-5.7/theme/eclipse.css
deleted file mode 100644
index 1bde460e9..000000000
--- a/www/code/codemirror-5.7/theme/eclipse.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.cm-s-eclipse span.cm-meta { color: #FF1717; }
-.cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; }
-.cm-s-eclipse span.cm-atom { color: #219; }
-.cm-s-eclipse span.cm-number { color: #164; }
-.cm-s-eclipse span.cm-def { color: #00f; }
-.cm-s-eclipse span.cm-variable { color: black; }
-.cm-s-eclipse span.cm-variable-2 { color: #0000C0; }
-.cm-s-eclipse span.cm-variable-3 { color: #0000C0; }
-.cm-s-eclipse span.cm-property { color: black; }
-.cm-s-eclipse span.cm-operator { color: black; }
-.cm-s-eclipse span.cm-comment { color: #3F7F5F; }
-.cm-s-eclipse span.cm-string { color: #2A00FF; }
-.cm-s-eclipse span.cm-string-2 { color: #f50; }
-.cm-s-eclipse span.cm-qualifier { color: #555; }
-.cm-s-eclipse span.cm-builtin { color: #30a; }
-.cm-s-eclipse span.cm-bracket { color: #cc7; }
-.cm-s-eclipse span.cm-tag { color: #170; }
-.cm-s-eclipse span.cm-attribute { color: #00c; }
-.cm-s-eclipse span.cm-link { color: #219; }
-.cm-s-eclipse span.cm-error { color: #f00; }
-
-.cm-s-eclipse .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-eclipse .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/www/code/codemirror-5.7/theme/elegant.css b/www/code/codemirror-5.7/theme/elegant.css
deleted file mode 100644
index 45b3ea655..000000000
--- a/www/code/codemirror-5.7/theme/elegant.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom { color: #762; }
-.cm-s-elegant span.cm-comment { color: #262; font-style: italic; line-height: 1em; }
-.cm-s-elegant span.cm-meta { color: #555; font-style: italic; line-height: 1em; }
-.cm-s-elegant span.cm-variable { color: black; }
-.cm-s-elegant span.cm-variable-2 { color: #b11; }
-.cm-s-elegant span.cm-qualifier { color: #555; }
-.cm-s-elegant span.cm-keyword { color: #730; }
-.cm-s-elegant span.cm-builtin { color: #30a; }
-.cm-s-elegant span.cm-link { color: #762; }
-.cm-s-elegant span.cm-error { background-color: #fdd; }
-
-.cm-s-elegant .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-elegant .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/www/code/codemirror-5.7/theme/erlang-dark.css b/www/code/codemirror-5.7/theme/erlang-dark.css
deleted file mode 100644
index 65fe4814c..000000000
--- a/www/code/codemirror-5.7/theme/erlang-dark.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
-.cm-s-erlang-dark div.CodeMirror-selected { background: #b36539; }
-.cm-s-erlang-dark .CodeMirror-line::selection, .cm-s-erlang-dark .CodeMirror-line > span::selection, .cm-s-erlang-dark .CodeMirror-line > span > span::selection { background: rgba(179, 101, 57, .99); }
-.cm-s-erlang-dark .CodeMirror-line::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span::-moz-selection, .cm-s-erlang-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(179, 101, 57, .99); }
-.cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-erlang-dark .CodeMirror-guttermarker { color: white; }
-.cm-s-erlang-dark .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-erlang-dark span.cm-quote      { color: #ccc; }
-.cm-s-erlang-dark span.cm-atom       { color: #f133f1; }
-.cm-s-erlang-dark span.cm-attribute  { color: #ff80e1; }
-.cm-s-erlang-dark span.cm-bracket    { color: #ff9d00; }
-.cm-s-erlang-dark span.cm-builtin    { color: #eaa; }
-.cm-s-erlang-dark span.cm-comment    { color: #77f; }
-.cm-s-erlang-dark span.cm-def        { color: #e7a; }
-.cm-s-erlang-dark span.cm-keyword    { color: #ffee80; }
-.cm-s-erlang-dark span.cm-meta       { color: #50fefe; }
-.cm-s-erlang-dark span.cm-number     { color: #ffd0d0; }
-.cm-s-erlang-dark span.cm-operator   { color: #d55; }
-.cm-s-erlang-dark span.cm-property   { color: #ccc; }
-.cm-s-erlang-dark span.cm-qualifier  { color: #ccc; }
-.cm-s-erlang-dark span.cm-special    { color: #ffbbbb; }
-.cm-s-erlang-dark span.cm-string     { color: #3ad900; }
-.cm-s-erlang-dark span.cm-string-2   { color: #ccc; }
-.cm-s-erlang-dark span.cm-tag        { color: #9effff; }
-.cm-s-erlang-dark span.cm-variable   { color: #50fe50; }
-.cm-s-erlang-dark span.cm-variable-2 { color: #e0e; }
-.cm-s-erlang-dark span.cm-variable-3 { color: #ccc; }
-.cm-s-erlang-dark span.cm-error      { color: #9d1e15; }
-
-.cm-s-erlang-dark .CodeMirror-activeline-background { background: #013461; }
-.cm-s-erlang-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.7/theme/icecoder.css b/www/code/codemirror-5.7/theme/icecoder.css
deleted file mode 100644
index d70d26e82..000000000
--- a/www/code/codemirror-5.7/theme/icecoder.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-ICEcoder default theme by Matt Pass, used in code editor available at https://icecoder.net
-*/
-
-.cm-s-icecoder { color: #666; background: #141612; }
-
-.cm-s-icecoder span.cm-keyword { color: #eee; font-weight:bold; }  /* off-white 1 */
-.cm-s-icecoder span.cm-atom { color: #e1c76e; }                    /* yellow */
-.cm-s-icecoder span.cm-number { color: #6cb5d9; }                  /* blue */
-.cm-s-icecoder span.cm-def { color: #b9ca4a; }                     /* green */
-
-.cm-s-icecoder span.cm-variable { color: #6cb5d9; }                /* blue */
-.cm-s-icecoder span.cm-variable-2 { color: #cc1e5c; }              /* pink */
-.cm-s-icecoder span.cm-variable-3 { color: #f9602c; }              /* orange */
-
-.cm-s-icecoder span.cm-property { color: #eee; }                   /* off-white 1 */
-.cm-s-icecoder span.cm-operator { color: #9179bb; }                /* purple */
-.cm-s-icecoder span.cm-comment { color: #97a3aa; }                 /* grey-blue */
-
-.cm-s-icecoder span.cm-string { color: #b9ca4a; }                  /* green */
-.cm-s-icecoder span.cm-string-2 { color: #6cb5d9; }                /* blue */
-
-.cm-s-icecoder span.cm-meta { color: #555; }                       /* grey */
-
-.cm-s-icecoder span.cm-qualifier { color: #555; }                  /* grey */
-.cm-s-icecoder span.cm-builtin { color: #214e7b; }                 /* bright blue */
-.cm-s-icecoder span.cm-bracket { color: #cc7; }                    /* grey-yellow */
-
-.cm-s-icecoder span.cm-tag { color: #e8e8e8; }                     /* off-white 2 */
-.cm-s-icecoder span.cm-attribute { color: #099; }                  /* teal */
-
-.cm-s-icecoder span.cm-header { color: #6a0d6a; }                  /* purple-pink */
-.cm-s-icecoder span.cm-quote { color: #186718; }                   /* dark green */
-.cm-s-icecoder span.cm-hr { color: #888; }                         /* mid-grey */
-.cm-s-icecoder span.cm-link { color: #e1c76e; }                    /* yellow */
-.cm-s-icecoder span.cm-error { color: #d00; }                      /* red */
-
-.cm-s-icecoder .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-icecoder div.CodeMirror-selected { color: #fff; background: #037; }
-.cm-s-icecoder .CodeMirror-gutters { background: #141612; min-width: 41px; border-right: 0; }
-.cm-s-icecoder .CodeMirror-linenumber { color: #555; cursor: default; }
-.cm-s-icecoder .CodeMirror-matchingbracket { border: 1px solid grey; color: black !important; }
-.cm-s-icecoder .CodeMirror-activeline-background { background: #000; }
\ No newline at end of file
diff --git a/www/code/codemirror-5.7/theme/lesser-dark.css b/www/code/codemirror-5.7/theme/lesser-dark.css
deleted file mode 100644
index 690c183d7..000000000
--- a/www/code/codemirror-5.7/theme/lesser-dark.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-http://lesscss.org/ dark theme
-Ported to CodeMirror by Peter Kroon
-*/
-.cm-s-lesser-dark {
-  line-height: 1.3em;
-}
-.cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
-.cm-s-lesser-dark div.CodeMirror-selected { background: #45443B; } /* 33322B*/
-.cm-s-lesser-dark .CodeMirror-line::selection, .cm-s-lesser-dark .CodeMirror-line > span::selection, .cm-s-lesser-dark .CodeMirror-line > span > span::selection { background: rgba(69, 68, 59, .99); }
-.cm-s-lesser-dark .CodeMirror-line::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span::-moz-selection, .cm-s-lesser-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(69, 68, 59, .99); }
-.cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
-
-.cm-s-lesser-dark.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
-
-.cm-s-lesser-dark .CodeMirror-gutters { background: #262626; border-right:1px solid #aaa; }
-.cm-s-lesser-dark .CodeMirror-guttermarker { color: #599eff; }
-.cm-s-lesser-dark .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
-
-.cm-s-lesser-dark span.cm-header { color: #a0a; }
-.cm-s-lesser-dark span.cm-quote { color: #090; }
-.cm-s-lesser-dark span.cm-keyword { color: #599eff; }
-.cm-s-lesser-dark span.cm-atom { color: #C2B470; }
-.cm-s-lesser-dark span.cm-number { color: #B35E4D; }
-.cm-s-lesser-dark span.cm-def { color: white; }
-.cm-s-lesser-dark span.cm-variable { color:#D9BF8C; }
-.cm-s-lesser-dark span.cm-variable-2 { color: #669199; }
-.cm-s-lesser-dark span.cm-variable-3 { color: white; }
-.cm-s-lesser-dark span.cm-property { color: #92A75C; }
-.cm-s-lesser-dark span.cm-operator { color: #92A75C; }
-.cm-s-lesser-dark span.cm-comment { color: #666; }
-.cm-s-lesser-dark span.cm-string { color: #BCD279; }
-.cm-s-lesser-dark span.cm-string-2 { color: #f50; }
-.cm-s-lesser-dark span.cm-meta { color: #738C73; }
-.cm-s-lesser-dark span.cm-qualifier { color: #555; }
-.cm-s-lesser-dark span.cm-builtin { color: #ff9e59; }
-.cm-s-lesser-dark span.cm-bracket { color: #EBEFE7; }
-.cm-s-lesser-dark span.cm-tag { color: #669199; }
-.cm-s-lesser-dark span.cm-attribute { color: #00c; }
-.cm-s-lesser-dark span.cm-hr { color: #999; }
-.cm-s-lesser-dark span.cm-link { color: #00c; }
-.cm-s-lesser-dark span.cm-error { color: #9d1e15; }
-
-.cm-s-lesser-dark .CodeMirror-activeline-background { background: #3C3A3A; }
-.cm-s-lesser-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.7/theme/liquibyte.css b/www/code/codemirror-5.7/theme/liquibyte.css
deleted file mode 100644
index c64c25c74..000000000
--- a/www/code/codemirror-5.7/theme/liquibyte.css
+++ /dev/null
@@ -1,95 +0,0 @@
-.cm-s-liquibyte.CodeMirror {
-	background-color: #000;
-	color: #fff;
-	line-height: 1.2em;
-	font-size: 1em;
-}
-.CodeMirror-focused .cm-matchhighlight {
-	text-decoration: underline;
-	text-decoration-color: #0f0;
-	text-decoration-style: wavy;
-}
-.cm-trailingspace {
-	text-decoration: line-through;
-	text-decoration-color: #f00;
-	text-decoration-style: dotted;
-}
-.cm-tab {
-	text-decoration: line-through;
-	text-decoration-color: #404040;
-	text-decoration-style: dotted;
-}
-.cm-s-liquibyte .CodeMirror-gutters { background-color: #262626; border-right: 1px solid #505050; padding-right: 0.8em; }
-.cm-s-liquibyte .CodeMirror-gutter-elt div { font-size: 1.2em; }
-.cm-s-liquibyte .CodeMirror-guttermarker {  }
-.cm-s-liquibyte .CodeMirror-guttermarker-subtle {  }
-.cm-s-liquibyte .CodeMirror-linenumber { color: #606060; padding-left: 0; }
-.cm-s-liquibyte .CodeMirror-cursor { border-left: 1px solid #eee; }
-
-.cm-s-liquibyte span.cm-comment     { color: #008000; }
-.cm-s-liquibyte span.cm-def         { color: #ffaf40; font-weight: bold; }
-.cm-s-liquibyte span.cm-keyword     { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-builtin     { color: #ffaf40; font-weight: bold; }
-.cm-s-liquibyte span.cm-variable    { color: #5967ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-string      { color: #ff8000; }
-.cm-s-liquibyte span.cm-number      { color: #0f0; font-weight: bold; }
-.cm-s-liquibyte span.cm-atom        { color: #bf3030; font-weight: bold; }
-
-.cm-s-liquibyte span.cm-variable-2  { color: #007f7f; font-weight: bold; }
-.cm-s-liquibyte span.cm-variable-3  { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-property    { color: #999; font-weight: bold; }
-.cm-s-liquibyte span.cm-operator    { color: #fff; }
-
-.cm-s-liquibyte span.cm-meta        { color: #0f0; }
-.cm-s-liquibyte span.cm-qualifier   { color: #fff700; font-weight: bold; }
-.cm-s-liquibyte span.cm-bracket     { color: #cc7; }
-.cm-s-liquibyte span.cm-tag         { color: #ff0; font-weight: bold; }
-.cm-s-liquibyte span.cm-attribute   { color: #c080ff; font-weight: bold; }
-.cm-s-liquibyte span.cm-error       { color: #f00; }
-
-.cm-s-liquibyte div.CodeMirror-selected { background-color: rgba(255, 0, 0, 0.25); }
-
-.cm-s-liquibyte span.cm-compilation { background-color: rgba(255, 255, 255, 0.12); }
-
-.cm-s-liquibyte .CodeMirror-activeline-background { background-color: rgba(0, 255, 0, 0.15); }
-
-/* Default styles for common addons */
-div.CodeMirror span.CodeMirror-matchingbracket { color: #0f0; font-weight: bold; }
-div.CodeMirror span.CodeMirror-nonmatchingbracket { color: #f00; font-weight: bold; }
-.CodeMirror-matchingtag { background-color: rgba(150, 255, 0, .3); }
-/* Scrollbars */
-/* Simple */
-div.CodeMirror-simplescroll-horizontal div:hover, div.CodeMirror-simplescroll-vertical div:hover {
-	background-color: rgba(80, 80, 80, .7);
-}
-div.CodeMirror-simplescroll-horizontal div, div.CodeMirror-simplescroll-vertical div {
-	background-color: rgba(80, 80, 80, .3);
-	border: 1px solid #404040;
-	border-radius: 5px;
-}
-div.CodeMirror-simplescroll-vertical div {
-	border-top: 1px solid #404040;
-	border-bottom: 1px solid #404040;
-}
-div.CodeMirror-simplescroll-horizontal div {
-	border-left: 1px solid #404040;
-	border-right: 1px solid #404040;
-}
-div.CodeMirror-simplescroll-vertical {
-	background-color: #262626;
-}
-div.CodeMirror-simplescroll-horizontal {
-	background-color: #262626;
-	border-top: 1px solid #404040;
-}
-/* Overlay */
-div.CodeMirror-overlayscroll-horizontal div, div.CodeMirror-overlayscroll-vertical div {
-	background-color: #404040;
-	border-radius: 5px;
-}
-div.CodeMirror-overlayscroll-vertical div {
-	border: 1px solid #404040;
-}
-div.CodeMirror-overlayscroll-horizontal div {
-	border: 1px solid #404040;
-}
diff --git a/www/code/codemirror-5.7/theme/material.css b/www/code/codemirror-5.7/theme/material.css
deleted file mode 100644
index 26005e280..000000000
--- a/www/code/codemirror-5.7/theme/material.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-
-    Name:       material
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original material color scheme by Mattia Astorino (https://github.com/equinusocio/material-theme)
-
-*/
-
-.cm-s-material {
-  background-color: #263238;
-  color: rgba(233, 237, 237, 1);
-}
-.cm-s-material .CodeMirror-gutters {
-  background: #263238;
-  color: rgb(83,127,126);
-  border: none;
-}
-.cm-s-material .CodeMirror-guttermarker, .cm-s-material .CodeMirror-guttermarker-subtle, .cm-s-material .CodeMirror-linenumber { color: rgb(83,127,126); }
-.cm-s-material .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
-.cm-s-material div.CodeMirror-selected { background: rgba(255, 255, 255, 0.15); }
-.cm-s-material.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-material .CodeMirror-line::selection, .cm-s-material .CodeMirror-line > span::selection, .cm-s-material .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-material .CodeMirror-line::-moz-selection, .cm-s-material .CodeMirror-line > span::-moz-selection, .cm-s-material .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-
-.cm-s-material .CodeMirror-activeline-background { background: rgba(0, 0, 0, 0); }
-.cm-s-material .cm-keyword { color: rgba(199, 146, 234, 1); }
-.cm-s-material .cm-operator { color: rgba(233, 237, 237, 1); }
-.cm-s-material .cm-variable-2 { color: #80CBC4; }
-.cm-s-material .cm-variable-3 { color: #82B1FF; }
-.cm-s-material .cm-builtin { color: #DECB6B; }
-.cm-s-material .cm-atom { color: #F77669; }
-.cm-s-material .cm-number { color: #F77669; }
-.cm-s-material .cm-def { color: rgba(233, 237, 237, 1); }
-.cm-s-material .cm-error {
-  color: rgba(255, 255, 255, 1.0);
-  background-color: #EC5F67;
-}
-.cm-s-material .cm-string { color: #C3E88D; }
-.cm-s-material .cm-string-2 { color: #80CBC4; }
-.cm-s-material .cm-comment { color: #546E7A; }
-.cm-s-material .cm-variable { color: #82B1FF; }
-.cm-s-material .cm-tag { color: #80CBC4; }
-.cm-s-material .cm-meta { color: #80CBC4; }
-.cm-s-material .cm-attribute { color: #FFCB6B; }
-.cm-s-material .cm-property { color: #80CBAE; }
-.cm-s-material .cm-qualifier { color: #DECB6B; }
-.cm-s-material .cm-variable-3 { color: #DECB6B; }
-.cm-s-material .cm-tag { color: rgba(255, 83, 112, 1); }
-.cm-s-material .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}
diff --git a/www/code/codemirror-5.7/theme/mbo.css b/www/code/codemirror-5.7/theme/mbo.css
deleted file mode 100644
index 59ff5da7c..000000000
--- a/www/code/codemirror-5.7/theme/mbo.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************/
-/*   Based on mbonaci's Brackets mbo theme                      */
-/*   https://github.com/mbonaci/global/blob/master/Mbo.tmTheme  */
-/*   Create your own: http://tmtheme-editor.herokuapp.com       */
-/****************************************************************/
-
-.cm-s-mbo.CodeMirror { background: #2c2c2c; color: #ffffec; }
-.cm-s-mbo div.CodeMirror-selected { background: #716C62; }
-.cm-s-mbo .CodeMirror-line::selection, .cm-s-mbo .CodeMirror-line > span::selection, .cm-s-mbo .CodeMirror-line > span > span::selection { background: rgba(113, 108, 98, .99); }
-.cm-s-mbo .CodeMirror-line::-moz-selection, .cm-s-mbo .CodeMirror-line > span::-moz-selection, .cm-s-mbo .CodeMirror-line > span > span::-moz-selection { background: rgba(113, 108, 98, .99); }
-.cm-s-mbo .CodeMirror-gutters { background: #4e4e4e; border-right: 0px; }
-.cm-s-mbo .CodeMirror-guttermarker { color: white; }
-.cm-s-mbo .CodeMirror-guttermarker-subtle { color: grey; }
-.cm-s-mbo .CodeMirror-linenumber { color: #dadada; }
-.cm-s-mbo .CodeMirror-cursor { border-left: 1px solid #ffffec; }
-
-.cm-s-mbo span.cm-comment { color: #95958a; }
-.cm-s-mbo span.cm-atom { color: #00a8c6; }
-.cm-s-mbo span.cm-number { color: #00a8c6; }
-
-.cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute { color: #9ddfe9; }
-.cm-s-mbo span.cm-keyword { color: #ffb928; }
-.cm-s-mbo span.cm-string { color: #ffcf6c; }
-.cm-s-mbo span.cm-string.cm-property { color: #ffffec; }
-
-.cm-s-mbo span.cm-variable { color: #ffffec; }
-.cm-s-mbo span.cm-variable-2 { color: #00a8c6; }
-.cm-s-mbo span.cm-def { color: #ffffec; }
-.cm-s-mbo span.cm-bracket { color: #fffffc; font-weight: bold; }
-.cm-s-mbo span.cm-tag { color: #9ddfe9; }
-.cm-s-mbo span.cm-link { color: #f54b07; }
-.cm-s-mbo span.cm-error { border-bottom: #636363; color: #ffffec; }
-.cm-s-mbo span.cm-qualifier { color: #ffffec; }
-
-.cm-s-mbo .CodeMirror-activeline-background { background: #494b41; }
-.cm-s-mbo .CodeMirror-matchingbracket { color: #222 !important; }
-.cm-s-mbo .CodeMirror-matchingtag { background: rgba(255, 255, 255, .37); }
diff --git a/www/code/codemirror-5.7/theme/mdn-like.css b/www/code/codemirror-5.7/theme/mdn-like.css
deleted file mode 100644
index f325d4500..000000000
--- a/www/code/codemirror-5.7/theme/mdn-like.css
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-  MDN-LIKE Theme - Mozilla
-  Ported to CodeMirror by Peter Kroon 
-  Report bugs/issues here: https://github.com/codemirror/CodeMirror/issues
-  GitHub: @peterkroon
-
-  The mdn-like theme is inspired on the displayed code examples at: https://developer.mozilla.org/en-US/docs/Web/CSS/animation
-
-*/
-.cm-s-mdn-like.CodeMirror { color: #999; background-color: #fff; }
-.cm-s-mdn-like div.CodeMirror-selected { background: #cfc; }
-.cm-s-mdn-like .CodeMirror-line::selection, .cm-s-mdn-like .CodeMirror-line > span::selection, .cm-s-mdn-like .CodeMirror-line > span > span::selection { background: #cfc; }
-.cm-s-mdn-like .CodeMirror-line::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span::-moz-selection, .cm-s-mdn-like .CodeMirror-line > span > span::-moz-selection { background: #cfc; }
-
-.cm-s-mdn-like .CodeMirror-gutters { background: #f8f8f8; border-left: 6px solid rgba(0,83,159,0.65); color: #333; }
-.cm-s-mdn-like .CodeMirror-linenumber { color: #aaa; padding-left: 8px; }
-.cm-s-mdn-like .CodeMirror-cursor { border-left: 2px solid #222; }
-
-.cm-s-mdn-like .cm-keyword { color: #6262FF; }
-.cm-s-mdn-like .cm-atom { color: #F90; }
-.cm-s-mdn-like .cm-number { color:  #ca7841; }
-.cm-s-mdn-like .cm-def { color: #8DA6CE; }
-.cm-s-mdn-like span.cm-variable-2, .cm-s-mdn-like span.cm-tag { color: #690; }
-.cm-s-mdn-like span.cm-variable-3, .cm-s-mdn-like span.cm-def { color: #07a; }
-
-.cm-s-mdn-like .cm-variable { color: #07a; }
-.cm-s-mdn-like .cm-property { color: #905; }
-.cm-s-mdn-like .cm-qualifier { color: #690; }
-
-.cm-s-mdn-like .cm-operator { color: #cda869; }
-.cm-s-mdn-like .cm-comment { color:#777; font-weight:normal; }
-.cm-s-mdn-like .cm-string { color:#07a; font-style:italic; }
-.cm-s-mdn-like .cm-string-2 { color:#bd6b18; } /*?*/
-.cm-s-mdn-like .cm-meta { color: #000; } /*?*/
-.cm-s-mdn-like .cm-builtin { color: #9B7536; } /*?*/
-.cm-s-mdn-like .cm-tag { color: #997643; }
-.cm-s-mdn-like .cm-attribute { color: #d6bb6d; } /*?*/
-.cm-s-mdn-like .cm-header { color: #FF6400; }
-.cm-s-mdn-like .cm-hr { color: #AEAEAE; }
-.cm-s-mdn-like .cm-link { color:#ad9361; font-style:italic; text-decoration:none; }
-.cm-s-mdn-like .cm-error { border-bottom: 1px solid red; }
-
-div.cm-s-mdn-like .CodeMirror-activeline-background { background: #efefff; }
-div.cm-s-mdn-like span.CodeMirror-matchingbracket { outline:1px solid grey; color: inherit; }
-
-.cm-s-mdn-like.CodeMirror { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFcAAAAyCAYAAAAp8UeFAAAHvklEQVR42s2b63bcNgyEQZCSHCdt2vd/0tWF7I+Q6XgMXiTtuvU5Pl57ZQKkKHzEAOtF5KeIJBGJ8uvL599FRFREZhFx8DeXv8trn68RuGaC8TRfo3SNp9dlDDHedyLyTUTeRWStXKPZrjtpZxaRw5hPqozRs1N8/enzIiQRWcCgy4MUA0f+XWliDhyL8Lfyvx7ei/Ae3iQFHyw7U/59pQVIMEEPEz0G7XiwdRjzSfC3UTtz9vchIntxvry5iMgfIhJoEflOz2CQr3F5h/HfeFe+GTdLaKcu9L8LTeQb/R/7GgbsfKedyNdoHsN31uRPWrfZ5wsj/NzzRQHuToIdU3ahwnsKPxXCjJITuOsi7XLc7SG/v5GdALs7wf8JjTFiB5+QvTEfRyGOfX3Lrx8wxyQi3sNq46O7QahQiCsRFgqddjBouVEHOKDgXAQHD9gJCr5sMKkEdjwsarG/ww3BMHBU7OBjXnzdyY7SfCxf5/z6ATccrwlKuwC/jhznnPF4CgVzhhVf4xp2EixcBActO75iZ8/fM9zAs2OMzKdslgXWJ9XG8PQoOAMA5fGcsvORgv0doBXyHrCwfLJAOwo71QLNkb8n2Pl6EWiR7OCibtkPaz4Kc/0NNAze2gju3zOwekALDaCFPI5vjPFmgGY5AZqyGEvH1x7QfIb8YtxMnA/b+QQ0aQDAwc6JMFg8CbQZ4qoYEEHbRwNojuK3EHwd7VALSgq+MNDKzfT58T8qdpADrgW0GmgcAS1lhzztJmkAzcPNOQbsWEALBDSlMKUG0Eq4CLAQWvEVQ9WU57gZJwZtgPO3r9oBTQ9WO8TjqXINx8R0EYpiZEUWOF3FxkbJkgU9B2f41YBrIj5ZfsQa0M5kTgiAAqM3ShXLgu8XMqcrQBvJ0CL5pnTsfMB13oB8athpAq2XOQmcGmoACCLydx7nToa23ATaSIY2ichfOdPTGxlasXMLaL0MLZAOwAKIM+y8CmicobGdCcbbK9DzN+yYGVoNNI5iUKTMyYOjPse4A8SM1MmcXgU0toOq1yO/v8FOxlASyc7TgeYaAMBJHcY1CcCwGI/TK4AmDbDyKYBBtFUkRwto8gygiQEaByFgJ00BH2M8JWwQS1nafDXQCidWyOI8AcjDCSjCLk8ngObuAm3JAHAdubAmOaK06V8MNEsKPJOhobSprwQa6gD7DclRQdqcwL4zxqgBrQcabUiBLclRDKAlWp+etPkBaNMA0AKlrHwTdEByZAA4GM+SNluSY6wAzcMNewxmgig5Ks0nkrSpBvSaQHMdKTBAnLojOdYyGpQ254602ZILPdTD1hdlggdIm74jbTp8vDwF5ZYUeLWGJpWsh6XNyXgcYwVoJQTEhhTYkxzZjiU5npU2TaB979TQehlaAVq4kaGpiPwwwLkYUuBbQwocyQTv1tA0+1UFWoJF3iv1oq+qoSk8EQdJmwHkziIF7oOZk14EGitibAdjLYYK78H5vZOhtWpoI0ATGHs0Q8OMb4Ey+2bU2UYztCtA0wFAs7TplGLRVQCcqaFdGSPCeTI1QNIC52iWNzof6Uib7xjEp07mNNoUYmVosVItHrHzRlLgBn9LFyRHaQCtVUMbtTNhoXWiTOO9k/V8BdAc1Oq0ArSQs6/5SU0hckNy9NnXqQY0PGYo5dWJ7nINaN6o958FWin27aBaWRka1r5myvLOAm0j30eBJqCxHLReVclxhxOEN2JfDWjxBtAC7MIH1fVaGdoOp4qJYDgKtKPSFNID2gSnGldrCqkFZ+5UeQXQBIRrSwocbdZYQT/2LwRahBPBXoHrB8nxaGROST62DKUbQOMMzZIC9abkuELfQzQALWTnDNAm8KHWFOJgJ5+SHIvTPcmx1xQyZRhNL5Qci689aXMEaN/uNIWkEwDAvFpOZmgsBaaGnbs1NPa1Jm32gBZAIh1pCtG7TSH4aE0y1uVY4uqoFPisGlpP2rSA5qTecWn5agK6BzSpgAyD+wFaqhnYoSZ1Vwr8CmlTQbrcO3ZaX0NAEyMbYaAlyquFoLKK3SPby9CeVUPThrSJmkCAE0CrKUQadi4DrdSlWhmah0YL9z9vClH59YGbHx1J8VZTyAjQepJjmXwAKTDQI3omc3p1U4gDUf6RfcdYfrUp5ClAi2J3Ba6UOXGo+K+bQrjjssitG2SJzshaLwMtXgRagUNpYYoVkMSBLM+9GGiJZMvduG6DRZ4qc04DMPtQQxOjEtACmhO7K1AbNbQDEggZyJwscFpAGwENhoBeUwh3bWolhe8BTYVKxQEWrSUn/uhcM5KhvUu/+eQu0Lzhi+VrK0PrZZNDQKs9cpYUuFYgMVpD4/NxenJTiMCNqdUEUf1qZWjppLT5qSkkUZbCwkbZMSuVnu80hfSkzRbQeqCZSAh6huR4VtoM2gHAlLf72smuWgE+VV7XpE25Ab2WFDgyhnSuKbs4GuGzCjR+tIoUuMFg3kgcWKLTwRqanJQ2W00hAsenfaApRC42hbCvK1SlE0HtE9BGgneJO+ELamitD1YjjOYnNYVcraGhtKkW0EqVVeDx733I2NH581k1NNxNLG0i0IJ8/NjVaOZ0tYZ2Vtr0Xv7tPV3hkWp9EFkgS/J0vosngTaSoaG06WHi+xObQkaAdlbanP8B2+2l0f90LmUAAAAASUVORK5CYII=); }
diff --git a/www/code/codemirror-5.7/theme/midnight.css b/www/code/codemirror-5.7/theme/midnight.css
deleted file mode 100644
index e41f10560..000000000
--- a/www/code/codemirror-5.7/theme/midnight.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Based on the theme at http://bonsaiden.github.com/JavaScript-Garden */
-
-/**/
-.cm-s-midnight span.CodeMirror-matchhighlight { background: #494949; }
-.cm-s-midnight.CodeMirror-focused span.CodeMirror-matchhighlight { background: #314D67 !important; }
-
-/**/
-.cm-s-midnight .CodeMirror-activeline-background { background: #253540; }
-
-.cm-s-midnight.CodeMirror {
-    background: #0F192A;
-    color: #D1EDFF;
-}
-
-.cm-s-midnight.CodeMirror { border-top: 1px solid black; border-bottom: 1px solid black; }
-
-.cm-s-midnight div.CodeMirror-selected { background: #314D67; }
-.cm-s-midnight .CodeMirror-line::selection, .cm-s-midnight .CodeMirror-line > span::selection, .cm-s-midnight .CodeMirror-line > span > span::selection { background: rgba(49, 77, 103, .99); }
-.cm-s-midnight .CodeMirror-line::-moz-selection, .cm-s-midnight .CodeMirror-line > span::-moz-selection, .cm-s-midnight .CodeMirror-line > span > span::-moz-selection { background: rgba(49, 77, 103, .99); }
-.cm-s-midnight .CodeMirror-gutters { background: #0F192A; border-right: 1px solid; }
-.cm-s-midnight .CodeMirror-guttermarker { color: white; }
-.cm-s-midnight .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-midnight .CodeMirror-linenumber { color: #D0D0D0; }
-.cm-s-midnight .CodeMirror-cursor { border-left: 1px solid #F8F8F0; }
-
-.cm-s-midnight span.cm-comment { color: #428BDD; }
-.cm-s-midnight span.cm-atom { color: #AE81FF; }
-.cm-s-midnight span.cm-number { color: #D1EDFF; }
-
-.cm-s-midnight span.cm-property, .cm-s-midnight span.cm-attribute { color: #A6E22E; }
-.cm-s-midnight span.cm-keyword { color: #E83737; }
-.cm-s-midnight span.cm-string { color: #1DC116; }
-
-.cm-s-midnight span.cm-variable { color: #FFAA3E; }
-.cm-s-midnight span.cm-variable-2 { color: #FFAA3E; }
-.cm-s-midnight span.cm-def { color: #4DD; }
-.cm-s-midnight span.cm-bracket { color: #D1EDFF; }
-.cm-s-midnight span.cm-tag { color: #449; }
-.cm-s-midnight span.cm-link { color: #AE81FF; }
-.cm-s-midnight span.cm-error { background: #F92672; color: #F8F8F0; }
-
-.cm-s-midnight .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}
diff --git a/www/code/codemirror-5.7/theme/monokai.css b/www/code/codemirror-5.7/theme/monokai.css
deleted file mode 100644
index 6910f793e..000000000
--- a/www/code/codemirror-5.7/theme/monokai.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Based on Sublime Text's Monokai theme */
-
-.cm-s-monokai.CodeMirror { background: #272822; color: #f8f8f2; }
-.cm-s-monokai div.CodeMirror-selected { background: #49483E; }
-.cm-s-monokai .CodeMirror-line::selection, .cm-s-monokai .CodeMirror-line > span::selection, .cm-s-monokai .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
-.cm-s-monokai .CodeMirror-line::-moz-selection, .cm-s-monokai .CodeMirror-line > span::-moz-selection, .cm-s-monokai .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
-.cm-s-monokai .CodeMirror-gutters { background: #272822; border-right: 0px; }
-.cm-s-monokai .CodeMirror-guttermarker { color: white; }
-.cm-s-monokai .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-monokai .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
-
-.cm-s-monokai span.cm-comment { color: #75715e; }
-.cm-s-monokai span.cm-atom { color: #ae81ff; }
-.cm-s-monokai span.cm-number { color: #ae81ff; }
-
-.cm-s-monokai span.cm-property, .cm-s-monokai span.cm-attribute { color: #a6e22e; }
-.cm-s-monokai span.cm-keyword { color: #f92672; }
-.cm-s-monokai span.cm-string { color: #e6db74; }
-
-.cm-s-monokai span.cm-variable { color: #f8f8f2; }
-.cm-s-monokai span.cm-variable-2 { color: #9effff; }
-.cm-s-monokai span.cm-variable-3 { color: #66d9ef; }
-.cm-s-monokai span.cm-def { color: #fd971f; }
-.cm-s-monokai span.cm-bracket { color: #f8f8f2; }
-.cm-s-monokai span.cm-tag { color: #f92672; }
-.cm-s-monokai span.cm-header { color: #ae81ff; }
-.cm-s-monokai span.cm-link { color: #ae81ff; }
-.cm-s-monokai span.cm-error { background: #f92672; color: #f8f8f0; }
-
-.cm-s-monokai .CodeMirror-activeline-background { background: #373831; }
-.cm-s-monokai .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
-}
diff --git a/www/code/codemirror-5.7/theme/neat.css b/www/code/codemirror-5.7/theme/neat.css
deleted file mode 100644
index 4267b1a37..000000000
--- a/www/code/codemirror-5.7/theme/neat.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.cm-s-neat span.cm-comment { color: #a86; }
-.cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; }
-.cm-s-neat span.cm-string { color: #a22; }
-.cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; }
-.cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; }
-.cm-s-neat span.cm-variable { color: black; }
-.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
-.cm-s-neat span.cm-meta { color: #555; }
-.cm-s-neat span.cm-link { color: #3a3; }
-
-.cm-s-neat .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-neat .CodeMirror-matchingbracket { outline:1px solid grey; color:black !important; }
diff --git a/www/code/codemirror-5.7/theme/neo.css b/www/code/codemirror-5.7/theme/neo.css
deleted file mode 100644
index b28d5c65f..000000000
--- a/www/code/codemirror-5.7/theme/neo.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* neo theme for codemirror */
-
-/* Color scheme */
-
-.cm-s-neo.CodeMirror {
-  background-color:#ffffff;
-  color:#2e383c;
-  line-height:1.4375;
-}
-.cm-s-neo .cm-comment { color:#75787b; }
-.cm-s-neo .cm-keyword, .cm-s-neo .cm-property { color:#1d75b3; }
-.cm-s-neo .cm-atom,.cm-s-neo .cm-number { color:#75438a; }
-.cm-s-neo .cm-node,.cm-s-neo .cm-tag { color:#9c3328; }
-.cm-s-neo .cm-string { color:#b35e14; }
-.cm-s-neo .cm-variable,.cm-s-neo .cm-qualifier { color:#047d65; }
-
-
-/* Editor styling */
-
-.cm-s-neo pre {
-  padding:0;
-}
-
-.cm-s-neo .CodeMirror-gutters {
-  border:none;
-  border-right:10px solid transparent;
-  background-color:transparent;
-}
-
-.cm-s-neo .CodeMirror-linenumber {
-  padding:0;
-  color:#e0e2e5;
-}
-
-.cm-s-neo .CodeMirror-guttermarker { color: #1d75b3; }
-.cm-s-neo .CodeMirror-guttermarker-subtle { color: #e0e2e5; }
-
-.cm-s-neo .CodeMirror-cursor {
-  width: auto;
-  border: 0;
-  background: rgba(155,157,162,0.37);
-  z-index: 1;
-}
diff --git a/www/code/codemirror-5.7/theme/night.css b/www/code/codemirror-5.7/theme/night.css
deleted file mode 100644
index 4dbb86624..000000000
--- a/www/code/codemirror-5.7/theme/night.css
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Loosely based on the Midnight Textmate theme */
-
-.cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-night div.CodeMirror-selected { background: #447; }
-.cm-s-night .CodeMirror-line::selection, .cm-s-night .CodeMirror-line > span::selection, .cm-s-night .CodeMirror-line > span > span::selection { background: rgba(68, 68, 119, .99); }
-.cm-s-night .CodeMirror-line::-moz-selection, .cm-s-night .CodeMirror-line > span::-moz-selection, .cm-s-night .CodeMirror-line > span > span::-moz-selection { background: rgba(68, 68, 119, .99); }
-.cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-night .CodeMirror-guttermarker { color: white; }
-.cm-s-night .CodeMirror-guttermarker-subtle { color: #bbb; }
-.cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-night .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-night span.cm-comment { color: #6900a1; }
-.cm-s-night span.cm-atom { color: #845dc4; }
-.cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; }
-.cm-s-night span.cm-keyword { color: #599eff; }
-.cm-s-night span.cm-string { color: #37f14a; }
-.cm-s-night span.cm-meta { color: #7678e2; }
-.cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
-.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
-.cm-s-night span.cm-bracket { color: #8da6ce; }
-.cm-s-night span.cm-comment { color: #6900a1; }
-.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
-.cm-s-night span.cm-link { color: #845dc4; }
-.cm-s-night span.cm-error { color: #9d1e15; }
-
-.cm-s-night .CodeMirror-activeline-background { background: #1C005A; }
-.cm-s-night .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.7/theme/paraiso-dark.css b/www/code/codemirror-5.7/theme/paraiso-dark.css
deleted file mode 100644
index aa9d207e6..000000000
--- a/www/code/codemirror-5.7/theme/paraiso-dark.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-    Name:       Paraíso (Dark)
-    Author:     Jan T. Sott
-
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
-    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-dark.CodeMirror { background: #2f1e2e; color: #b9b6b0; }
-.cm-s-paraiso-dark div.CodeMirror-selected { background: #41323f; }
-.cm-s-paraiso-dark .CodeMirror-line::selection, .cm-s-paraiso-dark .CodeMirror-line > span::selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::selection { background: rgba(65, 50, 63, .99); }
-.cm-s-paraiso-dark .CodeMirror-line::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(65, 50, 63, .99); }
-.cm-s-paraiso-dark .CodeMirror-gutters { background: #2f1e2e; border-right: 0px; }
-.cm-s-paraiso-dark .CodeMirror-guttermarker { color: #ef6155; }
-.cm-s-paraiso-dark .CodeMirror-guttermarker-subtle { color: #776e71; }
-.cm-s-paraiso-dark .CodeMirror-linenumber { color: #776e71; }
-.cm-s-paraiso-dark .CodeMirror-cursor { border-left: 1px solid #8d8687; }
-
-.cm-s-paraiso-dark span.cm-comment { color: #e96ba8; }
-.cm-s-paraiso-dark span.cm-atom { color: #815ba4; }
-.cm-s-paraiso-dark span.cm-number { color: #815ba4; }
-
-.cm-s-paraiso-dark span.cm-property, .cm-s-paraiso-dark span.cm-attribute { color: #48b685; }
-.cm-s-paraiso-dark span.cm-keyword { color: #ef6155; }
-.cm-s-paraiso-dark span.cm-string { color: #fec418; }
-
-.cm-s-paraiso-dark span.cm-variable { color: #48b685; }
-.cm-s-paraiso-dark span.cm-variable-2 { color: #06b6ef; }
-.cm-s-paraiso-dark span.cm-def { color: #f99b15; }
-.cm-s-paraiso-dark span.cm-bracket { color: #b9b6b0; }
-.cm-s-paraiso-dark span.cm-tag { color: #ef6155; }
-.cm-s-paraiso-dark span.cm-link { color: #815ba4; }
-.cm-s-paraiso-dark span.cm-error { background: #ef6155; color: #8d8687; }
-
-.cm-s-paraiso-dark .CodeMirror-activeline-background { background: #4D344A; }
-.cm-s-paraiso-dark .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.7/theme/paraiso-light.css b/www/code/codemirror-5.7/theme/paraiso-light.css
deleted file mode 100644
index ae0c755f8..000000000
--- a/www/code/codemirror-5.7/theme/paraiso-light.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-    Name:       Paraíso (Light)
-    Author:     Jan T. Sott
-
-    Color scheme by Jan T. Sott (https://github.com/idleberg/Paraiso-CodeMirror)
-    Inspired by the art of Rubens LP (http://www.rubenslp.com.br)
-
-*/
-
-.cm-s-paraiso-light.CodeMirror { background: #e7e9db; color: #41323f; }
-.cm-s-paraiso-light div.CodeMirror-selected { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-line::selection, .cm-s-paraiso-light .CodeMirror-line > span::selection, .cm-s-paraiso-light .CodeMirror-line > span > span::selection { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-line::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span::-moz-selection, .cm-s-paraiso-light .CodeMirror-line > span > span::-moz-selection { background: #b9b6b0; }
-.cm-s-paraiso-light .CodeMirror-gutters { background: #e7e9db; border-right: 0px; }
-.cm-s-paraiso-light .CodeMirror-guttermarker { color: black; }
-.cm-s-paraiso-light .CodeMirror-guttermarker-subtle { color: #8d8687; }
-.cm-s-paraiso-light .CodeMirror-linenumber { color: #8d8687; }
-.cm-s-paraiso-light .CodeMirror-cursor { border-left: 1px solid #776e71; }
-
-.cm-s-paraiso-light span.cm-comment { color: #e96ba8; }
-.cm-s-paraiso-light span.cm-atom { color: #815ba4; }
-.cm-s-paraiso-light span.cm-number { color: #815ba4; }
-
-.cm-s-paraiso-light span.cm-property, .cm-s-paraiso-light span.cm-attribute { color: #48b685; }
-.cm-s-paraiso-light span.cm-keyword { color: #ef6155; }
-.cm-s-paraiso-light span.cm-string { color: #fec418; }
-
-.cm-s-paraiso-light span.cm-variable { color: #48b685; }
-.cm-s-paraiso-light span.cm-variable-2 { color: #06b6ef; }
-.cm-s-paraiso-light span.cm-def { color: #f99b15; }
-.cm-s-paraiso-light span.cm-bracket { color: #41323f; }
-.cm-s-paraiso-light span.cm-tag { color: #ef6155; }
-.cm-s-paraiso-light span.cm-link { color: #815ba4; }
-.cm-s-paraiso-light span.cm-error { background: #ef6155; color: #776e71; }
-
-.cm-s-paraiso-light .CodeMirror-activeline-background { background: #CFD1C4; }
-.cm-s-paraiso-light .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.7/theme/pastel-on-dark.css b/www/code/codemirror-5.7/theme/pastel-on-dark.css
deleted file mode 100644
index 719750920..000000000
--- a/www/code/codemirror-5.7/theme/pastel-on-dark.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Pastel On Dark theme ported from ACE editor
- * @license MIT
- * @copyright AtomicPages LLC 2014
- * @author Dennis Thompson, AtomicPages LLC
- * @version 1.1
- * @source https://github.com/atomicpages/codemirror-pastel-on-dark-theme
- */
-
-.cm-s-pastel-on-dark.CodeMirror {
-	background: #2c2827;
-	color: #8F938F;
-	line-height: 1.5;
-	font-size: 14px;
-}
-.cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2); }
-.cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }
-.cm-s-pastel-on-dark .CodeMirror-line::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span::-moz-selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(221,240,255,0.2); }
-
-.cm-s-pastel-on-dark .CodeMirror-gutters {
-	background: #34302f;
-	border-right: 0px;
-	padding: 0 3px;
-}
-.cm-s-pastel-on-dark .CodeMirror-guttermarker { color: white; }
-.cm-s-pastel-on-dark .CodeMirror-guttermarker-subtle { color: #8F938F; }
-.cm-s-pastel-on-dark .CodeMirror-linenumber { color: #8F938F; }
-.cm-s-pastel-on-dark .CodeMirror-cursor { border-left: 1px solid #A7A7A7; }
-.cm-s-pastel-on-dark span.cm-comment { color: #A6C6FF; }
-.cm-s-pastel-on-dark span.cm-atom { color: #DE8E30; }
-.cm-s-pastel-on-dark span.cm-number { color: #CCCCCC; }
-.cm-s-pastel-on-dark span.cm-property { color: #8F938F; }
-.cm-s-pastel-on-dark span.cm-attribute { color: #a6e22e; }
-.cm-s-pastel-on-dark span.cm-keyword { color: #AEB2F8; }
-.cm-s-pastel-on-dark span.cm-string { color: #66A968; }
-.cm-s-pastel-on-dark span.cm-variable { color: #AEB2F8; }
-.cm-s-pastel-on-dark span.cm-variable-2 { color: #BEBF55; }
-.cm-s-pastel-on-dark span.cm-variable-3 { color: #DE8E30; }
-.cm-s-pastel-on-dark span.cm-def { color: #757aD8; }
-.cm-s-pastel-on-dark span.cm-bracket { color: #f8f8f2; }
-.cm-s-pastel-on-dark span.cm-tag { color: #C1C144; }
-.cm-s-pastel-on-dark span.cm-link { color: #ae81ff; }
-.cm-s-pastel-on-dark span.cm-qualifier,.cm-s-pastel-on-dark span.cm-builtin { color: #C1C144; }
-.cm-s-pastel-on-dark span.cm-error {
-	background: #757aD8;
-	color: #f8f8f0;
-}
-.cm-s-pastel-on-dark .CodeMirror-activeline-background { background: rgba(255, 255, 255, 0.031); }
-.cm-s-pastel-on-dark .CodeMirror-matchingbracket {
-	border: 1px solid rgba(255,255,255,0.25);
-	color: #8F938F !important;
-	margin: -1px -1px 0 -1px;
-}
diff --git a/www/code/codemirror-5.7/theme/rubyblue.css b/www/code/codemirror-5.7/theme/rubyblue.css
deleted file mode 100644
index 76d33e779..000000000
--- a/www/code/codemirror-5.7/theme/rubyblue.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
-.cm-s-rubyblue div.CodeMirror-selected { background: #38566F; }
-.cm-s-rubyblue .CodeMirror-line::selection, .cm-s-rubyblue .CodeMirror-line > span::selection, .cm-s-rubyblue .CodeMirror-line > span > span::selection { background: rgba(56, 86, 111, 0.99); }
-.cm-s-rubyblue .CodeMirror-line::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span::-moz-selection, .cm-s-rubyblue .CodeMirror-line > span > span::-moz-selection { background: rgba(56, 86, 111, 0.99); }
-.cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
-.cm-s-rubyblue .CodeMirror-guttermarker { color: white; }
-.cm-s-rubyblue .CodeMirror-guttermarker-subtle { color: #3E7087; }
-.cm-s-rubyblue .CodeMirror-linenumber { color: white; }
-.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }
-.cm-s-rubyblue span.cm-atom { color: #F4C20B; }
-.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
-.cm-s-rubyblue span.cm-keyword { color: #F0F; }
-.cm-s-rubyblue span.cm-string { color: #F08047; }
-.cm-s-rubyblue span.cm-meta { color: #F0F; }
-.cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
-.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
-.cm-s-rubyblue span.cm-bracket { color: #F0F; }
-.cm-s-rubyblue span.cm-link { color: #F4C20B; }
-.cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
-.cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }
-.cm-s-rubyblue span.cm-error { color: #AF2018; }
-
-.cm-s-rubyblue .CodeMirror-activeline-background { background: #173047; }
diff --git a/www/code/codemirror-5.7/theme/seti.css b/www/code/codemirror-5.7/theme/seti.css
deleted file mode 100644
index 6632d3fc7..000000000
--- a/www/code/codemirror-5.7/theme/seti.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
-    Name:       seti
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original seti color scheme by Jesse Weed (https://github.com/jesseweed/seti-syntax)
-
-*/
-
-
-.cm-s-seti.CodeMirror {
-  background-color: #151718 !important;
-  color: #CFD2D1 !important;
-  border: none;
-}
-.cm-s-seti .CodeMirror-gutters {
-  color: #404b53;
-  background-color: #0E1112;
-  border: none;
-}
-.cm-s-seti .CodeMirror-cursor { border-left: solid thin #f8f8f0; }
-.cm-s-seti .CodeMirror-linenumber { color: #6D8A88; }
-.cm-s-seti.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti .CodeMirror-line::selection, .cm-s-seti .CodeMirror-line > span::selection, .cm-s-seti .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti .CodeMirror-line::-moz-selection, .cm-s-seti .CodeMirror-line > span::-moz-selection, .cm-s-seti .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-seti span.cm-comment { color: #41535b; }
-.cm-s-seti span.cm-string, .cm-s-seti span.cm-string-2 { color: #55b5db; }
-.cm-s-seti span.cm-number { color: #cd3f45; }
-.cm-s-seti span.cm-variable { color: #55b5db; }
-.cm-s-seti span.cm-variable-2 { color: #a074c4; }
-.cm-s-seti span.cm-def { color: #55b5db; }
-.cm-s-seti span.cm-keyword { color: #ff79c6; }
-.cm-s-seti span.cm-operator { color: #9fca56; }
-.cm-s-seti span.cm-keyword { color: #e6cd69; }
-.cm-s-seti span.cm-atom { color: #cd3f45; }
-.cm-s-seti span.cm-meta { color: #55b5db; }
-.cm-s-seti span.cm-tag { color: #55b5db; }
-.cm-s-seti span.cm-attribute { color: #9fca56; }
-.cm-s-seti span.cm-qualifier { color: #9fca56; }
-.cm-s-seti span.cm-property { color: #a074c4; }
-.cm-s-seti span.cm-variable-3 { color: #9fca56; }
-.cm-s-seti span.cm-builtin { color: #9fca56; }
-.cm-s-seti .CodeMirror-activeline-background { background: #101213; }
-.cm-s-seti .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.7/theme/solarized.css b/www/code/codemirror-5.7/theme/solarized.css
deleted file mode 100644
index 7882c9376..000000000
--- a/www/code/codemirror-5.7/theme/solarized.css
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-Solarized theme for code-mirror
-http://ethanschoonover.com/solarized
-*/
-
-/*
-Solarized color pallet
-http://ethanschoonover.com/solarized/img/solarized-palette.png
-*/
-
-.solarized.base03 { color: #002b36; }
-.solarized.base02 { color: #073642; }
-.solarized.base01 { color: #586e75; }
-.solarized.base00 { color: #657b83; }
-.solarized.base0 { color: #839496; }
-.solarized.base1 { color: #93a1a1; }
-.solarized.base2 { color: #eee8d5; }
-.solarized.base3  { color: #fdf6e3; }
-.solarized.solar-yellow  { color: #b58900; }
-.solarized.solar-orange  { color: #cb4b16; }
-.solarized.solar-red { color: #dc322f; }
-.solarized.solar-magenta { color: #d33682; }
-.solarized.solar-violet  { color: #6c71c4; }
-.solarized.solar-blue { color: #268bd2; }
-.solarized.solar-cyan { color: #2aa198; }
-.solarized.solar-green { color: #859900; }
-
-/* Color scheme for code-mirror */
-
-.cm-s-solarized {
-  line-height: 1.45em;
-  color-profile: sRGB;
-  rendering-intent: auto;
-}
-.cm-s-solarized.cm-s-dark {
-  color: #839496;
-  background-color:  #002b36;
-  text-shadow: #002b36 0 1px;
-}
-.cm-s-solarized.cm-s-light {
-  background-color: #fdf6e3;
-  color: #657b83;
-  text-shadow: #eee8d5 0 1px;
-}
-
-.cm-s-solarized .CodeMirror-widget {
-  text-shadow: none;
-}
-
-.cm-s-solarized .cm-header { color: #586e75; }
-.cm-s-solarized .cm-quote { color: #93a1a1; }
-
-.cm-s-solarized .cm-keyword { color: #cb4b16; }
-.cm-s-solarized .cm-atom { color: #d33682; }
-.cm-s-solarized .cm-number { color: #d33682; }
-.cm-s-solarized .cm-def { color: #2aa198; }
-
-.cm-s-solarized .cm-variable { color: #839496; }
-.cm-s-solarized .cm-variable-2 { color: #b58900; }
-.cm-s-solarized .cm-variable-3 { color: #6c71c4; }
-
-.cm-s-solarized .cm-property { color: #2aa198; }
-.cm-s-solarized .cm-operator { color: #6c71c4; }
-
-.cm-s-solarized .cm-comment { color: #586e75; font-style:italic; }
-
-.cm-s-solarized .cm-string { color: #859900; }
-.cm-s-solarized .cm-string-2 { color: #b58900; }
-
-.cm-s-solarized .cm-meta { color: #859900; }
-.cm-s-solarized .cm-qualifier { color: #b58900; }
-.cm-s-solarized .cm-builtin { color: #d33682; }
-.cm-s-solarized .cm-bracket { color: #cb4b16; }
-.cm-s-solarized .CodeMirror-matchingbracket { color: #859900; }
-.cm-s-solarized .CodeMirror-nonmatchingbracket { color: #dc322f; }
-.cm-s-solarized .cm-tag { color: #93a1a1; }
-.cm-s-solarized .cm-attribute { color: #2aa198; }
-.cm-s-solarized .cm-hr {
-  color: transparent;
-  border-top: 1px solid #586e75;
-  display: block;
-}
-.cm-s-solarized .cm-link { color: #93a1a1; cursor: pointer; }
-.cm-s-solarized .cm-special { color: #6c71c4; }
-.cm-s-solarized .cm-em {
-  color: #999;
-  text-decoration: underline;
-  text-decoration-style: dotted;
-}
-.cm-s-solarized .cm-strong { color: #eee; }
-.cm-s-solarized .cm-error,
-.cm-s-solarized .cm-invalidchar {
-  color: #586e75;
-  border-bottom: 1px dotted #dc322f;
-}
-
-.cm-s-solarized.cm-s-dark div.CodeMirror-selected { background: #073642; }
-.cm-s-solarized.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
-.cm-s-solarized.cm-s-dark .CodeMirror-line::-moz-selection, .cm-s-dark .CodeMirror-line > span::-moz-selection, .cm-s-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(7, 54, 66, 0.99); }
-
-.cm-s-solarized.cm-s-light div.CodeMirror-selected { background: #eee8d5; }
-.cm-s-solarized.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: #eee8d5; }
-.cm-s-solarized.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-ligh .CodeMirror-line > span::-moz-selection, .cm-s-ligh .CodeMirror-line > span > span::-moz-selection { background: #eee8d5; }
-
-/* Editor styling */
-
-
-
-/* Little shadow on the view-port of the buffer view */
-.cm-s-solarized.CodeMirror {
-  -moz-box-shadow: inset 7px 0 12px -6px #000;
-  -webkit-box-shadow: inset 7px 0 12px -6px #000;
-  box-shadow: inset 7px 0 12px -6px #000;
-}
-
-/* Gutter border and some shadow from it  */
-.cm-s-solarized .CodeMirror-gutters {
-  border-right: 1px solid;
-}
-
-/* Gutter colors and line number styling based of color scheme (dark / light) */
-
-/* Dark */
-.cm-s-solarized.cm-s-dark .CodeMirror-gutters {
-  background-color:  #002b36;
-  border-color: #00232c;
-}
-
-.cm-s-solarized.cm-s-dark .CodeMirror-linenumber {
-  text-shadow: #021014 0 -1px;
-}
-
-/* Light */
-.cm-s-solarized.cm-s-light .CodeMirror-gutters {
-  background-color: #fdf6e3;
-  border-color: #eee8d5;
-}
-
-/* Common */
-.cm-s-solarized .CodeMirror-linenumber {
-  color: #586e75;
-  padding: 0 5px;
-}
-.cm-s-solarized .CodeMirror-guttermarker-subtle { color: #586e75; }
-.cm-s-solarized.cm-s-dark .CodeMirror-guttermarker { color: #ddd; }
-.cm-s-solarized.cm-s-light .CodeMirror-guttermarker { color: #cb4b16; }
-
-.cm-s-solarized .CodeMirror-gutter .CodeMirror-gutter-text {
-  color: #586e75;
-}
-
-.cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
-
-/*
-Active line. Negative margin compensates left padding of the text in the
-view-port
-*/
-.cm-s-solarized.cm-s-dark .CodeMirror-activeline-background {
-  background: rgba(255, 255, 255, 0.10);
-}
-.cm-s-solarized.cm-s-light .CodeMirror-activeline-background {
-  background: rgba(0, 0, 0, 0.10);
-}
diff --git a/www/code/codemirror-5.7/theme/the-matrix.css b/www/code/codemirror-5.7/theme/the-matrix.css
deleted file mode 100644
index 3912a8dbd..000000000
--- a/www/code/codemirror-5.7/theme/the-matrix.css
+++ /dev/null
@@ -1,30 +0,0 @@
-.cm-s-the-matrix.CodeMirror { background: #000000; color: #00FF00; }
-.cm-s-the-matrix div.CodeMirror-selected { background: #2D2D2D; }
-.cm-s-the-matrix .CodeMirror-line::selection, .cm-s-the-matrix .CodeMirror-line > span::selection, .cm-s-the-matrix .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-the-matrix .CodeMirror-line::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span::-moz-selection, .cm-s-the-matrix .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-the-matrix .CodeMirror-gutters { background: #060; border-right: 2px solid #00FF00; }
-.cm-s-the-matrix .CodeMirror-guttermarker { color: #0f0; }
-.cm-s-the-matrix .CodeMirror-guttermarker-subtle { color: white; }
-.cm-s-the-matrix .CodeMirror-linenumber { color: #FFFFFF; }
-.cm-s-the-matrix .CodeMirror-cursor { border-left: 1px solid #00FF00; }
-
-.cm-s-the-matrix span.cm-keyword { color: #008803; font-weight: bold; }
-.cm-s-the-matrix span.cm-atom { color: #3FF; }
-.cm-s-the-matrix span.cm-number { color: #FFB94F; }
-.cm-s-the-matrix span.cm-def { color: #99C; }
-.cm-s-the-matrix span.cm-variable { color: #F6C; }
-.cm-s-the-matrix span.cm-variable-2 { color: #C6F; }
-.cm-s-the-matrix span.cm-variable-3 { color: #96F; }
-.cm-s-the-matrix span.cm-property { color: #62FFA0; }
-.cm-s-the-matrix span.cm-operator { color: #999; }
-.cm-s-the-matrix span.cm-comment { color: #CCCCCC; }
-.cm-s-the-matrix span.cm-string { color: #39C; }
-.cm-s-the-matrix span.cm-meta { color: #C9F; }
-.cm-s-the-matrix span.cm-qualifier { color: #FFF700; }
-.cm-s-the-matrix span.cm-builtin { color: #30a; }
-.cm-s-the-matrix span.cm-bracket { color: #cc7; }
-.cm-s-the-matrix span.cm-tag { color: #FFBD40; }
-.cm-s-the-matrix span.cm-attribute { color: #FFF700; }
-.cm-s-the-matrix span.cm-error { color: #FF0000; }
-
-.cm-s-the-matrix .CodeMirror-activeline-background { background: #040; }
diff --git a/www/code/codemirror-5.7/theme/tomorrow-night-bright.css b/www/code/codemirror-5.7/theme/tomorrow-night-bright.css
deleted file mode 100644
index b6dd4a927..000000000
--- a/www/code/codemirror-5.7/theme/tomorrow-night-bright.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-
-    Name:       Tomorrow Night - Bright
-    Author:     Chris Kempson
-
-    Port done by Gerard Braad 
-
-*/
-
-.cm-s-tomorrow-night-bright.CodeMirror { background: #000000; color: #eaeaea; }
-.cm-s-tomorrow-night-bright div.CodeMirror-selected { background: #424242; }
-.cm-s-tomorrow-night-bright .CodeMirror-gutters { background: #000000; border-right: 0px; }
-.cm-s-tomorrow-night-bright .CodeMirror-guttermarker { color: #e78c45; }
-.cm-s-tomorrow-night-bright .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-tomorrow-night-bright .CodeMirror-linenumber { color: #424242; }
-.cm-s-tomorrow-night-bright .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
-
-.cm-s-tomorrow-night-bright span.cm-comment { color: #d27b53; }
-.cm-s-tomorrow-night-bright span.cm-atom { color: #a16a94; }
-.cm-s-tomorrow-night-bright span.cm-number { color: #a16a94; }
-
-.cm-s-tomorrow-night-bright span.cm-property, .cm-s-tomorrow-night-bright span.cm-attribute { color: #99cc99; }
-.cm-s-tomorrow-night-bright span.cm-keyword { color: #d54e53; }
-.cm-s-tomorrow-night-bright span.cm-string { color: #e7c547; }
-
-.cm-s-tomorrow-night-bright span.cm-variable { color: #b9ca4a; }
-.cm-s-tomorrow-night-bright span.cm-variable-2 { color: #7aa6da; }
-.cm-s-tomorrow-night-bright span.cm-def { color: #e78c45; }
-.cm-s-tomorrow-night-bright span.cm-bracket { color: #eaeaea; }
-.cm-s-tomorrow-night-bright span.cm-tag { color: #d54e53; }
-.cm-s-tomorrow-night-bright span.cm-link { color: #a16a94; }
-.cm-s-tomorrow-night-bright span.cm-error { background: #d54e53; color: #6A6A6A; }
-
-.cm-s-tomorrow-night-bright .CodeMirror-activeline-background { background: #2a2a2a; }
-.cm-s-tomorrow-night-bright .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.7/theme/tomorrow-night-eighties.css b/www/code/codemirror-5.7/theme/tomorrow-night-eighties.css
deleted file mode 100644
index 2a9debc32..000000000
--- a/www/code/codemirror-5.7/theme/tomorrow-night-eighties.css
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-    Name:       Tomorrow Night - Eighties
-    Author:     Chris Kempson
-
-    CodeMirror template by Jan T. Sott (https://github.com/idleberg/base16-codemirror)
-    Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16)
-
-*/
-
-.cm-s-tomorrow-night-eighties.CodeMirror { background: #000000; color: #CCCCCC; }
-.cm-s-tomorrow-night-eighties div.CodeMirror-selected { background: #2D2D2D; }
-.cm-s-tomorrow-night-eighties .CodeMirror-line::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-tomorrow-night-eighties .CodeMirror-line::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span::-moz-selection, .cm-s-tomorrow-night-eighties .CodeMirror-line > span > span::-moz-selection { background: rgba(45, 45, 45, 0.99); }
-.cm-s-tomorrow-night-eighties .CodeMirror-gutters { background: #000000; border-right: 0px; }
-.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker { color: #f2777a; }
-.cm-s-tomorrow-night-eighties .CodeMirror-guttermarker-subtle { color: #777; }
-.cm-s-tomorrow-night-eighties .CodeMirror-linenumber { color: #515151; }
-.cm-s-tomorrow-night-eighties .CodeMirror-cursor { border-left: 1px solid #6A6A6A; }
-
-.cm-s-tomorrow-night-eighties span.cm-comment { color: #d27b53; }
-.cm-s-tomorrow-night-eighties span.cm-atom { color: #a16a94; }
-.cm-s-tomorrow-night-eighties span.cm-number { color: #a16a94; }
-
-.cm-s-tomorrow-night-eighties span.cm-property, .cm-s-tomorrow-night-eighties span.cm-attribute { color: #99cc99; }
-.cm-s-tomorrow-night-eighties span.cm-keyword { color: #f2777a; }
-.cm-s-tomorrow-night-eighties span.cm-string { color: #ffcc66; }
-
-.cm-s-tomorrow-night-eighties span.cm-variable { color: #99cc99; }
-.cm-s-tomorrow-night-eighties span.cm-variable-2 { color: #6699cc; }
-.cm-s-tomorrow-night-eighties span.cm-def { color: #f99157; }
-.cm-s-tomorrow-night-eighties span.cm-bracket { color: #CCCCCC; }
-.cm-s-tomorrow-night-eighties span.cm-tag { color: #f2777a; }
-.cm-s-tomorrow-night-eighties span.cm-link { color: #a16a94; }
-.cm-s-tomorrow-night-eighties span.cm-error { background: #f2777a; color: #6A6A6A; }
-
-.cm-s-tomorrow-night-eighties .CodeMirror-activeline-background { background: #343600; }
-.cm-s-tomorrow-night-eighties .CodeMirror-matchingbracket { text-decoration: underline; color: white !important; }
diff --git a/www/code/codemirror-5.7/theme/ttcn.css b/www/code/codemirror-5.7/theme/ttcn.css
deleted file mode 100644
index b3d465645..000000000
--- a/www/code/codemirror-5.7/theme/ttcn.css
+++ /dev/null
@@ -1,64 +0,0 @@
-.cm-s-ttcn .cm-quote { color: #090; }
-.cm-s-ttcn .cm-negative { color: #d44; }
-.cm-s-ttcn .cm-positive { color: #292; }
-.cm-s-ttcn .cm-header, .cm-strong { font-weight: bold; }
-.cm-s-ttcn .cm-em { font-style: italic; }
-.cm-s-ttcn .cm-link { text-decoration: underline; }
-.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
-.cm-s-ttcn .cm-header { color: #00f; font-weight: bold; }
-
-.cm-s-ttcn .cm-atom { color: #219; }
-.cm-s-ttcn .cm-attribute { color: #00c; }
-.cm-s-ttcn .cm-bracket { color: #997; }
-.cm-s-ttcn .cm-comment { color: #333333; }
-.cm-s-ttcn .cm-def { color: #00f; }
-.cm-s-ttcn .cm-em { font-style: italic; }
-.cm-s-ttcn .cm-error { color: #f00; }
-.cm-s-ttcn .cm-hr { color: #999; }
-.cm-s-ttcn .cm-invalidchar { color: #f00; }
-.cm-s-ttcn .cm-keyword { font-weight:bold; }
-.cm-s-ttcn .cm-link { color: #00c; text-decoration: underline; }
-.cm-s-ttcn .cm-meta { color: #555; }
-.cm-s-ttcn .cm-negative { color: #d44; }
-.cm-s-ttcn .cm-positive { color: #292; }
-.cm-s-ttcn .cm-qualifier { color: #555; }
-.cm-s-ttcn .cm-strikethrough { text-decoration: line-through; }
-.cm-s-ttcn .cm-string { color: #006400; }
-.cm-s-ttcn .cm-string-2 { color: #f50; }
-.cm-s-ttcn .cm-strong { font-weight: bold; }
-.cm-s-ttcn .cm-tag { color: #170; }
-.cm-s-ttcn .cm-variable { color: #8B2252; }
-.cm-s-ttcn .cm-variable-2 { color: #05a; }
-.cm-s-ttcn .cm-variable-3 { color: #085; }
-
-.cm-s-ttcn .cm-invalidchar { color: #f00; }
-
-/* ASN */
-.cm-s-ttcn .cm-accessTypes,
-.cm-s-ttcn .cm-compareTypes { color: #27408B; }
-.cm-s-ttcn .cm-cmipVerbs { color: #8B2252; }
-.cm-s-ttcn .cm-modifier { color:#D2691E; }
-.cm-s-ttcn .cm-status { color:#8B4545; }
-.cm-s-ttcn .cm-storage { color:#A020F0; }
-.cm-s-ttcn .cm-tags { color:#006400; }
-
-/* CFG */
-.cm-s-ttcn .cm-externalCommands { color: #8B4545; font-weight:bold; }
-.cm-s-ttcn .cm-fileNCtrlMaskOptions,
-.cm-s-ttcn .cm-sectionTitle { color: #2E8B57; font-weight:bold; }
-
-/* TTCN */
-.cm-s-ttcn .cm-booleanConsts,
-.cm-s-ttcn .cm-otherConsts,
-.cm-s-ttcn .cm-verdictConsts { color: #006400; }
-.cm-s-ttcn .cm-configOps,
-.cm-s-ttcn .cm-functionOps,
-.cm-s-ttcn .cm-portOps,
-.cm-s-ttcn .cm-sutOps,
-.cm-s-ttcn .cm-timerOps,
-.cm-s-ttcn .cm-verdictOps { color: #0000FF; }
-.cm-s-ttcn .cm-preprocessor,
-.cm-s-ttcn .cm-templateMatch,
-.cm-s-ttcn .cm-ttcn3Macros { color: #27408B; }
-.cm-s-ttcn .cm-types { color: #A52A2A; font-weight:bold; }
-.cm-s-ttcn .cm-visibilityModifiers { font-weight:bold; }
diff --git a/www/code/codemirror-5.7/theme/twilight.css b/www/code/codemirror-5.7/theme/twilight.css
deleted file mode 100644
index d342b899f..000000000
--- a/www/code/codemirror-5.7/theme/twilight.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
-.cm-s-twilight div.CodeMirror-selected { background: #323232; } /**/
-.cm-s-twilight .CodeMirror-line::selection, .cm-s-twilight .CodeMirror-line > span::selection, .cm-s-twilight .CodeMirror-line > span > span::selection { background: rgba(50, 50, 50, 0.99); }
-.cm-s-twilight .CodeMirror-line::-moz-selection, .cm-s-twilight .CodeMirror-line > span::-moz-selection, .cm-s-twilight .CodeMirror-line > span > span::-moz-selection { background: rgba(50, 50, 50, 0.99); }
-
-.cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
-.cm-s-twilight .CodeMirror-guttermarker { color: white; }
-.cm-s-twilight .CodeMirror-guttermarker-subtle { color: #aaa; }
-.cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
-.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-twilight .cm-keyword { color: #f9ee98; } /**/
-.cm-s-twilight .cm-atom { color: #FC0; }
-.cm-s-twilight .cm-number { color:  #ca7841; } /**/
-.cm-s-twilight .cm-def { color: #8DA6CE; }
-.cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
-.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def { color: #607392; } /**/
-.cm-s-twilight .cm-operator { color: #cda869; } /**/
-.cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
-.cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
-.cm-s-twilight .cm-string-2 { color:#bd6b18; } /*?*/
-.cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
-.cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
-.cm-s-twilight .cm-tag { color: #997643; } /**/
-.cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
-.cm-s-twilight .cm-header { color: #FF6400; }
-.cm-s-twilight .cm-hr { color: #AEAEAE; }
-.cm-s-twilight .cm-link { color:#ad9361; font-style:italic; text-decoration:none; } /**/
-.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
-
-.cm-s-twilight .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-twilight .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.7/theme/vibrant-ink.css b/www/code/codemirror-5.7/theme/vibrant-ink.css
deleted file mode 100644
index ac4ec6d87..000000000
--- a/www/code/codemirror-5.7/theme/vibrant-ink.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Taken from the popular Visual Studio Vibrant Ink Schema */
-
-.cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
-.cm-s-vibrant-ink div.CodeMirror-selected { background: #35493c; }
-.cm-s-vibrant-ink .CodeMirror-line::selection, .cm-s-vibrant-ink .CodeMirror-line > span::selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::selection { background: rgba(53, 73, 60, 0.99); }
-.cm-s-vibrant-ink .CodeMirror-line::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span::-moz-selection, .cm-s-vibrant-ink .CodeMirror-line > span > span::-moz-selection { background: rgba(53, 73, 60, 0.99); }
-
-.cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-vibrant-ink .CodeMirror-guttermarker { color: white; }
-.cm-s-vibrant-ink .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
-.cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-vibrant-ink .cm-keyword { color: #CC7832; }
-.cm-s-vibrant-ink .cm-atom { color: #FC0; }
-.cm-s-vibrant-ink .cm-number { color:  #FFEE98; }
-.cm-s-vibrant-ink .cm-def { color: #8DA6CE; }
-.cm-s-vibrant-ink span.cm-variable-2, .cm-s-vibrant span.cm-tag { color: #FFC66D; }
-.cm-s-vibrant-ink span.cm-variable-3, .cm-s-vibrant span.cm-def { color: #FFC66D; }
-.cm-s-vibrant-ink .cm-operator { color: #888; }
-.cm-s-vibrant-ink .cm-comment { color: gray; font-weight: bold; }
-.cm-s-vibrant-ink .cm-string { color:  #A5C25C; }
-.cm-s-vibrant-ink .cm-string-2 { color: red; }
-.cm-s-vibrant-ink .cm-meta { color: #D8FA3C; }
-.cm-s-vibrant-ink .cm-builtin { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-tag { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-attribute { color: #8DA6CE; }
-.cm-s-vibrant-ink .cm-header { color: #FF6400; }
-.cm-s-vibrant-ink .cm-hr { color: #AEAEAE; }
-.cm-s-vibrant-ink .cm-link { color: blue; }
-.cm-s-vibrant-ink .cm-error { border-bottom: 1px solid red; }
-
-.cm-s-vibrant-ink .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-vibrant-ink .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.7/theme/xq-dark.css b/www/code/codemirror-5.7/theme/xq-dark.css
deleted file mode 100644
index e3bd960bb..000000000
--- a/www/code/codemirror-5.7/theme/xq-dark.css
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-.cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
-.cm-s-xq-dark div.CodeMirror-selected { background: #27007A; }
-.cm-s-xq-dark .CodeMirror-line::selection, .cm-s-xq-dark .CodeMirror-line > span::selection, .cm-s-xq-dark .CodeMirror-line > span > span::selection { background: rgba(39, 0, 122, 0.99); }
-.cm-s-xq-dark .CodeMirror-line::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span::-moz-selection, .cm-s-xq-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(39, 0, 122, 0.99); }
-.cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-xq-dark .CodeMirror-guttermarker { color: #FFBD40; }
-.cm-s-xq-dark .CodeMirror-guttermarker-subtle { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
-.cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white; }
-
-.cm-s-xq-dark span.cm-keyword { color: #FFBD40; }
-.cm-s-xq-dark span.cm-atom { color: #6C8CD5; }
-.cm-s-xq-dark span.cm-number { color: #164; }
-.cm-s-xq-dark span.cm-def { color: #FFF; text-decoration:underline; }
-.cm-s-xq-dark span.cm-variable { color: #FFF; }
-.cm-s-xq-dark span.cm-variable-2 { color: #EEE; }
-.cm-s-xq-dark span.cm-variable-3 { color: #DDD; }
-.cm-s-xq-dark span.cm-property {}
-.cm-s-xq-dark span.cm-operator {}
-.cm-s-xq-dark span.cm-comment { color: gray; }
-.cm-s-xq-dark span.cm-string { color: #9FEE00; }
-.cm-s-xq-dark span.cm-meta { color: yellow; }
-.cm-s-xq-dark span.cm-qualifier { color: #FFF700; }
-.cm-s-xq-dark span.cm-builtin { color: #30a; }
-.cm-s-xq-dark span.cm-bracket { color: #cc7; }
-.cm-s-xq-dark span.cm-tag { color: #FFBD40; }
-.cm-s-xq-dark span.cm-attribute { color: #FFF700; }
-.cm-s-xq-dark span.cm-error { color: #f00; }
-
-.cm-s-xq-dark .CodeMirror-activeline-background { background: #27282E; }
-.cm-s-xq-dark .CodeMirror-matchingbracket { outline:1px solid grey; color:white !important; }
diff --git a/www/code/codemirror-5.7/theme/xq-light.css b/www/code/codemirror-5.7/theme/xq-light.css
deleted file mode 100644
index 8d2fcb667..000000000
--- a/www/code/codemirror-5.7/theme/xq-light.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright (C) 2011 by MarkLogic Corporation
-Author: Mike Brevoort 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-.cm-s-xq-light span.cm-keyword { line-height: 1em; font-weight: bold; color: #5A5CAD; }
-.cm-s-xq-light span.cm-atom { color: #6C8CD5; }
-.cm-s-xq-light span.cm-number { color: #164; }
-.cm-s-xq-light span.cm-def { text-decoration:underline; }
-.cm-s-xq-light span.cm-variable { color: black; }
-.cm-s-xq-light span.cm-variable-2 { color:black; }
-.cm-s-xq-light span.cm-variable-3 { color: black; }
-.cm-s-xq-light span.cm-property {}
-.cm-s-xq-light span.cm-operator {}
-.cm-s-xq-light span.cm-comment { color: #0080FF; font-style: italic; }
-.cm-s-xq-light span.cm-string { color: red; }
-.cm-s-xq-light span.cm-meta { color: yellow; }
-.cm-s-xq-light span.cm-qualifier { color: grey; }
-.cm-s-xq-light span.cm-builtin { color: #7EA656; }
-.cm-s-xq-light span.cm-bracket { color: #cc7; }
-.cm-s-xq-light span.cm-tag { color: #3F7F7F; }
-.cm-s-xq-light span.cm-attribute { color: #7F007F; }
-.cm-s-xq-light span.cm-error { color: #f00; }
-
-.cm-s-xq-light .CodeMirror-activeline-background { background: #e8f2ff; }
-.cm-s-xq-light .CodeMirror-matchingbracket { outline:1px solid grey;color:black !important;background:yellow; }
diff --git a/www/code/codemirror-5.7/theme/yeti.css b/www/code/codemirror-5.7/theme/yeti.css
deleted file mode 100644
index c70d4d214..000000000
--- a/www/code/codemirror-5.7/theme/yeti.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
-    Name:       yeti
-    Author:     Michael Kaminsky (http://github.com/mkaminsky11)
-
-    Original yeti color scheme by Jesse Weed (https://github.com/jesseweed/yeti-syntax)
-
-*/
-
-
-.cm-s-yeti.CodeMirror {
-  background-color: #ECEAE8 !important;
-  color: #d1c9c0 !important;
-  border: none;
-}
-
-.cm-s-yeti .CodeMirror-gutters {
-  color: #adaba6;
-  background-color: #E5E1DB;
-  border: none;
-}
-.cm-s-yeti .CodeMirror-cursor { border-left: solid thin #d1c9c0; }
-.cm-s-yeti .CodeMirror-linenumber { color: #adaba6; }
-.cm-s-yeti.CodeMirror-focused div.CodeMirror-selected { background: #DCD8D2; }
-.cm-s-yeti .CodeMirror-line::selection, .cm-s-yeti .CodeMirror-line > span::selection, .cm-s-yeti .CodeMirror-line > span > span::selection { background: #DCD8D2; }
-.cm-s-yeti .CodeMirror-line::-moz-selection, .cm-s-yeti .CodeMirror-line > span::-moz-selection, .cm-s-yeti .CodeMirror-line > span > span::-moz-selection { background: #DCD8D2; }
-.cm-s-yeti span.cm-comment { color: #d4c8be; }
-.cm-s-yeti span.cm-string, .cm-s-yeti span.cm-string-2 { color: #96c0d8; }
-.cm-s-yeti span.cm-number { color: #a074c4; }
-.cm-s-yeti span.cm-variable { color: #55b5db; }
-.cm-s-yeti span.cm-variable-2 { color: #a074c4; }
-.cm-s-yeti span.cm-def { color: #55b5db; }
-.cm-s-yeti span.cm-operator { color: #9fb96e; }
-.cm-s-yeti span.cm-keyword { color: #9fb96e; }
-.cm-s-yeti span.cm-atom { color: #a074c4; }
-.cm-s-yeti span.cm-meta { color: #96c0d8; }
-.cm-s-yeti span.cm-tag { color: #96c0d8; }
-.cm-s-yeti span.cm-attribute { color: #9fb96e; }
-.cm-s-yeti span.cm-qualifier { color: #96c0d8; }
-.cm-s-yeti span.cm-property { color: #a074c4; }
-.cm-s-yeti span.cm-builtin { color: #a074c4; }
-.cm-s-yeti span.cm-variable-3 { color: #96c0d8; }
-.cm-s-yeti .CodeMirror-activeline-background { background: #E7E4E0; }
-.cm-s-yeti .CodeMirror-matchingbracket { text-decoration: underline; }
diff --git a/www/code/codemirror-5.7/theme/zenburn.css b/www/code/codemirror-5.7/theme/zenburn.css
deleted file mode 100644
index 781c40aca..000000000
--- a/www/code/codemirror-5.7/theme/zenburn.css
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * "
- *  Using Zenburn color palette from the Emacs Zenburn Theme
- *  https://github.com/bbatsov/zenburn-emacs/blob/master/zenburn-theme.el
- *
- *  Also using parts of https://github.com/xavi/coderay-lighttable-theme
- * "
- * From: https://github.com/wisenomad/zenburn-lighttable-theme/blob/master/zenburn.css
- */
-
-.cm-s-zenburn .CodeMirror-gutters { background: #3f3f3f !important; }
-.cm-s-zenburn .CodeMirror-foldgutter-open, .CodeMirror-foldgutter-folded { color: #999; }
-.cm-s-zenburn .CodeMirror-cursor { border-left: 1px solid white; }
-.cm-s-zenburn { background-color: #3f3f3f; color: #dcdccc; }
-.cm-s-zenburn span.cm-builtin { color: #dcdccc; font-weight: bold; }
-.cm-s-zenburn span.cm-comment { color: #7f9f7f; }
-.cm-s-zenburn span.cm-keyword { color: #f0dfaf; font-weight: bold; }
-.cm-s-zenburn span.cm-atom { color: #bfebbf; }
-.cm-s-zenburn span.cm-def { color: #dcdccc; }
-.cm-s-zenburn span.cm-variable { color: #dfaf8f; }
-.cm-s-zenburn span.cm-variable-2 { color: #dcdccc; }
-.cm-s-zenburn span.cm-string { color: #cc9393; }
-.cm-s-zenburn span.cm-string-2 { color: #cc9393; }
-.cm-s-zenburn span.cm-number { color: #dcdccc; }
-.cm-s-zenburn span.cm-tag { color: #93e0e3; }
-.cm-s-zenburn span.cm-property { color: #dfaf8f; }
-.cm-s-zenburn span.cm-attribute { color: #dfaf8f; }
-.cm-s-zenburn span.cm-qualifier { color: #7cb8bb; }
-.cm-s-zenburn span.cm-meta { color: #f0dfaf; }
-.cm-s-zenburn span.cm-header { color: #f0efd0; }
-.cm-s-zenburn span.cm-operator { color: #f0efd0; }
-.cm-s-zenburn span.CodeMirror-matchingbracket { box-sizing: border-box; background: transparent; border-bottom: 1px solid; }
-.cm-s-zenburn span.CodeMirror-nonmatchingbracket { border-bottom: 1px solid; background: none; }
-.cm-s-zenburn .CodeMirror-activeline { background: #000000; }
-.cm-s-zenburn .CodeMirror-activeline-background { background: #000000; }
-.cm-s-zenburn div.CodeMirror-selected { background: #545454; }
-.cm-s-zenburn .CodeMirror-focused div.CodeMirror-selected { background: #4f4f4f; }
diff --git a/www/code/errorbox.js b/www/code/errorbox.js
deleted file mode 100644
index f93096271..000000000
--- a/www/code/errorbox.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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 .
- */
-require.config({
-    'shim': {
-        '/bower_components/modalBox/modalBox-min.js': [
-            '/bower_components/jquery/dist/jquery.min.js'
-        ],
-    }
-});
-define([
-    '/common/messages.js',
-    '/bower_components/modalBox/modalBox-min.js'
-], function (Messages) {
-    var $ = window.jQuery;
-
-    var STYLE = [
-        ''
-    ].join('');
-
-    var CONTENT = [
-        '
    ',
-        '
    ',
-        '
    '
-    ].join('');
-
-    var ERROR_ADDITIONAL = [
-        '
    ',
-        '',
-        '',
-    ].join('');    
-
-    var showError = function (errorType, docHtml, moreInfo) {
-        $('body').append('
    ');
-        var $modalbox = $('.modalBox');
-        $modalbox.append(CONTENT + STYLE);
-
-        $modalbox.find('.errorType').text(Messages['errorBox_errorType_' + errorType]);
-        $modalbox.find('.errorExplanation').text(Messages['errorBox_errorExplanation_' + errorType]);
-        if (moreInfo) {
-            $modalbox.append(ERROR_ADDITIONAL);
-            $modalbox.find('.errorMoreExplanation').text(Messages.errorBox_moreExplanation);
-            $modalbox.find('.errorData').text(Messages['errorBox_' + errorType]);
-        }
-
-        $modalbox.modalBox({
-            onClose: function () { $('.modalBox').remove(); }
-        });
-        $('.iw-modalOverlay').css({'z-index':10000});
-    };
-
-    return {
-        show: showError
-    };
-});
diff --git a/www/code/rt_codemirror.js b/www/code/rt_codemirror.js
deleted file mode 100644
index 08b0d625e..000000000
--- a/www/code/rt_codemirror.js
+++ /dev/null
@@ -1,447 +0,0 @@
-define([
-  //'jquery',
-  //'RTWiki_WebHome_sharejs_textarea',
-  //'RTWiki_ErrorBox',
-  //'RTWiki_WebHome_chainpad'
-  '/common/crypto.js',
-  '/code/errorbox.js',
-  '/common/messages.js',
-  '/code/toolbar.js',
-  '/common/chainpad.js',
-  '/common/otaml.js',
-  '/bower_components/jquery/dist/jquery.min.js'
-], function(Crypto, ErrorBox, Messages, Toolbar) {
-    var $ = window.jQuery;
-    var ChainPad = window.ChainPad;
-    var Otaml = window.Otaml;
-    var module = { exports: {} };
-
-    // How long to wait before determining that the connection is lost.
-    var MAX_LAG_BEFORE_DISCONNECT = 30000;
-
-    var MAX_RECOVERABLE_ERRORS = 15;
-
-    var warn = function (x) { };
-    var debug = function (x) { };
-    //debug = function (x) { console.log(x) };
-    warn = function (x) { console.log(x); };
-
-    var uid = function () {
-        return 'rtwiki-uid-' + String(Math.random()).substring(2);
-    };
-
-    // only used within updateUserList so far
-    var decodeUser = function (all, one) {
-        return decodeURIComponent(one);
-    };
-
-    var updateUserList = function (myUserName, listElement, userList, messages) {
-        var meIdx = userList.indexOf(myUserName);
-        if (meIdx === -1) {
-            listElement.text(messages.disconnected);
-            return;
-        }
-        var userMap = {};
-        userMap[messages.myself] = 1;
-        userList.splice(meIdx, 1);
-
-        for (var i = 0; i < userList.length; i++) {
-            var user;
-            if (userList[i].indexOf('xwiki:XWiki.XWikiGuest') === 0) {
-                if (userMap.Guests) {
-                    user = messages.guests;
-                } else {
-                    user = messages.guest;
-                }
-            } else {
-                user = userList[i].replace(/^.*-([^-]*)%2d[0-9]*$/, decodeUser);
-            }
-            userMap[user] = userMap[user] || 0;
-            if (user === messages.guest && userMap[user] > 0) {
-                userMap.Guests = userMap[user];
-                delete userMap[user];
-                user = messages.guests;
-            }
-            userMap[user]++;
-        }
-        var userListOut = [];
-        for (var name in userMap) {
-            if (userMap[name] > 1) {
-                userListOut.push(userMap[name] + " " + name);
-            } else {
-                userListOut.push(name);
-            }
-        }
-        if (userListOut.length > 1) {
-            userListOut[userListOut.length-1] =
-                messages.and + ' ' + userListOut[userListOut.length-1];
-        }
-        listElement.text(messages.editingWith + ' ' + userListOut.join(', '));
-    };
-
-    var createUserList = function (realtime, myUserName, container, messages) {
-        var id = uid();
-        $(container).prepend('
    ');
-        var listElement = $('#'+id);
-        return listElement;
-    };
-
-    var checkLag = function (realtime, lagElement, messages) {
-        var lag = realtime.getLag();
-        var lagSec = lag.lag/1000;
-        var lagMsg = messages.lag + ' ';
-        if (lag.waiting && lagSec > 1) {
-            lagMsg += "?? " + Math.floor(lagSec);
-        } else {
-            lagMsg += lagSec;
-        }
-        lagElement.text(lagMsg);
-    };
-
-    var createLagElement = function (socket, realtime, container, messages) {
-        var id = uid();
-        $(container).append('
    ');
-        var lagElement = $('#'+id);
-        var intr = setInterval(function () {
-            checkLag(realtime, lagElement, messages);
-        }, 3000);
-        socket.onClose.push(function () { clearTimeout(intr); });
-        return lagElement;
-    };
-
-    var isSocketDisconnected = function (socket, realtime) {
-        return socket.readyState === socket.CLOSING ||
-            socket.readyState === socket.CLOSED ||
-            (realtime.getLag().waiting && realtime.getLag().lag > MAX_LAG_BEFORE_DISCONNECT);
-    };
-
-    var setAutosaveHiddenState = function (hidden) {
-        var elem = $('#autosaveControl');
-        if (hidden) {
-            elem.hide();
-        } else {
-            elem.show();
-        }
-    };
-
-    // CodeMirror/RTWiki
-    // 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 (cmDiv, onEvent, unbind)
-    {
-        bindEvents(cmDiv,
-                   ['textInput', 'keydown', 'keyup', 'select', 'cut', 'paste', 'mousedown','mouseup','click'],
-                   onEvent,
-                   unbind);
-    };
-  
-    var transformCursorCMRemove = function(text, cursor, pos, length) {
-      var newCursor = cursor;
-      var textLines = text.substr(0, pos).split("\n");
-      var removedTextLineNumber = textLines.length-1;
-      var removedTextColumnIndex = textLines[textLines.length-1].length;
-      var removedLines = text.substr(pos, length).split("\n").length - 1;
-      if(cursor.line > (removedTextLineNumber + removedLines)) {
-        newCursor.line -= removedLines;
-      }
-      else if(removedLines > 0 && cursor.line === (removedTextLineNumber+removedLines)) {
-        var lastLineCharsRemoved = text.substr(pos, length).split("\n")[removedLines].length;
-        if(cursor.ch >= lastLineCharsRemoved) {
-          newCursor.line = removedTextLineNumber;
-          newCursor.ch = removedTextColumnIndex + cursor.ch - lastLineCharsRemoved;
-        }
-        else {
-          newCursor.line -= removedLines;
-          newCursor.ch = removedTextColumnIndex;
-        }
-      }
-      else if(cursor.line === removedTextLineNumber && cursor.ch > removedTextColumnIndex) {
-        newCursor.ch -= Math.min(length, cursor.ch-removedTextColumnIndex);
-      }
-      return newCursor;
-    };
-    var transformCursorCMInsert = function(oldtext, cursor, pos, text) {
-      var newCursor = cursor;
-      var textLines = oldtext.substr(0, pos).split("\n");
-      var addedTextLineNumber = textLines.length-1;
-      var addedTextColumnIndex = textLines[textLines.length-1].length;
-      var addedLines = text.split("\n").length - 1;
-      if(cursor.line > addedTextLineNumber) {
-        newCursor.line += addedLines;
-      }
-      else if(cursor.line === addedTextLineNumber && cursor.ch > addedTextColumnIndex) {
-        newCursor.line += addedLines;
-        if(addedLines > 0) {
-          newCursor.ch = newCursor.ch - addedTextColumnIndex + text.split("\n")[addedLines].length;
-        }
-        else {
-          newCursor.ch += text.split("\n")[addedLines].length;
-        }
-      }
-      return newCursor;
-    };
-  
-    var startWebSocketCM = function (windowCM,
-                                   websocketUrl,
-                                   userName,
-                                   channel,
-                                   messages,
-                                   cryptKey)
-    {
-        debug("Opening websocket");
-        var textArea = windowCM.document.getElementById('editor1');
-        var cmDiv = windowCM.document.getElementsByClassName('CodeMirror')[0];
-        var cmEditor = cmDiv.CodeMirror;
-        var onEvent = function () { };
-        var socket = new WebSocket(websocketUrl);
-        socket.onClose = [];
-        socket.onMessage = [];
-        var initState = $(textArea).val();
-        var realtime = socket.realtime = ChainPad.create(userName, 'x', channel, initState);
-        var toolbar = realtime.toolbar = Toolbar.create(windowCM.$('#cme_toolbox'), userName, realtime);
-        // for debugging
-        window.rtwiki_chainpad = realtime;
-
-        // http://jira.xwiki.org/browse/RTWIKI-21
-        var onbeforeunload = window.onbeforeunload || function () { };
-        window.onbeforeunload = function (ev) {
-            socket.intentionallyClosing = true;
-            return onbeforeunload(ev);
-        };
-        var isErrorState = false;
-        var recoverableErrorCount = 0;
-        var error = function (recoverable, err) {
-            console.log(new Error().stack);
-            console.log('error: ' + err.stack);
-            if (recoverable && recoverableErrorCount++ < MAX_RECOVERABLE_ERRORS) { return; }
-            var realtime = socket.realtime;
-            var docHtml = $(textArea).val();
-            isErrorState = true;
-
-            // FIXME pull this in from more mainline version
-            //handleError(socket, realtime, err, docHtml, allMessages);
-        };
-        var attempt = function (func) {
-            return function () {
-                var e;
-                try { return func.apply(func, arguments); } catch (ee) { e = ee; }
-                if (e) {
-                    console.log(e.stack);
-                    error(true, e);
-                }
-            };
-        };
-      
-        var checkSocket = function () {
-            if (socket.intentionallyClosing || isErrorState) { return false; }
-            if (isSocketDisconnected(socket, realtime)) {
-                realtime.abort();
-                realtime.toolbar.failed();
-                socket.close();
-                ErrorBox.show('disconnected');
-                isErrorState = true;
-                return true;
-            }
-            return false;
-        };
-        
-        socket.onopen = function (evt) {
-
-            var initializing = true;
-
-            var userListElement = createUserList(realtime,
-                                                 userName,
-                                                 [],
-                                                 messages);
-            userListElement.text(messages.initializing);
-            createLagElement(socket,
-                             realtime,
-                             [],
-                             messages);
-
-            setAutosaveHiddenState(true);
-            onEvent = function () {
-                if (isErrorState) { return; }
-                if (initializing) { return; }
-                var oldDocText = realtime.getUserDoc();
-                var docText = $(textArea).val();
-                var op = attempt(Otaml.makeTextOperation)(oldDocText, docText);
-
-                if (!op) { return; }
-                if (op.toRemove > 0) {
-                    attempt(realtime.remove)(op.offset, op.toRemove);
-                }
-                if (op.toInsert.length > 0) {
-                    attempt(realtime.insert)(op.offset, op.toInsert);
-                }
-
-                if (realtime.getUserDoc() !== docText) {
-                    error(false, 'realtime.getUserDoc() !== docText');
-                }
-            };
-            
-            socket.onMessage.push(function (evt) {
-                debug(evt.data);
-                var message = Crypto.decrypt(evt.data, cryptKey);
-                realtime.message(message);
-            });
-            realtime.onMessage(function (message) { message = Crypto.encrypt(message, cryptKey);socket.send(message); });
-            
-            var userDocBeforePatch;
-            var incomingPatch = function () {
-                if (isErrorState || initializing) { return; }
-                var textAreaVal = $(textArea).val();
-                userDocBeforePatch = userDocBeforePatch || textAreaVal;
-                if (userDocBeforePatch !== textAreaVal) {
-                  //error(false, "userDocBeforePatch !== textAreaVal");
-                }
-                var op = attempt(Otaml.makeTextOperation)(userDocBeforePatch, realtime.getUserDoc());
-                if (typeof op === 'undefined') {
-                    warn("TypeError: op is undefined");
-                    return;
-                } 
-
-                var oldValue = textAreaVal;
-                var newValue = realtime.getUserDoc();
-                // Fix cursor and/or selection
-                var oldCursor = cmEditor.getCursor();
-                var oldCursorCMStart = cmEditor.getCursor('from');
-                var oldCursorCMEnd = cmEditor.getCursor('to');
-                var newCursor;
-                var newSelection;
-                if(oldCursorCMStart.line !== oldCursorCMEnd.line
-                    && oldCursorCMStart.ch !== oldCursorCMEnd.ch) { // Selection
-                    if (op.toRemove > 0) {
-                        newSelection = [transformCursorCMRemove(oldValue, oldCursorCMStart, op.offset, op.toRemove), transformCursorCMRemove(oldValue, oldCursorCMEnd, op.offset, op.toRemove)];
-                    }
-                    if (op.toInsert.length > 0) {
-                        newSelection = [transformCursorCMInsert(oldValue, oldCursorCMStart, op.offset, op.toInsert), transformCursorCMInsert(oldValue, oldCursorCMEnd, op.offset, op.toInsert)];
-                    }
-                }
-                else { // Cursor
-                    if (op.toRemove > 0) {
-                        newCursor = transformCursorCMRemove(oldValue, oldCursor, op.offset, op.toRemove);
-                    }
-                    if (op.toInsert.length > 0) {
-                        newCursor = transformCursorCMInsert(oldValue, oldCursor, op.offset, op.toInsert);
-                    }
-                }
-                $(textArea).val(newValue);
-                userDocBeforePatch = newValue;
-                cmEditor.setCursor({line:0, ch:0});
-                try { cmEditor.setValue(newValue); } catch (err) { console.error(err); }
-                if(newCursor) {
-                  cmEditor.setCursor(newCursor);
-                }
-                else {
-                  cmEditor.setSelection(newSelection[0], newSelection[1]);
-                }
-            };
-            realtime.onPatch(incomingPatch);
-            realtime.onUserListChange(function (userList) {
-                if (initializing && userList.indexOf(userName) > -1) {
-                    initializing = false;
-                    incomingPatch();
-                }
-                if (!initializing) {
-                    updateUserList(userName, userListElement, userList, messages);
-                }
-            });
-            debug("Bound websocket");
-            bindAllEvents(cmDiv, onEvent, false);
-            setInterval(function () {
-                if (isErrorState || checkSocket()) {
-                    toolbar.reconnecting();
-                }
-            }, 200);
-            realtime.start();
-            toolbar.connected();
-        };
-        socket.onclose = function (evt) {
-            for (var i = 0; i < socket.onClose.length; i++) {
-                if (socket.onClose[i](evt) === false) { return; }
-            }
-        };
-        socket.onmessage = function (evt) {
-            for (var i = 0; i < socket.onMessage.length; i++) {
-                if (socket.onMessage[i](evt) === false) { return; }
-            }
-        };
-        socket.onerror = function (err) {
-            warn(err);
-            checkSocket(realtime);
-        };
-
-        var to = setInterval(function () {
-            checkSocket(realtime);
-        }, 500);
-        socket.onClose.push(function () {
-            clearTimeout(to);
-            if (toolbar && typeof toolbar.remove === 'function') {
-                toolbar.remove();
-            } else {
-                warn("toolbar.remove is not a function"); //why not?
-            }
-            setAutosaveHiddenState(false);
-        });
-        socket.onEvent = function(){
-          onEvent();
-        };
-        return socket;
-    };
-    
-    var cmEditor = function (cmWindow, websocketUrl, userName, messages, channel, cryptkey) {
-        var cmTextarea = $(cmWindow.document.getElementById('editor1'));
-        if (!cmTextarea.length) {
-            warn("WARNING: Could not find textarea to bind to");
-            return;
-        }
-        var socket = startWebSocketCM(cmWindow,
-                                websocketUrl,
-                                userName,
-                                channel,
-                                messages,
-                                cryptkey);
-        return {
-            onEvent: function() {
-              socket.onEvent();
-            }
-        };
-    };
-  
-    var start = module.exports.start = function (window, websocketUrl,
-                                               userName,
-                                               channel,
-                                               cryptkey)
-    {
-        if (!websocketUrl) {
-            throw new Error("No WebSocket URL, please ensure Realtime Backend is installed.");
-        }
-        var cme = cmEditor(window, websocketUrl+'_old', userName, Messages, channel, cryptkey);
-        return {
-            onEvent: function () { 
-              cme.onEvent();
-            }
-        };
-    };
-
-    return module.exports;
-});
diff --git a/www/code/toolbar.js b/www/code/toolbar.js
deleted file mode 100644
index ea0afa9c8..000000000
--- a/www/code/toolbar.js
+++ /dev/null
@@ -1,233 +0,0 @@
-define([
-    '/common/messages.js'
-], function (Messages) {
-
-    /** Id of the element for getting debug info. */
-    var DEBUG_LINK_CLS = 'rtwysiwyg-debug-link';
-
-    /** Id of the div containing the user list. */
-    var USER_LIST_CLS = 'rtwysiwyg-user-list';
-
-    /** Id of the div containing the lag info. */
-    var LAG_ELEM_CLS = 'rtwysiwyg-lag';
-
-    /** The toolbar class which contains the user list, debug link and lag. */
-    var TOOLBAR_CLS = 'rtwysiwyg-toolbar';
-
-    /** Key in the localStore which indicates realtime activity should be disallowed. */
-    var LOCALSTORAGE_DISALLOW = 'rtwysiwyg-disallow';
-
-    var SPINNER_DISAPPEAR_TIME = 3000;
-    var SPINNER = [ '-', '\\', '|', '/' ];
-
-    var uid = function () {
-        return 'rtwysiwyg-uid-' + String(Math.random()).substring(2);
-    };
-
-    var createRealtimeToolbar = function ($container) {
-        var id = uid();
-        $container.prepend(
-            '
    ' +
-                '
    ' +
-                '
    ' +
-            '
    '
-        );
-        var toolbar = $container.find('#'+id);
-        toolbar.append([
-            ''
-         ].join('\n'));
-        return toolbar;
-    };
-
-    var createEscape = function ($container) {
-        var id = uid();
-        $container.append('
    ⇐ Back
    ');
-        var $ret = $container.find('#'+id);
-        $ret.on('click', function () {
-            window.location.href = '/';
-        });
-        return $ret[0];
-    };
-
-    var createSpinner = function ($container) {
-        var id = uid();
-        $container.append('');
-        return $container.find('#'+id)[0];
-    };
-
-    var kickSpinner = function (spinnerElement, reversed) {
-        var txt = spinnerElement.textContent || '-';
-        var inc = (reversed) ? -1 : 1;
-        spinnerElement.textContent = SPINNER[(SPINNER.indexOf(txt) + inc) % SPINNER.length];
-        if (spinnerElement.timeout) { clearTimeout(spinnerElement.timeout); }
-        spinnerElement.timeout = setTimeout(function () {
-            spinnerElement.textContent = '';
-        }, SPINNER_DISAPPEAR_TIME);
-    };
-
-    var createUserList = function ($container) {
-        var id = uid();
-        $container.append('
    ');
-        return $container.find('#'+id)[0];
-    };
-
-    var updateUserList = function (myUserName, listElement, userList) {
-        var meIdx = userList.indexOf(myUserName);
-        if (meIdx === -1) {
-            listElement.textContent = Messages.synchronizing;
-            return;
-        }
-        if (userList.length === 1) {
-            listElement.textContent = Messages.editingAlone;
-        } else if (userList.length === 2) {
-            listElement.textContent = Messages.editingWithOneOtherPerson;
-        } else {
-            listElement.textContent = Messages.editingWith + ' ' + (userList.length - 1) + ' ' + Messages.otherPeople;
-        }
-    };
-
-    var createLagElement = function ($container) {
-        var id = uid();
-        $container.append('
    ');
-        return $container.find('#'+id)[0];
-    };
-
-    var checkLag = function (realtime, lagElement) {
-        var lag = realtime.getLag();
-        var lagSec = lag.lag/1000;
-        var lagMsg = Messages.lag + ' ';
-        if (lag.waiting && lagSec > 1) {
-            lagMsg += "?? " + Math.floor(lagSec);
-        } else {
-            lagMsg += lagSec;
-        }
-        lagElement.textContent = lagMsg;
-    };
-
-    // this is a little hack, it should go in it's own file.
-    // FIXME ok, so let's put it in its own file then
-    // TODO there should also be a 'clear recent pads' button
-    var rememberPad = function () {
-        // FIXME, this is overly complicated, use array methods
-        var recentPadsStr = localStorage['CryptPad_RECENTPADS'];
-        var recentPads = [];
-        if (recentPadsStr) { recentPads = JSON.parse(recentPadsStr); }
-        // TODO use window.location.hash or something like that
-        if (window.location.href.indexOf('#') === -1) { return; }
-        var now = new Date();
-        var out = [];
-        for (var i = recentPads.length; i >= 0; i--) {
-            if (recentPads[i] &&
-                // TODO precompute this time value, maybe make it configurable?
-                // FIXME precompute the date too, why getTime every time?
-                now.getTime() - recentPads[i][1] < (1000*60*60*24*30) &&
-                recentPads[i][0] !== window.location.href)
-            {
-                out.push(recentPads[i]);
-            }
-        }
-        out.push([window.location.href, now.getTime()]);
-        localStorage['CryptPad_RECENTPADS'] = JSON.stringify(out);
-    };
-
-    var create = function ($container, myUserName, realtime) {
-        var toolbar = createRealtimeToolbar($container);
-        createEscape(toolbar.find('.rtwysiwyg-toolbar-leftside'));
-        var userListElement = createUserList(toolbar.find('.rtwysiwyg-toolbar-leftside'));
-        var spinner = createSpinner(toolbar.find('.rtwysiwyg-toolbar-rightside'));
-        var lagElement = createLagElement(toolbar.find('.rtwysiwyg-toolbar-rightside'));
-
-        rememberPad();
-
-        var connected = false;
-
-        realtime.onUserListChange(function (userList) {
-            if (userList.indexOf(myUserName) !== -1) { connected = true; }
-            if (!connected) { return; }
-            updateUserList(myUserName, userListElement, userList);
-        });
-
-        var ks = function () {
-            if (connected) { kickSpinner(spinner, false); }
-        };
-
-        realtime.onPatch(ks);
-        // Try to filter out non-patch messages, doesn't have to be perfect this is just the spinner
-        realtime.onMessage(function (msg) { if (msg.indexOf(':[2,') > -1) { ks(); } });
-
-        setInterval(function () {
-            if (!connected) { return; }
-            checkLag(realtime, lagElement);
-        }, 3000);
-
-        return {
-            failed: function () {
-                connected = false;
-                userListElement.textContent = '';
-                lagElement.textContent = '';
-            },
-            reconnecting: function () {
-                connected = false;
-                userListElement.textContent = Messages.reconnecting;
-                lagElement.textContent = '';
-            },
-            connected: function () {
-                connected = true;
-            }
-        };
-    };
-
-    return { create: create };
-});
\ No newline at end of file

From ba17b78f7a80665ab2b84de6b6d93bf331001bf8 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 15:32:58 +0200
Subject: [PATCH 166/257] restyle name change button

---
 www/common/toolbar.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/common/toolbar.js b/www/common/toolbar.js
index f3adbe1df..59da0881c 100644
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -10,7 +10,6 @@ define([
 
     /** Id of the button to change my username. */
     var USERNAME_BUTTON_GROUP = 'cryptpad-changeName';
-    var USERNAME_BUTTON_ID = 'rtwysiwyg-change-username';
 
     /** Id of the div containing the lag info. */
     var LAG_ELEM_CLS = 'rtwysiwyg-lag';
@@ -68,10 +67,10 @@ define([
             '    cursor: pointer;',
             '    color: #000;',
             '}',
-            '#' + USERNAME_BUTTON_GROUP + ' {',
+            '.' + USERNAME_BUTTON_GROUP + ' {',
             '    float: left;',
             '}',
-            '#' + USERNAME_BUTTON_GROUP + ' button {',
+            '.' + USERNAME_BUTTON_GROUP + ' button {',
             '    padding: 0;',
             '    margin-right: 5px;',
             '}',
@@ -96,6 +95,7 @@ define([
             '.' + DEBUG_LINK_CLS + ':link { color:transparent; }',
             '.' + DEBUG_LINK_CLS + ':link:hover { color:blue; }',
             '.gwt-TabPanelBottom { border-top: 0 none; }',
+            '.' + TOOLBAR_CLS + ' button { box-sizing: border-box; height: 101%; background-color: inherit; border: 1px solid #A6A6A6; border-radius: 5px; margin-right: 5px;}',
 
             ''
          ].join('\n'));
@@ -153,7 +153,7 @@ define([
 
     var createChangeName = function($container, userList, buttonID) {
         var id = uid();
-        userList.innerHTML = '';
+        userList.innerHTML = '';
         return $container.find('#'+id)[0];
     };
 

From 506a703b7d6926a5e6e16130773cc7f2db077621 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 15:40:48 +0200
Subject: [PATCH 167/257] turn off TextPatcher logging on /pad/

---
 www/pad/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 084d57746..aed4612cc 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -353,7 +353,7 @@ define([
             var onReady = realtimeOptions.onReady = function (info) {
                 module.patchText = TextPatcher.create({
                     realtime: info.realtime,
-                    logging: true,
+                    //logging: true,
                 });
 
                 module.realtime = info.realtime;

From 6736335db2203c18eea8542be00fc331fabad106 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 15:43:31 +0200
Subject: [PATCH 168/257] add 'made with <3' toolbar to code

---
 www/code/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/code/main.js b/www/code/main.js
index 37fb572ce..07e9f7da4 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -9,7 +9,8 @@ define([
     '/common/toolbar.js',
     'json.sortify',
     '/common/json-ot.js',
-    '/bower_components/jquery/dist/jquery.min.js'
+    '/bower_components/jquery/dist/jquery.min.js',
+    '/customize/pad.js'
 ], function (Config, /*RTCode,*/ Messages, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT) {
     var $ = window.jQuery;
     var module = window.APP = {};

From aef6f3a85bf89fe60ecd69082834c47eecf2a8eb Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 16:21:10 +0200
Subject: [PATCH 169/257] lock codemirror editor until chain has synced

---
 www/code/main.js | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index 07e9f7da4..1ff99deab 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -50,9 +50,14 @@ define([
                 extraKeys: {"Ctrl-Q": function(cm){ cm.foldCode(cm.getCursor()); }},
                 foldGutter: true,
                 gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
-                mode: "javascript"
+                mode: "javascript",
+                readOnly: true
             });
 
+            var setEditable = module.setEditable = function (bool) {
+                editor.setOption('readOnly', !bool);
+            };
+
             var userList = {}; // List of pretty name of all users (mapped with their server ID)
             var toolbarList; // List of users still connected to the channel (server IDs)
             var addToUserList = function(data) {
@@ -101,9 +106,6 @@ define([
                 transformFunction: JsonOT.validate
             };
 
-            // TODO lock editor until chain is synced
-            // then unlock
-            var setEditable = function () { };
             var canonicalize = function (t) { return t.replace(/\r\n/g, '\n'); };
 
             var initializing = true;
@@ -118,17 +120,6 @@ define([
                 toolbar = info.realtime.toolbar = Toolbar.create($bar, info.myID, info.realtime, info.getLag, info.userList, config);
                 createChangeName('cryptpad-changeName', $bar);
                 window.location.hash = info.channel + key;
-
-
-
-                /*if (!hash) {
-                    editor.setValue(Messages.codeInitialState);
-                    module.patchText(Messages.codeInitialState);
-                    module.patchText(Messages.codeInitialState);
-                    editor.setValue(Messages.codeInitialState);
-                }*/
-
-                //$(window).on('hashchange', function() { window.location.reload(); });
             };
 
             var updateUserList = function(shjson) {
@@ -161,6 +152,7 @@ define([
 
                 editor.setValue(newDoc);
 
+                setEditable(true);
                 initializing = false;
             };
 
@@ -179,7 +171,7 @@ define([
                 }
                 return pos;
             }
-            
+
             var posToCursor = function(position, newText) {
                 var cursor = {
                     line: 0,
@@ -202,12 +194,12 @@ define([
 
                 var hjson = JSON.parse(shjson);
                 var remoteDoc = hjson.content;
-                
+
                 //get old cursor here
                 var oldCursor = {};
                 oldCursor.selectionStart = cursorToPos(editor.getCursor('from'), oldDoc);
                 oldCursor.selectionEnd = cursorToPos(editor.getCursor('to'), oldDoc);
-                
+
                 editor.setValue(remoteDoc);
                 editor.save();
 
@@ -220,7 +212,7 @@ define([
                 }
                 else {
                     editor.setSelection(posToCursor(selects[0], remoteDoc), posToCursor(selects[1], remoteDoc));
-                }                                
+                }
 
                 var localDoc = canonicalize($textarea.val());
                 var hjson2 = {
@@ -232,11 +224,6 @@ define([
                     console.error("shjson2 !== shjson");
                     module.patchText(shjson2);
                 }
-
-
-                // check cursor
-                // apply changes to textarea
-                // replace cursor
             };
 
             var onLocal = config.onLocal = function () {
@@ -260,8 +247,8 @@ define([
             };
 
             var onAbort = config.onAbort = function (info) {
-                // TODO  alert the user
                 // inform of network disconnect
+                setEditable(false);
                 window.alert("Network Connection Lost!");
             };
 

From 150ebaba7ba73a2aee1cdde1367b99ebf467e958 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 27 Apr 2016 17:58:55 +0200
Subject: [PATCH 170/257] add ability to force text diffing

---
 www/common/TextPatcher.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/common/TextPatcher.js b/www/common/TextPatcher.js
index 83bfedc48..a5d9b9d01 100644
--- a/www/common/TextPatcher.js
+++ b/www/common/TextPatcher.js
@@ -120,8 +120,8 @@ var create = function(config) {
     });
 
     // propogate()
-    return function (newContent) {
-        if (newContent !== content) {
+    return function (newContent, force) {
+        if (newContent !== content || force) {
             applyChange(ctx, ctx.getUserDoc(), newContent, logging);
             if (ctx.getUserDoc() !== newContent) {
                 console.log("Expected that: `ctx.getUserDoc() === newContent`!");

From d2fa5e8f70d1ebc94ee1fe1064a343a71a12c9c9 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 9 May 2016 11:41:02 +0200
Subject: [PATCH 171/257] start using hyperjson from bower.io

---
 bower.json      | 3 ++-
 www/pad/main.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index 6883d1107..caa00008b 100644
--- a/bower.json
+++ b/bower.json
@@ -30,6 +30,7 @@
     "marked": "~0.3.5",
     "rangy": "rangy-release#~1.3.0",
     "json.sortify": "~2.1.0",
-    "fabric.js": "fabric#~1.6.0"
+    "fabric.js": "fabric#~1.6.0",
+    "hyperjson": "~1.1.0"
   }
 }
diff --git a/www/pad/main.js b/www/pad/main.js
index aed4612cc..84656c3d3 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -4,7 +4,7 @@ define([
     '/common/messages.js',
     '/common/crypto.js',
     '/common/realtime-input.js',
-    '/common/hyperjson.js',
+    '/bower_components/hyperjson/hyperjson.js',
     '/common/hyperscript.js',
     '/common/toolbar.js',
     '/common/cursor.js',
@@ -37,6 +37,7 @@ define([
     var module = window.REALTIME_MODULE = {
         Hyperjson: Hyperjson,
         Hyperscript: Hyperscript,
+        TextPatcher: TextPatcher,
         logFights: true,
         fights: []
     };

From 6b2e98678918b2c447333ba08d9bbde6cc24b07f Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 9 May 2016 11:57:40 +0200
Subject: [PATCH 172/257] remove deprecated textsocket library

---
 www/common/RealtimeTextSocket.js | 271 -------------------------------
 1 file changed, 271 deletions(-)
 delete mode 100644 www/common/RealtimeTextSocket.js

diff --git a/www/common/RealtimeTextSocket.js b/www/common/RealtimeTextSocket.js
deleted file mode 100644
index cdbeb1d8d..000000000
--- a/www/common/RealtimeTextSocket.js
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * 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 .
- */
-define([
-    '/common/messages.js',
-    '/bower_components/reconnectingWebsocket/reconnecting-websocket.js',
-    '/common/crypto.js',
-    '/common/chainpad.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-], function (Messages, ReconnectingWebSocket, Crypto) {
-    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;
-
-    var recoverableErrors = 0;
-
-    /** Maximum number of milliseconds of lag before we fail the connection. */
-    var MAX_LAG_BEFORE_DISCONNECT = 20000;
-
-    var debug = function (x) { console.log(x); };
-    var warn = function (x) { console.error(x); };
-    var verbose = function (x) { /*console.log(x);*/ };
-    var error = function (x) {
-        console.error(x);
-        recoverableErrors++;
-        if (recoverableErrors >= MAX_RECOVERABLE_ERRORS) {
-            window.alert("FAIL");
-        }
-    };
-
-    /* websocket stuff */
-    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;
-        }
-    };
-
-    // TODO before removing websocket implementation
-    // bind abort to onLeaving
-    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);
-        /* create a set of handlers to use instead of the native socket handler
-            these handlers will iterate over all of the functions pushed to the
-            arrays bearing their name.
-
-            The first such function to return `false` will prevent subsequent
-            functions from being executed. */
-        var out = {
-            onOpen: [], // takes care of launching the post-open logic
-            onClose: [], // takes care of cleanup
-            onError: [], // in case of error, socket will close, and fire this
-            onMessage: [], // used for the bulk of our logic
-            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;
-                    }
-                }
-            };
-        };
-
-        // bind your new handlers to the important listeners on the socket
-        socket.onopen = mkHandler('onOpen');
-        socket.onclose = mkHandler('onClose');
-        socket.onerror = mkHandler('onError');
-        socket.onmessage = mkHandler('onMessage');
-        return out;
-    };
-    /* end websocket stuff */
-
-    var start = module.exports.start = function (config) {
-        //var textarea = config.textarea;
-        var websocketUrl = config.websocketURL;
-        var userName = config.userName;
-        var channel = config.channel;
-        var cryptKey = config.cryptKey;
-        var passwd = 'y';
-        var doc = config.doc || null;
-
-        // wrap up the reconnecting websocket with our additional stack logic
-        var socket = makeWebsocket(websocketUrl);
-
-        var allMessages = window.chainpad_allMessages = [];
-        var isErrorState = false;
-        var initializing = true;
-        var recoverableErrorCount = 0;
-
-        var toReturn = { socket: socket };
-
-        socket.onOpen.push(function (evt) {
-            var realtime = toReturn.realtime = socket.realtime =
-                // everybody has a username, and we assume they don't collide
-                // usernames are used to determine whether a message is remote
-                // or local in origin. This could mess with expected behaviour
-                // if someone spoofed.
-                ChainPad.create(userName,
-                    passwd, // password, to be deprecated (maybe)
-                    channel, // the channel we're to connect to
-
-                    /*  optional unless your application expects JSON
-                        from getUserDoc */
-                    config.initialState || '',
-
-                    // transform function (optional), which handles conflicts
-                    { transformFunction: config.transformFunction });
-
-            var onEvent = toReturn.onEvent = function (newText) {
-                if (isErrorState || initializing) { return; }
-                // assert things here...
-                if (realtime.getUserDoc() !== newText) {
-                    // this is a problem
-                    warn("realtime.getUserDoc() !== newText");
-                }
-            };
-
-            // pass your shiny new realtime into initialization functions
-            if (config.onInit) {
-                // extend as you wish
-                config.onInit({
-                    realtime: realtime
-                });
-            }
-
-            /* UI hints on userList changes are handled within the toolbar
-                so we don't actually need to do anything here except confirm
-                whether we've successfully joined the session, and call our
-                'onReady' function */
-            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.
-                initializing = false;
-
-                // execute an onReady callback if one was supplied
-                // pass an object so we can extend this later
-                if (config.onReady) {
-                    // extend as you wish
-                    config.onReady({
-                        userList: userList,
-                        realtime: realtime
-                    });
-                }
-            });
-
-            // when a message is ready to send
-            // Don't confuse this onMessage with socket.onMessage
-            realtime.onMessage(function (message) {
-                if (isErrorState) { return; }
-                message = Crypto.encrypt(message, cryptKey);
-                try {
-                    socket.send(message);
-                } catch (e) {
-                    warn(e);
-                }
-            });
-
-            realtime.onPatch(function () {
-                if (config.onRemote) {
-                    config.onRemote({
-                        realtime: realtime
-                    });
-                }
-            });
-
-            // when you receive a message...
-            socket.onMessage.push(function (evt) {
-                verbose(evt.data);
-                if (isErrorState) { return; }
-
-                var message = Crypto.decrypt(evt.data, cryptKey);
-                verbose(message);
-                allMessages.push(message);
-                if (!initializing) {
-                    if (config.onLocal) {
-                        config.onLocal();
-                    }
-                }
-                realtime.message(message);
-            });
-
-            // 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;
-
-            var socketChecker = setInterval(function () {
-                if (checkSocket(socket)) {
-                    warn("Socket disconnected!");
-
-                    recoverableErrorCount += 1;
-
-                    if (recoverableErrorCount >= MAX_RECOVERABLE_ERRORS) {
-                        warn("Giving up!");
-                        abort(socket, realtime);
-                        if (config.onAbort) {
-                            config.onAbort({
-                                socket: socket
-                            });
-                        }
-                        if (socketChecker) { clearInterval(socketChecker); }
-                    }
-                } // it's working as expected, continue
-            }, 200);
-
-            realtime.start();
-            debug('started');
-        });
-
-        return toReturn;
-    };
-    return module.exports;
-});

From c752e4a6e5d82e0a4dc6bc3ec7e83f3e93ddcac7 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 9 May 2016 14:20:11 +0200
Subject: [PATCH 173/257] remove sharejs

---
 www/common/sharejs_textarea.js | 188 ---------------------------------
 1 file changed, 188 deletions(-)
 delete mode 100644 www/common/sharejs_textarea.js

diff --git a/www/common/sharejs_textarea.js b/www/common/sharejs_textarea.js
deleted file mode 100644
index 18282d682..000000000
--- a/www/common/sharejs_textarea.js
+++ /dev/null
@@ -1,188 +0,0 @@
-define(function () {
-
-/**
- * Licensed under the standard MIT license:
- *
- * Copyright 2011 Joseph Gentle.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * See: https://github.com/share/ShareJS/blob/master/LICENSE
- */
-
-/* This contains the textarea binding for ShareJS. This binding is really
- * simple, and a bit slow on big documents (Its O(N). However, it requires no
- * changes to the DOM and no heavy libraries like ace. It works for any kind of
- * text input field.
- *
- * You probably want to use this binding for small fields on forms and such.
- * For code editors or rich text editors or whatever, I recommend something
- * heavier.
- */
-
-
-/* applyChange creates the edits to convert oldval -> newval.
- *
- * This function should be called every time the text element is changed.
- * Because changes are always localised, the diffing is quite easy. We simply
- * scan in from the start and scan in from the end to isolate the edited range,
- * then delete everything that was removed & add everything that was added.
- * This wouldn't work for complex changes, but this function should be called
- * on keystroke - so the edits will mostly just be single character changes.
- * Sometimes they'll paste text over other text, but even then the diff
- * generated by this algorithm is correct.
- *
- * This algorithm is O(N). I suspect you could speed it up somehow using regular expressions.
- */
-var applyChange = function(ctx, oldval, newval) {
-    // Strings are immutable and have reference equality. I think this test is O(1), so its worth doing.
-    if (oldval === newval) {
-        return;
-    }
-
-    var commonStart = 0;
-    while (oldval.charAt(commonStart) === newval.charAt(commonStart)) {
-        commonStart++;
-    }
-
-    var commonEnd = 0;
-    while (oldval.charAt(oldval.length - 1 - commonEnd) === newval.charAt(newval.length - 1 - commonEnd) &&
-        commonEnd + commonStart < oldval.length && commonEnd + commonStart < newval.length) {
-        commonEnd++;
-    }
-
-    var bugz = {
-        commonStart:commonStart,
-        commonEnd:commonEnd,
-        oldvalLength: oldval.length,
-        newvalLength: newval.length
-    };
-    if (oldval.length !== commonStart + commonEnd) {
-        if (ctx.localChange) { ctx.localChange(true); }
-        ctx.remove(commonStart, oldval.length - commonStart - commonEnd);
-    }
-    if (newval.length !== commonStart + commonEnd) {
-        if (ctx.localChange) { ctx.localChange(true); }
-        ctx.insert(commonStart, newval.slice(commonStart, newval.length - commonEnd));
-    }
-};
-
-/**
- * Fix issues with textarea content which is different per-browser.
- */
-var cannonicalize = function (content) {
-
-    return content.replace(/\r\n/g, '\n');
-};
-
-// Attach a textarea to a document's editing context.
-//
-// The context is optional, and will be created from the document if its not
-// specified.
-var attachTextarea = function(elem, ctx) {
-
-    // initial state will always fail the !== check in genop.
-    var content = {};
-    var newSelection;
-
-    // Replace the content of the text area with newText, and transform the
-    // current cursor by the specified function.
-    var replaceText = function(newText, transformCursor) {
-        if (transformCursor) {
-            newSelection = [transformCursor(elem.selectionStart), transformCursor(elem.selectionEnd)];
-        }
-
-        // Fixate the window's scroll while we set the element's value. Otherwise
-        // the browser scrolls to the element.
-        var scrollTop = elem.scrollTop;
-        elem.value = newText;
-        content = elem.value; // Not done on one line so the browser can do newline conversion.
-        if (elem.scrollTop !== scrollTop) { elem.scrollTop = scrollTop; }
-
-        // Setting the selection moves the cursor. We'll just have to let your
-        // cursor drift if the element isn't active, though usually users don't
-        // care.
-        if (newSelection && window.document.activeElement === elem) {
-            elem.selectionStart = newSelection[0];
-            elem.selectionEnd = newSelection[1];
-        }
-    };
-
-  //replaceText(ctx.get());
-
-
-  // *** remote -> local changes
-
-  ctx.onRemove(function(pos, length) {
-    var transformCursor = function(cursor) {
-      // If the cursor is inside the deleted region, we only want to move back to the start
-      // of the region. Hence the Math.min.
-      return pos < cursor ? cursor - Math.min(length, cursor - pos) : cursor;
-    };
-    replaceText(ctx.getUserDoc(), transformCursor);
-  });
-
-  ctx.onInsert(function(pos, text) {
-    var transformCursor = function(cursor) {
-      return pos < cursor ? cursor + text.length : cursor;
-    };
-    replaceText(ctx.getUserDoc(), transformCursor);
-  });
-
-
-  // *** local -> remote changes
-
-  // This function generates operations from the changed content in the textarea.
-  var genOp = function() {
-    // In a timeout so the browser has time to propogate the event's changes to the DOM.
-    setTimeout(function() { var val = elem.value;
-      if (val !== content) {
-        applyChange(ctx, ctx.getUserDoc(), cannonicalize(val));
-      }
-    }, 0);
-  };
-
-  var eventNames = ['textInput', 'keydown', 'keyup', 'select', 'cut', 'paste'];
-  for (var i = 0; i < eventNames.length; i++) {
-    var e = eventNames[i];
-    if (elem.addEventListener) {
-      elem.addEventListener(e, genOp, false);
-    } else {
-      elem.attachEvent('on' + e, genOp);
-    }
-  }
-
-  ctx.detach = function() {
-    for (var i = 0; i < eventNames.length; i++) {
-      var e = eventNames[i];
-      if (elem.removeEventListener) {
-        elem.removeEventListener(e, genOp, false);
-      } else {
-        elem.detachEvent('on' + e, genOp);
-      }
-    }
-  };
-
-  ctx.bumpSharejs = genOp;
-
-  return ctx;
-};
-
-return { attach: attachTextarea };
-});

From dcd130cd9d864592daa1dc11ac445f8accfa2777 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 9 May 2016 15:27:37 +0200
Subject: [PATCH 174/257] use hyperjson from bower in padrtc

---
 www/padrtc/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/padrtc/main.js b/www/padrtc/main.js
index 233241a86..6d3c0fd4c 100644
--- a/www/padrtc/main.js
+++ b/www/padrtc/main.js
@@ -3,7 +3,7 @@ define([
     '/common/messages.js',
     '/common/crypto.js',
     '/padrtc/realtime-input.js',
-    '/common/hyperjson.js',
+    '/bower_components/hyperjson/hyperjson.js',
     '/common/hyperscript.js',
     '/common/toolbar.js',
     '/common/cursor.js',

From 523aff306706a0dfabcb66320bec4489a6a81ab4 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 9 May 2016 15:50:19 +0200
Subject: [PATCH 175/257] use upstream chainpad.js

---
 www/common/chainpad.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/www/common/chainpad.js b/www/common/chainpad.js
index e7823bc58..c54189ca5 100644
--- a/www/common/chainpad.js
+++ b/www/common/chainpad.js
@@ -558,7 +558,7 @@ var Common = require('./Common');
 var Operation = module.exports.Operation = require('./Operation');
 var Patch = require('./Patch');
 var Message = require('./Message');
-var Sha = require('./SHA256');
+var Sha = module.exports.Sha = require('./SHA256');
 
 var ChainPad = {};
 
@@ -574,7 +574,9 @@ var enterChainPad = function (realtime, func) {
 };
 
 var debug = function (realtime, msg) {
-    console.log("[" + realtime.userName + "]  " + msg);
+    if (realtime.logLevel > 0) {
+        console.log("[" + realtime.userName + "]  " + msg);
+    }
 };
 
 var schedule = function (realtime, func, timeout) {
@@ -707,12 +709,16 @@ var onPong = function (realtime, msg) {
 
 var create = ChainPad.create = function (userName, authToken, channelId, initialState, config) {
 
+    config = config || {};
+
     var realtime = {
         type: 'ChainPad',
 
         authDoc: '',
 
-        config: config || {},
+        config: config,
+
+        logLevel: typeof(config.logLevel) !== 'undefined'? config.logLevel: 1,
 
         userName: userName,
         authToken: authToken,

From 7faf57602bc439baac2f96e496a2fae88970ca89 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 10 May 2016 09:39:20 +0200
Subject: [PATCH 176/257] implement log level settings from application layer

---
 www/common/realtime-input.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 5a8726e35..95759d757 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -190,7 +190,8 @@ define([
                                         channel,
                                         config.initialState || '',
                                         {
-                                        transformFunction: config.transformFunction
+                                        transformFunction: config.transformFunction,
+                                        logLevel: typeof(config.logLevel) !== 'undefined'? config.logLevel : 1
                                         });
         };
 

From 1769ca16dca994f0affcc3d703c459c0953e7a14 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 10 May 2016 10:23:22 +0200
Subject: [PATCH 177/257] add example for configuring the logLevel in /pad/

---
 www/pad/main.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 84656c3d3..673c4104f 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -277,7 +277,10 @@ define([
                 crypto: Crypto,
 
                 // really basic operational transform
-                transformFunction : JsonOT.validate
+                transformFunction : JsonOT.validate,
+
+                // cryptpad debug logging (default is 1)
+                // logLevel: 0,
             };
 
             var updateUserList = function(shjson) {

From 663c157e2a287767a2abb795328e232c018e6ce8 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 12 May 2016 10:46:17 +0200
Subject: [PATCH 178/257] expose text patcher to the window via APP

---
 www/text/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/text/main.js b/www/text/main.js
index 2b91c446d..d82ce59de 100644
--- a/www/text/main.js
+++ b/www/text/main.js
@@ -18,7 +18,9 @@ define([
         key = hash.substr(32);
     }
 
-    var module = window.APP = {};
+    var module = window.APP = {
+        TextPatcher: TextPatcher
+    };
 
     var userName = module.userName = Crypto.rand64(8);
 

From 31052e49b86beeae0b179632ffd0af4c81c6b65a Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 12 May 2016 14:59:45 +0200
Subject: [PATCH 179/257] remove note about jquery sheet

---
 customize.dist/index.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/customize.dist/index.html b/customize.dist/index.html
index 3dd81b486..5be1bc5dd 100644
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -98,9 +98,8 @@
       
    CryptPad is the zero knowledge realtime collaborative editor.
       Encryption carried out in your web browser protects the data from the server, the cloud
       and the NSA. This project uses the CKEditor Visual Editor
-      the ChainPad realtime engine and now
-      jQuery.sheet for realtime spreadsheet
-      editing! The secret encryption key is stored in the URL
+      the ChainPad realtime engine. The secret
+      encryption key is stored in the URL
       fragment identifier which is
       never sent to the server but is available to javascript so by sharing the URL, you give
       authorization to others who want to participate.
    

From f5266e2109d938ed3c038f6b6b27ffb6c9cbf7be Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 12 May 2016 18:20:30 +0200
Subject: [PATCH 180/257] use latest release of hyperjson

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index caa00008b..a37b05700 100644
--- a/bower.json
+++ b/bower.json
@@ -31,6 +31,6 @@
     "rangy": "rangy-release#~1.3.0",
     "json.sortify": "~2.1.0",
     "fabric.js": "fabric#~1.6.0",
-    "hyperjson": "~1.1.0"
+    "hyperjson": "~1.2.0"
   }
 }

From d2c8fbf1f8ecb65328ca7b30c41f13f1eeaded1e Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 12 May 2016 18:21:01 +0200
Subject: [PATCH 181/257] use hyperjson.amd.js, not hyperjson.js

---
 www/pad/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 673c4104f..93ac225b4 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -4,7 +4,7 @@ define([
     '/common/messages.js',
     '/common/crypto.js',
     '/common/realtime-input.js',
-    '/bower_components/hyperjson/hyperjson.js',
+    '/bower_components/hyperjson/hyperjson.amd.js',
     '/common/hyperscript.js',
     '/common/toolbar.js',
     '/common/cursor.js',

From d8a96b38cf3e820498a7416f90e7e345d77c405d Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 12 May 2016 18:37:37 +0200
Subject: [PATCH 182/257] use hyperjson 1.2.2

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index a37b05700..48912d3e0 100644
--- a/bower.json
+++ b/bower.json
@@ -31,6 +31,6 @@
     "rangy": "rangy-release#~1.3.0",
     "json.sortify": "~2.1.0",
     "fabric.js": "fabric#~1.6.0",
-    "hyperjson": "~1.2.0"
+    "hyperjson": "~1.2.2"
   }
 }

From 3ea270acb9f2abafe4cfa242e734c30d6d49f241 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 13 May 2016 16:41:36 +0200
Subject: [PATCH 183/257] fix cursors in form prototype

---
 www/form/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/form/main.js b/www/form/main.js
index 102ed9bf9..10b89b24e 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -51,7 +51,7 @@ define([
     var cursorTypes = ['textarea', 'password', 'text'];
 
     var canonicalize = function (text) { return text.replace(/\r\n/g, '\n'); };
-    $elements.each(function (element) {
+    $elements.each(function (index, element) {
         var $this = $(this);
 
         var id = uid();

From a7cbd8c470cf29685ca4bde992d23657bedd5ae5 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 13 May 2016 16:42:14 +0200
Subject: [PATCH 184/257] we're pushing json over the wire, so let's use
 json-ot.validate

---
 www/canvas/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/canvas/main.js b/www/canvas/main.js
index 212f12bfe..47d8c37d1 100644
--- a/www/canvas/main.js
+++ b/www/canvas/main.js
@@ -9,10 +9,11 @@ define([
     '/common/crypto.js',
     '/common/TextPatcher.js',
     'json.sortify',
+    '/common/json-ot.js',
     '/bower_components/fabric.js/dist/fabric.min.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
-], function (Config, Realtime, Messages, Crypto, TextPatcher, JSONSortify) {
+], function (Config, Realtime, Messages, Crypto, TextPatcher, JSONSortify, JsonOT) {
     var module = window.APP = { };
     var $ = module.$ = window.jQuery;
     var Fabric = module.Fabric = window.fabric;
@@ -68,6 +69,7 @@ define([
         channel: channel,
         cryptKey: key,
         crypto: Crypto,
+        transformFunction: JsonOT.validate,
     };
 
     var onInit = config.onInit = function (info) {

From 0cd4f85ff055c1377673d6719c374a9a0eea2e5e Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 13 May 2016 17:00:01 +0200
Subject: [PATCH 185/257] remove migration notes

---
 www/migrate | 50 --------------------------------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 www/migrate

diff --git a/www/migrate b/www/migrate
deleted file mode 100644
index 936251961..000000000
--- a/www/migrate
+++ /dev/null
@@ -1,50 +0,0 @@
-* hack
-  - good
-* code
-  - this is actually a fair bit of work (maybe)
-* canvas
-  - seems to work
-  - should have json-ot
-* form
-  - doesn't work yet
-  - don't bother developing for websocket, move to netflux asap
-* p
-  - using sockets, pad is the fixed version
-  - move things over and deprecate
-* pad
-  - using netflux already, but might require some updates from /p/
-* padrtc
-  - using netflux, but it's not really useful
-* render
-  - idek man
-* style
-  - works, using netflux
-* text
-  - works
-
-
-## Remaining
-
-* code
-  - use netflux
-* form
-  - use netflux
-  - get it working
-  - audit json-ot
-* pad
-  - update /pad/ from /p/
-  - then delete p
-* p
-  - see above
-* padrtc
-  - idk
-* render
-  - get it working
-  - use diffdom
-  - continue to use rainbow?
-* style
-  - push initial styles into new documents
-* text
-  - support tabs?
-
-

From ad3c53c34490e1a613803353bcb92bff643203a7 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 13 May 2016 17:32:56 +0200
Subject: [PATCH 186/257] use textpatcher from bower for all pads

---
 bower.json         | 3 ++-
 www/assert/main.js | 2 +-
 www/canvas/main.js | 2 +-
 www/code/main.js   | 2 +-
 www/form/main.js   | 2 +-
 www/hack/main.js   | 2 +-
 www/pad/main.js    | 2 +-
 www/style/main.js  | 2 +-
 www/text/main.js   | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/bower.json b/bower.json
index 48912d3e0..0c819e0a4 100644
--- a/bower.json
+++ b/bower.json
@@ -31,6 +31,7 @@
     "rangy": "rangy-release#~1.3.0",
     "json.sortify": "~2.1.0",
     "fabric.js": "fabric#~1.6.0",
-    "hyperjson": "~1.2.2"
+    "hyperjson": "~1.2.2",
+    "textpatcher": "^1.1.1"
   }
 }
diff --git a/www/assert/main.js b/www/assert/main.js
index 27223752d..35ec51957 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -3,7 +3,7 @@ define([
     '/bower_components/jquery/dist/jquery.min.js',
     '/common/hyperjson.js', // serializing classes as an attribute
     '/common/hyperscript.js', // using setAttribute
-    '/common/TextPatcher.js',
+    '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
 ], function (jQuery, Hyperjson, Hyperscript, TextPatcher, Sortify) {
     var $ = window.jQuery;
diff --git a/www/canvas/main.js b/www/canvas/main.js
index 47d8c37d1..5564d95f1 100644
--- a/www/canvas/main.js
+++ b/www/canvas/main.js
@@ -7,7 +7,7 @@ define([
     '/common/realtime-input.js',
     '/common/messages.js',
     '/common/crypto.js',
-    '/common/TextPatcher.js',
+    '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
     '/common/json-ot.js',
     '/bower_components/fabric.js/dist/fabric.min.js',
diff --git a/www/code/main.js b/www/code/main.js
index 1ff99deab..867f47147 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -5,7 +5,7 @@ define([
     '/common/messages.js',
     '/common/crypto.js',
     '/common/realtime-input.js',
-    '/common/TextPatcher.js',
+    '/bower_components/textpatcher/TextPatcher.amd.js',
     '/common/toolbar.js',
     'json.sortify',
     '/common/json-ot.js',
diff --git a/www/form/main.js b/www/form/main.js
index 10b89b24e..d4bddf767 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -3,7 +3,7 @@ define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/realtime-input.js',
     '/common/crypto.js',
-    '/common/TextPatcher.js',
+    '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
     '/form/ula.js',
     '/common/json-ot.js',
diff --git a/www/hack/main.js b/www/hack/main.js
index fe71ac64d..81cc87234 100644
--- a/www/hack/main.js
+++ b/www/hack/main.js
@@ -2,7 +2,7 @@ define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/realtime-input.js',
     '/common/crypto.js',
-    '/common/TextPatcher.js',
+    '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js'
 ], function (Config, Realtime, Crypto, TextPatcher) {
     var $ = window.jQuery;
diff --git a/www/pad/main.js b/www/pad/main.js
index 93ac225b4..f9a5521bf 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -11,7 +11,7 @@ define([
     '/common/json-ot.js',
     '/common/TypingTests.js',
     'json.sortify',
-    '/common/TextPatcher.js',
+    '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/diff-dom/diffDOM.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
diff --git a/www/style/main.js b/www/style/main.js
index fa209cf7c..218cc1cd8 100644
--- a/www/style/main.js
+++ b/www/style/main.js
@@ -2,7 +2,7 @@ define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/realtime-input.js',
     '/common/crypto.js',
-    '/common/TextPatcher.js',
+    '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
 ], function (Config, Realtime, Crypto, TextPatcher) { 
diff --git a/www/text/main.js b/www/text/main.js
index d82ce59de..e3c23af9e 100644
--- a/www/text/main.js
+++ b/www/text/main.js
@@ -2,7 +2,7 @@ define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/realtime-input.js',
     '/common/crypto.js',
-    '/common/TextPatcher.js',
+    '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
 ], function (Config, Realtime, Crypto, TextPatcher) { 

From cae750cd7561ba084614547a7ea5abd9626c5da5 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 13 May 2016 17:35:17 +0200
Subject: [PATCH 187/257] update padrtc for to use bower libraries

---
 www/{common => padrtc}/TextPatcher.js | 0
 www/padrtc/main.js                    | 2 +-
 www/padrtc/realtime-input.js          | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename www/{common => padrtc}/TextPatcher.js (100%)

diff --git a/www/common/TextPatcher.js b/www/padrtc/TextPatcher.js
similarity index 100%
rename from www/common/TextPatcher.js
rename to www/padrtc/TextPatcher.js
diff --git a/www/padrtc/main.js b/www/padrtc/main.js
index 6d3c0fd4c..f71fa5f1d 100644
--- a/www/padrtc/main.js
+++ b/www/padrtc/main.js
@@ -3,7 +3,7 @@ define([
     '/common/messages.js',
     '/common/crypto.js',
     '/padrtc/realtime-input.js',
-    '/bower_components/hyperjson/hyperjson.js',
+    '/bower_components/hyperjson/hyperjson.amd.js',
     '/common/hyperscript.js',
     '/common/toolbar.js',
     '/common/cursor.js',
diff --git a/www/padrtc/realtime-input.js b/www/padrtc/realtime-input.js
index ae2f8c72c..568781209 100644
--- a/www/padrtc/realtime-input.js
+++ b/www/padrtc/realtime-input.js
@@ -20,7 +20,7 @@ define([
     '/padrtc/netflux.js',
     '/common/crypto.js',
     '/common/toolbar.js',
-    '/common/TextPatcher.js',
+    '/padrtc/TextPatcher.js',
     '/common/es6-promise.min.js',
     '/common/chainpad.js',
     '/bower_components/jquery/dist/jquery.min.js',

From fe261c34bbc42011a4cf89c9abba8b99509ca4b6 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 14 May 2016 12:47:59 +0200
Subject: [PATCH 188/257] set log level via the config file, not via a constant

---
 NetfluxWebsocketSrv.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 13ec51cca..6fad102ed 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -2,13 +2,13 @@
 const Crypto = require('crypto');
 const LogStore = require('./storage/LogStore');
 
+
 const LAG_MAX_BEFORE_DISCONNECT = 30000;
 const LAG_MAX_BEFORE_PING = 15000;
 const HISTORY_KEEPER_ID = Crypto.randomBytes(8).toString('hex');
 
 const USE_HISTORY_KEEPER = true;
 const USE_FILE_BACKUP_STORAGE = true;
-const LOG_MESSAGES = false;
 
 
 let dropUser;
@@ -17,7 +17,7 @@ const now = function () { return (new Date()).getTime(); };
 
 const sendMsg = function (ctx, user, msg) {
     try {
-        if (LOG_MESSAGES) { console.log('<' + JSON.stringify(msg)); }
+        if (ctx.config.logToStdout) { console.log('<' + JSON.stringify(msg)); }
         user.socket.send(JSON.stringify(msg));
     } catch (e) {
         console.log(e.stack);
@@ -153,11 +153,12 @@ const handleMessage = function (ctx, user, msg) {
     }
 };
 
-let run = module.exports.run = function (storage, socketServer) {
+let run = module.exports.run = function (storage, socketServer, config) {
     let ctx = {
         users: {},
         channels: {},
-        store: (USE_FILE_BACKUP_STORAGE) ? LogStore.create('messages.log', storage) : storage
+        store: (USE_FILE_BACKUP_STORAGE) ? LogStore.create('messages.log', storage) : storage,
+        config: config
     };
     setInterval(function () {
         Object.keys(ctx.users).forEach(function (userId) {
@@ -183,7 +184,7 @@ let run = module.exports.run = function (storage, socketServer) {
         ctx.users[user.id] = user;
         sendMsg(ctx, user, [0, '', 'IDENT', user.id]);
         socket.on('message', function(message) {
-            if (LOG_MESSAGES) { console.log('>'+message); }
+            if (ctx.config.logToStdout) { console.log('>'+message); }
             try {
                 handleMessage(ctx, user, message);
             } catch (e) {

From a08efc568ba676b32a20ab03fce252fa5cb35cd6 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 14 May 2016 12:50:03 +0200
Subject: [PATCH 189/257] update default config to contain logToStdout

---
 config.js.dist | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config.js.dist b/config.js.dist
index b79777eb7..9d0ef5f32 100644
--- a/config.js.dist
+++ b/config.js.dist
@@ -12,6 +12,11 @@ module.exports = {
     // the port used for websockets
     websocketPort: 3000,
 
+    /*  Cryptpad can log activity to stdout
+     *  This may be useful for debugging
+     */
+    logToStdout: false,
+
     // You now have a choice of storage engines
 
     /* amnesiadb only exists in memory.

From 061cffe462c2b14b4e2991b1a9178e3fce53f1d4 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 14 May 2016 12:51:52 +0200
Subject: [PATCH 190/257] transform and pass through the existing store

---
 storage/LogStore.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/storage/LogStore.js b/storage/LogStore.js
index d588c82f5..14761e6b7 100644
--- a/storage/LogStore.js
+++ b/storage/LogStore.js
@@ -8,11 +8,12 @@ var create = module.exports.create = function(filePath, backingStore) {
 
     var file = Fs.createWriteStream(filePath, {flags: 'a+'});
 
-    return {
-        message: function(channel, msg, callback) {
-            message(file, msg);
-            backingStore.message(channel, msg, callback);
-        },
-        getMessages: backingStore.getMessages
+    var originalMessageFunction = backingStore.message;
+
+    backingStore.message = function(channel, msg, callback) {
+        message(file, msg);
+        originalMessageFunction(channel, msg, callback);
     };
+
+    return backingStore;
 };

From d59824929d71d360f3281db174d8a941133af02f Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 14 May 2016 12:52:34 +0200
Subject: [PATCH 191/257] pass config object into NetfluxServer

---
 server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 819480fcf..0b963f730 100644
--- a/server.js
+++ b/server.js
@@ -81,6 +81,6 @@ if (config.websocketPort !== config.httpPort) {
 var wsSrv = new WebSocketServer(wsConfig);
 Storage.create(config, function (store) {
     console.log('DB connected');
-    NetfluxSrv.run(store, wsSrv);
+    NetfluxSrv.run(store, wsSrv, config);
     WebRTCSrv.run(wsSrv);
 });

From 3232671a6a24361d34bef0d9fa650dfca5e39bda Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 14 May 2016 13:04:05 +0200
Subject: [PATCH 192/257] implement optional channel removal hooks

add configuration variables to the default config
---
 NetfluxWebsocketSrv.js | 24 ++++++++++++++++++++++++
 config.js.dist         |  9 +++++++++
 2 files changed, 33 insertions(+)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 6fad102ed..48444f7ef 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -62,6 +62,17 @@ dropUser = function (ctx, user) {
         if (chan.length === 0) {
             console.log("Removing empty channel ["+chanName+"]");
             delete ctx.channels[chanName];
+
+            /*  Call removeChannel if it is a function and channel removal is
+                set to true in the config file */
+            if (ctx.config.removeChannels && typeof(ctx.store.removeChannel) === 'function') {
+                ctx.timeouts[chanName] = setTimeout(function () {
+                    ctx.store.removeChannel(chanName, function (err) {
+                        if (err) { console.error("[removeChannelErr]: %s", err); }
+                        console.log("Deleted channel [%s] history from database...", chanName);
+                    });
+                }, ctx.config.channelRemovalTimeout);
+            }
         } else {
             sendChannelMessage(ctx, chan, [user.id, 'LEAVE', chanName, 'Quit: [ dropUser() ]']);
         }
@@ -91,6 +102,12 @@ const handleMessage = function (ctx, user, msg) {
         let chanName = obj || randName();
         sendMsg(ctx, user, [seq, 'JACK', chanName]);
         let chan = ctx.channels[chanName] = ctx.channels[chanName] || [];
+
+        // prevent removal of the channel if there is a pending timeout
+        if (ctx.config.removeChannels && ctx.timeouts[chanName]) {
+            clearTimeout(ctx.timeouts[chanName]);
+        }
+
         chan.id = chanName;
         if (USE_HISTORY_KEEPER) {
             sendMsg(ctx, user, [0, HISTORY_KEEPER_ID, 'JOIN', chanName]);
@@ -154,9 +171,16 @@ const handleMessage = function (ctx, user, msg) {
 };
 
 let run = module.exports.run = function (storage, socketServer, config) {
+    /*  Channel removal timeout defaults to 60000ms (one minute) */
+    config.channelRemovalTimeout =
+        typeof(config.channelRemovalTimeout) === 'number'?
+            config.channelRemovalTimeout:
+            60000;
+
     let ctx = {
         users: {},
         channels: {},
+        timeouts: {},
         store: (USE_FILE_BACKUP_STORAGE) ? LogStore.create('messages.log', storage) : storage,
         config: config
     };
diff --git a/config.js.dist b/config.js.dist
index 9d0ef5f32..4b5702574 100644
--- a/config.js.dist
+++ b/config.js.dist
@@ -17,6 +17,15 @@ module.exports = {
      */
     logToStdout: false,
 
+    /*  Cryptpad can be configured to remove channels some number of ms
+        after the last remaining client has disconnected.
+
+        Default behaviour is to keep channels forever.
+        If you enable channel removal, the default removal time is one minute
+    */
+    removeChannels: false,
+    channelRemovalTimeout: 60000,
+
     // You now have a choice of storage engines
 
     /* amnesiadb only exists in memory.

From 1b2c129380938e89881927cc7815cf6df963e740 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 14 May 2016 13:05:21 +0200
Subject: [PATCH 193/257] implement channel removal in amnesiadb

---
 storage/amnesia.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/storage/amnesia.js b/storage/amnesia.js
index bd414b8fb..b7c1702e6 100644
--- a/storage/amnesia.js
+++ b/storage/amnesia.js
@@ -19,6 +19,10 @@ module.exports.create = function(conf, cb){
     var db=[],
         index=0;
 
+    if (conf.removeChannels) {
+        console.log("Server is set to remove channels %sms after the last remaining client leaves.", conf.channelRemovalTimeout);
+    }
+
     cb({
         message: function(channelName, content, cb){
             var val = {
@@ -41,5 +45,12 @@ module.exports.create = function(conf, cb){
             });
             if (cb) { cb(); }
         },
+        removeChannel: function (channelName, cb) {
+            var err = false;
+            db = db.filter(function (msg) {
+                return msg.chan !== channelName;
+            });
+            cb(err);
+        },
     });
 };

From 2d3ed84f5d7505f70614af32d9a07a739aba1fbf Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 14 May 2016 13:14:55 +0200
Subject: [PATCH 194/257] don't say you deleted database entries if you didn't

---
 NetfluxWebsocketSrv.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 48444f7ef..3d0d44d7f 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -69,7 +69,9 @@ dropUser = function (ctx, user) {
                 ctx.timeouts[chanName] = setTimeout(function () {
                     ctx.store.removeChannel(chanName, function (err) {
                         if (err) { console.error("[removeChannelErr]: %s", err); }
-                        console.log("Deleted channel [%s] history from database...", chanName);
+                        else {
+                            console.log("Deleted channel [%s] history from database...", chanName);
+                        }
                     });
                 }, ctx.config.channelRemovalTimeout);
             }

From 62dba6de7ba6a8616e666ff1182f7656430df1d4 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 14 May 2016 13:27:15 +0200
Subject: [PATCH 195/257] add specific complaints for removeChannel's
 non-existence

---
 NetfluxWebsocketSrv.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 3d0d44d7f..8ce1ab442 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -65,15 +65,20 @@ dropUser = function (ctx, user) {
 
             /*  Call removeChannel if it is a function and channel removal is
                 set to true in the config file */
-            if (ctx.config.removeChannels && typeof(ctx.store.removeChannel) === 'function') {
-                ctx.timeouts[chanName] = setTimeout(function () {
-                    ctx.store.removeChannel(chanName, function (err) {
-                        if (err) { console.error("[removeChannelErr]: %s", err); }
-                        else {
-                            console.log("Deleted channel [%s] history from database...", chanName);
-                        }
-                    });
-                }, ctx.config.channelRemovalTimeout);
+            if (ctx.config.removeChannels) {
+                if (typeof(ctx.store.removeChannel) === 'function') {
+                    ctx.timeouts[chanName] = setTimeout(function () {
+                        ctx.store.removeChannel(chanName, function (err) {
+                            if (err) { console.error("[removeChannelErr]: %s", err); }
+                            else {
+                                console.log("Deleted channel [%s] history from database...", chanName);
+                            }
+                        });
+                    }, ctx.config.channelRemovalTimeout);
+                } else {
+                    console.error("You have configured your server to remove empty channels, " +
+                        "however, the database adaptor you are using has not implemented this behaviour.");
+                }
             }
         } else {
             sendChannelMessage(ctx, chan, [user.id, 'LEAVE', chanName, 'Quit: [ dropUser() ]']);

From 9c15a43268c09b7b578b36e117c219aa2fd332a4 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 14 May 2016 13:50:25 +0200
Subject: [PATCH 196/257] add removeChannel documentation to storage/README

---
 storage/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/storage/README.md b/storage/README.md
index 3c854d00c..7f406cf94 100644
--- a/storage/README.md
+++ b/storage/README.md
@@ -42,6 +42,12 @@ This function accepts the name of the channel in which the user is interested, t
 It is only implemented within the leveldb adaptor, making our latest code incompatible with the other back ends.
 While we migrate to our new Netflux API, only the leveldb adaptor will be supported.
 
+## removeChannel(channelName, callback)
+
+This method is called (optionally, see config.js.dist for more info) some amount of time after the last client in a channel disconnects.
+
+It should remove any history of that channel, and execute a callback which takes an error message as an argument.
+
 ## Documenting your adaptor
 
 Naturally, you should comment your code well before making a PR.

From 39fcd7dc4cc429e7edc43a6d38a91800321d7fff Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 17 May 2016 16:55:47 +0200
Subject: [PATCH 197/257] more specific filtering for magicline plugin

to avoid false positives for other things which are non-contenteditable spans
---
 www/pad/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index f9a5521bf..712d6e574 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -48,7 +48,9 @@ define([
     var isNotMagicLine = function (el) {
         // factor as:
         // return !(el.tagName === 'SPAN' && el.contentEditable === 'false');
-        var filter = (el.tagName === 'SPAN' && el.getAttribute('contentEditable') === 'false');
+        var filter = (el.tagName === 'SPAN' &&
+            el.getAttribute('contentEditable') === 'false' &&
+            /position:absolute;border-top:1px dashed/.test(ml.getAttribute('style')));
         if (filter) {
             console.log("[hyperjson.serializer] prevented an element" +
                 "from being serialized:", el);

From 0c89443c1b68a142090e296284475a313a0906ca Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 17 May 2016 17:22:18 +0200
Subject: [PATCH 198/257] fix typo

---
 www/pad/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 712d6e574..b257fc82f 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -50,7 +50,7 @@ define([
         // return !(el.tagName === 'SPAN' && el.contentEditable === 'false');
         var filter = (el.tagName === 'SPAN' &&
             el.getAttribute('contentEditable') === 'false' &&
-            /position:absolute;border-top:1px dashed/.test(ml.getAttribute('style')));
+            /position:absolute;border-top:1px dashed/.test(el.getAttribute('style')));
         if (filter) {
             console.log("[hyperjson.serializer] prevented an element" +
                 "from being serialized:", el);

From baf523e9a5bea598168802cc35432c82bf65359c Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 19 May 2016 12:20:05 +0200
Subject: [PATCH 199/257] add new functionality from xwiki development

---
 www/form/main.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/www/form/main.js b/www/form/main.js
index d4bddf767..7845ef582 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -57,6 +57,9 @@ define([
         var id = uid();
         var type = getInputType($this);
 
+        // ignore hidden elements
+        if (type === 'hidden') { return; }
+
         $this   // give each element a uid
             .data('rtform-uid', id)
                 // get its type
@@ -144,10 +147,18 @@ define([
 
         console.log(userDoc);
 
+        // flush received values to the map
+        // but only if you don't have them locally
+        // this *shouldn't* break cursors
+        Object.keys(parsed).forEach(function (key) {
+            if (UI.ids.indexOf(key) === -1) { Map[key] = parsed[key]; }
+        });
+
         UI.each(function (ui, i, list) {
             var newval = parsed[ui.id];
             var oldval = ui.value();
 
+            if (typeof(newval) === 'undefined') { return; }
             if (newval === oldval) { return; }
 
             var op;

From 297d8c2d44d59d3558d89d62a8f1849115523fe3 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 20 May 2016 13:39:40 +0200
Subject: [PATCH 200/257] reformat code for jshint compliance

---
 www/code/main.js | 76 ++++++++++++++++++++++++------------------------
 www/form/main.js | 21 ++++++-------
 www/pad/main.js  |  2 +-
 3 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/www/code/main.js b/www/code/main.js
index 867f47147..2a9aac661 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -76,6 +76,41 @@ define([
               myUserName = myID;
             };
 
+            var config = {
+                //initialState: Messages.codeInitialState,
+                userName: userName,
+                websocketURL: Config.websocketURL,
+                channel: channel,
+                cryptKey: key,
+                crypto: Crypto,
+                setMyID: setMyID,
+                transformFunction: JsonOT.validate
+            };
+
+            var canonicalize = function (t) { return t.replace(/\r\n/g, '\n'); };
+
+            var initializing = true;
+
+            var onLocal = config.onLocal = function () {
+                if (initializing) { return; }
+
+                editor.save();
+                var textValue = canonicalize($textarea.val());
+                var obj = {content: textValue};
+
+                // append the userlist to the hyperjson structure
+                obj.metadata = userList;
+
+                // stringify the json and send it into chainpad
+                var shjson = stringify(obj);
+
+                module.patchText(shjson);
+
+                if (module.realtime.getUserDoc() !== shjson) {
+                    console.error("realtime.getUserDoc() !== shjson");
+                }
+            };
+
             var createChangeName = function(id, $container) {
                 var buttonElmt = $container.find('#'+id)[0];
                 buttonElmt.addEventListener("click", function() {
@@ -95,21 +130,6 @@ define([
                 });
             };
 
-            var config = {
-                //initialState: Messages.codeInitialState,
-                userName: userName,
-                websocketURL: Config.websocketURL,
-                channel: channel,
-                cryptKey: key,
-                crypto: Crypto,
-                setMyID: setMyID,
-                transformFunction: JsonOT.validate
-            };
-
-            var canonicalize = function (t) { return t.replace(/\r\n/g, '\n'); };
-
-            var initializing = true;
-
             var onInit = config.onInit = function (info) {
                 var $bar = $('#pad-iframe')[0].contentWindow.$('#cme_toolbox');
                 toolbarList = info.userList;
@@ -130,7 +150,7 @@ define([
                   // Update the local user data
                   addToUserList(userData);
                 }
-            }
+            };
 
             var onReady = config.onReady = function (info) {
                 var realtime = module.realtime = info.realtime;
@@ -170,7 +190,7 @@ define([
                     }
                 }
                 return pos;
-            }
+            };
 
             var posToCursor = function(position, newText) {
                 var cursor = {
@@ -181,7 +201,7 @@ define([
                 cursor.line = textLines.length - 1;
                 cursor.ch = textLines[cursor.line].length;
                 return cursor;
-            }
+            };
 
             var onRemote = config.onRemote = function (info) {
                 if (initializing) { return; }
@@ -226,26 +246,6 @@ define([
                 }
             };
 
-            var onLocal = config.onLocal = function () {
-                if (initializing) { return; }
-
-                editor.save();
-                var textValue = canonicalize($textarea.val());
-                var obj = {content: textValue};
-
-                // append the userlist to the hyperjson structure
-                obj.metadata = userList;
-
-                // stringify the json and send it into chainpad
-                var shjson = stringify(obj);
-
-                module.patchText(shjson);
-
-                if (module.realtime.getUserDoc() !== shjson) {
-                    console.error("realtime.getUserDoc() !== shjson");
-                }
-            };
-
             var onAbort = config.onAbort = function (info) {
                 // inform of network disconnect
                 setEditable(false);
diff --git a/www/form/main.js b/www/form/main.js
index 7845ef582..3d9d6e263 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -33,7 +33,7 @@ define([
     var uid = module.uid = Formula.uid;
 
     var getInputType = Formula.getInputType;
-    var $elements = module.elements = $('input, select, textarea')
+    var $elements = module.elements = $('input, select, textarea');
 
     var eventsByType = Formula.eventsByType;
 
@@ -128,6 +128,12 @@ define([
         });
     };
 
+    var readValues = function () {
+        UI.each(function (ui, i, list) {
+            Map[ui.id] = ui.value();
+        });
+    };
+
     var onLocal = config.onLocal = function () {
         if (initializing) { return; }
         /* serialize local changes */
@@ -135,12 +141,6 @@ define([
         module.patchText(Sortify(Map));
     };
 
-    var readValues = function () {
-        UI.each(function (ui, i, list) {
-            Map[ui.id] = ui.value();
-        });
-    };
-
     var updateValues = function () {
         var userDoc = module.realtime.getUserDoc();
         var parsed = JSON.parse(userDoc);
@@ -162,10 +162,11 @@ define([
             if (newval === oldval) { return; }
 
             var op;
+            var selects;
             var element = ui.element;
             if (ui.preserveCursor) {
                 op = TextPatcher.diff(oldval, newval);
-                var selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
+                selects = ['selectionStart', 'selectionEnd'].map(function (attr) {
                     var before = element[attr];
                     var after = TextPatcher.transformCursor(element[attr], op);
                     return after;
@@ -175,8 +176,8 @@ define([
             ui.value(newval);
             ui.update();
 
-            if (op) {
-                console.log(selects);
+            if (op && ui.preserveCursor) {
+                //console.log(selects);
                 element.selectionStart = selects[0];
                 element.selectionEnd = selects[1];
             }
diff --git a/www/pad/main.js b/www/pad/main.js
index b257fc82f..c2f2d3f65 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -295,7 +295,7 @@ define([
                   addToUserList(userData);
                   hjson.pop();
                 }
-            }
+            };
 
             var onRemote = realtimeOptions.onRemote = function (info) {
                 if (initializing) { return; }

From 976a08cc7a0a92383c52329db46f3dc854006f7e Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 20 May 2016 16:34:55 +0200
Subject: [PATCH 201/257] move to chainpad version 2

---
 www/common/chainpad.js       | 325 ++++++++++-------------------------
 www/common/crypto.js         |  28 +--
 www/common/netflux-client.js |   2 +-
 www/common/realtime-input.js |  73 +++-----
 4 files changed, 117 insertions(+), 311 deletions(-)

diff --git a/www/common/chainpad.js b/www/common/chainpad.js
index c54189ca5..8d9ec786b 100644
--- a/www/common/chainpad.js
+++ b/www/common/chainpad.js
@@ -435,38 +435,20 @@ var REGISTER     = Message.REGISTER     = 0;
 var REGISTER_ACK = Message.REGISTER_ACK = 1;
 var PATCH        = Message.PATCH        = 2;
 var DISCONNECT   = Message.DISCONNECT   = 3;
-var PING         = Message.PING         = 4;
-var PONG         = Message.PONG         = 5;
 
 var check = Message.check = function(msg) {
     Common.assert(msg.type === 'Message');
-    Common.assert(typeof(msg.userName) === 'string');
-    Common.assert(typeof(msg.authToken) === 'string');
-    Common.assert(typeof(msg.channelId) === 'string');
-
     if (msg.messageType === PATCH) {
         Patch.check(msg.content);
         Common.assert(typeof(msg.lastMsgHash) === 'string');
-    } else if (msg.messageType === PING || msg.messageType === PONG) {
-        Common.assert(typeof(msg.lastMsgHash) === 'undefined');
-        Common.assert(typeof(msg.content) === 'number');
-    } else if (msg.messageType === REGISTER
-        || msg.messageType === REGISTER_ACK
-        || msg.messageType === DISCONNECT)
-    {
-        Common.assert(typeof(msg.lastMsgHash) === 'undefined');
-        Common.assert(typeof(msg.content) === 'undefined');
     } else {
         throw new Error("invalid message type [" + msg.messageType + "]");
     }
 };
 
-var create = Message.create = function (userName, authToken, channelId, type, content, lastMsgHash) {
+var create = Message.create = function (type, content, lastMsgHash) {
     var msg = {
         type: 'Message',
-        userName: userName,
-        authToken: authToken,
-        channelId: channelId,
         messageType: type,
         content: content,
         lastMsgHash: lastMsgHash
@@ -477,62 +459,67 @@ var create = Message.create = function (userName, authToken, channelId, type, co
 
 var toString = Message.toString = function (msg) {
     if (Common.PARANOIA) { check(msg); }
-    var prefix = msg.messageType + ':';
-    var content = '';
-    if (msg.messageType === REGISTER) {
-        content = JSON.stringify([REGISTER]);
-    } else if (msg.messageType === PING || msg.messageType === PONG) {
-        content = JSON.stringify([msg.messageType, msg.content]);
-    } else if (msg.messageType === PATCH) {
-        content = JSON.stringify([PATCH, Patch.toObj(msg.content), msg.lastMsgHash]);
-    }
-    return msg.authToken.length + ":" + msg.authToken +
-        msg.userName.length + ":" + msg.userName +
-        msg.channelId.length + ":" + msg.channelId +
-        content.length + ':' + content;
+
+    if (msg.messageType === PATCH) {
+        return JSON.stringify([PATCH, Patch.toObj(msg.content), msg.lastMsgHash]);
+    } else {
+        throw new Error();
+    }
+};
+
+var discardBencode = function (msg, arr) {
+    var len = msg.substring(0,msg.indexOf(':'));
+    msg = msg.substring(len.length+1);
+    var value = msg.substring(0,Number(len));
+    msg = msg.substring(value.length);
+
+    if (arr) { arr.push(value); }
+    return msg;
 };
 
 var fromString = Message.fromString = function (str) {
     var msg = str;
 
-    var unameLen = msg.substring(0,msg.indexOf(':'));
-    msg = msg.substring(unameLen.length+1);
-    var userName = msg.substring(0,Number(unameLen));
-    msg = msg.substring(userName.length);
-
-    var channelIdLen = msg.substring(0,msg.indexOf(':'));
-    msg = msg.substring(channelIdLen.length+1);
-    var channelId = msg.substring(0,Number(channelIdLen));
-    msg = msg.substring(channelId.length);
+    if (str.charAt(0) === '[') {
+        var m = JSON.parse(str);
+        return create(m[0], Patch.fromObj(m[1]), m[2]);
+    } else {
+        /*  Just in case we receive messages in the old format,
+            we should try to parse them. We only need the content, though,
+            so just extract that and throw the rest away */
+        var last;
+        var parts = [];
+
+        // chop off all the bencoded components
+        while (msg) {
+            msg = discardBencode(msg, parts);
+        }
 
-    var contentStrLen = msg.substring(0,msg.indexOf(':'));
-    msg = msg.substring(contentStrLen.length+1);
-    var contentStr = msg.substring(0,Number(contentStrLen));
+        // grab the last component from the parts
+        // we don't need anything else
+        var contentStr = parts.slice(-1)[0];
+
+        var content = JSON.parse(contentStr);
+        var message;
+        if (content[0] === PATCH) {
+            message = create(userName, PATCH, Patch.fromObj(content[1]), content[2]);
+        } else if ([4,5].indexOf(content[0]) !== -1 /* === PING || content[0] === PONG*/) {
+            // it's a ping or pong, which we don't want to support anymore
+            message = create(userName, content[0], content[1]);
+        } else {
+            message = create(userName, content[0]);
+        }
 
-    Common.assert(contentStr.length === Number(contentStrLen));
+        // This check validates every operation in the patch.
+        check(message);
 
-    var content = JSON.parse(contentStr);
-    var message;
-    if (content[0] === PATCH) {
-        message = create(userName, '', channelId, PATCH, Patch.fromObj(content[1]), content[2]);
-    } else if (content[0] === PING || content[0] === PONG) {
-        message = create(userName, '', channelId, content[0], content[1]);
-    } else {
-        message = create(userName, '', channelId, content[0]);
+        return message
     }
-
-    // This check validates every operation in the patch.
-    check(message);
-
-    return message
 };
 
 var hashOf = Message.hashOf = function (msg) {
     if (Common.PARANOIA) { check(msg); }
-    var authToken = msg.authToken;
-    msg.authToken = '';
     var hash = Sha.hex_sha256(toString(msg));
-    msg.authToken = authToken;
     return hash;
 };
 
@@ -554,10 +541,10 @@ var hashOf = Message.hashOf = function (msg) {
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see .
  */
-var Common = require('./Common');
+var Common = module.exports.Common = require('./Common');
 var Operation = module.exports.Operation = require('./Operation');
-var Patch = require('./Patch');
-var Message = require('./Message');
+var Patch = module.exports.Patch = require('./Patch');
+var Message = module.exports.Message = require('./Message');
 var Sha = module.exports.Sha = require('./SHA256');
 
 var ChainPad = {};
@@ -634,12 +621,7 @@ var sync = function (realtime) {
     if (realtime.best === realtime.initialMessage) {
         msg = realtime.initialMessage;
     } else {
-        msg = Message.create(realtime.userName,
-                             realtime.authToken,
-                             realtime.channelId,
-                             Message.PATCH,
-                             realtime.uncommitted,
-                             realtime.best.hashOf);
+        msg = Message.create(Message.PATCH, realtime.uncommitted, realtime.best.hashOf);
     }
 
     var strMsg = Message.toString(msg);
@@ -647,6 +629,8 @@ var sync = function (realtime) {
     onMessage(realtime, strMsg, function (err) {
         if (err) {
             debug(realtime, "Posting to server failed [" + err + "]");
+        } else {
+            handleMessage(realtime, strMsg, true);
         }
     });
 
@@ -670,46 +654,9 @@ var sync = function (realtime) {
     if (Common.PARANOIA) { check(realtime); }
 };
 
-var getMessages = function (realtime) {
-    realtime.registered = true;
-    /*var to = schedule(realtime, function () {
-        throw new Error("failed to connect to the server");
-    }, 5000);*/
-    var msg = Message.create(realtime.userName,
-                             realtime.authToken,
-                             realtime.channelId,
-                             Message.REGISTER);
-    onMessage(realtime, Message.toString(msg), function (err) {
-        if (err) { throw err; }
-    });
-};
-
-var sendPing = function (realtime) {
-    realtime.pingSchedule = undefined;
-    realtime.lastPingTime = (new Date()).getTime();
-    var msg = Message.create(realtime.userName,
-                             realtime.authToken,
-                             realtime.channelId,
-                             Message.PING,
-                             realtime.lastPingTime);
-    onMessage(realtime, Message.toString(msg), function (err) {
-        if (err) { throw err; }
-    });
-};
-
-var onPong = function (realtime, msg) {
-    if (Common.PARANOIA) {
-        Common.assert(realtime.lastPingTime === Number(msg.content));
-    }
-    realtime.lastPingLag = (new Date()).getTime() - Number(msg.content);
-    realtime.lastPingTime = 0;
-    realtime.pingSchedule =
-        schedule(realtime, function () { sendPing(realtime); }, realtime.pingCycle);
-};
-
-var create = ChainPad.create = function (userName, authToken, channelId, initialState, config) {
-
+var create = ChainPad.create = function (config) {
     config = config || {};
+    var initialState = config.initialState || '';
 
     var realtime = {
         type: 'ChainPad',
@@ -720,10 +667,6 @@ var create = ChainPad.create = function (userName, authToken, channelId, initial
 
         logLevel: typeof(config.logLevel) !== 'undefined'? config.logLevel: 1,
 
-        userName: userName,
-        authToken: authToken,
-        channelId: channelId,
-
         /** A patch representing all uncommitted work. */
         uncommitted: null,
 
@@ -755,23 +698,13 @@ var create = ChainPad.create = function (userName, authToken, channelId, initial
 
         rootMessage: null,
 
+        userName: config.userName || 'anonymous',
+
         /**
          * Set to the message which sets the initialState if applicable.
          * Reset to null after the initial message has been successfully broadcasted.
          */
         initialMessage: null,
-
-        userListChangeHandlers: [],
-        userList: [],
-
-        /** The schedule() for sending pings. */
-        pingSchedule: undefined,
-
-        lastPingLag: 0,
-        lastPingTime: 0,
-
-        /** Average number of milliseconds between pings. */
-        pingCycle: 5000
     };
 
     if (Common.PARANOIA) {
@@ -781,7 +714,7 @@ var create = ChainPad.create = function (userName, authToken, channelId, initial
     var zeroPatch = Patch.create(EMPTY_STR_HASH);
     zeroPatch.inverseOf = Patch.invert(zeroPatch, '');
     zeroPatch.inverseOf.inverseOf = zeroPatch;
-    var zeroMsg = Message.create('', '', channelId, Message.PATCH, zeroPatch, ZERO);
+    var zeroMsg = Message.create(Message.PATCH, zeroPatch, ZERO);
     zeroMsg.hashOf = Message.hashOf(zeroMsg);
     zeroMsg.parentCount = 0;
     realtime.messages[zeroMsg.hashOf] = zeroMsg;
@@ -810,14 +743,10 @@ var create = ChainPad.create = function (userName, authToken, channelId, initial
     if (Common.PARANOIA) {
         realtime.userInterfaceContent = initialState;
     }
-    initialMessage = Message.create(realtime.userName,
-                                    realtime.authToken,
-                                    realtime.channelId,
-                                    Message.PATCH,
-                                    initialStatePatch,
-                                    zeroMsg.hashOf);
+    initialMessage = Message.create(Message.PATCH, initialStatePatch, zeroMsg.hashOf);
     initialMessage.hashOf = Message.hashOf(initialMessage);
     initialMessage.parentCount = 1;
+    initialMessage.isFromMe = true;
 
     realtime.messages[initialMessage.hashOf] = initialMessage;
     (realtime.messagesByParent[initialMessage.lastMessageHash] || []).push(initialMessage);
@@ -887,8 +816,10 @@ var parentCount = function (realtime, message) {
     return message.parentCount;
 };
 
-var applyPatch = function (realtime, author, patch) {
-    if (author === realtime.userName && !patch.isInitialStatePatch) {
+var applyPatch = function (realtime, isFromMe, patch) {
+    Common.assert(patch);
+    Common.assert(patch.inverseOf);
+    if (isFromMe && !patch.isInitialStatePatch) {
         var inverseOldUncommitted = Patch.invert(realtime.uncommitted, realtime.authDoc);
         var userInterfaceContent = Patch.apply(realtime.uncommitted, realtime.authDoc);
         if (Common.PARANOIA) {
@@ -907,12 +838,14 @@ var applyPatch = function (realtime, author, patch) {
     realtime.authDoc = Patch.apply(patch, realtime.authDoc);
 
     if (Common.PARANOIA) {
+        Common.assert(realtime.uncommitted.parentHash === patch.inverseOf.parentHash);
+        Common.assert(Sha.hex_sha256(realtime.authDoc) === realtime.uncommitted.parentHash);
         realtime.userInterfaceContent = Patch.apply(realtime.uncommitted, realtime.authDoc);
     }
 };
 
-var revertPatch = function (realtime, author, patch) {
-    applyPatch(realtime, author, patch.inverseOf);
+var revertPatch = function (realtime, isFromMe, patch) {
+    applyPatch(realtime, isFromMe, patch.inverseOf);
 };
 
 var getBestChild = function (realtime, msg) {
@@ -925,55 +858,23 @@ var getBestChild = function (realtime, msg) {
     return best;
 };
 
-var userListChange = function (realtime) {
-    for (var i = 0; i < realtime.userListChangeHandlers.length; i++) {
-        var list = [];
-        list.push.apply(list, realtime.userList);
-        realtime.userListChangeHandlers[i](list);
-    }
-};
-
-var handleMessage = ChainPad.handleMessage = function (realtime, msgStr) {
+var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromMe) {
 
     if (Common.PARANOIA) { check(realtime); }
     var msg = Message.fromString(msgStr);
-    Common.assert(msg.channelId === realtime.channelId);
-
-    if (msg.messageType === Message.REGISTER_ACK) {
-        debug(realtime, "registered");
-        realtime.registered = true;
-        sendPing(realtime);
-        return;
-    }
-
-    if (msg.messageType === Message.REGISTER) {
-        realtime.userList.push(msg.userName);
-        userListChange(realtime);
-        return;
-    }
 
-    if (msg.messageType === Message.PONG) {
-        onPong(realtime, msg);
-        return;
-    }
-
-    if (msg.messageType === Message.DISCONNECT) {
-        if (msg.userName === '') {
-            realtime.userList = [];
-            userListChange(realtime);
-            return;
-        }
-        var idx = realtime.userList.indexOf(msg.userName);
-        if (Common.PARANOIA) { Common.assert(idx > -1); }
-        if (idx > -1) {
-            realtime.userList.splice(idx, 1);
-            userListChange(realtime);
-        }
+    // These are all deprecated message types
+    if (['REGISTER', 'PONG', 'DISCONNECT'].map(function (x) {
+        return Message[x];
+    }).indexOf(msg.messageType) !== -1) {
+        console.log("Deprecated message type: [%s]", msg.messageType);
         return;
     }
 
     // otherwise it's a disconnect.
-    if (msg.messageType !== Message.PATCH) { return; }
+    if (msg.messageType !== Message.PATCH) {
+        console.error("disconnect");
+        return; }
 
     msg.hashOf = Message.hashOf(msg);
 
@@ -1002,6 +903,7 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr) {
     // of this message fills in a hole in the chain which makes another patch better, swap to the
     // best child of this patch since longest chain always wins.
     msg = getBestChild(realtime, msg);
+    msg.isFromMe = isFromMe;
     var patch = msg.content;
 
     // Find the ancestor of this patch which is in the main chain, reverting as necessary
@@ -1040,6 +942,7 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr) {
     var authDocAtTimeOfPatch = realtime.authDoc;
 
     for (var i = 0; i < toRevert.length; i++) {
+        Common.assert(typeof(toRevert[i].content.inverseOf) !== 'undefined');
         authDocAtTimeOfPatch = Patch.apply(toRevert[i].content.inverseOf, authDocAtTimeOfPatch);
     }
 
@@ -1086,13 +989,13 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr) {
     for (var i = 0; i < toRevert.length; i++) {
         debug(realtime, "reverting [" + toRevert[i].hashOf + "]");
         uncommittedPatch = Patch.merge(uncommittedPatch, toRevert[i].content.inverseOf);
-        revertPatch(realtime, toRevert[i].userName, toRevert[i].content);
+        revertPatch(realtime, toRevert[i].isFromMe, toRevert[i].content);
     }
 
     for (var i = 0; i < toApply.length; i++) {
         debug(realtime, "applying [" + toApply[i].hashOf + "]");
         uncommittedPatch = Patch.merge(uncommittedPatch, toApply[i].content);
-        applyPatch(realtime, toApply[i].userName, toApply[i].content);
+        applyPatch(realtime, toApply[i].isFromMe, toApply[i].content);
     }
 
     uncommittedPatch = Patch.merge(uncommittedPatch, realtime.uncommitted);
@@ -1125,22 +1028,6 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr) {
     if (Common.PARANOIA) { check(realtime); }
 };
 
-var wasEverState = function (content, realtime) {
-    Common.assert(typeof(content) === 'string');
-    // without this we would never get true on the ^HEAD
-    if (realtime.authDoc === content) {
-        return true;
-    }
-
-    var hash = Sha.hex_sha256(content);
-
-    var patchMsg = realtime.best;
-    do {
-        if (patchMsg.content.parentHash === hash) { return true; }
-    } while ((patchMsg = getParent(realtime, patchMsg)));
-    return false;
-};
-
 var getDepthOfState = function (content, minDepth, realtime) {
     Common.assert(typeof(content) === 'string');
 
@@ -1169,47 +1056,29 @@ var getDepthOfState = function (content, minDepth, realtime) {
         }
         depth++;
     } while ((patchMsg = getParent(realtime, patchMsg)));
-    return;
+    return -1;
 };
 
-module.exports.create = function (userName, authToken, channelId, initialState, conf) {
-    Common.assert(typeof(userName) === 'string');
-    Common.assert(typeof(authToken) === 'string');
-    Common.assert(typeof(channelId) === 'string');
-    Common.assert(typeof(initialState) === 'string');
-    var realtime = ChainPad.create(userName, authToken, channelId, initialState, conf);
+module.exports.create = function (conf) {
+    var realtime = ChainPad.create(conf);
     return {
         onPatch: enterChainPad(realtime, function (handler) {
             Common.assert(typeof(handler) === 'function');
             realtime.patchHandlers.push(handler);
         }),
-        onRemove: enterChainPad(realtime, function (handler) {
-            Common.assert(typeof(handler) === 'function');
-            realtime.opHandlers.unshift(function (op) {
-                if (op.toRemove > 0) { handler(op.offset, op.toRemove); }
-            });
-        }),
-        onInsert: enterChainPad(realtime, function (handler) {
-            Common.assert(typeof(handler) === 'function');
-            realtime.opHandlers.push(function (op) {
-                if (op.toInsert.length > 0) { handler(op.offset, op.toInsert); }
-            });
-        }),
-        remove: enterChainPad(realtime, function (offset, numChars) {
-            doOperation(realtime, Operation.create(offset, numChars, ''));
-        }),
-        insert: enterChainPad(realtime, function (offset, str) {
-            doOperation(realtime, Operation.create(offset, 0, str));
+
+        patch: enterChainPad(realtime, function (offset, count, chars) {
+            doOperation(realtime, Operation.create(offset, count, chars));
         }),
+
         onMessage: enterChainPad(realtime, function (handler) {
             Common.assert(typeof(handler) === 'function');
             realtime.messageHandlers.push(handler);
         }),
         message: enterChainPad(realtime, function (message) {
-            handleMessage(realtime, message);
+            handleMessage(realtime, message, false);
         }),
         start: enterChainPad(realtime, function () {
-            getMessages(realtime);
             if (realtime.syncSchedule) { unschedule(realtime, realtime.syncSchedule); }
             realtime.syncSchedule = schedule(realtime, function () { sync(realtime); });
         }),
@@ -1221,19 +1090,7 @@ module.exports.create = function (userName, authToken, channelId, initialState,
         }),
         getAuthDoc: function () { return realtime.authDoc; },
         getUserDoc: function () { return Patch.apply(realtime.uncommitted, realtime.authDoc); },
-        onUserListChange: enterChainPad(realtime, function (handler) {
-            Common.assert(typeof(handler) === 'function');
-            realtime.userListChangeHandlers.push(handler);
-        }),
-        getLag: function () {
-            if (realtime.lastPingTime) {
-                return { waiting:1, lag: (new Date()).getTime() - realtime.lastPingTime };
-            }
-            return { waiting:0, lag: realtime.lastPingLag };
-        },
-        wasEverState: function (content) {
-            return wasEverState(content, realtime);
-        },
+
         getDepthOfState: function (content, minDepth) {
             return getDepthOfState(content, minDepth, realtime);
         }
diff --git a/www/common/crypto.js b/www/common/crypto.js
index aa4f0b68d..dd6f826bd 100644
--- a/www/common/crypto.js
+++ b/www/common/crypto.js
@@ -22,36 +22,12 @@ define([
         return Nacl.util.encodeUTF8(unpacked);
     };
 
-    // this is crap because of bencoding messages... it should go away....
-    var splitMessage = function (msg, sending) {
-        var idx = 0;
-        var nl;
-        for (var i = ((sending) ? 0 : 1); i < 3; i++) {
-            nl = msg.indexOf(':',idx);
-            idx = nl + Number(msg.substring(idx,nl)) + 1;
-        }
-        return [ msg.substring(0,idx), msg.substring(msg.indexOf(':',idx) + 1) ];
-    };
-
     var encrypt = module.exports.encrypt = function (msg, key) {
-        var spl = splitMessage(msg, true);
-        var json = JSON.parse(spl[1]);
-        // non-patches are not encrypted.
-        if (json[0] !== 2) { return msg; }
-        json[1] = encryptStr(JSON.stringify(json[1]), key);
-        var res = JSON.stringify(json);
-        return spl[0] + res.length + ':' + res;
+        return encryptStr(msg, key);
     };
 
     var decrypt = module.exports.decrypt = function (msg, key) {
-        var spl = splitMessage(msg, false);
-        var json = JSON.parse(spl[1]);
-        // non-patches are not encrypted.
-        if (json[0] !== 2) { return msg; }
-        if (typeof(json[1]) !== 'string') { throw new Error(); }
-        json[1] = JSON.parse(decryptStr(json[1], key));
-        var res = JSON.stringify(json);
-        return spl[0] + res.length + ':' + res;
+        return decryptStr(msg, key);
     };
 
     var parseKey = module.exports.parseKey = function (str) {
diff --git a/www/common/netflux-client.js b/www/common/netflux-client.js
index 83dadcf5c..b9165bf37 100644
--- a/www/common/netflux-client.js
+++ b/www/common/netflux-client.js
@@ -288,4 +288,4 @@ define(function () {
     };
 
     return { connect: connect };
-});
\ No newline at end of file
+});
diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 95759d757..209c7e532 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -37,6 +37,8 @@ define([
         verbose = function (x) { console.log(x); };
     verbose = function () {}; // comment out to enable verbose logging
 
+    var unBencode = function (str) { return str.replace(/^\d+:/, ''); };
+
     var start = module.exports.start =
         function (config)
     {
@@ -59,27 +61,7 @@ define([
         var realtime;
 
         var parseMessage = function (msg) {
-            var res ={};
-            // two or more? use a for
-            ['pass','user','channelId','content'].forEach(function(attr){
-                var len=msg.slice(0,msg.indexOf(':')),
-                // taking an offset lets us slice out the prop
-                // and saves us one string copy
-                    o=len.length+1,
-                    prop=res[attr]=msg.slice(o,Number(len)+o);
-                // slice off the property and its descriptor
-                msg = msg.slice(prop.length+o);
-            });
-            // content is the only attribute that's not a string
-            res.content=JSON.parse(res.content);
-            return res;
-        };
-
-        var mkMessage = function (user, chan, content) {
-            content = JSON.stringify(content);
-            return user.length + ':' + user +
-                chan.length + ':' + chan +
-                content.length + ':' + content;
+            return unBencode(msg);//.slice(msg.indexOf(':[') + 1);
         };
 
         var userList = {
@@ -137,6 +119,12 @@ define([
                     config.onLocal();
                 }
             }
+
+            // slice off the bencoded header
+            // Why are we getting bencoded stuff to begin with?
+            // FIXME this shouldn't be necessary
+            message = unBencode(message);//.slice(message.indexOf(':[') + 1);
+
             // pass the message into Chainpad
             realtime.message(message);
         };
@@ -154,10 +142,7 @@ define([
         // shim between chainpad and netflux
         chainpadAdapter = {
             msgIn : function(peerId, msg) {
-                var parsed = parseMessage(msg);
-                // Remove the password from the message
-                var passLen = msg.substring(0,msg.indexOf(':'));
-                var message = msg.substring(passLen.length+1 + Number(passLen));
+                var message = parseMessage(msg);
                 try {
                     var decryptedMsg = Crypto.decrypt(message, cryptKey);
                     messagesHistory.push(decryptedMsg);
@@ -166,33 +151,24 @@ define([
                     console.error(err);
                     return message;
                 }
-
             },
             msgOut : function(msg, wc) {
-                var parsed = parseMessage(msg);
-                if(parsed.content[0] === 0) { // We're registering : send a REGISTER_ACK to Chainpad
-                    onMessage('', '1:y'+mkMessage('', channel, [1,0]));
-                    return;
-                }
-                if(parsed.content[0] === 4) { // PING message from Chainpad
-                    parsed.content[0] = 5;
-                    onMessage('', '1:y'+mkMessage(parsed.user, parsed.channelId, parsed.content));
-                    // wc.sendPing();
-                    return;
+                try {
+                    return Crypto.encrypt(msg, cryptKey);
+                } catch (err) {
+                    console.log(msg);
+                    throw err;
                 }
-                return Crypto.encrypt(msg, cryptKey);
             }
         };
 
         var createRealtime = function(chan) {
-            return ChainPad.create(userName,
-                                        passwd,
-                                        channel,
-                                        config.initialState || '',
-                                        {
-                                        transformFunction: config.transformFunction,
-                                        logLevel: typeof(config.logLevel) !== 'undefined'? config.logLevel : 1
-                                        });
+            return ChainPad.create({
+                userName: userName,
+                initialState: config.initialState,
+                transformFunction: config.transformFunction,
+                logLevel: typeof(config.logLevel) !== 'undefined'? config.logLevel : 1
+            });
         };
 
 
@@ -225,13 +201,12 @@ define([
             }
 
             // Sending a message...
-            realtime.onMessage(function(message) {
+            realtime.onMessage(function(message, cb) {
                 // Filter messages sent by Chainpad to make it compatible with Netflux
                 message = chainpadAdapter.msgOut(message, wc);
                 if(message) {
                   wc.bcast(message).then(function() {
-                    // Send the message back to Chainpad once it is sent to the recipients.
-                    onMessage(wc.myID, message);
+                    cb();
                   }, function(err) {
                     // The message has not been sent, display the error.
                     console.error(err);
@@ -283,8 +258,6 @@ define([
             // pass messages that come out of netflux into our local handler
 
             network.on('disconnect', function (evt) {
-                // TODO also abort if Netflux times out
-                // that will be managed in Netflux-client.js
                 if (config.onAbort) {
                     config.onAbort({
                         reason: evt.reason

From f04be53d113f97293117eafcb16795b4218f375a Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 20 May 2016 16:45:25 +0200
Subject: [PATCH 202/257] fall back to old parsing if the message is bencoded?

---
 www/common/crypto.js | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/www/common/crypto.js b/www/common/crypto.js
index dd6f826bd..6c5e37aea 100644
--- a/www/common/crypto.js
+++ b/www/common/crypto.js
@@ -22,12 +22,46 @@ define([
         return Nacl.util.encodeUTF8(unpacked);
     };
 
+    var isBencoded = function (msg) {
+        return /^\d+:/;
+    };
+
+    // this is crap because of bencoding messages... it should go away....
+    var splitMessage = function (msg, sending) {
+        var idx = 0;
+        var nl;
+        for (var i = ((sending) ? 0 : 1); i < 3; i++) {
+            nl = msg.indexOf(':',idx);
+            idx = nl + Number(msg.substring(idx,nl)) + 1;
+        }
+        return [ msg.substring(0,idx), msg.substring(msg.indexOf(':',idx) + 1) ];
+    };
+
     var encrypt = module.exports.encrypt = function (msg, key) {
-        return encryptStr(msg, key);
+        if (!isBencoded(msg)) {
+            return encryptStr(msg, key);
+        }
+        var spl = splitMessage(msg, true);
+        var json = JSON.parse(spl[1]);
+        // non-patches are not encrypted.
+        if (json[0] !== 2) { return msg; }
+        json[1] = encryptStr(JSON.stringify(json[1]), key);
+        var res = JSON.stringify(json);
+        return spl[0] + res.length + ':' + res;
     };
 
     var decrypt = module.exports.decrypt = function (msg, key) {
-        return decryptStr(msg, key);
+        if (!isBencoded(msg)) {
+            return decryptStr(msg, key);
+        }
+        var spl = splitMessage(msg, false);
+        var json = JSON.parse(spl[1]);
+        // non-patches are not encrypted.
+        if (json[0] !== 2) { return msg; }
+        if (typeof(json[1]) !== 'string') { throw new Error(); }
+        json[1] = JSON.parse(decryptStr(json[1], key));
+        var res = JSON.stringify(json);
+        return spl[0] + res.length + ':' + res;
     };
 
     var parseKey = module.exports.parseKey = function (str) {

From d99bb8ff84372dcdf0b52b95fd2147810d4b9371 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 20 May 2016 17:46:48 +0200
Subject: [PATCH 203/257] WIP : fallback to old parsing doesn't work

---
 www/common/crypto.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/common/crypto.js b/www/common/crypto.js
index 6c5e37aea..708ee40a9 100644
--- a/www/common/crypto.js
+++ b/www/common/crypto.js
@@ -41,6 +41,10 @@ define([
         if (!isBencoded(msg)) {
             return encryptStr(msg, key);
         }
+
+        /*  Currently this fails because messages have already been tampered
+            with before they get here.  */
+
         var spl = splitMessage(msg, true);
         var json = JSON.parse(spl[1]);
         // non-patches are not encrypted.

From d942d999d5a3caa2be3d8c6dfbe3f65923dd20d9 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 25 May 2016 11:53:52 +0200
Subject: [PATCH 204/257] add Proxy polyfill to bower.json

---
 bower.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 0c819e0a4..537fda237 100644
--- a/bower.json
+++ b/bower.json
@@ -32,6 +32,7 @@
     "json.sortify": "~2.1.0",
     "fabric.js": "fabric#~1.6.0",
     "hyperjson": "~1.2.2",
-    "textpatcher": "^1.1.1"
+    "textpatcher": "^1.1.1",
+    "proxy-polyfill": "^0.1.5"
   }
 }

From cf85de61130e9442deaf953c3bf25b1fa8f210c2 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 25 May 2016 11:54:36 +0200
Subject: [PATCH 205/257] remove old bencoding code

---
 www/common/crypto.js | 42 ++----------------------------------------
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/www/common/crypto.js b/www/common/crypto.js
index 708ee40a9..dd6f826bd 100644
--- a/www/common/crypto.js
+++ b/www/common/crypto.js
@@ -22,50 +22,12 @@ define([
         return Nacl.util.encodeUTF8(unpacked);
     };
 
-    var isBencoded = function (msg) {
-        return /^\d+:/;
-    };
-
-    // this is crap because of bencoding messages... it should go away....
-    var splitMessage = function (msg, sending) {
-        var idx = 0;
-        var nl;
-        for (var i = ((sending) ? 0 : 1); i < 3; i++) {
-            nl = msg.indexOf(':',idx);
-            idx = nl + Number(msg.substring(idx,nl)) + 1;
-        }
-        return [ msg.substring(0,idx), msg.substring(msg.indexOf(':',idx) + 1) ];
-    };
-
     var encrypt = module.exports.encrypt = function (msg, key) {
-        if (!isBencoded(msg)) {
-            return encryptStr(msg, key);
-        }
-
-        /*  Currently this fails because messages have already been tampered
-            with before they get here.  */
-
-        var spl = splitMessage(msg, true);
-        var json = JSON.parse(spl[1]);
-        // non-patches are not encrypted.
-        if (json[0] !== 2) { return msg; }
-        json[1] = encryptStr(JSON.stringify(json[1]), key);
-        var res = JSON.stringify(json);
-        return spl[0] + res.length + ':' + res;
+        return encryptStr(msg, key);
     };
 
     var decrypt = module.exports.decrypt = function (msg, key) {
-        if (!isBencoded(msg)) {
-            return decryptStr(msg, key);
-        }
-        var spl = splitMessage(msg, false);
-        var json = JSON.parse(spl[1]);
-        // non-patches are not encrypted.
-        if (json[0] !== 2) { return msg; }
-        if (typeof(json[1]) !== 'string') { throw new Error(); }
-        json[1] = JSON.parse(decryptStr(json[1], key));
-        var res = JSON.stringify(json);
-        return spl[0] + res.length + ':' + res;
+        return decryptStr(msg, key);
     };
 
     var parseKey = module.exports.parseKey = function (str) {

From 774d349ec316e17053940392012e8e12a45b8447 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 25 May 2016 11:55:11 +0200
Subject: [PATCH 206/257] ignore hidden elements and submit buttons

---
 www/form/main.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/form/main.js b/www/form/main.js
index 3d9d6e263..f4e0fc751 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -57,8 +57,10 @@ define([
         var id = uid();
         var type = getInputType($this);
 
-        // ignore hidden elements
-        if (type === 'hidden') { return; }
+        // ignore hidden inputs, submit inputs, and buttons
+        if (['button', 'submit', 'hidden'].indexOf(type) !== -1) {
+            return;
+        }
 
         $this   // give each element a uid
             .data('rtform-uid', id)

From f61d06fa1814e5188312cbaa8366518830063ae7 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 25 May 2016 11:56:17 +0200
Subject: [PATCH 207/257] first commit for listmap prototype

---
 www/json/README.md  |  81 ++++++++++++++++++
 www/json/compare.js | 200 +++++++++++++++++++++++++++++++++++++++++++
 www/json/index.html |  51 +++++++++++
 www/json/main.js    | 204 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 536 insertions(+)
 create mode 100644 www/json/README.md
 create mode 100644 www/json/compare.js
 create mode 100644 www/json/index.html
 create mode 100644 www/json/main.js

diff --git a/www/json/README.md b/www/json/README.md
new file mode 100644
index 000000000..5beacac5c
--- /dev/null
+++ b/www/json/README.md
@@ -0,0 +1,81 @@
+# Realtime Lists and Maps
+
+Our realtime list/map API has some limitations.
+
+## Datatype Serialization
+
+Only datatypes which can be serialized via `JSON.parse(JSON.stringify(yourObject))` will be preserved.
+
+This means the following types can be serialized:
+
+1. strings
+2. objects
+3. arrays
+4. booleans
+5. numbers
+6. null
+
+While these cannot be serialized:
+
+1. undefined
+2. symbol
+
+## Object Interaction
+
+Only 'get' and 'set' methods are supported.
+This is because we need to limit the operations we support to those supported by all browsers we might use.
+
+Currently that means we can't rely on `in`, `delete`, or anything other than a `get`/`set` operation to behave as expected.
+Treat all other features as `Undefined Behaviour`.
+
+> Your mileage may vary
+
+`set` methods include all of the [assignment operators](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Assignment_Operators#Exponentiation_assignment).
+
+```
+// where 'x' is the realtime object `{}`
+
+// assignment
+x.n = 5;
+
+x.n += 3;
+x.n++;
+++x.n;
+
+x.a = 5;
+x.b = 3;
+x.a *= x.b++;
+x // {a: 15, b: 4, n: 10}
+```
+
+Instead of `delete`, assign `undefined`.
+`delete` will remove an attribute locally, but the deletion will not propogate to other clients until your next serialization.
+This is potentially problematic, as it can result in poorly formed patches.
+
+### Object and array methods
+
+methods which do not directly use setters and getters can be problematic:
+
+`Array.push` behaves correctly, however, `Array.pop` does not.
+
+
+## Deep Equality
+
+Normally in Javascript objects are passed by reference.
+That means you can do things like this:
+
+```
+var a = {x: 5};
+var b = a;
+
+// true
+console.log(a === b);
+```
+
+Using the realtime list/map API, objects are serialized, and are therefore copied by value.
+
+Since objects are deserialized and created on each client, you will not be able to rely on this kind of equality across objects, despite their having been created in this fashion.
+
+Object equality _might_ work if the comparison is performed on the same client that initially created the object, but relying on this kind of behaviour is not advisable.
+
+
diff --git a/www/json/compare.js b/www/json/compare.js
new file mode 100644
index 000000000..970bb0e4b
--- /dev/null
+++ b/www/json/compare.js
@@ -0,0 +1,200 @@
+define(function () {
+    var compare = {};
+
+    var isArray = compare.isArray = function (obj) {
+        return Object.prototype.toString.call(obj)==='[object Array]'
+    };
+
+    var type = compare.type = function (dat) {
+        return dat === null?
+            'null':
+            isArray(dat)?'array': typeof(dat);
+    };
+
+    /*  compare objects A and B, where A is the _older_ of the two */
+    compare.objects = function (A, B, f, path) {
+        var Akeys = Object.keys(A);
+        var Bkeys = Object.keys(B);
+
+        console.log("inspecting path [%s]", path.join(','));
+
+        /*  iterating over the keys in B will tell you if a new key exists
+            it will not tell you if a key has been removed.
+            to accomplish that you will need to iterate over A's keys */
+        Bkeys.forEach(function (b) {
+            console.log(b);
+            if (Akeys.indexOf(b) === -1) {
+                // there was an insertion
+                console.log("Inserting new key: [%s]", b);
+
+                var t_b = type(B[b]);
+                switch (t_b) {
+                    case 'undefined':
+                        // umm. this should never happen?
+                        throw new Error("undefined type has key. this shouldn't happen?");
+                        break;
+                    case 'array':
+                        console.log('construct list');
+                        A[b] = f(B[b]);
+                        break;
+                    case 'object':
+                        console.log('construct map');
+                        A[b] = f(B[b]);
+                        break;
+                    default:
+                        A[b] = B[b];
+                        break;
+                }
+            } else {
+                // the key already existed
+                var t_a = type(A[b]);
+                var t_b = type(B[b]);
+
+                if (t_a !== t_b) {
+                    // its type changed!
+                    console.log("type changed from [%s] to [%s]", t_a, t_b);
+                    switch (t_b) {
+                        case 'undefined':
+                            delete A[b];
+                            break;
+                        case 'array':
+                            console.log('construct list');
+                            A[b] = f(B[b]);
+                            // make a new proxy
+                            break;
+                        case 'object':
+                            console.log('construct map');
+                            A[b] = f(B[b]);
+                            // make a new proxy
+                            break;
+                        default:
+                            // all other datatypes just require assignment.
+                            A[b] = B[b];
+                            break;
+                    }
+                } else {
+                    // did values change?
+
+                    if (['array', 'object'].indexOf(t_a) === -1) {
+                        // we can do deep equality...
+                        if (A[b] !== B[b]) {
+                            console.log("changed values from [%s] to [%s]", A[b], B[b]);
+                            A[b] = B[b];
+                        }
+                    } else {
+                        var nextPath = path.slice(0);
+                        nextPath.push(b);
+                        if (t_a === 'object') {
+                            // it's an object
+                            compare.objects(A[b], B[b], f, nextPath);
+                        } else {
+                            // it's an array
+                            compare.arrays(A[b], B[b], f, nextPath);
+                        }
+                    }
+                }
+            }
+        });
+        Akeys.forEach(function (a) {
+            if (Bkeys.indexOf(a) === -1 || type(B[a]) === 'undefined') {
+                console.log("Deleting [%s]", a);
+                // the key was deleted!
+                delete A[a];
+            }
+        });
+    };
+
+    compare.arrays = function (A, B, f, path) {
+        var l_A = A.length;
+        var l_B = B.length;
+
+        // TODO do things with the path
+
+        if (l_A !== l_B) {
+            // B is longer than Aj
+            // there has been an insertion
+
+            // OR
+
+            // A is longer than B
+            // there has been a deletion
+
+            B.forEach(function (b, i) {
+                var t_a = type(A[i]);
+                var t_b = type(b);
+
+                if (t_a !== t_b) {
+                    // type changes are always destructive
+                    // that's good news because destructive is easy
+                    switch (t_b) {
+                        case 'object':
+                            A[i] = f(b);
+                            break;
+                        case 'array':
+                            A[i] = f(b);
+                            break;
+                        default:
+                            A[i] = b;
+                            break;
+                    }
+                } else {
+                    // same type
+                    var nextPath = path.slice(0);
+                    nextPath.push(i);
+
+                    switch (t_b) {
+                        case 'object':
+                            compare.objects(A[i], b, f, nextPath);
+                            break;
+                        case 'array':
+                            compare.arrays(A[i], b, f, nextPath);
+                            break;
+                        default:
+                            A[i] = b;
+                            break;
+                    }
+                }
+            });
+            return;
+        } else {
+            // they are the same length...
+            A.forEach(function (a, i) {
+                var t_a = type(a);
+                var t_b = type(B[i]);
+
+                if (t_a !== t_b) {
+                    switch (t_b) {
+                        case 'object':
+                            A[i] = f(B[i]);
+                            break;
+                        case 'array':
+                            A[i] = f(B[i]);
+                            break;
+                        default:
+                            A[i] = B[i];
+                            break;
+                    }
+                    return;
+                } else {
+                    var nextPath = path.slice(0);
+                    nextPath.push(i);
+
+                    // same type
+                    switch (t_b) {
+                        case 'object':
+                            compare.objects(A[i], B[i], f, nextPath);
+                            break;
+                        case 'array':
+                            compare.arrays(A[i], B[i], f, nextPath);
+                            break;
+                        default:
+                            A[i] = B[i];
+                            break;
+                    }
+                }
+            });
+        }
+    };
+
+    return compare;
+});
diff --git a/www/json/index.html b/www/json/index.html
new file mode 100644
index 000000000..166613c8d
--- /dev/null
+++ b/www/json/index.html
@@ -0,0 +1,51 @@
+
+
+
+    
+    
+    
+    
+
+
+    
    
+        
    The field below behaves like a REPL, with the realtime object created by this page exposed as the value x
    
+        
    Open your browser's console to see the output.
    
+        
    
+    
    
+
+
+
diff --git a/www/json/main.js b/www/json/main.js
new file mode 100644
index 000000000..cfe805926
--- /dev/null
+++ b/www/json/main.js
@@ -0,0 +1,204 @@
+require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
+define([
+    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    '/common/realtime-input.js',
+    '/common/crypto.js',
+    '/bower_components/textpatcher/TextPatcher.amd.js',
+    'json.sortify',
+    '/common/json-ot.js',
+    '/json/compare.js',
+    '/bower_components/proxy-polyfill/proxy.min.js', // https://github.com/GoogleChrome/proxy-polyfill
+    '/bower_components/jquery/dist/jquery.min.js',
+    '/customize/pad.js'
+], function (Config, Realtime, Crypto, TextPatcher, Sortify, JsonOT, Compare) {
+    // https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Proxy#A_complete_traps_list_example
+    // https://github.com/xwiki-labs/RealtimeJSON
+    // https://github.com/xwiki-labs/ChainJSON
+    var $ = window.jQuery;
+    var Proxy = window.Proxy;
+
+    var key;
+    var channel = '';
+    var hash = false;
+    if (!/#/.test(window.location.href)) {
+        key = Crypto.genKey();
+    } else {
+        hash = window.location.hash.slice(1);
+        channel = hash.slice(0,32);
+        key = hash.slice(32);
+    }
+
+    var module = window.APP = {
+        TextPatcher: TextPatcher,
+        Sortify: Sortify,
+    };
+
+    var $repl = $('[name="repl"]');
+
+    var Map = module.Map = {};
+
+    var initializing = true;
+
+    var config = module.config = {
+        initialState: Sortify(Map) || '{}',
+        websocketURL: Config.websocketURL,
+        userName: Crypto.rand64(8),
+        channel: channel,
+        cryptKey: key,
+        crypto: Crypto,
+        transformFunction: JsonOT.validate
+    };
+
+    var setEditable = module.setEditable = function (bool) {
+        /* (dis)allow editing */
+        [$repl].forEach(function ($el) {
+            $el.attr('disabled', !bool);
+        });
+    };
+
+    setEditable(false);
+
+    var onInit = config.onInit = function (info) {
+        var realtime = module.realtime = info.realtime;
+        window.location.hash = info.channel + key;
+
+        // create your patcher
+        module.patchText = TextPatcher.create({
+            realtime: realtime,
+            logging: true,
+        });
+    };
+
+    var onLocal = config.onLocal = module.bump = function () {
+        if (initializing) { return; }
+
+        var strung = Sortify(Map);
+
+        console.log(strung);
+
+        /* serialize local changes */
+        module.patchText(strung);
+
+        if (module.realtime.getUserDoc !== strung) {
+            module.patchText(strung);
+        }
+    };
+
+    var onRemote = config.onRemote = function (info) {
+        if (initializing) { return; }
+        /* integrate remote changes */
+
+        var proxy = module.proxy;
+
+        var userDoc = module.realtime.getUserDoc();
+        var parsed = JSON.parse(userDoc);
+
+        if (Compare.isArray(parsed)) {
+            // what's different about arrays?
+        } else if (Compare.type(parsed) === 'object') { /*
+            don't use native typeof because 'null' is an object, but you can't
+            proxy it, so you need to distinguish */
+            Compare.objects(Map, parsed, function (obj) {
+                console.log("constructing new proxy for type [%s]", Compare.type(obj));
+                return module.makeProxy(obj);
+            }, []);
+        } else {
+            throw new Error("unsupported realtime datatype");
+        }
+
+    };
+
+    var onReady = config.onReady = function (info) {
+        console.log("READY");
+
+        var userDoc = module.realtime.getUserDoc();
+        var parsed = JSON.parse(userDoc);
+
+        //Compare.objects(module.proxy, parsed, module.makeProxy, []);
+        Object.keys(parsed).forEach(function (key) {
+            Map[key] = module.recursiveProxies(parsed[key]);
+        });
+
+        setEditable(true);
+        initializing = false;
+    };
+
+    var onAbort = config.onAbort = function (info) {
+        window.alert("Network Connection Lost");
+    };
+
+    var rt = Realtime.start(config);
+
+    var handler = {
+        get: function (obj, prop) {
+            // FIXME magic?
+            if (prop === 'length' && typeof(obj.length) === 'number') {
+                return obj.length;
+            }
+
+            //console.log("Getting [%s]", prop);
+            return obj[prop];
+        },
+        set: function (obj, prop, value) {
+            if (prop === 'on') {
+                throw new Error("'on' is a reserved attribute name for realtime lists and maps");
+            }
+            if (obj[prop] === value) { return value; }
+
+            var t_value = Compare.type(value);
+            if (['array', 'object'].indexOf(t_value) !== -1) {
+                console.log("Constructing new proxy for value with type [%s]", t_value);
+                var proxy = obj[prop] = module.makeProxy(value);
+                //onLocal();
+                //return proxy;
+            } else {
+                console.log("Setting [%s] to [%s]", prop, value);
+                obj[prop] = value;
+            }
+
+            onLocal();
+            return obj[prop];
+        }
+    };
+
+    var makeProxy = module.makeProxy = function (obj) {
+        return new Proxy(obj, handler);
+    };
+
+    var recursiveProxies = module.recursiveProxies = function (obj) {
+        var t_obj = Compare.type(obj);
+
+        var proxy;
+
+        switch (t_obj) {
+            case 'object':
+                proxy = makeProxy({});
+                Compare.objects(proxy, obj, makeProxy, []);
+                return proxy;
+            case 'array':
+                proxy = makeProxy([]);
+                Compare.arrays(proxy, obj, makeProxy, []);
+                return proxy;
+            default:
+                return obj;
+        }
+    };
+
+    var proxy = module.proxy = makeProxy(Map);
+
+    $repl.on('keyup', function (e) {
+        if (e.which === 13) {
+            var value = $repl.val();
+
+            if (!value.trim()) { return; }
+
+            console.log("evaluating `%s`", value);
+
+            var x = proxy;
+            console.log('> ', eval(value)); // jshint ignore:line
+            //console.log(Sortify(proxy));
+            console.log();
+            $repl.val('');
+        }
+    });
+});

From 88856584310055be7941c1a8f7e6d4349832cbba Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 25 May 2016 12:33:28 +0200
Subject: [PATCH 208/257] bump to latest textpatcher

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 537fda237..eddf72f45 100644
--- a/bower.json
+++ b/bower.json
@@ -32,7 +32,7 @@
     "json.sortify": "~2.1.0",
     "fabric.js": "fabric#~1.6.0",
     "hyperjson": "~1.2.2",
-    "textpatcher": "^1.1.1",
+    "textpatcher": "^1.2.0",
     "proxy-polyfill": "^0.1.5"
   }
 }

From c1bca09cce0c0b5ed5cb9879a1c56a3d4941f0da Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 25 May 2016 18:36:44 +0200
Subject: [PATCH 209/257] move list/map functionality into wrapper file

---
 www/json/api.js                     | 184 +++++++++++++++++++++++++
 www/json/{compare.js => listmap.js} | 127 +++++++++++++----
 www/json/main.js                    | 202 +---------------------------
 3 files changed, 292 insertions(+), 221 deletions(-)
 create mode 100644 www/json/api.js
 rename www/json/{compare.js => listmap.js} (62%)

diff --git a/www/json/api.js b/www/json/api.js
new file mode 100644
index 000000000..ae01cf289
--- /dev/null
+++ b/www/json/api.js
@@ -0,0 +1,184 @@
+require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
+define([
+    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    '/common/crypto.js',
+    '/common/realtime-input.js',
+    '/json/listmap.js',
+    '/common/json-ot.js',
+    'json.sortify',
+    '/bower_components/textpatcher/TextPatcher.amd.js',
+    '/bower_components/jquery/dist/jquery.min.js',
+], function (Config, Crypto, Realtime, ListMap, JsonOT, Sortify, TextPatcher) {
+    var api = {};
+
+    api.ListMap = ListMap;
+
+    var key;
+    var channel = '';
+    var hash = false;
+    if (!/#/.test(window.location.href)) {
+        key = Crypto.genKey();
+    } else {
+        hash = window.location.hash.slice(1);
+        channel = hash.slice(0,32);
+        key = hash.slice(32);
+    }
+
+    var module = window.APP = {
+        TextPatcher: TextPatcher,
+        Sortify: Sortify,
+    };
+
+    var $repl = $('[name="repl"]');
+
+    var Map = module.Map = {};
+
+    var initializing = true;
+
+    var config = module.config = {
+        initialState: Sortify(Map) || '{}',
+        websocketURL: Config.websocketURL,
+        userName: Crypto.rand64(8),
+        channel: channel,
+        cryptKey: key,
+        crypto: Crypto,
+        transformFunction: JsonOT.validate
+    };
+
+    var setEditable = module.setEditable = function (bool) {
+        /* (dis)allow editing */
+        [$repl].forEach(function ($el) {
+            $el.attr('disabled', !bool);
+        });
+    };
+
+    setEditable(false);
+
+    var onInit = config.onInit = function (info) {
+        var realtime = module.realtime = info.realtime;
+        window.location.hash = info.channel + key;
+
+        // create your patcher
+        module.patchText = TextPatcher.create({
+            realtime: realtime,
+            logging: true,
+        });
+    };
+
+    /*  we still need to pass in the function that bumps to ListMap.
+        this is no good. FIXME */
+    var onLocal = config.onLocal = ListMap.onLocal = module.bump = function () {
+        if (initializing) { return; }
+
+        var strung = Sortify(Map);
+
+        console.log(strung);
+
+        /* serialize local changes */
+        module.patchText(strung);
+
+        if (module.realtime.getUserDoc !== strung) {
+            module.patchText(strung);
+        }
+    };
+
+    var onRemote = config.onRemote = function (info) {
+        if (initializing) { return; }
+        /* integrate remote changes */
+
+        var proxy = module.proxy;
+
+        var userDoc = module.realtime.getUserDoc();
+        var parsed = JSON.parse(userDoc);
+
+        ListMap.update(proxy, parsed);
+    };
+
+    var onReady = config.onReady = function (info) {
+        console.log("READY");
+
+        var userDoc = module.realtime.getUserDoc();
+        var parsed = JSON.parse(userDoc);
+
+        Object.keys(parsed).forEach(function (key) {
+            module.proxy[key] = ListMap.recursiveProxies(parsed[key]);
+        });
+
+        setEditable(true);
+        initializing = false;
+    };
+
+    var onAbort = config.onAbort = function (info) {
+        window.alert("Network Connection Lost");
+    };
+
+    var rt = Realtime.start(config);
+
+    var proxy = module.proxy = ListMap.makeProxy(Map);
+
+    $repl.on('keyup', function (e) {
+        if (e.which === 13) {
+            var value = $repl.val();
+
+            if (!value.trim()) { return; }
+
+            console.log("evaluating `%s`", value);
+
+            var x = proxy;
+            console.log('> ', eval(value)); // jshint ignore:line
+            console.log();
+            $repl.val('');
+        }
+    });
+
+    var create = api.create = function (config) {
+        /* validate your inputs before proceeding */
+
+        if (['object', 'array'].indexOf(ListMap.type(config.data))) {
+            throw new Error('unsupported datatype');
+        }
+
+        var Config = {
+            initialState: Sortify(config.data),
+            transformFunction: JsonOT.validate,
+            userName: userName,
+            channel: channel,
+            cryptKey: cryptKey,
+            crypto: crypto,
+        };
+
+        var rt;
+
+        var onInit = Config.onInit = function (info) {
+            // onInit
+            config.onInit(info);
+        };
+
+        var onReady = Config.onReady = function (info) {
+            // onReady
+            config.onReady(info);
+        };
+
+        var onLocal = Config.onLocal = function () {
+            // onLocal
+            config.onLocal();
+        };
+
+        var onRemote = Config.onRemote = function (info) {
+            // onRemote
+            config.onRemote(info);
+        };
+
+        var onAbort = Config.onAbort = function (info) {
+            // onAbort
+            config.onAbort(info);
+        };
+
+        rt =Realtime.start(Config);
+        var proxy = rt.proxy = ListMap.makeProxy(data);
+
+        return rt;
+    };
+
+    return api;
+});
diff --git a/www/json/compare.js b/www/json/listmap.js
similarity index 62%
rename from www/json/compare.js
rename to www/json/listmap.js
index 970bb0e4b..c453a93d2 100644
--- a/www/json/compare.js
+++ b/www/json/listmap.js
@@ -1,38 +1,94 @@
-define(function () {
-    var compare = {};
+define([
+    '/bower_components/proxy-polyfill/proxy.min.js', // https://github.com/GoogleChrome/proxy-polyfill
+],function () {
+    var Proxy = window.Proxy;
 
-    var isArray = compare.isArray = function (obj) {
-        return Object.prototype.toString.call(obj)==='[object Array]'
+    var ListMap = {};
+
+    var isArray = ListMap.isArray = function (obj) {
+        return Object.prototype.toString.call(obj)==='[object Array]';
+    };
+
+    /*  Arrays and nulls both register as 'object' when using native typeof
+        we need to distinguish them as their own types, so use this instead. */
+    var type = ListMap.type = function (dat) {
+        return dat === null?  'null': isArray(dat)?'array': typeof(dat);
+    };
+
+    var handlers = ListMap.handlers = {
+        get: function (obj, prop) {
+            // FIXME magic?
+            if (prop === 'length' && typeof(obj.length) === 'number') { return obj.length; }
+
+            return obj[prop];
+        },
+        set: function (obj, prop, value) {
+            if (prop === 'on') {
+                throw new Error("'on' is a reserved attribute name for realtime lists and maps");
+            }
+            if (obj[prop] === value) { return value; }
+
+            var t_value = ListMap.type(value);
+            if (['array', 'object'].indexOf(t_value) !== -1) {
+                console.log("Constructing new proxy for value with type [%s]", t_value);
+                var proxy = obj[prop] = ListMap.makeProxy(value);
+            } else {
+                console.log("Setting [%s] to [%s]", prop, value);
+                obj[prop] = value;
+            }
+
+            // FIXME this is NO GOOD
+            ListMap.onLocal();
+            return obj[prop];
+        }
+    };
+
+    var makeProxy = ListMap.makeProxy = function (obj) {
+        return new Proxy(obj, handlers);
     };
 
-    var type = compare.type = function (dat) {
-        return dat === null?
-            'null':
-            isArray(dat)?'array': typeof(dat);
+    var recursiveProxies = ListMap.recursiveProxies = function (obj) {
+        var t_obj = type(obj);
+
+        var proxy;
+
+        switch (t_obj) {
+            case 'object':
+                proxy = makeProxy({});
+                ListMap.objects(proxy, obj, makeProxy, []);
+                return proxy;
+            case 'array':
+                proxy = makeProxy([]);
+                ListMap.arrays(proxy, obj, makeProxy, []);
+                return proxy;
+            default:
+                return obj;
+        }
     };
 
-    /*  compare objects A and B, where A is the _older_ of the two */
-    compare.objects = function (A, B, f, path) {
+    /*  ListMap objects A and B, where A is the _older_ of the two */
+    ListMap.objects = function (A, B, f, path) {
         var Akeys = Object.keys(A);
         var Bkeys = Object.keys(B);
 
-        console.log("inspecting path [%s]", path.join(','));
+        //console.log("inspecting path [%s]", path.join(','));
 
         /*  iterating over the keys in B will tell you if a new key exists
             it will not tell you if a key has been removed.
             to accomplish that you will need to iterate over A's keys */
         Bkeys.forEach(function (b) {
-            console.log(b);
+            //console.log(b);
+            var t_b = type(B[b]);
+
             if (Akeys.indexOf(b) === -1) {
                 // there was an insertion
                 console.log("Inserting new key: [%s]", b);
 
-                var t_b = type(B[b]);
                 switch (t_b) {
                     case 'undefined':
                         // umm. this should never happen?
                         throw new Error("undefined type has key. this shouldn't happen?");
-                        break;
+                        //break;
                     case 'array':
                         console.log('construct list');
                         A[b] = f(B[b]);
@@ -48,7 +104,6 @@ define(function () {
             } else {
                 // the key already existed
                 var t_a = type(A[b]);
-                var t_b = type(B[b]);
 
                 if (t_a !== t_b) {
                     // its type changed!
@@ -86,10 +141,10 @@ define(function () {
                         nextPath.push(b);
                         if (t_a === 'object') {
                             // it's an object
-                            compare.objects(A[b], B[b], f, nextPath);
+                            ListMap.objects(A[b], B[b], f, nextPath);
                         } else {
                             // it's an array
-                            compare.arrays(A[b], B[b], f, nextPath);
+                            ListMap.arrays(A[b], B[b], f, nextPath);
                         }
                     }
                 }
@@ -104,11 +159,11 @@ define(function () {
         });
     };
 
-    compare.arrays = function (A, B, f, path) {
+    ListMap.arrays = function (A, B, f, path) {
         var l_A = A.length;
         var l_B = B.length;
 
-        // TODO do things with the path
+        // TODO do things with the path (callbacks)
 
         if (l_A !== l_B) {
             // B is longer than Aj
@@ -144,10 +199,10 @@ define(function () {
 
                     switch (t_b) {
                         case 'object':
-                            compare.objects(A[i], b, f, nextPath);
+                            ListMap.objects(A[i], b, f, nextPath);
                             break;
                         case 'array':
-                            compare.arrays(A[i], b, f, nextPath);
+                            ListMap.arrays(A[i], b, f, nextPath);
                             break;
                         default:
                             A[i] = b;
@@ -182,10 +237,10 @@ define(function () {
                     // same type
                     switch (t_b) {
                         case 'object':
-                            compare.objects(A[i], B[i], f, nextPath);
+                            ListMap.objects(A[i], B[i], f, nextPath);
                             break;
                         case 'array':
-                            compare.arrays(A[i], B[i], f, nextPath);
+                            ListMap.arrays(A[i], B[i], f, nextPath);
                             break;
                         default:
                             A[i] = B[i];
@@ -196,5 +251,29 @@ define(function () {
         }
     };
 
-    return compare;
+    var update = ListMap.update = function (A, B) {
+
+        var t_A = type(A);
+        var t_B = type(B);
+
+        if (t_A !== t_B) {
+            throw new Error("Proxy updates can't result in type changes");
+        }
+
+        switch (t_B) {
+            case 'array':
+                // idk
+                break;
+            case 'object':
+                ListMap.objects(A, B, function (obj) {
+                    console.log("constructing new proxy for type [%s]", type(obj));
+                    return makeProxy(obj);
+                }, []);
+                break;
+            default:
+                throw new Error("unsupported realtime datatype");
+        }
+    };
+
+    return ListMap;
 });
diff --git a/www/json/main.js b/www/json/main.js
index cfe805926..8ae03c393 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -1,204 +1,12 @@
-require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/crypto.js',
-    '/bower_components/textpatcher/TextPatcher.amd.js',
-    'json.sortify',
-    '/common/json-ot.js',
-    '/json/compare.js',
-    '/bower_components/proxy-polyfill/proxy.min.js', // https://github.com/GoogleChrome/proxy-polyfill
-    '/bower_components/jquery/dist/jquery.min.js',
-    '/customize/pad.js'
-], function (Config, Realtime, Crypto, TextPatcher, Sortify, JsonOT, Compare) {
-    // https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Proxy#A_complete_traps_list_example
-    // https://github.com/xwiki-labs/RealtimeJSON
-    // https://github.com/xwiki-labs/ChainJSON
+    '/json/api.js',
+    //'/customize/pad.js'
+], function (RtListMap) {
     var $ = window.jQuery;
-    var Proxy = window.Proxy;
 
-    var key;
-    var channel = '';
-    var hash = false;
-    if (!/#/.test(window.location.href)) {
-        key = Crypto.genKey();
-    } else {
-        hash = window.location.hash.slice(1);
-        channel = hash.slice(0,32);
-        key = hash.slice(32);
-    }
+    var config = {
 
-    var module = window.APP = {
-        TextPatcher: TextPatcher,
-        Sortify: Sortify,
     };
 
-    var $repl = $('[name="repl"]');
-
-    var Map = module.Map = {};
-
-    var initializing = true;
-
-    var config = module.config = {
-        initialState: Sortify(Map) || '{}',
-        websocketURL: Config.websocketURL,
-        userName: Crypto.rand64(8),
-        channel: channel,
-        cryptKey: key,
-        crypto: Crypto,
-        transformFunction: JsonOT.validate
-    };
-
-    var setEditable = module.setEditable = function (bool) {
-        /* (dis)allow editing */
-        [$repl].forEach(function ($el) {
-            $el.attr('disabled', !bool);
-        });
-    };
-
-    setEditable(false);
-
-    var onInit = config.onInit = function (info) {
-        var realtime = module.realtime = info.realtime;
-        window.location.hash = info.channel + key;
-
-        // create your patcher
-        module.patchText = TextPatcher.create({
-            realtime: realtime,
-            logging: true,
-        });
-    };
-
-    var onLocal = config.onLocal = module.bump = function () {
-        if (initializing) { return; }
-
-        var strung = Sortify(Map);
-
-        console.log(strung);
-
-        /* serialize local changes */
-        module.patchText(strung);
-
-        if (module.realtime.getUserDoc !== strung) {
-            module.patchText(strung);
-        }
-    };
-
-    var onRemote = config.onRemote = function (info) {
-        if (initializing) { return; }
-        /* integrate remote changes */
-
-        var proxy = module.proxy;
-
-        var userDoc = module.realtime.getUserDoc();
-        var parsed = JSON.parse(userDoc);
-
-        if (Compare.isArray(parsed)) {
-            // what's different about arrays?
-        } else if (Compare.type(parsed) === 'object') { /*
-            don't use native typeof because 'null' is an object, but you can't
-            proxy it, so you need to distinguish */
-            Compare.objects(Map, parsed, function (obj) {
-                console.log("constructing new proxy for type [%s]", Compare.type(obj));
-                return module.makeProxy(obj);
-            }, []);
-        } else {
-            throw new Error("unsupported realtime datatype");
-        }
-
-    };
-
-    var onReady = config.onReady = function (info) {
-        console.log("READY");
-
-        var userDoc = module.realtime.getUserDoc();
-        var parsed = JSON.parse(userDoc);
-
-        //Compare.objects(module.proxy, parsed, module.makeProxy, []);
-        Object.keys(parsed).forEach(function (key) {
-            Map[key] = module.recursiveProxies(parsed[key]);
-        });
-
-        setEditable(true);
-        initializing = false;
-    };
-
-    var onAbort = config.onAbort = function (info) {
-        window.alert("Network Connection Lost");
-    };
-
-    var rt = Realtime.start(config);
-
-    var handler = {
-        get: function (obj, prop) {
-            // FIXME magic?
-            if (prop === 'length' && typeof(obj.length) === 'number') {
-                return obj.length;
-            }
-
-            //console.log("Getting [%s]", prop);
-            return obj[prop];
-        },
-        set: function (obj, prop, value) {
-            if (prop === 'on') {
-                throw new Error("'on' is a reserved attribute name for realtime lists and maps");
-            }
-            if (obj[prop] === value) { return value; }
-
-            var t_value = Compare.type(value);
-            if (['array', 'object'].indexOf(t_value) !== -1) {
-                console.log("Constructing new proxy for value with type [%s]", t_value);
-                var proxy = obj[prop] = module.makeProxy(value);
-                //onLocal();
-                //return proxy;
-            } else {
-                console.log("Setting [%s] to [%s]", prop, value);
-                obj[prop] = value;
-            }
-
-            onLocal();
-            return obj[prop];
-        }
-    };
-
-    var makeProxy = module.makeProxy = function (obj) {
-        return new Proxy(obj, handler);
-    };
-
-    var recursiveProxies = module.recursiveProxies = function (obj) {
-        var t_obj = Compare.type(obj);
-
-        var proxy;
-
-        switch (t_obj) {
-            case 'object':
-                proxy = makeProxy({});
-                Compare.objects(proxy, obj, makeProxy, []);
-                return proxy;
-            case 'array':
-                proxy = makeProxy([]);
-                Compare.arrays(proxy, obj, makeProxy, []);
-                return proxy;
-            default:
-                return obj;
-        }
-    };
-
-    var proxy = module.proxy = makeProxy(Map);
-
-    $repl.on('keyup', function (e) {
-        if (e.which === 13) {
-            var value = $repl.val();
-
-            if (!value.trim()) { return; }
-
-            console.log("evaluating `%s`", value);
-
-            var x = proxy;
-            console.log('> ', eval(value)); // jshint ignore:line
-            //console.log(Sortify(proxy));
-            console.log();
-            $repl.val('');
-        }
-    });
+//    RtListMap.create(config);
 });

From 014dce272ba99a1e57404eddd7ef486b680edda0 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 26 May 2016 11:55:33 +0200
Subject: [PATCH 210/257] working on better abstractions. still held together
 with duct tape

---
 www/json/api.js     | 198 ++++++++++++++------------------------------
 www/json/listmap.js |  58 +++++++++++--
 www/json/main.js    |  66 ++++++++++++++-
 3 files changed, 175 insertions(+), 147 deletions(-)

diff --git a/www/json/api.js b/www/json/api.js
index ae01cf289..20ace5914 100644
--- a/www/json/api.js
+++ b/www/json/api.js
@@ -13,170 +13,92 @@ define([
 
     api.ListMap = ListMap;
 
-    var key;
-    var channel = '';
-    var hash = false;
-    if (!/#/.test(window.location.href)) {
-        key = Crypto.genKey();
-    } else {
-        hash = window.location.hash.slice(1);
-        channel = hash.slice(0,32);
-        key = hash.slice(32);
-    }
-
-    var module = window.APP = {
-        TextPatcher: TextPatcher,
-        Sortify: Sortify,
-    };
-
-    var $repl = $('[name="repl"]');
-
-    var Map = module.Map = {};
-
-    var initializing = true;
-
-    var config = module.config = {
-        initialState: Sortify(Map) || '{}',
-        websocketURL: Config.websocketURL,
-        userName: Crypto.rand64(8),
-        channel: channel,
-        cryptKey: key,
-        crypto: Crypto,
-        transformFunction: JsonOT.validate
-    };
-
-    var setEditable = module.setEditable = function (bool) {
-        /* (dis)allow editing */
-        [$repl].forEach(function ($el) {
-            $el.attr('disabled', !bool);
-        });
-    };
-
-    setEditable(false);
-
-    var onInit = config.onInit = function (info) {
-        var realtime = module.realtime = info.realtime;
-        window.location.hash = info.channel + key;
-
-        // create your patcher
-        module.patchText = TextPatcher.create({
-            realtime: realtime,
-            logging: true,
-        });
-    };
-
-    /*  we still need to pass in the function that bumps to ListMap.
-        this is no good. FIXME */
-    var onLocal = config.onLocal = ListMap.onLocal = module.bump = function () {
-        if (initializing) { return; }
-
-        var strung = Sortify(Map);
-
-        console.log(strung);
-
-        /* serialize local changes */
-        module.patchText(strung);
-
-        if (module.realtime.getUserDoc !== strung) {
-            module.patchText(strung);
-        }
-    };
-
-    var onRemote = config.onRemote = function (info) {
-        if (initializing) { return; }
-        /* integrate remote changes */
-
-        var proxy = module.proxy;
-
-        var userDoc = module.realtime.getUserDoc();
-        var parsed = JSON.parse(userDoc);
-
-        ListMap.update(proxy, parsed);
-    };
-
-    var onReady = config.onReady = function (info) {
-        console.log("READY");
-
-        var userDoc = module.realtime.getUserDoc();
-        var parsed = JSON.parse(userDoc);
-
-        Object.keys(parsed).forEach(function (key) {
-            module.proxy[key] = ListMap.recursiveProxies(parsed[key]);
-        });
-
-        setEditable(true);
-        initializing = false;
-    };
-
-    var onAbort = config.onAbort = function (info) {
-        window.alert("Network Connection Lost");
-    };
-
-    var rt = Realtime.start(config);
-
-    var proxy = module.proxy = ListMap.makeProxy(Map);
-
-    $repl.on('keyup', function (e) {
-        if (e.which === 13) {
-            var value = $repl.val();
-
-            if (!value.trim()) { return; }
-
-            console.log("evaluating `%s`", value);
-
-            var x = proxy;
-            console.log('> ', eval(value)); // jshint ignore:line
-            console.log();
-            $repl.val('');
-        }
-    });
-
-    var create = api.create = function (config) {
+    var create = api.create = function (cfg) {
         /* validate your inputs before proceeding */
 
-        if (['object', 'array'].indexOf(ListMap.type(config.data))) {
+        if (['object', 'array'].indexOf(ListMap.type(cfg.data))) {
             throw new Error('unsupported datatype');
         }
 
-        var Config = {
-            initialState: Sortify(config.data),
+        var config = {
+            initialState: Sortify(cfg.data),
             transformFunction: JsonOT.validate,
-            userName: userName,
-            channel: channel,
-            cryptKey: cryptKey,
-            crypto: crypto,
+            userName: Crypto.rand64(8),
+            channel: cfg.channel,
+            cryptKey: cfg.cryptKey,
+            crypto: Crypto,
+            websocketURL: Config.websocketURL,
         };
 
         var rt;
+        var proxy = ListMap.makeProxy(cfg.data);
+        var realtime;
+
+        var onInit = config.onInit = function (info) {
+            realtime = info.realtime;
+            // create your patcher
+            realtime.patchText = TextPatcher.create({
+                realtime: realtime,
+                logging: config.logging || false,
+            });
 
-        var onInit = Config.onInit = function (info) {
             // onInit
-            config.onInit(info);
+            cfg.onInit(info);
         };
 
-        var onReady = Config.onReady = function (info) {
+        var onReady = config.onReady = function (info) {
+            var userDoc = realtime.getUserDoc();
+            var parsed = JSON.parse(userDoc);
+
+            // update your proxy to the state of the userDoc
+            Object.keys(parsed).forEach(function (key) {
+                proxy[key] = ListMap.recursiveProxies(parsed[key]);
+            });
+
             // onReady
-            config.onReady(info);
+            cfg.onReady(info);
         };
 
-        var onLocal = Config.onLocal = function () {
+        // FIXME
+        var onLocal = config.onLocal = ListMap.onLocal = function () {
+            var strung = Sortify(proxy);
+
+            realtime.patchText(strung);
+
+            // try harder
+            if (realtime.getUserDoc() !== strung) {
+                realtime.patchText(strung);
+            }
+
             // onLocal
-            config.onLocal();
+            if (cfg.onLocal) {
+                cfg.onLocal();
+            }
+
+            // TODO actually emit 'change' events, or something like them
         };
 
-        var onRemote = Config.onRemote = function (info) {
+        var onRemote = config.onRemote = function (info) {
+            var userDoc = realtime.getUserDoc();
+            var parsed = JSON.parse(userDoc);
+
+            ListMap.update(proxy, parsed);
+
             // onRemote
-            config.onRemote(info);
+            if (cfg.onRemote) {
+                cfg.onRemote(info);
+            }
         };
 
-        var onAbort = Config.onAbort = function (info) {
+        var onAbort = config.onAbort = function (info) {
             // onAbort
-            config.onAbort(info);
+            cfg.onAbort(info);
         };
 
-        rt =Realtime.start(Config);
-        var proxy = rt.proxy = ListMap.makeProxy(data);
+        rt = Realtime.start(config);
 
+        rt.proxy = proxy;
+        rt.realtime = realtime;
         return rt;
     };
 
diff --git a/www/json/listmap.js b/www/json/listmap.js
index c453a93d2..998469931 100644
--- a/www/json/listmap.js
+++ b/www/json/listmap.js
@@ -15,6 +15,35 @@ define([
         return dat === null?  'null': isArray(dat)?'array': typeof(dat);
     };
 
+    var makeHandlers = function (cb) {
+        return {
+            get: function (obj, prop) {
+                // FIXME magic?
+                if (prop === 'length' && typeof(obj.length) === 'number') { return obj.length; }
+
+                return obj[prop];
+            },
+            set: function (obj, prop, value) {
+                if (prop === 'on') {
+                    throw new Error("'on' is a reserved attribute name for realtime lists and maps");
+                }
+                if (obj[prop] === value) { return value; }
+
+                var t_value = ListMap.type(value);
+                if (['array', 'object'].indexOf(t_value) !== -1) {
+                    console.log("Constructing new proxy for value with type [%s]", t_value);
+                    var proxy = obj[prop] = ListMap.makeProxy(value);
+                } else {
+                    console.log("Setting [%s] to [%s]", prop, value);
+                    obj[prop] = value;
+                }
+
+                cb();
+                return obj[prop];
+            },
+        };
+    };
+
     var handlers = ListMap.handlers = {
         get: function (obj, prop) {
             // FIXME magic?
@@ -43,8 +72,10 @@ define([
         }
     };
 
-    var makeProxy = ListMap.makeProxy = function (obj) {
-        return new Proxy(obj, handlers);
+    var makeProxy = ListMap.makeProxy = function (obj, local) {
+        local = local || ListMap.onLocal;
+
+        return new Proxy(obj, handlers); //makeHandlers(ListMap.onLocal));
     };
 
     var recursiveProxies = ListMap.recursiveProxies = function (obj) {
@@ -66,6 +97,12 @@ define([
         }
     };
 
+    var onChange = function (path, key) {
+        var P = path.slice(0);
+        P.push(key);
+        console.log('change at path [%s]', P.join(','));
+    };
+
     /*  ListMap objects A and B, where A is the _older_ of the two */
     ListMap.objects = function (A, B, f, path) {
         var Akeys = Object.keys(A);
@@ -83,6 +120,7 @@ define([
             if (Akeys.indexOf(b) === -1) {
                 // there was an insertion
                 console.log("Inserting new key: [%s]", b);
+                onChange(path, b);
 
                 switch (t_b) {
                     case 'undefined':
@@ -90,11 +128,11 @@ define([
                         throw new Error("undefined type has key. this shouldn't happen?");
                         //break;
                     case 'array':
-                        console.log('construct list');
+                        //console.log('construct list');
                         A[b] = f(B[b]);
                         break;
                     case 'object':
-                        console.log('construct map');
+                        //console.log('construct map');
                         A[b] = f(B[b]);
                         break;
                     default:
@@ -113,12 +151,12 @@ define([
                             delete A[b];
                             break;
                         case 'array':
-                            console.log('construct list');
+                            //console.log('construct list');
                             A[b] = f(B[b]);
                             // make a new proxy
                             break;
                         case 'object':
-                            console.log('construct map');
+                            //console.log('construct map');
                             A[b] = f(B[b]);
                             // make a new proxy
                             break;
@@ -133,6 +171,7 @@ define([
                     if (['array', 'object'].indexOf(t_a) === -1) {
                         // we can do deep equality...
                         if (A[b] !== B[b]) {
+                            onChange(path, b);
                             console.log("changed values from [%s] to [%s]", A[b], B[b]);
                             A[b] = B[b];
                         }
@@ -152,6 +191,7 @@ define([
         });
         Akeys.forEach(function (a) {
             if (Bkeys.indexOf(a) === -1 || type(B[a]) === 'undefined') {
+                onChange(path, a);
                 console.log("Deleting [%s]", a);
                 // the key was deleted!
                 delete A[a];
@@ -205,6 +245,7 @@ define([
                             ListMap.arrays(A[i], b, f, nextPath);
                             break;
                         default:
+                            onChange(path, i);
                             A[i] = b;
                             break;
                     }
@@ -262,11 +303,14 @@ define([
 
         switch (t_B) {
             case 'array':
+                ListMap.arrays(A, B, function (obj) {
+                    return makeProxy(obj);
+                });
                 // idk
                 break;
             case 'object':
                 ListMap.objects(A, B, function (obj) {
-                    console.log("constructing new proxy for type [%s]", type(obj));
+                    //console.log("constructing new proxy for type [%s]", type(obj));
                     return makeProxy(obj);
                 }, []);
                 break;
diff --git a/www/json/main.js b/www/json/main.js
index 8ae03c393..5e96cea5e 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -1,12 +1,74 @@
 define([
     '/json/api.js',
+    '/common/crypto.js',
     //'/customize/pad.js'
-], function (RtListMap) {
+], function (RtListMap, Crypto) {
     var $ = window.jQuery;
 
+    var key;
+    var channel = '';
+    var hash = false;
+    if (!/#/.test(window.location.href)) {
+        key = Crypto.genKey();
+    } else {
+        hash = window.location.hash.slice(1);
+        channel = hash.slice(0,32);
+        key = hash.slice(32);
+    }
+
     var config = {
+        channel: channel,
+        cryptKey: key,
+        data: {},
+    };
+
+    var module = window.APP = {};
+
+    var $repl = $('[name="repl"]');
+
+    var setEditable = module.setEditable = function (bool) {
+        [$repl].forEach(function ($el) {
+            $el.attr('disabled', !bool);
+        });
+    };
+
+    var initializing = true;
+
+    // TODO replace with `proxy.on('init'` ?
+    // or just remove?
+    var onInit = config.onInit = function (info) {
+        console.log("initializing!");
+        window.location.hash = info.channel + key;
+    };
+
+    // TODO replace with `proxy.on('ready'` ?
+    var onReady = config.onReady = function (info) {
+        setEditable(true);
+    };
+
+    setEditable(false);
 
+    // TODO replace with `proxy.on('disconnect'` ?
+    var onAbort = config.onAbort = function (info) {
+        setEditable(false);
+        window.alert("Network connection lost");
     };
 
-//    RtListMap.create(config);
+    var rt = module.rt = RtListMap.create(config);
+
+    // set up user interface hooks
+    $repl.on('keyup', function (e) {
+        if (e.which === 13) {
+            var value = $repl.val();
+
+            if (!value.trim()) { return; }
+
+            console.log("evaluating `%s`", value);
+            var x = rt.proxy;
+
+            console.log('> ', eval(value)); // jshint ignore:line
+            console.log();
+            $repl.val('');
+        }
+    });
 });

From da2bfe2de90aa7c51d783dff2c5b0b859400744a Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Thu, 26 May 2016 17:09:02 +0200
Subject: [PATCH 211/257] Added checkpoints with the new code from ChainPad

---
 NetfluxWebsocketSrv.js       |  22 +-
 www/common/chainpad.js       | 396 +++++++++++++++++++++--------------
 www/common/realtime-input.js |  10 +-
 3 files changed, 264 insertions(+), 164 deletions(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 8ce1ab442..03889ee8e 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -87,7 +87,27 @@ dropUser = function (ctx, user) {
 };
 
 const getHistory = function (ctx, channelName, handler, cb) {
-    ctx.store.getMessages(channelName, function (msgStr) { handler(JSON.parse(msgStr)); }, cb);
+    var messageBuf = [];
+    ctx.store.getMessages(channelName, function (msgStr) {
+        messageBuf.push(JSON.parse(msgStr));
+    }, function () {
+        var startPoint;
+        var cpCount = 0;
+        var msgBuff2 = [];
+        for (startPoint = messageBuf.length - 1; startPoint >= 0; startPoint--) {
+            var msg = messageBuf[startPoint];
+            msgBuff2.push(msg);
+            if (msg[2] === 'MSG' && msg[4].indexOf('cp|') === 0) {
+                cpCount++;
+                if (cpCount >= 2) {
+                    for (var x = msgBuff2.pop(); x; x = msgBuff2.pop()) { handler(x); }
+                    break;
+                }
+            }
+            //console.log(messageBuf[startPoint]);
+        }
+        cb();
+    });
 };
 
 const randName = function () { return Crypto.randomBytes(16).toString('hex'); };
diff --git a/www/common/chainpad.js b/www/common/chainpad.js
index 8d9ec786b..e93330845 100644
--- a/www/common/chainpad.js
+++ b/www/common/chainpad.js
@@ -28,7 +28,8 @@ var create = Patch.create = function (parentHash) {
     return {
         type: 'Patch',
         operations: [],
-        parentHash: parentHash
+        parentHash: parentHash,
+        isCheckpoint: false
     };
 };
 
@@ -45,6 +46,13 @@ var check = Patch.check = function (patch, docLength_opt) {
             docLength_opt += Operation.lengthChange(patch.operations[i]);
         }
     }
+    if (patch.isCheckpoint) {
+        Common.assert(patch.operations.length === 1);
+        Common.assert(patch.operations[0].offset === 0);
+        if (typeof(docLength_opt) === 'number') {
+            Common.assert(!docLength_opt || patch.operations[0].toRemove === docLength_opt);
+        }
+    }
 };
 
 var toObj = Patch.toObj = function (patch) {
@@ -104,6 +112,20 @@ var addOperation = Patch.addOperation = function (patch, op) {
     if (Common.PARANOIA) { check(patch); }
 };
 
+var createCheckpoint = Patch.createCheckpoint =
+    function (parentContent, checkpointContent, parentContentHash_opt)
+{
+    var op = Operation.create(0, parentContent.length, checkpointContent);
+    if (Common.PARANOIA && parentContentHash_opt) {
+        Common.assert(parentContentHash_opt === hash(parentContent));
+    }
+    parentContentHash_opt = parentContentHash_opt || hash(parentContent);
+    var out = create(parentContentHash_opt);
+    addOperation(out, op);
+    out.isCheckpoint = true;
+    return out;
+};
+
 var clone = Patch.clone = function (patch) {
     if (Common.PARANOIA) { check(patch); }
     var out = create();
@@ -380,7 +402,7 @@ var PARANOIA = module.exports.PARANOIA = true;
 var VALIDATE_ENTIRE_CHAIN_EACH_MSG = module.exports.VALIDATE_ENTIRE_CHAIN_EACH_MSG = false;
 
 /* throw errors over non-compliant messages which would otherwise be treated as invalid */
-var TESTING = module.exports.TESTING = true;
+var TESTING = module.exports.TESTING = false;
 
 var assert = module.exports.assert = function (expr) {
     if (!expr) { throw new Error("Failed assertion"); }
@@ -435,10 +457,11 @@ var REGISTER     = Message.REGISTER     = 0;
 var REGISTER_ACK = Message.REGISTER_ACK = 1;
 var PATCH        = Message.PATCH        = 2;
 var DISCONNECT   = Message.DISCONNECT   = 3;
+var CHECKPOINT   = Message.CHECKPOINT   = 4;
 
 var check = Message.check = function(msg) {
     Common.assert(msg.type === 'Message');
-    if (msg.messageType === PATCH) {
+    if (msg.messageType === PATCH || msg.messageType === CHECKPOINT) {
         Patch.check(msg.content);
         Common.assert(typeof(msg.lastMsgHash) === 'string');
     } else {
@@ -459,9 +482,8 @@ var create = Message.create = function (type, content, lastMsgHash) {
 
 var toString = Message.toString = function (msg) {
     if (Common.PARANOIA) { check(msg); }
-
-    if (msg.messageType === PATCH) {
-        return JSON.stringify([PATCH, Patch.toObj(msg.content), msg.lastMsgHash]);
+    if (msg.messageType === PATCH || msg.messageType === CHECKPOINT) {
+        return JSON.stringify([msg.messageType, Patch.toObj(msg.content), msg.lastMsgHash]);
     } else {
         throw new Error();
     }
@@ -478,43 +500,11 @@ var discardBencode = function (msg, arr) {
 };
 
 var fromString = Message.fromString = function (str) {
-    var msg = str;
-
-    if (str.charAt(0) === '[') {
-        var m = JSON.parse(str);
-        return create(m[0], Patch.fromObj(m[1]), m[2]);
-    } else {
-        /*  Just in case we receive messages in the old format,
-            we should try to parse them. We only need the content, though,
-            so just extract that and throw the rest away */
-        var last;
-        var parts = [];
-
-        // chop off all the bencoded components
-        while (msg) {
-            msg = discardBencode(msg, parts);
-        }
-
-        // grab the last component from the parts
-        // we don't need anything else
-        var contentStr = parts.slice(-1)[0];
-
-        var content = JSON.parse(contentStr);
-        var message;
-        if (content[0] === PATCH) {
-            message = create(userName, PATCH, Patch.fromObj(content[1]), content[2]);
-        } else if ([4,5].indexOf(content[0]) !== -1 /* === PING || content[0] === PONG*/) {
-            // it's a ping or pong, which we don't want to support anymore
-            message = create(userName, content[0], content[1]);
-        } else {
-            message = create(userName, content[0]);
-        }
-
-        // This check validates every operation in the patch.
-        check(message);
-
-        return message
-    }
+    var m = JSON.parse(str);
+    if (m[0] !== CHECKPOINT && m[0] !== PATCH) { throw new Error("invalid message type " + m[0]); }
+    var msg = create(m[0], Patch.fromObj(m[1]), m[2]);
+    if (m[0] === CHECKPOINT) { msg.content.isCheckpoint = true; }
+    return msg;
 };
 
 var hashOf = Message.hashOf = function (msg) {
@@ -550,8 +540,16 @@ var Sha = module.exports.Sha = require('./SHA256');
 var ChainPad = {};
 
 // hex_sha256('')
-var EMPTY_STR_HASH = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855';
-var ZERO =           '0000000000000000000000000000000000000000000000000000000000000000';
+var EMPTY_STR_HASH = module.exports.EMPTY_STR_HASH =
+    'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855';
+var ZERO = '0000000000000000000000000000000000000000000000000000000000000000';
+
+// Default number of patches between checkpoints (patches older than this will be pruned)
+// default for realtime.config.checkpointInterval
+var DEFAULT_CHECKPOINT_INTERVAL = 200;
+
+// Default number of milliseconds to wait before syncing to the server
+var DEFAULT_AVERAGE_SYNC_MILLISECONDS = 300;
 
 var enterChainPad = function (realtime, func) {
     return function () {
@@ -567,8 +565,9 @@ var debug = function (realtime, msg) {
 };
 
 var schedule = function (realtime, func, timeout) {
+    if (realtime.aborted) { return; }
     if (!timeout) {
-        timeout = Math.floor(Math.random() * 2 * realtime.avgSyncTime);
+        timeout = Math.floor(Math.random() * 2 * realtime.config.avgSyncMilliseconds);
     }
     var to = setTimeout(enterChainPad(realtime, function () {
         realtime.schedules.splice(realtime.schedules.indexOf(to), 1);
@@ -598,12 +597,52 @@ var onMessage = function (realtime, message, callback) {
     }
 };
 
+var sendMessage = function (realtime, msg, callback) {
+    var strMsg = Message.toString(msg);
+
+    onMessage(realtime, strMsg, function (err) {
+        if (err) {
+            debug(realtime, "Posting to server failed [" + err + "]");
+            realtime.pending = null;
+        } else {
+            var pending = realtime.pending;
+            realtime.pending = null;
+            Common.assert(pending.hash === msg.hashOf);
+            handleMessage(realtime, strMsg, true);
+            pending.callback();
+        }
+    });
+
+    msg.hashOf = msg.hashOf || Message.hashOf(msg);
+
+    var timeout = schedule(realtime, function () {
+        debug(realtime, "Failed to send message [" + msg.hashOf + "] to server");
+        sync(realtime);
+    }, 10000 + (Math.random() * 5000));
+
+    if (realtime.pending) { throw new Error("there is already a pending message"); }
+    realtime.pending = {
+        hash: msg.hashOf,
+        callback: function () {
+            if (realtime.initialMessage && realtime.initialMessage.hashOf === msg.hashOf) {
+                debug(realtime, "initial Ack received [" + msg.hashOf + "]");
+                realtime.initialMessage = null;
+            }
+            unschedule(realtime, timeout);
+            realtime.syncSchedule = schedule(realtime, function () { sync(realtime); }, 0);
+            callback();
+        }
+    };
+    if (Common.PARANOIA) { check(realtime); }
+};
+
 var sync = function (realtime) {
     if (Common.PARANOIA) { check(realtime); }
-    if (realtime.syncSchedule) {
+    if (realtime.syncSchedule && !realtime.pending) {
         unschedule(realtime, realtime.syncSchedule);
         realtime.syncSchedule = null;
     } else {
+        //debug(realtime, "already syncing...");
         // we're currently waiting on something from the server.
         return;
     }
@@ -617,6 +656,19 @@ var sync = function (realtime) {
         return;
     }
 
+    if (((parentCount(realtime, realtime.best) + 1) % realtime.config.checkpointInterval) === 0) {
+        var best = realtime.best;
+        debug(realtime, "Sending checkpoint");
+        var cpp = Patch.createCheckpoint(realtime.authDoc,
+                                         realtime.authDoc,
+                                         realtime.best.content.inverseOf.parentHash);
+        var cp = Message.create(Message.CHECKPOINT, cpp, realtime.best.hashOf);
+        sendMessage(realtime, cp, function () {
+            debug(realtime, "Checkpoint sent and accepted");
+        });
+        return;
+    }
+
     var msg;
     if (realtime.best === realtime.initialMessage) {
         msg = realtime.initialMessage;
@@ -624,39 +676,16 @@ var sync = function (realtime) {
         msg = Message.create(Message.PATCH, realtime.uncommitted, realtime.best.hashOf);
     }
 
-    var strMsg = Message.toString(msg);
-
-    onMessage(realtime, strMsg, function (err) {
-        if (err) {
-            debug(realtime, "Posting to server failed [" + err + "]");
-        } else {
-            handleMessage(realtime, strMsg, true);
-        }
+    sendMessage(realtime, msg, function () {
+        //debug(realtime, "patch sent");
     });
-
-    var hash = Message.hashOf(msg);
-
-    var timeout = schedule(realtime, function () {
-        debug(realtime, "Failed to send message ["+hash+"] to server");
-        sync(realtime);
-    }, 10000 + (Math.random() * 5000));
-    realtime.pending = {
-        hash: hash,
-        callback: function () {
-            if (realtime.initialMessage && realtime.initialMessage.hashOf === hash) {
-                debug(realtime, "initial Ack received ["+hash+"]");
-                realtime.initialMessage = null;
-            }
-            unschedule(realtime, timeout);
-            realtime.syncSchedule = schedule(realtime, function () { sync(realtime); }, 0);
-        }
-    };
-    if (Common.PARANOIA) { check(realtime); }
 };
 
 var create = ChainPad.create = function (config) {
     config = config || {};
     var initialState = config.initialState || '';
+    config.checkpointInterval = config.checkpointInterval || DEFAULT_CHECKPOINT_INTERVAL;
+    config.avgSyncMilliseconds = config.avgSyncMilliseconds || DEFAULT_AVERAGE_SYNC_MILLISECONDS;
 
     var realtime = {
         type: 'ChainPad',
@@ -665,7 +694,7 @@ var create = ChainPad.create = function (config) {
 
         config: config,
 
-        logLevel: typeof(config.logLevel) !== 'undefined'? config.logLevel: 1,
+        logLevel: (typeof(config.logLevel) === 'number') ? config.logLevel : 1,
 
         /** A patch representing all uncommitted work. */
         uncommitted: null,
@@ -673,18 +702,17 @@ var create = ChainPad.create = function (config) {
         uncommittedDocLength: initialState.length,
 
         patchHandlers: [],
-        opHandlers: [],
+        changeHandlers: [],
 
         messageHandlers: [],
 
         schedules: [],
+        aborted: false,
 
         syncSchedule: null,
 
         registered: false,
 
-        avgSyncTime: 100,
-
         // this is only used if PARANOIA is enabled.
         userInterfaceContent: undefined,
 
@@ -699,12 +727,6 @@ var create = ChainPad.create = function (config) {
         rootMessage: null,
 
         userName: config.userName || 'anonymous',
-
-        /**
-         * Set to the message which sets the initialState if applicable.
-         * Reset to null after the initial message has been successfully broadcasted.
-         */
-        initialMessage: null,
     };
 
     if (Common.PARANOIA) {
@@ -712,6 +734,10 @@ var create = ChainPad.create = function (config) {
     }
 
     var zeroPatch = Patch.create(EMPTY_STR_HASH);
+    if (initialState !== '') {
+        var initialOp = Operation.create(0, 0, initialState);
+        Patch.addOperation(zeroPatch, initialOp);
+    }
     zeroPatch.inverseOf = Patch.invert(zeroPatch, '');
     zeroPatch.inverseOf.inverseOf = zeroPatch;
     var zeroMsg = Message.create(Message.PATCH, zeroPatch, ZERO);
@@ -721,40 +747,12 @@ var create = ChainPad.create = function (config) {
     (realtime.messagesByParent[zeroMsg.lastMessageHash] || []).push(zeroMsg);
     realtime.rootMessage = zeroMsg;
     realtime.best = zeroMsg;
-
-    if (initialState === '') {
-        realtime.uncommitted = Patch.create(zeroPatch.inverseOf.parentHash);
-        return realtime;
-    }
-
-    var initialOp = Operation.create(0, 0, initialState);
-    var initialStatePatch = Patch.create(zeroPatch.inverseOf.parentHash);
-    Patch.addOperation(initialStatePatch, initialOp);
-    initialStatePatch.inverseOf = Patch.invert(initialStatePatch, '');
-    initialStatePatch.inverseOf.inverseOf = initialStatePatch;
-
-    // flag this patch so it can be handled specially.
-    // Specifically, we never treat an initialStatePatch as our own,
-    // we let it be reverted to prevent duplication of data.
-    initialStatePatch.isInitialStatePatch = true;
-    initialStatePatch.inverseOf.isInitialStatePatch = true;
-
     realtime.authDoc = initialState;
+    realtime.uncommitted = Patch.create(zeroPatch.inverseOf.parentHash);
+
     if (Common.PARANOIA) {
         realtime.userInterfaceContent = initialState;
     }
-    initialMessage = Message.create(Message.PATCH, initialStatePatch, zeroMsg.hashOf);
-    initialMessage.hashOf = Message.hashOf(initialMessage);
-    initialMessage.parentCount = 1;
-    initialMessage.isFromMe = true;
-
-    realtime.messages[initialMessage.hashOf] = initialMessage;
-    (realtime.messagesByParent[initialMessage.lastMessageHash] || []).push(initialMessage);
-
-    realtime.best = initialMessage;
-    realtime.uncommitted = Patch.create(initialStatePatch.inverseOf.parentHash);
-    realtime.initialMessage = initialMessage;
-
     return realtime;
 };
 
@@ -803,6 +801,17 @@ var doOperation = ChainPad.doOperation = function (realtime, op) {
     realtime.uncommittedDocLength += Operation.lengthChange(op);
 };
 
+var doPatch = ChainPad.doPatch = function (realtime, patch) {
+    if (Common.PARANOIA) {
+        check(realtime);
+        Common.assert(Patch.invert(realtime.uncommitted).parentHash === patch.parentHash);
+        realtime.userInterfaceContent = Patch.apply(patch, realtime.userInterfaceContent);
+    }
+    Patch.check(patch, realtime.uncommittedDocLength);
+    realtime.uncommitted = Patch.merge(realtime.uncommitted, patch);
+    realtime.uncommittedDocLength += Patch.lengthChange(patch);
+};
+
 var isAncestorOf = function (realtime, ancestor, decendent) {
     if (!decendent || !ancestor) { return false; }
     if (ancestor === decendent) { return true; }
@@ -858,31 +867,34 @@ var getBestChild = function (realtime, msg) {
     return best;
 };
 
+var pushUIPatch = function (realtime, patch) {
+    if (patch.operations.length) {
+        // push the uncommittedPatch out to the user interface.
+        for (var i = 0; i < realtime.patchHandlers.length; i++) {
+            realtime.patchHandlers[i](patch);
+        }
+        for (var i = 0; i < realtime.changeHandlers.length; i++) {
+            for (var j = patch.operations.length; j >= 0; j--) {
+                var op = patch.operations[j];
+                realtime.changeHandlers[i](op.offset, op.toRemove, op.toInsert);
+            }
+        }
+    }
+};
+
 var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromMe) {
 
     if (Common.PARANOIA) { check(realtime); }
     var msg = Message.fromString(msgStr);
 
-    // These are all deprecated message types
-    if (['REGISTER', 'PONG', 'DISCONNECT'].map(function (x) {
-        return Message[x];
-    }).indexOf(msg.messageType) !== -1) {
-        console.log("Deprecated message type: [%s]", msg.messageType);
+    // otherwise it's a disconnect.
+    if (msg.messageType !== Message.PATCH && msg.messageType !== Message.CHECKPOINT) {
+        debug(realtime, "unrecognized message type " + msg.messageType);
         return;
     }
 
-    // otherwise it's a disconnect.
-    if (msg.messageType !== Message.PATCH) {
-        console.error("disconnect");
-        return; }
-
     msg.hashOf = Message.hashOf(msg);
 
-    if (realtime.pending && realtime.pending.hash === msg.hashOf) {
-        realtime.pending.callback();
-        realtime.pending = null;
-    }
-
     if (realtime.messages[msg.hashOf]) {
         debug(realtime, "Patch [" + msg.hashOf + "] is already known");
         if (Common.PARANOIA) { check(realtime); }
@@ -894,10 +906,33 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         realtime.messagesByParent[msg.lastMsgHash] || []).push(msg);
 
     if (!isAncestorOf(realtime, realtime.rootMessage, msg)) {
-        // we'll probably find the missing parent later.
-        debug(realtime, "Patch [" + msg.hashOf + "] not connected to root");
-        if (Common.PARANOIA) { check(realtime); }
-        return;
+        if (realtime.rootMessage === realtime.best && msg.content.isCheckpoint) {
+            // We're starting with a trucated chain from a checkpoint, we will adopt this
+            // as the root message and go with it...
+            var userDoc = Patch.apply(realtime.uncommitted, realtime.authDoc);
+            Common.assert(!Common.PARANOIA || realtime.userInterfaceContent === userDoc);
+            var fixUserDocPatch = Patch.invert(realtime.uncommitted, realtime.authDoc);
+            Patch.addOperation(fixUserDocPatch,
+                Operation.create(0, realtime.authDoc.length, msg.content.operations[0].toInsert));
+            fixUserDocPatch =
+                Patch.simplify(fixUserDocPatch, userDoc, realtime.config.operationSimplify);
+
+            msg.parentCount = 0;
+            realtime.rootMessage = realtime.best = msg;
+
+            realtime.authDoc = msg.content.operations[0].toInsert;
+            realtime.uncommitted = Patch.create(Sha.hex_sha256(realtime.authDoc));
+            realtime.uncommittedDocLength = realtime.authDoc.length;
+            pushUIPatch(realtime, fixUserDocPatch);
+
+            if (Common.PARANOIA) { realtime.userInterfaceContent = realtime.authDoc; }
+            return;
+        } else {
+            // we'll probably find the missing parent later.
+            debug(realtime, "Patch [" + msg.hashOf + "] not connected to root");
+            if (Common.PARANOIA) { check(realtime); }
+            return;
+        }
     }
 
     // of this message fills in a hole in the chain which makes another patch better, swap to the
@@ -963,14 +998,49 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         return;
     }
 
-    var simplePatch =
-        Patch.simplify(patch, authDocAtTimeOfPatch, realtime.config.operationSimplify);
-    if (!Patch.equals(simplePatch, patch)) {
-        debug(realtime, "patch [" + msg.hashOf + "] can be simplified");
-        if (Common.PARANOIA) { check(realtime); }
-        if (Common.TESTING) { throw new Error(); }
-        delete realtime.messages[msg.hashOf];
-        return;
+    if (patch.isCheckpoint) {
+        // Ok, we have a checkpoint patch.
+        // If the chain length is not equal to checkpointInterval then this patch is invalid.
+        var i = 0;
+        var checkpointP;
+        for (var m = getParent(realtime, msg); m; m = getParent(realtime, m)) {
+            if (m.content.isCheckpoint) {
+                if (checkpointP) {
+                    checkpointP = m;
+                    break;
+                }
+                checkpointP = m;
+            }
+        }
+        if (checkpointP && checkpointP !== realtime.rootMessage) {
+            var point = parentCount(realtime, checkpointP);
+            if ((point % realtime.config.checkpointInterval) !== 0) {
+                debug(realtime, "checkpoint [" + msg.hashOf + "] at invalid point [" + point + "]");
+                if (Common.PARANOIA) { check(realtime); }
+                if (Common.TESTING) { throw new Error(); }
+                delete realtime.messages[msg.hashOf];
+                return;
+            }
+
+            // Time to prune some old messages from the chain
+            debug(realtime, "checkpoint [" + msg.hashOf + "]");
+            for (var m = getParent(realtime, checkpointP); m; m = getParent(realtime, m)) {
+                debug(realtime, "pruning [" + m.hashOf + "]");
+                delete realtime.messages[m.hashOf];
+                delete realtime.messagesByParent[m.hashOf];
+            }
+            realtime.rootMessage = checkpointP;
+        }
+    } else {
+        var simplePatch =
+            Patch.simplify(patch, authDocAtTimeOfPatch, realtime.config.operationSimplify);
+        if (!Patch.equals(simplePatch, patch)) {
+            debug(realtime, "patch [" + msg.hashOf + "] can be simplified");
+            if (Common.PARANOIA) { check(realtime); }
+            if (Common.TESTING) { throw new Error(); }
+            delete realtime.messages[msg.hashOf];
+            return;
+        }
     }
 
     patch.inverseOf = Patch.invert(patch, authDocAtTimeOfPatch);
@@ -1012,19 +1082,8 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         Common.assert(newUserInterfaceContent === realtime.userInterfaceContent);
     }
 
-    if (uncommittedPatch.operations.length) {
-        // push the uncommittedPatch out to the user interface.
-        for (var i = 0; i < realtime.patchHandlers.length; i++) {
-            realtime.patchHandlers[i](uncommittedPatch);
-        }
-        if (realtime.opHandlers.length) {
-            for (var i = uncommittedPatch.operations.length-1; i >= 0; i--) {
-                for (var j = 0; j < realtime.opHandlers.length; j++) {
-                    realtime.opHandlers[j](uncommittedPatch.operations[i]);
-                }
-            }
-        }
-    }
+    pushUIPatch(realtime, uncommittedPatch);
+
     if (Common.PARANOIA) { check(realtime); }
 };
 
@@ -1061,13 +1120,26 @@ var getDepthOfState = function (content, minDepth, realtime) {
 
 module.exports.create = function (conf) {
     var realtime = ChainPad.create(conf);
-    return {
+    var out = {
         onPatch: enterChainPad(realtime, function (handler) {
             Common.assert(typeof(handler) === 'function');
             realtime.patchHandlers.push(handler);
         }),
+        patch: enterChainPad(realtime, function (patch, x, y) {
+            if (typeof(patch) === 'number') {
+                // Actually they meant to call realtime.change()
+                out.change(patch, x, y);
+                return;
+            }
+            doPatch(realtime, patch);
+        }),
 
-        patch: enterChainPad(realtime, function (offset, count, chars) {
+        onChange: enterChainPad(realtime, function (handler) {
+            Common.assert(typeof(handler) === 'function');
+            realtime.changeHandlers.push(handler);
+        }),
+        change: enterChainPad(realtime, function (offset, count, chars) {
+            if (count === 0 && chars === '') { return; }
             doOperation(realtime, Operation.create(offset, count, chars));
         }),
 
@@ -1075,26 +1147,32 @@ module.exports.create = function (conf) {
             Common.assert(typeof(handler) === 'function');
             realtime.messageHandlers.push(handler);
         }),
+
         message: enterChainPad(realtime, function (message) {
             handleMessage(realtime, message, false);
         }),
+
         start: enterChainPad(realtime, function () {
             if (realtime.syncSchedule) { unschedule(realtime, realtime.syncSchedule); }
             realtime.syncSchedule = schedule(realtime, function () { sync(realtime); });
         }),
+
         abort: enterChainPad(realtime, function () {
+            realtime.aborted = true;
             realtime.schedules.forEach(function (s) { clearTimeout(s) });
         }),
-        sync: enterChainPad(realtime, function () {
-            sync(realtime);
-        }),
+
+        sync: enterChainPad(realtime, function () { sync(realtime); }),
+
         getAuthDoc: function () { return realtime.authDoc; },
+
         getUserDoc: function () { return Patch.apply(realtime.uncommitted, realtime.authDoc); },
 
         getDepthOfState: function (content, minDepth) {
             return getDepthOfState(content, minDepth, realtime);
         }
     };
+    return out;
 };
 
 },
diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 209c7e532..d838fda3a 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -142,19 +142,21 @@ define([
         // shim between chainpad and netflux
         chainpadAdapter = {
             msgIn : function(peerId, msg) {
-                var message = parseMessage(msg);
+                msg = msg.replace(/^cp\|/, '');
                 try {
-                    var decryptedMsg = Crypto.decrypt(message, cryptKey);
+                    var decryptedMsg = Crypto.decrypt(msg, cryptKey);
                     messagesHistory.push(decryptedMsg);
                     return decryptedMsg;
                 } catch (err) {
                     console.error(err);
-                    return message;
+                    return msg;
                 }
             },
             msgOut : function(msg, wc) {
                 try {
-                    return Crypto.encrypt(msg, cryptKey);
+                    var cmsg = Crypto.encrypt(msg, cryptKey);
+                    if (msg.indexOf('[4') === 0) { cmsg = 'cp|' + cmsg; }
+                    return cmsg;
                 } catch (err) {
                     console.log(msg);
                     throw err;

From 55846044e13b729e82d3a376fec2d2fa1b9eb60e Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 28 May 2016 00:48:10 +0200
Subject: [PATCH 212/257] rewrite underlying API. implement listeners

---
 www/json/api.js        |  57 +++---
 www/json/deep-proxy.js | 435 +++++++++++++++++++++++++++++++++++++++++
 www/json/listmap.js    | 323 ------------------------------
 3 files changed, 463 insertions(+), 352 deletions(-)
 create mode 100644 www/json/deep-proxy.js
 delete mode 100644 www/json/listmap.js

diff --git a/www/json/api.js b/www/json/api.js
index 20ace5914..bb03835a0 100644
--- a/www/json/api.js
+++ b/www/json/api.js
@@ -3,20 +3,18 @@ define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/crypto.js',
     '/common/realtime-input.js',
-    '/json/listmap.js',
     '/common/json-ot.js',
     'json.sortify',
     '/bower_components/textpatcher/TextPatcher.amd.js',
+    '/json/deep-proxy.js',
     '/bower_components/jquery/dist/jquery.min.js',
-], function (Config, Crypto, Realtime, ListMap, JsonOT, Sortify, TextPatcher) {
+], function (Config, Crypto, Realtime, JsonOT, Sortify, TextPatcher, DeepProxy) {
     var api = {};
 
-    api.ListMap = ListMap;
-
     var create = api.create = function (cfg) {
         /* validate your inputs before proceeding */
 
-        if (['object', 'array'].indexOf(ListMap.type(cfg.data))) {
+        if (['object', 'array'].indexOf(DeepProxy.type(cfg.data))) {
             throw new Error('unsupported datatype');
         }
 
@@ -28,12 +26,34 @@ define([
             cryptKey: cfg.cryptKey,
             crypto: Crypto,
             websocketURL: Config.websocketURL,
+            logLevel: 0
         };
 
         var rt;
-        var proxy = ListMap.makeProxy(cfg.data);
         var realtime;
 
+        var proxy;
+
+        var onLocal = config.onLocal = function () {
+            var strung = Sortify(proxy);
+
+            realtime.patchText(strung);
+
+            // try harder
+            if (realtime.getUserDoc() !== strung) {
+                realtime.patchText(strung);
+            }
+
+            // onLocal
+            if (cfg.onLocal) {
+                cfg.onLocal();
+            }
+
+            // TODO actually emit 'change' events, or something like them
+        };
+
+        proxy = DeepProxy.create(cfg.data, onLocal, true);
+
         var onInit = config.onInit = function (info) {
             realtime = info.realtime;
             // create your patcher
@@ -50,39 +70,18 @@ define([
             var userDoc = realtime.getUserDoc();
             var parsed = JSON.parse(userDoc);
 
-            // update your proxy to the state of the userDoc
-            Object.keys(parsed).forEach(function (key) {
-                proxy[key] = ListMap.recursiveProxies(parsed[key]);
-            });
+            DeepProxy.update(proxy, parsed);
 
             // onReady
             cfg.onReady(info);
         };
 
-        // FIXME
-        var onLocal = config.onLocal = ListMap.onLocal = function () {
-            var strung = Sortify(proxy);
-
-            realtime.patchText(strung);
-
-            // try harder
-            if (realtime.getUserDoc() !== strung) {
-                realtime.patchText(strung);
-            }
-
-            // onLocal
-            if (cfg.onLocal) {
-                cfg.onLocal();
-            }
-
-            // TODO actually emit 'change' events, or something like them
-        };
 
         var onRemote = config.onRemote = function (info) {
             var userDoc = realtime.getUserDoc();
             var parsed = JSON.parse(userDoc);
 
-            ListMap.update(proxy, parsed);
+            DeepProxy.update(proxy, parsed, onLocal);
 
             // onRemote
             if (cfg.onRemote) {
diff --git a/www/json/deep-proxy.js b/www/json/deep-proxy.js
new file mode 100644
index 000000000..ebc21bb65
--- /dev/null
+++ b/www/json/deep-proxy.js
@@ -0,0 +1,435 @@
+define([
+    '/bower_components/proxy-polyfill/proxy.min.js', // https://github.com/GoogleChrome/proxy-polyfill
+], function () {
+    // linter complains if this isn't defined
+    var Proxy = window.Proxy;
+
+    var deepProxy = {};
+
+    var isArray = deepProxy.isArray = function (obj) {
+        return Object.prototype.toString.call(obj)==='[object Array]';
+    };
+
+    /*  Arrays and nulls both register as 'object' when using native typeof
+        we need to distinguish them as their own types, so use this instead. */
+    var type = deepProxy.type = function (dat) {
+        return dat === null?  'null': isArray(dat)?'array': typeof(dat);
+    };
+
+    /*  Any time you set a value, check its type.
+        If that type is proxyable, make a new proxy. */
+    var setter = deepProxy.set = function (cb) {
+        return function (obj, prop, value) {
+            if (prop === 'on') {
+                return;
+                throw new Error("'on' is a reserved attribute name for realtime lists and maps");
+            }
+            if (obj[prop] === value) { return value; }
+
+            var t_value = type(value);
+            if (['array', 'object'].indexOf(t_value) !== -1) {
+                //console.log("Constructing new proxy for value with type [%s]", t_value);
+                var proxy = obj[prop] = deepProxy.create(value, cb);
+            } else {
+                //console.log("Setting [%s] to [%s]", prop, value);
+                obj[prop] = value;
+            }
+
+            cb();
+            return obj[prop];
+        };
+    };
+
+    var pathMatches = deepProxy.pathMatches = function (path, pattern) {
+        console.log("Comparing checking if path:[%s] matches pattern:[%s]", path.join(','), pattern.join(','));
+        return !pattern.some(function (x, i) {
+            return x !== path[i];
+        });
+    };
+
+    var getter = deepProxy.get = function (cb) {
+        var events = {
+            disconnect: [],
+            change: [],
+            ready: [],
+            remove: [],
+        };
+
+        var on = function (evt, pattern, f) {
+            switch (evt) {
+                case 'change':
+                    console.log("[MOCK] adding change listener at path [%s]", pattern.join(','));
+                    events.change.push(function (oldval, newval, path, root) {
+                        if (pathMatches(path, pattern)) {
+                            f(oldval, newval, path, root);
+                        } else {
+                            console.log("path did not match pattern!");
+                        }
+                    });
+                    break;
+                case 'ready':
+                    break;
+                case 'disconnect':
+                    break;
+                case 'delete':
+                    break;
+                default:
+                    break;
+            }
+            return true;
+        };
+
+        return function (obj, prop) {
+            if (prop === 'on') {
+                return on;
+            } else if (prop === '_events') {
+                return events;
+            }
+
+            // FIXME magic?
+            if (prop === 'length' && typeof(obj.length) === 'number') { return obj.length; }
+
+            return obj[prop];
+        };
+    };
+
+    var handlers = deepProxy.handlers = function (cb) {
+        return {
+            set: setter(cb),
+            get: getter(cb),
+        };
+    };
+
+    var create = deepProxy.create = function (obj, opt, root) {
+        var methods = type(opt) === 'function'? handlers(opt) : opt;
+        return new Proxy(obj, methods);
+    };
+
+    // onChange(path, key, root, oldval, newval)
+    var onChange = function (path, key, root, oldval, newval) {
+        var P = path.slice(0);
+        P.push(key);
+        console.log('change at path [%s]', P.join(','));
+
+        /*  TODO make this such that we can halt propogation to less specific
+            paths? */
+        root._events.change.forEach(function (f, i) {
+            f(oldval, newval, P, root);
+        });
+    };
+
+    // newval doesn't really make sense here
+    var onRemove = function (path, key, root, oldval, newval) {
+        console.log("onRemove is stubbed for now");
+        return false;
+    };
+
+    /*  compare a new object 'B' against an existing proxy object 'A'
+        provide a unary function 'f' for the purpose of constructing new
+        deep proxies from regular objects and arrays.
+
+        Supply the path as you recurse, for the purpose of emitting events
+        attached to particular paths within the complete structure.
+
+        Operates entirely via side effects on 'A'
+    */
+    var objects = deepProxy.objects = function (A, B, f, path, root) {
+        var Akeys = Object.keys(A);
+        var Bkeys = Object.keys(B);
+
+        /*  iterating over the keys in B will tell you if a new key exists
+            it will not tell you if a key has been removed.
+            to accomplish that you will need to iterate over A's keys 
+        */
+
+        /*  TODO return a truthy or falsey value (in 'objects' and 'arrays')
+            so that we have some measure of whether an object or array changed
+            (from the higher level in the tree, rather than doing everything
+            at the leaf level).
+
+            bonus points if you can defer events until the complete diff has
+            finished (collect them into an array or something, and simplify
+            the event if possible)
+        */
+
+        var hasChanged = false;
+
+        Bkeys.forEach(function (b) {
+            //console.log(b);
+            var t_b = type(B[b]);
+            var old = A[b];
+
+            if (Akeys.indexOf(b) === -1) {
+                // there was an insertion
+                //console.log("Inserting new key: [%s]", b);
+
+                // mind the fallthrough behaviour
+                switch (t_b) {
+                    case 'undefined':
+                        // umm. this should never happen?
+                        throw new Error("undefined type has key. this shouldn't happen?");
+                    case 'array':
+                    case 'object':
+                        A[b] = f(B[b]);
+                        break;
+                    default:
+                        A[b] = B[b];
+                }
+
+                // insertions are a change
+                hasChanged = true;
+
+                // onChange(path, key, root, oldval, newval)
+                onChange(path, b, root, old, B[b]);
+                return;
+            }
+
+            // else the key already existed
+            var t_a = type(A[b]);
+            if (t_a !== t_b) {
+                // its type changed!
+                console.log("type changed from [%s] to [%s]", t_a, t_b);
+                switch (t_b) {
+                    case 'undefined':
+                        // deletions are a removal
+                        //delete A[b];
+                        //onRemove(path, b, root, old, undefined);
+
+                        // this should never happen?
+                        throw new Error("first pass should never reveal undefined keys");
+                        //break;
+                    case 'array':
+                        //console.log('construct list');
+                        A[b] = f(B[b]);
+                        // make a new proxy
+                        break;
+                    case 'object':
+                        //console.log('construct map');
+                        A[b] = f(B[b]);
+                        // make a new proxy
+                        break;
+                    default:
+                        // all other datatypes just require assignment.
+                        A[b] = B[b];
+                        break;
+                }
+
+                // type changes always mean a change happened
+                onChange(path, b, root, old, B[b]);
+                return;
+            }
+
+            // values might have changed, if not types
+            if (['array', 'object'].indexOf(t_a) === -1) {
+                // it's not an array or object, so we can do deep equality
+                if (A[b] !== B[b]) {
+                    // not equal, so assign
+                    A[b] = B[b];
+
+                    hasChanged = true;
+                    onChange(path, b, root, old, B[b]);
+                }
+                return;
+            }
+
+            // else it's an array or object
+            var nextPath = path.slice(0).concat(b);
+            if (t_a === 'object') {
+                // it's an object
+
+                if (objects.call(root, A[b], B[b], f, nextPath, root)) {
+                    hasChanged = true;
+                    // TODO do you want to call onChange when an object changes?
+                    //onChange(path, b, root, old, B[b]);
+                }
+            } else {
+                // it's an array
+                if (deepProxy.arrays.call(root, A[b], B[b], f, nextPath, root)) {
+                    hasChanged = true;
+
+                    // TODO do you want to call onChange when an object changes?
+                    //onChange(path, b, root, old, B[b]);
+                }
+            }
+        });
+        Akeys.forEach(function (a) {
+            var old = A[a];
+
+            if (Bkeys.indexOf(a) === -1 || type(B[a]) === 'undefined') {
+                //console.log("Deleting [%s]", a);
+                // the key was deleted!
+                delete A[a];
+
+                onRemove(path, a, root, old, B[a]);
+            }
+        });
+
+        return hasChanged;
+    };
+
+    var arrays = deepProxy.arrays = function (A, B, f, path, root) {
+        var l_A = A.length;
+        var l_B = B.length;
+
+        var hasChanged = false;
+
+        if (l_A !== l_B) {
+            // B is longer than Aj
+            // there has been an insertion
+
+            // OR
+
+            // A is longer than B
+            // there has been a deletion
+
+            B.forEach(function (b, i) {
+                var t_a = type(A[i]);
+                var t_b = type(b);
+
+                var old = B[i];
+
+                if (t_a !== t_b) {
+                    // type changes are always destructive
+                    // that's good news because destructive is easy
+                    switch (t_b) {
+                        case 'object':
+                            A[i] = f(b);
+                            break;
+                        case 'array':
+                            A[i] = f(b);
+                            break;
+                        default:
+                            A[i] = b;
+                            break;
+                    }
+
+                    hasChanged = true;
+                    // path, key, root object, oldvalue, newvalue
+                    onChange(path, i, root, old, b);
+                } else {
+                    // same type
+                    var nextPath = path.slice(0).concat(i);
+
+                    switch (t_b) {
+                        case 'object':
+                            if (objects.call(root, A[i], b, f, nextPath, root)) {
+                                hasChanged = true;
+                                onChange(path, i, root, old, b);
+                            }
+                            break;
+                        case 'array':
+                            if (arrays.call(root, A[i], b, f, nextPath, root)) {
+                                hasChanged = true;
+                                onChange(path, i, root, old, b);
+                            }
+                            break;
+                        default:
+                            if (b !== A[i]) {
+                                A[i] = b;
+                                onChange(path, i, root, old, b);
+                                hasChanged = true;
+                            }
+                            break;
+                    }
+                }
+            });
+
+
+            if (l_A > l_B) {
+                // A was longer than B, so there have been deletions
+                var i = l_B;
+                var t_a;
+
+                for (; i < l_B; i++) {
+                    // it was most definitely a deletion
+                    onRemove(path, i, root, A[i], undefined);
+                }
+                // cool
+            }
+
+            A.length = l_B;
+            return;
+        }
+
+        // else they are the same length, iterate over their values
+        A.forEach(function (a, i) {
+            var t_a = type(a);
+            var t_b = type(B[i]);
+
+            var old = a;
+
+            // they have different types
+            if (t_a !== t_b) {
+                // watch out for fallthrough behaviour
+                switch (t_b) {
+                    case 'object':
+                    case 'array':
+                        A[i] = f(B[i]);
+                        break;
+                    default:
+                        A[i] = B[i];
+                        break;
+                }
+
+                hasChanged = true;
+                onChange(path, i, root, old, B[i]);
+                return;
+            }
+
+            // they are the same type, clone the paths array and push to it
+            var nextPath = path.slice(0).concat(i);
+
+            // same type
+            switch (t_b) {
+                case 'object':
+                    if (objects.call(root, A[i], B[i], f, nextPath, root)) {
+                        hasChanged = true;
+                        onChange(path, i, root, old, B[i]);
+                    }
+                    break;
+                case 'array':
+                    if (arrays.call(root, A[i], B[i], f, nextPath, root)) {
+                        hasChanged = true;
+                        onChange(path, i, root, old, B[i]);
+                    }
+                    break;
+                default:
+                    if (A[i] !== B[i]) {
+                        A[i] = B[i];
+                        hasChanged = true;
+                        onChange(path, i, root, old, B[i]);
+                    }
+                    break;
+            }
+        });
+        return hasChanged;
+    };
+
+    var update = deepProxy.update = function (A, B, cb) {
+        var t_A = type(A);
+        var t_B = type(B);
+
+        if (t_A !== t_B) {
+            throw new Error("Proxy updates can't result in type changes");
+        }
+
+        switch (t_B) {
+            /* use .call so you can supply a different `this` value */
+            case 'array':
+                arrays.call(A, A, B, function (obj) {
+                    return create(obj, cb);
+                }, [], A);
+                break;
+            case 'object':
+            //   arrays.call(this, A   , B   , f, path    , root)
+                objects.call(A, A, B, function (obj) {
+                    return create(obj, cb);
+                }, [], A);
+                break;
+            default:
+                throw new Error("unsupported realtime datatype");
+        }
+    };
+
+    return deepProxy;
+});
diff --git a/www/json/listmap.js b/www/json/listmap.js
deleted file mode 100644
index 998469931..000000000
--- a/www/json/listmap.js
+++ /dev/null
@@ -1,323 +0,0 @@
-define([
-    '/bower_components/proxy-polyfill/proxy.min.js', // https://github.com/GoogleChrome/proxy-polyfill
-],function () {
-    var Proxy = window.Proxy;
-
-    var ListMap = {};
-
-    var isArray = ListMap.isArray = function (obj) {
-        return Object.prototype.toString.call(obj)==='[object Array]';
-    };
-
-    /*  Arrays and nulls both register as 'object' when using native typeof
-        we need to distinguish them as their own types, so use this instead. */
-    var type = ListMap.type = function (dat) {
-        return dat === null?  'null': isArray(dat)?'array': typeof(dat);
-    };
-
-    var makeHandlers = function (cb) {
-        return {
-            get: function (obj, prop) {
-                // FIXME magic?
-                if (prop === 'length' && typeof(obj.length) === 'number') { return obj.length; }
-
-                return obj[prop];
-            },
-            set: function (obj, prop, value) {
-                if (prop === 'on') {
-                    throw new Error("'on' is a reserved attribute name for realtime lists and maps");
-                }
-                if (obj[prop] === value) { return value; }
-
-                var t_value = ListMap.type(value);
-                if (['array', 'object'].indexOf(t_value) !== -1) {
-                    console.log("Constructing new proxy for value with type [%s]", t_value);
-                    var proxy = obj[prop] = ListMap.makeProxy(value);
-                } else {
-                    console.log("Setting [%s] to [%s]", prop, value);
-                    obj[prop] = value;
-                }
-
-                cb();
-                return obj[prop];
-            },
-        };
-    };
-
-    var handlers = ListMap.handlers = {
-        get: function (obj, prop) {
-            // FIXME magic?
-            if (prop === 'length' && typeof(obj.length) === 'number') { return obj.length; }
-
-            return obj[prop];
-        },
-        set: function (obj, prop, value) {
-            if (prop === 'on') {
-                throw new Error("'on' is a reserved attribute name for realtime lists and maps");
-            }
-            if (obj[prop] === value) { return value; }
-
-            var t_value = ListMap.type(value);
-            if (['array', 'object'].indexOf(t_value) !== -1) {
-                console.log("Constructing new proxy for value with type [%s]", t_value);
-                var proxy = obj[prop] = ListMap.makeProxy(value);
-            } else {
-                console.log("Setting [%s] to [%s]", prop, value);
-                obj[prop] = value;
-            }
-
-            // FIXME this is NO GOOD
-            ListMap.onLocal();
-            return obj[prop];
-        }
-    };
-
-    var makeProxy = ListMap.makeProxy = function (obj, local) {
-        local = local || ListMap.onLocal;
-
-        return new Proxy(obj, handlers); //makeHandlers(ListMap.onLocal));
-    };
-
-    var recursiveProxies = ListMap.recursiveProxies = function (obj) {
-        var t_obj = type(obj);
-
-        var proxy;
-
-        switch (t_obj) {
-            case 'object':
-                proxy = makeProxy({});
-                ListMap.objects(proxy, obj, makeProxy, []);
-                return proxy;
-            case 'array':
-                proxy = makeProxy([]);
-                ListMap.arrays(proxy, obj, makeProxy, []);
-                return proxy;
-            default:
-                return obj;
-        }
-    };
-
-    var onChange = function (path, key) {
-        var P = path.slice(0);
-        P.push(key);
-        console.log('change at path [%s]', P.join(','));
-    };
-
-    /*  ListMap objects A and B, where A is the _older_ of the two */
-    ListMap.objects = function (A, B, f, path) {
-        var Akeys = Object.keys(A);
-        var Bkeys = Object.keys(B);
-
-        //console.log("inspecting path [%s]", path.join(','));
-
-        /*  iterating over the keys in B will tell you if a new key exists
-            it will not tell you if a key has been removed.
-            to accomplish that you will need to iterate over A's keys */
-        Bkeys.forEach(function (b) {
-            //console.log(b);
-            var t_b = type(B[b]);
-
-            if (Akeys.indexOf(b) === -1) {
-                // there was an insertion
-                console.log("Inserting new key: [%s]", b);
-                onChange(path, b);
-
-                switch (t_b) {
-                    case 'undefined':
-                        // umm. this should never happen?
-                        throw new Error("undefined type has key. this shouldn't happen?");
-                        //break;
-                    case 'array':
-                        //console.log('construct list');
-                        A[b] = f(B[b]);
-                        break;
-                    case 'object':
-                        //console.log('construct map');
-                        A[b] = f(B[b]);
-                        break;
-                    default:
-                        A[b] = B[b];
-                        break;
-                }
-            } else {
-                // the key already existed
-                var t_a = type(A[b]);
-
-                if (t_a !== t_b) {
-                    // its type changed!
-                    console.log("type changed from [%s] to [%s]", t_a, t_b);
-                    switch (t_b) {
-                        case 'undefined':
-                            delete A[b];
-                            break;
-                        case 'array':
-                            //console.log('construct list');
-                            A[b] = f(B[b]);
-                            // make a new proxy
-                            break;
-                        case 'object':
-                            //console.log('construct map');
-                            A[b] = f(B[b]);
-                            // make a new proxy
-                            break;
-                        default:
-                            // all other datatypes just require assignment.
-                            A[b] = B[b];
-                            break;
-                    }
-                } else {
-                    // did values change?
-
-                    if (['array', 'object'].indexOf(t_a) === -1) {
-                        // we can do deep equality...
-                        if (A[b] !== B[b]) {
-                            onChange(path, b);
-                            console.log("changed values from [%s] to [%s]", A[b], B[b]);
-                            A[b] = B[b];
-                        }
-                    } else {
-                        var nextPath = path.slice(0);
-                        nextPath.push(b);
-                        if (t_a === 'object') {
-                            // it's an object
-                            ListMap.objects(A[b], B[b], f, nextPath);
-                        } else {
-                            // it's an array
-                            ListMap.arrays(A[b], B[b], f, nextPath);
-                        }
-                    }
-                }
-            }
-        });
-        Akeys.forEach(function (a) {
-            if (Bkeys.indexOf(a) === -1 || type(B[a]) === 'undefined') {
-                onChange(path, a);
-                console.log("Deleting [%s]", a);
-                // the key was deleted!
-                delete A[a];
-            }
-        });
-    };
-
-    ListMap.arrays = function (A, B, f, path) {
-        var l_A = A.length;
-        var l_B = B.length;
-
-        // TODO do things with the path (callbacks)
-
-        if (l_A !== l_B) {
-            // B is longer than Aj
-            // there has been an insertion
-
-            // OR
-
-            // A is longer than B
-            // there has been a deletion
-
-            B.forEach(function (b, i) {
-                var t_a = type(A[i]);
-                var t_b = type(b);
-
-                if (t_a !== t_b) {
-                    // type changes are always destructive
-                    // that's good news because destructive is easy
-                    switch (t_b) {
-                        case 'object':
-                            A[i] = f(b);
-                            break;
-                        case 'array':
-                            A[i] = f(b);
-                            break;
-                        default:
-                            A[i] = b;
-                            break;
-                    }
-                } else {
-                    // same type
-                    var nextPath = path.slice(0);
-                    nextPath.push(i);
-
-                    switch (t_b) {
-                        case 'object':
-                            ListMap.objects(A[i], b, f, nextPath);
-                            break;
-                        case 'array':
-                            ListMap.arrays(A[i], b, f, nextPath);
-                            break;
-                        default:
-                            onChange(path, i);
-                            A[i] = b;
-                            break;
-                    }
-                }
-            });
-            return;
-        } else {
-            // they are the same length...
-            A.forEach(function (a, i) {
-                var t_a = type(a);
-                var t_b = type(B[i]);
-
-                if (t_a !== t_b) {
-                    switch (t_b) {
-                        case 'object':
-                            A[i] = f(B[i]);
-                            break;
-                        case 'array':
-                            A[i] = f(B[i]);
-                            break;
-                        default:
-                            A[i] = B[i];
-                            break;
-                    }
-                    return;
-                } else {
-                    var nextPath = path.slice(0);
-                    nextPath.push(i);
-
-                    // same type
-                    switch (t_b) {
-                        case 'object':
-                            ListMap.objects(A[i], B[i], f, nextPath);
-                            break;
-                        case 'array':
-                            ListMap.arrays(A[i], B[i], f, nextPath);
-                            break;
-                        default:
-                            A[i] = B[i];
-                            break;
-                    }
-                }
-            });
-        }
-    };
-
-    var update = ListMap.update = function (A, B) {
-
-        var t_A = type(A);
-        var t_B = type(B);
-
-        if (t_A !== t_B) {
-            throw new Error("Proxy updates can't result in type changes");
-        }
-
-        switch (t_B) {
-            case 'array':
-                ListMap.arrays(A, B, function (obj) {
-                    return makeProxy(obj);
-                });
-                // idk
-                break;
-            case 'object':
-                ListMap.objects(A, B, function (obj) {
-                    //console.log("constructing new proxy for type [%s]", type(obj));
-                    return makeProxy(obj);
-                }, []);
-                break;
-            default:
-                throw new Error("unsupported realtime datatype");
-        }
-    };
-
-    return ListMap;
-});

From e189092ba82f657538e3d463e5251bac75e7c37e Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 28 May 2016 00:48:52 +0200
Subject: [PATCH 213/257] document/spec the listmap api in its current/intended
 form

---
 www/json/README.md | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/www/json/README.md b/www/json/README.md
index 5beacac5c..ec1a8f340 100644
--- a/www/json/README.md
+++ b/www/json/README.md
@@ -78,4 +78,48 @@ Since objects are deserialized and created on each client, you will not be able
 
 Object equality _might_ work if the comparison is performed on the same client that initially created the object, but relying on this kind of behaviour is not advisable.
 
+## Listeners
+
+You can add a listener to an attribute (via its path relative to the root realtime object).
+
+There are various types of listeners
+
+* change
+* remove
+* disconnect
+* ready
+
+### Semantics
+
+Suppose you have a realtime object `A` containing nested structures.
+
+```
+{
+    a: {
+        b: {
+            c: 5
+        }
+    },
+    d: {
+        e: [
+            1,
+            4,
+            9
+        ]
+    }
+}
+```
+
+If you want to be alerted whenever the second element in the array `e` within `d` changes, you can attach a listener like so:
+
+```
+A.on('change', ['d', 'e', 1], function (oldval, newval, path, rootObject) {
+    /* do something with these values */
+    console.log("value changes from %s to %s", oldval, newval);
+});
+```
+
+## Known Bugs
+
+there is currently an issue with popping the last element of an array.
 

From a0c73c95d84eece36fc22410b0b6775599c2ffad Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 28 May 2016 13:13:54 +0200
Subject: [PATCH 214/257] do away with a bit of boilerplate

---
 www/common/cryptpad-common.js | 19 +++++++++++++++++++
 www/json/main.js              | 20 ++++++--------------
 2 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 www/common/cryptpad-common.js

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
new file mode 100644
index 000000000..c69b8e407
--- /dev/null
+++ b/www/common/cryptpad-common.js
@@ -0,0 +1,19 @@
+define([
+    '/common/crypto.js',
+], function (Crypto) {
+    var common = {};
+
+    var getSecrets = common.getSecrets = function () {
+        var secret = {};
+        if (!/#/.test(window.location.href)) {
+            secret.key = Crypto.genKey();
+        } else {
+            var hash = window.location.hash.slice(1);
+            secret.channel = hash.slice(0, 32);
+            secret.key = hash.slice(32);
+        }
+        return secret;
+    };
+
+    return common;
+});
diff --git a/www/json/main.js b/www/json/main.js
index 5e96cea5e..28865d852 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -1,24 +1,16 @@
 define([
     '/json/api.js',
     '/common/crypto.js',
+    '/common/cryptpad-common.js',
     //'/customize/pad.js'
-], function (RtListMap, Crypto) {
+], function (RtListMap, Crypto, Common) {
     var $ = window.jQuery;
 
-    var key;
-    var channel = '';
-    var hash = false;
-    if (!/#/.test(window.location.href)) {
-        key = Crypto.genKey();
-    } else {
-        hash = window.location.hash.slice(1);
-        channel = hash.slice(0,32);
-        key = hash.slice(32);
-    }
+    var secret = Common.getSecrets();
 
     var config = {
-        channel: channel,
-        cryptKey: key,
+        channel: secret.channel,
+        cryptKey: secret.key,
         data: {},
     };
 
@@ -38,7 +30,7 @@ define([
     // or just remove?
     var onInit = config.onInit = function (info) {
         console.log("initializing!");
-        window.location.hash = info.channel + key;
+        window.location.hash = info.channel + secret.key;
     };
 
     // TODO replace with `proxy.on('ready'` ?

From 7c63219add091c228f9d503c3cdd7ba0dd425481 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 28 May 2016 13:15:06 +0200
Subject: [PATCH 215/257] fix some minor bugs

---
 www/json/api.js        |  1 -
 www/json/deep-proxy.js | 20 ++++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/www/json/api.js b/www/json/api.js
index bb03835a0..ad540c275 100644
--- a/www/json/api.js
+++ b/www/json/api.js
@@ -76,7 +76,6 @@ define([
             cfg.onReady(info);
         };
 
-
         var onRemote = config.onRemote = function (info) {
             var userDoc = realtime.getUserDoc();
             var parsed = JSON.parse(userDoc);
diff --git a/www/json/deep-proxy.js b/www/json/deep-proxy.js
index ebc21bb65..3a86993de 100644
--- a/www/json/deep-proxy.js
+++ b/www/json/deep-proxy.js
@@ -6,6 +6,13 @@ define([
 
     var deepProxy = {};
 
+    // for passing messages while recursing. use powers of two in case we ever
+    // need to pass multiple message types (via bitpacking)
+    var Messages = deepProxy.Messages = {
+        CHANGE: 1,
+        REMOVE: 2
+    };
+
     var isArray = deepProxy.isArray = function (obj) {
         return Object.prototype.toString.call(obj)==='[object Array]';
     };
@@ -21,10 +28,8 @@ define([
     var setter = deepProxy.set = function (cb) {
         return function (obj, prop, value) {
             if (prop === 'on') {
-                return;
                 throw new Error("'on' is a reserved attribute name for realtime lists and maps");
             }
-            if (obj[prop] === value) { return value; }
 
             var t_value = type(value);
             if (['array', 'object'].indexOf(t_value) !== -1) {
@@ -36,7 +41,7 @@ define([
             }
 
             cb();
-            return obj[prop];
+            return obj[prop] || true; // always return truthey or you have problems
         };
     };
 
@@ -58,6 +63,9 @@ define([
         var on = function (evt, pattern, f) {
             switch (evt) {
                 case 'change':
+                    // pattern needs to be an array
+                    pattern = type(pattern) === 'array'?  pattern: [pattern];
+
                     console.log("[MOCK] adding change listener at path [%s]", pattern.join(','));
                     events.change.push(function (oldval, newval, path, root) {
                         if (pathMatches(path, pattern)) {
@@ -85,10 +93,6 @@ define([
             } else if (prop === '_events') {
                 return events;
             }
-
-            // FIXME magic?
-            if (prop === 'length' && typeof(obj.length) === 'number') { return obj.length; }
-
             return obj[prop];
         };
     };
@@ -286,7 +290,7 @@ define([
                 var t_a = type(A[i]);
                 var t_b = type(b);
 
-                var old = B[i];
+                var old = A[i];
 
                 if (t_a !== t_b) {
                     // type changes are always destructive

From e86a3567bedc4eb4c3c21fdde3de4e917ce2f0b3 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Sat, 28 May 2016 13:51:24 +0200
Subject: [PATCH 216/257] more minor bugfixes and general improvements

off by one error in deletion loop (and undefined references)
sort listeners by pattern specificity
deletions are changes (for now)
---
 www/json/deep-proxy.js | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/www/json/deep-proxy.js b/www/json/deep-proxy.js
index 3a86993de..67570d6e1 100644
--- a/www/json/deep-proxy.js
+++ b/www/json/deep-proxy.js
@@ -46,7 +46,7 @@ define([
     };
 
     var pathMatches = deepProxy.pathMatches = function (path, pattern) {
-        console.log("Comparing checking if path:[%s] matches pattern:[%s]", path.join(','), pattern.join(','));
+        console.log("checking if path:[%s] matches pattern:[%s]", path.join(','), pattern.join(','));
         return !pattern.some(function (x, i) {
             return x !== path[i];
         });
@@ -67,13 +67,19 @@ define([
                     pattern = type(pattern) === 'array'?  pattern: [pattern];
 
                     console.log("[MOCK] adding change listener at path [%s]", pattern.join(','));
-                    events.change.push(function (oldval, newval, path, root) {
-                        if (pathMatches(path, pattern)) {
-                            f(oldval, newval, path, root);
-                        } else {
-                            console.log("path did not match pattern!");
-                        }
+                    events.change.push({
+                        cb: function (oldval, newval, path, root) {
+                            if (pathMatches(path, pattern)) {
+                                return f(oldval, newval, path, root);
+                            } else {
+                                console.log("path did not match pattern!");
+                            }
+                        },
+                        pattern: pattern,
                     });
+                    // sort into descending order so we evaluate in order of specificity
+                    events.change.sort(function (a, b) { return b.length - a.length; });
+
                     break;
                 case 'ready':
                     break;
@@ -117,8 +123,8 @@ define([
 
         /*  TODO make this such that we can halt propogation to less specific
             paths? */
-        root._events.change.forEach(function (f, i) {
-            f(oldval, newval, P, root);
+        root._events.change.forEach(function (handler, i) {
+            return handler.cb(oldval, newval, P, root);
         });
     };
 
@@ -143,7 +149,7 @@ define([
 
         /*  iterating over the keys in B will tell you if a new key exists
             it will not tell you if a key has been removed.
-            to accomplish that you will need to iterate over A's keys 
+            to accomplish that you will need to iterate over A's keys
         */
 
         /*  TODO return a truthy or falsey value (in 'objects' and 'arrays')
@@ -264,7 +270,9 @@ define([
                 // the key was deleted!
                 delete A[a];
 
-                onRemove(path, a, root, old, B[a]);
+                // FIXME
+                //onRemove(path, a, root, old, B[a]);
+                onChange(path, a, root, old, B[a]);
             }
         });
 
@@ -338,15 +346,15 @@ define([
                 }
             });
 
-
             if (l_A > l_B) {
                 // A was longer than B, so there have been deletions
                 var i = l_B;
                 var t_a;
 
-                for (; i < l_B; i++) {
-                    // it was most definitely a deletion
-                    onRemove(path, i, root, A[i], undefined);
+                for (; i <= l_B; i++) {
+                    // FIXME
+                    //onRemove(path, i, root, A[i], undefined);
+                    onChange(path, i, root, A[i], B[i]);
                 }
                 // cool
             }

From 3afd144562cafc0967a8c4071d4f56366e74d706 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 30 May 2016 10:17:46 +0200
Subject: [PATCH 217/257] don't make noise when adding a listener

---
 www/json/deep-proxy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/json/deep-proxy.js b/www/json/deep-proxy.js
index 67570d6e1..48619a9fc 100644
--- a/www/json/deep-proxy.js
+++ b/www/json/deep-proxy.js
@@ -66,7 +66,7 @@ define([
                     // pattern needs to be an array
                     pattern = type(pattern) === 'array'?  pattern: [pattern];
 
-                    console.log("[MOCK] adding change listener at path [%s]", pattern.join(','));
+                    //console.log("adding change listener at path [%s]", pattern.join(','));
                     events.change.push({
                         cb: function (oldval, newval, path, root) {
                             if (pathMatches(path, pattern)) {

From 599f5aeec80e8bc98e6dd17f66ac282dac0950e0 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 30 May 2016 10:18:08 +0200
Subject: [PATCH 218/257] add sample listeners for debugging

---
 www/json/main.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/json/main.js b/www/json/main.js
index 28865d852..15b651b0b 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -63,4 +63,8 @@ define([
             $repl.val('');
         }
     });
+
+    // debugging TODO remove
+    //rt.proxy.on('change', 'u', (o, n) => console.log("'u' changed!", o,n));
+    //rt.proxy.on('change', ['u', 2], (o, n) => (console.log("'u[2]' changed!", o, n), true));
 });

From 6e2e8bf21f3a2f36d681ee07527eb3bc950c4062 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 30 May 2016 10:20:08 +0200
Subject: [PATCH 219/257] Revert "Added checkpoints with the new code from
 ChainPad"

This reverts commit da2bfe2de90aa7c51d783dff2c5b0b859400744a.
---
 NetfluxWebsocketSrv.js       |  22 +-
 www/common/chainpad.js       | 396 ++++++++++++++---------------------
 www/common/realtime-input.js |  10 +-
 3 files changed, 164 insertions(+), 264 deletions(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 03889ee8e..8ce1ab442 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -87,27 +87,7 @@ dropUser = function (ctx, user) {
 };
 
 const getHistory = function (ctx, channelName, handler, cb) {
-    var messageBuf = [];
-    ctx.store.getMessages(channelName, function (msgStr) {
-        messageBuf.push(JSON.parse(msgStr));
-    }, function () {
-        var startPoint;
-        var cpCount = 0;
-        var msgBuff2 = [];
-        for (startPoint = messageBuf.length - 1; startPoint >= 0; startPoint--) {
-            var msg = messageBuf[startPoint];
-            msgBuff2.push(msg);
-            if (msg[2] === 'MSG' && msg[4].indexOf('cp|') === 0) {
-                cpCount++;
-                if (cpCount >= 2) {
-                    for (var x = msgBuff2.pop(); x; x = msgBuff2.pop()) { handler(x); }
-                    break;
-                }
-            }
-            //console.log(messageBuf[startPoint]);
-        }
-        cb();
-    });
+    ctx.store.getMessages(channelName, function (msgStr) { handler(JSON.parse(msgStr)); }, cb);
 };
 
 const randName = function () { return Crypto.randomBytes(16).toString('hex'); };
diff --git a/www/common/chainpad.js b/www/common/chainpad.js
index e93330845..8d9ec786b 100644
--- a/www/common/chainpad.js
+++ b/www/common/chainpad.js
@@ -28,8 +28,7 @@ var create = Patch.create = function (parentHash) {
     return {
         type: 'Patch',
         operations: [],
-        parentHash: parentHash,
-        isCheckpoint: false
+        parentHash: parentHash
     };
 };
 
@@ -46,13 +45,6 @@ var check = Patch.check = function (patch, docLength_opt) {
             docLength_opt += Operation.lengthChange(patch.operations[i]);
         }
     }
-    if (patch.isCheckpoint) {
-        Common.assert(patch.operations.length === 1);
-        Common.assert(patch.operations[0].offset === 0);
-        if (typeof(docLength_opt) === 'number') {
-            Common.assert(!docLength_opt || patch.operations[0].toRemove === docLength_opt);
-        }
-    }
 };
 
 var toObj = Patch.toObj = function (patch) {
@@ -112,20 +104,6 @@ var addOperation = Patch.addOperation = function (patch, op) {
     if (Common.PARANOIA) { check(patch); }
 };
 
-var createCheckpoint = Patch.createCheckpoint =
-    function (parentContent, checkpointContent, parentContentHash_opt)
-{
-    var op = Operation.create(0, parentContent.length, checkpointContent);
-    if (Common.PARANOIA && parentContentHash_opt) {
-        Common.assert(parentContentHash_opt === hash(parentContent));
-    }
-    parentContentHash_opt = parentContentHash_opt || hash(parentContent);
-    var out = create(parentContentHash_opt);
-    addOperation(out, op);
-    out.isCheckpoint = true;
-    return out;
-};
-
 var clone = Patch.clone = function (patch) {
     if (Common.PARANOIA) { check(patch); }
     var out = create();
@@ -402,7 +380,7 @@ var PARANOIA = module.exports.PARANOIA = true;
 var VALIDATE_ENTIRE_CHAIN_EACH_MSG = module.exports.VALIDATE_ENTIRE_CHAIN_EACH_MSG = false;
 
 /* throw errors over non-compliant messages which would otherwise be treated as invalid */
-var TESTING = module.exports.TESTING = false;
+var TESTING = module.exports.TESTING = true;
 
 var assert = module.exports.assert = function (expr) {
     if (!expr) { throw new Error("Failed assertion"); }
@@ -457,11 +435,10 @@ var REGISTER     = Message.REGISTER     = 0;
 var REGISTER_ACK = Message.REGISTER_ACK = 1;
 var PATCH        = Message.PATCH        = 2;
 var DISCONNECT   = Message.DISCONNECT   = 3;
-var CHECKPOINT   = Message.CHECKPOINT   = 4;
 
 var check = Message.check = function(msg) {
     Common.assert(msg.type === 'Message');
-    if (msg.messageType === PATCH || msg.messageType === CHECKPOINT) {
+    if (msg.messageType === PATCH) {
         Patch.check(msg.content);
         Common.assert(typeof(msg.lastMsgHash) === 'string');
     } else {
@@ -482,8 +459,9 @@ var create = Message.create = function (type, content, lastMsgHash) {
 
 var toString = Message.toString = function (msg) {
     if (Common.PARANOIA) { check(msg); }
-    if (msg.messageType === PATCH || msg.messageType === CHECKPOINT) {
-        return JSON.stringify([msg.messageType, Patch.toObj(msg.content), msg.lastMsgHash]);
+
+    if (msg.messageType === PATCH) {
+        return JSON.stringify([PATCH, Patch.toObj(msg.content), msg.lastMsgHash]);
     } else {
         throw new Error();
     }
@@ -500,11 +478,43 @@ var discardBencode = function (msg, arr) {
 };
 
 var fromString = Message.fromString = function (str) {
-    var m = JSON.parse(str);
-    if (m[0] !== CHECKPOINT && m[0] !== PATCH) { throw new Error("invalid message type " + m[0]); }
-    var msg = create(m[0], Patch.fromObj(m[1]), m[2]);
-    if (m[0] === CHECKPOINT) { msg.content.isCheckpoint = true; }
-    return msg;
+    var msg = str;
+
+    if (str.charAt(0) === '[') {
+        var m = JSON.parse(str);
+        return create(m[0], Patch.fromObj(m[1]), m[2]);
+    } else {
+        /*  Just in case we receive messages in the old format,
+            we should try to parse them. We only need the content, though,
+            so just extract that and throw the rest away */
+        var last;
+        var parts = [];
+
+        // chop off all the bencoded components
+        while (msg) {
+            msg = discardBencode(msg, parts);
+        }
+
+        // grab the last component from the parts
+        // we don't need anything else
+        var contentStr = parts.slice(-1)[0];
+
+        var content = JSON.parse(contentStr);
+        var message;
+        if (content[0] === PATCH) {
+            message = create(userName, PATCH, Patch.fromObj(content[1]), content[2]);
+        } else if ([4,5].indexOf(content[0]) !== -1 /* === PING || content[0] === PONG*/) {
+            // it's a ping or pong, which we don't want to support anymore
+            message = create(userName, content[0], content[1]);
+        } else {
+            message = create(userName, content[0]);
+        }
+
+        // This check validates every operation in the patch.
+        check(message);
+
+        return message
+    }
 };
 
 var hashOf = Message.hashOf = function (msg) {
@@ -540,16 +550,8 @@ var Sha = module.exports.Sha = require('./SHA256');
 var ChainPad = {};
 
 // hex_sha256('')
-var EMPTY_STR_HASH = module.exports.EMPTY_STR_HASH =
-    'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855';
-var ZERO = '0000000000000000000000000000000000000000000000000000000000000000';
-
-// Default number of patches between checkpoints (patches older than this will be pruned)
-// default for realtime.config.checkpointInterval
-var DEFAULT_CHECKPOINT_INTERVAL = 200;
-
-// Default number of milliseconds to wait before syncing to the server
-var DEFAULT_AVERAGE_SYNC_MILLISECONDS = 300;
+var EMPTY_STR_HASH = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855';
+var ZERO =           '0000000000000000000000000000000000000000000000000000000000000000';
 
 var enterChainPad = function (realtime, func) {
     return function () {
@@ -565,9 +567,8 @@ var debug = function (realtime, msg) {
 };
 
 var schedule = function (realtime, func, timeout) {
-    if (realtime.aborted) { return; }
     if (!timeout) {
-        timeout = Math.floor(Math.random() * 2 * realtime.config.avgSyncMilliseconds);
+        timeout = Math.floor(Math.random() * 2 * realtime.avgSyncTime);
     }
     var to = setTimeout(enterChainPad(realtime, function () {
         realtime.schedules.splice(realtime.schedules.indexOf(to), 1);
@@ -597,52 +598,12 @@ var onMessage = function (realtime, message, callback) {
     }
 };
 
-var sendMessage = function (realtime, msg, callback) {
-    var strMsg = Message.toString(msg);
-
-    onMessage(realtime, strMsg, function (err) {
-        if (err) {
-            debug(realtime, "Posting to server failed [" + err + "]");
-            realtime.pending = null;
-        } else {
-            var pending = realtime.pending;
-            realtime.pending = null;
-            Common.assert(pending.hash === msg.hashOf);
-            handleMessage(realtime, strMsg, true);
-            pending.callback();
-        }
-    });
-
-    msg.hashOf = msg.hashOf || Message.hashOf(msg);
-
-    var timeout = schedule(realtime, function () {
-        debug(realtime, "Failed to send message [" + msg.hashOf + "] to server");
-        sync(realtime);
-    }, 10000 + (Math.random() * 5000));
-
-    if (realtime.pending) { throw new Error("there is already a pending message"); }
-    realtime.pending = {
-        hash: msg.hashOf,
-        callback: function () {
-            if (realtime.initialMessage && realtime.initialMessage.hashOf === msg.hashOf) {
-                debug(realtime, "initial Ack received [" + msg.hashOf + "]");
-                realtime.initialMessage = null;
-            }
-            unschedule(realtime, timeout);
-            realtime.syncSchedule = schedule(realtime, function () { sync(realtime); }, 0);
-            callback();
-        }
-    };
-    if (Common.PARANOIA) { check(realtime); }
-};
-
 var sync = function (realtime) {
     if (Common.PARANOIA) { check(realtime); }
-    if (realtime.syncSchedule && !realtime.pending) {
+    if (realtime.syncSchedule) {
         unschedule(realtime, realtime.syncSchedule);
         realtime.syncSchedule = null;
     } else {
-        //debug(realtime, "already syncing...");
         // we're currently waiting on something from the server.
         return;
     }
@@ -656,19 +617,6 @@ var sync = function (realtime) {
         return;
     }
 
-    if (((parentCount(realtime, realtime.best) + 1) % realtime.config.checkpointInterval) === 0) {
-        var best = realtime.best;
-        debug(realtime, "Sending checkpoint");
-        var cpp = Patch.createCheckpoint(realtime.authDoc,
-                                         realtime.authDoc,
-                                         realtime.best.content.inverseOf.parentHash);
-        var cp = Message.create(Message.CHECKPOINT, cpp, realtime.best.hashOf);
-        sendMessage(realtime, cp, function () {
-            debug(realtime, "Checkpoint sent and accepted");
-        });
-        return;
-    }
-
     var msg;
     if (realtime.best === realtime.initialMessage) {
         msg = realtime.initialMessage;
@@ -676,16 +624,39 @@ var sync = function (realtime) {
         msg = Message.create(Message.PATCH, realtime.uncommitted, realtime.best.hashOf);
     }
 
-    sendMessage(realtime, msg, function () {
-        //debug(realtime, "patch sent");
+    var strMsg = Message.toString(msg);
+
+    onMessage(realtime, strMsg, function (err) {
+        if (err) {
+            debug(realtime, "Posting to server failed [" + err + "]");
+        } else {
+            handleMessage(realtime, strMsg, true);
+        }
     });
+
+    var hash = Message.hashOf(msg);
+
+    var timeout = schedule(realtime, function () {
+        debug(realtime, "Failed to send message ["+hash+"] to server");
+        sync(realtime);
+    }, 10000 + (Math.random() * 5000));
+    realtime.pending = {
+        hash: hash,
+        callback: function () {
+            if (realtime.initialMessage && realtime.initialMessage.hashOf === hash) {
+                debug(realtime, "initial Ack received ["+hash+"]");
+                realtime.initialMessage = null;
+            }
+            unschedule(realtime, timeout);
+            realtime.syncSchedule = schedule(realtime, function () { sync(realtime); }, 0);
+        }
+    };
+    if (Common.PARANOIA) { check(realtime); }
 };
 
 var create = ChainPad.create = function (config) {
     config = config || {};
     var initialState = config.initialState || '';
-    config.checkpointInterval = config.checkpointInterval || DEFAULT_CHECKPOINT_INTERVAL;
-    config.avgSyncMilliseconds = config.avgSyncMilliseconds || DEFAULT_AVERAGE_SYNC_MILLISECONDS;
 
     var realtime = {
         type: 'ChainPad',
@@ -694,7 +665,7 @@ var create = ChainPad.create = function (config) {
 
         config: config,
 
-        logLevel: (typeof(config.logLevel) === 'number') ? config.logLevel : 1,
+        logLevel: typeof(config.logLevel) !== 'undefined'? config.logLevel: 1,
 
         /** A patch representing all uncommitted work. */
         uncommitted: null,
@@ -702,17 +673,18 @@ var create = ChainPad.create = function (config) {
         uncommittedDocLength: initialState.length,
 
         patchHandlers: [],
-        changeHandlers: [],
+        opHandlers: [],
 
         messageHandlers: [],
 
         schedules: [],
-        aborted: false,
 
         syncSchedule: null,
 
         registered: false,
 
+        avgSyncTime: 100,
+
         // this is only used if PARANOIA is enabled.
         userInterfaceContent: undefined,
 
@@ -727,6 +699,12 @@ var create = ChainPad.create = function (config) {
         rootMessage: null,
 
         userName: config.userName || 'anonymous',
+
+        /**
+         * Set to the message which sets the initialState if applicable.
+         * Reset to null after the initial message has been successfully broadcasted.
+         */
+        initialMessage: null,
     };
 
     if (Common.PARANOIA) {
@@ -734,10 +712,6 @@ var create = ChainPad.create = function (config) {
     }
 
     var zeroPatch = Patch.create(EMPTY_STR_HASH);
-    if (initialState !== '') {
-        var initialOp = Operation.create(0, 0, initialState);
-        Patch.addOperation(zeroPatch, initialOp);
-    }
     zeroPatch.inverseOf = Patch.invert(zeroPatch, '');
     zeroPatch.inverseOf.inverseOf = zeroPatch;
     var zeroMsg = Message.create(Message.PATCH, zeroPatch, ZERO);
@@ -747,12 +721,40 @@ var create = ChainPad.create = function (config) {
     (realtime.messagesByParent[zeroMsg.lastMessageHash] || []).push(zeroMsg);
     realtime.rootMessage = zeroMsg;
     realtime.best = zeroMsg;
-    realtime.authDoc = initialState;
-    realtime.uncommitted = Patch.create(zeroPatch.inverseOf.parentHash);
 
+    if (initialState === '') {
+        realtime.uncommitted = Patch.create(zeroPatch.inverseOf.parentHash);
+        return realtime;
+    }
+
+    var initialOp = Operation.create(0, 0, initialState);
+    var initialStatePatch = Patch.create(zeroPatch.inverseOf.parentHash);
+    Patch.addOperation(initialStatePatch, initialOp);
+    initialStatePatch.inverseOf = Patch.invert(initialStatePatch, '');
+    initialStatePatch.inverseOf.inverseOf = initialStatePatch;
+
+    // flag this patch so it can be handled specially.
+    // Specifically, we never treat an initialStatePatch as our own,
+    // we let it be reverted to prevent duplication of data.
+    initialStatePatch.isInitialStatePatch = true;
+    initialStatePatch.inverseOf.isInitialStatePatch = true;
+
+    realtime.authDoc = initialState;
     if (Common.PARANOIA) {
         realtime.userInterfaceContent = initialState;
     }
+    initialMessage = Message.create(Message.PATCH, initialStatePatch, zeroMsg.hashOf);
+    initialMessage.hashOf = Message.hashOf(initialMessage);
+    initialMessage.parentCount = 1;
+    initialMessage.isFromMe = true;
+
+    realtime.messages[initialMessage.hashOf] = initialMessage;
+    (realtime.messagesByParent[initialMessage.lastMessageHash] || []).push(initialMessage);
+
+    realtime.best = initialMessage;
+    realtime.uncommitted = Patch.create(initialStatePatch.inverseOf.parentHash);
+    realtime.initialMessage = initialMessage;
+
     return realtime;
 };
 
@@ -801,17 +803,6 @@ var doOperation = ChainPad.doOperation = function (realtime, op) {
     realtime.uncommittedDocLength += Operation.lengthChange(op);
 };
 
-var doPatch = ChainPad.doPatch = function (realtime, patch) {
-    if (Common.PARANOIA) {
-        check(realtime);
-        Common.assert(Patch.invert(realtime.uncommitted).parentHash === patch.parentHash);
-        realtime.userInterfaceContent = Patch.apply(patch, realtime.userInterfaceContent);
-    }
-    Patch.check(patch, realtime.uncommittedDocLength);
-    realtime.uncommitted = Patch.merge(realtime.uncommitted, patch);
-    realtime.uncommittedDocLength += Patch.lengthChange(patch);
-};
-
 var isAncestorOf = function (realtime, ancestor, decendent) {
     if (!decendent || !ancestor) { return false; }
     if (ancestor === decendent) { return true; }
@@ -867,34 +858,31 @@ var getBestChild = function (realtime, msg) {
     return best;
 };
 
-var pushUIPatch = function (realtime, patch) {
-    if (patch.operations.length) {
-        // push the uncommittedPatch out to the user interface.
-        for (var i = 0; i < realtime.patchHandlers.length; i++) {
-            realtime.patchHandlers[i](patch);
-        }
-        for (var i = 0; i < realtime.changeHandlers.length; i++) {
-            for (var j = patch.operations.length; j >= 0; j--) {
-                var op = patch.operations[j];
-                realtime.changeHandlers[i](op.offset, op.toRemove, op.toInsert);
-            }
-        }
-    }
-};
-
 var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromMe) {
 
     if (Common.PARANOIA) { check(realtime); }
     var msg = Message.fromString(msgStr);
 
-    // otherwise it's a disconnect.
-    if (msg.messageType !== Message.PATCH && msg.messageType !== Message.CHECKPOINT) {
-        debug(realtime, "unrecognized message type " + msg.messageType);
+    // These are all deprecated message types
+    if (['REGISTER', 'PONG', 'DISCONNECT'].map(function (x) {
+        return Message[x];
+    }).indexOf(msg.messageType) !== -1) {
+        console.log("Deprecated message type: [%s]", msg.messageType);
         return;
     }
 
+    // otherwise it's a disconnect.
+    if (msg.messageType !== Message.PATCH) {
+        console.error("disconnect");
+        return; }
+
     msg.hashOf = Message.hashOf(msg);
 
+    if (realtime.pending && realtime.pending.hash === msg.hashOf) {
+        realtime.pending.callback();
+        realtime.pending = null;
+    }
+
     if (realtime.messages[msg.hashOf]) {
         debug(realtime, "Patch [" + msg.hashOf + "] is already known");
         if (Common.PARANOIA) { check(realtime); }
@@ -906,33 +894,10 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         realtime.messagesByParent[msg.lastMsgHash] || []).push(msg);
 
     if (!isAncestorOf(realtime, realtime.rootMessage, msg)) {
-        if (realtime.rootMessage === realtime.best && msg.content.isCheckpoint) {
-            // We're starting with a trucated chain from a checkpoint, we will adopt this
-            // as the root message and go with it...
-            var userDoc = Patch.apply(realtime.uncommitted, realtime.authDoc);
-            Common.assert(!Common.PARANOIA || realtime.userInterfaceContent === userDoc);
-            var fixUserDocPatch = Patch.invert(realtime.uncommitted, realtime.authDoc);
-            Patch.addOperation(fixUserDocPatch,
-                Operation.create(0, realtime.authDoc.length, msg.content.operations[0].toInsert));
-            fixUserDocPatch =
-                Patch.simplify(fixUserDocPatch, userDoc, realtime.config.operationSimplify);
-
-            msg.parentCount = 0;
-            realtime.rootMessage = realtime.best = msg;
-
-            realtime.authDoc = msg.content.operations[0].toInsert;
-            realtime.uncommitted = Patch.create(Sha.hex_sha256(realtime.authDoc));
-            realtime.uncommittedDocLength = realtime.authDoc.length;
-            pushUIPatch(realtime, fixUserDocPatch);
-
-            if (Common.PARANOIA) { realtime.userInterfaceContent = realtime.authDoc; }
-            return;
-        } else {
-            // we'll probably find the missing parent later.
-            debug(realtime, "Patch [" + msg.hashOf + "] not connected to root");
-            if (Common.PARANOIA) { check(realtime); }
-            return;
-        }
+        // we'll probably find the missing parent later.
+        debug(realtime, "Patch [" + msg.hashOf + "] not connected to root");
+        if (Common.PARANOIA) { check(realtime); }
+        return;
     }
 
     // of this message fills in a hole in the chain which makes another patch better, swap to the
@@ -998,49 +963,14 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         return;
     }
 
-    if (patch.isCheckpoint) {
-        // Ok, we have a checkpoint patch.
-        // If the chain length is not equal to checkpointInterval then this patch is invalid.
-        var i = 0;
-        var checkpointP;
-        for (var m = getParent(realtime, msg); m; m = getParent(realtime, m)) {
-            if (m.content.isCheckpoint) {
-                if (checkpointP) {
-                    checkpointP = m;
-                    break;
-                }
-                checkpointP = m;
-            }
-        }
-        if (checkpointP && checkpointP !== realtime.rootMessage) {
-            var point = parentCount(realtime, checkpointP);
-            if ((point % realtime.config.checkpointInterval) !== 0) {
-                debug(realtime, "checkpoint [" + msg.hashOf + "] at invalid point [" + point + "]");
-                if (Common.PARANOIA) { check(realtime); }
-                if (Common.TESTING) { throw new Error(); }
-                delete realtime.messages[msg.hashOf];
-                return;
-            }
-
-            // Time to prune some old messages from the chain
-            debug(realtime, "checkpoint [" + msg.hashOf + "]");
-            for (var m = getParent(realtime, checkpointP); m; m = getParent(realtime, m)) {
-                debug(realtime, "pruning [" + m.hashOf + "]");
-                delete realtime.messages[m.hashOf];
-                delete realtime.messagesByParent[m.hashOf];
-            }
-            realtime.rootMessage = checkpointP;
-        }
-    } else {
-        var simplePatch =
-            Patch.simplify(patch, authDocAtTimeOfPatch, realtime.config.operationSimplify);
-        if (!Patch.equals(simplePatch, patch)) {
-            debug(realtime, "patch [" + msg.hashOf + "] can be simplified");
-            if (Common.PARANOIA) { check(realtime); }
-            if (Common.TESTING) { throw new Error(); }
-            delete realtime.messages[msg.hashOf];
-            return;
-        }
+    var simplePatch =
+        Patch.simplify(patch, authDocAtTimeOfPatch, realtime.config.operationSimplify);
+    if (!Patch.equals(simplePatch, patch)) {
+        debug(realtime, "patch [" + msg.hashOf + "] can be simplified");
+        if (Common.PARANOIA) { check(realtime); }
+        if (Common.TESTING) { throw new Error(); }
+        delete realtime.messages[msg.hashOf];
+        return;
     }
 
     patch.inverseOf = Patch.invert(patch, authDocAtTimeOfPatch);
@@ -1082,8 +1012,19 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         Common.assert(newUserInterfaceContent === realtime.userInterfaceContent);
     }
 
-    pushUIPatch(realtime, uncommittedPatch);
-
+    if (uncommittedPatch.operations.length) {
+        // push the uncommittedPatch out to the user interface.
+        for (var i = 0; i < realtime.patchHandlers.length; i++) {
+            realtime.patchHandlers[i](uncommittedPatch);
+        }
+        if (realtime.opHandlers.length) {
+            for (var i = uncommittedPatch.operations.length-1; i >= 0; i--) {
+                for (var j = 0; j < realtime.opHandlers.length; j++) {
+                    realtime.opHandlers[j](uncommittedPatch.operations[i]);
+                }
+            }
+        }
+    }
     if (Common.PARANOIA) { check(realtime); }
 };
 
@@ -1120,26 +1061,13 @@ var getDepthOfState = function (content, minDepth, realtime) {
 
 module.exports.create = function (conf) {
     var realtime = ChainPad.create(conf);
-    var out = {
+    return {
         onPatch: enterChainPad(realtime, function (handler) {
             Common.assert(typeof(handler) === 'function');
             realtime.patchHandlers.push(handler);
         }),
-        patch: enterChainPad(realtime, function (patch, x, y) {
-            if (typeof(patch) === 'number') {
-                // Actually they meant to call realtime.change()
-                out.change(patch, x, y);
-                return;
-            }
-            doPatch(realtime, patch);
-        }),
 
-        onChange: enterChainPad(realtime, function (handler) {
-            Common.assert(typeof(handler) === 'function');
-            realtime.changeHandlers.push(handler);
-        }),
-        change: enterChainPad(realtime, function (offset, count, chars) {
-            if (count === 0 && chars === '') { return; }
+        patch: enterChainPad(realtime, function (offset, count, chars) {
             doOperation(realtime, Operation.create(offset, count, chars));
         }),
 
@@ -1147,32 +1075,26 @@ module.exports.create = function (conf) {
             Common.assert(typeof(handler) === 'function');
             realtime.messageHandlers.push(handler);
         }),
-
         message: enterChainPad(realtime, function (message) {
             handleMessage(realtime, message, false);
         }),
-
         start: enterChainPad(realtime, function () {
             if (realtime.syncSchedule) { unschedule(realtime, realtime.syncSchedule); }
             realtime.syncSchedule = schedule(realtime, function () { sync(realtime); });
         }),
-
         abort: enterChainPad(realtime, function () {
-            realtime.aborted = true;
             realtime.schedules.forEach(function (s) { clearTimeout(s) });
         }),
-
-        sync: enterChainPad(realtime, function () { sync(realtime); }),
-
+        sync: enterChainPad(realtime, function () {
+            sync(realtime);
+        }),
         getAuthDoc: function () { return realtime.authDoc; },
-
         getUserDoc: function () { return Patch.apply(realtime.uncommitted, realtime.authDoc); },
 
         getDepthOfState: function (content, minDepth) {
             return getDepthOfState(content, minDepth, realtime);
         }
     };
-    return out;
 };
 
 },
diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index d838fda3a..209c7e532 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -142,21 +142,19 @@ define([
         // shim between chainpad and netflux
         chainpadAdapter = {
             msgIn : function(peerId, msg) {
-                msg = msg.replace(/^cp\|/, '');
+                var message = parseMessage(msg);
                 try {
-                    var decryptedMsg = Crypto.decrypt(msg, cryptKey);
+                    var decryptedMsg = Crypto.decrypt(message, cryptKey);
                     messagesHistory.push(decryptedMsg);
                     return decryptedMsg;
                 } catch (err) {
                     console.error(err);
-                    return msg;
+                    return message;
                 }
             },
             msgOut : function(msg, wc) {
                 try {
-                    var cmsg = Crypto.encrypt(msg, cryptKey);
-                    if (msg.indexOf('[4') === 0) { cmsg = 'cp|' + cmsg; }
-                    return cmsg;
+                    return Crypto.encrypt(msg, cryptKey);
                 } catch (err) {
                     console.log(msg);
                     throw err;

From ba4dba24ddb3bb36a091915309ebee3c191d613f Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle 
Date: Mon, 30 May 2016 12:29:58 +0200
Subject: [PATCH 220/257] If there are no checkpoints, the document fails to
 sync

---
 NetfluxWebsocketSrv.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 03889ee8e..d92510749 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -106,6 +106,10 @@ const getHistory = function (ctx, channelName, handler, cb) {
             }
             //console.log(messageBuf[startPoint]);
         }
+        if (cpCount < 2) {
+            // no checkpoints.
+            for (var x = msgBuff2.pop(); x; x = msgBuff2.pop()) { handler(x); }
+        }
         cb();
     });
 };

From 058548b95a476604495388a837b77f99aeb3cff1 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 30 May 2016 14:58:20 +0200
Subject: [PATCH 221/257] revert my reversion

Revert "Revert "Added checkpoints with the new code from ChainPad""

This reverts commit 6e2e8bf21f3a2f36d681ee07527eb3bc950c4062.
---
 NetfluxWebsocketSrv.js       |  22 +-
 www/common/chainpad.js       | 396 +++++++++++++++++++++--------------
 www/common/realtime-input.js |  10 +-
 3 files changed, 264 insertions(+), 164 deletions(-)

diff --git a/NetfluxWebsocketSrv.js b/NetfluxWebsocketSrv.js
index 8ce1ab442..03889ee8e 100644
--- a/NetfluxWebsocketSrv.js
+++ b/NetfluxWebsocketSrv.js
@@ -87,7 +87,27 @@ dropUser = function (ctx, user) {
 };
 
 const getHistory = function (ctx, channelName, handler, cb) {
-    ctx.store.getMessages(channelName, function (msgStr) { handler(JSON.parse(msgStr)); }, cb);
+    var messageBuf = [];
+    ctx.store.getMessages(channelName, function (msgStr) {
+        messageBuf.push(JSON.parse(msgStr));
+    }, function () {
+        var startPoint;
+        var cpCount = 0;
+        var msgBuff2 = [];
+        for (startPoint = messageBuf.length - 1; startPoint >= 0; startPoint--) {
+            var msg = messageBuf[startPoint];
+            msgBuff2.push(msg);
+            if (msg[2] === 'MSG' && msg[4].indexOf('cp|') === 0) {
+                cpCount++;
+                if (cpCount >= 2) {
+                    for (var x = msgBuff2.pop(); x; x = msgBuff2.pop()) { handler(x); }
+                    break;
+                }
+            }
+            //console.log(messageBuf[startPoint]);
+        }
+        cb();
+    });
 };
 
 const randName = function () { return Crypto.randomBytes(16).toString('hex'); };
diff --git a/www/common/chainpad.js b/www/common/chainpad.js
index 8d9ec786b..e93330845 100644
--- a/www/common/chainpad.js
+++ b/www/common/chainpad.js
@@ -28,7 +28,8 @@ var create = Patch.create = function (parentHash) {
     return {
         type: 'Patch',
         operations: [],
-        parentHash: parentHash
+        parentHash: parentHash,
+        isCheckpoint: false
     };
 };
 
@@ -45,6 +46,13 @@ var check = Patch.check = function (patch, docLength_opt) {
             docLength_opt += Operation.lengthChange(patch.operations[i]);
         }
     }
+    if (patch.isCheckpoint) {
+        Common.assert(patch.operations.length === 1);
+        Common.assert(patch.operations[0].offset === 0);
+        if (typeof(docLength_opt) === 'number') {
+            Common.assert(!docLength_opt || patch.operations[0].toRemove === docLength_opt);
+        }
+    }
 };
 
 var toObj = Patch.toObj = function (patch) {
@@ -104,6 +112,20 @@ var addOperation = Patch.addOperation = function (patch, op) {
     if (Common.PARANOIA) { check(patch); }
 };
 
+var createCheckpoint = Patch.createCheckpoint =
+    function (parentContent, checkpointContent, parentContentHash_opt)
+{
+    var op = Operation.create(0, parentContent.length, checkpointContent);
+    if (Common.PARANOIA && parentContentHash_opt) {
+        Common.assert(parentContentHash_opt === hash(parentContent));
+    }
+    parentContentHash_opt = parentContentHash_opt || hash(parentContent);
+    var out = create(parentContentHash_opt);
+    addOperation(out, op);
+    out.isCheckpoint = true;
+    return out;
+};
+
 var clone = Patch.clone = function (patch) {
     if (Common.PARANOIA) { check(patch); }
     var out = create();
@@ -380,7 +402,7 @@ var PARANOIA = module.exports.PARANOIA = true;
 var VALIDATE_ENTIRE_CHAIN_EACH_MSG = module.exports.VALIDATE_ENTIRE_CHAIN_EACH_MSG = false;
 
 /* throw errors over non-compliant messages which would otherwise be treated as invalid */
-var TESTING = module.exports.TESTING = true;
+var TESTING = module.exports.TESTING = false;
 
 var assert = module.exports.assert = function (expr) {
     if (!expr) { throw new Error("Failed assertion"); }
@@ -435,10 +457,11 @@ var REGISTER     = Message.REGISTER     = 0;
 var REGISTER_ACK = Message.REGISTER_ACK = 1;
 var PATCH        = Message.PATCH        = 2;
 var DISCONNECT   = Message.DISCONNECT   = 3;
+var CHECKPOINT   = Message.CHECKPOINT   = 4;
 
 var check = Message.check = function(msg) {
     Common.assert(msg.type === 'Message');
-    if (msg.messageType === PATCH) {
+    if (msg.messageType === PATCH || msg.messageType === CHECKPOINT) {
         Patch.check(msg.content);
         Common.assert(typeof(msg.lastMsgHash) === 'string');
     } else {
@@ -459,9 +482,8 @@ var create = Message.create = function (type, content, lastMsgHash) {
 
 var toString = Message.toString = function (msg) {
     if (Common.PARANOIA) { check(msg); }
-
-    if (msg.messageType === PATCH) {
-        return JSON.stringify([PATCH, Patch.toObj(msg.content), msg.lastMsgHash]);
+    if (msg.messageType === PATCH || msg.messageType === CHECKPOINT) {
+        return JSON.stringify([msg.messageType, Patch.toObj(msg.content), msg.lastMsgHash]);
     } else {
         throw new Error();
     }
@@ -478,43 +500,11 @@ var discardBencode = function (msg, arr) {
 };
 
 var fromString = Message.fromString = function (str) {
-    var msg = str;
-
-    if (str.charAt(0) === '[') {
-        var m = JSON.parse(str);
-        return create(m[0], Patch.fromObj(m[1]), m[2]);
-    } else {
-        /*  Just in case we receive messages in the old format,
-            we should try to parse them. We only need the content, though,
-            so just extract that and throw the rest away */
-        var last;
-        var parts = [];
-
-        // chop off all the bencoded components
-        while (msg) {
-            msg = discardBencode(msg, parts);
-        }
-
-        // grab the last component from the parts
-        // we don't need anything else
-        var contentStr = parts.slice(-1)[0];
-
-        var content = JSON.parse(contentStr);
-        var message;
-        if (content[0] === PATCH) {
-            message = create(userName, PATCH, Patch.fromObj(content[1]), content[2]);
-        } else if ([4,5].indexOf(content[0]) !== -1 /* === PING || content[0] === PONG*/) {
-            // it's a ping or pong, which we don't want to support anymore
-            message = create(userName, content[0], content[1]);
-        } else {
-            message = create(userName, content[0]);
-        }
-
-        // This check validates every operation in the patch.
-        check(message);
-
-        return message
-    }
+    var m = JSON.parse(str);
+    if (m[0] !== CHECKPOINT && m[0] !== PATCH) { throw new Error("invalid message type " + m[0]); }
+    var msg = create(m[0], Patch.fromObj(m[1]), m[2]);
+    if (m[0] === CHECKPOINT) { msg.content.isCheckpoint = true; }
+    return msg;
 };
 
 var hashOf = Message.hashOf = function (msg) {
@@ -550,8 +540,16 @@ var Sha = module.exports.Sha = require('./SHA256');
 var ChainPad = {};
 
 // hex_sha256('')
-var EMPTY_STR_HASH = 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855';
-var ZERO =           '0000000000000000000000000000000000000000000000000000000000000000';
+var EMPTY_STR_HASH = module.exports.EMPTY_STR_HASH =
+    'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855';
+var ZERO = '0000000000000000000000000000000000000000000000000000000000000000';
+
+// Default number of patches between checkpoints (patches older than this will be pruned)
+// default for realtime.config.checkpointInterval
+var DEFAULT_CHECKPOINT_INTERVAL = 200;
+
+// Default number of milliseconds to wait before syncing to the server
+var DEFAULT_AVERAGE_SYNC_MILLISECONDS = 300;
 
 var enterChainPad = function (realtime, func) {
     return function () {
@@ -567,8 +565,9 @@ var debug = function (realtime, msg) {
 };
 
 var schedule = function (realtime, func, timeout) {
+    if (realtime.aborted) { return; }
     if (!timeout) {
-        timeout = Math.floor(Math.random() * 2 * realtime.avgSyncTime);
+        timeout = Math.floor(Math.random() * 2 * realtime.config.avgSyncMilliseconds);
     }
     var to = setTimeout(enterChainPad(realtime, function () {
         realtime.schedules.splice(realtime.schedules.indexOf(to), 1);
@@ -598,12 +597,52 @@ var onMessage = function (realtime, message, callback) {
     }
 };
 
+var sendMessage = function (realtime, msg, callback) {
+    var strMsg = Message.toString(msg);
+
+    onMessage(realtime, strMsg, function (err) {
+        if (err) {
+            debug(realtime, "Posting to server failed [" + err + "]");
+            realtime.pending = null;
+        } else {
+            var pending = realtime.pending;
+            realtime.pending = null;
+            Common.assert(pending.hash === msg.hashOf);
+            handleMessage(realtime, strMsg, true);
+            pending.callback();
+        }
+    });
+
+    msg.hashOf = msg.hashOf || Message.hashOf(msg);
+
+    var timeout = schedule(realtime, function () {
+        debug(realtime, "Failed to send message [" + msg.hashOf + "] to server");
+        sync(realtime);
+    }, 10000 + (Math.random() * 5000));
+
+    if (realtime.pending) { throw new Error("there is already a pending message"); }
+    realtime.pending = {
+        hash: msg.hashOf,
+        callback: function () {
+            if (realtime.initialMessage && realtime.initialMessage.hashOf === msg.hashOf) {
+                debug(realtime, "initial Ack received [" + msg.hashOf + "]");
+                realtime.initialMessage = null;
+            }
+            unschedule(realtime, timeout);
+            realtime.syncSchedule = schedule(realtime, function () { sync(realtime); }, 0);
+            callback();
+        }
+    };
+    if (Common.PARANOIA) { check(realtime); }
+};
+
 var sync = function (realtime) {
     if (Common.PARANOIA) { check(realtime); }
-    if (realtime.syncSchedule) {
+    if (realtime.syncSchedule && !realtime.pending) {
         unschedule(realtime, realtime.syncSchedule);
         realtime.syncSchedule = null;
     } else {
+        //debug(realtime, "already syncing...");
         // we're currently waiting on something from the server.
         return;
     }
@@ -617,6 +656,19 @@ var sync = function (realtime) {
         return;
     }
 
+    if (((parentCount(realtime, realtime.best) + 1) % realtime.config.checkpointInterval) === 0) {
+        var best = realtime.best;
+        debug(realtime, "Sending checkpoint");
+        var cpp = Patch.createCheckpoint(realtime.authDoc,
+                                         realtime.authDoc,
+                                         realtime.best.content.inverseOf.parentHash);
+        var cp = Message.create(Message.CHECKPOINT, cpp, realtime.best.hashOf);
+        sendMessage(realtime, cp, function () {
+            debug(realtime, "Checkpoint sent and accepted");
+        });
+        return;
+    }
+
     var msg;
     if (realtime.best === realtime.initialMessage) {
         msg = realtime.initialMessage;
@@ -624,39 +676,16 @@ var sync = function (realtime) {
         msg = Message.create(Message.PATCH, realtime.uncommitted, realtime.best.hashOf);
     }
 
-    var strMsg = Message.toString(msg);
-
-    onMessage(realtime, strMsg, function (err) {
-        if (err) {
-            debug(realtime, "Posting to server failed [" + err + "]");
-        } else {
-            handleMessage(realtime, strMsg, true);
-        }
+    sendMessage(realtime, msg, function () {
+        //debug(realtime, "patch sent");
     });
-
-    var hash = Message.hashOf(msg);
-
-    var timeout = schedule(realtime, function () {
-        debug(realtime, "Failed to send message ["+hash+"] to server");
-        sync(realtime);
-    }, 10000 + (Math.random() * 5000));
-    realtime.pending = {
-        hash: hash,
-        callback: function () {
-            if (realtime.initialMessage && realtime.initialMessage.hashOf === hash) {
-                debug(realtime, "initial Ack received ["+hash+"]");
-                realtime.initialMessage = null;
-            }
-            unschedule(realtime, timeout);
-            realtime.syncSchedule = schedule(realtime, function () { sync(realtime); }, 0);
-        }
-    };
-    if (Common.PARANOIA) { check(realtime); }
 };
 
 var create = ChainPad.create = function (config) {
     config = config || {};
     var initialState = config.initialState || '';
+    config.checkpointInterval = config.checkpointInterval || DEFAULT_CHECKPOINT_INTERVAL;
+    config.avgSyncMilliseconds = config.avgSyncMilliseconds || DEFAULT_AVERAGE_SYNC_MILLISECONDS;
 
     var realtime = {
         type: 'ChainPad',
@@ -665,7 +694,7 @@ var create = ChainPad.create = function (config) {
 
         config: config,
 
-        logLevel: typeof(config.logLevel) !== 'undefined'? config.logLevel: 1,
+        logLevel: (typeof(config.logLevel) === 'number') ? config.logLevel : 1,
 
         /** A patch representing all uncommitted work. */
         uncommitted: null,
@@ -673,18 +702,17 @@ var create = ChainPad.create = function (config) {
         uncommittedDocLength: initialState.length,
 
         patchHandlers: [],
-        opHandlers: [],
+        changeHandlers: [],
 
         messageHandlers: [],
 
         schedules: [],
+        aborted: false,
 
         syncSchedule: null,
 
         registered: false,
 
-        avgSyncTime: 100,
-
         // this is only used if PARANOIA is enabled.
         userInterfaceContent: undefined,
 
@@ -699,12 +727,6 @@ var create = ChainPad.create = function (config) {
         rootMessage: null,
 
         userName: config.userName || 'anonymous',
-
-        /**
-         * Set to the message which sets the initialState if applicable.
-         * Reset to null after the initial message has been successfully broadcasted.
-         */
-        initialMessage: null,
     };
 
     if (Common.PARANOIA) {
@@ -712,6 +734,10 @@ var create = ChainPad.create = function (config) {
     }
 
     var zeroPatch = Patch.create(EMPTY_STR_HASH);
+    if (initialState !== '') {
+        var initialOp = Operation.create(0, 0, initialState);
+        Patch.addOperation(zeroPatch, initialOp);
+    }
     zeroPatch.inverseOf = Patch.invert(zeroPatch, '');
     zeroPatch.inverseOf.inverseOf = zeroPatch;
     var zeroMsg = Message.create(Message.PATCH, zeroPatch, ZERO);
@@ -721,40 +747,12 @@ var create = ChainPad.create = function (config) {
     (realtime.messagesByParent[zeroMsg.lastMessageHash] || []).push(zeroMsg);
     realtime.rootMessage = zeroMsg;
     realtime.best = zeroMsg;
-
-    if (initialState === '') {
-        realtime.uncommitted = Patch.create(zeroPatch.inverseOf.parentHash);
-        return realtime;
-    }
-
-    var initialOp = Operation.create(0, 0, initialState);
-    var initialStatePatch = Patch.create(zeroPatch.inverseOf.parentHash);
-    Patch.addOperation(initialStatePatch, initialOp);
-    initialStatePatch.inverseOf = Patch.invert(initialStatePatch, '');
-    initialStatePatch.inverseOf.inverseOf = initialStatePatch;
-
-    // flag this patch so it can be handled specially.
-    // Specifically, we never treat an initialStatePatch as our own,
-    // we let it be reverted to prevent duplication of data.
-    initialStatePatch.isInitialStatePatch = true;
-    initialStatePatch.inverseOf.isInitialStatePatch = true;
-
     realtime.authDoc = initialState;
+    realtime.uncommitted = Patch.create(zeroPatch.inverseOf.parentHash);
+
     if (Common.PARANOIA) {
         realtime.userInterfaceContent = initialState;
     }
-    initialMessage = Message.create(Message.PATCH, initialStatePatch, zeroMsg.hashOf);
-    initialMessage.hashOf = Message.hashOf(initialMessage);
-    initialMessage.parentCount = 1;
-    initialMessage.isFromMe = true;
-
-    realtime.messages[initialMessage.hashOf] = initialMessage;
-    (realtime.messagesByParent[initialMessage.lastMessageHash] || []).push(initialMessage);
-
-    realtime.best = initialMessage;
-    realtime.uncommitted = Patch.create(initialStatePatch.inverseOf.parentHash);
-    realtime.initialMessage = initialMessage;
-
     return realtime;
 };
 
@@ -803,6 +801,17 @@ var doOperation = ChainPad.doOperation = function (realtime, op) {
     realtime.uncommittedDocLength += Operation.lengthChange(op);
 };
 
+var doPatch = ChainPad.doPatch = function (realtime, patch) {
+    if (Common.PARANOIA) {
+        check(realtime);
+        Common.assert(Patch.invert(realtime.uncommitted).parentHash === patch.parentHash);
+        realtime.userInterfaceContent = Patch.apply(patch, realtime.userInterfaceContent);
+    }
+    Patch.check(patch, realtime.uncommittedDocLength);
+    realtime.uncommitted = Patch.merge(realtime.uncommitted, patch);
+    realtime.uncommittedDocLength += Patch.lengthChange(patch);
+};
+
 var isAncestorOf = function (realtime, ancestor, decendent) {
     if (!decendent || !ancestor) { return false; }
     if (ancestor === decendent) { return true; }
@@ -858,31 +867,34 @@ var getBestChild = function (realtime, msg) {
     return best;
 };
 
+var pushUIPatch = function (realtime, patch) {
+    if (patch.operations.length) {
+        // push the uncommittedPatch out to the user interface.
+        for (var i = 0; i < realtime.patchHandlers.length; i++) {
+            realtime.patchHandlers[i](patch);
+        }
+        for (var i = 0; i < realtime.changeHandlers.length; i++) {
+            for (var j = patch.operations.length; j >= 0; j--) {
+                var op = patch.operations[j];
+                realtime.changeHandlers[i](op.offset, op.toRemove, op.toInsert);
+            }
+        }
+    }
+};
+
 var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromMe) {
 
     if (Common.PARANOIA) { check(realtime); }
     var msg = Message.fromString(msgStr);
 
-    // These are all deprecated message types
-    if (['REGISTER', 'PONG', 'DISCONNECT'].map(function (x) {
-        return Message[x];
-    }).indexOf(msg.messageType) !== -1) {
-        console.log("Deprecated message type: [%s]", msg.messageType);
+    // otherwise it's a disconnect.
+    if (msg.messageType !== Message.PATCH && msg.messageType !== Message.CHECKPOINT) {
+        debug(realtime, "unrecognized message type " + msg.messageType);
         return;
     }
 
-    // otherwise it's a disconnect.
-    if (msg.messageType !== Message.PATCH) {
-        console.error("disconnect");
-        return; }
-
     msg.hashOf = Message.hashOf(msg);
 
-    if (realtime.pending && realtime.pending.hash === msg.hashOf) {
-        realtime.pending.callback();
-        realtime.pending = null;
-    }
-
     if (realtime.messages[msg.hashOf]) {
         debug(realtime, "Patch [" + msg.hashOf + "] is already known");
         if (Common.PARANOIA) { check(realtime); }
@@ -894,10 +906,33 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         realtime.messagesByParent[msg.lastMsgHash] || []).push(msg);
 
     if (!isAncestorOf(realtime, realtime.rootMessage, msg)) {
-        // we'll probably find the missing parent later.
-        debug(realtime, "Patch [" + msg.hashOf + "] not connected to root");
-        if (Common.PARANOIA) { check(realtime); }
-        return;
+        if (realtime.rootMessage === realtime.best && msg.content.isCheckpoint) {
+            // We're starting with a trucated chain from a checkpoint, we will adopt this
+            // as the root message and go with it...
+            var userDoc = Patch.apply(realtime.uncommitted, realtime.authDoc);
+            Common.assert(!Common.PARANOIA || realtime.userInterfaceContent === userDoc);
+            var fixUserDocPatch = Patch.invert(realtime.uncommitted, realtime.authDoc);
+            Patch.addOperation(fixUserDocPatch,
+                Operation.create(0, realtime.authDoc.length, msg.content.operations[0].toInsert));
+            fixUserDocPatch =
+                Patch.simplify(fixUserDocPatch, userDoc, realtime.config.operationSimplify);
+
+            msg.parentCount = 0;
+            realtime.rootMessage = realtime.best = msg;
+
+            realtime.authDoc = msg.content.operations[0].toInsert;
+            realtime.uncommitted = Patch.create(Sha.hex_sha256(realtime.authDoc));
+            realtime.uncommittedDocLength = realtime.authDoc.length;
+            pushUIPatch(realtime, fixUserDocPatch);
+
+            if (Common.PARANOIA) { realtime.userInterfaceContent = realtime.authDoc; }
+            return;
+        } else {
+            // we'll probably find the missing parent later.
+            debug(realtime, "Patch [" + msg.hashOf + "] not connected to root");
+            if (Common.PARANOIA) { check(realtime); }
+            return;
+        }
     }
 
     // of this message fills in a hole in the chain which makes another patch better, swap to the
@@ -963,14 +998,49 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         return;
     }
 
-    var simplePatch =
-        Patch.simplify(patch, authDocAtTimeOfPatch, realtime.config.operationSimplify);
-    if (!Patch.equals(simplePatch, patch)) {
-        debug(realtime, "patch [" + msg.hashOf + "] can be simplified");
-        if (Common.PARANOIA) { check(realtime); }
-        if (Common.TESTING) { throw new Error(); }
-        delete realtime.messages[msg.hashOf];
-        return;
+    if (patch.isCheckpoint) {
+        // Ok, we have a checkpoint patch.
+        // If the chain length is not equal to checkpointInterval then this patch is invalid.
+        var i = 0;
+        var checkpointP;
+        for (var m = getParent(realtime, msg); m; m = getParent(realtime, m)) {
+            if (m.content.isCheckpoint) {
+                if (checkpointP) {
+                    checkpointP = m;
+                    break;
+                }
+                checkpointP = m;
+            }
+        }
+        if (checkpointP && checkpointP !== realtime.rootMessage) {
+            var point = parentCount(realtime, checkpointP);
+            if ((point % realtime.config.checkpointInterval) !== 0) {
+                debug(realtime, "checkpoint [" + msg.hashOf + "] at invalid point [" + point + "]");
+                if (Common.PARANOIA) { check(realtime); }
+                if (Common.TESTING) { throw new Error(); }
+                delete realtime.messages[msg.hashOf];
+                return;
+            }
+
+            // Time to prune some old messages from the chain
+            debug(realtime, "checkpoint [" + msg.hashOf + "]");
+            for (var m = getParent(realtime, checkpointP); m; m = getParent(realtime, m)) {
+                debug(realtime, "pruning [" + m.hashOf + "]");
+                delete realtime.messages[m.hashOf];
+                delete realtime.messagesByParent[m.hashOf];
+            }
+            realtime.rootMessage = checkpointP;
+        }
+    } else {
+        var simplePatch =
+            Patch.simplify(patch, authDocAtTimeOfPatch, realtime.config.operationSimplify);
+        if (!Patch.equals(simplePatch, patch)) {
+            debug(realtime, "patch [" + msg.hashOf + "] can be simplified");
+            if (Common.PARANOIA) { check(realtime); }
+            if (Common.TESTING) { throw new Error(); }
+            delete realtime.messages[msg.hashOf];
+            return;
+        }
     }
 
     patch.inverseOf = Patch.invert(patch, authDocAtTimeOfPatch);
@@ -1012,19 +1082,8 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         Common.assert(newUserInterfaceContent === realtime.userInterfaceContent);
     }
 
-    if (uncommittedPatch.operations.length) {
-        // push the uncommittedPatch out to the user interface.
-        for (var i = 0; i < realtime.patchHandlers.length; i++) {
-            realtime.patchHandlers[i](uncommittedPatch);
-        }
-        if (realtime.opHandlers.length) {
-            for (var i = uncommittedPatch.operations.length-1; i >= 0; i--) {
-                for (var j = 0; j < realtime.opHandlers.length; j++) {
-                    realtime.opHandlers[j](uncommittedPatch.operations[i]);
-                }
-            }
-        }
-    }
+    pushUIPatch(realtime, uncommittedPatch);
+
     if (Common.PARANOIA) { check(realtime); }
 };
 
@@ -1061,13 +1120,26 @@ var getDepthOfState = function (content, minDepth, realtime) {
 
 module.exports.create = function (conf) {
     var realtime = ChainPad.create(conf);
-    return {
+    var out = {
         onPatch: enterChainPad(realtime, function (handler) {
             Common.assert(typeof(handler) === 'function');
             realtime.patchHandlers.push(handler);
         }),
+        patch: enterChainPad(realtime, function (patch, x, y) {
+            if (typeof(patch) === 'number') {
+                // Actually they meant to call realtime.change()
+                out.change(patch, x, y);
+                return;
+            }
+            doPatch(realtime, patch);
+        }),
 
-        patch: enterChainPad(realtime, function (offset, count, chars) {
+        onChange: enterChainPad(realtime, function (handler) {
+            Common.assert(typeof(handler) === 'function');
+            realtime.changeHandlers.push(handler);
+        }),
+        change: enterChainPad(realtime, function (offset, count, chars) {
+            if (count === 0 && chars === '') { return; }
             doOperation(realtime, Operation.create(offset, count, chars));
         }),
 
@@ -1075,26 +1147,32 @@ module.exports.create = function (conf) {
             Common.assert(typeof(handler) === 'function');
             realtime.messageHandlers.push(handler);
         }),
+
         message: enterChainPad(realtime, function (message) {
             handleMessage(realtime, message, false);
         }),
+
         start: enterChainPad(realtime, function () {
             if (realtime.syncSchedule) { unschedule(realtime, realtime.syncSchedule); }
             realtime.syncSchedule = schedule(realtime, function () { sync(realtime); });
         }),
+
         abort: enterChainPad(realtime, function () {
+            realtime.aborted = true;
             realtime.schedules.forEach(function (s) { clearTimeout(s) });
         }),
-        sync: enterChainPad(realtime, function () {
-            sync(realtime);
-        }),
+
+        sync: enterChainPad(realtime, function () { sync(realtime); }),
+
         getAuthDoc: function () { return realtime.authDoc; },
+
         getUserDoc: function () { return Patch.apply(realtime.uncommitted, realtime.authDoc); },
 
         getDepthOfState: function (content, minDepth) {
             return getDepthOfState(content, minDepth, realtime);
         }
     };
+    return out;
 };
 
 },
diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 209c7e532..d838fda3a 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -142,19 +142,21 @@ define([
         // shim between chainpad and netflux
         chainpadAdapter = {
             msgIn : function(peerId, msg) {
-                var message = parseMessage(msg);
+                msg = msg.replace(/^cp\|/, '');
                 try {
-                    var decryptedMsg = Crypto.decrypt(message, cryptKey);
+                    var decryptedMsg = Crypto.decrypt(msg, cryptKey);
                     messagesHistory.push(decryptedMsg);
                     return decryptedMsg;
                 } catch (err) {
                     console.error(err);
-                    return message;
+                    return msg;
                 }
             },
             msgOut : function(msg, wc) {
                 try {
-                    return Crypto.encrypt(msg, cryptKey);
+                    var cmsg = Crypto.encrypt(msg, cryptKey);
+                    if (msg.indexOf('[4') === 0) { cmsg = 'cp|' + cmsg; }
+                    return cmsg;
                 } catch (err) {
                     console.log(msg);
                     throw err;

From e3b8a1095911adf03fb51ea9f5ae5a3652f87061 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 30 May 2016 17:33:24 +0200
Subject: [PATCH 222/257] fix magicline filter

---
 www/pad/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index c2f2d3f65..b71ac111d 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -50,7 +50,7 @@ define([
         // return !(el.tagName === 'SPAN' && el.contentEditable === 'false');
         var filter = (el.tagName === 'SPAN' &&
             el.getAttribute('contentEditable') === 'false' &&
-            /position:absolute;border-top:1px dashed/.test(el.getAttribute('style')));
+            /magicline/.test(el.getAttribute('style')));
         if (filter) {
             console.log("[hyperjson.serializer] prevented an element" +
                 "from being serialized:", el);

From d0b553d198c2e124b3799845202bb2e992a073de Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 31 May 2016 12:27:28 +0200
Subject: [PATCH 223/257] port Yann's multiple-select implementation to
 cryptpad

---
 www/form/index.html | 7 +++++++
 www/form/main.js    | 2 +-
 www/form/ula.js     | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/www/form/index.html b/www/form/index.html
index 97b69f270..064063814 100644
--- a/www/form/index.html
+++ b/www/form/index.html
@@ -63,6 +63,13 @@
             
          Dropdowns
    
 
+        
+
         
    
 
     
diff --git a/www/form/main.js b/www/form/main.js
index f4e0fc751..0dc1c9fdf 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -91,7 +91,7 @@ define([
                 return function (content) {
                     return typeof content !== 'undefined' ?
                         $this.val(content):
-                        canonicalize($this.val());
+                        typeof($this.val()) === 'string'? canonicalize($this.val()): $this.val();
                 };
             }
         }());
diff --git a/www/form/ula.js b/www/form/ula.js
index 4591bb5eb..011783ff5 100644
--- a/www/form/ula.js
+++ b/www/form/ula.js
@@ -17,6 +17,7 @@ define([], function () {
         number: 'change',
         range: 'keyup change',
         'select-one': 'change',
+        'select-multiple': 'change',
         textarea: 'change keyup',
     };
 

From 9336c4de5cd8fd934a9135c862bf7fa799c16725 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 31 May 2016 12:35:01 +0200
Subject: [PATCH 224/257] import latest chainpad

---
 www/common/chainpad.js | 146 ++++++++++++++++++++++++++++++-----------
 1 file changed, 107 insertions(+), 39 deletions(-)

diff --git a/www/common/chainpad.js b/www/common/chainpad.js
index e93330845..ae0d40185 100644
--- a/www/common/chainpad.js
+++ b/www/common/chainpad.js
@@ -546,11 +546,15 @@ var ZERO = '0000000000000000000000000000000000000000000000000000000000000000';
 
 // Default number of patches between checkpoints (patches older than this will be pruned)
 // default for realtime.config.checkpointInterval
-var DEFAULT_CHECKPOINT_INTERVAL = 200;
+var DEFAULT_CHECKPOINT_INTERVAL = 50;
 
 // Default number of milliseconds to wait before syncing to the server
 var DEFAULT_AVERAGE_SYNC_MILLISECONDS = 300;
 
+// By default, we allow checkpoints at any place but if this is set true, we will blow up on chains
+// which have checkpoints not where we expect them to be.
+var DEFAULT_STRICT_CHECKPOINT_VALIDATION = false;
+
 var enterChainPad = function (realtime, func) {
     return function () {
         if (realtime.failed) { return; }
@@ -624,10 +628,6 @@ var sendMessage = function (realtime, msg, callback) {
     realtime.pending = {
         hash: msg.hashOf,
         callback: function () {
-            if (realtime.initialMessage && realtime.initialMessage.hashOf === msg.hashOf) {
-                debug(realtime, "initial Ack received [" + msg.hashOf + "]");
-                realtime.initialMessage = null;
-            }
             unschedule(realtime, timeout);
             realtime.syncSchedule = schedule(realtime, function () { sync(realtime); }, 0);
             callback();
@@ -670,22 +670,48 @@ var sync = function (realtime) {
     }
 
     var msg;
-    if (realtime.best === realtime.initialMessage) {
-        msg = realtime.initialMessage;
+    if (realtime.setContentPatch) {
+        msg = realtime.setContentPatch;
     } else {
         msg = Message.create(Message.PATCH, realtime.uncommitted, realtime.best.hashOf);
     }
 
     sendMessage(realtime, msg, function () {
         //debug(realtime, "patch sent");
+        if (realtime.setContentPatch) {
+            debug(realtime, "initial Ack received [" + msg.hashOf + "]");
+            realtime.setContentPatch = null;
+        }
     });
 };
 
+var storeMessage = function (realtime, msg) {
+    Common.assert(msg.lastMsgHash);
+    Common.assert(msg.hashOf);
+    realtime.messages[msg.hashOf] = msg;
+    (realtime.messagesByParent[msg.lastMsgHash] =
+        realtime.messagesByParent[msg.lastMsgHash] || []).push(msg);
+};
+
+var forgetMessage = function (realtime, msg) {
+    Common.assert(msg.lastMsgHash);
+    Common.assert(msg.hashOf);
+    delete realtime.messages[msg.hashOf];
+    var list = realtime.messagesByParent[msg.lastMsgHash];
+    Common.assert(list.indexOf(msg) > -1);
+    list.splice(list.indexOf(msg), 1);
+    if (list.length === 0) {
+        delete realtime.messagesByParent[msg.lastMsgHash];
+    }
+};
+
 var create = ChainPad.create = function (config) {
     config = config || {};
     var initialState = config.initialState || '';
     config.checkpointInterval = config.checkpointInterval || DEFAULT_CHECKPOINT_INTERVAL;
     config.avgSyncMilliseconds = config.avgSyncMilliseconds || DEFAULT_AVERAGE_SYNC_MILLISECONDS;
+    config.strictCheckpointValidation =
+        config.strictCheckpointValidation || DEFAULT_STRICT_CHECKPOINT_VALIDATION;
 
     var realtime = {
         type: 'ChainPad',
@@ -716,6 +742,11 @@ var create = ChainPad.create = function (config) {
         // this is only used if PARANOIA is enabled.
         userInterfaceContent: undefined,
 
+        // If we want to set the content to a particular thing, this patch will be sent across the
+        // wire. If the patch is not accepted we will not try to recover it. This is used for
+        // setting initial state.
+        setContentPatch: null,
+
         failed: false,
 
         // hash and callback for previously send patch, currently in flight.
@@ -729,26 +760,31 @@ var create = ChainPad.create = function (config) {
         userName: config.userName || 'anonymous',
     };
 
-    if (Common.PARANOIA) {
-        realtime.userInterfaceContent = initialState;
-    }
-
     var zeroPatch = Patch.create(EMPTY_STR_HASH);
-    if (initialState !== '') {
-        var initialOp = Operation.create(0, 0, initialState);
-        Patch.addOperation(zeroPatch, initialOp);
-    }
     zeroPatch.inverseOf = Patch.invert(zeroPatch, '');
     zeroPatch.inverseOf.inverseOf = zeroPatch;
     var zeroMsg = Message.create(Message.PATCH, zeroPatch, ZERO);
     zeroMsg.hashOf = Message.hashOf(zeroMsg);
     zeroMsg.parentCount = 0;
-    realtime.messages[zeroMsg.hashOf] = zeroMsg;
-    (realtime.messagesByParent[zeroMsg.lastMessageHash] || []).push(zeroMsg);
+    zeroMsg.isInitialMessage = true;
+    storeMessage(realtime, zeroMsg);
     realtime.rootMessage = zeroMsg;
     realtime.best = zeroMsg;
-    realtime.authDoc = initialState;
-    realtime.uncommitted = Patch.create(zeroPatch.inverseOf.parentHash);
+
+    if (initialState !== '') {
+        var initPatch = Patch.create(EMPTY_STR_HASH);
+        Patch.addOperation(initPatch, Operation.create(0, 0, initialState));
+        initPatch.inverseOf = Patch.invert(initPatch, '');
+        initPatch.inverseOf.inverseOf = initPatch;
+        var initMsg = Message.create(Message.PATCH, initPatch, zeroMsg.hashOf);
+        initMsg.hashOf = Message.hashOf(initMsg);
+        initMsg.isInitialMessage = true;
+        storeMessage(realtime, initMsg);
+        realtime.best = initMsg;
+        realtime.authDoc = initialState;
+        realtime.setContentPatch = initMsg;
+    }
+    realtime.uncommitted = Patch.create(realtime.best.content.inverseOf.parentHash);
 
     if (Common.PARANOIA) {
         realtime.userInterfaceContent = initialState;
@@ -828,16 +864,22 @@ var parentCount = function (realtime, message) {
 var applyPatch = function (realtime, isFromMe, patch) {
     Common.assert(patch);
     Common.assert(patch.inverseOf);
-    if (isFromMe && !patch.isInitialStatePatch) {
-        var inverseOldUncommitted = Patch.invert(realtime.uncommitted, realtime.authDoc);
-        var userInterfaceContent = Patch.apply(realtime.uncommitted, realtime.authDoc);
-        if (Common.PARANOIA) {
-            Common.assert(userInterfaceContent === realtime.userInterfaceContent);
-        }
-        realtime.uncommitted = Patch.merge(inverseOldUncommitted, patch);
-        realtime.uncommitted = Patch.invert(realtime.uncommitted, userInterfaceContent);
+    if (isFromMe) {
+        // Case 1: We're applying a patch which we originally created (yay our work was accepted)
+        //         We will merge the inverse of the patch with our uncommitted work in order that
+        //         we do not try to commit that work over again.
+        // Case 2: We're reverting a patch which had originally come from us, a.k.a. we're applying
+        //         the inverse of that patch.
+        //
+        // In either scenario, we want to apply the inverse of the patch we are applying, to the
+        // uncommitted work. Whatever we "add" to the authDoc we "remove" from the uncommittedWork.
+        //
+        Common.assert(patch.parentHash === realtime.uncommitted.parentHash);
+        realtime.uncommitted = Patch.merge(patch.inverseOf, realtime.uncommitted);
 
     } else {
+        // It's someone else's patch which was received, we need to *transform* out uncommitted
+        // work over their patch in order to preserve intent as much as possible.
         realtime.uncommitted =
             Patch.transform(
                 realtime.uncommitted, patch, realtime.authDoc, realtime.config.transformFunction);
@@ -882,12 +924,21 @@ var pushUIPatch = function (realtime, patch) {
     }
 };
 
+var validContent = function (realtime, contentGetter) {
+    if (!realtime.config.validateContent) { return true; }
+    try {
+        return realtime.validateContent(contentGetter());
+    } catch (e) {
+        warn(realtime, "Error in content validator [" + e.stack + "]");
+    }
+    return false;
+};
+
 var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromMe) {
 
     if (Common.PARANOIA) { check(realtime); }
     var msg = Message.fromString(msgStr);
 
-    // otherwise it's a disconnect.
     if (msg.messageType !== Message.PATCH && msg.messageType !== Message.CHECKPOINT) {
         debug(realtime, "unrecognized message type " + msg.messageType);
         return;
@@ -901,12 +952,18 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         return;
     }
 
-    realtime.messages[msg.hashOf] = msg;
-    (realtime.messagesByParent[msg.lastMsgHash] =
-        realtime.messagesByParent[msg.lastMsgHash] || []).push(msg);
+    if (msg.content.isCheckpoint &&
+        !validContent(realtime, function () { return msg.content.operations[0].toInsert }))
+    {
+        // If it's not a checkpoint, we verify it later on...
+        debug(realtime, "Checkpoint [" + msg.hashOf + "] failed content validation");
+        return;
+    }
+
+    storeMessage(realtime, msg);
 
     if (!isAncestorOf(realtime, realtime.rootMessage, msg)) {
-        if (realtime.rootMessage === realtime.best && msg.content.isCheckpoint) {
+        if (msg.content.isCheckpoint && realtime.best.isInitialMessage) {
             // We're starting with a trucated chain from a checkpoint, we will adopt this
             // as the root message and go with it...
             var userDoc = Patch.apply(realtime.uncommitted, realtime.authDoc);
@@ -957,8 +1014,10 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
                 commonAncestor = getParent(realtime, commonAncestor);
             }
             Common.assert(commonAncestor);
+            debug(realtime, "Patch [" + msg.hashOf + "] better than best chain, switching");
         } else {
-            debug(realtime, "Patch [" + msg.hashOf + "] chain is ["+pcMsg+"] best chain is ["+pcBest+"]");
+            debug(realtime, "Patch [" + msg.hashOf + "] chain is [" + pcMsg + "] best chain is [" +
+                pcBest + "]");
             if (Common.PARANOIA) { check(realtime); }
             return;
         }
@@ -994,7 +1053,7 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         debug(realtime, "patch [" + msg.hashOf + "] parentHash is not valid");
         if (Common.PARANOIA) { check(realtime); }
         if (Common.TESTING) { throw new Error(); }
-        delete realtime.messages[msg.hashOf];
+        forgetMessage(realtime, msg);
         return;
     }
 
@@ -1014,11 +1073,13 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
         }
         if (checkpointP && checkpointP !== realtime.rootMessage) {
             var point = parentCount(realtime, checkpointP);
-            if ((point % realtime.config.checkpointInterval) !== 0) {
+            if (realtime.config.strictCheckpointValidation &&
+                (point % realtime.config.checkpointInterval) !== 0)
+            {
                 debug(realtime, "checkpoint [" + msg.hashOf + "] at invalid point [" + point + "]");
                 if (Common.PARANOIA) { check(realtime); }
                 if (Common.TESTING) { throw new Error(); }
-                delete realtime.messages[msg.hashOf];
+                forgetMessage(realtime, msg);
                 return;
             }
 
@@ -1026,8 +1087,7 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
             debug(realtime, "checkpoint [" + msg.hashOf + "]");
             for (var m = getParent(realtime, checkpointP); m; m = getParent(realtime, m)) {
                 debug(realtime, "pruning [" + m.hashOf + "]");
-                delete realtime.messages[m.hashOf];
-                delete realtime.messagesByParent[m.hashOf];
+                forgetMessage(realtime, m);
             }
             realtime.rootMessage = checkpointP;
         }
@@ -1038,7 +1098,14 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
             debug(realtime, "patch [" + msg.hashOf + "] can be simplified");
             if (Common.PARANOIA) { check(realtime); }
             if (Common.TESTING) { throw new Error(); }
-            delete realtime.messages[msg.hashOf];
+            forgetMessage(realtime, msg);
+            return;
+        }
+
+        if (!validContent(realtime,
+            function () { return Patch.apply(patch, authDocAtTimeOfPatch); }))
+        {
+            debug(realtime, "Patch [" + msg.hashOf + "] failed content validation");
             return;
         }
     }
@@ -1058,6 +1125,7 @@ var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromM
 
     for (var i = 0; i < toRevert.length; i++) {
         debug(realtime, "reverting [" + toRevert[i].hashOf + "]");
+        if (toRevert[i].isFromMe) { debug(realtime, "reverting patch 'from me' [" + JSON.stringify(toRevert[i].content.operations) + "]"); }
         uncommittedPatch = Patch.merge(uncommittedPatch, toRevert[i].content.inverseOf);
         revertPatch(realtime, toRevert[i].isFromMe, toRevert[i].content);
     }

From a0ec5eada8394fc5b0272c82b4a8910ef21824c6 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Tue, 31 May 2016 12:51:04 +0200
Subject: [PATCH 225/257] better fix for magicline filter

---
 www/pad/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index b71ac111d..7f0ffacf5 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -50,7 +50,9 @@ define([
         // return !(el.tagName === 'SPAN' && el.contentEditable === 'false');
         var filter = (el.tagName === 'SPAN' &&
             el.getAttribute('contentEditable') === 'false' &&
-            /magicline/.test(el.getAttribute('style')));
+            /dashed/.test(el.getAttribute('style')) &&
+            /(rgb\(255|red)/.test(el.getAttribute('style')));
+            ///magicline/.test(el.getAttribute('style')));
         if (filter) {
             console.log("[hyperjson.serializer] prevented an element" +
                 "from being serialized:", el);

From 954ee26f4df6c45a6d7534cb08e045cd2e4b82be Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 1 Jun 2016 12:19:54 +0200
Subject: [PATCH 226/257] fix undefined disconnect reason

---
 www/common/realtime-input.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index d838fda3a..4c9151a01 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -259,10 +259,10 @@ define([
         Netflux.connect(websocketUrl).then(function(network) {
             // pass messages that come out of netflux into our local handler
 
-            network.on('disconnect', function (evt) {
+            network.on('disconnect', function (reason) {
                 if (config.onAbort) {
                     config.onAbort({
-                        reason: evt.reason
+                        reason: reason
                     });
                 }
             });

From 4222c0b5165f22ca99ddb65e4d9f142dcfa5a4cc Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 1 Jun 2016 12:25:16 +0200
Subject: [PATCH 227/257] simplify api

* refactor conditional with DeepProxy helpers
* don't call 'onRemote' until fully initialized
* use disconnect, ready, and create handlers on proxy object
---
 www/json/api.js | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/www/json/api.js b/www/json/api.js
index ad540c275..c10cdb679 100644
--- a/www/json/api.js
+++ b/www/json/api.js
@@ -14,8 +14,8 @@ define([
     var create = api.create = function (cfg) {
         /* validate your inputs before proceeding */
 
-        if (['object', 'array'].indexOf(DeepProxy.type(cfg.data))) {
-            throw new Error('unsupported datatype');
+        if (!DeepProxy.isProxyable(cfg.data)) {
+            throw new Error('unsupported datatype: '+ DeepProxy.type(cfg.data));
         }
 
         var config = {
@@ -48,8 +48,6 @@ define([
             if (cfg.onLocal) {
                 cfg.onLocal();
             }
-
-            // TODO actually emit 'change' events, or something like them
         };
 
         proxy = DeepProxy.create(cfg.data, onLocal, true);
@@ -62,35 +60,38 @@ define([
                 logging: config.logging || false,
             });
 
-            // onInit
-            cfg.onInit(info);
+            proxy._events.create.forEach(function (handler) {
+                handler.cb(info);
+            });
         };
 
+        var initializing = true;
+
         var onReady = config.onReady = function (info) {
             var userDoc = realtime.getUserDoc();
             var parsed = JSON.parse(userDoc);
 
-            DeepProxy.update(proxy, parsed);
+            DeepProxy.update(proxy, parsed, onLocal);
 
-            // onReady
-            cfg.onReady(info);
+            proxy._events.ready.forEach(function (handler) {
+                handler.cb(info);
+            });
+
+            initializing = false;
         };
 
         var onRemote = config.onRemote = function (info) {
+            if (initializing) { return; }
             var userDoc = realtime.getUserDoc();
             var parsed = JSON.parse(userDoc);
 
             DeepProxy.update(proxy, parsed, onLocal);
-
-            // onRemote
-            if (cfg.onRemote) {
-                cfg.onRemote(info);
-            }
         };
 
         var onAbort = config.onAbort = function (info) {
-            // onAbort
-            cfg.onAbort(info);
+            proxy._events.disconnect.forEach(function (handler) {
+                handler.cb(info);
+            });
         };
 
         rt = Realtime.start(config);

From a58d6c745af350d58230096ad67ca71041d1af77 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 1 Jun 2016 12:28:25 +0200
Subject: [PATCH 228/257] implement remaining listeners and factor

* 'isProxyable' helper
* 'find' helper
* 'lengthDescending' helper (for sorting change/remove events by path length)
* implement recursive proxy creation
* implement recursive proxy removal
* implement 'bubbling' prevention (via return false)
* implement create, ready, and disconnect event handlers
* return 'this' from 'on'
* trim dead code
---
 www/json/deep-proxy.js | 215 ++++++++++++++++++++++++++++-------------
 1 file changed, 146 insertions(+), 69 deletions(-)

diff --git a/www/json/deep-proxy.js b/www/json/deep-proxy.js
index 48619a9fc..dc3086550 100644
--- a/www/json/deep-proxy.js
+++ b/www/json/deep-proxy.js
@@ -23,6 +23,10 @@ define([
         return dat === null?  'null': isArray(dat)?'array': typeof(dat);
     };
 
+    var isProxyable = deepProxy.isProxyable = function (obj) {
+        return ['object', 'array'].indexOf(type(obj)) !== -1;
+    };
+
     /*  Any time you set a value, check its type.
         If that type is proxyable, make a new proxy. */
     var setter = deepProxy.set = function (cb) {
@@ -32,11 +36,9 @@ define([
             }
 
             var t_value = type(value);
-            if (['array', 'object'].indexOf(t_value) !== -1) {
-                //console.log("Constructing new proxy for value with type [%s]", t_value);
+            if (isProxyable(t_value)) {
                 var proxy = obj[prop] = deepProxy.create(value, cb);
             } else {
-                //console.log("Setting [%s] to [%s]", prop, value);
                 obj[prop] = value;
             }
 
@@ -46,51 +48,82 @@ define([
     };
 
     var pathMatches = deepProxy.pathMatches = function (path, pattern) {
-        console.log("checking if path:[%s] matches pattern:[%s]", path.join(','), pattern.join(','));
         return !pattern.some(function (x, i) {
             return x !== path[i];
         });
     };
 
+    var lengthDescending = function (a, b) { return b.pattern.length - a.pattern.length; };
+
     var getter = deepProxy.get = function (cb) {
         var events = {
             disconnect: [],
             change: [],
             ready: [],
             remove: [],
+            create: [],
         };
 
         var on = function (evt, pattern, f) {
             switch (evt) {
                 case 'change':
                     // pattern needs to be an array
-                    pattern = type(pattern) === 'array'?  pattern: [pattern];
+                    pattern = type(pattern) === 'array'? pattern: [pattern];
 
-                    //console.log("adding change listener at path [%s]", pattern.join(','));
                     events.change.push({
                         cb: function (oldval, newval, path, root) {
                             if (pathMatches(path, pattern)) {
                                 return f(oldval, newval, path, root);
-                            } else {
-                                console.log("path did not match pattern!");
                             }
+                            //else { console.log("path did not match pattern!"); }
                         },
                         pattern: pattern,
                     });
                     // sort into descending order so we evaluate in order of specificity
-                    events.change.sort(function (a, b) { return b.length - a.length; });
+                    events.change.sort(lengthDescending);
+
+                    break;
+                case 'delete':
+                    pattern = type(pattern) === 'array'? pattern: [pattern];
+
+                    events.remove.push({
+                        cb: function (oldval, path, root) {
+                            if (pathMatches(path, pattern)) { return f(oldval, path, root); }
+                        },
+                        pattern: pattern,
+                    });
+
+                    events.remove.sort(lengthDescending);
 
                     break;
                 case 'ready':
+                    events.ready.push({
+                        // on('ready' has a different signature than 
+                        // change and delete, so use 'pattern', not 'f'
+
+                        cb: function (info) {
+                            pattern(info);
+                        }
+                    });
                     break;
                 case 'disconnect':
+                    events.disconnect.push({
+                        cb: function (info) {
+                            // as above
+                            pattern(info);
+                        }
+                    });
                     break;
-                case 'delete':
-                    break;
+                case 'create':
+                    events.create.push({
+                        cb: function (info) {
+                            pattern(info);
+                        }
+                    });
                 default:
                     break;
             }
-            return true;
+            return this;
         };
 
         return function (obj, prop) {
@@ -110,8 +143,38 @@ define([
         };
     };
 
-    var create = deepProxy.create = function (obj, opt, root) {
+    var create = deepProxy.create = function (obj, opt) {
+        /*  recursively create proxies in case users do:
+            `x.a = {b: {c: 5}};
+
+            otherwise the inner object is not a proxy, which leads to incorrect
+            behaviour on the client that initiated the object (but not for
+            clients that receive the objects) */
+
+        // if the user supplied a callback, use it to create handlers
+        // this saves a bit of work in recursion
         var methods = type(opt) === 'function'? handlers(opt) : opt;
+        switch (type(obj)) {
+            case 'object':
+                var keys = Object.keys(obj);
+                keys.forEach(function (k) {
+                    if (isProxyable(obj[k])) {
+                        obj[k] = create(obj[k], opt);
+                    }
+                });
+                break;
+            case 'array':
+                obj.forEach(function (o, i) {
+                    if (isProxyable(o)) {
+                        obj[i] = create(obj[i], opt);
+                    }
+                });
+                break;
+            default:
+                // if it's not an array or object, you don't need to proxy it
+                throw new Error('attempted to make a proxy of an unproxyable object');
+        }
+
         return new Proxy(obj, methods);
     };
 
@@ -119,19 +182,61 @@ define([
     var onChange = function (path, key, root, oldval, newval) {
         var P = path.slice(0);
         P.push(key);
-        console.log('change at path [%s]', P.join(','));
 
-        /*  TODO make this such that we can halt propogation to less specific
-            paths? */
-        root._events.change.forEach(function (handler, i) {
-            return handler.cb(oldval, newval, P, root);
+        /*  returning false in your callback terminates 'bubbling up'
+            we can accomplish this with Array.some because we've presorted
+            listeners by the specificity of their path
+        */
+        root._events.change.some(function (handler, i) {
+            return handler.cb(oldval, newval, P, root) === false;
         });
     };
 
-    // newval doesn't really make sense here
-    var onRemove = function (path, key, root, oldval, newval) {
-        console.log("onRemove is stubbed for now");
-        return false;
+    var find = deepProxy.find = function (map, path) {
+        /* safely search for nested values in an object via a path */
+        return (map && path.reduce(function (p, n) {
+            return typeof p[n] !== 'undefined' && p[n];
+        }, map)) || undefined;
+    };
+
+    var onRemove = function (path, key, root) {
+        var newpath = path.concat(key);
+        var X = find(root, newpath);
+
+        var t_X = type(X);
+
+        /*  TODO 'find' is correct but unnecessarily expensive.
+            optimize it. */
+
+        switch (t_X) {
+            case 'array':
+                // remove all of the array's children
+                X.forEach(function (x, i) {
+                    onRemove(newpath, i, root);
+                });
+
+                root._events.remove.forEach(function (handler, i) {
+                    return handler.cb(X, newpath, root);
+                });
+
+                break;
+            case 'object':
+                // remove all of the object's children
+                Object.keys(X).forEach(function (key, i) {
+                    onRemove(newpath, key, root);
+                });
+
+                root._events.remove.forEach(function (handler, i) {
+                    return handler.cb(X, newpath, root);
+                });
+
+                break;
+            default:
+                root._events.remove.forEach(function (handler, i) {
+                    return handler.cb(X, newpath, root);
+                });
+                break;
+        }
     };
 
     /*  compare a new object 'B' against an existing proxy object 'A'
@@ -162,16 +267,12 @@ define([
             the event if possible)
         */
 
-        var hasChanged = false;
-
         Bkeys.forEach(function (b) {
-            //console.log(b);
             var t_b = type(B[b]);
             var old = A[b];
 
             if (Akeys.indexOf(b) === -1) {
                 // there was an insertion
-                //console.log("Inserting new key: [%s]", b);
 
                 // mind the fallthrough behaviour
                 switch (t_b) {
@@ -187,7 +288,6 @@ define([
                 }
 
                 // insertions are a change
-                hasChanged = true;
 
                 // onChange(path, key, root, oldval, newval)
                 onChange(path, b, root, old, B[b]);
@@ -203,18 +303,16 @@ define([
                     case 'undefined':
                         // deletions are a removal
                         //delete A[b];
-                        //onRemove(path, b, root, old, undefined);
+                        onRemove(path, b, root);
 
                         // this should never happen?
                         throw new Error("first pass should never reveal undefined keys");
                         //break;
                     case 'array':
-                        //console.log('construct list');
                         A[b] = f(B[b]);
                         // make a new proxy
                         break;
                     case 'object':
-                        //console.log('construct map');
                         A[b] = f(B[b]);
                         // make a new proxy
                         break;
@@ -236,7 +334,6 @@ define([
                     // not equal, so assign
                     A[b] = B[b];
 
-                    hasChanged = true;
                     onChange(path, b, root, old, B[b]);
                 }
                 return;
@@ -246,45 +343,29 @@ define([
             var nextPath = path.slice(0).concat(b);
             if (t_a === 'object') {
                 // it's an object
-
-                if (objects.call(root, A[b], B[b], f, nextPath, root)) {
-                    hasChanged = true;
-                    // TODO do you want to call onChange when an object changes?
-                    //onChange(path, b, root, old, B[b]);
-                }
+                objects.call(root, A[b], B[b], f, nextPath, root);
             } else {
                 // it's an array
-                if (deepProxy.arrays.call(root, A[b], B[b], f, nextPath, root)) {
-                    hasChanged = true;
-
-                    // TODO do you want to call onChange when an object changes?
-                    //onChange(path, b, root, old, B[b]);
-                }
+                deepProxy.arrays.call(root, A[b], B[b], f, nextPath, root);
             }
         });
         Akeys.forEach(function (a) {
             var old = A[a];
 
+            // the key was deleted
             if (Bkeys.indexOf(a) === -1 || type(B[a]) === 'undefined') {
-                //console.log("Deleting [%s]", a);
-                // the key was deleted!
+                onRemove(path, a, root);
                 delete A[a];
-
-                // FIXME
-                //onRemove(path, a, root, old, B[a]);
-                onChange(path, a, root, old, B[a]);
             }
         });
 
-        return hasChanged;
+        return;
     };
 
     var arrays = deepProxy.arrays = function (A, B, f, path, root) {
         var l_A = A.length;
         var l_B = B.length;
 
-        var hasChanged = false;
-
         if (l_A !== l_B) {
             // B is longer than Aj
             // there has been an insertion
@@ -315,7 +396,6 @@ define([
                             break;
                     }
 
-                    hasChanged = true;
                     // path, key, root object, oldvalue, newvalue
                     onChange(path, i, root, old, b);
                 } else {
@@ -324,14 +404,10 @@ define([
 
                     switch (t_b) {
                         case 'object':
-                            if (objects.call(root, A[i], b, f, nextPath, root)) {
-                                hasChanged = true;
-                                onChange(path, i, root, old, b);
-                            }
+                            objects.call(root, A[i], b, f, nextPath, root);
                             break;
                         case 'array':
                             if (arrays.call(root, A[i], b, f, nextPath, root)) {
-                                hasChanged = true;
                                 onChange(path, i, root, old, b);
                             }
                             break;
@@ -339,7 +415,6 @@ define([
                             if (b !== A[i]) {
                                 A[i] = b;
                                 onChange(path, i, root, old, b);
-                                hasChanged = true;
                             }
                             break;
                     }
@@ -352,9 +427,8 @@ define([
                 var t_a;
 
                 for (; i <= l_B; i++) {
-                    // FIXME
-                    //onRemove(path, i, root, A[i], undefined);
-                    onChange(path, i, root, A[i], B[i]);
+                    // recursively delete
+                    onRemove(path, i, root);
                 }
                 // cool
             }
@@ -372,8 +446,13 @@ define([
 
             // they have different types
             if (t_a !== t_b) {
-                // watch out for fallthrough behaviour
                 switch (t_b) {
+                    case 'undefined':
+                        onRemove(path, i, root);
+                        break;
+
+                // watch out for fallthrough behaviour
+                    // if it's an object or array, create a proxy
                     case 'object':
                     case 'array':
                         A[i] = f(B[i]);
@@ -383,7 +462,6 @@ define([
                         break;
                 }
 
-                hasChanged = true;
                 onChange(path, i, root, old, B[i]);
                 return;
             }
@@ -393,28 +471,27 @@ define([
 
             // same type
             switch (t_b) {
+                case 'undefined':
+                    throw new Error('existing key had type `undefined`. this should never happen');
                 case 'object':
                     if (objects.call(root, A[i], B[i], f, nextPath, root)) {
-                        hasChanged = true;
                         onChange(path, i, root, old, B[i]);
                     }
                     break;
                 case 'array':
                     if (arrays.call(root, A[i], B[i], f, nextPath, root)) {
-                        hasChanged = true;
                         onChange(path, i, root, old, B[i]);
                     }
                     break;
                 default:
                     if (A[i] !== B[i]) {
                         A[i] = B[i];
-                        hasChanged = true;
                         onChange(path, i, root, old, B[i]);
                     }
                     break;
             }
         });
-        return hasChanged;
+        return;
     };
 
     var update = deepProxy.update = function (A, B, cb) {
@@ -439,7 +516,7 @@ define([
                 }, [], A);
                 break;
             default:
-                throw new Error("unsupported realtime datatype");
+                throw new Error("unsupported realtime datatype:" + t_B);
         }
     };
 

From fea74782a2a793d19808ef780c1fdeeecc8b9388 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 1 Jun 2016 12:35:42 +0200
Subject: [PATCH 229/257] remove a little more dead code that I missed

---
 www/json/deep-proxy.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/json/deep-proxy.js b/www/json/deep-proxy.js
index dc3086550..ae99e2bb9 100644
--- a/www/json/deep-proxy.js
+++ b/www/json/deep-proxy.js
@@ -75,7 +75,6 @@ define([
                             if (pathMatches(path, pattern)) {
                                 return f(oldval, newval, path, root);
                             }
-                            //else { console.log("path did not match pattern!"); }
                         },
                         pattern: pattern,
                     });

From 2b9ac14cb1f55a4993b248c1b7b8afe070f49040 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Wed, 1 Jun 2016 12:36:26 +0200
Subject: [PATCH 230/257] restructure main to take advantage of new callback
 infrastructure

---
 www/json/main.js | 71 ++++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/www/json/main.js b/www/json/main.js
index 15b651b0b..4d82b9183 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -26,45 +26,50 @@ define([
 
     var initializing = true;
 
-    // TODO replace with `proxy.on('init'` ?
-    // or just remove?
-    var onInit = config.onInit = function (info) {
-        console.log("initializing!");
-        window.location.hash = info.channel + secret.key;
-    };
-
-    // TODO replace with `proxy.on('ready'` ?
-    var onReady = config.onReady = function (info) {
-        setEditable(true);
-    };
-
     setEditable(false);
 
-    // TODO replace with `proxy.on('disconnect'` ?
-    var onAbort = config.onAbort = function (info) {
-        setEditable(false);
-        window.alert("Network connection lost");
-    };
-
     var rt = module.rt = RtListMap.create(config);
+    rt.proxy.on('create', function (info) {
+        console.log("initializing!");
+        window.location.hash = info.channel + secret.key;
+        console.log(info);
+    }).on('ready', function (info) {
+        console.log("ready");
+
+        console.log(info);
+
+        rt.proxy
+            // on(event, path, cb)
+            .on('change', [], function (o, n, p) {
+                console.log("root change event firing for path [%s]: %s => %s", p.join(','), o, n);
+            }).on('change', ['a', 'b', 'c'], function (o, n, p) {
+                console.log("Deeper change event at [%s]: %s => %s", p.join(','), o, n);
+                console.log("preventing propogation...");
+                return false;
+            });
+
+        rt.proxy.on('disconnect', function (info) {
+            setEditable(false);
+            console.log(info);
+            window.alert("Network connection lost");
+        });
 
-    // set up user interface hooks
-    $repl.on('keyup', function (e) {
-        if (e.which === 13) {
-            var value = $repl.val();
+        // set up user interface hooks
+        $repl.on('keyup', function (e) {
+            if (e.which === 13) {
+                var value = $repl.val();
 
-            if (!value.trim()) { return; }
+                if (!value.trim()) { return; }
 
-            console.log("evaluating `%s`", value);
-            var x = rt.proxy;
+                console.log("evaluating `%s`", value);
+                var x = rt.proxy;
 
-            console.log('> ', eval(value)); // jshint ignore:line
-            console.log();
-            $repl.val('');
-        }
-    });
+                console.log('> ', eval(value)); // jshint ignore:line
+                console.log();
+                $repl.val('');
+            }
+        });
 
-    // debugging TODO remove
-    //rt.proxy.on('change', 'u', (o, n) => console.log("'u' changed!", o,n));
-    //rt.proxy.on('change', ['u', 2], (o, n) => (console.log("'u[2]' changed!", o, n), true));
+        setEditable(true);
+    });
 });

From 83696495a855697a2938f96c4b65541f959ab5a2 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 2 Jun 2016 16:54:47 +0200
Subject: [PATCH 231/257] use chainpad from bower, not local

---
 bower.json                   |    3 +-
 www/common/chainpad.js       | 1530 ----------------------------------
 www/common/realtime-input.js |    2 +-
 3 files changed, 3 insertions(+), 1532 deletions(-)
 delete mode 100644 www/common/chainpad.js

diff --git a/bower.json b/bower.json
index eddf72f45..e080c2f3d 100644
--- a/bower.json
+++ b/bower.json
@@ -33,6 +33,7 @@
     "fabric.js": "fabric#~1.6.0",
     "hyperjson": "~1.2.2",
     "textpatcher": "^1.2.0",
-    "proxy-polyfill": "^0.1.5"
+    "proxy-polyfill": "^0.1.5",
+    "chainpad": "^0.2.2"
   }
 }
diff --git a/www/common/chainpad.js b/www/common/chainpad.js
deleted file mode 100644
index ae0d40185..000000000
--- a/www/common/chainpad.js
+++ /dev/null
@@ -1,1530 +0,0 @@
-(function(){
-var r=function(){var e="function"==typeof require&&require,r=function(i,o,u){o||(o=0);var n=r.resolve(i,o),t=r.m[o][n];if(!t&&e){if(t=e(n))return t}else if(t&&t.c&&(o=t.c,n=t.m,t=r.m[o][t.m],!t))throw new Error('failed to require "'+n+'" from '+o);if(!t)throw new Error('failed to require "'+i+'" from '+u);return t.exports||(t.exports={},t.call(t.exports,t,t.exports,r.relative(n,o))),t.exports};return r.resolve=function(e,n){var i=e,t=e+".js",o=e+"/index.js";return r.m[n][t]&&t?t:r.m[n][o]&&o?o:i},r.relative=function(e,t){return function(n){if("."!=n.charAt(0))return r(n,t,e);var o=e.split("/"),f=n.split("/");o.pop();for(var i=0;i.
- */
-var Common = require('./Common');
-var Operation = require('./Operation');
-var Sha = require('./SHA256');
-
-var Patch = module.exports;
-
-var create = Patch.create = function (parentHash) {
-    return {
-        type: 'Patch',
-        operations: [],
-        parentHash: parentHash,
-        isCheckpoint: false
-    };
-};
-
-var check = Patch.check = function (patch, docLength_opt) {
-    Common.assert(patch.type === 'Patch');
-    Common.assert(Array.isArray(patch.operations));
-    Common.assert(/^[0-9a-f]{64}$/.test(patch.parentHash));
-    for (var i = patch.operations.length - 1; i >= 0; i--) {
-        Operation.check(patch.operations[i], docLength_opt);
-        if (i > 0) {
-            Common.assert(!Operation.shouldMerge(patch.operations[i], patch.operations[i-1]));
-        }
-        if (typeof(docLength_opt) === 'number') {
-            docLength_opt += Operation.lengthChange(patch.operations[i]);
-        }
-    }
-    if (patch.isCheckpoint) {
-        Common.assert(patch.operations.length === 1);
-        Common.assert(patch.operations[0].offset === 0);
-        if (typeof(docLength_opt) === 'number') {
-            Common.assert(!docLength_opt || patch.operations[0].toRemove === docLength_opt);
-        }
-    }
-};
-
-var toObj = Patch.toObj = function (patch) {
-    if (Common.PARANOIA) { check(patch); }
-    var out = new Array(patch.operations.length+1);
-    var i;
-    for (i = 0; i < patch.operations.length; i++) {
-        out[i] = Operation.toObj(patch.operations[i]);
-    }
-    out[i] = patch.parentHash;
-    return out;
-};
-
-var fromObj = Patch.fromObj = function (obj) {
-    Common.assert(Array.isArray(obj) && obj.length > 0);
-    var patch = create();
-    var i;
-    for (i = 0; i < obj.length-1; i++) {
-        patch.operations[i] = Operation.fromObj(obj[i]);
-    }
-    patch.parentHash = obj[i];
-    if (Common.PARANOIA) { check(patch); }
-    return patch;
-};
-
-var hash = function (text) {
-    return Sha.hex_sha256(text);
-};
-
-var addOperation = Patch.addOperation = function (patch, op) {
-    if (Common.PARANOIA) {
-        check(patch);
-        Operation.check(op);
-    }
-    for (var i = 0; i < patch.operations.length; i++) {
-        if (Operation.shouldMerge(patch.operations[i], op)) {
-            op = Operation.merge(patch.operations[i], op);
-            patch.operations.splice(i,1);
-            if (op === null) {
-                //console.log("operations cancelled eachother");
-                return;
-            }
-            i--;
-        } else {
-            var out = Operation.rebase(patch.operations[i], op);
-            if (out === op) {
-                // op could not be rebased further, insert it here to keep the list ordered.
-                patch.operations.splice(i,0,op);
-                return;
-            } else {
-                op = out;
-                // op was rebased, try rebasing it against the next operation.
-            }
-        }
-    }
-    patch.operations.push(op);
-    if (Common.PARANOIA) { check(patch); }
-};
-
-var createCheckpoint = Patch.createCheckpoint =
-    function (parentContent, checkpointContent, parentContentHash_opt)
-{
-    var op = Operation.create(0, parentContent.length, checkpointContent);
-    if (Common.PARANOIA && parentContentHash_opt) {
-        Common.assert(parentContentHash_opt === hash(parentContent));
-    }
-    parentContentHash_opt = parentContentHash_opt || hash(parentContent);
-    var out = create(parentContentHash_opt);
-    addOperation(out, op);
-    out.isCheckpoint = true;
-    return out;
-};
-
-var clone = Patch.clone = function (patch) {
-    if (Common.PARANOIA) { check(patch); }
-    var out = create();
-    out.parentHash = patch.parentHash;
-    for (var i = 0; i < patch.operations.length; i++) {
-        out.operations[i] = Operation.clone(patch.operations[i]);
-    }
-    return out;
-};
-
-var merge = Patch.merge = function (oldPatch, newPatch) {
-    if (Common.PARANOIA) {
-        check(oldPatch);
-        check(newPatch);
-    }
-    oldPatch = clone(oldPatch);
-    for (var i = newPatch.operations.length-1; i >= 0; i--) {
-        addOperation(oldPatch, newPatch.operations[i]);
-    }
-    return oldPatch;
-};
-
-var apply = Patch.apply = function (patch, doc)
-{
-    if (Common.PARANOIA) {
-        check(patch);
-        Common.assert(typeof(doc) === 'string');
-        Common.assert(Sha.hex_sha256(doc) === patch.parentHash);
-    }
-    var newDoc = doc;
-    for (var i = patch.operations.length-1; i >= 0; i--) {
-        newDoc = Operation.apply(patch.operations[i], newDoc);
-    }
-    return newDoc;
-};
-
-var lengthChange = Patch.lengthChange = function (patch)
-{
-    if (Common.PARANOIA) { check(patch); }
-    var out = 0;
-    for (var i = 0; i < patch.operations.length; i++) {
-        out += Operation.lengthChange(patch.operations[i]);
-    }
-    return out;
-};
-
-var invert = Patch.invert = function (patch, doc)
-{
-    if (Common.PARANOIA) {
-        check(patch);
-        Common.assert(typeof(doc) === 'string');
-        Common.assert(Sha.hex_sha256(doc) === patch.parentHash);
-    }
-    var rpatch = create();
-    var newDoc = doc;
-    for (var i = patch.operations.length-1; i >= 0; i--) {
-        rpatch.operations[i] = Operation.invert(patch.operations[i], newDoc);
-        newDoc = Operation.apply(patch.operations[i], newDoc);
-    }
-    for (var i = rpatch.operations.length-1; i >= 0; i--) {
-        for (var j = i - 1; j >= 0; j--) {
-            rpatch.operations[i].offset += rpatch.operations[j].toRemove;
-            rpatch.operations[i].offset -= rpatch.operations[j].toInsert.length;
-        }
-    }
-    rpatch.parentHash = Sha.hex_sha256(newDoc);
-    if (Common.PARANOIA) { check(rpatch); }
-    return rpatch;
-};
-
-var simplify = Patch.simplify = function (patch, doc, operationSimplify)
-{
-    if (Common.PARANOIA) {
-        check(patch);
-        Common.assert(typeof(doc) === 'string');
-        Common.assert(Sha.hex_sha256(doc) === patch.parentHash);
-    }
-    operationSimplify = operationSimplify || Operation.simplify;
-    var spatch = create(patch.parentHash);
-    var newDoc = doc;
-    var outOps = [];
-    var j = 0;
-    for (var i = patch.operations.length-1; i >= 0; i--) {
-        outOps[j] = operationSimplify(patch.operations[i], newDoc, Operation.simplify);
-        if (outOps[j]) {
-            newDoc = Operation.apply(outOps[j], newDoc);
-            j++;
-        }
-    }
-    spatch.operations = outOps.reverse();
-    if (!spatch.operations[0]) {
-        spatch.operations.shift();
-    }
-    if (Common.PARANOIA) {
-        check(spatch);
-    }
-    return spatch;
-};
-
-var equals = Patch.equals = function (patchA, patchB) {
-    if (patchA.operations.length !== patchB.operations.length) { return false; }
-    for (var i = 0; i < patchA.operations.length; i++) {
-        if (!Operation.equals(patchA.operations[i], patchB.operations[i])) { return false; }
-    }
-    return true;
-};
-
-var transform = Patch.transform = function (origToTransform, transformBy, doc, transformFunction) {
-    if (Common.PARANOIA) {
-        check(origToTransform, doc.length);
-        check(transformBy, doc.length);
-        Common.assert(Sha.hex_sha256(doc) === origToTransform.parentHash);
-    }
-    Common.assert(origToTransform.parentHash === transformBy.parentHash);
-    var resultOfTransformBy = apply(transformBy, doc);
-
-    var toTransform = clone(origToTransform);
-    var text = doc;
-    for (var i = toTransform.operations.length-1; i >= 0; i--) {
-        for (var j = transformBy.operations.length-1; j >= 0; j--) {
-            try {
-                toTransform.operations[i] = Operation.transform(text,
-                                                                toTransform.operations[i],
-                                                                transformBy.operations[j],
-                                                                transformFunction);
-            } catch (e) {
-                console.error("The pluggable transform function threw an error, " +
-                    "failing operational transformation");
-                return create(Sha.hex_sha256(resultOfTransformBy));
-            }
-            if (!toTransform.operations[i]) {
-                break;
-            }
-        }
-        if (Common.PARANOIA && toTransform.operations[i]) {
-            Operation.check(toTransform.operations[i], resultOfTransformBy.length);
-        }
-    }
-    var out = create(transformBy.parentHash);
-    for (var i = toTransform.operations.length-1; i >= 0; i--) {
-        if (toTransform.operations[i]) {
-            addOperation(out, toTransform.operations[i]);
-        }
-    }
-
-    out.parentHash = Sha.hex_sha256(resultOfTransformBy);
-
-    if (Common.PARANOIA) {
-        check(out, resultOfTransformBy.length);
-    }
-    return out;
-};
-
-var random = Patch.random = function (doc, opCount) {
-    Common.assert(typeof(doc) === 'string');
-    opCount = opCount || (Math.floor(Math.random() * 30) + 1);
-    var patch = create(Sha.hex_sha256(doc));
-    var docLength = doc.length;
-    while (opCount-- > 0) {
-        var op = Operation.random(docLength);
-        docLength += Operation.lengthChange(op);
-        addOperation(patch, op);
-    }
-    check(patch);
-    return patch;
-};
-
-},
-"SHA256.js": function(module, exports, require){
-/* A JavaScript implementation of the Secure Hash Algorithm, SHA-256
- * Version 0.3 Copyright Angel Marin 2003-2004 - http://anmar.eu.org/
- * Distributed under the BSD License
- * Some bits taken from Paul Johnston's SHA-1 implementation
- */
-(function () {
-    var chrsz = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode  */
-    function safe_add (x, y) {
-        var lsw = (x & 0xFFFF) + (y & 0xFFFF);
-        var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-        return (msw << 16) | (lsw & 0xFFFF);
-    }
-    function S (X, n) {return ( X >>> n ) | (X << (32 - n));}
-    function R (X, n) {return ( X >>> n );}
-    function Ch(x, y, z) {return ((x & y) ^ ((~x) & z));}
-    function Maj(x, y, z) {return ((x & y) ^ (x & z) ^ (y & z));}
-    function Sigma0256(x) {return (S(x, 2) ^ S(x, 13) ^ S(x, 22));}
-    function Sigma1256(x) {return (S(x, 6) ^ S(x, 11) ^ S(x, 25));}
-    function Gamma0256(x) {return (S(x, 7) ^ S(x, 18) ^ R(x, 3));}
-    function Gamma1256(x) {return (S(x, 17) ^ S(x, 19) ^ R(x, 10));}
-    function newArray (n) {
-        var a = [];
-        for (;n>0;n--) {
-            a.push(undefined);
-        }
-        return a;
-    }
-    function core_sha256 (m, l) {
-        var K = [0x428A2F98,0x71374491,0xB5C0FBCF,0xE9B5DBA5,0x3956C25B,0x59F111F1,0x923F82A4,0xAB1C5ED5,0xD807AA98,0x12835B01,0x243185BE,0x550C7DC3,0x72BE5D74,0x80DEB1FE,0x9BDC06A7,0xC19BF174,0xE49B69C1,0xEFBE4786,0xFC19DC6,0x240CA1CC,0x2DE92C6F,0x4A7484AA,0x5CB0A9DC,0x76F988DA,0x983E5152,0xA831C66D,0xB00327C8,0xBF597FC7,0xC6E00BF3,0xD5A79147,0x6CA6351,0x14292967,0x27B70A85,0x2E1B2138,0x4D2C6DFC,0x53380D13,0x650A7354,0x766A0ABB,0x81C2C92E,0x92722C85,0xA2BFE8A1,0xA81A664B,0xC24B8B70,0xC76C51A3,0xD192E819,0xD6990624,0xF40E3585,0x106AA070,0x19A4C116,0x1E376C08,0x2748774C,0x34B0BCB5,0x391C0CB3,0x4ED8AA4A,0x5B9CCA4F,0x682E6FF3,0x748F82EE,0x78A5636F,0x84C87814,0x8CC70208,0x90BEFFFA,0xA4506CEB,0xBEF9A3F7,0xC67178F2];
-        var HASH = [0x6A09E667, 0xBB67AE85, 0x3C6EF372, 0xA54FF53A, 0x510E527F, 0x9B05688C, 0x1F83D9AB, 0x5BE0CD19];
-        var W = newArray(64);
-        var a, b, c, d, e, f, g, h, i, j;
-        var T1, T2;
-        /* append padding */
-        m[l >> 5] |= 0x80 << (24 - l % 32);
-        m[((l + 64 >> 9) << 4) + 15] = l;
-        for ( var i = 0; i>5] |= (str.charCodeAt(i / chrsz) & mask) << (24 - i%32);
-        return bin;
-    }
-    function binb2hex (binarray) {
-        var hexcase = 0; /* hex output format. 0 - lowercase; 1 - uppercase */
-        var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
-        var str = "";
-        for (var i = 0; i < binarray.length * 4; i++) {
-            str += hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8+4)) & 0xF) +
-                hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8  )) & 0xF);
-        }
-        return str;
-    }
-    function hex_sha256(s){
-        return binb2hex(core_sha256(str2binb(s),s.length * chrsz));
-    }
-    module.exports.hex_sha256 = hex_sha256;
-}());
-
-},
-"Common.js": function(module, exports, require){
-/*
- * 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 .
- */
-
-var PARANOIA = module.exports.PARANOIA = true;
-
-/* Good testing but slooooooooooow */
-var VALIDATE_ENTIRE_CHAIN_EACH_MSG = module.exports.VALIDATE_ENTIRE_CHAIN_EACH_MSG = false;
-
-/* throw errors over non-compliant messages which would otherwise be treated as invalid */
-var TESTING = module.exports.TESTING = false;
-
-var assert = module.exports.assert = function (expr) {
-    if (!expr) { throw new Error("Failed assertion"); }
-};
-
-var isUint = module.exports.isUint = function (integer) {
-    return (typeof(integer) === 'number') &&
-        (Math.floor(integer) === integer) &&
-        (integer >= 0);
-};
-
-var randomASCII = module.exports.randomASCII = function (length) {
-    var content = [];
-    for (var i = 0; i < length; i++) {
-        content[i] = String.fromCharCode( Math.floor(Math.random()*256) % 57 + 65 );
-    }
-    return content.join('');
-};
-
-var strcmp = module.exports.strcmp = function (a, b) {
-    if (PARANOIA && typeof(a) !== 'string') { throw new Error(); }
-    if (PARANOIA && typeof(b) !== 'string') { throw new Error(); }
-    return ( (a === b) ? 0 : ( (a > b) ? 1 : -1 ) );
-}
-
-},
-"Message.js": function(module, exports, require){
-/*
- * 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 .
- */
-var Common = require('./Common');
-var Operation = require('./Operation');
-var Patch = require('./Patch');
-var Sha = require('./SHA256');
-
-var Message = module.exports;
-
-var REGISTER     = Message.REGISTER     = 0;
-var REGISTER_ACK = Message.REGISTER_ACK = 1;
-var PATCH        = Message.PATCH        = 2;
-var DISCONNECT   = Message.DISCONNECT   = 3;
-var CHECKPOINT   = Message.CHECKPOINT   = 4;
-
-var check = Message.check = function(msg) {
-    Common.assert(msg.type === 'Message');
-    if (msg.messageType === PATCH || msg.messageType === CHECKPOINT) {
-        Patch.check(msg.content);
-        Common.assert(typeof(msg.lastMsgHash) === 'string');
-    } else {
-        throw new Error("invalid message type [" + msg.messageType + "]");
-    }
-};
-
-var create = Message.create = function (type, content, lastMsgHash) {
-    var msg = {
-        type: 'Message',
-        messageType: type,
-        content: content,
-        lastMsgHash: lastMsgHash
-    };
-    if (Common.PARANOIA) { check(msg); }
-    return msg;
-};
-
-var toString = Message.toString = function (msg) {
-    if (Common.PARANOIA) { check(msg); }
-    if (msg.messageType === PATCH || msg.messageType === CHECKPOINT) {
-        return JSON.stringify([msg.messageType, Patch.toObj(msg.content), msg.lastMsgHash]);
-    } else {
-        throw new Error();
-    }
-};
-
-var discardBencode = function (msg, arr) {
-    var len = msg.substring(0,msg.indexOf(':'));
-    msg = msg.substring(len.length+1);
-    var value = msg.substring(0,Number(len));
-    msg = msg.substring(value.length);
-
-    if (arr) { arr.push(value); }
-    return msg;
-};
-
-var fromString = Message.fromString = function (str) {
-    var m = JSON.parse(str);
-    if (m[0] !== CHECKPOINT && m[0] !== PATCH) { throw new Error("invalid message type " + m[0]); }
-    var msg = create(m[0], Patch.fromObj(m[1]), m[2]);
-    if (m[0] === CHECKPOINT) { msg.content.isCheckpoint = true; }
-    return msg;
-};
-
-var hashOf = Message.hashOf = function (msg) {
-    if (Common.PARANOIA) { check(msg); }
-    var hash = Sha.hex_sha256(toString(msg));
-    return hash;
-};
-
-},
-"ChainPad.js": function(module, exports, require){
-/*
- * 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 .
- */
-var Common = module.exports.Common = require('./Common');
-var Operation = module.exports.Operation = require('./Operation');
-var Patch = module.exports.Patch = require('./Patch');
-var Message = module.exports.Message = require('./Message');
-var Sha = module.exports.Sha = require('./SHA256');
-
-var ChainPad = {};
-
-// hex_sha256('')
-var EMPTY_STR_HASH = module.exports.EMPTY_STR_HASH =
-    'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855';
-var ZERO = '0000000000000000000000000000000000000000000000000000000000000000';
-
-// Default number of patches between checkpoints (patches older than this will be pruned)
-// default for realtime.config.checkpointInterval
-var DEFAULT_CHECKPOINT_INTERVAL = 50;
-
-// Default number of milliseconds to wait before syncing to the server
-var DEFAULT_AVERAGE_SYNC_MILLISECONDS = 300;
-
-// By default, we allow checkpoints at any place but if this is set true, we will blow up on chains
-// which have checkpoints not where we expect them to be.
-var DEFAULT_STRICT_CHECKPOINT_VALIDATION = false;
-
-var enterChainPad = function (realtime, func) {
-    return function () {
-        if (realtime.failed) { return; }
-        func.apply(null, arguments);
-    };
-};
-
-var debug = function (realtime, msg) {
-    if (realtime.logLevel > 0) {
-        console.log("[" + realtime.userName + "]  " + msg);
-    }
-};
-
-var schedule = function (realtime, func, timeout) {
-    if (realtime.aborted) { return; }
-    if (!timeout) {
-        timeout = Math.floor(Math.random() * 2 * realtime.config.avgSyncMilliseconds);
-    }
-    var to = setTimeout(enterChainPad(realtime, function () {
-        realtime.schedules.splice(realtime.schedules.indexOf(to), 1);
-        func();
-    }), timeout);
-    realtime.schedules.push(to);
-    return to;
-};
-
-var unschedule = function (realtime, schedule) {
-    var index = realtime.schedules.indexOf(schedule);
-    if (index > -1) {
-        realtime.schedules.splice(index, 1);
-    }
-    clearTimeout(schedule);
-};
-
-var onMessage = function (realtime, message, callback) {
-    if (!realtime.messageHandlers.length) {
-        callback("no onMessage() handler registered");
-    }
-    for (var i = 0; i < realtime.messageHandlers.length; i++) {
-        realtime.messageHandlers[i](message, function () {
-            callback.apply(null, arguments);
-            callback = function () { };
-        });
-    }
-};
-
-var sendMessage = function (realtime, msg, callback) {
-    var strMsg = Message.toString(msg);
-
-    onMessage(realtime, strMsg, function (err) {
-        if (err) {
-            debug(realtime, "Posting to server failed [" + err + "]");
-            realtime.pending = null;
-        } else {
-            var pending = realtime.pending;
-            realtime.pending = null;
-            Common.assert(pending.hash === msg.hashOf);
-            handleMessage(realtime, strMsg, true);
-            pending.callback();
-        }
-    });
-
-    msg.hashOf = msg.hashOf || Message.hashOf(msg);
-
-    var timeout = schedule(realtime, function () {
-        debug(realtime, "Failed to send message [" + msg.hashOf + "] to server");
-        sync(realtime);
-    }, 10000 + (Math.random() * 5000));
-
-    if (realtime.pending) { throw new Error("there is already a pending message"); }
-    realtime.pending = {
-        hash: msg.hashOf,
-        callback: function () {
-            unschedule(realtime, timeout);
-            realtime.syncSchedule = schedule(realtime, function () { sync(realtime); }, 0);
-            callback();
-        }
-    };
-    if (Common.PARANOIA) { check(realtime); }
-};
-
-var sync = function (realtime) {
-    if (Common.PARANOIA) { check(realtime); }
-    if (realtime.syncSchedule && !realtime.pending) {
-        unschedule(realtime, realtime.syncSchedule);
-        realtime.syncSchedule = null;
-    } else {
-        //debug(realtime, "already syncing...");
-        // we're currently waiting on something from the server.
-        return;
-    }
-
-    realtime.uncommitted = Patch.simplify(
-        realtime.uncommitted, realtime.authDoc, realtime.config.operationSimplify);
-
-    if (realtime.uncommitted.operations.length === 0) {
-        //debug(realtime, "No data to sync to the server, sleeping");
-        realtime.syncSchedule = schedule(realtime, function () { sync(realtime); });
-        return;
-    }
-
-    if (((parentCount(realtime, realtime.best) + 1) % realtime.config.checkpointInterval) === 0) {
-        var best = realtime.best;
-        debug(realtime, "Sending checkpoint");
-        var cpp = Patch.createCheckpoint(realtime.authDoc,
-                                         realtime.authDoc,
-                                         realtime.best.content.inverseOf.parentHash);
-        var cp = Message.create(Message.CHECKPOINT, cpp, realtime.best.hashOf);
-        sendMessage(realtime, cp, function () {
-            debug(realtime, "Checkpoint sent and accepted");
-        });
-        return;
-    }
-
-    var msg;
-    if (realtime.setContentPatch) {
-        msg = realtime.setContentPatch;
-    } else {
-        msg = Message.create(Message.PATCH, realtime.uncommitted, realtime.best.hashOf);
-    }
-
-    sendMessage(realtime, msg, function () {
-        //debug(realtime, "patch sent");
-        if (realtime.setContentPatch) {
-            debug(realtime, "initial Ack received [" + msg.hashOf + "]");
-            realtime.setContentPatch = null;
-        }
-    });
-};
-
-var storeMessage = function (realtime, msg) {
-    Common.assert(msg.lastMsgHash);
-    Common.assert(msg.hashOf);
-    realtime.messages[msg.hashOf] = msg;
-    (realtime.messagesByParent[msg.lastMsgHash] =
-        realtime.messagesByParent[msg.lastMsgHash] || []).push(msg);
-};
-
-var forgetMessage = function (realtime, msg) {
-    Common.assert(msg.lastMsgHash);
-    Common.assert(msg.hashOf);
-    delete realtime.messages[msg.hashOf];
-    var list = realtime.messagesByParent[msg.lastMsgHash];
-    Common.assert(list.indexOf(msg) > -1);
-    list.splice(list.indexOf(msg), 1);
-    if (list.length === 0) {
-        delete realtime.messagesByParent[msg.lastMsgHash];
-    }
-};
-
-var create = ChainPad.create = function (config) {
-    config = config || {};
-    var initialState = config.initialState || '';
-    config.checkpointInterval = config.checkpointInterval || DEFAULT_CHECKPOINT_INTERVAL;
-    config.avgSyncMilliseconds = config.avgSyncMilliseconds || DEFAULT_AVERAGE_SYNC_MILLISECONDS;
-    config.strictCheckpointValidation =
-        config.strictCheckpointValidation || DEFAULT_STRICT_CHECKPOINT_VALIDATION;
-
-    var realtime = {
-        type: 'ChainPad',
-
-        authDoc: '',
-
-        config: config,
-
-        logLevel: (typeof(config.logLevel) === 'number') ? config.logLevel : 1,
-
-        /** A patch representing all uncommitted work. */
-        uncommitted: null,
-
-        uncommittedDocLength: initialState.length,
-
-        patchHandlers: [],
-        changeHandlers: [],
-
-        messageHandlers: [],
-
-        schedules: [],
-        aborted: false,
-
-        syncSchedule: null,
-
-        registered: false,
-
-        // this is only used if PARANOIA is enabled.
-        userInterfaceContent: undefined,
-
-        // If we want to set the content to a particular thing, this patch will be sent across the
-        // wire. If the patch is not accepted we will not try to recover it. This is used for
-        // setting initial state.
-        setContentPatch: null,
-
-        failed: false,
-
-        // hash and callback for previously send patch, currently in flight.
-        pending: null,
-
-        messages: {},
-        messagesByParent: {},
-
-        rootMessage: null,
-
-        userName: config.userName || 'anonymous',
-    };
-
-    var zeroPatch = Patch.create(EMPTY_STR_HASH);
-    zeroPatch.inverseOf = Patch.invert(zeroPatch, '');
-    zeroPatch.inverseOf.inverseOf = zeroPatch;
-    var zeroMsg = Message.create(Message.PATCH, zeroPatch, ZERO);
-    zeroMsg.hashOf = Message.hashOf(zeroMsg);
-    zeroMsg.parentCount = 0;
-    zeroMsg.isInitialMessage = true;
-    storeMessage(realtime, zeroMsg);
-    realtime.rootMessage = zeroMsg;
-    realtime.best = zeroMsg;
-
-    if (initialState !== '') {
-        var initPatch = Patch.create(EMPTY_STR_HASH);
-        Patch.addOperation(initPatch, Operation.create(0, 0, initialState));
-        initPatch.inverseOf = Patch.invert(initPatch, '');
-        initPatch.inverseOf.inverseOf = initPatch;
-        var initMsg = Message.create(Message.PATCH, initPatch, zeroMsg.hashOf);
-        initMsg.hashOf = Message.hashOf(initMsg);
-        initMsg.isInitialMessage = true;
-        storeMessage(realtime, initMsg);
-        realtime.best = initMsg;
-        realtime.authDoc = initialState;
-        realtime.setContentPatch = initMsg;
-    }
-    realtime.uncommitted = Patch.create(realtime.best.content.inverseOf.parentHash);
-
-    if (Common.PARANOIA) {
-        realtime.userInterfaceContent = initialState;
-    }
-    return realtime;
-};
-
-var getParent = function (realtime, message) {
-    return message.parent = message.parent || realtime.messages[message.lastMsgHash];
-};
-
-var check = ChainPad.check = function(realtime) {
-    Common.assert(realtime.type === 'ChainPad');
-    Common.assert(typeof(realtime.authDoc) === 'string');
-
-    Patch.check(realtime.uncommitted, realtime.authDoc.length);
-
-    var uiDoc = Patch.apply(realtime.uncommitted, realtime.authDoc);
-    if (uiDoc.length !== realtime.uncommittedDocLength) {
-        Common.assert(0);
-    }
-    if (realtime.userInterfaceContent !== '') {
-        Common.assert(uiDoc === realtime.userInterfaceContent);
-    }
-
-    if (!Common.VALIDATE_ENTIRE_CHAIN_EACH_MSG) { return; }
-
-    var doc = realtime.authDoc;
-    var patchMsg = realtime.best;
-    Common.assert(patchMsg.content.inverseOf.parentHash === realtime.uncommitted.parentHash);
-    var patches = [];
-    do {
-        patches.push(patchMsg);
-        doc = Patch.apply(patchMsg.content.inverseOf, doc);
-    } while ((patchMsg = getParent(realtime, patchMsg)));
-    Common.assert(doc === '');
-    while ((patchMsg = patches.pop())) {
-        doc = Patch.apply(patchMsg.content, doc);
-    }
-    Common.assert(doc === realtime.authDoc);
-};
-
-var doOperation = ChainPad.doOperation = function (realtime, op) {
-    if (Common.PARANOIA) {
-        check(realtime);
-        realtime.userInterfaceContent = Operation.apply(op, realtime.userInterfaceContent);
-    }
-    Operation.check(op, realtime.uncommittedDocLength);
-    Patch.addOperation(realtime.uncommitted, op);
-    realtime.uncommittedDocLength += Operation.lengthChange(op);
-};
-
-var doPatch = ChainPad.doPatch = function (realtime, patch) {
-    if (Common.PARANOIA) {
-        check(realtime);
-        Common.assert(Patch.invert(realtime.uncommitted).parentHash === patch.parentHash);
-        realtime.userInterfaceContent = Patch.apply(patch, realtime.userInterfaceContent);
-    }
-    Patch.check(patch, realtime.uncommittedDocLength);
-    realtime.uncommitted = Patch.merge(realtime.uncommitted, patch);
-    realtime.uncommittedDocLength += Patch.lengthChange(patch);
-};
-
-var isAncestorOf = function (realtime, ancestor, decendent) {
-    if (!decendent || !ancestor) { return false; }
-    if (ancestor === decendent) { return true; }
-    return isAncestorOf(realtime, ancestor, getParent(realtime, decendent));
-};
-
-var parentCount = function (realtime, message) {
-    if (typeof(message.parentCount) !== 'number') {
-        message.parentCount = parentCount(realtime, getParent(realtime, message)) + 1;
-    }
-    return message.parentCount;
-};
-
-var applyPatch = function (realtime, isFromMe, patch) {
-    Common.assert(patch);
-    Common.assert(patch.inverseOf);
-    if (isFromMe) {
-        // Case 1: We're applying a patch which we originally created (yay our work was accepted)
-        //         We will merge the inverse of the patch with our uncommitted work in order that
-        //         we do not try to commit that work over again.
-        // Case 2: We're reverting a patch which had originally come from us, a.k.a. we're applying
-        //         the inverse of that patch.
-        //
-        // In either scenario, we want to apply the inverse of the patch we are applying, to the
-        // uncommitted work. Whatever we "add" to the authDoc we "remove" from the uncommittedWork.
-        //
-        Common.assert(patch.parentHash === realtime.uncommitted.parentHash);
-        realtime.uncommitted = Patch.merge(patch.inverseOf, realtime.uncommitted);
-
-    } else {
-        // It's someone else's patch which was received, we need to *transform* out uncommitted
-        // work over their patch in order to preserve intent as much as possible.
-        realtime.uncommitted =
-            Patch.transform(
-                realtime.uncommitted, patch, realtime.authDoc, realtime.config.transformFunction);
-    }
-    realtime.uncommitted.parentHash = patch.inverseOf.parentHash;
-
-    realtime.authDoc = Patch.apply(patch, realtime.authDoc);
-
-    if (Common.PARANOIA) {
-        Common.assert(realtime.uncommitted.parentHash === patch.inverseOf.parentHash);
-        Common.assert(Sha.hex_sha256(realtime.authDoc) === realtime.uncommitted.parentHash);
-        realtime.userInterfaceContent = Patch.apply(realtime.uncommitted, realtime.authDoc);
-    }
-};
-
-var revertPatch = function (realtime, isFromMe, patch) {
-    applyPatch(realtime, isFromMe, patch.inverseOf);
-};
-
-var getBestChild = function (realtime, msg) {
-    var best = msg;
-    (realtime.messagesByParent[msg.hashOf] || []).forEach(function (child) {
-        Common.assert(child.lastMsgHash === msg.hashOf);
-        child = getBestChild(realtime, child);
-        if (parentCount(realtime, child) > parentCount(realtime, best)) { best = child; }
-    });
-    return best;
-};
-
-var pushUIPatch = function (realtime, patch) {
-    if (patch.operations.length) {
-        // push the uncommittedPatch out to the user interface.
-        for (var i = 0; i < realtime.patchHandlers.length; i++) {
-            realtime.patchHandlers[i](patch);
-        }
-        for (var i = 0; i < realtime.changeHandlers.length; i++) {
-            for (var j = patch.operations.length; j >= 0; j--) {
-                var op = patch.operations[j];
-                realtime.changeHandlers[i](op.offset, op.toRemove, op.toInsert);
-            }
-        }
-    }
-};
-
-var validContent = function (realtime, contentGetter) {
-    if (!realtime.config.validateContent) { return true; }
-    try {
-        return realtime.validateContent(contentGetter());
-    } catch (e) {
-        warn(realtime, "Error in content validator [" + e.stack + "]");
-    }
-    return false;
-};
-
-var handleMessage = ChainPad.handleMessage = function (realtime, msgStr, isFromMe) {
-
-    if (Common.PARANOIA) { check(realtime); }
-    var msg = Message.fromString(msgStr);
-
-    if (msg.messageType !== Message.PATCH && msg.messageType !== Message.CHECKPOINT) {
-        debug(realtime, "unrecognized message type " + msg.messageType);
-        return;
-    }
-
-    msg.hashOf = Message.hashOf(msg);
-
-    if (realtime.messages[msg.hashOf]) {
-        debug(realtime, "Patch [" + msg.hashOf + "] is already known");
-        if (Common.PARANOIA) { check(realtime); }
-        return;
-    }
-
-    if (msg.content.isCheckpoint &&
-        !validContent(realtime, function () { return msg.content.operations[0].toInsert }))
-    {
-        // If it's not a checkpoint, we verify it later on...
-        debug(realtime, "Checkpoint [" + msg.hashOf + "] failed content validation");
-        return;
-    }
-
-    storeMessage(realtime, msg);
-
-    if (!isAncestorOf(realtime, realtime.rootMessage, msg)) {
-        if (msg.content.isCheckpoint && realtime.best.isInitialMessage) {
-            // We're starting with a trucated chain from a checkpoint, we will adopt this
-            // as the root message and go with it...
-            var userDoc = Patch.apply(realtime.uncommitted, realtime.authDoc);
-            Common.assert(!Common.PARANOIA || realtime.userInterfaceContent === userDoc);
-            var fixUserDocPatch = Patch.invert(realtime.uncommitted, realtime.authDoc);
-            Patch.addOperation(fixUserDocPatch,
-                Operation.create(0, realtime.authDoc.length, msg.content.operations[0].toInsert));
-            fixUserDocPatch =
-                Patch.simplify(fixUserDocPatch, userDoc, realtime.config.operationSimplify);
-
-            msg.parentCount = 0;
-            realtime.rootMessage = realtime.best = msg;
-
-            realtime.authDoc = msg.content.operations[0].toInsert;
-            realtime.uncommitted = Patch.create(Sha.hex_sha256(realtime.authDoc));
-            realtime.uncommittedDocLength = realtime.authDoc.length;
-            pushUIPatch(realtime, fixUserDocPatch);
-
-            if (Common.PARANOIA) { realtime.userInterfaceContent = realtime.authDoc; }
-            return;
-        } else {
-            // we'll probably find the missing parent later.
-            debug(realtime, "Patch [" + msg.hashOf + "] not connected to root");
-            if (Common.PARANOIA) { check(realtime); }
-            return;
-        }
-    }
-
-    // of this message fills in a hole in the chain which makes another patch better, swap to the
-    // best child of this patch since longest chain always wins.
-    msg = getBestChild(realtime, msg);
-    msg.isFromMe = isFromMe;
-    var patch = msg.content;
-
-    // Find the ancestor of this patch which is in the main chain, reverting as necessary
-    var toRevert = [];
-    var commonAncestor = realtime.best;
-    if (!isAncestorOf(realtime, realtime.best, msg)) {
-        var pcBest = parentCount(realtime, realtime.best);
-        var pcMsg = parentCount(realtime, msg);
-        if (pcBest < pcMsg
-          || (pcBest === pcMsg
-            && Common.strcmp(realtime.best.hashOf, msg.hashOf) > 0))
-        {
-            // switch chains
-            while (commonAncestor && !isAncestorOf(realtime, commonAncestor, msg)) {
-                toRevert.push(commonAncestor);
-                commonAncestor = getParent(realtime, commonAncestor);
-            }
-            Common.assert(commonAncestor);
-            debug(realtime, "Patch [" + msg.hashOf + "] better than best chain, switching");
-        } else {
-            debug(realtime, "Patch [" + msg.hashOf + "] chain is [" + pcMsg + "] best chain is [" +
-                pcBest + "]");
-            if (Common.PARANOIA) { check(realtime); }
-            return;
-        }
-    }
-
-    // Find the parents of this patch which are not in the main chain.
-    var toApply = [];
-    var current = msg;
-    do {
-        toApply.unshift(current);
-        current = getParent(realtime, current);
-        Common.assert(current);
-    } while (current !== commonAncestor);
-
-
-    var authDocAtTimeOfPatch = realtime.authDoc;
-
-    for (var i = 0; i < toRevert.length; i++) {
-        Common.assert(typeof(toRevert[i].content.inverseOf) !== 'undefined');
-        authDocAtTimeOfPatch = Patch.apply(toRevert[i].content.inverseOf, authDocAtTimeOfPatch);
-    }
-
-    // toApply.length-1 because we do not want to apply the new patch.
-    for (var i = 0; i < toApply.length-1; i++) {
-        if (typeof(toApply[i].content.inverseOf) === 'undefined') {
-            toApply[i].content.inverseOf = Patch.invert(toApply[i].content, authDocAtTimeOfPatch);
-            toApply[i].content.inverseOf.inverseOf = toApply[i].content;
-        }
-        authDocAtTimeOfPatch = Patch.apply(toApply[i].content, authDocAtTimeOfPatch);
-    }
-
-    if (Sha.hex_sha256(authDocAtTimeOfPatch) !== patch.parentHash) {
-        debug(realtime, "patch [" + msg.hashOf + "] parentHash is not valid");
-        if (Common.PARANOIA) { check(realtime); }
-        if (Common.TESTING) { throw new Error(); }
-        forgetMessage(realtime, msg);
-        return;
-    }
-
-    if (patch.isCheckpoint) {
-        // Ok, we have a checkpoint patch.
-        // If the chain length is not equal to checkpointInterval then this patch is invalid.
-        var i = 0;
-        var checkpointP;
-        for (var m = getParent(realtime, msg); m; m = getParent(realtime, m)) {
-            if (m.content.isCheckpoint) {
-                if (checkpointP) {
-                    checkpointP = m;
-                    break;
-                }
-                checkpointP = m;
-            }
-        }
-        if (checkpointP && checkpointP !== realtime.rootMessage) {
-            var point = parentCount(realtime, checkpointP);
-            if (realtime.config.strictCheckpointValidation &&
-                (point % realtime.config.checkpointInterval) !== 0)
-            {
-                debug(realtime, "checkpoint [" + msg.hashOf + "] at invalid point [" + point + "]");
-                if (Common.PARANOIA) { check(realtime); }
-                if (Common.TESTING) { throw new Error(); }
-                forgetMessage(realtime, msg);
-                return;
-            }
-
-            // Time to prune some old messages from the chain
-            debug(realtime, "checkpoint [" + msg.hashOf + "]");
-            for (var m = getParent(realtime, checkpointP); m; m = getParent(realtime, m)) {
-                debug(realtime, "pruning [" + m.hashOf + "]");
-                forgetMessage(realtime, m);
-            }
-            realtime.rootMessage = checkpointP;
-        }
-    } else {
-        var simplePatch =
-            Patch.simplify(patch, authDocAtTimeOfPatch, realtime.config.operationSimplify);
-        if (!Patch.equals(simplePatch, patch)) {
-            debug(realtime, "patch [" + msg.hashOf + "] can be simplified");
-            if (Common.PARANOIA) { check(realtime); }
-            if (Common.TESTING) { throw new Error(); }
-            forgetMessage(realtime, msg);
-            return;
-        }
-
-        if (!validContent(realtime,
-            function () { return Patch.apply(patch, authDocAtTimeOfPatch); }))
-        {
-            debug(realtime, "Patch [" + msg.hashOf + "] failed content validation");
-            return;
-        }
-    }
-
-    patch.inverseOf = Patch.invert(patch, authDocAtTimeOfPatch);
-    patch.inverseOf.inverseOf = patch;
-
-    realtime.uncommitted = Patch.simplify(
-        realtime.uncommitted, realtime.authDoc, realtime.config.operationSimplify);
-    var oldUserInterfaceContent = Patch.apply(realtime.uncommitted, realtime.authDoc);
-    if (Common.PARANOIA) {
-        Common.assert(oldUserInterfaceContent === realtime.userInterfaceContent);
-    }
-
-    // Derive the patch for the user's uncommitted work
-    var uncommittedPatch = Patch.invert(realtime.uncommitted, realtime.authDoc);
-
-    for (var i = 0; i < toRevert.length; i++) {
-        debug(realtime, "reverting [" + toRevert[i].hashOf + "]");
-        if (toRevert[i].isFromMe) { debug(realtime, "reverting patch 'from me' [" + JSON.stringify(toRevert[i].content.operations) + "]"); }
-        uncommittedPatch = Patch.merge(uncommittedPatch, toRevert[i].content.inverseOf);
-        revertPatch(realtime, toRevert[i].isFromMe, toRevert[i].content);
-    }
-
-    for (var i = 0; i < toApply.length; i++) {
-        debug(realtime, "applying [" + toApply[i].hashOf + "]");
-        uncommittedPatch = Patch.merge(uncommittedPatch, toApply[i].content);
-        applyPatch(realtime, toApply[i].isFromMe, toApply[i].content);
-    }
-
-    uncommittedPatch = Patch.merge(uncommittedPatch, realtime.uncommitted);
-    uncommittedPatch = Patch.simplify(
-        uncommittedPatch, oldUserInterfaceContent, realtime.config.operationSimplify);
-
-    realtime.uncommittedDocLength += Patch.lengthChange(uncommittedPatch);
-    realtime.best = msg;
-
-    if (Common.PARANOIA) {
-        // apply the uncommittedPatch to the userInterface content.
-        var newUserInterfaceContent = Patch.apply(uncommittedPatch, oldUserInterfaceContent);
-        Common.assert(realtime.userInterfaceContent.length === realtime.uncommittedDocLength);
-        Common.assert(newUserInterfaceContent === realtime.userInterfaceContent);
-    }
-
-    pushUIPatch(realtime, uncommittedPatch);
-
-    if (Common.PARANOIA) { check(realtime); }
-};
-
-var getDepthOfState = function (content, minDepth, realtime) {
-    Common.assert(typeof(content) === 'string');
-
-    // minimum depth is an optional argument which defaults to zero
-    var minDepth = minDepth || 0;
-
-    if (minDepth === 0 && realtime.authDoc === content) {
-        return 0;
-    }
-
-    var hash = Sha.hex_sha256(content);
-
-    var patchMsg = realtime.best;
-    var depth = 0;
-
-    do {
-        if (depth < minDepth) {
-            // you haven't exceeded the minimum depth
-        } else {
-            //console.log("Exceeded minimum depth");
-            // you *have* exceeded the minimum depth
-            if (patchMsg.content.parentHash === hash) {
-                // you found it!
-                return depth + 1;
-            }
-        }
-        depth++;
-    } while ((patchMsg = getParent(realtime, patchMsg)));
-    return -1;
-};
-
-module.exports.create = function (conf) {
-    var realtime = ChainPad.create(conf);
-    var out = {
-        onPatch: enterChainPad(realtime, function (handler) {
-            Common.assert(typeof(handler) === 'function');
-            realtime.patchHandlers.push(handler);
-        }),
-        patch: enterChainPad(realtime, function (patch, x, y) {
-            if (typeof(patch) === 'number') {
-                // Actually they meant to call realtime.change()
-                out.change(patch, x, y);
-                return;
-            }
-            doPatch(realtime, patch);
-        }),
-
-        onChange: enterChainPad(realtime, function (handler) {
-            Common.assert(typeof(handler) === 'function');
-            realtime.changeHandlers.push(handler);
-        }),
-        change: enterChainPad(realtime, function (offset, count, chars) {
-            if (count === 0 && chars === '') { return; }
-            doOperation(realtime, Operation.create(offset, count, chars));
-        }),
-
-        onMessage: enterChainPad(realtime, function (handler) {
-            Common.assert(typeof(handler) === 'function');
-            realtime.messageHandlers.push(handler);
-        }),
-
-        message: enterChainPad(realtime, function (message) {
-            handleMessage(realtime, message, false);
-        }),
-
-        start: enterChainPad(realtime, function () {
-            if (realtime.syncSchedule) { unschedule(realtime, realtime.syncSchedule); }
-            realtime.syncSchedule = schedule(realtime, function () { sync(realtime); });
-        }),
-
-        abort: enterChainPad(realtime, function () {
-            realtime.aborted = true;
-            realtime.schedules.forEach(function (s) { clearTimeout(s) });
-        }),
-
-        sync: enterChainPad(realtime, function () { sync(realtime); }),
-
-        getAuthDoc: function () { return realtime.authDoc; },
-
-        getUserDoc: function () { return Patch.apply(realtime.uncommitted, realtime.authDoc); },
-
-        getDepthOfState: function (content, minDepth) {
-            return getDepthOfState(content, minDepth, realtime);
-        }
-    };
-    return out;
-};
-
-},
-"Operation.js": function(module, exports, require){
-/*
- * 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 .
- */
-var Common = require('./Common');
-
-var Operation = module.exports;
-
-var check = Operation.check = function (op, docLength_opt) {
-    Common.assert(op.type === 'Operation');
-    Common.assert(Common.isUint(op.offset));
-    Common.assert(Common.isUint(op.toRemove));
-    Common.assert(typeof(op.toInsert) === 'string');
-    Common.assert(op.toRemove > 0 || op.toInsert.length > 0);
-    Common.assert(typeof(docLength_opt) !== 'number' || op.offset + op.toRemove <= docLength_opt);
-};
-
-var create = Operation.create = function (offset, toRemove, toInsert) {
-    var out = {
-        type: 'Operation',
-        offset: offset || 0,
-        toRemove: toRemove || 0,
-        toInsert: toInsert || '',
-    };
-    if (Common.PARANOIA) { check(out); }
-    return out;
-};
-
-var toObj = Operation.toObj = function (op) {
-    if (Common.PARANOIA) { check(op); }
-    return [op.offset,op.toRemove,op.toInsert];
-};
-
-var fromObj = Operation.fromObj = function (obj) {
-    Common.assert(Array.isArray(obj) && obj.length === 3);
-    return create(obj[0], obj[1], obj[2]);
-};
-
-var clone = Operation.clone = function (op) {
-    return create(op.offset, op.toRemove, op.toInsert);
-};
-
-/**
- * @param op the operation to apply.
- * @param doc the content to apply the operation on
- */
-var apply = Operation.apply = function (op, doc)
-{
-    if (Common.PARANOIA) {
-        check(op);
-        Common.assert(typeof(doc) === 'string');
-        Common.assert(op.offset + op.toRemove <= doc.length);
-    }
-    return doc.substring(0,op.offset) + op.toInsert + doc.substring(op.offset + op.toRemove);
-};
-
-var invert = Operation.invert = function (op, doc) {
-    if (Common.PARANOIA) {
-        check(op);
-        Common.assert(typeof(doc) === 'string');
-        Common.assert(op.offset + op.toRemove <= doc.length);
-    }
-    var rop = clone(op);
-    rop.toInsert = doc.substring(op.offset, op.offset + op.toRemove);
-    rop.toRemove = op.toInsert.length;
-    return rop;
-};
-
-var simplify = Operation.simplify = function (op, doc) {
-    if (Common.PARANOIA) {
-        check(op);
-        Common.assert(typeof(doc) === 'string');
-        Common.assert(op.offset + op.toRemove <= doc.length);
-    }
-    var rop = invert(op, doc);
-    op = clone(op);
-
-    var minLen = Math.min(op.toInsert.length, rop.toInsert.length);
-    var i;
-    for (i = 0; i < minLen && rop.toInsert[i] === op.toInsert[i]; i++) ;
-    op.offset += i;
-    op.toRemove -= i;
-    op.toInsert = op.toInsert.substring(i);
-    rop.toInsert = rop.toInsert.substring(i);
-
-    if (rop.toInsert.length === op.toInsert.length) {
-        for (i = rop.toInsert.length-1; i >= 0 && rop.toInsert[i] === op.toInsert[i]; i--) ;
-        op.toInsert = op.toInsert.substring(0, i+1);
-        op.toRemove = i+1;
-    }
-
-    if (op.toRemove === 0 && op.toInsert.length === 0) { return null; }
-    return op;
-};
-
-var equals = Operation.equals = function (opA, opB) {
-    return (opA.toRemove === opB.toRemove
-        && opA.toInsert === opB.toInsert
-        && opA.offset === opB.offset);
-};
-
-var lengthChange = Operation.lengthChange = function (op)
-{
-    if (Common.PARANOIA) { check(op); }
-    return op.toInsert.length - op.toRemove;
-};
-
-/*
- * @return the merged operation OR null if the result of the merger is a noop.
- */
-var merge = Operation.merge = function (oldOpOrig, newOpOrig) {
-    if (Common.PARANOIA) {
-        check(newOpOrig);
-        check(oldOpOrig);
-    }
-
-    var newOp = clone(newOpOrig);
-    var oldOp = clone(oldOpOrig);
-    var offsetDiff = newOp.offset - oldOp.offset;
-
-    if (newOp.toRemove > 0) {
-        var origOldInsert = oldOp.toInsert;
-        oldOp.toInsert = (
-             oldOp.toInsert.substring(0,offsetDiff)
-           + oldOp.toInsert.substring(offsetDiff + newOp.toRemove)
-        );
-        newOp.toRemove -= (origOldInsert.length - oldOp.toInsert.length);
-        if (newOp.toRemove < 0) { newOp.toRemove = 0; }
-
-        oldOp.toRemove += newOp.toRemove;
-        newOp.toRemove = 0;
-    }
-
-    if (offsetDiff < 0) {
-        oldOp.offset += offsetDiff;
-        oldOp.toInsert = newOp.toInsert + oldOp.toInsert;
-
-    } else if (oldOp.toInsert.length === offsetDiff) {
-        oldOp.toInsert = oldOp.toInsert + newOp.toInsert;
-
-    } else if (oldOp.toInsert.length > offsetDiff) {
-        oldOp.toInsert = (
-            oldOp.toInsert.substring(0,offsetDiff)
-          + newOp.toInsert
-          + oldOp.toInsert.substring(offsetDiff)
-        );
-    } else {
-        throw new Error("should never happen\n" +
-                        JSON.stringify([oldOpOrig,newOpOrig], null, '  '));
-    }
-
-    if (oldOp.toInsert === '' && oldOp.toRemove === 0) {
-        return null;
-    }
-    if (Common.PARANOIA) { check(oldOp); }
-
-    return oldOp;
-};
-
-/**
- * If the new operation deletes what the old op inserted or inserts content in the middle of
- * the old op's content or if they abbut one another, they should be merged.
- */
-var shouldMerge = Operation.shouldMerge = function (oldOp, newOp) {
-    if (Common.PARANOIA) {
-        check(oldOp);
-        check(newOp);
-    }
-    if (newOp.offset < oldOp.offset) {
-        return (oldOp.offset <= (newOp.offset + newOp.toRemove));
-    } else {
-        return (newOp.offset <= (oldOp.offset + oldOp.toInsert.length));
-    }
-};
-
-/**
- * Rebase newOp against oldOp.
- *
- * @param oldOp the eariler operation to have happened.
- * @param newOp the later operation to have happened (in time).
- * @return either the untouched newOp if it need not be rebased,
- *                the rebased clone of newOp if it needs rebasing, or
- *                null if newOp and oldOp must be merged.
- */
-var rebase = Operation.rebase = function (oldOp, newOp) {
-    if (Common.PARANOIA) {
-        check(oldOp);
-        check(newOp);
-    }
-    if (newOp.offset < oldOp.offset) { return newOp; }
-    newOp = clone(newOp);
-    newOp.offset += oldOp.toRemove;
-    newOp.offset -= oldOp.toInsert.length;
-    return newOp;
-};
-
-/**
- * this is a lossy and dirty algorithm, everything else is nice but transformation
- * has to be lossy because both operations have the same base and they diverge.
- * This could be made nicer and/or tailored to a specific data type.
- *
- * @param toTransform the operation which is converted *MUTATED*.
- * @param transformBy an existing operation which also has the same base.
- * @return toTransform *or* null if the result is a no-op.
- */
-
-var transform0 = Operation.transform0 = function (text, toTransformOrig, transformByOrig) {
-    // Cloning the original transformations makes this algorithm such that it
-    // **DOES NOT MUTATE ANYMORE**
-    var toTransform = Operation.clone(toTransformOrig);
-    var transformBy = Operation.clone(transformByOrig);
-
-    if (toTransform.offset > transformBy.offset) {
-        if (toTransform.offset > transformBy.offset + transformBy.toRemove) {
-            // simple rebase
-            toTransform.offset -= transformBy.toRemove;
-            toTransform.offset += transformBy.toInsert.length;
-            return toTransform;
-        }
-        // goto the end, anything you deleted that they also deleted should be skipped.
-        var newOffset = transformBy.offset + transformBy.toInsert.length;
-        toTransform.toRemove = 0; //-= (newOffset - toTransform.offset);
-        if (toTransform.toRemove < 0) { toTransform.toRemove = 0; }
-        toTransform.offset = newOffset;
-        if (toTransform.toInsert.length === 0 && toTransform.toRemove === 0) {
-            return null;
-        }
-        return toTransform;
-    }
-    if (toTransform.offset + toTransform.toRemove < transformBy.offset) {
-        return toTransform;
-    }
-    toTransform.toRemove = transformBy.offset - toTransform.offset;
-    if (toTransform.toInsert.length === 0 && toTransform.toRemove === 0) {
-        return null;
-    }
-    return toTransform;
-};
-
-/**
- * @param toTransform the operation which is converted
- * @param transformBy an existing operation which also has the same base.
- * @return a modified clone of toTransform *or* toTransform itself if no change was made.
- */
-var transform = Operation.transform = function (text, toTransform, transformBy, transformFunction) {
-    if (Common.PARANOIA) {
-        check(toTransform);
-        check(transformBy);
-    }
-    transformFunction = transformFunction || transform0;
-    toTransform = clone(toTransform);
-    var result = transformFunction(text, toTransform, transformBy);
-    if (Common.PARANOIA && result) { check(result); }
-    return result;
-};
-
-/** Used for testing. */
-var random = Operation.random = function (docLength) {
-    Common.assert(Common.isUint(docLength));
-    var offset = Math.floor(Math.random() * 100000000 % docLength) || 0;
-    var toRemove = Math.floor(Math.random() * 100000000 % (docLength - offset)) || 0;
-    var toInsert = '';
-    do {
-        var toInsert = Common.randomASCII(Math.floor(Math.random() * 20));
-    } while (toRemove === 0 && toInsert === '');
-    return create(offset, toRemove, toInsert);
-};
-
-}
-};
-ChainPad = r("ChainPad.js");}());
diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 4c9151a01..58fc596b2 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -17,7 +17,7 @@
 define([
     '/common/netflux-client.js',
     '/common/es6-promise.min.js',
-    '/common/chainpad.js',
+    '/bower_components/chainpad/chainpad.dist.js',
     '/bower_components/jquery/dist/jquery.min.js',
 ], function (Netflux) {
     var $ = window.jQuery;

From 68cec2348a71eaa6c72f19ee513ae5d4f35dd0f0 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 2 Jun 2016 16:56:01 +0200
Subject: [PATCH 232/257] don't prompt the user with a crypto hash for their
 name

---
 www/pad/main.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/pad/main.js b/www/pad/main.js
index 7f0ffacf5..5f6cfa0c8 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -216,8 +216,7 @@ define([
             var myID; // My server ID
 
             var setMyID = function(info) {
-              myID = info.myID || null;
-              myUserName = myID;
+                myID = info.myID || null;
             };
 
             var createChangeName = function(id, $container) {

From e44446f71e67396630fd73c221bee3f3f8d3b7a8 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 2 Jun 2016 17:49:27 +0200
Subject: [PATCH 233/257] proper recursive proxy initialization

---
 www/json/deep-proxy.js | 51 ++++++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/www/json/deep-proxy.js b/www/json/deep-proxy.js
index ae99e2bb9..8591223d1 100644
--- a/www/json/deep-proxy.js
+++ b/www/json/deep-proxy.js
@@ -35,8 +35,7 @@ define([
                 throw new Error("'on' is a reserved attribute name for realtime lists and maps");
             }
 
-            var t_value = type(value);
-            if (isProxyable(t_value)) {
+            if (isProxyable(value)) {
                 var proxy = obj[prop] = deepProxy.create(value, cb);
             } else {
                 obj[prop] = value;
@@ -82,7 +81,7 @@ define([
                     events.change.sort(lengthDescending);
 
                     break;
-                case 'delete':
+                case 'remove':
                     pattern = type(pattern) === 'array'? pattern: [pattern];
 
                     events.remove.push({
@@ -119,6 +118,7 @@ define([
                             pattern(info);
                         }
                     });
+                    break;
                 default:
                     break;
             }
@@ -198,7 +198,7 @@ define([
         }, map)) || undefined;
     };
 
-    var onRemove = function (path, key, root) {
+    var onRemove = function (path, key, root, old, top) {
         var newpath = path.concat(key);
         var X = find(root, newpath);
 
@@ -209,24 +209,32 @@ define([
 
         switch (t_X) {
             case 'array':
+
+                if (top) {
+                    // the top of an onremove should emit an onchange instead
+                    onChange(path, key, root, old, undefined);// no newval since it's a deletion
+                } else {
+                    root._events.remove.forEach(function (handler, i) {
+                        return handler.cb(X, newpath, root);
+                    });
+                }
                 // remove all of the array's children
                 X.forEach(function (x, i) {
                     onRemove(newpath, i, root);
                 });
 
-                root._events.remove.forEach(function (handler, i) {
-                    return handler.cb(X, newpath, root);
-                });
-
                 break;
             case 'object':
+                if (top) {
+                    onChange(path, key, root, old, undefined);// no newval since it's a deletion
+                } else {
+                    root._events.remove.forEach(function (handler, i) {
+                        return handler.cb(X, newpath, root, old, false);
+                    });
+                }
                 // remove all of the object's children
                 Object.keys(X).forEach(function (key, i) {
-                    onRemove(newpath, key, root);
-                });
-
-                root._events.remove.forEach(function (handler, i) {
-                    return handler.cb(X, newpath, root);
+                    onRemove(newpath, key, root, X[key], false);
                 });
 
                 break;
@@ -300,13 +308,7 @@ define([
                 console.log("type changed from [%s] to [%s]", t_a, t_b);
                 switch (t_b) {
                     case 'undefined':
-                        // deletions are a removal
-                        //delete A[b];
-                        onRemove(path, b, root);
-
-                        // this should never happen?
                         throw new Error("first pass should never reveal undefined keys");
-                        //break;
                     case 'array':
                         A[b] = f(B[b]);
                         // make a new proxy
@@ -353,7 +355,7 @@ define([
 
             // the key was deleted
             if (Bkeys.indexOf(a) === -1 || type(B[a]) === 'undefined') {
-                onRemove(path, a, root);
+                onRemove(path, a, root, old, true);
                 delete A[a];
             }
         });
@@ -384,6 +386,8 @@ define([
                     // type changes are always destructive
                     // that's good news because destructive is easy
                     switch (t_b) {
+                        case 'undefined':
+                            throw new Error('this should never happen');
                         case 'object':
                             A[i] = f(b);
                             break;
@@ -424,10 +428,13 @@ define([
                 // A was longer than B, so there have been deletions
                 var i = l_B;
                 var t_a;
+                var old;
 
                 for (; i <= l_B; i++) {
                     // recursively delete
-                    onRemove(path, i, root);
+                    old = A[i];
+
+                    onRemove(path, i, root, old, true);
                 }
                 // cool
             }
@@ -447,7 +454,7 @@ define([
             if (t_a !== t_b) {
                 switch (t_b) {
                     case 'undefined':
-                        onRemove(path, i, root);
+                        onRemove(path, i, root, old, true);
                         break;
 
                 // watch out for fallthrough behaviour

From 6f7543e9cc5ad81263715bd5ea9962b88dd6296b Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Thu, 2 Jun 2016 17:50:55 +0200
Subject: [PATCH 234/257] demonstrate chaining of 'on' directives

---
 www/json/main.js | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/www/json/main.js b/www/json/main.js
index 4d82b9183..e77004f91 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -30,33 +30,32 @@ define([
 
     var rt = module.rt = RtListMap.create(config);
     rt.proxy.on('create', function (info) {
-        console.log("initializing!");
+        console.log("initializing...");
         window.location.hash = info.channel + secret.key;
-        console.log(info);
     }).on('ready', function (info) {
-        console.log("ready");
-
-        console.log(info);
+        console.log("...your realtime object is ready");
 
         rt.proxy
             // on(event, path, cb)
             .on('change', [], function (o, n, p) {
                 console.log("root change event firing for path [%s]: %s => %s", p.join(','), o, n);
-            }).on('change', ['a', 'b', 'c'], function (o, n, p) {
+            })
+            .on('remove', [], function (o, p, root) {
+                console.log("Removal of value [%s] at path [%s]", o, p.join(','));
+            })
+            .on('change', ['a', 'b', 'c'], function (o, n, p) {
                 console.log("Deeper change event at [%s]: %s => %s", p.join(','), o, n);
                 console.log("preventing propogation...");
                 return false;
+            })
+            .on('disconnect', function (info) {
+                setEditable(false);
+                window.alert("Network connection lost");
             });
 
-        rt.proxy.on('disconnect', function (info) {
-            setEditable(false);
-            console.log(info);
-            window.alert("Network connection lost");
-        });
-
         // set up user interface hooks
         $repl.on('keyup', function (e) {
-            if (e.which === 13) {
+            if (e.which === 13 /* enter keycode */) {
                 var value = $repl.val();
 
                 if (!value.trim()) { return; }

From ba3e120fbfc0e509d0f4d273b5f54b69af32184a Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 13:12:40 +0200
Subject: [PATCH 235/257] remove everything related to jquery sheet since we're
 not using it

---
 bower.json | 2 --
 server.js  | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/bower.json b/bower.json
index e080c2f3d..19b2e8ca0 100644
--- a/bower.json
+++ b/bower.json
@@ -18,8 +18,6 @@
     "tests"
   ],
   "dependencies": {
-    "markdown": "~0.5.0",
-    "jquery.sheet": "master",
     "jquery": "~2.1.3",
     "tweetnacl": "~0.12.2",
     "ckeditor": "~4.5.6",
diff --git a/server.js b/server.js
index 0b963f730..62fd053d8 100644
--- a/server.js
+++ b/server.js
@@ -18,12 +18,6 @@ var Storage = require(config.storage||'./storage/mongo');
 var app = Express();
 app.use(Express.static(__dirname + '/www'));
 
-// Bower is broken and does not allow components nested within components...
-// And jquery.sheet expects it!
-// *Workaround*
-app.use("/bower_components/jquery.sheet/bower_components",
-    Express.static(__dirname + '/www/bower_components'));
-
 var customize = "/customize";
 if (!Fs.existsSync(__dirname + "/customize")) {
     customize = "/customize.dist";

From dbf1e2b8708f82a5a8bf8f780aaa6405d3993af3 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 15:30:51 +0200
Subject: [PATCH 236/257] support reusing the netflux network

export more internals from realtime input
---
 www/common/realtime-input.js | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 58fc596b2..61250fdf3 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -59,6 +59,7 @@ define([
         var messagesHistory = [];
         var chainpadAdapter = {};
         var realtime;
+        var network;
 
         var parseMessage = function (msg) {
             return unBencode(msg);//.slice(msg.indexOf(':[') + 1);
@@ -188,7 +189,7 @@ define([
             wc.on('leave', onLeaving);
 
             // Open a Chainpad session
-            realtime = createRealtime();
+            toReturn.realtime = realtime = createRealtime();
 
             if(config.onInit) {
                 config.onInit({
@@ -255,10 +256,29 @@ define([
             return webChannel;
         };
 
-        // Connect to the WebSocket channel
-        Netflux.connect(websocketUrl).then(function(network) {
+        var joinSession = function (endPoint, cb) {
+            // a websocket URL has been provided
+            // connect to it with Netflux.
+            if (typeof(endPoint) === 'string') {
+                Netflux.connect(endPoint).then(cb);
+            } else if (typeof(endPoint.then) ==- 'function') {
+                // a netflux network promise was provided
+                // connect to it and use a channel
+                endPoint.then(cb);
+            } else {
+                // assume it's a network and try to connect.
+                cb(network);
+            }
+        };
+
+        /*  Connect to the Netflux network, or fall back to a WebSocket
+            in theory this lets us connect to more netflux channels using only
+            one network. */
+        joinSession(network || websocketUrl, function (network) {
             // pass messages that come out of netflux into our local handler
 
+            toReturn.network = network;
+
             network.on('disconnect', function (reason) {
                 if (config.onAbort) {
                     config.onAbort({

From f80e9772a88ddb5f969a75598378958379418f0b Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 15:45:58 +0200
Subject: [PATCH 237/257] merge api.js and deep-proxy.js into one file

---
 www/json/api.js              | 105 ------
 www/json/chainpad-listmap.js | 627 +++++++++++++++++++++++++++++++++++
 www/json/deep-proxy.js       | 530 -----------------------------
 3 files changed, 627 insertions(+), 635 deletions(-)
 delete mode 100644 www/json/api.js
 create mode 100644 www/json/chainpad-listmap.js
 delete mode 100644 www/json/deep-proxy.js

diff --git a/www/json/api.js b/www/json/api.js
deleted file mode 100644
index c10cdb679..000000000
--- a/www/json/api.js
+++ /dev/null
@@ -1,105 +0,0 @@
-require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
-define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/crypto.js',
-    '/common/realtime-input.js',
-    '/common/json-ot.js',
-    'json.sortify',
-    '/bower_components/textpatcher/TextPatcher.amd.js',
-    '/json/deep-proxy.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-], function (Config, Crypto, Realtime, JsonOT, Sortify, TextPatcher, DeepProxy) {
-    var api = {};
-
-    var create = api.create = function (cfg) {
-        /* validate your inputs before proceeding */
-
-        if (!DeepProxy.isProxyable(cfg.data)) {
-            throw new Error('unsupported datatype: '+ DeepProxy.type(cfg.data));
-        }
-
-        var config = {
-            initialState: Sortify(cfg.data),
-            transformFunction: JsonOT.validate,
-            userName: Crypto.rand64(8),
-            channel: cfg.channel,
-            cryptKey: cfg.cryptKey,
-            crypto: Crypto,
-            websocketURL: Config.websocketURL,
-            logLevel: 0
-        };
-
-        var rt;
-        var realtime;
-
-        var proxy;
-
-        var onLocal = config.onLocal = function () {
-            var strung = Sortify(proxy);
-
-            realtime.patchText(strung);
-
-            // try harder
-            if (realtime.getUserDoc() !== strung) {
-                realtime.patchText(strung);
-            }
-
-            // onLocal
-            if (cfg.onLocal) {
-                cfg.onLocal();
-            }
-        };
-
-        proxy = DeepProxy.create(cfg.data, onLocal, true);
-
-        var onInit = config.onInit = function (info) {
-            realtime = info.realtime;
-            // create your patcher
-            realtime.patchText = TextPatcher.create({
-                realtime: realtime,
-                logging: config.logging || false,
-            });
-
-            proxy._events.create.forEach(function (handler) {
-                handler.cb(info);
-            });
-        };
-
-        var initializing = true;
-
-        var onReady = config.onReady = function (info) {
-            var userDoc = realtime.getUserDoc();
-            var parsed = JSON.parse(userDoc);
-
-            DeepProxy.update(proxy, parsed, onLocal);
-
-            proxy._events.ready.forEach(function (handler) {
-                handler.cb(info);
-            });
-
-            initializing = false;
-        };
-
-        var onRemote = config.onRemote = function (info) {
-            if (initializing) { return; }
-            var userDoc = realtime.getUserDoc();
-            var parsed = JSON.parse(userDoc);
-
-            DeepProxy.update(proxy, parsed, onLocal);
-        };
-
-        var onAbort = config.onAbort = function (info) {
-            proxy._events.disconnect.forEach(function (handler) {
-                handler.cb(info);
-            });
-        };
-
-        rt = Realtime.start(config);
-
-        rt.proxy = proxy;
-        rt.realtime = realtime;
-        return rt;
-    };
-
-    return api;
-});
diff --git a/www/json/chainpad-listmap.js b/www/json/chainpad-listmap.js
new file mode 100644
index 000000000..b1c502207
--- /dev/null
+++ b/www/json/chainpad-listmap.js
@@ -0,0 +1,627 @@
+require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
+define([
+    '/api/config?cb=' + Math.random().toString(16).substring(2),
+    '/common/crypto.js',
+    '/common/realtime-input.js',
+    '/common/json-ot.js',
+    'json.sortify',
+    '/bower_components/textpatcher/TextPatcher.amd.js',
+    '/bower_components/jquery/dist/jquery.min.js',
+    '/bower_components/proxy-polyfill/proxy.min.js', // https://github.com/GoogleChrome/proxy-polyfill
+], function (Config, Crypto, Realtime, JsonOT, Sortify, TextPatcher) {
+    var api = {};
+    // linter complains if this isn't defined
+    var Proxy = window.Proxy;
+
+    var DeepProxy = api.DeepProxy = (function () {
+
+        var deepProxy = {};
+
+        var isArray = deepProxy.isArray = function (obj) {
+            return Object.prototype.toString.call(obj)==='[object Array]';
+        };
+
+        /*  Arrays and nulls both register as 'object' when using native typeof
+            we need to distinguish them as their own types, so use this instead. */
+        var type = deepProxy.type = function (dat) {
+            return dat === null?  'null': isArray(dat)?'array': typeof(dat);
+        };
+
+        var isProxyable = deepProxy.isProxyable = function (obj) {
+            return ['object', 'array'].indexOf(type(obj)) !== -1;
+        };
+
+        /*  Any time you set a value, check its type.
+            If that type is proxyable, make a new proxy. */
+        var setter = deepProxy.set = function (cb) {
+            return function (obj, prop, value) {
+                if (prop === 'on') {
+                    throw new Error("'on' is a reserved attribute name for realtime lists and maps");
+                }
+
+                if (isProxyable(value)) {
+                    var proxy = obj[prop] = deepProxy.create(value, cb);
+                } else {
+                    obj[prop] = value;
+                }
+
+                cb();
+                return obj[prop] || true; // always return truthey or you have problems
+            };
+        };
+
+        var pathMatches = deepProxy.pathMatches = function (path, pattern) {
+            return !pattern.some(function (x, i) {
+                return x !== path[i];
+            });
+        };
+
+        var lengthDescending = function (a, b) { return b.pattern.length - a.pattern.length; };
+
+        var getter = deepProxy.get = function (cb) {
+            var events = {
+                disconnect: [],
+                change: [],
+                ready: [],
+                remove: [],
+                create: [],
+            };
+
+            var on = function (evt, pattern, f) {
+                switch (evt) {
+                    case 'change':
+                        // pattern needs to be an array
+                        pattern = type(pattern) === 'array'? pattern: [pattern];
+
+                        events.change.push({
+                            cb: function (oldval, newval, path, root) {
+                                if (pathMatches(path, pattern)) {
+                                    return f(oldval, newval, path, root);
+                                }
+                            },
+                            pattern: pattern,
+                        });
+                        // sort into descending order so we evaluate in order of specificity
+                        events.change.sort(lengthDescending);
+
+                        break;
+                    case 'remove':
+                        pattern = type(pattern) === 'array'? pattern: [pattern];
+
+                        events.remove.push({
+                            cb: function (oldval, path, root) {
+                                if (pathMatches(path, pattern)) { return f(oldval, path, root); }
+                            },
+                            pattern: pattern,
+                        });
+
+                        events.remove.sort(lengthDescending);
+
+                        break;
+                    case 'ready':
+                        events.ready.push({
+                            // on('ready' has a different signature than 
+                            // change and delete, so use 'pattern', not 'f'
+
+                            cb: function (info) {
+                                pattern(info);
+                            }
+                        });
+                        break;
+                    case 'disconnect':
+                        events.disconnect.push({
+                            cb: function (info) {
+                                // as above
+                                pattern(info);
+                            }
+                        });
+                        break;
+                    case 'create':
+                        events.create.push({
+                            cb: function (info) {
+                                pattern(info);
+                            }
+                        });
+                        break;
+                    default:
+                        break;
+                }
+                return this;
+            };
+
+            return function (obj, prop) {
+                if (prop === 'on') {
+                    return on;
+                } else if (prop === '_events') {
+                    return events;
+                }
+                return obj[prop];
+            };
+        };
+
+        var handlers = deepProxy.handlers = function (cb) {
+            return {
+                set: setter(cb),
+                get: getter(cb),
+            };
+        };
+
+        var create = deepProxy.create = function (obj, opt) {
+            /*  recursively create proxies in case users do:
+                `x.a = {b: {c: 5}};
+
+                otherwise the inner object is not a proxy, which leads to incorrect
+                behaviour on the client that initiated the object (but not for
+                clients that receive the objects) */
+
+            // if the user supplied a callback, use it to create handlers
+            // this saves a bit of work in recursion
+            var methods = type(opt) === 'function'? handlers(opt) : opt;
+            switch (type(obj)) {
+                case 'object':
+                    var keys = Object.keys(obj);
+                    keys.forEach(function (k) {
+                        if (isProxyable(obj[k])) {
+                            obj[k] = create(obj[k], opt);
+                        }
+                    });
+                    break;
+                case 'array':
+                    obj.forEach(function (o, i) {
+                        if (isProxyable(o)) {
+                            obj[i] = create(obj[i], opt);
+                        }
+                    });
+                    break;
+                default:
+                    // if it's not an array or object, you don't need to proxy it
+                    throw new Error('attempted to make a proxy of an unproxyable object');
+            }
+
+            return new Proxy(obj, methods);
+        };
+
+        // onChange(path, key, root, oldval, newval)
+        var onChange = function (path, key, root, oldval, newval) {
+            var P = path.slice(0);
+            P.push(key);
+
+            /*  returning false in your callback terminates 'bubbling up'
+                we can accomplish this with Array.some because we've presorted
+                listeners by the specificity of their path
+            */
+            root._events.change.some(function (handler, i) {
+                return handler.cb(oldval, newval, P, root) === false;
+            });
+        };
+
+        var find = deepProxy.find = function (map, path) {
+            /* safely search for nested values in an object via a path */
+            return (map && path.reduce(function (p, n) {
+                return typeof p[n] !== 'undefined' && p[n];
+            }, map)) || undefined;
+        };
+
+        var onRemove = function (path, key, root, old, top) {
+            var newpath = path.concat(key);
+            var X = find(root, newpath);
+
+            var t_X = type(X);
+
+            /*  TODO 'find' is correct but unnecessarily expensive.
+                optimize it. */
+
+            switch (t_X) {
+                case 'array':
+
+                    if (top) {
+                        // the top of an onremove should emit an onchange instead
+                        onChange(path, key, root, old, undefined);// no newval since it's a deletion
+                    } else {
+                        root._events.remove.forEach(function (handler, i) {
+                            return handler.cb(X, newpath, root);
+                        });
+                    }
+                    // remove all of the array's children
+                    X.forEach(function (x, i) {
+                        onRemove(newpath, i, root);
+                    });
+
+                    break;
+                case 'object':
+                    if (top) {
+                        onChange(path, key, root, old, undefined);// no newval since it's a deletion
+                    } else {
+                        root._events.remove.forEach(function (handler, i) {
+                            return handler.cb(X, newpath, root, old, false);
+                        });
+                    }
+                    // remove all of the object's children
+                    Object.keys(X).forEach(function (key, i) {
+                        onRemove(newpath, key, root, X[key], false);
+                    });
+
+                    break;
+                default:
+                    root._events.remove.forEach(function (handler, i) {
+                        return handler.cb(X, newpath, root);
+                    });
+                    break;
+            }
+        };
+
+        /*  compare a new object 'B' against an existing proxy object 'A'
+            provide a unary function 'f' for the purpose of constructing new
+            deep proxies from regular objects and arrays.
+
+            Supply the path as you recurse, for the purpose of emitting events
+            attached to particular paths within the complete structure.
+
+            Operates entirely via side effects on 'A'
+        */
+        var objects = deepProxy.objects = function (A, B, f, path, root) {
+            var Akeys = Object.keys(A);
+            var Bkeys = Object.keys(B);
+
+            /*  iterating over the keys in B will tell you if a new key exists
+                it will not tell you if a key has been removed.
+                to accomplish that you will need to iterate over A's keys
+            */
+
+            /*  TODO return a truthy or falsey value (in 'objects' and 'arrays')
+                so that we have some measure of whether an object or array changed
+                (from the higher level in the tree, rather than doing everything
+                at the leaf level).
+
+                bonus points if you can defer events until the complete diff has
+                finished (collect them into an array or something, and simplify
+                the event if possible)
+            */
+
+            Bkeys.forEach(function (b) {
+                var t_b = type(B[b]);
+                var old = A[b];
+
+                if (Akeys.indexOf(b) === -1) {
+                    // there was an insertion
+
+                    // mind the fallthrough behaviour
+                    switch (t_b) {
+                        case 'undefined':
+                            // umm. this should never happen?
+                            throw new Error("undefined type has key. this shouldn't happen?");
+                        case 'array':
+                        case 'object':
+                            A[b] = f(B[b]);
+                            break;
+                        default:
+                            A[b] = B[b];
+                    }
+
+                    // insertions are a change
+
+                    // onChange(path, key, root, oldval, newval)
+                    onChange(path, b, root, old, B[b]);
+                    return;
+                }
+
+                // else the key already existed
+                var t_a = type(A[b]);
+                if (t_a !== t_b) {
+                    // its type changed!
+                    console.log("type changed from [%s] to [%s]", t_a, t_b);
+                    switch (t_b) {
+                        case 'undefined':
+                            throw new Error("first pass should never reveal undefined keys");
+                        case 'array':
+                            A[b] = f(B[b]);
+                            // make a new proxy
+                            break;
+                        case 'object':
+                            A[b] = f(B[b]);
+                            // make a new proxy
+                            break;
+                        default:
+                            // all other datatypes just require assignment.
+                            A[b] = B[b];
+                            break;
+                    }
+
+                    // type changes always mean a change happened
+                    onChange(path, b, root, old, B[b]);
+                    return;
+                }
+
+                // values might have changed, if not types
+                if (['array', 'object'].indexOf(t_a) === -1) {
+                    // it's not an array or object, so we can do deep equality
+                    if (A[b] !== B[b]) {
+                        // not equal, so assign
+                        A[b] = B[b];
+
+                        onChange(path, b, root, old, B[b]);
+                    }
+                    return;
+                }
+
+                // else it's an array or object
+                var nextPath = path.slice(0).concat(b);
+                if (t_a === 'object') {
+                    // it's an object
+                    objects.call(root, A[b], B[b], f, nextPath, root);
+                } else {
+                    // it's an array
+                    deepProxy.arrays.call(root, A[b], B[b], f, nextPath, root);
+                }
+            });
+            Akeys.forEach(function (a) {
+                var old = A[a];
+
+                // the key was deleted
+                if (Bkeys.indexOf(a) === -1 || type(B[a]) === 'undefined') {
+                    onRemove(path, a, root, old, true);
+                    delete A[a];
+                }
+            });
+
+            return;
+        };
+
+        var arrays = deepProxy.arrays = function (A, B, f, path, root) {
+            var l_A = A.length;
+            var l_B = B.length;
+
+            if (l_A !== l_B) {
+                // B is longer than Aj
+                // there has been an insertion
+
+                // OR
+
+                // A is longer than B
+                // there has been a deletion
+
+                B.forEach(function (b, i) {
+                    var t_a = type(A[i]);
+                    var t_b = type(b);
+
+                    var old = A[i];
+
+                    if (t_a !== t_b) {
+                        // type changes are always destructive
+                        // that's good news because destructive is easy
+                        switch (t_b) {
+                            case 'undefined':
+                                throw new Error('this should never happen');
+                            case 'object':
+                                A[i] = f(b);
+                                break;
+                            case 'array':
+                                A[i] = f(b);
+                                break;
+                            default:
+                                A[i] = b;
+                                break;
+                        }
+
+                        // path, key, root object, oldvalue, newvalue
+                        onChange(path, i, root, old, b);
+                    } else {
+                        // same type
+                        var nextPath = path.slice(0).concat(i);
+
+                        switch (t_b) {
+                            case 'object':
+                                objects.call(root, A[i], b, f, nextPath, root);
+                                break;
+                            case 'array':
+                                if (arrays.call(root, A[i], b, f, nextPath, root)) {
+                                    onChange(path, i, root, old, b);
+                                }
+                                break;
+                            default:
+                                if (b !== A[i]) {
+                                    A[i] = b;
+                                    onChange(path, i, root, old, b);
+                                }
+                                break;
+                        }
+                    }
+                });
+
+                if (l_A > l_B) {
+                    // A was longer than B, so there have been deletions
+                    var i = l_B;
+                    var t_a;
+                    var old;
+
+                    for (; i <= l_B; i++) {
+                        // recursively delete
+                        old = A[i];
+
+                        onRemove(path, i, root, old, true);
+                    }
+                    // cool
+                }
+
+                A.length = l_B;
+                return;
+            }
+
+            // else they are the same length, iterate over their values
+            A.forEach(function (a, i) {
+                var t_a = type(a);
+                var t_b = type(B[i]);
+
+                var old = a;
+
+                // they have different types
+                if (t_a !== t_b) {
+                    switch (t_b) {
+                        case 'undefined':
+                            onRemove(path, i, root, old, true);
+                            break;
+
+                    // watch out for fallthrough behaviour
+                        // if it's an object or array, create a proxy
+                        case 'object':
+                        case 'array':
+                            A[i] = f(B[i]);
+                            break;
+                        default:
+                            A[i] = B[i];
+                            break;
+                    }
+
+                    onChange(path, i, root, old, B[i]);
+                    return;
+                }
+
+                // they are the same type, clone the paths array and push to it
+                var nextPath = path.slice(0).concat(i);
+
+                // same type
+                switch (t_b) {
+                    case 'undefined':
+                        throw new Error('existing key had type `undefined`. this should never happen');
+                    case 'object':
+                        if (objects.call(root, A[i], B[i], f, nextPath, root)) {
+                            onChange(path, i, root, old, B[i]);
+                        }
+                        break;
+                    case 'array':
+                        if (arrays.call(root, A[i], B[i], f, nextPath, root)) {
+                            onChange(path, i, root, old, B[i]);
+                        }
+                        break;
+                    default:
+                        if (A[i] !== B[i]) {
+                            A[i] = B[i];
+                            onChange(path, i, root, old, B[i]);
+                        }
+                        break;
+                }
+            });
+            return;
+        };
+
+        var update = deepProxy.update = function (A, B, cb) {
+            var t_A = type(A);
+            var t_B = type(B);
+
+            if (t_A !== t_B) {
+                throw new Error("Proxy updates can't result in type changes");
+            }
+
+            switch (t_B) {
+                /* use .call so you can supply a different `this` value */
+                case 'array':
+                    arrays.call(A, A, B, function (obj) {
+                        return create(obj, cb);
+                    }, [], A);
+                    break;
+                case 'object':
+                //   arrays.call(this, A   , B   , f, path    , root)
+                    objects.call(A, A, B, function (obj) {
+                        return create(obj, cb);
+                    }, [], A);
+                    break;
+                default:
+                    throw new Error("unsupported realtime datatype:" + t_B);
+            }
+        };
+
+        return deepProxy;
+    }());
+
+    var create = api.create = function (cfg) {
+        /* validate your inputs before proceeding */
+
+        if (!DeepProxy.isProxyable(cfg.data)) {
+            throw new Error('unsupported datatype: '+ DeepProxy.type(cfg.data));
+        }
+
+        var config = {
+            initialState: Sortify(cfg.data),
+            transformFunction: JsonOT.validate,
+            userName: Crypto.rand64(8),
+            channel: cfg.channel,
+            cryptKey: cfg.cryptKey,
+            crypto: Crypto,
+            websocketURL: Config.websocketURL,
+            logLevel: 0
+        };
+
+        var rt;
+        var realtime;
+
+        var proxy;
+
+        var onLocal = config.onLocal = function () {
+            var strung = Sortify(proxy);
+
+            realtime.patchText(strung);
+
+            // try harder
+            if (realtime.getUserDoc() !== strung) {
+                realtime.patchText(strung);
+            }
+
+            // onLocal
+            if (cfg.onLocal) {
+                cfg.onLocal();
+            }
+        };
+
+        proxy = DeepProxy.create(cfg.data, onLocal, true);
+
+        var onInit = config.onInit = function (info) {
+            realtime = info.realtime;
+            // create your patcher
+            realtime.patchText = TextPatcher.create({
+                realtime: realtime,
+                logging: config.logging || false,
+            });
+
+            proxy._events.create.forEach(function (handler) {
+                handler.cb(info);
+            });
+        };
+
+        var initializing = true;
+
+        var onReady = config.onReady = function (info) {
+            var userDoc = realtime.getUserDoc();
+            var parsed = JSON.parse(userDoc);
+
+            DeepProxy.update(proxy, parsed, onLocal);
+
+            proxy._events.ready.forEach(function (handler) {
+                handler.cb(info);
+            });
+
+            initializing = false;
+        };
+
+        var onRemote = config.onRemote = function (info) {
+            if (initializing) { return; }
+            var userDoc = realtime.getUserDoc();
+            var parsed = JSON.parse(userDoc);
+
+            DeepProxy.update(proxy, parsed, onLocal);
+        };
+
+        var onAbort = config.onAbort = function (info) {
+            proxy._events.disconnect.forEach(function (handler) {
+                handler.cb(info);
+            });
+        };
+
+        rt = Realtime.start(config);
+
+        rt.proxy = proxy;
+        rt.realtime = realtime;
+        return rt;
+    };
+
+    return api;
+});
diff --git a/www/json/deep-proxy.js b/www/json/deep-proxy.js
deleted file mode 100644
index 8591223d1..000000000
--- a/www/json/deep-proxy.js
+++ /dev/null
@@ -1,530 +0,0 @@
-define([
-    '/bower_components/proxy-polyfill/proxy.min.js', // https://github.com/GoogleChrome/proxy-polyfill
-], function () {
-    // linter complains if this isn't defined
-    var Proxy = window.Proxy;
-
-    var deepProxy = {};
-
-    // for passing messages while recursing. use powers of two in case we ever
-    // need to pass multiple message types (via bitpacking)
-    var Messages = deepProxy.Messages = {
-        CHANGE: 1,
-        REMOVE: 2
-    };
-
-    var isArray = deepProxy.isArray = function (obj) {
-        return Object.prototype.toString.call(obj)==='[object Array]';
-    };
-
-    /*  Arrays and nulls both register as 'object' when using native typeof
-        we need to distinguish them as their own types, so use this instead. */
-    var type = deepProxy.type = function (dat) {
-        return dat === null?  'null': isArray(dat)?'array': typeof(dat);
-    };
-
-    var isProxyable = deepProxy.isProxyable = function (obj) {
-        return ['object', 'array'].indexOf(type(obj)) !== -1;
-    };
-
-    /*  Any time you set a value, check its type.
-        If that type is proxyable, make a new proxy. */
-    var setter = deepProxy.set = function (cb) {
-        return function (obj, prop, value) {
-            if (prop === 'on') {
-                throw new Error("'on' is a reserved attribute name for realtime lists and maps");
-            }
-
-            if (isProxyable(value)) {
-                var proxy = obj[prop] = deepProxy.create(value, cb);
-            } else {
-                obj[prop] = value;
-            }
-
-            cb();
-            return obj[prop] || true; // always return truthey or you have problems
-        };
-    };
-
-    var pathMatches = deepProxy.pathMatches = function (path, pattern) {
-        return !pattern.some(function (x, i) {
-            return x !== path[i];
-        });
-    };
-
-    var lengthDescending = function (a, b) { return b.pattern.length - a.pattern.length; };
-
-    var getter = deepProxy.get = function (cb) {
-        var events = {
-            disconnect: [],
-            change: [],
-            ready: [],
-            remove: [],
-            create: [],
-        };
-
-        var on = function (evt, pattern, f) {
-            switch (evt) {
-                case 'change':
-                    // pattern needs to be an array
-                    pattern = type(pattern) === 'array'? pattern: [pattern];
-
-                    events.change.push({
-                        cb: function (oldval, newval, path, root) {
-                            if (pathMatches(path, pattern)) {
-                                return f(oldval, newval, path, root);
-                            }
-                        },
-                        pattern: pattern,
-                    });
-                    // sort into descending order so we evaluate in order of specificity
-                    events.change.sort(lengthDescending);
-
-                    break;
-                case 'remove':
-                    pattern = type(pattern) === 'array'? pattern: [pattern];
-
-                    events.remove.push({
-                        cb: function (oldval, path, root) {
-                            if (pathMatches(path, pattern)) { return f(oldval, path, root); }
-                        },
-                        pattern: pattern,
-                    });
-
-                    events.remove.sort(lengthDescending);
-
-                    break;
-                case 'ready':
-                    events.ready.push({
-                        // on('ready' has a different signature than 
-                        // change and delete, so use 'pattern', not 'f'
-
-                        cb: function (info) {
-                            pattern(info);
-                        }
-                    });
-                    break;
-                case 'disconnect':
-                    events.disconnect.push({
-                        cb: function (info) {
-                            // as above
-                            pattern(info);
-                        }
-                    });
-                    break;
-                case 'create':
-                    events.create.push({
-                        cb: function (info) {
-                            pattern(info);
-                        }
-                    });
-                    break;
-                default:
-                    break;
-            }
-            return this;
-        };
-
-        return function (obj, prop) {
-            if (prop === 'on') {
-                return on;
-            } else if (prop === '_events') {
-                return events;
-            }
-            return obj[prop];
-        };
-    };
-
-    var handlers = deepProxy.handlers = function (cb) {
-        return {
-            set: setter(cb),
-            get: getter(cb),
-        };
-    };
-
-    var create = deepProxy.create = function (obj, opt) {
-        /*  recursively create proxies in case users do:
-            `x.a = {b: {c: 5}};
-
-            otherwise the inner object is not a proxy, which leads to incorrect
-            behaviour on the client that initiated the object (but not for
-            clients that receive the objects) */
-
-        // if the user supplied a callback, use it to create handlers
-        // this saves a bit of work in recursion
-        var methods = type(opt) === 'function'? handlers(opt) : opt;
-        switch (type(obj)) {
-            case 'object':
-                var keys = Object.keys(obj);
-                keys.forEach(function (k) {
-                    if (isProxyable(obj[k])) {
-                        obj[k] = create(obj[k], opt);
-                    }
-                });
-                break;
-            case 'array':
-                obj.forEach(function (o, i) {
-                    if (isProxyable(o)) {
-                        obj[i] = create(obj[i], opt);
-                    }
-                });
-                break;
-            default:
-                // if it's not an array or object, you don't need to proxy it
-                throw new Error('attempted to make a proxy of an unproxyable object');
-        }
-
-        return new Proxy(obj, methods);
-    };
-
-    // onChange(path, key, root, oldval, newval)
-    var onChange = function (path, key, root, oldval, newval) {
-        var P = path.slice(0);
-        P.push(key);
-
-        /*  returning false in your callback terminates 'bubbling up'
-            we can accomplish this with Array.some because we've presorted
-            listeners by the specificity of their path
-        */
-        root._events.change.some(function (handler, i) {
-            return handler.cb(oldval, newval, P, root) === false;
-        });
-    };
-
-    var find = deepProxy.find = function (map, path) {
-        /* safely search for nested values in an object via a path */
-        return (map && path.reduce(function (p, n) {
-            return typeof p[n] !== 'undefined' && p[n];
-        }, map)) || undefined;
-    };
-
-    var onRemove = function (path, key, root, old, top) {
-        var newpath = path.concat(key);
-        var X = find(root, newpath);
-
-        var t_X = type(X);
-
-        /*  TODO 'find' is correct but unnecessarily expensive.
-            optimize it. */
-
-        switch (t_X) {
-            case 'array':
-
-                if (top) {
-                    // the top of an onremove should emit an onchange instead
-                    onChange(path, key, root, old, undefined);// no newval since it's a deletion
-                } else {
-                    root._events.remove.forEach(function (handler, i) {
-                        return handler.cb(X, newpath, root);
-                    });
-                }
-                // remove all of the array's children
-                X.forEach(function (x, i) {
-                    onRemove(newpath, i, root);
-                });
-
-                break;
-            case 'object':
-                if (top) {
-                    onChange(path, key, root, old, undefined);// no newval since it's a deletion
-                } else {
-                    root._events.remove.forEach(function (handler, i) {
-                        return handler.cb(X, newpath, root, old, false);
-                    });
-                }
-                // remove all of the object's children
-                Object.keys(X).forEach(function (key, i) {
-                    onRemove(newpath, key, root, X[key], false);
-                });
-
-                break;
-            default:
-                root._events.remove.forEach(function (handler, i) {
-                    return handler.cb(X, newpath, root);
-                });
-                break;
-        }
-    };
-
-    /*  compare a new object 'B' against an existing proxy object 'A'
-        provide a unary function 'f' for the purpose of constructing new
-        deep proxies from regular objects and arrays.
-
-        Supply the path as you recurse, for the purpose of emitting events
-        attached to particular paths within the complete structure.
-
-        Operates entirely via side effects on 'A'
-    */
-    var objects = deepProxy.objects = function (A, B, f, path, root) {
-        var Akeys = Object.keys(A);
-        var Bkeys = Object.keys(B);
-
-        /*  iterating over the keys in B will tell you if a new key exists
-            it will not tell you if a key has been removed.
-            to accomplish that you will need to iterate over A's keys
-        */
-
-        /*  TODO return a truthy or falsey value (in 'objects' and 'arrays')
-            so that we have some measure of whether an object or array changed
-            (from the higher level in the tree, rather than doing everything
-            at the leaf level).
-
-            bonus points if you can defer events until the complete diff has
-            finished (collect them into an array or something, and simplify
-            the event if possible)
-        */
-
-        Bkeys.forEach(function (b) {
-            var t_b = type(B[b]);
-            var old = A[b];
-
-            if (Akeys.indexOf(b) === -1) {
-                // there was an insertion
-
-                // mind the fallthrough behaviour
-                switch (t_b) {
-                    case 'undefined':
-                        // umm. this should never happen?
-                        throw new Error("undefined type has key. this shouldn't happen?");
-                    case 'array':
-                    case 'object':
-                        A[b] = f(B[b]);
-                        break;
-                    default:
-                        A[b] = B[b];
-                }
-
-                // insertions are a change
-
-                // onChange(path, key, root, oldval, newval)
-                onChange(path, b, root, old, B[b]);
-                return;
-            }
-
-            // else the key already existed
-            var t_a = type(A[b]);
-            if (t_a !== t_b) {
-                // its type changed!
-                console.log("type changed from [%s] to [%s]", t_a, t_b);
-                switch (t_b) {
-                    case 'undefined':
-                        throw new Error("first pass should never reveal undefined keys");
-                    case 'array':
-                        A[b] = f(B[b]);
-                        // make a new proxy
-                        break;
-                    case 'object':
-                        A[b] = f(B[b]);
-                        // make a new proxy
-                        break;
-                    default:
-                        // all other datatypes just require assignment.
-                        A[b] = B[b];
-                        break;
-                }
-
-                // type changes always mean a change happened
-                onChange(path, b, root, old, B[b]);
-                return;
-            }
-
-            // values might have changed, if not types
-            if (['array', 'object'].indexOf(t_a) === -1) {
-                // it's not an array or object, so we can do deep equality
-                if (A[b] !== B[b]) {
-                    // not equal, so assign
-                    A[b] = B[b];
-
-                    onChange(path, b, root, old, B[b]);
-                }
-                return;
-            }
-
-            // else it's an array or object
-            var nextPath = path.slice(0).concat(b);
-            if (t_a === 'object') {
-                // it's an object
-                objects.call(root, A[b], B[b], f, nextPath, root);
-            } else {
-                // it's an array
-                deepProxy.arrays.call(root, A[b], B[b], f, nextPath, root);
-            }
-        });
-        Akeys.forEach(function (a) {
-            var old = A[a];
-
-            // the key was deleted
-            if (Bkeys.indexOf(a) === -1 || type(B[a]) === 'undefined') {
-                onRemove(path, a, root, old, true);
-                delete A[a];
-            }
-        });
-
-        return;
-    };
-
-    var arrays = deepProxy.arrays = function (A, B, f, path, root) {
-        var l_A = A.length;
-        var l_B = B.length;
-
-        if (l_A !== l_B) {
-            // B is longer than Aj
-            // there has been an insertion
-
-            // OR
-
-            // A is longer than B
-            // there has been a deletion
-
-            B.forEach(function (b, i) {
-                var t_a = type(A[i]);
-                var t_b = type(b);
-
-                var old = A[i];
-
-                if (t_a !== t_b) {
-                    // type changes are always destructive
-                    // that's good news because destructive is easy
-                    switch (t_b) {
-                        case 'undefined':
-                            throw new Error('this should never happen');
-                        case 'object':
-                            A[i] = f(b);
-                            break;
-                        case 'array':
-                            A[i] = f(b);
-                            break;
-                        default:
-                            A[i] = b;
-                            break;
-                    }
-
-                    // path, key, root object, oldvalue, newvalue
-                    onChange(path, i, root, old, b);
-                } else {
-                    // same type
-                    var nextPath = path.slice(0).concat(i);
-
-                    switch (t_b) {
-                        case 'object':
-                            objects.call(root, A[i], b, f, nextPath, root);
-                            break;
-                        case 'array':
-                            if (arrays.call(root, A[i], b, f, nextPath, root)) {
-                                onChange(path, i, root, old, b);
-                            }
-                            break;
-                        default:
-                            if (b !== A[i]) {
-                                A[i] = b;
-                                onChange(path, i, root, old, b);
-                            }
-                            break;
-                    }
-                }
-            });
-
-            if (l_A > l_B) {
-                // A was longer than B, so there have been deletions
-                var i = l_B;
-                var t_a;
-                var old;
-
-                for (; i <= l_B; i++) {
-                    // recursively delete
-                    old = A[i];
-
-                    onRemove(path, i, root, old, true);
-                }
-                // cool
-            }
-
-            A.length = l_B;
-            return;
-        }
-
-        // else they are the same length, iterate over their values
-        A.forEach(function (a, i) {
-            var t_a = type(a);
-            var t_b = type(B[i]);
-
-            var old = a;
-
-            // they have different types
-            if (t_a !== t_b) {
-                switch (t_b) {
-                    case 'undefined':
-                        onRemove(path, i, root, old, true);
-                        break;
-
-                // watch out for fallthrough behaviour
-                    // if it's an object or array, create a proxy
-                    case 'object':
-                    case 'array':
-                        A[i] = f(B[i]);
-                        break;
-                    default:
-                        A[i] = B[i];
-                        break;
-                }
-
-                onChange(path, i, root, old, B[i]);
-                return;
-            }
-
-            // they are the same type, clone the paths array and push to it
-            var nextPath = path.slice(0).concat(i);
-
-            // same type
-            switch (t_b) {
-                case 'undefined':
-                    throw new Error('existing key had type `undefined`. this should never happen');
-                case 'object':
-                    if (objects.call(root, A[i], B[i], f, nextPath, root)) {
-                        onChange(path, i, root, old, B[i]);
-                    }
-                    break;
-                case 'array':
-                    if (arrays.call(root, A[i], B[i], f, nextPath, root)) {
-                        onChange(path, i, root, old, B[i]);
-                    }
-                    break;
-                default:
-                    if (A[i] !== B[i]) {
-                        A[i] = B[i];
-                        onChange(path, i, root, old, B[i]);
-                    }
-                    break;
-            }
-        });
-        return;
-    };
-
-    var update = deepProxy.update = function (A, B, cb) {
-        var t_A = type(A);
-        var t_B = type(B);
-
-        if (t_A !== t_B) {
-            throw new Error("Proxy updates can't result in type changes");
-        }
-
-        switch (t_B) {
-            /* use .call so you can supply a different `this` value */
-            case 'array':
-                arrays.call(A, A, B, function (obj) {
-                    return create(obj, cb);
-                }, [], A);
-                break;
-            case 'object':
-            //   arrays.call(this, A   , B   , f, path    , root)
-                objects.call(A, A, B, function (obj) {
-                    return create(obj, cb);
-                }, [], A);
-                break;
-            default:
-                throw new Error("unsupported realtime datatype:" + t_B);
-        }
-    };
-
-    return deepProxy;
-});

From 58633af9431ef8e888c2e1ccf7face9adb5c660f Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 15:47:34 +0200
Subject: [PATCH 238/257] listmap can be reused. put it in common/

---
 www/{json => common}/chainpad-listmap.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename www/{json => common}/chainpad-listmap.js (100%)

diff --git a/www/json/chainpad-listmap.js b/www/common/chainpad-listmap.js
similarity index 100%
rename from www/json/chainpad-listmap.js
rename to www/common/chainpad-listmap.js

From dccf5e8dcf7ed2044daeebf7410a70609b49bd0c Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 15:51:54 +0200
Subject: [PATCH 239/257] use listmap api from common/

---
 www/json/main.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/json/main.js b/www/json/main.js
index e77004f91..02e3a63c9 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -1,5 +1,5 @@
 define([
-    '/json/api.js',
+    '/common/chainpad-listmap.js',
     '/common/crypto.js',
     '/common/cryptpad-common.js',
     //'/customize/pad.js'
@@ -48,6 +48,7 @@ define([
                 console.log("preventing propogation...");
                 return false;
             })
+            // on(event, cb)
             .on('disconnect', function (info) {
                 setEditable(false);
                 window.alert("Network connection lost");

From ff0f7d15dcd5e5ba2fffe6c0f7c9e3d5bac4ad97 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 16:23:25 +0200
Subject: [PATCH 240/257] use json-ot from bower

---
 bower.json                     |  3 +-
 www/canvas/main.js             |  2 +-
 www/common/chainpad-listmap.js |  2 +-
 www/common/json-ot.js          | 68 ----------------------------------
 www/pad/main.js                |  2 +-
 5 files changed, 5 insertions(+), 72 deletions(-)
 delete mode 100644 www/common/json-ot.js

diff --git a/bower.json b/bower.json
index 19b2e8ca0..56205905c 100644
--- a/bower.json
+++ b/bower.json
@@ -32,6 +32,7 @@
     "hyperjson": "~1.2.2",
     "textpatcher": "^1.2.0",
     "proxy-polyfill": "^0.1.5",
-    "chainpad": "^0.2.2"
+    "chainpad": "^0.2.2",
+    "chainpad-json-validator": "^0.1.1"
   }
 }
diff --git a/www/canvas/main.js b/www/canvas/main.js
index 5564d95f1..64a782120 100644
--- a/www/canvas/main.js
+++ b/www/canvas/main.js
@@ -9,7 +9,7 @@ define([
     '/common/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
-    '/common/json-ot.js',
+    '/bower_components/chainpad-json-validator/json-ot.js',
     '/bower_components/fabric.js/dist/fabric.min.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
diff --git a/www/common/chainpad-listmap.js b/www/common/chainpad-listmap.js
index b1c502207..fe0c1b1ec 100644
--- a/www/common/chainpad-listmap.js
+++ b/www/common/chainpad-listmap.js
@@ -3,7 +3,7 @@ define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/crypto.js',
     '/common/realtime-input.js',
-    '/common/json-ot.js',
+    '/bower_components/chainpad-json-validator/json-ot.js',
     'json.sortify',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js',
diff --git a/www/common/json-ot.js b/www/common/json-ot.js
deleted file mode 100644
index f04cf3b75..000000000
--- a/www/common/json-ot.js
+++ /dev/null
@@ -1,68 +0,0 @@
-define([
-    '/common/realtime-input.js'
-], function () {
-    var ChainPad = window.ChainPad;
-    var JsonOT = {};
-
-    var validate = JsonOT.validate = function (text, toTransform, transformBy) {
-        var DEBUG = window.REALTIME_DEBUG = window.REALTIME_DEBUG || {};
-
-        var resultOp, text2, text3;
-        try {
-            // text = O (mutual common ancestor)
-            // toTransform = A (the first incoming operation)
-            // transformBy = B (the second incoming operation)
-            // threeway merge (0, A, B)
-
-            resultOp = ChainPad.Operation.transform0(text, toTransform, transformBy);
-
-            /*  if after operational transform we find that no op is necessary
-                return null to ignore this patch */
-            if (!resultOp) { return null; }
-
-            text2 = ChainPad.Operation.apply(transformBy, text);
-            text3 = ChainPad.Operation.apply(resultOp, text2);
-            try {
-                JSON.parse(text3);
-                return resultOp;
-            } catch (e) {
-                console.error(e);
-                var info = DEBUG.ot_parseError = {
-                    type: 'resultParseError',
-                    resultOp: resultOp,
-
-                    toTransform: toTransform,
-                    transformBy: transformBy,
-
-                    text1: text,
-                    text2: text2,
-                    text3: text3,
-                    error: e
-                };
-                console.log('Debugging info available at `window.REALTIME_DEBUG.ot_parseError`');
-            }
-        } catch (x) {
-            console.error(x);
-            window.DEBUG.ot_applyError = {
-                type: 'resultParseError',
-                resultOp: resultOp,
-
-                toTransform: toTransform,
-                transformBy: transformBy,
-
-                text1: text,
-                text2: text2,
-                text3: text3,
-                error: x
-            };
-            console.log('Debugging info available at `window.REALTIME_DEBUG.ot_applyError`');
-        }
-
-        // returning **null** breaks out of the loop
-        // which transforms conflicting operations
-        // in theory this should prevent us from producing bad JSON
-        return null;
-    };
-
-    return JsonOT;
-});
diff --git a/www/pad/main.js b/www/pad/main.js
index 5f6cfa0c8..e22d439a4 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -8,7 +8,7 @@ define([
     '/common/hyperscript.js',
     '/common/toolbar.js',
     '/common/cursor.js',
-    '/common/json-ot.js',
+    '/bower_components/chainpad-json-validator/json-ot.js',
     '/common/TypingTests.js',
     'json.sortify',
     '/bower_components/textpatcher/TextPatcher.amd.js',

From 5bb77bd50c53ab6a067f873570a9f0496dc66a8b Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 16:24:41 +0200
Subject: [PATCH 241/257] add UI.add and UI.remove methods.

also use json-ot from bower
---
 www/form/main.js | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/www/form/main.js b/www/form/main.js
index 0dc1c9fdf..643d71e46 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -6,7 +6,7 @@ define([
     '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
     '/form/ula.js',
-    '/common/json-ot.js',
+    '/bower_components/chainpad-json-validator/json-ot.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
 ], function (Config, Realtime, Crypto, TextPatcher, Sortify, Formula, JsonOT) {
@@ -43,8 +43,29 @@ define([
         ids: [],
         each: function (f) {
             UI.ids.forEach(function (id, i, list) {
+                if (!UI[id]) { return; }
                 f(UI[id], i, list);
             });
+        },
+        add: function (id, ui) {
+            if (UI.ids.indexOf(id) === -1) {
+                UI.ids.push(id);
+
+                UI[id] = ui;
+                return true;
+            } else {
+                // it already exists
+
+                return false;
+            }
+        },
+        remove: function (id) {
+            delete UI[id];
+            var idx = UI.ids.indexOf(id);
+            if (idx > -1) {
+                UI.ids.splice(idx, 1);
+                return true;
+            }
         }
     };
 
@@ -67,9 +88,7 @@ define([
                 // get its type
             .data('rt-ui-type', type);
 
-        UI.ids.push(id);
-
-        var component = UI[id] = {
+        var component = {
             id: id,
             $: $this,
             element: element,
@@ -78,6 +97,8 @@ define([
             name: $this.prop('name'),
         };
 
+        UI.add(id, component);
+
         component.value = (function () {
             var checker = ['radio', 'checkbox'].indexOf(type) !== -1;
 

From cf2866baa739875b98698707d176ee8c3dc2f5cf Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 16:35:45 +0200
Subject: [PATCH 242/257] use json-ot from bower for tests

---
 www/assert/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/assert/main.js b/www/assert/main.js
index 35ec51957..244e731e4 100644
--- a/www/assert/main.js
+++ b/www/assert/main.js
@@ -1,7 +1,7 @@
 require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/bower_components/jquery/dist/jquery.min.js',
-    '/common/hyperjson.js', // serializing classes as an attribute
+    '/bower_components/hyperjson/hyperjson.amd.js', // serializing classes as an attribute
     '/common/hyperscript.js', // using setAttribute
     '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',

From d9a4f2f22c2974ef305977e3724e8d4299020e88 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 16:44:15 +0200
Subject: [PATCH 243/257] missed one

---
 www/common/convert.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/convert.js b/www/common/convert.js
index 973881c80..924f94e76 100644
--- a/www/common/convert.js
+++ b/www/common/convert.js
@@ -1,6 +1,6 @@
 define([
     '/common/virtual-dom.js',
-    '/common/hyperjson.js',
+    '/bower_components/hyperjson/hyperjson.amd.js',
     '/common/hyperscript.js'
 ], function (vdom, hyperjson, hyperscript) {
     // complain if you don't find the required APIs

From 85dbd5cb6e6d863efd8ab318de7b6902c0c540fe Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 17:27:01 +0200
Subject: [PATCH 244/257] pass in websocketURL from main

---
 www/common/chainpad-listmap.js | 9 ++++++---
 www/json/main.js               | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/www/common/chainpad-listmap.js b/www/common/chainpad-listmap.js
index fe0c1b1ec..3e7fe8c8f 100644
--- a/www/common/chainpad-listmap.js
+++ b/www/common/chainpad-listmap.js
@@ -1,6 +1,5 @@
 require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
-    '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/crypto.js',
     '/common/realtime-input.js',
     '/bower_components/chainpad-json-validator/json-ot.js',
@@ -8,7 +7,7 @@ define([
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/bower_components/proxy-polyfill/proxy.min.js', // https://github.com/GoogleChrome/proxy-polyfill
-], function (Config, Crypto, Realtime, JsonOT, Sortify, TextPatcher) {
+], function (Crypto, Realtime, JsonOT, Sortify, TextPatcher) {
     var api = {};
     // linter complains if this isn't defined
     var Proxy = window.Proxy;
@@ -67,6 +66,10 @@ define([
                 create: [],
             };
 
+            /*  TODO implement 'off' as well.
+                change 'setter' to warn users when they attempt to set 'off'
+            */
+
             var on = function (evt, pattern, f) {
                 switch (evt) {
                     case 'change':
@@ -547,7 +550,7 @@ define([
             channel: cfg.channel,
             cryptKey: cfg.cryptKey,
             crypto: Crypto,
-            websocketURL: Config.websocketURL,
+            websocketURL: cfg.websocketURL,
             logLevel: 0
         };
 
diff --git a/www/json/main.js b/www/json/main.js
index 02e3a63c9..64f1ac552 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -1,14 +1,16 @@
 define([
+    '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/chainpad-listmap.js',
     '/common/crypto.js',
     '/common/cryptpad-common.js',
     //'/customize/pad.js'
-], function (RtListMap, Crypto, Common) {
+], function (Config, RtListMap, Crypto, Common) {
     var $ = window.jQuery;
 
     var secret = Common.getSecrets();
 
     var config = {
+        websocketURL: Config.websocketURL,
         channel: secret.channel,
         cryptKey: secret.key,
         data: {},

From f76dc615c0627906eab08eb77ee01a6609b8c5d6 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 18:51:31 +0200
Subject: [PATCH 245/257] use chainpad-crypto from bower and pass it into the
 listmap api

---
 bower.json       | 3 ++-
 www/json/main.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bower.json b/bower.json
index 56205905c..f80f20181 100644
--- a/bower.json
+++ b/bower.json
@@ -33,6 +33,7 @@
     "textpatcher": "^1.2.0",
     "proxy-polyfill": "^0.1.5",
     "chainpad": "^0.2.2",
-    "chainpad-json-validator": "^0.1.1"
+    "chainpad-json-validator": "^0.1.1",
+    "chainpad-crypto": "^0.1.1"
   }
 }
diff --git a/www/json/main.js b/www/json/main.js
index 64f1ac552..e81295e99 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -1,7 +1,7 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/chainpad-listmap.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/common/cryptpad-common.js',
     //'/customize/pad.js'
 ], function (Config, RtListMap, Crypto, Common) {
@@ -14,6 +14,7 @@ define([
         channel: secret.channel,
         cryptKey: secret.key,
         data: {},
+        crypto: Crypto
     };
 
     var module = window.APP = {};

From 288b4d5b66da7f3c33a4abb2c2acd063eed008e9 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 18:52:35 +0200
Subject: [PATCH 246/257] depend on main passing in the crypto module for now

---
 www/common/chainpad-listmap.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/www/common/chainpad-listmap.js b/www/common/chainpad-listmap.js
index 3e7fe8c8f..cdd88d3a1 100644
--- a/www/common/chainpad-listmap.js
+++ b/www/common/chainpad-listmap.js
@@ -1,13 +1,12 @@
 require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
-    '/common/crypto.js',
-    '/common/realtime-input.js',
+    '/common/realtime-input.js', // TODO publish on bower
     '/bower_components/chainpad-json-validator/json-ot.js',
     'json.sortify',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/bower_components/proxy-polyfill/proxy.min.js', // https://github.com/GoogleChrome/proxy-polyfill
-], function (Crypto, Realtime, JsonOT, Sortify, TextPatcher) {
+], function (Realtime, JsonOT, Sortify, TextPatcher) {
     var api = {};
     // linter complains if this isn't defined
     var Proxy = window.Proxy;
@@ -543,13 +542,26 @@ define([
             throw new Error('unsupported datatype: '+ DeepProxy.type(cfg.data));
         }
 
+        if (!cfg.crypto) {
+            // complain and stub
+            console.log("[chainpad-listmap] no crypto module provided. messages will not be encrypted");
+            cfg.crypto = {
+                encrypt: function (msg) {
+                    return msg;
+                },
+                descrypt: function (msg) {
+                    return msg;
+                }
+            };
+        }
+
         var config = {
             initialState: Sortify(cfg.data),
             transformFunction: JsonOT.validate,
-            userName: Crypto.rand64(8),
+            userName: cfg.crypto.rand64(8), // TODO stub this in case there is no crypto module provided?
             channel: cfg.channel,
-            cryptKey: cfg.cryptKey,
-            crypto: Crypto,
+            cryptKey: cfg.cryptKey, // TODO make sure things work without this code
+            crypto: cfg.crypto, // stub if not provided
             websocketURL: cfg.websocketURL,
             logLevel: 0
         };

From 58c968b319e437f014e0a4e0aa3f4bab829b8b5f Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 3 Jun 2016 18:55:32 +0200
Subject: [PATCH 247/257] minor cleanup in realtime-input

---
 www/common/realtime-input.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
index 61250fdf3..61a7c242a 100644
--- a/www/common/realtime-input.js
+++ b/www/common/realtime-input.js
@@ -61,9 +61,7 @@ define([
         var realtime;
         var network;
 
-        var parseMessage = function (msg) {
-            return unBencode(msg);//.slice(msg.indexOf(':[') + 1);
-        };
+        var parseMessage = function (msg) { return unBencode(msg); };
 
         var userList = {
             onChange : function() {},

From d9b6d72a7ffa608796e47603ea75fbd35bf6bbca Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 6 Jun 2016 11:53:08 +0200
Subject: [PATCH 248/257] depend on netflux-websocket (netflux-client.js) and
 chainpad-netflux (realtime-input.js) via bower

---
 bower.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index f80f20181..d75845992 100644
--- a/bower.json
+++ b/bower.json
@@ -34,6 +34,8 @@
     "proxy-polyfill": "^0.1.5",
     "chainpad": "^0.2.2",
     "chainpad-json-validator": "^0.1.1",
-    "chainpad-crypto": "^0.1.1"
+    "chainpad-crypto": "^0.1.1",
+    "netflux-websocket": "^0.1.0",
+    "chainpad-netflux": "^0.1.0"
   }
 }

From 2798d1b1f9369b75faa9df0fe4838916fa3ac6fa Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 6 Jun 2016 11:54:37 +0200
Subject: [PATCH 249/257] all of the list/map api's dependencies are now on
 bower

---
 www/common/chainpad-listmap.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/common/chainpad-listmap.js b/www/common/chainpad-listmap.js
index cdd88d3a1..134174dc9 100644
--- a/www/common/chainpad-listmap.js
+++ b/www/common/chainpad-listmap.js
@@ -1,10 +1,9 @@
 require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
-    '/common/realtime-input.js', // TODO publish on bower
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/chainpad-json-validator/json-ot.js',
     'json.sortify',
     '/bower_components/textpatcher/TextPatcher.amd.js',
-    '/bower_components/jquery/dist/jquery.min.js',
     '/bower_components/proxy-polyfill/proxy.min.js', // https://github.com/GoogleChrome/proxy-polyfill
 ], function (Realtime, JsonOT, Sortify, TextPatcher) {
     var api = {};

From beba78d7f85853c266a00c4127a6e471fe1ac51e Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 6 Jun 2016 12:14:07 +0200
Subject: [PATCH 250/257] update prototype dependencies

---
 www/canvas/main.js | 4 ++--
 www/code/main.js   | 7 +++----
 www/form/main.js   | 4 ++--
 www/hack/main.js   | 4 ++--
 www/json/main.js   | 1 +
 www/pad/main.js    | 4 ++--
 www/render/main.js | 4 ++--
 www/style/main.js  | 4 ++--
 www/text/main.js   | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/www/canvas/main.js b/www/canvas/main.js
index 64a782120..5f398da05 100644
--- a/www/canvas/main.js
+++ b/www/canvas/main.js
@@ -4,9 +4,9 @@ require.config({ paths: {
 
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/common/messages.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
     '/bower_components/chainpad-json-validator/json-ot.js',
diff --git a/www/code/main.js b/www/code/main.js
index 2a9aac661..d32d3c807 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -1,14 +1,13 @@
 require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-//    '/code/rt_codemirror.js',
     '/common/messages.js',
-    '/common/crypto.js',
-    '/common/realtime-input.js',
+    '/bower_components/chainpad-crypto/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/common/toolbar.js',
     'json.sortify',
-    '/common/json-ot.js',
+    '/bower_components/chainpad-json-validator/json-ot.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
 ], function (Config, /*RTCode,*/ Messages, Crypto, Realtime, TextPatcher, Toolbar, JSONSortify, JsonOT) {
diff --git a/www/form/main.js b/www/form/main.js
index 643d71e46..5c4bf93ab 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -1,8 +1,8 @@
 require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     'json.sortify',
     '/form/ula.js',
diff --git a/www/hack/main.js b/www/hack/main.js
index 81cc87234..8318ebe1a 100644
--- a/www/hack/main.js
+++ b/www/hack/main.js
@@ -1,7 +1,7 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js'
 ], function (Config, Realtime, Crypto, TextPatcher) {
diff --git a/www/json/main.js b/www/json/main.js
index e81295e99..7f8567073 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -3,6 +3,7 @@ define([
     '/common/chainpad-listmap.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/common/cryptpad-common.js',
+    '/bower_components/jquery/dist/jquery.min.js',
     //'/customize/pad.js'
 ], function (Config, RtListMap, Crypto, Common) {
     var $ = window.jQuery;
diff --git a/www/pad/main.js b/www/pad/main.js
index e22d439a4..a66053386 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -2,8 +2,8 @@ require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/J
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
     '/common/messages.js',
-    '/common/crypto.js',
-    '/common/realtime-input.js',
+    '/bower_components/chainpad-crypto/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
     '/bower_components/hyperjson/hyperjson.amd.js',
     '/common/hyperscript.js',
     '/common/toolbar.js',
diff --git a/www/render/main.js b/www/render/main.js
index 451728ad0..d6b03eea8 100644
--- a/www/render/main.js
+++ b/www/render/main.js
@@ -1,7 +1,7 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/marked/marked.min.js',
     '/common/convert.js',
     '/common/rainbow.js',
diff --git a/www/style/main.js b/www/style/main.js
index 218cc1cd8..d68a6c8c6 100644
--- a/www/style/main.js
+++ b/www/style/main.js
@@ -1,7 +1,7 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'
diff --git a/www/text/main.js b/www/text/main.js
index e3c23af9e..077e997b4 100644
--- a/www/text/main.js
+++ b/www/text/main.js
@@ -1,7 +1,7 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/realtime-input.js',
-    '/common/crypto.js',
+    '/bower_components/chainpad-netflux/chainpad-netflux.js',
+    '/bower_components/chainpad-crypto/crypto.js',
     '/bower_components/textpatcher/TextPatcher.amd.js',
     '/bower_components/jquery/dist/jquery.min.js',
     '/customize/pad.js'

From 2c3de4992243124c7741204e7b77a93e105c7d8a Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 6 Jun 2016 12:15:00 +0200
Subject: [PATCH 251/257] remove realtime-input, since it's in bower now

---
 www/common/realtime-input.js | 308 -----------------------------------
 1 file changed, 308 deletions(-)
 delete mode 100644 www/common/realtime-input.js

diff --git a/www/common/realtime-input.js b/www/common/realtime-input.js
deleted file mode 100644
index 61a7c242a..000000000
--- a/www/common/realtime-input.js
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * 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 .
- */
-define([
-    '/common/netflux-client.js',
-    '/common/es6-promise.min.js',
-    '/bower_components/chainpad/chainpad.dist.js',
-    '/bower_components/jquery/dist/jquery.min.js',
-], function (Netflux) {
-    var $ = window.jQuery;
-    var ChainPad = window.ChainPad;
-    var PARANOIA = true;
-    var USE_HISTORY = 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;
-
-    var debug = function (x) { console.log(x); },
-        warn = function (x) { console.error(x); },
-        verbose = function (x) { console.log(x); };
-    verbose = function () {}; // comment out to enable verbose logging
-
-    var unBencode = function (str) { return str.replace(/^\d+:/, ''); };
-
-    var start = module.exports.start =
-        function (config)
-    {
-        var websocketUrl = config.websocketURL;
-        var userName = config.userName;
-        var channel = config.channel;
-        var chanKey = config.cryptKey || '';
-        var Crypto = config.crypto;
-        var cryptKey = Crypto.parseKey(chanKey).cryptKey;
-        var passwd = 'y';
-
-        // make sure configuration is defined
-        config = config || {};
-
-        var initializing = true;
-        var recoverableErrorCount = 0; // unused
-        var toReturn = {};
-        var messagesHistory = [];
-        var chainpadAdapter = {};
-        var realtime;
-        var network;
-
-        var parseMessage = function (msg) { return unBencode(msg); };
-
-        var userList = {
-            onChange : function() {},
-            users: []
-        };
-
-        var onJoining = function(peer) {
-            if(peer.length !== 32) { return; }
-            var list = userList.users;
-            var index = list.indexOf(peer);
-            if(index === -1) {
-                userList.users.push(peer);
-            }
-            userList.onChange();
-        };
-
-        var onReady = function(wc, network) {
-            if(config.setMyID) {
-                config.setMyID({
-                    myID: wc.myID
-                });
-            }
-            // Trigger onJoining with our own Cryptpad username to tell the toolbar that we are synced
-            onJoining(wc.myID);
-
-            // we're fully synced
-            initializing = false;
-
-            if (config.onReady) {
-                config.onReady({
-                    realtime: realtime
-                });
-            }
-        };
-
-        var onMessage = function(peer, msg, wc, network) {
-            // unpack the history keeper from the webchannel
-            var hc = (wc && wc.history_keeper) ? wc.history_keeper : null;
-
-            if(wc && (msg === 0 || msg === '0')) {
-                onReady(wc, network);
-                return;
-            }
-            if (peer === hc){
-                // if the peer is the 'history keeper', extract their message
-                msg = JSON.parse(msg)[4];
-            }
-            var message = chainpadAdapter.msgIn(peer, msg);
-
-            verbose(message);
-
-            if (!initializing) {
-                if (config.onLocal) {
-                    config.onLocal();
-                }
-            }
-
-            // slice off the bencoded header
-            // Why are we getting bencoded stuff to begin with?
-            // FIXME this shouldn't be necessary
-            message = unBencode(message);//.slice(message.indexOf(':[') + 1);
-
-            // pass the message into Chainpad
-            realtime.message(message);
-        };
-
-        // update UI components to show that one of the other peers has left
-        var onLeaving = function(peer) {
-          var list = userList.users;
-          var index = list.indexOf(peer);
-          if(index !== -1) {
-            userList.users.splice(index, 1);
-          }
-          userList.onChange();
-        };
-
-        // shim between chainpad and netflux
-        chainpadAdapter = {
-            msgIn : function(peerId, msg) {
-                msg = msg.replace(/^cp\|/, '');
-                try {
-                    var decryptedMsg = Crypto.decrypt(msg, cryptKey);
-                    messagesHistory.push(decryptedMsg);
-                    return decryptedMsg;
-                } catch (err) {
-                    console.error(err);
-                    return msg;
-                }
-            },
-            msgOut : function(msg, wc) {
-                try {
-                    var cmsg = Crypto.encrypt(msg, cryptKey);
-                    if (msg.indexOf('[4') === 0) { cmsg = 'cp|' + cmsg; }
-                    return cmsg;
-                } catch (err) {
-                    console.log(msg);
-                    throw err;
-                }
-            }
-        };
-
-        var createRealtime = function(chan) {
-            return ChainPad.create({
-                userName: userName,
-                initialState: config.initialState,
-                transformFunction: config.transformFunction,
-                logLevel: typeof(config.logLevel) !== 'undefined'? config.logLevel : 1
-            });
-        };
-
-
-        var onOpen = function(wc, network) {
-            channel = wc.id;
-
-            // Add the existing peers in the userList
-            wc.members.forEach(onJoining);
-
-            // Add the handlers to the WebChannel
-            wc.on('message', function (msg, sender) { //Channel msg
-                onMessage(sender, msg, wc, network);
-            });
-            wc.on('join', onJoining);
-            wc.on('leave', onLeaving);
-
-            // Open a Chainpad session
-            toReturn.realtime = realtime = createRealtime();
-
-            if(config.onInit) {
-                config.onInit({
-                    myID: wc.myID,
-                    realtime: realtime,
-                    getLag: network.getLag,
-                    userList: userList,
-
-                    // channel
-                    channel: channel,
-                });
-            }
-
-            // Sending a message...
-            realtime.onMessage(function(message, cb) {
-                // Filter messages sent by Chainpad to make it compatible with Netflux
-                message = chainpadAdapter.msgOut(message, wc);
-                if(message) {
-                  wc.bcast(message).then(function() {
-                    cb();
-                  }, function(err) {
-                    // The message has not been sent, display the error.
-                    console.error(err);
-                  });
-                }
-            });
-
-            realtime.onPatch(function () {
-                if (config.onRemote) {
-                    config.onRemote({
-                        realtime: realtime
-                    });
-                }
-            });
-
-            // Get the channel history
-            if(USE_HISTORY) {
-              var hc;
-
-              wc.members.forEach(function (p) {
-                if (p.length === 16) { hc = p; }
-              });
-              wc.history_keeper = hc;
-
-              if (hc) { network.sendto(hc, JSON.stringify(['GET_HISTORY', wc.id])); }
-            }
-
-            realtime.start();
-
-            if(!USE_HISTORY) {
-              onReady(wc, network);
-            }
-        };
-
-        var findChannelById = function(webChannels, channelId) {
-            var webChannel;
-
-            // Array.some terminates once a truthy value is returned
-            // best case is faster than forEach, though webchannel arrays seem
-            // to consistently have a length of 1
-            webChannels.some(function(chan) {
-                if(chan.id === channelId) { webChannel = chan; return true;}
-            });
-            return webChannel;
-        };
-
-        var joinSession = function (endPoint, cb) {
-            // a websocket URL has been provided
-            // connect to it with Netflux.
-            if (typeof(endPoint) === 'string') {
-                Netflux.connect(endPoint).then(cb);
-            } else if (typeof(endPoint.then) ==- 'function') {
-                // a netflux network promise was provided
-                // connect to it and use a channel
-                endPoint.then(cb);
-            } else {
-                // assume it's a network and try to connect.
-                cb(network);
-            }
-        };
-
-        /*  Connect to the Netflux network, or fall back to a WebSocket
-            in theory this lets us connect to more netflux channels using only
-            one network. */
-        joinSession(network || websocketUrl, function (network) {
-            // pass messages that come out of netflux into our local handler
-
-            toReturn.network = network;
-
-            network.on('disconnect', function (reason) {
-                if (config.onAbort) {
-                    config.onAbort({
-                        reason: reason
-                    });
-                }
-            });
-
-            network.on('message', function (msg, sender) { // Direct message
-                var wchan = findChannelById(network.webChannels, channel);
-                if(wchan) {
-                  onMessage(sender, msg, wchan, network);
-                }
-            });
-
-            // join the netflux network, promise to handle opening of the channel
-            network.join(channel || null).then(function(wc) {
-                onOpen(wc, network);
-            }, function(error) {
-                console.error(error);
-            });
-        }, function(error) {
-            warn(error);
-        });
-
-        return toReturn;
-    };
-    return module.exports;
-});

From f72cb24fc55543b629f45eab4b0ee933e835faf2 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 6 Jun 2016 12:27:42 +0200
Subject: [PATCH 252/257] rm LORIA

---
 www/common/netflux.js | 1473 -----------------------------------------
 1 file changed, 1473 deletions(-)
 delete mode 100644 www/common/netflux.js

diff --git a/www/common/netflux.js b/www/common/netflux.js
deleted file mode 100644
index d01302980..000000000
--- a/www/common/netflux.js
+++ /dev/null
@@ -1,1473 +0,0 @@
-(function webpackUniversalModuleDefinition(root, factory) {
-	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory();
-	else if(typeof define === 'function' && define.amd)
-		define([], factory);
-	else if(typeof exports === 'object')
-		exports["nf"] = factory();
-	else
-		root["nf"] = factory();
-})(this, function() {
-return /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId])
-/******/ 			return installedModules[moduleId].exports;
-
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			exports: {},
-/******/ 			id: moduleId,
-/******/ 			loaded: false
-/******/ 		};
-
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-
-/******/ 		// Flag the module as loaded
-/******/ 		module.loaded = true;
-
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-
-
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	var _Facade = __webpack_require__(1);
-
-	var _Facade2 = _interopRequireDefault(_Facade);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	module.exports = new _Facade2.default();
-
-/***/ },
-/* 1 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-
-	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-	var _WebChannel = __webpack_require__(2);
-
-	var _WebChannel2 = _interopRequireDefault(_WebChannel);
-
-	var _ServiceProvider = __webpack_require__(4);
-
-	var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	var Facade = function () {
-	  function Facade() {
-	    var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-	    _classCallCheck(this, Facade);
-
-	    this.defaults = {
-	      webrtc: {}
-	    };
-	    this.settings = Object.assign({}, this.defaults, options);
-	  }
-
-	  _createClass(Facade, [{
-	    key: 'create',
-	    value: function create() {
-	      var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-	      return new _WebChannel2.default();
-	    }
-	  }, {
-	    key: 'join',
-	    value: function join(key) {
-	      var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-
-	      var defaults = {
-	        connector: 'WebRTCService',
-	        protocol: 'ExchangeProtocolService'
-	      };
-	      var settings = Object.assign({}, defaults, options);
-	      var connector = _ServiceProvider2.default.get(settings.connector);
-	      var protocol = _ServiceProvider2.default.get(settings.protocol);
-	      var connectorOptions = { signaling: settings.signaling, facade: this };
-	      return new Promise(function (resolve, reject) {
-	        connector.join(key, connectorOptions).then(function (channel) {
-	          var webChannel = new _WebChannel2.default(options);
-	          channel.webChannel = webChannel;
-	          channel.onmessage = protocol.onmessage;
-	          webChannel.channels.add(channel);
-	          webChannel.onopen = function () {
-	            resolve(webChannel);
-	          };
-	        }, reject);
-	      });
-	    }
-	  }, {
-	    key: 'invite',
-	    value: function invite() {
-	      // TODO
-	    }
-	  }, {
-	    key: '_onJoining',
-	    value: function _onJoining() {
-	      // TODO
-	    }
-	  }, {
-	    key: '_onLeaving',
-	    value: function _onLeaving() {
-	      // TODO
-	    }
-	  }, {
-	    key: '_onMessage',
-	    value: function _onMessage() {
-	      // TODO
-	    }
-	  }, {
-	    key: '_onPeerMessage',
-	    value: function _onPeerMessage() {
-	      // TODO
-	    }
-	  }, {
-	    key: '_onInvite',
-	    value: function _onInvite() {
-	      // TODO
-	    }
-	  }]);
-
-	  return Facade;
-	}();
-
-	exports.default = Facade;
-
-/***/ },
-/* 2 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-
-	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-	var _constants = __webpack_require__(3);
-
-	var cs = _interopRequireWildcard(_constants);
-
-	var _ServiceProvider = __webpack_require__(4);
-
-	var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	var WebChannel = function () {
-	  function WebChannel() {
-	    var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-	    _classCallCheck(this, WebChannel);
-
-	    this.defaults = {
-	      connector: cs.WEBRTC_SERVICE,
-	      topology: cs.FULLYCONNECTED_SERVICE,
-	      protocol: cs.EXCHANGEPROTOCOL_SERVICE
-	    };
-	    this.settings = Object.assign({}, this.defaults, options);
-
-	    // Private attributes
-	    this.protocol = cs.EXCHANGEPROTOCOL_SERVICE;
-
-	    // Public attributes
-	    this.id;
-	    this.myID = this._generateID();
-	    this.channels = new Set();
-	    this.onjoining;
-	    this.onleaving;
-	    this.onmessage;
-	  }
-
-	  _createClass(WebChannel, [{
-	    key: 'leave',
-	    value: function leave() {}
-	  }, {
-	    key: 'send',
-	    value: function send(data) {
-	      var channel = this;
-	      return new Promise(function (resolve, reject) {
-	        if (channel.channels.size === 0) {
-	          resolve();
-	        }
-	        var protocol = _ServiceProvider2.default.get(channel.settings.protocol);
-	        channel.topologyService.broadcast(channel, protocol.message(cs.USER_DATA, { id: channel.myID, data: data })).then(resolve, reject);
-	      });
-	    }
-	  }, {
-	    key: 'sendPing',
-	    value: function sendPing() {
-	      var channel = this;
-	      return new Promise(function (resolve, reject) {
-	        if (channel.channels.size === 0) {
-	          resolve();
-	        }
-	        var protocol = _ServiceProvider2.default.get(channel.settings.protocol);
-	        channel.topologyService.broadcast(channel, protocol.message(cs.PING, { data: '' })).then(resolve, reject);
-	      });
-	    }
-	  }, {
-	    key: 'getHistory',
-	    value: function getHistory(historyKeeperID) {
-	      var channel = this;
-	      return new Promise(function (resolve, reject) {
-	        var protocol = _ServiceProvider2.default.get(channel.settings.protocol);
-	        channel.topologyService.sendTo(historyKeeperID, channel, protocol.message(cs.GET_HISTORY, { id: channel.myID, data: '' })).then(resolve, reject);
-	      });
-	    }
-	  }, {
-	    key: 'sendTo',
-	    value: function sendTo(id, msg) {
-	      var channel = this;
-	      return new Promise(function (resolve, reject) {
-	        var protocol = _ServiceProvider2.default.get(channel.settings.protocol);
-	        channel.topologyService.sendTo(id, channel, protocol.message(cs.USER_DATA, { id: channel.myID, data: msg })).then(resolve, reject);
-	      });
-	    }
-	  }, {
-	    key: 'openForJoining',
-	    value: function openForJoining() {
-	      var _this = this;
-
-	      var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-	      var settings = Object.assign({}, this.settings, options);
-	      var connector = _ServiceProvider2.default.get(settings.connector);
-	      return connector.open(function (channel) {
-	        // 1) New dataChannel connection established.
-	        //    NEXT: add it to the network
-	        var protocol = _ServiceProvider2.default.get(_this.protocol);
-	        _this.topologyService = _ServiceProvider2.default.get(_this.settings.topology);
-	        channel.webChannel = _this;
-	        channel.onmessage = protocol.onmessage;
-
-	        // 2.1) Send to the new client the webChannel topology name
-	        channel.send(protocol.message(cs.JOIN_START, _this.settings.topology));
-
-	        // 2.2) Ask to topology to add the new client to this webChannel
-	        _this.topologyService.addStart(channel, _this).then(function (id) {
-	          _this.topologyService.broadcast(_this, protocol.message(cs.JOIN_FINISH, id));
-	          _this.onJoining(id);
-	        });
-	      }, settings).then(function (data) {
-	        return data;
-	      });
-	    }
-	  }, {
-	    key: 'closeForJoining',
-	    value: function closeForJoining() {}
-	  }, {
-	    key: 'isInviting',
-	    value: function isInviting() {}
-	  }, {
-	    key: '_generateID',
-	    value: function _generateID() {
-	      var MIN_LENGTH = 10;
-	      var DELTA_LENGTH = 10;
-	      var MASK = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-	      var result = '';
-	      var length = MIN_LENGTH + Math.round(Math.random() * DELTA_LENGTH);
-
-	      for (var i = 0; i < length; i++) {
-	        result += MASK[Math.round(Math.random() * (MASK.length - 1))];
-	      }
-	      return result;
-	    }
-	  }, {
-	    key: 'topology',
-	    set: function set(topologyServiceName) {
-	      this.settings.topology = topologyServiceName;
-	      this.topologyService = _ServiceProvider2.default.get(topologyServiceName);
-	    },
-	    get: function get() {
-	      return this.settigns.topology;
-	    }
-	  }]);
-
-	  return WebChannel;
-	}();
-
-	exports.default = WebChannel;
-
-/***/ },
-/* 3 */
-/***/ function(module, exports) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-	// API user's message
-	var USER_DATA = exports.USER_DATA = 0;
-	var GET_HISTORY = exports.GET_HISTORY = 6;
-
-	// Internal messages
-	var JOIN_START = exports.JOIN_START = 2;
-	var JOIN_FINISH = exports.JOIN_FINISH = 4;
-	var YOUR_NEW_ID = exports.YOUR_NEW_ID = 5;
-	var PING = exports.PING = 7;
-
-	// Internal message to a specific Service
-	var SERVICE_DATA = exports.SERVICE_DATA = 3;
-
-	var WEBRTC_SERVICE = exports.WEBRTC_SERVICE = 'WebRTCService';
-	var WEBSOCKET_SERVICE = exports.WEBSOCKET_SERVICE = 'WebSocketService';
-	var FULLYCONNECTED_SERVICE = exports.FULLYCONNECTED_SERVICE = 'FullyConnectedService';
-	var STAR_SERVICE = exports.STAR_SERVICE = 'StarTopologyService';
-	var EXCHANGEPROTOCOL_SERVICE = exports.EXCHANGEPROTOCOL_SERVICE = 'ExchangeProtocolService';
-	var WSPROTOCOL_SERVICE = exports.WSPROTOCOL_SERVICE = 'WebSocketProtocolService';
-
-/***/ },
-/* 4 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-
-	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-	var _constants = __webpack_require__(3);
-
-	var cs = _interopRequireWildcard(_constants);
-
-	var _FullyConnectedService = __webpack_require__(5);
-
-	var _FullyConnectedService2 = _interopRequireDefault(_FullyConnectedService);
-
-	var _StarTopologyService = __webpack_require__(6);
-
-	var _StarTopologyService2 = _interopRequireDefault(_StarTopologyService);
-
-	var _WebRTCService = __webpack_require__(7);
-
-	var _WebRTCService2 = _interopRequireDefault(_WebRTCService);
-
-	var _WebSocketService = __webpack_require__(8);
-
-	var _WebSocketService2 = _interopRequireDefault(_WebSocketService);
-
-	var _ExchangeProtocolService = __webpack_require__(9);
-
-	var _ExchangeProtocolService2 = _interopRequireDefault(_ExchangeProtocolService);
-
-	var _WebSocketProtocolService = __webpack_require__(10);
-
-	var _WebSocketProtocolService2 = _interopRequireDefault(_WebSocketProtocolService);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	var services = new Map();
-
-	var ServiceProvider = function () {
-	  function ServiceProvider() {
-	    _classCallCheck(this, ServiceProvider);
-	  }
-
-	  _createClass(ServiceProvider, null, [{
-	    key: 'get',
-	    value: function get(code) {
-	      var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-
-	      var service = undefined;
-	      switch (code) {
-	        case cs.WEBRTC_SERVICE:
-	          service = new _WebRTCService2.default(options);
-	          break;
-	        case cs.WEBSOCKET_SERVICE:
-	          service = new _WebSocketService2.default(options);
-	          break;
-	        case cs.FULLYCONNECTED_SERVICE:
-	          service = new _FullyConnectedService2.default(options);
-	          break;
-	        case cs.STAR_SERVICE:
-	          service = new _StarTopologyService2.default(options);
-	          break;
-	        case cs.EXCHANGEPROTOCOL_SERVICE:
-	          service = new _ExchangeProtocolService2.default(options);
-	          break;
-	        case cs.WSPROTOCOL_SERVICE:
-	          service = new _WebSocketProtocolService2.default(options);
-	          break;
-	      }
-	      services.set(code, service);
-	      return service;
-	    }
-	  }]);
-
-	  return ServiceProvider;
-	}();
-
-	exports.default = ServiceProvider;
-
-/***/ },
-/* 5 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-
-	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-	var _constants = __webpack_require__(3);
-
-	var cs = _interopRequireWildcard(_constants);
-
-	var _ServiceProvider = __webpack_require__(4);
-
-	var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	var FullyConnectedService = function () {
-	  function FullyConnectedService() {
-	    var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-	    _classCallCheck(this, FullyConnectedService);
-	  }
-
-	  _createClass(FullyConnectedService, [{
-	    key: 'addStart',
-	    value: function addStart(channel, webChannel) {
-	      var _this = this;
-
-	      var protocol = _ServiceProvider2.default.get(cs.EXCHANGEPROTOCOL_SERVICE);
-	      return new Promise(function (resolve, reject) {
-	        channel.peerID = _this._generateID();
-	        channel.send(protocol.message(cs.YOUR_NEW_ID, {
-	          newID: channel.peerID,
-	          myID: webChannel.myID
-	        }));
-	        if (Reflect.has(webChannel, 'aboutToJoin') && webChannel.aboutToJoin instanceof Map) {
-	          webChannel.aboutToJoin.set(channel.peerID, channel);
-	        } else {
-	          webChannel.aboutToJoin = new Map();
-	        }
-
-	        if (webChannel.channels.size === 0) {
-	          webChannel.channels.add(channel);
-	          channel.onclose = function () {
-	            webChannel.onLeaving(channel.peerID);
-	            webChannel.channels.delete(channel);
-	          };
-	          resolve(channel.peerID);
-	        } else {
-	          (function () {
-	            webChannel.successfullyConnected = new Map();
-	            webChannel.successfullyConnected.set(channel.peerID, 0);
-	            webChannel.connectionSucceed = function (id, withId) {
-	              var counter = webChannel.successfullyConnected.get(withId);
-	              webChannel.successfullyConnected.set(withId, ++counter);
-	              if (webChannel.successfullyConnected.get(withId) === webChannel.channels.size) {
-	                _this.addFinish(webChannel, withId);
-	                resolve(withId);
-	              }
-	            };
-	            var connector = _ServiceProvider2.default.get(cs.WEBRTC_SERVICE);
-	            webChannel.channels.forEach(function (c) {
-	              connector.connect(channel.peerID, webChannel, c.peerID);
-	            });
-	          })();
-	        }
-	      });
-	    }
-	  }, {
-	    key: 'addFinish',
-	    value: function addFinish(webChannel, id) {
-	      if (id != webChannel.myID) {
-	        (function () {
-	          var channel = webChannel.aboutToJoin.get(id);
-	          webChannel.channels.add(webChannel.aboutToJoin.get(id));
-	          channel.onclose = function () {
-	            webChannel.onLeaving(channel.peerID);
-	            webChannel.channels.delete(channel);
-	          };
-	          //webChannel.aboutToJoin.delete(id)
-	          if (Reflect.has(webChannel, 'successfullyConnected')) {
-	            webChannel.successfullyConnected.delete(id);
-	          }
-	        })();
-	      } else {
-	        webChannel.onopen();
-	      }
-	    }
-	  }, {
-	    key: 'broadcast',
-	    value: function broadcast(webChannel, data) {
-	      return new Promise(function (resolve, reject) {
-	        var _iteratorNormalCompletion = true;
-	        var _didIteratorError = false;
-	        var _iteratorError = undefined;
-
-	        try {
-	          for (var _iterator = webChannel.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-	            var c = _step.value;
-
-	            c.send(data);
-	          }
-	        } catch (err) {
-	          _didIteratorError = true;
-	          _iteratorError = err;
-	        } finally {
-	          try {
-	            if (!_iteratorNormalCompletion && _iterator.return) {
-	              _iterator.return();
-	            }
-	          } finally {
-	            if (_didIteratorError) {
-	              throw _iteratorError;
-	            }
-	          }
-	        }
-
-	        resolve();
-	      });
-	    }
-	  }, {
-	    key: 'sendTo',
-	    value: function sendTo(id, webChannel, data) {
-	      return new Promise(function (resolve, reject) {
-	        var _iteratorNormalCompletion2 = true;
-	        var _didIteratorError2 = false;
-	        var _iteratorError2 = undefined;
-
-	        try {
-	          for (var _iterator2 = webChannel.channels[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-	            var c = _step2.value;
-
-	            if (c.peerID == id) {
-	              c.send(data);
-	            }
-	          }
-	        } catch (err) {
-	          _didIteratorError2 = true;
-	          _iteratorError2 = err;
-	        } finally {
-	          try {
-	            if (!_iteratorNormalCompletion2 && _iterator2.return) {
-	              _iterator2.return();
-	            }
-	          } finally {
-	            if (_didIteratorError2) {
-	              throw _iteratorError2;
-	            }
-	          }
-	        }
-
-	        resolve();
-	      });
-	    }
-	  }, {
-	    key: 'leave',
-	    value: function leave(webChannel) {
-	      this.broadcast(webChannel);
-	    }
-	  }, {
-	    key: '_generateID',
-	    value: function _generateID() {
-	      var MIN_LENGTH = 10;
-	      var DELTA_LENGTH = 10;
-	      var MASK = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-	      var length = MIN_LENGTH + Math.round(Math.random() * DELTA_LENGTH);
-	      var maskLastIndex = MASK.length - 1;
-	      var result = '';
-
-	      for (var i = 0; i < length; i++) {
-	        result += MASK[Math.round(Math.random() * maskLastIndex)];
-	      }
-	      return result;
-	    }
-	  }]);
-
-	  return FullyConnectedService;
-	}();
-
-	exports.default = FullyConnectedService;
-
-/***/ },
-/* 6 */
-/***/ function(module, exports) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-
-	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	var StarTopologyService = function () {
-	  function StarTopologyService() {
-	    var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-	    _classCallCheck(this, StarTopologyService);
-	  }
-
-	  _createClass(StarTopologyService, [{
-	    key: 'broadcast',
-	    value: function broadcast(webChannel, data) {
-	      return new Promise(function (resolve, reject) {
-	        var _iteratorNormalCompletion = true;
-	        var _didIteratorError = false;
-	        var _iteratorError = undefined;
-
-	        try {
-	          for (var _iterator = webChannel.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-	            var c = _step.value;
-
-	            var msg = undefined;
-	            // Create the string message
-	            var date = new Date().getTime();
-	            if (data.type === 'PING') {
-	              msg = JSON.stringify([c.seq++, 'PING', date]);
-	            } else {
-	              msg = JSON.stringify([c.seq++, data.type, webChannel.id, data.msg]);
-	            }
-	            // Store the message with his sequence number to know what message has caused the reception of an ACK
-	            // This is used in WebSocketProtocolService
-	            var srvMsg = JSON.parse(msg);
-	            srvMsg.shift();
-	            srvMsg.unshift(webChannel.myID);
-	            srvMsg.unshift(0);
-	            webChannel.waitingAck[c.seq - 1] = { resolve: resolve, reject: reject, time: date, data: srvMsg };
-	            // Send the message to the server
-	            c.send(msg);
-	          }
-	          // resolve();
-	        } catch (err) {
-	          _didIteratorError = true;
-	          _iteratorError = err;
-	        } finally {
-	          try {
-	            if (!_iteratorNormalCompletion && _iterator.return) {
-	              _iterator.return();
-	            }
-	          } finally {
-	            if (_didIteratorError) {
-	              throw _iteratorError;
-	            }
-	          }
-	        }
-	      });
-	    }
-	  }, {
-	    key: 'sendTo',
-	    value: function sendTo(id, webChannel, data) {
-	      return new Promise(function (resolve, reject) {
-	        var _iteratorNormalCompletion2 = true;
-	        var _didIteratorError2 = false;
-	        var _iteratorError2 = undefined;
-
-	        try {
-	          for (var _iterator2 = webChannel.channels[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-	            var c = _step2.value;
-
-	            var msg = JSON.stringify([c.seq++, data.type, id, data.msg]);
-	            c.send(msg);
-	          }
-	        } catch (err) {
-	          _didIteratorError2 = true;
-	          _iteratorError2 = err;
-	        } finally {
-	          try {
-	            if (!_iteratorNormalCompletion2 && _iterator2.return) {
-	              _iterator2.return();
-	            }
-	          } finally {
-	            if (_didIteratorError2) {
-	              throw _iteratorError2;
-	            }
-	          }
-	        }
-
-	        resolve();
-	      });
-	    }
-	  }]);
-
-	  return StarTopologyService;
-	}();
-
-	exports.default = StarTopologyService;
-
-/***/ },
-/* 7 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-
-	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-	var _constants = __webpack_require__(3);
-
-	var cs = _interopRequireWildcard(_constants);
-
-	var _ServiceProvider = __webpack_require__(4);
-
-	var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	var WEBRTC_DATA = 0;
-	var CONNECT_WITH = 1;
-	var CONNECT_WITH_SUCCEED = 2;
-
-	var WebRTCService = function () {
-	  function WebRTCService() {
-	    var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-	    _classCallCheck(this, WebRTCService);
-
-	    this.NAME = this.constructor.name;
-	    this.protocol = _ServiceProvider2.default.get(cs.EXCHANGEPROTOCOL_SERVICE);
-	    this.defaults = {
-	      signaling: 'ws://localhost:8000',
-	      webRTCOptions: {
-	        iceServers: [{
-	          urls: ['stun:23.21.150.121', 'stun:stun.l.google.com:19302']
-	        }, {
-	          urls: 'turn:numb.viagenie.ca',
-	          credential: 'webrtcdemo',
-	          username: 'louis%40mozilla.com'
-	        }]
-	      }
-	    };
-	    this.settings = Object.assign({}, this.defaults, options);
-
-	    // Declare WebRTC related global(window) constructors
-	    this.RTCPeerConnection = window.RTCPeerConnection || window.mozRTCPeerConnection || window.webkitRTCPeerConnection || window.msRTCPeerConnection;
-
-	    this.RTCIceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate || window.RTCIceCandidate || window.msRTCIceCandidate;
-
-	    this.RTCSessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription || window.webkitRTCSessionDescription || window.msRTCSessionDescription;
-	  }
-
-	  _createClass(WebRTCService, [{
-	    key: 'connect',
-	    value: function connect(newPeerID, webChannel, peerID) {
-	      webChannel.topologyService.sendTo(peerID, webChannel, this._msg(CONNECT_WITH, { key: newPeerID, intermediaryID: webChannel.myID }));
-	    }
-	  }, {
-	    key: 'open',
-	    value: function open(onchannel) {
-	      var _this = this;
-
-	      var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-
-	      var defaults = {
-	        key: this._randomKey()
-	      };
-	      var settings = Object.assign({}, this.settings, defaults, options);
-
-	      return new Promise(function (resolve, reject) {
-	        var connections = [];
-	        var socket = new window.WebSocket(settings.signaling);
-	        socket.onopen = function () {
-	          socket.send(JSON.stringify({ key: settings.key }));
-	          resolve({ url: _this.settings.signaling, key: settings.key });
-	        };
-	        socket.onmessage = function (e) {
-	          var msg = JSON.parse(e.data);
-	          if (Reflect.has(msg, 'id') && Reflect.has(msg, 'data')) {
-	            if (Reflect.has(msg.data, 'offer')) {
-	              (function () {
-	                var connection = new _this.RTCPeerConnection(settings.webRTCOptions);
-	                connections.push(connection);
-	                connection.ondatachannel = function (e) {
-	                  e.channel.onopen = function () {
-	                    onchannel(e.channel);
-	                  };
-	                };
-	                connection.onicecandidate = function (e) {
-	                  if (e.candidate !== null) {
-	                    var candidate = {
-	                      candidate: e.candidate.candidate,
-	                      sdpMLineIndex: e.candidate.sdpMLineIndex
-	                    };
-	                    socket.send(JSON.stringify({ id: msg.id, data: { candidate: candidate } }));
-	                  }
-	                };
-	                var sd = Object.assign(new _this.RTCSessionDescription(), msg.data.offer);
-	                connection.setRemoteDescription(sd, function () {
-	                  connection.createAnswer(function (answer) {
-	                    connection.setLocalDescription(answer, function () {
-	                      socket.send(JSON.stringify({
-	                        id: msg.id,
-	                        data: { answer: connection.localDescription.toJSON() } }));
-	                    }, function () {});
-	                  }, function () {});
-	                }, function () {});
-	              })();
-	            } else if (Reflect.has(msg.data, 'candidate')) {
-	              var candidate = new _this.RTCIceCandidate(msg.data.candidate);
-	              connections[msg.id].addIceCandidate(candidate);
-	            }
-	          }
-	        };
-	        socket.onerror = reject;
-	      });
-	    }
-	  }, {
-	    key: 'join',
-	    value: function join(key) {
-	      var _this2 = this;
-
-	      var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-
-	      var settings = Object.assign({}, this.settings, options);
-	      return new Promise(function (resolve, reject) {
-	        var connection = undefined;
-	        var socket = new window.WebSocket(settings.signaling);
-	        socket.onopen = function () {
-	          connection = new _this2.RTCPeerConnection(settings.webRTCOptions);
-	          connection.onicecandidate = function (e) {
-	            if (e.candidate !== null) {
-	              var candidate = {
-	                candidate: e.candidate.candidate,
-	                sdpMLineIndex: e.candidate.sdpMLineIndex
-	              };
-	              socket.send(JSON.stringify({ data: { candidate: candidate } }));
-	            }
-	          };
-	          var dc = connection.createDataChannel(key);
-	          dc.onopen = function () {
-	            resolve(dc);
-	          };
-	          connection.createOffer(function (offer) {
-	            connection.setLocalDescription(offer, function () {
-	              socket.send(JSON.stringify({ join: key, data: { offer: connection.localDescription.toJSON() } }));
-	            }, reject);
-	          }, reject);
-	        };
-	        socket.onclose = function (e) {
-	          reject(e);
-	        };
-	        socket.onmessage = function (e) {
-	          var msg = JSON.parse(e.data);
-	          if (Reflect.has(msg, 'data')) {
-	            if (Reflect.has(msg.data, 'answer')) {
-	              var sd = Object.assign(new _this2.RTCSessionDescription(), msg.data.answer);
-	              connection.setRemoteDescription(sd, function () {}, reject);
-	            } else if (Reflect.has(msg.data, 'candidate')) {
-	              var candidate = new _this2.RTCIceCandidate(msg.data.candidate);
-	              connection.addIceCandidate(candidate);
-	            } else {
-	              reject();
-	            }
-	          } else {
-	            reject();
-	          }
-	        };
-	        socket.onerror = reject;
-	      });
-	    }
-	  }, {
-	    key: '_randomKey',
-	    value: function _randomKey() {
-	      var MIN_LENGTH = 10;
-	      var DELTA_LENGTH = 10;
-	      var MASK = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-	      var result = '';
-	      var length = MIN_LENGTH + Math.round(Math.random() * DELTA_LENGTH);
-
-	      for (var i = 0; i < length; i++) {
-	        result += MASK[Math.round(Math.random() * (MASK.length - 1))];
-	      }
-	      return result;
-	    }
-	  }, {
-	    key: '_msg',
-	    value: function _msg(code, data) {
-	      var msg = { service: this.constructor.name };
-	      msg.data = {};
-	      msg.data.code = code;
-	      Object.assign(msg.data, data);
-	      return this.protocol.message(cs.SERVICE_DATA, msg);
-	    }
-	  }, {
-	    key: 'onmessage',
-	    value: function onmessage(channel, msg) {
-	      var _this3 = this;
-
-	      var webChannel = channel.webChannel;
-	      if (!Reflect.has(webChannel, 'connections')) {
-	        webChannel.connections = new Map();
-	      }
-	      switch (msg.code) {
-	        case WEBRTC_DATA:
-	          if (webChannel.myID === msg.recipientPeerID) {
-	            if (Reflect.has(msg, 'sdp')) {
-	              if (msg.sdp.type === 'offer') {
-	                (function () {
-	                  var connection = new _this3.RTCPeerConnection(_this3.settings.webRTCOptions);
-	                  webChannel.connections.set(msg.senderPeerID, connection);
-	                  connection.ondatachannel = function (e) {
-	                    e.channel.onopen = function () {
-	                      e.channel.peerID = msg.senderPeerID;
-	                      e.channel.webChannel = webChannel;
-	                      e.channel.onmessage = _this3.protocol.onmessage;
-	                      webChannel.channels.add(e.channel);
-	                      e.channel.onclose = function () {
-	                        webChannel.onLeaving(e.channel.peerID);
-	                        webChannel.channels.delete(e.channel);
-	                      };
-	                    };
-	                  };
-	                  connection.onicecandidate = function (e) {
-	                    if (e.candidate !== null) {
-	                      var candidate = {
-	                        candidate: e.candidate.candidate,
-	                        sdpMLineIndex: e.candidate.sdpMLineIndex
-	                      };
-	                      channel.send(_this3._msg(WEBRTC_DATA, {
-	                        senderPeerID: webChannel.myID,
-	                        recipientPeerID: msg.senderPeerID,
-	                        candidate: candidate
-	                      }));
-	                    }
-	                  };
-	                  var sd = Object.assign(new _this3.RTCSessionDescription(), msg.sdp);
-	                  connection.setRemoteDescription(sd, function () {
-	                    connection.createAnswer(function (answer) {
-	                      connection.setLocalDescription(answer, function () {
-	                        channel.send(_this3._msg(WEBRTC_DATA, {
-	                          senderPeerID: webChannel.myID,
-	                          recipientPeerID: msg.senderPeerID,
-	                          sdp: connection.localDescription.toJSON()
-	                        }));
-	                      }, function () {});
-	                    }, function () {});
-	                  }, function () {});
-	                })();
-	              } else if (msg.sdp.type === 'answer') {
-	                var sd = Object.assign(new this.RTCSessionDescription(), msg.sdp);
-	                webChannel.connections.get(msg.senderPeerID).setRemoteDescription(sd, function () {}, function () {});
-	              }
-	            } else if (Reflect.has(msg, 'candidate')) {
-	              webChannel.connections.get(msg.senderPeerID).addIceCandidate(new this.RTCIceCandidate(msg.candidate));
-	            }
-	          } else {
-	            var data = this._msg(WEBRTC_DATA, msg);
-	            if (webChannel.aboutToJoin.has(msg.recipientPeerID)) {
-	              webChannel.aboutToJoin.get(msg.recipientPeerID).send(data);
-	            } else {
-	              webChannel.topologyService.sendTo(msg.recipientPeerID, webChannel, data);
-	            }
-	          }
-	          break;
-	        case CONNECT_WITH:
-	          var connection = new this.RTCPeerConnection(this.settings.webRTCOptions);
-	          connection.onicecandidate = function (e) {
-	            if (e.candidate !== null) {
-	              var candidate = {
-	                candidate: e.candidate.candidate,
-	                sdpMLineIndex: e.candidate.sdpMLineIndex
-	              };
-	              webChannel.topologyService.sendTo(msg.intermediaryID, webChannel, _this3._msg(WEBRTC_DATA, {
-	                senderPeerID: webChannel.myID,
-	                recipientPeerID: msg.key,
-	                candidate: candidate
-	              }));
-	            }
-	          };
-	          var dc = connection.createDataChannel(msg.key);
-	          dc.onopen = function () {
-	            if (!Reflect.has(webChannel, 'aboutToJoin')) {
-	              webChannel.aboutToJoin = new Map();
-	            }
-	            webChannel.aboutToJoin.set(dc.label, dc);
-	            dc.onmessage = _this3.protocol.onmessage;
-	            dc.peerID = dc.label;
-	            dc.webChannel = webChannel;
-	            webChannel.topologyService.sendTo(msg.intermediaryID, webChannel, _this3._msg(CONNECT_WITH_SUCCEED, {
-	              senderPeerID: webChannel.myID,
-	              recipientPeerID: dc.label
-	            }));
-	          };
-	          connection.createOffer(function (offer) {
-	            connection.setLocalDescription(offer, function () {
-	              webChannel.topologyService.sendTo(msg.intermediaryID, webChannel, _this3._msg(WEBRTC_DATA, {
-	                senderPeerID: webChannel.myID,
-	                recipientPeerID: msg.key,
-	                sdp: connection.localDescription.toJSON()
-	              }));
-	              webChannel.connections.set(msg.key, connection);
-	            }, function () {});
-	          }, function () {});
-	          break;
-	        case CONNECT_WITH_SUCCEED:
-	          webChannel.connectionSucceed(msg.senderPeerID, msg.recipientPeerID);
-	          break;
-	      }
-	    }
-	  }]);
-
-	  return WebRTCService;
-	}();
-
-	exports.default = WebRTCService;
-
-/***/ },
-/* 8 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-
-	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-	var _constants = __webpack_require__(3);
-
-	var cs = _interopRequireWildcard(_constants);
-
-	var _ServiceProvider = __webpack_require__(4);
-
-	var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	var WebSocketService = function () {
-	  function WebSocketService() {
-	    var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-	    _classCallCheck(this, WebSocketService);
-
-	    this.NAME = this.constructor.name;
-	    this.protocol = _ServiceProvider2.default.get(cs.EXCHANGEPROTOCOL_SERVICE);
-	    this.defaults = {
-	      signaling: 'ws://localhost:9000',
-	      REQUEST_TIMEOUT: 5000
-	    };
-	    this.settings = Object.assign({}, this.defaults, options);
-	  }
-
-	  _createClass(WebSocketService, [{
-	    key: 'join',
-	    value: function join(key) {
-	      var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
-
-	      var settings = Object.assign({}, this.settings, options);
-	      return new Promise(function (resolve, reject) {
-	        var connection = undefined;
-	        var socket = new window.WebSocket(settings.signaling);
-	        setInterval(function () {
-	          if (socket.webChannel && socket.webChannel.waitingAck) {
-	            var waitingAck = socket.webChannel.waitingAck;
-	            for (var id in waitingAck) {
-	              var req = waitingAck[id];
-	              var now = new Date().getTime();
-	              if (now - req.time > settings.REQUEST_TIMEOUT) {
-	                delete socket.webChannel.waitingAck[id];
-	                req.reject({ type: 'TIMEOUT', message: 'waited ' + now - req.time + 'ms' });
-	              }
-	            }
-	          }
-	        }, 5000);
-	        socket.seq = 1;
-	        socket.facade = options.facade || null;
-	        socket.onopen = function () {
-	          if (key && key !== '') {
-	            socket.send(JSON.stringify([socket.seq++, 'JOIN', key]));
-	          } else {
-	            socket.send(JSON.stringify([socket.seq++, 'JOIN']));
-	          }
-	          resolve(socket);
-	        };
-	        socket.onerror = reject;
-	      });
-	    }
-	  }]);
-
-	  return WebSocketService;
-	}();
-
-	exports.default = WebSocketService;
-
-/***/ },
-/* 9 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-
-	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-	var _constants = __webpack_require__(3);
-
-	var cs = _interopRequireWildcard(_constants);
-
-	var _ServiceProvider = __webpack_require__(4);
-
-	var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	var ExchangeProtocolService = function () {
-	  function ExchangeProtocolService() {
-	    var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-	    _classCallCheck(this, ExchangeProtocolService);
-	  }
-
-	  _createClass(ExchangeProtocolService, [{
-	    key: 'onmessage',
-	    value: function onmessage(e) {
-	      var msg = JSON.parse(e.data);
-	      var channel = e.currentTarget;
-	      var webChannel = channel.webChannel;
-
-	      switch (msg.code) {
-	        case cs.USER_DATA:
-	          webChannel.onmessage(msg.id, msg.data);
-	          break;
-	        case cs.GET_HISTORY:
-	          webChannel.onPeerMessage(msg.id, msg.code);
-	          break;
-	        case cs.SERVICE_DATA:
-	          var service = _ServiceProvider2.default.get(msg.service);
-	          service.onmessage(channel, msg.data);
-	          break;
-	        case cs.YOUR_NEW_ID:
-	          // TODO: change names
-	          webChannel.myID = msg.newID;
-	          channel.peerID = msg.myID;
-	          break;
-	        case cs.JOIN_START:
-	          // 2.1) Send to the new client the webChannel topology
-	          webChannel.topology = msg.topology;
-	          webChannel.topologyService = _ServiceProvider2.default.get(msg.topology);
-	          break;
-	        case cs.JOIN_FINISH:
-	          webChannel.topologyService.addFinish(webChannel, msg.id);
-	          if (msg.id != webChannel.myID) {
-	            // A new user has just registered
-	            webChannel.onJoining(msg.id);
-	          } else {
-	            (function () {
-	              // We're fully synced, trigger onJoining for all existing users
-	              var waitForOnJoining = function waitForOnJoining() {
-	                if (typeof webChannel.onJoining !== "function") {
-	                  setTimeout(waitForOnJoining, 500);
-	                  return;
-	                }
-	                var _iteratorNormalCompletion = true;
-	                var _didIteratorError = false;
-	                var _iteratorError = undefined;
-
-	                try {
-	                  for (var _iterator = webChannel.channels[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-	                    var c = _step.value;
-
-	                    webChannel.onJoining(c.peerID);
-	                  }
-	                } catch (err) {
-	                  _didIteratorError = true;
-	                  _iteratorError = err;
-	                } finally {
-	                  try {
-	                    if (!_iteratorNormalCompletion && _iterator.return) {
-	                      _iterator.return();
-	                    }
-	                  } finally {
-	                    if (_didIteratorError) {
-	                      throw _iteratorError;
-	                    }
-	                  }
-	                }
-	              };
-	              waitForOnJoining();
-	            })();
-	          }
-	          break;
-	      }
-	    }
-	  }, {
-	    key: 'message',
-	    value: function message(code, data) {
-	      var msg = { code: code };
-	      switch (code) {
-	        case cs.USER_DATA:
-	          msg.id = data.id;
-	          msg.data = data.data;
-	          break;
-	        case cs.GET_HISTORY:
-	          msg.id = data.id;
-	          break;
-	        case cs.SERVICE_DATA:
-	          msg.service = data.service;
-	          msg.data = Object.assign({}, data.data);
-	          break;
-	        case cs.YOUR_NEW_ID:
-	          msg.newID = data.newID;
-	          msg.myID = data.myID;
-	          break;
-	        case cs.JOIN_START:
-	          msg.topology = data;
-	          break;
-	        case cs.JOIN_FINISH:
-	          msg.id = data;
-	          break;
-	      }
-	      return JSON.stringify(msg);
-	    }
-	  }]);
-
-	  return ExchangeProtocolService;
-	}();
-
-	exports.default = ExchangeProtocolService;
-
-/***/ },
-/* 10 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-
-	var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-	var _constants = __webpack_require__(3);
-
-	var cs = _interopRequireWildcard(_constants);
-
-	var _ServiceProvider = __webpack_require__(4);
-
-	var _ServiceProvider2 = _interopRequireDefault(_ServiceProvider);
-
-	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-	function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
-
-	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-	var WebSocketProtocolService = function () {
-	  function WebSocketProtocolService() {
-	    var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
-
-	    _classCallCheck(this, WebSocketProtocolService);
-	  }
-
-	  _createClass(WebSocketProtocolService, [{
-	    key: 'onmessage',
-	    value: function onmessage(e) {
-	      var msg = JSON.parse(e.data);
-	      var socket = e.currentTarget;
-	      var webChannel = socket.webChannel;
-	      var topology = cs.STAR_SERVICE;
-	      var topologyService = _ServiceProvider2.default.get(topology);
-	      var history_keeper = webChannel.hc;
-
-	      if (msg[0] !== 0 && msg[1] !== 'ACK') {
-	        return;
-	      }
-
-	      if (msg[2] === 'IDENT' && msg[1] === '') {
-	        socket.uid = msg[3];
-	        webChannel.myID = msg[3];
-	        webChannel.peers = [];
-	        webChannel.waitingAck = [];
-	        webChannel.topology = topology;
-	        return;
-	      }
-	      if (msg[1] === 'PING') {
-	        msg[1] = 'PONG';
-	        socket.send(JSON.stringify(msg));
-	        return;
-	      }
-	      if (msg[1] === 'ACK') {
-	        var seq = msg[0];
-	        if (webChannel.waitingAck[seq]) {
-	          var waitingAck = webChannel.waitingAck[seq];
-	          waitingAck.resolve();
-	          var newMsg = waitingAck.data;
-	          if (newMsg[2] === 'PING') {
-	            // PING message : set the lag
-	            var lag = new Date().getTime() - newMsg[3];
-	            webChannel.getLag = function () {
-	              return lag;
-	            };
-	          }
-	          delete webChannel.waitingAck[seq];
-	        }
-	        return;
-	      }
-	      // We have received a new direct message from another user
-	      if (msg[2] === 'MSG' && msg[3] === socket.uid) {
-	        // If it comes from the history keeper, send it to the user
-	        if (msg[1] === history_keeper) {
-	          if (msg[4] === 0) {
-	            webChannel.onmessage(msg[1], msg[4]);
-	            return;
-	          }
-	          var msgHistory = JSON.parse(msg[4]);
-	          webChannel.onmessage(msgHistory[1], msgHistory[4]);
-	        }
-	        return;
-	      }
-	      if (msg[2] === 'JOIN' && (webChannel.id == null || webChannel.id === msg[3])) {
-	        if (!webChannel.id) {
-	          // New unnamed channel : get its name from the first "JOIN" message
-	          if (!window.location.hash) {
-	            var chanName = window.location.hash = msg[3];
-	          }
-	          webChannel.id = msg[3];
-	        }
-
-	        if (msg[1] === socket.uid) {
-	          // If the user catches himself registering, he is synchronized with the server
-	          webChannel.onopen();
-	        } else {
-	          // Trigger onJoining() when another user is joining the channel
-	          // Register the user in the list of peers in the channel
-	          if (webChannel.peers.length === 0 && msg[1].length === 16) {
-	            // We've just catched the history keeper (16 characters length name)
-	            history_keeper = msg[1];
-	            webChannel.hc = history_keeper;
-	          }
-	          var linkQuality = msg[1] === history_keeper ? 1000 : 0;
-	          var sendToPeer = function sendToPeer(data) {
-	            topologyService.sendTo(msg[1], webChannel, { type: 'MSG', msg: data });
-	          };
-	          var peer = { id: msg[1], connector: socket, linkQuality: linkQuality, send: sendToPeer };
-	          if (webChannel.peers.indexOf(peer) === -1) {
-	            webChannel.peers.push(peer);
-	          }
-
-	          if (msg[1] !== history_keeper) {
-	            // Trigger onJoining with that peer once the function is loaded (i.e. once the channel is synced)
-	            var waitForOnJoining = function waitForOnJoining() {
-	              if (typeof webChannel.onJoining !== "function") {
-	                setTimeout(waitForOnJoining, 500);
-	                return;
-	              }
-	              webChannel.onJoining(msg[1]);
-	            };
-	            waitForOnJoining();
-	          }
-	        }
-	        return;
-	      }
-	      // We have received a new message in that channel from another peer
-	      if (msg[2] === 'MSG' && msg[3] === webChannel.id) {
-	        // Find the peer who sent the message and display it
-	        //TODO Use Peer instead of peer.id (msg[1]) :
-	        if (typeof webChannel.onmessage === "function") webChannel.onmessage(msg[1], msg[4]);
-	        return;
-	      }
-	      // Someone else has left the channel, remove him from the list of peers
-	      if (msg[2] === 'LEAVE' && msg[3] === webChannel.id) {
-	        //TODO Use Peer instead of peer.id (msg[1]) :
-	        if (typeof webChannel.onLeaving === "function") webChannel.onLeaving(msg[1], webChannel);
-	        return;
-	      }
-	    }
-	  }, {
-	    key: 'message',
-	    value: function message(code, data) {
-	      var type = undefined;
-	      switch (code) {
-	        case cs.USER_DATA:
-	          type = 'MSG';
-	          break;
-	        case cs.JOIN_START:
-	          type = 'JOIN';
-	          break;
-	        case cs.PING:
-	          type = 'PING';
-	          break;
-	      }
-	      return { type: type, msg: data.data };
-	    }
-	  }]);
-
-	  return WebSocketProtocolService;
-	}();
-
-	exports.default = WebSocketProtocolService;
-
-/***/ }
-/******/ ])
-});
-;
\ No newline at end of file

From 2a3ff256b91d0104ec2e3280873faf3ccd9eaf4d Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 6 Jun 2016 12:29:45 +0200
Subject: [PATCH 253/257] remove libraries which are now in bower

---
 www/common/crypto.js          |  53 -------
 www/common/es6-promise.min.js |   9 --
 www/common/hyperjson.js       |  98 ------------
 www/common/netflux-client.js  | 291 ----------------------------------
 4 files changed, 451 deletions(-)
 delete mode 100644 www/common/crypto.js
 delete mode 100644 www/common/es6-promise.min.js
 delete mode 100644 www/common/hyperjson.js
 delete mode 100644 www/common/netflux-client.js

diff --git a/www/common/crypto.js b/www/common/crypto.js
deleted file mode 100644
index dd6f826bd..000000000
--- a/www/common/crypto.js
+++ /dev/null
@@ -1,53 +0,0 @@
-define([
-    '/bower_components/tweetnacl/nacl-fast.min.js',
-], function () {
-    var Nacl = window.nacl;
-    var module = { exports: {} };
-
-    var encryptStr = function (str, key) {
-        var array = Nacl.util.decodeUTF8(str);
-        var nonce = Nacl.randomBytes(24);
-        var packed = Nacl.secretbox(array, nonce, key);
-        if (!packed) { throw new Error(); }
-        return Nacl.util.encodeBase64(nonce) + "|" + Nacl.util.encodeBase64(packed);
-    };
-
-    var decryptStr = function (str, key) {
-        var arr = str.split('|');
-        if (arr.length !== 2) { throw new Error(); }
-        var nonce = Nacl.util.decodeBase64(arr[0]);
-        var packed = Nacl.util.decodeBase64(arr[1]);
-        var unpacked = Nacl.secretbox.open(packed, nonce, key);
-        if (!unpacked) { throw new Error(); }
-        return Nacl.util.encodeUTF8(unpacked);
-    };
-
-    var encrypt = module.exports.encrypt = function (msg, key) {
-        return encryptStr(msg, key);
-    };
-
-    var decrypt = module.exports.decrypt = function (msg, key) {
-        return decryptStr(msg, key);
-    };
-
-    var parseKey = module.exports.parseKey = function (str) {
-        var array = Nacl.util.decodeBase64(str);
-        var hash = Nacl.hash(array);
-        var lk = hash.subarray(32);
-        return {
-            lookupKey: lk,
-            cryptKey: hash.subarray(0,32),
-            channel: Nacl.util.encodeBase64(lk).substring(0,10)
-        };
-    };
-
-    var rand64 = module.exports.rand64 = function (bytes) {
-        return Nacl.util.encodeBase64(Nacl.randomBytes(bytes));
-    };
-
-    var genKey = module.exports.genKey = function () {
-        return rand64(18);
-    };
-
-    return module.exports;
-});
diff --git a/www/common/es6-promise.min.js b/www/common/es6-promise.min.js
deleted file mode 100644
index f26f3c8ce..000000000
--- a/www/common/es6-promise.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * @overview es6-promise - a tiny implementation of Promises/A+.
- * @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
- * @license   Licensed under MIT license
- *            See https://raw.githubusercontent.com/jakearchibald/es6-promise/master/LICENSE
- * @version   3.2.1
- */
-
-(function(){"use strict";function t(t){return"function"==typeof t||"object"==typeof t&&null!==t}function e(t){return"function"==typeof t}function n(t){G=t}function r(t){Q=t}function o(){return function(){process.nextTick(a)}}function i(){return function(){B(a)}}function s(){var t=0,e=new X(a),n=document.createTextNode("");return e.observe(n,{characterData:!0}),function(){n.data=t=++t%2}}function u(){var t=new MessageChannel;return t.port1.onmessage=a,function(){t.port2.postMessage(0)}}function c(){return function(){setTimeout(a,1)}}function a(){for(var t=0;J>t;t+=2){var e=tt[t],n=tt[t+1];e(n),tt[t]=void 0,tt[t+1]=void 0}J=0}function f(){try{var t=require,e=t("vertx");return B=e.runOnLoop||e.runOnContext,i()}catch(n){return c()}}function l(t,e){var n=this,r=new this.constructor(p);void 0===r[rt]&&k(r);var o=n._state;if(o){var i=arguments[o-1];Q(function(){x(o,r,i,n._result)})}else E(n,r,t,e);return r}function h(t){var e=this;if(t&&"object"==typeof t&&t.constructor===e)return t;var n=new e(p);return g(n,t),n}function p(){}function _(){return new TypeError("You cannot resolve a promise with itself")}function d(){return new TypeError("A promises callback cannot return that same promise.")}function v(t){try{return t.then}catch(e){return ut.error=e,ut}}function y(t,e,n,r){try{t.call(e,n,r)}catch(o){return o}}function m(t,e,n){Q(function(t){var r=!1,o=y(n,e,function(n){r||(r=!0,e!==n?g(t,n):S(t,n))},function(e){r||(r=!0,j(t,e))},"Settle: "+(t._label||" unknown promise"));!r&&o&&(r=!0,j(t,o))},t)}function b(t,e){e._state===it?S(t,e._result):e._state===st?j(t,e._result):E(e,void 0,function(e){g(t,e)},function(e){j(t,e)})}function w(t,n,r){n.constructor===t.constructor&&r===et&&constructor.resolve===nt?b(t,n):r===ut?j(t,ut.error):void 0===r?S(t,n):e(r)?m(t,n,r):S(t,n)}function g(e,n){e===n?j(e,_()):t(n)?w(e,n,v(n)):S(e,n)}function A(t){t._onerror&&t._onerror(t._result),T(t)}function S(t,e){t._state===ot&&(t._result=e,t._state=it,0!==t._subscribers.length&&Q(T,t))}function j(t,e){t._state===ot&&(t._state=st,t._result=e,Q(A,t))}function E(t,e,n,r){var o=t._subscribers,i=o.length;t._onerror=null,o[i]=e,o[i+it]=n,o[i+st]=r,0===i&&t._state&&Q(T,t)}function T(t){var e=t._subscribers,n=t._state;if(0!==e.length){for(var r,o,i=t._result,s=0;si;i++)e.resolve(t[i]).then(n,r)}:function(t,e){e(new TypeError("You must pass an array to race."))})}function F(t){var e=this,n=new e(p);return j(n,t),n}function D(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}function K(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}function L(t){this[rt]=O(),this._result=this._state=void 0,this._subscribers=[],p!==t&&("function"!=typeof t&&D(),this instanceof L?C(this,t):K())}function N(t,e){this._instanceConstructor=t,this.promise=new t(p),this.promise[rt]||k(this.promise),Array.isArray(e)?(this._input=e,this.length=e.length,this._remaining=e.length,this._result=new Array(this.length),0===this.length?S(this.promise,this._result):(this.length=this.length||0,this._enumerate(),0===this._remaining&&S(this.promise,this._result))):j(this.promise,U())}function U(){return new Error("Array Methods must be provided an Array")}function W(){var t;if("undefined"!=typeof global)t=global;else if("undefined"!=typeof self)t=self;else try{t=Function("return this")()}catch(e){throw new Error("polyfill failed because global object is unavailable in this environment")}var n=t.Promise;(!n||"[object Promise]"!==Object.prototype.toString.call(n.resolve())||n.cast)&&(t.Promise=pt)}var z;z=Array.isArray?Array.isArray:function(t){return"[object Array]"===Object.prototype.toString.call(t)};var B,G,H,I=z,J=0,Q=function(t,e){tt[J]=t,tt[J+1]=e,J+=2,2===J&&(G?G(a):H())},R="undefined"!=typeof window?window:void 0,V=R||{},X=V.MutationObserver||V.WebKitMutationObserver,Z="undefined"==typeof self&&"undefined"!=typeof process&&"[object process]"==={}.toString.call(process),$="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof importScripts&&"undefined"!=typeof MessageChannel,tt=new Array(1e3);H=Z?o():X?s():$?u():void 0===R&&"function"==typeof require?f():c();var et=l,nt=h,rt=Math.random().toString(36).substring(16),ot=void 0,it=1,st=2,ut=new M,ct=new M,at=0,ft=Y,lt=q,ht=F,pt=L;L.all=ft,L.race=lt,L.resolve=nt,L.reject=ht,L._setScheduler=n,L._setAsap=r,L._asap=Q,L.prototype={constructor:L,then:et,"catch":function(t){return this.then(null,t)}};var _t=N;N.prototype._enumerate=function(){for(var t=this.length,e=this._input,n=0;this._state===ot&&t>n;n++)this._eachEntry(e[n],n)},N.prototype._eachEntry=function(t,e){var n=this._instanceConstructor,r=n.resolve;if(r===nt){var o=v(t);if(o===et&&t._state!==ot)this._settledAt(t._state,e,t._result);else if("function"!=typeof o)this._remaining--,this._result[e]=t;else if(n===pt){var i=new n(p);w(i,t,o),this._willSettleAt(i,e)}else this._willSettleAt(new n(function(e){e(t)}),e)}else this._willSettleAt(r(t),e)},N.prototype._settledAt=function(t,e,n){var r=this.promise;r._state===ot&&(this._remaining--,t===st?j(r,n):this._result[e]=n),0===this._remaining&&S(r,this._result)},N.prototype._willSettleAt=function(t,e){var n=this;E(t,void 0,function(t){n._settledAt(it,e,t)},function(t){n._settledAt(st,e,t)})};var dt=W,vt={Promise:pt,polyfill:dt};"function"==typeof define&&define.amd?define(function(){return vt}):"undefined"!=typeof module&&module.exports?module.exports=vt:"undefined"!=typeof this&&(this.ES6Promise=vt),dt()}).call(this);
\ No newline at end of file
diff --git a/www/common/hyperjson.js b/www/common/hyperjson.js
deleted file mode 100644
index b9dc87b9b..000000000
--- a/www/common/hyperjson.js
+++ /dev/null
@@ -1,98 +0,0 @@
-define([], function () {
-    // this makes recursing a lot simpler
-    var isArray = function (A) {
-        return Object.prototype.toString.call(A)==='[object Array]';
-    };
-
-    var callOnHyperJSON = function (hj, cb) {
-        var children;
-
-        if (hj && hj[2]) {
-            children = hj[2].map(function (child) {
-                if (isArray(child)) {
-                    // if the child is an array, recurse
-                    return callOnHyperJSON(child, cb);
-                } else if (typeof (child) === 'string') {
-                    return child;
-                } else {
-                    // the above branches should cover all methods
-                    // if we hit this, there is a problem
-                    throw new Error();
-                }
-            });
-        } else {
-            children = [];
-        }
-        // this should return the top level element of your new DOM
-        return cb(hj[0], hj[1], children);
-    };
-
-    var isTruthy = function (x) {
-        return x;
-    };
-
-    var DOM2HyperJSON = function(el, predicate, filter){
-        if(!el.tagName && el.nodeType === Node.TEXT_NODE){
-            return el.textContent;
-        }
-        if(!el.attributes){
-          return;
-        }
-        if (predicate) {
-            if (!predicate(el)) {
-                // shortcircuit
-                return;
-            }
-        }
-
-        var attributes = {};
-
-        var i = 0;
-        for(;i < el.attributes.length; i++){
-            var attr = el.attributes[i];
-            if(attr.name && attr.value){
-                attributes[attr.name] = attr.value;
-            }
-        }
-
-        // this should never be longer than three elements
-        var result = [];
-
-        // get the element type, id, and classes of the element
-        // and push them to the result array
-        var sel = el.tagName;
-
-        if(attributes.id){
-            // we don't have to do much to validate IDs because the browser
-            // will only permit one id to exist
-            // unless we come across a strange browser in the wild
-          sel = sel +'#'+ attributes.id;
-          delete attributes.id;
-        }
-        result.push(sel);
-
-        // second element of the array is the element attributes
-        result.push(attributes);
-
-        // third element of the array is an array of child nodes
-        var children = [];
-
-        // js hint complains if we use 'var' here
-        i = 0;
-        for(; i < el.childNodes.length; i++){
-            children.push(DOM2HyperJSON(el.childNodes[i], predicate, filter));
-        }
-        result.push(children.filter(isTruthy));
-
-        if (filter) {
-            return filter(result);
-        } else {
-            return result;
-        }
-    };
-
-    return {
-        fromDOM: DOM2HyperJSON,
-        callOn: callOnHyperJSON
-    };
-});
diff --git a/www/common/netflux-client.js b/www/common/netflux-client.js
deleted file mode 100644
index b9165bf37..000000000
--- a/www/common/netflux-client.js
+++ /dev/null
@@ -1,291 +0,0 @@
-/*global: WebSocket */
-define(function () {
-    'use strict';
-
-    var MAX_LAG_BEFORE_PING = 15000;
-    var MAX_LAG_BEFORE_DISCONNECT = 30000;
-    var PING_CYCLE = 5000;
-    var REQUEST_TIMEOUT = 30000;
-
-    var now = function now() {
-        return new Date().getTime();
-    };
-
-    var networkSendTo = function networkSendTo(ctx, peerId, content) {
-        var seq = ctx.seq++;
-        ctx.ws.send(JSON.stringify([seq, 'MSG', peerId, content]));
-        return new Promise(function (res, rej) {
-            ctx.requests[seq] = { reject: rej, resolve: res, time: now() };
-        });
-    };
-
-    var channelBcast = function channelBcast(ctx, chanId, content) {
-        var chan = ctx.channels[chanId];
-        if (!chan) {
-            throw new Error("no such channel " + chanId);
-        }
-        var seq = ctx.seq++;
-        ctx.ws.send(JSON.stringify([seq, 'MSG', chanId, content]));
-        return new Promise(function (res, rej) {
-            ctx.requests[seq] = { reject: rej, resolve: res, time: now() };
-        });
-    };
-
-    var channelLeave = function channelLeave(ctx, chanId, reason) {
-        var chan = ctx.channels[chanId];
-        if (!chan) {
-            throw new Error("no such channel " + chanId);
-        }
-        delete ctx.channels[chanId];
-        ctx.ws.send(JSON.stringify([ctx.seq++, 'LEAVE', chanId, reason]));
-    };
-
-    var makeEventHandlers = function makeEventHandlers(ctx, mappings) {
-        return function (name, handler) {
-            var handlers = mappings[name];
-            if (!handlers) {
-                throw new Error("no such event " + name);
-            }
-            handlers.push(handler);
-        };
-    };
-
-    var mkChannel = function mkChannel(ctx, id) {
-        var internal = {
-            onMessage: [],
-            onJoin: [],
-            onLeave: [],
-            members: [],
-            jSeq: ctx.seq++
-        };
-        var chan = {
-            _: internal,
-            time: now(),
-            id: id,
-            members: internal.members,
-            bcast: function bcast(msg) {
-                return channelBcast(ctx, chan.id, msg);
-            },
-            leave: function leave(reason) {
-                return channelLeave(ctx, chan.id, reason);
-            },
-            on: makeEventHandlers(ctx, { message: internal.onMessage, join: internal.onJoin, leave: internal.onLeave })
-        };
-        ctx.requests[internal.jSeq] = chan;
-        ctx.ws.send(JSON.stringify([internal.jSeq, 'JOIN', id]));
-
-        return new Promise(function (res, rej) {
-            chan._.resolve = res;
-            chan._.reject = rej;
-        });
-    };
-
-    var mkNetwork = function mkNetwork(ctx) {
-        var network = {
-            webChannels: ctx.channels,
-            getLag: function getLag() {
-                return ctx.lag;
-            },
-            sendto: function sendto(peerId, content) {
-                return networkSendTo(ctx, peerId, content);
-            },
-            join: function join(chanId) {
-                return mkChannel(ctx, chanId);
-            },
-            on: makeEventHandlers(ctx, { message: ctx.onMessage, disconnect: ctx.onDisconnect })
-        };
-        network.__defineGetter__("webChannels", function () {
-            return Object.keys(ctx.channels).map(function (k) {
-                return ctx.channels[k];
-            });
-        });
-        return network;
-    };
-
-    var onMessage = function onMessage(ctx, evt) {
-        var msg = void 0;
-        try {
-            msg = JSON.parse(evt.data);
-        } catch (e) {
-            console.log(e.stack);return;
-        }
-        if (msg[0] !== 0) {
-            var req = ctx.requests[msg[0]];
-            if (!req) {
-                console.log("error: " + JSON.stringify(msg));
-                return;
-            }
-            delete ctx.requests[msg[0]];
-            if (msg[1] === 'ACK') {
-                if (req.ping) {
-                    // ACK of a PING
-                    ctx.lag = now() - Number(req.ping);
-                    return;
-                }
-                req.resolve();
-            } else if (msg[1] === 'JACK') {
-                if (req._) {
-                    // Channel join request...
-                    if (!msg[2]) {
-                        throw new Error("wrong type of ACK for channel join");
-                    }
-                    req.id = msg[2];
-                    ctx.channels[req.id] = req;
-                    return;
-                }
-                req.resolve();
-            } else if (msg[1] === 'ERROR') {
-                req.reject({ type: msg[2], message: msg[3] });
-            } else {
-                req.reject({ type: 'UNKNOWN', message: JSON.stringify(msg) });
-            }
-            return;
-        }
-        
-        if (msg[2] === 'IDENT') {
-            ctx.uid = msg[3];
-
-            setInterval(function () {
-                if (now() - ctx.timeOfLastMessage < MAX_LAG_BEFORE_PING) {
-                    return;
-                }
-                var seq = ctx.seq++;
-                var currentDate = now();
-                ctx.requests[seq] = { time: now(), ping: currentDate };
-                ctx.ws.send(JSON.stringify([seq, 'PING', currentDate]));
-                if (now() - ctx.timeOfLastMessage > MAX_LAG_BEFORE_DISCONNECT) {
-                    ctx.ws.close();
-                }
-            }, PING_CYCLE);
-
-            return;
-        } else if (!ctx.uid) {
-            // extranious message, waiting for an ident.
-            return;
-        }
-        if (msg[2] === 'PING') {
-            msg[2] = 'PONG';
-            ctx.ws.send(JSON.stringify(msg));
-            return;
-        }
-
-        if (msg[2] === 'MSG') {
-            var handlers = void 0;
-            if (msg[3] === ctx.uid) {
-                handlers = ctx.onMessage;
-            } else {
-                var chan = ctx.channels[msg[3]];
-                if (!chan) {
-                    console.log("message to non-existant chan " + JSON.stringify(msg));
-                    return;
-                }
-                handlers = chan._.onMessage;
-            }
-            handlers.forEach(function (h) {
-                try {
-                    h(msg[4], msg[1]);
-                } catch (e) {
-                    console.error(e);
-                }
-            });
-        }
-
-        if (msg[2] === 'LEAVE') {
-            var _chan = ctx.channels[msg[3]];
-            if (!_chan) {
-                console.log("leaving non-existant chan " + JSON.stringify(msg));
-                return;
-            }
-            _chan._.onLeave.forEach(function (h) {
-                try {
-                    h(msg[1], msg[4]);
-                } catch (e) {
-                    console.log(e.stack);
-                }
-            });
-        }
-
-        if (msg[2] === 'JOIN') {
-            var _chan2 = ctx.channels[msg[3]];
-            if (!_chan2) {
-                console.log("ERROR: join to non-existant chan " + JSON.stringify(msg));
-                return;
-            }
-            // have we yet fully joined the chan?
-            var synced = _chan2._.members.indexOf(ctx.uid) !== -1;
-            _chan2._.members.push(msg[1]);
-            if (!synced && msg[1] === ctx.uid) {
-                // sync the channel join event
-                _chan2.myID = ctx.uid;
-                _chan2._.resolve(_chan2);
-            }
-            if (synced) {
-                _chan2._.onJoin.forEach(function (h) {
-                    try {
-                        h(msg[1]);
-                    } catch (e) {
-                        console.log(e.stack);
-                    }
-                });
-            }
-        }
-    };
-
-    var connect = function connect(websocketURL) {
-        var ctx = {
-            ws: new WebSocket(websocketURL),
-            seq: 1,
-            lag: 0,
-            uid: null,
-            network: null,
-            channels: {},
-            onMessage: [],
-            onDisconnect: [],
-            requests: {}
-        };
-        setInterval(function () {
-            for (var id in ctx.requests) {
-                var req = ctx.requests[id];
-                if (now() - req.time > REQUEST_TIMEOUT) {
-                    delete ctx.requests[id];
-                    if (typeof req.reject === "function") {
-                        req.reject({ type: 'TIMEOUT', message: 'waited ' + (now() - req.time) + 'ms' });
-                    }
-                }
-            }
-        }, 5000);
-        ctx.network = mkNetwork(ctx);
-        ctx.ws.onmessage = function (msg) {
-            return onMessage(ctx, msg);
-        };
-        ctx.ws.onclose = function (evt) {
-            ctx.onDisconnect.forEach(function (h) {
-                try {
-                    h(evt.reason);
-                } catch (e) {
-                    console.log(e.stack);
-                }
-            });
-        };
-        return new Promise(function (resolve, reject) {
-            ctx.ws.onopen = function () {
-                var count = 0;
-                var interval = 100;
-                var checkIdent = function() {
-                  if(ctx.uid !== null) {
-                    return resolve(ctx.network);
-                  }
-                  else {
-                    if(count * interval > REQUEST_TIMEOUT) {
-                      return reject({ type: 'TIMEOUT', message: 'waited ' + (count * interval) + 'ms' });
-                    }
-                    setTimeout(checkIdent, 100);
-                  }
-                }
-                checkIdent();
-            };
-        });
-    };
-
-    return { connect: connect };
-});

From 1746a4e732ddab28cfee253d0010013cf1f94647 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 6 Jun 2016 12:35:06 +0200
Subject: [PATCH 254/257] use crypto from bower

---
 www/common/cryptpad-common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index c69b8e407..c09a0ab9d 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1,5 +1,5 @@
 define([
-    '/common/crypto.js',
+    '/bower_components/chainpad-crypto/crypto.js'
 ], function (Crypto) {
     var common = {};
 

From aca75383cc4858a30484c9024fadddd4508f4803 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 6 Jun 2016 12:37:50 +0200
Subject: [PATCH 255/257] depend on the listmap api

---
 bower.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index d75845992..873412848 100644
--- a/bower.json
+++ b/bower.json
@@ -36,6 +36,7 @@
     "chainpad-json-validator": "^0.1.1",
     "chainpad-crypto": "^0.1.1",
     "netflux-websocket": "^0.1.0",
-    "chainpad-netflux": "^0.1.0"
+    "chainpad-netflux": "^0.1.0",
+    "chainpad-listmap": "^0.1.0"
   }
 }

From 48d222e565a8f38b4a3f0032ecf8dc4f456d6930 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Mon, 6 Jun 2016 12:38:31 +0200
Subject: [PATCH 256/257] depend on listmap api from bower

---
 www/json/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/json/main.js b/www/json/main.js
index 7f8567073..2e51631fc 100644
--- a/www/json/main.js
+++ b/www/json/main.js
@@ -1,6 +1,6 @@
 define([
     '/api/config?cb=' + Math.random().toString(16).substring(2),
-    '/common/chainpad-listmap.js',
+    '/bower_components/chainpad-listmap/chainpad-listmap.js',
     '/bower_components/chainpad-crypto/crypto.js',
     '/common/cryptpad-common.js',
     '/bower_components/jquery/dist/jquery.min.js',

From 8af49698da2de4fca9b8777ae4b23de6dc401b12 Mon Sep 17 00:00:00 2001
From: ansuz 
Date: Fri, 10 Jun 2016 09:56:40 +0200
Subject: [PATCH 257/257] add a class to the magicline markup so it's easier to
 remove

---
 www/pad/main.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/www/pad/main.js b/www/pad/main.js
index a66053386..d1a52aa7a 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -45,6 +45,7 @@ define([
     var userName = Crypto.rand64(8),
         toolbar;
 
+    // TODO update this filter to use the .non-realtime class
     var isNotMagicLine = function (el) {
         // factor as:
         // return !(el.tagName === 'SPAN' && el.contentEditable === 'false');
@@ -104,6 +105,7 @@ define([
         }
 
         var fixThings = false;
+
         var editor = window.editor = Ckeditor.replace('editor1', {
             // https://dev.ckeditor.com/ticket/10907
             needsBrFiller: fixThings,
@@ -114,7 +116,17 @@ define([
             removePlugins: 'resize'
         });
 
+
         editor.on('instanceReady', function (Ckeditor) {
+
+            /* add a class to the magicline plugin so we can pick it out more easily */
+            $('iframe')[0].contentWindow.CKEDITOR.instances.editor1.plugins.magicline
+                .backdoor.that.line.$.setAttribute('class', 'non-realtime');
+
+            /*  in XWiki this is 
+                CKEDITOR.instances.content.plugins.magicline.backdoor.that.line
+                    .$.setAttribute('class', 'non-realtime') */
+
             editor.execCommand('maximize');
             var documentBody = ifrw.$('iframe')[0].contentDocument.body;
 
@@ -422,6 +434,9 @@ define([
     var interval = 100;
     var first = function () {
         Ckeditor = ifrw.CKEDITOR;
+
+        console.log(Ckeditor);
+
         if (Ckeditor) {
             andThen(Ckeditor);
         } else {