material 0.7.1 → 0.7.2

package/src/mixin/events.js

@@ -1,16 +1,10 @@
 export default {
-
-  /**
-   * cross browser addEvent
-   * @param {string}   event The event to add
-   * @param {Function} fn    [description]
-   */
   addEvent (event, fn) {
-    var element = this.element
+    const element = this.element
     // avoid memory overhead of new anonymous functions for every event handler that's installed
     // by using local functions
     function listenHandler (e) {
-      var ret = fn.apply(this, arguments)
+      const ret = fn.apply(this, arguments)
       if (ret === false) {
         e.stopPropagation()
         e.preventDefault()
@@ -21,7 +15,7 @@ export default {
     function attachHandler () {
       // set the this pointer same as addEventListener when fn is called
       // and make sure the event is passed to the fn also so that works the same too
-      var ret = fn.call(element, window.event)
+      const ret = fn.call(element, window.event)
       if (ret === false) {
         window.event.returnValue = false
         window.event.cancelBubble = true
@@ -38,14 +32,8 @@ export default {
     return this
   },
 
-  /**
-   * cross browser removeEvent
-   * @param  {string}   event The event to remove
-   * @param  {Function} fn    [description]
-   * @return {Object}         [description]
-   */
   removeEvent (event, fn) {
-    var element = this.element
+    const element = this.element
 
     if (element.removeEventListener) {
       element.removeEventListener(event, fn, false)

package/src/mixin/focus.js

@@ -1,4 +1,4 @@
-import css from '../module/css'
+import * as css from '../module/css'
 
 export default {
   /**

package/src/mixin/icon.js

@@ -11,12 +11,12 @@ function icon (root, svg, options) {
     return
   }
 
-  var position = 'top'
+  let position = 'top'
   if (options && options.type === 'text-icon') {
     position = 'bottom'
   }
 
-  var element = create('i', options.class + '-icon')
+  const element = create('i', options.class + '-icon')
   insert(element, root, position)
 
   element.innerHTML = svg

package/src/mixin/init.js

@@ -10,9 +10,9 @@ function init (instance) {
 }
 
 function modules (instance) {
-  var modules = instance.options.modules
+  const modules = instance.options.modules
 
-  for (var i = 0; i < modules.length; i++) {
+  for (let i = 0; i < modules.length; i++) {
     if (typeof modules[i] === 'function') {
       modules[i](instance)
     } else {

package/src/mixin/insert.js

@@ -5,7 +5,7 @@ import dom from '../module/dom'
 export default {
 
   insert (container, context) {
-    var element = this.element
+    const element = this.element
 
     this.insertElement(element, container, context)
 
@@ -27,15 +27,15 @@ export default {
 
     context = context || 'bottom'
 
-    var contexts = ['top', 'bottom', 'after', 'before']
-    var methods = ['prepend', 'append', 'after', 'before']
+    const contexts = ['top', 'bottom', 'after', 'before']
+    const methods = ['prepend', 'append', 'after', 'before']
 
-    var index = contexts.indexOf(context)
+    const index = contexts.indexOf(context)
     if (index === -1) {
       return
     }
 
-    var method = methods[index]
+    const method = methods[index]
 
     // this.emit('insert');
 

package/src/mixin/label.js

@@ -10,9 +10,9 @@ const prefix = 'material'
 function label (root, text, options) {
   text = text || null
 
-  var prefix = options.class || options.prefix
+  const prefix = options.class || options.prefix
 
-  var label = create('label', prefix + '-label')
+  const label = create('label', prefix + '-label')
   label.textContent = text
   label.setAttribute('for', options.name)
   insert(label, root)

package/src/mixin/settings.js

@@ -2,9 +2,9 @@ import cookies from '../module/cookies'
 import merge from '../module/merge'
 
 function set (key, value) {
-  var text = cookies.get(key)
+  const text = cookies.get(key)
 
-  var current = {}
+  let current = {}
 
   if (text) {
     current = JSON.parse(text)
@@ -12,7 +12,7 @@ function set (key, value) {
 
   console.log('settings value', current, value)
   // settings = [settings, value].reduce(Object.assign, {});
-  var settings = merge(current, value)
+  const settings = merge(current, value)
 
   console.log('settings ' + key, settings)
 
@@ -20,12 +20,12 @@ function set (key, value) {
 }
 
 function get (key) {
-  var json = cookies.get(key)
+  const json = cookies.get(key)
 
   if (!json) {
     return null
   }
-  var value = JSON.parse(json)
+  const value = JSON.parse(json)
 
   console.log('settings' + key, value)
 

package/src/module/attach.js

@@ -1,72 +1,58 @@
+// Assuming extract is imported or defined elsewhere
 import extract from './extract'
 
-/**
- * attach function to events
- * @module module/attach
- * @category module
- */
-
-/**
- * [attach description]
- * @param  {object} component [description]
- * @param  {[type]} events    [description]
- * @return {[type]}           [description]
- */
-export default {
-  attach: function (events) {
-    // console.log('attach', events)
+const attachModule = {
+  attach (events) {
     events = events || this.options.events
     if (!events) return
 
-    // console.log('attach', events, this)
-    var instance = this
-    events.map((def) => {
-      var e = extract.e(instance, def[0])
-      var f = extract.f(instance, def[1])
-      var option = def[2]
+    events.map(([eventDef, funcDef, option]) => {
+      const e = extract.e(this, eventDef)
+      const isFunction = typeof funcDef === 'function'
+      let f = null
+      let keys = []
+
+      if (!isFunction) {
+        f = extract.f(this, funcDef)
+        keys = funcDef.split('.')
+        keys.pop()
+      }
 
-      var keys = def[1].split('.')
+      const bound = this.last(keys.join('.'))
 
-      keys.pop()
-      var bound = this.last(keys.join('.'))
+      let handler = null
 
-      if (f && bound && e && e.element && e.element.addEventListener) {
-        if (!f) { console.log('error') }
+      if (isFunction) {
+        handler = funcDef.bind(this)
+      } else if (f && bound) {
+        handler = f.bind(bound)
+      } else {
+        // console.error(`Can't bind function for ${eventDef}`)
+        return
+      }
 
+      if (handler && e && e.element && e.element.addEventListener) {
         if (option) {
-          e.element.addEventListener(e.name, f.bind(bound), option)
+          e.element.addEventListener(e.name, handler, option)
         } else {
-          e.element.addEventListener(e.name, f.bind(bound))
+          e.element.addEventListener(e.name, handler)
         }
-      } else if (e && e.element && e.element.on && f && bound) {
-        e.element.on(e.name, f.bind(bound))
+      } else if (e && e.element && e.element.on && handler) {
+        e.element.on(e.name, handler)
       } else {
-        // console.log('can\'t attach', def[0])
+        // console.error(`Can't attach ${eventDef}`)
       }
     })
 
     return this
   },
 
-  /**
-   * Return the last reference from an object
-   * @param  {string} str Object path for example key1.key2.key3
-   * @return {value} The value of the last reference
-   */
-  last: function (str) {
-    // console.log('_path', str)
+  last (str) {
     if (!str) return this
-    else if (!str.match(/\./)) return this[str]
-    var last
-
-    var keys = str.split('.')
-    for (var i = 0, l = keys.length; i < l; i++) {
-      var key = keys[i]
+    if (!str.includes('.')) return this[str]
 
-      last = last || this
-      last = last[key]
-    }
-
-    return last
+    return str.split('.').reduce((acc, key) => acc[key], this)
   }
 }
+
+export default attachModule

package/src/module/attributes.js

@@ -5,8 +5,8 @@ function attributes (element, o) {
 
   if (!element) return
 
-  for (var i = 0; i < o.attributes.length; i++) {
-    var attribute = o.attributes[i]
+  for (let i = 0; i < o.attributes.length; i++) {
+    const attribute = o.attributes[i]
 
     if (o[attribute] && o[attribute] !== 'undefined') {
       if (special.indexOf(attribute) > -1) {

package/src/module/build.js

@@ -1,4 +1,6 @@
+import * as css from './css'
 import dataset from './dataset'
+
 import Layout from '../layout'
 
 export default {
@@ -7,14 +9,15 @@ export default {
 
     const defaults = this.constructor.defaults || {}
 
-    if (defaults.base) this.element.classList.add(defaults.base)
-
-    if (defaults.class) this.element.classList.add(defaults.class)
+    if (defaults.base) css.add(this.element, defaults.base)
+    if (defaults.class) css.add(this.element, defaults.class)
 
     if (this.options.class !== defaults.class) {
-      this.addClass(this.options.class)
+      css.add(this.element, this.options.class)
     }
 
+    if (defaults.class === 'account') console.log('data')
+
     if (this.options.data) {
       dataset(this.element, this.options.data)
     }
@@ -37,11 +40,5 @@ export default {
 
   appendTo (container) {
     container.appendChild(this.element)
-  },
-
-  addClass (clss) {
-    const c = clss.replace(/\s+/g, ' ').trim()
-    const list = c.split(' ')
-    list.forEach(item => this.element.classList.add(item))
   }
 }

package/src/module/classify.js

@@ -1,4 +1,4 @@
-import css from '../module/css'
+import * as css from '../module/css'
 
 function classify (element, options) {
   css.add(element, options.prefix + '-' + options.class)
@@ -34,14 +34,14 @@ function classify (element, options) {
   }
 
   if (options.style) {
-    var styles = options.style.split(' ')
-    for (var i = 0; i < styles.length; i++) {
+    const styles = options.style.split(' ')
+    for (let i = 0; i < styles.length; i++) {
       css.add(element, 'style-' + styles[i])
     }
   }
 
   if (options.data) {
-    for (var property in options.data) {
+    for (const property in options.data) {
       if (options.data.hasOwnProperty(property)) {
         element.dataset[property] = options.data[property]
       }

package/src/module/controller.js

@@ -1,15 +1,4 @@
-'use strict'
-
-/**
- *
- */
-var controller = {
-
-  /**
-   * [register description]
-   * @param  {component} component [description]
-   * @return {Object} The class instance
-   */
+const controller = {
   register (instance, group) {
     group = group || 'component'
     this[group + 's'] = this[group + 's'] || []
@@ -24,12 +13,6 @@ var controller = {
     return this
   },
 
-  /**
-   * This method subscribes to a specific topic
-   * @param  {string}   topic
-   * @param  {Function} callback
-   * @return {boolean} true
-   */
   subscribe (topic, callback) {
     this._topics = this._topics || {}
 
@@ -42,12 +25,6 @@ var controller = {
     return true
   },
 
-  /**
-   * This method unsubscribes to a specific topic
-   * @param  {string}   topic
-   * @param  {Function} callback
-   * @return {boolean} true
-   */
   unsunscribe (topic, callback) {
     this._topics = this._topics || {}
     // _log.debug('unsubscribe', topic);
@@ -55,7 +32,7 @@ var controller = {
       return false
     }
 
-    for (var i = 0, len = this._topics[topic].length; i < len; i++) {
+    for (let i = 0, len = this._topics[topic].length; i < len; i++) {
       if (this._topics[topic][i] === callback) {
         this._topics[topic].splice(i, 1)
         return true
@@ -65,21 +42,17 @@ var controller = {
     return false
   },
 
-  /**
-   * [publish description]
-   * @return {?} [description]
-   */
   publish () {
     this._topics = this._topics || {}
 
-    var args = Array.prototype.slice.call(arguments)
-    var topic = args.shift()
+    const args = Array.prototype.slice.call(arguments)
+    const topic = args.shift()
     // _log.debug('publish', topic);
     if (!this._topics.hasOwnProperty(topic)) {
       return false
     }
 
-    for (var i = 0, len = this._topics[topic].length; i < len; i++) {
+    for (let i = 0, len = this._topics[topic].length; i < len; i++) {
       this._topics[topic][i].apply(undefined, args)
     }
     return true

package/src/module/css.js

@@ -1,51 +1,15 @@
-/**
- * This function checks if the element className passed in parameters
- *
- * @since 0.0.6
- * @module css/has
- * @category Element
- * @param {...Array} [arrays] The arrays to process.
- * @param {Function} iteratee The function to combine
- *  grouped values.
- * @returns {Array} Returns the new array of grouped elements.
- * @see unzip, unzipWith, zip, zipObject, zipObjectDeep, zipWith
- * @example
- *
- * has(element, 'show');
- * // => [111, 222]
- */
-function has(element, className) {
-  if (!element || !className) {
-    return false
-  }
-
-  return !!element.className.match(new RegExp('(\\s|^)' + className + '(\\s|$)'))
+const has = (element, className) => {
+  if (!element || !className) return false
+  return !!element.className.match(new RegExp(`(\\s|^)${className}(\\s|$)`))
 }
 
-/**
- * This function adds className to the element's attribute class
- *
- * @since 0.0.6
- * @module css/add
- * @category css
- * @param {HTMLElement} element Related element
- * @param {String} className the className to add
- *  grouped values.
- * @returns {HTMLElement} The augmented element
- * @example
- *
- * add(element, 'hidden');
- * // => <div class="element hidden">...</div>
- */
-function add(element, className) {
-  if (!element || !className) {
-    return
-  }
+const add = (element, className) => {
+  if (!element || !className) return
 
-  let classNames = className.split(' ')
+  const sanitizedClassName = className.trim().replace(/\s+/g, ' ')
+  const classNames = sanitizedClassName.split(' ')
 
-  for (var i = 0; i < classNames.length; i++) {
-    var cn = classNames[i]
+  for (const cn of classNames) {
     if (!has(element, cn)) {
       element.classList.add(cn)
     }
@@ -53,55 +17,19 @@ function add(element, className) {
   return element
 }
 
-/**
- * This function removes className to the element's attribute class
- *
- * @since 0.0.6
- * @module css/remove
- * @category css
- * @param {HTMLElement} element Related element
- * @param {String} className the className to add
- * @returns {HTMLElement} The element with the removed className
- * @example
- *
- * remove(element, 'hidden');
- * // => <div class="element">...</div>
- */
-function remove(element, className) {
-  if (!element || !className) {
-    return
-  }
-
+const remove = (element, className) => {
+  if (!element || !className) return
   element.classList.remove(className)
-
   return element
 }
 
-/**
- * This function toggles className from the element's attribute class
- *
- * @since 0.0.6
- * @module css/toggle
- * @category Element
- * @param {HTMLElement} element Related element
- * @param {String} className the className to add
- *  grouped values.
- * @returns {HTMLElement} The modified element
- * @example
- *
- * toggle(element, 'hidden');
- * // => <div class="element">...</div>
- * toggle(element, 'hidden');
- * // => <div class="element hidden">...</div>
- */
-function toggle(element, className) {
+const toggle = (element, className) => {
   if (has(element, className)) {
     remove(element, className)
   } else {
     add(element, className)
   }
-
   return element
 }
 
-export default { has, add, remove, toggle }
+export { has, add, remove, toggle }

package/src/module/dataset.js

@@ -1,7 +1,7 @@
 
 function dataset (element, data) {
   if (data) {
-    for (var property in data) {
+    for (const property in data) {
       if (data.hasOwnProperty(property)) {
         element.dataset[property] = data[property]
       }

package/src/module/dom.js

@@ -22,12 +22,12 @@ function replace (container, element) {
 }
 
 function remove (element) {
-  var parent = element.parentNode
+  const parent = element.parentNode
   return parent.removeChild(element)
 }
 
 function dispose (element) {
-  var el = element
+  const el = element
   return (el.parentNode) ? el.parentNode.removeChild(el) : el
 }
 
@@ -38,7 +38,12 @@ function empty (element) {
 }
 
 function destroy (element) {
-  return element.parentNode.removeChild(element)
+  if (element && element.parentNode) {
+    return element.parentNode.removeChild(element)
+  } else {
+    // console.error('Element or its parent node is null')
+    return null
+  }
 }
 
 export default { append, prepend, after, before, replace, remove, destroy, empty, dispose }

package/src/module/dot.js

@@ -1,10 +1,10 @@
 
 function dot (obj) {
-  var res = {}
+  const res = {}
   function recurse (obj, current) {
-    for (var key in obj) {
-      var value = obj[key]
-      var newKey = (current ? current + '.' + key : key)
+    for (const key in obj) {
+      const value = obj[key]
+      const newKey = (current ? current + '.' + key : key)
       if (value && typeof value === 'object') {
         recurse(value, newKey)
       } else {

package/src/module/emitter.js

@@ -14,7 +14,7 @@ export default {
   emit (event /* , args... */) {
     this.event = this.event || {}
     if (event in this.event === false) return
-    for (var i = 0; i < this.event[event].length; i++) {
+    for (let i = 0; i < this.event[event].length; i++) {
       this.event[event][i].apply(this, Array.prototype.slice.call(arguments, 1))
     }
     return this

package/src/module/event.js

@@ -9,7 +9,7 @@ export default {
     // avoid memory overhead of new anonymous functions for every event handler that's installed
     // by using local functions
     function listenHandler (e) {
-      var ret = fn.apply(this, arguments)
+      const ret = fn.apply(this, arguments)
       if (ret === false) {
         e.stopPropagation()
         e.preventDefault()
@@ -20,7 +20,7 @@ export default {
     function attachHandler () {
       // set the this pointer same as addEventListener when fn is called
       // and make sure the event is passed to the fn also so that works the same too
-      var ret = fn.call(element, window.event)
+      const ret = fn.call(element, window.event)
       if (ret === false) {
         window.event.returnValue = false
         window.event.cancelBubble = true