Merge branch 'master' into master

.editorconfig

@@ -13,22 +13,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
 [*.hbs]
 insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
 
 [*.{diff,md}]
 trim_trailing_whitespace = false

.eslintrc.js

@@ -0,0 +1,61 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 2017,
+    sourceType: 'module'
+  },
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
+  env: {
+    browser: true
+  },
+  rules: {
+    "ember/use-brace-expansion": 1,
+    "ember/no-on-calls-in-components": 1,
+    "ember/avoid-leaking-state-in-ember-objects": 1,
+    "ember/closure-actions": 1,
+    "ember/no-global-jquery": 1
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'index.js',
+        'testem.js',
+        'ember-cli-build.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js'
+      ],
+      excludedFiles: [
+        'app/**',
+        'addon/**'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+      })
+    },
+
+    // test files
+    {
+      files: ['tests/**/*.js'],
+      excludedFiles: ['tests/dummy/**/*.js'],
+      env: {
+        embertest: true
+      }
+    }
+  ]
+};

.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -13,7 +13,11 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
+yarn-error.log
 testem.log
-*.sublime-workspace
-lcov.dat
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.npmignore

@@ -7,10 +7,15 @@
 .bowerrc
 .editorconfig
 .ember-cli
+.eslintrc.js
 .gitignore
-.jshintrc
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
 testem.js
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.prettierrc

@@ -0,0 +1,9 @@
+{
+  "singleQuote": true,
+  "bracketSpacing": true,
+  "trailingComma": "none",
+  "useTabs": false,
+  "tabWidth": 2,
+  "printWidth": 120,
+  "semi": true
+}

.travis.yml

@@ -1,53 +1,43 @@
-
----
 language: node_js
 node_js:
-  - "stable"
-
+- '4'
+sudo: false
 dist: trusty
-sudo: required
-
 addons:
-  apt:
-    sources:
-    - google-chrome
-    packages:
-    - google-chrome-stable
-
+  chrome: stable
 cache:
   directories:
-    - node_modules
-
+  - "$HOME/.npm"
 env:
-- EMBER_TRY_SCENARIO=ember-1.13
-- EMBER_TRY_SCENARIO=ember-2.4
-- EMBER_TRY_SCENARIO=ember-2.6
-- EMBER_TRY_SCENARIO=ember-release
-- ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-beta
-- ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary
-
+  global:
+  - JOBS=1
+  matrix:
+  - EMBER_TRY_SCENARIO=ember-1.13
+  - EMBER_TRY_SCENARIO=ember-lts-2.12
+  - EMBER_TRY_SCENARIO=ember-lts-2.16
+  - EMBER_TRY_SCENARIO=ember-release
+  - EMBER_TRY_SCENARIO=ember-beta
+  - EMBER_TRY_SCENARIO=ember-canary
 matrix:
   fast_finish: true
   allow_failures:
-    - env: ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-beta
-    - env: ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary
-
+  - env: EMBER_TRY_SCENARIO=ember-canary
 before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - "npm config set spin false"
-  - "npm install -g npm@^3"
-
+- npm config set spin false
+- npm install -g npm@4
+- npm install -g bower
+- npm --version
 install:
-  - npm install
-  - bower install
-
+- npm install
+- bower install
 script:
-- if [ "${EMBER_TRY_SCENARIO}" = "ember-release" ]; then ember try:one $EMBER_TRY_SCENARIO test; else ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup; fi
+- npm run lint:js
+- if [ "${EMBER_TRY_SCENARIO}" = "ember-release" ]; then ember try:one $EMBER_TRY_SCENARIO;
+  else ember try:one $EMBER_TRY_SCENARIO --skip-cleanup; fi
 deploy:
   provider: heroku
   api_key:
-    secure: JyCVhFlH+gDBkHoIivvBVNNIVuJSZT5jeFDHCBAhCMh2OsHCK99hlGtLJRjG6fPWwJ81jorUb14RDA5jxU/2VPeFvefelDqarkG3lWNUUnVtiFk2mDBuhYHW03P11btoixcg2NTr7cgNjARWEt4UbaZ1a0QkdzsmzhIbSjShrRk=
+    secure: OeFMyi6ylYfPeNd/25cLaueVuVKbqtEHvis/J9GDiWIa7xpVD/NBS+TGxMTMaaA02Mft3Vw+MkZsPSWPU53ws1rQFAwAf98Pqx197dXoQ97Fi3wY0bipm9ZFl+bQYJg58Ydkz0sjQQbIxxtq9jn/gOtVTy5b+hQduSWjx3i15HE=
   app: ember-materialize-demo
   on:
     repo: mike-north/ember-cli-materialize

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "javascript.implicitProjectConfig.checkJs": true,
+  "editor.formatOnSave": false
+}

README.md

@@ -1,5 +1,7 @@
 # ember-cli-materialize
 
