Skip to content
This repository was archived by the owner on Nov 17, 2022. It is now read-only.

Commit 20f0468

Browse files
NickIlievNickIliev
authored
Merge branch 'master' into patch-1
2 parents 48c9965 + acd7c5f commit 20f0468

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+248
-187
lines changed

‎build/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ RUN apk add --update \
1212
rsync \
1313
nginx \
1414
nodejs \
15+
&& npm config set unsafe-perm true \
1516
&& rm -rf /var/cache/apk/* \
1617
&& npm config set cache /var --global \
1718
&& npm install -g grunt \

‎build/_assets/javascripts/app.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,11 @@ $(function(){
325325
}
326326
});
327327

328-
topElement = $('.right-nav__tree [href$="#' + topElement.id + '"]');
328+
var prevParent = $(topElement).prevAll("h2")[0];
329+
330+
topElement = $('.right-nav__tree' +
331+
(prevParent && topElement.nodeName !== "H2" ? ' [href$="#' + prevParent.id + '"] + ul' : '') +
332+
' [href$="#' + topElement.id + '"]');
329333

330334
if (topElement[0]) {
331335
$(".right-nav__tree a").removeClass("ns-state-selected");

‎build/_assets/stylesheets/styles.css

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,14 @@ html .k-panelbar-expand.k-icon {
519519
height: 4.71em;
520520
}
521521

522+
.ns-flavor-header a {
523+
color: var(--color-dark);
524+
}
525+
526+
.ns-flavor-header a:hover .flavor-header__title:after {
527+
color: var(--color-success);
528+
}
529+
522530
.flavor-header__search {
523531
flex: 1;
524532
padding-left: 3.57em;
@@ -707,6 +715,10 @@ html.ns-root .-hidden {
707715
}
708716

709717
.side-nav__burger-menu {
718+
border-radius: 4px;
719+
}
720+
721+
.side-nav__burger-input:checked + .side-nav__burger-menu {
710722
border-radius: 12px;
711723
}
712724

@@ -969,6 +981,7 @@ blockquote {
969981
border: 1px solid var(--border-light-blue);
970982
padding: 1.25em 1.25em 1.25em 5.63em;
971983
min-height: 3em;
984+
border-radius: 4px;
972985
}
973986

974987
blockquote:before {
@@ -1021,6 +1034,7 @@ html .ns-navigation .navigation__right .k-menu .k-item .ns-button {
10211034
margin: 0 .36em;
10221035
}
10231036

1037+
.ns-feedback .ns-button,
10241038
.footer__contribute > .ns-button,
10251039
html .ns-navigation .navigation__right .k-menu .k-item .ns-button {
10261040
height: 2.25em;
@@ -1477,7 +1491,7 @@ html .fb_iframe_widget {
14771491
}
14781492

14791493
.ns-feedback .ns-button {
1480-
font-size: 1.2em;
1494+
font-size: 1.135em;
14811495
}
14821496

14831497
/* Sitemap */
@@ -1528,7 +1542,7 @@ html .fb_iframe_widget {
15281542
}
15291543

15301544
.footer__contribute .ns-button {
1531-
font-size: .9em;
1545+
font-size: .895em;
15321546
}
15331547

