diff --git a/src/js/App.js b/src/js/App.js index 5e313462..cecedc3c 100755 --- a/src/js/App.js +++ b/src/js/App.js @@ -91,14 +91,25 @@ class App extends React.Component{ } shouldTriggerShortcut(e){ - var ignoreNodes = ['INPUT', 'TEXTAREA'] - var keyCodes = [32,27,191,37,38,39,40,70] - if( ignoreNodes.indexOf(e.target.nodeName) > -1 ){ + // When we're focussed on certian elements, don't fire any shortcuts + // Typically form inputs + var ignoreNodes = ['INPUT', 'TEXTAREA'] + if (ignoreNodes.indexOf(e.target.nodeName) > -1){ return false } - if( keyCodes.indexOf(e.keyCode) > -1 ){ + // Listen for standalone key codes + let keyCodes = [27,32,191] + if (keyCodes.indexOf(e.keyCode) > -1){ + if (keyCode == 37) + e.preventDefault() + return true + } + + // Listen for key codes that require ctrl to be held + let keyCodesWithCtrl = [37,38,39,40,70] + if (e.ctrlKey && keyCodesWithCtrl.indexOf(e.keyCode) > -1){ e.preventDefault() return true } diff --git a/src/js/components/PlaybackControls.js b/src/js/components/PlaybackControls.js index d6885ec6..f1f9a7c1 100755 --- a/src/js/components/PlaybackControls.js +++ b/src/js/components/PlaybackControls.js @@ -60,6 +60,17 @@ class PlaybackControls extends React.Component{ handleThumbnailClick(e){ e.preventDefault(); this.props.uiActions.openModal('kiosk_mode') + + let app = document.documentElement + if (app.requestFullscreen){ + app.requestFullscreen() + } else if (app.webkitRequestFullscreen){ + app.webkitRequestFullscreen() + } else if (app.mozRequestFullScreen){ + app.mozRequestFullScreen() + } else if (app.msRequestFullscreen){ + app.msRequestFullscreen() + } } render(){ diff --git a/src/js/services/ui/actions.js b/src/js/services/ui/actions.js index 0b416d38..81361a81 100755 --- a/src/js/services/ui/actions.js +++ b/src/js/services/ui/actions.js @@ -299,7 +299,9 @@ export function openModal( name, data ){ } export function closeModal(){ - return { type: 'CLOSE_MODAL' } + return { + type: 'CLOSE_MODAL' + } } diff --git a/src/js/views/Debug.js b/src/js/views/Debug.js index 296b5119..d6998416 100755 --- a/src/js/views/Debug.js +++ b/src/js/views/Debug.js @@ -25,7 +25,8 @@ class Debug extends React.Component{ this.state = { mopidy_call: 'playlists.asList', mopidy_data: '{}', - pusher_data: '{"method":"get_config"}' + pusher_data: '{"method":"get_config"}', + access_token: this.props.access_token } } @@ -116,8 +117,8 @@ class Debug extends React.Component{