mtl 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57e2dac26b6a58590625382a0750e9646596b36d
-  data.tar.gz: f3f2731e287f7e1e5c367c46a0938646b3a9cced
+  metadata.gz: 5f8400a76f9ad5c951ceec5a18bb58b32c3c4541
+  data.tar.gz: 686224b970bfc5939dd7f25fa8af6386fb700338
 SHA512:
-  metadata.gz: f9f982819c9477dd8f28331e61dc3864aaf7702bb56faba6f1d739fb302b03d3e2dd7fbf80e43b311d4960cf41e6e9548398d9cf3a8e932f8af655bbb4fe44d1
-  data.tar.gz: 641de61f49159ce2bf49df996b57b85892cf8d2de627b363b24314730b7e9960f28256bc9d9fbff0f7d895b29bada4605e067895295650d6311b728decbed7c2
+  metadata.gz: f793b5bc1b8eb97cf7453e3cfc97e283c97539616fca461414db12cdd71a3d8a50e02b2185568dc9bcf7d3d5153514ba8e13fd49c01603ff7619c0af0f6ad181
+  data.tar.gz: 11b52a45bd8a36867dd5c2a23ae0834a26844795021de6b18a7243c8a5daf446da92d9d9a6416fdd1a0b494db9755fd8ca32afefa160f420ad866b3cc0296542

data/app/assets/javascripts/mtl.js

@@ -1,4 +1,4 @@
-//=require "materialize/jquery.easing.1.3"
+//=require "materialize/jquery.easing.1.4"
 //=require "materialize/velocity.min"
 //=require "materialize/hammer.min"
 //=require "materialize/jquery.hammer"

data/app/assets/stylesheets/mtl/all.scss

@@ -69,3 +69,7 @@
 html { height: 100%; } // yes, necessary
 @import './layouts/default';
 @import './layouts/single';
+
+// new stuff (0.98.0 -> 0.99.0)
+@import 'materialize/pulse';
+@import 'materialize/tapTarget';

data/lib/mtl/version.rb

@@ -1,6 +1,6 @@
 module Mtl
-  VERSION = '1.1.7'.freeze
-  MATERIALIZE_VERSION = '0.98.0'.freeze
+  VERSION = '1.1.8'.freeze
+  MATERIALIZE_VERSION = '0.99.0'.freeze
   ICONS_VERSION = '2.2.3'.freeze
   LODASH_VERSION = '4.14.1'.freeze
   PDFOBJECT_VERSION = '2.0.201604172'.freeze

data/package.json

@@ -6,6 +6,6 @@
     "pdfobject": "2.0",
     "lodash": "4.14.1",
     "material-design-icons": "2.2.3",
-    "materialize-css": "https://github.com/Dogfalo/materialize.git#v0.98.0"
+    "materialize-css": "https://github.com/Dogfalo/materialize.git#v0.99.0"
   }
 }

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

@@ -3,6 +3,13 @@
 
     $(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')
+          );
+        }
         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(
@@ -10,17 +17,20 @@
               duration: 225,
               queue: false,
               easing: 'easeInOutQuad',
-              complete: function() { $(this).css({ display: 'none'}); }
+              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')) ) {
-          $(e.target).closest('.card').css('overflow', 'hidden');
+          $card.css('overflow', 'hidden');
           $(this).find('.card-reveal').css({ display: 'block'}).velocity("stop", false).velocity({translateY: '-100%'}, {duration: 300, queue: false, easing: 'easeInOutQuad'});
         }
       }
     });
 
   });
-}( jQuery ));
+}( jQuery ));

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

@@ -14,39 +14,44 @@
         onCycleTo: null // Callback for when a new slide is cycled to.
       };
       options = $.extend(defaults, options);
+      var namespace = Materialize.objectSelectorString($(this));
 
