From: Zachary Vance <vanceza@gmail.com>
Date: Thu, 14 May 2015 04:09:53 +0000 (-0700)
Subject: Switched backspace and delete
X-Git-Url: https://git.za3k.com/?a=commitdiff_plain;h=16fe4c4654259ff611dde2a2223118214ae471a2;p=flowy.git

Switched backspace and delete
---

diff --git a/dist/flowy.js b/dist/flowy.js
index 87a4d5f..5d057d3 100644
--- a/dist/flowy.js
+++ b/dist/flowy.js
@@ -111,7 +111,7 @@ var TodoView = Backbone.View.extend({
     return $("<div/>").html(encodedText).text();
   },
   backspace: function(e) {
-    if (e.keyCode !== 8 /* backspace */ && e.keyCode !== 46 /* delete */) {
+    if (e.keyCode !== 46 /* backspace */ && e.keyCode !== 8 /* delete */) {
         return;
     }
     if (this.model.hasChildren()) {
@@ -125,7 +125,7 @@ var TodoView = Backbone.View.extend({
         e.preventDefault();
         this.model.remove(this.model.collection);
         previousNode.getView().startEditingText({"atEnd":true});
-    } else if (this.isFocusAtBeginning() && e.keyCode !== 8 /* backspace only */) {
+    } else if (this.isFocusAtBeginning() && e.keyCode !== 46 /* backspace only */) {
         e.preventDefault();
         var text = this.model.get("text");
         this.model.remove(this.model.collection);
diff --git a/dist/flowy.unwrapped.js b/dist/flowy.unwrapped.js
index 4cf5f15..64cdaa7 100644
--- a/dist/flowy.unwrapped.js
+++ b/dist/flowy.unwrapped.js
@@ -110,7 +110,7 @@ var TodoView = Backbone.View.extend({
     return $("<div/>").html(encodedText).text();
   },
   backspace: function(e) {
-    if (e.keyCode !== 8 /* backspace */ && e.keyCode !== 46 /* delete */) {
+    if (e.keyCode !== 46 /* backspace */ && e.keyCode !== 8 /* delete */) {
         return;
     }
     if (this.model.hasChildren()) {
@@ -124,7 +124,7 @@ var TodoView = Backbone.View.extend({
         e.preventDefault();
         this.model.remove(this.model.collection);
         previousNode.getView().startEditingText({"atEnd":true});
-    } else if (this.isFocusAtBeginning() && e.keyCode !== 8 /* backspace only */) {
+    } else if (this.isFocusAtBeginning() && e.keyCode !== 46 /* backspace only */) {
         e.preventDefault();
         var text = this.model.get("text");
         this.model.remove(this.model.collection);
diff --git a/src/views/todo.js b/src/views/todo.js
index 979d998..298a45a 100644
--- a/src/views/todo.js
+++ b/src/views/todo.js
@@ -49,7 +49,7 @@ var TodoView = Backbone.View.extend({
     return $("<div/>").html(encodedText).text();
   },
   backspace: function(e) {
-    if (e.keyCode !== 8 /* backspace */ && e.keyCode !== 46 /* delete */) {
+    if (e.keyCode !== 46 /* backspace */ && e.keyCode !== 8 /* delete */) {
         return;
     }
     if (this.model.hasChildren()) {
@@ -63,7 +63,7 @@ var TodoView = Backbone.View.extend({
         e.preventDefault();
         this.model.remove(this.model.collection);
         previousNode.getView().startEditingText({"atEnd":true});
-    } else if (this.isFocusAtBeginning() && e.keyCode !== 8 /* backspace only */) {
+    } else if (this.isFocusAtBeginning() && e.keyCode !== 46 /* backspace only */) {
         e.preventDefault();
         var text = this.model.get("text");
         this.model.remove(this.model.collection);