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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
js/ext/angular/src/controller/ionicScrollController.js vendored
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