de-require-config

IPython/frontend/html/notebook/static/notebook/js/config.js

@@ -8,16 +8,15 b''
 //============================================================================
 // Notebook
 //============================================================================
-"use strict";
 
 /**
  * @module IPython
  * @namespace IPython
  **/
 
-define(function () {
+var IPython = (function (IPython) {
         /**
-         * A place where some stuff can be configured.
+         * A place where some stuff can be confugured.
          *
          * @class config
          * @static
@@ -70,9 +69,10 b' define(function () {'
         };
 
     // use the same method to merge user configuration
-    var config = {};
-    $.extend(config, default_config);
+    IPython.config = {};
+    $.extend(IPython.config, default_config);
 
-    return config;
-});
+    return IPython;
+
+}(IPython));
 

IPython/frontend/html/notebook/static/notebook/js/main.js

@@ -14,15 +14,12 b''
 // as injecting require.js make marked not to put itself in the globals,
 // which make both this file fail at setting marked configuration, and textcell.js
 // which search marked into global.
-require(['static/components/marked/lib/marked.js',
-        'static/notebook/js/config.js'],
+require(['static/components/marked/lib/marked.js'],
 
-function (marked, config) {
-
-    IPython.config = config;
-    console.log('config is',config);
+function (marked) {
 
     window.marked = marked
+
     // monkey patch CM to be able to syntax highlight cell magics
     // bug reported upstream,
     // see https://github.com/marijnh/CodeMirror2/issues/670
@@ -107,7 +104,6 b' function (marked, config) {'
     $([IPython.events]).on('notebook_loaded.Notebook', first_load);
     IPython.notebook.load_notebook($('body').data('notebookId'));
 
-    var marked;
     if (marked) {
         marked.setOptions({
             gfm : true,

IPython/frontend/html/notebook/templates/notebook.html

@@ -230,6 +230,7 b' class="notebook_app"'
 <script src="{{ static_url("notebook/js/notificationwidget.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{ static_url("notebook/js/notificationarea.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{ static_url("notebook/js/tooltip.js") }}" type="text/javascript" charset="utf-8"></script>
+<script src="{{ static_url("notebook/js/config.js") }}" type="text/javascript" charset="utf-8"></script>
 <script src="{{ static_url("notebook/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
 
 <script src="{{ static_url("notebook/js/contexthint.js") }}" charset="utf-8"></script>