Make enter work on empty line

diff --git a/dist/flowy.js b/dist/flowy.js
index f66f16b09dcb836865ad92bc495a5242b3fb3017..8c7252821bb1a4f1b2c91605fb24ff688e02d8d9 100644 (file)
--- a/dist/flowy.js
+++ b/dist/flowy.js
@@ -552,7 +552,8 @@ var TodoView = Backbone.View.extend({
     var el = this.$el.find("> .text")[0];
     var sel = window.getSelection();
     var retVal;
-    if (sel.rangeCount >= 1) {
+    if (sel.rangeCount >= 1 && el.childNodes.length > 0) {
+        el = this.$el.find("> .text")[0];
         var range = sel.getRangeAt(0);
         var start = range.startOffset, end = range.endOffset;
         retVal = f();
@@ -562,6 +563,10 @@ var TodoView = Backbone.View.extend({
         range.setStart(el.childNodes[0], start);
         range.setEnd(el.childNodes[0], end);
         sel.addRange(range);
+    } else if (sel.rangeCount >= 1) {
+        retVal = f();
+        el = this.$el.find("> .text")[0];
+        el.focus();
     } else {
         retVal = f();
         sel.removeAllRanges();

diff --git a/dist/flowy.unwrapped.js b/dist/flowy.unwrapped.js
index 138a8db2470ddfa54d0c2699b5274e3844de49dd..1e19a3831ccc78be1db015fc6b05ac6dfd952059 100644 (file)
--- a/dist/flowy.unwrapped.js
+++ b/dist/flowy.unwrapped.js
@@ -551,7 +551,8 @@ var TodoView = Backbone.View.extend({
     var el = this.$el.find("> .text")[0];
     var sel = window.getSelection();
     var retVal;
-    if (sel.rangeCount >= 1) {
+    if (sel.rangeCount >= 1 && el.childNodes.length > 0) {
+        el = this.$el.find("> .text")[0];
         var range = sel.getRangeAt(0);
         var start = range.startOffset, end = range.endOffset;
         retVal = f();
@@ -561,6 +562,10 @@ var TodoView = Backbone.View.extend({
         range.setStart(el.childNodes[0], start);
         range.setEnd(el.childNodes[0], end);
         sel.addRange(range);
+    } else if (sel.rangeCount >= 1) {
+        retVal = f();
+        el = this.$el.find("> .text")[0];
+        el.focus();
     } else {
         retVal = f();
         sel.removeAllRanges();

diff --git a/src/views/todo.js b/src/views/todo.js
index e60812df5d55507970f0d1e52f4b4c8909e10f70..05d49faf6ef3cf68b1b4599e834fb4380df993d7 100644 (file)
--- a/src/views/todo.js
+++ b/src/views/todo.js
@@ -155,7 +155,8 @@ var TodoView = Backbone.View.extend({
     var el = this.$el.find("> .text")[0];
     var sel = window.getSelection();
     var retVal;
-    if (sel.rangeCount >= 1) {
+    if (sel.rangeCount >= 1 && el.childNodes.length > 0) {
+        el = this.$el.find("> .text")[0];
         var range = sel.getRangeAt(0);
         var start = range.startOffset, end = range.endOffset;
         retVal = f();
@@ -165,6 +166,10 @@ var TodoView = Backbone.View.extend({
         range.setStart(el.childNodes[0], start);
         range.setEnd(el.childNodes[0], end);
         sel.addRange(range);
+    } else if (sel.rangeCount >= 1) {
+        retVal = f();
+        el = this.$el.find("> .text")[0];
+        el.focus();
     } else {
         retVal = f();
         sel.removeAllRanges();