1.1.1

canwdev · Feb 19, 2024 · b60f190 · b60f190
1 parent 37fff0d
commit b60f190
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 10 deletions.
diff --git a/docs/assets/index-b30cd3ce.js b/docs/assets/index-b30cd3ce.js
diff --git a/docs/assets/index-c755aaa2.js b/docs/assets/index-c755aaa2.js
diff --git a/docs/index.html b/docs/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" href="./favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Web MediaDevices Player</title>
-    <script type="module" crossorigin src="./assets/index-c755aaa2.js"></script>
+    <script type="module" crossorigin src="./assets/index-b30cd3ce.js"></script>
     <link rel="stylesheet" href="./assets/index-1194dece.css">
   <link rel="manifest" href="./manifest.webmanifest"><script id="vite-plugin-pwa:register-sw" src="./registerSW.js"></script></head>
   <body>

diff --git a/docs/sw.js b/docs/sw.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web-mediadevices-player",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "scripts": {
     "dev": "vite",

diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -17,7 +17,7 @@ tauri-build = { version = "1.5.1", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.6.0", features = [] }
+tauri = { version = "1.6.0", features = ["window-set-fullscreen"] }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 
 [features]

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,12 +7,15 @@
     "distDir": "../docs"
   },
   "package": {
-    "productName": "Web Mediadevices Player",
-    "version": "1.1.0"
+    "productName": "web-mediadevices-player",
+    "version": "1.1.1"
   },
   "tauri": {
     "allowlist": {
-      "all": false
+      "all": false,
+      "window": {
+        "setFullscreen": true
+      }
     },
     "bundle": {
       "active": true,
@@ -58,7 +61,7 @@
         "fullscreen": false,
         "height": 600,
         "resizable": true,
-        "title": "web-mediadevices-player",
+        "title": "Web Mediadevices Player",
         "width": 800
       }
     ]

diff --git a/src/App.vue b/src/App.vue
@@ -25,6 +25,7 @@ async function getEnumerateDevices() {
 export default defineComponent({
   setup() {
     const isLoading = ref(false)
+    const isTauri = ref(!!window.__TAURI__)
     const isShowControls = useLocalStorageBoolean('ls_key_is_show_controls', false)
     const deviceList = ref([])
     const videoRef = ref()
@@ -297,6 +298,7 @@ export default defineComponent({
       handleScreenshot,
       actionBarRef,
       rootRef,
+      isTauri,
     }
   },
 })
@@ -333,7 +335,7 @@ export default defineComponent({
           <button @click="handleStart">▶Start</button>
           <button @click="stopBothVideoAndAudio">⏹Stop</button>
           <button @click="clearSelect">🛑Reset</button>
-          <button @click="toggleFullScreen">📺Fullscreen</button>
+          <button v-if="!isTauri" @click="toggleFullScreen">📺Fullscreen</button>
 
           <label for="toggleControls">
             <input