🐛 #139

anucvml · Mar 6, 2022 · e758335 · e758335
1 parent 25b4f0e
commit e758335
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -119,14 +119,16 @@ const q = useQuasar()
 q.dark.set('auto')
 
 const useV2 = computed(() => {
-  console.log('Video Decoder: ', preferenceStore.decoder)
+  let ret
   if (preferenceStore.decoder === 'v1') {
-    return false
+    ret = false
   } else if (preferenceStore.decoder === 'v2') {
-    return true
+    ret = true
   } else {
-    return !!window.VideoDecoder
+    ret = !!window.VideoDecoder
   }
+  console.log('Video Decoder:', ret ? 'V2' : 'V1')
+  return ret
 })
 
 const progress = computed(() => {

diff --git a/src/pages/annotation/CanvasPanel.vue b/src/pages/annotation/CanvasPanel.vue
@@ -958,7 +958,7 @@ const getTouchLocation = event => {
   let currentTarget = canvas.value
   let top = 0
   let left = 0
-  while (currentTarget !== undefined) {
+  while (currentTarget) {
     top += currentTarget.offsetTop
     left += currentTarget.offsetLeft
     currentTarget = currentTarget.offsetParent

diff --git a/src/pages/annotation/ControlPanel.vue b/src/pages/annotation/ControlPanel.vue
@@ -157,7 +157,7 @@
                 label="Grayscale"
             ></q-toggle>
             <q-toggle
-                v-if="annotationStore.mode !== 'action'"
+                v-if="!q.platform.has.touch && annotationStore.mode !== 'action'"
                 v-model="preferenceStore.showPopup"
                 label="Show popup"
             ></q-toggle>

diff --git a/src/pages/annotation/components/TableBase.vue b/src/pages/annotation/components/TableBase.vue
@@ -249,8 +249,9 @@ const handleClearAll = () => {
 }
 const currentInstance = getCurrentInstance()
 const focusLast = () => {
-  if (currentInstance.ctx.$refs.select) {
-    currentInstance.ctx.$refs.select.at(-1).showPopup()
+  const selectList = currentInstance.ctx.$refs.select
+  if (selectList) {
+    selectList[selectList.length - 1].showPopup()
   }
 }
 defineExpose({