8000 Merge remote-tracking branch 'origin/master' into svetoslavtsenov/mer… · NativeScript/NativeScript@b8a6d1d · GitHub
[go: up one dir, main page]
Skip to content

Commit b8a6d1d

Browse files
SvetoslavTsenovSvetoslavTsenov
committed
Merge remote-tracking branch 'origin/master' into svetoslavtsenov/merge-tests-in-master
2 parents 5957551 + e72aaca commit b8a6d1d

File tree

22 files changed

+104
-78
lines changed

22 files changed

+104
-78
lines changed

‎tests/app/xml-parser-tests/xml-parser-tests.ts

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,32 @@ export var test_XmlParser_EntityReferencesInAttributeValuesAreDecoded = function
5454
TKUnit.assert(data === "<>\"&'", "Expected result: <>\"&'; Actual result: " + data + ";");
5555
};
5656

57+
export var test_XmlParser_UnicodeEntitiesAreDecoded = function () {
58+
var data;
59+
var xmlParser = new xmlModule.XmlParser(function (event: xmlModule.ParserEvent) {
60+
switch (event.eventType) {
61+
case xmlModule.ParserEventType.Text:
62+
data = event.data;
63+
break;
64+
}
65+
});
66+
xmlParser.parse("<element>&#x1f923;&#x2713;</element>");
67+
TKUnit.assert(data === "\uD83E\uDD23\u2713", "Expected result: \uD83E\uDD23\u2713; Actual result: " + data + ";");
68+
};
69+
70+
export var test_XmlParser_UnicodeEntitiesInAttributeValuesAreDecoded = function () {
71+
var data;
72+
var xmlParser = new xmlModule.XmlParser(function (event: xmlModule.ParserEvent) {
73+
switch (event.eventType) {
74+
case xmlModule.ParserEventType.StartElement:
75+
data = event.attributes["text"];
76+
break;
77+
}
78+
});
79+
xmlParser.parse("<Label text=\"&#x1f923;&#x2713;\"/>");
80+
TKUnit.assert(data === "\uD83E\uDD23\u2713", "Expected result: \uD83E\uDD23\u2713; Actual result: " + data + ";");
81+
};
82+
5783
export var test_XmlParser_OnErrorIsCalledWhenAnErrorOccurs = function () {
5884
var e;
5985
var xmlParser = new xmlModule.XmlParser(

‎tns-core-modules-widgets/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tns-core-modules-widgets",
3-
"version": "6.0.1",
3+
"version": "6.1.0",
44
"description": "Native widgets used in the NativeScript framework.",
55
"scripts": {
66
"test": "echo \"Error: no test specified\" && exit 1"

‎tns-core-modules/application/application-common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Require globals first so that snapshot takes __extends function.
2-
require("globals");
2+
require("../globals");
33

44
import { Observable, EventData } from "../data/observable";
55
import { View } from "../ui/core/view";

‎tns-core-modules/bundle-entry-points.ts

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,44 @@ if (global.TNS_WEBPACK) {
44
// Register "dynamically" loaded module that need to be resolved by the
55
// XML/component builders.
66

7-
global.registerModule("text/formatted-string", () => require("text/formatted-string"));
8-
global.registerModule("text/span", () => require("text/span"));
9-
global.registerModule("ui/action-bar", () => require("ui/action-bar"));
10-
global.registerModule("ui/activity-indicator", () => require("ui/activity-indicator"));
11-
global.registerModule("ui/border", () => require("ui/border"));
12-
global.registerModule("ui/bottom-navigation", () => require("ui/bottom-navigation"));
13-
global.registerModule("ui/button", () => require("ui/button"));
14-
global.registerModule("ui/content-view", () => require("ui/content-view"));
15-
global.registerModule("ui/date-picker", () => require("ui/date-picker"));
16-
global.registerModule("ui/frame", () => require("ui/frame"));
17-
global.registerModule("ui/html-view", () => require("ui/html-view"));
18-
global.registerModule("ui/image", () => require("ui/image"));
19-
global.registerModule("ui/label", () => require("ui/label"));
20-
global.registerModule("ui/layouts/absolute-layout", () => require("ui/layouts/absolute-layout"));
21-
global.registerModule("ui/layouts/dock-layout", () => require("ui/layouts/dock-layout"));
22-
global.registerModule("ui/layouts/grid-layout", () => require("ui/layouts/grid-layout"));
23-
global.registerModule("ui/layouts/stack-layout", () => require("ui/layouts/stack-layout"));
24-
global.registerModule("ui/layouts/flexbox-layout", () => require("ui/layouts/flexbox-layout"));
25-
global.registerModule("ui/layouts/wrap-layout", () => require("ui/layouts/wrap-layout"));
26-
global.registerModule("ui/list-picker", () => require("ui/list-picker"));
27-
global.registerModule("ui/page", () => require("ui/page"));
28-
global.registerModule("ui/placeholder", () => require("ui/placeholder"));
29-
global.registerModule("ui/progress", () => require("ui/progress"));
30-
global.registerModule("ui/proxy-view-container", () => require("ui/proxy-view-container"));
31-
global.registerModule("ui/repeater", () => require("ui/repeater"));
32-
global.registerModule("ui/scroll-view", () => require("ui/scroll-view"));
33-
global.registerModule("ui/search-bar", () => require("ui/search-bar"));
34-
global.registerModule("ui/segmented-bar", () => require("ui/segmented-bar"));
35-
global.registerModule("ui/slider", () => require("ui/slider"));
36-
global.registerModule("ui/switch", () => require("ui/switch"));
37-
global.registerModule("ui/tab-view", () => require("ui/tab-view"));
38-
global.registerModule("ui/tab-navigation-base/tab-strip", () => require("ui/tab-navigation-base/tab-strip"));
39-
global.registerModule("ui/tab-navigation-base/tab-strip-item", () => require("ui/tab-navigation-base/tab-strip-item"));
40-
global.registerModule("ui/tab-navigation-base/tab-content-item", () => require("ui/tab-navigation-base/tab-content-item"));
41-
global.registerModule("ui/tabs", () => require("ui/tabs"));
42-
global.registerModule("ui/web-view", () => require("ui/web-view"));
43-
global.registerModule("ui/text-field", () => require("ui/text-field"));
44-
global.registerModule("ui/text-view", () => require("ui/text-view"));
45-
global.registerModule("ui/time-picker", () => require("ui/time-picker"));
46-
global.registerModule("ui/list-view", () => require("ui/list-view"));
7+
global.registerModule("text/formatted-string", () => require("./text/formatted-string"));
8+
global.registerModule("text/span", () => require("./text/span"));
9+
global.registerModule("ui/action-bar", () => require("./ui/action-bar"));
10+
global.registerModule("ui/activity-indicator", () => require("./ui/activity-indicator"));
11+
global.registerModule("ui/border", () => require("./ui/border"));
12+
global.registerModule("ui/bottom-navigation", () => require("./ui/bottom-navigation"));
13+
global.registerModule("ui/button", () => require("./ui/button"));
14+
global.registerModule("ui/content-view", () => require("./ui/content-view"));
15+
global.registerModule("ui/date-picker", () => require("./ui/date-picker"));
16+
global.registerModule("ui/frame", () => require("./ui/frame"));
17+
global.registerModule("ui/html-view", () => require("./ui/html-view"));
18+
global.registerModule("ui/image", () => require("./ui/image"));
19+
global.registerModule("ui/label", () => require("./ui/label"));
20+
global.registerModule("ui/layouts/absolute-layout", () => require("./ui/layouts/absolute-layout"));
21+
global.registerModule("ui/layouts/dock-layout", () => require("./ui/layouts/dock-layout"));
22+
global.registerModule("ui/layouts/grid-layout", () => require("./ui/layouts/grid-layout"));
23+
global.registerModule("ui/layouts/stack-layout", () => require("./ui/layouts/stack-layout"));
24+
global.registerModule("ui/layouts/flexbox-layout", () => require("./ui/layouts/flexbox-layout"));
25+
global.registerModule("ui/layouts/wrap-layout", () => require("./ui/layouts/wrap-layout"));
26+
global.registerModule("ui/list-picker", () => require("./ui/list-picker"));
27+
global.registerModule("ui/page", () => require("./ui/page"));
28+
global.registerModule("ui/placeholder", () => require("./ui/placeholder"));
29+
global.registerModule("ui/progress", () => require("./ui/progress"));
30+
global.registerModule("ui/proxy-view-container", () => require("./ui/proxy-view-container"));
31+
global.registerModule("ui/repeater", () => require("./ui/repeater"));
32+
global.registerModule("ui/scroll-view", () => require("./ui/scroll-view"));
33+
global.registerModule("ui/search-bar", () => require("./ui/search-bar"));
34+
global.registerModule("ui/segmented-bar", () => require("./ui/segmented-bar"));
35+
global.registerModule("ui/slider", () => require("./ui/slider"));
36+
global.registerModule("ui/switch", () => require("./ui/switch"));
37+
global.registerModule("ui/tab-view", () => require("./ui/tab-view"));
38+
global.registerModule("ui/tab-navigation-base/tab-strip", () => require("./ui/tab-navigation-base/tab-strip"));
39+
global.registerModule("ui/tab-navigation-base/tab-strip-item", () => require("./ui/tab-navigation-base/tab-strip-item"));
40+
global.registerModule("ui/tab-navigation-base/tab-content-item", () => require("./ui/tab-navigation-base/tab-content-item"));
41+
global.registerModule("ui/tabs", () => require("./ui/tabs"));
42+
global.registerModule("ui/web-view", () => require("./ui/web-view"));
43+
global.registerModule("ui/text-field", () => require("./ui/text-field"));
44+
global.registerModule("ui/text-view", () => require("./ui/text-view"));
45+
global.registerModule("ui/time-picker", () => require("./ui/time-picker"));
46+
global.registerModule("ui/list-view", () => require("./ui/list-view"));
4747
}

‎tns-core-modules/file-system/file-system.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function getFileAccess(): FileSystemAccess {
1717
let platform: typeof platformModule;
1818
function ensurePlatform() {
1919
if (!platform) {
20-
platform = require("platform");
20+
platform = require("../platform");
2121
}
2222
}
2323

‎tns-core-modules/globals/globals.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ global.zonedCallback = function (callback: Function): Function {
2727
}
2828
};
2929

30-
global.registerModule("timer", () => require("timer"));
31-
global.registerModule("ui/dialogs", () => require("ui/dialogs"));
32-
global.registerModule("xhr", () => require("xhr"));
33-
global.registerModule("fetch", () => require("fetch"));
30+
global.registerModule("timer", () => require("../timer"));
31+
global.registerModule("ui/dialogs", () => require("../ui/dialogs"));
32+
global.registerModule("xhr", () => require("../xhr"));
33+
global.registerModule("fetch", () => require("../fetch"));
3434

3535
(<any>global).System = {
3636
import(path) {
@@ -65,10 +65,10 @@ export function install() {
6565
if ((<any>global).__snapshot || (<any>global).__snapshotEnabled) {
6666
if (!snapshotGlobals) {
6767
// require in snapshot mode is cheap
68-
const timer: typeof timerModule = require("timer");
69-
const dialogs: typeof dialogsModule = require("ui/dialogs");
70-
const xhr = require("xhr");
71-
const fetch = require("fetch");
68+
const timer: typeof timerModule = require("../timer");
69+
const dialogs: typeof dialogsModule = require("../ui/dialogs");
70+
const xhr = require("../xhr");
71+
const fetch = require("../fetch");
7272

7373
snapshotGlobals = snapshotGlobals || {
7474
setTimeout: timer.setTimeout,
@@ -91,7 +91,7 @@ export function install() {
9191
Response: fetch.Response,
9292
};
9393
}
94-
const consoleModule = require("console").Console;
94+
const consoleModule = require("../console").Console;
9595
// Object.assign call will fire an error when trying to write to a read-only property of an object, such as 'console'
9696
global.console = global.console || new consoleModule();
9797
Object.assign(global, snapshotGlobals);

‎tns-core-modules/http/http-request/http-request-common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as fsModule from "../../file-system";
22

33
export function getFilenameFromUrl(url: string) {
4-
const fs: typeof fsModule = require("file-system");
4+
const fs: typeof fsModule = require("../../file-system");
55
const slashPos = url.lastIndexOf("/") + 1;
66
const questionMarkPos = url.lastIndexOf("?");
77

‎tns-core-modules/http/http-request/http-request.android.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ const pendingRequests = {};
2727
let imageSource: typeof imageSourceModule;
2828
function ensureImageSource() {
2929
if (!imageSource) {
30-
imageSource = require("image-source");
30+
imageSource = require("../../image-source");
3131
}
3232
}
3333

3434
let platform: typeof platformModule;
3535
function ensurePlatform() {
3636
if (!platform) {
37-
platform = require("platform");
37+
platform = require("../../platform");
3838
}
3939
}
4040

4141
let fs: typeof fsModule;
4242
function ensureFileSystem() {
4343
if (!fs) {
44-
fs = require("file-system");
44+
fs = require("../../file-system");
4545
}
4646
}
4747

‎tns-core-modules/http/http-request/http-request.ios.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ function ensureSessionNotFollowingRedirects() {
5656
let imageSource: typeof imageSourceModule;
5757
function ensureImageSource() {
5858
if (!imageSource) {
59-
imageSource = require("image-source");
59+
imageSource = require("../../image-source");
6060
}
6161
}
6262

6363
let fs: typeof fsModule;
6464
function ensureFileSystem() {
6565
if (!fs) {
66-
fs = require("file-system");
66+
fs = require("../../file-system");
6767
}
6868
}
6969

‎tns-core-modules/js-libs/easysax/easysax.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,10 @@ function rpEntities(s, d, x, z) {
188188
};
189189

190190
if (d) {
191-
return String.fromCharCode(d);
191+
return String.fromCodePoint(d);
192192
};
193193

194-
return String.fromCharCode(parseInt(x, 16));
194+
return String.fromCodePoint(parseInt(x, 16));
195195
};
196196

197197
function unEntities(s, i) {

‎tns-core-modules/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tns-core-modules",
33
"description": "Telerik NativeScript Core Modules",
4-
"version": "6.0.2",
4+
"version": "6.1.0",
55
"homepage": "https://www.nativescript.org",
66
"repository": {
77
"type": "git",

‎tns-core-modules/ui/builder/component-builder/component-builder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const createComponentInstance = profile("createComponentInstance", (elementName:
5353
// Create instance of the component.
5454
instance = new instanceType();
5555
} catch (ex) {
56-
const debug: typeof debugModule = require("utils/debug");
56+
const debug: typeof debugModule = require("../../../utils/debug");
5757
throw new debug.ScopeError(ex, "Module '" + resolvedModuleName + "' not found for element '" + (namespace ? namespace + ":" : "") + elementName + "'.");
5858
}
5959

‎tns-core-modules/ui/core/view-base/view-base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function ensuredomNodeModule(): void {
3737
let styleScopeModule: typeof ssm;
3838
function ensureStyleScopeModule() {
3939
if (!styleScopeModule) {
40-
styleScopeModule = require("ui/styling/style-scope");
40+
styleScopeModule = require("../../styling/style-scope");
4141
}
4242
}
4343

‎tns-core-modules/ui/core/view/view-common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import * as am from "../../animation";
3434
let animationModule: typeof am;
3535
function ensureAnimationModule() {
3636
if (!animationModule) {
37-
animationModule = require("ui/animation");
37+
animationModule = require("../../animation");
3838
}
3939
}
4040

‎tns-core-modules/ui/dialogs/dialogs-common.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export module capitalizationType {
7878
let frame: typeof frameModule;
7979
export function getCurrentPage(): Page {
8080
if (!frame) {
81-
frame = require("ui/frame");
81+
frame = require("../frame");
8282
}
8383

8484
let topmostFrame = frame.topmost();
@@ -108,7 +108,7 @@ let textField: View;
108108

109109
export function getButtonColors(): { color: Color, backgroundColor: Color } {
110110
if (!button) {
111-
const Button = require("ui/button").Button;
111+
const Button = require("../button").Button;
112112
button = new Button;
113113
if (isIOS) {
114114
button._setupUI({});
@@ -127,7 +127,7 @@ export function getButtonColors(): { color: Color, backgroundColor: Color } {
127127

128128
export function getLabelColor(): Color {
129129
if (!label) {
130-
const Label = require("ui/label").Label;
130+
const Label = require("../label").Label;
131131
label = new Label;
132132
if (isIOS) {
133133
label._setupUI({});
@@ -144,7 +144,7 @@ export function getLabelColor(): Color {
144144

145145
export function getTextFieldColor(): Color {
146146
if (!textField) {
147-
const TextField = require("ui/text-field").TextField;
147+
const TextField = require("../text-field").TextField;
148148
textField = new TextField();
149149
if (isIOS) {
150150
textField._setupUI({});

‎tns-core-modules/ui/enums/enums.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export module AnimationCurve {
177177
export const linear = "linear";
178178
export const spring = "spring";
179179
export function cubicBezier(x1: number, y1: number, x2: number, y2: number): Object {
180-
animation = animation || require("ui/animation");
180+
animation = animation || require("../animation");
181181

182182
return new animation.CubicBezierAnimationCurve(x1, y1 , x2, y2);
183183
}

‎tns-core-modules/ui/frame/frame.android.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ let fragmentId = -1;
4646
export let moduleLoaded: boolean;
4747

4848
if (global && global.__inspector) {
49-
const devtools = require("tns-core-modules/debugger/devtools-elements");
49+
const devtools = require("../../debugger/devtools-elements");
5050
devtools.attachDOMInspectorEventCallbacks(global.__inspector);
5151
devtools.attachDOMInspectorCommandCallbacks(global.__inspector);
5252
}
@@ -754,7 +754,7 @@ function ensureFragmentClass() {
754754
}
755755

756756
// this require will apply the FragmentClass implementation
757-
require("ui/frame/fragment");
757+
require("./fragment");
758758

759759
if (!fragmentClass) {
760760
throw new Error("Failed to initialize the extended androidx.fragment.app.Fragment class");

‎tns-core-modules/ui/frame/frame.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class Frame extends View {
3030
* This method will require the module and will check for a Page property in the exports of the module.
3131
* @param pageModuleName The name of the module to require starting from the application root.
3232
* For example if you want to navigate to page called "myPage.js" in a folder called "subFolder" and your root folder is "app" you can call navigate method like this:
33-
* const frames = require("ui/frame");
33+
* const frames = require("tns-core-modules/ui/frame");
3434
* frames.topmost().navigate("app/subFolder/myPage");
3535
*/
3636
navigate(pageModuleName: string);

‎tns-core-modules/ui/image-cache/image-cache.ios.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as utils from "../../utils/utils";
88
let httpRequest: typeof httpRequestModule;
99
function ensureHttpRequest() {
1010
if (!httpRequest) {
11-
httpRequest = require("http/http-request");
11+
httpRequest = require("../../http/http-request");
1212
}
1313
}
1414

‎tns-core-modules/ui/styling/style-scope.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import * as kam from "../animation/keyframe-animation";
3535
let keyframeAnimationModule: typeof kam;
3636
function ensureKeyframeAnimationModule() {
3737
if (!keyframeAnimationModule) {
38-
keyframeAnimationModule = require("ui/animation/keyframe-animation");
38+
keyframeAnimationModule = require("../animation/keyframe-animation");
3939
}
4040
}
4141

‎tns-core-modules/xml/xml.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,17 @@ function _HandleAmpEntities(found: string, decimalValue: string, hexValue: strin
100100
}
101101
const res = _ampCodes.get(wordValue);
102102
if (res) {
103-
return String.fromCharCode(res);
103+
return String.fromCodePoint(res);
104104
}
105105

106106
// Invalid word; so we just return it
107107
return found;
108108
}
109109
if (decimalValue) {
110-
return String.fromCharCode(parseInt(decimalValue, 10));
110+
return String.fromCodePoint(parseInt(decimalValue, 10));
111111
}
112112

113-
return String.fromCharCode(parseInt(hexValue, 16));
113+
return String.fromCodePoint(parseInt(hexValue, 16));
114114
}
115115

116116
export class XmlParser implements definition.XmlParser {

‎tns-platform-declarations/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "tns-platform-declarations",
3-
"version": "6.0.2",
3+
"version": "6.1.0",
44
"description": "Platform-specific TypeScript declarations for NativeScript for accessing native objects",
55
"main": "",
66
"scripts": {

0 commit comments

Comments
 (0)
0