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 b72375660c317531a795b8c070c86a9c6516b4fa..d492fbefe4190c7bed16ef668b7c941403dd7be0 100644 (file)
--- a/webcit/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
+++ b/webcit/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
@@ -1,8 +1,11 @@
 /**\r
- * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $\r
+ * editor_plugin_src.js\r
  *\r
- * @author Moxiecode\r
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.\r
+ * Copyright 2009, Moxiecode Systems AB\r
+ * Released under LGPL License.\r
+ *\r
+ * License: http://tinymce.moxiecode.com/license\r
+ * Contributing: http://tinymce.moxiecode.com/contributing\r
  */\r
 \r
 (function() {\r
@@ -14,7 +17,7 @@
 \r
                        // Register commands\r
                        ed.addCommand('mceNonBreaking', function() {\r
-                               ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span class="mceItemHidden mceVisualNbsp">&middot;</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
@@ -22,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