public/javascripts/swfupload/swfupload.queue.js in uploader-0.2.7 vs public/javascripts/swfupload/swfupload.queue.js in uploader-0.2.8
- old
+ new
@@ -14,13 +14,14 @@
var SWFUpload;
if (typeof(SWFUpload) === "function") {
SWFUpload.queue = {};
SWFUpload.prototype.initSettings = (function (oldInitSettings) {
- return function () {
+ return function (userSettings) {
+ userSettings = this.tmp_settings; // This fixes a bug where userSettings is undefined
if (typeof(oldInitSettings) === "function") {
- oldInitSettings.call(this);
+ oldInitSettings.call(this, userSettings);
}
this.queueSettings = {};
this.queueSettings.queue_cancelled_flag = false;
@@ -29,10 +30,10 @@
this.queueSettings.user_upload_complete_handler = this.settings.upload_complete_handler;
this.queueSettings.user_upload_start_handler = this.settings.upload_start_handler;
this.settings.upload_complete_handler = SWFUpload.queue.uploadCompleteHandler;
this.settings.upload_start_handler = SWFUpload.queue.uploadStartHandler;
- this.settings.queue_complete_handler = this.settings.queue_complete_handler || null;
+ this.settings.queue_complete_handler = userSettings.queue_complete_handler || null;
};
})(SWFUpload.prototype.initSettings);
SWFUpload.prototype.startUpload = function (fileID) {
this.queueSettings.queue_cancelled_flag = false;
\ No newline at end of file