hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed event forward method

Browse source
This commit is contained in:
Cat 2017-03-02 14:34:45 +01:00 • committed by Thulinma
parent 899ee1088a
commit cf942c5700
4 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
embed/core.js
View file

@ -779,7 +779,10 @@ MistPlayer.prototype.report = function(msg) {
MistPlayer.prototype.unload = function(){
this.addlog('Unloading..');
if (('pause' in this) && (this.pause)) { this.pause(); }
if ('updateSrc' in this) { this.updateSrc(''); this.load(); }
if ('updateSrc' in this) {
this.updateSrc('');
this.element.load(); //dont use this.load() to avoid interrupting play/pause
}
this.timer.clear();
this.target.innerHTML = '';
};

12
embed/wrappers/dashjs.js
View file

@ -82,13 +82,19 @@ p.prototype.build = function (options,callback) {
break;
}
}
me.adderror(msg);
},true);
//prevent onerror loops
if (e.target == me.element) {
e.message = msg;
}
else {
me.adderror(msg);
}
});
var events = ['abort','canplay','canplaythrough','durationchange','emptied','ended','interruptbegin','interruptend','loadeddata','loadedmetadata','loadstart','pause','play','playing','ratechange','seeked','seeking','stalled','volumechange','waiting'];
for (var i in events) {
ele.addEventListener(events[i],function(e){
me.addlog('Player event fired: '+e.type);
},true);
});
}
var player = dashjs.MediaPlayer().create();

8
embed/wrappers/html5.js
View file

@ -159,7 +159,13 @@ p.prototype.build = function (options) {
break;
}
}
me.adderror(msg);
//prevent onerror loops
if (e.target == me.element) {
e.message = msg;
}
else {
me.adderror(msg);
}
});
var events = ['abort','canplay','canplaythrough','durationchange','emptied','ended','interruptbegin','interruptend','loadeddata','loadedmetadata','loadstart','pause','play','playing','ratechange','seeked','seeking','stalled','volumechange','waiting','progress'];
for (var i in events) {

10
embed/wrappers/videojs.js
View file

@ -132,13 +132,19 @@ p.prototype.build = function (options) {
break;
}
}
me.adderror(msg);
//prevent onerror loops
if (e.target == me.element) {
e.message = msg;
}
else {
me.adderror(msg);
}
});
var events = ['abort','canplay','canplaythrough','durationchange','emptied','ended','interruptbegin','interruptend','loadeddata','loadedmetadata','loadstart','pause','play','playing','ratechange','seeked','seeking','stalled','volumechange','waiting','progress'];
for (var i in events) {
ele.addEventListener(events[i],function(e){
me.addlog('Player event fired: '+e.type);
},true);
});
}
return cont;