Mercurial > hg > soundsoftware-site
comparison public/javascripts/attachments.js @ 1516:b450a9d58aed redmine-2.4
Update to Redmine SVN revision 13356 on 2.4-stable branch
author | Chris Cannam |
---|---|
date | Tue, 09 Sep 2014 09:28:31 +0100 |
parents | e248c7af89ec |
children |
comparison
equal
deleted
inserted
replaced
1494:e248c7af89ec | 1516:b450a9d58aed |
---|---|
97 } | 97 } |
98 | 98 |
99 return $.ajax(uploadUrl, { | 99 return $.ajax(uploadUrl, { |
100 type: 'POST', | 100 type: 'POST', |
101 contentType: 'application/octet-stream', | 101 contentType: 'application/octet-stream', |
102 beforeSend: function(jqXhr) { | 102 beforeSend: function(jqXhr, settings) { |
103 jqXhr.setRequestHeader('Accept', 'application/js'); | 103 jqXhr.setRequestHeader('Accept', 'application/js'); |
104 // attach proper File object | |
105 settings.data = blob; | |
104 }, | 106 }, |
105 xhr: function() { | 107 xhr: function() { |
106 var xhr = $.ajaxSettings.xhr(); | 108 var xhr = $.ajaxSettings.xhr(); |
107 xhr.upload.onloadstart = actualOptions.loadstartEventHandler; | 109 xhr.upload.onloadstart = actualOptions.loadstartEventHandler; |
108 xhr.upload.onprogress = actualOptions.progressEventHandler; | 110 xhr.upload.onprogress = actualOptions.progressEventHandler; |
129 if (attachmentId) { | 131 if (attachmentId) { |
130 $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]', style: 'display:none;' }).appendTo('#attachments_' + attachmentId); | 132 $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]', style: 'display:none;' }).appendTo('#attachments_' + attachmentId); |
131 } | 133 } |
132 } | 134 } |
133 | 135 |
134 clearedFileInput.insertAfter('#attachments_fields'); | 136 clearedFileInput.insertAfter('#attachments_fields').on('change', function(){addInputFiles(this);}); |
135 } | 137 } |
136 | 138 |
137 function uploadAndAttachFiles(files, inputEl) { | 139 function uploadAndAttachFiles(files, inputEl) { |
138 | 140 |
139 var maxFileSize = $(inputEl).data('max-file-size'); | 141 var maxFileSize = $(inputEl).data('max-file-size'); |