uploader 0.2.7 → 0.2.8

data/.gitignore

@@ -1,4 +1,3 @@
-*.sw?
 .DS_Store
 coverage
 rdoc

data/README.rdoc

@@ -336,5 +336,9 @@ If you intend to develop code and wish to run the tests you may do so using rake
 rake install since the embedded test application will use the gem that is install and not the current code from the project.  This is a limitation
 I attempted to overcome using a special initializer in rails_root/config/initializers/uploader.rb but I didn't have any success getting it working.
 
+=== Development notes
+The swfupload.js and swfupload.queue.js have been modified according to this forum post:
+http://www.swfupload.org/forum/generaldiscussion/2053
 
-Copyright (c) 2009 Justin Ball, released under the MIT license
+
+Copyright (c) 2010 Tatemae.com, released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/app/views/uploads/_swf_javascript.html.erb

@@ -28,12 +28,14 @@
         jQuery('.show_degraded_container').hide();
         jQuery('.degraded_container').show();
         jQuery('.swfupload_container').hide();
+        return false;
       });
       jQuery('.show_swfupload_container').click(function(){
         jQuery('.show_swfupload_container').hide();
         jQuery('.show_degraded_container').show();
         jQuery('.degraded_container').hide();
         jQuery('.swfupload_container').show();
+        return false;
       });
     });
   </script>
@@ -46,6 +48,7 @@
     	var settings = {
 
 				flash_url : '/swf/swfupload.swf',
+				flash9_url : '/swf/swfupload_fp9.swf',
 				upload_url: '<%= options[:upload_url] || new_upload_path_with_session_information(parent) %>',
 
 				file_size_limit : '<%= options[:file_size_limit] || "100 MB" %>',
@@ -87,7 +90,6 @@
 				queue_complete_handler : queueComplete,	// Queue plugin event
 
 				// SWFObject settings
-				minimum_flash_version : "9.0.28",
 				swfupload_pre_load_handler : swfUploadPreLoad,
 				swfupload_load_failed_handler : swfUploadLoadFailed
 			};

data/locales/gl.yml

@@ -12,9 +12,9 @@ gl:
     permission_denied: "Non ten permiso para completar esta acción."
     show_degraded_container: "Use uploader estándar"
     show_swfupload_container: "Use múltiples arquivos de subida. (Require Flash)"
-    standard_file_upload_error: "Houbo un erro ao facer a carga do arquivo: {{error}}. Asegúrese de que o arquivo non é válida. Asegúrese de que o arquivo non está baleiro. En seguida, ténteo de novo."
+    standard_file_upload_error: "Houbo un erro ao facer a carga do arquivo: {{error}}. Asegúrese de que o arquivo non é válida. Asegúrese de que o arquivo non está baleiro. A continuación, téntao de novo."
     successful_upload: "Arquivo subido con éxito."
-    swf_loading: "SWFUpload está cargando. Por favor, agarde un intre ..."
+    swf_loading: "SWFUpload está cargando. Por facor, agarde un intre ..."
     swf_not_loading: "We're sorry. SWFUpload non puido cargar. Pode instalar ou actualizar o Flash Player. Visita o {{url}} para obter o Flash Player."
     swf_taking_to_long: "SWFUpload está levando moito tempo para subir ou a carga fallou. Por favor, asegúrese que o plugin de Flash está activado e que unha versión de traballo do Adobe Flash Player instalado."
     upload_file: "Subida de Arquivos"

data/locales/th.yml

@@ -1,21 +1,21 @@
 --- 
 th: 
   uploader: 
-    cancel_all: อัพโหลดยกเลิกทั้งหมด
-    file_delete_permission_denied: คุณไม่ได้รับสิทธิ์ในการลบไฟล์ที่.
-    file_deleted: ไฟล์ที่ถูกลบ
-    file_upload_error: เกิดข้อผิดพลาดขณะอัปโหลดไฟล์.
-    javascript_not_enabled: "ขออภัย. SWFUpload ไม่สามารถโหลด. คุณต้องเปิดการใช้งาน JavaScript สนุก SWFUpload."
-    manage_files: จัดการไฟล์
-    manage_photos_files: "จัดการรูปภาพ / Files"
-    missing_parent_id_error: กรุณาระบุวัตถุผู้ปกครอง
-    permission_denied: คุณไม่ได้รับอนุญาตให้ดำเนินการนี้เสร็จ.
-    show_degraded_container: ใช้อัพโหลดมาตรฐาน
-    show_swfupload_container: "หลายใช้ไฟล์อัพโหลด. (Flash ต้องการ)"
-    standard_file_upload_error: "เกิดข้อผิดพลาดขณะอัพโหลดไฟล์: {{error}}. โปรดตรวจสอบว่าไฟล์นั้นถูกต้อง. ตรวจสอบเพื่อให้แน่ใจว่าแฟ้มไม่ว่าง. แล้วลองอีกครั้ง."
-    successful_upload: สำเร็จไฟล์ที่อัพโหลด.
-    swf_loading: "SWFUpload กำลังโหลด. โปรดรอสักครู่ ..."
-    swf_not_loading: "ขออภัย. SWFUpload ไม่สามารถโหลด. คุณอาจต้องติดตั้งหรืออัพเกรด Flash Player. ไป {{url}} เพื่อรับ Flash Player."
-    swf_taking_to_long: "SWFUpload ต้องใช้เวลานานในการโหลดหรือโหลดล้มเหลว. โปรดตรวจสอบว่ามีการเปิดใช้ปลั๊กอิน Flash และรุ่นที่ทำงานของ Adobe Flash Player ติดตั้ง."
-    upload_file: อัพโหลดไฟล์
-    upload_files: อัปโหลดไฟล์
+    cancel_all: "อัพโหลด ยกเลิก ทั้งหมด"
+    file_delete_permission_denied: "คุณ ไม่ ได้ รับ สิทธิ์ ใน การ ลบ ไฟล์ ที่."
+    file_deleted: "ไฟล์ ที่ ถูก ลบ"
+    file_upload_error: "เกิด ข้อ ผิด พลาด ขณะ อัป โหลด ไฟล์."
+    javascript_not_enabled: "ขออภัย. SWFUpload ไม่ สามารถ โหลด. คุณ ต้อง เปิด การ ใช้ งาน JavaScript สนุก SWFUpload."
+    manage_files: "จัดการ ไฟล์"
+    manage_photos_files: "จัดการ รูปภาพ / Files"
+    missing_parent_id_error: "กรุณา ระบุ วัตถุ ผู้ ปกครอง"
+    permission_denied: "คุณ ไม่ ได้ รับ อนุญาต ให้ ดำเนิน การ นี้ เสร็จ."
+    show_degraded_container: "ใช้ อัพโหลด มาตรฐาน"
+    show_swfupload_container: "หลาย ใช้ ไฟล์ อัพโหลด. (Flash ต้องการ)"
+    standard_file_upload_error: "เกิด ข้อ ผิด พลาด ขณะ อัพโหลด ไฟล์: {{error}}. โปรด ตรวจ สอบ ว่า ไฟล์ นั้น ถูก ต้อง. ตรวจ สอบ เพื่อ ให้ แน่ใจ ว่า แฟ้ม ไม่ ว่าง. แล้ว ลอง อีก ครั้ง."
+    successful_upload: "สำเร็จ ไฟล์ ที่ อัพโหลด."
+    swf_loading: "SWFUpload กำลัง โหลด. โปรด รอ สัก ครู่ ..."
+    swf_not_loading: "ขออภัย. SWFUpload ไม่ สามารถ โหลด. คุณ อาจ ต้อง ติด ตั้ง หรือ อัพเกรด Flash Player. ไป {{url}} เพื่อ รับ Flash Player."
+    swf_taking_to_long: "SWFUpload ต้อง ใช้ เวลา นาน ใน การ โหลด หรือ โหลด ล้ม เหลว. โปรด ตรวจ สอบ ว่า มี การ เปิด ใช้ ปลั๊กอิน Flash และ รุ่น ที่ ทำงาน ของ Adobe Flash Player ติด ตั้ง."
+    upload_file: "อัพโหลด ไฟล์"
+    upload_files: "อัป โหลด ไฟล์"

