From b76d4d5c05cf1cf4e2e5584450aa3d7ca4214b2f Mon Sep 17 00:00:00 2001
From: Jonathan Frederic <jon.freder@gmail.com>
Date: Mon, 10 Nov 2014 10:41:17 -0800
Subject: [PATCH] Use es6-promise polyfill

---
 IPython/html/static/notebook/js/main.js | 3 ++-
 IPython/html/templates/page.html        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/IPython/html/static/notebook/js/main.js b/IPython/html/static/notebook/js/main.js
index 02e746883..41870ba8f 100644
--- a/IPython/html/static/notebook/js/main.js
+++ b/IPython/html/static/notebook/js/main.js
@@ -2,6 +2,7 @@
 // Distributed under the terms of the Modified BSD License.
 
 require([
+    'es6promise',
     'base/js/namespace',
     'jquery',
     'notebook/js/notebook',
@@ -25,6 +26,7 @@ require([
     // only loaded, not used, please keep sure this is loaded last
     'custom/custom'
 ], function(
+    es6promise,
     IPython, 
     $,
     notebook, 
@@ -49,7 +51,6 @@ require([
     custom
     ) {
     "use strict";
-    console.log(promise);
 
     // compat with old IPython, remove for IPython > 3.0
     window.CodeMirror = CodeMirror;
diff --git a/IPython/html/templates/page.html b/IPython/html/templates/page.html
index 93ba4b5f7..f024bb53e 100644
--- a/IPython/html/templates/page.html
+++ b/IPython/html/templates/page.html
@@ -27,9 +27,9 @@
             bootstrap: 'components/bootstrap/js/bootstrap.min',
             bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min',
             jqueryui: 'components/jquery-ui/ui/minified/jquery-ui.min',
-            moment: "components/moment/moment",
+            moment: 'components/moment/moment',
             codemirror: 'components/codemirror',
-            termjs: "components/term.js/src/term",
+            termjs: 'components/term.js/src/term',
             contents: '{{ contents_js_source }}',
           },
           shim: {