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

HttpContent for request also and body renamed to content

Browse Source
This commit is contained in:
Vladimir Enchev
2014-04-24 09:14:37 +03:00
parent 1bf9c1ecaa
commit 9a2ad1d7ef
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/http_client.android.ts
View File

@ -43,7 +43,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
d.reject(error); d.reject(error);
} else { } else {
d.resolve({ d.resolve({
body: { 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 image_module.Image.imageFromNativeBitmap(data); }

4
net/http_client.d.ts vendored
View File

@ -14,7 +14,7 @@ export interface HttpRequestOptions {
url: string; url: string;
method: string; method: string;
headers?: HttpHeader[]; headers?: HttpHeader[];
body?: any; content?: HttpContent;
} }
export interface HttpHeader { export interface HttpHeader {
@ -25,7 +25,7 @@ export interface HttpHeader {
export interface HttpResponse { export interface HttpResponse {
statusCode: number; statusCode: number;
headers: HttpHeader[]; headers: HttpHeader[];
body: HttpContent; content?: HttpContent;
} }
export interface HttpContent { export interface HttpContent {

6
net/http_client.ios.ts
View File

@ -36,9 +36,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
} }
} }
if (typeof (options.body) == "string") { urlRequest.setHTTPBody(Foundation.NSString.initWithString(options.content.toString()).dataUsingEncoding(4));
urlRequest.setHTTPBody(Foundation.NSString.initWithString(options.body).dataUsingEncoding(4));
}
var dataTask = session.dataTaskWithRequestCompletionHandler(urlRequest, var dataTask = session.dataTaskWithRequestCompletionHandler(urlRequest,
function (data, response, error) { function (data, response, error) {
@ -57,7 +55,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
} }
d.resolve({ d.resolve({
body: { 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 image.Image.imageFromData(data); }

6
net/http_common.ts
View File

@ -9,7 +9,7 @@ export function getString(url: string): promises.Promise<string> {
var d = promises.defer<string>(); var d = promises.defer<string>();
http.request({ url: url, method: "GET" }) http.request({ url: url, method: "GET" })
.then(r => d.resolve(r.body.toString())) .then(r => d.resolve(r.content.toString()))
.fail(e => d.reject(e)); .fail(e => d.reject(e));
return d.promise(); return d.promise();
@ -22,7 +22,7 @@ export function getJSON<T>(url: string): promises.Promise<T> {
var d = promises.defer<T>(); var d = promises.defer<T>();
http.request({ url: url, method: "GET" }) http.request({ url: url, method: "GET" })
.then(r => d.resolve(r.body.toJSON())) .then(r => d.resolve(r.content.toJSON()))
.fail(e => d.reject(e)); .fail(e => d.reject(e));
return d.promise(); return d.promise();
@ -35,7 +35,7 @@ export function getImage(url: string): promises.Promise<image_module.Image> {
var d = promises.defer<image_module.Image>(); var d = promises.defer<image_module.Image>();
http.request({ url: url, method: "GET" }) http.request({ url: url, method: "GET" })
.then(r => d.resolve(r.body.toImage())) .then(r => d.resolve(r.content.toImage()))
.fail(e => d.reject(e)); .fail(e => d.reject(e));
return d.promise(); return d.promise();