composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 16:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into develop

Browse Source
This commit is contained in:
Molkobain
2021-05-11 12:22:47 +02:00
parent cb61d85572 6ad3c40c42
commit 1c2dcc7b9a
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig
View File

@@ -397,15 +397,16 @@
}
}
};
// N°3995: Loader is shown immediately, otherwise when we have a huge amount of items, we can have a bottleneck on the buildMosaic() function, blocking the display of the loader
showMosaicLoader();
$(document).ready(function(){
// Auto collapse item actions popup
$('body').on('click', function(){
$('#brick_content_mosaic .item-action-wrapper.collapse.in').collapse('hide');
});
// Build the tree (collapsed)
showMosaicLoader();
// Build the mosaic (collapsed)
buildMosaic(oRawDatas);
hideMosaicLoader();
registerFilterListeners();

3
datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig
View File

@@ -321,6 +321,8 @@
}
};
// N°3995: Loader is shown immediately, otherwise when we have a huge amount of items, we can have a bottleneck on the buildTree() function, blocking the display of the loader
showTreeLoader();
$(document).ready(function(){
// Init expand/collapse all buttons
$('#btn-collapse-all').on('click', function (oEvent) {
@@ -405,7 +407,6 @@
});
// Build the tree (collapsed)
showTreeLoader();
buildTree(oRawDatas);
hideTreeLoader();
registerFilterListeners();