[pLog-svn] r6556 - in plog/trunk: flash/swfupload js/swfupload js/swfupload/plugins js/swfupload/plugins/swfupload.v102 js/ui js/ui/assets/upload templates/admin

mark at devel.lifetype.net mark at devel.lifetype.net
Mon Jun 16 05:45:50 EDT 2008


Author: mark
Date: 2008-06-16 05:45:48 -0400 (Mon, 16 Jun 2008)
New Revision: 6556

Added:
   plog/trunk/js/swfupload/plugins/swfupload.cookies.js
   plog/trunk/js/swfupload/plugins/swfupload.swfobject.js
   plog/trunk/js/swfupload/plugins/swfupload.v102/
   plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.accept.png
   plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.add.png
   plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.callbacks.js
   plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.cancel.png
   plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.js
   plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.progressbar.png
   plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.theme.css
Modified:
   plog/trunk/flash/swfupload/swfupload_f8.swf
   plog/trunk/flash/swfupload/swfupload_f9.swf
   plog/trunk/js/swfupload/plugins/swfupload.graceful_degradation.js
   plog/trunk/js/swfupload/plugins/swfupload.queue.js
   plog/trunk/js/swfupload/swfupload.js
   plog/trunk/js/ui/assets/upload/upload.css
   plog/trunk/js/ui/upload.js
   plog/trunk/templates/admin/editblogtemplate.template
   plog/trunk/templates/admin/edittemplate.template
   plog/trunk/templates/admin/resources.template
Log:
1. Upgrade to swfupload 2.1.0
2. Fix overflow:auto error in IE6/7
3. Use SWFObject to load SWFUpload, hope it can solve the flash not loaded problem in some IE6/7 browser.

Modified: plog/trunk/flash/swfupload/swfupload_f8.swf
===================================================================
(Binary files differ)

Modified: plog/trunk/flash/swfupload/swfupload_f9.swf
===================================================================
(Binary files differ)

Added: plog/trunk/js/swfupload/plugins/swfupload.cookies.js
===================================================================
--- plog/trunk/js/swfupload/plugins/swfupload.cookies.js	                        (rev 0)
+++ plog/trunk/js/swfupload/plugins/swfupload.cookies.js	2008-06-16 09:45:48 UTC (rev 6556)
@@ -0,0 +1,53 @@
+/*
+	Cookie Plug-in
+	
+	This plug in automatically gets all the cookies for this site and adds them to the post_params.
+	Cookies are loaded only on initialization.  The refreshCookies function can be called to update the post_params.
+	The cookies will override any other post params with the same name.
+*/
+
+var SWFUpload;
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.prototype.initSettings = function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
+			}
+			
+			this.refreshCookies(false);	// The false parameter must be sent since SWFUpload has not initialzed at this point
+		};
+	}(SWFUpload.prototype.initSettings);
+	
+	// refreshes the post_params and updates SWFUpload.  The sendToFlash parameters is optional and defaults to True
+	SWFUpload.prototype.refreshCookies = function (sendToFlash) {
+		if (sendToFlash === undefined) {
+			sendToFlash = true;
+		}
+		sendToFlash = !!sendToFlash;
+		
+		// Get the post_params object
+		var postParams = this.settings.post_params;
+		
+		// Get the cookies
+		var i, cookieArray = document.cookie.split(';'), caLength = cookieArray.length, c, eqIndex, name, value;
+		for (i = 0; i < caLength; i++) {
+			c = cookieArray[i];
+			
+			// Left Trim spaces
+			while (c.charAt(0) === " ") {
+				c = c.substring(1, c.length);
+			}
+			eqIndex = c.indexOf("=");
+			if (eqIndex > 0) {
+				name = c.substring(0, eqIndex);
+				value = c.substring(eqIndex + 1);
+				postParams[name] = value;
+			}
+		}
+		
+		if (sendToFlash) {
+			this.setPostParams(postParams);
+		}
+	};
+
+}

Modified: plog/trunk/js/swfupload/plugins/swfupload.graceful_degradation.js
===================================================================
--- plog/trunk/js/swfupload/plugins/swfupload.graceful_degradation.js	2008-06-15 11:20:03 UTC (rev 6555)
+++ plog/trunk/js/swfupload/plugins/swfupload.graceful_degradation.js	2008-06-16 09:45:48 UTC (rev 6556)
@@ -19,44 +19,46 @@
 var SWFUpload;
 if (typeof(SWFUpload) === "function") {
 	SWFUpload.gracefulDegradation = {};
-	SWFUpload.prototype.initSettings = function (old_initSettings) {
-		return function (init_settings) {
-			if (typeof(old_initSettings) === "function") {
-				old_initSettings.call(this, init_settings);
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
 			}
 			
-			this.addSetting("swfupload_element_id",		  		init_settings.swfupload_element_id,				"swfupload_container");
-			this.addSetting("degraded_element_id",		  		init_settings.degraded_element_id,				"degraded_container");
-			this.addSetting("user_swfUploadLoaded_handler",		init_settings.swfupload_loaded_handler,			SWFUpload.swfUploadLoaded);
+			this.ensureDefault = function (settingName, defaultValue) {
+				this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+			};
+			
+			this.ensureDefault("swfupload_element_id", "swfupload_container");
+			this.ensureDefault("degraded_element_id", "degraded_container");
+			this.settings.user_swfupload_loaded_handler = this.settings.swfupload_loaded_handler;
 
-			this.swfUploadLoaded_handler = SWFUpload.gracefulDegradation.swfUploadLoaded;
+			this.settings.swfupload_loaded_handler = SWFUpload.gracefulDegradation.swfUploadLoadedHandler;
+			
+			delete this.ensureDefault;
 		};
-	}(SWFUpload.prototype.initSettings);
+	})(SWFUpload.prototype.initSettings);
 
