Slidebox bouncing

ionic-team · Dec 6, 2015 · 465d98c · 465d98c
1 parent 96ef1cc
commit 465d98c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/js/angular/directive/slideBox.js b/js/angular/directive/slideBox.js
@@ -56,13 +56,13 @@ function($timeout, $compile, $ionicSlideBoxDelegate, $ionicHistory, $ionicScroll
       disableScroll: '@',
       onSlideChanged: '&',
       activeSlide: '=?',
-      hasBouncing: '@'
+      bounce: '@'
     },
     controller: ['$scope', '$element', '$attrs', function($scope, $element, $attrs) {
       var _this = this;
 
       var continuous = $scope.$eval($scope.doesContinue) === true;
-      var bouncing = ($scope.$eval($scope.hasBouncing) !== false); //Default to true
+      var bouncing = ($scope.$eval($scope.bounce) !== false); //Default to true
       var shouldAutoPlay = isDefined($attrs.autoPlay) ? !!$scope.autoPlay : false;
       var slideInterval = shouldAutoPlay ? $scope.$eval($scope.slideInterval) || 4000 : 0;
 
@@ -142,7 +142,6 @@ function($timeout, $compile, $ionicSlideBoxDelegate, $ionicHistory, $ionicScroll
       };
 
       this.onPagerClick = function(index) {
-        console.log('pagerClick', index);
         $scope.pagerClick({index: index});
       };
 

diff --git a/js/views/sliderView.js b/js/views/sliderView.js
@@ -379,16 +379,17 @@ ionic.views.Slider = ionic.views.View.inherit({
             translate(index, delta.x + slidePos[index], 0);
             translate(circle(index + 1), delta.x + slidePos[circle(index + 1)], 0);
 
-          } else{
-              if(options.bouncing){
-               delta.x =
-                 delta.x /
-                   ( (!index && delta.x > 0 ||         // if first slide and sliding left
-                     index == slides.length - 1 &&     // or if last slide and sliding right
-                     delta.x < 0                       // and if sliding at all
-                   ) ?
-                   ( Math.abs(delta.x) / width + 1 )      // determine resistance level
-                   : 1 );                                 // no resistance if false
+          } else {
+            // If the slider bounces, do the bounce!
+            if(options.bouncing) {
+              delta.x =
+               delta.x /
+                 ( (!index && delta.x > 0 ||         // if first slide and sliding left
+                   index == slides.length - 1 &&     // or if last slide and sliding right
+                   delta.x < 0                       // and if sliding at all
+                 ) ?
+                 ( Math.abs(delta.x) / width + 1 )      // determine resistance level
+                 : 1 );                                 // no resistance if false
              } else {
                if(width * index - delta.x < 0) {               //We are trying scroll past left boundary
                  delta.x = Math.min(delta.x, width * index);  //Set delta.x so we don't go past left screen

diff --git a/test/html/slideBox.html b/test/html/slideBox.html
@@ -55,7 +55,6 @@
                          on-slide-changed="slideChanged(index)"
                          show-pager="{{$root.showPager}}"
                          pager-click="pagerClick(index)"
-                         does-continue="true"
                          auto-play="false">
             <ion-slide ng-controller="FirstSlideCtrl">
               <h3>Thank you for choosing the Awesome App!</h3>