public/flash/swfupload.swf
public/images/TestImageNoText_65x29.png
@@ -1,7 +1,7 @@
swfupload-rails-authentication
==============================
-Demo Rails 2.1 app showing SWFUpload working in tandem with restful-authentication, CSRF protection and attachment_fu.
+Demo Rails 2.1.2 app showing SWFUpload working in tandem with restful-authentication, CSRF protection and attachment_fu.
Requirements
README
@@ -6,12 +6,25 @@
window.onload = function () {
swfu = new SWFUpload({
upload_url : '<%= assets_path -%>?_swfupload_demo_session=<%= u session.session_id %>',
- flash_url : '/flash/swfupload_f9.swf',
+ flash_url : '/flash/swfupload.swf',
+
+ // Button settings
+ button_image_url: "/images/TestImageNoText_65x29.png", // Relative to the Flash file
+ button_width: "65",
+ button_height: "29",
+ button_placeholder_id: "spanButtonPlaceHolder",
+ button_text: '<span class="theFont">Hello</span>',
+ button_text_style: ".theFont { font-size: 16; }",
+ button_text_left_padding: 12,
+ button_text_top_padding: 3,
file_size_limit : '10000',
file_types : '*.jpg',
file_types_description : 'JPG Images',
file_upload_limit : '0',
+ custom_settings : {
+ progressTarget : "fsUploadProgress"
+ },
file_queue_error_handler : fileQueueError,
file_dialog_complete_handler : fileDialogComplete,
@@ -39,9 +52,10 @@
<% form_for(@asset) do |f| %>
<fieldset>
- <button id="btnBrowse" type="button" style="padding: 5px;" onclick="swfu.selectFiles(); this.blur();">
- Select Files <span style="font-size: 7pt;">(5 MB Max)</span>
- </button>
+ <div id="divStatus">0 Files Uploaded</div>
+ <div>
+ <span id="spanButtonPlaceHolder"></span>
+ </div>
</fieldset>
<% end %>
app/views/assets/new.html.erb
@@ -5,7 +5,7 @@
# ENV['RAILS_ENV'] ||= 'production'
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.1.2' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
config/environment.rb
@@ -1,21 +1,27 @@
/**
- * 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, Olov Nilzén and Mammon Media and is released under the MIT License:
+ * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+ *
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/, http://www.vinterwebb.se/
+ *
+ * SWFUpload is (c) 2006-2007 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
+ * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
*
*/
-/* *********** */
-/* Constructor */
-/* *********** */
+/* ******************* */
+/* Constructor & Init */
+/* ******************* */
+var SWFUpload;
-var SWFUpload = function (settings) {
- this.initSWFUpload(settings);
-};
+if (SWFUpload == undefined) {
+ SWFUpload = function (settings) {
+ this.initSWFUpload(settings);
+ };
+}
SWFUpload.prototype.initSWFUpload = function (settings) {
try {
@@ -43,7 +49,7 @@ SWFUpload.prototype.initSWFUpload = function (settings) {
/* *************** */
SWFUpload.instances = {};
SWFUpload.movieCount = 0;
-SWFUpload.version = "2.1.0";
+SWFUpload.version = "2.2.0 Beta 2";
SWFUpload.QUEUE_ERROR = {
QUEUE_LIMIT_EXCEEDED : -100,
FILE_EXCEEDS_SIZE_LIMIT : -110,
@@ -69,7 +75,20 @@ SWFUpload.FILE_STATUS = {
COMPLETE : -4,
CANCELLED : -5
};
-
+SWFUpload.BUTTON_ACTION = {
+ SELECT_FILE : -100,
+ SELECT_FILES : -110,
+ START_UPLOAD : -120
+};
+SWFUpload.CURSOR = {
+ ARROW : -1,
+ HAND : -2
+};
+SWFUpload.WINDOW_MODE = {
+ WINDOW : "window",
+ TRANSPARENT : "transparent",
+ OPAQUE : "opaque"
+};
/* ******************** */
/* Instance Members */
@@ -88,6 +107,7 @@ SWFUpload.prototype.initSettings = function () {
this.ensureDefault("post_params", {});
this.ensureDefault("use_query_string", false);
this.ensureDefault("requeue_on_error", false);
+ this.ensureDefault("http_success", []);
// File Settings
this.ensureDefault("file_types", "*.*");
@@ -97,9 +117,23 @@ SWFUpload.prototype.initSettings = function () {
this.ensureDefault("file_queue_limit", 0);
// Flash Settings
- this.ensureDefault("flash_url", "swfupload_f9.swf");
- this.ensureDefault("flash_color", "#FFFFFF");
-
+ this.ensureDefault("flash_url", "swfupload.swf");
+ this.ensureDefault("prevent_swf_caching", true);
+
+ // Button Settings
+ this.ensureDefault("button_image_url", "");
+ this.ensureDefault("button_width", 1);
+ this.ensureDefault("button_height", 1);
+ this.ensureDefault("button_text", "");
+ this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+ this.ensureDefault("button_text_top_padding", 0);
+ this.ensureDefault("button_text_left_padding", 0);
+ this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+ this.ensureDefault("button_disabled", false);
+ this.ensureDefault("button_placeholder_id", null);
+ this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+ this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+
// Debug Settings
this.ensureDefault("debug", false);
this.settings.debug_enabled = this.settings.debug; // Here to maintain v2 API
@@ -125,12 +159,25 @@ SWFUpload.prototype.initSettings = function () {
// Other settings
this.customSettings = this.settings.custom_settings;
+ // Update the flash url if needed
+ if (this.settings.prevent_swf_caching) {
+ this.settings.flash_url = this.settings.flash_url + "?swfuploadrnd=" + Math.floor(Math.random() * 999999999);
+ }
+
delete this.ensureDefault;
};
-// Private: loadFlash generates the HTML tag for the Flash
-// It then adds the flash to the body
SWFUpload.prototype.loadFlash = function () {
+ if (this.settings.button_placeholder_id !== "") {
+ this.replaceWithFlash();
+ } else {
+ this.appendFlash();
+ }
+};
+
+// Private: appendFlash gets the HTML tag for the Flash
+// It then appends the flash to the body
+SWFUpload.prototype.appendFlash = function () {
var targetElement, container;
// Make sure an element with the ID we are going to use doesn't already exist
@@ -149,17 +196,41 @@ SWFUpload.prototype.loadFlash = function () {
container = document.createElement("div");
container.style.width = "1px";
container.style.height = "1px";
+ container.style.overflow = "hidden";
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)
};
+// Private: replaceWithFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.replaceWithFlash = function () {
+ var targetElement, tempParent;
+
+ // Make sure an element with the ID we are going to use doesn't already exist
+ if (document.getElementById(this.movieName) !== null) {
+ throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
+ }
+
+ // Get the element where we will be placing the flash movie
+ targetElement = document.getElementById(this.settings.button_placeholder_id);
+
+ if (targetElement == undefined) {
+ throw "Could not find the placeholder element.";
+ }
+
+ // Append the container and load the flash
+ tempParent = document.createElement("div");
+ tempParent.innerHTML = this.getFlashHTML(); // Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+ targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+
+};
+
// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
SWFUpload.prototype.getFlashHTML = function () {
// 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;">',
+ return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+ '<param name="wmode" value="', this.settings.button_window_mode , '" />',
'<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" />',
@@ -172,12 +243,14 @@ SWFUpload.prototype.getFlashHTML = function () {
SWFUpload.prototype.getFlashVars = function () {
// Build a string from the post param object
var paramString = this.buildParamString();
-
+ var httpSuccessString = this.settings.http_success.join(",");
+
// Build the parameter string
return ["movieName=", encodeURIComponent(this.movieName),
"&uploadURL=", encodeURIComponent(this.settings.upload_url),
"&useQueryString=", encodeURIComponent(this.settings.use_query_string),
"&requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+ "&httpSuccess=", encodeURIComponent(httpSuccessString),
"&params=", encodeURIComponent(paramString),
"&filePostName=", encodeURIComponent(this.settings.file_post_name),
"&fileTypes=", encodeURIComponent(this.settings.file_types),
@@ -185,7 +258,18 @@ SWFUpload.prototype.getFlashVars = function () {
"&fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
"&fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
"&fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
- "&debugEnabled=", encodeURIComponent(this.settings.debug_enabled)].join("");
+ "&debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+ "&buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+ "&buttonWidth=", encodeURIComponent(this.settings.button_width),
+ "&buttonHeight=", encodeURIComponent(this.settings.button_height),
+ "&buttonText=", encodeURIComponent(this.settings.button_text),
+ "&buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+ "&buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+ "&buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+ "&buttonAction=", encodeURIComponent(this.settings.button_action),
+ "&buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+ "&buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+ ].join("");
};
// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
@@ -205,7 +289,7 @@ SWFUpload.prototype.getMovieElement = function () {
// Private: buildParamString takes the name/value pairs in the post_params setting object
// and joins them up in to a string formatted "name=value&name=value"
SWFUpload.prototype.buildParamString = function () {
- var postParams = this.settings.post_params;
+ var postParams = this.settings.post_params;
var paramStringPairs = [];
if (typeof(postParams) === "object") {
@@ -234,11 +318,11 @@ SWFUpload.prototype.destroy = function () {
} catch (ex) {
}
- if (movieElement != undefined && movieElement.parentNode != undefined && typeof(movieElement.parentNode.removeChild) === "function") {
+ 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") {
+ if (container.parentNode != undefined && typeof container.parentNode.removeChild === "function") {
container.parentNode.removeChild(container);
}
}
@@ -254,6 +338,8 @@ SWFUpload.prototype.destroy = function () {
delete this.eventQueue;
delete this.movieName;
+ delete window[this.movieName];
+
return true;
} catch (ex1) {
return false;
@@ -271,30 +357,45 @@ SWFUpload.prototype.displayDebugInfo = function () {
"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",
+ "\t", "upload_url: ", this.settings.upload_url, "\n",
+ "\t", "flash_url: ", this.settings.flash_url, "\n",
+ "\t", "use_query_string: ", this.settings.use_query_string.toString(), "\n",
+ "\t", "requeue_on_error: ", this.settings.requeue_on_error.toString(), "\n",
+ "\t", "http_success: ", this.settings.http_success.join(", "), "\n",
+ "\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", "debug: ", this.settings.debug.toString(), "\n",
+
+ "\t", "prevent_swf_caching: ", this.settings.prevent_swf_caching.toString(), "\n",
+
+ "\t", "button_placeholder_id: ", this.settings.button_placeholder_id.toString(), "\n",
+ "\t", "button_image_url: ", this.settings.button_image_url.toString(), "\n",
+ "\t", "button_width: ", this.settings.button_width.toString(), "\n",
+ "\t", "button_height: ", this.settings.button_height.toString(), "\n",
+ "\t", "button_text: ", this.settings.button_text.toString(), "\n",
+ "\t", "button_text_style: ", this.settings.button_text_style.toString(), "\n",
+ "\t", "button_text_top_padding: ", this.settings.button_text_top_padding.toString(), "\n",
+ "\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+ "\t", "button_action: ", this.settings.button_action.toString(), "\n",
+ "\t", "button_disabled: ", this.settings.button_disabled.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"
+ "\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("")
);
};
@@ -328,36 +429,32 @@ SWFUpload.prototype.getSetting = function (name) {
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 {
- throw "Too many arguments";
- }
-
- // Unescape file post param values
- if (returnValue != undefined && typeof(returnValue.post) === "object") {
- returnValue = self.unescapeFilePostParams(returnValue);
- }
-
- return returnValue;
+ var movieElement = this.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 {
- throw "Invalid function name";
+ throw "Too many arguments";
}
- };
-
- return callFunction();
+
+ // Unescape file post param values
+ if (returnValue != undefined && typeof returnValue.post === "object") {
+ returnValue = this.unescapeFilePostParams(returnValue);
+ }
+
+ return returnValue;
+ } else {
+ throw "Invalid function name: " + functionName;
+ }
};
@@ -368,7 +465,7 @@ SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
***************************** */
// Public: selectFile causes a File Selection Dialog window to appear. This
-// dialog only allows 1 file to be selected.
+// dialog only allows 1 file to be selected. WARNING: this function does not work in Flash Player 10
SWFUpload.prototype.selectFile = function () {
this.callFlash("SelectFile");
};
@@ -377,7 +474,7 @@ SWFUpload.prototype.selectFile = function () {
// 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.
+// for this bug. WARNING: this function does not work in Flash Player 10
SWFUpload.prototype.selectFiles = function () {
this.callFlash("SelectFiles");
};
@@ -389,11 +486,11 @@ SWFUpload.prototype.startUpload = function (fileID) {
this.callFlash("StartUpload", [fileID]);
};
-/* Cancels a the file upload. You must specify a file_id */
-// Public: cancelUpload cancels any queued file. The fileID parameter
-// must be specified.
-SWFUpload.prototype.cancelUpload = function (fileID) {
- this.callFlash("CancelUpload", [fileID]);
+// Public: cancelUpload cancels any queued file. The fileID parameter may be the file ID or index.
+// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
+// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
+SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
+ this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
};
// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
@@ -513,12 +610,79 @@ SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
this.callFlash("SetRequeueOnError", [requeueOnError]);
};
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
+ if (typeof http_status_codes === "string") {
+ http_status_codes = http_status_codes.replace(" ", "").split(",");
+ }
+
+ this.settings.http_success = http_status_codes;
+ this.callFlash("SetHTTPSuccess", [http_status_codes]);
+};
+
+
// Public: setDebugEnabled changes the debug_enabled setting
SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
this.settings.debug_enabled = debugEnabled;
this.callFlash("SetDebugEnabled", [debugEnabled]);
};
+// Public: setButtonImageURL loads a button image sprite
+SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
+ if (buttonImageURL == undefined) {
+ buttonImageURL = "";
+ }
+
+ this.settings.button_image_url = buttonImageURL;
+ this.callFlash("SetButtonImageURL", [buttonImageURL]);
+};
+
+// Public: setButtonDimensions resizes the Flash Movie and button
+SWFUpload.prototype.setButtonDimensions = function (width, height) {
+ this.settings.button_width = width;
+ this.settings.button_height = height;
+
+ var movie = this.getMovieElement();
+ if (movie != undefined) {
+ movie.style.width = width + "px";
+ movie.style.height = height + "px";
+ }
+
+ this.callFlash("SetButtonDimensions", [width, height]);
+};
+// Public: setButtonText Changes the text overlaid on the button
+SWFUpload.prototype.setButtonText = function (html) {
+ this.settings.button_text = html;
+ this.callFlash("SetButtonText", [html]);
+};
+// Public: setButtonTextPadding changes the top and left padding of the text overlay
+SWFUpload.prototype.setButtonTextPadding = function (left, top) {
+ this.settings.button_text_top_padding = top;
+ this.settings.button_text_left_padding = left;
+ this.callFlash("SetButtonTextPadding", [left, top]);
+};
+
+// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
+SWFUpload.prototype.setButtonTextStyle = function (css) {
+ this.settings.button_text_style = css;
+ this.callFlash("SetButtonTextStyle", [css]);
+};
+// Public: setButtonDisabled disables/enables the button
+SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
+ this.settings.button_disabled = isDisabled;
+ this.callFlash("SetButtonDisabled", [isDisabled]);
+};
+// Public: setButtonAction sets the action that occurs when the button is clicked
+SWFUpload.prototype.setButtonAction = function (buttonAction) {
+ this.settings.button_action = buttonAction;
+ this.callFlash("SetButtonAction", [buttonAction]);
+};
+
+// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
+SWFUpload.prototype.setButtonCursor = function (cursor) {
+ this.settings.button_cursor = cursor;
+ this.callFlash("SetButtonCursor", [cursor]);
+};
/* *******************************
Flash Event Interfaces
@@ -543,7 +707,7 @@ SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
}
var self = this;
- if (typeof(this.settings[handlerName]) === "function") {
+ if (typeof this.settings[handlerName] === "function") {
// Queue the event
this.eventQueue.push(function () {
this.settings[handlerName].apply(this, argumentArray);
@@ -570,7 +734,7 @@ SWFUpload.prototype.executeNextEvent = function () {
}
};
-// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterfance cannot have
+// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface 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) {
@@ -584,7 +748,7 @@ SWFUpload.prototype.unescapeFilePostParams = function (file) {
uk = k;
var match;
while ((match = reg.exec(uk)) !== null) {
- uk = uk.replace(match[0], String.fromCharCode(parseInt("0x"+match[1], 16)));
+ uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
}
unescapedPost[uk] = file.post[k];
}
@@ -599,9 +763,14 @@ SWFUpload.prototype.unescapeFilePostParams = function (file) {
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") {
+ if (typeof movieElement.StartUpload !== "function") {
throw "ExternalInterface methods failed to initialize.";
}
+
+ // Fix IE Flash/Form bug
+ if (window[this.movieName] == undefined) {
+ window[this.movieName] = movieElement;
+ }
this.queueEvent("swfupload_loaded_handler");
};
@@ -639,7 +808,7 @@ SWFUpload.prototype.uploadStart = function (file) {
SWFUpload.prototype.returnUploadStart = function (file) {
var returnValue;
- if (typeof(this.settings.upload_start_handler) === "function") {
+ 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) {
@@ -707,7 +876,7 @@ SWFUpload.prototype.debugMessage = function (message) {
var exceptionMessage, exceptionValues = [];
// Check for an exception object and print it nicely
- if (typeof(message) === "object" && typeof(message.name) === "string" && typeof(message.message) === "string") {
+ 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]);
public/javascripts/swfupload.js
@@ -84,7 +84,7 @@
white-space: nowrap;
}
-a.progressCancel {
+/*a.progressCancel {
font-size: 0;
display: block;
height: 14px;
@@ -97,4 +97,57 @@ a.progressCancel {
a.progressCancel:hover {
background-position: 0px 0px;
+}*/
+
+div.fieldset {
+ border: 1px solid #afe14c;
+ margin: 10px 0;
+ padding: 20px 10px;
+}
+div.fieldset span.legend {
+ position: relative;
+ background-color: #FFF;
+ padding: 3px;
+ top: -30px;
+ font: 700 14px Arial, Helvetica, sans-serif;
+ color: #73b304;
+}
+
+div.flash {
+ width: 375px;
+ margin: 10px 5px;
+ border-color: #D9E4FF;
+
+ -moz-border-radius-topleft : 5px;
+ -webkit-border-top-left-radius : 5px;
+ -moz-border-radius-topright : 5px;
+ -webkit-border-top-right-radius : 5px;
+ -moz-border-radius-bottomleft : 5px;
+ -webkit-border-bottom-left-radius : 5px;
+ -moz-border-radius-bottomright : 5px;
+ -webkit-border-bottom-right-radius : 5px;
+
+}
+
+button,
+input,
+select,
+textarea {
+ border-width: 1px;
+ margin-bottom: 10px;
+ padding: 2px 3px;
}
+
+
+
+input[disabled]{ border: 1px solid #ccc } /* FF 2 Fix */
+
+
+label {
+ width: 150px;
+ text-align: right;
+ display:block;
+ margin-right: 5px;
+}
+
+#btnSubmit { margin: 0 0 0 155px ; }
\ No newline at end of file
public/stylesheets/swfupload.css
log/development.log
public/.DS_Store
public/flash/swfupload_f9.swf
6f60bd52557f850f272c3635ed940672de5173a8
Cameron Yule
cameron@cameronyule.com
http://github.com/cameronyule/swfupload-rails-authentication/commit/8e309c7e2c7ca045490e448d9cd06301ef80e0af
8e309c7e2c7ca045490e448d9cd06301ef80e0af
2008-10-30T04:58:18-07:00
2008-10-30T04:58:18-07:00
Updating to SWFUpload v2.2.0 Beta 2 and Rails 2.1.2
4337208e37364d3ac0f9bfe36739084618c478d7
Cameron Yule
cameron@cameronyule.com