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

Imporvements and lint fix

Browse Source
This commit is contained in:
vakrilov
2015-03-13 16:56:29 +02:00
parent 36e0f80a10
commit cf1a0158e1
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
image-source/image-source-common.ts
View File

@ -1,4 +1,5 @@
import http = require("http");
import types = require("utils/types");
// This is used for definition purposes only, it does not generate JavaScript for it.
import definition = require("image-source");
@ -30,8 +31,22 @@ export function fromUrl(url: string): Promise<definition.ImageSource> {
}
export function fromFileOrResource(path: string): definition.ImageSource {
if (!isFileOrResourcePath(path)) {
throw new Error("Path \"" + "\" is not a valid file or resource.");
}
if (path.indexOf(RESOURCE_PREFIX) === 0) {
return fromResource(path.substr(RESOURCE_PREFIX.length));
}
return fromFile(path);
}
export function isFileOrResourcePath(path: string): boolean {
if (!types.isString(path)) {
return false;
}
return path.indexOf("~/") === 0 || // relative to AppRoot
path.indexOf("/") === 0 || // absolute path
path.indexOf(RESOURCE_PREFIX) === 0; // resource
}

10
image-source/image-source.d.ts vendored
View File

@ -4,8 +4,8 @@
declare module "image-source" {
/**
* Encapsulates the common abstraction behind a platform specific object (typically a Bitmap) that is used as a source for images.
*/
* Encapsulates the common abstraction behind a platform specific object (typically a Bitmap) that is used as a source for images.
*/
export class ImageSource {
/**
* Gets the height of this instance. This is a read-only property.
@ -104,4 +104,10 @@ declare module "image-source" {
* @param path The location of the file on the file system.
*/
export function fromFileOrResource(path: string): ImageSource;
/**
* Returns true if the specified path points to a resource or local file.
* @param path The path.
*/
export function isFileOrResourcePath(path: string): boolean
}

2
ui/enums/enums.d.ts vendored
View File

@ -311,8 +311,6 @@
export var allCharacters: string;
}
/**
* Defines the recognized image formats.
*/

1
ui/enums/enums.ts
View File

@ -86,7 +86,6 @@ export module AutocapitalizationType {
export var allCharacters: string = "allCharacters";
}
export module ImageFormat {
export var png: string = "png";
export var jpeg: string = "jpeg";

12
ui/image/image-common.ts
View File

@ -15,10 +15,6 @@ var IMAGE = "Image";
var ISLOADING = "isLoading";
var STRETCH = "stretch";
function isUrl(value: string): boolean {
return value.indexOf("http://") === 0 || value.indexOf("https://") === 0;
}
function isValidSrc(src: any): boolean {
return types.isString(src);
}
@ -34,16 +30,16 @@ function onSrcPropertyChanged(data: dependencyObservable.PropertyChangeData) {
image._setValue(Image.isLoadingProperty, true);
if (isUrl(value)) {
if (imageSource.isFileOrResourcePath(value)) {
image.imageSource = imageSource.fromFileOrResource(value);
image._setValue(Image.isLoadingProperty, false);
} else {
imageSource.fromUrl(value).then((r) => {
if (image["_url"] === value) {
image.imageSource = r;
image._setValue(Image.isLoadingProperty, false);
}
});
} else {
image.imageSource = imageSource.fromFileOrResource(value);
image._setValue(Image.isLoadingProperty, false);
}
}
else if (value instanceof imageSource.ImageSource) {