Download as
Browse Code »

Commit bfd5827a4c5670691791d173125b4092dd96831d

Authored by Braulio Bhavamitra
1 parent 18aeacba
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

Remove etherpad code from tinymce

Showing 1 changed file with 0 additions and 12 deletions   Show diff stats
app/helpers/tinymce_helper.rb
  Diff comments   View file @bfd5827
... ... @@ -42,22 +42,10 @@ module TinymceHelper
42 42 EOS
43 43 end
44 44  
45   - apply_etherpadlite_options options
46   -
47 45 #cleanup non tinymce options
48 46 options = options.except :mode
49 47  
50 48 "noosfero.tinymce.init(#{options.to_json})"
51 49 end
52 50  
53   - def apply_etherpadlite_options options
54   - return if options[:mode] == 'simple'
55   - return unless environment.tinymce_plugin_etherpadlite_padServerUrl.present?
56   - options.merge! :plugin_etherpadlite_padServerUrl => environment.tinymce_plugin_etherpadlite_padServerUrl,
57   - :plugin_etherpadlite_padNamesPrefix => environment.default_hostname,
58   - :plugin_etherpadlite_padWidth => environment.tinymce_plugin_etherpadlite_padWidth,
59   - :plugin_etherpadlite_padHeight => environment.tinymce_plugin_etherpadlite_padHeight
60   - options[:plugins] << "etherpadlite"
61   - options[:toolbar2] += " | etherpadlite"
62   - end
63 51 end
... ...