Make shortcuts toggle work, global shortcuts work

diff --git a/dist/flowy.js b/dist/flowy.js
index b99ef65beee2520dff517988aa0ed10f741a43bb..f4d420ec7ff7b78ee905d6526a4204cb000a4b3e 100644 (file)
--- a/dist/flowy.js
+++ b/dist/flowy.js
@@ -210,7 +210,7 @@ var Shortcut = (function(document, _) {
             });
         },
         shortcutPressed: function(shortcut, object) {
-            if (shortcut.action) return shortcut.action(object.element, shortcut, object.type, object.options);
+            if (shortcut.action) return shortcut.action(object.element, shortcut, object.type, object.options || {});
         },
         onNewShortcut: function(f) {
             this.onNewShortcutCallbacks.push(f);
@@ -534,7 +534,7 @@ var TodoView = Backbone.View.extend({
   },
   expand: function() {
     console.log("Expand not implemented"); // TODO
-    this.model.toggleCollapsed(); // TODO: Display change
+    //this.model.toggleCollapsed(); // TODO: Display change not showing, this is bug
     return false;
   },
   zoomIn: function() {
@@ -555,7 +555,7 @@ var TodoView = Backbone.View.extend({
   },
   moveTo: function(loc, options) {
     loc = _.defaults({}, loc, { parent: this.model.getParent(this.model.collection), index: this.model.getParent(this.model.collection).findChild(this.model.id) });
-    options = _.defaults({}, options, { 
+    options = _.defaults({}, options, {
         keyboard: false, // Whether the action was done with keyboard vs mouse (affects UI focus)
     });
     console.log("Move not implemented");
@@ -869,7 +869,7 @@ var AppView = Backbone.View.extend({
     el: $("#todo-app"),
     shortcutObject: "global",
     events: {
-        'Shortcut("toggleShortcuts", "Keyboard Shortcuts", "ctrl+?") > .text': 'toggleShortcuts',
+        'Shortcut("toggleShortcuts", "Keyboard Shortcuts", "ctrl+shift+/") > .text': 'toggleShortcuts',
         'Shortcut("toggleShowCompleted", "Not Done - Show/hide completed", "ctrl+o") > .text': 'toggleShowCompleted',
         'Shortcut("search", "Not Done - Search", "esc") > .text': 'search',
     },

diff --git a/dist/flowy.unwrapped.js b/dist/flowy.unwrapped.js
index acfa2a68a0d7d756d95eb02f5b1d63fc947e92c4..ffb2d2ee5f881797c26cebe73300a40cb1cff1db 100644 (file)
--- a/dist/flowy.unwrapped.js
+++ b/dist/flowy.unwrapped.js
@@ -209,7 +209,7 @@ var Shortcut = (function(document, _) {
             });
         },
         shortcutPressed: function(shortcut, object) {
-            if (shortcut.action) return shortcut.action(object.element, shortcut, object.type, object.options);
+            if (shortcut.action) return shortcut.action(object.element, shortcut, object.type, object.options || {});
         },
         onNewShortcut: function(f) {
             this.onNewShortcutCallbacks.push(f);
@@ -533,7 +533,7 @@ var TodoView = Backbone.View.extend({
   },
   expand: function() {
     console.log("Expand not implemented"); // TODO
-    this.model.toggleCollapsed(); // TODO: Display change
+    //this.model.toggleCollapsed(); // TODO: Display change not showing, this is bug
     return false;
   },
   zoomIn: function() {
@@ -554,7 +554,7 @@ var TodoView = Backbone.View.extend({
   },
   moveTo: function(loc, options) {
     loc = _.defaults({}, loc, { parent: this.model.getParent(this.model.collection), index: this.model.getParent(this.model.collection).findChild(this.model.id) });
-    options = _.defaults({}, options, { 
+    options = _.defaults({}, options, {
         keyboard: false, // Whether the action was done with keyboard vs mouse (affects UI focus)
     });
     console.log("Move not implemented");
@@ -868,7 +868,7 @@ var AppView = Backbone.View.extend({
     el: $("#todo-app"),
     shortcutObject: "global",
     events: {
-        'Shortcut("toggleShortcuts", "Keyboard Shortcuts", "ctrl+?") > .text': 'toggleShortcuts',
+        'Shortcut("toggleShortcuts", "Keyboard Shortcuts", "ctrl+shift+/") > .text': 'toggleShortcuts',
         'Shortcut("toggleShowCompleted", "Not Done - Show/hide completed", "ctrl+o") > .text': 'toggleShowCompleted',
         'Shortcut("search", "Not Done - Search", "esc") > .text': 'search',
     },

diff --git a/src/library/shortcut.js b/src/library/shortcut.js
index 8c97dbdf21c4725f4d79323d466fa8117a322ec8..7269b875f4dc75bc918a02754b9223d6548407b7 100644 (file)
--- a/src/library/shortcut.js
+++ b/src/library/shortcut.js
@@ -148,7 +148,7 @@ var Shortcut = (function(document, _) {
             });
         },
         shortcutPressed: function(shortcut, object) {
-            if (shortcut.action) return shortcut.action(object.element, shortcut, object.type, object.options);
+            if (shortcut.action) return shortcut.action(object.element, shortcut, object.type, object.options || {});
         },
         onNewShortcut: function(f) {
             this.onNewShortcutCallbacks.push(f);

diff --git a/src/views/app.js b/src/views/app.js
index dc920501c103892a66f4b9cc5f82ec918396ba35..fa573e8fadbf1492159c2ba93a0fd7ca50c1e23a 100644 (file)
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -63,7 +63,7 @@ var AppView = Backbone.View.extend({
     el: $("#todo-app"),
     shortcutObject: "global",
     events: {
-        'Shortcut("toggleShortcuts", "Keyboard Shortcuts", "ctrl+?") > .text': 'toggleShortcuts',
+        'Shortcut("toggleShortcuts", "Keyboard Shortcuts", "ctrl+shift+/") > .text': 'toggleShortcuts',
         'Shortcut("toggleShowCompleted", "Not Done - Show/hide completed", "ctrl+o") > .text': 'toggleShowCompleted',
         'Shortcut("search", "Not Done - Search", "esc") > .text': 'search',
     },

diff --git a/src/views/todo.js b/src/views/todo.js
index 56feefd269e973df0d2d409851a072dbfba7ad7a..f7816a141f3dd44c638f14cfc88e0ece730a95f7 100644 (file)
--- a/src/views/todo.js
+++ b/src/views/todo.js
@@ -144,7 +144,7 @@ var TodoView = Backbone.View.extend({
   },
   expand: function() {
     console.log("Expand not implemented"); // TODO
-    this.model.toggleCollapsed(); // TODO: Display change
+    //this.model.toggleCollapsed(); // TODO: Display change not showing, this is bug
     return false;
   },
   zoomIn: function() {
@@ -165,7 +165,7 @@ var TodoView = Backbone.View.extend({
   },
   moveTo: function(loc, options) {
     loc = _.defaults({}, loc, { parent: this.model.getParent(this.model.collection), index: this.model.getParent(this.model.collection).findChild(this.model.id) });
-    options = _.defaults({}, options, { 
+    options = _.defaults({}, options, {
         keyboard: false, // Whether the action was done with keyboard vs mouse (affects UI focus)
     });
     console.log("Move not implemented");