upstream/ipython Commit - r9549:bb91ce54

377

Notebook.prototype.get_next_cell = function (cell) {

377

Notebook.prototype.get_next_cell = function (cell) {

378

var result = null;

378

var result = null;

379

var index = this.find_cell_index(cell);

379

var index = this.find_cell_index(cell);

380

if (index !== null && index < this.ncells()) {

380

if (this.is_valid_cell_index(index+1)) {

381

result = this.get_cell(index+1);

381

result = this.get_cell(index+1);

382

}

382

}

383

return result;

383

return result;

425

426

427

Notebook.prototype.is_valid_cell_index = function (index) {

427

Notebook.prototype.is_valid_cell_index = function (index) {

428

if (index !== ~~null~~ && index >= 0 && index < this.ncells()) {

428

if (index != undefined && index >= 0 && index < this.ncells()) {

429

return true;

429

return true;

430

} else {

430

} else {

431

return false;

431

return false;

446

// Cell selection.

446

// Cell selection.

447

448

Notebook.prototype.select = function (index) {

448

Notebook.prototype.select = function (index) {

449

if (index !== undefined && index >= 0 && index < this.ncells()) {

449

if (this.is_valid_cell_index(index)) {

450

var sindex = this.get_selected_index()

450

var sindex = this.get_selected_index()

451

if (sindex !== null && index !== sindex) {

451

if (sindex !== null && index !== sindex) {

452

this.get_cell(sindex).unselect();

452

this.get_cell(sindex).unselect();

469

470

Notebook.prototype.select_next = function () {

470

Notebook.prototype.select_next = function () {

471

var index = this.get_selected_index();

471

var index = this.get_selected_index();

472

if (index !== null && index >= 0 && (index+1) < this.ncells()) {

472

this.select(index+1);

473

this.select(index+1);

474

};

475

return this;

473

return this;

476

};

474

};

477

475

478

476

479

Notebook.prototype.select_prev = function () {

477

Notebook.prototype.select_prev = function () {

480

var index = this.get_selected_index();

478

var index = this.get_selected_index();

481

if (index !== null && index >= 0 && (index-1) < this.ncells()) {

479

this.select(index-1);

482

this.select(index-1);

483

};

484

return this;

480

return this;

485

};

481

};

486

482

489

485

490

Notebook.prototype.move_cell_up = function (index) {

486

Notebook.prototype.move_cell_up = function (index) {

491

var i = this.index_or_selected();

487

var i = this.index_or_selected();

492

if (i ~~!==~~ ~~null~~ && i < this.~~ncells~~() && i > 0) {

488

if (this.is_valid_cell_index(index) && i > 0) {

493

var pivot = this.get_cell_element(i-1);

489

var pivot = this.get_cell_element(i-1);

494

var tomove = this.get_cell_element(i);

490

var tomove = this.get_cell_element(i);

495

if (pivot !== null && tomove !== null) {

491

if (pivot !== null && tomove !== null) {

497

pivot.before(tomove);

493

pivot.before(tomove);

498

this.select(i-1);

494

this.select(i-1);

499

};

495

};

496

this.dirty = true;

500

};

497

};

501

this.dirty = true;

502

return this;

498

return this;

503

};

499

};

504

500

505

501

506

Notebook.prototype.move_cell_down = function (index) {

502

Notebook.prototype.move_cell_down = function (index) {

507

var i = this.index_or_selected();

503

var i = this.index_or_selected();

508

if (i !== null && i < (this.ncells()-1) && i >= 0) {

504

if ( this.is_valid_cell_index(i) && this.is_valid_cell_index(i+1)) {

509

var pivot = this.get_cell_element(i+1);

505

var pivot = this.get_cell_element(i+1);

510

var tomove = this.get_cell_element(i);

506

var tomove = this.get_cell_element(i);

511

if (pivot !== null && tomove !== null) {

507

if (pivot !== null && tomove !== null) {

	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

                 Notebook.prototype.get_next_cell = function (cell) {
                     var result = null;
                     var index = this.find_cell_index(cell);
-                    if (index !== null && index < this.ncells()) {
+                    if (this.is_valid_cell_index(index+1)) {
                         result = this.get_cell(index+1);
                     }
                     return result;
                 Notebook.prototype.is_valid_cell_index = function (index) {
-                    if (index !== null && index >= 0 && index < this.ncells()) {
+                    if (index != undefined && index >= 0 && index < this.ncells()) {
                         return true;
                     } else {
                         return false;
                 // Cell selection.
                 Notebook.prototype.select = function (index) {
-                    if (index !== undefined && index >= 0 && index < this.ncells()) {
+                    if (this.is_valid_cell_index(index)) {
                         var sindex = this.get_selected_index()
                         if (sindex !== null && index !== sindex) {
                             this.get_cell(sindex).unselect();
                 Notebook.prototype.select_next = function () {
                     var index = this.get_selected_index();
-                    if (index !== null && index >= 0 && (index+1) < this.ncells()) {
+                    this.select(index+1);
-                        this.select(index+1);
-                    };
                     return this;
                 };
                 Notebook.prototype.select_prev = function () {
                     var index = this.get_selected_index();
-                    if (index !== null && index >= 0 && (index-1) < this.ncells()) {
+                    this.select(index-1);
-                        this.select(index-1);
-                    };
                     return this;
                 };
                 Notebook.prototype.move_cell_up = function (index) {
                     var i = this.index_or_selected();
-                    if (i !== null && i < this.ncells() && i > 0) {
+                    if (this.is_valid_cell_index(index) && i > 0) {
                         var pivot = this.get_cell_element(i-1);
                         var tomove = this.get_cell_element(i);
                         if (pivot !== null && tomove !== null) {
                             pivot.before(tomove);
                             this.select(i-1);
                         };
+                        this.dirty = true;
                     };
-                    this.dirty = true;
                     return this;
                 };
                 Notebook.prototype.move_cell_down = function (index) {
                     var i = this.index_or_selected();
-                    if (i !== null && i < (this.ncells()-1) && i >= 0) {
+                    if ( this.is_valid_cell_index(i) && this.is_valid_cell_index(i+1)) {
                         var pivot = this.get_cell_element(i+1);
                         var tomove = this.get_cell_element(i);
                         if (pivot !== null && tomove !== null) {