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

amend(slidebox): add null-check for slide.scope

Browse Source 
Addresses #2530
This commit is contained in:
Andrew
2014-11-18 11:10:30 -07:00
parent 7ca780f22c
commit c7d401cd9c
1 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
js/angular/controller/slideBoxController.js vendored
View File

@@ -66,6 +66,45 @@ function(scope, element, $$ionicAttachDrag, $interval, $rootScope, $timeout) {
self.onDrag = onDrag;
self.onDragEnd = onDragEnd;
/** DEPRECATED METHODS **/
self.update = deprecated.method(
'$ionicSlideBoxDelegate.update() has been deprecated! Slidebox updates on its own now.',
console.warn,
angular.noop
);
self.currentIndex = deprecated.method(
'$ionicSlideBoxDelegate.currentIndex() has been deprecated! Use self.selected() instead.',
console.warn,
self.selected
);
self.slide = deprecated.method(
'$ionicSlideBoxDelegate.slide(newIndex[, speed]) has been deprecated! Use self.select(newIndex[, speed]) instead.',
console.warn,
self.select
);
self.slidesCount = deprecated.method(
'$ionicSlideBoxDelegate.slidesCount has been deprecated! Use self.slidesCount() instead.',
console.warn,
self.count
);
self.slidesCount =
self.stop = deprecated.method(
'$ionicSlideBoxDelegate.stop() has been deprecated! Use $ionicSlideBoxDelegate.autoPlay(0) to stop instead.',
console.warn,
function() {
self._stoppedInterval = self.autoPlayInterval;
self.autoPlay(0);
}
);
self.start = deprecated.method(
'$ionicSlideBoxDelegate.start() has been deprecated! Use $ionicSlideBoxDelegate.autoPlay(newInterval) to start instead.',
console.warn,
function() {
self.autoPlay(self._stoppedInterval);
}
);
// ***
// Public Methods
// ***
@@ -109,6 +148,7 @@ function(scope, element, $$ionicAttachDrag, $interval, $rootScope, $timeout) {
}
function autoPlay(newInterval) {
self.autoPlayInterval = newInterval;
$interval.cancel(self.autoPlayTimeout);
if (angular.isNumber(newInterval) && newInterval > 0) {
@@ -216,8 +256,9 @@ function(scope, element, $$ionicAttachDrag, $interval, $rootScope, $timeout) {
// If one of the child nodes was destroyed but not yet removed
// from the DOM, we'll enqueue a new digest to re-check
// once the element is actually removed.
var slideScope;
for (var i = 0; i < slideNodes.length; i++) {
if (angular.element(slideNodes[i]).scope().$$destroyed) {
if ( (slideScope = angular.element(slideNodes[i]).scope()) && slideScope.$$destroyed) {
$timeout(angular.noop);
break;
}