Skip to content

Commit 8ac64a9

Browse files
victorsosavictorsosa
committed
Merge pull request NativeScript#2 from NativeScript/master
update pull
2 parents f00ff13 + 8a522fc commit 8ac64a9

File tree

95 files changed

+390
-188
lines changed

Some content is hidden

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

95 files changed

+390
-188
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ addons:
1111
artifacts:
1212
paths:
1313
- "$HOME/test-run-results$PACKAGE_VERSION.xml"
14-
sudo: required
14+
sudo: false
1515
dist: trusty
1616
language: android
1717
node_js:

‎CrossPlatformModules.csproj

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -447,8 +447,8 @@
447447
<TypeScriptCompile Include="apps\tests\connectivity-tests.ts" />
448448
<TypeScriptCompile Include="apps\tests\console-tests.ts" />
449449
<TypeScriptCompile Include="apps\tests\file-name-resolver-tests\file-name-resolver-tests.ts" />
450-
<TypeScriptCompile Include="apps\tests\frame-tests.ts" />
451-
<TypeScriptCompile Include="apps\tests\gestures-tests.ts" />
450+
<TypeScriptCompile Include="apps\tests\ui\frame-tests.ts" />
451+
<TypeScriptCompile Include="apps\tests\ui\gestures\gestures-tests.ts" />
452452
<TypeScriptCompile Include="apps\tests\fetch-tests.ts" />
453453
<TypeScriptCompile Include="apps\tests\layouts\layout-helper.d.ts" />
454454
<TypeScriptCompile Include="apps\tests\layouts\layout-helper.ios.ts">
@@ -548,7 +548,7 @@
548548
<TypeScriptCompile Include="apps\tests\ui\list-picker\list-picker-tests.ts" />
549549
<TypeScriptCompile Include="apps\tests\ui\scroll-view\scroll-view-tests.ts" />
550550
<TypeScriptCompile Include="apps\tests\ui\search-bar\search-bar-tests.ts" />
551-
<TypeScriptCompile Include="apps\tests\ui\style\style-properties-tests.ts" />
551+
<TypeScriptCompile Include="apps\tests\ui\styling\style-properties-tests.ts" />
552552
<TypeScriptCompile Include="apps\tests\ui\view\view-tests.d.ts" />
553553
<TypeScriptCompile Include="apps\tests\ui\html-view\html-view-tests.ts" />
554554
<TypeScriptCompile Include="apps\tests\ui\web-view\web-view-tests.ts" />
@@ -720,7 +720,7 @@
720720
<TypeScriptCompile Include="apps\tests\ui\bindable-tests.ts" />
721721
<TypeScriptCompile Include="apps\tests\ui\dependency-observable-tests.ts" />
722722
<TypeScriptCompile Include="apps\tests\ui\helper.ts" />
723-
<TypeScriptCompile Include="apps\tests\observable-tests.ts" />
723+
<TypeScriptCompile Include="apps\tests\data\observable-tests.ts" />
724724
<TypeScriptCompile Include="apps\tests\pages\page6.ts" />
725725
<TypeScriptCompile Include="apps\tests\pages\page5.ts" />
726726
<TypeScriptCompile Include="apps\tests\application-tests-common.ts" />
@@ -737,7 +737,7 @@
737737
<TypeScriptCompile Include="apps\tests\location-tests.ts" />
738738
<TypeScriptCompile Include="apps\tests\TKUnit.ts" />
739739
<TypeScriptCompile Include="apps\tests\ui\slider\slider-tests.ts" />
740-
<TypeScriptCompile Include="apps\tests\ui\style\visual-state-tests.ts" />
740+
<TypeScriptCompile Include="apps\tests\ui\styling\visual-state-tests.ts" />
741741
<TypeScriptCompile Include="apps\tests\ui\switch\switch-tests.ts" />
742742
<TypeScriptCompile Include="apps\tests\ui\view\view-tests-common.ts" />
743743
<TypeScriptCompile Include="apps\tests\ui\view\view-tests.android.ts">
@@ -829,10 +829,16 @@
829829
<TypeScriptCompile Include="ui\layouts\layout.android.ts">
830830
<DependentUpon>layout.d.ts</DependentUpon>
831831
</TypeScriptCompile>
832-
<TypeScriptCompile Include="ui\layouts\layout-base.ts">
832+
<TypeScriptCompile Include="ui\layouts\layout-base.d.ts" />
833+
<TypeScriptCompile Include="ui\layouts\layout-base-common.ts">
834+
<DependentUpon>layout-base.d.ts</DependentUpon>
835+
</TypeScriptCompile>
836+
<TypeScriptCompile Include="ui\layouts\layout-base.android.ts">
837+
<DependentUpon>layout-base.d.ts</DependentUpon>
838+
</TypeScriptCompile>
839+
<TypeScriptCompile Include="ui\layouts\layout-base.ios.ts">
833840
<DependentUpon>layout-base.d.ts</DependentUpon>
834841
</TypeScriptCompile>
835-
<TypeScriptCompile Include="ui\layouts\layout-base.d.ts" />
836842
<TypeScriptCompile Include="ui\layouts\stack-layout\stack-layout.ios.ts">
837843
<DependentUpon>stack-layout.d.ts</DependentUpon>
838844
</TypeScriptCompile>
@@ -1174,7 +1180,7 @@
11741180
<SubType>Designer</SubType>
11751181
</Content>
11761182
<Content Include="apps\tests\test-icon.png" />
1177-
<Content Include="apps\tests\ui\style\test.css" />
1183+
<Content Include="apps\tests\ui\styling\test.css" />
11781184
<Content Include="apps\tests\xml-declaration\inherited-page.xml" />
11791185
<Content Include="apps\tests\xml-declaration\mymodulewithxml\my-control-no-js.xml">
11801186
<SubType>Designer</SubType>
@@ -1343,7 +1349,9 @@
13431349
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
13441350
</Content>
13451351
<Content Include=".gitignore" />
1346-
<Content Include="apps\template-blank\main-page.xml" />
1352+
<Content Include="apps\template-blank\main-page.xml">
1353+
<SubType>Designer</SubType>
1354+
</Content>
13471355
<Content Include="apps\tests\small-image.png" />
13481356
<Content Include="apps\tests\pages\page14.xml">
13491357
<SubType>Designer</SubType>
@@ -1456,7 +1464,7 @@
14561464
<TypeScriptCompile Include="xhr\xhr.ts" />
14571465
<TypeScriptCompile Include="xml\xml.d.ts" />
14581466
<TypeScriptCompile Include="data\observable-array\observable-array.d.ts" />
1459-
<TypeScriptCompile Include="apps\tests\observable-array-tests.ts" />
1467+
<TypeScriptCompile Include="apps\tests\data\observable-array-tests.ts" />
14601468
<TypeScriptCompile Include="apps\tests\xml-parser-tests\xml-parser-tests.ts" />
14611469
<TypeScriptCompile Include="xml\xml.ts">
14621470
<DependentUpon>xml.d.ts</DependentUpon>
@@ -1626,7 +1634,7 @@
16261634
<TypeScriptCompile Include="utils\utils-common.ts">
16271635
<DependentUpon>utils.d.ts</DependentUpon>
16281636
</TypeScriptCompile>
1629-
<TypeScriptCompile Include="apps\tests\virtual-array-tests.ts" />
1637+
<TypeScriptCompile Include="apps\tests\data\virtual-array-tests.ts" />
16301638
<TypeScriptCompile Include="apps\tests\ui\button\button-tests-native.d.ts" />
16311639
<TypeScriptCompile Include="apps\tests\ui\button\button-tests.ts" />
16321640
<TypeScriptCompile Include="apps\tests\ui\button\button-tests-native.android.ts">
@@ -2222,7 +2230,7 @@
22222230
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
22232231
</WebProjectProperties>
22242232
</FlavorProperties>
2225-
<UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
2233+
<UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
22262234
</VisualStudio>
22272235
</ProjectExtensions>
2228-
</Project>
2236+
</Project>

