diff options
| author | Dan Bornstein <danfuzz@milk.com> | 2016-09-08 09:41:23 -0700 |
|---|---|---|
| committer | Dan Bornstein <danfuzz@milk.com> | 2016-09-08 09:41:23 -0700 |
| commit | 879ae7c67d6b0c7fa78e0e09435861e5509678a8 (patch) | |
| tree | 6d0efc6ca65ed08fefe763ce7b65d52bf7857f5d | |
| parent | 6d7f128b870cc405151e44484a35999a0cbb69b0 (diff) | |
| download | etherpad-lite-879ae7c67d6b0c7fa78e0e09435861e5509678a8.zip | |
Remove the `noDocType` argument, which was only ever passed as `false`.
| -rw-r--r-- | src/node/handler/ExportHandler.js | 2 | ||||
| -rw-r--r-- | src/node/hooks/express/padreadonly.js | 4 | ||||
| -rw-r--r-- | src/node/utils/ExportHtml.js | 3 | ||||
| -rw-r--r-- | src/templates/export_html.html | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/node/handler/ExportHandler.js b/src/node/handler/ExportHandler.js index 8f91ced2..7cce6200 100644 --- a/src/node/handler/ExportHandler.js +++ b/src/node/handler/ExportHandler.js @@ -92,7 +92,7 @@ exports.doExport = function(req, res, padId, type) //render the html document function(callback) { - exporthtml.getPadHTMLDocument(padId, req.params.rev, false, function(err, _html) + exporthtml.getPadHTMLDocument(padId, req.params.rev, function(err, _html) { if(ERR(err, callback)) return; html = _html; diff --git a/src/node/hooks/express/padreadonly.js b/src/node/hooks/express/padreadonly.js index 66be3339..bff8adf7 100644 --- a/src/node/hooks/express/padreadonly.js +++ b/src/node/hooks/express/padreadonly.js @@ -7,7 +7,7 @@ var exporthtml = require("../../utils/ExportHtml"); exports.expressCreateServer = function (hook_name, args, cb) { //serve read only pad args.app.get('/ro/:id', function(req, res) - { + { var html; var padId; @@ -40,7 +40,7 @@ exports.expressCreateServer = function (hook_name, args, cb) { hasPadAccess(req, res, function() { //render the html document - exporthtml.getPadHTMLDocument(padId, null, false, function(err, _html) + exporthtml.getPadHTMLDocument(padId, null, function(err, _html) { if(ERR(err, callback)) return; html = _html; diff --git a/src/node/utils/ExportHtml.js b/src/node/utils/ExportHtml.js index f2e275ee..bd177ac4 100644 --- a/src/node/utils/ExportHtml.js +++ b/src/node/utils/ExportHtml.js @@ -479,7 +479,7 @@ function getHTMLFromAtext(pad, atext, authorColors) return pieces.join(''); } -exports.getPadHTMLDocument = function (padId, revNum, noDocType, callback) +exports.getPadHTMLDocument = function (padId, revNum, callback) { padManager.getPad(padId, function (err, pad) { @@ -497,7 +497,6 @@ exports.getPadHTMLDocument = function (padId, revNum, noDocType, callback) if(ERR(err, callback)) return; var exportedDoc = eejs.require("ep_etherpad-lite/templates/export_html.html", { body: html, - doctype: noDocType ? '' : '<!doctype html>', padId: Security.escapeHTML(padId), extraCSS: stylesForExportCSS }); diff --git a/src/templates/export_html.html b/src/templates/export_html.html index 24e83ac2..b8893b71 100644 --- a/src/templates/export_html.html +++ b/src/templates/export_html.html @@ -1,4 +1,4 @@ -<%- doctype %> +<!doctype html> <html lang="en"> <head> <title><%- padId %></title> |