From 3fc4442053edc97f4d2cb1ec3c710b93ea14b83d Mon Sep 17 00:00:00 2001
From: Jason Grout <jgrout6@bloomberg.net>
Date: Wed, 23 Jul 2014 21:13:42 +0000
Subject: [PATCH] Move shim to the standard location

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

diff --git a/IPython/html/static/notebook/js/main.js b/IPython/html/static/notebook/js/main.js
index db747be31..b36dcfc3b 100644
--- a/IPython/html/static/notebook/js/main.js
+++ b/IPython/html/static/notebook/js/main.js
@@ -1,12 +1,6 @@
 // Copyright (c) IPython Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-requirejs.config({
-    shim: {
-	'components/highlight.js/build/highlight.pack': {exports: 'hljs'}
-    }
-});
-
 require([
     'base/js/namespace',
     'jquery',
diff --git a/IPython/html/static/notebook/js/notebook.js b/IPython/html/static/notebook/js/notebook.js
index d65da6418..658cbd087 100644
--- a/IPython/html/static/notebook/js/notebook.js
+++ b/IPython/html/static/notebook/js/notebook.js
@@ -11,7 +11,7 @@ define([
     'services/sessions/js/session',
     'notebook/js/celltoolbar',
     'components/marked/lib/marked',
-    'components/highlight.js/build/highlight.pack',
+    'highlight',
     'notebook/js/mathjaxutils',
     'base/js/keyboard',
     'notebook/js/tooltip',
diff --git a/IPython/html/templates/page.html b/IPython/html/templates/page.html
index b882f5185..e0af43732 100644
--- a/IPython/html/templates/page.html
+++ b/IPython/html/templates/page.html
@@ -26,6 +26,7 @@
             bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min',
             dateformat: 'dateformat/date.format',
             jqueryui: 'components/jquery-ui/ui/minified/jquery-ui.min',
+            highlight: 'components/highlight.js/build/highlight.pack',
           },
           shim: {
             underscore: {
@@ -44,7 +45,10 @@
             jqueryui: {
               deps: ["jquery"],
               exports: "$"
-            }
+            },
+            highlight: {
+              exports: "hljs"
+            },
           }
       });
     </script>