materialize-sass 0.96.1 → 0.96.2

data/app/assets/javascripts/materialize/materialbox.js

@@ -4,11 +4,11 @@
 
     return this.each(function() {
 
-      if ($(this).hasClass('intialized')) {
+      if ($(this).hasClass('initialized')) {
         return;
       }
 
-      $(this).addClass('intialized');
+      $(this).addClass('initialized');
 
       var overlayActive = false;
       var doneAnimating = true;
@@ -19,15 +19,15 @@
       var originalWidth = 0;
       var originalHeight = 0;
       origin.wrap(placeholder);
-      
-      
+
+
       origin.on('click', function(){
         var placeholder = origin.parent('.material-placeholder');
         var windowWidth = window.innerWidth;
         var windowHeight = window.innerHeight;
         var originalWidth = origin.width();
         var originalHeight = origin.height();
-        
+
 
         // If already modal, return to original
         if (doneAnimating === false) {
@@ -38,7 +38,7 @@
           returnToOriginal();
           return false;
         }
-        
+
 
         // Set states
         doneAnimating = false;
@@ -54,8 +54,8 @@
           top: 0,
           left: 0
         });
-        
-        
+
+
 
         // Set css on origin
         origin.css({position: 'absolute', 'z-index': 1000})
@@ -83,7 +83,7 @@
           $photo_caption.text(origin.data('caption'));
           $('body').append($photo_caption);
           $photo_caption.css({ "display": "inline" });
-          $photo_caption.velocity({opacity: 1}, {duration: inDuration, queue: false, easing: 'easeOutQuad'})
+          $photo_caption.velocity({opacity: 1}, {duration: inDuration, queue: false, easing: 'easeOutQuad'});
         }
 
 
@@ -178,7 +178,7 @@
           var windowHeight = window.innerHeight;
           var originalWidth = origin.data('width');
           var originalHeight = origin.data('height');
-       
+
           origin.velocity("stop", true);
           $('#materialbox-overlay').velocity("stop", true);
           $('.materialbox-caption').velocity("stop", true);

data/app/assets/javascripts/materialize/scrollFire.js

@@ -29,41 +29,16 @@
               var elementOffset = currentElement.getBoundingClientRect().top + document.body.scrollTop;
 
               if (windowScroll > (elementOffset + offset)) {
-                if (value.done != true) {
+                if (value.done !== true) {
                   var callbackFunc = new Function(callback);
                   callbackFunc();
                   value.done = true;
                 }
               }
             }
-          };
+          }
       }
     }, 100);
-
-
-    // $(window).scroll(function () {
-    //   var windowScroll = $(window).scrollTop() + $(window).height();
-
-    //   $.each( options, function( i, value ){
-    //     var selector = value.selector,
-    //         offset = value.offset,
-    //         callback = value.callback;
-
-    //     if ($(selector).length != 0) {
-    //       var elementOffset = $(selector).offset().top;
-
-    //       if (windowScroll > (elementOffset + offset)) {
-    //         if (value.done != true) {
-    //           var callbackFunc = new Function(callback);
-    //           callbackFunc();
-    //           value.done = true;
-    //         }
-    //       }
-    //     }
-
-    //   });
-    // });
-
-  }
+  };
 
 })(jQuery);

data/app/assets/javascripts/materialize/sideNav.js

