mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-08-18 13:51:27 +08:00
HttpContent for request also and body renamed to content
This commit is contained in:
@ -43,7 +43,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
|
||||
d.reject(error);
|
||||
} else {
|
||||
d.resolve({
|
||||
body: {
|
||||
content: {
|
||||
toString: () => { return data },
|
||||
toJSON: () => { return JSON.parse(data) },
|
||||
toImage: () => { return image_module.Image.imageFromNativeBitmap(data); }
|
||||
|
4
net/http_client.d.ts
vendored
4
net/http_client.d.ts
vendored
@ -14,7 +14,7 @@ export interface HttpRequestOptions {
|
||||
url: string;
|
||||
method: string;
|
||||
headers?: HttpHeader[];
|
||||
body?: any;
|
||||
content?: HttpContent;
|
||||
}
|
||||
|
||||
export interface HttpHeader {
|
||||
@ -25,7 +25,7 @@ export interface HttpHeader {
|
||||
export interface HttpResponse {
|
||||
statusCode: number;
|
||||
headers: HttpHeader[];
|
||||
body: HttpContent;
|
||||
content?: HttpContent;
|
||||
}
|
||||
|
||||
export interface HttpContent {
|
||||
|
@ -36,9 +36,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof (options.body) == "string") {
|
||||
urlRequest.setHTTPBody(Foundation.NSString.initWithString(options.body).dataUsingEncoding(4));
|
||||
}
|
||||
urlRequest.setHTTPBody(Foundation.NSString.initWithString(options.content.toString()).dataUsingEncoding(4));
|
||||
|
||||
var dataTask = session.dataTaskWithRequestCompletionHandler(urlRequest,
|
||||
function (data, response, error) {
|
||||
@ -57,7 +55,7 @@ export function request(options: http.HttpRequestOptions): promises.Promise<http
|
||||
}
|
||||
|
||||
d.resolve({
|
||||
body: {
|
||||
content: {
|
||||
toString: () => { return NSDataToString(data); },
|
||||
toJSON: () => { return JSON.parse(NSDataToString(data)); },
|
||||
toImage: () => { return image.Image.imageFromData(data); }
|
||||
|
@ -9,7 +9,7 @@ export function getString(url: string): promises.Promise<string> {
|
||||
var d = promises.defer<string>();
|
||||
|
||||
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));
|
||||
|
||||
return d.promise();
|
||||
@ -22,7 +22,7 @@ export function getJSON<T>(url: string): promises.Promise<T> {
|
||||
var d = promises.defer<T>();
|
||||
|
||||
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));
|
||||
|
||||
return d.promise();
|
||||
@ -35,7 +35,7 @@ export function getImage(url: string): promises.Promise<image_module.Image> {
|
||||
var d = promises.defer<image_module.Image>();
|
||||
|
||||
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));
|
||||
|
||||
return d.promise();
|
||||
|
Reference in New Issue
Block a user