fix(scrollView): fix error from checking device before ready

This commit is contained in:
Andy Joslin
2014-02-17 11:57:15 -05:00
parent 71ea118e4d
commit a5d964734f
3 changed files with 9 additions and 6 deletions

View File

@@ -5,15 +5,17 @@ angular.module('ionic.ui.scroll')
.controller('$ionicScroll', ['$scope', 'scrollViewOptions', '$timeout', '$ionicScrollDelegate', '$window', function($scope, scrollViewOptions, $timeout, $ionicScrollDelegate, $window) {
scrollViewOptions.bouncing = angular.isDefined(scrollViewOptions.bouncing) ?
scrollViewOptions.bouncing :
!ionic.Platform.isAndroid();
var self = this;
var element = this.element = scrollViewOptions.el;
var scrollView = this.scrollView = new ionic.views.Scroll(scrollViewOptions);
if (!angular.isDefined(scrollViewOptions.bouncing)) {
ionic.Platform.ready(function() {
scrollView.options.bouncing = !ionic.Platform.isAndroid();
});
}
var $element = this.$element = angular.element(element);
//Attach self to element as a controller so other directives can require this controller

View File

@@ -9,6 +9,9 @@ describe('Ionic Scroll Directive', function() {
timeout = $timeout;
window = $window;
ionic.Platform.setPlatform('Android');
spyOn(ionic.Platform, 'ready').andCallFake(function(cb) {
cb();
});
}));
it('Has $ionicScroll controller', function() {

View File

@@ -292,8 +292,6 @@ ionic.views.Scroll = ionic.views.View.inherit({
this.__container = options.el;
this.__content = options.el.firstElementChild;
var self = this;
//Remove any scrollTop attached to these elements; they are virtual scroll now
//This also stops on-load-scroll-to-window.location.hash that the browser does
setTimeout(function() {