upstream/ipython Commit - r15236:d2ceddcf

holy crap, semicolons

MinRK -

r15236:d2ceddcf

parent child

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

0 +75 -75

                      };
                      this.element.bind('collapse_pager', function (event, extrap) {
-                         var time = (extrap != undefined) ? ((extrap.duration != undefined ) ? extrap.duration : 'fast') : 'fast';
+                         var time = (extrap !== undefined) ? ((extrap.duration !== undefined ) ? extrap.duration : 'fast') : 'fast';
                          collapse_time(time);
                      });
                      };
                      this.element.bind('expand_pager', function (event, extrap) {
-                         var time = (extrap != undefined) ? ((extrap.duration != undefined ) ? extrap.duration : 'fast') : 'fast';
+                         var time = (extrap !== undefined) ? ((extrap.duration !== undefined ) ? extrap.duration : 'fast') : 'fast';
                          expand_time(time);
                      });
                              } else {
                                  return "Unsaved changes will be lost.";
                              }
-                         };
+                         }
                          // Null is the *only* return value that will make the browser not
                          // pop up the "don't leave" dialog.
                          return null;
                   */
                  Notebook.prototype.scroll_to_cell = function (cell_number, time) {
                      var cells = this.get_cells();
-                     var time = time || 0;
+                     time = time || 0;
                      cell_number = Math.min(cells.length-1,cell_number);
                      cell_number = Math.max(0             ,cell_number);
                      var scroll_value = cells[cell_number].element.position().top-cells[0].element.position().top ;
                          result = ce.data('cell');
                      }
                      return result;
+                 }
+                 };
                  /**
                   * Get the cell below a given cell.
                          result = this.get_cell(index+1);
                      }
                      return result;
+                 }
+                 };
                  /**
                   * Get the cell above a given cell.
                          result = this.get_cell(index-1);
                      }
                      return result;
+                 }
+                 };
                  /**
                   * Get the numeric index of a given cell.
                      this.get_cell_elements().filter(function (index) {
                          if ($(this).data("cell") === cell) {
                              result = index;
-                         };
+                         }
                      });
                      return result;
                  };
                          return true;
                      } else {
                          return false;
-                     };
                  }
+                 };
                  /**
                   * Get the index of the currently selected cell.
                      this.get_cell_elements().filter(function (index) {
                          if ($(this).data("cell").selected === true) {
                              result = index;
-                         };
+                         }
                      });
                      return result;
                  };
                   */
                  Notebook.prototype.select = function (index) {
                      if (this.is_valid_cell_index(index)) {
-                         var sindex = this.get_selected_index()
+                         var sindex = this.get_selected_index();
                          if (sindex !== null && index !== sindex) {
                              this.command_mode();
                              this.get_cell(sindex).unselect();
-                         };
+                         }
                          var cell = this.get_cell(index);
                          cell.select();
                          if (cell.cell_type === 'heading') {
                              $([IPython.events]).trigger('selected_cell_type_changed.Notebook',
                                  {'cell_type':cell.cell_type}
                              );
-                         };
-                     };
+                         }
+                     }
                      return this;
                  };
                      this.get_cell_elements().filter(function (index) {
                          if ($(this).data("cell").mode === 'edit') {
                              result = index;
-                         };
+                         }
                      });
                      return result;
                  };
                          var cell = this.get_cell(index);
                          if (cell) {
                              cell.command_mode();
-                         };
+                         }
                          this.mode = 'command';
                          IPython.keyboard_manager.command_mode();
-                     };
+                     }
                  };
                  Notebook.prototype.edit_mode = function () {
                          this.mode = 'edit';
                          IPython.keyboard_manager.edit_mode();
                          cell.edit_mode();
-                     };
+                     }
                  };
                  Notebook.prototype.focus_cell = function () {
                              this.select(i-1);
                              var cell = this.get_selected_cell();
                              cell.focus_cell();
-                         };
+                         }
                          this.set_dirty(true);
-                     };
+                     }
                      return this;
                  };
                              this.select(i+1);
                              var cell = this.get_selected_cell();
                              cell.focus_cell();
-                         };
-                     };
+                         }
+                     }
                      this.set_dirty();
                      return this;
                  };
                              this.select(i);
                              this.undelete_index = i;
                              this.undelete_below = false;
-                         };
+                         }
                          $([IPython.events]).trigger('delete.Cell', {'cell': cell, 'index': i});
                          this.set_dirty(true);
-                     };
+                     }
                      return this;
                  };
                          this.undelete_index = null;
                      }
                      $('#undelete_cell').addClass('disabled');
