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

Remove the noDocType argument, which was only ever passed as false.

Browse source
This commit is contained in:
Dan Bornstein 2016-09-08 09:41:23 -07:00
parent 6d7f128b87
commit 879ae7c67d
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/handler/ExportHandler.js
View file

@ -92,7 +92,7 @@ exports.doExport = function(req, res, padId, type)
//render the html document //render the html document
function(callback) 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; if(ERR(err, callback)) return;
html = _html; html = _html;

4
src/node/hooks/express/padreadonly.js
View file

@ -7,7 +7,7 @@ var exporthtml = require("../../utils/ExportHtml");
exports.expressCreateServer = function (hook_name, args, cb) { exports.expressCreateServer = function (hook_name, args, cb) {
//serve read only pad //serve read only pad
args.app.get('/ro/:id', function(req, res) args.app.get('/ro/:id', function(req, res)
{ {
var html; var html;
var padId; var padId;
@ -40,7 +40,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
hasPadAccess(req, res, function() hasPadAccess(req, res, function()
{ {
//render the html document //render the html document
exporthtml.getPadHTMLDocument(padId, null, false, function(err, _html) exporthtml.getPadHTMLDocument(padId, null, function(err, _html)
{ {
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
html = _html; html = _html;

3
src/node/utils/ExportHtml.js
View file

@ -479,7 +479,7 @@ function getHTMLFromAtext(pad, atext, authorColors)
return pieces.join(''); return pieces.join('');
} }
exports.getPadHTMLDocument = function (padId, revNum, noDocType, callback) exports.getPadHTMLDocument = function (padId, revNum, callback)
{ {
padManager.getPad(padId, function (err, pad) padManager.getPad(padId, function (err, pad)
{ {
@ -497,7 +497,6 @@ exports.getPadHTMLDocument = function (padId, revNum, noDocType, callback)
if(ERR(err, callback)) return; if(ERR(err, callback)) return;
var exportedDoc = eejs.require("ep_etherpad-lite/templates/export_html.html", { var exportedDoc = eejs.require("ep_etherpad-lite/templates/export_html.html", {
body: html, body: html,
doctype: noDocType ? '' : '<!doctype html>',
padId: Security.escapeHTML(padId), padId: Security.escapeHTML(padId),
extraCSS: stylesForExportCSS extraCSS: stylesForExportCSS
}); });

2
src/templates/export_html.html
View file

@ -1,4 +1,4 @@
<%- doctype %> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<title><%- padId %></title> <title><%- padId %></title>