From 79495602c04a87c680895467cfd01c1f1be87036 Mon Sep 17 00:00:00 2001
From: Ben Demboski <demboskb@gmail.com>
Date: Fri, 17 Jul 2020 11:22:49 -0700
Subject: [PATCH] Remove usage of getWithDefault()

Fixes #147
---
 addon/components/fa-icon.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/addon/components/fa-icon.js b/addon/components/fa-icon.js
index 66b12ba..e20bcc3 100644
--- a/addon/components/fa-icon.js
+++ b/addon/components/fa-icon.js
@@ -3,11 +3,19 @@ import Component from '@ember/component'
 import layout from '../templates/components/fa-icon'
 import { icon, parse, toHtml, config } from '@fortawesome/fontawesome-svg-core'
 import { htmlSafe } from '@ember/string'
-import { computed, getWithDefault } from '@ember/object'
+import { computed, get } from '@ember/object'
 import { assign } from '@ember/polyfills';
 import appConfig from 'ember-get-config';
 import { deprecate } from '@ember/debug';
 
+function getWithDefault (object, key, defaultValue) {
+  let value = get(object, key);
+  if (value === undefined) {
+    return defaultValue;
+  }
+  return value;
+}
+
 function getConfigOption (key, defaultValue) {
   return getWithDefault(appConfig, `fontawesome.${key}`, defaultValue);
 }
@@ -25,9 +33,9 @@ function classList () {
     'fa-li': this.get('listItem'),
     'fa-flip-horizontal': this.get('flip') === 'horizontal' || this.get('flip') === 'both',
     'fa-flip-vertical': this.get('flip') === 'vertical' || this.get('flip') === 'both',
-    [`fa-${this.get('size')}`]: this.getWithDefault('size', null) !== null,
-    [`fa-rotate-${this.get('rotation')}`]: this.getWithDefault('rotation', null) !== null,
-    [`fa-pull-${this.get('pull')}`]: this.getWithDefault('pull', null) !== null
+    [`fa-${this.get('size')}`]: getWithDefault(this, 'size', null) !== null,
+    [`fa-rotate-${this.get('rotation')}`]: getWithDefault(this, 'rotation', null) !== null,
+    [`fa-pull-${this.get('pull')}`]: getWithDefault(this, 'pull', null) !== null
   }
 
   return Object.keys(classes)
@@ -139,8 +147,8 @@ const IconComponent = Component.extend({
     const transformProp = this.get('transform')
     const transform = objectWithKey('transform', (typeof transformProp === 'string') ? parse.transform(transformProp) : transformProp)
     const mask = objectWithKey('mask', normalizeIconArgs(null, this.get('mask')))
-    const symbol = this.getWithDefault('symbol', false)
-    let title = this.getWithDefault('title', null)
+    const symbol = getWithDefault(this, 'symbol', false)
+    let title = getWithDefault(this, 'title', null)
     if (title) {
       title = `${title}`;
     }