Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: base keyboard shortcuts on touch vs no touch.

This commit is contained in:
Sam 2014-08-06 15:00:51 +10:00
parent bc48094d9a
commit cbc71e693e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/site-map.js.es6
View File

@ -10,11 +10,11 @@ export default Ember.ArrayController.extend(Discourse.HasCurrentUser, {
badgesUrl: Discourse.getURL('/badges'), badgesUrl: Discourse.getURL('/badges'),
showKeyboardShortcuts: function(){ showKeyboardShortcuts: function(){
return !Discourse.Mobile.mobileView && !Discourse.Mobile.isMobileDevice; return !Discourse.Mobile.mobileView && !Discourse.Capabilities.touch;
}.property(), }.property(),
showMobileToggle: function(){ showMobileToggle: function(){
return Discourse.SiteSettings.enable_mobile_theme && Discourse.Mobile.isMobileDevice; return Discourse.SiteSettings.enable_mobile_theme && Discourse.Capabilities.touch;
}.property(), }.property(),
mobileViewLinkTextKey: function() { mobileViewLinkTextKey: function() {

2
app/assets/javascripts/discourse/initializers/sniff-capabilities.js.es6
View File

@ -28,5 +28,7 @@ export default {
// Inject it // Inject it
application.register('capabilities:main', caps, { instantiate: false }); application.register('capabilities:main', caps, { instantiate: false });
application.inject('view', 'capabilities', 'capabilities:main'); application.inject('view', 'capabilities', 'capabilities:main');
Discourse.Capabilities = caps;
} }
}; };