Much better slide box

Author: mlynch

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',
 

dist/css/ionic.css

@@ -3,7 +3,7 @@
  * Copyright 2013 Drifty Co.
  * http://drifty.com/
  *
- * Ionic, v0.9.14
+ * Ionic, v0.9.17
  * A powerful HTML5 mobile app framework.
  * http://ionicframework.com/
  *
@@ -4408,44 +4408,40 @@ button.item-button-right:after {
  * Slide Box
  * --------------------------------------------------
  */
-.slide-box {
+.slider {
   position: relative;
   overflow: hidden;
+  visibility: hidden;
   background-color: #000; }
 
-.slide-box-slides {
+.slider-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; }
-
-.slide-box-animating {
-  -webkit-transition-duration: 0.2s;
-  -moz-transition-duration: 0.2s;
-  transition-duration: 0.2s; }
+  font-size: 0; }
 
-.slide {
-  display: inline-block;
+.slider-slide {
+  display: block;
+  position: relative;
   width: 100%;
-  height: 100%;
+  float: left;
   vertical-align: top; }
-  .slide img {
+  .slider-slide img {
     width: 100%; }
 
-.slide-box-pager {
+.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;

dist/js/ionic-angular.js

@@ -2,7 +2,7 @@
  * Copyright 2013 Drifty Co.
  * http://drifty.com/
  *
- * Ionic, v0.9.14
+ * Ionic, v0.9.17
  * A powerful HTML5 mobile app framework.
  * http://ionicframework.com/
  *
@@ -1811,41 +1811,48 @@ 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: {},
     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) {
+        slidesChanged: function() {
+          $scope.currentSlide = slider.getPos();
+          $timeout(function() {});
+        },
+        callback: function(slideIndex) {
+          $scope.currentSlide = slideIndex;
           $scope.$parent.$broadcast('slideBox.slideChanged', slideIndex);
           $scope.$apply();
         }
       });
 
-      $scope.$parent.slideBox = this;
+      slider.load();
+
+      $scope.slider = slider;
+
+      $timeout(function() {
+        $scope.slider.setup();
+      });
     }],
-    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") {
         var childScope = $scope.$new();
-        var pager = $compile('<pager></pager>')(childScope);
+        var pager = angular.element('<pager></pager>');
         $element.append(pager);
+        $compile(pager)(childScope);
       }
     }
   };
@@ -1857,10 +1864,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();
       };
     }
   };
@@ -1871,7 +1877,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.slider.getNumSlides());
+      };
+
+      $scope.$watch('currentSlide', function(v) {
+        console.log('Current slide', v);
+        selectPage(v);
+      });
+    }
   };
 
 });