Skip to content

Commit dc7e49f

Browse files
committed
Remove trailing whitespaces
Hoping to minimize future diffs. Not touching vendorized libraries.
1 parent 1cb9c3e commit dc7e49f

28 files changed

+165
-165
lines changed

src/node/hooks/express.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ exports.createServer = function () {
1313
console.log("Report bugs at https://github.com/ether/etherpad-lite/issues")
1414

1515
serverName = `Etherpad ${settings.getGitCommit()} (http://etherpad.org)`;
16-
16+
1717
console.log(`Your Etherpad version is ${settings.getEpVersion()} (${settings.getGitCommit()})`);
1818

1919
exports.restartServer();
@@ -45,7 +45,7 @@ exports.restartServer = function () {
4545
console.log("SSL -- enabled");
4646
console.log(`SSL -- server key file: ${settings.ssl.key}`);
4747
console.log(`SSL -- Certificate Authority's certificate file: ${settings.ssl.cert}`);
48-
48+
4949
var options = {
5050
key: fs.readFileSync( settings.ssl.key ),
5151
cert: fs.readFileSync( settings.ssl.cert )
@@ -57,7 +57,7 @@ exports.restartServer = function () {
5757
options.ca.push(fs.readFileSync(caFileName));
5858
}
5959
}
60-
60+
6161
var https = require('https');
6262
server = https.createServer(options, app);
6363

src/node/hooks/express/socketio.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var padMessageHandler = require("../../handler/PadMessageHandler");
88

99
var cookieParser = require('cookie-parser');
1010
var sessionModule = require('express-session');
11-
11+
1212
exports.expressCreateServer = function (hook_name, args, cb) {
1313
//init socket.io and redirect all requests to the MessageHandler
1414
// there shouldn't be a browser that isn't compatible to all
@@ -57,7 +57,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
5757
// no longer available, details available at:
5858
// http://stackoverflow.com/questions/23981741/minify-socket-io-socket-io-js-with-1-0
5959
// if(settings.minify) io.enable('browser client minification');
60-
60+
6161
//Initalize the Socket.IO Router
6262
socketIORouter.setSocketIO(io);
6363
socketIORouter.addComponent("pad", padMessageHandler);

src/node/hooks/express/static.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ exports.expressCreateServer = function (hook_name, args, cb) {
4040

4141
var clientParts = _(plugins.parts)
4242
.filter(function(part){ return _(part).has('client_hooks') });
43-
43+
4444
var clientPlugins = {};
45-
45+
4646
_(clientParts).chain()
4747
.map(function(part){ return part.plugin })
4848
.uniq()
4949
.each(function(name){
5050
clientPlugins[name] = _(plugins.plugins[name]).clone();
5151
delete clientPlugins[name]['package'];
5252
});
53-
53+
5454
res.header("Content-Type","application/json; charset=utf-8");
5555
res.write(JSON.stringify({"plugins": clientPlugins, "parts": clientParts}));
5656
res.end();

src/node/hooks/express/swagger.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ var API = {
113113
"response": {"groupIDs":{"type":"List", "items":{"type":"string"}}}
114114
},
115115
},
116-
116+
117117
// Author
118118
"author": {
119119
"create" : {
@@ -298,7 +298,7 @@ function capitalise(string){
298298

299299
for (var resource in API) {
300300
for (var func in API[resource]) {
301-
301+
302302
// The base response model
303303
var responseModel = {
304304
"properties": {
@@ -350,7 +350,7 @@ function newSwagger() {
350350
exports.expressCreateServer = function (hook_name, args, cb) {
351351

352352
for (var version in apiHandler.version) {
353-
353+
354354
var swagger = newSwagger();
355355
var basePath = "/rest/" + version;
356356

@@ -437,7 +437,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
437437
};
438438

439439
swagger.configureSwaggerPaths("", "/api" , "");
440-
440+
441441
swagger.configure("http://" + settings.ip + ":" + settings.port + basePath, version);
442442
}
443443
};

src/node/utils/Abiword.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* See the License for the specific language governing permissions and
1818
* limitations under the License.
1919
*/
20-
20+
2121
var spawn = require('child_process').spawn;
2222
var async = require("async");
2323
var settings = require("./Settings");
@@ -34,7 +34,7 @@ if(os.type().indexOf("Windows") > -1)
3434
{
3535
//span an abiword process to perform the conversion
3636
var abiword = spawn(settings.abiword, ["--to=" + task.destFile, task.srcFile]);
37-
37+
3838
//delegate the processing of stdout to another function
3939
abiword.stdout.on('data', function (data)
4040
{
@@ -43,7 +43,7 @@ if(os.type().indexOf("Windows") > -1)
4343
});
4444

4545
//append error messages to the buffer
46-
abiword.stderr.on('data', function (data)
46+
abiword.stderr.on('data', function (data)
4747
{
4848
stdoutBuffer += data.toString();
4949
});
@@ -63,7 +63,7 @@ if(os.type().indexOf("Windows") > -1)
6363
callback();
6464
});
6565
};
66-
66+
6767
exports.convertFile = function(srcFile, destFile, type, callback)
6868
{
6969
doConvertTask({"srcFile": srcFile, "destFile": destFile, "type": type}, callback);
@@ -79,16 +79,16 @@ else
7979
var spawnAbiword = function (){
8080
abiword = spawn(settings.abiword, ["--plugin", "AbiCommand"]);
8181
var stdoutBuffer = "";
82-
var firstPrompt = true;
82+
var firstPrompt = true;
8383

8484
//append error messages to the buffer
85-
abiword.stderr.on('data', function (data)
85+
abiword.stderr.on('data', function (data)
8686
{
8787
stdoutBuffer += data.toString();
8888
});
8989

9090
//abiword died, let's restart abiword and return an error with the callback
91-
abiword.on('exit', function (code)
91+
abiword.on('exit', function (code)
9292
{
9393
spawnAbiword();
9494
stdoutCallback(`Abiword died with exit code ${code}`);
@@ -105,18 +105,18 @@ else
105105
{
106106
//filter the feedback message
107107
var err = stdoutBuffer.search("OK") != -1 ? null : stdoutBuffer;
108-
108+
109109
//reset the buffer
110110
stdoutBuffer = "";
111-
111+
112112
//call the callback with the error message
113113
//skip the first prompt
114114
if(stdoutCallback != null && !firstPrompt)
115115
{
116116
stdoutCallback(err);
117117
stdoutCallback = null;
118118
}
119-
119+
120120
firstPrompt = false;
121121
}
122122
});
@@ -138,7 +138,7 @@ else
138138
}
139139
};
140140
};
141-
141+
142142
//Queue with the converts we have to do
143143
var queue = async.queue(doConvertTask, 1);
144144
exports.convertFile = function(srcFile, destFile, type, callback)

src/node/utils/ExportHtml.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -331,12 +331,12 @@ function getHTMLFromAtext(pad, atext, authorColors)
331331
nextLine = _analyzeLine(textLines[i + 1], attribLines[i + 1], apool);
332332
}
333333
hooks.aCallAll('getLineHTMLForExport', context);
334-
//To create list parent elements
334+
//To create list parent elements
335335
if ((!prevLine || prevLine.listLevel !== line.listLevel) || (prevLine && line.listTypeName !== prevLine.listTypeName))
336336
{
337337
var exists = _.find(openLists, function (item)
338338
{
339-
return (item.level === line.listLevel && item.type === line.listTypeName);
339+
return (item.level === line.listLevel && item.type === line.listTypeName);
340340
});
341341
if (!exists) {
342342
var prevLevel = 0;
@@ -365,7 +365,7 @@ function getHTMLFromAtext(pad, atext, authorColors)
365365
{
366366
pieces.push("<ul class=\"" + line.listTypeName + "\">");
367367
}
368-
}
368+
}
369369
}
370370
}
371371

@@ -398,7 +398,7 @@ function getHTMLFromAtext(pad, atext, authorColors)
398398
{
399399
pieces.push("</li>");
400400
}
401-
401+
402402
if (line.listTypeName === "number")
403403
{
404404
pieces.push("</ol>");
@@ -407,7 +407,7 @@ function getHTMLFromAtext(pad, atext, authorColors)
407407
{
408408
pieces.push("</ul>");
409409
}
410-
}
410+
}
411411
}
412412
}
413413
else//outside any list, need to close line.listLevel of lists

src/node/utils/customError.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ function customError(message, errorName)
55
{
66
this.name = errorName || "Error";
77
this.message = message;
8-
8+
99
var stackParts = new Error().stack.split("\n");
1010
stackParts.splice(0,2);
1111
stackParts.unshift(this.name + ": " + message);
12-
12+
1313
this.stack = stackParts.join("\n");
1414
}
1515
customError.prototype = Error.prototype;

src/static/js/AttributePool.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,6 @@ AttributePool.prototype.fromJsonable = function (obj) {
9191
}
9292
return this;
9393
};
94-
9594

96-
module.exports = AttributePool;
95+
96+
module.exports = AttributePool;

0 commit comments

Comments
 (0)