diff --git a/docs/lab/js/common.js b/docs/lab/js/common.js
index 884d9eaab..d2df4cc53 100644
--- a/docs/lab/js/common.js
+++ b/docs/lab/js/common.js
@@ -1,4 +1,4 @@
-(function(win) {
+(function() {
var $code = document.querySelector('.code');
var $run = document.querySelector('.run');
var $lib = document.querySelector('.lib');
@@ -57,23 +57,33 @@
script.onload = function() {
resolve(url);
};
+ script.onerror = function() {
+ reject(new Error('Loading script failed:' + url));
+ };
document.querySelector('head').appendChild(script);
});
}
function loadStyle(url) {
- return new Promise(function(resolve) {
- var style = document.createElement('style');
- style.type = 'text/css';
- style.src = url;
- document.querySelector('head').appendChild(style);
- resolve(url);
+ return new Promise(function(resolve, reject) {
+ var link = document.createElement('link');
+ link.rel = 'stylesheet';
+ link.href = url;
+ link.onload = function() {
+ resolve(url);
+ };
+ link.onerror = function() {
+ reject(new Error('Loading style failed:' + url));
+ };
+ document.querySelector('head').appendChild(link);
});
}
- function loadLib(libs = defaultLib) {
+ function loadLib(libs) {
var libPromise = [];
- libs.split(',')
+ var libsDecode = decodeURIComponent(libs || defaultLib);
+ libsDecode
+ .split(/\r?\n/)
.filter(function(url) {
return !loaddLib.includes(url);
})
@@ -85,45 +95,27 @@
libPromise.push(loadStyle(url));
}
});
- $lib.value = decodeURIComponent(libs);
+ $lib.value = libsDecode;
return Promise.all(libPromise);
}
function loadCode(code) {
- return new Promise(function(resolve, reject) {
- if (code) {
- mirror.setValue(decodeURIComponent(code).trim());
- runCode();
- resolve(code);
- } else {
- fetch('./js/example.js')
- .then(response => {
- return response.text();
- })
- .then(text => {
- mirror.setValue(text);
- runCode();
- resolve(text);
- })
- .catch(err => {
- console.error(err.message);
- });
- }
- });
- }
-
- function initApp() {
- const { code, libs } = getURLParameters(window.location.href);
- loadLib(libs)
- .then(function(result) {
- loaddLib = loaddLib.concat(result);
- loadCode(code).then(() => {
- console.info('App initialization completed');
+ if (code) {
+ mirror.setValue(decodeURIComponent(code).trim());
+ runCode();
+ } else {
+ fetch('./js/example.js')
+ .then(response => {
+ return response.text();
+ })
+ .then(text => {
+ mirror.setValue(text);
+ runCode();
+ })
+ .catch(err => {
+ console.error(err.message);
});
- })
- .catch(err => {
- console.error(err.message);
- });
+ }
}
function runCode() {
@@ -133,19 +125,32 @@
var code = mirror.getValue();
eval(code);
initArt(Artplayer.instances[0]);
+ console.info('Player initialization completed');
+ }
+
+ function initApp() {
+ const { code, libs } = getURLParameters(window.location.href);
+ loadLib(libs)
+ .then(function(result) {
+ loaddLib = loaddLib.concat(result);
+ loadCode(code);
+ })
+ .catch(err => {
+ console.error(err.message);
+ });
}
$run.addEventListener('click', function(e) {
- runCode();
const libs = encodeURIComponent($lib.value);
const code = encodeURIComponent(mirror.getValue());
const url = window.location.origin + window.location.pathname + '?libs=' + libs + '&code=' + code;
history.pushState(null, null, url);
+ initApp();
});
- win.addEventListener('error', err => {
+ window.addEventListener('error', err => {
console.error(err.message);
});
initApp();
-})(window);
+})();
diff --git a/docs/lab/js/dash.js b/docs/lab/js/dash.js
deleted file mode 100644
index d137feb3e..000000000
--- a/docs/lab/js/dash.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var art = new Artplayer({
- container: '.artplayer-app',
- url: 'https://dash.akamaized.net/envivio/EnvivioDash3/manifest.mpd',
- customType: {
- mpd: function(video, url) {
- var player = dashjs.MediaPlayer().create();
- player.initialize(video, url, true);
- },
- },
-});
\ No newline at end of file
diff --git a/docs/lab/js/flv.js b/docs/lab/js/flv.js
deleted file mode 100644
index 0af364276..000000000
--- a/docs/lab/js/flv.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var url = 'https://blog.zhw-island.com/assets-cdn';
-var art = new Artplayer({
- container: '.artplayer-app',
- url: url + '/video/one-more-time-one-more-chance-480p.flv',
- customType: {
- flv: function(video, url) {
- const flvPlayer = flvjs.createPlayer({
- type: 'flv',
- url: url,
- });
- flvPlayer.attachMediaElement(video);
- flvPlayer.load();
- },
- },
-});
\ No newline at end of file
diff --git a/docs/lab/js/hls.js b/docs/lab/js/hls.js
deleted file mode 100644
index 181fd420d..000000000
--- a/docs/lab/js/hls.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var art = new Artplayer({
- container: '.artplayer-app',
- url: 'https://video-dev.github.io/streams/x36xhzz/x36xhzz.m3u8',
- customType: {
- m3u8: function(video, url) {
- var hls = new Hls();
- hls.loadSource(url);
- hls.attachMedia(video);
- },
- },
-});
\ No newline at end of file
diff --git a/docs/lab/js/shaka.js b/docs/lab/js/shaka.js
deleted file mode 100644
index dd8d0a295..000000000
--- a/docs/lab/js/shaka.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var art = new Artplayer({
- container: '.artplayer-app',
- url: '//storage.googleapis.com/shaka-demo-assets/angel-one/dash.mpd',
- customType: {
- mpd: function(video, url) {
- shaka.polyfill.installAll();
- var player = new shaka.Player(video);
- player.load(url);
- },
- },
-});
\ No newline at end of file
diff --git a/docs/lab/js/webtorrent.js b/docs/lab/js/webtorrent.js
deleted file mode 100644
index 2fbacd5a9..000000000
--- a/docs/lab/js/webtorrent.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var art = new Artplayer({
- container: '.artplayer-app',
- url: 'magnet:?xt=urn:btih:6a9759bffd5c0af65319979fb7832189f4f3c35d&dn=sintel.mp4&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com&tr=wss%3A%2F%2Ftracker.webtorrent.io&ws=https%3A%2F%2Fwebtorrent.io%2Ftorrents%2Fsintel-1024-surround.mp4',
- type: 'torrent',
- customType: {
- torrent: function (video, url, art) {
- var client = new WebTorrent();
- art.loading.show();
- client.add(url, function (torrent) {
- var file = torrent.files[0];
- file.renderTo(video, {
- autoplay: true
- })
- })
- },
- },
-});
diff --git a/docs/lab/shaka.html b/docs/lab/shaka.html
deleted file mode 100644
index ffd8b2bf2..000000000
--- a/docs/lab/shaka.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
ArtPlayer.js Lab
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/docs/lab/webtorrent.html b/docs/lab/webtorrent.html
deleted file mode 100644
index 6ce01a3a5..000000000
--- a/docs/lab/webtorrent.html
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
ArtPlayer.js Lab
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file