Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Made vjs.get work with xDomain in IE < 10 #1095

Closed
wants to merge 10 commits into from
Closed

Made vjs.get work with xDomain in IE < 10 #1095

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
86e2dfd
Made vjs.get work in IE < 10
Mar 12, 2014
8691077
Merge branch 'master' of https://github.com/videojs/video.js into fea…
Mar 27, 2014
440de37
Fixed a bug with withcredentials
Mar 27, 2014
b7311f3
Set the withCredentials flag as an optional parameter
Apr 15, 2014
3fd0c92
Added line to changelog
heff May 7, 2014
bcb69a0
Merge branch 'master' of github.com:videojs/video.js
heff May 7, 2014
92eac13
More explicit MIME type note
mmcc May 7, 2014
24459eb
Merge branch 'feature/IE-get-xDomain' of github.com:dbmedialab/video.…
heff May 8, 2014
0812660
Switched to only using XDomainRequest if it is cross domain.
heff May 8, 2014
5d76663
Merge pull request #1 from heff/dbmedialab-feature/IE-get-xDomain
May 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions src/js/lib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,7 @@ vjs.createTimeRange = function(start, end){
vjs.get = function(url, onSuccess, onError){
var local, request;

onError = onError || function(){};
if (typeof XMLHttpRequest === 'undefined') {
window.XMLHttpRequest = function () {
try { return new window.ActiveXObject('Msxml2.XMLHTTP.6.0'); } catch (e) {}
Expand All @@ -584,8 +585,26 @@ vjs.get = function(url, onSuccess, onError){
}

request = new XMLHttpRequest();
if(!('withCredentials' in request) && window.XDomainRequest) {
request = new window.XDomainRequest();
request.onload = function() {
onSuccess(request.responseText);
};
request.onprogress = function() {};
request.onerror = onError;
request.ontimeout = onError;
try {
request.open('GET', url);
request.send();
} catch (e) {
onError(e);
}
return;
}

try {
request.open('GET', url);
request.withCredentials = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this always be set?

request.open('GET', url, true);
} catch(e) {
onError(e);
}
Expand All @@ -597,19 +616,15 @@ vjs.get = function(url, onSuccess, onError){
if (request.status === 200 || local && request.status === 0) {
onSuccess(request.responseText);
} else {
if (onError) {
onError();
}
onError();
}
}
};

try {
request.send();
} catch(e) {
if (onError) {
onError(e);
}
onError(e);
}
};

Expand Down