holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix timestamper widget to deal with tinyMCE

Browse Source
This commit is contained in:
Hadi Nategh 2018-12-13 15:15:11 +01:00
parent 486f8e0b4b
commit bde724d29f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/js/etemplate/et2_widget_timestamper.js
View File

@ -110,7 +110,7 @@ var et2_timestamper = (function(){ "use strict"; return et2_button.extend([],
"standards" : (document.selection ? "ie" : false ) );
var pos = 0;
var CK = CKEDITOR && CKEDITOR.instances[input.id] || false;
var tinymce = tinyMCE && tinyMCE.EditorManager.get(input.id) || false;
// Find cursor or selection
if (browser == "ie")
@ -126,12 +126,9 @@ var et2_timestamper = (function(){ "use strict"; return et2_button.extend([],
};
// If CKEDitor, update it
if(CKEDITOR && CKEDITOR.instances[input.id])
if(tinymce)
{
CKEDITOR.instances[input.id].insertText(text);
window.setTimeout(function() {
CKEDITOR.instances[input.id].focus();
}, 10);
tinymce.insertContent(text);
}
else
{