Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
sawasawasawa committed Sep 12, 2017
1 parent 1a73a63 commit 816a610
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 17 deletions.
Binary file added 5_kawa-ek_o_-yciu.mp3
Binary file not shown.
4 changes: 2 additions & 2 deletions client/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ h3 {
.bottomButton > div {
max-width: 90px;
bottom: auto;
top: 170px;
left: 20px;
bottom: 30px;
left: 30px;
}
#mapButtons {
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion imports/ui/components/dialogs/AddMediaDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default class AddMediaDialog extends React.Component {

if (this.state.mediaType === 'youtubeVideo') {
mediaObject.videoLink = this.state.videoLink
mediaObject.videoId = this.state.videoLink.replace(/http.*watch.*=/gi, '')
mediaObject.youtubeId = this.state.videoLink.replace(/http.*watch.*=/gi, '')
}

if (this.state.mediaType === 'mp3' && this.state.mp3 && this.state.uploadedFile) {
Expand Down
18 changes: 10 additions & 8 deletions imports/ui/components/dialogs/AddPlaceDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default class AddNewPlaceModal extends React.Component {
<MenuItem key={9} value={'Telewizja'} primaryText={'Telewizja'}/>
]
const actions = [
<FlatButton label='Anuluj' primary onTouchTap={this.handleClose}/>,
<FlatButton label='Anuluj' primary onTouchTap={this.handleClose} />,
<FlatButton label='Dodaj miejsce' primary onTouchTap={this.addPlace}
disabled={!(this.state.position && this.state.name)}
/>
Expand All @@ -88,13 +88,15 @@ export default class AddNewPlaceModal extends React.Component {
<Autocomplete
style={{width: '100%'}}
onPlaceSelected={(place) => {
this.setState({
place,
position: {
lat: place.geometry.location.lat(),
lng: place.geometry.location.lng()
}
})
if (place.geometry){
this.setState({
place,
position: {
lat: place.geometry.location.lat(),
lng: place.geometry.location.lng()
}
})
}
}}
types={['address']} // TODO needed?
componentRestrictions={{country: 'pl'}}
Expand Down
2 changes: 1 addition & 1 deletion imports/ui/components/dialogs/EventDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default class EventDialog extends React.Component {
actions={actions}
open={this.state.open}
onRequestClose={this.handleClose}
style={{zIndex: 10, paddingTop: '0px !important', top: '-156px'}}
style={{zIndex: 10, paddingTop: '0px !important'}}
repositionOnUpdate={false}
autoScrollBodyContent
>
Expand Down
2 changes: 1 addition & 1 deletion imports/ui/components/dialogs/MapVideoDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const MapVideoDialog = (props) => {
open={props.open}
titleStyle={{display: 'none'}}
onRequestClose={props.handleClose}
style={{zIndex: 10, paddingTop: '0px !important', top: '-156px'}}
style={{zIndex: 10, paddingTop: '0px !important'}}
repositionOnUpdate={false}
autoScrollBodyContent
>
Expand Down
2 changes: 1 addition & 1 deletion imports/ui/components/dialogs/Mp3Dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const Mp3Dialog = (props) => {
actions={actions}
open={props.open}
onRequestClose={props.handleClose}
style={{zIndex: 10, paddingTop: '0px !important', top: '-156px'}}
style={{zIndex: 10, paddingTop: '0px !important'}}
repositionOnUpdate={false}
autoScrollBodyContent
>
Expand Down
3 changes: 2 additions & 1 deletion imports/ui/components/dialogs/PlaceDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ export const PlaceDialog = (props) => {
actions={actions}
open={props.open}
onRequestClose={() => props.handleClose()}
style={{zIndex: 10, paddingTop: '0px !important', top: '-126px'}}
style={{zIndex: 10, paddingTop: '0px !important'}}
titleStyle={{display: 'none'}}
repositionOnUpdate={false}
autoScrollBodyContent
>
Expand Down
6 changes: 4 additions & 2 deletions imports/ui/components/dialogs/VideoDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,16 @@ export default class VideoDialog extends React.Component {
<h5 label={video.name} onTouchTap={this.handleOpen}>{ video.name }</h5>
<Dialog
title={video.name}
titleStyle={{display: 'none'}}
titleStyle={{display: 'none'}}
actions={actions}
open={this.state.open}
onRequestClose={this.handleClose}
style={{zIndex: 10, paddingTop: '0px !important', top: '-156px'}}
style={{zIndex: 10, paddingTop: '0px !important'}}
repositionOnUpdate={false}
autoScrollBodyContent
>
<h1>{video.name}</h1>
<h4 className='infowindow-title'>{video.name}</h4>
<YouTube key={video._id} videoId={video.youtubeId} opts={opts} />
</Dialog>
</div>
Expand Down

0 comments on commit 816a610

Please sign in to comment.