commit af3533c6662a06815018846ccbd91b96617174a7
author Thomas Bouron <tbouron@gmail.com> Tue Dec 10 16:08:03 2019 +0000
committer GitHub <noreply@github.com> Tue Dec 10 16:08:03 2019 +0000
tree f93339e76e0d58295bf61aafd63a25e88cead27f
parent bb1763823622835059386710b83bcd9caf35d02d
parent 21ea4bb7db93148238875edb0155fb9043c4ca85

Merge pull request #151 from tbouron/feature/jenkins

Reuse local maven cache + add PR comment trigger

ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js

diff --git a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
index 3d90b92..1b2fbdc 100644
--- a/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
+++ b/ui-modules/blueprint-composer/app/components/catalog-selector/catalog-selector.directive.js
@@ -97,7 +97,6 @@
 
         $scope.viewModes = PALETTE_VIEW_MODES;
         $scope.viewOrders = PALETTE_VIEW_ORDERS;
-
         if (!$scope.state) $scope.state = {};
         if (!$scope.state.viewMode) $scope.state.viewMode = PALETTE_VIEW_MODES.normal;
 
@@ -345,14 +344,11 @@
     function repaginate($scope, $element) {
         let rowsPerPage = $scope.rowsPerPage;
         if (!rowsPerPage) {
-            let main = angular.element($element[0].querySelector(".catalog-palette-main"));
-            if (!main || main[0].offsetHeight == 0) {
-                // no main, or hidden, or items per page fixed
-                return;
-            }
-            let header = angular.element(main[0].querySelector(".catalog-palette-header"));
-            let footer = angular.element(main[0].querySelector(".catalog-palette-footer"));
-            rowsPerPage = Math.max(MIN_ROWS_PER_PAGE, Math.floor((main[0].offsetHeight - header[0].offsetHeight - footer[0].offsetHeight - 16) / ($scope.state.viewMode.rowHeightPx || 96)));
+            let palette = angular.element(document.querySelector(".page-main-area"));
+            let toolbar = angular.element(document.querySelector(".navbar-mode"));
+            let header = angular.element($element[0].querySelector(".catalog-palette-header"));
+            let footer = angular.element($element[0].querySelector(".catalog-palette-footer"));
+            rowsPerPage = Math.max(MIN_ROWS_PER_PAGE, Math.floor((palette[0].offsetHeight - (toolbar[0].offsetHeight + header[0].offsetHeight + footer[0].offsetHeight + 16)) / ($scope.state.viewMode.rowHeightPx || 96)));
         }
         $scope.$apply(() => $scope.pagination.itemsPerPage = rowsPerPage * $scope.state.viewMode.itemsPerRow);
     }