Skip to content

Commit 621d42e

Browse files
committed
Rebuild
1 parent 35abb61 commit 621d42e

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

dist/css/ionic.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3682,6 +3682,7 @@ a.subdued {
36823682
position: fixed;
36833683
top: 0;
36843684
left: 0;
3685+
z-index: 10;
36853686
visibility: hidden;
36863687
width: 100%;
36873688
height: 100%; }

dist/css/ionic.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/ionic-angular.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,10 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ngAnimate'
295295

296296
// Remove and destroy the modal scope
297297
remove: function() {
298-
var element = angular.element(this.el);
298+
var self = this,
299+
element = angular.element(this.el);
299300
$animate.leave(angular.element(this.el), function() {
300-
scope.$destroy();
301+
self.scope.$destroy();
301302
});
302303
}
303304
});
@@ -2326,7 +2327,8 @@ angular.module('ionic.ui.slideBox', [])
23262327
slideInterval: '@',
23272328
showPager: '@',
23282329
disableScroll: '@',
2329-
onSlideChanged: '&'
2330+
onSlideChanged: '&',
2331+
activeSlide: '='
23302332
},
23312333
controller: ['$scope', '$element', function($scope, $element) {
23322334
var _this = this;
@@ -2349,12 +2351,18 @@ angular.module('ionic.ui.slideBox', [])
23492351
$scope.currentSlide = slideIndex;
23502352
$scope.onSlideChanged({index:$scope.currentSlide});
23512353
$scope.$parent.$broadcast('slideBox.slideChanged', slideIndex);
2352-
2354+
$scope.activeSlide = slideIndex;
23532355
// Try to trigger a digest
23542356
$timeout(function() {});
23552357
}
23562358
});
23572359

2360+
$scope.$watch('activeSlide', function(nv) {
2361+
if(angular.isDefined(nv)){
2362+
slider.slide(nv);
2363+
}
2364+
});
2365+
23582366
$scope.$on('slideBox.nextSlide', function() {
23592367
slider.next();
23602368
});

dist/js/ionic-angular.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)