public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop

pull/840/merge
johnyma22 2012-06-12 20:35:36 +01:00
parent 63588bd11a 638e4cf9d3
commit 3c02222b03
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/node/utils/ImportHtml.js
View File

@ -20,7 +20,6 @@ var log4js = require('log4js');
var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var Changeset = require("ep_etherpad-lite/static/js/Changeset");
var contentcollector = require("ep_etherpad-lite/static/js/contentcollector"); var contentcollector = require("ep_etherpad-lite/static/js/contentcollector");
var map = require("ep_etherpad-lite/static/js/ace2_common").map;
function setPadHTML(pad, html, callback) function setPadHTML(pad, html, callback)
{ {
@ -50,9 +49,7 @@ function setPadHTML(pad, html, callback)
} }
// Get the new plain text and its attributes // Get the new plain text and its attributes
var newText = map(result.lines, function (e) { var newText = result.lines.join('\n');
return e + '\n';
}).join('');
apiLogger.debug('newText:'); apiLogger.debug('newText:');
apiLogger.debug(newText); apiLogger.debug(newText);
var newAttribs = result.lineAttribs.join('|1+1') + '|1+1'; var newAttribs = result.lineAttribs.join('|1+1') + '|1+1';
@ -62,7 +59,7 @@ function setPadHTML(pad, html, callback)
var attribsIter = Changeset.opIterator(attribs); var attribsIter = Changeset.opIterator(attribs);
var textIndex = 0; var textIndex = 0;
var newTextStart = 0; var newTextStart = 0;
var newTextEnd = newText.length - 1; var newTextEnd = newText.length;
while (attribsIter.hasNext()) while (attribsIter.hasNext())
{ {
var op = attribsIter.next(); var op = attribsIter.next();

2
src/package.json
View File

@ -25,7 +25,7 @@
"log4js" : "0.4.1", "log4js" : "0.4.1",
"jsdom-nocontextifiy" : "0.2.10", "jsdom-nocontextifiy" : "0.2.10",
"async-stacktrace" : "0.0.2", "async-stacktrace" : "0.0.2",
"npm" : "1.1", "npm" : "1.1.24",
"ejs" : "0.6.1", "ejs" : "0.6.1",
"graceful-fs" : "1.1.5", "graceful-fs" : "1.1.5",
"slide" : "1.1.3", "slide" : "1.1.3",