Switched backspace and delete

diff --git a/dist/flowy.js b/dist/flowy.js
index 87a4d5f51fe6457a584f3c3d49174afeba2723f8..5d057d3da041d3a832f59a8e259b56cff7728594 100644 (file)
--- 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 4cf5f156eade39cc7b53a321e21591768a6ae3a8..64cdaa71d3536041eb42cc5f3b28b97efdf79a9c 100644 (file)
--- 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 979d998c6162c999d25c1cb3db401d5547862e72..298a45a5b60ac42ffa52a3b59ae4e2cce1421486 100644 (file)
--- 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);