Skip to content

Commit 273d1a7

Browse files
author
Alexander Vakrilov
authored
Merge branch 'master' into djenkov/location-strategy
2 parents 905e3df + 801f96b commit 273d1a7

File tree

2 files changed

+43
-18
lines changed

2 files changed

+43
-18
lines changed

Diff for: .github/ISSUE_TEMPLATE.md

+24-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
1-
PSST! Want to get faster responses to bug reports and important issues? Help us keep the issue tracker organized by:
1+
### Make sure to check the existing issues in this repository
22

3-
- Reporting bugs. Please include all details about the problem and provide a sample app (consider using the [playground](https://play.nativescript.org) for this.
4-
- Proposing features and enhancements.
5-
- Discussing implementation details.
3+
### If there is no issue for your problem, tell us about it
4+
Please, ensure your title is less than 63 characters long and starts with a capital
5+
letter.
66

7-
Please move all other content to the [forums](https://discourse.nativescript.org/).
7+
### Which platform(s) does your issue occur on?
8+
- iOS/Android/Both
9+
- iOS/Android versions
10+
- emulator or device. What type of device?
11+
12+
### Please, provide the following version numbers that your issue occurs with:
13+
14+
- CLI: (run `tns --version` to fetch it)
15+
- Cross-platform modules: (check the 'version' attribute in the
16+
`node_modules/tns-core-modules/package.json` file in your project)
17+
- Runtime(s): (look for the `"tns-android"` and `"tns-ios"` properties in the `package.json` file of your project)
18+
- Plugin(s): (look for the version numbers in the `package.json` file of your
19+
project and paste your dependencies and devDependencies here)
20+
21+
### Please, tell us how to recreate the issue in as much detail as possible.
22+
Describe the steps to reproduce it.
23+
24+
### Is there any code involved?
25+
- provide a code example to recreate the problem
26+
- (EVEN BETTER) consider using the [playground](https://play.nativescript.org) to provide an application where the problem is reproducible. If this is not possible, provide a .zip with application or refer to a repository with application where the problem is reproducible.

Diff for: nativescript-angular/directives/dialogs.ts

+19-13
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,25 @@ export class ModalDialogService {
7878

7979
this.location._beginModalNavigation(frame);
8080

81-
return new Promise(resolve => {
82-
setTimeout(() => this._showDialog({
83-
containerRef: viewContainerRef,
84-
context,
85-
doneCallback: resolve,
86-
fullscreen,
87-
animated,
88-
stretched,
89-
pageFactory,
90-
parentView,
91-
resolver,
92-
type,
93-
}), 10);
81+
return new Promise((resolve, reject) => {
82+
setTimeout(() => {
83+
try {
84+
this._showDialog({
85+
containerRef: viewContainerRef,
86+
context,
87+
doneCallback: resolve,
88+
fullscreen,
89+
animated,
90+
stretched,
91+
pageFactory,
92+
parentView,
93+
resolver,
94+
type,
95+
});
96+
} catch (err) {
97+
reject(err);
98+
}
99+
}, 10);
94100
});
95101
}
96102

0 commit comments

Comments
 (0)