+                 }
+                 };
                  /**
                   * Insert a cell so that after insertion the cell is at given index.
                  Notebook.prototype.insert_cell_at_index = function(type, index){
                      var ncells = this.ncells();
-                     var index = Math.min(index,ncells);
+                     index = Math.min(index,ncells);
-                         index = Math.max(index,0);
                      var cell = null;
                              source_element.remove();
                              this.select(i);
                              this.set_dirty(true);
-                         };
-                     };
+                         }
+                     }
                  };
                  /**
                              var text = source_cell.get_text();
                              if (text === source_cell.placeholder) {
                                  text = '';
-                             };
+                             }
                              // We must show the editor before setting its contents
                              target_cell.unrender();
                              target_cell.set_text(text);
                                  target_cell.render();
                              }
                              this.set_dirty(true);
-                         };
-                     };
+                         }
+                     }
                  };
                  /**
                              var text = source_cell.get_text();
                              if (text === source_cell.placeholder) {
                                  text = '';
-                             };
+                             }
                              // We must show the editor before setting its contents
                              target_cell.unrender();
                              target_cell.set_text(text);
                              source_element.remove();
                              this.select(i);
                              this.set_dirty(true);
-                         };
-                     };
+                         }
+                     }
                  };
                  /**
                              var text = source_cell.get_text();
                              if (text === source_cell.placeholder) {
                                  text = '';
-                             };
+                             }
                              // We must show the editor before setting its contents
                              target_cell.set_level(level);
                              target_cell.unrender();
                              if ((source_cell instanceof IPython.TextCell) && source_cell.rendered) {
                                  target_cell.render();
                              }
-                         };
+                         }
                          this.set_dirty(true);
                          $([IPython.events]).trigger('selected_cell_type_changed.Notebook',
                              {'cell_type':'heading',level:level}
                          );
-                     };
+                     }
                  };
                          $('#paste_cell_below').removeClass('disabled')
                              .on('click', function () {that.paste_cell_below();});
                          this.paste_enabled = true;
-                     };
+                     }
                  };
                  /**
                          $('#paste_cell_above').addClass('disabled').off('click');
                          $('#paste_cell_below').addClass('disabled').off('click');
                          this.paste_enabled = false;
-                     };
+                     }
                  };
                  /**
                  Notebook.prototype.cut_cell = function () {
                      this.copy_cell();
                      this.delete_cell();
+                 }
+                 };
                  /**
                   * Copy a cell.
                          var old_cell = this.get_next_cell(new_cell);
                          this.delete_cell(this.find_cell_index(old_cell));
                          this.select(this.find_cell_index(new_cell));
-                     };
+                     }
                  };
                  /**
                          var new_cell = this.insert_cell_above(cell_data.cell_type);
                          new_cell.fromJSON(cell_data);
                          new_cell.focus_cell();
-                     };
+                     }
                  };
                  /**
                          var new_cell = this.insert_cell_below(cell_data.cell_type);
                          new_cell.fromJSON(cell_data);
                          new_cell.focus_cell();
-                     };
+                     }
                  };
                  // Split/merge
                              new_cell.unrender();
                              new_cell.set_text(texta);
                          }
-                     };
+                     }
                  };
                  /**
                                  // that of the original selected cell;
                                  cell.render();
                              }
-                         };
+                         }
                          this.delete_cell(index-1);
                          this.select(this.find_cell_index(cell));
-                     };
+                     }
                  };
                  /**
                                  // that of the original selected cell;
                                  cell.render();
                              }
-                         };
+                         }
                          this.delete_cell(index+1);
                          this.select(this.find_cell_index(cell));
-                     };
+                     }
                  };
                          var cell = this.get_cell(i);
                          if (cell instanceof IPython.CodeCell) {
                              cell.set_kernel(this.session.kernel);
-                         };
-                     };
+                         }
+                     }
                  };
                  /**
                      this.command_mode();
                      cell.focus_cell();
                      this.set_dirty(true);
+                 }
+                 };
                  /**
                   * Execute or render cell outputs and insert a new cell below.
                      for (var i=start; i<end; i++) {
                          this.select(i);
                          this.execute_cell();
-                     };
+                     }
                  };
                  // Persistance and loading
                   */
                  Notebook.prototype.test_notebook_name = function (nbname) {
                      nbname = nbname || '';
-                     if (this.notebook_name_blacklist_re.test(nbname) == false && nbname.length>0) {
+                     if (nbname.length>0 && !this.notebook_name_blacklist_re.test(nbname)) {
                          return true;
                      } else {
                          return false;
-                     };
+                     }
                  };
                  /**
                      for (i=0; i<ncells; i++) {
                          // Always delete cell 0 as they get renumbered as they are deleted.
                          this.delete_cell(0);
-                     };
+                     }
                      // Save the metadata and name.
                      this.metadata = content.metadata;
                      this.notebook_name = data.name;
                              new_cell = this.insert_cell_at_index(cell_data.cell_type, i);
                              new_cell.fromJSON(cell_data);
-                         };
-                     };
+                         }
+                     }
                      if (content.worksheets.length > 1) {
                          IPython.dialog.modal({
                              title : "Multiple worksheets",
                      var cell_array = new Array(ncells);
                      for (var i=0; i<ncells; i++) {
                          cell_array[i] = cells[i].toJSON();
-                     };
+                     }
                      var data = {
                          // Only handle 1 worksheet for now.
                          worksheets : [{
                      } else {
                          this.autosave_timer = null;
                          $([IPython.events]).trigger("autosave_disabled.Notebook");
-                     };
+                     }
                  };
                  /**
                      if (this._checkpoint_after_save) {
                          this.create_checkpoint();
                          this._checkpoint_after_save = false;
-                     };
+                     }
                  };
                  /**
                  Notebook.prototype.rename_success = function (json, status, xhr) {
-                     this.notebook_name = json.name;
-                     var name = this.notebook_name;
+                     var name = this.notebook_name = json.name;
                      var path = json.path;
                      this.session.rename_notebook(name, path);
                      $([IPython.events]).trigger('notebook_renamed.Notebook', json);
+                 }
+                 };
                  Notebook.prototype.rename_error = function (xhr, status, error) {
                      var that = this;
                      var dialog = $('<div/>').append(
                          $("<p/>").addClass("rename-message")
                          .text('This notebook name already exists.')
+                     )
+                     );
                      $([IPython.events]).trigger('notebook_rename_failed.Notebook', [xhr, status, error]);
                      IPython.dialog.modal({
                          title: "Notebook Rename Error!",
                              that.find('input[type="text"]').focus();
                          }
                      });
+                 }
+                 };
                  /**
                   * Request a notebook's data from the server.
                      } else {
                          this.select(0);
                          this.command_mode();
-                     };
+                     }
                      this.set_dirty(false);
                      this.scroll_to_top();
                      if (data.orig_nbformat !== undefined && data.nbformat !== data.orig_nbformat) {
                          var this_vs = 'v' + data.nbformat + '.' + this.nbformat_minor;
                          var msg = "This notebook is version " + orig_vs + ", but we only fully support up to " +
                          this_vs + ".  You can still work with this notebook, but some features " +
-                         "introduced in later notebook versions may not be available."
+                         "introduced in later notebook versions may not be available.";
                          IPython.dialog.modal({
                              title : "Newer Notebook",
                      // Create the session after the notebook is completely loaded to prevent
                      // code execution upon loading, which is a security risk.
-                     if (this.session == null) {
+                     if (this.session === null) {
                          this.start_session();
                      }
                      // load our checkpoint list
                   */
                  Notebook.prototype.load_notebook_error = function (xhr, status, error) {
                      $([IPython.events]).trigger('notebook_load_failed.Notebook', [xhr, status, error]);
+                     var msg;
                      if (xhr.status === 400) {
-                         var msg = error;
+                         msg = error;
                      } else if (xhr.status === 500) {
-                         var msg = "An unknown error occurred while loading this notebook. " +
+                         msg = "An unknown error occurred while loading this notebook. " +
                          "This version can load notebook formats " +
                          "v" + this.nbformat + " or earlier.";
                      }
                              "OK": {}
                          }
                      });
+                 }
+                 };
                  /*********************  checkpoint-related  *********************/
                   * @param {jqXHR} xhr jQuery Ajax object
                   */
                  Notebook.prototype.list_checkpoints_success = function (data, status, xhr) {
-                     var data = $.parseJSON(data);
+                     data = $.parseJSON(data);
                      this.checkpoints = data;
                      if (data.length) {
                          this.last_checkpoint = data[data.length - 1];
                   * @param {jqXHR} xhr jQuery Ajax object
                   */
                  Notebook.prototype.create_checkpoint_success = function (data, status, xhr) {
-                     var data = $.parseJSON(data);
+                     data = $.parseJSON(data);
                      this.add_checkpoint(data);
                      $([IPython.events]).trigger('checkpoint_created.Notebook', data);
                  };
                  Notebook.prototype.restore_checkpoint_dialog = function (checkpoint) {
                      var that = this;
-                     var checkpoint = checkpoint || this.last_checkpoint;
+                     checkpoint = checkpoint || this.last_checkpoint;
                      if ( ! checkpoint ) {
                          console.log("restore dialog, but no checkpoint to restore to!");
                          return;
                              Cancel : {}
                              }
                      });
+                 }
+                 };
                  /**
                   * Restore the notebook to a checkpoint state.

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