mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-21 16:06:16 -04:00
9497ee734f
This change is only cosmetic. Its aim is do make it easier to understand the
async changes that are going to be merged later on. It was extracted from the
original work from Ray Bellis.
To verify that nothing has changed, you can run the following command on each
file touched by this commit:
npm install uglify-es
diff --unified <(uglify-js --beautify bracketize <BEFORE.js>) <(uglify-js --beautify bracketize <AFTER.js>)
This is a complete script that does the same automatically (works from a
mercurial clone):
```bash
#!/usr/bin/env bash
set -eu
REVISION=<THIS_REVISION>
PARENT_REV=$(hg identify --rev "${REVISION}" --template '{p1rev}')
FILE_LIST=$(hg status --no-status --change ${REVISION})
UGLIFYJS="node_modules/uglify-es/bin/uglifyjs"
for FILE_NAME in ${FILE_LIST[@]}; do
echo "Checking ${FILE_NAME}"
diff --unified \
<("${UGLIFYJS}" --beautify bracketize <(hg cat --rev "${PARENT_REV}" "${FILE_NAME}")) \
<("${UGLIFYJS}" --beautify bracketize <(hg cat --rev "${REVISION}" "${FILE_NAME}"))
done
```
49 lines
1.7 KiB
JavaScript
49 lines
1.7 KiB
JavaScript
var hasPadAccess = require("../../padaccess");
|
|
var settings = require('../../utils/Settings');
|
|
var exportHandler = require('../../handler/ExportHandler');
|
|
var importHandler = require('../../handler/ImportHandler');
|
|
var padManager = require("../../db/PadManager");
|
|
|
|
exports.expressCreateServer = function (hook_name, args, cb) {
|
|
args.app.get('/p/:pad/:rev?/export/:type', function(req, res, next) {
|
|
var types = ["pdf", "doc", "txt", "html", "odt", "etherpad"];
|
|
//send a 404 if we don't support this filetype
|
|
if (types.indexOf(req.params.type) == -1) {
|
|
next();
|
|
return;
|
|
}
|
|
|
|
// if abiword is disabled, and this is a format we only support with abiword, output a message
|
|
if (settings.exportAvailable() == "no" &&
|
|
["odt", "pdf", "doc"].indexOf(req.params.type) !== -1) {
|
|
res.send("This export is not enabled at this Etherpad instance. Set the path to Abiword or SOffice in settings.json to enable this feature");
|
|
return;
|
|
}
|
|
|
|
res.header("Access-Control-Allow-Origin", "*");
|
|
|
|
hasPadAccess(req, res, function() {
|
|
console.log('req.params.pad', req.params.pad);
|
|
padManager.doesPadExists(req.params.pad, function(err, exists) {
|
|
if (!exists) {
|
|
return next();
|
|
}
|
|
|
|
exportHandler.doExport(req, res, req.params.pad, req.params.type);
|
|
});
|
|
});
|
|
});
|
|
|
|
// handle import requests
|
|
args.app.post('/p/:pad/import', function(req, res, next) {
|
|
hasPadAccess(req, res, function() {
|
|
padManager.doesPadExists(req.params.pad, function(err, exists) {
|
|
if (!exists) {
|
|
return next();
|
|
}
|
|
|
|
importHandler.doImport(req, res, req.params.pad);
|
|
});
|
|
});
|
|
});
|
|
}
|