materialize-sass 0.99.0 → 0.100.0

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

@@ -1,8 +1,7 @@
 // Custom Easing
-jQuery.extend( jQuery.easing,
-{
+jQuery.extend(jQuery.easing, {
   easeInOutMaterial: function (x, t, b, c, d) {
-    if ((t/=d/2) < 1) return c/2*t*t + b;
-    return c/4*((t-=2)*t*t + 2) + b;
+    if ((t /= d / 2) < 1) return c / 2 * t * t + b;
+    return c / 4 * ((t -= 2) * t * t + 2) + b;
   }
-});
+});

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

@@ -1,21 +1,21 @@
 (function ($) {
-  $(document).on('ready turbolinks:load', function() {
+  $(document).on('ready turbolinks:load', function () {
 
     // jQuery reverse
     $.fn.reverse = [].reverse;
 
     // Hover behaviour: make sure this doesn't work on .click-to-toggle FABs!
-    $(document).on('mouseenter.fixedActionBtn', '.fixed-action-btn:not(.click-to-toggle):not(.toolbar)', function(e) {
+    $(document).on('mouseenter.fixedActionBtn', '.fixed-action-btn:not(.click-to-toggle):not(.toolbar)', function (e) {
       var $this = $(this);
       openFABMenu($this);
     });
-    $(document).on('mouseleave.fixedActionBtn', '.fixed-action-btn:not(.click-to-toggle):not(.toolbar)', function(e) {
+    $(document).on('mouseleave.fixedActionBtn', '.fixed-action-btn:not(.click-to-toggle):not(.toolbar)', function (e) {
       var $this = $(this);
       closeFABMenu($this);
     });
 
     // Toggle-on-click behaviour.
-    $(document).on('click.fabClickToggle', '.fixed-action-btn.click-to-toggle > a', function(e) {
+    $(document).on('click.fabClickToggle', '.fixed-action-btn.click-to-toggle > a', function (e) {
       var $this = $(this);
       var $menu = $this.parent();
       if ($menu.hasClass('active')) {
@@ -26,30 +26,28 @@
     });
 
     // Toolbar transition behaviour.
-    $(document).on('click.fabToolbar', '.fixed-action-btn.toolbar > a', function(e) {
+    $(document).on('click.fabToolbar', '.fixed-action-btn.toolbar > a', function (e) {
       var $this = $(this);
       var $menu = $this.parent();
       FABtoToolbar($menu);
     });
-
   });
 
   $.fn.extend({
-    openFAB: function() {
+    openFAB: function () {
       openFABMenu($(this));
     },
-    closeFAB: function() {
+    closeFAB: function () {
       closeFABMenu($(this));
     },
-    openToolbar: function() {
+    openToolbar: function () {
       FABtoToolbar($(this));
     },
-    closeToolbar: function() {
+    closeToolbar: function () {
       toolbarToFAB($(this));
     }
   });
 
-
   var openFABMenu = function (btn) {
     var $this = btn;
     if ($this.hasClass('active') === false) {
@@ -65,15 +63,11 @@
       }
 
       $this.addClass('active');
-      $this.find('ul .btn-floating').velocity(
-        { scaleY: ".4", scaleX: ".4", translateY: offsetY + 'px', translateX: offsetX + 'px'},
-        { duration: 0 });
+      $this.find('ul .btn-floating').velocity({ scaleY: ".4", scaleX: ".4", translateY: offsetY + 'px', translateX: offsetX + 'px' }, { duration: 0 });
 
       var time = 0;
-      $this.find('ul .btn-floating').reverse().each( function () {
-        $(this).velocity(
-          { opacity: "1", scaleX: "1", scaleY: "1", translateY: "0", translateX: '0'},
-          { duration: 80, delay: time });
+      $this.find('ul .btn-floating').reverse().each(function () {
+        $(this).velocity({ opacity: "1", scaleX: "1", scaleY: "1", translateY: "0", translateX: '0' }, { duration: 80, delay: time });
         time += 40;
       });
     }
@@ -94,18 +88,14 @@
     $this.removeClass('active');
     var time = 0;
     $this.find('ul .btn-floating').velocity("stop", true);
-    $this.find('ul .btn-floating').velocity(
-      { opacity: "0", scaleX: ".4", scaleY: ".4", translateY: offsetY + 'px', translateX: offsetX + 'px'},
-      { duration: 80 }
-    );
+    $this.find('ul .btn-floating').velocity({ opacity: "0", scaleX: ".4", scaleY: ".4", translateY: offsetY + 'px', translateX: offsetX + 'px' }, { duration: 80 });
   };
 
-
   /**
    * Transform FAB into toolbar
    * @param  {Object}  object jQuery object
    */
-  var FABtoToolbar = function(btn) {
+  var FABtoToolbar = function (btn) {
     if (btn.attr('data-open') === "true") {
       return;
     }
@@ -120,7 +110,7 @@
     var fabColor = anchor.css('background-color');
     anchor.append(backdrop);
 
-    offsetX = btnRect.left - (windowWidth / 2) + (btnRect.width / 2);
+    offsetX = btnRect.left - windowWidth / 2 + btnRect.width / 2;
     offsetY = windowHeight - btnRect.bottom;
     scaleFactor = windowWidth / backdrop.width();
     btn.attr('data-origin-bottom', btnRect.bottom);
@@ -146,8 +136,7 @@
       'background-color': fabColor
     });
 
-
-    setTimeout(function() {
+    setTimeout(function () {
       btn.css({
         transform: '',
         transition: 'transform .2s cubic-bezier(0.550, 0.085, 0.680, 0.530), background-color 0s linear .2s'
@@ -158,7 +147,7 @@
         transition: 'transform .2s'
       });
 
-      setTimeout(function() {
+      setTimeout(function () {
         btn.css({
           overflow: 'hidden',
           'background-color': fabColor
@@ -172,13 +161,13 @@
         });
 
         // Scroll to close.
-        $(window).on('scroll.fabToolbarClose', function() {
+        $(window).on('scroll.fabToolbarClose', function () {
           toolbarToFAB(btn);
           $(window).off('scroll.fabToolbarClose');
           $(document).off('click.fabToolbarClose');
         });
 
-        $(document).on('click.fabToolbarClose', function(e) {
+        $(document).on('click.fabToolbarClose', function (e) {
           if (!$(e.target).closest(menu).length) {
             toolbarToFAB(btn);
             $(window).off('scroll.fabToolbarClose');
@@ -193,7 +182,7 @@
    * Transform toolbar back into FAB
    * @param  {Object}  object jQuery object
    */
-  var toolbarToFAB = function(btn) {
+  var toolbarToFAB = function (btn) {
     if (btn.attr('data-open') !== "true") {
       return;
     }
@@ -209,11 +198,10 @@
     var backdrop = btn.find('.fab-backdrop');
     var fabColor = anchor.css('background-color');
 
-    offsetX = btnLeft - (windowWidth / 2) + (btnWidth / 2);
+    offsetX = btnLeft - windowWidth / 2 + btnWidth / 2;
     offsetY = windowHeight - btnBottom;
     scaleFactor = windowWidth / backdrop.width();
 
-
     // Hide backdrop
     btn.removeClass('active');
     btn.attr('data-open', false);
@@ -232,7 +220,7 @@
       opacity: ''
     });
 
-    setTimeout(function() {
+    setTimeout(function () {
       backdrop.remove();
 
       // Set initial state.
@@ -250,7 +238,7 @@
         transform: 'translate3d(0,' + offsetY + 'px,0)'
       });
 
-      setTimeout(function() {
+      setTimeout(function () {
         btn.css({
           transform: 'translate3d(0,0,0)',
           transition: 'transform .2s'
@@ -262,6 +250,4 @@
       }, 20);
     }, 200);
   };
-
-
-}( jQuery ));
+})(jQuery);

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

@@ -1,36 +1,28 @@
 (function ($) {
-  $(document).on('ready turbolinks:load', function() {
+  $(document).on('ready turbolinks:load', function () {
 
     $(document).on('click.card', '.card', function (e) {
       if ($(this).find('> .card-reveal').length) {
         var $card = $(e.target).closest('.card');
         if ($card.data('initialOverflow') === undefined) {
-          $card.data(
-            'initialOverflow',
-            $card.css('overflow') === undefined ? '' : $card.css('overflow')
-          );
+          $card.data('initialOverflow', $card.css('overflow') === undefined ? '' : $card.css('overflow'));
         }
         if ($(e.target).is($('.card-reveal .card-title')) || $(e.target).is($('.card-reveal .card-title i'))) {
           // Make Reveal animate down and display none
-          $(this).find('.card-reveal').velocity(
-            {translateY: 0}, {
-              duration: 225,
-              queue: false,
-              easing: 'easeInOutQuad',
-              complete: function() {
-                $(this).css({ display: 'none'});
-                $card.css('overflow', $card.data('initialOverflow'));
-              }
+          $(this).find('.card-reveal').velocity({ translateY: 0 }, {
+            duration: 225,
+            queue: false,
+            easing: 'easeInOutQuad',
+            complete: function () {
+              $(this).css({ display: 'none' });
+              $card.css('overflow', $card.data('initialOverflow'));
             }
-          );
-        }
-        else if ($(e.target).is($('.card .activator')) ||
-                 $(e.target).is($('.card .activator i')) ) {
+          });
+        } else if ($(e.target).is($('.card .activator')) || $(e.target).is($('.card .activator i'))) {
           $card.css('overflow', 'hidden');
-          $(this).find('.card-reveal').css({ display: 'block'}).velocity("stop", false).velocity({translateY: '-100%'}, {duration: 300, queue: false, easing: 'easeInOutQuad'});
+          $(this).find('.card-reveal').css({ display: 'block' }).velocity("stop", false).velocity({ translateY: '-100%' }, { duration: 300, queue: false, easing: 'easeInOutQuad' });
         }
       }
     });
-
   });
-}( jQuery ));
+})(jQuery);

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

@@ -2,7 +2,7 @@
 
   var methods = {
 
-    init : function(options) {
+    init: function (options) {
       var defaults = {
         duration: 200, // ms
         dist: -100, // zoom scale TODO: make this more intuitive as an option
@@ -16,36 +16,47 @@
       options = $.extend(defaults, options);
       var namespace = Materialize.objectSelectorString($(this));
 
-      return this.each(function(i) {
+      return this.each(function (i) {
 
-        var uniqueNamespace = namespace+i;
-        var images, item_width, item_height, offset, center, pressed, dim, count,
-            reference, referenceY, amplitude, target, velocity, scrolling,
-            xform, frame, timestamp, ticker, dragged, vertical_dragged;
+        var images, item_width, item_height, offset, center, pressed, dim, count, reference, referenceY, amplitude, target, velocity, scrolling, xform, frame, timestamp, ticker, dragged, vertical_dragged;
         var $indicators = $('<ul class="indicators"></ul>');
         var scrollingTimeout = null;
         var oneTimeCallback = null;
 
-
         // Initialize
         var view = $(this);
-        var showIndicators = view.attr('data-indicators') || options.indicators;
-
+        var hasMultipleSlides = view.find('.carousel-item').length > 1;
+        var showIndicators = (view.attr('data-indicators') || options.indicators) && hasMultipleSlides;
+        var noWrap = view.attr('data-no-wrap') || options.noWrap || !hasMultipleSlides;
+        var uniqueNamespace = view.attr('data-namespace') || namespace + i;
+        view.attr('data-namespace', uniqueNamespace);
 
         // Options
-        var setCarouselHeight = function() {
-          var firstImage = view.find('.carousel-item img').first();
+        var setCarouselHeight = function (imageOnly) {
+          var firstSlide = view.find('.carousel-item.active').length ? view.find('.carousel-item.active').first() : view.find('.carousel-item').first();
+          var firstImage = firstSlide.find('img').first();
           if (firstImage.length) {
-            if (firstImage.prop('complete')) {
-              view.css('height', firstImage.height());
+            if (firstImage[0].complete) {
+              // If image won't trigger the load event
+              var imageHeight = firstImage.height();
+              if (imageHeight > 0) {
+                view.css('height', firstImage.height());
+              } else {
+                // If image still has no height, use the natural dimensions to calculate
+                var naturalWidth = firstImage[0].naturalWidth;
+                var naturalHeight = firstImage[0].naturalHeight;
+                var adjustedHeight = view.width() / naturalWidth * naturalHeight;
+                view.css('height', adjustedHeight);
+              }
             } else {
-              firstImage.on('load', function(){
+              // Get height when image is loaded normally
+              firstImage.on('load', function () {
                 view.css('height', $(this).height());
               });
             }
-          } else {
-            var imageHeight = view.find('.carousel-item').first().height();
-            view.css('height', imageHeight);
+          } else if (!imageOnly) {
+            var slideHeight = firstSlide.height();
+            view.css('height', slideHeight);
           }
         };
 
@@ -59,18 +70,16 @@
           }
         }
 
-
         // Don't double initialize.
         if (view.hasClass('initialized')) {
           // Recalculate variables
           $(window).trigger('resize');
 
           // Redraw carousel.
-          $(this).trigger('carouselNext', [0.000001]);
+          view.trigger('carouselNext', [0.000001]);
           return true;
         }
 
-
         view.addClass('initialized');
         pressed = false;
         offset = target = 0;
@@ -105,23 +114,22 @@
         }
         count = images.length;
 
-
         function setupEvents() {
           if (typeof window.ontouchstart !== 'undefined') {
-            view[0].addEventListener('touchstart', tap);
-            view[0].addEventListener('touchmove', drag);
-            view[0].addEventListener('touchend', release);
-          }
-          view[0].addEventListener('mousedown', tap);
-          view[0].addEventListener('mousemove', drag);
-          view[0].addEventListener('mouseup', release);
-          view[0].addEventListener('mouseleave', release);
-          view[0].addEventListener('click', click);
+            view.on('touchstart.carousel', tap);
+            view.on('touchmove.carousel', drag);
+            view.on('touchend.carousel', release);
+          }
+          view.on('mousedown.carousel', tap);
+          view.on('mousemove.carousel', drag);
+          view.on('mouseup.carousel', release);
+          view.on('mouseleave.carousel', release);
+          view.on('click.carousel', click);
         }
 
         function xpos(e) {
           // touch event
-          if (e.targetTouches && (e.targetTouches.length >= 1)) {
+          if (e.targetTouches && e.targetTouches.length >= 1) {
             return e.targetTouches[0].clientX;
           }
 
@@ -131,7 +139,7 @@
 
         function ypos(e) {
           // touch event
-          if (e.targetTouches && (e.targetTouches.length >= 1)) {
+          if (e.targetTouches && e.targetTouches.length >= 1) {
             return e.targetTouches[0].clientY;
           }
 
@@ -140,7 +148,7 @@
         }
 
         function wrap(x) {
-          return (x >= count) ? (x % count) : (x < 0) ? wrap(count + (x % count)) : x;
+          return x >= count ? x % count : x < 0 ? wrap(count + x % count) : x;
         }
 
         function scroll(x) {
@@ -152,7 +160,7 @@
           if (scrollingTimeout != null) {
             window.clearTimeout(scrollingTimeout);
           }
-          scrollingTimeout = window.setTimeout(function() {
+          scrollingTimeout = window.setTimeout(function () {
             scrolling = false;
             view.removeClass('scrolling');
           }, options.duration);
@@ -161,10 +169,10 @@
           var i, half, delta, dir, tween, el, alignment, xTranslation;
           var lastCenter = center;
 
-          offset = (typeof x === 'number') ? x : offset;
+          offset = typeof x === 'number' ? x : offset;
           center = Math.floor((offset + dim / 2) / dim);
           delta = offset - center * dim;
-          dir = (delta < 0) ? 1 : -1;
+          dir = delta < 0 ? 1 : -1;
           tween = -dir * delta * 2 / dim;
           half = count >> 1;
 
@@ -177,7 +185,7 @@
 
           // Set indicator active
           if (showIndicators) {
-            var diff = (center % count);
+            var diff = center % count;
             var activeIndicator = $indicators.find('.indicator-item.active');
             if (activeIndicator.index() !== diff) {
               activeIndicator.removeClass('active');
@@ -187,7 +195,7 @@
 
           // center
           // Don't show wrapped items.
-          if (!options.noWrap || (center >= 0 && center < count)) {
+          if (!noWrap || center >= 0 && center < count) {
             el = images[wrap(center)];
 
             // Add active class to center item.
@@ -195,13 +203,13 @@
               view.find('.carousel-item').removeClass('active');
               $(el).addClass('active');
             }
-            el.style[xform] = alignment +
-              ' translateX(' + (-delta / 2) + 'px)' +
-              ' translateX(' + (dir * options.shift * tween * i) + 'px)' +
-              ' translateZ(' + (options.dist * tween) + 'px)';
+            el.style[xform] = alignment + ' translateX(' + -delta / 2 + 'px)' + ' translateX(' + dir * options.shift * tween * i + 'px)' + ' translateZ(' + options.dist * tween + 'px)';
             el.style.zIndex = 0;
-            if (options.fullWidth) { tweenedOpacity = 1; }
-            else { tweenedOpacity = 1 - 0.2 * tween; }
+            if (options.fullWidth) {
+              tweenedOpacity = 1;
+            } else {
+              tweenedOpacity = 1 - 0.2 * tween;
+            }
             el.style.opacity = tweenedOpacity;
             el.style.display = 'block';
           }
@@ -210,37 +218,32 @@
             // right side
             if (options.fullWidth) {
               zTranslation = options.dist;
-              tweenedOpacity = (i === half && delta < 0) ? 1 - tween : 1;
+              tweenedOpacity = i === half && delta < 0 ? 1 - tween : 1;
             } else {
               zTranslation = options.dist * (i * 2 + tween * dir);
               tweenedOpacity = 1 - 0.2 * (i * 2 + tween * dir);
             }
             // Don't show wrapped items.
-            if (!options.noWrap || center + i < count) {
+            if (!noWrap || center + i < count) {
               el = images[wrap(center + i)];
-              el.style[xform] = alignment +
-                ' translateX(' + (options.shift + (dim * i - delta) / 2) + 'px)' +
-                ' translateZ(' + zTranslation + 'px)';
+              el.style[xform] = alignment + ' translateX(' + (options.shift + (dim * i - delta) / 2) + 'px)' + ' translateZ(' + zTranslation + 'px)';
               el.style.zIndex = -i;
               el.style.opacity = tweenedOpacity;
               el.style.display = 'block';
             }
 
-
             // left side
             if (options.fullWidth) {
               zTranslation = options.dist;
-              tweenedOpacity = (i === half && delta > 0) ? 1 - tween : 1;
+              tweenedOpacity = i === half && delta > 0 ? 1 - tween : 1;
             } else {
               zTranslation = options.dist * (i * 2 - tween * dir);
               tweenedOpacity = 1 - 0.2 * (i * 2 - tween * dir);
             }
             // Don't show wrapped items.
-            if (!options.noWrap || center - i >= 0) {
+            if (!noWrap || center - i >= 0) {
               el = images[wrap(center - i)];
-              el.style[xform] = alignment +
-                ' translateX(' + (-options.shift + (-dim * i - delta) / 2) + 'px)' +
-                ' translateZ(' + zTranslation + 'px)';
+              el.style[xform] = alignment + ' translateX(' + (-options.shift + (-dim * i - delta) / 2) + 'px)' + ' translateZ(' + zTranslation + 'px)';
               el.style.zIndex = -i;
               el.style.opacity = tweenedOpacity;
               el.style.display = 'block';
@@ -249,28 +252,27 @@
 
           // center
           // Don't show wrapped items.
-          if (!options.noWrap || (center >= 0 && center < count)) {
+          if (!noWrap || center >= 0 && center < count) {
             el = images[wrap(center)];
-            el.style[xform] = alignment +
-              ' translateX(' + (-delta / 2) + 'px)' +
-              ' translateX(' + (dir * options.shift * tween) + 'px)' +
-              ' translateZ(' + (options.dist * tween) + 'px)';
+            el.style[xform] = alignment + ' translateX(' + -delta / 2 + 'px)' + ' translateX(' + dir * options.shift * tween + 'px)' + ' translateZ(' + options.dist * tween + 'px)';
             el.style.zIndex = 0;
-            if (options.fullWidth) { tweenedOpacity = 1; }
-            else { tweenedOpacity = 1 - 0.2 * tween; }
+            if (options.fullWidth) {
+              tweenedOpacity = 1;
+            } else {
+              tweenedOpacity = 1 - 0.2 * tween;
+            }
             el.style.opacity = tweenedOpacity;
             el.style.display = 'block';
           }
 
           // onCycleTo callback
-          if (lastCenter !== center &&
-              typeof(options.onCycleTo) === "function") {
+          if (lastCenter !== center && typeof options.onCycleTo === "function") {
             var $curr_item = view.find('.carousel-item').eq(wrap(center));
             options.onCycleTo.call(this, $curr_item, dragged);
           }
 
           // One time callback
-          if (typeof(oneTimeCallback) === "function") {
+          if (typeof oneTimeCallback === "function") {
             oneTimeCallback.call(this, $curr_item, dragged);
             oneTimeCallback = null;
           }
@@ -296,10 +298,10 @@
             elapsed = Date.now() - timestamp;
             delta = amplitude * Math.exp(-elapsed / options.duration);
             if (delta > 2 || delta < -2) {
-                scroll(target - delta);
-                requestAnimationFrame(autoScroll);
+              scroll(target - delta);
+              requestAnimationFrame(autoScroll);
             } else {
-                scroll(target);
+              scroll(target);
             }
           }
         }
@@ -310,7 +312,6 @@
             e.preventDefault();
             e.stopPropagation();
             return false;
-
           } else if (!options.fullWidth) {
             var clickedIndex = $(e.target).closest('.carousel-item').index();
             var diff = wrap(center) - clickedIndex;
@@ -325,29 +326,32 @@
         }
 
         function cycleTo(n) {
-          var diff = (center % count) - n;
+          var diff = center % count - n;
 
           // Account for wraparound.
-          if (!options.noWrap) {
+          if (!noWrap) {
             if (diff < 0) {
-              if (Math.abs(diff + count) < Math.abs(diff)) { diff += count; }
-
+              if (Math.abs(diff + count) < Math.abs(diff)) {
+                diff += count;
+              }
             } else if (diff > 0) {
-              if (Math.abs(diff - count) < diff) { diff -= count; }
+              if (Math.abs(diff - count) < diff) {
+                diff -= count;
+              }
             }
           }
 
           // Call prev or next accordingly.
           if (diff < 0) {
             view.trigger('carouselNext', [Math.abs(diff)]);
-
           } else if (diff > 0) {
             view.trigger('carouselPrev', [diff]);
           }
         }
 
         function tap(e) {
-          if (e.type === 'mousedown') {
+          // Fixes firefox draggable image bug
+          if (e.type === 'mousedown' && $(e.target).is('img')) {
             e.preventDefault();
           }
           pressed = true;
@@ -377,13 +381,11 @@
                 reference = x;
                 scroll(offset + delta);
               }
-
             } else if (dragged) {
               // If dragging don't allow vertical scroll.
               e.preventDefault();
               e.stopPropagation();
               return false;
-
             } else {
               // Vertical scrolling.
               vertical_dragged = true;
@@ -414,7 +416,7 @@
           target = Math.round(target / dim) * dim;
 
           // No wrap of items.
-          if (options.noWrap) {
+          if (noWrap) {
             if (target >= dim * (count - 1)) {
               target = dim * (count - 1);
             } else if (target < 0) {
@@ -442,31 +444,32 @@
           return true;
         });
 
-
-        $(window).off('resize.carousel-'+uniqueNamespace).on('resize.carousel-'+uniqueNamespace, function() {
+        var throttledResize = Materialize.throttle(function () {
           if (options.fullWidth) {
             item_width = view.find('.carousel-item').first().innerWidth();
-            item_height = view.find('.carousel-item').first().innerHeight();
+            var imageHeight = view.find('.carousel-item.active').height();
             dim = item_width * 2 + options.padding;
             offset = center * 2 * item_width;
             target = offset;
+            setCarouselHeight(true);
           } else {
             scroll();
           }
-        });
+        }, 200);
+        $(window).off('resize.carousel-' + uniqueNamespace).on('resize.carousel-' + uniqueNamespace, throttledResize);
 
         setupEvents();
         scroll(offset);
 
-        $(this).on('carouselNext', function(e, n, callback) {
+        $(this).on('carouselNext', function (e, n, callback) {
           if (n === undefined) {
             n = 1;
           }
-          if (typeof(callback) === "function") {
+          if (typeof callback === "function") {
             oneTimeCallback = callback;
           }
 
-          target = (dim * Math.round(offset / dim)) + (dim * n);
+          target = dim * Math.round(offset / dim) + dim * n;
           if (offset !== target) {
             amplitude = target - offset;
             timestamp = Date.now();
@@ -474,15 +477,15 @@
           }
         });
 
-        $(this).on('carouselPrev', function(e, n, callback) {
+        $(this).on('carouselPrev', function (e, n, callback) {
           if (n === undefined) {
             n = 1;
           }
-          if (typeof(callback) === "function") {
+          if (typeof callback === "function") {
             oneTimeCallback = callback;
           }
 
-          target = (dim * Math.round(offset / dim)) - (dim * n);
+          target = dim * Math.round(offset / dim) - dim * n;
           if (offset !== target) {
             amplitude = target - offset;
             timestamp = Date.now();
@@ -490,42 +493,51 @@
           }
         });
 
-        $(this).on('carouselSet', function(e, n, callback) {
+        $(this).on('carouselSet', function (e, n, callback) {
           if (n === undefined) {
             n = 0;
           }
-          if (typeof(callback) === "function") {
+          if (typeof callback === "function") {
             oneTimeCallback = callback;
           }
 
           cycleTo(n);
         });
-
       });
-
-
-
     },
-    next : function(n, callback) {
+    next: function (n, callback) {
       $(this).trigger('carouselNext', [n, callback]);
     },
-    prev : function(n, callback) {
+    prev: function (n, callback) {
       $(this).trigger('carouselPrev', [n, callback]);
     },
-    set : function(n, callback) {
+    set: function (n, callback) {
       $(this).trigger('carouselSet', [n, callback]);
+    },
+    destroy: function () {
+      var uniqueNamespace = $(this).attr('data-namespace');
+      $(this).removeAttr('data-namespace');
+      $(this).removeClass('initialized');
+      $(this).find('.indicators').remove();
+
+      // Remove event handlers
+      $(this).off('carouselNext carouselPrev carouselSet');
+      $(window).off('resize.carousel-' + uniqueNamespace);
+      if (typeof window.ontouchstart !== 'undefined') {
+        $(this).off('touchstart.carousel touchmove.carousel touchend.carousel');
+      }
+      $(this).off('mousedown.carousel mousemove.carousel mouseup.carousel mouseleave.carousel click.carousel');
     }
   };
 
-
-    $.fn.carousel = 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.carousel' );
-      }
-    }; // Plugin end
-}( jQuery ));
+  $.fn.carousel = 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.carousel');
+    }
+  }; // Plugin end
+})(jQuery);