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

Merge remote-tracking branch 'origin/master' into svetoslavtsenov/merge-release-in-master

Browse Source
This commit is contained in:
SvetoslavTsenov
2019-07-16 13:26:15 +03:00
parent 12fdb82ffe 5e14de6a4e
commit abc143eeac
22 changed files with 104 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/app/xml-parser-tests/xml-parser-tests.ts
View File

@ -54,6 +54,32 @@ export var test_XmlParser_EntityReferencesInAttributeValuesAreDecoded = function
TKUnit.assert(data === "<>\"&'", "Expected result: <>\"&'; Actual result: " + data + ";");
};
export var test_XmlParser_UnicodeEntitiesAreDecoded = function () {
var data;
var xmlParser = new xmlModule.XmlParser(function (event: xmlModule.ParserEvent) {
switch (event.eventType) {
case xmlModule.ParserEventType.Text:
data = event.data;
break;
}
});
xmlParser.parse("<element>&#x1f923;&#x2713;</element>");
TKUnit.assert(data === "\uD83E\uDD23\u2713", "Expected result: \uD83E\uDD23\u2713; Actual result: " + data + ";");
};
export var test_XmlParser_UnicodeEntitiesInAttributeValuesAreDecoded = function () {
var data;
var xmlParser = new xmlModule.XmlParser(function (event: xmlModule.ParserEvent) {
switch (event.eventType) {
case xmlModule.ParserEventType.StartElement:
data = event.attributes["text"];
break;
}
});
xmlParser.parse("<Label text=\"&#x1f923;&#x2713;\"/>");
TKUnit.assert(data === "\uD83E\uDD23\u2713", "Expected result: \uD83E\uDD23\u2713; Actual result: " + data + ";");
};
export var test_XmlParser_OnErrorIsCalledWhenAnErrorOccurs = function () {
var e;
var xmlParser = new xmlModule.XmlParser(

2
tns-core-modules-widgets/package.json
View File

@ -1,6 +1,6 @@
{
"name": "tns-core-modules-widgets",
"version": "6.0.1",
"version": "6.1.0",
"description": "Native widgets used in the NativeScript framework.",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"

2
tns-core-modules/application/application-common.ts
View File

@ -1,5 +1,5 @@
// Require globals first so that snapshot takes __extends function.
require("globals");
require("../globals");
import { Observable, EventData } from "../data/observable";
import { View } from "../ui/core/view";

80
tns-core-modules/bundle-entry-points.ts
View File

@ -4,44 +4,44 @@ if (global.TNS_WEBPACK) {
// Register "dynamically" loaded module that need to be resolved by the
// XML/component builders.
global.registerModule("text/formatted-string", () => require("text/formatted-string"));
global.registerModule("text/span", () => require("text/span"));
global.registerModule("ui/action-bar", () => require("ui/action-bar"));
global.registerModule("ui/activity-indicator", () => require("ui/activity-indicator"));
global.registerModule("ui/border", () => require("ui/border"));
global.registerModule("ui/bottom-navigation", () => require("ui/bottom-navigation"));
global.registerModule("ui/button", () => require("ui/button"));
global.registerModule("ui/content-view", () => require("ui/content-view"));
global.registerModule("ui/date-picker", () => require("ui/date-picker"));
global.registerModule("ui/frame", () => require("ui/frame"));
global.registerModule("ui/html-view", () => require("ui/html-view"));
global.registerModule("ui/image", () => require("ui/image"));
global.registerModule("ui/label", () => require("ui/label"));
global.registerModule("ui/layouts/absolute-layout", () => require("ui/layouts/absolute-layout"));
global.registerModule("ui/layouts/dock-layout", () => require("ui/layouts/dock-layout"));
global.registerModule("ui/layouts/grid-layout", () => require("ui/layouts/grid-layout"));
global.registerModule("ui/layouts/stack-layout", () => require("ui/layouts/stack-layout"));
global.registerModule("ui/layouts/flexbox-layout", () => require("ui/layouts/flexbox-layout"));
global.registerModule("ui/layouts/wrap-layout", () => require("ui/layouts/wrap-layout"));
global.registerModule("ui/list-picker", () => require("ui/list-picker"));
global.registerModule("ui/page", () => require("ui/page"));
global.registerModule("ui/placeholder", () => require("ui/placeholder"));
global.registerModule("ui/progress", () => require("ui/progress"));
global.registerModule("ui/proxy-view-container", () => require("ui/proxy-view-container"));
global.registerModule("ui/repeater", () => require("ui/repeater"));
global.registerModule("ui/scroll-view", () => require("ui/scroll-view"));
global.registerModule("ui/search-bar", () => require("ui/search-bar"));
global.registerModule("ui/segmented-bar", () => require("ui/segmented-bar"));
global.registerModule("ui/slider", () => require("ui/slider"));
global.registerModule("ui/switch", () => require("ui/switch"));
global.registerModule("ui/tab-view", () => require("ui/tab-view"));
global.registerModule("ui/tab-navigation-base/tab-strip", () => require("ui/tab-navigation-base/tab-strip"));
global.registerModule("ui/tab-navigation-base/tab-strip-item", () => require("ui/tab-navigation-base/tab-strip-item"));
global.registerModule("ui/tab-navigation-base/tab-content-item", () => require("ui/tab-navigation-base/tab-content-item"));
global.registerModule("ui/tabs", () => require("ui/tabs"));
global.registerModule("ui/web-view", () => require("ui/web-view"));
global.registerModule("ui/text-field", () => require("ui/text-field"));
global.registerModule("ui/text-view", () => require("ui/text-view"));
global.registerModule("ui/time-picker", () => require("ui/time-picker"));
global.registerModule("ui/list-view", () => require("ui/list-view"));
global.registerModule("text/formatted-string", () => require("./text/formatted-string"));
global.registerModule("text/span", () => require("./text/span"));
global.registerModule("ui/action-bar", () => require("./ui/action-bar"));
global.registerModule("ui/activity-indicator", () => require("./ui/activity-indicator"));
global.registerModule("ui/border", () => require("./ui/border"));
global.registerModule("ui/bottom-navigation", () => require("./ui/bottom-navigation"));
global.registerModule("ui/button", () => require("./ui/button"));
global.registerModule("ui/content-view", () => require("./ui/content-view"));
global.registerModule("ui/date-picker", () => require("./ui/date-picker"));
global.registerModule("ui/frame", () => require("./ui/frame"));
global.registerModule("ui/html-view", () => require("./ui/html-view"));
global.registerModule("ui/image", () => require("./ui/image"));
global.registerModule("ui/label", () => require("./ui/label"));
global.registerModule("ui/layouts/absolute-layout", () => require("./ui/layouts/absolute-layout"));
global.registerModule("ui/layouts/dock-layout", () => require("./ui/layouts/dock-layout"));
global.registerModule("ui/layouts/grid-layout", () => require("./ui/layouts/grid-layout"));
global.registerModule("ui/layouts/stack-layout", () => require("./ui/layouts/stack-layout"));
global.registerModule("ui/layouts/flexbox-layout", () => require("./ui/layouts/flexbox-layout"));
global.registerModule("ui/layouts/wrap-layout", () => require("./ui/layouts/wrap-layout"));
global.registerModule("ui/list-picker", () => require("./ui/list-picker"));
global.registerModule("ui/page", () => require("./ui/page"));
global.registerModule("ui/placeholder", () => require("./ui/placeholder"));
global.registerModule("ui/progress", () => require("./ui/progress"));
global.registerModule("ui/proxy-view-container", () => require("./ui/proxy-view-container"));
global.registerModule("ui/repeater", () => require("./ui/repeater"));
global.registerModule("ui/scroll-view", () => require("./ui/scroll-view"));
global.registerModule("ui/search-bar", () => require("./ui/search-bar"));
global.registerModule("ui/segmented-bar", () => require("./ui/segmented-bar"));
global.registerModule("ui/slider", () => require("./ui/slider"));
global.registerModule("ui/switch", () => require("./ui/switch"));
global.registerModule("ui/tab-view", () => require("./ui/tab-view"));
global.registerModule("ui/tab-navigation-base/tab-strip", () => require("./ui/tab-navigation-base/tab-strip"));
global.registerModule("ui/tab-navigation-base/tab-strip-item", () => require("./ui/tab-navigation-base/tab-strip-item"));
global.registerModule("ui/tab-navigation-base/tab-content-item", () => require("./ui/tab-navigation-base/tab-content-item"));
global.registerModule("ui/tabs", () => require("./ui/tabs"));
global.registerModule("ui/web-view", () => require("./ui/web-view"));
global.registerModule("ui/text-field", () => require("./ui/text-field"));
global.registerModule("ui/text-view", () => require("./ui/text-view"));
global.registerModule("ui/time-picker", () => require("./ui/time-picker"));
global.registerModule("ui/list-view", () => require("./ui/list-view"));
}

2
tns-core-modules/file-system/file-system.ts
View File

@ -17,7 +17,7 @@ function getFileAccess(): FileSystemAccess {
let platform: typeof platformModule;
function ensurePlatform() {
if (!platform) {
platform = require("platform");
platform = require("../platform");
}
}

18
tns-core-modules/globals/globals.ts
View File

@ -27,10 +27,10 @@ global.zonedCallback = function (callback: Function): Function {
}
};
global.registerModule("timer", () => require("timer"));
global.registerModule("ui/dialogs", () => require("ui/dialogs"));
global.registerModule("xhr", () => require("xhr"));
global.registerModule("fetch", () => require("fetch"));
global.registerModule("timer", () => require("../timer"));
global.registerModule("ui/dialogs", () => require("../ui/dialogs"));
global.registerModule("xhr", () => require("../xhr"));
global.registerModule("fetch", () => require("../fetch"));
(<any>global).System = {
import(path) {
@ -65,10 +65,10 @@ export function install() {
if ((<any>global).__snapshot || (<any>global).__snapshotEnabled) {
if (!snapshotGlobals) {
// require in snapshot mode is cheap
const timer: typeof timerModule = require("timer");
const dialogs: typeof dialogsModule = require("ui/dialogs");
const xhr = require("xhr");
const fetch = require("fetch");
const timer: typeof timerModule = require("../timer");
const dialogs: typeof dialogsModule = require("../ui/dialogs");
const xhr = require("../xhr");
const fetch = require("../fetch");
snapshotGlobals = snapshotGlobals || {
setTimeout: timer.setTimeout,
@ -91,7 +91,7 @@ export function install() {
Response: fetch.Response,
};
}
const consoleModule = require("console").Console;
const consoleModule = require("../console").Console;
// Object.assign call will fire an error when trying to write to a read-only property of an object, such as 'console'
global.console = global.console || new consoleModule();
Object.assign(global, snapshotGlobals);

2
tns-core-modules/http/http-request/http-request-common.ts
View File

@ -1,7 +1,7 @@
import * as fsModule from "../../file-system";
export function getFilenameFromUrl(url: string) {
const fs: typeof fsModule = require("file-system");
const fs: typeof fsModule = require("../../file-system");
const slashPos = url.lastIndexOf("/") + 1;
const questionMarkPos = url.lastIndexOf("?");

6
tns-core-modules/http/http-request/http-request.android.ts
View File

@ -27,21 +27,21 @@ const pendingRequests = {};
let imageSource: typeof imageSourceModule;
function ensureImageSource() {
if (!imageSource) {
imageSource = require("image-source");
imageSource = require("../../image-source");
}
}
let platform: typeof platformModule;
function ensurePlatform() {
if (!platform) {
platform = require("platform");
platform = require("../../platform");
}
}
let fs: typeof fsModule;
function ensureFileSystem() {
if (!fs) {
fs = require("file-system");
fs = require("../../file-system");
}
}

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

@ -56,14 +56,14 @@ function ensureSessionNotFollowingRedirects() {
let imageSource: typeof imageSourceModule;
function ensureImageSource() {
if (!imageSource) {
imageSource = require("image-source");
imageSource = require("../../image-source");
}
}
let fs: typeof fsModule;
function ensureFileSystem() {
if (!fs) {
fs = require("file-system");
fs = require("../../file-system");
}
}

4
tns-core-modules/js-libs/easysax/easysax.js
View File

@ -188,10 +188,10 @@ function rpEntities(s, d, x, z) {
};
if (d) {
return String.fromCharCode(d);
return String.fromCodePoint(d);
};
return String.fromCharCode(parseInt(x, 16));
return String.fromCodePoint(parseInt(x, 16));
};
function unEntities(s, i) {

2
tns-core-modules/package.json
View File

@ -1,7 +1,7 @@
{
"name": "tns-core-modules",
"description": "Telerik NativeScript Core Modules",
"version": "6.0.2",
"version": "6.1.0",
"homepage": "https://www.nativescript.org",
"repository": {
"type": "git",

2
tns-core-modules/ui/builder/component-builder/component-builder.ts
View File

@ -53,7 +53,7 @@ const createComponentInstance = profile("createComponentInstance", (elementName:
// Create instance of the component.
instance = new instanceType();
} catch (ex) {
const debug: typeof debugModule = require("utils/debug");
const debug: typeof debugModule = require("../../../utils/debug");
throw new debug.ScopeError(ex, "Module '" + resolvedModuleName + "' not found for element '" + (namespace ? namespace + ":" : "") + elementName + "'.");
}

2
tns-core-modules/ui/core/view-base/view-base.ts
View File

@ -37,7 +37,7 @@ function ensuredomNodeModule(): void {
let styleScopeModule: typeof ssm;
function ensureStyleScopeModule() {
if (!styleScopeModule) {
styleScopeModule = require("ui/styling/style-scope");
styleScopeModule = require("../../styling/style-scope");
}
}

2
tns-core-modules/ui/core/view/view-common.ts
View File

@ -34,7 +34,7 @@ import * as am from "../../animation";
let animationModule: typeof am;
function ensureAnimationModule() {
if (!animationModule) {
animationModule = require("ui/animation");
animationModule = require("../../animation");
}
}

8
tns-core-modules/ui/dialogs/dialogs-common.ts
View File

@ -78,7 +78,7 @@ export module capitalizationType {
let frame: typeof frameModule;
export function getCurrentPage(): Page {
if (!frame) {
frame = require("ui/frame");
frame = require("../frame");
}
let topmostFrame = frame.topmost();
@ -108,7 +108,7 @@ let textField: View;
export function getButtonColors(): { color: Color, backgroundColor: Color } {
if (!button) {
const Button = require("ui/button").Button;
const Button = require("../button").Button;
button = new Button;
if (isIOS) {
button._setupUI({});
@ -127,7 +127,7 @@ export function getButtonColors(): { color: Color, backgroundColor: Color } {
export function getLabelColor(): Color {
if (!label) {
const Label = require("ui/label").Label;
const Label = require("../label").Label;
label = new Label;
if (isIOS) {
label._setupUI({});
@ -144,7 +144,7 @@ export function getLabelColor(): Color {
export function getTextFieldColor(): Color {
if (!textField) {
const TextField = require("ui/text-field").TextField;
const TextField = require("../text-field").TextField;
textField = new TextField();
if (isIOS) {
textField._setupUI({});

2
tns-core-modules/ui/enums/enums.ts
View File

@ -177,7 +177,7 @@ export module AnimationCurve {
export const linear = "linear";
export const spring = "spring";
export function cubicBezier(x1: number, y1: number, x2: number, y2: number): Object {
animation = animation || require("ui/animation");
animation = animation || require("../animation");
return new animation.CubicBezierAnimationCurve(x1, y1 , x2, y2);
}

4
tns-core-modules/ui/frame/frame.android.ts
View File

@ -46,7 +46,7 @@ let fragmentId = -1;
export let moduleLoaded: boolean;
if (global && global.__inspector) {
const devtools = require("tns-core-modules/debugger/devtools-elements");
const devtools = require("../../debugger/devtools-elements");
devtools.attachDOMInspectorEventCallbacks(global.__inspector);
devtools.attachDOMInspectorCommandCallbacks(global.__inspector);
}
@ -754,7 +754,7 @@ function ensureFragmentClass() {
}
// this require will apply the FragmentClass implementation
require("ui/frame/fragment");
require("./fragment");
if (!fragmentClass) {
throw new Error("Failed to initialize the extended androidx.fragment.app.Fragment class");

2
tns-core-modules/ui/frame/frame.d.ts vendored
View File

@ -30,7 +30,7 @@ export class Frame extends View {
* This method will require the module and will check for a Page property in the exports of the module.
* @param pageModuleName The name of the module to require starting from the application root.
* 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:
* const frames = require("ui/frame");
* const frames = require("tns-core-modules/ui/frame");
* frames.topmost().navigate("app/subFolder/myPage");
*/
navigate(pageModuleName: string);

2
tns-core-modules/ui/image-cache/image-cache.ios.ts
View File

@ -8,7 +8,7 @@ import * as utils from "../../utils/utils";
let httpRequest: typeof httpRequestModule;
function ensureHttpRequest() {
if (!httpRequest) {
httpRequest = require("http/http-request");
httpRequest = require("../../http/http-request");
}
}

2
tns-core-modules/ui/styling/style-scope.ts
View File

@ -35,7 +35,7 @@ import * as kam from "../animation/keyframe-animation";
let keyframeAnimationModule: typeof kam;
function ensureKeyframeAnimationModule() {
if (!keyframeAnimationModule) {
keyframeAnimationModule = require("ui/animation/keyframe-animation");
keyframeAnimationModule = require("../animation/keyframe-animation");
}
}

6
tns-core-modules/xml/xml.ts
View File

@ -100,17 +100,17 @@ function _HandleAmpEntities(found: string, decimalValue: string, hexValue: strin
}
const res = _ampCodes.get(wordValue);
if (res) {
return String.fromCharCode(res);
return String.fromCodePoint(res);
}
// Invalid word; so we just return it
return found;
}
if (decimalValue) {
return String.fromCharCode(parseInt(decimalValue, 10));
return String.fromCodePoint(parseInt(decimalValue, 10));
}
return String.fromCharCode(parseInt(hexValue, 16));
return String.fromCodePoint(parseInt(hexValue, 16));
}
export class XmlParser implements definition.XmlParser {

2
tns-platform-declarations/package.json
View File

@ -1,6 +1,6 @@
{
"name": "tns-platform-declarations",
"version": "6.0.2",
"version": "6.1.0",
"description": "Platform-specific TypeScript declarations for NativeScript for accessing native objects",
"main": "",
"scripts": {