Skip to content

fix(ionContent): Use new name to find ion-infinite-scroll element #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamdbradley merged 2 commits into from
Feb 25, 2014
Merged

fix(ionContent): Use new name to find ion-infinite-scroll element #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1702f5c
fix(ionContent): Use new name to find ion-infinite-scroll element
deflomu Feb 25, 2014
788df52
fix(ionContent): Update scss for ion-infinite-scroll element
deflomu Feb 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/ext/angular/src/directive/ionicContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scss/_scaffolding.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down