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

Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles

Browse source
This commit is contained in:
John McLear 2014-12-21 23:12:59 +00:00
commit 12aac2d0d0
12 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/node/db/API.js
View file

@ -263,7 +263,7 @@ exports.getText = function(padID, rev, callback)
{
if(ERR(err, callback)) return;
data = {text: atext.text};
var data = {text: atext.text};
callback(null, data);
})
@ -368,7 +368,7 @@ exports.getHTML = function(padID, rev, callback)
if(ERR(err, callback)) return;
html = "<!DOCTYPE HTML><html><body>" +html; // adds HTML head
html += "</body></html>";
data = {html: html};
var data = {html: html};
callback(null, data);
});
}
@ -380,7 +380,7 @@ exports.getHTML = function(padID, rev, callback)
if(ERR(err, callback)) return;
html = "<!DOCTYPE HTML><html><body>" +html; // adds HTML head
html += "</body></html>";
data = {html: html};
var data = {html: html};
callback(null, data);
});
}

4
src/node/db/Pad.js
View file

@ -135,7 +135,7 @@ Pad.prototype.getRevisionDate = function getRevisionDate(revNum, callback) {
Pad.prototype.getAllAuthors = function getAllAuthors() {
var authors = [];
for(key in this.pool.numToAttrib)
for(var key in this.pool.numToAttrib)
{
if(this.pool.numToAttrib[key][0] == "author" && this.pool.numToAttrib[key][1] != "")
{
@ -690,7 +690,7 @@ Pad.prototype.isPasswordProtected = function isPasswordProtected() {
Pad.prototype.addSavedRevision = function addSavedRevision(revNum, savedById, label) {
//if this revision is already saved, return silently
for(var i in this.savedRevisions){
if(this.savedRevisions.revNum === revNum){
if(this.savedRevisions[i] && this.savedRevisions[i].revNum === revNum){
return;
}
}

2
src/node/eejs/index.js
View file

@ -71,7 +71,7 @@ exports.begin_define_block = function (name) {
}
exports.end_define_block = function () {
content = exports.end_capture();
var content = exports.end_capture();
return content;
}

2
src/node/hooks/express.js
View file

@ -56,7 +56,7 @@ exports.restartServer = function () {
console.log( "SSL -- server key file: " + settings.ssl.key );
console.log( "SSL -- Certificate Authority's certificate file: " + settings.ssl.cert );
options = {
var options = {
key: fs.readFileSync( settings.ssl.key ),
cert: fs.readFileSync( settings.ssl.cert )
};