diff --git a/.eslintrc b/.eslintrc
index bf0396a4b..160be46dd 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -17,7 +17,6 @@
"no-implicit-globals": 1,
"no-labels": 1,
"no-multi-str": 1,
- "no-unused-expressions": 1,
"comma-spacing": 1,
"comma-style": 1,
"func-call-spacing": 1,
diff --git a/demo/index.html b/demo/index.html
index c5794e059..5e05bae02 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -46,7 +46,6 @@
-
DPlayer
Wow, such a lovely HTML5 danmaku video player
@@ -61,6 +60,8 @@
Live Video (HTTP Live Streaming, M3U8 format) support
FLV format support
+
Segmented videos
+
@@ -180,6 +181,28 @@ FLV format support
}
});
+ // Segmented videos
+ var dp5 = new DPlayer({
+ element: document.getElementById('dplayer5'),
+ autoplay: false,
+ theme: '#FADFA3',
+ loop: true,
+ screenshot: true,
+ hotkey: true,
+ preload: 'metadata',
+ video: {
+ url: ['http://devtest.qiniudn.com/若能绽放光芒0.mp4', 'http://devtest.qiniudn.com/若能绽放光芒1.mp4', 'http://devtest.qiniudn.com/若能绽放光芒2.mp4', 'http://devtest.qiniudn.com/若能绽放光芒3.mp4', 'http://devtest.qiniudn.com/若能绽放光芒4.mp4', 'http://devtest.qiniudn.com/若能绽放光芒5.mp4', 'http://devtest.qiniudn.com/若能绽放光芒6.mp4', 'http://devtest.qiniudn.com/若能绽放光芒7.mp4', 'http://devtest.qiniudn.com/若能绽放光芒8.mp4'],
+ pic: 'http://devtest.qiniudn.com/若能绽放光芒.png',
+ type: 'normal',
+ },
+ danmaku: {
+ id: '9E2E3368B56CDBB40',
+ api: 'https://api.prprpr.me/dplayer/',
+ token: 'tokendemo',
+ maximum: 3000
+ }
+ });
+
// stats.js: JavaScript Performance Monitor
var stats = new Stats();
stats.showPanel(0); // 0: fps, 1: ms, 2: mb, 3+: custom
@@ -193,5 +216,6 @@ FLV format support
}
requestAnimationFrame(animate);
+