mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed all requires

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-07-27 18:52:23 +01:00
parent 8736b945c3
commit 2aafcc1027
12 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
node/utils/ExportHtml.js
View file

@ -14,8 +14,8 @@
* limitations under the License.
*/
var async = require("async");
var Changeset = require("../Changeset");
var padManager = require("../PadManager");
var Changeset = require("./Changeset");
var padManager = require("../db/PadManager");
function getPadPlainText(pad, revNum) {

8
node/utils/Minify.js
View file

@ -19,7 +19,7 @@
* limitations under the License.
*/
var settings = require('./settings');
var settings = require('./Settings');
var async = require('async');
var fs = require('fs');
var cleanCSS = require('clean-css');
@ -28,7 +28,7 @@ var pro = require("uglify-js").uglify;
var path = require('path');
var Buffer = require('buffer').Buffer;
var gzip = require('gzip');
var server = require('./server');
var server = require('../server');
var padJS = ["jquery.min.js", "pad_utils.js", "plugins.js", "undo-xpopup.js", "json2.js", "pad_cookie.js", "pad_editor.js", "pad_editbar.js", "pad_docbar.js", "pad_modals.js", "ace.js", "collab_client.js", "pad_userlist.js", "pad_impexp.js", "pad_savedrevs.js", "pad_connectionstatus.js", "pad2.js", "jquery-ui.js", "chat.js"];
@ -240,12 +240,12 @@ exports.minifyJS = function(req, res, jsFilename)
var pathStr;
if(gzipSupport)
{
pathStr = path.normalize(__dirname + "/../var/minified_" + jsFilename + ".gz");
pathStr = path.normalize(__dirname + "/../../var/minified_" + jsFilename + ".gz");
res.header('Content-Encoding', 'gzip');
}
else
{
pathStr = path.normalize(__dirname + "/../var/minified_" + jsFilename );
pathStr = path.normalize(__dirname + "/../../var/minified_" + jsFilename );
}
res.sendfile(pathStr, { maxAge: server.maxAge });