javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #674 from elm/fix-infinite-scolling

Browse Source 
fix(ionContent): Use new name to find ion-infinite-scroll element
This commit is contained in:
Adam Bradley
2014-02-25 09:24:34 -06:00
parent 29d891c6e0 788df5243d
commit c80cadeee7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/ext/angular/src/directive/ionicContent.js vendored
View File

@@ -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

4
scss/_scaffolding.scss
View File

@@ -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;
}