Image module loading now is on demand

This commit is contained in:
Vladimir Enchev
2014-04-24 15:39:35 +03:00
parent 468b408229
commit 61e2a2d01f
2 changed files with 3 additions and 6 deletions

View File

@ -1,8 +1,6 @@
/** /**
* Android specific http client implementation. * Android specific http client implementation.
*/ */
import app_module = require("Application/application");
import image_module = require("Image/image");
import promises = require("promises/promises"); import promises = require("promises/promises");
import http = require("net/http_request"); import http = require("net/http_request");
@ -22,7 +20,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
var isImage = options.url.match(/\.(jpeg|jpg|gif|png)$/i) != null; var isImage = options.url.match(/\.(jpeg|jpg|gif|png)$/i) != null;
var context = app_module.Application.current.android.context; var context = require("Application/application").Application.current.android.context;
var request = com.koushikdutta.ion.Ion.with(context, options.url); var request = com.koushikdutta.ion.Ion.with(context, options.url);
request = isImage ? request.asBitmap() : request.asString(); request = isImage ? request.asBitmap() : request.asString();
@ -36,7 +34,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
content: { content: {
toString: () => { return data }, toString: () => { return data },
toJSON: () => { return JSON.parse(data) }, toJSON: () => { return JSON.parse(data) },
toImage: () => { return image_module.Image.imageFromNativeBitmap(data); } toImage: () => { return require("Image/image").Image.imageFromNativeBitmap(data); }
}, },
statusCode: 0, statusCode: 0,
headers: [] headers: []

View File

@ -1,7 +1,6 @@
/** /**
* iOS specific http client implementation. * iOS specific http client implementation.
*/ */
import image = require("Image/image");
import promises = require("promises/promises"); import promises = require("promises/promises");
import http = require("net/http_request"); import http = require("net/http_request");
@ -51,7 +50,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
content: { content: {
toString: () => { return NSDataToString(data); }, toString: () => { return NSDataToString(data); },
toJSON: () => { return JSON.parse(NSDataToString(data)); }, toJSON: () => { return JSON.parse(NSDataToString(data)); },
toImage: () => { return image.Image.imageFromData(data); } toImage: () => { return require("Image/image").Image.imageFromData(data); }
}, },
statusCode: response.statusCode(), statusCode: response.statusCode(),
headers: headers headers: headers