Download as
Browse Code »

Commit 231a6ffbade5bd9667f8af2a4f8da2e33ff24441

Authored by Daniela Feitosa
2 parents e0b1f059 fa192b4c
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

Merge commit 'refs/merge-requests/2' of git://gitorious.org/noosfero/noosfero into merge-requests/2

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
app/views/shared/tiny_mce.rhtml
  Diff comments   View file @231a6ff
@@ -21,6 +21,7 @@ tinyMCE.init({ @@ -21,6 +21,7 @@ tinyMCE.init({
21 theme : "advanced", 21 theme : "advanced",
22 relative_urls : false, 22 relative_urls : false,
23 remove_script_host : true, 23 remove_script_host : true,
  24 + document_base_url : <%= environment.top_url.to_json %>,
24 plugins: myplugins, 25 plugins: myplugins,
25 theme_advanced_toolbar_location : "top", 26 theme_advanced_toolbar_location : "top",
26 theme_advanced_layout_manager: 'SimpleLayout', 27 theme_advanced_layout_manager: 'SimpleLayout',
@@ -32,7 +33,7 @@ tinyMCE.init({ @@ -32,7 +33,7 @@ tinyMCE.init({
32 paste_insert_word_content_callback : "convertWord", 33 paste_insert_word_content_callback : "convertWord",
33 paste_use_dialog: false, 34 paste_use_dialog: false,
34 apply_source_formatting : true, 35 apply_source_formatting : true,
35 - extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height|scrolling]", 36 + extended_valid_elements : "applet[style|archive|codebase|code|height|width],comment,iframe[src|style|allowtransparency|frameborder|width|height|scrolling],embed[title|src|type|height|width]",
36 content_css: '/stylesheets/tinymce.css', 37 content_css: '/stylesheets/tinymce.css',
37 language: <%= tinymce_language.inspect %>, 38 language: <%= tinymce_language.inspect %>,
38 entity_encoding: 'raw' 39 entity_encoding: 'raw'