Merge branch 'feature/dark'
This commit is contained in:
@ -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
|
||||
}
|
||||
|
||||
@ -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(){
|
||||
|
||||
@ -299,7 +299,9 @@ export function openModal( name, data ){
|
||||
}
|
||||
|
||||
export function closeModal(){
|
||||
return { type: 'CLOSE_MODAL' }
|
||||
return {
|
||||
type: 'CLOSE_MODAL'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -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{
|
||||
<div className="input">
|
||||
<input
|
||||
type="text"
|
||||
readOnly
|
||||
value={ this.props.access_token } />
|
||||
onBlur={e => this.props.spotifyActions.authorizationGranted({access_token: e.target.value})}
|
||||
value={this.state.access_token} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -15,6 +15,25 @@ body {
|
||||
overflow-y: scroll;
|
||||
overflow-x: hidden;
|
||||
|
||||
&::-webkit-scrollbar{
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
}
|
||||
|
||||
&::-webkit-scrollbar-track {
|
||||
background: $dark_grey;
|
||||
}
|
||||
|
||||
&::-webkit-scrollbar-thumb {
|
||||
@include animate();
|
||||
background: $grey;
|
||||
border-radius: 3px;
|
||||
|
||||
&:hover {
|
||||
background: $mid_grey;
|
||||
}
|
||||
}
|
||||
|
||||
&.touch-dragging,
|
||||
&.modal-open {
|
||||
overflow-y: hidden;
|
||||
|
||||
Reference in New Issue
Block a user