diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-10-04 20:59:33 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-10-04 20:59:33 -0700 |
| commit | 2be122cb5032567e88bb926b8aac250fd488cf68 (patch) | |
| tree | d8900899a18f29d39c39380bec119823f38f34e5 /mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js | |
| parent | 34a7e57ef205362d6c093fa7234ca38977560bea (diff) | |
| download | elgg-2be122cb5032567e88bb926b8aac250fd488cf68.tar.gz elgg-2be122cb5032567e88bb926b8aac250fd488cf68.tar.bz2 | |
Refs #3853. Upgraded TinyMCE to 3.4.6. Embed still inserts the content in the wrong place for IE 8.
Diffstat (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js')
| -rw-r--r-- | mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js index 4917edc53..604da8b42 100644 --- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js +++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js @@ -30,10 +30,13 @@ ed.onKeyDown.add(function(ed, e) { if (e.keyCode == 13) return t.handleEnter(ed); - if (e.shiftKey && e.keyCode == 48) - return t.handleEclipse(ed); }); + ed.onKeyPress.add(function(ed, e) { + if (e.which == 41) + return t.handleEclipse(ed); + }); + // Add a key up handler ed.onKeyUp.add(function(ed, e) { if (e.keyCode == 32) @@ -132,7 +135,7 @@ bookmark = ed.selection.getBookmark(); ed.selection.setRng(r); - tinyMCE.execCommand('mceInsertLink',false, matches[1] + matches[2]); + tinyMCE.execCommand('createlink',false, matches[1] + matches[2]); ed.selection.moveToBookmark(bookmark); // TODO: Determine if this is still needed. |