mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-30 12:11:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1982 from minrk/fixCR5

Browse Source 
fix carriage return handling
This commit is contained in:
Thomas Kluyver 2016-12-16 18:16:57 +00:00 committed by GitHub
commit 0c5613b13a
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
notebook/static/base/js/utils.js
View File

@ -445,11 +445,11 @@ define([
// carriage return characters
function fixCarriageReturn(txt) {
txt = txt.replace(/\r+\n/gm, '\n'); // \r followed by \n --> newline
while (txt.search(/\r/g) > -1) {
var base = txt.match(/^.*\r+/m)[0].replace(/\r/, '');
var insert = txt.match(/\r+.*$/m)[0].replace(/\r/, '');
while (txt.search(/\r[^$]/g) > -1) {
var base = txt.match(/^(.*)\r+/m)[1];
var insert = txt.match(/\r+(.*)$/m)[1];
insert = insert + base.slice(insert.length, base.length);
txt = txt.replace(/\r+.*$/m, '\r').replace(/^.*\r+/m, insert);
txt = txt.replace(/\r+.*$/m, '\r').replace(/^.*\r/m, insert);
}
return txt;
}

26
notebook/tests/base/utils.js
View File

@ -48,7 +48,33 @@ casper.notebook_test(function () {
that.test.assertEquals(result, testcase.result, "Overwriting characters processed");
});
var input = [
'hasrn\r\n',
'hasn\n',
'\n',
'abcdef\r',
'hello\n',
'ab3\r',
'x2\r\r',
'1\r',
].join('');
var output = [
'hasrn\n',
'hasn\n',
'\n',
'hellof\n',
'123\r'
].join('');
var result = this.evaluate(function (input) {
return IPython.utils.fixCarriageReturn(input);
}, input);
this.test.assertEquals(result, output, "IPython.utils.fixCarriageReturns works");
// Test load_extensions
this.thenEvaluate(function() {
define('nbextensions/a', [], function() { window.a = true; });
define('nbextensions/c', [], function() { window.c = true; });