Download as
Browse Code »

Commit 63f475de6734cd3e1bc1f7a0890a0a821450c4bc

Authored by Antonio Terceiro
2 parents f25e4c1b f3577c1b
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge branch 'add-more-files' into 'master' 

Add more files

See merge request !508
Showing 4 changed files with 8 additions and 8 deletions   Show diff stats
app/helpers/cms_helper.rb
  Diff comments   View file @63f475d
... ... @@ -9,12 +9,6 @@ module CmsHelper
9 9 mime_type.gsub('/', '_').gsub('-', '')
10 10 end
11 11  
12   - def add_upload_file_field(name, locals)
13   - button_to_function :add, name, nil do |page|
14   - page.insert_html :bottom, :uploaded_files, CGI::escapeHTML(render(:partial => 'upload_file', :locals => locals, :object => UploadedFile.new))
15   - end
16   - end
17   -
18 12 def pagination_links(collection, options={})
19 13 options = {:previous_label => '« ', :next_label => ' »', :page_links => false}.merge(options)
20 14 will_paginate(collection, options)
... ...
app/views/cms/_upload_file.html.erb
  Diff comments   View file @63f475d
1 1 <p><%= file_field_tag('uploaded_files[]', :size => size) %></p>
2   -<%= javascript_tag("jQuery('#uploaded_files')[0].scrollTop = jQuery('#uploaded_files')[0].scrollHeight") %>
... ...
app/views/cms/_upload_file_form.html.erb
  Diff comments   View file @63f475d
... ... @@ -13,7 +13,7 @@
13 13 <%= hidden_field_tag('back_to', @back_to) %>
14 14  
15 15 <% button_bar do %>
16   - <%= add_upload_file_field(_('More files'), {:size => size}) %>
  16 + <%= button_to_function :add, _('More files'), "add_new_file_fields()" %>
17 17 <% if @back_to %>
18 18 <%= submit_button :save, _('Upload'), :cancel => @back_to %>
19 19 <% else %>
... ...
public/javascripts/application.js
  Diff comments   View file @63f475d
... ... @@ -1128,4 +1128,11 @@ function stop_fetching(element){
1128 1128 jQuery('.fetching-overlay', element).remove();
1129 1129 }
1130 1130  
  1131 +function add_new_file_fields() {
  1132 + var cloned = jQuery('#uploaded_files p:last').clone();
  1133 + cloned.find("input[type='file']").val('');
  1134 + cloned.appendTo('#uploaded_files');
  1135 + jQuery('body').scrollTo(cloned);
  1136 +}
  1137 +
1131 1138 window.isHidden = function isHidden() { return (typeof(document.hidden) != 'undefined') ? document.hidden : !document.hasFocus() };
... ...