Merge pull request #6188 from jasongrout/highlightjs-require-shim

Add a requirejs shim for highlight.js

IPython/html/static/notebook/js/notebook.js

@@ -11,6 +11,7 define([
     'services/sessions/js/session',
     'notebook/js/celltoolbar',
     'components/marked/lib/marked',
+    'highlight',
     'notebook/js/mathjaxutils',
     'base/js/keyboard',
     'notebook/js/tooltip',
@@ -27,6 +28,7 define([
     session, 
     celltoolbar, 
     marked,
+    hljs,
     mathjaxutils,
     keyboard,
     tooltip,

IPython/html/templates/page.html

@@ -27,6 +27,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: {
@@ -50,7 +51,10
             jqueryui: {
               deps: ["jquery"],
               exports: "$"
-            }
+            },
+            highlight: {
+              exports: "hljs"
+            },
           }
       });
     </script>