From 2fb24a6bbbc284b78dbb02fcb5e111c33d4a5460 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Thu, 22 Dec 2011 11:01:24 +0000 Subject: [PATCH] [-] BO : fixed js global conflict for categories tree --- js/admin-categories-tree.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/js/admin-categories-tree.js b/js/admin-categories-tree.js index 7254ab2ac..558714d98 100755 --- a/js/admin-categories-tree.js +++ b/js/admin-categories-tree.js @@ -29,7 +29,7 @@ var needCheckAll = false; var needUncheckAll = false; var interval = null; var intervalCheck = null; -var id = 0; +var id_tree = 0; var arrayCatToExpand = new Array(); function buildTreeView() @@ -113,7 +113,7 @@ function setCategoryToExpand() { var ret = false; - id = 0; + id_tree = 0; arrayCatToExpand = new Array(); $('#categories-treeview').find('li.expandable:visible').each(function() { arrayCatToExpand.push($(this).attr('id')); @@ -145,7 +145,7 @@ function openCategory() { // Check readyToExpand in order to don't clearInterval if AJAX request is in progress // readyToExpand = category has been expanded, go to next ;) - if (id >= arrayCatToExpand.length && readyToExpand) + if (id_tree >= arrayCatToExpand.length && readyToExpand) { if (!setCategoryToExpand()) { @@ -170,10 +170,10 @@ function openCategory() if (readyToExpand) { - if ($('#categories-treeview').find('li#'+arrayCatToExpand[id]+'.hasChildren').length > 0) + if ($('#categories-treeview').find('li#'+arrayCatToExpand[id_tree]+'.hasChildren').length > 0) readyToExpand = false; - $('#categories-treeview').find('li#'+arrayCatToExpand[id]+'.expandable:visible span.category_label').trigger('click'); - id++; + $('#categories-treeview').find('li#'+arrayCatToExpand[id_tree]+'.expandable:visible span.category_label').trigger('click'); + id_tree++; } } @@ -311,8 +311,7 @@ function getParentCategoriesIdAndOpen(id_category) function openParentCategories() { intervalCheck = setInterval(checkCategory, 20); - - if (id >= arrayCatToExpand.length && !readyToExpand) + if (id_tree >= arrayCatToExpand.length && !readyToExpand) { clearInterval(interval); // delete interval value @@ -322,10 +321,11 @@ function openParentCategories() if (readyToExpand) { - if ($('li#'+arrayCatToExpand[id]+'.hasChildren').length > 0) + if ($('li#'+arrayCatToExpand[id_tree]+'.hasChildren').length > 0) readyToExpand = false; - $('li#'+arrayCatToExpand[id]+'.expandable span').trigger('click'); - id++; + + $('li#'+arrayCatToExpand[id_tree]+'.expandable span').trigger('click'); + id_tree++; } }