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

Merge branch 'master' into animate-width-height

Browse Source
This commit is contained in:
Martin Yankov
2019-05-08 08:52:36 +03:00
committed by GitHub
parent a84b6301ed 2a023609f5
commit 08fae2fb8e
5 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tns-core-modules/ui/button/button.android.ts
View File

@@ -91,6 +91,7 @@ export class Button extends ButtonBase {
this._highlightedHandler = this._highlightedHandler || ((args: TouchGestureEventData) => {
switch (args.action) {
case TouchAction.up:
case TouchAction.cancel:
this._goToVisualState("normal");
break;
case TouchAction.down:

6
tns-core-modules/ui/image-cache/image-cache.ios.ts
View File

@@ -72,7 +72,11 @@ export class Cache extends common.Cache {
.then((response) => {
try {
const image = UIImage.alloc().initWithData(response.content.raw);
this._onDownloadCompleted(request.key, image);
if (image) {
this._onDownloadCompleted(request.key, image);
} else {
this._onDownloadError(request.key, new Error("No result for provided url"));
}
} catch (err) {
this._onDownloadError(request.key, err);
}