##// END OF EJS Templates
Merge pull request #3267 from minrk/forreals...
Merge pull request #3267 from minrk/forreals add missing return

File last commit:

r10453:3cf26cde
r10548:f6499360 merge
Show More
utils.js
291 lines | 10.7 KiB | application/javascript | JavascriptLexer
Brian E. Granger
More review changes....
r4609 //----------------------------------------------------------------------------
Aron Ahmadia
partial refactor, can't quite get environments working
r8565 // Copyright (C) 2008-2012 The IPython Development Team
Brian E. Granger
More review changes....
r4609 //
// Distributed under the terms of the BSD License. The full license is in
// the file COPYING, distributed as part of this software.
//----------------------------------------------------------------------------
Brian E. Granger
Splitting notebook.js into muliple files for development ease.
r4349
//============================================================================
// Utilities
//============================================================================
Stefan van der Walt
Clean up javascript based on js2-mode feedback.
r5479 IPython.namespace('IPython.utils');
Brian E. Granger
Splitting notebook.js into muliple files for development ease.
r4349
Brian E. Granger
Implemented module and namespace pattern in js notebook.
r4352 IPython.utils = (function (IPython) {
Aron Ahmadia
partial refactor, can't quite get environments working
r8565 //============================================================================
// Cross-browser RegEx Split
//============================================================================
// This code has been MODIFIED from the code licensed below to not replace the
// default browser split. The license is reproduced here.
// see http://blog.stevenlevithan.com/archives/cross-browser-split for more info:
/*!
* Cross-Browser Split 1.1.1
* Copyright 2007-2012 Steven Levithan <stevenlevithan.com>
* Available under the MIT License
* ECMAScript compliant, uniform cross-browser split method
*/
/**
* Splits a string into an array of strings using a regex or string
* separator. Matches of the separator are not included in the result array.
* However, if `separator` is a regex that contains capturing groups,
* backreferences are spliced into the result each time `separator` is
* matched. Fixes browser bugs compared to the native
* `String.prototype.split` and can be used reliably cross-browser.
* @param {String} str String to split.
* @param {RegExp|String} separator Regex or string to use for separating
* the string.
* @param {Number} [limit] Maximum number of items to include in the result
* array.
* @returns {Array} Array of substrings.
* @example
*
* // Basic use
* regex_split('a b c d', ' ');
* // -> ['a', 'b', 'c', 'd']
*
* // With limit
* regex_split('a b c d', ' ', 2);
* // -> ['a', 'b']
*
* // Backreferences in result array
* regex_split('..word1 word2..', /([a-z]+)(\d+)/i);
* // -> ['..', 'word', '1', ' ', 'word', '2', '..']
*/
var regex_split = function (str, separator, limit) {
// If `separator` is not a regex, use `split`
if (Object.prototype.toString.call(separator) !== "[object RegExp]") {
return split.call(str, separator, limit);
}
var output = [],
flags = (separator.ignoreCase ? "i" : "") +
(separator.multiline ? "m" : "") +
(separator.extended ? "x" : "") + // Proposed for ES6
(separator.sticky ? "y" : ""), // Firefox 3+
lastLastIndex = 0,
// Make `global` and avoid `lastIndex` issues by working with a copy
separator = new RegExp(separator.source, flags + "g"),
separator2, match, lastIndex, lastLength;
str += ""; // Type-convert
Mikhail Korobov
Some bugs in js (mostly scoping bugs) are fixed
r8839 var compliantExecNpcg = typeof(/()??/.exec("")[1]) === "undefined"
Aron Ahmadia
partial refactor, can't quite get environments working
r8565 if (!compliantExecNpcg) {
// Doesn't need flags gy, but they don't hurt
separator2 = new RegExp("^" + separator.source + "$(?!\\s)", flags);
}
/* Values for `limit`, per the spec:
* If undefined: 4294967295 // Math.pow(2, 32) - 1
* If 0, Infinity, or NaN: 0
* If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
* If negative number: 4294967296 - Math.floor(Math.abs(limit))
* If other: Type-convert, then use the above rules
*/
limit = typeof(limit) === "undefined" ?
-1 >>> 0 : // Math.pow(2, 32) - 1
limit >>> 0; // ToUint32(limit)
while (match = separator.exec(str)) {
// `separator.lastIndex` is not reliable cross-browser
lastIndex = match.index + match[0].length;
if (lastIndex > lastLastIndex) {
output.push(str.slice(lastLastIndex, match.index));
// Fix browsers whose `exec` methods don't consistently return `undefined` for
// nonparticipating capturing groups
if (!compliantExecNpcg && match.length > 1) {
match[0].replace(separator2, function () {
for (var i = 1; i < arguments.length - 2; i++) {
if (typeof(arguments[i]) === "undefined") {
match[i] = undefined;
}
}
});
}
if (match.length > 1 && match.index < str.length) {
Array.prototype.push.apply(output, match.slice(1));
}
lastLength = match[0].length;
lastLastIndex = lastIndex;
if (output.length >= limit) {
break;
}
}
if (separator.lastIndex === match.index) {
separator.lastIndex++; // Avoid an infinite loop
}
}
if (lastLastIndex === str.length) {
if (lastLength || !separator.test("")) {
output.push("");
}
} else {
output.push(str.slice(lastLastIndex));
}
return output.length > limit ? output.slice(0, limit) : output;
};
//============================================================================
// End contributed Cross-browser RegEx Split
//============================================================================
Brian E. Granger
Implemented module and namespace pattern in js notebook.
r4352 var uuid = function () {
// http://www.ietf.org/rfc/rfc4122.txt
var s = [];
var hexDigits = "0123456789ABCDEF";
for (var i = 0; i < 32; i++) {
s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
}
s[12] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
s[16] = hexDigits.substr((s[16] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
var uuid = s.join("");
return uuid;
};
//Fix raw text to parse correctly in crazy XML
function xmlencode(string) {
return string.replace(/\&/g,'&'+'amp;')
.replace(/</g,'&'+'lt;')
.replace(/>/g,'&'+'gt;')
.replace(/\'/g,'&'+'apos;')
.replace(/\"/g,'&'+'quot;')
Stefan van der Walt
Clean up javascript based on js2-mode feedback.
r5479 .replace(/`/g,'&'+'#96;');
Brian E. Granger
Splitting notebook.js into muliple files for development ease.
r4349 }
Brian E. Granger
Implemented module and namespace pattern in js notebook.
r4352
Brian E. Granger
Pager is working again.
r4361
Brian E. Granger
Implemented module and namespace pattern in js notebook.
r4352 //Map from terminal commands to CSS classes
Mikhail Korobov
Some bugs in js (mostly scoping bugs) are fixed
r8839 var ansi_colormap = {
MinRK
use much faster regexp for ansi coloring...
r10250 "01":"ansibold",
"30":"ansiblack",
"31":"ansired",
"32":"ansigreen",
"33":"ansiyellow",
"34":"ansiblue",
"35":"ansipurple",
"36":"ansicyan",
"37":"ansigrey"
Stefan van der Walt
Clean up javascript based on js2-mode feedback.
r5479 };
Brian E. Granger
Implemented module and namespace pattern in js notebook.
r4352
MinRK
use much faster regexp for ansi coloring...
r10250 function ansispan(str) {
// ansispan function adapted from github.com/mmalecki/ansispan (MIT License)
Object.keys(ansi_colormap).forEach(function(ansi) {
var span = '<span class="' + ansi_colormap[ansi] + '">';
//
// `\033[Xm` == `\033[0;Xm` sets foreground color to `X`.
//
str = str.replace(
new RegExp('\033\\[([01];)?' + ansi + 'm', 'g'), span
);
});
str = str.replace(/\033\[([01]|39|22)?m/g, '</span>');
return str;
};
Michael Droettboom
Handle carriage return characters ("\r") in HTML notebook output....
r7339 // Transform ANSI color escape codes into HTML <span> tags with css
Brian Granger
Colors now working in tracebacks and the pager....
r4383 // classes listed in the above ansi_colormap object. The actual color used
// are set in the css file.
Brian E. Granger
Implemented module and namespace pattern in js notebook.
r4352 function fixConsole(txt) {
Stefan van der Walt
Clean up javascript based on js2-mode feedback.
r5479 txt = xmlencode(txt);
MinRK
[notebook] clear_output is handled after a delay...
r6423 var re = /\033\[([\dA-Fa-f;]*?)m/;
Stefan van der Walt
Clean up javascript based on js2-mode feedback.
r5479 var opened = false;
var cmds = [];
var opener = "";
var closer = "";
Jack Feser
Strip non color related ANSI escape sequences from notebook output....
r10140
// Strip all ANSI codes that are not color related. Matches
// all ANSI codes that do not end with "m".
var ignored_re = /(?=(\033\[[\d;=]*[a-ln-zA-Z]{1}))\1(?!m)/g;
txt = txt.replace(ignored_re, "");
MinRK
use much faster regexp for ansi coloring...
r10250
// color ansi codes
txt = ansispan(txt);
Stefan van der Walt
Clean up javascript based on js2-mode feedback.
r5479 return txt;
Brian E. Granger
Implemented module and namespace pattern in js notebook.
r4352 }
Michael Droettboom
Fix carriage-return handling regular expression so it doesn't treat "\r\n" as "\r".
r7338 // Remove chunks that should be overridden by the effect of
// carriage return characters
function fixCarriageReturn(txt) {
Mikhail Korobov
Some bugs in js (mostly scoping bugs) are fixed
r8839 var tmp = txt;
Michael Droettboom
Fix carriage-return handling regular expression so it doesn't treat "\r\n" as "\r".
r7338 do {
txt = tmp;
Thomas Kluyver
Fix display of plain text containing multiple carriage returns before line feed....
r8702 tmp = txt.replace(/\r+\n/gm, '\n'); // \r followed by \n --> newline
tmp = tmp.replace(/^.*\r+/gm, ''); // Other \r --> clear line
Michael Droettboom
Fix carriage-return handling regular expression so it doesn't treat "\r\n" as "\r".
r7338 } while (tmp.length < txt.length);
return txt;
}
Brian E. Granger
Pager is working again.
r4361
MinRK
fix regular expression for detecting links in stdout...
r10045 // Locate any URLs and convert them to a anchor tag
Erik M. Bray
Locate URLs in text output and convert them to hyperlinks.
r8528 function autoLinkUrls(txt) {
MinRK
fix regular expression for detecting links in stdout...
r10045 return txt.replace(/(^|\s)(https?|ftp)(:[^'">\s]+)/gi,
"$1<a target=\"_blank\" href=\"$2$3\">$2$3</a>");
Erik M. Bray
Locate URLs in text output and convert them to hyperlinks.
r8528 }
Matthias BUSSONNIER
add a keycodes structure to utils...
r7136 // some keycodes that seem to be platform/browser independant
var keycodes ={
Matthias BUSSONNIER
Uppercase constant keycode in utils.js
r7193 BACKSPACE: 8,
TAB : 9,
ENTER : 13,
SHIFT : 16,
CTRL : 17,
CONTROL : 17,
Brian Granger
Misc fixes to the code cell and output area.
r7199 ALT : 18,
Juergen Hasch
Add new keycodes
r10237 CAPS_LOCK: 20,
Matthias BUSSONNIER
Uppercase constant keycode in utils.js
r7193 ESC : 27,
SPACE : 32,
PGUP : 33,
PGDOWN : 34,
Juergen Hasch
Add new keycodes
r10237 END : 35,
HOME : 36,
Matthias BUSSONNIER
Uppercase constant keycode in utils.js
r7193 LEFT_ARROW: 37,
LEFTARROW: 37,
LEFT : 37,
UP_ARROW : 38,
UPARROW : 38,
UP : 38,
RIGHT_ARROW:39,
RIGHTARROW:39,
RIGHT : 39,
DOWN_ARROW: 40,
DOWNARROW: 40,
DOWN : 40,
Juergen Hasch
Add COMMAND keycode
r10246 COMMAND : 91,
Matthias BUSSONNIER
add a keycodes structure to utils...
r7136 };
Brian E. Granger
Pager is working again.
r4361
Brian Granger
Resolving conflict in utils.js.
r7353
Mikhail Korobov
Some bugs in js (mostly scoping bugs) are fixed
r8839 var points_to_pixels = function (points) {
Brian Granger
Resolving conflict in utils.js.
r7353 // A reasonably good way of converting between points and pixels.
var test = $('<div style="display: none; width: 10000pt; padding:0; border:0;"></div>');
$(body).append(test);
var pixel_per_point = test.width()/10000;
test.remove();
return Math.floor(points*pixel_per_point);
Mikhail Korobov
Some bugs in js (mostly scoping bugs) are fixed
r8839 };
Brian Granger
Resolving conflict in utils.js.
r7353
Brian E. Granger
Removing call to $.browser which went away in jQuery 1.9....
r9227 // http://stackoverflow.com/questions/2400935/browser-detection-in-javascript
browser = (function() {
var N= navigator.appName, ua= navigator.userAgent, tem;
var M= ua.match(/(opera|chrome|safari|firefox|msie)\/?\s*(\.?\d+(\.\d+)*)/i);
if (M && (tem= ua.match(/version\/([\.\d]+)/i))!= null) M[2]= tem[1];
M= M? [M[1], M[2]]: [N, navigator.appVersion,'-?'];
return M;
})();
Brian Granger
Resolving conflict in utils.js.
r7353
Brian E. Granger
Implemented module and namespace pattern in js notebook.
r4352 return {
Aron Ahmadia
partial refactor, can't quite get environments working
r8565 regex_split : regex_split,
Brian E. Granger
Implemented module and namespace pattern in js notebook.
r4352 uuid : uuid,
Brian E. Granger
Pager is working again.
r4361 fixConsole : fixConsole,
Matthias BUSSONNIER
add a keycodes structure to utils...
r7136 keycodes : keycodes,
Min RK
fix missing comma
r7357 fixCarriageReturn : fixCarriageReturn,
Erik M. Bray
Locate URLs in text output and convert them to hyperlinks.
r8528 autoLinkUrls : autoLinkUrls,
Brian E. Granger
Removing call to $.browser which went away in jQuery 1.9....
r9227 points_to_pixels : points_to_pixels,
browser : browser
Stefan van der Walt
Clean up javascript based on js2-mode feedback.
r5479 };
Brian E. Granger
Implemented module and namespace pattern in js notebook.
r4352
}(IPython));
Brian E. Granger
Removing call to $.browser which went away in jQuery 1.9....
r9227