Index: trunk/core/admin_templates/js/catalog.js =================================================================== diff -u -N -r6093 -r6583 --- trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 6093) +++ trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 6583) @@ -6,7 +6,7 @@ this.ParentCategoryID = 0; this.OnResponceMethod = null; this.TabShift = isset($tab_shift) ? $tab_shift : 1; // start from 2nd tab (index starting from 0) - + this.TabRegistry = new Array(); this.ActivePrefix = getCookie(this.CookiePrefix + 'active_prefix'); this.PreviousPrefix = this.ActivePrefix; @@ -49,13 +49,13 @@ Catalog.prototype.submit_kernel_form = function($tab_id) { var $prefix = 'dummy'; var $result_div = ''; - + if (isset($tab_id)) { // responce result + progress are required $prefix = this.queryTabRegistry('tab_id', $tab_id, 'prefix'); $result_div = $tab_id + '_div'; } - + var $kf = document.getElementById($form_name); Request.params = Request.serializeForm($kf); @@ -75,11 +75,12 @@ window.location.href = $match_redirect[1]; return false; } - + $params = $params.split(','); - - + + var $js_end = $text.indexOf($object.Separator); +// alert($text.substring(0, $js_end)); if ($js_end != -1) { // allow to detect if output is permitted by ajax request parameters var $request_visible = '$request_visible = ' + ($params[0].length ? 'true' : 'false') + "\n"; @@ -95,12 +96,12 @@ else if ($params[0].length) { document.getElementById($params[0]).innerHTML = $text; } - + if (typeof($object.OnResponceMethod) == 'function') { $object.OnResponceMethod($object); $object.OnResponceMethod = null; } - + if (typeof($Debugger) != 'undefined') { $Debugger.Clear(); } @@ -115,7 +116,7 @@ if (typeof($OnResponceMethod) == 'function') { this.OnResponceMethod = $OnResponceMethod; } - + var $prev_template = get_hidden_field('t'); if (!isset($prefix_special)) $prefix_special = this.getCurrentPrefix(); var $tab_id = this.queryTabRegistry('prefix', $prefix_special, 'tab_id'); @@ -165,7 +166,7 @@ this.setItemCount(this.TabRegistry[$i]['prefix'], '?'); $i++; } - + if ($reset_content) { // set category for all tabs to -1 (forces reload next time) $i = this.TabShift; @@ -181,7 +182,7 @@ // active prefix is not registred -> cookie left, but not modules installed/enabled at the moment return false; } - + if (!isset($prefix)) $prefix = this.ActivePrefix; if (this.BusyRequest[$prefix]) { @@ -204,7 +205,7 @@ this.ShowDependentButtons(this.ActivePrefix); this.setViewMenu(this.ActivePrefix); setCookie(this.CookiePrefix + 'active_prefix', this.ActivePrefix); - + this.refreshTab($prefix, $div_id, $force); } @@ -267,7 +268,7 @@ else { alert('has form: ['+$tab_id + '_form'+']'); }*/ - + var $dep_buttons = this.queryTabRegistry('prefix', $prefix, 'dep_buttons'); var $i = 0; while ($i < $dep_buttons.length) {