diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index 598b2df54..bc8f5d629 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); diff --git a/src/node/utils/Minify.js b/src/node/utils/Minify.js index 58d08b30e..132d63dae 100644 --- a/src/node/utils/Minify.js +++ b/src/node/utils/Minify.js @@ -23,12 +23,12 @@ 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'); 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/"); @@ -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 f173b94ec..3d5f5e24e 100644 --- a/src/package.json +++ b/src/package.json @@ -12,35 +12,35 @@ ], "dependencies" : { "yajsml" : "1.1.6", - "request" : "2.9.100", - "require-kernel" : "1.0.5", + "request" : ">=2.48.0", + "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.1.x", + "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" : ">=2.0.0", + "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" }, diff --git a/src/static/css/pad.css b/src/static/css/pad.css index f59403fcf..fb2cb82ba 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% @@ -968,12 +974,15 @@ 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; + top:auto !important; + bottom:33px !important; /* #mycolorpicker: width -#users: width */; } #editorcontainer { @@ -990,6 +999,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; @@ -1009,8 +1019,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; @@ -1023,11 +1041,11 @@ input[type=checkbox] { width: 100%; } #settings, - #importexport, + #import_export, #connectivity, #embed { + top:auto; left: 0; - top: 0; bottom: 33px; right: 0; } @@ -1037,6 +1055,14 @@ input[type=checkbox] { #online_count { line-height: 24px } + #chatbox{ + position:absolute; + bottom:33px; + } + #gritter-notice-wrapper{ + bottom:43px !important; + right:10px !important; + } } #passwordRequired{ diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index 76a79a629..7e750a3e0 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);