From cd348d18e99f8e88b81db0306ab8445099cfe782 Mon Sep 17 00:00:00 2001 From: Maksymilian Fryc Date: Thu, 17 Aug 2017 13:49:11 +0200 Subject: [PATCH] Small fixes --- lib/components/SideMenu/side-menu.spec.ts | 6 +++--- lib/components/SideMenu/side-menu.ts | 10 +++++----- lib/components/SideMenu/sort.ts | 8 ++++---- lib/services/menu.service.ts | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/components/SideMenu/side-menu.spec.ts b/lib/components/SideMenu/side-menu.spec.ts index e653d907..933b8279 100644 --- a/lib/components/SideMenu/side-menu.spec.ts +++ b/lib/components/SideMenu/side-menu.spec.ts @@ -68,10 +68,10 @@ describe('Redoc components', () => { it('should confirm that component is sorted', () => { let firstMenuItemsListLength = fixedMenuItemsList.length; - for(var firstMenuItemIndex = 0; firstMenuItemIndex < firstMenuItemsListLength; firstMenuItemIndex++) { - if(fixedMenuItemsList[firstMenuItemIndex].items !== null) { + for (var firstMenuItemIndex = 0; firstMenuItemIndex < firstMenuItemsListLength; firstMenuItemIndex++) { + if (fixedMenuItemsList[firstMenuItemIndex].items !== null) { let secondMenuItemsListLength = fixedMenuItemsList[firstMenuItemIndex].items.length; - for(var secondMenuItemIndex = 0; secondMenuItemIndex < secondMenuItemsListLength; secondMenuItemIndex++) { + for (var secondMenuItemIndex = 0; secondMenuItemIndex < secondMenuItemsListLength; secondMenuItemIndex++) { component.menuItems[firstMenuItemIndex].items[secondMenuItemIndex].name.should.be.equal(fixedMenuItemsList[firstMenuItemIndex].items[secondMenuItemIndex].name); } } diff --git a/lib/components/SideMenu/side-menu.ts b/lib/components/SideMenu/side-menu.ts index cf6839a1..11f6f256 100644 --- a/lib/components/SideMenu/side-menu.ts +++ b/lib/components/SideMenu/side-menu.ts @@ -116,14 +116,14 @@ export class SideMenu implements OnInit, OnDestroy { this.menuItems = this.menuService.items; let firstMenuItemsLength = this.menuItems.length; - for(var firstMenuItemIndex = 0; firstMenuItemIndex < firstMenuItemsLength; firstMenuItemIndex++) { - if(this.menuItems[firstMenuItemIndex].items !== null) { + for (var firstMenuItemIndex = 0; firstMenuItemIndex < firstMenuItemsLength; firstMenuItemIndex++) { + if (this.menuItems[firstMenuItemIndex].items !== null) { let secondMenuItemsLength = this.menuItems[firstMenuItemIndex].items.length; - for(var secondMenuItemIndex = 0; secondMenuItemIndex < secondMenuItemsLength; secondMenuItemIndex++) { - if(this.menuItems[firstMenuItemIndex].items[secondMenuItemIndex].items == null) { + for (var secondMenuItemIndex = 0; secondMenuItemIndex < secondMenuItemsLength; secondMenuItemIndex++) { + if (this.menuItems[firstMenuItemIndex].items[secondMenuItemIndex].items == null) { this.menuItems[firstMenuItemIndex].items.sort(endpointComparator); } - else{ + else { this.menuItems[firstMenuItemIndex].items[secondMenuItemIndex].items.sort(endpointComparator); } } diff --git a/lib/components/SideMenu/sort.ts b/lib/components/SideMenu/sort.ts index 171f42eb..d9098733 100644 --- a/lib/components/SideMenu/sort.ts +++ b/lib/components/SideMenu/sort.ts @@ -3,18 +3,18 @@ export const endpointComparator = (a, b) => { let operationComparisonResult: number; let nameComparisonResult: number = a.name.localeCompare(b.name); - if(a.metadata.sortOrder != null && b.metadata.sortOrder != null) { + if (a.metadata.sortOrder != null && b.metadata.sortOrder != null) { sortOrderComparisonResult = a.metadata.sortOrder.localeCompare(b.metadata.sortOrder); } - if(a.metadata.operation != null && b.metadata.operation != null) { + if (a.metadata.operation != null && b.metadata.operation != null) { operationComparisonResult = a.metadata.operation.localeCompare(b.metadata.operation); } - if(sortOrderComparisonResult != null && sortOrderComparisonResult !== 0) { + if (sortOrderComparisonResult != null && sortOrderComparisonResult !== 0) { return sortOrderComparisonResult; } - else if(operationComparisonResult != null && operationComparisonResult !== 0) { + else if (operationComparisonResult != null && operationComparisonResult !== 0) { return operationComparisonResult; } else { diff --git a/lib/services/menu.service.ts b/lib/services/menu.service.ts index 2b7efb92..afd906d7 100644 --- a/lib/services/menu.service.ts +++ b/lib/services/menu.service.ts @@ -335,8 +335,8 @@ export class MenuService { let xSortOrder; let orderInfo = operationInfo['x-sort-order']; - if(orderInfo != null) { - if(orderInfo >= 0 && orderInfo < tag.operations.length && Number.isInteger(orderInfo)) { + if (orderInfo != null) { + if (orderInfo >= 0 && orderInfo < tag.operations.length && Number.isInteger(orderInfo)) { xSortOrder = operationInfo['x-sort-order']; } }