Merge pull request #1431 from nshki/update-help-arrow-scroll-copy

Make arrow scroll copy dynamic on help page

assets/javascripts/templates/pages/help_tmpl.coffee

@@ -1,6 +1,7 @@
 app.templates.helpPage = ->
   ctrlKey = if $.isMac() then 'cmd' else 'ctrl'
   navKey = if $.isMac() then 'cmd' else 'alt'
+  arrowScroll = app.settings.get('arrowScroll')
 
   aliases_one = {}
   aliases_two = {}
@@ -66,10 +67,12 @@ app.templates.helpPage = ->
   <h3 class="_shortcuts-title">Sidebar</h3>
   <dl class="_shortcuts-dl">
     <dt class="_shortcuts-dt">
+      #{if arrowScroll then '<code class="_shortcut-code">shift</code> + ' else ''}
       <code class="_shortcut-code">&darr;</code>
       <code class="_shortcut-code">&uarr;</code>
     <dd class="_shortcuts-dd">Move selection
     <dt class="_shortcuts-dt">
+      #{if arrowScroll then '<code class="_shortcut-code">shift</code> + ' else ''}
       <code class="_shortcut-code">&rarr;</code>
       <code class="_shortcut-code">&larr;</code>
     <dd class="_shortcuts-dd">Show/hide sub-list
@@ -90,11 +93,15 @@ app.templates.helpPage = ->
       <code class="_shortcut-code">#{navKey} + &rarr;</code>
     <dd class="_shortcuts-dd">Go back/forward
     <dt class="_shortcuts-dt">
-      <code class="_shortcut-code">alt + &darr;</code>
+      #{if arrowScroll
-      <code class="_shortcut-code">alt + &uarr;</code>
+          '<code class="_shortcut-code">&darr;</code> ' +
-      <br>
+          '<code class="_shortcut-code">&uarr;</code>'
-      <code class="_shortcut-code">shift + &darr;</code>
+        else
-      <code class="_shortcut-code">shift + &uarr;</code>
+          '<code class="_shortcut-code">alt + &darr;</code> ' +
+          '<code class="_shortcut-code">alt + &uarr;</code>' +
+          '<br>' +
+          '<code class="_shortcut-code">shift + &darr;</code> ' +
+          '<code class="_shortcut-code">shift + &uarr;</code>'}
     <dd class="_shortcuts-dd">Scroll step by step<br><br>
     <dt class="_shortcuts-dt">
       <code class="_shortcut-code">space</code>

assets/javascripts/templates/tip_tmpl.coffee

@@ -3,8 +3,8 @@ app.templates.tipKeyNav = () -> """
     <strong>ProTip</strong>
     <span class="_notif-info">(click to dismiss)</span>
   <p class="_notif-text">
-    Hit #{if app.settings.cache.arrowScroll then '<code class="_label">shift</code> +' else ''} <code class="_label">&darr;</code> <code class="_label">&uarr;</code> <code class="_label">&larr;</code> <code class="_label">&rarr;</code> to navigate the sidebar.<br>
+    Hit #{if app.settings.get('arrowScroll') then '<code class="_label">shift</code> +' else ''} <code class="_label">&darr;</code> <code class="_label">&uarr;</code> <code class="_label">&larr;</code> <code class="_label">&rarr;</code> to navigate the sidebar.<br>
-    Hit <code class="_label">space / shift space</code>#{if app.settings.cache.arrowScroll then ' or <code class="_label">&darr;/&uarr;</code>' else ', <code class="_label">alt &darr;/&uarr;</code> or <code class="_label">shift &darr;/&uarr;</code>'} to scroll the page.
+    Hit <code class="_label">space / shift space</code>#{if app.settings.get('arrowScroll') then ' or <code class="_label">&darr;/&uarr;</code>' else ', <code class="_label">alt &darr;/&uarr;</code> or <code class="_label">shift &darr;/&uarr;</code>'} to scroll the page.
   <p class="_notif-text">
     <a href="/help#shortcuts" class="_notif-link">See all keyboard shortcuts</a>
 """