diff options
author | Thomas Willingham <founder@kakste.com> | 2012-03-26 20:17:01 +0100 |
---|---|---|
committer | Thomas Willingham <founder@kakste.com> | 2012-03-26 20:17:01 +0100 |
commit | 286c230fa858b7b1fead9c3ff722f6b1b9478d01 (patch) | |
tree | 463f0d075f9593a4d513aa91e08ebc896b00779a /library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js | |
parent | 64a2b00cdc97e40ac8e9dc8f0b9cdc5d78cdf2c2 (diff) | |
parent | 0a3f2bdd5bc51d7fc642f431843a5b13287ae94e (diff) | |
download | volse-hubzilla-286c230fa858b7b1fead9c3ff722f6b1b9478d01.tar.gz volse-hubzilla-286c230fa858b7b1fead9c3ff722f6b1b9478d01.tar.bz2 volse-hubzilla-286c230fa858b7b1fead9c3ff722f6b1b9478d01.zip |
Merge remote-tracking branch 'main/master'
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.js | 7 |
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">·</span>' : ' ');
+ ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span data-mce-bogus="1" class="mceItemHidden mceItemNbsp"> </span>' : ' ');
});
// 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);
}
});
}
|