Merge pull request #21 from metal/release/v3.1.0

3.1.0

gulpfile.js

@@ -19,11 +19,6 @@ var options = {
 			browserName: 'chrome',
 			version: '57'
 		},
-		sl_safari_8: {
-			base: 'SauceLabs',
-			browserName: 'safari',
-			version: '8'
-		},
 		sl_safari_9: {
 			base: 'SauceLabs',
 			browserName: 'safari',

karma.conf.js

@@ -2,6 +2,14 @@
 
 module.exports = function(config) {
 	config.set({
+		customHeaders: [
+			{
+				match: 'test/data/data.json',
+				name: 'Content-Length',
+				value: 315186
+			}
+		],
+
 		frameworks: ['browserify', 'chai', 'mocha', 'sinon'],
 
 		files: [
@@ -10,6 +18,12 @@ module.exports = function(config) {
 				watched: false,
 				included: true,
 				served: true
+			},
+			{
+				pattern: 'test/data/data.json',
+				watched: false,
+				included: false,
+				served: true
 			}
 		],
 

package.json

@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "metal": "^2.0.0",
-    "metal-promise": "^2.0.0",
+    "metal-promise": "^3.0.3",
     "metal-uri": "^3.0.0"
   },
   "devDependencies": {
@@ -38,6 +38,7 @@
     "gulp-metal": "^2.2.2",
     "karma": "^1.7.1",
     "karma-browserify": "^5.1.1",
-    "metal-structs": "^1.0.0"
+    "metal-structs": "^1.0.0",
+    "metal-useragent": "^2.1.3"
   }
 }

src/Ajax.js

@@ -2,7 +2,7 @@
 
 import { isDef, isDefAndNotNull } from 'metal';
 import Uri from 'metal-uri';
-import { CancellablePromise as Promise } from 'metal-promise';
+import { ProgressPromise as Promise } from 'metal-promise';
 
 class Ajax {
 
@@ -55,14 +55,19 @@ class Ajax {
 		var request = new XMLHttpRequest();
 		var previousReadyState = 0;
 
-		var promise = new Promise(function(resolve, reject) {
+		var promise = new Promise(function(resolve, reject, progress) {
 			request.onload = function() {
 				if (request.aborted) {
 					request.onerror();
 					return;
 				}
 				resolve(request);
 			};
+			request.onprogress = function(progressEvent) {
+				if (progressEvent.lengthComputable) {
+					progress(progressEvent.loaded / progressEvent.total);
+				}
+			};
 			request.onreadystatechange = function() {
 				if (previousReadyState && previousReadyState < 3 && 4 === request.readyState) {
 					request.terminatedPrematurely = true;
@@ -73,7 +78,7 @@ class Ajax {
 				var message = 'Request error';
 				if (request.terminatedPrematurely) {
 					message = 'Request terminated prematurely';
-				} 
+				}
 				var error = new Error(message);
 				error.request = request;
 				reject(error);