materialize-sass 1.0.0.alpha2 → 1.0.0.alpha3

data/assets/javascripts/materialize/global.js

@@ -65,24 +65,22 @@ M.initializeJqueryWrapper = function (plugin, pluginName, classRef) {
       if (methodOrOptions.slice(0, 3) === 'get') {
         var instance = this.first()[0][classRef];
         return instance[methodOrOptions].apply(instance, params);
-
-        // Void methods
-      } else {
-        return this.each(function () {
-          var instance = this[classRef];
-          instance[methodOrOptions].apply(instance, params);
-        });
       }
 
+      // Void methods
+      return this.each(function () {
+        var instance = this[classRef];
+        instance[methodOrOptions].apply(instance, params);
+      });
+
       // Initialize plugin if options or no argument is passed in
     } else if (typeof methodOrOptions === 'object' || !methodOrOptions) {
       plugin.init(this, arguments[0]);
       return this;
-
-      // Return error if an unrecognized  method name is passed in
-    } else {
-      jQuery.error("Method " + methodOrOptions + " does not exist on jQuery." + pluginName);
     }
+
+    // Return error if an unrecognized  method name is passed in
+    jQuery.error("Method " + methodOrOptions + " does not exist on jQuery." + pluginName);
   };
 };
 
@@ -245,9 +243,9 @@ M.getOverflowParent = function (element) {
 
   if (element === document.body || getComputedStyle(element).overflow !== 'visible') {
     return element;
-  } else {
-    return M.getOverflowParent(element.parentElement);
   }
+
+  return M.getOverflowParent(element.parentElement);
 };
 
 /**

data/assets/javascripts/materialize/materialbox.js

@@ -1,13 +1,23 @@
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
+var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
 (function ($, anim) {
   'use strict';
 
   var _defaults = {
     inDuration: 275,
-    outDuration: 200
+    outDuration: 200,
+    onOpenStart: null,
+    onOpenEnd: null,
+    onCloseStart: null,
+    onCloseEnd: null
   };
 
   /**
@@ -15,7 +25,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
    *
    */
 
