Skip to content

Commit 45448aa

Browse files
committed
Merge remote-tracking branch 'origin/master' into feature/ember-upgrade
# 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
2 parents 4ebec8f + 65b4bda commit 45448aa

File tree

3 files changed

+16
-23
lines changed

3 files changed

+16
-23
lines changed

Diff for: CHANGELOG.md

+15
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
# [2.7.0](https://github.com/BBVAEngineering/ember-modal-service/compare/v2.6.0...v2.7.0) (2021-12-21)
2+
3+
### Bug Fixes
4+
5+
- apply suggestions into PR ([5c73504](https://github.com/BBVAEngineering/ember-modal-service/commit/5c7350478b7f2d27fa16d14b83a4326e26b6908c))
6+
- delete unnecesary private variable ([ad8ed8e](https://github.com/BBVAEngineering/ember-modal-service/commit/ad8ed8e93101271e9ac8b25ff782ecfa9025bf8b))
7+
- resolve modal with function ([a1d135f](https://github.com/BBVAEngineering/ember-modal-service/commit/a1d135f7616b9b4e0f988b39b57adaa39bcdc54e))
8+
- update condition isDestroying ([ceeff26](https://github.com/BBVAEngineering/ember-modal-service/commit/ceeff26665d7b7a5739d0990d86ed2a4d949fc9a))
9+
- update safeDidOpen func ([216a4da](https://github.com/BBVAEngineering/ember-modal-service/commit/216a4da93d1f8d27d711c15825787e7aa214e603))
10+
11+
### Features
12+
13+
- resolve modal when is destroyed ([998b8ca](https://github.com/BBVAEngineering/ember-modal-service/commit/998b8ca85b11f6ff83205f88f3c763467c36e988))
14+
- resolve suggestion into PR ([0f66af4](https://github.com/BBVAEngineering/ember-modal-service/commit/0f66af481172eb3190d332153cd9b8458bafb237))
15+
116
# [2.6.0](https://github.com/BBVAEngineering/ember-modal-service/compare/v2.5.0...v2.6.0) (2021-11-24)
217

318
### Features

Diff for: README.md

-22
Original file line numberDiff line numberDiff line change
@@ -82,28 +82,6 @@ export default class Controller extends Controller {
8282
8383
### Other useful things
8484
85-
If you need to wait until modal is removed from DOM:
86-
87-
```javascript
88-
import Controller from '@ember/controller';
89-
import { action } from '@ember/object';
90-
91-
export default class Controller extends Controller {
92-
// Inject the service
93-
@service modal;
94-
95-
@action
96-
async doSomething() {
97-
await this.modal.open('foo', { bar: 'bar' });
98-
99-
this.modal.one('close', ({ name }) => {
100-
if (name === 'foo') {
101-
// Do something...
102-
}
103-
});
104-
}
105-
```
106-
10785
You can close all modals by using the `close` method.
10886
10987
```javascript

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-modal-service",
3-
"version": "2.6.0",
3+
"version": "2.7.1",
44
"description": "An ember-cli addon to manage modals as promises.",
55
"keywords": [
66
"ember-addon"

0 commit comments

Comments
 (0)