diff --git a/api/js/etemplate/et2_core_widget.js b/api/js/etemplate/et2_core_widget.js index 6cfce254bf..d9795d2b21 100644 --- a/api/js/etemplate/et2_core_widget.js +++ b/api/js/etemplate/et2_core_widget.js @@ -152,6 +152,16 @@ var et2_widget = (function(){ "use strict"; return ClassWithAttributes.extend( */ "readonly": { "ignore": true + }, + + /** + * Widget's attributes + */ + attributes: { + "name": "Widget attributes", + "type": "any", + "ignore": true, + "description": "Object of widget attributes" } }, @@ -188,6 +198,10 @@ var et2_widget = (function(){ "use strict"; return ClassWithAttributes.extend( _attrs = {}; } + if (_attrs.attributes) + { + jQuery.extend(_attrs, _attrs.attributes); + } // Initialize all important parameters this._mgrs = {}; this._inst = null; diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php index 1b816dcaab..f1f4bd7917 100644 --- a/mail/inc/class.mail_hooks.inc.php +++ b/mail/inc/class.mail_hooks.inc.php @@ -410,7 +410,14 @@ class mail_hooks 'label' => 'Toggled on actions', 'help' => 'List of actions to be switched/activated on by default', 'name' => 'toggledOnActions', - 'values' => $toggledOnActions + 'values' => '', + 'attributes' => array( + 'allowFreeEntries' => false, + //'multiple' => 'toggle', + 'editModeEnabled' => false, + 'autocomplete_url' => ' ', + 'select_options' => $toggledOnActions + ) ) ); if (!$GLOBALS['egw_info']['apps']['stylite']) unset($settingsArray['attachVCardAtCompose']); diff --git a/preferences/inc/class.preferences_settings.inc.php b/preferences/inc/class.preferences_settings.inc.php index 7aeea118b1..28b9bab1f3 100644 --- a/preferences/inc/class.preferences_settings.inc.php +++ b/preferences/inc/class.preferences_settings.inc.php @@ -451,6 +451,7 @@ class preferences_settings 'help' => lang($setting['help']), // is html 'default' => (string)$default !== '' ? lang('Default').': '.$default : null, 'onchange' => $setting['onchange'], + 'attributes' => $setting['attributes'] ); //error_log("appname=$appname, attribute=$attribute, setting=".array2string($setting)); $content[$tab][$setting['name']] = $GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']]; diff --git a/preferences/templates/default/settings.xet b/preferences/templates/default/settings.xet index c3e454a473..fd2f23dfa2 100644 --- a/preferences/templates/default/settings.xet +++ b/preferences/templates/default/settings.xet @@ -15,7 +15,7 @@ - +