-      return this.each(function() {
+      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,
+            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;
 
-        // Don't double initialize.
-        if (view.hasClass('initialized')) {
-          // Redraw carousel.
-          $(this).trigger('carouselNext', [0.000001]);
-          return true;
-        }
-
 
         // Options
-        if (options.fullWidth) {
-          options.dist = 0;
+        var setCarouselHeight = function() {
           var firstImage = view.find('.carousel-item img').first();
           if (firstImage.length) {
-            imageHeight = firstImage.on('load', function(){
-              view.css('height', $(this).height());
-            });
+            if (firstImage.prop('complete')) {
+              view.css('height', firstImage.height());
+            } else {
+              firstImage.on('load', function(){
+                view.css('height', $(this).height());
+              });
+            }
           } else {
-            imageHeight = view.find('.carousel-item').first().height();
+            var imageHeight = view.find('.carousel-item').first().height();
             view.css('height', imageHeight);
           }
+        };
+
+        if (options.fullWidth) {
+          options.dist = 0;
+          setCarouselHeight();
 
           // Offset fixed items when indicators.
           if (showIndicators) {
@@ -55,6 +60,17 @@
         }
 
 
+        // Don't double initialize.
+        if (view.hasClass('initialized')) {
+          // Recalculate variables
+          $(window).trigger('resize');
+
+          // Redraw carousel.
+          $(this).trigger('carouselNext', [0.000001]);
+          return true;
+        }
+
+
         view.addClass('initialized');
         pressed = false;
         offset = target = 0;
@@ -128,6 +144,20 @@
         }
 
         function scroll(x) {
+          // Track scrolling state
+          scrolling = true;
+          if (!view.hasClass('scrolling')) {
+            view.addClass('scrolling');
+          }
+          if (scrollingTimeout != null) {
+            window.clearTimeout(scrollingTimeout);
+          }
+          scrollingTimeout = window.setTimeout(function() {
+            scrolling = false;
+            view.removeClass('scrolling');
+          }, options.duration);
+
+          // Start actual scroll
           var i, half, delta, dir, tween, el, alignment, xTranslation;
           var lastCenter = center;
 
@@ -238,6 +268,12 @@
             var $curr_item = view.find('.carousel-item').eq(wrap(center));
             options.onCycleTo.call(this, $curr_item, dragged);
           }
+
+          // One time callback
+          if (typeof(oneTimeCallback) === "function") {
+            oneTimeCallback.call(this, $curr_item, dragged);
+            oneTimeCallback = null;
+          }
         }
 
         function track() {
@@ -277,7 +313,7 @@
 
           } else if (!options.fullWidth) {
             var clickedIndex = $(e.target).closest('.carousel-item').index();
-            var diff = (center % count) - clickedIndex;
+            var diff = wrap(center) - clickedIndex;
 
             // Disable clicks if carousel was shifted by click
             if (diff !== 0) {
@@ -311,6 +347,9 @@
         }
 
         function tap(e) {
+          if (e.type === 'mousedown') {
+            e.preventDefault();
+          }
           pressed = true;
           dragged = false;
           vertical_dragged = false;
@@ -322,7 +361,6 @@
           timestamp = Date.now();
           clearInterval(ticker);
           ticker = setInterval(track, 100);
-
         }
 
         function drag(e) {
@@ -405,7 +443,7 @@
         });
 
 
-        $(window).on('resize.carousel', function() {
+        $(window).off('resize.carousel-'+uniqueNamespace).on('resize.carousel-'+uniqueNamespace, function() {
           if (options.fullWidth) {
             item_width = view.find('.carousel-item').first().innerWidth();
             item_height = view.find('.carousel-item').first().innerHeight();
@@ -420,10 +458,14 @@
         setupEvents();
         scroll(offset);
 
-        $(this).on('carouselNext', function(e, n) {
+        $(this).on('carouselNext', function(e, n, callback) {
           if (n === undefined) {
             n = 1;
           }
+          if (typeof(callback) === "function") {
+            oneTimeCallback = callback;
+          }
+
           target = (dim * Math.round(offset / dim)) + (dim * n);
           if (offset !== target) {
             amplitude = target - offset;
@@ -432,10 +474,14 @@
           }
         });
 
-        $(this).on('carouselPrev', function(e, n) {
+        $(this).on('carouselPrev', function(e, n, callback) {
           if (n === undefined) {
             n = 1;
           }
+          if (typeof(callback) === "function") {
+            oneTimeCallback = callback;
+          }
+
           target = (dim * Math.round(offset / dim)) - (dim * n);
           if (offset !== target) {
             amplitude = target - offset;
@@ -444,10 +490,14 @@
           }
         });
 
-        $(this).on('carouselSet', function(e, n) {
+        $(this).on('carouselSet', function(e, n, callback) {
           if (n === undefined) {
             n = 0;
           }
+          if (typeof(callback) === "function") {
+            oneTimeCallback = callback;
+          }
+
           cycleTo(n);
         });
 
@@ -456,14 +506,14 @@
 
 
     },
-    next : function(n) {
-      $(this).trigger('carouselNext', [n]);
+    next : function(n, callback) {
+      $(this).trigger('carouselNext', [n, callback]);
     },
-    prev : function(n) {
-      $(this).trigger('carouselPrev', [n]);
+    prev : function(n, callback) {
+      $(this).trigger('carouselPrev', [n, callback]);
     },
-    set : function(n) {
-      $(this).trigger('carouselSet', [n]);
+    set : function(n, callback) {
+      $(this).trigger('carouselSet', [n, callback]);
     }
   };
 
@@ -478,4 +528,4 @@
         $.error( 'Method ' +  methodOrOptions + ' does not exist on jQuery.carousel' );
       }
     }; // Plugin end
-}( jQuery ));
+}( jQuery ));

data/vendor/assets/javascripts/materialize/chips.js

@@ -3,8 +3,7 @@
     data: [],
     placeholder: '',
     secondaryPlaceholder: '',
-    autocompleteData: {},
-    autocompleteLimit: Infinity,
+    autocompleteOptions: {},
   };
 
   $(document).ready(function() {
@@ -35,7 +34,7 @@
     }
 
     var curr_options = $.extend({}, materialChipsDefaults, options);
-    self.hasAutocomplete = !$.isEmptyObject(curr_options.autocompleteData);
+    self.hasAutocomplete = !$.isEmptyObject(curr_options.autocompleteOptions.data);
 
     // Initialize
     this.init = function() {
@@ -150,7 +149,7 @@
         $currChips.removeClass('focus');
 
         // Remove active if empty
-        if (!$currChips.data('chips').length) {
+        if ($currChips.data('chips') === undefined || !$currChips.data('chips').length) {
           $currChips.siblings('label').removeClass('active');
         }
         $currChips.siblings('.prefix').removeClass('active');
@@ -197,12 +196,11 @@
     };
 
     this.chips = function($chips, chipId) {
-      var html = '';
+      $chips.empty();
       $chips.data('chips').forEach(function(elem){
-        html += self.renderChip(elem);
+        $chips.append(self.renderChip(elem));
       });
-      html += '<input id="' + chipId +'" class="input" placeholder="">';
-      $chips.html(html);
+      $chips.append($('<input id="' + chipId +'" class="input" placeholder="">'));
       self.setPlaceholder($chips);
 
       // Set for attribute for label
@@ -210,7 +208,7 @@
       if (label.length) {
         label.attr('for', chipId);
 
-        if ($chips.data('chips').length) {
+        if ($chips.data('chips')!== undefined && $chips.data('chips').length) {
           label.addClass('active');
         }
       }
@@ -218,35 +216,37 @@
       // Setup autocomplete if needed.
       var input = $('#' + chipId);
       if (self.hasAutocomplete) {
-        input.autocomplete({
-          data: curr_options.autocompleteData,
-          limit: curr_options.autocompleteLimit,
-          onAutocomplete: function(val) {
-            self.addChip({tag: val}, $chips);
-            input.val('');
-            input.focus();
-          },
-        })
+        curr_options.autocompleteOptions.onAutocomplete = function(val) {
+          self.addChip({tag: val}, $chips);
+          input.val('');
+          input.focus();
+        }
+        input.autocomplete(curr_options.autocompleteOptions);
       }
     };
 
+    /**
+     * Render chip jQuery element.
+     * @param {Object} elem
+     * @return {jQuery}
+     */
     this.renderChip = function(elem) {
       if (!elem.tag) return;
 
-      var html = '<div class="chip">' + elem.tag;
+      var $renderedChip = $('<div class="chip"></div>');
+      $renderedChip.text(elem.tag);
       if (elem.image) {
-        html += ' <img src="' + elem.image + '"> ';
+        $renderedChip.prepend($('<img />').attr('src', elem.image))
       }
-      html += '<i class="material-icons close">close</i>';
-      html += '</div>';
-      return html;
+      $renderedChip.append($('<i class="material-icons close">close</i>'));
+      return $renderedChip;
     };
 
     this.setPlaceholder = function($chips) {
-      if ($chips.data('chips').length && curr_options.placeholder) {
+      if ($chips.data('chips') !== undefined && $chips.data('chips').length && curr_options.placeholder) {
         $chips.find('input').prop('placeholder', curr_options.placeholder);
 
-      } else if (!$chips.data('chips').length && curr_options.secondaryPlaceholder) {
+      } else if (($chips.data('chips') === undefined || !$chips.data('chips').length) && curr_options.secondaryPlaceholder) {
         $chips.find('input').prop('placeholder', curr_options.secondaryPlaceholder);
       }
     };
@@ -267,7 +267,7 @@
       if (!self.isValid($chips, elem)) {
         return;
       }
-      var chipHtml = self.renderChip(elem);
+      var $renderedChip = self.renderChip(elem);
       var newData = [];
       var oldData = $chips.data('chips');
       for (var i = 0; i < oldData.length; i++) {
@@ -276,7 +276,7 @@
       newData.push(elem);
 
       $chips.data('chips', newData);
-      $(chipHtml).insertBefore($chips.find('input'));
+      $renderedChip.insertBefore($chips.find('input'));
       $chips.trigger('chip.add', elem);
       self.setPlaceholder($chips);
     };

data/vendor/assets/javascripts/materialize/collapsible.js

@@ -1,11 +1,12 @@
 (function ($) {
-  $.fn.collapsible = function(options) {
+  $.fn.collapsible = function(options, methodParam) {
     var defaults = {
       accordion: undefined,
       onOpen: undefined,
       onClose: undefined
     };
 
+    var methodName = options;
     options = $.extend(defaults, options);
 
 
@@ -17,11 +18,6 @@
 
       var collapsible_type = $this.data("collapsible");
 
-      // Turn off any existing event handlers
-      $this.off('click.collapse', '> li > .collapsible-header');
-      $panel_headers.off('click.collapse');
-
-
       /****************
       Helper Functions
       ****************/
@@ -78,7 +74,11 @@
       }
 
       // Open collapsible. object: .collapsible-header
-      function collapsibleOpen(object) {
+      function collapsibleOpen(object, noToggle) {
+        if (!noToggle) {
+          object.toggleClass('active');
+        }
+
         if (options.accordion || collapsible_type === "accordion" || collapsible_type === undefined) { // Handle Accordion
           accordionOpen(object);
         } else { // Handle Expandables
@@ -123,9 +123,34 @@
         return object.closest('li > .collapsible-header');
       }
 
+
+      // Turn off any existing event handlers
+      function removeEventHandlers() {
+        $this.off('click.collapse', '> li > .collapsible-header');
+      }
+
       /*****  End Helper Functions  *****/
 
 
+      // Methods
+      if (methodName === 'destroy') {
+        removeEventHandlers();
+        return;
+      } else if (methodParam >= 0 &&
+          methodParam < $panel_headers.length) {
+        var $curr_header = $panel_headers.eq(methodParam);
+        if ($curr_header.length &&
+            (methodName === 'open' ||
+            (methodName === 'close' &&
+            $curr_header.hasClass('active')))) {
+          collapsibleOpen($curr_header);
+        }
+        return;
+      }
+
+
+      removeEventHandlers();
+
 
       // Add click handler to only direct collapsible header children
       $this.on('click.collapse', '> li > .collapsible-header', function(e) {
@@ -135,19 +160,17 @@
           element = getPanelHeader(element);
         }
 
-        element.toggleClass('active');
-
         collapsibleOpen(element);
       });
 
 
       // Open first active
       if (options.accordion || collapsible_type === "accordion" || collapsible_type === undefined) { // Handle Accordion
-        collapsibleOpen($panel_headers.filter('.active').first());
+        collapsibleOpen($panel_headers.filter('.active').first(), true);
 
       } else { // Handle Expandables
         $panel_headers.filter('.active').each(function() {
-          collapsibleOpen($(this));
+          collapsibleOpen($(this), true);
         });
       }