Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2025-08-07 13:44:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
Maksymilian Fryc 2017-08-17 13:49:11 +02:00
parent 43527b197d
commit cd348d18e9
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/components/SideMenu/side-menu.spec.ts
View File

@ -68,10 +68,10 @@ describe('Redoc components', () => {
it('should confirm that component is sorted', () => { it('should confirm that component is sorted', () => {
let firstMenuItemsListLength = fixedMenuItemsList.length; let firstMenuItemsListLength = fixedMenuItemsList.length;
for(var firstMenuItemIndex = 0; firstMenuItemIndex < firstMenuItemsListLength; firstMenuItemIndex++) { for (var firstMenuItemIndex = 0; firstMenuItemIndex < firstMenuItemsListLength; firstMenuItemIndex++) {
if(fixedMenuItemsList[firstMenuItemIndex].items !== null) { if (fixedMenuItemsList[firstMenuItemIndex].items !== null) {
let secondMenuItemsListLength = fixedMenuItemsList[firstMenuItemIndex].items.length; 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); component.menuItems[firstMenuItemIndex].items[secondMenuItemIndex].name.should.be.equal(fixedMenuItemsList[firstMenuItemIndex].items[secondMenuItemIndex].name);
} }
} }

10
lib/components/SideMenu/side-menu.ts
View File

@ -116,14 +116,14 @@ export class SideMenu implements OnInit, OnDestroy {
this.menuItems = this.menuService.items; this.menuItems = this.menuService.items;
let firstMenuItemsLength = this.menuItems.length; let firstMenuItemsLength = this.menuItems.length;
for(var firstMenuItemIndex = 0; firstMenuItemIndex < firstMenuItemsLength; firstMenuItemIndex++) { for (var firstMenuItemIndex = 0; firstMenuItemIndex < firstMenuItemsLength; firstMenuItemIndex++) {
if(this.menuItems[firstMenuItemIndex].items !== null) { if (this.menuItems[firstMenuItemIndex].items !== null) {
let secondMenuItemsLength = this.menuItems[firstMenuItemIndex].items.length; let secondMenuItemsLength = this.menuItems[firstMenuItemIndex].items.length;
for(var secondMenuItemIndex = 0; secondMenuItemIndex < secondMenuItemsLength; secondMenuItemIndex++) { for (var secondMenuItemIndex = 0; secondMenuItemIndex < secondMenuItemsLength; secondMenuItemIndex++) {
if(this.menuItems[firstMenuItemIndex].items[secondMenuItemIndex].items == null) { if (this.menuItems[firstMenuItemIndex].items[secondMenuItemIndex].items == null) {
this.menuItems[firstMenuItemIndex].items.sort(endpointComparator); this.menuItems[firstMenuItemIndex].items.sort(endpointComparator);
} }
else{ else {
this.menuItems[firstMenuItemIndex].items[secondMenuItemIndex].items.sort(endpointComparator); this.menuItems[firstMenuItemIndex].items[secondMenuItemIndex].items.sort(endpointComparator);
} }
} }

8
lib/components/SideMenu/sort.ts
View File

@ -3,18 +3,18 @@ export const endpointComparator = (a, b) => {
let operationComparisonResult: number; let operationComparisonResult: number;
let nameComparisonResult: number = a.name.localeCompare(b.name); 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); 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); operationComparisonResult = a.metadata.operation.localeCompare(b.metadata.operation);
} }
if(sortOrderComparisonResult != null && sortOrderComparisonResult !== 0) { if (sortOrderComparisonResult != null && sortOrderComparisonResult !== 0) {
return sortOrderComparisonResult; return sortOrderComparisonResult;
} }
else if(operationComparisonResult != null && operationComparisonResult !== 0) { else if (operationComparisonResult != null && operationComparisonResult !== 0) {
return operationComparisonResult; return operationComparisonResult;
} }
else { else {

4
lib/services/menu.service.ts
View File

@ -335,8 +335,8 @@ export class MenuService {
let xSortOrder; let xSortOrder;
let orderInfo = operationInfo['x-sort-order']; let orderInfo = operationInfo['x-sort-order'];
if(orderInfo != null) { if (orderInfo != null) {
if(orderInfo >= 0 && orderInfo < tag.operations.length && Number.isInteger(orderInfo)) { if (orderInfo >= 0 && orderInfo < tag.operations.length && Number.isInteger(orderInfo)) {
xSortOrder = operationInfo['x-sort-order']; xSortOrder = operationInfo['x-sort-order'];
} }
} }