materialize-sass 0.97.8 → 0.98.0

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

@@ -10,13 +10,13 @@
     init : function(options) {
       var defaults = {
         opacity: 0.5,
-        in_duration: 350,
-        out_duration: 250,
+        inDuration: 350,
+        outDuration: 250,
         ready: undefined,
         complete: undefined,
         dismissible: true,
-        starting_top: '4%',
-        ending_top: '10%'
+        startingTop: '4%',
+        endingTop: '10%'
       };
 
       // Override defaults
@@ -40,12 +40,12 @@
           $modal.find('.modal-close').off('click.close');
           $(document).off('keyup.modal' + overlayID);
 
-          $overlay.velocity( { opacity: 0}, {duration: options.out_duration, queue: false, ease: "easeOutQuart"});
+          $overlay.velocity( { opacity: 0}, {duration: options.outDuration, queue: false, ease: "easeOutQuart"});
 
 
           // Define Bottom Sheet animation
           var exitVelocityOptions = {
-            duration: options.out_duration,
+            duration: options.outDuration,
             queue: false,
             ease: "easeOutCubic",
             // Handle modal ready callback
@@ -65,7 +65,7 @@
           }
           else {
             $modal.velocity(
-              { top: options.starting_top, opacity: 0, scaleX: 0.7},
+              { top: options.startingTop, opacity: 0, scaleX: 0.7},
               exitVelocityOptions
             );
           }
@@ -115,12 +115,12 @@
             opacity: 0
           });
 
-          $overlay.velocity({opacity: options.opacity}, {duration: options.in_duration, queue: false, ease: "easeOutCubic"});
+          $overlay.velocity({opacity: options.opacity}, {duration: options.inDuration, queue: false, ease: "easeOutCubic"});
           $modal.data('associated-overlay', $overlay[0]);
 
           // Define Bottom Sheet animation
           var enterVelocityOptions = {
-            duration: options.in_duration,
+            duration: options.inDuration,
             queue: false,
             ease: "easeOutCubic",
             // Handle modal ready callback
@@ -135,8 +135,8 @@
           }
           else {
             $.Velocity.hook($modal, "scaleX", 0.7);
-            $modal.css({ top: options.starting_top });
-            $modal.velocity({top: options.ending_top, opacity: 1, scaleX: '1'}, enterVelocityOptions);
+            $modal.css({ top: options.startingTop });
+            $modal.velocity({top: options.endingTop, opacity: 1, scaleX: '1'}, enterVelocityOptions);
           }
 
         };
@@ -148,7 +148,7 @@
 
         // Close Handlers
         $(document).on('click.modalTrigger', 'a[href="#' + modal_id + '"], [data-target="' + modal_id + '"]', function(e) {
-          options.starting_top = ($(this).offset().top - $(window).scrollTop()) /1.15;
+          options.startingTop = ($(this).offset().top - $(window).scrollTop()) /1.15;
           openModal($(this));
           e.preventDefault();
         }); // done set on click

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

@@ -1,58 +1,58 @@
 (function ($) {
 
-    $.fn.parallax = function () {
-      var window_width = $(window).width();
-      // Parallax Scripts
-      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;
-          }
-          var $img = $this.children("img").first();
-          var img_height = $img.height();
-          var parallax_dist = img_height - container_height;
-          var bottom = $this.offset().top + container_height;
-          var top = $this.offset().top;
-          var scrollTop = $(window).scrollTop();
-          var windowHeight = window.innerHeight;
-          var windowBottom = scrollTop + windowHeight;
-          var percentScrolled = (windowBottom - top) / (container_height + windowHeight);
-          var parallax = Math.round((parallax_dist * percentScrolled));
-
-          if (initial) {
-            $img.css('display', 'block');
-          }
-          if ((bottom > scrollTop) && (top < (scrollTop + windowHeight))) {
-            $img.css('transform', "translate3D(-50%," + parallax + "px, 0)");
-          }
-
+  $.fn.parallax = function () {
+    var window_width = $(window).width();
+    // Parallax Scripts
+    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;
+        }
+        var $img = $this.children("img").first();
+        var img_height = $img.height();
+        var parallax_dist = img_height - container_height;
+        var bottom = $this.offset().top + container_height;
+        var top = $this.offset().top;
+        var scrollTop = $(window).scrollTop();
+        var windowHeight = window.innerHeight;
+        var windowBottom = scrollTop + windowHeight;
+        var percentScrolled = (windowBottom - top) / (container_height + windowHeight);
+        var parallax = Math.round((parallax_dist * percentScrolled));
+
+        if (initial) {
+          $img.css('display', 'block');
+        }
+        if ((bottom > scrollTop) && (top < (scrollTop + windowHeight))) {
+          $img.css('transform', "translate3D(-50%," + parallax + "px, 0)");
         }
 
-        // Wait for image load
-        $this.children("img").one("load", function() {
-          updateParallax(true);
-        }).each(function() {
-          if (this.complete) $(this).trigger("load");
-        });
+      }
 
-        $(window).scroll(function() {
-          window_width = $(window).width();
-          updateParallax(false);
-        });
+      // Wait for image load
+      $this.children("img").one("load", function() {
+        updateParallax(true);
+      }).each(function() {
+        if (this.complete) $(this).trigger("load");
+      });
 
-        $(window).resize(function() {
-          window_width = $(window).width();
-          updateParallax(false);
-        });
+      $(window).scroll(function() {
+        window_width = $(window).width();
+        updateParallax(false);
+      });
 
+      $(window).resize(function() {
+        window_width = $(window).width();
+        updateParallax(false);
       });
 
-    };
+    });
+
+  };
 }( jQuery ));

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

