Merge pull request #67 from im-saxo/master

RubaXa · RubaXa · commit 8254f97ab176 · 2013-02-12T00:03:21.000-08:00
flash upload error http status
diff --git a/FileAPI.flash.swf b/FileAPI.flash.swf
diff --git a/flash/src/ru/mail/commands/UploadFileCommand.as b/flash/src/ru/mail/commands/UploadFileCommand.as
@@ -22,6 +22,7 @@ package ru.mail.commands
 	public class UploadFileCommand extends AbstractUploadFileCommand
 	{
 		private var fileRef:FileReference;
+		private var status:String = null; // httpStatus. in case of upload error we get httpStatus event followed by ioError event. add status to error event using this temp variable
 		
 		public function UploadFileCommand(fileRef:FileReference, url:String, headers:Object, uploadPostData:Object, uploadDataFieldName:String)
 		{
@@ -103,7 +104,8 @@ package ru.mail.commands
 		private function onHTTPStatus(event:HTTPStatusEvent):void
 		{
 			trace ("onHTTPStatus", event);
-			LoggerJS.log("fileReference.upload HTTPStatusEvent: " +event.status)
+			LoggerJS.log("fileReference.upload HTTPStatusEvent: " +event.status);
+			status = event.status.toString();
 			dispatchEvent(new TextEvent("httpStatus", false, false, event.status.toString() ) );
 		}
 		
@@ -120,7 +122,7 @@ package ru.mail.commands
 			LoggerJS.log("fileReference.upload onError: " +event.toString());
 			
 			trace ("onError", event);
-			complete(false, null, new ErrorVO(event.toString(), errorType) );
+			complete(false, null, new ErrorVO(event.toString(), errorType, status) );
 		}
 		
 		private function onProgress(event:ProgressEvent):void
diff --git a/flash/src/ru/mail/commands/UploadImageCommand.as b/flash/src/ru/mail/commands/UploadImageCommand.as
@@ -24,6 +24,7 @@ package ru.mail.commands
 		private var _files:Object;
 		private var _totalSize:int = 0;
 		private var _loader:MultipartURLLoader;
+		private var status:String = null; // httpStatus. in case of upload error we get httpStatus event followed by ioError event. add status to error event using this temp variable
 		
 		public function UploadImageCommand(files:Object, url:String, headers:Object, uploadPostData:Object)
 		{
@@ -130,7 +131,8 @@ package ru.mail.commands
 		private function onHTTPStatus(event:HTTPStatusEvent):void
 		{
 			trace ("onHTTPStatus", event);
-			LoggerJS.log("urlloader.upload onHTTPStatus: " +event.toString());
+			LoggerJS.log("urlloader.upload onHTTPStatus: " +event.status);
+			status = event.status.toString();
 			dispatchEvent(new TextEvent("httpStatus", false, false, event.status.toString() ) );
 		}
 		
@@ -147,7 +149,7 @@ package ru.mail.commands
 			LoggerJS.log("fileReference.upload onError: " +event.toString());
 			
 			trace ("onError", event);
-			complete(false, null, new ErrorVO(event.toString(), errorType) );
+			complete(false, null, new ErrorVO(event.toString(), errorType, status) );
 		}
 		
 		private function onProgress(event:ProgressEvent):void
diff --git a/flash/src/ru/mail/controller/AppController.as b/flash/src/ru/mail/controller/AppController.as
@@ -597,7 +597,7 @@ package ru.mail.controller
 						if (event.error.error.indexOf("#2038") > -1) {
 							_model.hasError = true;
 						}
-						_jsCaller.callJS( callback, {type:"error", message:event.error.getError() } );
+						_jsCaller.callJS( callback, {type:"error", message:event.error.getError(), status:event.error.httpStatus } );
 					}
 					
 					uploadCommand.dispose();
diff --git a/flash/src/ru/mail/data/vo/ErrorVO.as b/flash/src/ru/mail/data/vo/ErrorVO.as
@@ -15,14 +15,18 @@ package ru.mail.data.vo
 		public var errorType:String = "error";
 		public var errorID:String = "";
 		public var errorMessage:String = "";
+		public var httpStatus:String = '';
 		
