Imporvements and lint fix

vakrilov · vakrilov · commit cf1a0158e18a · 2015-03-13T16:56:29.000+02:00
diff --git a/image-source/image-source-common.ts b/image-source/image-source-common.ts
@@ -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
 }
diff --git a/image-source/image-source.d.ts b/image-source/image-source.d.ts
@@ -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
 }
diff --git a/ui/enums/enums.d.ts b/ui/enums/enums.d.ts
@@ -311,8 +311,6 @@
         export var allCharacters: string;
     }
 
-
-
     /**
      * Defines the recognized image formats.
      */
diff --git a/ui/enums/enums.ts b/ui/enums/enums.ts
@@ -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";
diff --git a/ui/image/image-common.ts b/ui/image/image-common.ts
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,6 @@`
`311`	`311`	`export var allCharacters: string;`
`312`	`312`	`}`
`313`	`313`
`314`		`-`
`315`		`-`
`316`	`314`	`/**`
`317`	`315`	`* Defines the recognized image formats.`
`318`	`316`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,6 @@ export module AutocapitalizationType {`
`86`	`86`	`export var allCharacters: string = "allCharacters";`
`87`	`87`	`}`
`88`	`88`
`89`		`-`
`90`	`89`	`export module ImageFormat {`
`91`	`90`	`export var png: string = "png";`
`92`	`91`	`export var jpeg: string = "jpeg";`