diff --git a/BCL.csproj b/BCL.csproj index 827d748d1..289f4f850 100644 --- a/BCL.csproj +++ b/BCL.csproj @@ -128,13 +128,13 @@ - - http_client.d.ts + + http_request.d.ts - - http_client.d.ts + + http_request.d.ts - + @@ -148,7 +148,7 @@ - + console.d.ts diff --git a/net/http_common.ts b/net/http.ts similarity index 89% rename from net/http_common.ts rename to net/http.ts index 73ea22b0f..2aba2066a 100644 --- a/net/http_common.ts +++ b/net/http.ts @@ -1,6 +1,10 @@ import image_module = require("Image/image"); import promises = require("promises/promises"); -import http = require("net/http_client"); +import http = require("net/http_request"); + +// merge request +declare var exports; +exports.request = http.request; /** * Gets string from url. diff --git a/net/http_client.android.ts b/net/http_request.android.ts similarity index 87% rename from net/http_client.android.ts rename to net/http_request.android.ts index 82ef0dd61..06669b834 100644 --- a/net/http_client.android.ts +++ b/net/http_request.android.ts @@ -1,20 +1,10 @@ /** * Android specific http client implementation. */ -import image_module = require("Image/image"); import app_module = require("Application/application"); +import image_module = require("Image/image"); import promises = require("promises/promises"); - -import http = require("net/http_client"); - -/* -// merge common -import http_common = require("net/http_common"); -declare var exports; -exports.getString = http_common.getString; -exports.getJSON = http_common.getJSON; -exports.getImage = http_common.getImage; -*/ +import http = require("net/http_request"); // TODO: Replace with similar to iOS implementation! export function request(options: http.HttpRequestOptions): promises.Promise { diff --git a/net/http_client.d.ts b/net/http_request.d.ts similarity index 74% rename from net/http_client.d.ts rename to net/http_request.d.ts index 267494ea3..9ce91da54 100644 --- a/net/http_client.d.ts +++ b/net/http_request.d.ts @@ -4,10 +4,6 @@ import image_module = require("Image/image"); import promises = require("promises/promises"); -export declare function getString(url: string): promises.Promise; -export declare function getJSON(url: string): promises.Promise; -export declare function getImage(url: string): promises.Promise; - export declare function request(options: HttpRequestOptions): promises.Promise; export interface HttpRequestOptions { diff --git a/net/http_client.ios.ts b/net/http_request.ios.ts similarity index 87% rename from net/http_client.ios.ts rename to net/http_request.ios.ts index eec653597..9c2cc199f 100644 --- a/net/http_client.ios.ts +++ b/net/http_request.ios.ts @@ -3,16 +3,7 @@ */ import image = require("Image/image"); import promises = require("promises/promises"); -import http = require("net/http_client"); - -/* -// merge common -import http_common = require("net/http_common"); -declare var exports; -exports.getString = http_common.getString; -exports.getJSON = http_common.getJSON; -exports.getImage = http_common.getImage; -*/ +import http = require("net/http_request"); export function request(options: http.HttpRequestOptions): promises.Promise { var d = promises.defer(); @@ -36,12 +27,13 @@ export function request(options: http.HttpRequestOptions): promises.Promise(); diff --git a/net/index.ts b/net/index.ts index 2845fb071..053b7482b 100644 --- a/net/index.ts +++ b/net/index.ts @@ -1,2 +1,2 @@ declare var module, require; -module.exports = require("net/http_client"); \ No newline at end of file +module.exports = require("net/http"); \ No newline at end of file