javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7204 from NativeScript/myankov/merge-release-master

Browse Source 
chore: merge release to master
This commit is contained in:
Martin Yankov
2019-05-07 08:50:07 +03:00
committed by GitHub
parent b7abb3dd64 c6b6d07f62
commit db4c0243f6
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG.md
View File

@ -1,3 +1,15 @@
## [5.3.2](https://github.com/NativeScript/NativeScript/compare/5.3.1...5.3.2) (2019-05-03)
### Bug Fixes
* no trace message on empty app.css ([#7135](https://github.com/NativeScript/NativeScript/issues/7135)) ([170d2a8](https://github.com/NativeScript/NativeScript/commit/170d2a8))
* **ios:** application.displayedEvent does not depend on trace to fire ([#7141](https://github.com/NativeScript/NativeScript/issues/7141)) ([f6f7b51](https://github.com/NativeScript/NativeScript/commit/f6f7b51))
* **ios:** flat action bar incorrect layout after navigation ([#7077](https://github.com/NativeScript/NativeScript/issues/7077)) ([1dc3952](https://github.com/NativeScript/NativeScript/commit/1dc3952))
* **ios-http-get:** http failure during parsing xml ([#7175](https://github.com/NativeScript/NativeScript/issues/7175)) ([c227c50](https://github.com/NativeScript/NativeScript/commit/c227c50))
## [5.3.1](https://github.com/NativeScript/NativeScript/compare/5.3.0...5.3.1) (2019-03-28) ## [5.3.1](https://github.com/NativeScript/NativeScript/compare/5.3.0...5.3.1) (2019-03-28)

1
package.json
View File

@ -26,7 +26,6 @@
"grunt-simple-mocha": "0.4.1", "grunt-simple-mocha": "0.4.1",
"grunt-ts": "6.0.0-beta.11", "grunt-ts": "6.0.0-beta.11",
"grunt-typedoc": "0.2.4", "grunt-typedoc": "0.2.4",
"http-server": "^0.9.0",
"madge": "^2.2.0", "madge": "^2.2.0",
"markdown-snippet-injector": "0.2.2", "markdown-snippet-injector": "0.2.2",
"mocha": "^3.5.0", "mocha": "^3.5.0",

16
tns-core-modules/http/http-request/http-request.ios.ts
View File

@ -197,11 +197,21 @@ export function request(options: httpModule.HttpRequestOptions): Promise<httpMod
} }
function NSDataToString(data: any, encoding?: HttpResponseEncoding): string { function NSDataToString(data: any, encoding?: HttpResponseEncoding): string {
let code = 4; //UTF8 let code = NSUTF8StringEncoding; // long:4
if (encoding === HttpResponseEncoding.GBK) { if (encoding === HttpResponseEncoding.GBK) {
code = 1586; code = CFStringEncodings.kCFStringEncodingGB_18030_2000; // long:1586
} }
return NSString.alloc().initWithDataEncoding(data, code).toString();
let encodedString = NSString.alloc().initWithDataEncoding(data, code);
// If UTF8 string encoding fails try with ISO-8859-1
if (!encodedString) {
code = NSISOLatin1StringEncoding; // long:5
encodedString = NSString.alloc().initWithDataEncoding(data, code);
}
return encodedString.toString();
} }
export function addHeader(headers: httpModule.Headers, key: string, value: string): void { export function addHeader(headers: httpModule.Headers, key: string, value: string): void {