@@ -1,45 +1,4 @@
 (function ($) {
-    // left: 37, up: 38, right: 39, down: 40,
-    // spacebar: 32, pageup: 33, pagedown: 34, end: 35, home: 36
-    // var keys = [32, 33, 34, 35, 36, 37, 38, 39, 40];
-
-    // function preventDefault(e) {
-    //   e = e || window.event;
-    //   if (e.preventDefault)
-    //     e.preventDefault();
-    //   e.returnValue = false;
-    // }
-
-    // function keydown(e) {
-    //   for (var i = keys.length; i--;) {
-    //     if (e.keyCode === keys[i]) {
-    //       preventDefault(e);
-    //       return;
-    //     }
-    //   }
-    // }
-
-    // function wheel(e) {
-    //   preventDefault(e);
-    // }
-
-    // function disable_scroll() {
-    //   if (window.addEventListener) {
-    //     window.addEventListener('DOMMouseScroll', wheel, false);
-    //   }
-    //   window.onmousewheel = document.onmousewheel = wheel;
-    //   document.onkeydown = keydown;
-    //   $('body').css({'overflow-y' : 'hidden'});
-    // }
-
-    // function enable_scroll() {
-    //   if (window.removeEventListener) {
-    //     window.removeEventListener('DOMMouseScroll', wheel, false);
-    //   }
-    //   window.onmousewheel = document.onmousewheel = document.onkeydown = null;
-    //   $('body').css({'overflow-y' : ''});
-
-    // }
 
   var methods = {
     init : function(options) {
@@ -47,7 +6,7 @@
         menuWidth: 240,
         edge: 'left',
         closeOnClick: false
-      }
+      };
       options = $.extend(defaults, options);
 
       $(this).each(function(){
@@ -75,7 +34,7 @@
 
         // If fixed sidenav, bring menu out
         if (menu_id.hasClass('fixed')) {
-            if ($(window).width() > 992) {
+            if (window.innerWidth > 992) {
               menu_id.css('left', 0);
             }
           }
@@ -85,7 +44,7 @@
           $(window).resize( function() {
             if (window.innerWidth > 992) {
               // Close menu if window is resized bigger than 992 and user has fixed sidenav
-              if ($('#sidenav-overlay').css('opacity') != 0 && menuOut) {
+              if ($('#sidenav-overlay').css('opacity') !== 0 && menuOut) {
                 removeMenu(true);
               }
               else {
@@ -104,7 +63,7 @@
         }
 
         // if closeOnClick, then add close event for all a tags in side sideNav
-        if (options.closeOnClick == true) {
+        if (options.closeOnClick === true) {
           menu_id.on("click.itemclick", "a:not(.collapsible-header)", function(){
             removeMenu();
           });
@@ -113,6 +72,10 @@
         function removeMenu(restoreNav) {
           panning = false;
           menuOut = false;
+
+          // Reenable scrolling
+          $('body').css('overflow', '');
+
           $('#sidenav-overlay').velocity({opacity: 0}, {duration: 200, queue: false, easing: 'easeOutQuad',
             complete: function() {
               $(this).remove();
@@ -126,7 +89,7 @@
                 queue: false,
                 easing: 'easeOutCubic',
                 complete: function() {
-                  if (restoreNav == true) {
+                  if (restoreNav === true) {
                     // Restore Fixed sidenav
                     menu_id.removeAttr('style');
                     menu_id.css('width', options.menuWidth);
@@ -144,7 +107,7 @@
                 queue: false,
                 easing: 'easeOutCubic',
                 complete: function() {
-                  if (restoreNav == true) {
+                  if (restoreNav === true) {
                     // Restore Fixed sidenav
                     menu_id.removeAttr('style');
                     menu_id.css('width', options.menuWidth);
@@ -162,7 +125,7 @@
 
         $('.drag-target').on('click', function(){
           removeMenu();
-        })
+        });
 
         $('.drag-target').hammer({
           prevent_default: false
@@ -175,6 +138,9 @@
             var y = e.gesture.center.y;
             var velocityX = e.gesture.velocityX;
 
+            // Disable Scrolling
+            $('body').css('overflow', 'hidden');
+
             // If overlay does not exist, create one and if it is clicked, close menu
             if ($('#sidenav-overlay').length === 0) {
               var overlay = $('<div id="sidenav-overlay"></div>');
@@ -200,11 +166,11 @@
             }
             else {
               // Left Direction
-              if (x < ($(window).width() - options.menuWidth / 2)) {
+              if (x < (window.innerWidth - options.menuWidth / 2)) {
                 menuOut = true;
               }
               // Right Direction
-              else if (x >= ($(window).width() - options.menuWidth / 2)) {
+              else if (x >= (window.innerWidth - options.menuWidth / 2)) {
                menuOut = false;
              }
               var rightPos = -1 *(x - options.menuWidth / 2);
@@ -219,17 +185,19 @@
 
 
             // Percentage overlay
+            var overlayPerc;
             if (options.edge === 'left') {
-              var overlayPerc = x / options.menuWidth;
+              overlayPerc = x / options.menuWidth;
               $('#sidenav-overlay').velocity({opacity: overlayPerc }, {duration: 50, queue: false, easing: 'easeOutQuad'});
             }
             else {
-              var overlayPerc = Math.abs((x - $(window).width()) / options.menuWidth);
+              overlayPerc = Math.abs((x - window.innerWidth) / options.menuWidth);
               $('#sidenav-overlay').velocity({opacity: overlayPerc }, {duration: 50, queue: false, easing: 'easeOutQuad'});
             }
           }
 
         }).bind('panend', function(e) {
+
           if (e.gesture.pointerType == "touch") {
             var velocityX = e.gesture.velocityX;
             panning = false;
@@ -241,6 +209,9 @@
                 $('.drag-target').css({width: '50%', right: 0, left: ''});
               }
               else if (!menuOut || velocityX > 0.3) {
+                // Enable Scrolling
+                $('body').css('overflow', '');
+                // Slide menu closed
                 menu_id.velocity({left: -1 * (options.menuWidth + 10)}, {duration: 200, queue: false, easing: 'easeOutQuad'});
                 $('#sidenav-overlay').velocity({opacity: 0 }, {duration: 200, queue: false, easing: 'easeOutQuad',
                   complete: function () {
@@ -256,6 +227,9 @@
                 $('.drag-target').css({width: '50%', right: '', left: 0});
               }
               else if (!menuOut || velocityX < -0.3) {
+                // Enable Scrolling
+                $('body').css('overflow', '');
+                // Slide menu closed
                 menu_id.velocity({right: -1 * (options.menuWidth + 10)}, {duration: 200, queue: false, easing: 'easeOutQuad'});
                 $('#sidenav-overlay').velocity({opacity: 0 }, {duration: 200, queue: false, easing: 'easeOutQuad',
                   complete: function () {
@@ -269,13 +243,16 @@
         });
 
           $this.click(function() {
-            if (menuOut == true) {
+            if (menuOut === true) {
               menuOut = false;
               panning = false;
               removeMenu();
             }
             else {
 
+              // Disable Scrolling
+              $('body').css('overflow', 'hidden');
+
               if (options.edge === 'left') {
                 $('.drag-target').css({width: '50%', right: 0, left: ''});
                 menu_id.velocity({left: 0}, {duration: 300, queue: false, easing: 'easeOutQuad'});
@@ -331,5 +308,5 @@
       } else {
         $.error( 'Method ' +  methodOrOptions + ' does not exist on jQuery.tooltip' );
       }
-    }; // PLugin end
+    }; // Plugin end
 }( jQuery ));

data/app/assets/javascripts/materialize/slider.js

@@ -1,246 +1,274 @@
 (function ($) {
 
-  $.fn.slider = function (options) {
-    var defaults = {
-      indicators: true,
-      height: 400,
-      transition: 500,
-      interval: 6000
-    }
-    options = $.extend(defaults, options);
-
-    return this.each(function() {
-
-      // For each slider, we want to keep track of
-      // which slide is active and its associated content
-      var $this = $(this);
-      var $slider = $this.find('ul.slides').first();
-      var $slides = $slider.find('li');
-      var $active_index = $slider.find('.active').index();
-      var $active;
-      if ($active_index != -1) { $active = $slides.eq($active_index); }
-
-      // Transitions the caption depending on alignment
-      function captionTransition(caption, duration) {
-        if (caption.hasClass("center-align")) {
-          caption.velocity({opacity: 0, translateY: -100}, {duration: duration, queue: false});
-        }
-        else if (caption.hasClass("right-align")) {
-          caption.velocity({opacity: 0, translateX: 100}, {duration: duration, queue: false});
-        }
-        else if (caption.hasClass("left-align")) {
-          caption.velocity({opacity: 0, translateX: -100}, {duration: duration, queue: false});
+  var methods = {
+
+    init : function(options) {
+      var defaults = {
+        indicators: true,
+        height: 400,
+        transition: 500,
+        interval: 6000
+      };
+      options = $.extend(defaults, options);
+      console.log(options);
+
+      return this.each(function() {
+
+        // For each slider, we want to keep track of
+        // which slide is active and its associated content
+        var $this = $(this);
+        var $slider = $this.find('ul.slides').first();
+        var $slides = $slider.find('li');
+        var $active_index = $slider.find('.active').index();
+        var $active;
+        if ($active_index != -1) { $active = $slides.eq($active_index); }
+
+        // Transitions the caption depending on alignment
+        function captionTransition(caption, duration) {
+          if (caption.hasClass("center-align")) {
+            caption.velocity({opacity: 0, translateY: -100}, {duration: duration, queue: false});
+          }
+          else if (caption.hasClass("right-align")) {
+            caption.velocity({opacity: 0, translateX: 100}, {duration: duration, queue: false});
+          }
+          else if (caption.hasClass("left-align")) {
+            caption.velocity({opacity: 0, translateX: -100}, {duration: duration, queue: false});
+          }
         }
-      }
 
-      // This function will transition the slide to any index of the next slide
-      function moveToSlide(index) {
-        if (index >= $slides.length) index = 0;
-        else if (index < 0) index = $slides.length -1;
+        // This function will transition the slide to any index of the next slide
+        function moveToSlide(index) {
+          if (index >= $slides.length) index = 0;
+          else if (index < 0) index = $slides.length -1;
 
-        $active_index = $slider.find('.active').index();
+          $active_index = $slider.find('.active').index();
 
-        // Only do if index changes
-        if ($active_index != index) {
-          $active = $slides.eq($active_index);
-          $caption = $active.find('.caption');
+          // Only do if index changes
+          if ($active_index != index) {
+            $active = $slides.eq($active_index);
+            $caption = $active.find('.caption');
 
-          $active.removeClass('active');
-          $active.velocity({opacity: 0}, {duration: options.transition, queue: false, easing: 'easeOutQuad',
-                            complete: function() {
-                              $slides.not('.active').velocity({opacity: 0, translateX: 0, translateY: 0}, {duration: 0, queue: false});
-                            } });
-          captionTransition($caption, options.transition);
+            $active.removeClass('active');
+            $active.velocity({opacity: 0}, {duration: options.transition, queue: false, easing: 'easeOutQuad',
+                              complete: function() {
+                                $slides.not('.active').velocity({opacity: 0, translateX: 0, translateY: 0}, {duration: 0, queue: false});
+                              } });
+            captionTransition($caption, options.transition);
 
 
-          // Update indicators
-          if (options.indicators) {
-            $indicators.eq($active_index).removeClass('active');
-          }
+            // Update indicators
+            if (options.indicators) {
+              $indicators.eq($active_index).removeClass('active');
+            }
 
-          $slides.eq(index).velocity({opacity: 1}, {duration: options.transition, queue: false, easing: 'easeOutQuad'});
-          $slides.eq(index).find('.caption').velocity({opacity: 1, translateX: 0, translateY: 0}, {duration: options.transition, delay: options.transition, queue: false, easing: 'easeOutQuad'});
-          $slides.eq(index).addClass('active');
+            $slides.eq(index).velocity({opacity: 1}, {duration: options.transition, queue: false, easing: 'easeOutQuad'});
+            $slides.eq(index).find('.caption').velocity({opacity: 1, translateX: 0, translateY: 0}, {duration: options.transition, delay: options.transition, queue: false, easing: 'easeOutQuad'});
+            $slides.eq(index).addClass('active');
 
 
-          // Update indicators
-          if (options.indicators) {
-            $indicators.eq(index).addClass('active');
+            // Update indicators
+            if (options.indicators) {
+              $indicators.eq(index).addClass('active');
+            }
           }
         }
-      }
 
-      // Set height of slider
-      if (options.height != 400) {
-        $this.height(options.height + 40);
+        console.log(options.height);
+        // Set height of slider
+        if (options.indicators) {
+          // Add height if indicators are present
+          $this.height(options.height + 40);
+        }
+        else {
+          $this.height(options.height);
+        }
         $slider.height(options.height);
-      }
-
-      // Set initial positions of captions
-      $slides.find('.caption').each(function () {
-        captionTransition($(this), 0);
-      });
 
-      // Set initial dimensions of images
-      // $slides.find('img').each(function () {
-      //   $(this).load(function () {
-      //     if ($(this).width() < $(this).parent().width()) {
-      //       $(this).css({width: '100%', height: 'auto'});
-      //     }
-      //   });
-      // });
-
-      // Move img src into background-image
-      $slides.find('img').each(function () {
-        $(this).css('background-image', 'url(' + $(this).attr('src') + ')' );
-        $(this).attr('src', 'data:image/gif;base64,R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==');
-      });
-
-      // dynamically add indicators
-      if (options.indicators) {
-        var $indicators = $('<ul class="indicators"></ul>');
-        $slides.each(function( index ) {
-          var $indicator = $('<li class="indicator-item"></li>');
-
-          // Handle clicks on indicators
-          $indicator.click(function () {
-            var $parent = $slider.parent();
-            var curr_index = $parent.find($(this)).index();
-            moveToSlide(curr_index);
 
-            // reset interval
-            clearInterval($interval);
-            $interval = setInterval(
-              function(){
-                $active_index = $slider.find('.active').index();
-                if ($slides.length == $active_index + 1) $active_index = 0; // loop to start
-                else $active_index += 1;
+        // Set initial positions of captions
+        $slides.find('.caption').each(function () {
+          captionTransition($(this), 0);
+        });
 
-                moveToSlide($active_index);
+        // Set initial dimensions of images
+        // $slides.find('img').each(function () {
+        //   $(this).load(function () {
+        //     if ($(this).width() < $(this).parent().width()) {
+        //       $(this).css({width: '100%', height: 'auto'});
+        //     }
+        //   });
+        // });
+
+        // Move img src into background-image
+        $slides.find('img').each(function () {
+          $(this).css('background-image', 'url(' + $(this).attr('src') + ')' );
+          $(this).attr('src', 'data:image/gif;base64,R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==');
+        });
 
-              }, options.transition + options.interval
-            );
+        // dynamically add indicators
+        if (options.indicators) {
+          var $indicators = $('<ul class="indicators"></ul>');
+          $slides.each(function( index ) {
+            var $indicator = $('<li class="indicator-item"></li>');
+
+            // Handle clicks on indicators
+            $indicator.click(function () {
+              var $parent = $slider.parent();
+              var curr_index = $parent.find($(this)).index();
+              moveToSlide(curr_index);
+
+              // reset interval
+              clearInterval($interval);
+              $interval = setInterval(
+                function(){
+                  $active_index = $slider.find('.active').index();
+                  if ($slides.length == $active_index + 1) $active_index = 0; // loop to start
+                  else $active_index += 1;
+
+                  moveToSlide($active_index);
+
+                }, options.transition + options.interval
+              );
+            });
+            $indicators.append($indicator);
           });
-          $indicators.append($indicator);
-        });
-        $this.append($indicators);
-        $indicators = $this.find('ul.indicators').find('li.indicator-item');
-      }
+          $this.append($indicators);
+          $indicators = $this.find('ul.indicators').find('li.indicator-item');
+        }
 
-      if ($active) {
-        $active.show();
-      }
-      else {
-        $slides.first().addClass('active').velocity({opacity: 1}, {duration: options.transition, queue: false, easing: 'easeOutQuad'});
+        if ($active) {
+          $active.show();
+        }
+        else {
+          $slides.first().addClass('active').velocity({opacity: 1}, {duration: options.transition, queue: false, easing: 'easeOutQuad'});
 
-        $active_index = 0;
-        $active = $slides.eq($active_index);
+          $active_index = 0;
+          $active = $slides.eq($active_index);
 
-        // Update indicators
-        if (options.indicators) {
-          $indicators.eq($active_index).addClass('active');
+          // Update indicators
+          if (options.indicators) {
+            $indicators.eq($active_index).addClass('active');
+          }
         }
-      }
 
-      // Adjust height to current slide
-      $active.find('img').each(function() {
-        $active.find('.caption').velocity({opacity: 1, translateX: 0, translateY: 0}, {duration: options.transition, queue: false, easing: 'easeOutQuad'});
-      });
+        // Adjust height to current slide
+        $active.find('img').each(function() {
+          $active.find('.caption').velocity({opacity: 1, translateX: 0, translateY: 0}, {duration: options.transition, queue: false, easing: 'easeOutQuad'});
+        });
 
-      // auto scroll
-      $interval = setInterval(
-        function(){
-          $active_index = $slider.find('.active').index();
-          moveToSlide($active_index + 1);
+        // auto scroll
+        $interval = setInterval(
+          function(){
+            $active_index = $slider.find('.active').index();
+            moveToSlide($active_index + 1);
 
-        }, options.transition + options.interval
-      );
+          }, options.transition + options.interval
+        );
 
 
-      // HammerJS, Swipe navigation
+        // HammerJS, Swipe navigation
 
-      // Touch Event
-      var panning = false;
-      var swipeLeft = false;
-      var swipeRight = false;
+        // Touch Event
+        var panning = false;
+        var swipeLeft = false;
+        var swipeRight = false;
 
-      $this.hammer({
-          prevent_default: false
-      }).bind('pan', function(e) {
-        if (e.gesture.pointerType === "touch") {
+        $this.hammer({
+            prevent_default: false
+        }).bind('pan', function(e) {
+          if (e.gesture.pointerType === "touch") {
 
-          // reset interval
-          clearInterval($interval);
+            // reset interval
+            clearInterval($interval);
 
-          var direction = e.gesture.direction;
-          var x = e.gesture.deltaX;
-          var velocityX = e.gesture.velocityX;
+            var direction = e.gesture.direction;
+            var x = e.gesture.deltaX;
+            var velocityX = e.gesture.velocityX;
 
-          $curr_slide = $slider.find('.active');
-          $curr_slide.velocity({ translateX: x
-              }, {duration: 50, queue: false, easing: 'easeOutQuad'});
+            $curr_slide = $slider.find('.active');
+            $curr_slide.velocity({ translateX: x
+                }, {duration: 50, queue: false, easing: 'easeOutQuad'});
 
-          // Swipe Left
-          if (direction === 4 && (x > ($this.innerWidth() / 2) || velocityX < -0.65)) {
-            swipeRight = true;
-          }
-          // Swipe Right
-          else if (direction === 2 && (x < (-1 * $this.innerWidth() / 2) || velocityX > 0.65)) {
-            swipeLeft = true;
-          }
+            // Swipe Left
+            if (direction === 4 && (x > ($this.innerWidth() / 2) || velocityX < -0.65)) {
+              swipeRight = true;
+            }
+            // Swipe Right
+            else if (direction === 2 && (x < (-1 * $this.innerWidth() / 2) || velocityX > 0.65)) {
+              swipeLeft = true;
+            }
 
-          // Make Slide Behind active slide visible
-          var next_slide;
-          if (swipeLeft) {
-            next_slide = $curr_slide.next();
-            if (next_slide.length === 0) {
-              next_slide = $slides.first();
+            // Make Slide Behind active slide visible
+            var next_slide;
+            if (swipeLeft) {
+              next_slide = $curr_slide.next();
+              if (next_slide.length === 0) {
+                next_slide = $slides.first();
+              }
+              next_slide.velocity({ opacity: 1
+                  }, {duration: 300, queue: false, easing: 'easeOutQuad'});
             }
-            next_slide.velocity({ opacity: 1
-                }, {duration: 300, queue: false, easing: 'easeOutQuad'});
-          }
-          if (swipeRight) {
-            next_slide = $curr_slide.prev();
-            if (next_slide.length === 0) {
-              next_slide = $slides.last();
+            if (swipeRight) {
+              next_slide = $curr_slide.prev();
+              if (next_slide.length === 0) {
+                next_slide = $slides.last();
+              }
+              next_slide.velocity({ opacity: 1
+                  }, {duration: 300, queue: false, easing: 'easeOutQuad'});
             }
-            next_slide.velocity({ opacity: 1
-                }, {duration: 300, queue: false, easing: 'easeOutQuad'});
+
+
           }
 
+        }).bind('panend', function(e) {
+          if (e.gesture.pointerType === "touch") {
 
-        }
+            $curr_slide = $slider.find('.active');
+            panning = false;
+            curr_index = $slider.find('.active').index();
 
-      }).bind('panend', function(e) {
-        if (e.gesture.pointerType === "touch") {
+            if (!swipeRight && !swipeLeft) {
+              // Return to original spot
+              $curr_slide.velocity({ translateX: 0
+                  }, {duration: 300, queue: false, easing: 'easeOutQuad'});
+            }
+            else if (swipeLeft) {
+              moveToSlide(curr_index + 1);
+              $curr_slide.velocity({translateX: -1 * $this.innerWidth() }, {duration: 300, queue: false, easing: 'easeOutQuad',
+                                    complete: function() {
+                                      $curr_slide.velocity({opacity: 0, translateX: 0}, {duration: 0, queue: false});
+                                    } });
+            }
+            else if (swipeRight) {
+              moveToSlide(curr_index - 1);
+              $curr_slide.velocity({translateX: $this.innerWidth() }, {duration: 300, queue: false, easing: 'easeOutQuad',
+                                    complete: function() {
+                                      $curr_slide.velocity({opacity: 0, translateX: 0}, {duration: 0, queue: false});
+                                    } });
+            }
+            swipeLeft = false;
+            swipeRight = false;
 
-          $curr_slide = $slider.find('.active');
-          panning = false;
-          curr_index = $slider.find('.active').index();
+            // Restart interval
+            clearInterval($interval);
+            $interval = setInterval(
+              function(){
+                $active_index = $slider.find('.active').index();
+                if ($slides.length == $active_index + 1) $active_index = 0; // loop to start
+                else $active_index += 1;
 
-          if (!swipeRight && !swipeLeft) {
-            // Return to original spot
-            $curr_slide.velocity({ translateX: 0
-                }, {duration: 300, queue: false, easing: 'easeOutQuad'});
-          }
-          else if (swipeLeft) {
-            moveToSlide(curr_index + 1);
-            $curr_slide.velocity({translateX: -1 * $this.innerWidth() }, {duration: 300, queue: false, easing: 'easeOutQuad',
-                                  complete: function() {
-                                    $curr_slide.velocity({opacity: 0, translateX: 0}, {duration: 0, queue: false});
-                                  } });
-          }
-          else if (swipeRight) {
-            moveToSlide(curr_index - 1);
-            $curr_slide.velocity({translateX: $this.innerWidth() }, {duration: 300, queue: false, easing: 'easeOutQuad',
-                                  complete: function() {
-                                    $curr_slide.velocity({opacity: 0, translateX: 0}, {duration: 0, queue: false});
-                                  } });
+                moveToSlide($active_index);
+
+              }, options.transition + options.interval
+            );
           }
-          swipeLeft = false;
-          swipeRight = false;
+        });
 
-          // Restart interval
+        $this.on('sliderPause', function() {
+          clearInterval($interval);
+        });
+
+        $this.on('sliderStart', function() {
           clearInterval($interval);
           $interval = setInterval(
             function(){
@@ -252,12 +280,30 @@
 
             }, options.transition + options.interval
           );
-        }
-      });
+        });
 
-    });
+      });
 
 
 
+    },
+    pause : function() {
+      $(this).trigger('sliderPause');
+    },
+    start : function() {
+      $(this).trigger('sliderStart');
+    }
   };
-}( jQuery ));
+
+
+    $.fn.slider = function(methodOrOptions) {
+      if ( methods[methodOrOptions] ) {
+        return methods[ methodOrOptions ].apply( this, Array.prototype.slice.call( arguments, 1 ));
+      } else if ( typeof methodOrOptions === 'object' || ! methodOrOptions ) {
+        // Default to "init"
+        return methods.init.apply( this, arguments );
+      } else {
+        $.error( 'Method ' +  methodOrOptions + ' does not exist on jQuery.tooltip' );
+      }
+    }; // Plugin end
+}( jQuery ));