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

TypeScript 2.5 compatibility (#4794)

Browse Source
This commit is contained in:
Alexander Vakrilov
2017-09-04 14:36:34 +03:00
committed by SvetoslavTsenov
parent a79a83ce82
commit 28b6eba9ac
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tns-core-modules/ui/image/image-common.ts
View File

@@ -5,7 +5,7 @@ import { ImageSource, fromAsset, fromNativeSource, fromUrl } from "../../image-s
import { isDataURI, isFileOrResourcePath, RESOURCE_PREFIX } from "../../utils/utils"; import { isDataURI, isFileOrResourcePath, RESOURCE_PREFIX } from "../../utils/utils";
export * from "../core/view"; export * from "../core/view";
export { ImageSource, fromAsset, fromNativeSource, fromUrl, isDataURI, isFileOrResourcePath, RESOURCE_PREFIX }; export { ImageSource, ImageAsset, fromAsset, fromNativeSource, fromUrl, isDataURI, isFileOrResourcePath, RESOURCE_PREFIX };
export abstract class ImageBase extends View implements ImageDefinition { export abstract class ImageBase extends View implements ImageDefinition {
public imageSource: ImageSource; public imageSource: ImageSource;
@@ -24,7 +24,7 @@ export abstract class ImageBase extends View implements ImageDefinition {
/** /**
* @internal * @internal
*/ */
public _createImageSourceFromSrc(value: string | ImageSource): void { public _createImageSourceFromSrc(value: string | ImageSource | ImageAsset): void {
const originalValue = value; const originalValue = value;
const sync = this.loadMode === "sync"; const sync = this.loadMode === "sync";
if (typeof value === "string" || value instanceof String) { if (typeof value === "string" || value instanceof String) {

4
tns-core-modules/ui/image/image.android.ts
View File

@@ -1,5 +1,5 @@
import { import {
ImageSource, ImageBase, stretchProperty, imageSourceProperty, srcProperty, tintColorProperty, Color, ImageSource, ImageAsset, ImageBase, stretchProperty, imageSourceProperty, srcProperty, tintColorProperty, Color,
isDataURI, isFileOrResourcePath, RESOURCE_PREFIX isDataURI, isFileOrResourcePath, RESOURCE_PREFIX
} from "./image-common"; } from "./image-common";
import { knownFolders } from "../../file-system"; import { knownFolders } from "../../file-system";
@@ -75,7 +75,7 @@ export class Image extends ImageBase {
this.nativeViewProtected.setImageMatrix(new android.graphics.Matrix()); this.nativeViewProtected.setImageMatrix(new android.graphics.Matrix());
} }
public _createImageSourceFromSrc(value: string | ImageSource) { public _createImageSourceFromSrc(value: string | ImageSource | ImageAsset) {
const imageView = this.nativeViewProtected; const imageView = this.nativeViewProtected;
if (!imageView) { if (!imageView) {
return; return;

4
tns-core-modules/ui/styling/style-properties.ts
View File

@@ -528,8 +528,8 @@ function parseTransformString(text: string): Transformation[] {
return matches; return matches;
} }
function normalizeTransformation({ property, value }: Transformation) { function normalizeTransformation({ property, value }: Transformation): Transformation {
return STYLE_TRANSFORMATION_MAP[property](value); return <any>STYLE_TRANSFORMATION_MAP[property](value);
} }
function convertTransformValue(property: string, stringValue: string) function convertTransformValue(property: string, stringValue: string)