From 503fc13fda0f37e36f58454e70aa82490bf41170 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 27 Dec 2014 17:23:13 +0100 Subject: [PATCH] recover stability but still have a server msg --- src/node/db/API.js | 1 - src/node/utils/ImportHtml.js | 1 - tests/backend/specs/api/pad.js | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/node/db/API.js b/src/node/db/API.js index bf8afacf0..dc49ab96e 100644 --- a/src/node/db/API.js +++ b/src/node/db/API.js @@ -416,7 +416,6 @@ exports.setHTML = function(padID, html, callback) }else{ //update the clients on the pad padMessageHandler.updatePadClients(pad, callback); - callback(); return; } }); diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js index 6bcf078d3..3ca91caf4 100644 --- a/src/node/utils/ImportHtml.js +++ b/src/node/utils/ImportHtml.js @@ -22,7 +22,6 @@ var cheerio = require("cheerio"); function setPadHTML(pad, html, callback) { var apiLogger = log4js.getLogger("ImportHtml"); -console.warn("setting padhtml"); var $ = cheerio.load(html); // Appends a line break, used by Etherpad to ensure a caret is available // below the last line of an import diff --git a/tests/backend/specs/api/pad.js b/tests/backend/specs/api/pad.js index a5634d605..5ee6bdd8f 100644 --- a/tests/backend/specs/api/pad.js +++ b/tests/backend/specs/api/pad.js @@ -294,7 +294,7 @@ describe('setHTML', function(){ describe('setHTML', function(){ it('Sets the HTML of a Pad attempting to pass ugly HTML', function(done) { - var html = ""; + var html = ""; api.get(endPoint('setHTML')+"&padID=test&html="+html) .expect(function(res){ if(res.body.code !== 0) throw new Error("List HTML cant be imported")