@@ -1,48 +1,51 @@
 (function($) {
 
-  // Input: Array of JSON objects {selector, offset, callback}
+  var scrollFireEventsHandled = false;
 
+  // Input: Array of JSON objects {selector, offset, callback}
   Materialize.scrollFire = function(options) {
-
-    var didScroll = false;
-
-    window.addEventListener("scroll", function() {
-      didScroll = true;
-    });
-
-    // Rate limit to 100ms
-    setInterval(function() {
-      if(didScroll) {
-          didScroll = false;
-
-          var windowScroll = window.pageYOffset + window.innerHeight;
-
-          for (var i = 0 ; i < options.length; i++) {
-            // Get options from each line
-            var value = options[i];
-            var selector = value.selector,
-                offset = value.offset,
-                callback = value.callback;
-
-            var currentElement = document.querySelector(selector);
-            if ( currentElement !== null) {
-              var elementOffset = currentElement.getBoundingClientRect().top + window.pageYOffset;
-
-              if (windowScroll > (elementOffset + offset)) {
-                if (value.done !== true) {
-                  if (typeof(callback) === 'function') {
-                    callback.call(this, currentElement);
-                  } else if (typeof(callback) === 'string') {
-                    var callbackFunc = new Function(callback);
-                    callbackFunc(currentElement);
-                  }
-                  value.done = true;
-                }
+    var onScroll = function() {
+      var windowScroll = window.pageYOffset + window.innerHeight;
+
+      for (var i = 0 ; i < options.length; i++) {
+        // Get options from each line
+        var value = options[i];
+        var selector = value.selector,
+            offset = value.offset,
+            callback = value.callback;
+
+        var currentElement = document.querySelector(selector);
+        if ( currentElement !== null) {
+          var elementOffset = currentElement.getBoundingClientRect().top + window.pageYOffset;
+
+          if (windowScroll > (elementOffset + offset)) {
+            if (value.done !== true) {
+              if (typeof(callback) === 'function') {
+                callback.call(this, currentElement);
+              } else if (typeof(callback) === 'string') {
+                var callbackFunc = new Function(callback);
+                callbackFunc(currentElement);
               }
+              value.done = true;
             }
           }
+        }
       }
-    }, 100);
+    };
+
+
+    var throttledScroll = Materialize.throttle(function() {
+      onScroll();
+    }, options.throttle || 100);
+
+    if (!scrollFireEventsHandled) {
+      window.addEventListener("scroll", throttledScroll);
+      window.addEventListener("resize", throttledScroll);
+      scrollFireEventsHandled = true;
+    }
+
+    // perform a scan once, after current execution context, and after dom is ready
+    setTimeout(throttledScroll, 0);
   };
 
 })(jQuery);

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

@@ -105,57 +105,6 @@
 		jWindow.trigger('scrollSpy:winSize');
 	}
 
-	/**
-	 * Get time in ms
-   * @license https://raw.github.com/jashkenas/underscore/master/LICENSE
-	 * @type {function}
-	 * @return {number}
-	 */
-	var getTime = (Date.now || function () {
-		return new Date().getTime();
-	});
-
-	/**
-	 * Returns a function, that, when invoked, will only be triggered at most once
-	 * during a given window of time. Normally, the throttled function will run
-	 * as much as it can, without ever going more than once per `wait` duration;
-	 * but if you'd like to disable the execution on the leading edge, pass
-	 * `{leading: false}`. To disable execution on the trailing edge, ditto.
-	 * @license https://raw.github.com/jashkenas/underscore/master/LICENSE
-	 * @param {function} func
-	 * @param {number} wait
-	 * @param {Object=} options
-	 * @returns {Function}
-	 */
-	function throttle(func, wait, options) {
-		var context, args, result;
-		var timeout = null;
-		var previous = 0;
-		options || (options = {});
-		var later = function () {
-			previous = options.leading === false ? 0 : getTime();
-			timeout = null;
-			result = func.apply(context, args);
-			context = args = null;
-		};
-		return function () {
-			var now = getTime();
-			if (!previous && options.leading === false) previous = now;
-			var remaining = wait - (now - previous);
-			context = this;
-			args = arguments;
-			if (remaining <= 0) {
-				clearTimeout(timeout);
-				timeout = null;
-				previous = now;
-				result = func.apply(context, args);
-				context = args = null;
-			} else if (!timeout && options.trailing !== false) {
-				timeout = setTimeout(later, remaining);
-			}
-			return result;
-		};
-	};
 
 	/**
 	 * Enables ScrollSpy using a selector
@@ -193,7 +142,7 @@
 		offset.bottom = options.offsetBottom || 0;
 		offset.left = options.offsetLeft || 0;
 
-		var throttledScroll = throttle(function() {
+		var throttledScroll = Materialize.throttle(function() {
 			onScroll(options.scrollOffset);
 		}, options.throttle || 100);
 		var readyScroll = function(){
@@ -263,7 +212,7 @@
 		options = options || {
 			throttle: 100
 		};
-		return jWindow.on('resize', throttle(onWinSize, options.throttle || 100));
+		return jWindow.on('resize', Materialize.throttle(onWinSize, options.throttle || 100));
 	};
 
 	/**

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

@@ -12,41 +12,47 @@
 
       $(this).each(function(){
         var $this = $(this);
-        var menu_id = $("#"+ $this.attr('data-activates'));
+        var menuId = $this.attr('data-activates');
+        var menu = $("#"+ menuId);
 
         // Set to width
         if (options.menuWidth != 300) {
-          menu_id.css('width', options.menuWidth);
+          menu.css('width', options.menuWidth);
         }
 
         // Add Touch Area
-        var $dragTarget;
+        var $dragTarget = $('.drag-target[data-sidenav="' + menuId + '"]');
         if (options.draggable) {
-          $dragTarget = $('<div class="drag-target"></div>').attr('data-sidenav', $this.attr('data-activates'));
+          // Regenerate dragTarget
+          if ($dragTarget.length) {
+            $dragTarget.remove();
+          }
+
+          $dragTarget = $('<div class="drag-target"></div>').attr('data-sidenav', menuId);
           $('body').append($dragTarget);
         } else {
           $dragTarget = $();
         }
 
         if (options.edge == 'left') {
-          menu_id.css('transform', 'translateX(-100%)');
+          menu.css('transform', 'translateX(-100%)');
           $dragTarget.css({'left': 0}); // Add Touch Area
         }
         else {
-          menu_id.addClass('right-aligned') // Change text-alignment to right
+          menu.addClass('right-aligned') // Change text-alignment to right
             .css('transform', 'translateX(100%)');
           $dragTarget.css({'right': 0}); // Add Touch Area
         }
 
         // If fixed sidenav, bring menu out
-        if (menu_id.hasClass('fixed')) {
+        if (menu.hasClass('fixed')) {
             if (window.innerWidth > 992) {
-              menu_id.css('transform', 'translateX(0)');
+              menu.css('transform', 'translateX(0)');
             }
           }
 
         // Window resize to reset on large screens fixed
-        if (menu_id.hasClass('fixed')) {
+        if (menu.hasClass('fixed')) {
           $(window).resize( function() {
             if (window.innerWidth > 992) {
               // Close menu if window is resized bigger than 992 and user has fixed sidenav
@@ -54,16 +60,16 @@
                 removeMenu(true);
               }
               else {
-                // menu_id.removeAttr('style');
-                menu_id.css('transform', 'translateX(0%)');
-                // menu_id.css('width', options.menuWidth);
+                // menu.removeAttr('style');
+                menu.css('transform', 'translateX(0%)');
+                // menu.css('width', options.menuWidth);
               }
             }
             else if (menuOut === false){
               if (options.edge === 'left') {
-                menu_id.css('transform', 'translateX(-100%)');
+                menu.css('transform', 'translateX(-100%)');
               } else {
-                menu_id.css('transform', 'translateX(100%)');
+                menu.css('transform', 'translateX(100%)');
               }
 
             }
@@ -73,7 +79,7 @@
 
         // if closeOnClick, then add close event for all a tags in side sideNav
         if (options.closeOnClick === true) {
-          menu_id.on("click.itemclick", "a:not(.collapsible-header)", function(){
+          menu.on("click.itemclick", "a:not(.collapsible-header)", function(){
             removeMenu();
           });
         }
@@ -95,7 +101,7 @@
           if (options.edge === 'left') {
             // Reset phantom div
             $dragTarget.css({width: '', right: '', left: '0'});
-            menu_id.velocity(
+            menu.velocity(
               {'translateX': '-100%'},
               { duration: 200,
                 queue: false,
@@ -103,8 +109,8 @@
                 complete: function() {
                   if (restoreNav === true) {
                     // Restore Fixed sidenav
-                    menu_id.removeAttr('style');
-                    menu_id.css('width', options.menuWidth);
+                    menu.removeAttr('style');
+                    menu.css('width', options.menuWidth);
                   }
                 }
 
@@ -113,7 +119,7 @@
           else {
             // Reset phantom div
             $dragTarget.css({width: '', right: '0', left: ''});
-            menu_id.velocity(
+            menu.velocity(
               {'translateX': '100%'},
               { duration: 200,
                 queue: false,
@@ -121,8 +127,8 @@
                 complete: function() {
                   if (restoreNav === true) {
                     // Restore Fixed sidenav
-                    menu_id.removeAttr('style');
-                    menu_id.css('width', options.menuWidth);
+                    menu.removeAttr('style');
+                    menu.css('width', options.menuWidth);
                   }
                 }
               });
@@ -180,7 +186,7 @@
                 if (x < (options.menuWidth / 2)) { menuOut = false; }
                 // Right Direction
                 else if (x >= (options.menuWidth / 2)) { menuOut = true; }
-                menu_id.css('transform', 'translateX(' + (x - options.menuWidth) + 'px)');
+                menu.css('transform', 'translateX(' + (x - options.menuWidth) + 'px)');
               }
               else {
                 // Left Direction
@@ -196,7 +202,7 @@
                   rightPos = 0;
                 }
 
-                menu_id.css('transform', 'translateX(' + rightPos + 'px)');
+                menu.css('transform', 'translateX(' + rightPos + 'px)');
               }
 
 
@@ -233,7 +239,7 @@
                 if ((menuOut && velocityX <= 0.3) || velocityX < -0.5) {
                   // Return menu to open
                   if (leftPos !== 0) {
-                    menu_id.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'});
@@ -247,7 +253,7 @@
                     width: ''
                   });
                   // Slide menu closed
-                  menu_id.velocity({'translateX': [-1 * options.menuWidth - 10, leftPos]}, {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 () {
                       $(this).remove();
@@ -259,7 +265,7 @@
                 if ((menuOut && velocityX >= -0.3) || velocityX > 0.5) {
                   // Return menu to open
                   if (rightPos !== 0) {
-                    menu_id.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'});
@@ -274,7 +280,7 @@
                   });
 
                   // Slide menu closed
-                  menu_id.velocity({'translateX': [options.menuWidth + 10, rightPos]}, {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 () {
                       $(this).remove();
@@ -287,7 +293,7 @@
           });
         }
 
-        $this.click(function() {
+        $this.off('click.sidenav').on('click.sidenav', function() {
           if (menuOut === true) {
             menuOut = false;
             panning = false;
@@ -307,11 +313,11 @@
 
             if (options.edge === 'left') {
               $dragTarget.css({width: '50%', right: 0, left: ''});
-              menu_id.velocity({'translateX': [0, -1 * options.menuWidth]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
+              menu.velocity({'translateX': [0, -1 * options.menuWidth]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
             }
             else {
               $dragTarget.css({width: '50%', right: '', left: 0});
-              menu_id.velocity({'translateX': [0, options.menuWidth]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
+              menu.velocity({'translateX': [0, options.menuWidth]}, {duration: 300, queue: false, easing: 'easeOutQuad'});
             }
 
             $overlay.css('opacity', 0)
@@ -357,14 +363,14 @@
   };
 
 
-    $.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 );
-      } else {
-        $.error( 'Method ' +  methodOrOptions + ' does not exist on jQuery.sideNav' );
-      }
-    }; // Plugin end
+  $.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 );
+    } else {
+      $.error( 'Method ' +  methodOrOptions + ' does not exist on jQuery.sideNav' );
+    }
+  }; // Plugin end
 }( jQuery ));