Download as
Browse Code »

Commit 53e21f85b4332a2736011634bd31f8fdd4459cdf

Authored by Daniela Feitosa
1 parent 5a911ba4
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

Fixed html escape on suborganization plugin 

(ActionItem2699)
Showing 1 changed file with 6 additions and 10 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @53e21f8
@@ -1346,10 +1346,7 @@ module ApplicationHelper @@ -1346,10 +1346,7 @@ module ApplicationHelper
1346 options[:on_ready] ||= 'null' 1346 options[:on_ready] ||= 'null'
1347 1347
1348 result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id}))) 1348 result = text_field_tag(name, nil, text_field_options.merge(html_options.merge({:id => element_id})))
1349 - result +=  
1350 - "  
1351 - <script type='text/javascript'>  
1352 - jQuery('##{element_id}') 1349 + result += javascript_tag("jQuery('##{element_id}')
1353 .tokenInput('#{url_for(search_action)}', { 1350 .tokenInput('#{url_for(search_action)}', {
1354 minChars: #{options[:min_chars].to_json}, 1351 minChars: #{options[:min_chars].to_json},
1355 prePopulate: #{options[:pre_populate].to_json}, 1352 prePopulate: #{options[:pre_populate].to_json},
@@ -1365,16 +1362,15 @@ module ApplicationHelper @@ -1365,16 +1362,15 @@ module ApplicationHelper
1365 onAdd: #{options[:on_add]}, 1362 onAdd: #{options[:on_add]},
1366 onDelete: #{options[:on_delete]}, 1363 onDelete: #{options[:on_delete]},
1367 onReady: #{options[:on_ready]}, 1364 onReady: #{options[:on_ready]},
1368 - })  
1369 - "  
1370 - result += options[:focus] ? ".focus();" : ";" 1365 + });
  1366 + ")
  1367 + result += javascript_tag("jQuery('##{element_id}').focus();") if options[:focus]
1371 if options[:avoid_enter] 1368 if options[:avoid_enter]
1372 - result += "jQuery('#token-input-#{element_id}') 1369 + result += javascript_tag("jQuery('#token-input-#{element_id}')
1373 .live('keydown', function(event){ 1370 .live('keydown', function(event){
1374 if(event.keyCode == '13') return false; 1371 if(event.keyCode == '13') return false;
1375 - });" 1372 + });")
1376 end 1373 end
1377 - result += "</script>"  
1378 result 1374 result
1379 end 1375 end
1380 1376