-	SWFUpload.gracefulDegradation.swfUploadLoaded = function () {
-		var swfupload_container_id, swfupload_container, degraded_container_id, degraded_container, user_swfUploadLoaded_handler;
-		try {
-			swfupload_element_id = this.getSetting("swfupload_element_id");
-			degraded_element_id = this.getSetting("degraded_element_id");
-			
-			// Show the UI container
-			swfupload_container = document.getElementById(swfupload_element_id);
-			if (swfupload_container !== null) {
-				swfupload_container.style.display = "block";
+	SWFUpload.gracefulDegradation.swfUploadLoadedHandler = function () {
+		var swfuploadContainerID, swfuploadContainer, degradedContainerID, degradedContainer;
 
-				// Now take care of hiding the degraded UI
-				degraded_container = document.getElementById(degraded_element_id);
-				if (degraded_container !== null) {
-					degraded_container.style.display = "none";
-				}
+		swfuploadContainerID = this.settings.swfupload_element_id;
+		degradedContainerID = this.settings.degraded_element_id;
+		
+		// Show the UI container
+		swfuploadContainer = document.getElementById(swfuploadContainerID);
+		if (swfuploadContainer != undefined) {
+			swfuploadContainer.style.display = "block";
+
+			// Now take care of hiding the degraded UI
+			degradedContainer = document.getElementById(degradedContainerID);
+			if (degradedContainer != undefined) {
+				degradedContainer.style.display = "none";
 			}
-		} catch (ex) {
-			this.debug(ex);
 		}
 		
-		user_swfUploadLoaded_handler = this.getSetting("user_swfUploadLoaded_handler");
-		if (typeof(user_swfUploadLoaded_handler) === "function") {
-			user_swfUploadLoaded_handler.apply(this);
+		if (typeof(this.settings.user_swfupload_loaded_handler) === "function") {
+			this.settings.user_swfupload_loaded_handler.apply(this);
 		}
 	};
 

Modified: plog/trunk/js/swfupload/plugins/swfupload.queue.js
===================================================================
--- plog/trunk/js/swfupload/plugins/swfupload.queue.js	2008-06-15 11:20:03 UTC (rev 6555)
+++ plog/trunk/js/swfupload/plugins/swfupload.queue.js	2008-06-16 09:45:48 UTC (rev 6556)
@@ -2,9 +2,12 @@
 	Queue Plug-in
 	
 	Features:
-		cancelQueue method for cancelling the entire queue.
-		All queued files are uploaded when startUpload() is called.
-		If false is returned from uploadComplete then the queue upload is stopped.  If false is not returned (strict comparison) then the queue upload is continued.
+		*Adds a cancelQueue() method for cancelling the entire queue.
+		*All queued files are uploaded when startUpload() is called.
+		*If false is returned from uploadComplete then the queue upload is stopped.
+		 If false is not returned (strict comparison) then the queue upload is continued.
+		*Adds a QueueComplete event that is fired when all the queued files have finished uploading.
+		 Set the event handler with the queue_complete_handler setting.
 		
 	*/
 
@@ -12,46 +15,62 @@
 if (typeof(SWFUpload) === "function") {
 	SWFUpload.queue = {};
 	
-	SWFUpload.prototype.initSettings = function (old_initSettings) {
-		return function (init_settings) {
-			if (typeof(old_initSettings) === "function") {
-				old_initSettings.call(this, init_settings);
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
 			}
 			
 			this.customSettings.queue_cancelled_flag = false;
+			this.customSettings.queue_upload_count = 0;
 			
-			this.addSetting("user_upload_complete_handler", init_settings.upload_complete_handler, SWFUpload.uploadComplete);
-			this.uploadComplete_handler = SWFUpload.queue.uploadComplete;
+			this.settings.user_upload_complete_handler = this.settings.upload_complete_handler;
+			this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
+			
+			this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
 		};
-	}(SWFUpload.prototype.initSettings);
+	})(SWFUpload.prototype.initSettings);
 
-	SWFUpload.prototype.cancelQueue = function () {
-		var stats = this.getStats();
+	SWFUpload.prototype.startUpload = function (fileID) {
 		this.customSettings.queue_cancelled_flag = false;
+		this.callFlash("StartUpload", false, [fileID]);
+	};
 
-		if (stats.in_progress > 0) {
-			this.customSettings.queue_cancelled_flag = true;
-		}
+	SWFUpload.prototype.cancelQueue = function () {
+		this.customSettings.queue_cancelled_flag = true;
+		this.stopUpload();
 		
-		while(stats.files_queued > 0) {
+		var stats = this.getStats();
+		while (stats.files_queued > 0) {
 			this.cancelUpload();
 			stats = this.getStats();
 		}
 	};
 	
-	SWFUpload.queue.uploadComplete = function (file) {
-		var user_upload_complete_handler = this.getSetting("user_upload_complete_handler");
-		var continue_upload = true;
+	SWFUpload.queue.uploadCompleteHandler = function (file) {
+		var user_upload_complete_handler = this.settings.user_upload_complete_handler;
+		var continueUpload;
+		
+		if (file.filestatus === SWFUpload.FILE_STATUS.COMPLETE) {
+			this.customSettings.queue_upload_count++;
+		}
+
 		if (typeof(user_upload_complete_handler) === "function") {
-			continue_upload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
+			continueUpload = (user_upload_complete_handler.call(this, file) === false) ? false : true;
+		} else {
+			continueUpload = true;
 		}
 		
-		if (continue_upload) {
+		if (continueUpload) {
 			var stats = this.getStats();
 			if (stats.files_queued > 0 && this.customSettings.queue_cancelled_flag === false) {
 				this.startUpload();
+			} else if (this.customSettings.queue_cancelled_flag === false) {
+				this.queueEvent("queue_complete_handler", [this.customSettings.queue_upload_count]);
+				this.customSettings.queue_upload_count = 0;
 			} else {
 				this.customSettings.queue_cancelled_flag = false;
+				this.customSettings.queue_upload_count = 0;
 			}
 		}
 	};

Added: plog/trunk/js/swfupload/plugins/swfupload.swfobject.js
===================================================================
--- plog/trunk/js/swfupload/plugins/swfupload.swfobject.js	                        (rev 0)
+++ plog/trunk/js/swfupload/plugins/swfupload.swfobject.js	2008-06-16 09:45:48 UTC (rev 6556)
@@ -0,0 +1,108 @@
+/*
+	SWFUpload.SWFObject Plugin
+
+	Summary:
+		This plugin uses SWFObject to embed SWFUpload dynamically in the page.  SWFObject provides accurate Flash Player detection and DOM Ready loading.
+		This plugin replaces the Graceful Degradation plugin.
+
+	Features:
+		* swfupload_load_failed_hander event
+		* swfupload_pre_load_handler event
+		* minimum_flash_version setting (default: "9.0.28")
+		* SWFUpload.onload event for early loading
+
+	Usage:
+		Provide handlers and settings as needed.  When using the SWFUpload.SWFObject plugin you should initialize SWFUploading
+		in SWFUpload.onload rather than in window.onload.  When initialized this way SWFUpload can load earlier preventing the UI flicker
+		that was seen using the Graceful Degradation plugin.
+
+		<script type="text/javascript">
+			var swfu;
+			SWFUpload.onload = function () {
+				swfu = new SWFUpload({
+					minimum_flash_version: "9.0.28",
+					swfupload_pre_load_handler: swfuploadPreLoad,
+					swfupload_load_failed_handler: swfuploadLoadFailed
+				});
+			};
+		</script>
+		
+	Notes:
+		You must provide set minimum_flash_version setting to "8" if you are using SWFUpload for Flash Player 8.
+		The swfuploadLoadFailed event is only fired if the minimum version of Flash Player is not met.  Other issues such as missing SWF files, browser bugs
+		 or corrupt Flash Player installations will not trigger this event.
+		The swfuploadPreLoad event is fired as soon as the minimum version of Flash Player is found.  It does not wait for SWFUpload to load and can
+		 be used to prepare the SWFUploadUI and hide alternate content.
+		swfobject's onDomReady event is cross-browser safe but will default to the window.onload event when DOMReady is not supported by the browser.
+		 Early DOM Loading is supported in major modern browsers but cannot be guaranteed for every browser ever made.
+*/
+
+
+/*	SWFObject v2.0 rc4 <http://code.google.com/p/swfobject/>
+	Copyright (c) 2007 Geoff Stearns, Michael Williams, and Bobby van der Sluis
+	This software is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
+*/
+var swfobject=function(){var X="undefined",P="object",a="visibility:visible",e="visibility:hidden",B="Shockwave Flash",h="ShockwaveFlash.ShockwaveFlash",V="application/x-shockwave-flash",K="SWFObjectExprInst",G=window,g=document,N=navigator,f=[],H=[],Q=null,L=null,S=false,C=false;var Y=function(){var l=typeof g.getElementById!=X&&typeof g.getElementsByTagName!=X&&typeof g.createElement!=X&&typeof g.appendChild!=X&&typeof g.replaceChild!=X&&typeof g.removeChild!=X&&typeof g.cloneNode!=X,t=[0,0,0],n=null;if(typeof N.plugins!=X&&typeof N.plugins[B]==P){n=N.plugins[B].description;if(n){n=n.replace(/^.*\s+(\S+\s+\S+$)/,"$1");t[0]=parseInt(n.replace(/^(.*)\..*$/,"$1"),10);t[1]=parseInt(n.replace(/^.*\.(.*)\s.*$/,"$1"),10);t[2]=/r/.test(n)?parseInt(n.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof G.ActiveXObject!=X){var o=null,s=false;try{o=new ActiveXObject(h+".7")}catch(k){try{o=new ActiveXObject(h+".6");t=[6,0,21];o.AllowScriptAccess="always"}catch(k){if(t[0]==6){s=true}}if(!s)
 {try{o=new ActiveXObject(h)}catch(k){}}}if(!s&&o){try{n=o.GetVariable("$version");if(n){n=n.split(" ")[1].split(",");t=[parseInt(n[0],10),parseInt(n[1],10),parseInt(n[2],10)]}}catch(k){}}}}var v=N.userAgent.toLowerCase(),j=N.platform.toLowerCase(),r=/webkit/.test(v)?parseFloat(v.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,i=false,q=j?/win/.test(j):/win/.test(v),m=j?/mac/.test(j):/mac/.test(v);/*@cc_on i=true;@if(@_win32)q=true;@elif(@_mac)m=true;@end@*/return{w3cdom:l,pv:t,webkit:r,ie:i,win:q,mac:m}}();var d=function(){if(!Y.w3cdom){return }J(I);if(Y.ie&&Y.win){try{g.write("<script id=__ie_ondomload defer=true src=//:><\/script>");var i=b("__ie_ondomload");if(i){i.onreadystatechange=function(){if(this.readyState=="complete"){this.parentNode.removeChild(this);U()}}}}catch(j){}}if(Y.webkit&&typeof g.readyState!=X){Q=setInterval(function(){if(/loaded|complete/.test(g.readyState)){U()}},10)}if(typeof g.addEventListener!=X){g.addEventListener("DOMContentLoaded",U,null)}M(U
 )}();function U(){if(S){return }if(Y.ie&&Y.win){var m=W("span");try{var l=g.getElementsByTagName("body")[0].appendChild(m);l.parentNode.removeChild(l)}catch(n){return }}S=true;if(Q){clearInterval(Q);Q=null}var j=f.length;for(var k=0;k<j;k++){f[k]()}}function J(i){if(S){i()}else{f[f.length]=i}}function M(j){if(typeof G.addEventListener!=X){G.addEventListener("load",j,false)}else{if(typeof g.addEventListener!=X){g.addEventListener("load",j,false)}else{if(typeof G.attachEvent!=X){G.attachEvent("onload",j)}else{if(typeof G.onload=="function"){var i=G.onload;G.onload=function(){i();j()}}else{G.onload=j}}}}}function I(){var l=H.length;for(var j=0;j<l;j++){var m=H[j].id;if(Y.pv[0]>0){var k=b(m);if(k){H[j].width=k.getAttribute("width")?k.getAttribute("width"):"0";H[j].height=k.getAttribute("height")?k.getAttribute("height"):"0";if(O(H[j].swfVersion)){if(Y.webkit&&Y.webkit<312){T(k)}}else{if(H[j].expressInstall&&!C&&O("6.0.65")&&(Y.win||Y.mac)){D(H[j])}else{c(k)}}}}A("#"+m,a)}}functi
 on T(m){var k=m.getElementsByTagName(P)[0];if(k){var p=W("embed"),r=k.attributes;if(r){var o=r.length;for(var n=0;n<o;n++){if(r[n].nodeName.toLowerCase()=="data"){p.setAttribute("src",r[n].nodeValue)}else{p.setAttribute(r[n].nodeName,r[n].nodeValue)}}}var q=k.childNodes;if(q){var s=q.length;for(var l=0;l<s;l++){if(q[l].nodeType==1&&q[l].nodeName.toLowerCase()=="param"){p.setAttribute(q[l].getAttribute("name"),q[l].getAttribute("value"))}}}m.parentNode.replaceChild(p,m)}}function F(i){if(Y.ie&&Y.win&&O("8.0.0")){G.attachEvent("onunload",function(){var k=b(i);for(var j in k){if(typeof k[j]=="function"){k[j]=function(){}}}k.parentNode.removeChild(k)})}}function D(j){C=true;var o=b(j.id);if(o){if(j.altContentId){var l=b(j.altContentId);if(l){L=l}}else{L=Z(o)}if(!(/%$/.test(j.width))&&parseInt(j.width,10)<310){j.width="310"}if(!(/%$/.test(j.height))&&parseInt(j.height,10)<137){j.height="137"}g.title=g.title.slice(0,47)+" - Flash Player Installation";var n=Y.ie&&Y.win?"ActiveX":"P
 lugIn",k=g.title,m="MMredirectURL="+G.location+"&MMplayerType="+n+"&MMdoctitle="+k,p=j.id;if(Y.ie&&Y.win&&o.readyState!=4){var i=W("div");p+="SWFObjectNew";i.setAttribute("id",p);o.parentNode.insertBefore(i,o);o.style.display="none";G.attachEvent("onload",function(){o.parentNode.removeChild(o)})}R({data:j.expressInstall,id:K,width:j.width,height:j.height},{flashvars:m},p)}}function c(j){if(Y.ie&&Y.win&&j.readyState!=4){var i=W("div");j.parentNode.insertBefore(i,j);i.parentNode.replaceChild(Z(j),i);j.style.display="none";G.attachEvent("onload",function(){j.parentNode.removeChild(j)})}else{j.parentNode.replaceChild(Z(j),j)}}function Z(n){var m=W("div");if(Y.win&&Y.ie){m.innerHTML=n.innerHTML}else{var k=n.getElementsByTagName(P)[0];if(k){var o=k.childNodes;if(o){var j=o.length;for(var l=0;l<j;l++){if(!(o[l].nodeType==1&&o[l].nodeName.toLowerCase()=="param")&&!(o[l].nodeType==8)){m.appendChild(o[l].cloneNode(true))}}}}}return m}function R(AE,AC,q){var p,t=b(q);if(typeof AE.id==X
 ){AE.id=q}if(Y.ie&&Y.win){var AD="";for(var z in AE){if(AE[z]!=Object.prototype[z]){if(z=="data"){AC.movie=AE[z]}else{if(z.toLowerCase()=="styleclass"){AD+=' class="'+AE[z]+'"'}else{if(z!="classid"){AD+=" "+z+'="'+AE[z]+'"'}}}}}var AB="";for(var y in AC){if(AC[y]!=Object.prototype[y]){AB+='<param name="'+y+'" value="'+AC[y]+'" />'}}t.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+AD+">"+AB+"</object>";F(AE.id);p=b(AE.id)}else{if(Y.webkit&&Y.webkit<312){var AA=W("embed");AA.setAttribute("type",V);for(var x in AE){if(AE[x]!=Object.prototype[x]){if(x=="data"){AA.setAttribute("src",AE[x])}else{if(x.toLowerCase()=="styleclass"){AA.setAttribute("class",AE[x])}else{if(x!="classid"){AA.setAttribute(x,AE[x])}}}}}for(var w in AC){if(AC[w]!=Object.prototype[w]){if(w!="movie"){AA.setAttribute(w,AC[w])}}}t.parentNode.replaceChild(AA,t);p=AA}else{var s=W(P);s.setAttribute("type",V);for(var v in AE){if(AE[v]!=Object.prototype[v]){if(v.toLowerCase()=="styleclass"){
 s.setAttribute("class",AE[v])}else{if(v!="classid"){s.setAttribute(v,AE[v])}}}}for(var u in AC){if(AC[u]!=Object.prototype[u]&&u!="movie"){E(s,u,AC[u])}}t.parentNode.replaceChild(s,t);p=s}}return p}function E(k,i,j){var l=W("param");l.setAttribute("name",i);l.setAttribute("value",j);k.appendChild(l)}function b(i){return g.getElementById(i)}function W(i){return g.createElement(i)}function O(k){var j=Y.pv,i=k.split(".");i[0]=parseInt(i[0],10);i[1]=parseInt(i[1],10);i[2]=parseInt(i[2],10);return(j[0]>i[0]||(j[0]==i[0]&&j[1]>i[1])||(j[0]==i[0]&&j[1]==i[1]&&j[2]>=i[2]))?true:false}function A(m,j){if(Y.ie&&Y.mac){return }var l=g.getElementsByTagName("head")[0],k=W("style");k.setAttribute("type","text/css");k.setAttribute("media","screen");if(!(Y.ie&&Y.win)&&typeof g.createTextNode!=X){k.appendChild(g.createTextNode(m+" {"+j+"}"))}l.appendChild(k);if(Y.ie&&Y.win&&typeof g.styleSheets!=X&&g.styleSheets.length>0){var i=g.styleSheets[g.styleSheets.length-1];if(typeof i.addRule==P){i.a
 ddRule(m,j)}}}return{registerObject:function(l,i,k){if(!Y.w3cdom||!l||!i){return }var j={};j.id=l;j.swfVersion=i;j.expressInstall=k?k:false;H[H.length]=j;A("#"+l,e)},getObjectById:function(l){var i=null;if(Y.w3cdom&&S){var j=b(l);if(j){var k=j.getElementsByTagName(P)[0];if(!k||(k&&typeof j.SetVariable!=X)){i=j}else{if(typeof k.SetVariable!=X){i=k}}}}return i},embedSWF:function(n,u,r,t,j,m,k,p,s){if(!Y.w3cdom||!n||!u||!r||!t||!j){return }r+="";t+="";if(O(j)){A("#"+u,e);var q=(typeof s==P)?s:{};q.data=n;q.width=r;q.height=t;var o=(typeof p==P)?p:{};if(typeof k==P){for(var l in k){if(k[l]!=Object.prototype[l]){if(typeof o.flashvars!=X){o.flashvars+="&"+l+"="+k[l]}else{o.flashvars=l+"="+k[l]}}}}J(function(){R(q,o,u);A("#"+u,a)})}else{if(m&&!C&&O("6.0.65")&&(Y.win||Y.mac)){A("#"+u,e);J(function(){var i={};i.id=i.altContentId=u;i.width=r;i.height=t;i.expressInstall=m;D(i);A("#"+u,a)})}}},getFlashPlayerVersion:function(){return{major:Y.pv[0],minor:Y.pv[1],release:Y.pv[2]}},hasFlash
 PlayerVersion:O,createSWF:function(k,j,i){if(Y.w3cdom&&S){return R(k,j,i)}else{return undefined}},createCSS:function(j,i){if(Y.w3cdom){A(j,i)}},addDomLoadEvent:J,addLoadEvent:M,getQueryParamValue:function(m){var l=g.location.search||g.location.hash;if(m==null){return l}if(l){var k=l.substring(1).split("&");for(var j=0;j<k.length;j++){if(k[j].substring(0,k[j].indexOf("="))==m){return k[j].substring((k[j].indexOf("=")+1))}}}return""},expressInstallCallback:function(){if(C&&L){var i=b(K);if(i){i.parentNode.replaceChild(L,i);L=null;C=false}}}}}();
+
+	
+var SWFUpload;
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.onload = function () {};
+	
+	swfobject.addDomLoadEvent(function () {
+		if (typeof(SWFUpload.onload) === "function") {
+			SWFUpload.onload.call(window);
+		}
+	});
+	
+	SWFUpload.prototype.initSettings = (function (oldInitSettings) {
+		return function () {
+			if (typeof(oldInitSettings) === "function") {
+				oldInitSettings.call(this);
+			}
+
+			this.ensureDefault = function (settingName, defaultValue) {
+				this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+			};
+
+			this.ensureDefault("minimum_flash_version", "9.0.28");
+			this.ensureDefault("swfupload_load_failed_handler", null);
+
+			delete this.ensureDefault;
+
+		};
+	})(SWFUpload.prototype.initSettings);
+
+
+	SWFUpload.prototype.loadFlash = function (oldLoadFlash) {
+		return function () {
+			var hasFlash = swfobject.hasFlashPlayerVersion(this.settings.minimum_flash_version);
+			
+			if (hasFlash) {
+				this.queueEvent("swfupload_pre_load_handler");
+				if (typeof(oldLoadFlash) === "function") {
+					oldLoadFlash.call(this);
+				}
+			} else {
+				this.queueEvent("swfupload_load_failed_handler");
+			}
+		};
+		
+	}(SWFUpload.prototype.loadFlash);
+			
+	SWFUpload.prototype.displayDebugInfo = function (oldDisplayDebugInfo) {
+		return function () {
+			if (typeof(oldDisplayDebugInfo) === "function") {
+				oldDisplayDebugInfo.call(this);
+			}
+			
+			this.debug(
+				[
+					"SWFUpload.SWFObject Plugin settings:", "\n",
+					"\t", "minimum_flash_version:                      ", this.settings.minimum_flash_version, "\n",
+					"\t", "swfupload_load_failed_handler assigned:     ", (typeof(this.settings.swfupload_load_failed_handler) === "function").toString(), "\n",
+				].join("")
+			);
+		};	
+	}(SWFUpload.prototype.displayDebugInfo);
+}

Added: plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.accept.png
===================================================================
(Binary files differ)


Property changes on: plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.accept.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.add.png
===================================================================
(Binary files differ)


Property changes on: plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.add.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.callbacks.js
===================================================================
--- plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.callbacks.js	                        (rev 0)
+++ plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.callbacks.js	2008-06-16 09:45:48 UTC (rev 6556)
@@ -0,0 +1,73 @@
+
+function fileQueued(file, queuelength) {
+	var listingfiles = document.getElementById("SWFUploadFileListingFiles");
+
+	if (!listingfiles.getElementsByTagName("ul")[0]) {
+		
+		var info = document.createElement("h4");
+		info.appendChild(document.createTextNode("File queue"));
+		
+		listingfiles.appendChild(info);
+		
+		var ul = document.createElement("ul");
+		listingfiles.appendChild(ul);
+	}
+	
+	listingfiles = listingfiles.getElementsByTagName("ul")[0];
+	
+	var li = document.createElement("li");
+	li.id = file.id;
+	li.className = "SWFUploadFileItem";
+	li.innerHTML = file.name + " <span class='progressBar' id='" + file.id + "progress'></span><a id='" + file.id + "deletebtn' class='cancelbtn' href='javascript:swfu.cancelFile(\"" + file.id + "\");'><!-- IE --></a>";
+
+	listingfiles.appendChild(li);
+	
+	var queueinfo = document.getElementById("queueinfo");
+	queueinfo.innerHTML = queuelength + " files queued";
+	document.getElementById(swfu.movieName + "UploadBtn").style.display = "block";
+	document.getElementById("cancelqueuebtn").style.display = "block";
+}
+
+function uploadFileCancelled(file, queuelength) {
+	var li = document.getElementById(file.id);
+	li.innerHTML = file.name + " - cancelled";
+	li.className = "SWFUploadFileItem uploadCancelled";
+	var queueinfo = document.getElementById("queueinfo");
+	queueinfo.innerHTML = queuelength + " files queued";
+}
+
+function uploadFileStart(file, position, queuelength) {
+	var div = document.getElementById("queueinfo");
+	div.innerHTML = "Uploading file " + position + " of " + queuelength;
+
+	var li = document.getElementById(file.id);
+	li.className += " fileUploading";
+}
+
+function uploadProgress(file, bytesLoaded) {
+
+	var progress = document.getElementById(file.id + "progress");
+	var percent = Math.ceil((bytesLoaded / file.size) * 200);
+	progress.style.background = "#f0f0f0 url(swfupload.v102.progressbar.png) no-repeat -" + (200 - percent) + "px 0";
+}
+
+function uploadError(errno) {
+	// SWFUpload.debug(errno);
+}
+
+function uploadFileComplete(file) {
+	var li = document.getElementById(file.id);
+	li.className = "SWFUploadFileItem uploadCompleted";
+}
+
+function cancelQueue() {
+	swfu.cancelQueue();
+	document.getElementById(swfu.movieName + "UploadBtn").style.display = "none";
+	document.getElementById("cancelqueuebtn").style.display = "none";
+}
+
+function uploadQueueComplete(file) {
+	var div = document.getElementById("queueinfo");
+	//div.innerHTML = "All files uploaded..."
+	document.getElementById("cancelqueuebtn").style.display = "none";
+}
\ No newline at end of file

Added: plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.cancel.png
===================================================================
(Binary files differ)


Property changes on: plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.cancel.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.js
===================================================================
--- plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.js	                        (rev 0)
+++ plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.js	2008-06-16 09:45:48 UTC (rev 6556)
@@ -0,0 +1,331 @@
+/*
+	SWFUpload v1.0.2 Plug-in for SWFUpload v2.1.0
+	---------------------------------------------
+	This plug in creates API compatibility with SWFUpload v1.0.2.  It
+	also mimics SWFUpload v1.0.2 behaviors as far as possible.
+	---------------------------------------------
+	
+	The purpose of this plugin is to allow you to replace
+	SWFUpload v1.0.2 in an existing website.  Allowing you
+	to get the benefits of the latest bug fixes with
+	little or no additional effort.
+	
+	If you are developing a new website please use the standard
+	SWFupload v2.1.0 as support for this plugin is limited.
+
+
+	**Warning: This plugin should not be combined with any other SWFupload plugin**
+*/
+
+var SWFUpload;
+if (typeof(SWFUpload) === "function") {
+	SWFUpload.v102 = {};
+	
+	SWFUpload.prototype.initSettings = function () {
+		var v102Settings = this.settings;
+		this.settings = {};
+
+		var provideDefault = function (value, defaultValue) {
+			return (value == undefined) ? defaultValue : value;
+		};
+		
+		this.settings.custom_settings = provideDefault(v102Settings.custom_settings, {});
+		this.customSettings = this.settings.custom_settings;
+
+		// Store v1.0.2 settings
+		this.customSettings.v102 = {};
+		this.customSettings.v102.target 				= provideDefault(v102Settings.target, "");
+		this.customSettings.v102.create_ui 				= provideDefault(v102Settings.create_ui, false);
+		this.customSettings.v102.browse_link_class 		= provideDefault(v102Settings.browse_link_class, "SWFBrowseLink");
+		this.customSettings.v102.upload_link_class 		= provideDefault(v102Settings.upload_link_class, "SWFUploadLink");
+		this.customSettings.v102.browse_link_innerhtml 	= provideDefault(v102Settings.browse_link_innerhtml, "<span>Browse...</span>");
+		this.customSettings.v102.upload_link_innerhtml 	= provideDefault(v102Settings.upload_link_innerhtml, "<span>Upload</span>");
+		this.customSettings.v102.auto_upload 			= !!provideDefault(v102Settings.auto_upload, false);
+		
+		// Store v1.0.2 events
+		this.customSettings.v102.upload_file_queued_callback 	= provideDefault(v102Settings.upload_file_queued_callback, null);
+		this.customSettings.v102.upload_file_start_callback 	= provideDefault(v102Settings.upload_file_start_callback, null);
+		this.customSettings.v102.upload_file_complete_callback 	= provideDefault(v102Settings.upload_file_complete_callback, null);
+		this.customSettings.v102.upload_queue_complete_callback = provideDefault(v102Settings.upload_queue_complete_callback, null);
+		this.customSettings.v102.upload_progress_callback 		= provideDefault(v102Settings.upload_progress_callback, null);
+		this.customSettings.v102.upload_dialog_cancel_callback 	= provideDefault(v102Settings.upload_dialog_cancel_callback, null);
+		this.customSettings.v102.upload_file_error_callback 	= provideDefault(v102Settings.upload_file_error_callback, null);
+		this.customSettings.v102.upload_file_cancel_callback 	= provideDefault(v102Settings.upload_file_cancel_callback, null);
+		this.customSettings.v102.upload_queue_cancel_callback 	= provideDefault(v102Settings.upload_queue_cancel_callback, null);
+		this.customSettings.v102.queue_cancelled_flag			= false;
+
+		// Upload backend settings
+		this.settings.upload_url = provideDefault(v102Settings.upload_script, "");
+		this.settings.file_post_name = "Filedata";
+		this.settings.post_params = {};
+
+		// File Settings
+		this.settings.file_types = provideDefault(v102Settings.allowed_filetypes, "*.*");
+		this.settings.file_types_description = provideDefault(v102Settings.allowed_filetypes_description, "All Files");
+		this.settings.file_size_limit = provideDefault(v102Settings.allowed_filesize, "1024");
+		this.settings.file_upload_limit = 0;
+		this.settings.file_queue_limit = 0;
+
+		// Flash Settings
+		this.settings.flash_url = provideDefault(v102Settings.flash_path, "swfupload.swf");
+		this.settings.flash_color = provideDefault(v102Settings.flash_color, "#000000");
+
+		// Debug Settings
+		this.settings.debug_enabled = this.settings.debug = provideDefault(v102Settings.debug,  false);
+
+
+		// Event Handlers
+		this.settings.swfupload_loaded_handler 		= SWFUpload.v102.swfUploadLoaded;
+		this.settings.file_dialog_start_handler 	= null;
+		this.settings.file_queued_handler 			= SWFUpload.v102.fileQueued;
+		this.settings.file_queue_error_handler 		= SWFUpload.v102.uploadError;
+		this.settings.file_dialog_complete_handler 	= SWFUpload.v102.fileDialogComplete;
+		
+		this.settings.upload_start_handler		= SWFUpload.v102.uploadStart;
+		this.settings.return_upload_start_handler = this.returnUploadStart;
+		this.settings.upload_progress_handler	= SWFUpload.v102.uploadProgress;
+		this.settings.upload_error_handler		= SWFUpload.v102.uploadError;
+		this.settings.upload_success_handler		= SWFUpload.v102.uploadSuccess;
+		this.settings.upload_complete_handler	= SWFUpload.v102.uploadComplete;
+
+		this.settings.debug_handler				= SWFUpload.v102.debug;
+		
+		// Hook up the v1.0.2 methods
+		this.browse = SWFUpload.v102.browse;
+		this.upload = SWFUpload.v102.upload;
+		this.cancelFile = SWFUpload.v102.cancelFile;
+		this.cancelQueue = SWFUpload.v102.cancelQueue;
+		this.debugSettings = SWFUpload.v102.debugSettings;
+	};
+
+	// Emulate the v1.0.2 events
+	SWFUpload.v102.swfUploadLoaded = function () {
+		try {
+			var target_id = this.customSettings.v102.target;
+			if (target_id !== "" && target_id !== "fileinputs") {
+				var self = this;
+				var target = document.getElementById(target_id);
+				
+				if (target !== null) {
+					// Create the link for uploading
+					var browselink = document.createElement("a");
+					browselink.className = this.customSettings.v102.browse_link_class;
+					browselink.id = this.movieName + "BrowseBtn";
+					browselink.href = "javascript:void(0);";
+					browselink.onclick = function () {
+						self.browse();
+						return false;
+					};
+					browselink.innerHTML = this.customSettings.v102.browse_link_innerhtml;
+				
+					target.innerHTML = "";
+					target.appendChild(browselink);
+						
+					// Add upload btn if auto upload not used
+					if (this.customSettings.v102.auto_upload === false) {
+
+						// Create the link for uploading
+						var uploadlink = document.createElement("a");
+						uploadlink.className = this.customSettings.v102.upload_link_class;
+						uploadlink.id = this.movieName + "UploadBtn";
+						uploadlink.href = "#";
+						uploadlink.onclick = function () {
+							self.upload();
+							return false;
+						};
+						uploadlink.innerHTML = this.customSettings.v102.upload_link_innerhtml;
+						target.appendChild(uploadlink);
+					}
+				}
+			}
+		}
+		catch (ex) {
+			this.debug("Exception in swfUploadLoaded");
+			this.debug(ex);
+		}
+	};
+
+	SWFUpload.v102.fileQueued = function (file) {
+		var stats = this.getStats();
+		var total_files = stats.successful_uploads + stats.upload_errors + stats.files_queued;
+
+		var v102fileQueued = this.customSettings.v102.upload_file_queued_callback;
+		if (typeof(v102fileQueued) === "function")  {
+			v102fileQueued.call(this, file, total_files);
+		}
+	};
+	
+	SWFUpload.v102.fileDialogComplete = function (num_files_selected, num_files_queued) {
+		if (this.customSettings.v102.auto_upload === true) {
+			this.startUpload();
+		}
+	};
+	
+	SWFUpload.v102.uploadStart = function (file) {
+		var callback = this.customSettings.v102.upload_file_start_callback;
+		var stats = this.getStats();
+		var current_file_number = stats.successful_uploads + stats.upload_errors + 1;
+		var total_files = stats.successful_uploads + stats.upload_errors + stats.files_queued;
+		if (typeof(callback) === "function") {
+			callback.call(this, file, current_file_number, total_files);
+		}
+		
+		return true;
+	};
+	
+	SWFUpload.v102.uploadProgress = function (file, bytes_complete, bytes_total) {
+		var callback = this.customSettings.v102.upload_progress_callback;
+		if (typeof(callback) === "function") {
+			callback.call(this, file, bytes_complete, bytes_total);
+		}
+	};
+	
+	SWFUpload.v102.uploadSuccess = function (file, server_data) {
+		var callback = this.customSettings.v102.upload_file_complete_callback;
+		if (typeof(callback) === "function") {
+			callback.call(this, file, server_data);
+		}
+	};
+	
+	SWFUpload.v102.uploadComplete = function (file) {
+		var stats = this.getStats();
+		
+		if (stats.files_queued > 0 && !this.customSettings.v102.queue_cancelled_flag) {
+			// Automatically start the next upload (if the queue wasn't cancelled)
+			this.startUpload();
+		} else if (stats.files_queued === 0 && !this.customSettings.v102.queue_cancelled_flag) {
+			// Call Queue Complete if there are no more files queued and the queue wasn't cancelled
+			var callback = this.customSettings.v102.upload_queue_complete_callback;
+			if (typeof(callback) === "function") {
+				callback.call(this, file);
+			}
+		} else {
+			// Don't do anything. Remove the queue cancelled flag (if the queue was cancelled it will be set again)
+			this.customSettings.v102.queue_cancelled_flag = false;
+		}
+	};
+	
+	
+	SWFUpload.v102.uploadError = function (file, error_code, msg) {
+		var translated_error_code = SWFUpload.v102.translateErrorCode(error_code);
+		if (error_code === SWFUpload.UPLOAD_ERROR.FILE_CANCELLED) {
+			var stats = this.getStats();
+			var total_files = stats.successful_uploads + stats.upload_errors + stats.files_queued;
+			var callback = this.customSettings.v102.upload_file_cancel_callback;
+			if (typeof(callback) === "function") {
+				callback.call(this, file, total_files);
+			}
+		} else {
+			var error_callback = this.customSettings.v102.upload_file_error_callback;
+			if (error_callback === null || typeof(error_callback) !== "function") {
+				SWFUpload.v102.defaultHandleErrors.call(this, translated_error_code, file, msg);
+			} else {
+				error_callback.call(this, translated_error_code, file, msg);
+			}
+		}
+	};
+	
+	SWFUpload.v102.translateErrorCode = function (error_code) {
+		var translated_error_code = 0;
+		switch (error_code) {
+		case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
+			translated_error_code = -40;
+			break;
+		case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+			translated_error_code = -50;
+			break;
+		case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+			translated_error_code = -30;
+			break;
+		case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+			translated_error_code = -30;
+			break;
+		case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
+			translated_error_code = -10;
+			break;
+		case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:
+			translated_error_code = -20;
+			break;
+		case SWFUpload.UPLOAD_ERROR.IO_ERROR:
+			translated_error_code = -30;
+			break;
+		case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
+			translated_error_code = -40;
+			break;
+		case SWFUpload.UPLOAD_ERROR.SPECIFIED_FILE_ID_NOT_FOUND:
+			translated_error_code = -30;
+			break;
+		case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
+			translated_error_code = -30;
+			break;
+		case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
+			translated_error_code = -30;
+			break;
+		}
+		
+		return translated_error_code;
+	};
+	
+	// Default error handling.
+	SWFUpload.v102.defaultHandleErrors = function (errcode, file, msg) {
+		
+		switch (errcode) {
+		case -10:	// HTTP error
+			alert("Error Code: HTTP Error, File name: " + file.name + ", Message: " + msg);
+			break;
+		
+		case -20:	// No upload script specified
+			alert("Error Code: No upload script, File name: " + file.name + ", Message: " + msg);
+			break;
+		
+		case -30:	// IOError
+			alert("Error Code: IO Error, File name: " + file.name + ", Message: " + msg);
+			break;
+		
+		case -40:	// Security error
+			alert("Error Code: Security Error, File name: " + file.name + ", Message: " + msg);
+			break;
+
+		case -50:	// Filesize too big
+			alert("Error Code: Filesize exceeds limit, File name: " + file.name + ", File size: " + file.size + ", Message: " + msg);
+			break;
+		default:
+			alert("Error Code: " + errcode + ". File name: " + file.name + ", Message: " + msg);
+		}
+		
+	};
+	
+	SWFUpload.v102.debug = function (message) {
+		if (this.settings.debug_enabled) {
+			if (window.console) {
+				window.console.log(message);
+			} else {
+				alert(message);
+			}
+		}
+	};
+	
+	
+	// Emulate the v1.0.2 function calls
+	SWFUpload.v102.browse = function () {
+		this.selectFiles();
+	};
+	SWFUpload.v102.upload = function () {
+		this.startUpload();
+	};
+	SWFUpload.v102.cancelFile = function (file_id) {
+		this.cancelUpload(file_id);
+	};
+	SWFUpload.v102.cancelQueue = function () {
+		var stats = this.getStats();
+		while (stats.files_queued > 0) {
+			this.customSettings.v102.queue_cancelled_flag = true;
+			this.cancelUpload();
+			stats = this.getStats();
+		}
+		
+		if (status.in_progress === 0) {
+			this.customSettings.v102.queue_cancelled_flag = false;
+		}
+	};
+}
\ No newline at end of file

Added: plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.progressbar.png
===================================================================
(Binary files differ)


Property changes on: plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.progressbar.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.theme.css
===================================================================
--- plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.theme.css	                        (rev 0)
+++ plog/trunk/js/swfupload/plugins/swfupload.v102/swfupload.v102.theme.css	2008-06-16 09:45:48 UTC (rev 6556)
@@ -0,0 +1,73 @@
+.clr {
+	clear:both;
+}
+
+/* SWFUpload CSS */
+
+.swfuploadbtn {
+	display: block;
+	width: 100px;
+	padding: 0 0 0 20px;
+	line-height: 16px;
+}
+
+
+.browsebtn {
+	background: url(swfupload.v102.add.png) no-repeat 0 0px;
+}
+
+.uploadbtn { 
+	display: none;
+	background: url(swfupload.v102.accept.png) no-repeat 0 0px; 
+}
+
+.cancelbtn { 
+	display: block;
+	width: 16px;
+	height: 16px;
+	float: right;
+	background: url(swfupload.v102.cancel.png) no-repeat; 
+}
+
+#cancelqueuebtn {
+	display: none;
+	background-image: url(swfupload.v102.cancel.png);
+	background-repeat: no-repeat;
+	background-position: 0px 0px;
+	background-attachment: scroll;
+	margin: 10px 0;
+	line-height: 16px;
+}
+
+#SWFUploadFileListingFiles ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+.SWFUploadFileItem {
+	display: block;
+	width: 230px;
+	height: 70px;
+	float: left;
+	background: #eaefea;
+	margin: 0 10px 10px 0;
+	padding: 5px;
+}
+.fileUploading { background: #fee727; }
+.uploadCompleted { background: #d2fa7c; }
+.uploadCancelled { background: #f77c7c; }
+
+.uploadCompleted .cancelbtn, .uploadCancelled .cancelbtn {
+	display: none;
+	
+}
+
+span.progressBar {
+	width: 200px;
+	display: block;
+	font-size: 10px;
+	height: 4px;
+	margin-top: 2px;
+	margin-bottom: 10px;
+	background-color: #CCC;
+}

Modified: plog/trunk/js/swfupload/swfupload.js
===================================================================
--- plog/trunk/js/swfupload/swfupload.js	2008-06-15 11:20:03 UTC (rev 6555)
+++ plog/trunk/js/swfupload/swfupload.js	2008-06-16 09:45:48 UTC (rev 6556)
@@ -1,18 +1,11 @@
 /**
- * SWFUpload v2.0 by Jacob Roberts, Nov 2007, http://www.swfupload.org, http://linebyline.blogspot.com
+ * SWFUpload v2.1.0 by Jacob Roberts, Feb 2008, http://www.swfupload.org, http://swfupload.googlecode.com, http://www.swfupload.org
  * -------- -------- -------- -------- -------- -------- -------- --------
- * SWFUpload is (c) 2006 Lars Huring and Mammon Media and is released under the MIT License:
+ * SWFUpload is (c) 2006 Lars Huring, Olov Nilzén and Mammon Media and is released under the MIT License:
  * http://www.opensource.org/licenses/mit-license.php
  *
  * See Changelog.txt for version history
  *
- * Development Notes:
- *  * This version of SWFUpload requires Flash Player 9.0.28 and should autodetect the correct flash version.
- *  * In Linux Flash Player 9 setting the post file variable name does not work. It is always set to "Filedata".
- *  * There is a lot of repeated code that could be refactored to single functions.  Feel free.
- *  * It's dangerous to do "circular calls" between Flash and JavaScript. I've taken steps to try to work around issues
- *     by having the event calls pipe through setTimeout.  However you should still avoid calling in to Flash from
- *     within the event handler methods.  Especially the "startUpload" event since it cannot use the setTimeout hack.
  */
 
 
@@ -20,22 +13,14 @@
 /* Constructor */
 /* *********** */
 
-var SWFUpload = function (init_settings) {
-	this.initSWFUpload(init_settings);
+var SWFUpload = function (settings) {
+	this.initSWFUpload(settings);
 };
 
-SWFUpload.prototype.initSWFUpload = function (init_settings) {
-	// Remove background flicker in IE (read this: http://misterpixel.blogspot.com/2006/09/forensic-analysis-of-ie6.html)
-	// This doesn't have anything to do with SWFUpload but can help your UI behave better in IE.
+SWFUpload.prototype.initSWFUpload = function (settings) {
 	try {
-		document.execCommand('BackgroundImageCache', false, true);
-	} catch (ex1) {
-	}
-
-
-	try {
 		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
-		this.settings = {};
+		this.settings = settings;
 		this.eventQueue = [];
 		this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
 		this.movieElement = null;
@@ -44,21 +29,21 @@
 		SWFUpload.instances[this.movieName] = this;
 
 		// Load the settings.  Load the Flash movie.
-		this.initSettings(init_settings);
+		this.initSettings();
 		this.loadFlash();
-
 		this.displayDebugInfo();
-
-	} catch (ex2) {
-		this.debug(ex2);
+	} catch (ex) {
+		delete SWFUpload.instances[this.movieName];
+		throw ex;
 	}
-}
+};
 
 /* *************** */
-/* Static thingies */
+/* Static Members  */
 /* *************** */
 SWFUpload.instances = {};
 SWFUpload.movieCount = 0;
+SWFUpload.version = "2.1.0";
 SWFUpload.QUEUE_ERROR = {
 	QUEUE_LIMIT_EXCEEDED	  		: -100,
 	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
@@ -86,908 +71,621 @@
 };
 
 
-/* ***************** */
-/* Instance Thingies */
-/* ***************** */
-// init is a private method that ensures that all the object settings are set, getting a default value if one was not assigned.
+/* ******************** */
+/* Instance Members  */
+/* ******************** */
 
-SWFUpload.prototype.initSettings = function (init_settings) {
+// Private: initSettings ensures that all the
+// settings are set, getting a default value if one was not assigned.
+SWFUpload.prototype.initSettings = function () {
+	this.ensureDefault = function (settingName, defaultValue) {
+		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+	};
+	
 	// Upload backend settings
-	this.addSetting("upload_url",		 		init_settings.upload_url,		  		"");
-	this.addSetting("file_post_name",	 		init_settings.file_post_name,	  		"Filedata");
-	this.addSetting("post_params",		 		init_settings.post_params,		  		{});
-
+	this.ensureDefault("upload_url", "");
+	this.ensureDefault("file_post_name", "Filedata");
+	this.ensureDefault("post_params", {});
+	this.ensureDefault("use_query_string", false);
+	this.ensureDefault("requeue_on_error", false);
+	
 	// File Settings
-	this.addSetting("file_types",			  	init_settings.file_types,				"*.*");
-	this.addSetting("file_types_description", 	init_settings.file_types_description, 	"All Files");
-	this.addSetting("file_size_limit",		  	init_settings.file_size_limit,			"1024");
-	this.addSetting("file_upload_limit",	  	init_settings.file_upload_limit,		"0");
-	this.addSetting("file_queue_limit",		  	init_settings.file_queue_limit,			"0");
+	this.ensureDefault("file_types", "*.*");
+	this.ensureDefault("file_types_description", "All Files");
+	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
+	this.ensureDefault("file_upload_limit", 0);
+	this.ensureDefault("file_queue_limit", 0);
 
 	// Flash Settings
-	this.addSetting("flash_url",		  		init_settings.flash_url,				"swfupload.swf");
-	this.addSetting("flash_width",		  		init_settings.flash_width,				"1px");
-	this.addSetting("flash_height",		  		init_settings.flash_height,				"1px");
-	this.addSetting("flash_color",		  		init_settings.flash_color,				"#FFFFFF");
+	this.ensureDefault("flash_url", "swfupload_f9.swf");
+	this.ensureDefault("flash_color", "#FFFFFF");
 
 	// Debug Settings
-	this.addSetting("debug_enabled", init_settings.debug,  false);
-
+	this.ensureDefault("debug", false);
+	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
+	
 	// Event Handlers
-	this.flashReady_handler         = SWFUpload.flashReady;	// This is a non-overrideable event handler
-	this.swfUploadLoaded_handler    = this.retrieveSetting(init_settings.swfupload_loaded_handler,	    SWFUpload.swfUploadLoaded);
+	this.settings.return_upload_start_handler = this.returnUploadStart;
+	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.fileDialogStart_handler	= this.retrieveSetting(init_settings.file_dialog_start_handler,		SWFUpload.fileDialogStart);
-	this.fileQueued_handler			= this.retrieveSetting(init_settings.file_queued_handler,			SWFUpload.fileQueued);
-	this.fileQueueError_handler		= this.retrieveSetting(init_settings.file_queue_error_handler,		SWFUpload.fileQueueError);
-	this.fileDialogComplete_handler	= this.retrieveSetting(init_settings.file_dialog_complete_handler,	SWFUpload.fileDialogComplete);
+	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.uploadStart_handler		= this.retrieveSetting(init_settings.upload_start_handler,			SWFUpload.uploadStart);
-	this.uploadProgress_handler		= this.retrieveSetting(init_settings.upload_progress_handler,		SWFUpload.uploadProgress);
-	this.uploadError_handler		= this.retrieveSetting(init_settings.upload_error_handler,			SWFUpload.uploadError);
-	this.uploadSuccess_handler		= this.retrieveSetting(init_settings.upload_success_handler,		SWFUpload.uploadSuccess);
-	this.uploadComplete_handler		= this.retrieveSetting(init_settings.upload_complete_handler,		SWFUpload.uploadComplete);
+	this.ensureDefault("debug_handler", this.debugMessage);
 
-	this.debug_handler				= this.retrieveSetting(init_settings.debug_handler,			   		SWFUpload.debug);
+	this.ensureDefault("custom_settings", {});
 
 	// Other settings
-	this.customSettings = this.retrieveSetting(init_settings.custom_settings, {});
+	this.customSettings = this.settings.custom_settings;
+	
+	delete this.ensureDefault;
 };
 
-// loadFlash is a private method that generates the HTML tag for the Flash
-// It then adds the flash to the "target" or to the body and stores a
-// reference to the flash element in "movieElement".
+// Private: loadFlash generates the HTML tag for the Flash
+// It then adds the flash to the body
 SWFUpload.prototype.loadFlash = function () {
-	var html, target_element, container;
+	var targetElement, container;
 
 	// Make sure an element with the ID we are going to use doesn't already exist
 	if (document.getElementById(this.movieName) !== null) {
-		return false;
+		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
 	}
 
 	// Get the body tag where we will be adding the flash movie
-	try {
-		target_element = document.getElementsByTagName("body")[0];
-		if (typeof(target_element) === "undefined" || target_element === null) {
-			this.debug('Could not find the BODY element. SWFUpload failed to load.');
-			return false;
-		}
-	} catch (ex) {
-		return false;
+	targetElement = document.getElementsByTagName("body")[0];
+
+	if (targetElement == undefined) {
+		throw "Could not find the 'body' element.";
 	}
 
 	// Append the container and load the flash
 	container = document.createElement("div");
-	container.style.width = this.getSetting("flash_width");
-	container.style.height = this.getSetting("flash_height");
+	container.style.width = "1px";
+	container.style.height = "1px";
 
-	target_element.appendChild(container);
+	targetElement.appendChild(container);
 	container.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
 };
 
-// Generates the embed/object tags needed to embed the flash in to the document
+// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
 SWFUpload.prototype.getFlashHTML = function () {
-	var html = "";
-
-	// Create Mozilla Embed HTML
-	if (navigator.plugins && navigator.mimeTypes && navigator.mimeTypes.length) {
-		// Build the basic embed html
-		html = '<embed type="application/x-shockwave-flash" src="' + this.getSetting("flash_url") + '" width="' + this.getSetting("flash_width") + '" height="' + this.getSetting("flash_height") + '"';
-		html += ' id="' + this.movieName + '" name="' + this.movieName + '" ';
-		html += 'bgcolor="' + this.getSetting("flash_color") + '" quality="high" menu="false" flashvars="';
-
-		html += this.getFlashVars();
-
-		html += '" />';
-
-		// Create IE Object HTML
-	} else {
-
-		// Build the basic Object tag
-		html = '<object id="' + this.movieName + '" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="' + this.getSetting("flash_width") + '" height="' + this.getSetting("flash_height") + '">';
-		html += '<param name="movie" value="' + this.getSetting("flash_url") + '">';
-
-		html += '<param name="bgcolor" value="' + this.getSetting("flash_color") + '" />';
-		html += '<param name="quality" value="high" />';
-		html += '<param name="menu" value="false" />';
-
-		html += '<param name="flashvars" value="' + this.getFlashVars() + '" />';
-		html += '</object>';
-	}
-
-	return html;
+	// 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="1" height="1" style="-moz-user-focus: ignore;">',
+				'<param name="movie" value="', this.settings.flash_url, '" />',
+				'<param name="bgcolor" value="', this.settings.flash_color, '" />',
+				'<param name="quality" value="high" />',
+				'<param name="menu" value="false" />',
+				'<param name="allowScriptAccess" value="always" />',
+				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
+				'</object>'].join("");
 };
 
-// This private method builds the parameter string that will be passed
-// to flash.
+// Private: getFlashVars builds the parameter string that will be passed
+// to flash in the flashvars param.
 SWFUpload.prototype.getFlashVars = function () {
 	// Build a string from the post param object
-	var param_string = this.buildParamString();
+	var paramString = this.buildParamString();
 
 	// Build the parameter string
-	var html = "";
-	html += "movieName=" + encodeURIComponent(this.movieName);
-	html += "&uploadURL=" + encodeURIComponent(this.getSetting("upload_url"));
-	html += "&params=" + encodeURIComponent(param_string);
-	html += "&filePostName=" + encodeURIComponent(this.getSetting("file_post_name"));
-	html += "&fileTypes=" + encodeURIComponent(this.getSetting("file_types"));
-	html += "&fileTypesDescription=" + encodeURIComponent(this.getSetting("file_types_description"));
-	html += "&fileSizeLimit=" + encodeURIComponent(this.getSetting("file_size_limit"));
-	html += "&fileUploadLimit=" + encodeURIComponent(this.getSetting("file_upload_limit"));
-	html += "&fileQueueLimit=" + encodeURIComponent(this.getSetting("file_queue_limit"));
-	html += "&debugEnabled=" + encodeURIComponent(this.getSetting("debug_enabled"));
-
-	return html;
+	return ["movieName=", encodeURIComponent(this.movieName),
+			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
+			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
+			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+			"&amp;params=", encodeURIComponent(paramString),
+			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
+			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
+			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled)].join("");
 };
 
+// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
+// The element is cached after the first lookup
 SWFUpload.prototype.getMovieElement = function () {
-	if (typeof(this.movieElement) === "undefined" || this.movieElement === null) {
+	if (this.movieElement == undefined) {
 		this.movieElement = document.getElementById(this.movieName);
-
-		// Fix IEs "Flash can't callback when in a form" issue (http://www.extremefx.com.ar/blog/fixing-flash-external-interface-inside-form-on-internet-explorer)
-		// Removed because Revision 6 always adds the flash to the body (inside a containing div)
-		// If you insist on adding the Flash file inside a Form then in IE you have to make you wait until the DOM is ready
-		// and run this code to make the form's ID available from the window object so Flash and JavaScript can communicate.
-		//if (typeof(window[this.movieName]) === "undefined" || window[this.moveName] !== this.movieElement) {
-		//	window[this.movieName] = this.movieElement;
-		//}
 	}
 
+	if (this.movieElement === null) {
+		throw "Could not find Flash element";
+	}
+	
 	return this.movieElement;
 };
 
+// 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 post_params = this.getSetting("post_params");
-	var param_string_pairs = [];
-	var i, value, name;
+	var postParams = this.settings.post_params;
+	var paramStringPairs = [];
 
-	// Retrieve the user defined parameters
-	if (typeof(post_params) === "object") {
-		for (name in post_params) {
-			if (post_params.hasOwnProperty(name)) {
-				if (typeof(post_params[name]) === "string") {
-					param_string_pairs.push(encodeURIComponent(name) + "=" + encodeURIComponent(post_params[name]));
-				}
+	if (typeof(postParams) === "object") {
+		for (var name in postParams) {
+			if (postParams.hasOwnProperty(name)) {
+				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
 			}
 		}
 	}
 
-	return param_string_pairs.join("&");
+	return paramStringPairs.join("&amp;");
 };
 
-// Saves a setting.	 If the value given is undefined or null then the default_value is used.
-SWFUpload.prototype.addSetting = function (name, value, default_value) {
-	if (typeof(value) === "undefined" || value === null) {
-		this.settings[name] = default_value;
-	} else {
-		this.settings[name] = value;
+// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
+// all references to the SWF, and other objects so memory is properly freed.
+// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
+SWFUpload.prototype.destroy = function () {
+	try {
+		// Make sure Flash is done before we try to remove it
+		this.stopUpload();
+		
+		// Remove the SWFUpload DOM nodes
+		var movieElement = null;
+		try {
+			movieElement = this.getMovieElement();
+		} catch (ex) {
+		}
+		
+		if (movieElement != undefined && movieElement.parentNode != undefined && typeof(movieElement.parentNode.removeChild) === "function") {
+			var container = movieElement.parentNode;
+			if (container != undefined) {
+				container.removeChild(movieElement);
+				if (container.parentNode != undefined && typeof(container.parentNode.removeChild) === "function") {
+					container.parentNode.removeChild(container);
+				}
+			}
+		}
+		
+		// Destroy references
+		SWFUpload.instances[this.movieName] = null;
+		delete SWFUpload.instances[this.movieName];
+
+		delete this.movieElement;
+		delete this.settings;
+		delete this.customSettings;
+		delete this.eventQueue;
+		delete this.movieName;
+		
+		return true;
+	} catch (ex1) {
+		return false;
 	}
+};
 
-	return this.settings[name];
+// Public: displayDebugInfo prints out settings and configuration
+// information about this SWFUpload instance.
+// This function (and any references to it) can be deleted when placing
+// SWFUpload in production.
+SWFUpload.prototype.displayDebugInfo = function () {
+	this.debug(
+		[
+			"---SWFUpload Instance Info---\n",
+			"Version: ", SWFUpload.version, "\n",
+			"Movie Name: ", this.movieName, "\n",
+			"Settings:\n",
+			"\t", "upload_url:             ", this.settings.upload_url, "\n",
+			"\t", "use_query_string:       ", this.settings.use_query_string.toString(), "\n",
+			"\t", "file_post_name:         ", this.settings.file_post_name, "\n",
+			"\t", "post_params:            ", this.settings.post_params.toString(), "\n",
+			"\t", "file_types:             ", this.settings.file_types, "\n",
+			"\t", "file_types_description: ", this.settings.file_types_description, "\n",
+			"\t", "file_size_limit:        ", this.settings.file_size_limit, "\n",
+			"\t", "file_upload_limit:      ", this.settings.file_upload_limit, "\n",
+			"\t", "file_queue_limit:       ", this.settings.file_queue_limit, "\n",
+			"\t", "flash_url:              ", this.settings.flash_url, "\n",
+			"\t", "flash_color:            ", this.settings.flash_color, "\n",
+			"\t", "debug:                  ", this.settings.debug.toString(), "\n",
+			"\t", "custom_settings:        ", this.settings.custom_settings.toString(), "\n",
+			"Event Handlers:\n",
+			"\t", "swfupload_loaded_handler assigned:  ", (typeof(this.settings.swfupload_loaded_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_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"
+		].join("")
+	);
 };
 
-// Gets a setting.	Returns empty string if not found.
-SWFUpload.prototype.getSetting = function (name) {
-	if (typeof(this.settings[name]) === "undefined") {
-		return "";
-	} else {
-		return this.settings[name];
+/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
+	the maintain v2 API compatibility
+*/
+// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
+SWFUpload.prototype.addSetting = function (name, value, default_value) {
+    if (value == undefined) {
+        return (this.settings[name] = default_value);
+    } else {
+        return (this.settings[name] = value);
 	}
 };
 
-// Gets a setting, if the setting is undefined then return the default value
-// This does not affect or use the interal setting object.
-SWFUpload.prototype.retrieveSetting = function (value, default_value) {
-	if (typeof(value) === "undefined" || value === null) {
-		return default_value;
-	} else {
-		return value;
+// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
+SWFUpload.prototype.getSetting = function (name) {
+    if (this.settings[name] != undefined) {
+        return this.settings[name];
 	}
-};
 
-
-// It loops through all the settings and displays
-// them in the debug Console.
-SWFUpload.prototype.displayDebugInfo = function () {
-	var key, debug_message = "";
-
-	debug_message += "----- SWFUPLOAD SETTINGS     ----\nID: " + this.moveName + "\n";
-
-	debug_message += this.outputObject(this.settings);
-
-	debug_message += "----- SWFUPLOAD SETTINGS END ----\n";
-	debug_message += "\n";
-
-	this.debug(debug_message);
+    return "";
 };
-SWFUpload.prototype.outputObject = function (object, prefix) {
-	var output = "", key;
 
-	if (typeof(prefix) !== "string") {
-		prefix = "";
-	}
-	if (typeof(object) !== "object") {
-		return "";
-	}
 
-	for (key in object) {
-		if (object.hasOwnProperty(key)) {
-			if (typeof(object[key]) === "object") {
-				output += (prefix + key + ": { \n" + this.outputObject(object[key], "\t" + prefix) + prefix + "}" + "\n");
+
+// Private: callFlash handles function calls made to the Flash element.
+// 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 self = this;
+	var callFunction = function () {
+		var movieElement = self.getMovieElement();
+		var returnValue;
+		if (typeof(movieElement[functionName]) === "function") {
+			// We have to go through all this if/else stuff because the Flash functions don't have apply() and only accept the exact number of arguments.
+			if (argumentArray.length === 0) {
+				returnValue = movieElement[functionName]();
+			} else if (argumentArray.length === 1) {
+				returnValue = movieElement[functionName](argumentArray[0]);
+			} else if (argumentArray.length === 2) {
+				returnValue = movieElement[functionName](argumentArray[0], argumentArray[1]);
+			} else if (argumentArray.length === 3) {
+				returnValue = movieElement[functionName](argumentArray[0], argumentArray[1], argumentArray[2]);
 			} else {
-				output += (prefix + key + ": " + object[key] + "\n");
+				throw "Too many arguments";
 			}
+			
+			// Unescape file post param values
+			if (returnValue != undefined && typeof(returnValue.post) === "object") {
+				returnValue = self.unescapeFilePostParams(returnValue);
+			}
+			
+			return returnValue;
+		} else {
+			throw "Invalid function name";
 		}
-	}
-
-	return output;
+	};
+	
+	return callFunction();
 };
 
+
 /* *****************************
 	-- Flash control methods --
 	Your UI should use these
 	to operate SWFUpload
    ***************************** */
 
+// Public: selectFile causes a File Selection Dialog window to appear.  This
+// dialog only allows 1 file to be selected.
 SWFUpload.prototype.selectFile = function () {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SelectFile) === "function") {
-		try {
-			movie_element.SelectFile();
-		}
-		catch (ex) {
-			this.debug("Could not call SelectFile: " + ex);
-		}
-	} else {
-		this.debug("Could not find Flash element");
-	}
-
+	this.callFlash("SelectFile");
 };
 
+// Public: selectFiles causes a File Selection Dialog window to appear/ This
+// dialog allows the user to select any number of files
+// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
+// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
+// for this bug.
 SWFUpload.prototype.selectFiles = function () {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SelectFiles) === "function") {
-		try {
-			movie_element.SelectFiles();
-		}
-		catch (ex) {
-			this.debug("Could not call SelectFiles: " + ex);
-		}
-	} else {
-		this.debug("Could not find Flash element");
-	}
-
+	this.callFlash("SelectFiles");
 };
 
 
-/* Start the upload.  If a file_id is specified that file is uploaded. Otherwise the first
- * file in the queue is uploaded.  If no files are in the queue then nothing happens.
- * This call uses setTimeout since Flash will be calling back in to JavaScript
- */
-SWFUpload.prototype.startUpload = function (file_id) {
-	var self = this;
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.StartUpload) === "function") {
-		setTimeout(
-			function () {
-				try {
-					movie_element.StartUpload(file_id);
-				}
-				catch (ex) {
-					self.debug("Could not call StartUpload: " + ex);
-				}
-			}, 0
-		);
-	} else {
-		this.debug("Could not find Flash element");
-	}
-
+// Public: startUpload starts uploading the first file in the queue unless
+// the optional parameter 'fileID' specifies the ID 
+SWFUpload.prototype.startUpload = function (fileID) {
+	this.callFlash("StartUpload", [fileID]);
 };
 
 /* Cancels a the file upload.  You must specify a file_id */
-SWFUpload.prototype.cancelUpload = function (file_id) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.CancelUpload) === "function") {
-		try {
-			movie_element.CancelUpload(file_id);
-		}
-		catch (ex) {
-			this.debug("Could not call CancelUpload: " + ex);
-		}
-	} else {
-		this.debug("Could not find Flash element");
-	}
-
+// Public: cancelUpload cancels any queued file.  The fileID parameter
+// must be specified.
+SWFUpload.prototype.cancelUpload = function (fileID) {
+	this.callFlash("CancelUpload", [fileID]);
 };
 
-// Stops the current upload.  The file is re-queued.  If nothing is currently uploading then nothing happens.
+// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
+// If nothing is currently uploading then nothing happens.
 SWFUpload.prototype.stopUpload = function () {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.StopUpload) === "function") {
-		try {
-			movie_element.StopUpload();
-		}
-		catch (ex) {
-			this.debug("Could not call StopUpload: " + ex);
-		}
-	} else {
-		this.debug("Could not find Flash element");
-	}
-
+	this.callFlash("StopUpload");
 };
 
 /* ************************
  * Settings methods
- *   These methods change the settings inside SWFUpload
- *   They shouldn't need to be called in a setTimeout since they
- *   should not call back from Flash to JavaScript (except perhaps in a Debug call)
- *   and some need to return data so setTimeout won't work.
- */
+ *   These methods change the SWFUpload settings.
+ *   SWFUpload settings should not be changed directly on the settings object
+ *   since many of the settings need to be passed to Flash in order to take
+ *   effect.
+ * *********************** */
 
-/* Gets the file statistics object.	 It looks like this (where n = number):
-	{
-		files_queued: n,
-		complete_uploads: n,
-		upload_errors: n,
-		uploads_cancelled: n,
-		queue_errors: n
-	}
-*/
+// Public: getStats gets the file statistics object.
 SWFUpload.prototype.getStats = function () {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.GetStats) === "function") {
-		try {
-			return movie_element.GetStats();
-		}
-		catch (ex) {
-			this.debug("Could not call GetStats");
-		}
-	} else {
-		this.debug("Could not find Flash element");
-	}
+	return this.callFlash("GetStats");
 };
-SWFUpload.prototype.setStats = function (stats_object) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SetStats) === "function") {
-		try {
-			movie_element.SetStats(stats_object);
-		}
-		catch (ex) {
-			this.debug("Could not call SetStats");
-		}
-	} else {
-		this.debug("Could not find Flash element");
-	}
+
+// Public: setStats changes the SWFUpload statistics.  You shouldn't need to 
+// change the statistics but you can.  Changing the statistics does not
+// affect SWFUpload accept for the successful_uploads count which is used
+// by the upload_limit setting to determine how many files the user may upload.
+SWFUpload.prototype.setStats = function (statsObject) {
+	this.callFlash("SetStats", [statsObject]);
 };
 
-SWFUpload.prototype.setCredentials = function(name, password) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SetCredentials) === "function") {
-		try {
-			return movie_element.SetCredentials(name, password);
-		}
-		catch (ex) {
-			this.debug("Could not call SetCredentials");
-		}
+// Public: getFile retrieves a File object by ID or Index.  If the file is
+// not found then 'null' is returned.
+SWFUpload.prototype.getFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByIndex", [fileID]);
 	} else {
-		this.debug("Could not find Flash element");
+		return this.callFlash("GetFile", [fileID]);
 	}
 };
 
-SWFUpload.prototype.getFile = function (file_id) {
-	var movie_element = this.getMovieElement();
-			if (typeof(file_id) === "number") {
-				if (movie_element !== null && typeof(movie_element.GetFileByIndex) === "function") {
-					try {
-						return movie_element.GetFileByIndex(file_id);
-					}
-					catch (ex) {
-						this.debug("Could not call GetFileByIndex");
-					}
-				} else {
-					this.debug("Could not find Flash element");
-				}
-			} else {
-				if (movie_element !== null && typeof(movie_element.GetFile) === "function") {
-					try {
-						return movie_element.GetFile(file_id);
-					}
-					catch (ex) {
-						this.debug("Could not call GetFile");
-					}
-				} else {
-					this.debug("Could not find Flash element");
-				}
-			}
+// 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.
+SWFUpload.prototype.addFileParam = function (fileID, name, value) {
+	return this.callFlash("AddFileParam", [fileID, name, value]);
 };
 
-SWFUpload.prototype.addFileParam = function (file_id, name, value) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.AddFileParam) === "function") {
-		try {
-			return movie_element.AddFileParam(file_id, name, value);
-		}
-		catch (ex) {
-			this.debug("Could not call AddFileParam");
-		}
-	} else {
-		this.debug("Could not find Flash element");
-	}
+// Public: removeFileParam removes a previously set (by addFileParam) name/value
+// pair from the specified file.
+SWFUpload.prototype.removeFileParam = function (fileID, name) {
+	this.callFlash("RemoveFileParam", [fileID, name]);
 };
 
-SWFUpload.prototype.removeFileParam = function (file_id, name) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.RemoveFileParam) === "function") {
-		try {
-			return movie_element.RemoveFileParam(file_id, name);
-		}
-		catch (ex) {
-			this.debug("Could not call AddFileParam");
-		}
-	} else {
-		this.debug("Could not find Flash element");
-	}
+// Public: setUploadUrl changes the upload_url setting.
+SWFUpload.prototype.setUploadURL = function (url) {
+	this.settings.upload_url = url.toString();
+	this.callFlash("SetUploadURL", [url]);
+};
 
+// Public: setPostParams changes the post_params setting
+SWFUpload.prototype.setPostParams = function (paramsObject) {
+	this.settings.post_params = paramsObject;
+	this.callFlash("SetPostParams", [paramsObject]);
 };
 
-SWFUpload.prototype.setUploadURL = function (url) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SetUploadURL) === "function") {
-		try {
-			this.addSetting("upload_url", url);
-			movie_element.SetUploadURL(this.getSetting("upload_url"));
-		}
-		catch (ex) {
-			this.debug("Could not call SetUploadURL");
-		}
-	} else {
-		this.debug("Could not find Flash element in setUploadURL");
-	}
+// Public: addPostParam adds post name/value pair.  Each name can have only one value.
+SWFUpload.prototype.addPostParam = function (name, value) {
+	this.settings.post_params[name] = value;
+	this.callFlash("SetPostParams", [this.settings.post_params]);
 };
 
-SWFUpload.prototype.setPostParams = function (param_object) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SetPostParams) === "function") {
-		try {
-			this.addSetting("post_params", param_object);
-			movie_element.SetPostParams(this.getSetting("post_params"));
-		}
-		catch (ex) {
-			this.debug("Could not call SetPostParams");
-		}
-	} else {
-		this.debug("Could not find Flash element in SetPostParams");
-	}
+// Public: removePostParam deletes post name/value pair.
+SWFUpload.prototype.removePostParam = function (name) {
+	delete this.settings.post_params[name];
+	this.callFlash("SetPostParams", [this.settings.post_params]);
 };
 
