From 12775cb55cc7f57834409b3e18222f1e5705bfe9 Mon Sep 17 00:00:00 2001 From: Matthew Hartstonge Date: Tue, 10 Sep 2024 11:22:48 +1200 Subject: [PATCH] refactor: migrates to `htmlSafe` from `@ember/template`. --- addon/components/paper-icon.js | 2 +- addon/components/paper-ink-bar.js | 2 +- addon/components/paper-progress-circular.js | 2 +- addon/components/paper-progress-linear.js | 2 +- addon/components/paper-sidenav-container.js | 2 +- addon/components/paper-slider/component.js | 2 +- addon/components/paper-speed-dial-actions-action.js | 2 +- addon/components/paper-switch.js | 2 +- addon/components/paper-tab.js | 2 +- addon/components/paper-tabs.js | 2 +- addon/components/paper-tooltip.js | 2 +- addon/mixins/translate3d-mixin.js | 2 +- tests/dummy/app/components/paper-api.js | 2 +- tests/dummy/app/controllers/demo/slider.js | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addon/components/paper-icon.js b/addon/components/paper-icon.js index 0649da247..b6e67c9e6 100644 --- a/addon/components/paper-icon.js +++ b/addon/components/paper-icon.js @@ -6,7 +6,7 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; import { reads } from '@ember/object/computed'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import ColorMixin from 'ember-paper/mixins/color-mixin'; diff --git a/addon/components/paper-ink-bar.js b/addon/components/paper-ink-bar.js index f1e74756f..41819dadf 100644 --- a/addon/components/paper-ink-bar.js +++ b/addon/components/paper-ink-bar.js @@ -1,7 +1,7 @@ /* eslint-disable ember/no-classic-components, ember/require-tagless-components, prettier/prettier */ import { computed } from '@ember/object'; import Component from '@ember/component'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; export default Component.extend({ tagName: 'md-ink-bar', diff --git a/addon/components/paper-progress-circular.js b/addon/components/paper-progress-circular.js index 4578c2b9f..bc259ee80 100644 --- a/addon/components/paper-progress-circular.js +++ b/addon/components/paper-progress-circular.js @@ -8,7 +8,7 @@ import { equal } from '@ember/object/computed'; import Component from '@ember/component'; import { computed } from '@ember/object'; import { isPresent } from '@ember/utils'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import ColorMixin from 'ember-paper/mixins/color-mixin'; import clamp from 'ember-paper/utils/clamp'; diff --git a/addon/components/paper-progress-linear.js b/addon/components/paper-progress-linear.js index 655db843c..3c657e357 100644 --- a/addon/components/paper-progress-linear.js +++ b/addon/components/paper-progress-linear.js @@ -7,7 +7,7 @@ import { inject as service } from '@ember/service'; import { computed } from '@ember/object'; import Component from '@ember/component'; import { isPresent } from '@ember/utils'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import ColorMixin from 'ember-paper/mixins/color-mixin'; function makeTransform(value) { diff --git a/addon/components/paper-sidenav-container.js b/addon/components/paper-sidenav-container.js index da1f83811..c1ae4e8db 100644 --- a/addon/components/paper-sidenav-container.js +++ b/addon/components/paper-sidenav-container.js @@ -4,7 +4,7 @@ */ import Component from '@ember/component'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; /** * @class PaperSidenavContainer diff --git a/addon/components/paper-slider/component.js b/addon/components/paper-slider/component.js index 12f28d551..46d268895 100644 --- a/addon/components/paper-slider/component.js +++ b/addon/components/paper-slider/component.js @@ -5,7 +5,7 @@ import Component from '@ember/component'; import { computed, action } from '@ember/object'; import { bind } from '@ember/runloop'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import template from './template'; import clamp from 'ember-paper/utils/clamp'; import { tagName, layout } from '@ember-decorators/component'; diff --git a/addon/components/paper-speed-dial-actions-action.js b/addon/components/paper-speed-dial-actions-action.js index 52c4ed4b3..d33fc3df6 100644 --- a/addon/components/paper-speed-dial-actions-action.js +++ b/addon/components/paper-speed-dial-actions-action.js @@ -1,7 +1,7 @@ /* eslint-disable ember/no-classic-components, ember/no-component-lifecycle-hooks, ember/no-get, ember/require-tagless-components, prettier/prettier */ import Component from '@ember/component'; import { computed } from '@ember/object'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; function getElementIndex(node) { let index = 0; diff --git a/addon/components/paper-switch.js b/addon/components/paper-switch.js index 0226d831f..3eac2639b 100644 --- a/addon/components/paper-switch.js +++ b/addon/components/paper-switch.js @@ -8,7 +8,7 @@ import Component from '@ember/component'; import { assert } from '@ember/debug'; import { get, computed } from '@ember/object'; import { bind } from '@ember/runloop'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import FocusableMixin from 'ember-paper/mixins/focusable-mixin'; import ColorMixin from 'ember-paper/mixins/color-mixin'; import ProxiableMixin from 'ember-paper/mixins/proxiable-mixin'; diff --git a/addon/components/paper-tab.js b/addon/components/paper-tab.js index 4bc89b80a..a31c0cb49 100644 --- a/addon/components/paper-tab.js +++ b/addon/components/paper-tab.js @@ -8,7 +8,7 @@ import { import { computed } from '@ember/object'; import Component from '@ember/component'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import { ChildMixin } from 'ember-composability-tools'; import FocusableMixin from 'ember-paper/mixins/focusable-mixin'; import { invokeAction } from 'ember-paper/utils/invoke-action'; diff --git a/addon/components/paper-tabs.js b/addon/components/paper-tabs.js index f194f2341..9a5ba28e3 100644 --- a/addon/components/paper-tabs.js +++ b/addon/components/paper-tabs.js @@ -8,7 +8,7 @@ import { action, computed } from '@ember/object'; import { inject as service } from '@ember/service'; import { gt } from '@ember/object/computed'; import Component from '@ember/component'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import { scheduleOnce, join } from '@ember/runloop'; import { ParentMixin } from 'ember-composability-tools'; import ColorMixin from 'ember-paper/mixins/color-mixin'; diff --git a/addon/components/paper-tooltip.js b/addon/components/paper-tooltip.js index abcf6eff3..e741bd1d6 100644 --- a/addon/components/paper-tooltip.js +++ b/addon/components/paper-tooltip.js @@ -3,7 +3,7 @@ import { or } from '@ember/object/computed'; import Component from '@ember/component'; import { computed } from '@ember/object'; import { later } from '@ember/runloop'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import { getOwner } from '@ember/application'; import getParent from 'ember-paper/utils/get-parent'; import { supportsPassiveEventListeners } from 'ember-paper/utils/browser-features'; diff --git a/addon/mixins/translate3d-mixin.js b/addon/mixins/translate3d-mixin.js index 42150f443..6ce6124fe 100644 --- a/addon/mixins/translate3d-mixin.js +++ b/addon/mixins/translate3d-mixin.js @@ -3,7 +3,7 @@ * @module ember-paper */ import Mixin from '@ember/object/mixin'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; import { computed } from '@ember/object'; import { schedule, later } from '@ember/runloop'; import { nextTick, computeTimeout } from 'ember-css-transitions/utils/transition-utils'; diff --git a/tests/dummy/app/components/paper-api.js b/tests/dummy/app/components/paper-api.js index f21dddeb9..024cdf598 100644 --- a/tests/dummy/app/components/paper-api.js +++ b/tests/dummy/app/components/paper-api.js @@ -2,7 +2,7 @@ import Component from '@ember/component'; import { computed } from '@ember/object'; import { typeOf } from '@ember/utils'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; const escape = function(text) { // Convert backtick markup to element. diff --git a/tests/dummy/app/controllers/demo/slider.js b/tests/dummy/app/controllers/demo/slider.js index ed32c1899..a0d39e1f5 100644 --- a/tests/dummy/app/controllers/demo/slider.js +++ b/tests/dummy/app/controllers/demo/slider.js @@ -1,7 +1,7 @@ /* eslint-disable ember/no-get, prettier/prettier */ import Controller from '@ember/controller'; import { computed } from '@ember/object'; -import { htmlSafe } from '@ember/string'; +import { htmlSafe } from '@ember/template'; let color = { red: Math.floor(Math.random() * 255),