- If you set this option to true, TinyMCE will force BR elements on newlines instead of inserting paragraphs. This option is set to false by default since paragraphs is a much better concept. You can style P elements to be one row by adding p { margin: 0px; padding: 0px; } to your CSS, P tags where invented for a reason and should be used. BR elements should only be used when you really have to (mostly never).
+ If you set this option to true, TinyMCE will force BR elements on newlines instead of inserting paragraphs. This option is set to false by default since paragraphs is a much better concept. You can style P elements to be one row by adding p { margin: 0; padding: 0; } to your CSS, P tags where invented for a reason and should be used. BR elements should only be used when you really have to (mostly never).
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_force_hex_style_colors.html b/www/extras/tinymce2/docs/option_force_hex_style_colors.html
index f55ed972d..7d1888927 100644
--- a/www/extras/tinymce2/docs/option_force_hex_style_colors.html
+++ b/www/extras/tinymce2/docs/option_force_hex_style_colors.html
@@ -27,7 +27,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_force_p_newlines.html b/www/extras/tinymce2/docs/option_force_p_newlines.html
index 347b144d0..16f108d15 100644
--- a/www/extras/tinymce2/docs/option_force_p_newlines.html
+++ b/www/extras/tinymce2/docs/option_force_p_newlines.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_height.html b/www/extras/tinymce2/docs/option_height.html
index 7daf75db4..1f0819be9 100644
--- a/www/extras/tinymce2/docs/option_height.html
+++ b/www/extras/tinymce2/docs/option_height.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_init_instance_callback.html b/www/extras/tinymce2/docs/option_init_instance_callback.html
index 0c6ee2342..739e94634 100644
--- a/www/extras/tinymce2/docs/option_init_instance_callback.html
+++ b/www/extras/tinymce2/docs/option_init_instance_callback.html
@@ -34,7 +34,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_inline_styles.html b/www/extras/tinymce2/docs/option_inline_styles.html
index 1dcc1b200..8e89164a9 100644
--- a/www/extras/tinymce2/docs/option_inline_styles.html
+++ b/www/extras/tinymce2/docs/option_inline_styles.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_insertimage_callback.html b/www/extras/tinymce2/docs/option_insertimage_callback.html
index cb55d9997..f27a2fd03 100644
--- a/www/extras/tinymce2/docs/option_insertimage_callback.html
+++ b/www/extras/tinymce2/docs/option_insertimage_callback.html
@@ -7,12 +7,15 @@
- This option enables you to override the build in functionality for inserting images. This option should contain a function name to be executed when a new image is inserted into TinyMCE. The format of this callback function is: insertImage(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action). Where most of these options are self explained the action can be "update" or "insert" depending on what operation type. This function should return an array with the same values as the incomming parameters, the example below describes how this is done. This option is set to a internal TinyMCE function by default.
+ This callback was removed in 2.0.3, use execcommand_callback instead this also enables you to override other things than the image and link dialogs.
+
+
+ This option enables you to override the built in functionality for inserting images. This option should contain a function name to be executed when a new image is inserted into TinyMCE. The format of this callback function is: insertImage(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action). Where most of these options are self explained the action can be "update" or "insert" depending on what operation type. This function should return an array with the same values as the incomming parameters, the example below describes how this is done. This option is set to a internal TinyMCE function by default.
@@ -49,7 +52,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_insertlink_callback.html b/www/extras/tinymce2/docs/option_insertlink_callback.html
index 2d67c4923..2aaf77a55 100644
--- a/www/extras/tinymce2/docs/option_insertlink_callback.html
+++ b/www/extras/tinymce2/docs/option_insertlink_callback.html
@@ -7,12 +7,15 @@
- This option enables you to override the build in functionality for inserting links. This option should contain a function name to be executed when a new link is inserted into TinyMCE. The format of this callback function is: insertLink(href, target, title, onclick, action). Where most of these options are self explained the action can be "update" or "insert" depending on what operation type. This function should return an array with the same values as the incomming parameters, the example below describes how this is done. This option is set to a internal TinyMCE function by default.
+ This callback was removed in 2.0.3, use execcommand_callback instead this also enables you to override other things than the image and link dialogs.
+
+
+ This option enables you to override the built in functionality for inserting links. This option should contain a function name to be executed when a new link is inserted into TinyMCE. The format of this callback function is: insertLink(href, target, title, onclick, action). Where most of these options are self explained the action can be "update" or "insert" depending on what operation type. This function should return an array with the same values as the incomming parameters, the example below describes how this is done. This option is set to a internal TinyMCE function by default.
@@ -42,7 +45,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_invalid_elements.html b/www/extras/tinymce2/docs/option_invalid_elements.html
index f313e7f47..0d4f38e6c 100644
--- a/www/extras/tinymce2/docs/option_invalid_elements.html
+++ b/www/extras/tinymce2/docs/option_invalid_elements.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_language.html b/www/extras/tinymce2/docs/option_language.html
index daf35dd4e..c75cf99bb 100644
--- a/www/extras/tinymce2/docs/option_language.html
+++ b/www/extras/tinymce2/docs/option_language.html
@@ -34,7 +34,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_merge_styles_invalid_parents.html b/www/extras/tinymce2/docs/option_merge_styles_invalid_parents.html
index 7deffee43..254366ec1 100644
--- a/www/extras/tinymce2/docs/option_merge_styles_invalid_parents.html
+++ b/www/extras/tinymce2/docs/option_merge_styles_invalid_parents.html
@@ -29,7 +29,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_mode.html b/www/extras/tinymce2/docs/option_mode.html
index c613d9d01..28b89a876 100644
--- a/www/extras/tinymce2/docs/option_mode.html
+++ b/www/extras/tinymce2/docs/option_mode.html
@@ -46,7 +46,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_nowrap.html b/www/extras/tinymce2/docs/option_nowrap.html
index 3d533211e..73705f374 100644
--- a/www/extras/tinymce2/docs/option_nowrap.html
+++ b/www/extras/tinymce2/docs/option_nowrap.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_object_resizing.html b/www/extras/tinymce2/docs/option_object_resizing.html
index 48d7069c1..90f750e79 100644
--- a/www/extras/tinymce2/docs/option_object_resizing.html
+++ b/www/extras/tinymce2/docs/option_object_resizing.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_onchange_callback.html b/www/extras/tinymce2/docs/option_onchange_callback.html
index d7d83c655..05cffb149 100644
--- a/www/extras/tinymce2/docs/option_onchange_callback.html
+++ b/www/extras/tinymce2/docs/option_onchange_callback.html
@@ -35,7 +35,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_oninit.html b/www/extras/tinymce2/docs/option_oninit.html
index 755dbd6f7..8a9511a4f 100644
--- a/www/extras/tinymce2/docs/option_oninit.html
+++ b/www/extras/tinymce2/docs/option_oninit.html
@@ -34,7 +34,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_plugins.html b/www/extras/tinymce2/docs/option_plugins.html
index 4169c5fb3..1e3c7e260 100644
--- a/www/extras/tinymce2/docs/option_plugins.html
+++ b/www/extras/tinymce2/docs/option_plugins.html
@@ -14,6 +14,9 @@
This option should contain a comma separated list of plugins. Plugins are loaded from the "tinymce/jscripts/tiny_mce/plugins" directory and the plugin name matches the name of the directory. TinyMCE is shipped with some core plugins these are described in greater detail in the Plugins reference.
+
+ TinyMCE also supports the ability to have plugins added from a external resource, these plugins needs to be self registrering and loaded after the tinyMCE.init call. You should also prefix these plugins with a "-" character so that TinyMCE doesn't try to load it from the TinyMCE plugins directory.
+
There are many third party plugins for TinyMCE some of these may be found under "Plugins" at SourceForge and if you have developed one of your own please contribute it to this project by uploading it to SourceForge.
@@ -26,7 +29,7 @@
tinyMCE.init({
...
- plugins : "table,contextmenu,paste"
+ plugins : "table,contextmenu,paste,-externalplugin"
});
@@ -34,7 +37,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_popups_css.html b/www/extras/tinymce2/docs/option_popups_css.html
index 9e3f5789f..ce1df5099 100644
--- a/www/extras/tinymce2/docs/option_popups_css.html
+++ b/www/extras/tinymce2/docs/option_popups_css.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_preformatted.html b/www/extras/tinymce2/docs/option_preformatted.html
index e0cd3aa72..177901cfa 100644
--- a/www/extras/tinymce2/docs/option_preformatted.html
+++ b/www/extras/tinymce2/docs/option_preformatted.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_relative_urls.html b/www/extras/tinymce2/docs/option_relative_urls.html
index a4aa7db22..0e127d4fb 100644
--- a/www/extras/tinymce2/docs/option_relative_urls.html
+++ b/www/extras/tinymce2/docs/option_relative_urls.html
@@ -28,7 +28,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_remove_linebreaks.html b/www/extras/tinymce2/docs/option_remove_linebreaks.html
index 065a9e713..cfcda016d 100644
--- a/www/extras/tinymce2/docs/option_remove_linebreaks.html
+++ b/www/extras/tinymce2/docs/option_remove_linebreaks.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_remove_script_host.html b/www/extras/tinymce2/docs/option_remove_script_host.html
index 3e2201400..880cd607b 100644
--- a/www/extras/tinymce2/docs/option_remove_script_host.html
+++ b/www/extras/tinymce2/docs/option_remove_script_host.html
@@ -29,7 +29,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_save_callback.html b/www/extras/tinymce2/docs/option_save_callback.html
index 391e9731c..12229aaf0 100644
--- a/www/extras/tinymce2/docs/option_save_callback.html
+++ b/www/extras/tinymce2/docs/option_save_callback.html
@@ -12,7 +12,7 @@
- This option enables you to add custom logic to be executed when the contents is extracted/saved. This custom logic can then modify the contents before it's submited to a serverside page. This can be useful if you want to do your own regexp cleanups and so forth. The format of this function is: saveContent(element_id, html, body). Where element id is the form element/div id of the editor and HTML is the HTML contents after the build in cleanup process has executed. This function should return the new HTML contents.
+ This option enables you to add custom logic to be executed when the contents is extracted/saved. This custom logic can then modify the contents before it's submited to a serverside page. This can be useful if you want to do your own regexp cleanups and so forth. The format of this function is: saveContent(element_id, html, body). Where element id is the form element/div id of the editor and HTML is the HTML contents after the built in cleanup process has executed. This function should return the new HTML contents.
@@ -37,7 +37,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_setupcontent_callback.html b/www/extras/tinymce2/docs/option_setupcontent_callback.html
index d0db1735e..b3526aa97 100644
--- a/www/extras/tinymce2/docs/option_setupcontent_callback.html
+++ b/www/extras/tinymce2/docs/option_setupcontent_callback.html
@@ -35,7 +35,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_submit_patch.html b/www/extras/tinymce2/docs/option_submit_patch.html
index e7709fcfe..a23bf49c0 100644
--- a/www/extras/tinymce2/docs/option_submit_patch.html
+++ b/www/extras/tinymce2/docs/option_submit_patch.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_table_inline_editing.html b/www/extras/tinymce2/docs/option_table_inline_editing.html
index 8a2c7a5bf..b94b84239 100644
--- a/www/extras/tinymce2/docs/option_table_inline_editing.html
+++ b/www/extras/tinymce2/docs/option_table_inline_editing.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_textarea_trigger.html b/www/extras/tinymce2/docs/option_textarea_trigger.html
index 570186bf8..70a2a5940 100644
--- a/www/extras/tinymce2/docs/option_textarea_trigger.html
+++ b/www/extras/tinymce2/docs/option_textarea_trigger.html
@@ -39,7 +39,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme.html b/www/extras/tinymce2/docs/option_theme.html
index 7abdc1b26..dbbbe215f 100644
--- a/www/extras/tinymce2/docs/option_theme.html
+++ b/www/extras/tinymce2/docs/option_theme.html
@@ -12,7 +12,7 @@
- This option enables you to specify what theme to use when rendering the TinyMCE WYSIWYG editor instances. This name matches the directories located in "tinymce/jscripts/tiny_mce/themes". The default value of this option is "advanced". TinyMCE has three build in themes and these are described in greater detail below.
+ This option enables you to specify what theme to use when rendering the TinyMCE WYSIWYG editor instances. This name matches the directories located in "tinymce/jscripts/tiny_mce/themes". The default value of this option is "advanced". TinyMCE has three built in themes and these are described in greater detail below.
@@ -41,7 +41,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_blockformats.html b/www/extras/tinymce2/docs/option_theme_advanced_blockformats.html
index bf2ca47f7..b5b9859cf 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_blockformats.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_blockformats.html
@@ -12,7 +12,7 @@
- This option should contain a comma separated list of block formats the default value of this option is "p,address,pre,h1,h2,h3,h4,h5,h6". This option is only available if the advanced theme is used.
+ This option should contain a comma separated list of block formats the default value of this option is "p,div,address,pre,h1,h2,h3,h4,h5,h6". This option is only available if the advanced theme is used.
@@ -22,7 +22,7 @@
tinyMCE.init({
...
- theme_advanced_blockformats : "p,h1,h2,h3,h4,h5,h6"
+ theme_advanced_blockformats : "p,div,h1,h2,h3,h4,h5,h6"
});
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_buttons_n.html b/www/extras/tinymce2/docs/option_theme_advanced_buttons_n.html
index e0066d750..d6ccdfd8d 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_buttons_n.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_buttons_n.html
@@ -12,7 +12,7 @@
- This option should contain a comma separated list of button/control names to insert into the toolbar. The number 1-n is the row number to insert the buttons/controls to. Below is a list of build in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
+ This option should contain a comma separated list of button/control names to insert into the toolbar. The number 1-n is the row number to insert the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
This option can only be used when theme is set to advanced and when the theme_advanced_layout_manager option is set to the default value of "SimpleLayout".
@@ -36,7 +36,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_buttons_n_add.html b/www/extras/tinymce2/docs/option_theme_advanced_buttons_n_add.html
index d321ee46b..0ada971ee 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_buttons_n_add.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_buttons_n_add.html
@@ -12,7 +12,7 @@
- This option should contain a comma separated list of button/control names to add to the end of the specified toolbar row. The number 1-n is the row number to add the buttons/controls to. Below is a list of build in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
+ This option should contain a comma separated list of button/control names to add to the end of the specified toolbar row. The number 1-n is the row number to add the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
This option can only be used when theme is set to advanced and when the theme_advanced_layout_manager option is set to the default value of "SimpleLayout".
@@ -36,7 +36,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_buttons_n_add_before.html b/www/extras/tinymce2/docs/option_theme_advanced_buttons_n_add_before.html
index 4ba6abf3c..fe27ecd0d 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_buttons_n_add_before.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_buttons_n_add_before.html
@@ -12,7 +12,7 @@
- This option should contain a comma separated list of button/control names to add to the beginning of the specified toolbar row. The number 1-n is the row number to add the buttons/controls to. Below is a list of build in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
+ This option should contain a comma separated list of button/control names to add to the beginning of the specified toolbar row. The number 1-n is the row number to add the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
This option can only be used when theme is set to advanced and when the theme_advanced_layout_manager option is set to the default value of "SimpleLayout".
@@ -36,7 +36,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_container.html b/www/extras/tinymce2/docs/option_theme_advanced_container.html
index 61c800ef2..cc2bddc0e 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_container.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_container.html
@@ -31,7 +31,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_container_align.html b/www/extras/tinymce2/docs/option_theme_advanced_container_align.html
index d944db655..972f69ef1 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_container_align.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_container_align.html
@@ -31,7 +31,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_container_class.html b/www/extras/tinymce2/docs/option_theme_advanced_container_class.html
index 71f9381a7..a663478f9 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_container_class.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_container_class.html
@@ -31,7 +31,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_containers.html b/www/extras/tinymce2/docs/option_theme_advanced_containers.html
index a6ceddfe4..cc4095645 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_containers.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_containers.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_containers_default_align.html b/www/extras/tinymce2/docs/option_theme_advanced_containers_default_align.html
index 89cf96b2e..41f040e92 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_containers_default_align.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_containers_default_align.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_containers_default_class.html b/www/extras/tinymce2/docs/option_theme_advanced_containers_default_class.html
index 9aee63474..166b183aa 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_containers_default_class.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_containers_default_class.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_custom_layout.html b/www/extras/tinymce2/docs/option_theme_advanced_custom_layout.html
index bafc1a4ca..ed523f3a5 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_custom_layout.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_custom_layout.html
@@ -41,7 +41,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_disable.html b/www/extras/tinymce2/docs/option_theme_advanced_disable.html
index e472821d3..6850f55ab 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_disable.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_disable.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_fonts.html b/www/extras/tinymce2/docs/option_theme_advanced_fonts.html
index 88b8791e8..77a5cecb9 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_fonts.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_fonts.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_layout_manager.html b/www/extras/tinymce2/docs/option_theme_advanced_layout_manager.html
index af479883f..0eb5c4e81 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_layout_manager.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_layout_manager.html
@@ -31,7 +31,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_link_targets.html b/www/extras/tinymce2/docs/option_theme_advanced_link_targets.html
index d1416a336..92cb33a2f 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_link_targets.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_link_targets.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_path.html b/www/extras/tinymce2/docs/option_theme_advanced_path.html
index 27874c98d..e76563356 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_path.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_path.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_path_location.html b/www/extras/tinymce2/docs/option_theme_advanced_path_location.html
index 9bbacd398..ee2c74a21 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_path_location.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_path_location.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_resize_horizontal.html b/www/extras/tinymce2/docs/option_theme_advanced_resize_horizontal.html
index b83b9cfce..869ada340 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_resize_horizontal.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_resize_horizontal.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_resizing.html b/www/extras/tinymce2/docs/option_theme_advanced_resizing.html
index 25c6e161f..a47d023a1 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_resizing.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_resizing.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_resizing_use_cookie.html b/www/extras/tinymce2/docs/option_theme_advanced_resizing_use_cookie.html
index 90df5b599..d9cc6a781 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_resizing_use_cookie.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_resizing_use_cookie.html
@@ -27,7 +27,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_source_editor_height.html b/www/extras/tinymce2/docs/option_theme_advanced_source_editor_height.html
index 6e14af81a..f8aff7da8 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_source_editor_height.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_source_editor_height.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_source_editor_width.html b/www/extras/tinymce2/docs/option_theme_advanced_source_editor_width.html
index fa11f9f4b..90c45076c 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_source_editor_width.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_source_editor_width.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_statusbar_location.html b/www/extras/tinymce2/docs/option_theme_advanced_statusbar_location.html
index 687ab6e35..415ed4259 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_statusbar_location.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_statusbar_location.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_styles.html b/www/extras/tinymce2/docs/option_theme_advanced_styles.html
index fa25eab23..997d3883b 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_styles.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_styles.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_toolbar_align.html b/www/extras/tinymce2/docs/option_theme_advanced_toolbar_align.html
index 93109355e..fc59eee3d 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_toolbar_align.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_toolbar_align.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_theme_advanced_toolbar_location.html b/www/extras/tinymce2/docs/option_theme_advanced_toolbar_location.html
index c7e9f1fa6..146b05fbb 100644
--- a/www/extras/tinymce2/docs/option_theme_advanced_toolbar_location.html
+++ b/www/extras/tinymce2/docs/option_theme_advanced_toolbar_location.html
@@ -33,7 +33,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_trim_span_elements.html b/www/extras/tinymce2/docs/option_trim_span_elements.html
index 3e07f87ae..e88e70dd9 100644
--- a/www/extras/tinymce2/docs/option_trim_span_elements.html
+++ b/www/extras/tinymce2/docs/option_trim_span_elements.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_urlconverter_callback.html b/www/extras/tinymce2/docs/option_urlconverter_callback.html
index a328df2d1..ae8ced6c9 100644
--- a/www/extras/tinymce2/docs/option_urlconverter_callback.html
+++ b/www/extras/tinymce2/docs/option_urlconverter_callback.html
@@ -12,7 +12,7 @@
- This option enable you to add your own URL converter logic. This option should contain a JavaScript function name. The format of this converter function is: URLConverter(url, node, on_save). There URL is the URL string to convert, node is the element that contains the URL that is to be converted this parameter may be set to null if there is no element for the URL and on_save is set to true when contents is to be extracted from the editor for example when the user submits the HTML form. This function should return the converted URL as a string. This option is set to a internal TinyMCE function "TinyMCE.prototype.convertURL" by default. You may call this function from your extention inorder to use the build in convertor options.
+ This option enable you to add your own URL converter logic. This option should contain a JavaScript function name. The format of this converter function is: URLConverter(url, node, on_save). There URL is the URL string to convert, node is the element that contains the URL that is to be converted this parameter may be set to null if there is no element for the URL and on_save is set to true when contents is to be extracted from the editor for example when the user submits the HTML form. This function should return the converted URL as a string. This option is set to a internal TinyMCE function "TinyMCE.prototype.convertURL" by default. You may call this function from your extention inorder to use the built in convert options.
@@ -38,7 +38,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_valid_elements.html b/www/extras/tinymce2/docs/option_valid_elements.html
index e6e1184ac..b332b5e54 100644
--- a/www/extras/tinymce2/docs/option_valid_elements.html
+++ b/www/extras/tinymce2/docs/option_valid_elements.html
@@ -30,6 +30,7 @@
| ? | Separates attribute verification values, see above. |
| + | Makes the element open if no child nodes exists. Example: +a. |
| - | Enables removal of empty elements such as >strong /<. Example: -strong. |
+
| # | Enables padding of empty elements, this will padd with if they are empty. Example: #p. |
Wildcards such as *,+,? may be used in element or attribute name matching.
@@ -64,7 +65,7 @@ tinyMCE.init({
-+a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/b[class|style],-em/i[class|style],-strike[class|style],-u[class|style],+p[style|dir|class|align],-ol[class|style],-ul[class|style],-li[class|style],br,img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border=0|alt|title|hspace|vspace|width|height|align],-sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[style|class|align],-pre[class|align|style],address[class|align|style],-h1[style|dir|class|align],-h2[style|dir|class|align],-h3[style|dir|class|align],-h4[style|dir|class|align],-h5[style|dir|class|align],-h6[style|dir|class|align],hr[class|style],font[face|size|style|id|class|dir|color]
++a[id|style|rel|rev|charset|hreflang|dir|lang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],-strong/-b[class|style],-em/-i[class|style],-strike[class|style],-u[class|style],#p[id|style|dir|class|align],-ol[class|style],-ul[class|style],-li[class|style],br,img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align],-sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor],-tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class],thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope],-th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style],-span[style|class|align],-pre[class|align|style],address[class|align|style],-h1[id|style|dir|class|align],-h2[id|style|dir|class|align],-h3[id|style|dir|class|align],-h4[id|style|dir|class|align],-h5[id|style|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],-font[face|size|style|id|class|dir|color],dd[id|class|title|style|dir|lang],dl[id|class|title|style|dir|lang],dt[id|class|title|style|dir|lang]
@@ -72,7 +73,7 @@ tinyMCE.init({
Full XHTML rule set:
- This is the default string used by TinyMCE to cleanup the HTML contents.
+ The following will validate that the page complies fully with the XHTML specification.
@@ -272,7 +273,7 @@ valid_elements : ""
+"small[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress"
+"|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style"
+"|title],"
-+"span[align
diff --git a/www/extras/tinymce2/docs/option_verify_css_classes.html b/www/extras/tinymce2/docs/option_verify_css_classes.html
index 8c3543a75..1109c208c 100644
--- a/www/extras/tinymce2/docs/option_verify_css_classes.html
+++ b/www/extras/tinymce2/docs/option_verify_css_classes.html
@@ -7,7 +7,7 @@
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_verify_html.html b/www/extras/tinymce2/docs/option_verify_html.html
index 36c52df19..9327a471e 100644
--- a/www/extras/tinymce2/docs/option_verify_html.html
+++ b/www/extras/tinymce2/docs/option_verify_html.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_visual.html b/www/extras/tinymce2/docs/option_visual.html
index a836f5b78..587e5a4cb 100644
--- a/www/extras/tinymce2/docs/option_visual.html
+++ b/www/extras/tinymce2/docs/option_visual.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_visual_table_class.html b/www/extras/tinymce2/docs/option_visual_table_class.html
index 22909937d..3f6a188a3 100644
--- a/www/extras/tinymce2/docs/option_visual_table_class.html
+++ b/www/extras/tinymce2/docs/option_visual_table_class.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/option_width.html b/www/extras/tinymce2/docs/option_width.html
index 01c1db081..b114d342e 100644
--- a/www/extras/tinymce2/docs/option_width.html
+++ b/www/extras/tinymce2/docs/option_width.html
@@ -30,7 +30,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_advhr.html b/www/extras/tinymce2/docs/plugin_advhr.html
index ee85cf42d..12617a3b5 100644
--- a/www/extras/tinymce2/docs/plugin_advhr.html
+++ b/www/extras/tinymce2/docs/plugin_advhr.html
@@ -38,7 +38,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_advimage.html b/www/extras/tinymce2/docs/plugin_advimage.html
index abb0fe7fc..f6141e9dd 100644
--- a/www/extras/tinymce2/docs/plugin_advimage.html
+++ b/www/extras/tinymce2/docs/plugin_advimage.html
@@ -40,8 +40,7 @@
tinyMCE.init({
theme : "advanced",
mode : "textareas",
- plugins : "preview",
- extended_valid_elements : "a[name|href|target|title|onclick]"
+ plugins : "preview"
});
@@ -50,7 +49,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_advlink.html b/www/extras/tinymce2/docs/plugin_advlink.html
index 951963ede..72b94fc05 100644
--- a/www/extras/tinymce2/docs/plugin_advlink.html
+++ b/www/extras/tinymce2/docs/plugin_advlink.html
@@ -39,8 +39,7 @@
tinyMCE.init({
theme : "advanced",
mode : "textareas",
- plugins : "advlink",
- extended_valid_elements : "a[name|href|target|title|onclick]"
+ plugins : "advlink"
});
@@ -48,7 +47,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_autosave.html b/www/extras/tinymce2/docs/plugin_autosave.html
index 0dc4adc12..7929216bf 100644
--- a/www/extras/tinymce2/docs/plugin_autosave.html
+++ b/www/extras/tinymce2/docs/plugin_autosave.html
@@ -27,7 +27,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_contextmenu.html b/www/extras/tinymce2/docs/plugin_contextmenu.html
index a5c9ed364..0ce0d101e 100644
--- a/www/extras/tinymce2/docs/plugin_contextmenu.html
+++ b/www/extras/tinymce2/docs/plugin_contextmenu.html
@@ -35,7 +35,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_directionality.html b/www/extras/tinymce2/docs/plugin_directionality.html
index 2eaca168c..c5c986dcd 100644
--- a/www/extras/tinymce2/docs/plugin_directionality.html
+++ b/www/extras/tinymce2/docs/plugin_directionality.html
@@ -36,7 +36,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_emotions.html b/www/extras/tinymce2/docs/plugin_emotions.html
index f178f7398..ae2556363 100644
--- a/www/extras/tinymce2/docs/plugin_emotions.html
+++ b/www/extras/tinymce2/docs/plugin_emotions.html
@@ -45,7 +45,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_flash.html b/www/extras/tinymce2/docs/plugin_flash.html
index f0447d83d..77d6c16a4 100644
--- a/www/extras/tinymce2/docs/plugin_flash.html
+++ b/www/extras/tinymce2/docs/plugin_flash.html
@@ -71,7 +71,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_fullscreen.html b/www/extras/tinymce2/docs/plugin_fullscreen.html
index b6b1832e0..6acc3329d 100644
--- a/www/extras/tinymce2/docs/plugin_fullscreen.html
+++ b/www/extras/tinymce2/docs/plugin_fullscreen.html
@@ -50,7 +50,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_iespell.html b/www/extras/tinymce2/docs/plugin_iespell.html
index dfc6f7f88..5137218cf 100644
--- a/www/extras/tinymce2/docs/plugin_iespell.html
+++ b/www/extras/tinymce2/docs/plugin_iespell.html
@@ -37,7 +37,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_inlinepopups.html b/www/extras/tinymce2/docs/plugin_inlinepopups.html
index 9e6af0473..61a2a2388 100644
--- a/www/extras/tinymce2/docs/plugin_inlinepopups.html
+++ b/www/extras/tinymce2/docs/plugin_inlinepopups.html
@@ -28,7 +28,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_insertdatetime.html b/www/extras/tinymce2/docs/plugin_insertdatetime.html
index 5a5e95d18..0cd07c362 100644
--- a/www/extras/tinymce2/docs/plugin_insertdatetime.html
+++ b/www/extras/tinymce2/docs/plugin_insertdatetime.html
@@ -99,7 +99,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_noneditable.html b/www/extras/tinymce2/docs/plugin_noneditable.html
index fb4dbd5ee..3826bc4c4 100644
--- a/www/extras/tinymce2/docs/plugin_noneditable.html
+++ b/www/extras/tinymce2/docs/plugin_noneditable.html
@@ -46,7 +46,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_paste.html b/www/extras/tinymce2/docs/plugin_paste.html
index d1269dd9e..d42e93c86 100644
--- a/www/extras/tinymce2/docs/plugin_paste.html
+++ b/www/extras/tinymce2/docs/plugin_paste.html
@@ -39,8 +39,25 @@ tinyMCE.init({
paste_auto_cleanup_on_paste : true,
paste_convert_middot_lists : false,
paste_unindented_list_class : "unindentedList",
- paste_convert_headers_to_strong : true
+ paste_convert_headers_to_strong : true,
+ paste_insert_word_content_callback : "convertWord"
});
+
+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.toLowerCase(); // Some dummy logic
+ break;
+ }
+
+ return content;
+}
@@ -59,7 +76,7 @@ tinyMCE.init({
| [paste_use_dialog] |
- MSIE specific option, if you set this to false both Mozilla and MSIE will present a paste dialog. If you set it to true pasting in MSIE will be done directly. This option is set to false by default. |
+ MSIE specific option, if you set this to true both Mozilla and MSIE will present a paste dialog. If you set it to false pasting in MSIE will be done directly. This option is set to false by default. |
| [paste_auto_cleanup_on_paste] |
@@ -77,6 +94,14 @@ tinyMCE.init({
[paste_convert_headers_to_strong] |
This feature converts H1-6 elements to strong elements on paste, this is feature is disabled by default. |
+
+ | [paste_remove_spans] |
+ This enables you to control if the word parse operation should remove or keep span elements, they will be removed by default. |
+
+
+ | [paste_remove_styles] |
+ This enables you to control if the word parse operation should remove or keep style attributes, they will be removed by default. |
+
| [paste_replace_list] |
Comma separated list of search/replace chunks. Where even items is the regexp that is to be used for the search and odd values are the contents that are to be replaced.
@@ -94,6 +119,11 @@ tinyMCE.init({
|
+
+ | [paste_insert_word_content_callback] |
+ This option enables you to specify a callback function. This callback is executed when the user pastes word content, the return value of this function will be the new content string. Check the example above for more details.
+ |
+
@@ -101,7 +131,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_preview.html b/www/extras/tinymce2/docs/plugin_preview.html
index 487bc5eb2..9bba87415 100644
--- a/www/extras/tinymce2/docs/plugin_preview.html
+++ b/www/extras/tinymce2/docs/plugin_preview.html
@@ -58,7 +58,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_print.html b/www/extras/tinymce2/docs/plugin_print.html
index 797854e15..696f12391 100644
--- a/www/extras/tinymce2/docs/plugin_print.html
+++ b/www/extras/tinymce2/docs/plugin_print.html
@@ -37,7 +37,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_save.html b/www/extras/tinymce2/docs/plugin_save.html
index 87c1c81f9..c42bde11d 100644
--- a/www/extras/tinymce2/docs/plugin_save.html
+++ b/www/extras/tinymce2/docs/plugin_save.html
@@ -20,7 +20,26 @@
Add the ltr, rtl button names to button list, example: theme_advanced_buttons3_add : "save".
+
+
+
Options
+
+
+
+
+ | [save_enablewhendirty] |
+ If you set this option to true, the edit button will be disabled/dimmed until modifications are made. This is disabled by default. |
+
+
+ | [onchange_callback] |
+ This option enables you to add a custom function to be called when the save button/command is invoked. This is not used by default. |
+
+
+
+
+
Initialization Example
+
@@ -28,7 +47,9 @@ tinyMCE.init({
theme : "advanced",
mode : "textareas",
plugins : "save",
- theme_advanced_buttons3_add : "save"
+ theme_advanced_buttons3_add : "save",
+ save_enablewhendirty : true,
+ onchange_callback : "mysave"
});
@@ -36,7 +57,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_searchreplace.html b/www/extras/tinymce2/docs/plugin_searchreplace.html
index 9914dfeb7..0538fde22 100644
--- a/www/extras/tinymce2/docs/plugin_searchreplace.html
+++ b/www/extras/tinymce2/docs/plugin_searchreplace.html
@@ -36,7 +36,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_table.html b/www/extras/tinymce2/docs/plugin_table.html
index 7e525ca7e..7706f97a9 100644
--- a/www/extras/tinymce2/docs/plugin_table.html
+++ b/www/extras/tinymce2/docs/plugin_table.html
@@ -59,6 +59,9 @@
| table_styles | This option should contain a semicolon separated list of class titles and class names separated by =. The titles are the ones that get presented to the user in the styles drop down list and and the class names is the classes that gets inserted. |
| table_cell_styles | This option should contain a semicolon separated list of class titles and class names separated by =. The titles are the ones that get presented to the user in the styles drop down list and and the class names is the classes that gets inserted. |
| table_row_styles | This option should contain a semicolon separated list of class titles and class names separated by =. The titles are the ones that get presented to the user in the styles drop down list and and the class names is the classes that gets inserted. |
+
| table_cell_limit | Enables you to specify the max number of cells for a table. |
+
| table_row_limit | Enables you to specify the max number of rows for a table. |
+
| table_col_limit | Enables you to specify the max number of columns for a table. |
@@ -82,7 +85,10 @@ tinyMCE.init({
theme_advanced_buttons3_add : "
tablecontrols",
table_styles : "Header 1=header1;Header 2=header2;Header 3=header3",
table_cell_styles : "Header 1=header1;Header 2=header2;Header 3=header3;Table Cell=tableCel1",
- table_row_styles : "Header 1=header1;Header 2=header2;Header 3=header3;Table Row=tableRow1"
+ table_row_styles : "Header 1=header1;Header 2=header2;Header 3=header3;Table Row=tableRow1",
+ table_cell_limit : 100,
+ table_row_limit : 5,
+ table_col_limit : 5
});
@@ -90,7 +96,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/plugin_zoom.html b/www/extras/tinymce2/docs/plugin_zoom.html
index d27844ade..93f7b06b2 100644
--- a/www/extras/tinymce2/docs/plugin_zoom.html
+++ b/www/extras/tinymce2/docs/plugin_zoom.html
@@ -36,7 +36,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/reference_buttons.html b/www/extras/tinymce2/docs/reference_buttons.html
index 1da568a55..6cd62997d 100644
--- a/www/extras/tinymce2/docs/reference_buttons.html
+++ b/www/extras/tinymce2/docs/reference_buttons.html
@@ -43,6 +43,10 @@
code
hr
removeformat
+ formatselect
+ fontselect
+ fontsizeselect
+ styleselect
sub
sup
forecolor
@@ -61,14 +65,25 @@
iespell
preview
print
-
save
zoom
fullscreen
+
advhr
+
fullpage
+
spellchecker
Plugins with custom buttons
@@ -100,7 +103,10 @@
init_instance_callback
file_browser_callback
cleanup_callback
+
handle_event_callback
+
execcommand_callback
oninit
+
onpageload
Layout
@@ -123,6 +129,7 @@
custom_undo_redo
custom_undo_redo_levels
custom_undo_redo_keyboard_shortcuts
+
custom_undo_redo_restore_selection
File lists
@@ -205,7 +212,7 @@ tinyMCE.init({
diff --git a/www/extras/tinymce2/docs/reference_javascript_functions.html b/www/extras/tinymce2/docs/reference_javascript_functions.html
index 3b936b9f3..a0aedc3b6 100644
--- a/www/extras/tinymce2/docs/reference_javascript_functions.html
+++ b/www/extras/tinymce2/docs/reference_javascript_functions.html
@@ -223,8 +223,9 @@ Example:
-
tinyMCE.insertLink(href, target);
-
+
(Deprecated) tinyMCE.insertLink(href, target);
+
This method is deprecated and removed as of 2.0.3. Use tinyMCE.execCommand('mceInsertContent',false,'custom html'); instead and tinyMCE.getInstanceById('<inst>').selection.getFocusElement() to retrive/update the selected element.
+
But if you realy need the old function it's marked internal but is available in the advanced theme and you can call it by using tinyMCE.themes['advanced']._insertLink(href, target);. But the recommended way is to modify your code to use the logic above.
This method inserts a link a the cursor position of the selected editor instance or updates the selected link with new data. This method should be called upon "ok" in the insertLink popup when you create custom themes.
@@ -248,7 +249,8 @@ Example:
Returns: Nothing
-tinyMCE.insertImage(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout);
+(Deprecated) tinyMCE.insertImage(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout);
+
This method is deprecated and removed as of 2.0.3. Use tinyMCE.execCommand('mceInsertContent',false,'custom html'); instead or if you realy need the old function it's marked internal but is available in the advanced theme and you can call it by using tinyMCE.themes['advanced']._insertImage(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout);. But the recommended way is to modify your code to use the logic above.
This method inserts a image a the cursor position of the selected editor instance or updates the selected image with new data. This method should be called upon "ok" in the insertImage popup when you create custom themes.
@@ -379,7 +381,7 @@ This method returns a editor instance by editor id.
-Returns: TinyMCE Editor instance (TinyMCEControl).
+Returns: TinyMCE Editor instance (TinyMCE_Control).
tinyMCE.importThemeLanguagePack([theme]);
@@ -587,7 +589,7 @@ Returns: TinyMCE configuration parameter.
diff --git a/www/extras/tinymce2/docs/reference_plugins.html b/www/extras/tinymce2/docs/reference_plugins.html
index 4e44d14d7..91521ab88 100644
--- a/www/extras/tinymce2/docs/reference_plugins.html
+++ b/www/extras/tinymce2/docs/reference_plugins.html
@@ -48,7 +48,10 @@
zoom
directionality
fullscreen
+
fullpage
inlinepopups
+
fullpage
+
spellchecker
@@ -65,7 +68,7 @@
diff --git a/www/extras/tinymce2/examples/example_advanced.htm b/www/extras/tinymce2/examples/example_advanced.htm
index 7dacef689..c22339310 100644
--- a/www/extras/tinymce2/examples/example_advanced.htm
+++ b/www/extras/tinymce2/examples/example_advanced.htm
@@ -9,8 +9,6 @@
theme : "advanced",
mode : "exact",
elements : "elm1,elm2",
- //insertlink_callback : "customInsertLink",
- //insertimage_callback : "customInsertImage",
save_callback : "customSave",
content_css : "example_advanced.css",
extended_valid_elements : "a[href|target|name]",
@@ -18,46 +16,39 @@
theme_advanced_buttons3_add_before : "tablecontrols,separator",
//invalid_elements : "a",
theme_advanced_styles : "Header 1=header1;Header 2=header2;Header 3=header3;Table Row=tableRow1", // Theme specific setting CSS classes
+ //execcommand_callback : "myCustomExecCommandHandler",
debug : false
});
- // Custom insert link callback, extends the link function
- function customInsertLink(href, target) {
- var result = new Array();
+ // Custom event handler
+ function myCustomExecCommandHandler(editor_id, elm, command, user_interface, value) {
+ var linkElm, imageElm, inst;
- alert("customInsertLink called href: " + href + " target: " + target);
+ switch (command) {
+ case "mceLink":
+ inst = tinyMCE.getInstanceById(editor_id);
+ linkElm = tinyMCE.getParentElement(inst.selection.getFocusElement(), "a");
- result['href'] = "http://www.sourceforge.net";
- result['target'] = '_blank';
+ if (linkElm)
+ alert("Link dialog has been overriden. Found link href: " + tinyMCE.getAttrib(linkElm, "href"));
+ else
+ alert("Link dialog has been overriden.");
- return result;
- }
+ return true;
- // Custom insert image callback, extends the image function
- function customInsertImage(src, alt, border, hspace, vspace, width, height, align) {
- var result = new Array();
+ case "mceImage":
+ inst = tinyMCE.getInstanceById(editor_id);
+ imageElm = tinyMCE.getParentElement(inst.selection.getFocusElement(), "img");
- var debug = "CustomInsertImage called:\n"
- debug += "src: " + src + "\n";
- debug += "alt: " + alt + "\n";
- debug += "border: " + border + "\n";
- debug += "hspace: " + hspace + "\n";
- debug += "vspace: " + vspace + "\n";
- debug += "width: " + width + "\n";
- debug += "height: " + height + "\n";
- debug += "align: " + align + "\n";
- alert(debug);
+ if (imageElm)
+ alert("Image dialog has been overriden. Found image src: " + tinyMCE.getAttrib(imageElm, "src"));
+ else
+ alert("Image dialog has been overriden.");
- result['src'] = "logo.jpg";
- result['alt'] = "test description";
- result['border'] = "2";
- result['hspace'] = "5";
- result['vspace'] = "5";
- result['width'] = width;
- result['height'] = height;
- result['align'] = "right";
+ return true;
+ }
- return result;
+ return false; // Pass to next handler in chain
}
// Custom save callback, gets called when the contents is to be submitted
@@ -100,9 +91,9 @@ Some custom actions:
[Bold] |
[Italic]
[Insert some HTML]
-
[Replace selection]
+
[Replace selection]
-
\ No newline at end of file
+
diff --git a/www/extras/tinymce2/examples/example_full.htm b/www/extras/tinymce2/examples/example_full.htm
index e6a8cea0a..0024f546e 100644
--- a/www/extras/tinymce2/examples/example_full.htm
+++ b/www/extras/tinymce2/examples/example_full.htm
@@ -7,28 +7,26 @@
tinyMCE.init({
mode : "textareas",
theme : "advanced",
- plugins : "table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,zoom,flash,searchreplace,print,paste,directionality,fullscreen,noneditable,contextmenu",
+ plugins : "table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,zoom,flash,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable",
theme_advanced_buttons1_add_before : "save,newdocument,separator",
theme_advanced_buttons1_add : "fontselect,fontsizeselect",
- theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor,liststyle",
+ theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,separator,forecolor,backcolor",
theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator",
theme_advanced_buttons3_add_before : "tablecontrols,separator",
theme_advanced_buttons3_add : "emotions,iespell,flash,advhr,separator,print,separator,ltr,rtl,separator,fullscreen",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
- theme_advanced_statusbar_location : "bottom",
+ theme_advanced_path_location : "bottom",
content_css : "example_full.css",
plugin_insertdate_dateFormat : "%Y-%m-%d",
plugin_insertdate_timeFormat : "%H:%M:%S",
- extended_valid_elements : "hr[class|width|size|noshade]",
+ extended_valid_elements : "hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
external_link_list_url : "example_link_list.js",
external_image_list_url : "example_image_list.js",
flash_external_list_url : "example_flash_list.js",
file_browser_callback : "fileBrowserCallBack",
- paste_use_dialog : false,
- theme_advanced_resizing : true,
theme_advanced_resize_horizontal : false,
- theme_advanced_link_targets : "_something=My somthing;_something2=My somthing2;_something3=My somthing3;"
+ theme_advanced_resizing : true
});
function fileBrowserCallBack(field_name, url, type, win) {
@@ -62,4 +60,4 @@