Index: branches/5.1.x/core/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -r14484 -r14485
--- branches/5.1.x/core/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 14484)
+++ branches/5.1.x/core/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 14485)
@@ -66,15 +66,17 @@
var $menu_frame = getFrame('menu');
-
-
- $menu_frame.ReloadFolder('', true);
-
-
-
-
+ if ( $menu_frame.ajax_requests_count == 0 ) {
+
+
+ $menu_frame.ReloadFolder('', true);
+
+
+
+
- $menu_frame.SyncActive('');
+ $menu_frame.SyncActive('');
+ }
Index: branches/5.1.x/core/admin_templates/js/tree.js
===================================================================
diff -u -r14241 -r14485
--- branches/5.1.x/core/admin_templates/js/tree.js (.../tree.js) (revision 14241)
+++ branches/5.1.x/core/admin_templates/js/tree.js (.../tree.js) (revision 14485)
@@ -1,3 +1,4 @@
+var ajax_requests_count = 0;
var last_hightlighted = null;
var last_highlighted_key = null;
@@ -580,6 +581,7 @@
}
$object.Reloading = false;
+ ajax_requests_count--;
}
TreeFolder.prototype.reload = function()
@@ -594,6 +596,7 @@
this.AddLoadingNode();
// sending request to receive items
+ ajax_requests_count++;
Request.headers['Content-type'] = 'text/xml';
Request.makeRequest(this.LateLoadURL, false, '', this.successCallback, this.errorCallback, 'reload', this);
}
@@ -625,6 +628,7 @@
this.AddLoadingNode();
// sending request to receive items
+ ajax_requests_count++;
Request.headers['Content-type'] = 'text/xml';
Request.makeRequest(this.LateLoadURL, false, '', this.successCallback, this.errorCallback, '', this);
}