Download as
Browse Code »

Commit c1862e35771103c5c9b6f7b85712a9a105e2e4f8

Authored by Antonio Terceiro
1 parent 6fd3cea8
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

When uploading, add images directly to the text

Showing 1 changed file with 7 additions and 3 deletions   Show diff stats
public/javascripts/article.js
  Diff comments   View file @c1862e3
... ... @@ -39,7 +39,7 @@ jQuery(function($) {
39 39 return '<a class="button icon-zoom zoom" href="#" title="' + button_zoom + '"><span>' + button_zoom + '</span></a>';
40 40 }
41 41  
42   - function list_items(items, selector) {
  42 + function list_items(items, selector, auto_add) {
43 43 var html_for_items = '';
44 44  
45 45 var images = [];
... ... @@ -71,6 +71,10 @@ jQuery(function($) {
71 71 });
72 72  
73 73 $(selector).html(html_for_items);
  74 +
  75 + if (auto_add) {
  76 + $(selector).find('a.add-to-text').click();
  77 + }
74 78 }
75 79  
76 80 $('.controls a.add-to-text').live('click', function() {
... ... @@ -118,7 +122,7 @@ jQuery(function($) {
118 122 var $button = $(this);
119 123 $('#media-search-box .header').toggleClass('icon-loading');
120 124 $.get($(this).parent().attr('action'), { 'q': query }, function(data) {
121   - list_items(data, '#media-search-results .items');
  125 + list_items(data, '#media-search-results .items', false);
122 126 if (data.length && data.length > 0) {
123 127 $('#media-search-results').slideDown();
124 128 }
... ... @@ -137,7 +141,7 @@ jQuery(function($) {
137 141 },
138 142 success:
139 143 function(data) {
140   - list_items(data, '#media-upload-results .items');
  144 + list_items(data, '#media-upload-results .items', true);
141 145 if (data.length && data.length > 0) {
142 146 $('#media-upload-results').slideDown();
143 147 }
... ...