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

chore: fix relative import #4096

Merged
merged 6 commits into from
Feb 15, 2020
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 app/initializers/extensions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '../extensions/ember-table/component';
import 'open-event-frontend/extensions/ember-table/component';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure there should not be initialisers before the extension in here @maze-runnar ?


export function initialize() {}

Expand Down
3 changes: 1 addition & 2 deletions app/services/current-user.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Service from '@ember/service';
import { inject as service } from '@ember/service';
import Service, { inject as service } from '@ember/service';
import { isEmpty } from '@ember/utils';
import { resolve } from 'rsvp';

Expand Down
3 changes: 1 addition & 2 deletions app/services/device.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import $ from 'jquery';
import Service from '@ember/service';
import Service, { inject as service } from '@ember/service';
import { computed } from '@ember/object';
import { equal, or } from '@ember/object/computed';
import { debounce } from '@ember/runloop';
import { forOwn } from 'lodash-es';
import { inject as service } from '@ember/service';

/**
* Keeping this outside the service object to keep it lean and faster to loop over
Expand Down
4 changes: 2 additions & 2 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Application from '../app';
import Application from 'open-event-frontend/app';
import QUnit from 'qunit';
import config from '../config/environment';
import config from 'open-event-frontend/config/environment';
import { setApplication } from '@ember/test-helpers';
import { start } from 'ember-qunit';
import loadEmberExam from 'ember-exam/test-support/load';
Expand Down