From 5e9e4437293c6713e99454e2cdfcb05cbc7e9e34 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Sun, 7 Aug 2016 15:03:10 +0800
Subject: [PATCH] add keyboard shortcut labels

---
 app/assets/javascripts/src/Metamaps.Backbone.js | 8 ++------
 app/assets/javascripts/src/Metamaps.JIT.js      | 4 ++--
 app/assets/javascripts/src/Metamaps.Map.js      | 2 ++
 app/assets/stylesheets/application.css.erb      | 3 ++-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/src/Metamaps.Backbone.js b/app/assets/javascripts/src/Metamaps.Backbone.js
index eb65bc15..63025c54 100644
--- a/app/assets/javascripts/src/Metamaps.Backbone.js
+++ b/app/assets/javascripts/src/Metamaps.Backbone.js
@@ -699,17 +699,13 @@ Metamaps.Backbone.init = function () {
   // attach collection event listeners
   self.attachCollectionEvents = function () {
     Metamaps.Topics.on('add remove', function (topic) {
-      if (Metamaps.Active.Map) {
-        Metamaps.Map.InfoBox.updateNumbers()
-      }
+      Metamaps.Map.InfoBox.updateNumbers()
       Metamaps.Filter.checkMetacodes()
       Metamaps.Filter.checkMappers()
     })
 
     Metamaps.Synapses.on('add remove', function (synapse) {
-      if (Metamaps.Active.Map) {
-        Metamaps.Map.InfoBox.updateNumbers()
-      }
+      Metamaps.Map.InfoBox.updateNumbers()
       Metamaps.Filter.checkSynapses()
       Metamaps.Filter.checkMappers()
     })
diff --git a/app/assets/javascripts/src/Metamaps.JIT.js b/app/assets/javascripts/src/Metamaps.JIT.js
index 01b321f7..2bdff385 100644
--- a/app/assets/javascripts/src/Metamaps.JIT.js
+++ b/app/assets/javascripts/src/Metamaps.JIT.js
@@ -1316,7 +1316,7 @@ Metamaps.JIT = {
     if (Metamaps.Active.Map && Metamaps.Active.Mapper) menustring += '<li class="rc-delete ' + disabled + '"><div class="rc-icon"></div>Delete<div class="rc-keyboard">Ctrl+D</div></li>'
 
     if (Metamaps.Active.Topic) {
-      menustring += '<li class="rc-center"><div class="rc-icon"></div>Center this topic</li>'
+      menustring += '<li class="rc-center"><div class="rc-icon"></div>Center this topic<div class="rc-keyboard">Ctrl+U</div></li>'
     }
     menustring += '<li class="rc-popout"><div class="rc-icon"></div>Open in new tab</li>'
     if (Metamaps.Active.Mapper) {
@@ -1341,7 +1341,7 @@ Metamaps.JIT = {
       // set up the get sibling menu as a "lazy load"
       // only fill in the submenu when they hover over the get siblings list item
       var siblingMenu = '<ul id="fetchSiblingList"> \
-                                <li class="fetchAll">All</li> \
+                                <li class="fetchAll">All<div class="rc-keyboard">Ctrl+Y</div></li> \
                                 <li id="loadingSiblings"></li> \
                             </ul>'
       menustring += '<li class="rc-siblings"><div class="rc-icon"></div>Get siblings' + siblingMenu + '<div class="expandLi"></div></li>'
diff --git a/app/assets/javascripts/src/Metamaps.Map.js b/app/assets/javascripts/src/Metamaps.Map.js
index 34374614..ec3b946f 100644
--- a/app/assets/javascripts/src/Metamaps.Map.js
+++ b/app/assets/javascripts/src/Metamaps.Map.js
@@ -673,6 +673,8 @@ Metamaps.Map.InfoBox = {
     return string
   },
   updateNumbers: function () {
+    if (!Metamaps.Active.Map) return
+
     var self = Metamaps.Map.InfoBox
     var mapper = Metamaps.Active.Mapper
     var relevantPeople = Metamaps.Active.Map.get('permission') === 'commons' ? Metamaps.Mappers : Metamaps.Collaborators
diff --git a/app/assets/stylesheets/application.css.erb b/app/assets/stylesheets/application.css.erb
index 6c76dd9e..d1f866bc 100644
--- a/app/assets/stylesheets/application.css.erb
+++ b/app/assets/stylesheets/application.css.erb
@@ -1249,8 +1249,9 @@ h3.filterBox {
 .rightclickmenu .rc-metacode > ul > li,
 .rightclickmenu .rc-siblings > ul > li {
     padding: 6px 24px 6px 8px;
-    width: auto;
     white-space: nowrap;
+    width: auto;
+    min-width: 5em;
 }
 .rightclickmenu .rc-metacode ul ul,
 .rightclickmenu .rc-siblings ul ul {