+// Public: setFileTypes changes the file_types setting and the file_types_description setting
 SWFUpload.prototype.setFileTypes = function (types, description) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SetFileTypes) === "function") {
-		try {
-			this.addSetting("file_types", types);
-			this.addSetting("file_types_description", description);
-			movie_element.SetFileTypes(this.getSetting("file_types"), this.getSetting("file_types_description"));
-		}
-		catch (ex) {
-			this.debug("Could not call SetFileTypes");
-		}
-	} else {
-		this.debug("Could not find Flash element in SetFileTypes");
-	}
+	this.settings.file_types = types;
+	this.settings.file_types_description = description;
+	this.callFlash("SetFileTypes", [types, description]);
 };
 
-SWFUpload.prototype.setFileSizeLimit = function (file_size_limit) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SetFileSizeLimit) === "function") {
-		try {
-			this.addSetting("file_size_limit", file_size_limit);
-			movie_element.SetFileSizeLimit(this.getSetting("file_size_limit"));
-		}
-		catch (ex) {
-			this.debug("Could not call SetFileSizeLimit");
-		}
-	} else {
-		this.debug("Could not find Flash element in SetFileSizeLimit");
-	}
+// Public: setFileSizeLimit changes the file_size_limit setting
+SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
+	this.settings.file_size_limit = fileSizeLimit;
+	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
 };
 
