summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-06-25 17:09:15 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-06-25 17:09:15 +0000
commita8389c4019e76aefabc39f65ec3a66e3d361f3fd (patch)
tree37a8132173e4f084d5ed1a9bc0d9d24b810eebe0
parent1fb7910561ad8a5d08605a5070f9314e6df8bb38 (diff)
downloadredmine-a8389c4019e76aefabc39f65ec3a66e3d361f3fd.tar.gz
redmine-a8389c4019e76aefabc39f65ec3a66e3d361f3fd.zip
revert r13183 (#17151)
git-svn-id: http://svn.redmine.org/redmine/trunk@13186 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/attachments/_form.html.erb4
-rw-r--r--public/javascripts/attachments.js2
2 files changed, 2 insertions, 4 deletions
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) %>)
</span>
-<%= 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 43803ba9c..a689c2ef3 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -131,7 +131,7 @@ function addInputFiles(inputEl) {
}
}
- clearedFileInput.insertAfter('#attachments_fields').on('change', function(){addInputFiles(this);});
+ clearedFileInput.insertAfter('#attachments_fields');
}
function uploadAndAttachFiles(files, inputEl) {