Merge branch 'master' into deprecate-property-fallback-lookup-no-implicit-this

Author: Elliot Murphy

.eslintrc.js

@@ -1,7 +1,8 @@
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
-    ecmaVersion: 2017,
+    ecmaVersion: 2019,
     sourceType: 'module'
   },
   extends: 'eslint:recommended',

addon/components/ember-inline-edit.js

@@ -2,7 +2,6 @@ import Component from '@ember/component'
 import { set, computed } from '@ember/object'
 import { htmlSafe } from '@ember/string'
 import { run } from '@ember/runloop'
-import { tryInvoke } from '@ember/utils'
 
 import layout from '../templates/components/ember-inline-edit'
 
@@ -90,16 +89,15 @@ export default Component.extend({
 
   actions: {
     save() {
-      tryInvoke(this, 'onSave', [this.value])
-
+      this.onSave?.(this.value);
       run(this, () => {
         set(this, 'isEditing', false)
       })
     },
 
     startEditing(e) {
       e.stopPropagation()
-      tryInvoke(this, 'onEdit')
+      this.onEdit?.()
 
       run(this, () => {
         set(this, 'previousValue', this.value)
@@ -108,7 +106,7 @@ export default Component.extend({
     },
 
     cancel() {
-      tryInvoke(this, 'onCancel')
+      this.onCancel?.()
 
       run(this, () => {
         set(this, 'value', this.previousValue)

addon/components/ember-inline-editable.js

@@ -7,9 +7,8 @@ export default Component.extend({
   layout,
 
   classNames: ['ember-inline-editable'],
-  classNameBindings: [
-    'isVisible:is-visible:is-hidden',
-    'showEditButton:is-not-clickable'
-  ],
+  classNameBindings: ['showEditButton:is-not-clickable'],
+  shouldHide: false,
+  attributeBindings: ['shouldHide:hidden'],
   valueIsEmpty: computed.empty('value')
 })

addon/components/ember-inline-editor.js

@@ -15,7 +15,8 @@ const isInputField = el => {
 
 export default Component.extend({
   layout,
-  classNameBindings: ['isVisible:is-visible:is-hidden'],
+  shouldHide: false,
+  attributeBindings: ['shouldHide:hidden'],
 
   textFields: ['search', 'url', 'text', 'phone', 'email', 'number'],
   textAreaFields: ['textarea'],

addon/helpers/in-arr.js

@@ -1,15 +1,17 @@
-import Ember from 'ember';
+import { helper } from '@ember/component/helper';
+import { isEmpty } from '@ember/utils';
+import { warn } from '@ember/debug';
 
 export function inArr(params/*, hash*/) {
   const haystack = params[0]
   const needle = params[1]
 
-  if (Ember.isEmpty(haystack) || Ember.isEmpty(needle)) {
-    Ember.warn('in-arr params cannot be empty')
+  if (isEmpty(haystack) || isEmpty(needle)) {
+    warn('in-arr params cannot be empty', 'ember-debug.empty-in-arr-params')
     return
   }
 
   return haystack.indexOf(needle) > -1;
 }
 
-export default Ember.Helper.helper(inArr);
+export default helper(inArr);

addon/templates/components/ember-inline-edit.hbs

@@ -1,7 +1,7 @@
-{{#if hasBlockParams}}
+{{#if (has-block-params)}}
   {{yield (hash
       editor=(component 'ember-inline-editor'
-        isVisible=this.isEditing
+        shouldHide=this.isNotEditing
         value=(readonly this.value)
         field=this.field
         fieldWidth=this.fieldWidth
@@ -20,7 +20,7 @@
         )
 
       editable=(component 'ember-inline-editable'
-        isVisible=this.isNotEditing
+        shouldHide=this.isEditing
         value=(readonly this.value)
         placeholder=this.placeholder
         showEditButton=this.showEditButton
@@ -34,7 +34,6 @@
 {{else}}
   {{#if this.isEditing}}
     {{ember-inline-editor
-      isVisible=this.isEditing
       value=(readonly this.value)
       field=this.field
       fieldWidth=this.fieldWidth
@@ -53,7 +52,6 @@
     }}
   {{else}}
     {{ember-inline-editable
-      isVisible=this.isNotEditing
       value=(readonly this.value)
       placeholder=this.placeholder
       editLabel=this.editLabel

addon/templates/components/ember-inline-editable.hbs

@@ -1,4 +1,4 @@
-{{#if hasBlock}}
+{{#if (has-block)}}
   {{yield}}
 {{else}}
   {{#if this.valueIsEmpty}}

addon/templates/components/ember-inline-editor.hbs

@@ -1,4 +1,4 @@
-{{#if hasBlock}}
+{{#if (has-block)}}
   {{yield}}
 {{else}}
   {{#if (in-arr this.textFields this.field)}}

package.json

@@ -24,17 +24,17 @@
     "test:all": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^6.6.0",
-    "ember-cli-htmlbars": "^2.0.1"
+    "ember-cli-babel": "^7.26.6",
+    "ember-cli-htmlbars": "^5.7.1"
   },
   "devDependencies": {
+    "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^2.7.0",
     "ember-ajax": "^3.0.0",
-    "ember-cli": "~3.3.0",
+    "ember-cli": "~3.27.0",
     "ember-cli-dependency-checker": "^2.0.0",
-    "ember-cli-eslint": "^4.2.1",
+    "ember-cli-eslint": "^5.1.0",
     "ember-cli-github-pages": "^0.2.0",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.3.2",
     "ember-cli-shims": "^1.2.0",
@@ -51,8 +51,8 @@
     "ember-source-channel-url": "^1.0.1",
     "ember-try": "^0.2.23",
     "ember-welcome-page": "^3.0.0",
-    "eslint-plugin-ember": "^5.0.0",
-    "eslint-plugin-node": "^6.0.1",
+    "eslint-plugin-ember": "^10.5.3",
+    "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.2.3",
     "qunit-dom": "^0.6.2"
   },

tests/integration/components/ember-inline-edit-test.js

@@ -386,22 +386,22 @@ module('Integration | Component | ember inline edit', function(hooks) {
                     {{/ember-inline-edit}}`)
 
     assert.ok(
-      find('.editor').classList.contains('is-hidden'),
+      find('.editor').hasAttribute('hidden'),
       'editor is hidden by default'
     )
     assert.ok(
-      find('.editable').classList.contains('is-visible'),
+      !find('.editable').hasAttribute('hidden'),
       'editable is visible by default'
     )
 
     await click('.editor')
 
     assert.ok(
-      find('.editor').classList.contains('is-visible'),
+      !find('.editor').hasAttribute('hidden'),
       'editor is visible after click'
     )
     assert.ok(
-      find('.editable').classList.contains('is-hidden'),
+      find('.editable').hasAttribute('hidden'),
       'editable is hidden after click'
     )
   })