material 0.7.0 → 0.7.2

package/src/select.js

@@ -1,323 +1,108 @@
-'use strict'
-
-import emitter from './module/emitter'
+import EventEmitter from './mixin/emitter'
+// modules
+import build from './module/build'
 import attach from './module/attach'
+import attributes from './module/attributes'
+import dataset from './module/dataset'
 
-var defaults = {
-  prefix: 'material',
-  class: 'textfield',
-  type: 'control',
-  tag: 'div',
-  events: [
-    ['input.change', '_onChange'],
-    ['input.focus', 'focus'],
-    ['input.blur', 'blur'],
-    // ['input.keypress', '_handleInputKeyPress',
-    ['input.keyup', '_handleInputKeyPress']
-    // ['input.mouseover', 'mouseover']
-    // ['input.change', '_onChange']
-    // 'input.keydown': '_handleInputKeyPress'
-
-  ]
-}
+class Select extends EventEmitter {
+  static defaults = {
+    type: 'list',
+    class: 'select',
+    first: null,
+    attributes: ['type', 'name', 'autocomplete', 'required']
+  }
 
-/**
- * Textfield class
- * @class
- */
-class Select {
-  /**
-   * Constructor
-   * @param  {Object} options - Component options
-   * @return {Object} Class instance
-   */
   constructor (options) {
-    this.options = Object.assign({}, defaults, options || {})
+    super()
 
-    this.init()
+    this.init(options)
     this.build()
-    this.attach()
-
-    return this
-  }
-
-  /**
-   * init
-   * @param  {Object} options The class options
-   * @return {Object} The class instance
-   */
-  init () {
-    Object.assign(this, emitter, attach)
-
-    this.value = this.options.value
-
-    return this
-  }
-
-  mouseover () {
-    // console.log('mouseover')
-  }
-
-  /**
-   * [build description]
-   * @return {Object} The class instance
-   */
-  build () {
-    // create a new div as input element
-    var tag = this.options.tag || 'div'
-    this.element = document.createElement(tag)
-    this.element.classList.add(this.options.prefix + '-' + this.options.class)
-
     this.buildLabel()
     this.buildInput()
-    this.buildUnderline()
-
-    if (this.disabled) {
-      css.add(this.element, 'is-disabled')
-    }
+    this.attach()
+  }
 
-    // insert if container this.options is given
-    if (this.options.container) {
-      // console.log(this.name, opts.container);
-      insert(this.element, this.options.container)
-    }
+  init (options) {
+    this.options = Object.assign({}, Select.defaults, options || {})
+    Object.assign(this, build, attach, dataset)
   }
 
   buildLabel () {
-    this.label = document.createElement('label')
-    this.label.classList.add(this.options.class + '-label')
-    this.element.appendChild(this.label)
-
-    if (this.options.label !== false) {
-      this.setLabel()
+    if (this.options.label) {
+      this.label = document.createElement('span')
+      this.label.classList.add('label')
+      this.label.innerHTML = this.options.label
+      this.element.appendChild(this.label)
     }
   }
 
-  /**
-   * [_initInput description]
-   * @return {Object} The class instance
-   */
   buildInput () {
     this.input = document.createElement('select')
-    this.input.classList.add(this.options.class + '-input')
-    // this.input.setAttribute('type', 'text')
+    this.input.classList.add('input')
     this.element.appendChild(this.input)
 
-    if (this.options.options) {
-      this.setOptions(this.options.options)
+    this.input.addEventListener('change', () => {
+      // console.log('change', this.input[this.input.selectedIndex].value)
+      this.emit('change', this.input[this.input.selectedIndex].value)
+    })
+
+    if (this.options.data) {
+      dataset(this.data, this.options.data)
     }
 
-    // if (!this.options.value) {
-    //   this.element.classList.add('is-empty')
-    // }
+    attributes(this.input, this.options)
 
-    if (this.readonly) {
-      this.input.setAttribute('readonly', 'readonly')
-      this.input.setAttribute('tabindex', '-1')
+    if (this.options.options) {
+      this.setOptions(this.options.options)
     }
-
-    return this.input
   }
 
   setOptions (options) {
-    for (var i = 0; i < options.length; i++) {
-      this.add(options[i], options[i])
-    }
-  }
+    // console.log('buildCountry', this.input)
 
-  /**
-   * _initUnderline
-   * @return {Object} The class instance
-   */
-  buildUnderline () {
-    this.underline = document.createElement('span')
-    this.underline.classList.add(this.options.class + '-underline')
-    this.element.appendChild(this.underline)
-  }
+    const first = this.options.first
 
-  /**
-   * Setter
-   * @param {string} prop
-   * @param {string} value
-   */
-  set (prop, value) {
-    switch (prop) {
-      case 'value':
-        this.setValue(value)
-        break
-      case 'label':
-        this.setLabel(value)
-        break
-      case 'disabled':
-        if (value === true) {
-          this.disable()
-        } else if (value === false) {
-          this.enable()
-        }
-        break
-      default:
-        this.setValue(prop)
+    if (first && first[0] && first[1]) {
+      this.input.options[0] = new Option(first[1], first[0])
     }
 
-    return this
-  }
-
-  /**
-   * [buildLabel description]
-   * @return {Object} The class instance
-   */
-  setLabel (label) {
-    label = label || this.options.label
-    var text
-
-    if (label === null || label === false) {
-      text = ''
-    } else if (this.options.label) {
-      text = label
-    } else {
-      text = this.options.name
+    for (let i = 0; i < options.length; i++) {
+      this.addOption(options[i][1], options[i][0])
     }
-
-    this.label.textContent = text
   }
 
-  disable () {
-    this.disabled = true
-
-    this.input.setAttribute('disabled', 'disabled')
-    this.element.classList.add('is-disabled')
-    return this
+  addOption (name, value) {
+    // console.log('addOption', name, value)
+    this.input.options[this.input.options.length] = new Option(name, value)
   }
 
-  enable () {
-    this.disabled = false
+  set (value) {
+    // console.log('set', value)
+    this.input.value = value
 
-    this.element.input.removeAttribute('disabled')
-    this.element.classList.remove('is-disabled')
     return this
   }
 
-  /**
-   * Getter
-   * @param {string} prop
-   * @param {string} value
-   */
-  get (prop) {
-    var value
-
-    switch (prop) {
-      case 'value':
-        value = this.getValue()
-        break
-      case 'name':
-        value = this.name
-        break
-      default:
-        return this.getValue()
+  setLabel (value) {
+    // console.log('setLabel', value)
+    if (this.label) {
+      this.label.innerHTML = value
     }
-
-    return value
-  }
-
-  /**
-   * [getValue description]
-   * @return {Object} The class instance
-   */
-  getValue () {
-    // console.log('getValue', this);
-    return this.input.value
-  }
-
-  /**
-   * [setValue description]
-   * @param {string} value [description]
-   */
-  setValue (value) {
-    // console.log('setValue', this.options.name, value)
-    this.input.value = value
-
-    if (value) {
-      this.element.classList.remove('is-empty')
-    } else {
-      this.element.classList.add('is-empty')
-    }
-
-    this.emit('change', value)
   }
 
-  _onChange (ev) {
-    // console.log('change', ev)
-
-    this.emit('change', ev.target.value)
-  }
-
-  /**
-   * [_initValue description]
-   * @return {Object} The class instance
-   */
-  _initValue () {
-    var opts = this.options
-
-    // create a new div as input element
-    if (opts.value) {
-      this.setValue(opts.value)
-    }
+  setText (value) {
+    this.setLabel(value)
   }
 
-  /**
-   * [_onFocus description]
-   * @return {Object} The class instance
-   */
-  _handleInputKeyPress (e) {
-    // console.log('_handleInputKeyPress', e);
+  get () {
+    let value = null
 
-    if (this.get('value') === '') {
-      this.element.classList.add('is-empty')
-    } else {
-      this.element.classList.remove('is-empty')
+    if (this.input[this.input.selectedIndex]) {
+      value = this.input[this.input.selectedIndex].value
     }
 
-    this.emit('change', this.getValue())
-  }
-
-  add (key, value, selected) {
-    selected = selected || false
-    var select = this.input
-    select.options[select.options.length] = new Option(value, key, selected, selected)
-  }
-
-  /**
-   * focus method
-   * @return {?} [description]
-   */
-  focus () {
-    if (this.disabled === true) return this
-
-    this.element.classList.add('is-focused')
-    if (this.input !== document.activeElement) { this.input.focus() }
-    return this
-  }
-
-  /**
-   * blur method
-   * @return {?} [description]
-   */
-  blur () {
-    this.element.classList.remove('is-focused')
-    return this
-  }
-  /**
-   * [setError description]
-   * @param {string} error Error description
-   */
-  setError (error) {
-    if (error) {
-      this.addClass('field-error')
-      if (this.error) { this.error.set('html', error) }
-    } else {
-      if (this.error) { this.removeClass('field-error') }
-      if (this.error) { this.error.set('html', '') }
-    }
+    return value
   }
 }
 

package/src/{control/selecter.js → selecter.js}

@@ -1,52 +1,50 @@
-import emitter from '..//module/emitter'
-import attach from '../module/attach'
-import dataset from '../view/dataset'
+import EventEmitter from './mixin/emitter'
+// modules
+import attach from './module/attach'
+import dataset from './module/dataset'
 import attributes from './module/attributes'
-import addClass from './module/addclass'
-
-// ui
-import Layout from '../layout'
-import Element from '../element'
+import * as css from './module/css'
+// components
+import Layout from './layout'
+import Element from './element'
 import Button from './button'
 
-const defaults = {
-  class: 'selecter',
-  first: null,
-  attributes: ['type', 'name', 'autocomplete', 'required'],
-  layout: [
-    [Element, 'label', { tag: 'label', class: 'label' }],
-    [Element, 'value', { tag: 'value', class: 'value' }],
-    [Element, 'input', { tag: 'input', type: 'text', class: 'input' }],
-    [Element, 'list', { class: 'list' },
-      [Element, 'head', { class: 'head' },
-        [Element, 'title', { class: 'title' }],
-        [Button, 'close', { class: 'close' }]
-      ],
-      [Element, 'body', { class: 'body' }]
+class Selecter extends EventEmitter {
+  static defaults = {
+    class: 'selecter',
+    first: null,
+    attributes: ['type', 'name', 'autocomplete', 'required'],
+    layout: [
+      [Element, 'label', { tag: 'label', class: 'label' }],
+      [Element, 'value', { tag: 'value', class: 'value' }],
+      [Element, 'input', { tag: 'input', type: 'text', class: 'input' }],
+      [Element, 'list', { class: 'list' },
+        [Element, 'head', { class: 'head' },
+          [Element, 'title', { class: 'title' }],
+          [Button, 'close', { class: 'close' }]
+        ],
+        [Element, 'body', { class: 'body' }]
+      ]
+    ],
+    events: [
+      ['ui.value.click', 'showList'],
+      ['ui.list.click', 'select'],
+      ['ui.close.click', 'hideList']
     ]
-  ],
-  events: [
-    ['ui.value.click', 'showList'],
-    ['ui.list.click', 'select'],
-    ['ui.close.click', 'hideList']
-  ]
-}
+  }
 
-class Selecter {
-  /**
-   * Constructor
-   * @param  {Object} options - Component options
-   * @return {Object} Class instance
-   */
   constructor (options) {
-    this.options = Object.assign({}, defaults, options || {})
-    Object.assign(this, emitter, attach, dataset)
+    super()
 
+    this.init(options)
     this.build()
     this.setup()
     this.attach()
+  }
 
-    return this
+  init (options) {
+    this.options = Object.assign({}, Selecter.defaults, options || {})
+    Object.assign(this, attach, dataset)
   }
 
   setup () {
@@ -75,17 +73,18 @@ class Selecter {
       this.element.classList.add(this.options.case + '-case')
     }
   }
+
   /**
    * build method
    * @return {Object} The class instance
    */
   build () {
-    var tag = this.options.tag || 'span'
+    const tag = this.options.tag || 'span'
     this.element = document.createElement(tag)
     this.element.classList.add('selecter')
 
     if (this.options.class !== 'selecter') {
-      addClass(this.element, this.options.class)
+      css.add(this.element, this.options.class)
     }
 
     this.layout = new Layout(this.options.layout, this.element)
@@ -138,9 +137,9 @@ class Selecter {
 
     // console.log('list', list)
 
-    for (var i = 0; i < list.length; i++) {
+    for (let i = 0; i < list.length; i++) {
       // if (list.indexOf(list[i][0]) > -1) {
-      var item = document.createElement('div')
+      const item = document.createElement('div')
       item.classList.add('item')
       item.innerHTML = list[i][1]
       item.dataset.value = list[i][0]
@@ -169,6 +168,7 @@ class Selecter {
       this.element.classList.add('bold')
     }
   }
+
   showList () {
     // console.log('showList')
 

package/src/selector.js

@@ -121,8 +121,8 @@ class Selector {
   update (target) {
     target = target || this.target
     if (!target) return
-    var coords = target.getBoundingClientRect()
-    var pcoords = this.element.parentNode.getBoundingClientRect()
+    const coords = target.getBoundingClientRect()
+    const pcoords = this.element.parentNode.getBoundingClientRect()
 
     this.element.style.top = coords.top - pcoords.top + 'px'
     this.element.style.left = coords.left - pcoords.left + 'px'
@@ -158,7 +158,7 @@ class Selector {
     const offsetY = this.element.getBoundingClientRect().y
     const element = document.body
 
-    var ratio = parseInt(this.element.style.width, 10) / parseInt(this.element.style.height, 10)
+    const ratio = parseInt(this.element.style.width, 10) / parseInt(this.element.style.height, 10)
 
     this.border.setPointerCapture(ev.pointerId)
 

package/src/skin/material/component/navigation.sass

@@ -0,0 +1,9 @@
+.navigation
+  flex: none
+  display: flex
+  flex-direction: column
+  width: 12px
+  background-color: #3a3a3a
+  margin: 0
+  overflow: hidden
+  transition: 0.1s linear width

package/src/skin/material/control/button.sass

@@ -123,3 +123,13 @@
     background-color: rgba(0, 0, 0, .1)
     &:focus
       background-color: rgba(0, 0, 0, .1)
+
+.ripple
+  opacity: 1
+  pointer-events: none
+  z-index: 1
+  position: absolute
+  background-color: rgba(255, 255, 255, 0.1)
+  height: 5px
+  width: 5px
+  border-radius: 50%

package/src/slider.js

@@ -1,5 +1,3 @@
-'use strict'
-
 import init from './mixin/init'
 import build from './element/build'
 import control from './mixin/control'
@@ -10,7 +8,7 @@ import offset from './element/offset'
 import classify from './module/classify'
 // import control from './control';
 import attach from './module/attach'
-import css from './module/css'
+import * as css from './module/css'
 import emitter from './module/emitter'
 
 import icon from './skin/material/icon/pin.svg'