Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/ember-upgrade
Browse files Browse the repository at this point in the history
# Conflicts:
#	addon/components/modal.js
#	addon/services/modal.js
#	package.json
#	tests/acceptance/modal-component-test.js
#	tests/dummy/app/components/modal-custom-modal/index.hbs
#	tests/dummy/app/styles/app.css
#	tests/integration/services/modal-test.js
#	yarn.lock
  • Loading branch information
josex2r committed Dec 23, 2021
2 parents 4ebec8f + 65b4bda commit 45448aa
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 23 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# [2.7.0](https://github.com/BBVAEngineering/ember-modal-service/compare/v2.6.0...v2.7.0) (2021-12-21)

### Bug Fixes

- apply suggestions into PR ([5c73504](https://github.com/BBVAEngineering/ember-modal-service/commit/5c7350478b7f2d27fa16d14b83a4326e26b6908c))
- delete unnecesary private variable ([ad8ed8e](https://github.com/BBVAEngineering/ember-modal-service/commit/ad8ed8e93101271e9ac8b25ff782ecfa9025bf8b))
- resolve modal with function ([a1d135f](https://github.com/BBVAEngineering/ember-modal-service/commit/a1d135f7616b9b4e0f988b39b57adaa39bcdc54e))
- update condition isDestroying ([ceeff26](https://github.com/BBVAEngineering/ember-modal-service/commit/ceeff26665d7b7a5739d0990d86ed2a4d949fc9a))
- update safeDidOpen func ([216a4da](https://github.com/BBVAEngineering/ember-modal-service/commit/216a4da93d1f8d27d711c15825787e7aa214e603))

### Features

- resolve modal when is destroyed ([998b8ca](https://github.com/BBVAEngineering/ember-modal-service/commit/998b8ca85b11f6ff83205f88f3c763467c36e988))
- resolve suggestion into PR ([0f66af4](https://github.com/BBVAEngineering/ember-modal-service/commit/0f66af481172eb3190d332153cd9b8458bafb237))

# [2.6.0](https://github.com/BBVAEngineering/ember-modal-service/compare/v2.5.0...v2.6.0) (2021-11-24)

### Features
Expand Down
22 changes: 0 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,28 +82,6 @@ export default class Controller extends Controller {
### Other useful things
If you need to wait until modal is removed from DOM:
```javascript
import Controller from '@ember/controller';
import { action } from '@ember/object';

export default class Controller extends Controller {
// Inject the service
@service modal;

@action
async doSomething() {
await this.modal.open('foo', { bar: 'bar' });

this.modal.one('close', ({ name }) => {
if (name === 'foo') {
// Do something...
}
});
}
```
You can close all modals by using the `close` method.
```javascript
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-modal-service",
"version": "2.6.0",
"version": "2.7.1",
"description": "An ember-cli addon to manage modals as promises.",
"keywords": [
"ember-addon"
Expand Down

0 comments on commit 45448aa

Please sign in to comment.