15341548
.footer__contribute > * {
@@ -1976,10 +1990,11 @@ article table {
19761990
width: 100%;
19771991
margin: 1.25em 0;
19781992
text-align: left;
1979-
border-collapse: collapse;
19801993
border: 1px solid var(--border-light-blue);
19811994
font-weight: 400;
19821995
background: var(--color-light);
1996+
border-radius: 4px;
1997+
border-spacing: 0;
19831998
}
19841999

19852000
article table tr {
@@ -2068,6 +2083,7 @@ pre[class*="language-"] {
20682083
overflow: auto;
20692084
background: var(--color-light);
20702085
border: 1px solid var(--border-light-blue);
2086+
border-radius: 4px;
20712087
}
20722088

20732089
/* Inline code */
@@ -2596,6 +2612,11 @@ html .gsc-result .gs-title {
25962612
margin-top: -2.6em;
25972613
padding: 2.6em 1.72em 0 0;
25982614
width: calc(100% - 1.66em);
2615+
border-radius: 4px;
2616+
}
2617+
2618+
.side-nav__burger-input:checked + .side-nav__burger-menu {
2619+
border-radius: 4px;
25992620
}
26002621

26012622
.side-nav__tree > .k-group:first-child {

‎build/_includes/footer.html

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,43 +13,41 @@
1313
<div>
1414
<h5 class="-allcaps">Framework</h5>
1515
<ul class="List0 HighlightList -ff-prim">
16-
<li><a href="https://docs.nativescript.org" target="_blank">Docs</a></li>
17-
<li><a href="{{site.headerbaseurl}}/showcases">Showcases</a></li>
18-
<li><a href="{{site.headerbaseurl}}/nativescript-is-how-you-build-native-mobile-apps-with-angular">Angular
19-
Integration</a></li>
20-
<li><a href="{{site.headerbaseurl}}/vue">Vue Integration</a></li>
16+
<li><a href="https://docs.nativescript.org">Docs</a></li>
17+
<li><a href="{{site.headerbaseurl}}/nativescript-is-how-you-build-native-mobile-apps-with-angular">Angular Integration</a></li>
18+
<li><a href="{{site.headerbaseurl}}/vue">Vue.js Integration</a></li>
19+
<li><a href="{{site.headerbaseurl}}/showcases">Customer Showcases</a></li>
20+
<li><a href="{{site.headerbaseurl}}/roadmap-and-releases">Roadmap &amp; Release Notes</a></li>
2121
</ul>
2222
</div>
2323
<div>
2424
<h5 class="-allcaps">Developers</h5>
2525
<ul class="List0 HighlightList -ff-prim">
2626
<li><a href="https://play.nativescript.org">Playground</a></li>
27-
<li><a href="https://market.nativescript.org/?tab=samples&amp;framework=all_frameworks&amp;category=all_samples">Code
28-
Samples</a>
29-
</li>
27+
<li><a href="https://market.nativescript.org/?tab=samples&framework=all_frameworks&category=all_samples">Code Samples</a></li>
3028
<li><a href="{{site.headerbaseurl}}/books-and-videos">Books &amp; Videos</a></li>
31-
<li><a href="https://market.nativescript.org/?tab=templates">App Templates</a></li>
29+
<li><a href="https://market.nativescript.org/?tab=templates&category=all_templates">App Templates</a></li>
3230
<li><a href="https://github.com/NativeScript/NativeScript" target="_blank">GitHub</a></li>
3331
</ul>
3432
</div>
3533
<div>
3634
<h5 class="-allcaps">Tools</h5>
3735
<ul class="List0 HighlightList -ff-prim">
38-
<li><a href="https://www.npmjs.com/package/nativescript">CLI</a></li>
36+
<li><a href="https://www.npmjs.com/package/nativescript" target="_blank">CLI</a></li>
3937
<li><a href="{{site.headerbaseurl}}/nativescript-sidekick">Sidekick</a></li>
4038
<li><a href="{{site.headerbaseurl}}/nativescript-for-visual-studio-code">VS Code Plugin</a></li>
39+
<li><a href="https://marketplace.visualstudio.com/items?itemName=TelerikInc.NativeScriptSidekickForVisualStudio" target="_blank">Visual Studio Extension</a></li>
4140
<li><a href="https://market.nativescript.org">Plugins</a></li>
4241
<li><a href="{{site.headerbaseurl}}/ui-for-nativescript">NativeScript UI</a></li>
4342
</ul>
4443
</div>
4544
<div>
4645
<h5 class="-allcaps">Support</h5>
4746
<ul class="List0 HighlightList -ff-prim">
48-
<li><a href="https://stackoverflow.com/questions/tagged/nativescript">Stack Overflow</a></li>
47+
<li><a href="https://stackoverflow.com/questions/tagged/nativescript" target="_blank">Stack Overflow</a></li>
4948
<li><a href="{{site.headerbaseurl}}/faq">FAQs</a></li>
50-
<li><a href="http://tinyurl.com/nativeScriptSlack">Slack</a></li>
51-
<li><a href="{{site.headerbaseurl}}/support">Developer Support</a></li>
52-
<li><a href="{{site.headerbaseurl}}/roadmap-and-releases">Roadmap &amp; Release Notes</a></li>
49+
<li><a href="{{site.headerbaseurl}}/slack-invitation-form">Slack</a></li>
50+
<li><a href="{{site.headerbaseurl}}/support">Professional Support</a></li>
5351
<li><a href="{{site.headerbaseurl}}/contact">Contact Us</a></li>
5452
</ul>
5553
</div>
@@ -59,6 +57,7 @@ <h5 class="-allcaps">Enterprise</h5>
5957
<li><a href="{{site.headerbaseurl}}/enterprise">Enterprise Support</a></li>
6058
<li><a href="{{site.headerbaseurl}}/ctos-guide">CTO&rsquo;s Guide</a></li>
6159
<li><a href="{{site.headerbaseurl}}/preferred-partners">Preferred Partners</a></li>
60+
<li><a href="https://www.progress.com/kinvey" target="_blank">Progress Kinvey</a></li>
6261
</ul>
6362
</div>
6463
</div>

‎build/_includes/header.html

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@
55
<li>
66
<span>Framework</span>
77
<ul>
8-
<li><a href="https://docs.nativescript.org" class="k-state-selected">Docs</a></li>
9-
<li><a href="{{site.headerbaseurl}}/showcases">Showcases</a></li>
108
<li><a href="{{site.headerbaseurl}}/nativescript-is-how-you-build-native-mobile-apps-with-angular">Angular Integration</a></li>
11-
<li><a href="{{site.headerbaseurl}}/vue">Vue Integration</a></li>
9+
<li><a href="{{site.headerbaseurl}}/vue">Vue.js Integration</a></li>
10+
<li><a href="{{site.headerbaseurl}}/showcases">Customer Showcases</a></li>
11+
<li><a href="{{site.headerbaseurl}}/roadmap-and-releases">Roadmap &amp; Release Notes</a></li>
1212
</ul>
1313
</li>
1414
<li>
1515
<span>Developers</span>
1616
<ul>
1717
<li><a href="https://play.nativescript.org">Playground</a></li>
18-
<li><a href="https://market.nativescript.org/?tab=samples">Code Samples</a></li>
19-
<li><a href="https://market.nativescript.org/?tab=templates">App Templates</a></li>
18+
<li><a href="https://market.nativescript.org/?tab=samples&framework=all_frameworks&category=all_samples">Code Samples</a></li>
2019
<li><a href="{{site.headerbaseurl}}/books-and-videos">Books &amp; Videos</a></li>
21-
<!-- <li><a href="#">API Reference</a></li> -->
22-
<li><a href="https://github.com/NativeScript/NativeScript" target="_blank">GitHub</a></li>
20+
<li><a href="https://market.nativescript.org/?tab=templates&category=all_templates">App Templates</a></li>
21+
<!--<li><a href="https://github.com/NativeScript/NativeScript" target="_blank">GitHub</a></li>-->
2322
</ul>
2423
</li>
2524
<li>
@@ -28,20 +27,18 @@
2827
<li><a href="https://www.npmjs.com/package/nativescript" target="_blank">CLI</a></li>
2928
<li><a href="{{site.headerbaseurl}}/nativescript-sidekick">Sidekick</a></li>
3029
<li><a href="{{site.headerbaseurl}}/nativescript-for-visual-studio-code">VS Code Plugin</a></li>
31-
<!--<li><a href="https://marketplace.visualstudio.com/items?itemName=Telerik.nativescript" target="_blank">Visual Studio Extension</a></li>-->
30+
<li><a href="https://marketplace.visualstudio.com/items?itemName=TelerikInc.NativeScriptSidekickForVisualStudio">Visual Studio Extension</a></li>
3231
<li><a href="https://market.nativescript.org">Plugins</a></li>
3332
<li><a href="{{site.headerbaseurl}}/ui-for-nativescript">NativeScript UI</a></li>
3433
</ul>
3534
</li>
3635
<li>
3736
<span>Support</span>
3837
<ul>
39-
<li><a href="https://stackoverflow.com/questions/tagged/nativescript">Stack Overflow</a></li>
38+
<li><a href="https://stackoverflow.com/questions/tagged/nativescript" target="_blank">Stack Overflow</a></li>
4039
<li><a href="{{site.headerbaseurl}}/faq">FAQs</a></li>
41-
<li><a href="http://tinyurl.com/nativeScriptSlack" target="_blank">Slack</a></li>
42-
<li><a href="{{site.headerbaseurl}}/developer-support">Developer Support</a></li>
43-
<li><a href="{{site.headerbaseurl}}/roadmap-and-releases">Roadmap &amp; Release Notes</a></li>
44-
<!-- <li><a href="#">Meetups & Events</a></li> -->
40+
<li><a href="{{site.headerbaseurl}}/slack-invitation-form">Slack</a></li>
41+
<li><a href="{{site.headerbaseurl}}/developer-support">Professional Support</a></li>
4542
<li><a href="{{site.headerbaseurl}}/contact">Contact Us</a></li>
4643
</ul>
4744
</li>
@@ -51,6 +48,7 @@
5148
<li><a href="{{site.headerbaseurl}}/enterprise">Enterprise Support</a></li>
5249
<li><a href="{{site.headerbaseurl}}/ctos-guide">CTO&rsquo;s Guide</a></li>
5350
<li><a href="{{site.headerbaseurl}}/preferred-partners">Preferred Partners</a></li>
51+
<li><a href="https://www.progress.com/kinvey" target="_blank">Progress Kinvey</a></li>
5452
</ul>
5553
</li>
5654
<li>

‎build/_layouts/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
})(window,document.documentElement,'async-hide','dataLayer',4000,
2121
{'GTM-W58JDD':true});</script>
2222
<!-- end Optimize Page Hiding Snippet -->
23-
<title>{{page.title}}</title>
23+
<title>{{page.title}} - NativeScript Docs</title>
2424
<link rel="preload" href="{{site.baseurl}}/{{page.category}}.json" as="script">
2525
<link rel="shortcut icon" href="{{site.headerbaseurl}}/favicon.ico"/>
2626
{% if page.description %}<meta name="description" content="{{page.description}}">{% endif %}
27+
{% if page.tags %}<meta name="keywords" content="{{ page.tags | join: ', ' | escape }}">{% endif %}
2728
<link href="https://kendo.cdn.telerik.com/2018.1.221/styles/kendo.common.min.css" rel="stylesheet" />
2829
<link href="https://d6vtbcy3ong79.cloudfront.net/fonts/1.1.8/css/avenir.min.css" type="text/css" rel="stylesheet" media="all" />
2930
{% stylesheet fontawesome-all %}

‎build/_layouts/landing.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<link rel="preload" href="{{site.baseurl}}/{{page.category}}.json" as="script">
2424
<link rel="shortcut icon" href="{{site.headerbaseurl}}/favicon.ico"/>
2525
{% if page.description %}<meta name="description" content="{{page.description}}">{% endif %}
26+
{% if page.tags %}<meta name="keywords" content="{{ page.tags | join: ', ' | escape }}">{% endif %}
2627
<link href="https://kendo.cdn.telerik.com/2018.1.221/styles/kendo.common.min.css" rel="stylesheet" />
2728
<link href="https://d6vtbcy3ong79.cloudfront.net/fonts/1.1.8/css/avenir.min.css" type="text/css" rel="stylesheet" media="all" />
2829
{% stylesheet fontawesome-all %}

‎docs/core-concepts/accessing-native-apis-with-javascript.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
title: Accessing Native APIs through JavaScript
3-
description: Learn how to access native iOS and Android APIs through JavaScript in a NativeScript App without writing any Objective-C/Swift or Java/Kotlin code
3+
description: Learn how to access the native iOS and Android APIs through JavaScript in a NativeScript app without writing any Objective-C/Swift or Java/Kotlin code.
44
position: 80
5+
tags: nativescript native apis, native apis, javascript native apis
56
slug: access-native-apis
67
---
78

‎docs/core-concepts/android-runtime/advanced-topics/extend-application-activity.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ position: 2
66
---
77

88
# Extending Application and Activity
9-
This article describes how to create custom `android.app.Application` and `android.support.v7.app.AppCompatActivity` implementations in a NativeScript application. Demo code below is taken from the [Android Extend Sample](https://github.com/NativeScript/sample-android-extend).
9+
This article describes how to create custom `android.app.Application` and `android.support.v7.app.AppCompatActivity` implementations in a NativeScript application.
10+
11+
> **Note**: Demo code below is taken from the Android Extend demos for [plain JavaScript](https://github.com/NativeScript/nativescript-dev-webpack/blob/master/demo/JavaScriptApp/app/activity.android.js), [TypeScript](https://github.com/NativeScript/nativescript-dev-webpack/blob/master/demo/TypeScriptApp/app/activity.android.ts) or [Angular](https://github.com/NativeScript/nativescript-dev-webpack/blob/master/demo/AngularApp/app/activity.android.ts) applications.
1012
1113
## Philosophy
1214
Because NativeScript is a JavaScript-to-Native framework, our main goal is to make as much as possible from the underlying native platforms easy to implement in JavaScript. Initially we discussed the option where developers would write Java code to achieve some more special cases like custom `android.support.v7.app.AppCompatActivity` implementations but then we agreed that we should explore a JavaScript approach first and only if it is not possible to fallback to native code. It turned to be pretty easy, especially with the new [Static Binding Generator (SBG)](https://www.nativescript.org/blog/details/static-binding-generator---what-is-it-good-for) tool.
@@ -108,6 +110,9 @@ The core modules ship with a default `android.support.v7.app.AppCompatActivity`
108110
const superProto = android.support.v7.app.AppCompatActivity.prototype;
109111
android.support.v7.app.AppCompatActivity.extend("org.myApp.MainActivity", {
110112
onCreate: function(savedInstanceState) {
113+
// Set the isNativeScriptActivity in onCreate (as done in the original NativeScript activity code)
114+
// The JS constructor might not be called because the activity is created from Android.
115+
this.isNativeScriptActivity = true;
111116
if(!this._callbacks) {
112117
frame.setActivityCallbacks(this);
113118
}
@@ -144,9 +149,14 @@ The core modules ship with a default `android.support.v7.app.AppCompatActivity`
144149
145150
@JavaProxy("org.myApp.MainActivity")
146151
class Activity extends android.support.v7.app.AppCompatActivity {
152+
public isNativeScriptActivity;
153+
147154
private _callbacks: AndroidActivityCallbacks;
148155
149156
public onCreate(savedInstanceState: android.os.Bundle): void {
157+
// Set the isNativeScriptActivity in onCreate (as done in the original NativeScript activity code)
158+
// The JS constructor might not be called because the activity is created from Android.
159+
this.isNativeScriptActivity = true;
150160
if (!this._callbacks) {
151161
setActivityCallbacks(this);
152162
}

0 commit comments

Comments
 (0)