Skip to content
Open
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
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ module.exports = {
browser: true
},
rules: {
'ember/new-module-imports': 'warn',
'ember/closure-actions': 'warn'
},
overrides: [
Expand Down
11 changes: 4 additions & 7 deletions addon/components/resize-detector.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import Ember from 'ember';
import Component from '@ember/component';
import { inject as service } from '@ember/service';
import { bind, scheduleOnce } from '@ember/runloop';
import layout from '../templates/components/resize-detector';

const {
inject: { service },
run: { scheduleOnce, bind }
} = Ember;

/**
* Replacement for jQuery $.height()
* Borrowed with thanks from https://github.com/nefe/You-Dont-Need-jQuery#2.2
Expand Down Expand Up @@ -37,7 +34,7 @@ function getWidth(el) {
}


export default Ember.Component.extend({
export default Component.extend({
layout,
tagName: '',
resizeDetector: service(),
Expand Down
4 changes: 3 additions & 1 deletion addon/services/resize-detector.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
/* global elementResizeDetectorMaker */

import Service from '@ember/service';

import Ember from 'ember';

const {
Logger: { error }
} = Ember;

export default Ember.Service.extend({
export default Service.extend({

init() {
this._super(...arguments);
Expand Down
11 changes: 4 additions & 7 deletions tests/dummy/app/components/resizable-container.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import Ember from 'ember';
import Component from '@ember/component';
import { htmlSafe } from '@ember/template';
import { computed } from '@ember/object';

const {
String: { htmlSafe },
computed
} = Ember;

export default Ember.Component.extend({
export default Component.extend({
classNames: ['resizable-container'],

style: computed('height', 'width', function(){
Expand Down
9 changes: 3 additions & 6 deletions tests/dummy/app/controllers/application.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import Ember from 'ember';
import Controller from '@ember/controller';
import { inject as service } from '@ember/service';

const {
inject: { service }
} = Ember;

export default Ember.Controller.extend({
export default Controller.extend({
notify: service(),

actions: {
Expand Down
8 changes: 2 additions & 6 deletions tests/integration/components/resize-detector-test.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
import Ember from 'ember';
import { htmlSafe } from '@ember/template';
import { later } from '@ember/runloop';
import { moduleForComponent, test } from 'ember-qunit';
import hbs from 'htmlbars-inline-precompile';
import wait from 'ember-test-helpers/wait';

const {
String: { htmlSafe },
run: { later }
} = Ember;

moduleForComponent('resize-detector', 'Integration | Component | resize detector', {
integration: true
});
Expand Down