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

fixed ckeditor wont start with NOT expanded toolbar

Browse Source
This commit is contained in:
Ralf Becker 2013-11-04 10:13:28 +00:00
parent c1bd68281c
commit 1dd3ad5e0a
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/inc/class.xul_io.inc.php
View File

@ -106,7 +106,7 @@ class xul_io
'size' => 'image,ro_image' 'size' => 'image,ro_image'
), ),
'htmlarea' => array( 'htmlarea' => array(
'size' => 'mode,height,width,toolbar,base_href', 'size' => 'mode,height,width,expand_toolbar,base_href',
), ),
'nextmatch' => array( 'nextmatch' => array(
'size' => 'template,hide_header,header_left,header_right', 'size' => 'template,hide_header,header_left,header_right',

14
etemplate/js/et2_widget_htmlarea.js
View File

@ -27,7 +27,7 @@
var et2_htmlarea = et2_inputWidget.extend( var et2_htmlarea = et2_inputWidget.extend(
{ {
modes: ['ascii','simple','extended','advanced'], modes: ['ascii','simple','extended','advanced'],
attributes: { attributes: {
'mode': { 'mode': {
'name': 'Mode', 'name': 'Mode',
@ -48,7 +48,7 @@ var et2_htmlarea = et2_inputWidget.extend(
'expand_toolbar': { 'expand_toolbar': {
'name': 'Expand Toolbar', 'name': 'Expand Toolbar',
'default': true, 'default': true,
'type':'any', 'type':'boolean',
'description': 'Have the toolbar expanded (visible)' 'description': 'Have the toolbar expanded (visible)'
}, },
'base_href': { 'base_href': {
@ -71,7 +71,7 @@ var et2_htmlarea = et2_inputWidget.extend(
/** /**
* Constructor * Constructor
* *
* @param _parent * @param _parent
* @param _attrs * @param _attrs
* @memberOf et2_htmlarea * @memberOf et2_htmlarea
@ -87,7 +87,7 @@ var et2_htmlarea = et2_inputWidget.extend(
.addClass('et2_textbox_ro'); .addClass('et2_textbox_ro');
this.setDOMNode(this.htmlNode[0]); this.setDOMNode(this.htmlNode[0]);
}, },
transformAttributes: function(_attrs) { transformAttributes: function(_attrs) {
// Check mode, some apps jammed everything in there // Check mode, some apps jammed everything in there
@ -102,11 +102,11 @@ var et2_htmlarea = et2_inputWidget.extend(
} }
this._super.apply(this, arguments); this._super.apply(this, arguments);
}, },
doLoadingFinished: function() { doLoadingFinished: function() {
this._super.apply(this, arguments); this._super.apply(this, arguments);
if(this.mode == 'ascii') return; if(this.mode == 'ascii') return;
var self = this; var self = this;
var ckeditor; var ckeditor;
try try
@ -161,7 +161,7 @@ var et2_htmlarea = et2_inputWidget.extend(
} }
else else
{ {
this.htmlNode.val(_value); this.htmlNode.val(_value);
this.value = _value; this.value = _value;
} }
} catch (e) { } catch (e) {

5
phpgwapi/inc/class.egw_ckeditor_config.inc.php
View File

@ -224,7 +224,8 @@ class egw_ckeditor_config
$config['removePlugins'] = 'elementspath'; $config['removePlugins'] = 'elementspath';
$config['toolbarCanCollapse'] = true; $config['toolbarCanCollapse'] = true;
$config['toolbarStartupExpanded'] = $expanded_toolbar; $config['toolbarStartupExpanded'] = is_bool($expanded_toolbar) ? $expanded_toolbar :
($expanded_toolbar === 'false' ? false : (boolean)$expanded_toolbar);
$config['filebrowserBrowseUrl'] = self::get_filebrowserBrowseUrl($start_path); $config['filebrowserBrowseUrl'] = self::get_filebrowserBrowseUrl($start_path);
$config['filebrowserWindowHeight'] = 640; $config['filebrowserWindowHeight'] = 640;
@ -377,7 +378,7 @@ class egw_ckeditor_config
self::add_default_options($config, $height, $expanded_toolbar, $start_path); self::add_default_options($config, $height, $expanded_toolbar, $start_path);
self::add_spellchecker_options($config, $spellchecker_button, $scayt_button); self::add_spellchecker_options($config, $spellchecker_button, $scayt_button);
self::add_toolbar_options($config, $mode, $spellchecker_button, $scayt_button); self::add_toolbar_options($config, $mode, $spellchecker_button, $scayt_button);
//error_log(__METHOD__."('$mode', $height, ".array2string($expanded_toolbar).") returning ".array2string($config));
return $config; return $config;
} }