@carreau review changes

IPython/html/static/auth/js/loginmain.js

@@ -3,8 +3,10
 
 var ipython = ipython || {};
 require(['base/js/page'], function(page) {
-    ipython.page = new page.Page();
+    var page_instance = new page.Page();
     $('button#login_submit').addClass("btn btn-default");
-    ipython.page.show();
+    page_instance.show();
     $('input#password_input').focus();
+    
+    ipython.page = page_instance;
 });

IPython/html/static/auth/js/logoutmain.js

@@ -2,8 +2,10
 // Distributed under the terms of the Modified BSD License.
 
 var ipython = ipython || {};
-require(['base/js/page'], function(Page) {
-    ipython.page = new page.Page();
+require(['base/js/page'], function(page) {
+    var page_instance = new page.Page();
     $('#ipython-main-app').addClass('border-box-sizing');
-    ipython.page.show();
+    page_instance.show();
+
+    ipython.page = page_instance;
 });

IPython/html/static/base/js/dialog.js

@@ -146,13 +146,13 define([
         modal.on('shown.bs.modal', function(){ editor.refresh(); });
     };
     
-    var Dialog = {
+    var dialog = {
         modal : modal,
         edit_metadata : edit_metadata,
     };
 
     // Backwards compatability.
-    IPython.Dialog = Dialog;
+    IPython.Dialog = dialog;
 
-    return Dialog;
+    return dialog;
 });

IPython/html/static/base/js/pagemain.js

@@ -2,7 +2,9
 // Distributed under the terms of the Modified BSD License.
 
 var ipython = ipython || {};
-require(['base/js/page'], function(Page) {
-    ipython.page = new page.Page();
-    ipython.page.show();
+require(['base/js/page'], function(page) {
+    var page_instance = new page.Page();
+    page_instance.show();
+
+    ipython.page = page_instance;
 });

IPython/html/static/base/js/utils.js

@@ -526,7 +526,7 define([
         console.log(msg);
     };
 
-    var Utils = {
+    var utils = {
         regex_split : regex_split,
         uuid : uuid,
         fixConsole : fixConsole,
@@ -551,7 +551,7 define([
     };
 
     // Backwards compatability.
-    IPython.Utils = Utils;
+    IPython.Utils = utils;
     
-    return Utils;
+    return utils;
 }); 

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

@@ -63,8 +63,6 require([
     var notification_area = new notificationarea.NotificationArea('#notification_area', events, save_widget, notebook);
     notification_area.init_notification_widgets();
 
-    layout_manager.do_resize();
-
     $('body').append('<div id="fonttest"><pre><span id="test1">x</span>'+
                      '<span id="test2" style="font-weight: bold;">x</span>'+
                      '<span id="test3" style="font-style: italic;">x</span></pre></div>');

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

@@ -42,14 +42,14 define([
         this.config = config;
         this.events = events;
         this.keyboard_manager = keyboard_manager;
+        // TODO: This code smells (and the other `= this` line a couple lines down)
+        // We need a better way to deal with circular instance references.
         keyboard_manager.notebook = this;
         this.save_widget = save_widget;
         save_widget.notebook = this;
         
         mathjaxutils.init();
 
-        
-        window.marked = window.marked || marked;
         if (marked) {
             marked.setOptions({
                 gfm : true,

IPython/html/templates/login.html

@@ -46,6 +46,7
 
 
 {% block script %}
+{{super()}}
 
 <script src="{{static_url("auth/js/loginmain.js") }}" type="text/javascript" charset="utf-8"></script>
 

IPython/html/templates/logout.html

@@ -32,6 +32,7
 {% endblock %}
 
 {% block script %}
+{{super()}}
 
 <script src="{{static_url("auth/js/logoutmain.js") }}" type="text/javascript" charset="utf-8"></script>
 

IPython/html/templates/notebook.html

@@ -293,6 +293,7 class="notebook_app"
 
 
 {% block script %}
+{{super()}}
 
 <script src="{{ static_url("components/codemirror/lib/codemirror.js") }}" charset="utf-8"></script>
 <script type="text/javascript">

IPython/html/templates/tree.html

@@ -110,5 +110,7 data-notebook-path="{{notebook_path}}"
 {% endblock %}
 
 {% block script %}
-    <script src="{{ static_url("tree/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
+    {{super()}}
+
+<script src="{{ static_url("tree/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
 {% endblock %}