Skip to content

Commit 2b3631d

Browse files
ADjenkovADjenkov
authored
Merge branch 'master' into djenkov/animations-overhaul
2 parents 7527507 + 76ee9e8 commit 2b3631d

File tree

71 files changed

+1623
-769
lines changed

Some content is hidden

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

71 files changed

+1623
-769
lines changed

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ tsconfig.tns.json
4646
*.map
4747
*.tgz
4848
.baseDir.ts
49-
.sublime-grunt.cache
5049
tscommand*.tmp.txt
5150
.tscache
5251

@@ -55,7 +54,6 @@ tscommand*.tmp.txt
5554
# https://github.com/NativeScript/nativescript-dev-webpack/issues/932
5655
!tns-core-modules/xml/xml.js
5756
!tests/hooks/**/*.*
58-
!gruntfile.js
5957
!js-libs/**/*.*
6058
!css/**/*.*
6159
!css-value/**/*.*

‎.travis.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1+
language: node_js
2+
node_js:
3+
- "node"
14
script:
2-
- cd tns-core-modules && npm i && cd ..
5+
# circular references check
6+
- cd tests && npm i
7+
- node_modules/.bin/webpack --env.android
8+
- node_modules/.bin/webpack --env.ios
9+
# modules transpilation
10+
- cd ../tns-core-modules && npm i && cd ..
311
- npm install
412
- npm run tsc
513
- npm run tslint

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ If the commit reverts a previous commit, it should begin with `revert: `, follow
124124
### Type
125125
Must be one of the following:
126126

127-
* **build**: Changes that affect the build system or external dependencies (example scopes: npm, grunt)
127+
* **build**: Changes that affect the build system or external dependencies (example scopes: npm)
128128
* **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Jenkins)
129129
* **docs**: Documentation only changes
130130
* **feat**: A new feature

‎DevelopmentWorkflow.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ tns run ios
8181
tns run android
8282
```
8383

84+
---
85+
**NOTE**
86+
87+
Linking `tns-core-modules` in Angular app does not work at the moment. Check [#7905](https://github.com/NativeScript/NativeScript/issues/7905) for more details on the issue.
88+
89+
---
90+
8491
## Platform declarations
8592
To update the platform declarations (the ios.d.ts-es) you can run:
8693

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[NativeScript](http://www.nativescript.org) is a framework for building native iOS and Android apps using JavaScript and CSS. NativeScript renders UIs with the native platform’s rendering engine, no [WebViews](http://developer.telerik.com/featured/what-is-a-webview/), resulting in native-like performance and UX.
66

7-
NativeScript provides a best-of-both-worlds development experience. Our cross-platform JavaScript modules give you the convenience of writing iOS and Android apps from a single JavaScript codebase, while our runtimes give you the power of accessing native APIs, SDKs, and frameworks when you need them—all without needing to open Xcode or Android Studio. NativeScript was created and is supported by [Telerik](http://www.telerik.com/).
7+
NativeScript provides a best-of-both-worlds development experience. Our cross-platform JavaScript modules give you the convenience of writing iOS and Android apps from a single JavaScript codebase, while our runtimes give you the power of accessing native APIs, SDKs, and frameworks when you need all of them without having to open Xcode or Android Studio. NativeScript was created and is supported by [Telerik](http://www.telerik.com/).
88

99
Check out the links below to get started:
1010

@@ -72,14 +72,14 @@ In addition to the code that makes up the NativeScript framework itself, we also
7272

7373
## Contributing
7474

75-
We love PRs, and accept them for all of our repositories—even docs! Please follow our [contribution guide](https://github.com/NativeScript/NativeScript/blob/master/CONTRIBUTING.md) if you want to become part of the project.
75+
We love PRs, and accept them for all of our repositories — even docs! Please follow our [contribution guide](https://github.com/NativeScript/NativeScript/blob/master/CONTRIBUTING.md) if you want to become part of the project.
7676

7777
## Angular
7878

79-
We [worked together with the Google Angular team](http://angularjs.blogspot.com/2015/12/building-mobile-apps-with-angular-2-and.html) to make Angular 2+ work on top of NativeScript. To use Angular with NativeScript please follow the [getting started](http://docs.nativescript.org/angular/tutorial/ng-chapter-0) article.
79+
We [worked together with the Google Angular team](https://angularjs.blogspot.com/2015/12/building-mobile-apps-with-angular-2-and.html) to make Angular 2+ work on top of NativeScript. To use Angular with NativeScript please follow the [getting started](http://docs.nativescript.org/angular/tutorial/ng-chapter-0) article.
8080

8181
## Get Help
8282

83-
Please, use [github issues](https://github.com/NativeScript/NativeScript/issues) strictly for [reporting a bugs](https://github.com/NativeScript/NativeScript/blob/master/CONTRIBUTING.md#bugs) or [requesting features](https://github.com/NativeScript/NativeScript/blob/master/CONTRIBUTING.md#features). For general NativeScript questions and support, check out [Stack Overflow](https://stackoverflow.com/questions/tagged/nativescript) or ask our experts in [NativeScript community Slack channel](http://developer.telerik.com/wp-login.php?action=slack-invitation).
83+
Please, use [github issues](https://github.com/NativeScript/NativeScript/issues) strictly for [reporting a bugs](https://github.com/NativeScript/NativeScript/blob/master/CONTRIBUTING.md#bugs) or [requesting features](https://github.com/NativeScript/NativeScript/blob/master/CONTRIBUTING.md#features). For general NativeScript questions and support, check out [Stack Overflow](https://stackoverflow.com/questions/tagged/nativescript) or ask our experts in [NativeScript community Slack channel](https://www.nativescript.org/slack-invitation-form).
8484

8585
![](https://ga-beacon.appspot.com/UA-111455-24/nativescript/nativescript?pixel)

‎build-docs.sh‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,6 @@ extract_snippets() {
3636
archive_dist_dir "snippets"
3737
}
3838

39-
extract_cookbook() {
40-
COOKBOOK_DIR="$DIST_DIR/cookbook"
41-
rm -rf "$COOKBOOK_DIR"
42-
43-
npm_install
44-
grunt articles
45-
mv "$DIST_DIR/articles" "$COOKBOOK_DIR"
46-
archive_dist_dir "cookbook"
47-
}
48-
4939
extract_apiref() {
5040
APIREF_DIR="$DIST_DIR/api-reference"
5141
rm -rf "$APIREF_DIR"
@@ -62,6 +52,5 @@ mkdir -p "$TARGET_DIR"
6252

6353
if [ "${BASH_SOURCE[0]}" == "$0" ] ; then
6454
extract_snippets
65-
extract_cookbook
6655
extract_apiref
6756
fi

‎e2e/ui-tests-app/app/action-bar/font-icons-page.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Page>
22
<Page.actionBar>
33
<ActionBar automationText="actionBar">
4+
<NavigationButton icon="font://&#xF137;" class="font-awesome font-size color"/>
45
<ActionBar.actionItems>
56
<!-- font family + font size + color -->
67
<ActionItem icon="font://&#xF10B;" class="font-awesome font-size color" tap="navigate"/>

‎expect.exp‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)