-SWFUpload.prototype.setFileUploadLimit = function (file_upload_limit) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SetFileUploadLimit) === "function") {
-		try {
-			this.addSetting("file_upload_limit", file_upload_limit);
-			movie_element.SetFileUploadLimit(this.getSetting("file_upload_limit"));
-		}
-		catch (ex) {
-			this.debug("Could not call SetFileUploadLimit");
-		}
-	} else {
-		this.debug("Could not find Flash element in SetFileUploadLimit");
-	}
+// Public: setFileUploadLimit changes the file_upload_limit setting
+SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
+	this.settings.file_upload_limit = fileUploadLimit;
+	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
 };
 
-SWFUpload.prototype.setFileQueueLimit = function (file_queue_limit) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SetFileQueueLimit) === "function") {
-		try {
-			this.addSetting("file_queue_limit", file_queue_limit);
-			movie_element.SetFileQueueLimit(this.getSetting("file_queue_limit"));
-		}
-		catch (ex) {
-			this.debug("Could not call SetFileQueueLimit");
-		}
-	} else {
-		this.debug("Could not find Flash element in SetFileQueueLimit");
-	}
+// Public: setFileQueueLimit changes the file_queue_limit setting
+SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
+	this.settings.file_queue_limit = fileQueueLimit;
+	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
 };
 
