From 61c6deda2e5ab82963f762abd5cc0a26e96ef413 Mon Sep 17 00:00:00 2001 From: John McLear Date: Thu, 27 Nov 2014 02:44:48 +0000 Subject: [PATCH 01/11] use a forked require-kernel --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index e69d9730..c6e07255 100644 --- a/src/package.json +++ b/src/package.json @@ -13,7 +13,7 @@ "dependencies" : { "yajsml" : "1.1.6", "request" : "2.9.100", - "require-kernel" : "1.0.5", + "etherpad-require-kernel" : "1.0.5", "resolve" : ">=1.0.0", "socket.io" : ">=1.2.0", "ueberDB" : ">=0.2.9", From c13301966f4d49d0cc70c295c3530c8c0fe6e7ef Mon Sep 17 00:00:00 2001 From: John McLear Date: Thu, 27 Nov 2014 02:56:42 +0000 Subject: [PATCH 02/11] yeah need htis too --- src/node/utils/Minify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index 58d08b30..e6b19542 100644 --- a/src/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -28,7 +28,7 @@ var jsp = require("uglify-js").parser; var pro = require("uglify-js").uglify; var path = require('path'); var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins"); -var RequireKernel = require('require-kernel'); +var RequireKernel = require('etherpad-require-kernel'); var urlutil = require('url'); var ROOT_DIR = path.normalize(__dirname + "/../../static/"); From 3224122f7e27bd3ec9ce3f419ab4025c653b8010 Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 28 Nov 2014 17:47:55 +0000 Subject: [PATCH 03/11] correct kernel v# --- src/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/package.json b/src/package.json index 7a8cd74e..98625622 100644 --- a/src/package.json +++ b/src/package.json @@ -12,13 +12,13 @@ ], "dependencies" : { "yajsml" : "1.1.6", - "request" : "2.9.100", - "etherpad-require-kernel" : "1.0.5", + "request" : ">=2.48.0", + "etherpad-require-kernel" : "1.0.6", "resolve" : ">=1.0.0", "socket.io" : ">=1.2.0", "ueberDB" : ">=0.2.9", "express" : ">3.1.0 <3.9.0", - "async" : "0.1.x", + "async" : "0.9.0", "connect" : "2.7.x", "clean-css" : "0.3.2", "uglify-js" : "1.2.5", From 74ffbdea7908f5fbbb0844815c62c67e0c842a74 Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 28 Nov 2014 18:02:11 +0000 Subject: [PATCH 04/11] bump vs --- src/package.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/package.json b/src/package.json index 98625622..1e85ca53 100644 --- a/src/package.json +++ b/src/package.json @@ -13,34 +13,34 @@ "dependencies" : { "yajsml" : "1.1.6", "request" : ">=2.48.0", - "etherpad-require-kernel" : "1.0.6", + "etherpad-require-kernel" : ">=1.0.7", "resolve" : ">=1.0.0", "socket.io" : ">=1.2.0", "ueberDB" : ">=0.2.9", "express" : ">3.1.0 <3.9.0", - "async" : "0.9.0", + "async" : ">=0.9.0", "connect" : "2.7.x", - "clean-css" : "0.3.2", - "uglify-js" : "1.2.5", - "formidable" : "1.0.9", - "log4js" : "0.6.6", + "clean-css" : ">=0.50.x", + "uglify-js" : ">=2.4.15", + "formidable" : ">=1.0.15", + "log4js" : ">=0.6.21", "nodemailer" : "0.3.x", - "cheerio" : "0.18.0", - "async-stacktrace" : "0.0.2", - "npm" : "1.4.x", - "ejs" : "0.6.1", - "graceful-fs" : "1.1.5", - "slide" : "1.1.3", - "semver" : ">2.3.0", + "cheerio" : ">=0.18.0", + "async-stacktrace" : ">=0.0.2", + "npm" : ">=2.1.x", + "ejs" : ">=1.0.0", + "graceful-fs" : ">=3.0.4", + "slide" : ">=1.1.6", + "semver" : ">=2.3.0", "security" : "1.0.0", - "tinycon" : "0.0.1", + "tinycon" : ">=0.0.1", "underscore" : "1.5.1", - "unorm" : "1.0.0", - "languages4translatewiki" : "0.1.3", + "unorm" : ">=1.3.3", + "languages4translatewiki" : ">=0.1.3", "swagger-node-express" : ">=2.1.0", "channels" : "0.0.x", - "jsonminify" : "0.2.2", - "measured" : "0.1.3", + "jsonminify" : ">=0.2.3", + "measured" : ">=0.1.6", "mocha" : ">=2.0.1", "supertest" : ">=0.15.0" }, From 53887db872bb482e035ac331dfec70aad1c81a83 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 29 Nov 2014 00:26:25 +0000 Subject: [PATCH 05/11] mobile ui polish --- src/static/css/pad.css | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 8b7e8258..177ce91e 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -967,9 +967,10 @@ input[type=checkbox] { } @media only screen and (min-device-width: 320px) and (max-device-width: 720px) { #users { - top: 36px; - bottom: 40px; - border-radius: none; + top: auto; + right:0px !important; + bottom: 33px; + border-radius: 0px !important; } #mycolorpicker { left: -73px; @@ -989,6 +990,7 @@ input[type=checkbox] { background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%); background: linear-gradient(#f7f7f7, #f1f1f1 80%); width: 100%; + right:0px !important; overflow: hidden; height: 32px; position: fixed; @@ -1008,8 +1010,16 @@ input[type=checkbox] { .toolbar ul li a.selected { background: none !important } - #chaticon, #timesliderlink { - display: none !important + li[data-key="showusers"] > a { + + margin-top:-10px; + padding-top:2px !important; + line-height:20px; + vertical-align:top !important; + } + #chaticon { + position:absolute; + right:48px; } .popup { -webkit-border-radius: 0; @@ -1022,11 +1032,11 @@ input[type=checkbox] { width: 100%; } #settings, - #importexport, + #import_export, #connectivity, #embed { + top:auto; left: 0; - top: 0; bottom: 33px; right: 0; } @@ -1036,6 +1046,10 @@ input[type=checkbox] { #online_count { line-height: 24px } + #chatbox{ + position:absolute; + bottom:33px; + } } #passwordRequired{ From 34f76257396663b5cce19e75b0f91e394922e233 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 29 Nov 2014 00:30:13 +0000 Subject: [PATCH 06/11] a little more polish --- src/static/css/pad.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 177ce91e..0ec2a5f5 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -1050,6 +1050,10 @@ input[type=checkbox] { position:absolute; bottom:33px; } + #gritter-notice-wrapper{ + bottom:43px !important; + right:10px !important; + } } #passwordRequired{ From ee585f045755a36e468a10dc73d29755cfc9ec93 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 29 Nov 2014 00:32:37 +0000 Subject: [PATCH 07/11] color picker on mobile actually shows on screen --- src/static/css/pad.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 0ec2a5f5..57575eca 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -974,6 +974,8 @@ input[type=checkbox] { } #mycolorpicker { left: -73px; + top:auto !important; + bottom:33px !important; /* #mycolorpicker: width -#users: width */; } #editorcontainer { From ed96c13a1f4a7faa41c6437c9b65aa349a170c28 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 29 Nov 2014 00:54:06 +0000 Subject: [PATCH 08/11] minor ui polish --- src/static/js/pad_editbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index 76a79a62..7e750a3e 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -180,8 +180,8 @@ var padeditbar = (function() return this; }, redrawHeight: function(){ - var editbarHeight = $('.menu_left').height() + 2 + "px"; - var containerTop = $('.menu_left').height() + 7 + "px"; + var editbarHeight = $('.menu_left').height() + 1 + "px"; + var containerTop = $('.menu_left').height() + 6 + "px"; $('#editbar').css("height", editbarHeight); $('#editorcontainer').css("top", containerTop); From 12f25d8a458bf007f8b442b1f3d6ef89b4f6e984 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 29 Nov 2014 01:31:04 +0000 Subject: [PATCH 09/11] bump cleancss --- src/node/utils/Minify.js | 5 +++-- src/package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index e6b19542..132d63da 100644 --- a/src/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -23,7 +23,7 @@ var ERR = require("async-stacktrace"); var settings = require('./Settings'); var async = require('async'); var fs = require('fs'); -var cleanCSS = require('clean-css'); +var CleanCSS = require('clean-css'); var jsp = require("uglify-js").parser; var pro = require("uglify-js").uglify; var path = require('path'); @@ -411,7 +411,8 @@ function compressJS(values) function compressCSS(values) { var complete = values.join("\n"); - return cleanCSS.process(complete); + var cleanCSS = new CleanCSS({}).minify(complete); + return cleanCSS; } exports.minify = minify; diff --git a/src/package.json b/src/package.json index 1e85ca53..3d5f5e24 100644 --- a/src/package.json +++ b/src/package.json @@ -20,7 +20,7 @@ "express" : ">3.1.0 <3.9.0", "async" : ">=0.9.0", "connect" : "2.7.x", - "clean-css" : ">=0.50.x", + "clean-css" : ">=2.0.0", "uglify-js" : ">=2.4.15", "formidable" : ">=1.0.15", "log4js" : ">=0.6.21", From d7e980cd47552a73f74f6ef56fc429072bf54578 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 29 Nov 2014 02:24:19 +0000 Subject: [PATCH 10/11] yet more minor css polish --- src/static/css/pad.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 57575eca..2dd1663d 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -436,6 +436,12 @@ table#otheruserstable { height: 13px; overflow: hidden; margin: 0 4px; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } .usertdswatch { width: 1% From 6fea3a25f8c9fac94a4d97ccb60b0b1d5df96795 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 30 Nov 2014 21:21:58 +0000 Subject: [PATCH 11/11] stop death on no session --- src/node/handler/PadMessageHandler.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index 598b2df5..bc8f5d62 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -838,10 +838,10 @@ exports.updatePadClients = function(pad, callback) client.json.send(wireMsg); } - - sessioninfos[sid].time = currentTime; - sessioninfos[sid].rev = r; - + if(sessioninfos[sid]){ + sessioninfos[sid].time = currentTime; + sessioninfos[sid].rev = r; + } callback(null); } ], callback);