Преглед на файлове

Fix the move up/down actions

Steven Silvester преди 8 години
родител
ревизия
16ab287df1
променени са 1 файла, в които са добавени 12 реда и са изтрити 12 реда
  1. 12 12
      src/notebook/notebook/actions.ts

+ 12 - 12
src/notebook/notebook/actions.ts

@@ -273,16 +273,17 @@ namespace NotebookActions {
       return;
     }
     let cells = widget.model.cells;
+    let widgets = widget.widgets;
     cells.beginCompoundOperation();
     for (let i = cells.length - 2; i > -1; i--) {
-      if (widget.isSelected(widget.widgets.at(i))) {
-        if (!widget.isSelected(widget.widgets.at(i + 1))) {
+      if (widget.isSelected(widgets.at(i))) {
+        if (!widget.isSelected(widgets.at(i + 1))) {
           cells.move(i, i + 1);
           if (widget.activeCellIndex === i) {
             widget.activeCellIndex++;
           }
-          widget.select(widget.widgets.at(i + 1));
-          widget.deselect(widget.widgets.at(i));
+          widget.select(widgets.at(i + 1));
+          widget.deselect(widgets.at(i));
         }
       }
     }
@@ -300,21 +301,20 @@ namespace NotebookActions {
       return;
     }
     let cells = widget.model.cells;
+    let widgets = widget.widgets;
     cells.beginCompoundOperation();
-    let i = 0;
-    each(widget.widgets, child => {
-      if (widget.isSelected(child)) {
-        if (!widget.isSelected(widget.widgets.at(i - 1))) {
+    for (let i = 1; i < cells.length; i++) {
+      if (widget.isSelected(widgets.at(i))) {
+        if (!widget.isSelected(widgets.at(i - 1))) {
           cells.move(i, i - 1);
           if (widget.activeCellIndex === i) {
             widget.activeCellIndex--;
           }
-          widget.select(widget.widgets.at(i - 1));
-          widget.deselect(widget.widgets.at(i));
+          widget.select(widgets.at(i - 1));
+          widget.deselect(widgets.at(i));
         }
       }
-      i++;
-    });
+    }
     cells.endCompoundOperation();
   }