From: Toshi MARUYAMA Date: Tue, 26 Aug 2014 08:15:11 +0000 (+0000) Subject: revert r13199 (#17151) X-Git-Tag: 2.6.0~73 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e3e14ce3a119f61f22a75c1fdea314e88e0a4d9b;p=redmine.git revert r13199 (#17151) Chrome 36.0.1985.143 was released. git-svn-id: http://svn.redmine.org/redmine/trunk@13350 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb index 26ff5c96a..65ad8804a 100644 --- a/app/views/attachments/_form.html.erb +++ b/app/views/attachments/_form.html.erb @@ -15,6 +15,7 @@ :id => nil, :class => 'file_selector', :multiple => true, + :onchange => 'addInputFiles(this);', :data => { :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)), @@ -24,9 +25,6 @@ } %> (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) -<%= javascript_tag do %> - $('input.file_selector').on('change', function(){addInputFiles(this);}); -<% end %> <% content_for :header_tags do %> <%= javascript_include_tag 'attachments' %> diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index a67ca4a72..229235f83 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -133,7 +133,7 @@ function addInputFiles(inputEl) { } } - clearedFileInput.insertAfter('#attachments_fields').on('change', function(){addInputFiles(this);}); + clearedFileInput.insertAfter('#attachments_fields'); } function uploadAndAttachFiles(files, inputEl) {