##// END OF EJS Templates
jro_apps » redmine
RSS
Save the selected file just in case uploading stuff fails/is not supported....
Jean-Philippe Lang -
r10781:39e7bab2b9ae
parent child
Show More
Side by Side Unified
Context file:
r10781:39e7bab2b9ae Loading diff...:

The requested changes are too big and content was truncated. Show full diff

Show file before | Show file after | Hide comments
@@ -1,30 +1,31
1 1 <span id="attachments_fields">
2 2 <% if defined?(container) && container && container.saved_attachments %>
3 3 <% container.saved_attachments.each_with_index do |attachment, i| %>
4 4 <span id="attachments_p<%= i %>">
5 5 <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename') +
6 6 text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description') +
7 7 link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
8 8 <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
9 9 </span>
10 10 <% end %>
11 11 <% end %>
12 12 </span>
13 13 <span class="add_attachment">
14 <%= file_field_tag 'attachments_files',
14 <%= file_field_tag 'attachments[dummy][file]',
15 15 :id => nil,
16 :class => 'file_selector',
16 17 :multiple => true,
17 18 :onchange => 'addInputFiles(this);',
18 19 :data => {
19 20 :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
20 21 :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
21 22 :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
22 23 :upload_path => uploads_path(:format => 'js'),
23 24 :description_placeholder => l(:label_optional_description)
24 25 } %>
25 26 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
26 27 </span>
27 28
28 29 <% content_for :header_tags do %>
29 30 <%= javascript_include_tag 'attachments' %>
30 31 <% end %>
Show file before | Show file after | Hide comments
@@ -1,189 +1,188
1 1 /* Redmine - project management software
2 2 Copyright (C) 2006-2012 Jean-Philippe Lang */
3 3
4 4 function addFile(inputEl, file, eagerUpload) {
5 5
6 6 if ($('#attachments_fields').children().length < 10) {
7 7
8 8 var attachmentId = addFile.nextAttachmentId++;
9 9
10 10 var fileSpan = $('<span>', { id: 'attachments_' + attachmentId });
11 11
12 12 fileSpan.append(
13 13 $('<input>', { type: 'text', 'class': 'filename readonly', name: 'attachments[' + attachmentId + '][filename]', readonly: 'readonly'} ).val(file.name),
14 14 $('<input>', { type: 'text', 'class': 'description', name: 'attachments[' + attachmentId + '][description]', maxlength: 255, placeholder: $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload),
15 15 $('<a>&nbsp</a>').attr({ href: "#", 'class': 'remove-upload' }).click(removeFile).toggle(!eagerUpload)
16 16 ).appendTo('#attachments_fields');
17 17
18 18 if(eagerUpload) {
19 19 ajaxUpload(file, attachmentId, fileSpan, inputEl);
20 20 }
21 21
22 22 return attachmentId;
23 23 }
24 24 return null;
25 25 }
26 26
27 27 addFile.nextAttachmentId = 1;
28 28
29 29 function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
30 30
31 31 function onLoadstart(e) {
32 32 fileSpan.removeClass('ajax-waiting');
33 33 fileSpan.addClass('ajax-loading');
34 34 $('input:submit', $(this).parents('form')).attr('disabled', 'disabled');
35 35 }
36 36
37 37 function onProgress(e) {
38 38 if(e.lengthComputable) {
39 39 this.progressbar( 'value', e.loaded * 100 / e.total );
40 40 }
41 41 }
42 42
43 43 function actualUpload(file, attachmentId, fileSpan, inputEl) {
44 44
45 45 ajaxUpload.uploading++;
46 46
47 47 uploadBlob(file, $(inputEl).data('upload-path'), attachmentId, {
48 48 loadstartEventHandler: onLoadstart.bind(progressSpan),
49 49 progressEventHandler: onProgress.bind(progressSpan)
50 50 })
51 51 .done(function(result) {
52 52 progressSpan.progressbar( 'value', 100 ).remove();
53 53 fileSpan.find('input.description, a').css('display', 'inline-block');
54 54 })
55 55 .fail(function(result) {
56 56 progressSpan.text(result.statusText);
57 57 }).always(function() {
58 58 ajaxUpload.uploading--;
59 59 fileSpan.removeClass('ajax-loading');
60 60 var form = fileSpan.parents('form');
61 61 if (form.queue('upload').length == 0 && ajaxUpload.uploading == 0) {
62 62 $('input:submit', form).removeAttr('disabled');
63 63 }
64 64 form.dequeue('upload');
65 65 });
66 66 }
67 67
68 68 var progressSpan = $('<div>').insertAfter(fileSpan.find('input.filename'));
69 69 progressSpan.progressbar();
70 70 fileSpan.addClass('ajax-waiting');
71 71
72 72 var maxSyncUpload = $(inputEl).data('max-concurrent-uploads');
73 73
74 74 if(maxSyncUpload == null || maxSyncUpload <= 0 || ajaxUpload.uploading < maxSyncUpload)
75 75 actualUpload(file, attachmentId, fileSpan, inputEl);
76 76 else
77 77 $(inputEl).parents('form').queue('upload', actualUpload.bind(this, file, attachmentId, fileSpan, inputEl));
78 78 }
79 79
80 80 ajaxUpload.uploading = 0;
81 81
82 82 function removeFile() {
83 83 $(this).parent('span').remove();
84 84 return false;
85 85 }
86 86
87 87 function uploadBlob(blob, uploadUrl, attachmentId, options) {
88 88
89 89 var actualOptions = $.extend({
90 90 loadstartEventHandler: $.noop,
91 91 progressEventHandler: $.noop
92 92 }, options);
93 93
94 94 uploadUrl = uploadUrl + '?attachment_id=' + attachmentId;
95 95 if (blob instanceof window.File) {
96 96 uploadUrl += '&filename=' + encodeURIComponent(blob.name);
97 97 }
98 98
99 99 return $.ajax(uploadUrl, {
100 100 type: 'POST',
101 101 contentType: 'application/octet-stream',
102 102 beforeSend: function(jqXhr) {
103 103 jqXhr.setRequestHeader('Accept', 'application/js');
104 104 },
105 105 xhr: function() {
106 106 var xhr = $.ajaxSettings.xhr();
107 107 xhr.upload.onloadstart = actualOptions.loadstartEventHandler;
108 108 xhr.upload.onprogress = actualOptions.progressEventHandler;
109 109 return xhr;
110 110 },
111 111 data: blob,
112 112 cache: false,
113 113 processData: false
114 114 });
115 115 }
116 116
117 117 function addInputFiles(inputEl) {
118 118 var clearedFileInput = $(inputEl).clone().val('');
119 119
120 120 if (inputEl.files) {
121 121 // upload files using ajax
122 122 uploadAndAttachFiles(inputEl.files, inputEl);
123 123 $(inputEl).remove();
124 124 } else {
125 125 // browser not supporting the file API, upload on form submission
126 126 var attachmentId;
127 127 var aFilename = inputEl.value.split(/\/|\\/);
128 128 attachmentId = addFile(inputEl, { name: aFilename[ aFilename.length - 1 ] }, false);
129 129 if (attachmentId) {
130 130 $(inputEl).attr({ name: 'attachments[' + attachmentId + '][file]', style: 'display:none;' }).appendTo('#attachments_' + attachmentId);
131 131 }
132 132 }
133 133
134 134 clearedFileInput.insertAfter('#attachments_fields');
135 135 }
136 136
137 137 function uploadAndAttachFiles(files, inputEl) {
138 138
139 139 var maxFileSize = $(inputEl).data('max-file-size');
140 140 var maxFileSizeExceeded = $(inputEl).data('max-file-size-message');
141 141
142 142 var sizeExceeded = false;
143 143 $.each(files, function() {
144 144 if (this.size && maxFileSize && this.size > parseInt(maxFileSize)) {sizeExceeded=true;}
145 145 });
146 146 if (sizeExceeded) {
147 147 window.alert(maxFileSizeExceeded);
148 148 } else {
149 149 $.each(files, function() {addFile(inputEl, this, true);});
150 150 }
151 151 }
152 152
153 153 function handleFileDropEvent(e) {
154 154
155 155 $(this).removeClass('fileover');
156 156 blockEventPropagation(e);
157 157
158 158 if ($.inArray('Files', e.dataTransfer.types) > -1) {
159
160 uploadAndAttachFiles(e.dataTransfer.files, $('input:file[name=attachments_files]'));
159 uploadAndAttachFiles(e.dataTransfer.files, $('input:file.file_selector'));
161 160 }
162 161 }
163 162
164 163 function dragOverHandler(e) {
165 164 $(this).addClass('fileover');
166 165 blockEventPropagation(e);
167 166 }
168 167
169 168 function dragOutHandler(e) {
170 169 $(this).removeClass('fileover');
171 170 blockEventPropagation(e);
172 171 }
173 172
174 173 function setupFileDrop() {
175 174 if (window.File && window.FileList && window.ProgressEvent && window.FormData) {
176 175
177 176 $.event.fixHooks.drop = { props: [ 'dataTransfer' ] };
178 177
179 178 $('form div.box').has('input:file').each(function() {
180 179 $(this).on({
181 180 dragover: dragOverHandler,
182 181 dragleave: dragOutHandler,
183 182 drop: handleFileDropEvent
184 183 });
185 184 });
186 185 }
187 186 }
188 187
189 188 $(document).ready(setupFileDrop);
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
General Comments 0
You need to be logged in to leave comments. Login now