From 8c962df79c0e0900d58cc588b3055cb7c642d9c2 Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <takowl@gmail.com>
Date: Fri, 14 Nov 2014 12:43:44 -0800
Subject: [PATCH] Load promises polyfill from a script tag

So all JS code can assume promises work, without needing to require it.
---
 IPython/html/static/base/js/utils.js | 1 -
 IPython/html/templates/page.html     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/IPython/html/static/base/js/utils.js b/IPython/html/static/base/js/utils.js
index 23b3dc316..013389cd4 100644
--- a/IPython/html/static/base/js/utils.js
+++ b/IPython/html/static/base/js/utils.js
@@ -5,7 +5,6 @@ define([
     'base/js/namespace',
     'jquery',
     'codemirror/lib/codemirror',
-    'es6promise',
 ], function(IPython, $, CodeMirror){
     "use strict";
     
diff --git a/IPython/html/templates/page.html b/IPython/html/templates/page.html
index 8c1650bd3..4c314df20 100644
--- a/IPython/html/templates/page.html
+++ b/IPython/html/templates/page.html
@@ -14,6 +14,7 @@
     <link rel="stylesheet" href="{{ static_url("style/style.min.css") }}" type="text/css"/>
     {% endblock %}
     <link rel="stylesheet" href="{{ static_url("custom/custom.css") }}" type="text/css" />
+    <script src="{{static_url("components/es6-promise/promise.min.js")}}" type="text/javascript" charset="utf-8"></script>
     <script src="{{static_url("components/requirejs/require.js") }}" type="text/javascript" charset="utf-8"></script>
     <script>
       require.config({
@@ -30,7 +31,6 @@
             moment: "components/moment/moment",
             codemirror: 'components/codemirror',
             termjs: "components/term.js/src/term",
-            es6promise: 'components/es6-promise/promise.min',
             contents: '{{ contents_js_source }}',
           },
           shim: {