Skip to content

Commit 0ec723c

Browse files
authored
Merge pull request #1262 from linc-technologies/feature/path-to-ember-v4
refactor: migrates to `htmlSafe` from `@ember/template`.
2 parents 3172ef7 + 12775cb commit 0ec723c

File tree

14 files changed

+14
-14
lines changed

14 files changed

+14
-14
lines changed

addon/components/paper-icon.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import Component from '@ember/component';
77
import { computed } from '@ember/object';
88
import { reads } from '@ember/object/computed';
9-
import { htmlSafe } from '@ember/string';
9+
import { htmlSafe } from '@ember/template';
1010

1111
import ColorMixin from 'ember-paper/mixins/color-mixin';
1212

addon/components/paper-ink-bar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable ember/no-classic-components, ember/require-tagless-components, prettier/prettier */
22
import { computed } from '@ember/object';
33
import Component from '@ember/component';
4-
import { htmlSafe } from '@ember/string';
4+
import { htmlSafe } from '@ember/template';
55

66
export default Component.extend({
77
tagName: 'md-ink-bar',

addon/components/paper-progress-circular.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { equal } from '@ember/object/computed';
88
import Component from '@ember/component';
99
import { computed } from '@ember/object';
1010
import { isPresent } from '@ember/utils';
11-
import { htmlSafe } from '@ember/string';
11+
import { htmlSafe } from '@ember/template';
1212
import ColorMixin from 'ember-paper/mixins/color-mixin';
1313
import clamp from 'ember-paper/utils/clamp';
1414

addon/components/paper-progress-linear.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { inject as service } from '@ember/service';
77
import { computed } from '@ember/object';
88
import Component from '@ember/component';
99
import { isPresent } from '@ember/utils';
10-
import { htmlSafe } from '@ember/string';
10+
import { htmlSafe } from '@ember/template';
1111
import ColorMixin from 'ember-paper/mixins/color-mixin';
1212

1313
function makeTransform(value) {

addon/components/paper-sidenav-container.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
import Component from '@ember/component';
66

7-
import { htmlSafe } from '@ember/string';
7+
import { htmlSafe } from '@ember/template';
88

99
/**
1010
* @class PaperSidenavContainer

addon/components/paper-slider/component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import Component from '@ember/component';
66
import { computed, action } from '@ember/object';
77
import { bind } from '@ember/runloop';
8-
import { htmlSafe } from '@ember/string';
8+
import { htmlSafe } from '@ember/template';
99
import template from './template';
1010
import clamp from 'ember-paper/utils/clamp';
1111
import { tagName, layout } from '@ember-decorators/component';

addon/components/paper-speed-dial-actions-action.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable ember/no-classic-components, ember/no-component-lifecycle-hooks, ember/no-get, ember/require-tagless-components, prettier/prettier */
22
import Component from '@ember/component';
33
import { computed } from '@ember/object';
4-
import { htmlSafe } from '@ember/string';
4+
import { htmlSafe } from '@ember/template';
55

66
function getElementIndex(node) {
77
let index = 0;

addon/components/paper-switch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import Component from '@ember/component';
88
import { assert } from '@ember/debug';
99
import { get, computed } from '@ember/object';
1010
import { bind } from '@ember/runloop';
11-
import { htmlSafe } from '@ember/string';
11+
import { htmlSafe } from '@ember/template';
1212
import FocusableMixin from 'ember-paper/mixins/focusable-mixin';
1313
import ColorMixin from 'ember-paper/mixins/color-mixin';
1414
import ProxiableMixin from 'ember-paper/mixins/proxiable-mixin';

addon/components/paper-tab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88

99
import { computed } from '@ember/object';
1010
import Component from '@ember/component';
11-
import { htmlSafe } from '@ember/string';
11+
import { htmlSafe } from '@ember/template';
1212
import { ChildMixin } from 'ember-composability-tools';
1313
import FocusableMixin from 'ember-paper/mixins/focusable-mixin';
1414
import { invokeAction } from 'ember-paper/utils/invoke-action';

addon/components/paper-tabs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { action, computed } from '@ember/object';
88
import { inject as service } from '@ember/service';
99
import { gt } from '@ember/object/computed';
1010
import Component from '@ember/component';
11-
import { htmlSafe } from '@ember/string';
11+
import { htmlSafe } from '@ember/template';
1212
import { scheduleOnce, join } from '@ember/runloop';
1313
import { ParentMixin } from 'ember-composability-tools';
1414
import ColorMixin from 'ember-paper/mixins/color-mixin';

0 commit comments

Comments
 (0)