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

Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-12-11 18:09:51 +01:00
commit c72cd49ede
7 changed files with 378 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
node/handler/ExportHandler.js
View file

@ -20,6 +20,7 @@
var ERR = require("async-stacktrace");
var exporthtml = require("../utils/ExportHtml");
var exportdokuwiki = require("../utils/ExportDokuWiki");
var padManager = require("../db/PadManager");
var async = require("async");
var fs = require("fs");
@ -56,6 +57,26 @@ exports.doExport = function(req, res, padId, type)
res.send(pad.text());
});
}
else if(type == 'dokuwiki')
{
var randNum;
var srcFile, destFile;
async.series([
//render the dokuwiki document
function(callback)
{
exportdokuwiki.getPadDokuWikiDocument(padId, null, function(err, dokuwiki)
{
res.send(dokuwiki);
callback("stop");
});
},
], function(err)
{
if(err && err != "stop") throw err;
});
}
else
{
var html;