From 3daa45deaf2484112f14d02c97abc1e7e1db067f Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 21 Apr 2022 21:56:08 +0200 Subject: [PATCH] FIX: replaces discourseComputed by computed (#16530) This was causing unexpected behaviors on production builds. And also on firefox on local environnement, however the issues was slightly different. - production chrome: colors don't load - dev firefox: colors don't change when selecting a different color set --- .../controllers/admin-customize-colors-show.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js index 160315a5289..4e207a62029 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js @@ -1,18 +1,19 @@ import Controller from "@ember/controller"; import I18n from "I18n"; import bootbox from "bootbox"; -import discourseComputed from "discourse-common/utils/decorators"; import { later } from "@ember/runloop"; -import { action } from "@ember/object"; +import { action, computed } from "@ember/object"; import { clipboardCopy } from "discourse/lib/utilities"; export default class AdminCustomizeColorsShowController extends Controller { - @discourseComputed("model.colors", "onlyOverridden") - colors(allColors, onlyOverridden) { - if (onlyOverridden) { - return allColors.filterBy("overridden"); + onlyOverridden = false; + + @computed("model.colors.[]", "onlyOverridden") + get colors() { + if (this.onlyOverridden) { + return this.model.colors?.filterBy("overridden"); } else { - return allColors; + return this.model.colors; } }