Commit b628e91e authored by jackie / Andrea Ida Malkah Klaura's avatar jackie / Andrea Ida Malkah Klaura
Browse files

FIX: rerender discarded slots

parent ddc8d47a
......@@ -270,12 +270,13 @@ export default {
},
resolveEvent (toResolve, mode) {
this.$log.debug('resolveEvent', toResolve)
this.conflictCount -= toResolve.collisions.length
let slotIndex = this.calendarSlots.findIndex(s => s.id === toResolve.id)
switch (mode) {
case 'theirs':
this.conflictSolutions[toResolve.hash] = 'theirs'
toResolve.className = 'discarded'
this.calendarSlots[slotIndex].className = 'ours-discarded'
this.renderView(null)
break
default:
......@@ -396,8 +397,9 @@ a.currentShow {
.noconflict {
background-color: #17a2b8;
}
.discarded {
background-color: #eee;
text-decoration: line-through;
.ours-discarded {
background-color: #b00;
opacity: 0.5;
text-decoration: line-through !important;
}
</style>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment