material 0.8.3 → 0.8.4

package/index.js

@@ -30,12 +30,12 @@ import Textfield from './src/textfield'
 import Toolbar from './src/toolbar'
 import Tooltip from './src/tooltip'
 import View from './src/view'
-import events from './src/module/events'
 import attributes from './src/module/attributes'
 import build from './src/module/build'
 import dataset from './src/module/dataset'
+import device from './src/module/device'
 import display from './src/mixin/display'
-import events from './src/module/attach'
+import events from './src/module/events'
 import emitter from './src/module/emitter'
 import jsonToHTML from './src/module/jsontohtml'
 import mediator from './src/module/mediator'
@@ -46,6 +46,6 @@ export {
   AppBar, Button, Card, Checkbox, Component, DateHour, Dialog, Drawer, Element,
   File, Form, Image, Layout, List, Loading, Menu, Navigation, Progress, Select,
   Selecter, Slider, Snackbar, Switch, Switcher, Tabs, TabView, Text, Textfield, Toolbar, Tooltip,
-  View, events, attributes, build, dataset, display, events, emitter, jsonToHTML, mediator,
+  View, attributes, build, dataset, device, display, events, emitter, jsonToHTML, mediator,
   observer, smoothscroll
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "material",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "A lightweight implementation of Material Design Components for the web - ES6",
   "main": "index.js",
   "type": "module",

package/src/module/device.js

@@ -4,7 +4,8 @@
 const previousDevice = window.device
 
 const device = {}
-
+const os = ['ios', 'iphone', 'ipad', 'ipod', 'android', 'blackberry', 'macos', 'windows', 'fxos', 'meego', 'television']
+const type = ['mobile', 'tablet', 'desktop']
 const changeOrientationList = []
 
 // Add device as a global object.
@@ -237,7 +238,7 @@ function removeClass (className) {
 }
 
 function cleanClasses () {
-  const classes = ['mobile', 'tablet', 'desktop', 'ios', 'iphone', 'ipad', 'ipod', 'android', 'blackberry', 'macos', 'windows', 'fxos', 'meego', 'television']
+  const classes = [...os, ...type]
   for (let i = 0; i < classes.length; i++) {
     removeClass(classes[i])
   }
@@ -362,20 +363,8 @@ function findMatch (arr) {
   return 'unknown'
 }
 
-device.type = findMatch(['mobile', 'tablet', 'desktop'])
-device.os = findMatch([
-  'ios',
-  'iphone',
-  'ipad',
-  'ipod',
-  'android',
-  'blackberry',
-  'macos',
-  'windows',
-  'fxos',
-  'meego',
-  'television'
-])
+device.type = findMatch(type)
+device.os = findMatch(os)
 
 function setOrientationCache () {
   device.orientation = findMatch(['portrait', 'landscape'])
@@ -388,9 +377,8 @@ device.onDeviceChange = null
 
 function updateDeviceDetection () {
   userAgent = window.navigator.userAgent.toLowerCase()
-  console.log('UA', userAgent)
-  device.type = findMatch(['mobile', 'tablet', 'desktop'])
-  device.os = findMatch(['ios', 'iphone', 'ipad', 'ipod', 'android', 'blackberry', 'macos', 'windows', 'fxos', 'meego', 'television'])
+  device.type = findMatch(type)
+  device.os = findMatch(os)
   setOrientationCache()
   applyClass()
   checkAndHandleDeviceChange()