Upgrade TinyMCE to v3.4.5

[citadel.git] / webcit / tiny_mce / plugins / nonbreaking / editor_plugin_src.js

diff --git a/webcit/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/webcit/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
index ca83ee26e5418216f5eccbb09885521595c3c32a..d492fbefe4190c7bed16ef668b7c941403dd7be0 100644 (file)
--- a/webcit/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
+++ b/webcit/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
@@ -17,7 +17,7 @@
 \r
                        // Register commands\r
                        ed.addCommand('mceNonBreaking', function() {\r
-                               ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span _mce_bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>' : '&nbsp;');\r
+                               ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>' : '&nbsp;');\r
                        });\r
 \r
                        // Register buttons\r
@@ -25,11 +25,12 @@
 \r
                        if (ed.getParam('nonbreaking_force_tab')) {\r
                                ed.onKeyDown.add(function(ed, e) {\r
-                                       if (tinymce.isIE && e.keyCode == 9) {\r
+                                       if (e.keyCode == 9) {\r
+                                               e.preventDefault();\r
+       \r
                                                ed.execCommand('mceNonBreaking');\r
                                                ed.execCommand('mceNonBreaking');\r
                                                ed.execCommand('mceNonBreaking');\r
-                                               tinymce.dom.Event.cancel(e);\r
                                        }\r
                                });\r
                        }\r