+[![Greenkeeper badge](https://badges.greenkeeper.io/mike-north/ember-cli-materialize.svg)](https://greenkeeper.io/)
+
 [![Build Status](https://travis-ci.org/mike-north/ember-cli-materialize.svg?branch=master)](https://travis-ci.org/mike-north/ember-cli-materialize)
 [![npm version](https://badge.fury.io/js/ember-cli-materialize.svg)](http://badge.fury.io/js/ember-cli-materialize)
 [![Code Climate](https://codeclimate.com/github/mike-north/ember-cli-materialize/badges/gpa.svg)](https://codeclimate.com/github/mike-north/ember-cli-materialize)

addon/components/-md-fixed-btn-base.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { computed, Component } = Ember;
+import { computed } from '@ember/object';
+import Component from '@ember/component';
 
 export default Component.extend({
   actionArgs: null,
@@ -18,6 +17,6 @@ export default Component.extend({
   },
 
   _btnClassString: computed('btnClass', function() {
-    return `${this.get('btnClass')} btn-floating ${this.get('large') ? 'btn-large' : '' }`;
+    return `${this.get('btnClass')} btn-floating ${this.get('large') ? 'btn-large' : ''}`;
   })
 });

addon/components/md-badge.js

@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from '../templates/components/md-badge';
 
-const { Component } = Ember;
-
 export default Component.extend({
   layout,
   tagName: 'span',

addon/components/md-btn-dropdown.js

@@ -1,9 +1,7 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
 import layout from '../templates/components/md-btn-dropdown';
 import MaterializeButton from './md-btn';
 
-const { computed } = Ember;
-
 export default MaterializeButton.extend({
   layout,
   tagName: 'a',
@@ -12,7 +10,13 @@ export default MaterializeButton.extend({
   iconBody: '',
   iconPosition: 'right',
   attributeBindings: [
-    'inDuration:data-induration', 'outDuration:data-outduration', 'constrainWidth:data-constrainwidth', '_hoverVal:data-hover', 'gutter:data-gutter', 'belowOrigin:data-beloworigin', 'alignment'
+    'inDuration:data-induration',
+    'outDuration:data-outduration',
+    'constrainWidth:data-constrainwidth',
+    '_hoverVal:data-hover',
+    'gutter:data-gutter',
+    'belowOrigin:data-beloworigin',
+    'alignment'
   ],
 
   didRender() {

addon/components/md-btn.js

@@ -1,9 +1,11 @@
-import Ember from 'ember';
+import { equal } from '@ember/object/computed';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { typeOf } from '@ember/utils';
+import { scheduleOnce } from '@ember/runloop';
 import UsesSettings from '../mixins/uses-settings';
 import layout from '../templates/components/md-btn';
 
-const { Component, computed, typeOf, run: { scheduleOnce } } = Ember;
-
 export default Component.extend(UsesSettings, {
   layout,
   tagName: 'a',
@@ -15,7 +17,7 @@ export default Component.extend(UsesSettings, {
   iconPosition: null,
   buttonType: null,
   actionArg: null,
-  isFlat: computed.equal('buttonType', 'flat'),
+  isFlat: equal('buttonType', 'flat'),
   isDisabled: false,
 
   init() {
@@ -43,7 +45,7 @@ export default Component.extend(UsesSettings, {
   },
 
   click() {
-    if (!this.get('disabled')) {
+    if (!this.get('isDisabled')) {
       this.sendAction('action', this.get('actionArg'));
     }
   }

addon/components/md-card-action.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Component } = Ember;
+import Component from '@ember/component';
 
 export default Component.extend({
   classNames: ['card-action']

addon/components/md-card-collapsible.js

@@ -1,8 +1,7 @@
-import Ember from 'ember';
+import { computed } from '@ember/object';
+import Component from '@ember/component';
 import layout from '../templates/components/md-card-collapsible';
 
-const { computed, Component } = Ember;
-
 export default Component.extend({
   layout,
   tagName: 'ul',

addon/components/md-card-content.js

@@ -1,8 +1,8 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+import { computed } from '@ember/object';
+import { alias } from '@ember/object/computed';
 import layout from '../templates/components/md-card-content';
 
-const { Component, computed } = Ember;
-
 export default Component.extend({
   layout,
 
@@ -26,4 +26,3 @@ export default Component.extend({
     return this.get('titleClass') || 'black-text';
   })
 });
-

addon/components/md-card-panel.js

@@ -1,12 +1,9 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from '../templates/components/md-card-panel';
 
-const { Component } = Ember;
-
 export default Component.extend({
   layout,
 
   classNames: ['card-panel'],
   classNameBindings: ['class']
 });
-

addon/components/md-card-reveal.js

@@ -1,8 +1,7 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+import { alias } from '@ember/object/computed';
 import layout from '../templates/components/md-card-reveal';
 
-const { Component, computed: { alias } } = Ember;
-
 export default Component.extend({
   layout,
   tagName: 'div',

addon/components/md-card.js

@@ -1,8 +1,6 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import layout from '../templates/components/md-card';
 
-const { Component } = Ember;
-
 export default Component.extend({
   layout,
   classNames: ['card'],

addon/components/md-check.js

@@ -1,9 +1,7 @@
-import Ember from 'ember';
+import { alias } from '@ember/object/computed';
 import SelectableItem from './selectable-item';
 import layout from '../templates/components/md-checkbox';
 
-const { computed: { alias } } = Ember;
-
 export default SelectableItem.extend({
   layout,
   text: alias('name'),

addon/components/md-checks-check.js

@@ -1,4 +1,4 @@
 import CheckboxComponent from './md-check';
 import GroupSelectableItemMixin from '../mixins/group-selectable-item';
 
-export default CheckboxComponent.extend(GroupSelectableItemMixin, { });
+export default CheckboxComponent.extend(GroupSelectableItemMixin, {});