-SWFUpload.prototype.setFilePostName = function (file_post_name) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SetFilePostName) === "function") {
-		try {
-			this.addSetting("file_post_name", file_post_name);
-			movie_element.SetFilePostName(this.getSetting("file_post_name"));
-		}
-		catch (ex) {
-			this.debug("Could not call SetFilePostName");
-		}
-	} else {
-		this.debug("Could not find Flash element in SetFilePostName");
-	}
+// Public: setFilePostName changes the file_post_name setting
+SWFUpload.prototype.setFilePostName = function (filePostName) {
+	this.settings.file_post_name = filePostName;
+	this.callFlash("SetFilePostName", [filePostName]);
 };
 
-SWFUpload.prototype.setDebugEnabled = function (debug_enabled) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.SetDebugEnabled) === "function") {
-		try {
-			this.addSetting("debug_enabled", debug_enabled);
-			movie_element.SetDebugEnabled(this.getSetting("debug_enabled"));
-		}
-		catch (ex) {
-			this.debug("Could not call SetDebugEnabled");
-		}
-	} else {
-		this.debug("Could not find Flash element in SetDebugEnabled");
-	}
+// Public: setUseQueryString changes the use_query_string setting
+SWFUpload.prototype.setUseQueryString = function (useQueryString) {
+	this.settings.use_query_string = useQueryString;
+	this.callFlash("SetUseQueryString", [useQueryString]);
 };
 
