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

Merge pull request #2767 from NativeScript/NickIliev-enums

Browse Source 
added jpg as synonim for ImageFormat jpeg
This commit is contained in:
Nick Iliev
2016-09-21 11:23:01 +03:00
committed by GitHub
parent 9d290a35b4 a66a983a80
commit c91162b934
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tns-core-modules/image-source/image-source.android.ts
View File

@ -160,7 +160,7 @@ function getTargetFormat(format: string): android.graphics.Bitmap.CompressFormat
ensureEnums(); ensureEnums();
switch (format) { switch (format) {
case enums.ImageFormat.jpeg: case enums.ImageFormat.jpeg || enums.ImageFormat.jpg:
return android.graphics.Bitmap.CompressFormat.JPEG; return android.graphics.Bitmap.CompressFormat.JPEG;
default: default:
return android.graphics.Bitmap.CompressFormat.PNG; return android.graphics.Bitmap.CompressFormat.PNG;

3
tns-core-modules/image-source/image-source.ios.ts
View File

@ -165,10 +165,9 @@ function getImageData(instance: UIImage, format: string, quality = 1.0): NSData
case enums.ImageFormat.png: // PNG case enums.ImageFormat.png: // PNG
data = UIImagePNGRepresentation(instance); data = UIImagePNGRepresentation(instance);
break; break;
case enums.ImageFormat.jpeg: // JPEG case enums.ImageFormat.jpeg || enums.ImageFormat.jpg: // JPEG
data = UIImageJPEGRepresentation(instance, quality); data = UIImageJPEGRepresentation(instance, quality);
break; break;
} }
return data; return data;
} }

5
tns-core-modules/ui/enums/enums.d.ts vendored
View File

@ -354,6 +354,11 @@
* The Joint Photographic Experts Group (JPEG) image format. * The Joint Photographic Experts Group (JPEG) image format.
*/ */
export var jpeg: string; export var jpeg: string;
/**
* The Joint Photographic Experts Group (JPEG) image format.
*/
export var jpg: string;
} }
/** /**

1
tns-core-modules/ui/enums/enums.ts
View File

@ -138,6 +138,7 @@ export module IOSActionItemPosition {
export module ImageFormat { export module ImageFormat {
export var png: string = "png"; export var png: string = "png";
export var jpeg: string = "jpeg"; export var jpeg: string = "jpeg";
export var jpg: string = "jpg";
} }
export module FontStyle { export module FontStyle {