Merge pull request #178 from girlbymirror/master

safari detect
numberwolf · Aug 28, 2022 · 539221a · 539221a
2 parents 9cb5cdb + 39a4bf3
commit 539221a
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 21 deletions.
diff --git a/dist-multi-thread/h265webjs-v20220824.js → dist-multi-thread/h265webjs-v20220828.js b/dist-multi-thread/h265webjs-v20220824.js → dist-multi-thread/h265webjs-v20220828.js
diff --git a/dist-multi-thread/index.js b/dist-multi-thread/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220824');
+require('./h265webjs-v20220828');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);

diff --git a/...le_vue/public/dist/h265webjs-v20220824.js → dist/h265webjs-v20220828.js b/...le_vue/public/dist/h265webjs-v20220824.js → dist/h265webjs-v20220828.js
diff --git a/dist/index.js b/dist/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220824');
+require('./h265webjs-v20220828');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);

diff --git a/.../dist-multi-thread/h265webjs-v20220824.js → .../dist-multi-thread/h265webjs-v20220828.js b/.../dist-multi-thread/h265webjs-v20220824.js → .../dist-multi-thread/h265webjs-v20220828.js
diff --git a/example_normal/dist-multi-thread/index.js b/example_normal/dist-multi-thread/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220824');
+require('./h265webjs-v20220828');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);

diff --git a/dist/h265webjs-v20220824.js → example_normal/dist/h265webjs-v20220828.js b/dist/h265webjs-v20220824.js → example_normal/dist/h265webjs-v20220828.js
diff --git a/example_normal/dist/index.js b/example_normal/dist/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220824');
+require('./h265webjs-v20220828');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);

diff --git a/example_normal/index.html b/example_normal/index.html
@@ -37,7 +37,7 @@
     <link rel="stylesheet" type="text/css" href='player-view/css/button.css'>
     <link rel="stylesheet" type="text/css" href='player-view/css/progress.css'>
     <script src="dist/missile.js"></script>
-    <script src="dist/h265webjs-v20220824.js"></script>
+    <script src="dist/h265webjs-v20220828.js"></script>
     <script src="index.js"></script>
 
 </head>

diff --git a/...vue_ts/public/dist/h265webjs-v20220824.js → ...le_vue/public/dist/h265webjs-v20220828.js b/...vue_ts/public/dist/h265webjs-v20220824.js → ...le_vue/public/dist/h265webjs-v20220828.js
diff --git a/example_vue/public/dist/index.js b/example_vue/public/dist/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220824');
+require('./h265webjs-v20220828');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);

diff --git a/index-debug.html b/index-debug.html
@@ -33,10 +33,10 @@
     <meta charset="utf-8" name="github" content="https://github.com/numberwolf/h265web.js">
 
     <script src="dist/missile.js"></script> <!-- IMPORTANT -->
-    <script src="dist/h265webjs-v20220824.js"></script> <!-- IMPORTANT -->
+    <script src="dist/h265webjs-v20220828.js"></script> <!-- IMPORTANT -->
 
     <!--<script src="dist-multi-thread/missile-multi-thread.js"></script>
-    <script src="dist-multi-thread/h265webjs-v20220824.js"></script>-->
+    <script src="dist-multi-thread/h265webjs-v20220828.js"></script>-->
 
     <style>
     </style>

diff --git a/src/src/decoder/av-common.js b/src/src/decoder/av-common.js
@@ -296,10 +296,11 @@ function BrowserJudge() {
         System.type = System.isIE ? "IE" :
             window.opera || (agent.indexOf("opr") > 0) ? "Opera" :
                 (agent.indexOf("chrome") > 0) ? "Chrome" :
-                    //safari也提供了专门的判定方式
-                    window.openDatabase ? "Safari" :
-                        (agent.indexOf("firefox") > 0) ? "Firefox" :
-                            'unknow';
+                    (agent.indexOf("safari") > 0) ? "Safari" :
+                        //safari也提供了专门的判定方式
+                        window.openDatabase ? "Safari" :
+                            (agent.indexOf("firefox") > 0) ? "Firefox" :
+                                'unknow';
 
         //版本号
         System.version = (System.type === "IE") ? System.ieVersion() :

diff --git a/src/src/index.js b/src/src/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220824');
+require('./h265webjs-v20220828');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);

diff --git a/src/version.sh b/src/version.sh
@@ -19,5 +19,5 @@
 #  * Github: https://github.com/numberwolf/h265web.js
 #  * 
 #  **********************************************************/
-VERSION='v20220824' # output version + index.js
+VERSION='v20220828' # output version + index.js
 WASM_VERSION='v20220706'
diff --git a/example_normal/dist/h265webjs-v20220824.js → ...vue_ts/public/dist/h265webjs-v20220828.js b/example_normal/dist/h265webjs-v20220824.js → ...vue_ts/public/dist/h265webjs-v20220828.js
diff --git a/vite_vue_ts/public/dist/index.js b/vite_vue_ts/public/dist/index.js
@@ -19,7 +19,7 @@
  * Github: https://github.com/numberwolf/h265web.js
  * 
  **********************************************************/
-require('./h265webjs-v20220824');
+require('./h265webjs-v20220828');
 export default class h265webjs {
 	static createPlayer(videoURL, config) {
 		return window.new265webjs(videoURL, config);