materialize-sass 0.99.0 → 0.100.0

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

@@ -3,17 +3,16 @@
   $.fn.parallax = function () {
     var window_width = $(window).width();
     // Parallax Scripts
-    return this.each(function(i) {
+    return this.each(function (i) {
       var $this = $(this);
       $this.addClass('parallax');
 
       function updateParallax(initial) {
         var container_height;
         if (window_width < 601) {
-          container_height = ($this.height() > 0) ? $this.height() : $this.children("img").height();
-        }
-        else {
-          container_height = ($this.height() > 0) ? $this.height() : 500;
+          container_height = $this.height() > 0 ? $this.height() : $this.children("img").height();
+        } else {
+          container_height = $this.height() > 0 ? $this.height() : 500;
         }
         var $img = $this.children("img").first();
         var img_height = $img.height();
@@ -24,35 +23,32 @@
         var windowHeight = window.innerHeight;
         var windowBottom = scrollTop + windowHeight;
         var percentScrolled = (windowBottom - top) / (container_height + windowHeight);
-        var parallax = Math.round((parallax_dist * percentScrolled));
+        var parallax = Math.round(parallax_dist * percentScrolled);
 
         if (initial) {
           $img.css('display', 'block');
         }
-        if ((bottom > scrollTop) && (top < (scrollTop + windowHeight))) {
+        if (bottom > scrollTop && top < scrollTop + windowHeight) {
           $img.css('transform', "translate3D(-50%," + parallax + "px, 0)");
         }
-
       }
 
       // Wait for image load
-      $this.children("img").one("load", function() {
+      $this.children("img").one("load", function () {
         updateParallax(true);
-      }).each(function() {
+      }).each(function () {
         if (this.complete) $(this).trigger("load");
       });
 
-      $(window).scroll(function() {
+      $(window).scroll(function () {
         window_width = $(window).width();
         updateParallax(false);
       });
 
-      $(window).resize(function() {
+      $(window).resize(function () {
         window_width = $(window).width();
         updateParallax(false);
       });
-
     });
-
   };
-}( jQuery ));
+})(jQuery);

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

@@ -20,9 +20,8 @@
 
     options = $.extend(defaults, options);
 
-
     $index = 0;
-    return this.each(function() {
+    return this.each(function () {
       var $uniqueId = Materialize.guid(),
           $this = $(this),
           $original_offset = $(this).offset().top;
@@ -64,8 +63,6 @@
         var $scrolled = $(window).scrollTop() + options.offset;
         updateElements($this, $scrolled);
       });
-
     });
-
   };
-}( jQuery ));
+})(jQuery);

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

