diff options
| author | Terry Truong <terry06890@gmail.com> | 2023-01-03 10:07:18 +1100 |
|---|---|---|
| committer | Terry Truong <terry06890@gmail.com> | 2023-01-03 10:07:18 +1100 |
| commit | 2e6463419e46ed21e8906f6519dc732398250583 (patch) | |
| tree | d91f41f83e208d1b42f97c2e9ada8257ac91de5a /src/components/TimeLine.vue | |
| parent | 6f34c4c3aafee39f8c7ec41a7777c194443a27fa (diff) | |
| parent | d48f3b862fad74af6576297d471d7834b1f0bba8 (diff) | |
Merge branch 'frontend-update' into backend-update
Diffstat (limited to 'src/components/TimeLine.vue')
| -rw-r--r-- | src/components/TimeLine.vue | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/components/TimeLine.vue b/src/components/TimeLine.vue index c869aa3..b9e8197 100644 --- a/src/components/TimeLine.vue +++ b/src/components/TimeLine.vue @@ -48,7 +48,7 @@ <!-- Events --> <div v-for="id in idToPos.keys()" :key="id" class="absolute animate-fadein z-20" :style="eventStyles(id)"> <!-- Image --> - <div class="rounded-full border border-yellow-500" :style="eventImgStyles(id)"></div> + <div class="rounded-full" :style="eventImgStyles(id)"></div> <!-- Label --> <div class="text-center text-stone-100 text-sm whitespace-nowrap text-ellipsis overflow-hidden"> {{idToEvent.get(id)!.title}} @@ -102,7 +102,6 @@ const width = ref(0); const height = ref(0); const availLen = computed(() => props.vert ? height.value : width.value); const availBreadth = computed(() => props.vert ? width.value : height.value); -const prevVert = ref(props.vert); // Previous 'vert' value, used for skipping transitions on horz/vert swap const mounted = ref(false); onMounted(() => { let rootEl = rootRef.value!; @@ -118,11 +117,8 @@ const resizeObserver = new ResizeObserver((entries) => { width.value = WRITING_MODE_HORZ ? boxSize.inlineSize : boxSize.blockSize; height.value = WRITING_MODE_HORZ ? boxSize.blockSize : boxSize.inlineSize; // Check for horz/vert swap - if (props.vert != prevVert.value){ - skipTransition.value = true; - setTimeout(() => {skipTransition.value = false}, 100); // Note: Using nextTick() doesn't work - prevVert.value = props.vert; - } + skipTransition.value = true; + setTimeout(() => {skipTransition.value = false}, 100); // Note: Using nextTick() doesn't work } } }); @@ -1104,7 +1100,7 @@ function onShiftWheel(evt: WheelEvent){ // For bound-change signalling function onStateChg(){ emit('state-chg', new TimelineState( - ID, firstDate.value, lastDate.value, startOffset.value, endOffset.value, scaleIdx.value + ID, startDate.value, endDate.value, startOffset.value, endOffset.value, scaleIdx.value )); } watch(firstDate, onStateChg); @@ -1172,6 +1168,8 @@ function eventImgStyles(eventId: number){ height: store.eventImgSz + 'px', backgroundImage: `url(${getImagePath(event.imgId)})`, backgroundSize: 'cover', + borderColor: event.ctg == 'discovery' ? store.color.alt2 : store.color.altDark, + borderWidth: '1px', }; } function eventLineStyles(eventId: number){ |