aboutsummaryrefslogtreecommitdiffstats
path: root/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-20 20:47:31 -0700
committerfriendica <info@friendica.com>2012-03-20 20:47:31 -0700
commitf55779fd831029f764c885bf1fd026a7e94f08eb (patch)
tree8a441c0bc5f519f7cf303e5065cba750141b05a8 /library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
parent810e69ef0a88a959ce9f5358377cdc1c7d4bd53a (diff)
downloadvolse-hubzilla-f55779fd831029f764c885bf1fd026a7e94f08eb.tar.gz
volse-hubzilla-f55779fd831029f764c885bf1fd026a7e94f08eb.tar.bz2
volse-hubzilla-f55779fd831029f764c885bf1fd026a7e94f08eb.zip
update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
Diffstat (limited to 'library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js')
-rw-r--r--[-rwxr-xr-x]library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
index e3b078bfa..d492fbefe 100755..100644
--- a/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
@@ -17,7 +17,7 @@
// Register commands
ed.addCommand('mceNonBreaking', function() {
- ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span class="mceItemHidden mceVisualNbsp">&middot;</span>' : '&nbsp;');
+ ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>' : '&nbsp;');
});
// Register buttons
@@ -25,11 +25,12 @@
if (ed.getParam('nonbreaking_force_tab')) {
ed.onKeyDown.add(function(ed, e) {
- if (tinymce.isIE && e.keyCode == 9) {
+ if (e.keyCode == 9) {
+ e.preventDefault();
+
ed.execCommand('mceNonBreaking');
ed.execCommand('mceNonBreaking');
ed.execCommand('mceNonBreaking');
- tinymce.dom.Event.cancel(e);
}
});
}