mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-23 08:56:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'develop' of github.com:ether/etherpad-lite into develop

Browse source
This commit is contained in:
John McLear 2014-12-01 15:10:17 +00:00
commit c1fdd7ff79
5 changed files with 62 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/handler/PadMessageHandler.js
View file

@ -838,10 +838,10 @@ exports.updatePadClients = function(pad, callback)
client.json.send(wireMsg); client.json.send(wireMsg);
} }
if(sessioninfos[sid]){
sessioninfos[sid].time = currentTime; sessioninfos[sid].time = currentTime;
sessioninfos[sid].rev = r; sessioninfos[sid].rev = r;
}
callback(null); callback(null);
} }
], callback); ], callback);

7
src/node/utils/Minify.js
View file

@ -23,12 +23,12 @@ var ERR = require("async-stacktrace");
var settings = require('./Settings'); var settings = require('./Settings');
var async = require('async'); var async = require('async');
var fs = require('fs'); var fs = require('fs');
var cleanCSS = require('clean-css'); var CleanCSS = require('clean-css');
var jsp = require("uglify-js").parser; var jsp = require("uglify-js").parser;
var pro = require("uglify-js").uglify; var pro = require("uglify-js").uglify;
var path = require('path'); var path = require('path');
var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins"); 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 urlutil = require('url');
var ROOT_DIR = path.normalize(__dirname + "/../../static/"); var ROOT_DIR = path.normalize(__dirname + "/../../static/");
@ -411,7 +411,8 @@ function compressJS(values)
function compressCSS(values) function compressCSS(values)
{ {
var complete = values.join("\n"); var complete = values.join("\n");
return cleanCSS.process(complete); var cleanCSS = new CleanCSS({}).minify(complete);
return cleanCSS;
} }
exports.minify = minify; exports.minify = minify;

38
src/package.json
View file

@ -12,35 +12,35 @@
], ],
"dependencies" : { "dependencies" : {
"yajsml" : "1.1.6", "yajsml" : "1.1.6",
"request" : "2.9.100", "request" : ">=2.48.0",
"require-kernel" : "1.0.5", "etherpad-require-kernel" : ">=1.0.7",
"resolve" : ">=1.0.0", "resolve" : ">=1.0.0",
"socket.io" : ">=1.2.0", "socket.io" : ">=1.2.0",
"ueberDB" : ">=0.2.9", "ueberDB" : ">=0.2.9",
"express" : ">3.1.0 <3.9.0", "express" : ">3.1.0 <3.9.0",
"async" : "0.1.x", "async" : ">=0.9.0",
"connect" : "2.7.x", "connect" : "2.7.x",
"clean-css" : "0.3.2", "clean-css" : ">=2.0.0",
"uglify-js" : "1.2.5", "uglify-js" : ">=2.4.15",
"formidable" : "1.0.9", "formidable" : ">=1.0.15",
"log4js" : "0.6.6", "log4js" : ">=0.6.21",
"nodemailer" : "0.3.x", "nodemailer" : "0.3.x",
"cheerio" : "0.18.0", "cheerio" : ">=0.18.0",
"async-stacktrace" : "0.0.2", "async-stacktrace" : ">=0.0.2",
"npm" : "1.4.x", "npm" : ">=2.1.x",
"ejs" : "0.6.1", "ejs" : ">=1.0.0",
"graceful-fs" : "1.1.5", "graceful-fs" : ">=3.0.4",
"slide" : "1.1.3", "slide" : ">=1.1.6",
"semver" : ">2.3.0", "semver" : ">=2.3.0",
"security" : "1.0.0", "security" : "1.0.0",
"tinycon" : "0.0.1", "tinycon" : ">=0.0.1",
"underscore" : "1.5.1", "underscore" : "1.5.1",
"unorm" : "1.0.0", "unorm" : ">=1.3.3",
"languages4translatewiki" : "0.1.3", "languages4translatewiki" : ">=0.1.3",
"swagger-node-express" : ">=2.1.0", "swagger-node-express" : ">=2.1.0",
"channels" : "0.0.x", "channels" : "0.0.x",
"jsonminify" : "0.2.2", "jsonminify" : ">=0.2.3",
"measured" : "0.1.3", "measured" : ">=0.1.6",
"mocha" : ">=2.0.1", "mocha" : ">=2.0.1",
"supertest" : ">=0.15.0" "supertest" : ">=0.15.0"
}, },

40
src/static/css/pad.css
View file

@ -436,6 +436,12 @@ table#otheruserstable {
height: 13px; height: 13px;
overflow: hidden; overflow: hidden;
margin: 0 4px; 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 { .usertdswatch {
width: 1% width: 1%
@ -968,12 +974,15 @@ input[type=checkbox] {
} }
@media only screen and (min-device-width: 320px) and (max-device-width: 720px) { @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
#users { #users {
top: 36px; top: auto;
bottom: 40px; right:0px !important;
border-radius: none; bottom: 33px;
border-radius: 0px !important;
} }
#mycolorpicker { #mycolorpicker {
left: -73px; left: -73px;
top:auto !important;
bottom:33px !important;
/* #mycolorpicker: width -#users: width */; /* #mycolorpicker: width -#users: width */;
} }
#editorcontainer { #editorcontainer {
@ -990,6 +999,7 @@ input[type=checkbox] {
background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%); background: -ms-linear-gradient(#f7f7f7, #f1f1f1 80%);
background: linear-gradient(#f7f7f7, #f1f1f1 80%); background: linear-gradient(#f7f7f7, #f1f1f1 80%);
width: 100%; width: 100%;
right:0px !important;
overflow: hidden; overflow: hidden;
height: 32px; height: 32px;
position: fixed; position: fixed;
@ -1009,8 +1019,16 @@ input[type=checkbox] {
.toolbar ul li a.selected { .toolbar ul li a.selected {
background: none !important background: none !important
} }
#chaticon, #timesliderlink { li[data-key="showusers"] > a {
display: none !important
margin-top:-10px;
padding-top:2px !important;
line-height:20px;
vertical-align:top !important;
}
#chaticon {
position:absolute;
right:48px;
} }
.popup { .popup {
-webkit-border-radius: 0; -webkit-border-radius: 0;
@ -1023,11 +1041,11 @@ input[type=checkbox] {
width: 100%; width: 100%;
} }
#settings, #settings,
#importexport, #import_export,
#connectivity, #connectivity,
#embed { #embed {
top:auto;
left: 0; left: 0;
top: 0;
bottom: 33px; bottom: 33px;
right: 0; right: 0;
} }
@ -1037,6 +1055,14 @@ input[type=checkbox] {
#online_count { #online_count {
line-height: 24px line-height: 24px
} }
#chatbox{
position:absolute;
bottom:33px;
}
#gritter-notice-wrapper{
bottom:43px !important;
right:10px !important;
}
} }
#passwordRequired{ #passwordRequired{

4
src/static/js/pad_editbar.js
View file

@ -180,8 +180,8 @@ var padeditbar = (function()
return this; return this;
}, },
redrawHeight: function(){ redrawHeight: function(){
var editbarHeight = $('.menu_left').height() + 2 + "px"; var editbarHeight = $('.menu_left').height() + 1 + "px";
var containerTop = $('.menu_left').height() + 7 + "px"; var containerTop = $('.menu_left').height() + 6 + "px";
$('#editbar').css("height", editbarHeight); $('#editbar').css("height", editbarHeight);
$('#editorcontainer').css("top", containerTop); $('#editorcontainer').css("top", containerTop);