-/* *******************************
-	Internal Event Callers
-	Don't override these! These event callers ensure that your custom event handlers
-	are called safely and in order.
-******************************* */
-
-/* This is the callback method that the Flash movie will call when it has been loaded and is ready to go.
-   Calling this or showUI() "manually" will bypass the Flash Detection built in to SWFUpload.
-   Use a ui_function setting if you want to control the UI loading after the flash has loaded.
-*/
-SWFUpload.prototype.flashReady = function () {
-	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
-	var movie_element = this.getMovieElement();
-	if (movie_element === null || typeof(movie_element.StartUpload) !== "function") {
-		this.debug("ExternalInterface methods failed to initialize.");
-		return;
-	}
-	
-	var self = this;
-	if (typeof(self.flashReady_handler) === "function") {
-		this.eventQueue[this.eventQueue.length] = function() { self.flashReady_handler(); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	} else {
-		this.debug("flashReady_handler event not defined");
-	}
+// Public: setRequeueOnError changes the requeue_on_error setting
+SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
+	this.settings.requeue_on_error = requeueOnError;
+	this.callFlash("SetRequeueOnError", [requeueOnError]);
 };
 
-/*
-	Event Queue.  Rather can call events directly from Flash they events are
-	are placed in a queue and then executed.  This ensures that each event is
-	executed in the order it was called which is not guarenteed when calling
-	setTimeout.  Out of order events was especially problematic in Safari.
-*/
-SWFUpload.prototype.executeNextEvent = function () {
-	var  f = this.eventQueue.shift();
-	if (typeof(f) === "function") {
-		f();
-	}
-}
-
-/* This is a chance to do something before the browse window opens */
-SWFUpload.prototype.fileDialogStart = function () {
-	var self = this;
-	if (typeof(self.fileDialogStart_handler) === "function") {
-		this.eventQueue[this.eventQueue.length] = function() { self.fileDialogStart_handler(); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	} else {
-		this.debug("fileDialogStart event not defined");
-	}
+// Public: setDebugEnabled changes the debug_enabled setting
+SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
+	this.settings.debug_enabled = debugEnabled;
+	this.callFlash("SetDebugEnabled", [debugEnabled]);
 };
 
 
-/* Called when a file is successfully added to the queue. */
-SWFUpload.prototype.fileQueued = function (file) {
-	var self = this;
-	if (typeof(self.fileQueued_handler) === "function") {
-		this.eventQueue[this.eventQueue.length] = function() { self.fileQueued_handler(file); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	} else {
-		this.debug("fileQueued event not defined");
-	}
-};
+/* *******************************
+	Flash Event Interfaces
+	These functions are used by Flash to trigger the various
+	events.
+	
+	All these functions a Private.
+	
+	Because the ExternalInterface library is buggy the event calls
+	are added to a queue and the queue then executed by a setTimeout.
+	This ensures that events are executed in a determinate order and that
+	the ExternalInterface bugs are avoided.
+******************************* */
 
-
-/* Handle errors that occur when an attempt to queue a file fails. */
-SWFUpload.prototype.fileQueueError = function (file, error_code, message) {
-	var self = this;
-	if (typeof(self.fileQueueError_handler) === "function") {
-		this.eventQueue[this.eventQueue.length] = function() {  self.fileQueueError_handler(file, error_code, message); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	} else {
-		this.debug("fileQueueError event not defined");
+SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+	
+	if (argumentArray == undefined) {
+		argumentArray = [];
+	} else if (!(argumentArray instanceof Array)) {
+		argumentArray = [argumentArray];
 	}
-};
-
-/* Called after the file dialog has closed and the selected files have been queued.
-	You could call startUpload here if you want the queued files to begin uploading immediately. */
-SWFUpload.prototype.fileDialogComplete = function (num_files_selected) {
-	var self = this;
-	if (typeof(self.fileDialogComplete_handler) === "function") {
-		this.eventQueue[this.eventQueue.length] = function() { self.fileDialogComplete_handler(num_files_selected); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	} else {
-		this.debug("fileDialogComplete event not defined");
-	}
-};
-
-/* Gets called when a file upload is about to be started.  Return true to continue the upload. Return false to stop the upload.
-	If you return false then uploadError and uploadComplete are called (like normal).
 	
-	This is a good place to do any file validation you need.
-	*/
-SWFUpload.prototype.uploadStart = function (file) {
 	var self = this;
-	if (typeof(self.fileDialogComplete_handler) === "function") {
-		this.eventQueue[this.eventQueue.length] = function() { self.returnUploadStart(self.uploadStart_handler(file)); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	} else {
-		this.debug("uploadStart event not defined");
+	if (typeof(this.settings[handlerName]) === "function") {
+		// Queue the event
+		this.eventQueue.push(function () {
+			this.settings[handlerName].apply(this, argumentArray);
+		});
+		
+		// Execute the next queued event
+		setTimeout(function () {
+			self.executeNextEvent();
+		}, 0);
+		
+	} else if (this.settings[handlerName] !== null) {
+		throw "Event handler " + handlerName + " is unknown or is not a function";
 	}
 };
 
-/* Note: Internal use only.  This function returns the result of uploadStart to
-	flash.  Since returning values in the normal way can result in Flash/JS circular
-	call issues we split up the call in a Timeout.  This is transparent from the API
-	point of view.
-*/
-SWFUpload.prototype.returnUploadStart = function (return_value) {
-	var movie_element = this.getMovieElement();
-	if (movie_element !== null && typeof(movie_element.ReturnUploadStart) === "function") {
-		try {
-			movie_element.ReturnUploadStart(return_value);
-		}
-		catch (ex) {
-			this.debug("Could not call ReturnUploadStart");
-		}
-	} else {
-		this.debug("Could not find Flash element in returnUploadStart");
-	}
-};
+// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
+// we must queue them in order to garentee that they are executed in order.
+SWFUpload.prototype.executeNextEvent = function () {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
 
-
-
-/* Called during upload as the file progresses. Use this event to update your UI. */
-SWFUpload.prototype.uploadProgress = function (file, bytes_complete, bytes_total) {
-	var self = this;
-	if (typeof(self.uploadProgress_handler) === "function") {
-		this.eventQueue[this.eventQueue.length] = function() { self.uploadProgress_handler(file, bytes_complete, bytes_total); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	} else {
-		this.debug("uploadProgress event not defined");
+	var  f = this.eventQueue ? this.eventQueue.shift() : null;
+	if (typeof(f) === "function") {
+		f.apply(this);
 	}
 };
 
-/* Called when an error occurs during an upload. Use error_code and the SWFUpload.UPLOAD_ERROR constants to determine
-   which error occurred. The uploadComplete event is called after an error code indicating that the next file is
-   ready for upload.  For files cancelled out of order the uploadComplete event will not be called. */
-SWFUpload.prototype.uploadError = function (file, error_code, message) {
-	var self = this;
-	if (typeof(this.uploadError_handler) === "function") {
-		this.eventQueue[this.eventQueue.length] = function() { self.uploadError_handler(file, error_code, message); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	} else {
-		this.debug("uploadError event not defined");
-	}
-};
+// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterfance cannot have
+// 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;
 
-/* This gets called when a file finishes uploading and the server-side upload script has completed and returned a 200
-status code. Any text returned by the server is available in server_data.
-**NOTE: The upload script MUST return some text or the uploadSuccess and uploadComplete events will not fire and the
-upload will become 'stuck'. */
-SWFUpload.prototype.uploadSuccess = function (file, server_data) {
-	var self = this;
-	if (typeof(self.uploadSuccess_handler) === "function") {
-		this.eventQueue[this.eventQueue.length] = function() { self.uploadSuccess_handler(file, server_data); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	} else {
-		this.debug("uploadSuccess event not defined");
-	}
-};
+	if (file != undefined) {
+		for (var 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)));
+				}
+				unescapedPost[uk] = file.post[k];
+			}
+		}
 
-/* uploadComplete is called when the file is uploaded or an error occurred and SWFUpload is ready to make the next upload.
-   If you want the next upload to start to automatically you can call startUpload() from this event. */
-SWFUpload.prototype.uploadComplete = function (file) {
-	var self = this;
-	if (typeof(self.uploadComplete_handler) === "function") {
-		this.eventQueue[this.eventQueue.length] = function() { self.uploadComplete_handler(file); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	} else {
-		this.debug("uploadComplete event not defined");
+		file.post = unescapedPost;
 	}
-};
 
-/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
-   internal debug console.  You can override this event and have messages written where you want. */
-SWFUpload.prototype.debug = function (message) {
-	var self = this;
-	if (typeof(self.debug_handler) === "function") {
-		this.eventQueue[this.eventQueue.length] = function() { self.debug_handler(message); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	} else {
-		this.eventQueue[this.eventQueue.length] = function() { self.debugMessage(message); };
-		setTimeout(function () { self.executeNextEvent();}, 0);
-	}
+	return file;
 };
 
-
-/* **********************************
-	Default Event Handlers.
-	These event handlers are used by default if an overriding handler is
-	not defined in the SWFUpload settings object.
-	
-	JS Note: even though these are defined on the SWFUpload object (rather than the prototype) they
-	are attached (read: copied) to a SWFUpload instance and 'this' is given the proper context.
-   ********************************** */
-
-/* This is a special event handler that has no override in the settings.  Flash calls this when it has
-   been loaded by the browser and is ready for interaction.  You should not override it.  If you need
-   to do something with SWFUpload has loaded then use the swfupload_loaded_handler setting.
-*/
-SWFUpload.flashReady = function () {
-	try {
-		this.debug("Flash called back and is ready.");
-
-		if (typeof(this.swfUploadLoaded_handler) === "function") {
-			this.swfUploadLoaded_handler();
-		}
-	} catch (ex) {
-		this.debug(ex);
+SWFUpload.prototype.flashReady = function () {
+	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
+	var movieElement = this.getMovieElement();
+	if (typeof(movieElement.StartUpload) !== "function") {
+		throw "ExternalInterface methods failed to initialize.";
 	}
+	
+	this.queueEvent("swfupload_loaded_handler");
 };
 
-/* This is a chance to something immediately after SWFUpload has loaded.
-   Like, hide the default/degraded upload form and display the SWFUpload form. */
-SWFUpload.swfUploadLoaded = function () {
-};
 
 /* This is a chance to do something before the browse window opens */
-SWFUpload.fileDialogStart = function () {
+SWFUpload.prototype.fileDialogStart = function () {
+	this.queueEvent("file_dialog_start_handler");
 };
 
 
 /* Called when a file is successfully added to the queue. */
-SWFUpload.fileQueued = function (file) {
+SWFUpload.prototype.fileQueued = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queued_handler", file);
 };
 
 
 /* Handle errors that occur when an attempt to queue a file fails. */
-SWFUpload.fileQueueError = function (file, error_code, message) {
-	try {
-		switch (error_code) {
-		case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
-			this.debug("Error Code: File too big, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
-			break;
-		case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
-			this.debug("Error Code: Zero Byte File, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
-			break;
-		case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED:
-			this.debug("Error Code: Upload limit reached, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
-			break;
-		case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
-			this.debug("Error Code: File extension is not allowed, Message: " + message);
-			break;
-		default:
-			this.debug("Error Code: Unhandled error occured. Errorcode: " + error_code);
-		}
-	} catch (ex) {
-		this.debug(ex);
-	}
+SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
 };
 
 /* Called after the file dialog has closed and the selected files have been queued.
 	You could call startUpload here if you want the queued files to begin uploading immediately. */
-SWFUpload.fileDialogComplete = function (num_files_selected) {
+SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued) {
+	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued]);
 };
 
-/* Gets called when a file upload is about to be started.  Return true to continue the upload. Return false to stop the upload.
-	If you return false then the uploadError callback is called and then uploadComplete (like normal).
+SWFUpload.prototype.uploadStart = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("return_upload_start_handler", file);
+};
+
+SWFUpload.prototype.returnUploadStart = function (file) {
+	var returnValue;
+	if (typeof(this.settings.upload_start_handler) === "function") {
+		file = this.unescapeFilePostParams(file);
+		returnValue = this.settings.upload_start_handler.call(this, file);
+	} else if (this.settings.upload_start_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;
+	}
 	
-	This is a good place to do any file validation you need.
+	returnValue = !!returnValue;
 	
-	This is the only function that cannot be called on a setTimeout because it must return a value to Flash.
-	You SHOULD NOT make any calls in to Flash (e.i, changing settings, getting stats, etc).  Flash Player bugs prevent
-	calls in to Flash from working reliably.
-*/
-SWFUpload.uploadStart = function (file) {
-	return true;
+	this.callFlash("ReturnUploadStart", [returnValue]);
 };
 
-// Called during upload as the file progresses
-SWFUpload.uploadProgress = function (file, bytes_complete, bytes_total) {
-	this.debug("File Progress: " + file.id + ", Bytes: " + bytes_complete + ". Total: " + bytes_total);
+
+
+SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
 };
 
-/* This gets called when a file finishes uploading and the upload script has completed and returned a 200 status code.	Any text returned by the
-server is available in server_data.	 The upload script must return some text or uploadSuccess will not fire (neither will uploadComplete). */
-SWFUpload.uploadSuccess = function (file, server_data) {
+SWFUpload.prototype.uploadError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_error_handler", [file, errorCode, message]);
 };
 
-/* This is called last.	 The file is uploaded or an error occurred and SWFUpload is ready to make the next upload.
-	If you want to automatically start the next file just call startUpload from here.
-*/
-SWFUpload.uploadComplete = function (file) {
+SWFUpload.prototype.uploadSuccess = function (file, serverData) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_success_handler", [file, serverData]);
 };
 
-// Called by SWFUpload JavaScript and Flash functions when debug is enabled.
-// Override this method in your settings to call your own debug message handler
-SWFUpload.debug = function (message) {
-	if (this.getSetting("debug_enabled")) {
-		this.debugMessage(message);
-	}
+SWFUpload.prototype.uploadComplete = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_complete_handler", file);
 };
 
-/* Called when an upload occurs during upload.  For HTTP errors 'message' will contain the HTTP STATUS CODE */
-SWFUpload.uploadError = function (file, error_code, message) {
-	try {
-		switch (errcode) {
-		case SWFUpload.UPLOAD_ERROR.SPECIFIED_FILE_ID_NOT_FOUND:
-			this.debug("Error Code: File ID specified for upload was not found, Message: " + msg);
-			break;
-		case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-			this.debug("Error Code: HTTP Error, File name: " + file.name + ", Message: " + msg);
-			break;
-		case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:
-			this.debug("Error Code: No backend file, File name: " + file.name + ", Message: " + msg);
-			break;
-		case SWFUpload.UPLOAD_ERROR.IO_ERROR:
-			this.debug("Error Code: IO Error, File name: " + file.name + ", Message: " + msg);
-			break;
-		case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
-			this.debug("Error Code: Security Error, File name: " + file.name + ", Message: " + msg);
-			break;
-		case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
-			this.debug("Error Code: Upload limit reached, File name: " + file.name + ", File size: " + file.size + ", Message: " + msg);
-			break;
-		case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
-			this.debug("Error Code: Upload Initialization exception, File name: " + file.name + ", File size: " + file.size + ", Message: " + msg);
-			break;
-		case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
-			this.debug("Error Code: uploadStart callback returned false, File name: " + file.name + ", File size: " + file.size + ", Message: " + msg);
-			break;
-		case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
-			this.debug("Error Code: The file upload was cancelled, File name: " + file.name + ", File size: " + file.size + ", Message: " + msg);
-			break;
-		case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
-			this.debug("Error Code: The file upload was stopped, File name: " + file.name + ", File size: " + file.size + ", Message: " + msg);
-			break;
-		default:
-			this.debug("Error Code: Unhandled error occured. Errorcode: " + errcode);
-		}
-	} catch (ex) {
-		this.debug(ex);
-	}
+/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
+   internal debug console.  You can override this event and have messages written where you want. */
+SWFUpload.prototype.debug = function (message) {
+	this.queueEvent("debug_handler", message);
 };
 
 
-
 /* **********************************
 	Debug Console
 	The debug console is a self contained, in page location
@@ -996,24 +694,32 @@
 
 	The console is automatically scrolled as messages appear.
 	
-	You can override this console (to use FireBug's console for instance) by setting the debug event method to your own function
-	that handles the debug message
-   ********************************** */
+	If you are using your own debug handler or when you deploy to production and
+	have debug disabled you can remove these functions to reduce the file size
+	and complexity.
+********************************** */
+   
+// Private: debugMessage is the default debug_handler.  If you want to print debug messages
+// 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 exception_message, exception_values;
+	if (this.settings.debug) {
+		var exceptionMessage, exceptionValues = [];
 
-	if (typeof(message) === "object" && typeof(message.name) === "string" && typeof(message.message) === "string") {
-		exception_message = "";
-		exception_values = [];
-		for (var key in message) {
-			exception_values.push(key + ": " + message[key]);
+		// 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) {
+				if (message.hasOwnProperty(key)) {
+					exceptionValues.push(key + ": " + message[key]);
+				}
+			}
+			exceptionMessage = exceptionValues.join("\n") || "";
+			exceptionValues = exceptionMessage.split("\n");
+			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
+			SWFUpload.Console.writeLine(exceptionMessage);
+		} else {
+			SWFUpload.Console.writeLine(message);
 		}
-		exception_message = exception_values.join("\n");
-		exception_values = exception_message.split("\n");
-		exception_message = "EXCEPTION: " + exception_values.join("\nEXCEPTION: ");
-		SWFUpload.Console.writeLine(exception_message);
-	} else {
-		SWFUpload.Console.writeLine(message);
 	}
 };
 

Modified: plog/trunk/js/ui/assets/upload/upload.css
===================================================================
--- plog/trunk/js/ui/assets/upload/upload.css	2008-06-15 11:20:03 UTC (rev 6555)
+++ plog/trunk/js/ui/assets/upload/upload.css	2008-06-16 09:45:48 UTC (rev 6556)
@@ -6,6 +6,7 @@
 	display: block;
 	height: 100px; 
 	overflow: auto;
+	position:relative;
 }
 
 .Lifetype_UI_QueueItem

Modified: plog/trunk/js/ui/upload.js
===================================================================
--- plog/trunk/js/ui/upload.js	2008-06-15 11:20:03 UTC (rev 6555)
+++ plog/trunk/js/ui/upload.js	2008-06-16 09:45:48 UTC (rev 6556)
@@ -63,7 +63,11 @@
 		swfupload_element_id : params.swfuploadElement,
 		degraded_element_id : params.degradedElement,
 
+		// SWFObject settings
+		minimum_flash_version : "9.0.28",
+
 		// UI settings
+		swfupload_pre_load_handler: Lifetype.UI.Upload.beforeShowUI,
 		swfupload_loaded_handler: Lifetype.UI.Upload.showUI,
 
 		// Debug settings
@@ -77,6 +81,9 @@
 	Lifetype.UI.Upload.params = params;
 	}
 
+Lifetype.UI.Upload.beforeShowUI = function() 
+{
+}
 /**
  * Render the UI
  */

Modified: plog/trunk/templates/admin/editblogtemplate.template
===================================================================
--- plog/trunk/templates/admin/editblogtemplate.template	2008-06-15 11:20:03 UTC (rev 6555)
+++ plog/trunk/templates/admin/editblogtemplate.template	2008-06-16 09:45:48 UTC (rev 6556)
@@ -4,6 +4,7 @@
 <link rel="stylesheet" href="js/ui/assets/upload/upload.css" type="text/css" />
 {js src="js/editor/lifetypeeditor.js"}
 {js src="js/swfupload/swfupload.js"}
+{js src="js/swfupload/plugins/swfupload.swfobject.js"}
 {js src="js/swfupload/plugins/swfupload.graceful_degradation.js"}
 {js src="js/swfupload/plugins/swfupload.queue.js"}
 {js src="js/ui/upload.js"}

Modified: plog/trunk/templates/admin/edittemplate.template
===================================================================
--- plog/trunk/templates/admin/edittemplate.template	2008-06-15 11:20:03 UTC (rev 6555)
+++ plog/trunk/templates/admin/edittemplate.template	2008-06-16 09:45:48 UTC (rev 6556)
@@ -4,6 +4,7 @@
 <link rel="stylesheet" href="js/ui/assets/upload/upload.css" type="text/css" />
 {js src="js/editor/lifetypeeditor.js"}
 {js src="js/swfupload/swfupload.js"}
+{js src="js/swfupload/plugins/swfupload.swfobject.js"}
 {js src="js/swfupload/plugins/swfupload.graceful_degradation.js"}
 {js src="js/swfupload/plugins/swfupload.queue.js"}
 {js src="js/ui/upload.js"}

Modified: plog/trunk/templates/admin/resources.template
===================================================================
--- plog/trunk/templates/admin/resources.template	2008-06-15 11:20:03 UTC (rev 6555)
+++ plog/trunk/templates/admin/resources.template	2008-06-16 09:45:48 UTC (rev 6556)
@@ -6,6 +6,7 @@
 {js src="js/ui/pages/resources.js"}
 {js src="js/ui/pages/resourcealbums.js"}
 {js src="js/swfupload/swfupload.js"}
+{js src="js/swfupload/plugins/swfupload.swfobject.js"}
 {js src="js/swfupload/plugins/swfupload.graceful_degradation.js"}
 {js src="js/swfupload/plugins/swfupload.queue.js"}
 {js src="js/ui/upload.js"}



More information about the pLog-svn mailing list