Mark complete and mark incomplete don't move focus the same

diff --git a/dist/flowy.js b/dist/flowy.js
index c0885a02608755791c7512c216726f9fdab2e128..0c259cfe47fbaff904af00cb71ddecd5a15244fc 100644 (file)
--- a/dist/flowy.js
+++ b/dist/flowy.js
@@ -357,11 +357,17 @@ var TodoView = Backbone.View.extend({
     return $("<div/>").html(encodedText).text();
   },
   toggleComplete: function() {
-    this.stopEditingText();
-    this.model.toggleComplete();
-    var next = this.model.nextNode(this.model.collection, {"childrenAllowed":false});
-    if (!next) return false;
-    next.getView().startEditingText();
+    if (this.model.get("completed")) {
+        this.stopEditingText();
+        this.model.toggleComplete();
+        this.startEditingText(); // TODO: Don't lose place
+    } else {
+        this.stopEditingText();
+        this.model.toggleComplete();
+        var next = this.model.nextNode(this.model.collection, {"childrenAllowed":false});
+        if (!next) return false;
+        next.getView().startEditingText();
+    }
     return false; // Don't propogate
   },
   backspace: function() {

diff --git a/dist/flowy.unwrapped.js b/dist/flowy.unwrapped.js
index 4ceec4bb329b9cadd35c7d7fd7a73c549357df7b..952da17b84a4d0df15598c83d1382be5e9eb5cd2 100644 (file)
--- a/dist/flowy.unwrapped.js
+++ b/dist/flowy.unwrapped.js
@@ -356,11 +356,17 @@ var TodoView = Backbone.View.extend({
     return $("<div/>").html(encodedText).text();
   },
   toggleComplete: function() {
-    this.stopEditingText();
-    this.model.toggleComplete();
-    var next = this.model.nextNode(this.model.collection, {"childrenAllowed":false});
-    if (!next) return false;
-    next.getView().startEditingText();
+    if (this.model.get("completed")) {
+        this.stopEditingText();
+        this.model.toggleComplete();
+        this.startEditingText(); // TODO: Don't lose place
+    } else {
+        this.stopEditingText();
+        this.model.toggleComplete();
+        var next = this.model.nextNode(this.model.collection, {"childrenAllowed":false});
+        if (!next) return false;
+        next.getView().startEditingText();
+    }
     return false; // Don't propogate
   },
   backspace: function() {

diff --git a/src/views/todo.js b/src/views/todo.js
index 6d3f45fa16c8ade0b78c63b3a9bfd7a18cf759d0..d9ce2b2bf05e41442f0661542b2e4088704d0c09 100644 (file)
--- a/src/views/todo.js
+++ b/src/views/todo.js
@@ -47,11 +47,17 @@ var TodoView = Backbone.View.extend({
     return $("<div/>").html(encodedText).text();
   },
   toggleComplete: function() {
-    this.stopEditingText();
-    this.model.toggleComplete();
-    var next = this.model.nextNode(this.model.collection, {"childrenAllowed":false});
-    if (!next) return false;
-    next.getView().startEditingText();
+    if (this.model.get("completed")) {
+        this.stopEditingText();
+        this.model.toggleComplete();
+        this.startEditingText(); // TODO: Don't lose place
+    } else {
+        this.stopEditingText();
+        this.model.toggleComplete();
+        var next = this.model.nextNode(this.model.collection, {"childrenAllowed":false});
+        if (!next) return false;
+        next.getView().startEditingText();
+    }
     return false; // Don't propogate
   },
   backspace: function() {