Index: trunk/core/admin_templates/js/catalog.js =================================================================== diff -u -N -r5322 -r5326 --- trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5322) +++ trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5326) @@ -72,17 +72,26 @@ } $params = $params.split(','); - if ($params[0].length) { - var $js_end = $text.indexOf($object.Separator); - if ($js_end != -1) { + + + var $js_end = $text.indexOf($object.Separator); + 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"; + if ($params[0].length) { document.getElementById($params[0]).innerHTML = $text.substring($js_end + $object.Separator.length); - eval($text.substring(0, $js_end)); + eval($request_visible + $text.substring(0, $js_end)); } else { - document.getElementById($params[0]).innerHTML = $text; + // eval JS only & set mark that js should not use HTML as usual in grids + eval($request_visible + $text.substring(0, $js_end)); } } + else if ($params[0].length) { + document.getElementById($params[0]).innerHTML = $text; + } + if (typeof($Debugger) != 'undefined') { $Debugger.Clear(); }