upstream/ipython Commit - r10781:126fe369

setting the notebook dirty flag is now an event...

MinRK -

r10781:126fe369

parent child

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

0 +1 -1

                 CodeCell.prototype._handle_execute_reply = function (content) {
                     this.set_input_prompt(content.execution_count);
                     this.element.removeClass("running");
-                    $([IPython.events]).trigger('set_dirty.Notebook', {'value': true});
+                    $([IPython.events]).trigger('set_dirty.Notebook', {value: true});
                 }
                 /**

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

0 +40 -22

                     this.undelete_index = null;
                     this.undelete_below = false;
                     this.paste_enabled = false;
-                    this.dirty = false;
+                    this.set_dirty(false);
                     this.metadata = {};
                     this._checkpoint_after_save = false;
                     this.last_checkpoint = null;
                         } else if (that.control_key_active) {
                             that.control_key_active = false;
                             return true;
-                        };
+                        } else if ( utils.is_typing(event) ) {
+                            that.set_dirty(true);
+                            return true;
+                        }
                         return true;
                     });
                     var collapse_time = function(time){
                         var app_height = $('#ipython-main-app').height(); // content height
                         var splitter_height = $('div#pager_splitter').outerHeight(true);
                 };
                 /**
+                 * Set the dirty flag, and trigger the set_dirty.Notebook event
+                 *
+                 * @method set_dirty
+                 */
+                Notebook.prototype.set_dirty = function (value) {
+                    if (value === undefined) {
+                        value = true;
+                    }
+                    if (this.dirty == value) {
+                        return;
+                    }
+                    $([IPython.events]).trigger('set_dirty.Notebook', {value: value});
+                };
+                /**
                  * Scroll the top of the page to a given cell.
                  *
                  * @method scroll_to_cell
                             pivot.before(tomove);
                             this.select(i-1);
                         };
-                        this.dirty = true;
+                        this.set_dirty(true);
                     };
                     return this;
                 };
                             this.select(i+1);
                         };
                     };
-                    this.dirty = true;
+                    this.set_dirty();
                     return this;
                 };
                             this.undelete_index = i;
                             this.undelete_below = false;
                         };
-                        this.dirty = true;
+                        this.set_dirty(true);
                     };
                     return this;
                 };
                         if(this._insert_element_at_index(cell.element,index)){
                             cell.render();
                             this.select(this.find_cell_index(cell));
-                            this.dirty = true;
+                            this.set_dirty(true);
                         }
                     }
                     return cell;
                     if (this.undelete_index !== null && index <= this.undelete_index) {
                         this.undelete_index = this.undelete_index + 1;
-                        this.dirty = true;
+                        this.set_dirty(true);
                     }
                     return true;
                 };
                             // to this state, instead of a blank cell
                             target_cell.code_mirror.clearHistory();
                             source_element.remove();
-                            this.dirty = true;
+                            this.set_dirty(true);
                         };
                     };
                 };
                             // to this state, instead of a blank cell
                             target_cell.code_mirror.clearHistory();
                             source_element.remove();
-                            this.dirty = true;
+                            this.set_dirty(true);
                         };
                     };
                 };
                             // to this state, instead of a blank cell
                             target_cell.code_mirror.clearHistory();
                             source_element.remove();
-                            this.dirty = true;
+                            this.set_dirty(true);
                         };
                     };
                 };
                             // to this state, instead of a blank cell
                             target_cell.code_mirror.clearHistory();
                             source_element.remove();
-                            this.dirty = true;
+                            this.set_dirty(true);
                         };
                         $([IPython.events]).trigger('selected_cell_type_changed.Notebook',
                             {'cell_type':'heading',level:level}
                 Notebook.prototype.collapse = function (index) {
                     var i = this.index_or_selected(index);
                     this.get_cell(i).collapse();
-                    this.dirty = true;
+                    this.set_dirty(true);
                 };
                 /**
                 Notebook.prototype.expand = function (index) {
                     var i = this.index_or_selected(index);
                     this.get_cell(i).expand();
-                    this.dirty = true;
+                    this.set_dirty(true);
                 };
                 /** Toggle whether a cell's output is collapsed or expanded.
                 Notebook.prototype.toggle_output = function (index) {
                     var i = this.index_or_selected(index);
                     this.get_cell(i).toggle_output();
-                    this.dirty = true;
+                    this.set_dirty(true);
                 };
                 /**
                         }
                     };
                     // this should not be set if the `collapse` key is removed from nbformat
-                    this.dirty = true;
+                    this.set_dirty(true);
                 };
                 /**
                         }
                     };
                     // this should not be set if the `collapse` key is removed from nbformat
-                    this.dirty = true;
+                    this.set_dirty(true);
                 };
                 /**
                         }
                     };
                     // this should not be set if the `collapse` key is removed from nbformat
-                    this.dirty = true;
+                    this.set_dirty(true);
                 };
                 /**
                             cells[i].set_input_prompt();
                         }
                     };
-                    this.dirty = true;
+                    this.set_dirty(true);
                 };
                             that.select(cell_index+1);
                         };
                     };
-                    this.dirty = true;
+                    this.set_dirty(true);
                 };
                 /**
                  * @param {jqXHR} xhr jQuery Ajax object
                  */
                 Notebook.prototype.save_notebook_success = function (start, data, status, xhr) {
-                    this.dirty = false;
+                    this.set_dirty(false);
                     $([IPython.events]).trigger('notebook_saved.Notebook');
                     this._update_autosave_interval(start);
                     if (this._checkpoint_after_save) {
                     if (this.ncells() === 0) {
                         this.insert_cell_below('code');
                     };
-                    this.dirty = false;
+                    this.set_dirty(false);
                     this.select(0);
                     this.scroll_to_top();
                     if (data.orig_nbformat !== undefined && data.nbformat !== data.orig_nbformat) {

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages