From 1702f5c916dda20957761fd1e7b30d5f9bc1b6b4 Mon Sep 17 00:00:00 2001 From: flmu Date: Tue, 25 Feb 2014 16:08:31 +0100 Subject: [PATCH 1/2] fix(ionContent): Use new name to find ion-infinite-scroll element --- js/ext/angular/src/directive/ionicContent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/ext/angular/src/directive/ionicContent.js b/js/ext/angular/src/directive/ionicContent.js index ea04c436f8..7ae643e6f0 100644 --- a/js/ext/angular/src/directive/ionicContent.js +++ b/js/ext/angular/src/directive/ionicContent.js @@ -138,7 +138,7 @@ function($parse, $timeout, $ionicScrollDelegate, $controller, $ionicBind) { // Check if this supports infinite scrolling and listen for scroll events // to trigger the infinite scrolling // TODO(ajoslin): move functionality out of this function and make testable - var infiniteScroll = $element.find('infinite-scroll'); + var infiniteScroll = $element.find('ion-infinite-scroll'); var infiniteStarted = false; if(infiniteScroll) { // Parse infinite scroll distance From 788df5243dc5300204171bcd40bf1e20fe610dbe Mon Sep 17 00:00:00 2001 From: flmu Date: Tue, 25 Feb 2014 16:13:26 +0100 Subject: [PATCH 2/2] fix(ionContent): Update scss for ion-infinite-scroll element --- scss/_scaffolding.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss index bb81c6b167..34a160d968 100644 --- a/scss/_scaffolding.scss +++ b/scss/_scaffolding.scss @@ -231,7 +231,7 @@ body.grade-c { } // Infinite scroll -infinite-scroll .scroll-infinite { +ion-infinite-scroll .scroll-infinite { position: relative; overflow: hidden; margin-top: -70px; @@ -247,7 +247,7 @@ infinite-scroll .scroll-infinite { text-align: center; font-size: 30px; } -infinite-scroll.active .scroll-infinite { +ion-infinite-scroll.active .scroll-infinite { margin-top: -30px; }