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

reverts the changes I didn't like/understand

This commit is contained in:
Peter 'Pita' Martischka 2011-07-07 18:09:08 +01:00
parent 7cf1a50fff
commit 822d854882
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
node/db.js
View File

@ -28,7 +28,7 @@ var db = new ueberDB.database(settings.dbType, settings.dbSettings);
/**
* The UeberDB Object that provides the database functions
*/
exports.db = db;
exports.db = null;
/**
* Initalizes the database with the settings provided by the settings module
@ -49,6 +49,7 @@ exports.init = function(callback)
//everything ok
else
{
exports.db = db;
callback(null);
}
});

10
node/server.js
View File

@ -31,8 +31,6 @@ var async = require('async');
var express = require('express');
var path = require('path');
var minify = require('./minify');
var exporthtml = require("./exporters/exporthtml");
var padManager = require("./PadManager");
//try to get the git version
var version = "";
@ -109,14 +107,6 @@ async.waterfall([
res.sendfile(filePath, { maxAge: exports.maxAge });
});
app.get("/p/:pad/html", function (req, res) {
padManager.getPad(req.params.pad, function (err, pad) {
exporthtml.getPadHTMLDocument(pad, null, false, function (err, html) {
res.send(html);
});
});
});
//serve timeslider.html under /p/$padname/timeslider
app.get('/p/:pad/timeslider', function(req, res, next)
{