Index: trunk/core/admin_templates/js/catalog.js
===================================================================
diff -u -N -r5048 -r5054
--- trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5048)
+++ trunk/core/admin_templates/js/catalog.js (.../catalog.js) (revision 5054)
@@ -73,23 +73,13 @@
document.getElementById($params[0]).innerHTML = $text;
}
- if ($params[0] != 'categories_div') {
- $Catalog.setViewMenu();
- }
-
if (isset($Debugger)) $Debugger.Clear();
}
Catalog.prototype.errorCallback = function($request, $params) {
alert('AJAX ERROR: ' + Request.getErrorHtml($request));
}
-Catalog.prototype.setViewMenu = function() {
- if (Grids[this.ActivePrefix]) {
- $ViewMenus = new Array('c', this.ActivePrefix);
- }
-}
-
Catalog.prototype.submit_event = function($prefix_special, $event, $t) {
if (!isset($prefix_special)) $prefix_special = this.getCurrentPrefix();
var $tab_id = this.queryTabRegistry('prefix', $prefix_special, 'tab_id');
@@ -158,6 +148,7 @@
var $div_id = this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id') + '_div'; // destination tab
document.getElementById($div_id).style.display = 'block';
this.ShowDependentButtons(this.ActivePrefix);
+ this.setViewMenu(this.ActivePrefix);
setCookie(this.CookiePrefix + 'active_prefix', this.ActivePrefix);
// this.TabRegistry.length == 1
@@ -234,4 +225,8 @@
// return prefix of first registred tab -> categories
return this.TabRegistry[0]['prefix'];
}
+}
+
+Catalog.prototype.setViewMenu = function($item_prefix) {
+ $ViewMenus = new Array('c', $item_prefix);
}
\ No newline at end of file
Index: trunk/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r4996 -r5054
--- trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 4996)
+++ trunk/core/kernel/utility/debugger.php (.../debugger.php) (revision 5054)
@@ -500,7 +500,9 @@
}
$this->appendHTML('ScriptName: '.$this->getFileLink($script, 1, basename($script)).' ('.dirname($script).')');
-
+ if (isset($_REQUEST['ajax']) && $_REQUEST['ajax'] == 'yes') {
+ $this->appendHTML('RequestURI: '.$_SERVER['REQUEST_URI']);
+ }
$this->appendHTML('DomViewer: ');
ob_start();
Index: trunk/kernel/admin_templates/incs/catalog.js
===================================================================
diff -u -N -r5048 -r5054
--- trunk/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5048)
+++ trunk/kernel/admin_templates/incs/catalog.js (.../catalog.js) (revision 5054)
@@ -73,23 +73,13 @@
document.getElementById($params[0]).innerHTML = $text;
}
- if ($params[0] != 'categories_div') {
- $Catalog.setViewMenu();
- }
-
if (isset($Debugger)) $Debugger.Clear();
}
Catalog.prototype.errorCallback = function($request, $params) {
alert('AJAX ERROR: ' + Request.getErrorHtml($request));
}
-Catalog.prototype.setViewMenu = function() {
- if (Grids[this.ActivePrefix]) {
- $ViewMenus = new Array('c', this.ActivePrefix);
- }
-}
-
Catalog.prototype.submit_event = function($prefix_special, $event, $t) {
if (!isset($prefix_special)) $prefix_special = this.getCurrentPrefix();
var $tab_id = this.queryTabRegistry('prefix', $prefix_special, 'tab_id');
@@ -158,6 +148,7 @@
var $div_id = this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id') + '_div'; // destination tab
document.getElementById($div_id).style.display = 'block';
this.ShowDependentButtons(this.ActivePrefix);
+ this.setViewMenu(this.ActivePrefix);
setCookie(this.CookiePrefix + 'active_prefix', this.ActivePrefix);
// this.TabRegistry.length == 1
@@ -234,4 +225,8 @@
// return prefix of first registred tab -> categories
return this.TabRegistry[0]['prefix'];
}
+}
+
+Catalog.prototype.setViewMenu = function($item_prefix) {
+ $ViewMenus = new Array('c', $item_prefix);
}
\ No newline at end of file