Menu
▾
▴
[eGroupWare-svn] r42605 - in /trunk/etemplate: inc/class.etemplate_widget_nextmatch.inc.php js/et2_widget_tree.js
|
From: <nat...@us...> - 2013-05-29 19:12:22
|
Author: nathangray Date: Wed May 29 21:12:14 2013 New Revision: 42605 URL: http://svn.stylite.de/viewvc/egroupware?rev=42605&view=rev Log: Change some indenting Modified: trunk/etemplate/inc/class.etemplate_widget_nextmatch.inc.php trunk/etemplate/js/et2_widget_tree.js Modified: trunk/etemplate/inc/class.etemplate_widget_nextmatch.inc.php URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/inc/class.etemplate_widget_nextmatch.inc.php?rev=42605&r1=42604&r2=42605&view=diff ============================================================================== --- trunk/etemplate/inc/class.etemplate_widget_nextmatch.inc.php (original) +++ trunk/etemplate/inc/class.etemplate_widget_nextmatch.inc.php Wed May 29 21:12:14 2013 @@ -21,15 +21,15 @@ * 'no_filter' => True// I disable the 1. filter * 'no_filter2' => True// I disable the 2. filter (params are the same as for filter) * 'no_cat' => True// I disable the cat-selectbox - * 'cat_app' => // I application the cat's should be from, default app in get_rows - * 'cat_is_select' => // I true||'no_lang' use selectbox instead of category selection, default null + * 'cat_app' => // I application the cat's should be from, default app in get_rows + * 'cat_is_select' => // I true||'no_lang' use selectbox instead of category selection, default null * 'template' => // I template to use for the rows, if not set via options * 'header_left' => // I template to show left of the range-value, left-aligned (optional) * 'header_right' => // I template to show right of the range-value, right-aligned (optional) * 'bottom_too' => True// I show the nextmatch-line (arrows, filters, search, ...) again after the rows * 'never_hide' => True// I never hide the nextmatch-line if less then maxmatch entries - * 'lettersearch' => True// I show a lettersearch - * 'searchletter' => // IO active letter of the lettersearch or false for [all] + * 'lettersearch' => True// I show a lettersearch + * 'searchletter' => // IO active letter of the lettersearch or false for [all] * 'start' => // IO position in list * 'num_rows' => // IO number of rows to show, defaults to maxmatches from the general prefs * 'cat_id' => // IO category, if not 'no_cat' => True @@ -53,8 +53,8 @@ * 'columnselection-pref' => // I name of the preference (plus 'nextmatch-' prefix), default = template-name * 'default_cols' => // I columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns * 'options-selectcols' => // I array with name/label pairs for the column-selection, this gets autodetected by default. A name => false suppresses a column completly. - * 'return' => // IO allows to return something from the get_rows function if $query is a var-param! - * 'csv_fields' => // I false=disable csv export, true or unset=enable it with auto-detected fieldnames or preferred importexport definition, + * 'return' => // IO allows to return something from the get_rows function if $query is a var-param! + * 'csv_fields' => // I false=disable csv export, true or unset=enable it with auto-detected fieldnames or preferred importexport definition, * array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type) * or name of import/export definition * 'row_id' => // I key into row content to set it's value as row-id, eg. 'id' Modified: trunk/etemplate/js/et2_widget_tree.js URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/et2_widget_tree.js?rev=42605&r1=42604&r2=42605&view=diff ============================================================================== --- trunk/etemplate/js/et2_widget_tree.js (original) +++ trunk/etemplate/js/et2_widget_tree.js Wed May 29 21:12:14 2013 @@ -164,45 +164,45 @@ onclick: function(_node) {}, createTree: function(widget) { - widget.input = new dhtmlXTreeObject({ - parent: widget.div[0], - width: '100%', - height: '100%', - image_path: widget.options.image_path, - checkbox: widget.options.multiple, - }); - // attach all event handlers (attributs starting with "on"), if they are set - for(var name in widget.options) - { - if (name.substr(0,2) == 'on' && widget.options[name]) - { - // automatic convert onChange event to oncheck or onSelect depending on multiple is used or not - if (name == 'onchange') name = widget.options.multiple ? 'oncheck' : 'onselect'; - widget.input.attachEvent(widget.attributes[name].name, function(_args){ - var _widget = widget; // closure to pass in et2 widget (1. param of event handler) - // use widget attributes to pass arguments and name of event to handler - _widget.event_args = arguments; - _widget.event_name = this.callEvent.arguments[0].substr(3); - var _js = _widget.options[_widget.event_name] || _widget.options.onchange; - (et2_compileLegacyJS(_js, _widget, this))(); - delete _widget.event_args; - delete _widget.event_name; - }); - - } - } - if (widget.options.autoloading) - { - var url = widget.options.autoloading; - if (url.charAt(0) != '/' && url.substr(0,4) != 'http') - { - url = '/json.php?menuaction='+url; - } - if (url.charAt(0) == '/') url = egw.webserverUrl+url; - this.autoloading_url = url; - widget.input.setXMLAutoLoading(url); - widget.input.setDataMode('JSON'); - } + widget.input = new dhtmlXTreeObject({ + parent: widget.div[0], + width: '100%', + height: '100%', + image_path: widget.options.image_path, + checkbox: widget.options.multiple, + }); + // attach all event handlers (attributs starting with "on"), if they are set + for(var name in widget.options) + { + if (name.substr(0,2) == 'on' && widget.options[name]) + { + // automatic convert onChange event to oncheck or onSelect depending on multiple is used or not + if (name == 'onchange') name = widget.options.multiple ? 'oncheck' : 'onselect'; + widget.input.attachEvent(widget.attributes[name].name, function(_args){ + var _widget = widget; // closure to pass in et2 widget (1. param of event handler) + // use widget attributes to pass arguments and name of event to handler + _widget.event_args = arguments; + _widget.event_name = this.callEvent.arguments[0].substr(3); + var _js = _widget.options[_widget.event_name] || _widget.options.onchange; + (et2_compileLegacyJS(_js, _widget, this))(); + delete _widget.event_args; + delete _widget.event_name; + }); + + } + } + if (widget.options.autoloading) + { + var url = widget.options.autoloading; + if (url.charAt(0) != '/' && url.substr(0,4) != 'http') + { + url = '/json.php?menuaction='+url; + } + if (url.charAt(0) == '/') url = egw.webserverUrl+url; + this.autoloading_url = url; + widget.input.setXMLAutoLoading(url); + widget.input.setDataMode('JSON'); + } }, set_select_options: function(options) { |