Merge pull request #1468 from OpenBazaar/patchShortcuts

patches shortcuts

Author: jjeffryes

js/config.js

@@ -15,17 +15,17 @@ module.exports = {
   keyShortcuts: {
     undo:            'z',
     discover:        'd',
-    myPage:          'j',
-    customizePage:   'k',
-    create:          'l',
-    purchases:       ',',
-    sales:           '.',
-    cases:           '/',
-    settings:        ';',
-    addressBar:      '[',
+    myPage:          't',
+    customizePage:   'e',
+    create:          'n',
+    purchases:       'k',
+    sales:           'm',
+    cases:           'j',
+    settings:        'g',
+    addressBar:      'l',
     save:            's',
-    refresh:         't',
-    restart:         'r'
+    refresh:         'r',
+    restart:         'f'
   },
 
   setTestnet: function(testNetBoolean){

js/main.js

@@ -198,10 +198,10 @@ $(window).bind('keydown', function(e) {
   }
 
   if (ctrl) {
+    e.preventDefault();
     switch (char) {
       case config.keyShortcuts.undo:
         //run undo programmatically to avoid crash
-        e.preventDefault();
         document.execCommand('undo');
         break;
       case config.keyShortcuts.discover:
@@ -238,6 +238,9 @@ $(window).bind('keydown', function(e) {
       case config.keyShortcuts.refresh:
         Backbone.history.loadUrl();
         break;
+      case config.keyShortcuts.restart:
+        location.reload();
+        break;
     }
 
     if (route !== null) {

js/templates/pageNav.html

@@ -123,16 +123,6 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
     <%= polyglot.t('nav.settings') %>
 	<span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.settings.toUpperCase() %></span>
   </a>
-  <a class="js-navRefresh">
-    <span class="ion-loop fontSize11 marginRight2 textOpacity1"></span>
-    <%= polyglot.t('nav.refresh') %>
-    <span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.refresh.toUpperCase() %></span>
-  </a>
-  <a class="js-navRestart">
-    <span class="ion-refresh fontSize11 marginRight2 textOpacity1"></span>
-    <%= polyglot.t('nav.restart') %>
-    <span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.restart.toUpperCase() %></span>
-  </a>
   <hr/>
   <a class="js-showAboutModal">
     <span class="ion-ios-book fontSize11 marginRight2 textOpacity1"></span>
@@ -165,7 +155,7 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
     <a class="btn btn-togRight btn-fwd ion-chevron-right js-navFwd custCol-primary custCol-text fontSize13 tooltip" data-tooltip="<%= polyglot.t('nav.Forward') %>"></a>
   </div>
   <div class="ctrlGroup">
-    <a class="btn btn-home ion-refresh custCol-primary custCol-text js-navRefresh tooltip" data-tooltip="<%= polyglot.t('Reload') %>"></a>
+    <a class="btn btn-home ion-refresh custCol-primary custCol-text js-navRefresh tooltip" data-tooltip="<%= polyglot.t('Reload') %> <%= config.keyShortcutPrefix + config.keyShortcuts.refresh.toUpperCase() %>"> </a>
   </div>
   <div class="ctrlGroup flexExpand">
     <div class="txtFieldWrapper searchWrapper mainSearchWrapper js-mainSearchWrapper">