]> git.za3k.com Git - flowy.git/commitdiff
make shortcuts fit
authorZachary Vance <vanceza@gmail.com>
Mon, 25 May 2015 23:49:21 +0000 (16:49 -0700)
committerZachary Vance <vanceza@gmail.com>
Mon, 25 May 2015 23:49:21 +0000 (16:49 -0700)
dist/flowy.js
dist/flowy.unwrapped.js
src/library/shortcut.js

index 2382082ba62e2c52ee35a9574492f944520b8c33..0be641af42f87fc15c01d2362bc96965ffa82f08 100644 (file)
@@ -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
index dd1e01361e8bdfe945061accd0d0b8968c752eb6..3dc2344ec9de81f300e1a96f3923ef4a2c7d10bd 100644 (file)
@@ -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
index 7269b875f4dc75bc918a02754b9223d6548407b7..cf2e92e625c16901de89711feb59f78f99becd5a 100644 (file)
@@ -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