mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-02-05 12:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2561 from takluyver/notebook-carriage-return

Browse Source 
Fix display of plain text containing multiple carriage returns before line feed
This commit is contained in:
Bussonnier Matthias 2012-11-12 02:14:30 -08:00
commit a0544ec066
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IPython/frontend/html/notebook/static/js/utils.js
View File

@ -195,7 +195,8 @@ IPython.utils = (function (IPython) {
tmp = txt;
do {
txt = tmp;
tmp = txt.replace(/^.*\r(?!\n)/gm, '');
tmp = txt.replace(/\r+\n/gm, '\n'); // \r followed by \n --> newline
tmp = tmp.replace(/^.*\r+/gm, ''); // Other \r --> clear line
} while (tmp.length < txt.length);
return txt;
}