ActionItem925: enhancements to the text editor

Daniela Feitosa · Antonio Terceiro
1 parent dd161fc1
Showing 3 changed files with 30 additions and 7 deletions Show diff stats
app/helpers/language_helper.rb
app/views/shared/tiny_mce.rhtml
test/unit/language_helper_test.rb
@@ -4,7 +4,7 @@ module LanguageHelper
   end
   def tinymce_language
-    language.downcase
+    language.downcase.split('_').first
   end
   def html_language
-<%= javascript_include_tag 'tiny_mce/tiny_mce.js' %>
+<%= javascript_include_tag 'tinymce/jscripts/tiny_mce/tiny_mce.js' %>
 <script type="text/javascript">
 tinyMCE.init({
         mode : "textareas",
         theme : "advanced",
-        plugins: "paste,searchreplace,print",
+        plugins: "paste,searchreplace,print,media",
         theme_advanced_toolbar_location : "top",
         theme_advanced_layout_manager: 'SimpleLayout',
-        theme_advanced_buttons1 : "print,separator,copy,paste,pastetext,pasteword,separator,undo,redo,separator,search,replace,separator,formatselect,separator,help",
+        theme_advanced_buttons1 : "print,separator,copy,paste,separator,undo,redo,separator,search,replace,separator,formatselect,separator,help",
         theme_advanced_buttons2 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code",
         theme_advanced_buttons3 : "",
+        paste_auto_cleanup_on_paste : true,
+        paste_insert_word_content_callback : "convertWord",
+        paste_use_dialog: false,
         apply_source_formatting : true,
         language: <%= tinymce_language.inspect %>
-});
+        });
+
+function convertWord(type, content) {
+  switch (type) {
+    // Gets executed before the built in logic performes it's cleanups
+    case "before":
+      //content = content.toLowerCase(); // Some dummy logic
+      break;
+
+    // Gets executed after the built in logic performes it's cleanups
+    case "after":
+      content = content.replace(/<!--\s*-->/, '');
+      break;
+  }
+
+  return content;
+}
 </script>
+
+
+
+
@@ -13,9 +13,9 @@ class LanguageHelperTest &lt; Test::Unit::TestCase
     assert_equal 'pt_BR', self.language
   end
-  should 'downcase language for tinymce' do
+  should 'remove country code for TinyMCE' do
     self.expects(:language).returns('pt_BR')
-    assert_equal 'pt_br', tinymce_language
+    assert_equal 'pt', tinymce_language
   end
   should 'downcase and use dash for HTML language' do
	@@ -4,7 +4,7 @@ module LanguageHelper		@@ -4,7 +4,7 @@ module LanguageHelper
4	end	4	end
5		5
6	def tinymce_language	6	def tinymce_language
7	- language.downcase	7	+ language.downcase.split('_').first
8	end	8	end
9		9
10	def html_language	10	def html_language
1	-<%= javascript_include_tag 'tiny_mce/tiny_mce.js' %>	1	+<%= javascript_include_tag 'tinymce/jscripts/tiny_mce/tiny_mce.js' %>
2	<script type="text/javascript">	2	<script type="text/javascript">
3	tinyMCE.init({	3	tinyMCE.init({
4	mode : "textareas",	4	mode : "textareas",
5	theme : "advanced",	5	theme : "advanced",
6	- plugins: "paste,searchreplace,print",	6	+ plugins: "paste,searchreplace,print,media",
7	theme_advanced_toolbar_location : "top",	7	theme_advanced_toolbar_location : "top",
8	theme_advanced_layout_manager: 'SimpleLayout',	8	theme_advanced_layout_manager: 'SimpleLayout',
9	- theme_advanced_buttons1 : "print,separator,copy,paste,pastetext,pasteword,separator,undo,redo,separator,search,replace,separator,formatselect,separator,help",	9	+ theme_advanced_buttons1 : "print,separator,copy,paste,separator,undo,redo,separator,search,replace,separator,formatselect,separator,help",
10	theme_advanced_buttons2 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code",	10	theme_advanced_buttons2 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code",
11	theme_advanced_buttons3 : "",	11	theme_advanced_buttons3 : "",
		12	+ paste_auto_cleanup_on_paste : true,
		13	+ paste_insert_word_content_callback : "convertWord",
		14	+ paste_use_dialog: false,
12	apply_source_formatting : true,	15	apply_source_formatting : true,
13	language: <%= tinymce_language.inspect %>	16	language: <%= tinymce_language.inspect %>
14	-});	17	+ });
		18	+
		19	+function convertWord(type, content) {
		20	+ switch (type) {
		21	+ // Gets executed before the built in logic performes it's cleanups
		22	+ case "before":
		23	+ //content = content.toLowerCase(); // Some dummy logic
		24	+ break;
		25	+
		26	+ // Gets executed after the built in logic performes it's cleanups
		27	+ case "after":
		28	+ content = content.replace(/<!--\s*-->/, '');
		29	+ break;
		30	+ }
		31	+
		32	+ return content;
		33	+}
15	</script>	34	</script>
		35	+
		36	+
		37	+
		38	+
	@@ -13,9 +13,9 @@ class LanguageHelperTest < Test::Unit::TestCase		@@ -13,9 +13,9 @@ class LanguageHelperTest < Test::Unit::TestCase
13	assert_equal 'pt_BR', self.language	13	assert_equal 'pt_BR', self.language
14	end	14	end
15		15
16	- should 'downcase language for tinymce' do	16	+ should 'remove country code for TinyMCE' do
17	self.expects(:language).returns('pt_BR')	17	self.expects(:language).returns('pt_BR')
18	- assert_equal 'pt_br', tinymce_language	18	+ assert_equal 'pt', tinymce_language
19	end	19	end
20		20
21	should 'downcase and use dash for HTML language' do	21	should 'downcase and use dash for HTML language' do