This commit is contained in:
Max Lynch
2014-01-10 10:02:23 -06:00
parent 35abb61493
commit 621d42e03b
4 changed files with 16 additions and 7 deletions

1
dist/css/ionic.css vendored
View File

@@ -3682,6 +3682,7 @@ a.subdued {
position: fixed;
top: 0;
left: 0;
z-index: 10;
visibility: hidden;
width: 100%;
height: 100%; }

View File

File diff suppressed because one or more lines are too long

View File

@@ -295,9 +295,10 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ngAnimate'
// Remove and destroy the modal scope
remove: function() {
var element = angular.element(this.el);
var self = this,
element = angular.element(this.el);
$animate.leave(angular.element(this.el), function() {
scope.$destroy();
self.scope.$destroy();
});
}
});
@@ -2326,7 +2327,8 @@ angular.module('ionic.ui.slideBox', [])
slideInterval: '@',
showPager: '@',
disableScroll: '@',
onSlideChanged: '&'
onSlideChanged: '&',
activeSlide: '='
},
controller: ['$scope', '$element', function($scope, $element) {
var _this = this;
@@ -2349,12 +2351,18 @@ angular.module('ionic.ui.slideBox', [])
$scope.currentSlide = slideIndex;
$scope.onSlideChanged({index:$scope.currentSlide});
$scope.$parent.$broadcast('slideBox.slideChanged', slideIndex);
$scope.activeSlide = slideIndex;
// Try to trigger a digest
$timeout(function() {});
}
});
$scope.$watch('activeSlide', function(nv) {
if(angular.isDefined(nv)){
slider.slide(nv);
}
});
$scope.$on('slideBox.nextSlide', function() {
slider.next();
});

View File

File diff suppressed because one or more lines are too long