diff --git a/app/controls/nav/nav.ts b/app/controls/nav/nav.ts
index 37f6f24..b430f42 100644
--- a/app/controls/nav/nav.ts
+++ b/app/controls/nav/nav.ts
@@ -20,11 +20,11 @@ import { MaterialIcon } from "../icons/material-icon";
-
+
-
+
diff --git a/app/controls/pullToRefresh/pullToRefresh.control.ts b/app/controls/pullToRefresh/pullToRefresh.control.ts
index 39f8d97..1cbe357 100644
--- a/app/controls/pullToRefresh/pullToRefresh.control.ts
+++ b/app/controls/pullToRefresh/pullToRefresh.control.ts
@@ -74,30 +74,30 @@ export class NxPullToRefreshView{
this.shrink();
}
- private animateContentChildElement: PullToRefreshAnimateElement;
- @ContentChild(PullToRefreshAnimateElement)
- public set contentChildren(element)
+ private animateContentChildElement: PullToRefreshAnimateElement[];
+ @ContentChildren(PullToRefreshAnimateElement)
+ public set contentChildren(elements)
{
- this.animateContentChildElement = element;
+ this.animateContentChildElement = elements.toArray();
}
- private animateViewChild : PullToRefreshAnimateElement;
- @ViewChild(PullToRefreshAnimateElement)
- public set viewChildren(element){
- this.animateViewChild = element;
+ private animateViewChild : PullToRefreshAnimateElement[];
+ @ViewChildren(PullToRefreshAnimateElement)
+ public set viewChildren(elements){
+ this.animateViewChild = elements.toArray();
}
private get AnimateElements() : PullToRefreshAnimateElement[]{
let a = [];
- if(this.animateContentChildElement)
+ if(this.animateContentChildElement && this.animateContentChildElement.length > 0)
{
this.logger.Notify("animateContentChildElement");
- a.push(this.animateContentChildElement);
+ this.animateContentChildElement.forEach(item => { a.push(item); });
}
- if(this.animateViewChild)
+ if(this.animateViewChild && this.animateViewChild.length > 0)
{
this.logger.Notify("animateViewChild");
- a.push(this.animateViewChild);
+ this.animateViewChild.forEach(item => { a.push(item); });
}
if(a.length === 0){
diff --git a/app/pages/competition/startList/competitors/competitors.page.ts b/app/pages/competition/startList/competitors/competitors.page.ts
index 327577a..62ca95c 100644
--- a/app/pages/competition/startList/competitors/competitors.page.ts
+++ b/app/pages/competition/startList/competitors/competitors.page.ts
@@ -106,7 +106,8 @@ export class StartGroup{
-
+
+