diff --git a/addon/components/paper-dialog-inner.js b/addon/components/paper-dialog-inner.js index b328f428a..42be88241 100644 --- a/addon/components/paper-dialog-inner.js +++ b/addon/components/paper-dialog-inner.js @@ -4,7 +4,7 @@ */ import Component from '@ember/component'; -import { run } from '@ember/runloop'; +import { bind } from '@ember/runloop'; import Translate3dMixin from '../mixins/translate3d-mixin'; /** @@ -42,7 +42,7 @@ export default Component.extend(Translate3dMixin, { this.checkContentOverflow(); // content overflow might change depending on load of images inside dialog. let imageElements = this.element.querySelectorAll('img'); - this._checkContentOverflowOnLoad = run.bind(this, this.checkContentOverflow); + this._checkContentOverflowOnLoad = bind(this, this.checkContentOverflow); imageElements.forEach((image) => { image.addEventListener('load', this._checkContentOverflowOnLoad); }); diff --git a/addon/components/paper-grid-list.js b/addon/components/paper-grid-list.js index 690e41200..0da1f6f39 100644 --- a/addon/components/paper-grid-list.js +++ b/addon/components/paper-grid-list.js @@ -1,4 +1,4 @@ -/* eslint-disable ember/no-computed-properties-in-native-classes, ember/classic-decorator-no-classic-methods, ember/no-classic-components, ember/require-tagless-components, ember/no-component-lifecycle-hooks, ember/no-get */ +/* eslint-disable ember/no-computed-properties-in-native-classes, ember/classic-decorator-no-classic-methods, ember/no-classic-components, ember/no-component-lifecycle-hooks, ember/no-get */ /** * @module ember-paper */ @@ -7,7 +7,7 @@ import { inject as service } from '@ember/service'; import { tagName, layout } from '@ember-decorators/component'; import Component from '@ember/component'; import { computed } from '@ember/object'; -import { run } from '@ember/runloop'; +import { bind, debounce } from '@ember/runloop'; import template from '../templates/components/paper-grid-list'; import { ParentMixin } from 'ember-composability-tools'; import gridLayout from '../utils/grid-layout'; @@ -56,7 +56,7 @@ export default class PaperGridList extends Component.extend(ParentMixin) { super.didUpdate(...arguments); // Debounces until the next run loop - run.debounce(this, this.updateGrid, 0); + debounce(this, this.updateGrid, 0); } willDestroyElement() { @@ -75,7 +75,7 @@ export default class PaperGridList extends Component.extend(ParentMixin) { this.set(`${listenerName}List`, mediaList); // Creates a function based on mediaName so that removeListener can remove it. - this.set(listenerName, run.bind(this, (result) => { + this.set(listenerName, bind(this, (result) => { this._mediaDidChange(mediaName, result.matches); })); @@ -98,7 +98,7 @@ export default class PaperGridList extends Component.extend(ParentMixin) { this.set(mediaName, matches); // Debounces until the next run loop - run.debounce(this, this._updateCurrentMedia, 0); + debounce(this, this._updateCurrentMedia, 0); } _updateCurrentMedia() { diff --git a/addon/components/paper-grid-tile.js b/addon/components/paper-grid-tile.js index 9d333ba99..249fcd5e1 100644 --- a/addon/components/paper-grid-tile.js +++ b/addon/components/paper-grid-tile.js @@ -4,7 +4,7 @@ import { computed } from '@ember/object'; import { alias } from '@ember/object/computed'; import Component from '@ember/component'; -import { run } from '@ember/runloop'; +import { debounce } from '@ember/runloop'; import layout from '../templates/components/paper-grid-tile'; import { ChildMixin } from 'ember-composability-tools'; import { invokeAction } from 'ember-paper/utils/invoke-action'; @@ -42,7 +42,7 @@ export default class PaperGridTile extends Component.extend(ChildMixin) { let gridList = this.gridList; // Debounces until the next run loop - run.debounce(gridList, gridList.updateGrid, 0); + debounce(gridList, gridList.updateGrid, 0); } updateTile() { diff --git a/addon/components/paper-input.js b/addon/components/paper-input.js index 3f2586fa7..cd328c4fc 100644 --- a/addon/components/paper-input.js +++ b/addon/components/paper-input.js @@ -7,7 +7,7 @@ import { or, bool, and } from '@ember/object/computed'; import Component from '@ember/component'; import { computed, set } from '@ember/object'; import { isEmpty } from '@ember/utils'; -import { run } from '@ember/runloop'; +import { bind, next } from '@ember/runloop'; import { assert } from '@ember/debug'; import layout from '../templates/components/paper-input'; import FocusableMixin from 'ember-paper/mixins/focusable-mixin'; @@ -102,7 +102,7 @@ export default Component.extend(FocusableMixin, ColorMixin, ChildMixin, Validati didInsertElement() { this._super(...arguments); if (this.textarea) { - this._growTextareaOnResize = run.bind(this, this.growTextarea); + this._growTextareaOnResize = bind(this, this.growTextarea); window.addEventListener('resize', this._growTextareaOnResize); } }, @@ -184,7 +184,7 @@ export default Component.extend(FocusableMixin, ColorMixin, ChildMixin, Validati handleInput(e) { invokeAction(this, 'onChange', e.target.value); // setValue below ensures that the input value is the same as this.value - run.next(() => { + next(() => { if (this.isDestroyed) { return; } diff --git a/addon/components/paper-sidenav-inner.js b/addon/components/paper-sidenav-inner.js index e083aae85..08a3bab23 100644 --- a/addon/components/paper-sidenav-inner.js +++ b/addon/components/paper-sidenav-inner.js @@ -7,7 +7,7 @@ import { inject as service } from '@ember/service'; import Component from '@ember/component'; import layout from '../templates/components/paper-sidenav-inner'; import { computed } from '@ember/object'; -import { run } from '@ember/runloop'; +import { bind } from '@ember/runloop'; import { invokeAction } from 'ember-paper/utils/invoke-action'; /** @@ -45,7 +45,7 @@ export default Component.extend({ didInsertElement() { this._super(...arguments); - this._updateOnResize = run.bind(this, this.updateLockedOpen); + this._updateOnResize = bind(this, this.updateLockedOpen); window.addEventListener('resize', this._updateOnResize); this.updateLockedOpen(); }, diff --git a/addon/components/paper-speed-dial.js b/addon/components/paper-speed-dial.js index 0a683b6cd..a36f75487 100644 --- a/addon/components/paper-speed-dial.js +++ b/addon/components/paper-speed-dial.js @@ -1,7 +1,7 @@ /* eslint-disable ember/no-classic-components, ember/require-tagless-components, ember/no-component-lifecycle-hooks */ import Component from '@ember/component'; import { computed } from '@ember/object'; -import { run } from '@ember/runloop'; +import { next } from '@ember/runloop'; import layout from '../templates/components/paper-speed-dial'; import { invokeAction } from 'ember-paper/utils/invoke-action'; @@ -55,7 +55,7 @@ export default Component.extend({ didRender() { this._super(...arguments); - run.next(() => { + next(() => { if (!this.isDestroyed && !this.isDestroying) { this.set('elementDidRender', true); } diff --git a/addon/components/paper-switch.js b/addon/components/paper-switch.js index e50125eb3..607fd132a 100644 --- a/addon/components/paper-switch.js +++ b/addon/components/paper-switch.js @@ -7,7 +7,7 @@ import { inject as service } from '@ember/service'; import Component from '@ember/component'; import { assert } from '@ember/debug'; import { get, computed } from '@ember/object'; -import { run } from '@ember/runloop'; +import { bind } from '@ember/runloop'; import { htmlSafe } from '@ember/string'; import layout from '../templates/components/paper-switch'; import FocusableMixin from 'ember-paper/mixins/focusable-mixin'; @@ -86,15 +86,15 @@ export default Component.extend(FocusableMixin, ColorMixin, ProxiableMixin, { // Enable dragging the switch container switchHammer.get('pan').set({ threshold: 1 }); - switchHammer.on('panstart', run.bind(this, this._dragStart)) - .on('panmove', run.bind(this, this._drag)) - .on('panend', run.bind(this, this._dragEnd)); + switchHammer.on('panstart', bind(this, this._dragStart)) + .on('panmove', bind(this, this._drag)) + .on('panend', bind(this, this._dragEnd)); // Enable tapping gesture on the switch this._switchHammer = new Hammer(this.element); - this._switchHammer.on('tap', run.bind(this, this._dragEnd)); + this._switchHammer.on('tap', bind(this, this._dragEnd)); - this._onClickHandleNativeClick = run.bind(this, this._handleNativeClick); + this._onClickHandleNativeClick = bind(this, this._handleNativeClick); this.element.querySelector('.md-container') .addEventListener('click', this._onClickHandleNativeClick); diff --git a/addon/components/paper-toast.js b/addon/components/paper-toast.js index 29cb8e5a9..4fb616ce6 100644 --- a/addon/components/paper-toast.js +++ b/addon/components/paper-toast.js @@ -7,7 +7,7 @@ import { inject as service } from '@ember/service'; import { or } from '@ember/object/computed'; import Component from '@ember/component'; import { computed } from '@ember/object'; -import { run } from '@ember/runloop'; +import { bind, later } from '@ember/runloop'; import { guidFor } from '@ember/object/internals'; import { getOwner } from '@ember/application'; import layout from '../templates/components/paper-toast'; @@ -98,12 +98,12 @@ export default Component.extend({ this._super(...arguments); if (this.duration !== false) { - run.later(this, '_destroyMessage', this.duration); + later(this, '_destroyMessage', this.duration); } if (this.escapeToClose) { // Adding Listener to body tag, FIXME - this._escapeToClose = run.bind(this, (e) => { + this._escapeToClose = bind(this, (e) => { if (e.keyCode === this.get('constants.KEYCODE.ESCAPE') && this.onClose) { this._destroyMessage(); } diff --git a/addon/components/paper-tooltip-inner.js b/addon/components/paper-tooltip-inner.js index e1857a038..05d6a9ac3 100644 --- a/addon/components/paper-tooltip-inner.js +++ b/addon/components/paper-tooltip-inner.js @@ -1,7 +1,7 @@ /* eslint-disable ember/no-classic-components */ import Component from '@ember/component'; import { computed } from '@ember/object'; -import { run } from '@ember/runloop'; +import { schedule } from '@ember/runloop'; import layout from '../templates/components/paper-tooltip-inner'; import { nextTick } from 'ember-css-transitions/utils/transition-utils'; import calculateTooltipPosition from 'ember-paper/utils/calculate-tooltip-position'; @@ -15,7 +15,7 @@ export default Component.extend({ }), setupTooltip(element, [position, anchorElement]) { - run.schedule('afterRender', () => { + schedule('afterRender', () => { let pos = calculateTooltipPosition(element, anchorElement, position); element.style.top = `${pos.top}px`; element.style.left = `${pos.left}px`; diff --git a/addon/components/paper-tooltip.js b/addon/components/paper-tooltip.js index 63404ab2d..be56768a4 100644 --- a/addon/components/paper-tooltip.js +++ b/addon/components/paper-tooltip.js @@ -2,7 +2,7 @@ import { or } from '@ember/object/computed'; import Component from '@ember/component'; import { computed } from '@ember/object'; -import { run } from '@ember/runloop'; +import { later } from '@ember/runloop'; import { htmlSafe } from '@ember/string'; import { getOwner } from '@ember/application'; import layout from '../templates/components/paper-tooltip'; @@ -72,7 +72,7 @@ export default Component.extend({ let leaveHandler = () => { if (!this.isDestroyed) { this.set('hideTooltip', true); - run.later(() => { + later(() => { if (!this.isDestroyed) { this.set('renderTooltip', false); } diff --git a/addon/mixins/proxiable-mixin.js b/addon/mixins/proxiable-mixin.js index fa71736ff..929070705 100644 --- a/addon/mixins/proxiable-mixin.js +++ b/addon/mixins/proxiable-mixin.js @@ -3,7 +3,7 @@ */ import Mixin from '@ember/object/mixin'; -import { run } from '@ember/runloop'; +import { next, later } from '@ember/runloop'; import { ChildMixin } from 'ember-composability-tools'; /** @@ -18,7 +18,7 @@ export default Mixin.create(ChildMixin, { shouldRegister: false, registerWithParent() { - run.next(this, this._super); + next(this, this._super); }, mouseDown() { @@ -26,7 +26,7 @@ export default Mixin.create(ChildMixin, { let parentComponent = this.parentComponent; if (parentComponent) { parentComponent.set('mouseActive', true); - run.later(() => { + later(() => { if (parentComponent.isDestroyed) { return; } diff --git a/addon/mixins/translate3d-mixin.js b/addon/mixins/translate3d-mixin.js index 356711320..2066614b8 100644 --- a/addon/mixins/translate3d-mixin.js +++ b/addon/mixins/translate3d-mixin.js @@ -5,7 +5,7 @@ import Mixin from '@ember/object/mixin'; import { htmlSafe } from '@ember/string'; import { computed } from '@ember/object'; -import { run } from '@ember/runloop'; +import { schedule, later } from '@ember/runloop'; import { nextTick, computeTimeout } from 'ember-css-transitions/utils/transition-utils'; import { getOwner } from '@ember/application'; @@ -43,7 +43,7 @@ export default Mixin.create({ didInsertElement() { this._super(...arguments); - run.schedule('afterRender', () => { + schedule('afterRender', () => { // Set translate3d style to start at the `from` origin this.set('transformStyleApply', 'from'); // Wait while CSS takes affect @@ -52,7 +52,7 @@ export default Mixin.create({ if (this.isDestroyed) { return; } - run.later(() => { + later(() => { if (!this.isDestroying && !this.isDestroyed) { this.onTranslateFromEnd(); } @@ -100,7 +100,7 @@ export default Mixin.create({ dialogClone.classList.add('md-transition-out'); dialogClone.style.cssText = toStyle; nextTick().then(() => { - run.later(() => { + later(() => { if (containerClone.parentNode !== null) { containerClone.parentNode.removeChild(containerClone); } diff --git a/addon/modifiers/toast-hammer.js b/addon/modifiers/toast-hammer.js index b03dba778..fe185e7a4 100644 --- a/addon/modifiers/toast-hammer.js +++ b/addon/modifiers/toast-hammer.js @@ -1,5 +1,5 @@ import Modifier from 'ember-modifier'; -import { run } from '@ember/runloop'; +import { bind } from '@ember/runloop'; /* global Hammer */ @@ -19,10 +19,10 @@ export default class ToastHammer extends Modifier { containerManager.add(swipe); containerManager.add(pan); containerManager - .on('panstart', run.bind(this, this.dragStart)) - .on('panmove', run.bind(this, this.drag)) - .on('panend', run.bind(this, this.dragEnd)) - .on('swiperight swipeleft', run.bind(this, this.dragEnd)); + .on('panstart', bind(this, this.dragStart)) + .on('panmove', bind(this, this.drag)) + .on('panend', bind(this, this.dragEnd)) + .on('swiperight swipeleft', bind(this, this.dragEnd)); this.hammer = containerManager; } } diff --git a/addon/services/paper-toaster.js b/addon/services/paper-toaster.js index 74bece7a5..7937bbf7b 100644 --- a/addon/services/paper-toaster.js +++ b/addon/services/paper-toaster.js @@ -1,6 +1,6 @@ import { reads } from '@ember/object/computed'; import { assign } from '@ember/polyfills'; -import { run } from '@ember/runloop'; +import { later } from '@ember/runloop'; import { A } from '@ember/array'; import Service from '@ember/service'; import EObject from '@ember/object'; @@ -32,7 +32,7 @@ export default Service.extend({ toast.set('show', false); if (this.activeToast === toast) { - run.later(() => { + later(() => { if (toast.onClose) { toast.onClose() } this.queue.removeObject(toast); }, 400); diff --git a/tests/dummy/app/controllers/demo/autocomplete.js b/tests/dummy/app/controllers/demo/autocomplete.js index a53a3f65c..9f704e139 100644 --- a/tests/dummy/app/controllers/demo/autocomplete.js +++ b/tests/dummy/app/controllers/demo/autocomplete.js @@ -1,5 +1,5 @@ /* eslint-disable ember/no-actions-hash */ -import { run } from '@ember/runloop'; +import { cancel, later } from '@ember/runloop'; import RSVP from 'rsvp'; import Controller from '@ember/controller'; import { A } from '@ember/array'; @@ -35,9 +35,9 @@ export default Controller.extend({ let XHR_TIMEOUT = Math.floor(Math.random() * 1000) + 100; return new RSVP.Promise((resolve) => { - run.cancel(this.searchTimer); + cancel(this.searchTimer); - this.searchTimer = run.later(this, () => { + this.searchTimer = later(this, () => { let nameRegExp = new RegExp(escapeRegExp(`${term}`), 'i', 'g'); let countries = this.items; let results = countries.filter((c) => nameRegExp.exec(c.name)) || []; diff --git a/tests/dummy/app/controllers/demo/grid-list.js b/tests/dummy/app/controllers/demo/grid-list.js index ae40d03c7..f5551d8ca 100644 --- a/tests/dummy/app/controllers/demo/grid-list.js +++ b/tests/dummy/app/controllers/demo/grid-list.js @@ -1,5 +1,5 @@ import Controller from '@ember/controller'; -import { run } from '@ember/runloop'; +import { later } from '@ember/runloop'; import { A } from '@ember/array'; import EObject, { computed } from '@ember/object'; import { assign } from '@ember/polyfills'; @@ -89,10 +89,10 @@ export default Controller.extend({ basicRows: 6, setupTimer() { - run.later(this, () => { + later(this, () => { this.recalculateColorTiles(); - run.later(this, this.setupTimer); + later(this, this.setupTimer); }, 10 * 1000); }, diff --git a/tests/dummy/app/controllers/demo/progress-circular.js b/tests/dummy/app/controllers/demo/progress-circular.js index 0b7755234..d87ccd55e 100644 --- a/tests/dummy/app/controllers/demo/progress-circular.js +++ b/tests/dummy/app/controllers/demo/progress-circular.js @@ -1,6 +1,6 @@ /* eslint-disable ember/no-actions-hash */ import Controller from '@ember/controller'; -import { run } from '@ember/runloop'; +import { later, cancel } from '@ember/runloop'; export default Controller.extend({ mode: 'query', @@ -13,7 +13,7 @@ export default Controller.extend({ }, setupTimer() { - this.set('timer', run.later(this, function() { + this.set('timer', later(this, function() { let value = this.incrementProperty('determinateValue', 1); if (value > 100) { this.set('determinateValue', 30); @@ -23,7 +23,7 @@ export default Controller.extend({ }, stop() { - run.cancel(this.timer); + cancel(this.timer); }, sliderDiameter: 100, diff --git a/tests/dummy/app/controllers/demo/progress-linear.js b/tests/dummy/app/controllers/demo/progress-linear.js index 1ae7ff3a3..00a11a164 100644 --- a/tests/dummy/app/controllers/demo/progress-linear.js +++ b/tests/dummy/app/controllers/demo/progress-linear.js @@ -1,5 +1,5 @@ import Controller from '@ember/controller'; -import { run } from '@ember/runloop'; +import { later, cancel } from '@ember/runloop'; export default Controller.extend({ @@ -17,7 +17,7 @@ export default Controller.extend({ }, setupTimer() { - this.set('timer', run.later(this, function() { + this.set('timer', later(this, function() { let value = this.incrementProperty('determinateValue', 1); this.incrementProperty('determinateValue2', 1.5); if (value > 100) { @@ -31,17 +31,17 @@ export default Controller.extend({ }, setupTimer2() { - this.set('timer2', run.later(this, function() { + this.set('timer2', later(this, function() { this.set('mode', this.mode === 'query' ? 'determinate' : 'query'); this.set('determinateValue', 30); this.set('determinateValue2', 30); - run.later(this, this.setupTimer2); + later(this, this.setupTimer2); }, 7200)); }, stop() { - run.cancel(this.timer); - run.cancel(this.timer2); + cancel(this.timer); + cancel(this.timer2); } }); diff --git a/tests/dummy/app/controllers/demo/select.js b/tests/dummy/app/controllers/demo/select.js index bf0308da9..4dafd6893 100644 --- a/tests/dummy/app/controllers/demo/select.js +++ b/tests/dummy/app/controllers/demo/select.js @@ -3,7 +3,7 @@ import Controller from '@ember/controller'; import { computed } from '@ember/object'; import RSVP from 'rsvp'; import { A } from '@ember/array'; -import { run } from '@ember/runloop'; +import { later } from '@ember/runloop'; export default Controller.extend({ @@ -47,7 +47,7 @@ export default Controller.extend({ { id: 5, name: 'Velma Dinkley' } ]); - run.later(() => { + later(() => { /* * Two arguments to the resolve: * - data from the server