From fc3fc0082101bda5ef474755418905bf0b9297cd Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Mon, 8 Aug 2016 21:34:27 +0800
Subject: [PATCH] update keyboard shortcuts to Ctrl+E, Ctrl+R, and Ctrl+T, and
 update docs

---
 app/assets/javascripts/src/Metamaps.JIT.js    |  6 ++--
 .../javascripts/src/Metamaps.Listeners.js     | 30 +++++++++----------
 app/views/shared/_cheatsheet.html.erb         |  7 +++--
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/src/Metamaps.JIT.js b/app/assets/javascripts/src/Metamaps.JIT.js
index 2bdff385..543d4bfd 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<div class="rc-keyboard">Ctrl+U</div></li>'
+      menustring += '<li class="rc-center"><div class="rc-icon"></div>Center this topic<div class="rc-keyboard">Ctrl+E</div></li>'
     }
     menustring += '<li class="rc-popout"><div class="rc-icon"></div>Open in new tab</li>'
     if (Metamaps.Active.Mapper) {
@@ -1341,10 +1341,10 @@ 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<div class="rc-keyboard">Ctrl+Y</div></li> \
+                                <li class="fetchAll">All<div class="rc-keyboard">Ctrl+R</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>'
+      menustring += '<li class="rc-siblings"><div class="rc-icon"></div>Reveal siblings' + siblingMenu + '<div class="expandLi"></div></li>'
     }
 
     menustring += '</ul>'
diff --git a/app/assets/javascripts/src/Metamaps.Listeners.js b/app/assets/javascripts/src/Metamaps.Listeners.js
index 8ad44d2a..0520c0a5 100644
--- a/app/assets/javascripts/src/Metamaps.Listeners.js
+++ b/app/assets/javascripts/src/Metamaps.Listeners.js
@@ -44,11 +44,11 @@ Metamaps.Listeners = {
           }
           break
         case 69: // if e or E is pressed
-          if (e.ctrlKey) {
-            e.preventDefault()
-            if (Metamaps.Active.Map) {
-              Metamaps.JIT.zoomExtents(null, Metamaps.Visualize.mGraph.canvas)
-            }
+          if (e.ctrlKey && Metamaps.Active.Topic) {
+            self.centerAndReveal(Metamaps.Selected.Nodes, {
+              center: true,
+              reveal: false
+            })
           }
           break
         case 72: // if h or H is pressed
@@ -65,7 +65,15 @@ Metamaps.Listeners = {
             Metamaps.Control.removeSelectedEdges()
           }
           break
-        case 84: // if t or T is pressed
+        case 79: // if o or O is pressed
+          if (e.ctrlKey) {
+            e.preventDefault()
+            if (Metamaps.Active.Map) {
+              Metamaps.JIT.zoomExtents(null, Metamaps.Visualize.mGraph.canvas)
+            }
+          }
+          break
+        case 82: // if r or R is pressed
           if (e.ctrlKey && Metamaps.Active.Topic) {
             self.centerAndReveal(Metamaps.Selected.Nodes, {
               center: false,
@@ -73,15 +81,7 @@ Metamaps.Listeners = {
             })
           }
           break
-        case 85: // if u or U is pressed
-          if (e.ctrlKey && Metamaps.Active.Topic) {
-            self.centerAndReveal(Metamaps.Selected.Nodes, {
-              center: true,
-              reveal: false
-            })
-          }
-          break
-        case 89: // if y or Y is pressed
+        case 84: // if t or T is pressed
           if (e.ctrlKey && Metamaps.Active.Topic) {
             self.centerAndReveal(Metamaps.Selected.Nodes, {
               center: true,
diff --git a/app/views/shared/_cheatsheet.html.erb b/app/views/shared/_cheatsheet.html.erb
index c02246ac..7541bd04 100644
--- a/app/views/shared/_cheatsheet.html.erb
+++ b/app/views/shared/_cheatsheet.html.erb
@@ -26,8 +26,9 @@
   </ul>
 
   <div id="csTopicView">    
-    <div class="csItem"><span class="csTitle">Recenter Topics around chosen Topic:</span> Alt + click on the topic OR Right-click + 'center this topic'</div>
-
+    <div class="csItem"><span class="csTitle">Recenter Topics around chosen Topic:</span> Alt + click on the topic OR Ctrl + E</div>
+    <div class="csItem"><span class="csTitle">Reveal the siblings for a Topic:</span> Right-click and choose 'Reveal siblings' OR Ctrl + R</div>
+    <div class="csItem"><span class="csTitle">Center topic and reveal siblings:</span> Ctrl + T</div>
   </div>
   
   <div id="csCreatingTopics">    
@@ -102,7 +103,7 @@
   <div id="csNavigation">    
     <div class="csItem"><span class="csTitle">Move around Canvas:</span> Click and drag</div>
     <div class="csItem"><span class="csTitle">Zoom in/out:</span> Scroll OR click on <div id="zoomIn"> </div> & <div id="zoomOut"> </div></div>
-    <div class="csItem"><span class="csTitle">Zoom to see all:</span> Click <div id="centerMap"></div> OR Ctrl + E</div>
+    <div class="csItem"><span class="csTitle">Zoom to see all:</span> Click <div id="centerMap"></div> OR Ctrl + O</div>
     <div class="csItem"><br><a href="http://metamapscc.uservoice.com/knowledgebase/articles/425784-viewing-existing-maps" target= "_blank">Learn More</a></div> 
 
   </div>