Changeset 8056

Timestamp:

06/06/08 07:29:15 (6 months ago)

Author:

ryan

Message:

Update to swfupload 2.1.0

Files:

• trunk/wp-includes/js/swfupload/plugins/swfupload.cookies.js (modified) (2 diffs)
• trunk/wp-includes/js/swfupload/plugins/swfupload.documentready.js (deleted)
• trunk/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js (modified) (1 diff)
• trunk/wp-includes/js/swfupload/plugins/swfupload.queue.js (modified) (3 diffs)
• trunk/wp-includes/js/swfupload/plugins/swfupload.swfobject.js (added)
• trunk/wp-includes/js/swfupload/swfupload.js (modified) (8 diffs)
• trunk/wp-includes/js/swfupload/swfupload_f9.swf (modified) (previous)

trunk/wp-includes/js/swfupload/plugins/swfupload.cookies.js

@@ -9 +9 @@
-var SWFUpload;
-if (typeof(SWFUpload) === "function") {
-_i
-init_settings
-_i
-_initSettings.call(this, init_setting
+I
+
+I
+InitSettings.call(thi
-            }
-            
@@ -19 +19 @@
-    }(SWFUpload.prototype.initSettings);
-    
-
-
-
+
+
+
+
+
+
-        
-        // Get the post_params object
-_params = this.getSetting("post_params")
+Params = this.settings.post_params
-        
-        // Get the cookies
-_array = document.cookie.split(';'), ca_length = cookie_array.length, c, eq_i
-(i = 0; i < ca_l
-_a
+Array = document.cookie.split(';'), caLength = cookieArray.length, c, eqI
+ (i = 0; i < caL
+A
-            
-            // Left Trim spaces
-
+=
-                c = c.substring(1, c.length);
-            }
-_i
-_i
-_i
-_index+
-_p
+I
+I
+I
+Index + 
+P
-            }
-        }
-        
-_to_f
-_p
+ToF
+P
-        }
-    };

trunk/wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js

@@ -20 +20 @@
-if (typeof(SWFUpload) === "function") {
-    SWFUpload.gracefulDegradation = {};
-function (old_i
-init_settings
-_i
-_initSettings.call(this, init_setting
+(function (oldI
+
+I
+InitSettings.call(thi
-            }
-            
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
-        };
-
+)
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        } catch (ex) {
-            this.debug(ex);
-        }
-        
-
-
-
+
+
-        }
-    };

trunk/wp-includes/js/swfupload/plugins/swfupload.queue.js

@@ -3 +3 @@
-    
-    Features:
-
-
-
+
+
+
+
+
+
-        
-    */
@@ -13 +16 @@
-    SWFUpload.queue = {};
-    
-function (old_i
-init_settings
-_i
-_initSettings.call(this, init_setting
+(function (oldI
+
+I
+InitSettings.call(thi
-            }
-            
-            this.customSettings.queue_cancelled_flag = false;
+            this.customSettings.queue_upload_count = 0;
-            
-
-
+
+
+
+
-        };
-
+
+
+
+
+
+
-
-    SWFUpload.prototype.cancelQueue = function () {
+        this.customSettings.queue_cancelled_flag = true;
+        this.stopUpload();
+        
-        var stats = this.getStats();
-
-
-
-
-
-
-
+
-            this.cancelUpload();
-            stats = this.getStats();
@@ -40 +48 @@
-    };
-    
-
-
-
+
+
+
+
+
+
+
+
-        if (typeof(user_upload_complete_handler) === "function") {
-
+
+
+
-        }
-        
-_u
+U
-            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;
-            }
-        }

trunk/wp-includes/js/swfupload/swfupload.js

@@ -1 +1 @@
-/**
-0 by Jacob Roberts, Nov 2007, http://www.swfupload.org, http://linebyline.blogspot.com
+1.0 by Jacob Roberts, Feb 2008, http://www.swfupload.org, http://swfupload.googlecode.com, http://www.swfupload.org
- * -------- -------- -------- -------- -------- -------- -------- --------
- 
+, Olov Nilz�
- * 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.
- */
-
@@ -21 +14 @@
-/* *********** */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    try {
-        this.customSettings = {};   // A container where developers can place their own settings associated with this instance.
-{}
+settings
-        this.eventQueue = [];
-        this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
@@ -45 +30 @@
-
-        // Load the settings.  Load the Flash movie.
-init_settings
+
-        this.loadFlash();
-
-        this.displayDebugInfo();
-
-} catch (ex2) {
-is.debug(ex2)
-
-
+
+   delete SWFUpload.instances[this.movieName];
+row ex
+
+;
-
-/* *************** */
-thingies
+Members 
-/* *************** */
-SWFUpload.instances = {};
-SWFUpload.movieCount = 0;
+SWFUpload.version = "2.1.0";
-SWFUpload.QUEUE_ERROR = {
-    QUEUE_LIMIT_EXCEEDED            : -100,
@@ -87 +72 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    // Upload backend settings
-
-
-
-
+
+
+
+
+
+
-    // File Settings
-addSetting("file_types",              init_settings.file_types,               
-addSetting("file_types_description",  init_settings.file_types_description,   
-addSetting("file_size_limit",         init_settings.file_size_limit,          "1024");
-addSetting("file_upload_limit",       init_settings.file_upload_limit,        "0"
-addSetting("file_queue_limit",            init_settings.file_queue_limit,         "0"
+ensureDefault("file_types", 
+ensureDefault("file_types_description", 
+ensureDefault("file_size_limit", 0);  // Default zero means "unlimited"
+ensureDefault("file_upload_limit", 0
+ensureDefault("file_queue_limit", 0
-
-    // Flash Settings
-
-
-
-
+
+
-
-    // Debug Settings
-
-
+
+
+
-    // Event Handlers
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // Other settings
-
-
-
-
-
-
+
+
+
+
+
+
+
-SWFUpload.prototype.loadFlash = function () {
-html, target_e
+targetE
-
-    // 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
-
-
-
-
-
-
-
-
+
+
+
+
-    }
-
-    // Append the container and load the flash
-    container = document.createElement("div");
-this.getSetting("flash_width")
-this.getSetting("flash_height")
-
-_e
+"1px"
+"1px"
+
+E
-    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
+Private: getFlashHTML generates the object tag
-SWFUpload.prototype.getFlashHTML = function () {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-SWFUpload.prototype.getFlashVars = function () {
-    // Build a string from the post param object
-_s
+S
-
-    // Build the parameter string
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-SWFUpload.prototype.getMovieElement = function () {
-ypeof(this.movieElement) === "undefined" || this.movieElement === null
+his.movieElement == undefined
-        this.movieElement = document.getElementById(this.movieName);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    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&name=value"
-SWFUpload.prototype.buildParamString = function () {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-SWFUpload.prototype.addSetting = function (name, value, default_value) {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-SWFUpload.prototype.getSetting = function (name) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            } 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";
-        }
-
-
-
-
+
+
+
+
+
-
-/* *****************************
@@ -330 +368 @@
-   ***************************** */
-
+// Public: selectFile causes a File Selection Dialog window to appear.  This
+// dialog only allows 1 file to be selected.
-SWFUpload.prototype.selectFile = function () {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-SWFUpload.prototype.selectFiles = function () {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-};
-
-/* Cancels a the file upload.  You must specify a file_id */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-SWFUpload.prototype.stopUpload = function () {
-
-
-
-
-
-
-
-
-
-
-
-
+
-};
-
-/* ************************
- * Settings methods
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+