Merge pull request #1582 from NicoPennec/fix/various

Improve UX
cgwire · Nov 11, 2024 · c9947bb · c9947bb
2 parents eeff9cc + 27bdc6f
commit c9947bb
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 29 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -980,6 +980,10 @@ a:hover {
   flex: 1;
 }
 
+.nowrap {
+  white-space: nowrap;
+}
+
 .z300 {
   z-index: 300000;
 }

diff --git a/src/components/pages/Assets.vue b/src/components/pages/Assets.vue
@@ -845,8 +845,8 @@ export default {
         searchQuery !== 'undefined'
       ) {
         this.setAssetSearch(searchQuery)
-        this.setSearchInUrl()
       }
+      this.setSearchInUrl()
       if (clearSelection) {
         this.clearSelection()
       }

diff --git a/src/components/pages/Edits.vue b/src/components/pages/Edits.vue
@@ -834,9 +834,10 @@ export default {
       const searchQuery = this.searchField.getValue() || ''
       if (searchQuery.length !== 1 && !this.isLongEditList) {
         this.applySearch(searchQuery)
-      }
-      if (searchQuery.length === 0 && this.isLongEditList) {
+      } else if (searchQuery.length === 0 && this.isLongEditList) {
         this.applySearch('')
+      } else {
+        this.setSearchInUrl()
       }
       if (clearSelection) {
         this.clearSelection()

diff --git a/src/components/pages/SequenceStats.vue b/src/components/pages/SequenceStats.vue
@@ -181,7 +181,7 @@ export default {
       this.$router.push(this.sequencesPath)
     },
 
-    onSearchChange(event) {
+    onSearchChange() {
       const searchQuery = this.$refs['sequence-search-field'].getValue()
       this.setSequenceStatsSearch(searchQuery)
     },

diff --git a/src/components/pages/Shots.vue b/src/components/pages/Shots.vue
@@ -941,9 +941,10 @@ export default {
       const searchQuery = this.searchField.getValue() || ''
       if (searchQuery.length !== 1 && !this.isLongShotList) {
         this.applySearch(searchQuery)
-      }
-      if (searchQuery.length === 0 && this.isLongShotList) {
+      } else if (searchQuery.length === 0 && this.isLongShotList) {
         this.applySearch('')
+      } else {
+        this.setSearchInUrl()
       }
       if (clearSelection) {
         this.clearSelection()

diff --git a/src/components/pages/playlists/PlaylistPlayer.vue b/src/components/pages/playlists/PlaylistPlayer.vue
@@ -403,30 +403,37 @@
         />
       </div>
 
-      <div v-if="isCurrentPreviewMovie">
-        <template v-if="!isFullMode">
-          <span
-            class="flexrow-item time-indicator is-hidden-desktop"
-            :title="$t('playlists.actions.current_time')"
-          >
-            {{ currentTime }}
-          </span>
-          <span class="flexrow-item time-indicator is-hidden-desktop"> / </span>
-          <span
-            class="flexrow-item time-indicator is-hidden-desktop"
-            :title="$t('playlists.actions.max_duration')"
-          >
-            {{ maxDuration }}
-          </span>
-          <span
-            class="flexrow-item time-indicator mr1"
-            :title="$t('playlists.actions.frame_number')"
-          >
-            ({{ currentFrame }}&nbsp;/&nbsp;{{
-              (nbFrames + '').padStart(3, '0')
-            }})
+      <div
+        class="flexrow flexrow-item mr0"
+        v-if="isCurrentPreviewMovie && !isFullMode"
+      >
+        <span
+          class="flexrow-item time-indicator"
+          :title="$t('playlists.actions.current_time')"
+        >
+          {{ currentTime }}
+        </span>
+        <span
+          class="flexrow-item time-indicator is-hidden-touch is-hidden-desktop-only"
+        >
+          /
+        </span>
+        <span
+          class="flexrow-item time-indicator is-hidden-touch is-hidden-desktop-only"
+          :title="$t('playlists.actions.max_duration')"
+        >
+          {{ maxDuration }}
+        </span>
+        <span
+          class="flexrow-item time-indicator mr05 nowrap"
+          :title="$t('playlists.actions.frame_number')"
+        >
+          ({{ currentFrame }}
+          <span class="is-hidden-touch is-hidden-desktop-only">
+            / {{ (nbFrames + '').padStart(3, '0') }}
           </span>
-        </template>
+          )
+        </span>
       </div>
 
       <div class="separator"></div>