From f8c0163eb179fb9460d8a378ac1a6584b81e908c Mon Sep 17 00:00:00 2001
From: Austin Burdine <acburdine@gmail.com>
Date: Tue, 26 Apr 2016 16:32:17 -0500
Subject: [PATCH] deps: ember-invoke-action@1.3.0

no issue
- replace instances of `this.get('action')()` with ember-invoke-action syntax
---
 core/client/app/components/gh-editor.js             | 6 +++---
 core/client/app/components/gh-fullscreen-modal.js   | 7 +++++--
 core/client/app/components/gh-navitem-url-input.js  | 3 ++-
 core/client/app/components/gh-posts-list-item.js    | 3 ++-
 core/client/app/components/gh-tag-settings-form.js  | 3 ++-
 core/client/app/components/gh-tag.js                | 3 ++-
 core/client/app/components/modals/base.js           | 3 ++-
 core/client/app/components/modals/delete-tag.js     | 3 ++-
 core/client/app/components/modals/delete-user.js    | 3 ++-
 core/client/app/components/modals/leave-editor.js   | 3 ++-
 core/client/app/components/modals/transfer-owner.js | 3 ++-
 core/client/package.json                            | 1 +
 12 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/core/client/app/components/gh-editor.js b/core/client/app/components/gh-editor.js
index ef47f9e167..5b0fec6988 100644
--- a/core/client/app/components/gh-editor.js
+++ b/core/client/app/components/gh-editor.js
@@ -2,6 +2,7 @@ import Ember from 'ember';
 import ShortcutsMixin from 'ghost/mixins/shortcuts';
 import imageManager from 'ghost/utils/ed-image-manager';
 import editorShortcuts from 'ghost/utils/editor-shortcuts';
+import {invokeAction} from 'ember-invoke-action';
 
 const {Component, computed, run} = Ember;
 const {equal} = computed;
