From 67af71bd9b9a30b3f737732bbe7cc7d1c7a198bf Mon Sep 17 00:00:00 2001 From: Manuel Mtz-Almeida Date: Mon, 24 Apr 2017 23:48:23 +0200 Subject: [PATCH] fix(virtual-scroll): supports null records fixes 11093 --- src/components/slides/swiper/swiper.ts | 2 +- src/components/virtual-scroll/virtual-util.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/slides/swiper/swiper.ts b/src/components/slides/swiper/swiper.ts index 6af4c1084a..3bbb07b748 100644 --- a/src/components/slides/swiper/swiper.ts +++ b/src/components/slides/swiper/swiper.ts @@ -892,7 +892,7 @@ export function enableTouchControl(s: Slides) { // Cleanup dynamic styles function cleanupStyles(s: Slides) { if (!s.container || !s._wrapper) { - //fix #10830 + // fix #10830 return; } diff --git a/src/components/virtual-scroll/virtual-util.ts b/src/components/virtual-scroll/virtual-util.ts index cb9bad9fff..391faef745 100644 --- a/src/components/virtual-scroll/virtual-util.ts +++ b/src/components/virtual-scroll/virtual-util.ts @@ -21,7 +21,7 @@ export function processRecords(stopAtHeight: number, let startRecordIndex: number; let previousCell: VirtualCell; let tmpData: any; - let lastRecordIndex = (records.length - 1); + let lastRecordIndex = records ? (records.length - 1) : -1; if (cells.length) { // we already have cells @@ -131,11 +131,11 @@ export function populateNodeData(startCellIndex: number, endCellIndex: number, v cells: VirtualCell[], records: any[], nodes: VirtualNode[], viewContainer: ViewContainerRef, itmTmp: TemplateRef, hdrTmp: TemplateRef, ftrTmp: TemplateRef, initialLoad: boolean): boolean { - const recordsLength = records.length; - if (!recordsLength) { + if (!records || records.length === 0) { nodes.length = 0; return true; } + const recordsLength = records.length; let hasChanges = false; let node: VirtualNode;