-  var Materialbox = function () {
+  var Materialbox = function (_Component) {
+    _inherits(Materialbox, _Component);
+
     /**
      * Construct Materialbox instance
      * @constructor
@@ -25,36 +37,36 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     function Materialbox(el, options) {
       _classCallCheck(this, Materialbox);
 
-      // If exists, destroy and reinitialize
-      if (!!el.M_Materialbox) {
-        el.M_Materialbox.destroy();
-      }
+      var _this = _possibleConstructorReturn(this, (Materialbox.__proto__ || Object.getPrototypeOf(Materialbox)).call(this, Materialbox, el, options));
 
-      this.el = el;
-      this.$el = $(el);
-      this.el.M_Materialbox = this;
+      _this.el.M_Materialbox = _this;
 
       /**
        * Options for the modal
        * @member Materialbox#options
        * @prop {Number} [inDuration=275] - Length in ms of enter transition
        * @prop {Number} [outDuration=200] - Length in ms of exit transition
+       * @prop {Function} onOpenStart - Callback function called before materialbox is opened
+       * @prop {Function} onOpenEnd - Callback function called after materialbox is opened
+       * @prop {Function} onCloseStart - Callback function called before materialbox is closed
+       * @prop {Function} onCloseEnd - Callback function called after materialbox is closed
        */
-      this.options = $.extend({}, Materialbox.defaults, options);
+      _this.options = $.extend({}, Materialbox.defaults, options);
 
-      this.overlayActive = false;
-      this.doneAnimating = true;
-      this.placeholder = $('<div></div>').addClass('material-placeholder');
-      this.originalWidth = 0;
-      this.originalHeight = 0;
-      this.originInlineStyles = this.$el.attr('style');
-      this.caption = this.el.getAttribute('data-caption') || "";
+      _this.overlayActive = false;
+      _this.doneAnimating = true;
+      _this.placeholder = $('<div></div>').addClass('material-placeholder');
+      _this.originalWidth = 0;
+      _this.originalHeight = 0;
+      _this.originInlineStyles = _this.$el.attr('style');
+      _this.caption = _this.el.getAttribute('data-caption') || "";
 
       // Wrap
-      this.$el.before(this.placeholder);
-      this.placeholder.append(this.$el);
+      _this.$el.before(_this.placeholder);
+      _this.placeholder.append(_this.$el);
 
-      this._setupEventHandlers();
+      _this._setupEventHandlers();
+      return _this;
     }
 
     _createClass(Materialbox, [{
@@ -174,7 +186,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     }, {
       key: '_animateImageIn',
       value: function _animateImageIn() {
-        var _this = this;
+        var _this2 = this;
 
         var animOptions = {
           targets: this.el,
@@ -185,7 +197,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
           duration: this.options.inDuration,
           easing: 'easeOutQuad',
           complete: function () {
-            _this.doneAnimating = true;
+            _this2.doneAnimating = true;
+
+            // onOpenEnd callback
+            if (typeof _this2.options.onOpenEnd === 'function') {
+              _this2.options.onOpenEnd.call(_this2, _this2.el);
+            }
           }
         };
 
@@ -207,7 +224,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     }, {
       key: '_animateImageOut',
       value: function _animateImageOut() {
-        var _this2 = this;
+        var _this3 = this;
 
         var animOptions = {
           targets: this.el,
@@ -218,7 +235,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
           duration: this.options.outDuration,
           easing: 'easeOutQuad',
           complete: function () {
-            _this2.placeholder.css({
+            _this3.placeholder.css({
               height: '',
               width: '',
               position: '',
@@ -226,16 +243,21 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
               left: ''
             });
 
-            _this2.$el.removeAttr('style');
-            _this2.$el.attr('style', _this2.originInlineStyles);
+            _this3.$el.removeAttr('style');
+            _this3.$el.attr('style', _this3.originInlineStyles);
 
             // Remove class
-            _this2.$el.removeClass('active');
-            _this2.doneAnimating = true;
+            _this3.$el.removeClass('active');
+            _this3.doneAnimating = true;
 
             // Remove overflow overrides on ancestors
-            if (_this2.ancestorsChanged.length) {
-              _this2.ancestorsChanged.css('overflow', '');
+            if (_this3.ancestorsChanged.length) {
+              _this3.ancestorsChanged.css('overflow', '');
+            }
+
+            // onCloseEnd callback
+            if (typeof _this3.options.onCloseEnd === 'function') {
+              _this3.options.onCloseEnd.call(_this3, _this3.el);
             }
           }
         };
@@ -262,7 +284,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     }, {
       key: 'open',
       value: function open() {
-        var _this3 = this;
+        var _this4 = this;
 
         this._updateVars();
         this.originalWidth = this.el.getBoundingClientRect().width;
@@ -273,6 +295,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         this.$el.addClass('active');
         this.overlayActive = true;
 
+        // onOpenStart callback
+        if (typeof this.options.onOpenStart === 'function') {
+          this.options.onOpenStart.call(this, this.el);
+        }
+
         // Set positioning for placeholder
         this.placeholder.css({
           width: this.placeholder[0].getBoundingClientRect().width + 'px',
@@ -295,8 +322,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         this.$overlay = $('<div id="materialbox-overlay"></div>').css({
           opacity: 0
         }).one('click', function () {
-          if (_this3.doneAnimating) {
-            _this3.close();
+          if (_this4.doneAnimating) {
+            _this4.close();
           }
         });
 
@@ -378,11 +405,16 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     }, {
       key: 'close',
       value: function close() {
-        var _this4 = this;
+        var _this5 = this;
 
         this._updateVars();
         this.doneAnimating = false;
 
+        // onCloseStart callback
+        if (typeof this.options.onCloseStart === 'function') {
+          this.options.onCloseStart.call(this, this.el);
+        }
+
         anim.remove(this.el);
         anim.remove(this.$overlay[0]);
 
@@ -401,8 +433,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
           duration: this.options.outDuration,
           easing: 'easeOutQuad',
           complete: function () {
-            _this4.overlayActive = false;
-            _this4.$overlay.remove();
+            _this5.overlayActive = false;
+            _this5.$overlay.remove();
           }
         });
 
@@ -416,19 +448,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             duration: this.options.outDuration,
             easing: 'easeOutQuad',
             complete: function () {
-              _this4.$photoCaption.remove();
+              _this5.$photoCaption.remove();
             }
           });
         }
       }
     }], [{
       key: 'init',
-      value: function init($els, options) {
-        var arr = [];
-        $els.each(function () {
-          arr.push(new Materialbox(this, options));
-        });
-        return arr;
+      value: function init(els, options) {
+        return _get(Materialbox.__proto__ || Object.getPrototypeOf(Materialbox), 'init', this).call(this, this, els, options);
       }
 
       /**
@@ -449,7 +477,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     }]);
 
     return Materialbox;
-  }();
+  }(Component);
 
   M.Materialbox = Materialbox;
 

data/assets/javascripts/materialize/modal.js

@@ -1,7 +1,13 @@
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
+var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
 (function ($, anim) {
   'use strict';
 
@@ -9,8 +15,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     opacity: 0.5,
     inDuration: 250,
     outDuration: 250,
-    ready: undefined,
-    complete: undefined,
+    onOpenStart: null,
+    onOpenEnd: null,
+    onCloseStart: null,
+    onCloseEnd: null,
     dismissible: true,
     startingTop: '4%',
     endingTop: '10%'
@@ -21,7 +29,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
    *
    */
 
-  var Modal = function () {
+  var Modal = function (_Component) {
+    _inherits(Modal, _Component);
+
     /**
      * Construct Modal instance and set up overlay
      * @constructor
@@ -31,14 +41,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     function Modal(el, options) {
       _classCallCheck(this, Modal);
 
-      // If exists, destroy and reinitialize
-      if (!!el.M_Modal) {
-        el.M_Modal.destroy();
-      }
+      var _this = _possibleConstructorReturn(this, (Modal.__proto__ || Object.getPrototypeOf(Modal)).call(this, Modal, el, options));
 
-      this.el = el;
-      this.$el = $(el);
-      this.el.M_Modal = this;
+      _this.el.M_Modal = _this;
 
       /**
        * Options for the modal
@@ -46,29 +51,32 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
        * @prop {Number} [opacity=0.5] - Opacity of the modal overlay
        * @prop {Number} [inDuration=250] - Length in ms of enter transition
        * @prop {Number} [outDuration=250] - Length in ms of exit transition
-       * @prop {Function} ready - Callback function called when modal is finished entering
-       * @prop {Function} complete - Callback function called when modal is finished exiting
+       * @prop {Function} onOpenStart - Callback function called before modal is opened
+       * @prop {Function} onOpenEnd - Callback function called after modal is opened
+       * @prop {Function} onCloseStart - Callback function called before modal is closed
+       * @prop {Function} onCloseEnd - Callback function called after modal is closed
        * @prop {Boolean} [dismissible=true] - Allow modal to be dismissed by keyboard or overlay click
        * @prop {String} [startingTop='4%'] - startingTop
        * @prop {String} [endingTop='10%'] - endingTop
        */
-      this.options = $.extend({}, Modal.defaults, options);
+      _this.options = $.extend({}, Modal.defaults, options);
 
       /**
        * Describes open/close state of modal
        * @type {Boolean}
        */
-      this.isOpen = false;
+      _this.isOpen = false;
 
-      this.id = this.$el.attr('id');
-      this._openingTrigger = undefined;
-      this.$overlay = $('<div class="modal-overlay"></div>');
+      _this.id = _this.$el.attr('id');
+      _this._openingTrigger = undefined;
+      _this.$overlay = $('<div class="modal-overlay"></div>');
 
       Modal._increment++;
       Modal._count++;
-      this.$overlay[0].style.zIndex = 1000 + Modal._increment * 2;
-      this.el.style.zIndex = 1000 + Modal._increment * 2 + 1;
-      this._setupEventHandlers();
+      _this.$overlay[0].style.zIndex = 1000 + Modal._increment * 2;
+      _this.el.style.zIndex = 1000 + Modal._increment * 2 + 1;
+      _this._setupEventHandlers();
+      return _this;
     }
 
     _createClass(Modal, [{
@@ -183,7 +191,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     }, {
       key: '_animateIn',
       value: function _animateIn() {
-        var _this = this;
+        var _this2 = this;
 
         // Set initial styles
         $.extend(this.el.style, {
@@ -208,10 +216,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
           targets: this.el,
           duration: this.options.inDuration,
           easing: 'easeOutCubic',
-          // Handle modal ready callback
+          // Handle modal onOpenEnd callback
           complete: function () {
-            if (typeof _this.options.ready === 'function') {
-              _this.options.ready.call(_this, _this.el, _this._openingTrigger);
+            if (typeof _this2.options.onOpenEnd === 'function') {
+              _this2.options.onOpenEnd.call(_this2, _this2.el, _this2._openingTrigger);
             }
           }
         };
@@ -243,7 +251,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     }, {
       key: '_animateOut',
       value: function _animateOut() {
-        var _this2 = this;
+        var _this3 = this;
 
         // Animate overlay
         anim({
@@ -260,12 +268,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
           easing: 'easeOutCubic',
           // Handle modal ready callback
           complete: function () {
-            _this2.el.style.display = 'none';
-            // Call complete callback
-            if (typeof _this2.options.complete === 'function') {
-              _this2.options.complete.call(_this2, _this2.el);
+            _this3.el.style.display = 'none';
+            _this3.$overlay.remove();
+
+            // Call onCloseEnd callback
+            if (typeof _this3.options.onCloseEnd === 'function') {
+              _this3.options.onCloseEnd.call(_this3, _this3.el);
             }
-            _this2.$overlay.remove();
           }
         };
 
@@ -302,10 +311,16 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         }
 
         this.isOpen = true;
+
+        // onOpenStart callback
+        if (typeof this.options.onOpenStart === 'function') {
+          this.options.onOpenStart.call(this, this.el, this._openingTrigger);
+        }
+
         var body = document.body;
         body.style.overflow = 'hidden';
         this.el.classList.add('open');
-        body.appendChild(this.$overlay[0]);
+        this.el.insertAdjacentElement('afterend', this.$overlay[0]);
 
         // Set opening trigger, undefined indicates modal was opened by javascript
         this._openingTrigger = !!$trigger ? $trigger[0] : undefined;
@@ -333,6 +348,12 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         }
 
         this.isOpen = false;
+
+        // Call onCloseStart callback
+        if (typeof this.options.onCloseStart === 'function') {
+          this.options.onCloseStart.call(this, this.el);
+        }
+
         this.el.classList.remove('open');
         document.body.style.overflow = '';
 
@@ -347,12 +368,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
       }
     }], [{
       key: 'init',
-      value: function init($els, options) {
-        var arr = [];
-        $els.each(function () {
-          arr.push(new Modal(this, options));
-        });
-        return arr;
+      value: function init(els, options) {
+        return _get(Modal.__proto__ || Object.getPrototypeOf(Modal), 'init', this).call(this, this, els, options);
       }
 
       /**
@@ -373,7 +390,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
     }]);
 
     return Modal;
-  }();
+  }(Component);
 
   /**
    * @static