From cbc71e693e06982c46fc9d669573d320014be820 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Wed, 6 Aug 2014 15:00:51 +1000
Subject: [PATCH] FIX: base keyboard shortcuts on touch vs no touch.

---
 app/assets/javascripts/discourse/controllers/site-map.js.es6  | 4 ++--
 .../discourse/initializers/sniff-capabilities.js.es6          | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/site-map.js.es6 b/app/assets/javascripts/discourse/controllers/site-map.js.es6
index 385b1afb96c..590b92266bb 100644
--- a/app/assets/javascripts/discourse/controllers/site-map.js.es6
+++ b/app/assets/javascripts/discourse/controllers/site-map.js.es6
@@ -10,11 +10,11 @@ export default Ember.ArrayController.extend(Discourse.HasCurrentUser, {
   badgesUrl: Discourse.getURL('/badges'),
 
   showKeyboardShortcuts: function(){
-    return !Discourse.Mobile.mobileView && !Discourse.Mobile.isMobileDevice;
+    return !Discourse.Mobile.mobileView && !Discourse.Capabilities.touch;
   }.property(),
 
   showMobileToggle: function(){
-    return Discourse.SiteSettings.enable_mobile_theme && Discourse.Mobile.isMobileDevice;
+    return Discourse.SiteSettings.enable_mobile_theme && Discourse.Capabilities.touch;
   }.property(),
 
   mobileViewLinkTextKey: function() {
diff --git a/app/assets/javascripts/discourse/initializers/sniff-capabilities.js.es6 b/app/assets/javascripts/discourse/initializers/sniff-capabilities.js.es6
index 2ca464f2b6f..46ace48ace3 100644
--- a/app/assets/javascripts/discourse/initializers/sniff-capabilities.js.es6
+++ b/app/assets/javascripts/discourse/initializers/sniff-capabilities.js.es6
@@ -28,5 +28,7 @@ export default {
     // Inject it
     application.register('capabilities:main', caps, { instantiate: false });
     application.inject('view', 'capabilities', 'capabilities:main');
+
+    Discourse.Capabilities = caps;
   }
 };