From 3a0015c3578083514987b254b2b6fac34a2eb237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Sun, 8 Jul 2012 11:51:04 +0200 Subject: [PATCH 001/189] remove unused _opt in favor of code size/readability --- src/static/js/Changeset.js | 245 ++++++++++++++----------------------- 1 file changed, 89 insertions(+), 156 deletions(-) diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js index 738ee1bab..cfea43625 100644 --- a/src/static/js/Changeset.js +++ b/src/static/js/Changeset.js @@ -27,8 +27,6 @@ var AttributePool = require("./AttributePool"); -var _opt = null; - /** * ==================== General Util Functions ======================= */ @@ -127,22 +125,13 @@ exports.opIterator = function (opsStr, optStartIndex) { function nextRegexMatch() { prevIndex = curIndex; var result; - if (_opt) { - result = _opt.nextOpInString(opsStr, curIndex); - if (result) { - if (result.opcode() == '?') { - exports.error("Hit error opcode in op stream"); - } - curIndex = result.lastIndex(); - } - } else { - regex.lastIndex = curIndex; - result = regex.exec(opsStr); - curIndex = regex.lastIndex; - if (result[0] == '?') { - exports.error("Hit error opcode in op stream"); - } + regex.lastIndex = curIndex; + result = regex.exec(opsStr); + curIndex = regex.lastIndex; + if (result[0] == '?') { + exports.error("Hit error opcode in op stream"); } + return result; } var regexResult = nextRegexMatch(); @@ -150,13 +139,7 @@ exports.opIterator = function (opsStr, optStartIndex) { function next(optObj) { var op = (optObj || obj); - if (_opt && regexResult) { - op.attribs = regexResult.attribs(); - op.lines = regexResult.lines(); - op.chars = regexResult.chars(); - op.opcode = regexResult.opcode(); - regexResult = nextRegexMatch(); - } else if ((!_opt) && regexResult[0]) { + if (regexResult[0]) { op.attribs = regexResult[1]; op.lines = exports.parseNum(regexResult[2] || 0); op.opcode = regexResult[3]; @@ -169,7 +152,7 @@ exports.opIterator = function (opsStr, optStartIndex) { } function hasNext() { - return !!(_opt ? regexResult : regexResult[0]); + return !!(regexResult[0]); } function lastIndex() { @@ -414,159 +397,109 @@ exports.smartOpAssembler = function () { }; }; -if (_opt) { - exports.mergingOpAssembler = function () { - var assem = _opt.mergingOpAssembler(); - function append(op) { - assem.append(op.opcode, op.chars, op.lines, op.attribs); - } +exports.mergingOpAssembler = function () { + // This assembler can be used in production; it efficiently + // merges consecutive operations that are mergeable, ignores + // no-ops, and drops final pure "keeps". It does not re-order + // operations. + var assem = exports.opAssembler(); + var bufOp = exports.newOp(); - function toString() { - return assem.toString(); - } + // If we get, for example, insertions [xxx\n,yyy], those don't merge, + // but if we get [xxx\n,yyy,zzz\n], that merges to [xxx\nyyyzzz\n]. + // This variable stores the length of yyy and any other newline-less + // ops immediately after it. + var bufOpAdditionalCharsAfterNewline = 0; - function clear() { - assem.clear(); - } - - function endDocument() { - assem.endDocument(); - } - - return { - append: append, - toString: toString, - clear: clear, - endDocument: endDocument - }; - }; -} else { - exports.mergingOpAssembler = function () { - // This assembler can be used in production; it efficiently - // merges consecutive operations that are mergeable, ignores - // no-ops, and drops final pure "keeps". It does not re-order - // operations. - var assem = exports.opAssembler(); - var bufOp = exports.newOp(); - - // If we get, for example, insertions [xxx\n,yyy], those don't merge, - // but if we get [xxx\n,yyy,zzz\n], that merges to [xxx\nyyyzzz\n]. - // This variable stores the length of yyy and any other newline-less - // ops immediately after it. - var bufOpAdditionalCharsAfterNewline = 0; - - function flush(isEndDocument) { - if (bufOp.opcode) { - if (isEndDocument && bufOp.opcode == '=' && !bufOp.attribs) { - // final merged keep, leave it implicit - } else { + function flush(isEndDocument) { + if (bufOp.opcode) { + if (isEndDocument && bufOp.opcode == '=' && !bufOp.attribs) { + // final merged keep, leave it implicit + } else { + assem.append(bufOp); + if (bufOpAdditionalCharsAfterNewline) { + bufOp.chars = bufOpAdditionalCharsAfterNewline; + bufOp.lines = 0; assem.append(bufOp); - if (bufOpAdditionalCharsAfterNewline) { - bufOp.chars = bufOpAdditionalCharsAfterNewline; - bufOp.lines = 0; - assem.append(bufOp); - bufOpAdditionalCharsAfterNewline = 0; - } + bufOpAdditionalCharsAfterNewline = 0; } - bufOp.opcode = ''; } + bufOp.opcode = ''; } + } - function append(op) { - if (op.chars > 0) { - if (bufOp.opcode == op.opcode && bufOp.attribs == op.attribs) { - if (op.lines > 0) { - // bufOp and additional chars are all mergeable into a multi-line op - bufOp.chars += bufOpAdditionalCharsAfterNewline + op.chars; - bufOp.lines += op.lines; - bufOpAdditionalCharsAfterNewline = 0; - } else if (bufOp.lines == 0) { - // both bufOp and op are in-line - bufOp.chars += op.chars; - } else { - // append in-line text to multi-line bufOp - bufOpAdditionalCharsAfterNewline += op.chars; - } + function append(op) { + if (op.chars > 0) { + if (bufOp.opcode == op.opcode && bufOp.attribs == op.attribs) { + if (op.lines > 0) { + // bufOp and additional chars are all mergeable into a multi-line op + bufOp.chars += bufOpAdditionalCharsAfterNewline + op.chars; + bufOp.lines += op.lines; + bufOpAdditionalCharsAfterNewline = 0; + } else if (bufOp.lines == 0) { + // both bufOp and op are in-line + bufOp.chars += op.chars; } else { - flush(); - exports.copyOp(op, bufOp); + // append in-line text to multi-line bufOp + bufOpAdditionalCharsAfterNewline += op.chars; } + } else { + flush(); + exports.copyOp(op, bufOp); } } + } - function endDocument() { - flush(true); - } + function endDocument() { + flush(true); + } - function toString() { - flush(); - return assem.toString(); - } + function toString() { + flush(); + return assem.toString(); + } - function clear() { - assem.clear(); - exports.clearOp(bufOp); - } - return { - append: append, - toString: toString, - clear: clear, - endDocument: endDocument - }; + function clear() { + assem.clear(); + exports.clearOp(bufOp); + } + return { + append: append, + toString: toString, + clear: clear, + endDocument: endDocument }; -} +}; -if (_opt) { - exports.opAssembler = function () { - var assem = _opt.opAssembler(); - // this function allows op to be mutated later (doesn't keep a ref) - function append(op) { - assem.append(op.opcode, op.chars, op.lines, op.attribs); + +exports.opAssembler = function () { + var pieces = []; + // this function allows op to be mutated later (doesn't keep a ref) + + function append(op) { + pieces.push(op.attribs); + if (op.lines) { + pieces.push('|', exports.numToString(op.lines)); } + pieces.push(op.opcode); + pieces.push(exports.numToString(op.chars)); + } - function toString() { - return assem.toString(); - } + function toString() { + return pieces.join(''); + } - function clear() { - assem.clear(); - } - return { - append: append, - toString: toString, - clear: clear - }; + function clear() { + pieces.length = 0; + } + return { + append: append, + toString: toString, + clear: clear }; -} else { - exports.opAssembler = function () { - var pieces = []; - // this function allows op to be mutated later (doesn't keep a ref) - - function append(op) { - pieces.push(op.attribs); - if (op.lines) { - pieces.push('|', exports.numToString(op.lines)); - } - pieces.push(op.opcode); - pieces.push(exports.numToString(op.chars)); - } - - function toString() { - return pieces.join(''); - } - - function clear() { - pieces.length = 0; - } - return { - append: append, - toString: toString, - clear: clear - }; - }; -} +}; /** * A custom made String Iterator From 4c8f69b7c55f1a8ba8e8d338c2cee6bac0cc85c4 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sun, 8 Jul 2012 18:59:46 +0200 Subject: [PATCH 002/189] Use v8 to parse settings.json --- src/node/utils/Settings.js | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index e60446df4..aeeb9015e 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -24,6 +24,7 @@ var os = require("os"); var path = require('path'); var argv = require('./Cli').argv; var npm = require("npm/lib/npm.js"); +var vm = require('vm'); /* Root path of the installation */ exports.root = path.normalize(path.join(npm.dir, "..")); @@ -45,6 +46,7 @@ exports.dbType = "dirty"; * This setting is passed with dbType to ueberDB to set up the database */ exports.dbSettings = { "filename" : path.join(exports.root, "dirty.db") }; + /** * The default Text of a new pad */ @@ -102,33 +104,25 @@ exports.abiwordAvailable = function() // Discover where the settings file lives var settingsFilename = argv.settings || "settings.json"; -if (settingsFilename.charAt(0) != '/') { - settingsFilename = path.normalize(path.join(root, settingsFilename)); -} +settingsFilename = path.resolve(path.join(root, settingsFilename)); -var settingsStr +var settingsStr; try{ //read the settings sync - settingsStr = fs.readFileSync(settingsFilename).toString(); + settingsStr = fs.readFileSync(settingsFilename); } catch(e){ console.warn('No settings file found. Using defaults.'); - settingsStr = '{}'; } - -//remove all comments -settingsStr = settingsStr.replace(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/gm,"").replace(/#.*/g,"").replace(/\/\/.*/g,""); -//try to parse the settings +// try to parse the settings var settings; -try -{ - settings = JSON.parse(settingsStr); -} -catch(e) -{ - console.error("There is a syntax error in your settings.json file"); - console.error(e.message); - process.exit(1); +try { + if(settingsStr) { + settings = vm.runInContext('exports = '+settingsStr, vm.createContext(), "settings.json"); + } +}catch(e){ + console.warn('There was an error processing your settings.json file. Using defaults.'); + console.warn(e.message); } //loop trough the settings From 975171a86b1c3eae8bebb91e1b87f6efcf990ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Sun, 8 Jul 2012 21:06:19 +0200 Subject: [PATCH 003/189] Make handleMessage async --- src/node/handler/PadMessageHandler.js | 34 ++++++++++++++++++++------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index a0aef6648..d02e65377 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -159,11 +159,7 @@ exports.handleDisconnect = function(client) */ exports.handleMessage = function(client, message) { - _.map(hooks.callAll( "handleMessage", { client: client, message: message }), function ( newmessage ) { - if ( newmessage || newmessage === null ) { - message = newmessage; - } - }); + if(message == null) { messageLogger.warn("Message is null!"); @@ -175,6 +171,23 @@ exports.handleMessage = function(client, message) return; } + var handleMessageHook = function(callback){ + var dropMessage = false; + + // Call handleMessage hook. If a plugin returns null, the message will be dropped. Note that for all messages + // handleMessage will be called, even if the client is not authorized + hooks.aCallAll("handleMessage", { client: client, message: message }, function ( messages ) { + _.each(messages, function(newMessage){ + if ( newmessage === null ) { + dropMessage = true; + } + }); + + // If no plugins explicitly told us to drop the message, its ok to proceed + if(!dropMessage){ callback() }; + }); + } + var finalHandler = function () { //Check what type of message we get and delegate to the other methodes if(message.type == "CLIENT_READY") { @@ -203,11 +216,18 @@ exports.handleMessage = function(client, message) } }; - if (message && message.padId) { + if (message) { async.series([ + handleMessageHook, //check permissions function(callback) { + + if(!message.padId){ + // If the message has a padId we assume the client is already known to the server and needs no re-authorization + callback(); + return; + } // Note: message.sessionID is an entirely different kind of // session from the sessions we use here! Beware! FIXME: Call // our "sessions" "connections". @@ -231,8 +251,6 @@ exports.handleMessage = function(client, message) }, finalHandler ]); - } else { - finalHandler(); } } From 885844667887411c8fc2822ab1914b7277bcb4ca Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Tue, 10 Jul 2012 21:38:14 +0200 Subject: [PATCH 004/189] Exit on error. --- src/node/utils/Settings.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index aeeb9015e..68e58eb22 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -111,7 +111,8 @@ try{ //read the settings sync settingsStr = fs.readFileSync(settingsFilename); } catch(e){ - console.warn('No settings file found. Using defaults.'); + console.error('No settings file found.'); + process.exit(1); } // try to parse the settings @@ -121,8 +122,8 @@ try { settings = vm.runInContext('exports = '+settingsStr, vm.createContext(), "settings.json"); } }catch(e){ - console.warn('There was an error processing your settings.json file. Using defaults.'); - console.warn(e.message); + console.error('There was an error processing your settings.json file: '+e.message); + process.exit(1); } //loop trough the settings @@ -142,8 +143,7 @@ for(var i in settings) //this setting is unkown, output a warning and throw it away else { - console.warn("Unkown Setting: '" + i + "'"); - console.warn("This setting doesn't exist or it was removed"); + console.warn("Unkown Setting: '" + i + "'. This setting doesn't exist or it was removed"); } } From 87f26334d1259f6422c3a2b7d9325b611c72316b Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Tue, 10 Jul 2012 21:55:35 +0200 Subject: [PATCH 005/189] Fix typo. --- src/node/utils/Settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 68e58eb22..205b675f2 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -143,7 +143,7 @@ for(var i in settings) //this setting is unkown, output a warning and throw it away else { - console.warn("Unkown Setting: '" + i + "'. This setting doesn't exist or it was removed"); + console.warn("Unknown Setting: '" + i + "'. This setting doesn't exist or it was removed"); } } From f09dd0f3fba8630d221dba3a652dad0a229aa509 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Wed, 11 Jul 2012 15:34:33 +0200 Subject: [PATCH 006/189] Put toString() back in. --- src/node/utils/Settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 205b675f2..1b7c3f46c 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -109,7 +109,7 @@ settingsFilename = path.resolve(path.join(root, settingsFilename)); var settingsStr; try{ //read the settings sync - settingsStr = fs.readFileSync(settingsFilename); + settingsStr = fs.readFileSync(settingsFilename).toString(); } catch(e){ console.error('No settings file found.'); process.exit(1); From dc09323d8f6ee5a65f301bb677d9e18a54672322 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Wed, 11 Jul 2012 15:36:41 +0200 Subject: [PATCH 007/189] Don't exit if no settings file was found. --- src/node/utils/Settings.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 1b7c3f46c..dd34ac5ee 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -111,8 +111,7 @@ try{ //read the settings sync settingsStr = fs.readFileSync(settingsFilename).toString(); } catch(e){ - console.error('No settings file found.'); - process.exit(1); + console.warn('No settings file found. Continuing using defaults!'); } // try to parse the settings From 6726ea66320e3075451027d5362d35d77bebaf5d Mon Sep 17 00:00:00 2001 From: John McLear Date: Wed, 11 Jul 2012 17:42:59 +0100 Subject: [PATCH 008/189] option to stop autoscroll --- src/static/js/chat.js | 7 +++++-- src/templates/pad.html | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/static/js/chat.js b/src/static/js/chat.js index 47b0ae3ca..b2a7d2737 100644 --- a/src/static/js/chat.js +++ b/src/static/js/chat.js @@ -62,8 +62,11 @@ var chat = (function() }, scrollDown: function() { - if($('#chatbox').css("display") != "none") - $('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, "slow"); + if($('#options-scrollchat').is(':checked')){ + if($('#chatbox').css("display") != "none"){ + $('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, "slow"); + } + } }, send: function() { diff --git a/src/templates/pad.html b/src/templates/pad.html index 02af9b107..a25133472 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -168,6 +168,10 @@

+

+ + +

Font type:

-

- - -

Font type: + + + + <% e.end_block(); %> +

<% e.end_block(); %> + +
+
+
Loading...
+
@@ -263,53 +317,6 @@
-
- <% e.begin_block("modals"); %> -
-
-
Connecting...
-
Reestablishing connection...
-
-

Disconnected.

-

Opened in another window.

-

No Authorization.

-
-

We're having trouble talking to the EtherPad lite synchronization server. You may be connecting through an incompatible firewall or proxy server.

-
-
-

We were unable to connect to the EtherPad lite synchronization server. This may be due to an incompatibility with your web browser or internet connection.

-
-
-

You seem to have opened this pad in another browser window. If you'd like to use this window instead, you can reconnect.

-
-
-

Lost connection with the EtherPad lite synchronization server. This may be due to a loss of network connectivity.

-
-
-

Server not responding. This may be due to network connectivity issues or high load on the server.

-
-
-

Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

-
-
-

This pad was deleted.

-
-
-

If this continues to happen, please let us know

-
-
- -
-
-
- -
- <% e.end_block(); %> -
<% e.end_block(); %> <% e.begin_block("scripts"); %> From 9e9cbd5ffa379607f1124b519aec53087cfe427d Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Fri, 13 Jul 2012 08:24:02 +0200 Subject: [PATCH 014/189] Fix typo. --- src/static/js/ace2_inner.js | 2 +- src/static/js/pad_editbar.js | 12 ++++++------ src/static/js/pad_modals.js | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index cc9f1288d..490eee19d 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3237,7 +3237,7 @@ function Ace2Inner(){ } //hide the dropdownso if(window.parent.parent.padeditbar){ // required in case its in an iframe should probably use parent.. See Issue 327 https://github.com/Pita/etherpad-lite/issues/327 - window.parent.parent.padeditbar.toogleDropDown("none"); + window.parent.parent.padeditbar.toggleDropDown("none"); } } diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index 973bfda2a..31912f8a8 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -122,25 +122,25 @@ var padeditbar = (function() { if(cmd == "showusers") { - self.toogleDropDown("users"); + self.toggleDropDown("users"); } else if (cmd == 'settings') { - self.toogleDropDown("settings"); + self.toggleDropDown("settings"); } else if (cmd == 'connectivity') { - self.toogleDropDown("connectivity"); + self.toggleDropDown("connectivity"); } else if (cmd == 'embed') { self.setEmbedLinks(); $('#linkinput').focus().select(); - self.toogleDropDown("embed"); + self.toggleDropDown("embed"); } else if (cmd == 'import_export') { - self.toogleDropDown("importexport"); + self.toggleDropDown("importexport"); } else if (cmd == 'savedRevision') { @@ -186,7 +186,7 @@ var padeditbar = (function() } if(padeditor.ace) padeditor.ace.focus(); }, - toogleDropDown: function(moduleName, cb) + toggleDropDown: function(moduleName, cb) { var modules = ["settings", "connectivity", "importexport", "embed", "users"]; diff --git a/src/static/js/pad_modals.js b/src/static/js/pad_modals.js index ee986621e..720fdfc14 100644 --- a/src/static/js/pad_modals.js +++ b/src/static/js/pad_modals.js @@ -35,8 +35,8 @@ var padmodals = (function() { $("#connectivity .visible").removeClass('visible'); $("#connectivity ."+messageId).addClass('visible'); - padeditbar.toogleDropDown("none", function() { - padeditbar.toogleDropDown("connectivity"); + padeditbar.toggleDropDown("none", function() { + padeditbar.toggleDropDown("connectivity"); }); }, showOverlay: function(duration) { From 6bda1f8e4dbdebdf2e1cbf38f3380069e2224b2a Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Fri, 13 Jul 2012 09:13:22 +0200 Subject: [PATCH 015/189] Fix padeditbar.toggleDropDown Only call callback, if one was passed. --- src/static/js/pad_editbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index 31912f8a8..59658a046 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -209,7 +209,7 @@ var padeditbar = (function() returned = true; } } - if(!returned) return cb(); + if(!returned && cb) return cb(); } else { From 8ab12ee69e1c255dda51a8dacb8ca5c05ea84bbc Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 14 Jul 2012 14:46:02 +0200 Subject: [PATCH 016/189] Only disable toolbar. Make content available and allow scrolling --- src/static/css/pad.css | 7 ++++--- src/static/js/pad_modals.js | 4 ++-- src/templates/pad.html | 7 +++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 3b600fd3c..226c1f7ca 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -402,6 +402,7 @@ table#otheruserstable { font-style: italic; } +#connectivitylink, #connectivity { z-index: 600 !important; } @@ -420,17 +421,17 @@ table#otheruserstable { padding: 5px; } -#modaloverlay { +.toolbar #overlay { z-index: 500; display: none; background-repeat: repeat-both; width: 100%; position: absolute; - height: 100%; + height: inherit; left: 0; top: 0; } -* html #modaloverlay { +* html #overlay { /* for IE 6+ */ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter: alpha(opacity=100); diff --git a/src/static/js/pad_modals.js b/src/static/js/pad_modals.js index 720fdfc14..174779df4 100644 --- a/src/static/js/pad_modals.js +++ b/src/static/js/pad_modals.js @@ -40,7 +40,7 @@ var padmodals = (function() }); }, showOverlay: function(duration) { - $("#modaloverlay").show().css( + $("#overlay").show().css( { 'opacity': 0 }).animate( @@ -49,7 +49,7 @@ var padmodals = (function() }, duration); }, hideOverlay: function(duration) { - $("#modaloverlay").animate( + $("#overlay").animate( { 'opacity': 0 }, duration, function() diff --git a/src/templates/pad.html b/src/templates/pad.html index a01016cd2..4c02bdf6f 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -22,6 +22,9 @@ <% e.begin_block("body"); %>
+
+
+
    <% e.begin_block("editbarMenuRight"); %> -
  • - - +
  • + +
  • @@ -99,9 +99,9 @@
    • -
  • - - +
  • + +
  • From 4220d6bedd8efa282903970e58d5ebb5f918edd9 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 14 Jul 2012 15:12:21 +0200 Subject: [PATCH 019/189] Put loading git back in. --- src/static/img/connectingbar.gif | Bin 10819 -> 10932 bytes src/templates/pad.html | 1 + 2 files changed, 1 insertion(+) diff --git a/src/static/img/connectingbar.gif b/src/static/img/connectingbar.gif index 34f54e90ceb542b30c5124dd2d13099f180f1ac9..5e54d6946960f0389f56639ebbc5bd41ab23caaa 100644 GIT binary patch literal 10932 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 F{U4`AKJNek diff --git a/src/templates/pad.html b/src/templates/pad.html index a5f54cdbf..88b5f4a58 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -225,6 +225,7 @@

Reestablishing connection...

+

Opened in another window.

From 2d0cf156af7213cd26246daf9a579b63bf13a8d0 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 14 Jul 2012 15:14:46 +0200 Subject: [PATCH 020/189] Fix showModal animation. New content shouldn' slide in before the containing popup. --- src/static/js/pad_modals.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/static/js/pad_modals.js b/src/static/js/pad_modals.js index 174779df4..0292e048f 100644 --- a/src/static/js/pad_modals.js +++ b/src/static/js/pad_modals.js @@ -33,9 +33,9 @@ var padmodals = (function() }, showModal: function(messageId) { - $("#connectivity .visible").removeClass('visible'); - $("#connectivity ."+messageId).addClass('visible'); padeditbar.toggleDropDown("none", function() { + $("#connectivity .visible").removeClass('visible'); + $("#connectivity ."+messageId).addClass('visible'); padeditbar.toggleDropDown("connectivity"); }); }, From 1466fa03a4d8c17d0bcb9a28abd4820531c89e27 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 14 Jul 2012 15:54:20 +0200 Subject: [PATCH 021/189] Fix some minor mistakes. --- src/static/css/pad.css | 1 - src/templates/pad.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 226c1f7ca..22cb6d26a 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -402,7 +402,6 @@ table#otheruserstable { font-style: italic; } -#connectivitylink, #connectivity { z-index: 600 !important; } diff --git a/src/templates/pad.html b/src/templates/pad.html index 88b5f4a58..8dee2cdc7 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -221,7 +221,7 @@ + +
+
+ +
+
@@ -70,54 +76,55 @@
-
-
- -
-
- -
- <% e.begin_block("modals"); %> -
-
-
Connecting...
-
Reestablishing connection...
-
-

Disconnected.

-

Opened in another window.

-

No Authorization.

-
-

We're having trouble talking to the EtherPad lite synchronization server. You may be connecting through an incompatible firewall or proxy server.

-
-
-

We were unable to connect to the EtherPad lite synchronization server. This may be due to an incompatibility with your web browser or internet connection.

-
-
-

You seem to have opened this pad in another browser window. If you'd like to use this window instead, you can reconnect.

-
-
-

Lost connection with the EtherPad lite synchronization server. This may be due to a loss of network connectivity.

-
-
-

Server not responding. This may be due to network connectivity issues or high load on the server.

-
-
-

Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

-
-
-

This pad was deleted.

-
-
-

If this continues to happen, please let us know

-
-
- -
-
-
-
- <% e.end_block(); %> -
+
From b1123d11b60b6325e0f3dc5cd343814cd2c264bf Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 14 Jul 2012 20:35:26 +0300 Subject: [PATCH 023/189] Correct path --- src/templates/admin/plugins.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 104f6b986..3dad3bd01 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -21,7 +21,7 @@

Etherpad Lite

- Technical information on installed plugins + Technical information on installed plugins

Installed plugins

From eb6be841509d7e6e33d4c4fc70f70da5426176c2 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sun, 15 Jul 2012 16:03:12 +0200 Subject: [PATCH 024/189] Fix html/css --- src/static/css/pad.css | 4 ++ src/templates/pad.html | 32 ++++++------ src/templates/timeslider.html | 94 ++++++++++++++++++----------------- 3 files changed, 71 insertions(+), 59 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 22cb6d26a..df9dde143 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -730,6 +730,10 @@ input[type=checkbox] { .popup input[type=text], #users input[type=text] { outline: none; } +.popup button { + padding: 5px; + font-size: 14px; +} .popup a { text-decoration: none } diff --git a/src/templates/pad.html b/src/templates/pad.html index 8dee2cdc7..94138d96a 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -224,40 +224,44 @@

Connected.

-

Reestablishing connection...

+

Reestablishing connection...

-

Opened in another window.

-

You seem to have opened this pad in another browser window. If you'd like to use this window instead, you can reconnect.

+

Opened in another window.

+

You seem to have opened this pad in another browser window.

+

If you'd like to use this window instead, you can reconnect.

-

No Authorization.

+

No Authorization.

Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

-

Disconnected.

-

We're having trouble talking to the EtherPad lite synchronization server. You may be connecting through an incompatible firewall or proxy server.

+

Disconnected.

+

We're having trouble talking to the EtherPad lite synchronization server.

+

You may be connecting through an incompatible firewall or proxy server.

-

Disconnected.

-

We were unable to connect to the EtherPad lite synchronization server. This may be due to an incompatibility with your web browser or internet connection.

+

Disconnected.

+

We were unable to connect to the EtherPad lite synchronization server.

+

This may be due to an incompatibility with your web browser or internet connection.

-

Disconnected.

-

Server not responding. This may be due to network connectivity issues or high load on the server.

+

Disconnected.

+

Server not responding.

+

This may be due to network connectivity issues or high load on the server.

-

Disconnected.

+

Disconnected.

This pad was deleted.

-

Disconnected.

-

Lost connection with the EtherPad lite synchronization server. This may be due to a loss of network connectivity.

-

If this continues to happen, please let us know

+

Disconnected.

+

Lost connection with the EtherPad lite synchronization server.

+

This may be due to a loss of network connectivity. If this continues to happen, please let us know

From 9bd23acb3dd14e381b7c97041a2a70712890761d Mon Sep 17 00:00:00 2001 From: Mark Holmquist Date: Tue, 17 Jul 2012 10:12:10 -0700 Subject: [PATCH 025/189] Add userJoinOrUpdate hook This hook fires on the client side, whenever a user joins or updates (hence the name). It will pass one thing, the user's info, into the context. This is mostly just for notification purposes. --- src/static/js/pad_userlist.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/static/js/pad_userlist.js b/src/static/js/pad_userlist.js index d83825854..474f9b0e1 100644 --- a/src/static/js/pad_userlist.js +++ b/src/static/js/pad_userlist.js @@ -21,6 +21,7 @@ */ var padutils = require('./pad_utils').padutils; +var hooks = require('./pluginfw/hooks'); var myUserInfo = {}; @@ -529,6 +530,10 @@ var paduserlist = (function() return; } + hooks.callAll('userJoinOrUpdate', { + userInfo: info + }); + var userData = {}; userData.color = typeof info.colorId == "number" ? clientVars.colorPalette[info.colorId] : info.colorId; userData.name = info.name; From 9aed433ad5947fbbeeac1bf94c0e4961f0833087 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Wed, 18 Jul 2012 15:54:53 +0200 Subject: [PATCH 026/189] Fix #880 Remove call to padsavedrevs.handleIsFullyConnected --- src/static/js/pad.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/static/js/pad.js b/src/static/js/pad.js index df6342e2d..a22e181a2 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -790,8 +790,6 @@ var pad = { }, 1000); } - padsavedrevs.handleIsFullyConnected(isConnected); - // pad.determineSidebarVisibility(isConnected && !isInitialConnect); pad.determineChatVisibility(isConnected && !isInitialConnect); pad.determineAuthorshipColorsVisibility(); From c0daf1aaaf6f24ff2c61df2d20642add67cae58f Mon Sep 17 00:00:00 2001 From: Jordan Wiens Date: Thu, 19 Jul 2012 00:59:15 -0400 Subject: [PATCH 027/189] adding basic numbered list support to dokuwiki export --- src/node/utils/ExportDokuWiki.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/node/utils/ExportDokuWiki.js b/src/node/utils/ExportDokuWiki.js index bcb211081..d2f71236b 100644 --- a/src/node/utils/ExportDokuWiki.js +++ b/src/node/utils/ExportDokuWiki.js @@ -252,7 +252,12 @@ function getDokuWikiFromAtext(pad, atext) if (line.listLevel && lineContent) { - pieces.push(new Array(line.listLevel + 1).join(' ') + '* '); + if (line.listTypeName == "number") + { + pieces.push(new Array(line.listLevel + 1).join(' ') + ' - '); + } else { + pieces.push(new Array(line.listLevel + 1).join(' ') + '* '); + } } pieces.push(lineContent); } From c3ddff3fa061a48ae7178c62038e143ab5304ec6 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Thu, 19 Jul 2012 11:34:14 +0200 Subject: [PATCH 028/189] Notify the user, if JavaScript is disabled. --- src/templates/pad.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/templates/pad.html b/src/templates/pad.html index 02af9b107..36d6334c2 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -148,7 +148,10 @@
-
Loading...
+
+

Loading...

+ +