From b9fc6b4047c6e5dd4f0b3c9d718881b8e2f553b6 Mon Sep 17 00:00:00 2001 From: Sabin Hertanu Date: Tue, 23 Apr 2019 11:59:10 +0200 Subject: [PATCH] Fix computed property overridability deprecation warnings (#68) * Fix computed property overidability deprecation warnings * Update initials.js --- addon/mixins/initials.js | 24 +++++++++++++++------ package-lock.json | 45 +++++++++++++++++++++++++++++----------- 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/addon/mixins/initials.js b/addon/mixins/initials.js index ad8a006..ae93bbf 100644 --- a/addon/mixins/initials.js +++ b/addon/mixins/initials.js @@ -55,12 +55,24 @@ export default Mixin.create(Avatar, { this.notifyPropertyChange('src'); }), - backgroundColor: computed('colors.length', 'seedText', 'defaultName', 'defaultBackground', function () { - if (this.get('seedText') === this.get('defaultName')) { - return this.get('defaultBackground'); - } else { - let index = ColorIndex(this.get('seedText'), this.get('colors.length')); - return this.get('colors')[index]; + backgroundColor: computed('colors.length', 'seedText', 'defaultName', 'defaultBackground', { + get() { + if (this._backgroundColor) { + return this._backgroundColor; + } + + let { colors, seedText, defaultName, defaultBackground } = this; + + if (seedText === defaultName) { + return defaultBackground; + } else { + let index = ColorIndex(seedText, colors.length); + return colors[index]; + } + }, + + set(key, value) { + return this._backgroundColor = value; } }), diff --git a/package-lock.json b/package-lock.json index b4bd3b1..78e5d6c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -488,6 +488,7 @@ "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -7056,7 +7057,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -7077,12 +7079,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7097,17 +7101,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -7224,7 +7231,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -7236,6 +7244,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7250,6 +7259,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7257,12 +7267,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -7281,6 +7293,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -7361,7 +7374,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -7373,6 +7387,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -7458,7 +7473,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -7494,6 +7510,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7513,6 +7530,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7556,12 +7574,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -9697,7 +9717,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true + "dev": true, + "optional": true }, "loose-envify": { "version": "1.3.1",