-		public function ErrorVO(error:String, errorType:String = null)
+		public function ErrorVO(error:String, errorType:String = null, httpStatus:String = null)
 		{
 			super();
 			parseError(error);
 			if (errorType) {
 				this.errorType = errorType;
 			}
+			if (httpStatus) {
+				this.httpStatus = httpStatus;
+			}
 		}
 		
 		public function parseError(str:String):void {
diff --git a/lib/FileAPI.Flash.js b/lib/FileAPI.Flash.js
@@ -1,7 +1,7 @@
 ﻿/**
  * FileAPI fallback to Flash
  *
- * @flash-developer  "Vladimer Demidov" <v.demidov@corp.mail.ru>
+ * @flash-developer  "Vladimir Demidov" <v.demidov@corp.mail.ru>
  */
 (function (api, window, document){
 	api.support.flash = (function (){
@@ -463,7 +463,7 @@
 											_this.end(evt.status || 200);
 										}
 										else if( type == 'abort' || type == 'error' ){
-											_this.end(0, evt.message);
+											_this.end(evt.status || 0, evt.message);
 											_unwrap(upload);
 										}
 									})

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ package ru.mail.commands`
`22`	`22`	`public class UploadFileCommand extends AbstractUploadFileCommand`
`23`	`23`	`{`
`24`	`24`	`private var fileRef:FileReference;`
	`25`	`+ private var status:String = null; // httpStatus. in case of upload error we get httpStatus event followed by ioError event. add status to error event using this temp variable`
`25`	`26`
`26`	`27`	`public function UploadFileCommand(fileRef:FileReference, url:String, headers:Object, uploadPostData:Object, uploadDataFieldName:String)`
`27`	`28`	`{`
`@@ -103,7 +104,8 @@ package ru.mail.commands`
`103`	`104`	`private function onHTTPStatus(event:HTTPStatusEvent):void`
`104`	`105`	`{`
`105`	`106`	`trace ("onHTTPStatus", event);`
`106`		`- LoggerJS.log("fileReference.upload HTTPStatusEvent: " +event.status)`
	`107`	`+ LoggerJS.log("fileReference.upload HTTPStatusEvent: " +event.status);`
	`108`	`+ status = event.status.toString();`
`107`	`109`	`dispatchEvent(new TextEvent("httpStatus", false, false, event.status.toString() ) );`
`108`	`110`	`}`
`109`	`111`
`@@ -120,7 +122,7 @@ package ru.mail.commands`
`120`	`122`	`LoggerJS.log("fileReference.upload onError: " +event.toString());`
`121`	`123`
`122`	`124`	`trace ("onError", event);`
`123`		`- complete(false, null, new ErrorVO(event.toString(), errorType) );`
	`125`	`+ complete(false, null, new ErrorVO(event.toString(), errorType, status) );`
`124`	`126`	`}`
`125`	`127`
`126`	`128`	`private function onProgress(event:ProgressEvent):void`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ package ru.mail.commands`
`24`	`24`	`private var _files:Object;`
`25`	`25`	`private var _totalSize:int = 0;`
`26`	`26`	`private var _loader:MultipartURLLoader;`
	`27`	`+ private var status:String = null; // httpStatus. in case of upload error we get httpStatus event followed by ioError event. add status to error event using this temp variable`
`27`	`28`
`28`	`29`	`public function UploadImageCommand(files:Object, url:String, headers:Object, uploadPostData:Object)`
`29`	`30`	`{`
`@@ -130,7 +131,8 @@ package ru.mail.commands`
`130`	`131`	`private function onHTTPStatus(event:HTTPStatusEvent):void`
`131`	`132`	`{`
`132`	`133`	`trace ("onHTTPStatus", event);`
`133`		`- LoggerJS.log("urlloader.upload onHTTPStatus: " +event.toString());`
	`134`	`+ LoggerJS.log("urlloader.upload onHTTPStatus: " +event.status);`
	`135`	`+ status = event.status.toString();`
`134`	`136`	`dispatchEvent(new TextEvent("httpStatus", false, false, event.status.toString() ) );`
`135`	`137`	`}`
`136`	`138`
`@@ -147,7 +149,7 @@ package ru.mail.commands`
`147`	`149`	`LoggerJS.log("fileReference.upload onError: " +event.toString());`
`148`	`150`
`149`	`151`	`trace ("onError", event);`
`150`		`- complete(false, null, new ErrorVO(event.toString(), errorType) );`
	`152`	`+ complete(false, null, new ErrorVO(event.toString(), errorType, status) );`
`151`	`153`	`}`
`152`	`154`
`153`	`155`	`private function onProgress(event:ProgressEvent):void`
Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,7 @@ package ru.mail.controller`
`597`	`597`	`if (event.error.error.indexOf("#2038") > -1) {`
`598`	`598`	`_model.hasError = true;`
`599`	`599`	`}`
`600`		`- _jsCaller.callJS( callback, {type:"error", message:event.error.getError() } );`
	`600`	`+ _jsCaller.callJS( callback, {type:"error", message:event.error.getError(), status:event.error.httpStatus } );`
`601`	`601`	`}`
`602`	`602`
`603`	`603`	`uploadCommand.dispose();`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,18 @@ package ru.mail.data.vo`
`15`	`15`	`public var errorType:String = "error";`
`16`	`16`	`public var errorID:String = "";`
`17`	`17`	`public var errorMessage:String = "";`
	`18`	`+ public var httpStatus:String = '';`
`18`	`19`
`19`		`- public function ErrorVO(error:String, errorType:String = null)`
	`20`	`+ public function ErrorVO(error:String, errorType:String = null, httpStatus:String = null)`
`20`	`21`	`{`
`21`	`22`	`super();`
`22`	`23`	`parseError(error);`
`23`	`24`	`if (errorType) {`
`24`	`25`	`this.errorType = errorType;`
`25`	`26`	`}`
	`27`	`+ if (httpStatus) {`
	`28`	`+ this.httpStatus = httpStatus;`
	`29`	`+ }`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	`public function parseError(str:String):void {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`* FileAPI fallback to Flash`
`3`	`3`	`*`
`4`		`- * @flash-developer "Vladimer Demidov" <v.demidov@corp.mail.ru>`
	`4`	`+ * @flash-developer "Vladimir Demidov" <v.demidov@corp.mail.ru>`
`5`	`5`	`*/`
`6`	`6`	`(function (api, window, document){`
`7`	`7`	`api.support.flash = (function (){`
`@@ -463,7 +463,7 @@`
`463`	`463`	`_this.end(evt.status \|\| 200);`
`464`	`464`	`}`
`465`	`465`	`else if( type == 'abort' \|\| type == 'error' ){`
`466`		`- _this.end(0, evt.message);`
	`466`	`+ _this.end(evt.status \|\| 0, evt.message);`
`467`	`467`	`_unwrap(upload);`
`468`	`468`	`}`
`469`	`469`	`})`