@@ -1,13 +1,13 @@
-(function($) {
+(function ($) {
 
   var scrollFireEventsHandled = false;
 
   // Input: Array of JSON objects {selector, offset, callback}
-  Materialize.scrollFire = function(options) {
-    var onScroll = function() {
+  Materialize.scrollFire = function (options) {
+    var onScroll = function () {
       var windowScroll = window.pageYOffset + window.innerHeight;
 
-      for (var i = 0 ; i < options.length; i++) {
+      for (var i = 0; i < options.length; i++) {
         // Get options from each line
         var value = options[i];
         var selector = value.selector,
@@ -15,14 +15,14 @@
             callback = value.callback;
 
         var currentElement = document.querySelector(selector);
-        if ( currentElement !== null) {
+        if (currentElement !== null) {
           var elementOffset = currentElement.getBoundingClientRect().top + window.pageYOffset;
 
-          if (windowScroll > (elementOffset + offset)) {
+          if (windowScroll > elementOffset + offset) {
             if (value.done !== true) {
-              if (typeof(callback) === 'function') {
+              if (typeof callback === 'function') {
                 callback.call(this, currentElement);
-              } else if (typeof(callback) === 'string') {
+              } else if (typeof callback === 'string') {
                 var callbackFunc = new Function(callback);
                 callbackFunc(currentElement);
               }
@@ -33,8 +33,7 @@
       }
     };
 
-
-    var throttledScroll = Materialize.throttle(function() {
+    var throttledScroll = Materialize.throttle(function () {
       onScroll();
     }, options.throttle || 100);
 
@@ -47,5 +46,4 @@
     // perform a scan once, after current execution context, and after dom is ready
     setTimeout(throttledScroll, 0);
   };
-
 })(jQuery);

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

@@ -10,7 +10,7 @@
  * @see https://github.com/thesmart
  * @version 0.1.2
  */
-(function($) {
+(function ($) {
 
 	var jWindow = $(window);
 	var elements = [];
@@ -19,33 +19,29 @@
 	var ticks = 0;
 	var unique_id = 1;
 	var offset = {
-		top : 0,
-		right : 0,
-		bottom : 0,
-		left : 0,
-	}
-
-	/**
-	 * Find elements that are within the boundary
-	 * @param {number} top
-	 * @param {number} right
-	 * @param {number} bottom
-	 * @param {number} left
-	 * @return {jQuery}		A collection of elements
-	 */
-	function findElements(top, right, bottom, left) {
+		top: 0,
+		right: 0,
+		bottom: 0,
+		left: 0
+
+		/**
+   * Find elements that are within the boundary
+   * @param {number} top
+   * @param {number} right
+   * @param {number} bottom
+   * @param {number} left
+   * @return {jQuery}		A collection of elements
+   */
+	};function findElements(top, right, bottom, left) {
 		var hits = $();
-		$.each(elements, function(i, element) {
+		$.each(elements, function (i, element) {
 			if (element.height() > 0) {
 				var elTop = element.offset().top,
-					elLeft = element.offset().left,
-					elRight = elLeft + element.width(),
-					elBottom = elTop + element.height();
+				    elLeft = element.offset().left,
+				    elRight = elLeft + element.width(),
+				    elBottom = elTop + element.height();
 
-				var isIntersect = !(elLeft > right ||
-					elRight < left ||
-					elTop > bottom ||
-					elBottom < top);
+				var isIntersect = !(elLeft > right || elRight < left || elTop > bottom || elBottom < top);
 
 				if (isIntersect) {
 					hits.push(element);
@@ -56,23 +52,22 @@
 		return hits;
 	}
 
-
 	/**
-	 * Called when the user scrolls the window
-	 */
+  * Called when the user scrolls the window
+  */
 	function onScroll(scrollOffset) {
 		// unique tick id
 		++ticks;
 
 		// viewport rectangle
 		var top = jWindow.scrollTop(),
-			left = jWindow.scrollLeft(),
-			right = left + jWindow.width(),
-			bottom = top + jWindow.height();
+		    left = jWindow.scrollLeft(),
+		    right = left + jWindow.width(),
+		    bottom = top + jWindow.height();
 
 		// determine which elements are in view
-		var intersections = findElements(top+offset.top + scrollOffset || 200, right+offset.right, bottom+offset.bottom, left+offset.left);
-		$.each(intersections, function(i, element) {
+		var intersections = findElements(top + offset.top + scrollOffset || 200, right + offset.right, bottom + offset.bottom, left + offset.left);
+		$.each(intersections, function (i, element) {
 
 			var lastTick = element.data('scrollSpy:ticks');
 			if (typeof lastTick != 'number') {
@@ -85,7 +80,7 @@
 		});
 
 		// determine which elements are no longer in view
-		$.each(elementsInView, function(i, element) {
+		$.each(elementsInView, function (i, element) {
 			var lastTick = element.data('scrollSpy:ticks');
 			if (typeof lastTick == 'number' && lastTick !== ticks) {
 				// exited from view
@@ -99,47 +94,46 @@
 	}
 
 	/**
-	 * Called when window is resized
-	*/
+  * Called when window is resized
+ */
 	function onWinSize() {
 		jWindow.trigger('scrollSpy:winSize');
 	}
 
-
 	/**
-	 * Enables ScrollSpy using a selector
-	 * @param {jQuery|string} selector  The elements collection, or a selector
-	 * @param {Object=} options	Optional.
+  * Enables ScrollSpy using a selector
+  * @param {jQuery|string} selector  The elements collection, or a selector
+  * @param {Object=} options	Optional.
         throttle : number -> scrollspy throttling. Default: 100 ms
         offsetTop : number -> offset from top. Default: 0
         offsetRight : number -> offset from right. Default: 0
         offsetBottom : number -> offset from bottom. Default: 0
         offsetLeft : number -> offset from left. Default: 0
-				activeClass : string -> Class name to be added to the active link. Default: active
-	 * @returns {jQuery}
-	 */
-	$.scrollSpy = function(selector, options) {
-	  var defaults = {
+ 			activeClass : string -> Class name to be added to the active link. Default: active
+  * @returns {jQuery}
+  */
+	$.scrollSpy = function (selector, options) {
+		var defaults = {
 			throttle: 100,
 			scrollOffset: 200, // offset - 200 allows elements near bottom of page to scroll
 			activeClass: 'active',
-			getActiveElement: function(id) {
+			getActiveElement: function (id) {
 				return 'a[href="#' + id + '"]';
 			}
-    };
-    options = $.extend(defaults, options);
+		};
+		options = $.extend(defaults, options);
 
 		var visible = [];
 		selector = $(selector);
-		selector.each(function(i, element) {
+		selector.each(function (i, element) {
 			elements.push($(element));
 			$(element).data("scrollSpy:id", i);
 			// Smooth scroll to section
-		  $('a[href="#' + $(element).attr('id') + '"]').click(function(e) {
-		    e.preventDefault();
-		    var offset = $(Materialize.escapeHash(this.hash)).offset().top + 1;
-	    	$('html, body').animate({ scrollTop: offset - options.scrollOffset }, {duration: 400, queue: false, easing: 'easeOutCubic'});
-		  });
+			$('a[href="#' + $(element).attr('id') + '"]').click(function (e) {
+				e.preventDefault();
+				var offset = $(Materialize.escapeHash(this.hash)).offset().top + 1;
+				$('html, body').animate({ scrollTop: offset - options.scrollOffset }, { duration: 400, queue: false, easing: 'easeOutCubic' });
+			});
 		});
 
 		offset.top = options.offsetTop || 0;
@@ -147,10 +141,10 @@
 		offset.bottom = options.offsetBottom || 0;
 		offset.left = options.offsetLeft || 0;
 
-		var throttledScroll = Materialize.throttle(function() {
+		var throttledScroll = Materialize.throttle(function () {
 			onScroll(options.scrollOffset);
 		}, options.throttle || 100);
-		var readyScroll = function(){
+		var readyScroll = function () {
 			$(document).on('ready turbolinks:load', throttledScroll);
 		};
 
@@ -163,11 +157,10 @@
 		// perform a scan once, after current execution context, and after dom is ready
 		setTimeout(readyScroll, 0);
 
-
-		selector.on('scrollSpy:enter', function() {
-			visible = $.grep(visible, function(value) {
-	      return value.height() != 0;
-	    });
+		selector.on('scrollSpy:enter', function () {
+			visible = $.grep(visible, function (value) {
+				return value.height() != 0;
+			});
 
 			var $this = $(this);
 
@@ -175,32 +168,30 @@
 				$(options.getActiveElement(visible[0].attr('id'))).removeClass(options.activeClass);
 				if ($this.data('scrollSpy:id') < visible[0].data('scrollSpy:id')) {
 					visible.unshift($(this));
-				}
-				else {
+				} else {
 					visible.push($(this));
 				}
-			}
-			else {
+			} else {
 				visible.push($(this));
 			}
 
-
 			$(options.getActiveElement(visible[0].attr('id'))).addClass(options.activeClass);
 		});
-		selector.on('scrollSpy:exit', function() {
-			visible = $.grep(visible, function(value) {
-	      return value.height() != 0;
-	    });
+		selector.on('scrollSpy:exit', function () {
+			visible = $.grep(visible, function (value) {
+				return value.height() != 0;
+			});
 
 			if (visible[0]) {
 				$(options.getActiveElement(visible[0].attr('id'))).removeClass(options.activeClass);
 				var $this = $(this);
-				visible = $.grep(visible, function(value) {
-	        return value.attr('id') != $this.attr('id');
-	      });
-	      if (visible[0]) { // Check if empty
+				visible = $.grep(visible, function (value) {
+					return value.attr('id') != $this.attr('id');
+				});
+				if (visible[0]) {
+					// Check if empty
 					$(options.getActiveElement(visible[0].attr('id'))).addClass(options.activeClass);
-	      }
+				}
 			}
 		});
 
@@ -208,12 +199,14 @@
 	};
 
 	/**
-	 * Listen for window resize events
-	 * @param {Object=} options						Optional. Set { throttle: number } to change throttling. Default: 100 ms
-	 * @returns {jQuery}		$(window)
-	 */
-	$.winSizeSpy = function(options) {
-		$.winSizeSpy = function() { return jWindow; }; // lock from multiple calls
+  * Listen for window resize events
+  * @param {Object=} options						Optional. Set { throttle: number } to change throttling. Default: 100 ms
+  * @returns {jQuery}		$(window)
+  */
+	$.winSizeSpy = function (options) {
+		$.winSizeSpy = function () {
+			return jWindow;
+		}; // lock from multiple calls
 		options = options || {
 			throttle: 100
 		};
@@ -221,18 +214,17 @@
 	};
 
 	/**
-	 * Enables ScrollSpy on a collection of elements
-	 * e.g. $('.scrollSpy').scrollSpy()
-	 * @param {Object=} options	Optional.
-											throttle : number -> scrollspy throttling. Default: 100 ms
-											offsetTop : number -> offset from top. Default: 0
-											offsetRight : number -> offset from right. Default: 0
-											offsetBottom : number -> offset from bottom. Default: 0
-											offsetLeft : number -> offset from left. Default: 0
-	 * @returns {jQuery}
-	 */
-	$.fn.scrollSpy = function(options) {
+  * Enables ScrollSpy on a collection of elements
+  * e.g. $('.scrollSpy').scrollSpy()
+  * @param {Object=} options	Optional.
+ 										throttle : number -> scrollspy throttling. Default: 100 ms
+ 										offsetTop : number -> offset from top. Default: 0
+ 										offsetRight : number -> offset from right. Default: 0
+ 										offsetBottom : number -> offset from bottom. Default: 0
+ 										offsetLeft : number -> offset from left. Default: 0
+  * @returns {jQuery}
+  */
+	$.fn.scrollSpy = function (options) {
 		return $.scrollSpy($(this), options);
 	};
-
 })(jQuery);

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

@@ -1,7 +1,7 @@
 (function ($) {
 
   var methods = {
-    init : function(options) {
+    init: function (options) {
       var defaults = {
         menuWidth: 300,
         edge: 'left',
@@ -12,10 +12,10 @@
       };
       options = $.extend(defaults, options);
 
-      $(this).each(function(){
+      $(this).each(function () {
         var $this = $(this);
         var menuId = $this.attr('data-activates');
-        var menu = $("#"+ menuId);
+        var menu = $("#" + menuId);
 
         // Set to width
         if (options.menuWidth != 300) {
@@ -38,57 +38,52 @@
 
         if (options.edge == 'left') {
           menu.css('transform', 'translateX(-100%)');
-          $dragTarget.css({'left': 0}); // Add Touch Area
-        }
-        else {
+          $dragTarget.css({ 'left': 0 }); // Add Touch Area
+        } else {
           menu.addClass('right-aligned') // Change text-alignment to right
-            .css('transform', 'translateX(100%)');
-          $dragTarget.css({'right': 0}); // Add Touch Area
+          .css('transform', 'translateX(100%)');
+          $dragTarget.css({ 'right': 0 }); // Add Touch Area
         }
 
         // If fixed sidenav, bring menu out
         if (menu.hasClass('fixed')) {
-            if (window.innerWidth > 992) {
-              menu.css('transform', 'translateX(0)');
-            }
+          if (window.innerWidth > 992) {
+            menu.css('transform', 'translateX(0)');
           }
+        }
 
         // Window resize to reset on large screens fixed
         if (menu.hasClass('fixed')) {
-          $(window).resize( function() {
+          $(window).resize(function () {
             if (window.innerWidth > 992) {
               // Close menu if window is resized bigger than 992 and user has fixed sidenav
               if ($('#sidenav-overlay').length !== 0 && menuOut) {
                 removeMenu(true);
-              }
-              else {
+              } else {
                 // menu.removeAttr('style');
                 menu.css('transform', 'translateX(0%)');
                 // menu.css('width', options.menuWidth);
               }
-            }
-            else if (menuOut === false){
+            } else if (menuOut === false) {
               if (options.edge === 'left') {
                 menu.css('transform', 'translateX(-100%)');
               } else {
                 menu.css('transform', 'translateX(100%)');
               }
-
             }
-
           });
         }
 
         // if closeOnClick, then add close event for all a tags in side sideNav
         if (options.closeOnClick === true) {
-          menu.on("click.itemclick", "a:not(.collapsible-header)", function(){
-            if (!(window.innerWidth > 992 && menu.hasClass('fixed'))){
+          menu.on("click.itemclick", "a:not(.collapsible-header)", function () {
+            if (!(window.innerWidth > 992 && menu.hasClass('fixed'))) {
               removeMenu();
             }
           });
         }
 
-        var removeMenu = function(restoreNav) {
+        var removeMenu = function (restoreNav) {
           panning = false;
           menuOut = false;
           // Reenable scrolling
@@ -97,61 +92,54 @@
             width: ''
           });
 
-          $('#sidenav-overlay').velocity({opacity: 0}, {duration: 200,
-              queue: false, easing: 'easeOutQuad',
-            complete: function() {
+          $('#sidenav-overlay').velocity({ opacity: 0 }, { duration: 200,
+            queue: false, easing: 'easeOutQuad',
+            complete: function () {
               $(this).remove();
             } });
           if (options.edge === 'left') {
             // Reset phantom div
-            $dragTarget.css({width: '', right: '', left: '0'});
-            menu.velocity(
-              {'translateX': '-100%'},
-              { duration: 200,
-                queue: false,
-                easing: 'easeOutCubic',
-                complete: function() {
-                  if (restoreNav === true) {
-                    // Restore Fixed sidenav
-                    menu.removeAttr('style');
-                    menu.css('width', options.menuWidth);
-                  }
+            $dragTarget.css({ width: '', right: '', left: '0' });
+            menu.velocity({ 'translateX': '-100%' }, { duration: 200,
+              queue: false,
+              easing: 'easeOutCubic',
+              complete: function () {
+                if (restoreNav === true) {
+                  // Restore Fixed sidenav
+                  menu.removeAttr('style');
+                  menu.css('width', options.menuWidth);
                 }
+              }
 
             });
-          }
-          else {
+          } else {
             // Reset phantom div
-            $dragTarget.css({width: '', right: '0', left: ''});
-            menu.velocity(
-              {'translateX': '100%'},
-              { duration: 200,
-                queue: false,
-                easing: 'easeOutCubic',
-                complete: function() {
-                  if (restoreNav === true) {
-                    // Restore Fixed sidenav
-                    menu.removeAttr('style');
-                    menu.css('width', options.menuWidth);
-                  }
+            $dragTarget.css({ width: '', right: '0', left: '' });
+            menu.velocity({ 'translateX': '100%' }, { duration: 200,
+              queue: false,
+              easing: 'easeOutCubic',
+              complete: function () {
+                if (restoreNav === true) {
+                  // Restore Fixed sidenav
+                  menu.removeAttr('style');
+                  menu.css('width', options.menuWidth);
                 }
-              });
+              }
+            });
           }
 
           // Callback
-          if (typeof(options.onClose) === 'function') {
+          if (typeof options.onClose === 'function') {
             options.onClose.call(this, menu);
           }
-        }
-
-
+        };
 
         // Touch Event
         var panning = false;
         var menuOut = false;
 
         if (options.draggable) {
-          $dragTarget.on('click', function(){
+          $dragTarget.on('click', function () {
             if (menuOut) {
               removeMenu();
             }
@@ -159,7 +147,7 @@
 
           $dragTarget.hammer({
             prevent_default: false
-          }).on('pan', function(e) {
+          }).on('pan', function (e) {
 
             if (e.gesture.pointerType == "touch") {
 
@@ -183,41 +171,47 @@
               // If overlay does not exist, create one and if it is clicked, close menu
               if ($overlay.length === 0) {
                 $overlay = $('<div id="sidenav-overlay"></div>');
-                $overlay.css('opacity', 0).click( function(){
+                $overlay.css('opacity', 0).click(function () {
                   removeMenu();
                 });
-                
+
                 // Run 'onOpen' when sidenav is opened via touch/swipe if applicable
-                if (typeof(options.onOpen) === 'function') {
+                if (typeof options.onOpen === 'function') {
                   options.onOpen.call(this, menu);
                 }
-                
+
                 $('body').append($overlay);
               }
 
               // Keep within boundaries
               if (options.edge === 'left') {
-                if (x > options.menuWidth) { x = options.menuWidth; }
-                else if (x < 0) { x = 0; }
+                if (x > options.menuWidth) {
+                  x = options.menuWidth;
+                } else if (x < 0) {
+                  x = 0;
+                }
               }
 
               if (options.edge === 'left') {
                 // Left Direction
-                if (x < (options.menuWidth / 2)) { menuOut = false; }
+                if (x < options.menuWidth / 2) {
+                  menuOut = false;
+                }
                 // Right Direction
-                else if (x >= (options.menuWidth / 2)) { menuOut = true; }
+                else if (x >= options.menuWidth / 2) {
+                    menuOut = true;
+                  }
                 menu.css('transform', 'translateX(' + (x - options.menuWidth) + 'px)');
-              }
-              else {
+              } else {
                 // Left Direction
-                if (x < (window.innerWidth - options.menuWidth / 2)) {
+                if (x < window.innerWidth - options.menuWidth / 2) {
                   menuOut = true;
                 }
                 // Right Direction
-                else if (x >= (window.innerWidth - options.menuWidth / 2)) {
-                 menuOut = false;
-               }
-                var rightPos = (x - options.menuWidth / 2);
+                else if (x >= window.innerWidth - options.menuWidth / 2) {
+                    menuOut = false;
+                  }
+                var rightPos = x - options.menuWidth / 2;
                 if (rightPos < 0) {
                   rightPos = 0;
                 }
@@ -225,20 +219,17 @@
                 menu.css('transform', 'translateX(' + rightPos + 'px)');
               }
 
-
               // Percentage overlay
               var overlayPerc;
               if (options.edge === 'left') {
                 overlayPerc = x / options.menuWidth;
-                $overlay.velocity({opacity: overlayPerc }, {duration: 10, queue: false, easing: 'easeOutQuad'});
-              }
-              else {
+                $overlay.velocity({ opacity: overlayPerc }, { duration: 10, queue: false, easing: 'easeOutQuad' });
+              } else {
                 overlayPerc = Math.abs((x - window.innerWidth) / options.menuWidth);
-                $overlay.velocity({opacity: overlayPerc }, {duration: 10, queue: false, easing: 'easeOutQuad'});
+                $overlay.velocity({ opacity: overlayPerc }, { duration: 10, queue: false, easing: 'easeOutQuad' });
               }
             }
-
-          }).on('panend', function(e) {
+          }).on('panend', function (e) {
 
             if (e.gesture.pointerType == "touch") {
               var $overlay = $('#sidenav-overlay');
@@ -246,7 +237,7 @@
               var x = e.gesture.center.x;
               var leftPos = x - options.menuWidth;
               var rightPos = x - options.menuWidth / 2;
-              if (leftPos > 0 ) {
+              if (leftPos > 0) {
                 leftPos = 0;
               }
               if (rightPos < 0) {
@@ -256,48 +247,45 @@
 
               if (options.edge === 'left') {
                 // If velocityX <= 0.3 then the user is flinging the menu closed so ignore menuOut
-                if ((menuOut && velocityX <= 0.3) || velocityX < -0.5) {
+                if (menuOut && velocityX <= 0.3 || velocityX < -0.5) {
                   // Return menu to open
                   if (leftPos !== 0) {
-                    menu.velocity({'translateX': [0, leftPos]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
+                    menu.velocity({ 'translateX': [0, leftPos] }, { duration: 300, queue: false, easing: 'easeOutQuad' });
                   }
 
-                  $overlay.velocity({opacity: 1 }, {duration: 50, queue: false, easing: 'easeOutQuad'});
-                  $dragTarget.css({width: '50%', right: 0, left: ''});
+                  $overlay.velocity({ opacity: 1 }, { duration: 50, queue: false, easing: 'easeOutQuad' });
+                  $dragTarget.css({ width: '50%', right: 0, left: '' });
                   menuOut = true;
-                }
-                else if (!menuOut || velocityX > 0.3) {
+                } else if (!menuOut || velocityX > 0.3) {
                   // Enable Scrolling
                   $('body').css({
                     overflow: '',
                     width: ''
                   });
                   // Slide menu closed
-                  menu.velocity({'translateX': [-1 * options.menuWidth - 10, leftPos]}, {duration: 200, queue: false, easing: 'easeOutQuad'});
-                  $overlay.velocity({opacity: 0 }, {duration: 200, queue: false, easing: 'easeOutQuad',
+                  menu.velocity({ 'translateX': [-1 * options.menuWidth - 10, leftPos] }, { duration: 200, queue: false, easing: 'easeOutQuad' });
+                  $overlay.velocity({ opacity: 0 }, { duration: 200, queue: false, easing: 'easeOutQuad',
                     complete: function () {
                       // Run 'onClose' when sidenav is closed via touch/swipe if applicable
-                      if (typeof(options.onClose) === 'function') {
+                      if (typeof options.onClose === 'function') {
                         options.onClose.call(this, menu);
                       }
-                      
+
                       $(this).remove();
-                    }});
-                  $dragTarget.css({width: '10px', right: '', left: 0});
+                    } });
+                  $dragTarget.css({ width: '10px', right: '', left: 0 });
                 }
-              }
-              else {
-                if ((menuOut && velocityX >= -0.3) || velocityX > 0.5) {
+              } else {
+                if (menuOut && velocityX >= -0.3 || velocityX > 0.5) {
                   // Return menu to open
                   if (rightPos !== 0) {
-                    menu.velocity({'translateX': [0, rightPos]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
+                    menu.velocity({ 'translateX': [0, rightPos] }, { duration: 300, queue: false, easing: 'easeOutQuad' });
                   }
 
-                  $overlay.velocity({opacity: 1 }, {duration: 50, queue: false, easing: 'easeOutQuad'});
-                  $dragTarget.css({width: '50%', right: '', left: 0});
+                  $overlay.velocity({ opacity: 1 }, { duration: 50, queue: false, easing: 'easeOutQuad' });
+                  $dragTarget.css({ width: '50%', right: '', left: 0 });
                   menuOut = true;
-                }
-                else if (!menuOut || velocityX < -0.3) {
+                } else if (!menuOut || velocityX < -0.3) {
                   // Enable Scrolling
                   $('body').css({
                     overflow: '',
@@ -305,26 +293,29 @@
                   });
 
                   // Slide menu closed
-                  menu.velocity({'translateX': [options.menuWidth + 10, rightPos]}, {duration: 200, queue: false, easing: 'easeOutQuad'});
-                  $overlay.velocity({opacity: 0 }, {duration: 200, queue: false, easing: 'easeOutQuad',
+                  menu.velocity({ 'translateX': [options.menuWidth + 10, rightPos] }, { duration: 200, queue: false, easing: 'easeOutQuad' });
+                  $overlay.velocity({ opacity: 0 }, { duration: 200, queue: false, easing: 'easeOutQuad',
                     complete: function () {
+                      // Run 'onClose' when sidenav is closed via touch/swipe if applicable
+                      if (typeof options.onClose === 'function') {
+                        options.onClose.call(this, menu);
+                      }
+
                       $(this).remove();
-                    }});
-                  $dragTarget.css({width: '10px', right: 0, left: ''});
+                    } });
+                  $dragTarget.css({ width: '10px', right: 0, left: '' });
                 }
               }
-
             }
           });
         }
 
-        $this.off('click.sidenav').on('click.sidenav', function() {
+        $this.off('click.sidenav').on('click.sidenav', function () {
           if (menuOut === true) {
             menuOut = false;
             panning = false;
             removeMenu();
-          }
-          else {
+          } else {
 
             // Disable Scrolling
             var $body = $('body');
@@ -337,35 +328,36 @@
             $('body').append($dragTarget);
 
             if (options.edge === 'left') {
-              $dragTarget.css({width: '50%', right: 0, left: ''});
-              menu.velocity({'translateX': [0, -1 * options.menuWidth]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
-            }
-            else {
-              $dragTarget.css({width: '50%', right: '', left: 0});
-              menu.velocity({'translateX': [0, options.menuWidth]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
+              $dragTarget.css({ width: '50%', right: 0, left: '' });
+              menu.velocity({ 'translateX': [0, -1 * options.menuWidth] }, { duration: 300, queue: false, easing: 'easeOutQuad' });
+            } else {
+              $dragTarget.css({ width: '50%', right: '', left: 0 });
+              menu.velocity({ 'translateX': [0, options.menuWidth] }, { duration: 300, queue: false, easing: 'easeOutQuad' });
             }
 
-            $overlay.css('opacity', 0)
-            .click(function(){
+            // Overlay close on click
+            $overlay.css('opacity', 0).click(function () {
               menuOut = false;
               panning = false;
               removeMenu();
-              $overlay.velocity({opacity: 0}, {duration: 300, queue: false, easing: 'easeOutQuad',
-                complete: function() {
-                  $(this).remove();
-                } });
-
-              });
-              $('body').append($overlay);
-              $overlay.velocity({opacity: 1}, {duration: 300, queue: false, easing: 'easeOutQuad',
+              $overlay.velocity({ opacity: 0 }, { duration: 300, queue: false, easing: 'easeOutQuad',
                 complete: function () {
-                  menuOut = true;
-                  panning = false;
+                  $(this).remove();
                 }
               });
+            });
+
+            // Append body
+            $('body').append($overlay);
+            $overlay.velocity({ opacity: 1 }, { duration: 300, queue: false, easing: 'easeOutQuad',
+              complete: function () {
+                menuOut = true;
+                panning = false;
+              }
+            });
 
             // Callback
-            if (typeof(options.onOpen) === 'function') {
+            if (typeof options.onOpen === 'function') {
               options.onOpen.call(this, menu);
             }
           }
@@ -373,8 +365,6 @@
           return false;
         });
       });
-
-
     },
     destroy: function () {
       var $overlay = $('#sidenav-overlay');
@@ -384,23 +374,22 @@
       $(this).off('click');
       $overlay.remove();
     },
-    show : function() {
+    show: function () {
       this.trigger('click');
     },
-    hide : function() {
+    hide: function () {
       $('#sidenav-overlay').trigger('click');
     }
   };
 
-
-  $.fn.sideNav = function(methodOrOptions) {
-    if ( methods[methodOrOptions] ) {
-      return methods[ methodOrOptions ].apply( this, Array.prototype.slice.call( arguments, 1 ));
-    } else if ( typeof methodOrOptions === 'object' || ! methodOrOptions ) {
+  $.fn.sideNav = 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 );
+      return methods.init.apply(this, arguments);
     } else {
-      $.error( 'Method ' +  methodOrOptions + ' does not exist on jQuery.sideNav' );
+      $.error('Method ' + methodOrOptions + ' does not exist on jQuery.sideNav');
     }
   }; // Plugin end
-}( jQuery ));
+})(jQuery);