Merge pull request ionic-team#329 from driftyco/328-slide-box

Revamped slide box
Jdww · Dec 17, 2013 · 6e62d37 · 6e62d37
2 parents 8683f0d + 89a3b75
commit 6e62d37
Show file tree

Hide file tree

Showing 16 changed files with 1,539 additions and 472 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -30,7 +30,7 @@ module.exports = function(grunt) {
           'js/views/navBarView.js',
           'js/views/popupView.js',
           'js/views/sideMenuView.js',
-          'js/views/slideBoxView.js',
+          'js/views/sliderView.js',
           'js/views/tabBarView.js',
           'js/views/toggleView.js',
 

diff --git a/dist/css/ionic.css b/dist/css/ionic.css
@@ -4404,44 +4404,38 @@ button.item-button-right:after {
  * Slide Box
  * --------------------------------------------------
  */
-.slide-box {
+.slider {
   position: relative;
   overflow: hidden;
-  background-color: #000; }
-
-.slide-box-slides {
-  position: relative;
-  white-space: nowrap;
-  font-size: 0;
-  -webkit-transition: -webkit-transform 0 ease-in-out;
-  -moz-transition: -moz-transform 0 ease-in-out;
-  transition: transform 0 ease-in-out; }
+  visibility: hidden; }
 
-.slide-box-animating {
-  -webkit-transition-duration: 0.2s;
-  -moz-transition-duration: 0.2s;
-  transition-duration: 0.2s; }
+.slider-slides {
+  position: relative; }
 
-.slide-box-slide {
-  display: inline-block;
+.slider-slide {
+  display: block;
+  position: relative;
   width: 100%;
-  height: 100%;
+  float: left;
   vertical-align: top; }
-  .slide-box-slide img {
-    width: 100%; }
 
-.slide-box-pager {
+.slider-slide-image > img {
+  width: 100%; }
+
+.slider-pager {
   position: absolute;
   bottom: 20px;
   width: 100%;
-  text-align: center; }
-  .slide-box-pager > * {
+  text-align: center;
+  z-index: 1; }
+  .slider-pager .slider-pager-page {
     display: inline-block;
-    margin: 0px 5px;
+    margin: 0px 3px;
+    width: 15px;
     color: #fff;
     text-decoration: none;
     opacity: 0.3; }
-    .slide-box-pager > *.active {
+    .slider-pager .slider-pager-page.active {
       opacity: 1;
       -webkit-transition: opacity 0.4s ease-in;
       -moz-transition: opacity 0.4s ease-in;
@@ -5706,6 +5700,11 @@ a.button {
   100% {
     transform: rotate(360deg); } }
 
+.no-animation > .ng-enter, .no-animation.ng-enter, .no-animation > .ng-leave, .no-animation.ng-leave {
+  -webkit-transition: none;
+  -moz-transition: none;
+  transition: none; }
+
 .noop-animation > .ng-enter, .noop-animation.ng-enter, .noop-animation > .ng-leave, .noop-animation.ng-leave {
   -webkit-transition: all cubic-bezier(0.25, 0.46, 0.45, 0.94) 250ms;
   -moz-transition: all cubic-bezier(0.25, 0.46, 0.45, 0.94) 250ms;

diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
@@ -509,12 +509,12 @@ angular.module('ionic.ui.header', ['ngAnimate'])
     transclude: true,
     template: '<header class="bar bar-header">\
                 <div class="buttons">\
-                  <button ng-repeat="button in leftButtons" class="button" ng-class="button.type" ng-click="button.tap($event, $index)" ng-bind-html="button.content">\
+                  <button ng-repeat="button in leftButtons" class="button no-animation" ng-class="button.type" ng-click="button.tap($event, $index)" ng-bind-html="button.content">\
                   </button>\
                 </div>\
                 <h1 class="title" ng-bind-html="title"></h1>\
                 <div class="buttons">\
-                  <button ng-repeat="button in rightButtons" class="button" ng-class="button.type" ng-click="button.tap($event, $index)" ng-bind-html="button.content">\
+                  <button ng-repeat="button in rightButtons" class="button no-animation" ng-class="button.type" ng-click="button.tap($event, $index)" ng-bind-html="button.content">\
                   </button>\
                 </div>\
               </header>',
@@ -543,6 +543,7 @@ angular.module('ionic.ui.header', ['ngAnimate'])
       });
 
       $scope.$watch('rightButtons', function(val) {
+        console.log('Right buttons changed');
         // Resize the title since the buttons have changed
         hb.align();
       });
@@ -1516,6 +1517,7 @@ angular.module('ionic.ui.scroll', [])
     transclude: true,
     scope: {
       direction: '@',
+      paging: '@',
       onRefresh: '&',
       onScroll: '&',
       refreshComplete: '=',
@@ -1524,46 +1526,51 @@ angular.module('ionic.ui.scroll', [])
       scrollbarY: '@',
     },
 
+    controller: function() {},
+
     compile: function(element, attr, transclude) {
       return function($scope, $element, $attr) {
         var clone, sv, sc = document.createElement('div');
 
+        // Create the internal scroll div
         sc.className = 'scroll';
         if(attr.padding == "true") {
-          sc.className += ' padding';
+          sc.classList.add('padding');
           addedPadding = true;
         }
+        if($scope.$eval($scope.paging) === true) {
+          sc.classList.add('scroll-paging');
+        }
         $element.append(sc);
 
         // Pass the parent scope down to the child
         clone = transclude($scope.$parent);
         angular.element($element[0].firstElementChild).append(clone);
 
+        // Get refresher size
         var refresher = $element[0].querySelector('.scroll-refresher');
         var refresherHeight = refresher && refresher.clientHeight || 0;
 
-        if(attr.refreshComplete) {
-          $scope.refreshComplete = function() {
-            if($scope.scrollView) {
-              refresher && refresher.classList.remove('active');
-              $scope.scrollView.finishPullToRefresh();
-              $scope.$parent.$broadcast('scroll.onRefreshComplete');
-            }
-          };
-        }
-
-
+        if(!$scope.direction) { $scope.direction = 'y'; }
         var hasScrollingX = $scope.direction.indexOf('x') >= 0;
         var hasScrollingY = $scope.direction.indexOf('y') >= 0;
 
         $timeout(function() {
-          sv = new ionic.views.Scroll({
+          var options = {
             el: $element[0],
+            paging: $scope.$eval($scope.paging) === true,
             scrollbarX: $scope.$eval($scope.scrollbarX) !== false,
             scrollbarY: $scope.$eval($scope.scrollbarY) !== false,
             scrollingX: hasScrollingX,
             scrollingY: hasScrollingY
-          });
+          };
+
+          if(options.paging) {
+            options.speedMultiplier = 0.8;
+            options.bouncing = false;
+          }
+
+          sv = new ionic.views.Scroll(options);
 
           // Activate pull-to-refresh
           if(refresher) {
@@ -1807,41 +1814,68 @@ angular.module('ionic.ui.slideBox', [])
  * some side menu stuff on the current scope.
  */
 
-.directive('slideBox', ['$compile', function($compile) {
+.directive('slideBox', ['$timeout', '$compile', function($timeout, $compile) {
   return {
     restrict: 'E',
     replace: true,
     transclude: true,
-    scope: {},
+    scope: {
+      doesContinue: '@',
+      showPager: '@',
+      onSlideChanged: '&'
+    },
     controller: ['$scope', '$element', function($scope, $element) {
-      $scope.slides = [];
-      this.slideAdded = function() {
-        $scope.slides.push({});
-      };
-
-      angular.extend(this, ionic.views.SlideBox.prototype);
+      var _this = this;
 
-      ionic.views.SlideBox.call(this, {
+      var slider = new ionic.views.Slider({
         el: $element[0],
-        slideChanged: function(slideIndex) {
+        continuous: $scope.$eval($scope.doesContinue) === true,
+        slidesChanged: function() {
+          $scope.currentSlide = slider.getPos();
+
+          // Try to trigger a digest
+          $timeout(function() {});
+        },
+        callback: function(slideIndex) {
+          $scope.currentSlide = slideIndex;
+          $scope.onSlideChanged({index:$scope.currentSlide});
           $scope.$parent.$broadcast('slideBox.slideChanged', slideIndex);
-          $scope.$apply();
+
+          // Try to trigger a digest
+          $timeout(function() {});
         }
       });
 
-      $scope.$parent.slideBox = this;
+      $scope.$on('slideBox.nextSlide', function() {
+        slider.next();
+      });
+
+      $scope.$on('slideBox.prevSlide', function() {
+        slider.prev();
+      });
+
+      $scope.$on('slideBox.setSlide', function(e, index) {
+        slider.slide(index);
+      });
+
+      $scope.slideBox = slider;
+
+      $timeout(function() {
+        slider.load();
+      });
     }],
-    template: '<div class="slide-box">\
-            <div class="slide-box-slides" ng-transclude>\
+    template: '<div class="slider">\
+            <div class="slider-slides" ng-transclude>\
             </div>\
           </div>',
 
     link: function($scope, $element, $attr, slideBoxCtrl) {
       // If the pager should show, append it to the slide box
-      if($attr.showPager !== "false") {
+      if($scope.$eval($scope.showPager) !== false) {
         var childScope = $scope.$new();
-        var pager = $compile('<pager></pager>')(childScope);
+        var pager = angular.element('<pager></pager>');
         $element.append(pager);
+        $compile(pager)(childScope);
       }
     }
   };
@@ -1853,10 +1887,9 @@ angular.module('ionic.ui.slideBox', [])
     replace: true,
     require: '^slideBox',
     transclude: true,
-    template: '<div class="slide-box-slide" ng-transclude></div>',
+    template: '<div class="slider-slide" ng-transclude></div>',
     compile: function(element, attr, transclude) {
       return function($scope, $element, $attr, slideBoxCtrl) {
-        slideBoxCtrl.slideAdded();
       };
     }
   };
@@ -1867,7 +1900,29 @@ angular.module('ionic.ui.slideBox', [])
     restrict: 'E',
     replace: true,
     require: '^slideBox',
-    template: '<div class="slide-box-pager"><span ng-repeat="slide in slides"><i class="icon ion-record"></i></span></div>'
+    template: '<div class="slider-pager"><span class="slider-pager-page" ng-repeat="slide in numSlides() track by $index" ng-class="{active: $index == currentSlide}"><i class="icon ion-record"></i></span></div>',
+    link: function($scope, $element, $attr, slideBox) {
+      var selectPage = function(index) {
+        var children = $element[0].children;
+        var length = children.length;
+        for(var i = 0; i < length; i++) {
+          if(i == index) {
+            children[i].classList.add('active');
+          } else {
+            children[i].classList.remove('active');
+          }
+        }
+      };
+
+      $scope.numSlides = function() {
+        return new Array($scope.slideBox.getNumSlides());
+      };
+
+      $scope.$watch('currentSlide', function(v) {
+        console.log('Current slide', v);
+        selectPage(v);
+      });
+    }
   };
 
 });