@@ -52,9 +53,8 @@ export default Component.extend(ShortcutsMixin, {
     },
 
     willDestroyElement() {
-        if (this.get('onTeardown')) {
-            this.get('onTeardown')();
-        }
+        invokeAction(this, 'onTeardown');
+
         this.removeShortcuts();
     },
 
diff --git a/core/client/app/components/gh-fullscreen-modal.js b/core/client/app/components/gh-fullscreen-modal.js
index 2f65580ec8..21740a1538 100644
--- a/core/client/app/components/gh-fullscreen-modal.js
+++ b/core/client/app/components/gh-fullscreen-modal.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import LiquidTether from 'liquid-tether/components/liquid-tether';
+import {invokeAction} from 'ember-invoke-action';
 
 const {
     RSVP: {Promise},
@@ -50,8 +51,10 @@ const FullScreenModalComponent = LiquidTether.extend({
 
     actions: {
         close() {
+            // Because we return the promise from invokeAction, we have
+            // to check if "close" exists first
             if (this.get('close')) {
-                return this.get('close')();
+                return invokeAction(this, 'close');
             }
 
             return new Promise((resolve) => {
@@ -61,7 +64,7 @@ const FullScreenModalComponent = LiquidTether.extend({
 
         confirm() {
             if (this.get('confirm')) {
-                return this.get('confirm')();
+                return invokeAction(this, 'confirm');
             }
 
             return new Promise((resolve) => {
diff --git a/core/client/app/components/gh-navitem-url-input.js b/core/client/app/components/gh-navitem-url-input.js
index 1e1cb47ecf..df1928c6e0 100644
--- a/core/client/app/components/gh-navitem-url-input.js
+++ b/core/client/app/components/gh-navitem-url-input.js
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import {invokeAction} from 'ember-invoke-action';
 
 const {TextField, computed, run} = Ember;
 
@@ -67,7 +68,7 @@ export default TextField.extend({
     },
 
     keyPress(event) {
-        this.get('clearErrors')();
+        invokeAction(this, 'clearErrors');
 
         // enter key
         if (event.keyCode === 13) {
diff --git a/core/client/app/components/gh-posts-list-item.js b/core/client/app/components/gh-posts-list-item.js
index f613a6454d..51c92c81c0 100644
--- a/core/client/app/components/gh-posts-list-item.js
+++ b/core/client/app/components/gh-posts-list-item.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import ActiveLinkWrapper from 'ghost/mixins/active-link-wrapper';
+import {invokeAction} from 'ember-invoke-action';
 
 const {
     $,
@@ -51,7 +52,7 @@ export default Component.extend(ActiveLinkWrapper, {
         this._super(...arguments);
         this.removeObserver('active', this, this.scrollIntoView);
         if (this.get('post.isDeleted') && this.get('onDelete')) {
-            this.get('onDelete')();
+            invokeAction(this, 'onDelete');
         }
     },
 
diff --git a/core/client/app/components/gh-tag-settings-form.js b/core/client/app/components/gh-tag-settings-form.js
index cf9c1868ae..c768a6b71d 100644
--- a/core/client/app/components/gh-tag-settings-form.js
+++ b/core/client/app/components/gh-tag-settings-form.js
@@ -1,6 +1,7 @@
 /* global key */
 import Ember from 'ember';
 import boundOneWay from 'ghost/utils/bound-one-way';
+import {invokeAction} from 'ember-invoke-action';
 
 const {
     Component,
@@ -128,7 +129,7 @@ export default Component.extend({
         },
 
         deleteTag() {
-            this.get('showDeleteTagModal')();
+            invokeAction(this, 'showDeleteTagModal');
         }
     }
 
diff --git a/core/client/app/components/gh-tag.js b/core/client/app/components/gh-tag.js
index 84b50d8a46..f4692ac4a6 100644
--- a/core/client/app/components/gh-tag.js
+++ b/core/client/app/components/gh-tag.js
@@ -1,11 +1,12 @@
 import Ember from 'ember';
+import {invokeAction} from 'ember-invoke-action';
 
 export default Ember.Component.extend({
     willDestroyElement() {
         this._super(...arguments);
 
         if (this.get('tag.isDeleted') && this.get('onDelete')) {
-            this.get('onDelete')();
+            invokeAction(this, 'onDelete');
         }
     }
 });
diff --git a/core/client/app/components/modals/base.js b/core/client/app/components/modals/base.js
index 043c615352..b77cdace4c 100644
--- a/core/client/app/components/modals/base.js
+++ b/core/client/app/components/modals/base.js
@@ -1,5 +1,6 @@
 /* global key */
 import Ember from 'ember';
+import {invokeAction} from 'ember-invoke-action';
 
 const {Component, run} = Ember;
 
@@ -49,7 +50,7 @@ export default Component.extend({
         },
 
         closeModal() {
-            this.get('closeModal')();
+            invokeAction(this, 'closeModal');
         }
     }
 });
diff --git a/core/client/app/components/modals/delete-tag.js b/core/client/app/components/modals/delete-tag.js
index 921da5bc8d..3e36d72edc 100644
--- a/core/client/app/components/modals/delete-tag.js
+++ b/core/client/app/components/modals/delete-tag.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import ModalComponent from 'ghost/components/modals/base';
+import {invokeAction} from 'ember-invoke-action';
 
 const {computed} = Ember;
 const {alias} = computed;
@@ -18,7 +19,7 @@ export default ModalComponent.extend({
         confirm() {
             this.set('submitting', true);
 
-            this.get('confirm')().finally(() => {
+            invokeAction(this, 'confirm').finally(() => {
                 this.send('closeModal');
             });
         }
diff --git a/core/client/app/components/modals/delete-user.js b/core/client/app/components/modals/delete-user.js
index 85dd65e1a6..801adac23d 100644
--- a/core/client/app/components/modals/delete-user.js
+++ b/core/client/app/components/modals/delete-user.js
@@ -1,4 +1,5 @@
 import ModalComponent from 'ghost/components/modals/base';
+import {invokeAction} from 'ember-invoke-action';
 
 export default ModalComponent.extend({
 
@@ -10,7 +11,7 @@ export default ModalComponent.extend({
         confirm() {
             this.set('submitting', true);
 
-            this.get('confirm')().finally(() => {
+            invokeAction(this, 'confirm').finally(() => {
                 this.send('closeModal');
             });
         }
diff --git a/core/client/app/components/modals/leave-editor.js b/core/client/app/components/modals/leave-editor.js
index a334a4e398..98dd690641 100644
--- a/core/client/app/components/modals/leave-editor.js
+++ b/core/client/app/components/modals/leave-editor.js
@@ -1,9 +1,10 @@
 import ModalComponent from 'ghost/components/modals/base';
+import {invokeAction} from 'ember-invoke-action';
 
 export default ModalComponent.extend({
     actions: {
         confirm() {
-            this.get('confirm')().finally(() => {
+            invokeAction(this, 'confirm').finally(() => {
                 this.send('closeModal');
             });
         }
diff --git a/core/client/app/components/modals/transfer-owner.js b/core/client/app/components/modals/transfer-owner.js
index d2adaff12a..8753c22f71 100644
--- a/core/client/app/components/modals/transfer-owner.js
+++ b/core/client/app/components/modals/transfer-owner.js
@@ -1,4 +1,5 @@
 import ModalComponent from 'ghost/components/modals/base';
+import {invokeAction} from 'ember-invoke-action';
 
 export default ModalComponent.extend({
     user: null,
@@ -8,7 +9,7 @@ export default ModalComponent.extend({
         confirm() {
             this.set('submitting', true);
 
-            this.get('confirm')().finally(() => {
+            invokeAction(this, 'confirm').finally(() => {
                 this.send('closeModal');
             });
         }
diff --git a/core/client/package.json b/core/client/package.json
index 57bdd28c22..114589c58c 100644
--- a/core/client/package.json
+++ b/core/client/package.json
@@ -41,6 +41,7 @@
     "ember-data": "2.5.2",
     "ember-data-filter": "1.13.0",
     "ember-export-application-global": "1.0.5",
+    "ember-invoke-action": "1.3.0",
     "ember-load-initializers": "0.5.1",
     "ember-myth": "0.1.1",
     "ember-one-way-controls": "0.6.2",