mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
Merge branch 'pr/400' - fixes #397
This commit is contained in:
1
dist/js/ionic-angular.js
vendored
1
dist/js/ionic-angular.js
vendored
@@ -2019,6 +2019,7 @@ angular.module('ionic.ui.slideBox', [])
|
||||
auto: slideInterval,
|
||||
disableScroll: ($scope.$eval($scope.disableScroll) === true) || false,
|
||||
continuous: continuous,
|
||||
startSlide: $scope.activeSlide,
|
||||
slidesChanged: function() {
|
||||
$scope.currentSlide = slider.getPos();
|
||||
|
||||
|
||||
2
dist/js/ionic-angular.min.js
vendored
2
dist/js/ionic-angular.min.js
vendored
File diff suppressed because one or more lines are too long
@@ -37,6 +37,7 @@ angular.module('ionic.ui.slideBox', [])
|
||||
auto: slideInterval,
|
||||
disableScroll: ($scope.$eval($scope.disableScroll) === true) || false,
|
||||
continuous: continuous,
|
||||
startSlide: $scope.activeSlide,
|
||||
slidesChanged: function() {
|
||||
$scope.currentSlide = slider.getPos();
|
||||
|
||||
|
||||
@@ -3,13 +3,16 @@
|
||||
* see the core Ionic sideMenu controller tests.
|
||||
*/
|
||||
describe('Ionic Angular Slide Box', function() {
|
||||
var el, delegate, timeout;
|
||||
var el, delegate, compile, rootScope, timeout;
|
||||
|
||||
beforeEach(module('ionic'));
|
||||
|
||||
beforeEach(inject(function($compile, $rootScope, $timeout, $ionicSlideBoxDelegate) {
|
||||
delegate = $ionicSlideBoxDelegate;
|
||||
timeout = $timeout;
|
||||
rootScope = $rootScope;
|
||||
compile = $compile;
|
||||
|
||||
el = $compile('<slide-box>\
|
||||
<slide>\
|
||||
<div class="box blue">\
|
||||
@@ -40,4 +43,25 @@ describe('Ionic Angular Slide Box', function() {
|
||||
timeout.flush();
|
||||
expect(slideBox.setup).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('Should set initial active slide', function() {
|
||||
el = compile('<slide-box active-slide="2">\
|
||||
<slide>\
|
||||
<div class="box blue">\
|
||||
<h1>BLUE {{slideBox.slideIndex}}</h1>\
|
||||
</div>\
|
||||
</slide>\
|
||||
<slide>\
|
||||
<div class="box yellow">\
|
||||
<h1>YELLOW {{slideBox.slideIndex}}</h1>\
|
||||
</div>\
|
||||
</slide>\
|
||||
<slide>\
|
||||
<div class="box pink"><h1>PINK {{slideBox.slideIndex}}</h1></div>\
|
||||
</slide>\
|
||||
</slide-box>')(rootScope);
|
||||
|
||||
var scope = el.scope();
|
||||
expect(scope.slideBox.getPos()).toBe(2);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user