mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

MDL-24932 Fixed regression caused by the previous commit

Browse Source 
To reproduce it, I just added a smiley via the popup and inserted some
character directly afterwards. While the smiley img was saved, the text
was not 8-o (it even did not appear in the HTML source view of the
editor before the save).
This commit is contained in:
David Mudrak 2010-10-29 22:51:51 +00:00
parent d504aeba97
commit 2bd56a246f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/editor/tinymce/tiny_mce/3.3.9.2/plugins/moodleemoticon/js/dialog.js
View File

@ -3,7 +3,7 @@ var MoodleEmoticonDialog = {
bookmark : null,
init : function() {
this.bookmark = tinyMCEPopup.editor.selection.getBookmark();
this.bookmark = tinyMCEPopup.editor.selection.getBookmark(1, true);
// register event handlers for the table rows
tinymce.each(tinymce.DOM.select('tr.emoticoninfo', document), function(row) {
@ -36,7 +36,7 @@ var MoodleEmoticonDialog = {
if (i == index) {
tinyMCEPopup.editor.selection.moveToBookmark(this.bookmark);
tinyMCEPopup.editor.execCommand('mceInsertContent', false, emoticons[emoticon]);
this.bookmark = tinyMCEPopup.editor.selection.getBookmark();
this.bookmark = tinyMCEPopup.editor.selection.getBookmark(1, true);
tinyMCEPopup.close();
return;
}