')
.attr('id',uuid)
- .addClass('notification ui-widget ui-widget-content ui-corner-all')
+ .addClass('notification_widget ui-widget ui-widget-content ui-corner-all')
.addClass('border-box-sizing')
.addClass(css_class)
.hide()
@@ -42,10 +43,94 @@ var IPython = (function (IPython) {
}, tmout)
};
+ NotificationArea.prototype.widget = function(name){
+ if(this.widget_dict[name] == undefined){
+ return this.new_notification_widget(name)
+ }
+ return this.get_widget(name)
+ }
+
+ NotificationArea.prototype.get_widget = function(name) {
+ if(this.widget_dict[name] == undefined){
+ throw('no widgets with this name');
+ }
+ return this.widget_dict[name];
+ }
+
NotificationArea.prototype.new_notification_widget = function(name) {
+ if(this.widget_dict[name] != undefined){
+ throw('widget with that name already exists ! ');
+ }
var div = $('
').attr('id','notification_'+name);
$(this.selector).append(div)
- return new IPython.NotificationWidget('#notification_'+name)
+ this.widget_dict[name] = new IPython.NotificationWidget('#notification_'+name)
+ return this.widget_dict[name];
+ }
+
+ NotificationArea.prototype.init_notification_widgets = function() {
+ var knw = this.new_notification_widget('kernel');
+
+ // Kernel events
+ $([IPython.events]).on('status_idle.Kernel',function () {
+ IPython.save_widget.update_document_title();
+ knw.set_message('Kernel Idle',200);
+ }
+ );
+
+ $([IPython.events]).on('status_busy.Kernel',function () {
+ window.document.title='(Busy) '+window.document.title;
+ knw.set_message("Kernel busy");
+ });
+
+ $([IPython.events]).on('status_restarting.Kernel',function () {
+ IPython.save_widget.update_document_title();
+ knw.set_message("Restarting kernel",1000);
+ });
+
+ $([IPython.events]).on('status_interrupting.Kernel',function () {
+ knw.set_message("Interrupting kernel");
+ });
+
+ $([IPython.events]).on('status_dead.Kernel',function () {
+ var dialog = $('
');
+ dialog.html('The kernel has died, would you like to restart it? If you do not restart the kernel, you will be able to save the notebook, but running code will not work until the notebook is reopened.');
+ $(document).append(dialog);
+ dialog.dialog({
+ resizable: false,
+ modal: true,
+ title: "Dead kernel",
+ buttons : {
+ "Restart": function () {
+ $([IPython.events]).trigger('status_restarting.Kernel');
+ IPython.notebook.start_kernel();
+ $(this).dialog('close');
+ },
+ "Continue running": function () {
+ $(this).dialog('close');
+ }
+ }
+ });
+ });
+
+ var nnw = this.new_notification_widget('notebook');
+
+ // Notebook events
+ $([IPython.events]).on('notebook_loading.Notebook', function () {
+ nnw.set_message("Loading notebook",500);
+ });
+ $([IPython.events]).on('notebook_loaded.Notebook', function () {
+ nnw.set_message("Notebook loaded",500);
+ });
+ $([IPython.events]).on('notebook_saving.Notebook', function () {
+ nnw.set_message("Saving notebook",500);
+ });
+ $([IPython.events]).on('notebook_saved.Notebook', function () {
+ nnw.set_message("Notebook saved",2000);
+ });
+ $([IPython.events]).on('notebook_save_failed.Notebook', function () {
+ nnw.set_message("Notebook save failed");
+ });
+
}
IPython.NotificationArea = NotificationArea;
diff --git a/IPython/frontend/html/notebook/static/js/notificationwidget.js b/IPython/frontend/html/notebook/static/js/notificationwidget.js
index 110a28881..f7293cc66 100644
--- a/IPython/frontend/html/notebook/static/js/notificationwidget.js
+++ b/IPython/frontend/html/notebook/static/js/notificationwidget.js
@@ -21,28 +21,27 @@ var IPython = (function (IPython) {
if (this.selector !== undefined) {
this.element = $(selector);
this.style();
- //this.bind_events();
}
this.element.button();
this.element.hide();
var that = this;
- this.element.click(function(){
- that.element.fadeOut(100, function () {that.element.html('');});
- if (that.timeout !== undefined) {
- that.timeout = undefined
- clearTimeout(that.timeout);
- }
- });
+
};
NotificationWidget.prototype.style = function () {
- this.element.addClass('notification ui-widget ui-widget-content ui-corner-all');
+ this.element.addClass('notification_widget ui-widget ui-widget-content ui-corner-all');
this.element.addClass('border-box-sizing');
};
-
- NotificationWidget.prototype.set_message = function (msg, timeout) {
+ // msg : message to display
+ // timeout : time in ms before diseapearing
+ //
+ // if timeout <= 0
+ // click_callback : function called if user click on notification
+ // could return false to prevent the notification to be dismissed
+ NotificationWidget.prototype.set_message = function (msg, timeout, click_callback) {
+ var callback = click_callback || function(){return false};
var that = this;
this.element.html(msg);
this.element.fadeIn(100);
@@ -55,7 +54,18 @@ var IPython = (function (IPython) {
that.element.fadeOut(100, function () {that.element.html('');});
that.timeout = null;
}, timeout);
- };
+ } else {
+ this.element.click(function(){
+ if( callback() != false){
+ that.element.fadeOut(100, function () {that.element.html('');});
+ }
+ if (that.timeout !== undefined) {
+ that.timeout = undefined
+ clearTimeout(that.timeout);
+ }
+ that.element.unbind('click')
+ });
+ }
};
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index 2c7487057..ffe9da70e 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -244,7 +244,6 @@ data-notebook-id={{notebook_id}}
-