Changeset 8057 for trunk/wp-includes/js/swfupload

Timestamp:

06/06/08 07:34:30 (6 months ago)

Author:

ryan

Message:

Revert [8056], didn't quite work

Files:

• trunk/wp-includes/js/swfupload/plugins/swfupload.cookies.js (modified) (2 diffs)
• trunk/wp-includes/js/swfupload/plugins/swfupload.documentready.js (copied) (copied from trunk/wp-includes/js/swfupload/plugins/swfupload.documentready.js)
• 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 (deleted)
• 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
-
-I
-InitSettings.call(thi
+_i
+init_settings
+_i
+_initSettings.call(this, init_setting
-            }
-            
@@ -19 +19 @@
-    }(SWFUpload.prototype.initSettings);
-    
-
-
-
-
-
-
+
+
+
-        
-        // Get the post_params object
-Params = this.settings.post_params
+_params = this.getSetting("post_params")
-        
-        // Get the cookies
-Array = document.cookie.split(';'), caLength = cookieArray.length, c, eqI
- (i = 0; i < caL
-A
+_array = document.cookie.split(';'), ca_length = cookie_array.length, c, eq_i
+(i = 0; i < ca_l
+_a
-            
-            // Left Trim spaces
-=
+
-                c = c.substring(1, c.length);
-            }
-I
-I
-I
-Index + 
-P
+_i
+_i
+_i
+_index+
+_p
-            }
-        }
-        
-ToF
-P
+_to_f
+_p
-        }
-    };

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

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

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

@@ -3 +3 @@
-    
-    Features:
-
-
-
-
-
-
+
+
+
-        
-    */
@@ -16 +13 @@
-    SWFUpload.queue = {};
-    
-(function (oldI
-
-I
-InitSettings.call(thi
+function (old_i
+init_settings
+_i
+_initSettings.call(this, init_setting
-            }
-            
-            this.customSettings.queue_cancelled_flag = false;
-            this.customSettings.queue_upload_count = 0;
-            
-
-
-
-
+
+
-        };
-
-
-
-
-
-
+
-
-    SWFUpload.prototype.cancelQueue = function () {
-
-
+
+
+
+
+
+
-        
-
-
+
-            this.cancelUpload();
-            stats = this.getStats();
@@ -48 +40 @@
-    };
-    
-
-
-
-
-
-
-
-
+
+
+
-        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 @@
-/**
-1.0 by Jacob Roberts, Feb 2008, http://www.swfupload.org, http://swfupload.googlecode.com, http://www.swfupload.org
+0 by Jacob Roberts, Nov 2007, http://www.swfupload.org, http://linebyline.blogspot.com
- * -------- -------- -------- -------- -------- -------- -------- --------
-, 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.
- */
-
@@ -14 +21 @@
-/* *********** */
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    try {
-        this.customSettings = {};   // A container where developers can place their own settings associated with this instance.
-settings
+{}
-        this.eventQueue = [];
-        this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
@@ -30 +45 @@
-
-        // Load the settings.  Load the Flash movie.
-
+init_settings
-        this.loadFlash();
+
-        this.displayDebugInfo();
-
-   delete SWFUpload.instances[this.movieName];
-row ex
-
-;
+
+} catch (ex2) {
+is.debug(ex2)
+
+
-
-/* *************** */
-Members 
+thingies
-/* *************** */
-SWFUpload.instances = {};
-SWFUpload.movieCount = 0;
-SWFUpload.version = "2.1.0";
-SWFUpload.QUEUE_ERROR = {
-    QUEUE_LIMIT_EXCEEDED            : -100,
@@ -72 +87 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-
-
-
-
-
-
+
+
+
+
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    // Other settings
-
-
-
-
-
-
-
+
+
+
+
+
+
-SWFUpload.prototype.loadFlash = function () {
-targetE
+html, target_e
-
-    // 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"
+return false
-    }
-
-    // Get the body tag where we will be adding the flash movie
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-
-    // Append the container and load the flash
-    container = document.createElement("div");
-"1px"
-"1px"
-
-E
+this.getSetting("flash_width")
+this.getSetting("flash_height")
+
+_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)
-};
-
-Private: getFlashHTML generates the object tag
+Generates the embed/object tags
-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 () {
-his.movieElement == undefined
+ypeof(this.movieElement) === "undefined" || this.movieElement === null
-        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.displayDebugInfo = function () {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            } else {
-throw "Too many arguments"
+output += (prefix + key + ": " + object[key] + "\n")
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-/* *****************************
@@ -368 +330 @@
-   ***************************** */
-
-// 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
-
-
-
-
-
-
-
+
+