fix(image): uncaught error in promise with image handling · NativeScript/NativeScript@f7ee2bd · GitHub

NativeScript / NativeScript Public

• Notifications You must be signed in to change notification settings
• Fork 1.7k
• Star 25.7k

• Code
• Issues 774
• Pull requests 69
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit f7ee2bd

Browse filesBrowse the repository at this point in the historyBrowse files

NathanWalker

committed

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

1 parent 8e83a61 commit f7ee2bd
Copy full SHA for f7ee2bd

2 files changed

+17-3Lines changed: 17 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tns-core-modules/http
  • http-request
    • http-request.ios.ts
  • http.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎tns-core-modules/http/http-request/http-request.ios.ts‎

Copy file name to clipboardExpand all lines: tns-core-modules/http/http-request/http-request.ios.ts

+5Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -69,6 +69,11 @@ function ensureImageSource() {
69	69	export function request(options: http.HttpRequestOptions): Promise<http.HttpResponse> {
70	70	return new Promise<http.HttpResponse>((resolve, reject) => {
71	71
	72	+ if (!options.url) {
	73	+ reject('Request url was empty.');
	74	+ return;
	75	+ }
	76	+
72	77	try {
73	78	var network = domainDebugger.getNetwork();
74	79	var debugRequest = network && network.create();

Collapse file

‎tns-core-modules/http/http.ts‎

Copy file name to clipboardExpand all lines: tns-core-modules/http/http.ts

+12-3Lines changed: 12 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -31,9 +31,18 @@ export function getJSON<T>(arg: any): Promise<T> {
31	31	}
32	32
33	33	export function getImage(arg: any): Promise<ImageSource> {
34		- return httpRequest
35		- .request(typeof arg === "string" ? { url: arg, method: "GET" } : arg)
36		- .then(response => response.content.toImage());
	34	+ return new Promise<any>((resolve, reject) => {
	35	+ httpRequest.request(typeof arg === "string" ? { url: arg, method: "GET" } : arg)
	36	+ .then(r => {
	37	+ try {
	38	+ resolve(r.content.toImage());
	39	+ } catch (err) {
	40	+ reject(err);
	41	+ }
	42	+ }, err => {
	43	+ reject(err);
	44	+ });
	45	+ });
37	46	}
38	47
39	48	export function getFile(arg: any, destinationFilePath?: string): Promise<any> {

0 commit comments

Comments

0 (0)