Skip to content

Commit c80cade

Browse files
committed
Merge pull request #674 from elm/fix-infinite-scolling
fix(ionContent): Use new name to find ion-infinite-scroll element
2 parents 29d891c + 788df52 commit c80cade

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

js/ext/angular/src/directive/ionicContent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ function($parse, $timeout, $ionicScrollDelegate, $controller, $ionicBind) {
138138
// Check if this supports infinite scrolling and listen for scroll events
139139
// to trigger the infinite scrolling
140140
// TODO(ajoslin): move functionality out of this function and make testable
141-
var infiniteScroll = $element.find('infinite-scroll');
141+
var infiniteScroll = $element.find('ion-infinite-scroll');
142142
var infiniteStarted = false;
143143
if(infiniteScroll) {
144144
// Parse infinite scroll distance

scss/_scaffolding.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ body.grade-c {
231231
}
232232

233233
// Infinite scroll
234-
infinite-scroll .scroll-infinite {
234+
ion-infinite-scroll .scroll-infinite {
235235
position: relative;
236236
overflow: hidden;
237237
margin-top: -70px;
@@ -247,7 +247,7 @@ infinite-scroll .scroll-infinite {
247247
text-align: center;
248248
font-size: 30px; }
249249

250-
infinite-scroll.active .scroll-infinite {
250+
ion-infinite-scroll.active .scroll-infinite {
251251
margin-top: -30px;
252252
}
253253

0 commit comments

Comments
 (0)