javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +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

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);