javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(image): uncaught error in promise with image handling (#6453)

Browse Source
This commit is contained in:
Nathan Walker
2018-11-13 08:49:37 -08:00
committed by Alexander Vakrilov
parent 8e83a61879
commit 950fdcf5e7
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tns-core-modules/http/http-request/http-request.ios.ts
View File

@ -69,6 +69,11 @@ function ensureImageSource() {
export function request(options: http.HttpRequestOptions): Promise<http.HttpResponse> { export function request(options: http.HttpRequestOptions): Promise<http.HttpResponse> {
return new Promise<http.HttpResponse>((resolve, reject) => { return new Promise<http.HttpResponse>((resolve, reject) => {
if (!options.url) {
reject(new Error("Request url was empty."));
return;
}
try { try {
var network = domainDebugger.getNetwork(); var network = domainDebugger.getNetwork();
var debugRequest = network && network.create(); var debugRequest = network && network.create();

15
tns-core-modules/http/http.ts
View File

@ -31,9 +31,18 @@ export function getJSON<T>(arg: any): Promise<T> {
} }
export function getImage(arg: any): Promise<ImageSource> { export function getImage(arg: any): Promise<ImageSource> {
return httpRequest return new Promise<any>((resolve, reject) => {
.request(typeof arg === "string" ? { url: arg, method: "GET" } : arg) httpRequest.request(typeof arg === "string" ? { url: arg, method: "GET" } : arg)
.then(response => response.content.toImage()); .then(r => {
try {
resolve(r.content.toImage());
} catch (err) {
reject(err);
}
}, err => {
reject(err);
});
});
} }
export function getFile(arg: any, destinationFilePath?: string): Promise<any> { export function getFile(arg: any, destinationFilePath?: string): Promise<any> {