From: Zachary Vance <vanceza@gmail.com>
Date: Mon, 25 May 2015 23:49:21 +0000 (-0700)
Subject: make shortcuts fit
X-Git-Url: https://git.za3k.com/?a=commitdiff_plain;h=cc8562496ad50f1b0fdfd54d82ba1dec59ec9c9a;p=flowy.git

make shortcuts fit
---

diff --git a/dist/flowy.js b/dist/flowy.js
index 2382082..0be641a 100644
--- a/dist/flowy.js
+++ b/dist/flowy.js
@@ -307,7 +307,7 @@ var Shortcut = (function(document, _) {
             }
 
             var keybindingHTML = _.map(keybindings, function(keybinding) {
-                return _.template("<code><%= keybinding %></code>")({keybinding: _.escape(keybinding)});
+                return _.template("<code><%= keybinding %></code>")({keybinding: _.escape(keybinding).replace(/\+/g, ' + ')});
             }).join(",<br/>");
             if (options.allowRebind) {
                 // Ugh, way too magic, how do I use an actual function here
diff --git a/dist/flowy.unwrapped.js b/dist/flowy.unwrapped.js
index dd1e013..3dc2344 100644
--- a/dist/flowy.unwrapped.js
+++ b/dist/flowy.unwrapped.js
@@ -306,7 +306,7 @@ var Shortcut = (function(document, _) {
             }
 
             var keybindingHTML = _.map(keybindings, function(keybinding) {
-                return _.template("<code><%= keybinding %></code>")({keybinding: _.escape(keybinding)});
+                return _.template("<code><%= keybinding %></code>")({keybinding: _.escape(keybinding).replace(/\+/g, ' + ')});
             }).join(",<br/>");
             if (options.allowRebind) {
                 // Ugh, way too magic, how do I use an actual function here
diff --git a/src/library/shortcut.js b/src/library/shortcut.js
index 7269b87..cf2e92e 100644
--- a/src/library/shortcut.js
+++ b/src/library/shortcut.js
@@ -245,7 +245,7 @@ var Shortcut = (function(document, _) {
             }
 
             var keybindingHTML = _.map(keybindings, function(keybinding) {
-                return _.template("<code><%= keybinding %></code>")({keybinding: _.escape(keybinding)});
+                return _.template("<code><%= keybinding %></code>")({keybinding: _.escape(keybinding).replace(/\+/g, ' + ')});
             }).join(",<br/>");
             if (options.allowRebind) {
                 // Ugh, way too magic, how do I use an actual function here