1
0
mirror of https://github.com/videojs/video.js.git synced 2024-12-21 01:39:04 +02:00

Merge branch 'main' into main

This commit is contained in:
mister-ben 2024-12-09 12:08:00 +01:00 committed by GitHub
commit 19ed230873
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 51 additions and 30 deletions

View File

@ -1,3 +1,26 @@
<a name="8.21.1"></a>
## [8.21.1](https://github.com/videojs/video.js/compare/v8.21.0...v8.21.1) (2024-12-05)
### Chores
* **lang:** update zh-TW translations ([#8929](https://github.com/videojs/video.js/issues/8929)) ([b6cec4f](https://github.com/videojs/video.js/commit/b6cec4f)), closes [1000#0](https://github.com/1000/issues/0)
* update Occitan locale file ([#8927](https://github.com/videojs/video.js/issues/8927)) ([a0ca168](https://github.com/videojs/video.js/commit/a0ca168))
<a name="8.21.0"></a>
# [8.21.0](https://github.com/videojs/video.js/compare/v8.20.0...v8.21.0) (2024-12-05)
### Features
* Add option to disable seeking while scrubbing on mobile ([#8903](https://github.com/videojs/video.js/issues/8903)) ([57d6ab6](https://github.com/videojs/video.js/commit/57d6ab6))
### Bug Fixes
* update vhs version ([#8930](https://github.com/videojs/video.js/issues/8930)) ([f87a699](https://github.com/videojs/video.js/commit/f87a699))
### Chores
* update VHS version ([#8933](https://github.com/videojs/video.js/issues/8933)) ([a7ba9f2](https://github.com/videojs/video.js/commit/a7ba9f2))
<a name="8.20.0"></a>
# [8.20.0](https://github.com/videojs/video.js/compare/v8.19.2...v8.20.0) (2024-11-19)

View File

@ -22,8 +22,8 @@ Video.js was started in the middle of 2010 and is now used on over ~~50,000~~ ~~
Thanks to the awesome folks over at [Fastly][fastly], there's a free, CDN hosted version of Video.js that anyone can use. Add these tags to your document's `<head>`:
```html
<link href="//vjs.zencdn.net/8.20.0/video-js.min.css" rel="stylesheet">
<script src="//vjs.zencdn.net/8.20.0/video.min.js"></script>
<link href="//vjs.zencdn.net/8.21.1/video-js.min.css" rel="stylesheet">
<script src="//vjs.zencdn.net/8.21.1/video.min.js"></script>
```
Alternatively, you can include Video.js by getting it from [npm](https://videojs.com/getting-started/#install-via-npm), downloading it from [GitHub releases](https://github.com/videojs/video.js/releases) or by including it via [unpkg](https://unpkg.com) or another JavaScript CDN, like CDNjs.
@ -34,12 +34,12 @@ Alternatively, you can include Video.js by getting it from [npm](https://videojs
<script src="https://unpkg.com/video.js/dist/video.min.js"></script>
<!-- unpkg : use a specific version of Video.js (change the version numbers as necessary) -->
<link href="https://unpkg.com/video.js@8.20.0/dist/video-js.min.css" rel="stylesheet">
<script src="https://unpkg.com/video.js@8.20.0/dist/video.min.js"></script>
<link href="https://unpkg.com/video.js@8.21.1/dist/video-js.min.css" rel="stylesheet">
<script src="https://unpkg.com/video.js@8.21.1/dist/video.min.js"></script>
<!-- cdnjs : use a specific version of Video.js (change the version numbers as necessary) -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.20.0/video-js.min.css" rel="stylesheet">
<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.20.0/video.min.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.21.1/video-js.min.css" rel="stylesheet">
<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/8.21.1/video.min.js"></script>
```
Next, using Video.js is as simple as creating a `<video>` element, but with an additional `data-setup` attribute. At a minimum, this attribute must have a value of `'{}'`, but it can include any Video.js [options][options] - just make sure it contains valid JSON!

View File

@ -506,6 +506,7 @@ This default value is hardcoded as a default to the localize method in the SeekB
| | Text Background |
| | Caption Area Background |
| | Playing in Picture-in-Picture |
| mr.json (Complete) | |
| nb.json (Complete) | |
| nl.json (missing 1) | Playing in Picture-in-Picture |
| nn.json (missing 10) | Exit Picture-in-Picture |
@ -527,15 +528,6 @@ This default value is hardcoded as a default to the localize method in the SeekB
| | Playing in Picture-in-Picture |
| | Skip backward {1} seconds |
| | Skip forward {1} seconds |
| np.json (missing 9) | Drop shadow |
| | No content |
| | Color |
| | Opacity |
| | Text Background |
| | Caption Area Background |
| | Playing in Picture-in-Picture |
| | Skip backward {1} seconds |
| | Skip forward {1} seconds |
| oc.json (missing 7) | Color |
| | Opacity |
| | Text Background |
@ -790,6 +782,6 @@ This default value is hardcoded as a default to the localize method in the SeekB
| | Skip forward {1} seconds |
| zh-CN.json (missing 2) | Drop shadow |
| | Playing in Picture-in-Picture |
| zh-TW.json (missing 1) | Playing in Picture-in-Picture |
| zh-TW.json (Complete) | |
<!-- END langtable -->

View File

@ -86,5 +86,12 @@
"{1} is loading.": "{1} es a cargar.",
"Exit Picture-in-Picture": "Sortir de la vidèo incrustada",
"Picture-in-Picture": "Vidèo incrustada",
"No content": "Cap de contengut"
"No content": "Cap de contengut",
"Color": "Color",
"Opacity": "Opacitat",
"Text Background": "Rèireplan del tèxte",
"Caption Area Background": "Rèireplan de la zòna de la legenda",
"Playing in Picture-in-Picture": "Lectura en vidèo incrustada",
"Skip backward {1} seconds": "Avançar de {1} segondas",
"Skip forward {1} seconds": "Recular de {1} segondas"
}

View File

@ -10,8 +10,6 @@
"Progress": "進度",
"Fullscreen": "全螢幕",
"Exit Fullscreen": "退出全螢幕",
"Picture-in-Picture": "子母畫面",
"Exit Picture-in-Picture": "退出子母畫面",
"Mute": "靜音",
"Unmute": "開啟音效",
"Playback Rate": " 播放速率",
@ -87,6 +85,7 @@
"progress bar timing: currentTime={1} duration={2}": "{1}/{2}",
"{1} is loading.": "{1} 正在載入。",
"Exit Picture-in-Picture": "離開子母畫面",
"Playing in Picture-in-Picture": "在子母畫面中播放",
"Picture-in-Picture": "子母畫面",
"No content": "沒有內容",
"Color": "顏色",

16
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "video.js",
"version": "8.20.0",
"version": "8.21.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -1791,9 +1791,9 @@
}
},
"@videojs/http-streaming": {
"version": "3.16.0",
"resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.16.0.tgz",
"integrity": "sha512-VL8l+JGbc9KqZ1fY2pYgBS1u3i6iQ/5mRAE6bwrI5R0RAtKxur1hjipVGwkkJSYRzwLgArt5Wg5abEjfoJN7yA==",
"version": "3.16.2",
"resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.16.2.tgz",
"integrity": "sha512-fvt4ko7FknxiT9FnjyNQt6q2px+awrkM+Orv7IB/4gldvj94u4fowGfmNHynnvNTPgPkdxHklGmFLGfclYw8HA==",
"requires": {
"@babel/runtime": "^7.12.5",
"@videojs/vhs-utils": "^4.1.1",
@ -15061,12 +15061,12 @@
"dev": true
},
"video.js": {
"version": "8.19.1",
"resolved": "https://registry.npmjs.org/video.js/-/video.js-8.19.1.tgz",
"integrity": "sha512-MVuayhXpzTBv5Jk3nYEU2akawPhuBBlizEbpQGx2i+6FiBmqxGjkrkLdDLOzG54ut7xapjp26IfWQLGSpeLmcQ==",
"version": "8.20.0",
"resolved": "https://registry.npmjs.org/video.js/-/video.js-8.20.0.tgz",
"integrity": "sha512-VyXY/DbtfaI22gpWJdo8bmTcpPRfKg0SeQJBusRdIJF1RMI+er1BHpRreg67s5Qfd9ZeSbfKShUOwaxRft/tBw==",
"requires": {
"@babel/runtime": "^7.12.5",
"@videojs/http-streaming": "^3.15.0",
"@videojs/http-streaming": "^3.16.0",
"@videojs/vhs-utils": "^4.1.1",
"@videojs/xhr": "2.7.0",
"aes-decrypter": "^4.0.2",

View File

@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 video player that supports HLS and DASH with a common API and skin.",
"version": "8.20.0",
"version": "8.21.1",
"main": "./dist/video.cjs.js",
"module": "./dist/video.es.js",
"style": "./dist/video-js.css",
@ -86,7 +86,7 @@
},
"dependencies": {
"@babel/runtime": "^7.12.5",
"@videojs/http-streaming": "^3.16.0",
"@videojs/http-streaming": "^3.16.2",
"@videojs/vhs-utils": "^4.1.1",
"@videojs/xhr": "2.7.0",
"aes-decrypter": "^4.0.2",