Download as
Browse Code »

Commit 231a6ffbade5bd9667f8af2a4f8da2e33ff24441

Authored by Daniela Feitosa
2 parents e0b1f059 fa192b4c
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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 21 theme : "advanced",
22 22 relative_urls : false,
23 23 remove_script_host : true,
  24 + document_base_url : <%= environment.top_url.to_json %>,
24 25 plugins: myplugins,
25 26 theme_advanced_toolbar_location : "top",
26 27 theme_advanced_layout_manager: 'SimpleLayout',
... ... @@ -32,7 +33,7 @@ tinyMCE.init({
32 33 paste_insert_word_content_callback : "convertWord",
33 34 paste_use_dialog: false,
34 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 37 content_css: '/stylesheets/tinymce.css',
37 38 language: <%= tinymce_language.inspect %>,
38 39 entity_encoding: 'raw'
... ...