Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: migrates to htmlSafe from @ember/template. #1262

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addon/components/paper-icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-ink-bar.js
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-progress-circular.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-progress-linear.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-sidenav-container.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
import Component from '@ember/component';

import { htmlSafe } from '@ember/string';
import { htmlSafe } from '@ember/template';

/**
* @class PaperSidenavContainer
Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-slider/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-speed-dial-actions-action.js
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-switch.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion addon/components/paper-tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion addon/mixins/translate3d-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/components/paper-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 <code> element.
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/controllers/demo/slider.js
Original file line number Diff line number Diff line change
@@ -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),
Expand Down
Loading