fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2350 from ether/require-kernel-change 

Require kernel change
This commit is contained in:
John McLear 2014-11-30 23:30:00 +00:00
parent d7e980cd47 6fea3a25f8
commit b5a0767f32
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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"
}, },