data/locales/zh-TW.yml

@@ -5,7 +5,7 @@ zh-TW:
     file_delete_permission_denied: 您沒有權限刪除該文件。
     file_deleted: 已刪除的文件
     file_upload_error: 時發生錯誤上傳文件。
-    javascript_not_enabled: "我們很抱歉。 SWFUpload無法加載。您必須啟用JavaScript享受SWFUpload。"
+    javascript_not_enabled: "我們很抱歉。 SWFUpload無法加載。您必須啟用 JavaScript享受SWFUpload。"
     manage_files: 管理文件
     manage_photos_files: 管理照片/文件
     missing_parent_id_error: 請指定一個父對象
@@ -15,7 +15,7 @@ zh-TW:
     standard_file_upload_error: "時發生錯誤上傳文件：{{error}}.請確保該文件是有效的。檢查以確保該文件不是空的。然後再試一次。"
     successful_upload: 成功上載文件。
     swf_loading: SWFUpload加載。請稍候...
-    swf_not_loading: "我們很抱歉。 SWFUpload無法加載。您可能需要安裝或升級Flash播放器。訪問{{url}}獲取Flash播放器。"
-    swf_taking_to_long: "SWFUpload花費很長的時間來加載或負載已失敗。請確保Flash插件啟用一個工作版本的Adobe Flash Player的安裝。"
+    swf_not_loading: "我們很抱歉。 SWFUpload無法加載。您可能需要安裝或升級 Flash播放器。訪問 {{url}}獲取 Flash播放器。"
+    swf_taking_to_long: "SWFUpload花費很長的時間來加載或負載已失敗。請確保 Flash插件啟用一個工作版本的Adobe Flash Player的安裝。"
     upload_file: 上傳文件
     upload_files: 上傳文件

data/public/javascripts/swfupload/swfupload.cookies.js

