Merge pull request #77 from im-saxo/master

* fix flash.abort
mailru · Feb 21, 2013 · 772f7ca · 772f7ca
2 parents 7cecec4 + b595ab8
commit 772f7ca
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 7 deletions.
diff --git a/FileAPI.flash.swf b/FileAPI.flash.swf
diff --git a/flash/src/ru/mail/commands/LoadFileCommand.as b/flash/src/ru/mail/commands/LoadFileCommand.as
@@ -77,9 +77,6 @@ package ru.mail.commands
 			fileRef.removeEventListener( Event.COMPLETE, onLoadComplete);
 			fileRef.removeEventListener( IOErrorEvent.IO_ERROR, onLoadError );
 			fileRef.removeEventListener(ProgressEvent.PROGRESS, onProgress);
-
-			fileRef = null;
-			file = null;
 		}
 
 		private function onLoadError(event:IOErrorEvent):void

diff --git a/flash/src/ru/mail/commands/UploadFileCommand.as b/flash/src/ru/mail/commands/UploadFileCommand.as
@@ -38,8 +38,6 @@ package ru.mail.commands
 			fileRef.removeEventListener(IOErrorEvent.IO_ERROR, onError);
 			fileRef.removeEventListener(SecurityErrorEvent.SECURITY_ERROR, onError);
 			fileRef.removeEventListener(ProgressEvent.PROGRESS, onProgress);
-
-			fileRef = null;
 		}
 
 		override public function execute():void

diff --git a/flash/src/ru/mail/controller/AppController.as b/flash/src/ru/mail/controller/AppController.as
@@ -648,7 +648,7 @@ package ru.mail.controller
 			}
 			_model.filesBuilder.removeFile(file);
 			file = null;
-
+			LoggerJS.log("abort complete");
 		}
 
 		/**

diff --git a/lib/FileAPI.Flash.js b/lib/FileAPI.Flash.js
@@ -436,7 +436,7 @@
 
 							_this.xhr = {
 								headers: {},
-								abort: function (){ flash.cmd(flashId, 'abort', fileId); },
+								abort: function (){ flash.cmd(flashId, 'abort', { id: fileId }); },
 								getResponseHeader: function (name){ return this.headers[name]; },
 								getAllResponseHeaders: function (){ return this.headers; }
 							};
-Original file line number
+Diff line change
@@ Expand Up / @@ -648,7 +648,7 @@ package ru.mail.controller @@
     			}
     			_model.filesBuilder.removeFile(file);
     			file = null;
+    			LoggerJS.log("abort complete");
     		}
     		/**
@@ Expand Down @@