Merge branch 'master' into modal-fullscreen

Author: rmisio

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

@@ -242,59 +242,59 @@ $(window).bind('keydown', function(e) {
     Backbone.history.loadUrl();
   }
 
-  switch (char) {
-    case config.keyShortcuts.undo:
-      //run undo programmatically to avoid crash
-      e.preventDefault();
-      document.execCommand('undo');
-      break;      
-    case config.keyShortcuts.discover:
-      route = 'home';
-      break;
-    case config.keyShortcuts.myPage:
-      route = 'userPage';
-      break;
-    case config.keyShortcuts.customizePage:
-      route = 'userPage/' + user.get('guid') + '/customize';
-      break;
-    case config.keyShortcuts.create:
-      route = 'userPage/' + user.get('guid') + '/listingNew';
-      break;
-    case config.keyShortcuts.purchases:
-      route = 'transactions/purchases';
-      break;
-    case config.keyShortcuts.sales:
-      route = 'transactions/sales';
-      break;
-    case config.keyShortcuts.cases:
-      route = 'transactions/cases';
-      break;
-    case config.keyShortcuts.settings:
-      route = 'settings';
-      break;
-    case config.keyShortcuts.addressBar:
-      // Select all text in address bar
-      $('.js-navAddressBar').select();
-      break;
-    case config.keyShortcuts.save:
-      window.obEventBus.trigger('saveCurrentForm');
-      break;
-    case config.keyShortcuts.refresh:
-      Backbone.history.loadUrl();
-      break;
-  }
-
-  if (route !== null) {
-    e.preventDefault();
-    Backbone.history.navigate(route, {
-      trigger: true
-    });
-  }
+  if (ctrl) {
+    switch (char) {
+      case config.keyShortcuts.undo:
+        e.preventDefault();
+        //run undo programmatically to avoid crash
+        document.execCommand('undo');
+        break;
+      case config.keyShortcuts.discover:
+        route = 'home';
+        break;
+      case config.keyShortcuts.myPage:
+        route = 'userPage';
+        break;
+      case config.keyShortcuts.customizePage:
+        route = 'userPage/' + user.get('guid') + '/customize';
+        break;
+      case config.keyShortcuts.create:
+        route = 'userPage/' + user.get('guid') + '/listingNew';
+        break;
+      case config.keyShortcuts.purchases:
+        route = 'transactions/purchases';
+        break;
+      case config.keyShortcuts.sales:
+        route = 'transactions/sales';
+        break;
+      case config.keyShortcuts.cases:
+        route = 'transactions/cases';
+        break;
+      case config.keyShortcuts.settings:
+        route = 'settings';
+        break;
+      case config.keyShortcuts.addressBar:
+        // Select all text in address bar
+        $('.js-navAddressBar').select();
+        break;
+      case config.keyShortcuts.save:
+        window.obEventBus.trigger('saveCurrentForm');
+        break;
+      case config.keyShortcuts.refresh:
+        e.preventDefault();
+        Backbone.history.loadUrl();
+        break;
+      case config.keyShortcuts.restart:
+        location.reload();
+        break;
+    }
 
-  // Select all text in address bar
-  if (char === config.keyShortcuts.addressBar) {
-    // Select all text in address bar
-    $('.js-navAddressBar').select();
+    if (route !== null) {
+      e.preventDefault();
+      Backbone.history.navigate(route, {
+        trigger: true
+      });
+    }
   }
 });
 

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">