From: Zachary Vance <vanceza@gmail.com>
Date: Thu, 28 May 2015 01:31:34 +0000 (-0700)
Subject: Make enter work on empty line
X-Git-Url: https://git.za3k.com/?a=commitdiff_plain;h=8eac2a1beb213d19ab073e47ab822159913b310c;p=flowy.git

Make enter work on empty line
---

diff --git a/dist/flowy.js b/dist/flowy.js
index f66f16b..8c72528 100644
--- 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 138a8db..1e19a38 100644
--- 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 e60812d..05d49fa 100644
--- 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();