Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion webapp/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ export default {
this.$refs.primaryMediaSource.isPlaying() &&
// don't background bbb room when switching to new bbb room
!(newRoom?.modules.some(isExclusive) && oldRoom?.modules.some(isExclusive)) &&
!newRoomHasMedia
!newRoomHasMedia
) {
this.backgroundRoom = oldRoom
} else if (newRoomHasMedia) {
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/views/schedule/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
bunt-progress-circular(v-else, size="huge", :page="true")
</template>
<script>
import _ from 'lodash'
// import _ from 'lodash'
import { mapState, mapGetters } from 'vuex'
import LinearSchedule from 'views/schedule/schedule-components/LinearSchedule'
import GridSchedule from 'views/schedule/schedule-components/GridSchedule'
Expand Down Expand Up @@ -193,7 +193,7 @@ export default {
return sessions
},
rooms() {
const occupiedRoomIds = this.sessions.map(s => s.room.id)
const occupiedRoomIds = this.sessions.map(s => s.room.id)
return this.schedule.rooms.filter(r => occupiedRoomIds.includes(r.id))
},
filter() {
Expand Down
14 changes: 7 additions & 7 deletions webapp/src/views/schedule/sessions/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -191,16 +191,12 @@ export default {
filter.tracks.data = this.filterItemsByLanguage(this?.schedule?.tracks)
return filter
},
inEventTimezone () {
inEventTimezone() {
if (!this.schedule?.talks?.length) return false
const example = this.schedule.talks[0].start
return moment.tz(example, this.userTimezone).format('Z') === moment.tz(example, this.schedule.timezone).format('Z')
},
},
async created () {
this.userTimezone = moment.tz.guess()
this.currentTimezone = localStorage.getItem(`userTimezone`)
},
watch: {
tracksFilter: {
handler: function(newValue) {
Expand All @@ -211,6 +207,10 @@ export default {
deep: true
}
},
async created() {
this.userTimezone = moment.tz.guess()
this.currentTimezone = localStorage.getItem('userTimezone')
},
methods: {
changeDay(day) {
if (day.isSame(this.currentDay)) return
Expand Down Expand Up @@ -288,8 +288,8 @@ export default {
resetOnlyFavs() {
this.onlyFavs = false
},
saveTimezone () {
localStorage.setItem(`userTimezone`, this.currentTimezone)
saveTimezone() {
localStorage.setItem('userTimezone', this.currentTimezone)
},
}
}
Expand Down