Skip to content

Commit

Permalink
options.element -> options.container
Browse files Browse the repository at this point in the history
  • Loading branch information
DIYgod committed Sep 15, 2017
1 parent 2323e73 commit 6ca11a2
Show file tree
Hide file tree
Showing 10 changed files with 174 additions and 167 deletions.
16 changes: 8 additions & 8 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h2 id="quick-start">Quick Start</h2>
<div id="dplayer1"></div>
<script>
var dp1 = new DPlayer({
element: document.getElementById('dplayer1'),
container: document.getElementById('dplayer1'),
video: {
url: 'http://devtest.qiniudn.com/若能绽放光芒.mp4',
pic: 'http://devtest.qiniudn.com/若能绽放光芒.png',
Expand Down Expand Up @@ -44,7 +44,7 @@ <h2 id="options">Options</h2>
<div id="events"></div>
<script>
var dp2 = new DPlayer({
element: document.getElementById('dplayer2'),
container: document.getElementById('dplayer2'),
autoplay: false,
theme: '#FADFA3',
loop: true,
Expand Down Expand Up @@ -135,7 +135,7 @@ <h2 id="quality-switching">Quality switching</h2>
<div id="dplayer3"></div>
<script>
var dp3 = new DPlayer({
element: document.getElementById('dplayer3'),
container: document.getElementById('dplayer3'),
video: {
quality: [{
name: 'HD',
Expand All @@ -158,7 +158,7 @@ <h2 id="hls-support">HLS support</h2>
<div id="dplayer4"></div>
<script>
var dp4 = new DPlayer({
element: document.getElementById('dplayer4'),
container: document.getElementById('dplayer4'),
video: {
url: 'http://devtest.qiniudn.com/若能绽放光芒5.m3u8',
type: 'hls'
Expand All @@ -168,7 +168,7 @@ <h2 id="hls-support">HLS support</h2>
<div id="dplayer8"></div>
<script>
var dp8 = new DPlayer({
element: document.getElementById('dplayer8')
container: document.getElementById('dplayer8')
});
var hls = new Hls();
hls.loadSource('http://devtest.qiniudn.com/若能绽放光芒5.m3u8');
Expand All @@ -181,7 +181,7 @@ <h2 id="flv-support">FLV support</h2>
<div id="dplayer5"></div>
<script>
var dp5 = new DPlayer({
element: document.getElementById('dplayer5'),
container: document.getElementById('dplayer5'),
video: {
url: 'http://devtest.qiniudn.com/【微小微】玖月奇迹-踩踩踩.flv',
type: 'flv'
Expand All @@ -191,7 +191,7 @@ <h2 id="flv-support">FLV support</h2>
<div id="dplayer7"></div>
<script>
var dp7 = new DPlayer({
element: document.getElementById('dplayer7')
container: document.getElementById('dplayer7')
});
var flvPlayer = flvjs.createPlayer({
type: 'flv',
Expand All @@ -207,7 +207,7 @@ <h2 id="bilibili-video-and-danmaku">Bilibili video and danmaku</h2>
<div id="dplayer6"></div>
<script>
var dp5 = new DPlayer({
element: document.getElementById('dplayer6'),
container: document.getElementById('dplayer6'),
screenshot: false,
video: {
url: 'https://api.prprpr.me/dplayer/video/bilibili?aid=4045652',
Expand Down
2 changes: 1 addition & 1 deletion dist/DPlayer.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/DPlayer.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dplayer",
"version": "1.10.3",
"version": "1.11.0",
"description": "Wow, such a lovely HTML5 danmaku video player",
"main": "dist/DPlayer.min.js",
"style": "dist/DPlayer.min.css",
Expand Down
Loading

0 comments on commit 6ca11a2

Please sign in to comment.