milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge from dev

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-30 13:52:33 -05:00
parent 8436c7ff3c
commit db793b9d25
46 changed files with 646 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/bower_components/hls.js/src/utils/attr-list.js vendored
View file

@ -64,7 +64,7 @@ class AttrList {
}
static parseAttrList(input) {
const re = /(.+?)=((?:\".*?\")|.*?)(?:,|$)/g;
const re = /\s*(.+?)\s*=((?:\".*?\")|.*?)(?:,|$)/g;
var match, attrs = {};
while ((match = re.exec(input)) !== null) {
var value = match[2], quote = '"';

9
dashboard-ui/bower_components/hls.js/src/utils/xhr-loader.js vendored
View file

@ -48,7 +48,14 @@ class XhrLoader {
}
loadInternal() {
var xhr = this.loader = new XMLHttpRequest();
var xhr;
if (typeof XDomainRequest !== 'undefined') {
xhr = this.loader = new XDomainRequest();
} else {
xhr = this.loader = new XMLHttpRequest();
}
xhr.onloadend = this.loadend.bind(this);
xhr.onprogress = this.loadprogress.bind(this);