Merge branch 't/12978' into major

ckeditor · May 11, 2015 · c666d44 · c666d44
2 parents 26b9d35 + da6dd60
commit c666d44
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/tests/plugins/uploadwidget/manual/_helpers/xhr.js b/tests/plugins/uploadwidget/manual/_helpers/xhr.js
@@ -24,7 +24,8 @@ window.FormData = function() {
 };
 
 window.XMLHttpRequest = function() {
-	var basePath = bender.config.tests[ bender.testData.group ].basePath;
+	var basePath = bender.config.tests[ bender.testData.group ].basePath,
+		interval;
 
 	return {
 		open: function() {},
@@ -35,8 +36,7 @@ window.XMLHttpRequest = function() {
 				step = Math.round( total / 10 ),
 				xhr = this,
 				onprogress = this.onprogress,
-				onload = this.onload,
-				interval;
+				onload = this.onload;
 
 			// Wait 400 ms for every step.
 			interval = setInterval( function() {
@@ -73,6 +73,8 @@ window.XMLHttpRequest = function() {
 
 		// Abort should call onabort.
 		abort: function() {
+			clearInterval( interval );
+			this.status = 0;
 			this.onabort();
 		}
 	};