add progress
This commit is contained in:
parent
effee987be
commit
a5742d1a2a
|
@ -868,6 +868,9 @@
|
||||||
, request: function (preq, _sys) {
|
, request: function (preq, _sys) {
|
||||||
return new OAUTH3.PromiseA(function (resolve, reject) {
|
return new OAUTH3.PromiseA(function (resolve, reject) {
|
||||||
var xhr;
|
var xhr;
|
||||||
|
var headers = preq.headers || {};
|
||||||
|
var multipart;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
xhr = new XMLHttpRequest(_sys);
|
xhr = new XMLHttpRequest(_sys);
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
|
@ -898,9 +901,24 @@
|
||||||
, status: xhr.status
|
, status: xhr.status
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
console.log('$$$$$$$$$$$$$$$$$$$$$$$$ preq.progress:');
|
||||||
|
console.log(preq.progress);
|
||||||
|
if (preq.progress) {
|
||||||
|
xhr.upload.onprogress = function (ev) {
|
||||||
|
console.log('[progress]');
|
||||||
|
console.log(ev);
|
||||||
|
preq.progress({
|
||||||
|
loaded: ev.loaded
|
||||||
|
, total: ev.total
|
||||||
|
});
|
||||||
|
if (OAUTH3._digest) {
|
||||||
|
// $rootScope.$digest();
|
||||||
|
OAUTH3._digest();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
xhr.open(preq.method || 'GET', preq.url, true);
|
xhr.open(preq.method || 'GET', preq.url, true);
|
||||||
var headers = preq.headers || {};
|
|
||||||
var multipart;
|
|
||||||
|
|
||||||
if (preq.data) {
|
if (preq.data) {
|
||||||
headers['Content-Type'] = 'application/json'; // TODO XXX TODO utf8
|
headers['Content-Type'] = 'application/json'; // TODO XXX TODO utf8
|
||||||
|
|
|
@ -5,8 +5,8 @@ var modules = {
|
||||||
azp: [
|
azp: [
|
||||||
'$timeout'
|
'$timeout'
|
||||||
, '$q'
|
, '$q'
|
||||||
, function Oauth3($timeout, $q) {
|
, '$rootScope'
|
||||||
|
, function Oauth3($timeout, $q, $rootScope) {
|
||||||
var OAUTH3 = window.OAUTH3;
|
var OAUTH3 = window.OAUTH3;
|
||||||
|
|
||||||
// We need to make angular's $q appear to be a standard Promise/A+
|
// We need to make angular's $q appear to be a standard Promise/A+
|
||||||
|
@ -29,6 +29,9 @@ var modules = {
|
||||||
PromiseAngularQ.all = $q.all;
|
PromiseAngularQ.all = $q.all;
|
||||||
|
|
||||||
OAUTH3.PromiseA = PromiseAngularQ;
|
OAUTH3.PromiseA = PromiseAngularQ;
|
||||||
|
OAUTH3._digest = function () {
|
||||||
|
$rootScope.$digest();
|
||||||
|
};
|
||||||
|
|
||||||
window.ngOauth3 = OAUTH3;
|
window.ngOauth3 = OAUTH3;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue