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

http refactored to fix circular references

Browse Source
This commit is contained in:
Vladimir Enchev
2014-04-24 09:40:47 +03:00
parent 9a2ad1d7ef
commit 4ee6ba8801
6 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BCL.csproj
View File

@ -128,13 +128,13 @@
</TypeScriptCompile> </TypeScriptCompile>
<TypeScriptCompile Include="Utils\utils_android.ts" /> <TypeScriptCompile Include="Utils\utils_android.ts" />
<TypeScriptCompile Include="Utils\utils_ios.ts" /> <TypeScriptCompile Include="Utils\utils_ios.ts" />
<TypeScriptCompile Include="net\http_client.android.ts"> <TypeScriptCompile Include="net\http_request.android.ts">
<DependentUpon>http_client.d.ts</DependentUpon> <DependentUpon>http_request.d.ts</DependentUpon>
</TypeScriptCompile> </TypeScriptCompile>
<TypeScriptCompile Include="net\http_client.ios.ts"> <TypeScriptCompile Include="net\http_request.ios.ts">
<DependentUpon>http_client.d.ts</DependentUpon> <DependentUpon>http_request.d.ts</DependentUpon>
</TypeScriptCompile> </TypeScriptCompile>
<TypeScriptCompile Include="net\http_client.d.ts" /> <TypeScriptCompile Include="net\http_request.d.ts" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<TypeScriptCompile Include="net\index.ts" /> <TypeScriptCompile Include="net\index.ts" />
@ -148,7 +148,7 @@
<TypeScriptCompile Include="android17.d.ts" /> <TypeScriptCompile Include="android17.d.ts" />
<TypeScriptCompile Include="promises\promises.ts" /> <TypeScriptCompile Include="promises\promises.ts" />
<TypeScriptCompile Include="promises\index.ts" /> <TypeScriptCompile Include="promises\index.ts" />
<TypeScriptCompile Include="net\http_common.ts" /> <TypeScriptCompile Include="net\http.ts" />
<Content Include="_references.ts" /> <Content Include="_references.ts" />
<TypeScriptCompile Include="Console\console.android.ts"> <TypeScriptCompile Include="Console\console.android.ts">
<DependentUpon>console.d.ts</DependentUpon> <DependentUpon>console.d.ts</DependentUpon>

6
net/http_common.ts → net/http.ts
View File

@ -1,6 +1,10 @@
import image_module = require("Image/image"); import image_module = require("Image/image");
import promises = require("promises/promises"); 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. * Gets string from url.

14
net/http_client.android.ts → net/http_request.android.ts
View File

@ -1,20 +1,10 @@
/** /**
* Android specific http client implementation. * Android specific http client implementation.
*/ */
import image_module = require("Image/image");
import app_module = require("Application/application"); 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_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;
*/
// TODO: Replace with similar to iOS implementation! // TODO: Replace with similar to iOS implementation!
export function request(options: http.HttpRequestOptions): promises.Promise<http.HttpResponse> { export function request(options: http.HttpRequestOptions): promises.Promise<http.HttpResponse> {

4
net/http_client.d.ts → net/http_request.d.ts vendored
View File

@ -4,10 +4,6 @@
import image_module = require("Image/image"); import image_module = require("Image/image");
import promises = require("promises/promises"); import promises = require("promises/promises");
export declare function getString(url: string): promises.Promise<string>;
export declare function getJSON<T>(url: string): promises.Promise<T>;
export declare function getImage(url: string): promises.Promise<image_module.Image>;
export declare function request(options: HttpRequestOptions): promises.Promise<HttpResponse>; export declare function request(options: HttpRequestOptions): promises.Promise<HttpResponse>;
export interface HttpRequestOptions { export interface HttpRequestOptions {

16
net/http_client.ios.ts → net/http_request.ios.ts
View File

@ -3,16 +3,7 @@
*/ */
import image = require("Image/image"); import image = require("Image/image");
import promises = require("promises/promises"); import promises = require("promises/promises");
import http = require("net/http_client"); import http = require("net/http_request");
/*
// 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;
*/
export function request(options: http.HttpRequestOptions): promises.Promise<http.HttpResponse> { export function request(options: http.HttpRequestOptions): promises.Promise<http.HttpResponse> {
var d = promises.defer<http.HttpResponse>(); var d = promises.defer<http.HttpResponse>();
@ -36,12 +27,13 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
} }
} }
urlRequest.setHTTPBody(Foundation.NSString.initWithString(options.content.toString()).dataUsingEncoding(4)); var content = options.content ? options.content.toString() : "";
urlRequest.setHTTPBody(Foundation.NSString.initWithString(content).dataUsingEncoding(4));
var dataTask = session.dataTaskWithRequestCompletionHandler(urlRequest, var dataTask = session.dataTaskWithRequestCompletionHandler(urlRequest,
function (data, response, error) { function (data, response, error) {
if (error) { if (error) {
d.reject(error); d.reject(new Error(error.localizedDescription()));
} else { } else {
var headers = new Array<http.HttpHeader>(); var headers = new Array<http.HttpHeader>();

2
net/index.ts
View File

@ -1,2 +1,2 @@
declare var module, require; declare var module, require;
module.exports = require("net/http_client"); module.exports = require("net/http");