extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-21 02:18:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

W.I.P. implementing TinyMCE editor and deprecating CKEditor:

Browse Source 
- Fix image upload via old file_selector for etemplate apps
This commit is contained in:
Hadi Nategh 2018-10-25 15:31:41 +02:00
parent 39944322b5
commit b00b37efa8
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
api/src/Html.php
View File

@ -442,6 +442,9 @@ class Html
static function fckEditor($_name, $_content, $_mode, $_options=array('toolbar_expanded' =>'true'), static function fckEditor($_name, $_content, $_mode, $_options=array('toolbar_expanded' =>'true'),
$_height='400px', $_width='100%',$_start_path='',$_purify=true, $_focusToBody=false, $_executeJSAfterInit='') $_height='400px', $_width='100%',$_start_path='',$_purify=true, $_focusToBody=false, $_executeJSAfterInit='')
{ {
//not used anymore but defined in function signature
unset ($_options);
if (!self::htmlarea_availible() || $_mode == 'ascii') if (!self::htmlarea_availible() || $_mode == 'ascii')
{ {
return self::textarea($_name,$_content,'style="width: '.$_width.'; height: '.$_height.';" id="'.htmlspecialchars($_name).'"'); return self::textarea($_name,$_content,'style="width: '.$_width.'; height: '.$_height.';" id="'.htmlspecialchars($_name).'"');
@ -490,9 +493,31 @@ tinymce.init({
browser_spellcheck: true, browser_spellcheck: true,
contextmenu: false, contextmenu: false,
file_picker_callback: function(_callback, _value, _meta){ file_picker_callback: function(_callback, _value, _meta){
var callback = _callback;
var attrs = {
menuaction: "filemanager.filemanager_select.select",
mode: "open",
method: "download_url",
path: "'. $_start_path.'"
};
// Open the filemanager select in a popup
var popup = egw(window).open_link(
egw().link("/index.php", attrs),
"link_existing",
"680x400"
);
if(popup)
{
// Safari and IE lose reference to global variables after window close
// Try to get updated data before window is closed then later we trigger
// change event on widget
egw().window.setTimeout(function(){
jQuery(popup).bind("unload",function(){
callback(this.selected_files, {alt:this.selected_files});
});
},1000);
}
}, },
init_instance_callback : function(_editor){ init_instance_callback : function(_editor){
console.log(_editor); console.log(_editor);

10
filemanager/inc/class.filemanager_select.inc.php
View File

@ -195,7 +195,15 @@ class filemanager_select
if ($content['method'] && $content['method'] != 'ckeditor_return') if ($content['method'] && $content['method'] != 'ckeditor_return')
{ {
$js = ExecMethod2($content['method'],$content['id'],$files); if ($content['method'] == 'download_url' && !is_array($files))
{
$files = Vfs::download_url($files);
if ($files[0] == '/') $files = Egw::link($files);
}
else
{
$js = ExecMethod2($content['method'],$content['id'],$files);
}
} }
else if ($content['method'] == 'ckeditor_return') else if ($content['method'] == 'ckeditor_return')
{ {