diff --git a/IPython/frontend/html/notebook/static/js/celltoolbar.js b/IPython/frontend/html/notebook/static/js/celltoolbar.js index c75e677..f85688c 100644 --- a/IPython/frontend/html/notebook/static/js/celltoolbar.js +++ b/IPython/frontend/html/notebook/static/js/celltoolbar.js @@ -202,7 +202,6 @@ var IPython = (function (IPython) { for (var k in CellToolbar._presets) { keys.push(k); } - console.log(keys); return keys; }; diff --git a/IPython/frontend/html/notebook/static/js/celltoolbarpresets/example.js b/IPython/frontend/html/notebook/static/js/celltoolbarpresets/example.js index 46224ed..8f26c4e 100644 --- a/IPython/frontend/html/notebook/static/js/celltoolbarpresets/example.js +++ b/IPython/frontend/html/notebook/static/js/celltoolbarpresets/example.js @@ -149,6 +149,6 @@ example_preset.push('example.help') CellToolbar.register_preset('Example',example_preset); - console.log('Example extension for metadata editting loaded.'); + console.log('Example extension for metadata editing loaded.'); }(IPython)); diff --git a/IPython/frontend/html/notebook/static/js/outputarea.js b/IPython/frontend/html/notebook/static/js/outputarea.js index 89cdcf3..f38e5ab 100644 --- a/IPython/frontend/html/notebook/static/js/outputarea.js +++ b/IPython/frontend/html/notebook/static/js/outputarea.js @@ -79,7 +79,7 @@ var IPython = (function (IPython) { this.element.resize(function () { // FIXME: Firefox on Linux misbehaves, so automatic scrolling is disabled - if ( $.browser.mozilla ) { + if ( IPython.utils.browser[0] === "Firefox" ) { return; } // maybe scroll output, diff --git a/IPython/frontend/html/notebook/static/js/utils.js b/IPython/frontend/html/notebook/static/js/utils.js index 7e66083..49cd18b 100644 --- a/IPython/frontend/html/notebook/static/js/utils.js +++ b/IPython/frontend/html/notebook/static/js/utils.js @@ -272,6 +272,15 @@ IPython.utils = (function (IPython) { return Math.floor(points*pixel_per_point); }; + // 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; + })(); + return { regex_split : regex_split, @@ -282,7 +291,9 @@ IPython.utils = (function (IPython) { fixCarriageReturn : fixCarriageReturn, wrapUrls : wrapUrls, autoLinkUrls : autoLinkUrls, - points_to_pixels : points_to_pixels + points_to_pixels : points_to_pixels, + browser : browser }; }(IPython)); +