@@ -9,9 +9,9 @@
 var SWFUpload;
 if (typeof(SWFUpload) === "function") {
 	SWFUpload.prototype.initSettings = function (oldInitSettings) {
-		return function () {
+		return function (userSettings) {
 			if (typeof(oldInitSettings) === "function") {
-				oldInitSettings.call(this);
+				oldInitSettings.call(this, userSettings);
 			}
 			
 			this.refreshCookies(false);	// The false parameter must be sent since SWFUpload has not initialzed at this point

data/public/javascripts/swfupload/swfupload.js

@@ -9,13 +9,17 @@
  * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
  * http://www.opensource.org/licenses/mit-license.php
  *
+ * SWFObject v2.2 <http://code.google.com/p/swfobject/> 
+ *	is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
  */
 
 
+
 /* ******************* */
 /* Constructor & Init  */
 /* ******************* */
 var SWFUpload;
+var swfobject;
 
 if (SWFUpload == undefined) {
 	SWFUpload = function (settings) {
@@ -23,10 +27,11 @@ if (SWFUpload == undefined) {
 	};
 }
 
-SWFUpload.prototype.initSWFUpload = function (settings) {
+SWFUpload.prototype.initSWFUpload = function (userSettings) {
 	try {
 		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
-		this.settings = settings;
+		this.settings = {};
+		this.tmp_settings = userSettings; // Added by Justin. This fixes a bug where userSettings is undefined
 		this.eventQueue = [];
 		this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
 		this.movieElement = null;
@@ -36,8 +41,12 @@ SWFUpload.prototype.initSWFUpload = function (settings) {
 		SWFUpload.instances[this.movieName] = this;
 
 		// Load the settings.  Load the Flash movie.
-		this.initSettings();
-		this.loadFlash();
+		this.initSettings(userSettings);
+		this.loadSupport();
+		if (this.swfuploadPreload()) {
+			this.loadFlash();
+		}
+
 		this.displayDebugInfo();
 	} catch (ex) {
 		delete SWFUpload.instances[this.movieName];
@@ -50,67 +59,85 @@ SWFUpload.prototype.initSWFUpload = function (settings) {
 /* *************** */
 SWFUpload.instances = {};
 SWFUpload.movieCount = 0;
-SWFUpload.version = "2.2.0 2009-03-25";
+SWFUpload.version = "2.5.0 2010-01-15 Beta 2";
 SWFUpload.QUEUE_ERROR = {
-	QUEUE_LIMIT_EXCEEDED	  		: -100,
-	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
-	ZERO_BYTE_FILE			  		: -120,
-	INVALID_FILETYPE		  		: -130
+	QUEUE_LIMIT_EXCEEDED            : -100,
+	FILE_EXCEEDS_SIZE_LIMIT         : -110,
+	ZERO_BYTE_FILE                  : -120,
+	INVALID_FILETYPE                : -130
 };
 SWFUpload.UPLOAD_ERROR = {
-	HTTP_ERROR				  		: -200,
-	MISSING_UPLOAD_URL	      		: -210,
-	IO_ERROR				  		: -220,
-	SECURITY_ERROR			  		: -230,
-	UPLOAD_LIMIT_EXCEEDED	  		: -240,
-	UPLOAD_FAILED			  		: -250,
-	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
-	FILE_VALIDATION_FAILED	  		: -270,
-	FILE_CANCELLED			  		: -280,
-	UPLOAD_STOPPED					: -290
+	HTTP_ERROR                      : -200,
+	MISSING_UPLOAD_URL              : -210,
+	IO_ERROR                        : -220,
+	SECURITY_ERROR                  : -230,
+	UPLOAD_LIMIT_EXCEEDED           : -240,
+	UPLOAD_FAILED                   : -250,
+	SPECIFIED_FILE_ID_NOT_FOUND     : -260,
+	FILE_VALIDATION_FAILED          : -270,
+	FILE_CANCELLED                  : -280,
+	UPLOAD_STOPPED                  : -290,
+	RESIZE                          : -300
 };
 SWFUpload.FILE_STATUS = {
-	QUEUED		 : -1,
-	IN_PROGRESS	 : -2,
-	ERROR		 : -3,
-	COMPLETE	 : -4,
-	CANCELLED	 : -5
+	QUEUED       : -1,
+	IN_PROGRESS  : -2,
+	ERROR        : -3,
+	COMPLETE     : -4,
+	CANCELLED    : -5
+};
+SWFUpload.UPLOAD_TYPE = {
+	NORMAL       : -1,
+	RESIZED      : -2
 };
+
 SWFUpload.BUTTON_ACTION = {
-	SELECT_FILE  : -100,
-	SELECT_FILES : -110,
-	START_UPLOAD : -120
+	SELECT_FILE             : -100,
+	SELECT_FILES            : -110,
+	START_UPLOAD            : -120,
+	JAVASCRIPT              : -130,	// DEPRECATED
+	NONE                    : -130
 };
 SWFUpload.CURSOR = {
 	ARROW : -1,
-	HAND : -2
+	HAND  : -2
 };
 SWFUpload.WINDOW_MODE = {
-	WINDOW : "window",
-	TRANSPARENT : "transparent",
-	OPAQUE : "opaque"
+	WINDOW       : "window",
+	TRANSPARENT  : "transparent",
+	OPAQUE       : "opaque"
+};
+
+SWFUpload.RESIZE_ENCODING = {
+	JPEG  : -1,
+	PNG   : -2
 };
 
 // Private: takes a URL, determines if it is relative and converts to an absolute URL
 // using the current site. Only processes the URL if it can, otherwise returns the URL untouched
-SWFUpload.completeURL = function(url) {
-	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
+SWFUpload.completeURL = function (url) {
+	try {
+		var path = "", indexSlash = -1;
+		if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//) || url === "") {
+			return url;
+		}
+		
+		indexSlash = window.location.pathname.lastIndexOf("/");
+		if (indexSlash <= 0) {
+			path = "/";
+		} else {
+			path = window.location.pathname.substr(0, indexSlash) + "/";
+		}
+		
+		return path + url;
+	} catch (ex) {
 		return url;
 	}
-	
-	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
-	
-	var indexSlash = window.location.pathname.lastIndexOf("/");
-	if (indexSlash <= 0) {
-		path = "/";
-	} else {
-		path = window.location.pathname.substr(0, indexSlash) + "/";
-	}
-	
-	return /*currentURL +*/ path + url;
-	
 };
 
+// Public: assign a new function to onload to use swfobject's domLoad functionality
+SWFUpload.onload = function () {};
+
 
 /* ******************** */
 /* Instance Members  */
@@ -118,9 +145,15 @@ SWFUpload.completeURL = function(url) {
 
 // Private: initSettings ensures that all the
 // settings are set, getting a default value if one was not assigned.
-SWFUpload.prototype.initSettings = function () {
+SWFUpload.prototype.initSettings = function (userSettings) {
+	userSettings = this.tmp_settings; // Fixes a bug where userSettings is undefined
 	this.ensureDefault = function (settingName, defaultValue) {
-		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+		var setting = userSettings[settingName];
+		if (setting != undefined) {
+			this.settings[settingName] = setting;
+		} else {
+			this.settings[settingName] = defaultValue;
+		}
 	};
 	
 	// Upload backend settings
@@ -142,6 +175,7 @@ SWFUpload.prototype.initSettings = function () {
 
 	// Flash Settings
 	this.ensureDefault("flash_url", "swfupload.swf");
+	this.ensureDefault("flash9_url", "swfupload_fp9.swf");
 	this.ensureDefault("prevent_swf_caching", true);
 	
 	// Button Settings
@@ -165,18 +199,25 @@ SWFUpload.prototype.initSettings = function () {
 	
 	// Event Handlers
 	this.settings.return_upload_start_handler = this.returnUploadStart;
+	this.ensureDefault("swfupload_preload_handler", null);
+	this.ensureDefault("swfupload_load_failed_handler", null);
 	this.ensureDefault("swfupload_loaded_handler", null);
 	this.ensureDefault("file_dialog_start_handler", null);
 	this.ensureDefault("file_queued_handler", null);
 	this.ensureDefault("file_queue_error_handler", null);
 	this.ensureDefault("file_dialog_complete_handler", null);
 	
+	this.ensureDefault("upload_resize_start_handler", null);
 	this.ensureDefault("upload_start_handler", null);
 	this.ensureDefault("upload_progress_handler", null);
 	this.ensureDefault("upload_error_handler", null);
 	this.ensureDefault("upload_success_handler", null);
 	this.ensureDefault("upload_complete_handler", null);
 	
+	this.ensureDefault("mouse_click_handler", null);
+	this.ensureDefault("mouse_out_handler", null);
+	this.ensureDefault("mouse_over_handler", null);
+	
 	this.ensureDefault("debug_handler", this.debugMessage);
 
 	this.ensureDefault("custom_settings", {});
@@ -187,10 +228,10 @@ SWFUpload.prototype.initSettings = function () {
 	// Update the flash url if needed
 	if (!!this.settings.prevent_swf_caching) {
 		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+		this.settings.flash9_url = this.settings.flash9_url + (this.settings.flash9_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
 	}
 	
 	if (!this.settings.preserve_relative_urls) {
-		//this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);	// Don't need to do this one since flash doesn't look at it
 		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
 		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
 	}
@@ -198,42 +239,80 @@ SWFUpload.prototype.initSettings = function () {
 	delete this.ensureDefault;
 };
 
+// Initializes the supported functionality based the Flash Player version, state, and event that occur during initialization
+SWFUpload.prototype.loadSupport = function () {
+	this.support = {
+		loading : swfobject.hasFlashPlayerVersion("9.0.28"),
+		imageResize : swfobject.hasFlashPlayerVersion("10.0.0")
+	};
+	
+};
+
 // Private: loadFlash replaces the button_placeholder element with the flash movie.
 SWFUpload.prototype.loadFlash = function () {
-	var targetElement, tempParent;
+	var targetElement, tempParent, wrapperType, flashHTML, els;
 
+	if (!this.support.loading) {
+		this.queueEvent("swfupload_load_failed_handler", ["Flash Player doesn't support SWFUpload"]);
+		return;
+	}
+	
 	// Make sure an element with the ID we are going to use doesn't already exist
 	if (document.getElementById(this.movieName) !== null) {
-		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
+		this.support.loading = false;
+		this.queueEvent("swfupload_load_failed_handler", ["Element ID already in use"]);
+		return;
 	}
 
 	// Get the element where we will be placing the flash movie
 	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
 
 	if (targetElement == undefined) {
-		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
+		this.support.loading = false;
+		this.queueEvent("swfupload_load_failed_handler", ["button place holder not found"]);
+		return;
 	}
 
+	wrapperType = (targetElement.currentStyle && targetElement.currentStyle["display"] || window.getComputedStyle && document.defaultView.getComputedStyle(targetElement, null).getPropertyValue("display")) !== "block" ? "span" : "div";
+	
 	// Append the container and load the flash
-	tempParent = document.createElement("div");
-	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+	tempParent = document.createElement(wrapperType);
+
+	flashHTML = this.getFlashHTML();
+
+	try {
+		tempParent.innerHTML = flashHTML;	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+	} catch (ex) {
+		this.support.loading = false;
+		this.queueEvent("swfupload_load_failed_handler", ["Exception loading Flash HTML into placeholder"]);
+		return;
+	}
+
+	// Try to get the movie element immediately
+	els = tempParent.getElementsByTagName("object");
+	if (!els || els.length > 1 || els.length === 0) {
+		this.support.loading = false;
+		this.queueEvent("swfupload_load_failed_handler", ["Unable to find movie after adding to DOM"]);
+		return;
+	} else if (els.length === 1) {
+		this.movieElement = els[0];
+	}
+	
 	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
 
 	// Fix IE Flash/Form bug
 	if (window[this.movieName] == undefined) {
 		window[this.movieName] = this.getMovieElement();
 	}
-	
 };
 
 // Private: getFlashHTML generates the object tag needed to embed the flash in to the document
-SWFUpload.prototype.getFlashHTML = function () {
+SWFUpload.prototype.getFlashHTML = function (flashVersion) {
 	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
-	return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+	return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', (this.support.imageResize ? this.settings.flash_url : this.settings.flash9_url), '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
 				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
-				'<param name="movie" value="', this.settings.flash_url, '" />',
+				'<param name="movie" value="', (this.support.imageResize ? this.settings.flash_url : this.settings.flash9_url), '" />',
 				'<param name="quality" value="high" />',
-				'<param name="menu" value="false" />',
 				'<param name="allowScriptAccess" value="always" />',
 				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
 				'</object>'].join("");
@@ -243,8 +322,10 @@ SWFUpload.prototype.getFlashHTML = function () {
 // to flash in the flashvars param.
 SWFUpload.prototype.getFlashVars = function () {
 	// Build a string from the post param object
-	var paramString = this.buildParamString();
-	var httpSuccessString = this.settings.http_success.join(",");
+	var httpSuccessString, paramString;
+	
+	paramString = this.buildParamString();
+	httpSuccessString = this.settings.http_success.join(",");
 	
 	// Build the parameter string
 	return ["movieName=", encodeURIComponent(this.movieName),
@@ -274,7 +355,7 @@ SWFUpload.prototype.getFlashVars = function () {
 		].join("");
 };
 
-// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
+// Public: get retrieves the DOM reference to the Flash element added by SWFUpload
 // The element is cached after the first lookup
 SWFUpload.prototype.getMovieElement = function () {
 	if (this.movieElement == undefined) {
@@ -291,11 +372,12 @@ SWFUpload.prototype.getMovieElement = function () {
 // Private: buildParamString takes the name/value pairs in the post_params setting object
 // and joins them up in to a string formatted "name=value&amp;name=value"
 SWFUpload.prototype.buildParamString = function () {
-	var postParams = this.settings.post_params; 
-	var paramStringPairs = [];
+	var name, postParams, paramStringPairs = [];
+	
+	postParams = this.settings.post_params; 
 
 	if (typeof(postParams) === "object") {
-		for (var name in postParams) {
+		for (name in postParams) {
 			if (postParams.hasOwnProperty(name)) {
 				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
 			}
@@ -310,31 +392,22 @@ SWFUpload.prototype.buildParamString = function () {
 // Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
 // Credits: Major improvements provided by steffen
 SWFUpload.prototype.destroy = function () {
+	var movieElement;
+	
 	try {
 		// Make sure Flash is done before we try to remove it
 		this.cancelUpload(null, false);
 		
+		movieElement = this.cleanUp();
 
 		// Remove the SWFUpload DOM nodes
-		var movieElement = null;
-		movieElement = this.getMovieElement();
-		
-		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
-			// Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
-			for (var i in movieElement) {
-				try {
-					if (typeof(movieElement[i]) === "function") {
-						movieElement[i] = null;
-					}
-				} catch (ex1) {}
-			}
-
+		if (movieElement) {
 			// Remove the Movie Element from the page
 			try {
 				movieElement.parentNode.removeChild(movieElement);
 			} catch (ex) {}
 		}
-		
+
 		// Remove IE form fix reference
 		window[this.movieName] = null;
 
@@ -369,6 +442,7 @@ SWFUpload.prototype.displayDebugInfo = function () {
 			"Settings:\n",
 			"\t", "upload_url:               ", this.settings.upload_url, "\n",
 			"\t", "flash_url:                ", this.settings.flash_url, "\n",
+			"\t", "flash9_url:                ", this.settings.flash9_url, "\n",
 			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
 			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
 			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
@@ -394,20 +468,32 @@ SWFUpload.prototype.displayDebugInfo = function () {
 			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
 			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
 			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
+			"\t", "button_cursor:            ", this.settings.button_cursor.toString(), "\n",
 			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
 
 			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
 			"Event Handlers:\n",
+			"\t", "swfupload_preload_handler assigned:  ", (typeof this.settings.swfupload_preload_handler === "function").toString(), "\n",
+			"\t", "swfupload_load_failed_handler assigned:  ", (typeof this.settings.swfupload_load_failed_handler === "function").toString(), "\n",
 			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+			"\t", "mouse_click_handler assigned:       ", (typeof this.settings.mouse_click_handler === "function").toString(), "\n",
+			"\t", "mouse_over_handler assigned:        ", (typeof this.settings.mouse_over_handler === "function").toString(), "\n",
+			"\t", "mouse_out_handler assigned:         ", (typeof this.settings.mouse_out_handler === "function").toString(), "\n",
 			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
 			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
 			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
+			"\t", "upload_resize_start_handler assigned:      ", (typeof this.settings.upload_resize_start_handler === "function").toString(), "\n",
 			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
 			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
 			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
 			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
 			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
-			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
+			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n",
+
+			"Support:\n",
+			"\t", "Load:                     ", (this.support.loading ? "Yes" : "No"), "\n",
+			"\t", "Image Resize:             ", (this.support.imageResize ? "Yes" : "No"), "\n"
+
 		].join("")
 	);
 };
@@ -439,17 +525,21 @@ SWFUpload.prototype.getSetting = function (name) {
 // Calls are made with a setTimeout for some functions to work around
 // bugs in the ExternalInterface library.
 SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
-	argumentArray = argumentArray || [];
+	var movieElement, returnValue, returnString;
 	
-	var movieElement = this.getMovieElement();
-	var returnValue, returnString;
+	argumentArray = argumentArray || [];
+	movieElement = this.getMovieElement();
 
 	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
 	try {
-		returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
-		returnValue = eval(returnString);
+		if (movieElement != undefined) {
+			returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
+			returnValue = eval(returnString);
+		} else {
+			this.debug("Can't call flash because the movie wasn't found.");
+		}
 	} catch (ex) {
-		throw "Call to " + functionName + " failed";
+		this.debug("Exception calling flash function '" + functionName + "': " + ex.message);
 	}
 	
 	// Unescape file post param values
@@ -490,6 +580,12 @@ SWFUpload.prototype.startUpload = function (fileID) {
 	this.callFlash("StartUpload", [fileID]);
 };
 
+// Public: startUpload starts uploading the first file in the queue unless
+// the optional parameter 'fileID' specifies the ID 
+SWFUpload.prototype.startResizedUpload = function (fileID, width, height, encoding, quality, allowEnlarging) {
+	this.callFlash("StartUpload", [fileID, { "width": width, "height" : height, "encoding" : encoding, "quality" : quality, "allowEnlarging" : allowEnlarging }]);
+};
+
 // Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
 // If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
 // If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
@@ -506,6 +602,15 @@ SWFUpload.prototype.stopUpload = function () {
 	this.callFlash("StopUpload");
 };
 
+
+// Public: requeueUpload requeues any file. If the file is requeued or already queued true is returned.
+// If the file is not found or is currently uploading false is returned.  Requeuing a file bypasses the
+// file size, queue size, upload limit and other queue checks.  Certain files can't be requeued (e.g, invalid or zero bytes files).
+SWFUpload.prototype.requeueUpload = function (indexOrFileID) {
+	return this.callFlash("RequeueUpload", [indexOrFileID]);
+};
+
+
 /* ************************
  * Settings methods
  *   These methods change the SWFUpload settings.
@@ -537,6 +642,17 @@ SWFUpload.prototype.getFile = function (fileID) {
 	}
 };
 
+// Public: getFileFromQueue retrieves a File object by ID or Index.  If the file is
+// not found then 'null' is returned.
+SWFUpload.prototype.getQueueFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByQueueIndex", [fileID]);
+	} else {
+		return this.callFlash("GetFile", [fileID]);
+	}
+};
+
+
 // Public: addFileParam sets a name/value pair that will be posted with the
 // file specified by the Files ID.  If the name already exists then the
 // exiting value will be overwritten.
@@ -711,6 +827,7 @@ SWFUpload.prototype.setButtonCursor = function (cursor) {
 
 SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
 	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+	var self = this;
 	
 	if (argumentArray == undefined) {
 		argumentArray = [];
@@ -718,7 +835,6 @@ SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
 		argumentArray = [argumentArray];
 	}
 	
-	var self = this;
 	if (typeof this.settings[handlerName] === "function") {
 		// Queue the event
 		this.eventQueue.push(function () {
@@ -750,15 +866,12 @@ SWFUpload.prototype.executeNextEvent = function () {
 // properties that contain characters that are not valid for JavaScript identifiers. To work around this
 // the Flash Component escapes the parameter names and we must unescape again before passing them along.
 SWFUpload.prototype.unescapeFilePostParams = function (file) {
-	var reg = /[$]([0-9a-f]{4})/i;
-	var unescapedPost = {};
-	var uk;
+	var reg = /[$]([0-9a-f]{4})/i, unescapedPost = {}, uk, k, match;
 
 	if (file != undefined) {
-		for (var k in file.post) {
+		for (k in file.post) {
 			if (file.post.hasOwnProperty(k)) {
 				uk = k;
-				var match;
 				while ((match = reg.exec(uk)) !== null) {
 					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
 				}
@@ -772,39 +885,51 @@ SWFUpload.prototype.unescapeFilePostParams = function (file) {
 	return file;
 };
 
-// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
-SWFUpload.prototype.testExternalInterface = function () {
-	try {
-		return this.callFlash("TestExternalInterface");
-	} catch (ex) {
-		return false;
+// Private: This event is called by SWFUpload Init after we've determined what the user's Flash Player supports.
+// Use the swfupload_preload_handler event setting to execute custom code when SWFUpload has loaded.
+// Return false to prevent SWFUpload from loading and allow your script to do something else if your required feature is
+// not supported
+SWFUpload.prototype.swfuploadPreload = function () {
+	var returnValue;
+	if (typeof this.settings.swfupload_preload_handler === "function") {
+		returnValue = this.settings.swfupload_preload_handler.call(this);
+	} else if (this.settings.swfupload_preload_handler != undefined) {
+		throw "upload_start_handler must be a function";
 	}
-};
+
+	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
+	// interpretted as 'true'.
+	if (returnValue === undefined) {
+		returnValue = true;
+	}
+	
+	return !!returnValue;
+}
 
 // Private: This event is called by Flash when it has finished loading. Don't modify this.
 // Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
 SWFUpload.prototype.flashReady = function () {
 	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
-	var movieElement = this.getMovieElement();
+	var movieElement = 	this.cleanUp();
 
 	if (!movieElement) {
 		this.debug("Flash called back ready but the flash movie can't be found.");
 		return;
 	}
 
-	this.cleanUp(movieElement);
-	
 	this.queueEvent("swfupload_loaded_handler");
 };
 
 // Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
 // This function is called by Flash each time the ExternalInterface functions are created.
-SWFUpload.prototype.cleanUp = function (movieElement) {
+SWFUpload.prototype.cleanUp = function () {
+	var key, movieElement = this.getMovieElement();
+	
 	// Pro-actively unhook all the Flash functions
 	try {
-		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
 			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
-			for (var key in movieElement) {
+			for (key in movieElement) {
 				try {
 					if (typeof(movieElement[key]) === "function") {
 						movieElement[key] = null;
@@ -817,7 +942,7 @@ SWFUpload.prototype.cleanUp = function (movieElement) {
 	
 	}
 
-	// Fix Flashes own cleanup code so if the SWFMovie was removed from the page
+	// Fix Flashes own cleanup code so if the SWF Movie was removed from the page
 	// it doesn't display errors.
 	window["__flash__removeCallback"] = function (instance, name) {
 		try {
@@ -828,9 +953,20 @@ SWFUpload.prototype.cleanUp = function (movieElement) {
 		
 		}
 	};
-
+	
+	return movieElement;
 };
 
+/* When the button_action is set to None this event gets fired and executes the mouse_click_handler */
+SWFUpload.prototype.mouseClick = function () {
+	this.queueEvent("mouse_click_handler");
+};
+SWFUpload.prototype.mouseOver = function () {
+	this.queueEvent("mouse_over_handler");
+};
+SWFUpload.prototype.mouseOut = function () {
+	this.queueEvent("mouse_out_handler");
+};
 
 /* This is a chance to do something before the browse window opens */
 SWFUpload.prototype.fileDialogStart = function () {
@@ -857,6 +993,11 @@ SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQue
 	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
 };
 
+SWFUpload.prototype.uploadResizeStart = function (file, resizeSettings) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_resize_start_handler", [file, resizeSettings.width, resizeSettings.height, resizeSettings.encoding, resizeSettings.quality]);
+};
+
 SWFUpload.prototype.uploadStart = function (file) {
 	file = this.unescapeFilePostParams(file);
 	this.queueEvent("return_upload_start_handler", file);
@@ -928,12 +1069,14 @@ SWFUpload.prototype.debug = function (message) {
 // call the debug() function.  When overriding the function your own function should
 // check to see if the debug setting is true before outputting debug information.
 SWFUpload.prototype.debugMessage = function (message) {
+	var exceptionMessage, exceptionValues, key;
+
 	if (this.settings.debug) {
-		var exceptionMessage, exceptionValues = [];
+		exceptionValues = [];
 
 		// Check for an exception object and print it nicely
 		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
-			for (var key in message) {
+			for (key in message) {
 				if (message.hasOwnProperty(key)) {
 					exceptionValues.push(key + ": " + message[key]);
 				}
@@ -978,3 +1121,14 @@ SWFUpload.Console.writeLine = function (message) {
 		alert("Exception: " + ex.name + " Message: " + ex.message);
 	}
 };
+
+
+/*	SWFObject v2.2 <http://code.google.com/p/swfobject/> 
+	is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
+*/
+swfobject = function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y<X;Y++){U[Y]()}}function K(X){if(J){X()}else{U[U.length]=X}}function s(Y){if(typeof O.addEventListener!=D){O.addEventListener("load",Y,false)}else{if(typeof j.addEventListener!=D){j.addEventListener("load",Y,false)}else{if(typeof O.attachEvent!=D){i(O,"onload",Y)}else{if(typeof O.onload=="function"){var X=O.onload;O.onload=function(){X();Y()}}else{O.onload=Y}}}}}function h(){if(T){V()}else{H()}}function V(){var X=j.getElementsByTagName("body")[0];var aa=C(r);aa.setAttribute("type",q);var Z=X.appendChild(aa);if(Z){var Y=0;(function(){if(typeof Z.GetVariable!=D){var ab=Z.GetVariable("$version");if(ab){ab=ab.split(" ")[1].split(",");M.pv=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}else{if(Y<10){Y++;setTimeout(arguments.callee,10);return}}X.removeChild(aa);Z=null;H()})()}else{H()}}function H(){var ag=o.length;if(ag>0){for(var af=0;af<ag;af++){var Y=o[af].id;var ab=o[af].callbackFn;var aa={success:false,id:Y};if(M.pv[0]>0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad<ac;ad++){if(X[ad].getAttribute("name").toLowerCase()!="movie"){ah[X[ad].getAttribute("name")]=X[ad].getAttribute("value")}}P(ai,ah,Y,ab)}else{p(ae);if(ab){ab(aa)}}}}}else{w(Y,true);if(ab){var Z=z(Y);if(Z&&typeof Z.SetVariable!=D){aa.success=true;aa.ref=Z}ab(aa)}}}}}function z(aa){var X=null;var Y=c(aa);if(Y&&Y.nodeName=="OBJECT"){if(typeof Y.SetVariable!=D){X=Y}else{var Z=Y.getElementsByTagName(r)[0];if(Z){X=Z}}}return X}function A(){return !a&&F("6.0.65")&&(M.win||M.mac)&&!(M.wk&&M.wk<312)}function P(aa,ab,X,Z){a=true;E=Z||null;B={success:false,id:X};var ae=c(X);if(ae){if(ae.nodeName=="OBJECT"){l=g(ae);Q=null}else{l=ae;Q=X}aa.id=R;if(typeof aa.width==D||(!/%$/.test(aa.width)&&parseInt(aa.width,10)<310)){aa.width="310"}if(typeof aa.height==D||(!/%$/.test(aa.height)&&parseInt(aa.height,10)<137)){aa.height="137"}j.title=j.title.slice(0,47)+" - Flash Player Installation";var ad=M.ie&&M.win?"ActiveX":"PlugIn",ac="MMredirectURL="+O.location.toString().replace(/&/g,"%26")+"&MMplayerType="+ad+"&MMdoctitle="+j.title;if(typeof ab.flashvars!=D){ab.flashvars+="&"+ac}else{ab.flashvars=ac}if(M.ie&&M.win&&ae.readyState!=4){var Y=C("div");X+="SWFObjectNew";Y.setAttribute("id",X);ae.parentNode.insertBefore(Y,ae);ae.style.display="none";(function(){if(ae.readyState==4){ae.parentNode.removeChild(ae)}else{setTimeout(arguments.callee,10)}})()}u(aa,ab,X)}}function p(Y){if(M.ie&&M.win&&Y.readyState!=4){var X=C("div");Y.parentNode.insertBefore(X,Y);X.parentNode.replaceChild(g(Y),X);Y.style.display="none";(function(){if(Y.readyState==4){Y.parentNode.removeChild(Y)}else{setTimeout(arguments.callee,10)}})()}else{Y.parentNode.replaceChild(g(Y),Y)}}function g(ab){var aa=C("div");if(M.win&&M.ie){aa.innerHTML=ab.innerHTML}else{var Y=ab.getElementsByTagName(r)[0];if(Y){var ad=Y.childNodes;if(ad){var X=ad.length;for(var Z=0;Z<X;Z++){if(!(ad[Z].nodeType==1&&ad[Z].nodeName=="PARAM")&&!(ad[Z].nodeType==8)){aa.appendChild(ad[Z].cloneNode(true))}}}}}return aa}function u(ai,ag,Y){var X,aa=c(Y);if(M.wk&&M.wk<312){return X}if(aa){if(typeof ai.id==D){ai.id=Y}if(M.ie&&M.win){var ah="";for(var ae in ai){if(ai[ae]!=Object.prototype[ae]){if(ae.toLowerCase()=="data"){ag.movie=ai[ae]}else{if(ae.toLowerCase()=="styleclass"){ah+=' class="'+ai[ae]+'"'}else{if(ae.toLowerCase()!="classid"){ah+=" "+ae+'="'+ai[ae]+'"'}}}}}var af="";for(var ad in ag){if(ag[ad]!=Object.prototype[ad]){af+='<param name="'+ad+'" value="'+ag[ad]+'" />'}}aa.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+ah+">"+af+"</object>";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab<ac;ab++){I[ab][0].detachEvent(I[ab][1],I[ab][2])}var Z=N.length;for(var aa=0;aa<Z;aa++){y(N[aa])}for(var Y in M){M[Y]=null}M=null;for(var X in swfobject){swfobject[X]=null}swfobject=null})}}();return{registerObject:function(ab,X,aa,Z){if(M.w3&&ab&&X){var Y={};Y.id=ab;Y.swfVersion=X;Y.expressInstall=aa;Y.callbackFn=Z;o[o.length]=Y;w(ab,false)}else{if(Z){Z({success:false,id:ab})}}},getObjectById:function(X){if(M.w3){return z(X)}},embedSWF:function(ab,ah,ae,ag,Y,aa,Z,ad,af,ac){var X={success:false,id:ah};if(M.w3&&!(M.wk&&M.wk<312)&&ab&&ah&&ae&&ag&&Y){w(ah,false);K(function(){ae+="";ag+="";var aj={};if(af&&typeof af===r){for(var al in af){aj[al]=af[al]}}aj.data=ab;aj.width=ae;aj.height=ag;var am={};if(ad&&typeof ad===r){for(var ak in ad){am[ak]=ad[ak]}}if(Z&&typeof Z===r){for(var ai in Z){if(typeof am.flashvars!=D){am.flashvars+="&"+ai+"="+Z[ai]}else{am.flashvars=ai+"="+Z[ai]}}}if(F(Y)){var an=u(aj,am,ah);if(aj.id==ah){w(ah,true)}X.success=true;X.ref=an}else{if(aa&&A()){aj.data=aa;P(aj,am,ah,ac);return}else{w(ah,true)}}if(ac){ac(X)}})}else{if(ac){ac(X)}}},switchOffAutoHideShow:function(){m=false},ua:M,getFlashPlayerVersion:function(){return{major:M.pv[0],minor:M.pv[1],release:M.pv[2]}},hasFlashPlayerVersion:F,createSWF:function(Z,Y,X){if(M.w3){return u(Z,Y,X)}else{return undefined}},showExpressInstall:function(Z,aa,X,Y){if(M.w3&&A()){P(Z,aa,X,Y)}},removeSWF:function(X){if(M.w3){y(X)}},createCSS:function(aa,Z,Y,X){if(M.w3){v(aa,Z,Y,X)}},addDomLoadEvent:K,addLoadEvent:s,getQueryParamValue:function(aa){var Z=j.location.search||j.location.hash;if(Z){if(/\?/.test(Z)){Z=Z.split("?")[1]}if(aa==null){return L(Z)}var Y=Z.split("&");for(var X=0;X<Y.length;X++){if(Y[X].substring(0,Y[X].indexOf("="))==aa){return L(Y[X].substring((Y[X].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(a){var X=c(R);if(X&&l){X.parentNode.replaceChild(l,X);if(Q){w(Q,true);if(M.ie&&M.win){l.style.display="block"}}if(E){E(B)}}a=false}}}}();
+swfobject.addDomLoadEvent(function () {
+	if (typeof(SWFUpload.onload) === "function") {
+		SWFUpload.onload.call(window);
+	}
+});

data/public/javascripts/swfupload/swfupload.proxy.js

@@ -0,0 +1,96 @@
+/*
+	Proxy Plug-in
+	
+	Features:
+		Times an upload to see if it appear suspiciously fast which might indicate a proxy server or anti-virus suite intercepting the upload. 
+		If the upload seems too fast an uploadError event is fired with PROXY error code after the final uploadProgress event.
+		
+		Adds a SWFUpload setting allowing you to tweak the bytes/s for triggering the error:
+			proxy_detect_threshold : 256000
+			
+		Adds an UPLOAD_ERROR entry called PROXY:
+			function uploadError(file, errorCode, message) {
+				if (errorCode === SWFUpload.UPLOAD_ERROR.PROXY) {
+					alert("You might have a proxy!");
+				}
+			}
+	*/
+
+var SWFUpload;
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.proxyDetect = {};
+	SWFUpload.UPLOAD_ERROR.PROXY = -30300;
+	
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function (userSettings) {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this, userSettings);
+			}
+			
+			this.ensureDefault = function (settingName, defaultValue) {
+				this.settings[settingName] = (userSettings[settingName] == undefined) ? defaultValue : userSettings[settingName];
+			};
+
+			// List used to keep the speed stats for the files we are tracking
+			this.proxyDetectFileStartTimes = {};
+			this.proxyDetectSettings = {};
+
+			this.ensureDefault("proxy_detect_threshold", 256000); // Default is 250 KB per second
+			
+			this.proxyDetectSettings.user_upload_progress_handler = this.settings.upload_progress_handler;
+			this.proxyDetectSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
+			
+			this.settings.upload_progress_handler = SWFUpload.proxyDetect.uploadProgressHandler;
+			this.settings.upload_complete_handler = SWFUpload.proxyDetect.uploadCompleteHandler;
+			
+			
+			delete this.ensureDefault;
+		};
+	}(SWFUpload.prototype.initSettings));
+
+	SWFUpload.proxyDetect.uploadProgressHandler = function (file, bytesComplete, bytesTotal) {
+		var ex1 = null, time, differenceMS, bps;
+		try {
+			if (typeof this.proxyDetectSettings.user_upload_progress_handler === "function") {
+				this.proxyDetectSettings.user_upload_progress_handler.call(this, file, bytesComplete, bytesTotal);
+			}
+		} catch (ex1) { }
+			
+		
+		if (bytesComplete === 0) {
+			this.proxyDetectFileStartTimes[file.ID] = new Date();
+
+		} else if (bytesComplete === bytesTotal) {
+			try {
+				// Calculate the Bps and decide if we should trigger the error
+				time = new Date();
+				differenceMS = time.getTime() - this.proxyDetectFileStartTimes[file.ID].getTime();
+				
+				if (differenceMS === 0) {
+					differenceMS = 1;
+				}
+				
+				bps = bytesTotal / (differenceMS * 1000);
+				if (bps > parseInt(this.settings.proxy_detect_threshold, 10)) {
+					this.queueEvent("upload_error_handler", [file, SWFUpload.UPLOAD_ERROR.PROXY, bps]);
+				}					
+			} catch (ex) {
+			}
+		}
+		
+		if (ex1 !== null) {
+			throw(ex1);
+		}
+	};
+	
+	SWFUpload.proxyDetect.uploadCompleteHandler = function (file) {
+		try {
+			delete this.proxyDetectFileStartTimes[file.ID];
+		} catch (ex) {
+		}
+		
+		if (typeof this.proxyDetectSettings.user_upload_progress_handler === "function") {
+			return this.proxyDetectSettings.user_upload_progress_handler.call(this, file);
+		}
+	};	
+}

data/public/javascripts/swfupload/swfupload.queue.js

@@ -16,9 +16,10 @@ if (typeof(SWFUpload) === "function") {
 	SWFUpload.queue = {};
 	
 	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
-		return function () {
+		return function (userSettings) {
+			userSettings = this.tmp_settings; // This fixes a bug where userSettings is undefined
 			if (typeof(oldInitSettings) === "function") {
-				oldInitSettings.call(this);
+				oldInitSettings.call(this, userSettings);
 			}
 			
 			this.queueSettings = {};
@@ -31,7 +32,7 @@ if (typeof(SWFUpload) === "function") {
 			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
 			this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
 			
-			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
+			this.settings.queue_complete_handler = userSettings.queue_complete_handler || null;
 		};
 	})(SWFUpload.prototype.initSettings);
 

data/public/javascripts/swfupload/swfupload.speed.js

@@ -3,9 +3,9 @@
 	
 	Features:
 		*Adds several properties to the 'file' object indicated upload speed, time left, upload time, etc.
-			- currentSpeed -- String indicating the upload speed, bytes per second
-			- averageSpeed -- Overall average upload speed, bytes per second
-			- movingAverageSpeed -- Speed over averaged over the last several measurements, bytes per second
+			- currentSpeed -- String indicating the upload speed, bits per second
+			- averageSpeed -- Overall average upload speed, bits per second
+			- movingAverageSpeed -- Speed over averaged over the last several measurements, bits per second
 			- timeRemaining -- Estimated remaining upload time in seconds
 			- timeElapsed -- Number of seconds passed for this upload
 			- percentUploaded -- Percentage of the file uploaded (0 to 100)
@@ -29,13 +29,13 @@ if (typeof(SWFUpload) === "function") {
 	SWFUpload.speed = {};
 	
 	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
-		return function () {
+		return function (userSettings) {
 			if (typeof(oldInitSettings) === "function") {
-				oldInitSettings.call(this);
+				oldInitSettings.call(this, userSettings);
 			}
 			
 			this.ensureDefault = function (settingName, defaultValue) {
-				this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+				this.settings[settingName] = (userSettings[settingName] == undefined) ? defaultValue : userSettings[settingName];
 			};
 
 			// List used to keep the speed stats for the files we are tracking
@@ -124,6 +124,10 @@ if (typeof(SWFUpload) === "function") {
 	SWFUpload.speed.extendFile = function (file, trackingList) {
 		var tracking;
 		
+		if (!file) {
+			return file;
+		}
+		
 		if (trackingList) {
 			tracking = trackingList[file.id];
 		}

data/test/rails_root/app/views/layouts/application.html.erb

@@ -4,7 +4,6 @@
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <title>Uploader</title>
-    <%= stylesheet_link_tag 'screen', :media => 'all' %>
     <%= javascript_include_tag %w{
                 jquery/jquery.js
                 jquery/jquery-ui.js

data/test/rails_root/config/database.yml

@@ -1,14 +1,22 @@
 development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  timeout: 5000
-
+  adapter: mysql
+  encoding: utf8
+  database: uploader_development
+  username: root
+  password:
+  host: 127.0.0.1
 test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  timeout: 5000
+  adapter: mysql
+  encoding: utf8
+  database: uploader_test
+  username: root
+  password:
+  socket: /tmp/mysql.sock
 
 production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  timeout: 5000
+  adapter: mysql
+  encoding: utf8
+  database: uploader_production
+  username: root
+  password: 
+  socket: /tmp/mysql.sock

data/test/rails_root/config/routes.rb

@@ -1,5 +1,8 @@
 ActionController::Routing::Routes.draw do |map|
 
+  map.home '', :controller => 'default', :action => 'index'
+  map.root :controller => 'default', :action => 'index'
+  
   map.resources :uploads, :collection => { :swfupload => :post }
   map.resources :users
   

data/uploader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uploader}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "David South"]
-  s.date = %q{2009-12-12}
+  s.date = %q{2010-08-24}
   s.description = %q{Uploader gem that makes it simple add multiple file uploads to your Rails project using SWFUpload and Paperclip}
   s.email = %q{justinball@gmail.com}
   s.extra_rdoc_files = [
@@ -136,11 +136,13 @@ Gem::Specification.new do |s|
      "public/javascripts/swfupload/handlers.js",
      "public/javascripts/swfupload/swfupload.cookies.js",
      "public/javascripts/swfupload/swfupload.js",
+     "public/javascripts/swfupload/swfupload.proxy.js",
      "public/javascripts/swfupload/swfupload.queue.js",
      "public/javascripts/swfupload/swfupload.speed.js",
      "public/javascripts/swfupload/swfupload.swfobject.js",
      "public/stylesheets/swfupload.css",
      "public/swf/swfupload.swf",
+     "public/swf/swfupload_fp9.swf",
      "rails/init.rb",
      "tasks/rails.rake",
      "test/rails_root/.gitignore",
@@ -261,6 +263,7 @@ Gem::Specification.new do |s|
      "test/rails_root/public/robots.txt",
      "test/rails_root/public/stylesheets/.keep",
      "test/rails_root/public/stylesheets/swfupload.css",
+     "test/rails_root/public/swf/swfupload.swf",
      "test/rails_root/script/about",
      "test/rails_root/script/breakpointer",
      "test/rails_root/script/console",
@@ -301,7 +304,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{uploader}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{SWFUpload + Paperclip wrapped in an engine with love.}
   s.test_files = [
     "test/rails_root/app/controllers/application_controller.rb",
@@ -340,7 +343,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 0"])
       s.add_runtime_dependency(%q<paperclip>, [">= 0"])

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: uploader
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  hash: 7
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Justin Ball
@@ -10,39 +16,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-12 00:00:00 -07:00
+date: 2010-08-24 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: paperclip
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Uploader gem that makes it simple add multiple file uploads to your Rails project using SWFUpload and Paperclip
 email: justinball@gmail.com
 executables: []
@@ -172,11 +190,13 @@ files:
 - public/javascripts/swfupload/handlers.js
 - public/javascripts/swfupload/swfupload.cookies.js
 - public/javascripts/swfupload/swfupload.js
+- public/javascripts/swfupload/swfupload.proxy.js
 - public/javascripts/swfupload/swfupload.queue.js
 - public/javascripts/swfupload/swfupload.speed.js
 - public/javascripts/swfupload/swfupload.swfobject.js
 - public/stylesheets/swfupload.css
 - public/swf/swfupload.swf
+- public/swf/swfupload_fp9.swf
 - rails/init.rb
 - tasks/rails.rake
 - test/rails_root/.gitignore
@@ -297,6 +317,7 @@ files:
 - test/rails_root/public/robots.txt
 - test/rails_root/public/stylesheets/.keep
 - test/rails_root/public/stylesheets/swfupload.css
+- test/rails_root/public/swf/swfupload.swf
 - test/rails_root/script/about
 - test/rails_root/script/breakpointer
 - test/rails_root/script/console
@@ -342,21 +363,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: uploader
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: SWFUpload + Paperclip wrapped in an engine with love.