Commit bfd5827a4c5670691791d173125b4092dd96831d
1 parent
18aeacba
Exists in
staging
and in
42 other branches
Remove etherpad code from tinymce
Showing
1 changed file
with
0 additions
and
12 deletions
Show diff stats
app/helpers/tinymce_helper.rb
| @@ -42,22 +42,10 @@ module TinymceHelper | @@ -42,22 +42,10 @@ module TinymceHelper | ||
| 42 | EOS | 42 | EOS |
| 43 | end | 43 | end |
| 44 | 44 | ||
| 45 | - apply_etherpadlite_options options | ||
| 46 | - | ||
| 47 | #cleanup non tinymce options | 45 | #cleanup non tinymce options |
| 48 | options = options.except :mode | 46 | options = options.except :mode |
| 49 | 47 | ||
| 50 | "noosfero.tinymce.init(#{options.to_json})" | 48 | "noosfero.tinymce.init(#{options.to_json})" |
| 51 | end | 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 | end | 51 | end |