From 53599756a1c5e119aca4bbb69b00d209f66b6e5e Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Wed, 7 Mar 2018 11:45:49 +0900 Subject: [PATCH] Fix inconsistent use of 'data' variable in jquery.fileUpload integration script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 공통으로 사용하는 data 변수를 이벤트 핸들러 파라미터 이름으로도 사용하여 특정 상황에서 스크립트 에러가 발생하는 문제를 수정함. 다른 이벤트 핸들러에서도 혼동의 여지가 없도록 변수명을 다르게 지정함. --- .../js/plugins/jquery.fileupload/js/main.js | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/common/js/plugins/jquery.fileupload/js/main.js b/common/js/plugins/jquery.fileupload/js/main.js index f8a792c3a..3e621a6f7 100644 --- a/common/js/plugins/jquery.fileupload/js/main.js +++ b/common/js/plugins/jquery.fileupload/js/main.js @@ -75,10 +75,10 @@ url: request_uri, formData: defaultFormData, dropZone: $container, - add: function(e, d) { + add: function(e, item) { var dfd = jQuery.Deferred(); - $.each(d.files, function(index, file) { + $.each(item.files, function(index, file) { if(data.settings.maxFileSize > 0 && data.settings.maxFileSize < file.size) { dfd.reject(); alert(window.xe.msg_exceeds_limit_size); @@ -88,15 +88,15 @@ }); dfd.done(function(){ - d.submit(); + item.submit(); }); }, - submit: function(e, data) { - data.formData = defaultFormData; - data.formData.nonce = "T" + new Date().getTime() + "." + Math.random(); + submit: function(e, item) { + item.formData = defaultFormData; + item.formData.nonce = "T" + new Date().getTime() + "." + Math.random(); chunkStatus = true; }, - chunksend: function(e, data) { + chunksend: function(e, res) { if (!chunkStatus) { return false; } @@ -116,9 +116,9 @@ return chunkStatus = false; } }, - chunkfail: function(e, data) { + chunkfail: function(e, res) { if (chunkStatus) { - alert(window.xe.msg_file_upload_error + " (Type 3)" + "
\n" + data.errorThrown + "
\n" + data.textStatus); + alert(window.xe.msg_file_upload_error + " (Type 3)" + "
\n" + res.errorThrown + "
\n" + res.textStatus); return chunkStatus = false; } }, @@ -158,11 +158,11 @@ return false; } }, - fail: function(e, data) { + fail: function(e, res) { data.settings.progressbar.delay(1000).slideUp(); data.settings.progressStatus.delay(1000).slideUp(); if (chunkStatus) { - alert(window.xe.msg_file_upload_error + " (Type 7)" + "
\n" + data.errorThrown + "
\n" + data.textStatus); + alert(window.xe.msg_file_upload_error + " (Type 7)" + "
\n" + res.errorThrown + "
\n" + res.textStatus); return false; } }, @@ -174,8 +174,8 @@ data.settings.progressStatus.show(); data.settings.progressbar.show(); }, - progressall: function (e, d) { - var progress = Math.round(d.loaded / d.total * 999) / 10; + progressall: function (e, res) { + var progress = Math.round(res.loaded / res.total * 999) / 10; data.settings.progressbarGraph.width(progress+'%'); data.settings.progressPercent.text(progress+'%'); }