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

Fix display of plain text containing multiple carriage returns before line feed
13 years ago · a0544ec066
parent 1f79f5b89e 015e8e73f4
commit a0544ec066
1 changed files with 2 additions and 1 deletions
--- a/IPython/frontend/html/notebook/static/js/utils.js
+++ b/IPython/frontend/html/notebook/static/js/utils.js
@ -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;
    }