ckplayer-plus 1.1.2 → 1.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/dist/ckplayer.js +35 -17
- package/dist/ckplayer.min.js +2 -2
- package/dist/index.cjs +29 -16
- package/dist/index.js +29 -16
- package/dist/react.cjs +32 -16
- package/dist/react.js +32 -16
- package/dist/vue.cjs +32 -16
- package/dist/vue.js +32 -16
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
|
@@ -210,7 +210,7 @@ var require_ckplayer = __commonJS({
|
|
|
210
210
|
cdnFallback: true
|
|
211
211
|
// getPath 失败时是否回退到 jsDelivr(内网可设 false,并配置 pluginPath)
|
|
212
212
|
};
|
|
213
|
-
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.
|
|
213
|
+
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.3/dist/";
|
|
214
214
|
function ckplayerEmbed(videoObj) {
|
|
215
215
|
var rightMenu = [
|
|
216
216
|
{
|
|
@@ -432,7 +432,7 @@ var require_ckplayer = __commonJS({
|
|
|
432
432
|
}
|
|
433
433
|
var allowCdn = !vars || vars["cdnFallback"] !== false;
|
|
434
434
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
435
|
-
if (!allowCdn || !cdn || cdn.indexOf("1.1.
|
|
435
|
+
if (!allowCdn || !cdn || cdn.indexOf("1.1.3") > -1) {
|
|
436
436
|
return folder + "/" + file;
|
|
437
437
|
}
|
|
438
438
|
if (cdn.slice(-1) !== "/") {
|
|
@@ -527,7 +527,11 @@ var require_ckplayer = __commonJS({
|
|
|
527
527
|
player.muted();
|
|
528
528
|
recoveryVolume = true;
|
|
529
529
|
video.attr("preload", "auto");
|
|
530
|
-
|
|
530
|
+
if (parseResumeSeekFromVars() > 0) {
|
|
531
|
+
autoplayPending = false;
|
|
532
|
+
} else {
|
|
533
|
+
autoplayPending = true;
|
|
534
|
+
}
|
|
531
535
|
} else {
|
|
532
536
|
video.attr("preload", "metadata");
|
|
533
537
|
}
|
|
@@ -643,6 +647,9 @@ var require_ckplayer = __commonJS({
|
|
|
643
647
|
if (!seekTime) {
|
|
644
648
|
applyResumeSeekState(parseResumeSeekFromVars());
|
|
645
649
|
}
|
|
650
|
+
if (seekTime > 0) {
|
|
651
|
+
autoplayPending = false;
|
|
652
|
+
}
|
|
646
653
|
}, hlsSeekTo = function(target, force) {
|
|
647
654
|
if (!hls || typeof hls.startLoad !== "function" || !video) {
|
|
648
655
|
return false;
|
|
@@ -1675,25 +1682,28 @@ var require_ckplayer = __commonJS({
|
|
|
1675
1682
|
return false;
|
|
1676
1683
|
}, finishResumeSeek = function(t) {
|
|
1677
1684
|
hlsResumeWarmup = false;
|
|
1685
|
+
autoplayPending = false;
|
|
1678
1686
|
applySeekToMedia(t);
|
|
1679
1687
|
setTimeout(function() {
|
|
1680
1688
|
if (!video) {
|
|
1681
1689
|
return;
|
|
1682
1690
|
}
|
|
1691
|
+
try {
|
|
1692
|
+
video.pause();
|
|
1693
|
+
} catch (event2) {
|
|
1694
|
+
}
|
|
1695
|
+
paused = true;
|
|
1683
1696
|
if (C["buffer"]) {
|
|
1684
1697
|
C["buffer"].hide();
|
|
1685
1698
|
}
|
|
1686
1699
|
waited = true;
|
|
1687
|
-
if (vars["
|
|
1688
|
-
|
|
1689
|
-
|
|
1690
|
-
|
|
1691
|
-
|
|
1692
|
-
|
|
1693
|
-
|
|
1694
|
-
} catch (event2) {
|
|
1695
|
-
}
|
|
1696
|
-
autoplayPending = false;
|
|
1700
|
+
if (!vars["controls"] && C["centerPlay"]) {
|
|
1701
|
+
C["centerPlay"].show();
|
|
1702
|
+
}
|
|
1703
|
+
if (C["bar"] && C["bar"]["playAndPause"]) {
|
|
1704
|
+
C["bar"]["playAndPause"]["pause"].hide();
|
|
1705
|
+
C["bar"]["playAndPause"]["play"].show();
|
|
1706
|
+
C["bar"]["playAndPause"]["refresh"].hide();
|
|
1697
1707
|
}
|
|
1698
1708
|
}, 120);
|
|
1699
1709
|
}, clearSeekRetry = function() {
|
|
@@ -2073,7 +2083,7 @@ var require_ckplayer = __commonJS({
|
|
|
2073
2083
|
eventTarget("seeked");
|
|
2074
2084
|
},
|
|
2075
2085
|
seeking: function() {
|
|
2076
|
-
if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime) {
|
|
2086
|
+
if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime && !autoplayPending) {
|
|
2077
2087
|
player.play();
|
|
2078
2088
|
}
|
|
2079
2089
|
var seekingTime = this.currentTime;
|
|
@@ -4273,7 +4283,10 @@ var require_ckplayer = __commonJS({
|
|
|
4273
4283
|
}
|
|
4274
4284
|
}
|
|
4275
4285
|
seekTime = player.time();
|
|
4276
|
-
|
|
4286
|
+
try {
|
|
4287
|
+
video.removeAttr("autoplay");
|
|
4288
|
+
} catch (event2) {
|
|
4289
|
+
}
|
|
4277
4290
|
changeVideo(ele.attr("data-video"));
|
|
4278
4291
|
message(language["switchTo"] + ele.htm());
|
|
4279
4292
|
C["bar"]["definition"]["button"].htm(ele.htm());
|
|
@@ -6265,7 +6278,7 @@ var require_ckplayer = __commonJS({
|
|
|
6265
6278
|
if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
|
|
6266
6279
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
6267
6280
|
var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
|
|
6268
|
-
if (cdn && cdn.indexOf("1.1.
|
|
6281
|
+
if (cdn && cdn.indexOf("1.1.3") === -1 && m) {
|
|
6269
6282
|
if (cdn.slice(-1) !== "/") {
|
|
6270
6283
|
cdn += "/";
|
|
6271
6284
|
}
|
package/dist/index.js
CHANGED
|
@@ -204,7 +204,7 @@ var require_ckplayer = __commonJS({
|
|
|
204
204
|
cdnFallback: true
|
|
205
205
|
// getPath 失败时是否回退到 jsDelivr(内网可设 false,并配置 pluginPath)
|
|
206
206
|
};
|
|
207
|
-
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.
|
|
207
|
+
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.3/dist/";
|
|
208
208
|
function ckplayerEmbed(videoObj) {
|
|
209
209
|
var rightMenu = [
|
|
210
210
|
{
|
|
@@ -426,7 +426,7 @@ var require_ckplayer = __commonJS({
|
|
|
426
426
|
}
|
|
427
427
|
var allowCdn = !vars || vars["cdnFallback"] !== false;
|
|
428
428
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
429
|
-
if (!allowCdn || !cdn || cdn.indexOf("1.1.
|
|
429
|
+
if (!allowCdn || !cdn || cdn.indexOf("1.1.3") > -1) {
|
|
430
430
|
return folder + "/" + file;
|
|
431
431
|
}
|
|
432
432
|
if (cdn.slice(-1) !== "/") {
|
|
@@ -521,7 +521,11 @@ var require_ckplayer = __commonJS({
|
|
|
521
521
|
player.muted();
|
|
522
522
|
recoveryVolume = true;
|
|
523
523
|
video.attr("preload", "auto");
|
|
524
|
-
|
|
524
|
+
if (parseResumeSeekFromVars() > 0) {
|
|
525
|
+
autoplayPending = false;
|
|
526
|
+
} else {
|
|
527
|
+
autoplayPending = true;
|
|
528
|
+
}
|
|
525
529
|
} else {
|
|
526
530
|
video.attr("preload", "metadata");
|
|
527
531
|
}
|
|
@@ -637,6 +641,9 @@ var require_ckplayer = __commonJS({
|
|
|
637
641
|
if (!seekTime) {
|
|
638
642
|
applyResumeSeekState(parseResumeSeekFromVars());
|
|
639
643
|
}
|
|
644
|
+
if (seekTime > 0) {
|
|
645
|
+
autoplayPending = false;
|
|
646
|
+
}
|
|
640
647
|
}, hlsSeekTo = function(target, force) {
|
|
641
648
|
if (!hls || typeof hls.startLoad !== "function" || !video) {
|
|
642
649
|
return false;
|
|
@@ -1669,25 +1676,28 @@ var require_ckplayer = __commonJS({
|
|
|
1669
1676
|
return false;
|
|
1670
1677
|
}, finishResumeSeek = function(t) {
|
|
1671
1678
|
hlsResumeWarmup = false;
|
|
1679
|
+
autoplayPending = false;
|
|
1672
1680
|
applySeekToMedia(t);
|
|
1673
1681
|
setTimeout(function() {
|
|
1674
1682
|
if (!video) {
|
|
1675
1683
|
return;
|
|
1676
1684
|
}
|
|
1685
|
+
try {
|
|
1686
|
+
video.pause();
|
|
1687
|
+
} catch (event2) {
|
|
1688
|
+
}
|
|
1689
|
+
paused = true;
|
|
1677
1690
|
if (C["buffer"]) {
|
|
1678
1691
|
C["buffer"].hide();
|
|
1679
1692
|
}
|
|
1680
1693
|
waited = true;
|
|
1681
|
-
if (vars["
|
|
1682
|
-
|
|
1683
|
-
|
|
1684
|
-
|
|
1685
|
-
|
|
1686
|
-
|
|
1687
|
-
|
|
1688
|
-
} catch (event2) {
|
|
1689
|
-
}
|
|
1690
|
-
autoplayPending = false;
|
|
1694
|
+
if (!vars["controls"] && C["centerPlay"]) {
|
|
1695
|
+
C["centerPlay"].show();
|
|
1696
|
+
}
|
|
1697
|
+
if (C["bar"] && C["bar"]["playAndPause"]) {
|
|
1698
|
+
C["bar"]["playAndPause"]["pause"].hide();
|
|
1699
|
+
C["bar"]["playAndPause"]["play"].show();
|
|
1700
|
+
C["bar"]["playAndPause"]["refresh"].hide();
|
|
1691
1701
|
}
|
|
1692
1702
|
}, 120);
|
|
1693
1703
|
}, clearSeekRetry = function() {
|
|
@@ -2067,7 +2077,7 @@ var require_ckplayer = __commonJS({
|
|
|
2067
2077
|
eventTarget("seeked");
|
|
2068
2078
|
},
|
|
2069
2079
|
seeking: function() {
|
|
2070
|
-
if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime) {
|
|
2080
|
+
if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime && !autoplayPending) {
|
|
2071
2081
|
player.play();
|
|
2072
2082
|
}
|
|
2073
2083
|
var seekingTime = this.currentTime;
|
|
@@ -4267,7 +4277,10 @@ var require_ckplayer = __commonJS({
|
|
|
4267
4277
|
}
|
|
4268
4278
|
}
|
|
4269
4279
|
seekTime = player.time();
|
|
4270
|
-
|
|
4280
|
+
try {
|
|
4281
|
+
video.removeAttr("autoplay");
|
|
4282
|
+
} catch (event2) {
|
|
4283
|
+
}
|
|
4271
4284
|
changeVideo(ele.attr("data-video"));
|
|
4272
4285
|
message(language["switchTo"] + ele.htm());
|
|
4273
4286
|
C["bar"]["definition"]["button"].htm(ele.htm());
|
|
@@ -6259,7 +6272,7 @@ var require_ckplayer = __commonJS({
|
|
|
6259
6272
|
if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
|
|
6260
6273
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
6261
6274
|
var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
|
|
6262
|
-
if (cdn && cdn.indexOf("1.1.
|
|
6275
|
+
if (cdn && cdn.indexOf("1.1.3") === -1 && m) {
|
|
6263
6276
|
if (cdn.slice(-1) !== "/") {
|
|
6264
6277
|
cdn += "/";
|
|
6265
6278
|
}
|
package/dist/react.cjs
CHANGED
|
@@ -210,7 +210,7 @@ var require_ckplayer = __commonJS({
|
|
|
210
210
|
cdnFallback: true
|
|
211
211
|
// getPath 失败时是否回退到 jsDelivr(内网可设 false,并配置 pluginPath)
|
|
212
212
|
};
|
|
213
|
-
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.
|
|
213
|
+
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.3/dist/";
|
|
214
214
|
function ckplayerEmbed(videoObj) {
|
|
215
215
|
var rightMenu = [
|
|
216
216
|
{
|
|
@@ -432,7 +432,7 @@ var require_ckplayer = __commonJS({
|
|
|
432
432
|
}
|
|
433
433
|
var allowCdn = !vars || vars["cdnFallback"] !== false;
|
|
434
434
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
435
|
-
if (!allowCdn || !cdn || cdn.indexOf("1.1.
|
|
435
|
+
if (!allowCdn || !cdn || cdn.indexOf("1.1.3") > -1) {
|
|
436
436
|
return folder + "/" + file;
|
|
437
437
|
}
|
|
438
438
|
if (cdn.slice(-1) !== "/") {
|
|
@@ -527,7 +527,11 @@ var require_ckplayer = __commonJS({
|
|
|
527
527
|
player.muted();
|
|
528
528
|
recoveryVolume = true;
|
|
529
529
|
video.attr("preload", "auto");
|
|
530
|
-
|
|
530
|
+
if (parseResumeSeekFromVars() > 0) {
|
|
531
|
+
autoplayPending = false;
|
|
532
|
+
} else {
|
|
533
|
+
autoplayPending = true;
|
|
534
|
+
}
|
|
531
535
|
} else {
|
|
532
536
|
video.attr("preload", "metadata");
|
|
533
537
|
}
|
|
@@ -643,6 +647,9 @@ var require_ckplayer = __commonJS({
|
|
|
643
647
|
if (!seekTime) {
|
|
644
648
|
applyResumeSeekState(parseResumeSeekFromVars());
|
|
645
649
|
}
|
|
650
|
+
if (seekTime > 0) {
|
|
651
|
+
autoplayPending = false;
|
|
652
|
+
}
|
|
646
653
|
}, hlsSeekTo = function(target, force) {
|
|
647
654
|
if (!hls || typeof hls.startLoad !== "function" || !video) {
|
|
648
655
|
return false;
|
|
@@ -1675,25 +1682,28 @@ var require_ckplayer = __commonJS({
|
|
|
1675
1682
|
return false;
|
|
1676
1683
|
}, finishResumeSeek = function(t) {
|
|
1677
1684
|
hlsResumeWarmup = false;
|
|
1685
|
+
autoplayPending = false;
|
|
1678
1686
|
applySeekToMedia(t);
|
|
1679
1687
|
setTimeout(function() {
|
|
1680
1688
|
if (!video) {
|
|
1681
1689
|
return;
|
|
1682
1690
|
}
|
|
1691
|
+
try {
|
|
1692
|
+
video.pause();
|
|
1693
|
+
} catch (event2) {
|
|
1694
|
+
}
|
|
1695
|
+
paused = true;
|
|
1683
1696
|
if (C["buffer"]) {
|
|
1684
1697
|
C["buffer"].hide();
|
|
1685
1698
|
}
|
|
1686
1699
|
waited = true;
|
|
1687
|
-
if (vars["
|
|
1688
|
-
|
|
1689
|
-
|
|
1690
|
-
|
|
1691
|
-
|
|
1692
|
-
|
|
1693
|
-
|
|
1694
|
-
} catch (event2) {
|
|
1695
|
-
}
|
|
1696
|
-
autoplayPending = false;
|
|
1700
|
+
if (!vars["controls"] && C["centerPlay"]) {
|
|
1701
|
+
C["centerPlay"].show();
|
|
1702
|
+
}
|
|
1703
|
+
if (C["bar"] && C["bar"]["playAndPause"]) {
|
|
1704
|
+
C["bar"]["playAndPause"]["pause"].hide();
|
|
1705
|
+
C["bar"]["playAndPause"]["play"].show();
|
|
1706
|
+
C["bar"]["playAndPause"]["refresh"].hide();
|
|
1697
1707
|
}
|
|
1698
1708
|
}, 120);
|
|
1699
1709
|
}, clearSeekRetry = function() {
|
|
@@ -2073,7 +2083,7 @@ var require_ckplayer = __commonJS({
|
|
|
2073
2083
|
eventTarget("seeked");
|
|
2074
2084
|
},
|
|
2075
2085
|
seeking: function() {
|
|
2076
|
-
if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime) {
|
|
2086
|
+
if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime && !autoplayPending) {
|
|
2077
2087
|
player.play();
|
|
2078
2088
|
}
|
|
2079
2089
|
var seekingTime = this.currentTime;
|
|
@@ -4273,7 +4283,10 @@ var require_ckplayer = __commonJS({
|
|
|
4273
4283
|
}
|
|
4274
4284
|
}
|
|
4275
4285
|
seekTime = player.time();
|
|
4276
|
-
|
|
4286
|
+
try {
|
|
4287
|
+
video.removeAttr("autoplay");
|
|
4288
|
+
} catch (event2) {
|
|
4289
|
+
}
|
|
4277
4290
|
changeVideo(ele.attr("data-video"));
|
|
4278
4291
|
message(language["switchTo"] + ele.htm());
|
|
4279
4292
|
C["bar"]["definition"]["button"].htm(ele.htm());
|
|
@@ -6265,7 +6278,7 @@ var require_ckplayer = __commonJS({
|
|
|
6265
6278
|
if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
|
|
6266
6279
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
6267
6280
|
var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
|
|
6268
|
-
if (cdn && cdn.indexOf("1.1.
|
|
6281
|
+
if (cdn && cdn.indexOf("1.1.3") === -1 && m) {
|
|
6269
6282
|
if (cdn.slice(-1) !== "/") {
|
|
6270
6283
|
cdn += "/";
|
|
6271
6284
|
}
|
|
@@ -7092,6 +7105,9 @@ function buildPlayerConfig(input) {
|
|
|
7092
7105
|
config[key] = opts[key];
|
|
7093
7106
|
}
|
|
7094
7107
|
}
|
|
7108
|
+
if (config.seek > 0) {
|
|
7109
|
+
config.autoplay = false;
|
|
7110
|
+
}
|
|
7095
7111
|
if (config.loaded != null && typeof config.loaded !== "function") {
|
|
7096
7112
|
delete config.loaded;
|
|
7097
7113
|
}
|
package/dist/react.js
CHANGED
|
@@ -204,7 +204,7 @@ var require_ckplayer = __commonJS({
|
|
|
204
204
|
cdnFallback: true
|
|
205
205
|
// getPath 失败时是否回退到 jsDelivr(内网可设 false,并配置 pluginPath)
|
|
206
206
|
};
|
|
207
|
-
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.
|
|
207
|
+
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.3/dist/";
|
|
208
208
|
function ckplayerEmbed(videoObj) {
|
|
209
209
|
var rightMenu = [
|
|
210
210
|
{
|
|
@@ -426,7 +426,7 @@ var require_ckplayer = __commonJS({
|
|
|
426
426
|
}
|
|
427
427
|
var allowCdn = !vars || vars["cdnFallback"] !== false;
|
|
428
428
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
429
|
-
if (!allowCdn || !cdn || cdn.indexOf("1.1.
|
|
429
|
+
if (!allowCdn || !cdn || cdn.indexOf("1.1.3") > -1) {
|
|
430
430
|
return folder + "/" + file;
|
|
431
431
|
}
|
|
432
432
|
if (cdn.slice(-1) !== "/") {
|
|
@@ -521,7 +521,11 @@ var require_ckplayer = __commonJS({
|
|
|
521
521
|
player.muted();
|
|
522
522
|
recoveryVolume = true;
|
|
523
523
|
video.attr("preload", "auto");
|
|
524
|
-
|
|
524
|
+
if (parseResumeSeekFromVars() > 0) {
|
|
525
|
+
autoplayPending = false;
|
|
526
|
+
} else {
|
|
527
|
+
autoplayPending = true;
|
|
528
|
+
}
|
|
525
529
|
} else {
|
|
526
530
|
video.attr("preload", "metadata");
|
|
527
531
|
}
|
|
@@ -637,6 +641,9 @@ var require_ckplayer = __commonJS({
|
|
|
637
641
|
if (!seekTime) {
|
|
638
642
|
applyResumeSeekState(parseResumeSeekFromVars());
|
|
639
643
|
}
|
|
644
|
+
if (seekTime > 0) {
|
|
645
|
+
autoplayPending = false;
|
|
646
|
+
}
|
|
640
647
|
}, hlsSeekTo = function(target, force) {
|
|
641
648
|
if (!hls || typeof hls.startLoad !== "function" || !video) {
|
|
642
649
|
return false;
|
|
@@ -1669,25 +1676,28 @@ var require_ckplayer = __commonJS({
|
|
|
1669
1676
|
return false;
|
|
1670
1677
|
}, finishResumeSeek = function(t) {
|
|
1671
1678
|
hlsResumeWarmup = false;
|
|
1679
|
+
autoplayPending = false;
|
|
1672
1680
|
applySeekToMedia(t);
|
|
1673
1681
|
setTimeout(function() {
|
|
1674
1682
|
if (!video) {
|
|
1675
1683
|
return;
|
|
1676
1684
|
}
|
|
1685
|
+
try {
|
|
1686
|
+
video.pause();
|
|
1687
|
+
} catch (event2) {
|
|
1688
|
+
}
|
|
1689
|
+
paused = true;
|
|
1677
1690
|
if (C["buffer"]) {
|
|
1678
1691
|
C["buffer"].hide();
|
|
1679
1692
|
}
|
|
1680
1693
|
waited = true;
|
|
1681
|
-
if (vars["
|
|
1682
|
-
|
|
1683
|
-
|
|
1684
|
-
|
|
1685
|
-
|
|
1686
|
-
|
|
1687
|
-
|
|
1688
|
-
} catch (event2) {
|
|
1689
|
-
}
|
|
1690
|
-
autoplayPending = false;
|
|
1694
|
+
if (!vars["controls"] && C["centerPlay"]) {
|
|
1695
|
+
C["centerPlay"].show();
|
|
1696
|
+
}
|
|
1697
|
+
if (C["bar"] && C["bar"]["playAndPause"]) {
|
|
1698
|
+
C["bar"]["playAndPause"]["pause"].hide();
|
|
1699
|
+
C["bar"]["playAndPause"]["play"].show();
|
|
1700
|
+
C["bar"]["playAndPause"]["refresh"].hide();
|
|
1691
1701
|
}
|
|
1692
1702
|
}, 120);
|
|
1693
1703
|
}, clearSeekRetry = function() {
|
|
@@ -2067,7 +2077,7 @@ var require_ckplayer = __commonJS({
|
|
|
2067
2077
|
eventTarget("seeked");
|
|
2068
2078
|
},
|
|
2069
2079
|
seeking: function() {
|
|
2070
|
-
if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime) {
|
|
2080
|
+
if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime && !autoplayPending) {
|
|
2071
2081
|
player.play();
|
|
2072
2082
|
}
|
|
2073
2083
|
var seekingTime = this.currentTime;
|
|
@@ -4267,7 +4277,10 @@ var require_ckplayer = __commonJS({
|
|
|
4267
4277
|
}
|
|
4268
4278
|
}
|
|
4269
4279
|
seekTime = player.time();
|
|
4270
|
-
|
|
4280
|
+
try {
|
|
4281
|
+
video.removeAttr("autoplay");
|
|
4282
|
+
} catch (event2) {
|
|
4283
|
+
}
|
|
4271
4284
|
changeVideo(ele.attr("data-video"));
|
|
4272
4285
|
message(language["switchTo"] + ele.htm());
|
|
4273
4286
|
C["bar"]["definition"]["button"].htm(ele.htm());
|
|
@@ -6259,7 +6272,7 @@ var require_ckplayer = __commonJS({
|
|
|
6259
6272
|
if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
|
|
6260
6273
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
6261
6274
|
var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
|
|
6262
|
-
if (cdn && cdn.indexOf("1.1.
|
|
6275
|
+
if (cdn && cdn.indexOf("1.1.3") === -1 && m) {
|
|
6263
6276
|
if (cdn.slice(-1) !== "/") {
|
|
6264
6277
|
cdn += "/";
|
|
6265
6278
|
}
|
|
@@ -7078,6 +7091,9 @@ function buildPlayerConfig(input) {
|
|
|
7078
7091
|
config[key] = opts[key];
|
|
7079
7092
|
}
|
|
7080
7093
|
}
|
|
7094
|
+
if (config.seek > 0) {
|
|
7095
|
+
config.autoplay = false;
|
|
7096
|
+
}
|
|
7081
7097
|
if (config.loaded != null && typeof config.loaded !== "function") {
|
|
7082
7098
|
delete config.loaded;
|
|
7083
7099
|
}
|
package/dist/vue.cjs
CHANGED
|
@@ -210,7 +210,7 @@ var require_ckplayer = __commonJS({
|
|
|
210
210
|
cdnFallback: true
|
|
211
211
|
// getPath 失败时是否回退到 jsDelivr(内网可设 false,并配置 pluginPath)
|
|
212
212
|
};
|
|
213
|
-
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.
|
|
213
|
+
var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.3/dist/";
|
|
214
214
|
function ckplayerEmbed(videoObj) {
|
|
215
215
|
var rightMenu = [
|
|
216
216
|
{
|
|
@@ -432,7 +432,7 @@ var require_ckplayer = __commonJS({
|
|
|
432
432
|
}
|
|
433
433
|
var allowCdn = !vars || vars["cdnFallback"] !== false;
|
|
434
434
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
435
|
-
if (!allowCdn || !cdn || cdn.indexOf("1.1.
|
|
435
|
+
if (!allowCdn || !cdn || cdn.indexOf("1.1.3") > -1) {
|
|
436
436
|
return folder + "/" + file;
|
|
437
437
|
}
|
|
438
438
|
if (cdn.slice(-1) !== "/") {
|
|
@@ -527,7 +527,11 @@ var require_ckplayer = __commonJS({
|
|
|
527
527
|
player.muted();
|
|
528
528
|
recoveryVolume = true;
|
|
529
529
|
video.attr("preload", "auto");
|
|
530
|
-
|
|
530
|
+
if (parseResumeSeekFromVars() > 0) {
|
|
531
|
+
autoplayPending = false;
|
|
532
|
+
} else {
|
|
533
|
+
autoplayPending = true;
|
|
534
|
+
}
|
|
531
535
|
} else {
|
|
532
536
|
video.attr("preload", "metadata");
|
|
533
537
|
}
|
|
@@ -643,6 +647,9 @@ var require_ckplayer = __commonJS({
|
|
|
643
647
|
if (!seekTime) {
|
|
644
648
|
applyResumeSeekState(parseResumeSeekFromVars());
|
|
645
649
|
}
|
|
650
|
+
if (seekTime > 0) {
|
|
651
|
+
autoplayPending = false;
|
|
652
|
+
}
|
|
646
653
|
}, hlsSeekTo = function(target, force) {
|
|
647
654
|
if (!hls || typeof hls.startLoad !== "function" || !video) {
|
|
648
655
|
return false;
|
|
@@ -1675,25 +1682,28 @@ var require_ckplayer = __commonJS({
|
|
|
1675
1682
|
return false;
|
|
1676
1683
|
}, finishResumeSeek = function(t) {
|
|
1677
1684
|
hlsResumeWarmup = false;
|
|
1685
|
+
autoplayPending = false;
|
|
1678
1686
|
applySeekToMedia(t);
|
|
1679
1687
|
setTimeout(function() {
|
|
1680
1688
|
if (!video) {
|
|
1681
1689
|
return;
|
|
1682
1690
|
}
|
|
1691
|
+
try {
|
|
1692
|
+
video.pause();
|
|
1693
|
+
} catch (event2) {
|
|
1694
|
+
}
|
|
1695
|
+
paused = true;
|
|
1683
1696
|
if (C["buffer"]) {
|
|
1684
1697
|
C["buffer"].hide();
|
|
1685
1698
|
}
|
|
1686
1699
|
waited = true;
|
|
1687
|
-
if (vars["
|
|
1688
|
-
|
|
1689
|
-
|
|
1690
|
-
|
|
1691
|
-
|
|
1692
|
-
|
|
1693
|
-
|
|
1694
|
-
} catch (event2) {
|
|
1695
|
-
}
|
|
1696
|
-
autoplayPending = false;
|
|
1700
|
+
if (!vars["controls"] && C["centerPlay"]) {
|
|
1701
|
+
C["centerPlay"].show();
|
|
1702
|
+
}
|
|
1703
|
+
if (C["bar"] && C["bar"]["playAndPause"]) {
|
|
1704
|
+
C["bar"]["playAndPause"]["pause"].hide();
|
|
1705
|
+
C["bar"]["playAndPause"]["play"].show();
|
|
1706
|
+
C["bar"]["playAndPause"]["refresh"].hide();
|
|
1697
1707
|
}
|
|
1698
1708
|
}, 120);
|
|
1699
1709
|
}, clearSeekRetry = function() {
|
|
@@ -2073,7 +2083,7 @@ var require_ckplayer = __commonJS({
|
|
|
2073
2083
|
eventTarget("seeked");
|
|
2074
2084
|
},
|
|
2075
2085
|
seeking: function() {
|
|
2076
|
-
if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime) {
|
|
2086
|
+
if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime && !autoplayPending) {
|
|
2077
2087
|
player.play();
|
|
2078
2088
|
}
|
|
2079
2089
|
var seekingTime = this.currentTime;
|
|
@@ -4273,7 +4283,10 @@ var require_ckplayer = __commonJS({
|
|
|
4273
4283
|
}
|
|
4274
4284
|
}
|
|
4275
4285
|
seekTime = player.time();
|
|
4276
|
-
|
|
4286
|
+
try {
|
|
4287
|
+
video.removeAttr("autoplay");
|
|
4288
|
+
} catch (event2) {
|
|
4289
|
+
}
|
|
4277
4290
|
changeVideo(ele.attr("data-video"));
|
|
4278
4291
|
message(language["switchTo"] + ele.htm());
|
|
4279
4292
|
C["bar"]["definition"]["button"].htm(ele.htm());
|
|
@@ -6265,7 +6278,7 @@ var require_ckplayer = __commonJS({
|
|
|
6265
6278
|
if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
|
|
6266
6279
|
var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
|
|
6267
6280
|
var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
|
|
6268
|
-
if (cdn && cdn.indexOf("1.1.
|
|
6281
|
+
if (cdn && cdn.indexOf("1.1.3") === -1 && m) {
|
|
6269
6282
|
if (cdn.slice(-1) !== "/") {
|
|
6270
6283
|
cdn += "/";
|
|
6271
6284
|
}
|
|
@@ -7081,6 +7094,9 @@ function buildPlayerConfig(input) {
|
|
|
7081
7094
|
config[key] = opts[key];
|
|
7082
7095
|
}
|
|
7083
7096
|
}
|
|
7097
|
+
if (config.seek > 0) {
|
|
7098
|
+
config.autoplay = false;
|
|
7099
|
+
}
|
|
7084
7100
|
if (config.loaded != null && typeof config.loaded !== "function") {
|
|
7085
7101
|
delete config.loaded;
|
|
7086
7102
|
}
|