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 27

make additional line break at end of imported doc

Browse source
This commit is contained in:
John McLear 2014-11-26 15:19:22 +00:00
parent 8851b8ab6b
commit 0a84379364
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/installDeps.sh
View file

@ -99,7 +99,7 @@ fi
echo "Clear minfified cache..." echo "Clear minfified cache..."
rm -f var/minified* rm -f var/minified*
echo "ensure custom css/js files are created..." echo "Ensure custom css/js files are created..."
for f in "index" "pad" "timeslider" for f in "index" "pad" "timeslider"
do do

2
bin/run.sh
View file

@ -32,7 +32,7 @@ fi
bin/installDeps.sh $* || exit 1 bin/installDeps.sh $* || exit 1
#Move to the node folder and start #Move to the node folder and start
echo "start..." echo "Started Etherpad..."
SCRIPTPATH=`pwd -P` SCRIPTPATH=`pwd -P`
node $SCRIPTPATH/node_modules/ep_etherpad-lite/node/server.js $* node $SCRIPTPATH/node_modules/ep_etherpad-lite/node/server.js $*

6
src/node/utils/ImportHtml.js
View file

@ -24,8 +24,12 @@ function setPadHTML(pad, html, callback)
var apiLogger = log4js.getLogger("ImportHtml"); var apiLogger = log4js.getLogger("ImportHtml");
var $ = cheerio.load(html); var $ = cheerio.load(html);
var doc = $('html')[0];
// Appends a line break, used by Etherpad to ensure a caret is available
// below the last line of an import
$('body').append("<p></p>");
var doc = $('html')[0];
apiLogger.debug('html:'); apiLogger.debug('html:');
apiLogger.debug(html); apiLogger.debug(html);