Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-16 10:16:03 +01:00
Code Issues Packages Projects Releases Activity

revert r13199 (#17151)

Browse Source 
Chrome 36.0.1985.143 was released.

git-svn-id: http://svn.redmine.org/redmine/trunk@13350 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2014-08-26 08:15:11 +00:00
parent 425761740a
commit e3e14ce3a1
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/attachments/_form.html.erb
View File

@@ -15,6 +15,7 @@
:id => nil, :id => nil,
:class => 'file_selector', :class => 'file_selector',
:multiple => true, :multiple => true,
:onchange => 'addInputFiles(this);',
:data => { :data => {
:max_file_size => Setting.attachment_max_size.to_i.kilobytes, :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
@@ -24,9 +25,6 @@
} %> } %>
(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
</span> </span>
<%= javascript_tag do %>
$('input.file_selector').on('change', function(){addInputFiles(this);});
<% end %>
<% content_for :header_tags do %> <% content_for :header_tags do %>
<%= javascript_include_tag 'attachments' %> <%= javascript_include_tag 'attachments' %>

2
public/javascripts/attachments.js
View File

@@ -133,7 +133,7 @@ function addInputFiles(inputEl) {
} }
} }
clearedFileInput.insertAfter('#attachments_fields').on('change', function(){addInputFiles(this);}); clearedFileInput.insertAfter('#attachments_fields');
} }
function uploadAndAttachFiles(files, inputEl) { function uploadAndAttachFiles(files, inputEl) {