##// END OF EJS Templates
@carreau review changes
Jonathan Frederic -
Show More
@@ -3,8 +3,10 b''
3
3
4 var ipython = ipython || {};
4 var ipython = ipython || {};
5 require(['base/js/page'], function(page) {
5 require(['base/js/page'], function(page) {
6 ipython.page = new page.Page();
6 var page_instance = new page.Page();
7 $('button#login_submit').addClass("btn btn-default");
7 $('button#login_submit').addClass("btn btn-default");
8 ipython.page.show();
8 page_instance.show();
9 $('input#password_input').focus();
9 $('input#password_input').focus();
10
11 ipython.page = page_instance;
10 });
12 });
@@ -2,8 +2,10 b''
2 // Distributed under the terms of the Modified BSD License.
2 // Distributed under the terms of the Modified BSD License.
3
3
4 var ipython = ipython || {};
4 var ipython = ipython || {};
5 require(['base/js/page'], function(Page) {
5 require(['base/js/page'], function(page) {
6 ipython.page = new page.Page();
6 var page_instance = new page.Page();
7 $('#ipython-main-app').addClass('border-box-sizing');
7 $('#ipython-main-app').addClass('border-box-sizing');
8 ipython.page.show();
8 page_instance.show();
9
10 ipython.page = page_instance;
9 });
11 });
@@ -146,13 +146,13 b' define(['
146 modal.on('shown.bs.modal', function(){ editor.refresh(); });
146 modal.on('shown.bs.modal', function(){ editor.refresh(); });
147 };
147 };
148
148
149 var Dialog = {
149 var dialog = {
150 modal : modal,
150 modal : modal,
151 edit_metadata : edit_metadata,
151 edit_metadata : edit_metadata,
152 };
152 };
153
153
154 // Backwards compatability.
154 // Backwards compatability.
155 IPython.Dialog = Dialog;
155 IPython.Dialog = dialog;
156
156
157 return Dialog;
157 return dialog;
158 });
158 });
@@ -2,7 +2,9 b''
2 // Distributed under the terms of the Modified BSD License.
2 // Distributed under the terms of the Modified BSD License.
3
3
4 var ipython = ipython || {};
4 var ipython = ipython || {};
5 require(['base/js/page'], function(Page) {
5 require(['base/js/page'], function(page) {
6 ipython.page = new page.Page();
6 var page_instance = new page.Page();
7 ipython.page.show();
7 page_instance.show();
8
9 ipython.page = page_instance;
8 });
10 });
@@ -526,7 +526,7 b' define(['
526 console.log(msg);
526 console.log(msg);
527 };
527 };
528
528
529 var Utils = {
529 var utils = {
530 regex_split : regex_split,
530 regex_split : regex_split,
531 uuid : uuid,
531 uuid : uuid,
532 fixConsole : fixConsole,
532 fixConsole : fixConsole,
@@ -551,7 +551,7 b' define(['
551 };
551 };
552
552
553 // Backwards compatability.
553 // Backwards compatability.
554 IPython.Utils = Utils;
554 IPython.Utils = utils;
555
555
556 return Utils;
556 return utils;
557 });
557 });
@@ -63,8 +63,6 b' require(['
63 var notification_area = new notificationarea.NotificationArea('#notification_area', events, save_widget, notebook);
63 var notification_area = new notificationarea.NotificationArea('#notification_area', events, save_widget, notebook);
64 notification_area.init_notification_widgets();
64 notification_area.init_notification_widgets();
65
65
66 layout_manager.do_resize();
67
68 $('body').append('<div id="fonttest"><pre><span id="test1">x</span>'+
66 $('body').append('<div id="fonttest"><pre><span id="test1">x</span>'+
69 '<span id="test2" style="font-weight: bold;">x</span>'+
67 '<span id="test2" style="font-weight: bold;">x</span>'+
70 '<span id="test3" style="font-style: italic;">x</span></pre></div>');
68 '<span id="test3" style="font-style: italic;">x</span></pre></div>');
@@ -42,14 +42,14 b' define(['
42 this.config = config;
42 this.config = config;
43 this.events = events;
43 this.events = events;
44 this.keyboard_manager = keyboard_manager;
44 this.keyboard_manager = keyboard_manager;
45 // TODO: This code smells (and the other `= this` line a couple lines down)
46 // We need a better way to deal with circular instance references.
45 keyboard_manager.notebook = this;
47 keyboard_manager.notebook = this;
46 this.save_widget = save_widget;
48 this.save_widget = save_widget;
47 save_widget.notebook = this;
49 save_widget.notebook = this;
48
50
49 mathjaxutils.init();
51 mathjaxutils.init();
50
52
51
52 window.marked = window.marked || marked;
53 if (marked) {
53 if (marked) {
54 marked.setOptions({
54 marked.setOptions({
55 gfm : true,
55 gfm : true,
@@ -46,6 +46,7 b''
46
46
47
47
48 {% block script %}
48 {% block script %}
49 {{super()}}
49
50
50 <script src="{{static_url("auth/js/loginmain.js") }}" type="text/javascript" charset="utf-8"></script>
51 <script src="{{static_url("auth/js/loginmain.js") }}" type="text/javascript" charset="utf-8"></script>
51
52
@@ -32,6 +32,7 b''
32 {% endblock %}
32 {% endblock %}
33
33
34 {% block script %}
34 {% block script %}
35 {{super()}}
35
36
36 <script src="{{static_url("auth/js/logoutmain.js") }}" type="text/javascript" charset="utf-8"></script>
37 <script src="{{static_url("auth/js/logoutmain.js") }}" type="text/javascript" charset="utf-8"></script>
37
38
@@ -293,6 +293,7 b' class="notebook_app"'
293
293
294
294
295 {% block script %}
295 {% block script %}
296 {{super()}}
296
297
297 <script src="{{ static_url("components/codemirror/lib/codemirror.js") }}" charset="utf-8"></script>
298 <script src="{{ static_url("components/codemirror/lib/codemirror.js") }}" charset="utf-8"></script>
298 <script type="text/javascript">
299 <script type="text/javascript">
@@ -110,5 +110,7 b' data-notebook-path="{{notebook_path}}"'
110 {% endblock %}
110 {% endblock %}
111
111
112 {% block script %}
112 {% block script %}
113 <script src="{{ static_url("tree/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
113 {{super()}}
114
115 <script src="{{ static_url("tree/js/main.js") }}" type="text/javascript" charset="utf-8"></script>
114 {% endblock %}
116 {% endblock %}
General Comments 0
You need to be logged in to leave comments. Login now