‎apps/tests/application-settings.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
nav-title: "application-settings How-To"
3-
title: "How-To"
3+
title: "application-settings"
44
description: "Examples for using application-settings"
5+
previous_url: /ApiReference/application-settings/HOW-TO
56
---
67
# Application Settings
78
Using application settings methods requires to load "application settings" module.

‎apps/tests/application.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
nav-title: "application How-To"
3-
title: "How-To"
3+
title: "application"
44
description: "Examples for using application"
5+
previous_url: /ApiReference/application/HOW-TO
56
---
67
# Application
78
The Application module provides abstraction over the platform-specific Application implementations.

‎apps/tests/camera.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
nav-title: "camera How-To"
3-
title: "How-To"
3+
title: "camera"
44
description: "Examples for using camera"
5+
previous_url: /ApiReference/camera/HOW-TO
56
---
67
# Camera module
78
Using a camera requires the camera module.

‎apps/tests/color.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
nav-title: "color How-To"
3-
title: "How-To"
3+
title: "color"
44
description: "Examples for using color"
5+
previous_url: /ApiReference/color/HOW-TO
56
---
67
# Color
78
Using Colors requires the "color" module.

‎apps/tests/connectivity.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
nav-title: "connectivity How-To"
3-
title: "How-To"
3+
title: "connectivity"
44
description: "Examples for using connectivity"
5+
previous_url: /ApiReference/connectivity/HOW-TO
56
---
67
# Connectivity
78
Obtaining connectivity information requires the "connectivity" module.
@@ -11,4 +12,4 @@ Obtaining connectivity information requires the "connectivity" module.
1112
<snippet id='connectivity-type'/>
1213

1314
### Monitoring connection type.
14-
<snippet id='connectivity-monitoring'/>
15+
<snippet id='connectivity-monitoring'/>

‎apps/tests/console.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
nav-title: "console How-To"
3-
title: "How-To"
3+
title: "console"
44
description: "Examples for using console"
5+
previous_url: /ApiReference/console/HOW-TO
56
---
67
# Console
78
### Logging

‎apps/tests/observable-array-tests.ts renamed to ‎apps/tests/data/observable-array-tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import TKUnit = require("./TKUnit");
1+
import TKUnit = require("../TKUnit");
22
import bindableModule = require("ui/core/bindable");
33
require("globals");
44

‎apps/tests/observable-array.md renamed to ‎apps/tests/data/observable-array.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
---
22
nav-title: "observable-array How-To"
3-
title: "How-To"
3+
title: "observable-array"
44
description: "Examples for using observable-array"
5+
previous_url: /ApiReference/data/observable-array/HOW-TO
56
---
67
# Observable Array module
78
<snippet id='observable-array-require'/>

0 commit comments

Comments
 (0)