Skip to content

Commit b59d32e

Browse files
MartoYankovMartoYankov
authored
Merge branch 'master' into myankov/merge
2 parents 4f0d6d3 + b436ecd commit b59d32e

File tree

100 files changed

+1695
-1744
lines changed

Some content is hidden

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

100 files changed

+1695
-1744
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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](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

7979
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.
8080

8181
## Get Help
8282

83-
Please, use [github issues](https://github.com/NativeScript/NativeScript/issues) strictly for [reporting a bugs](CONTRIBUTING.md#bugs) or [requesting features](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](http://developer.telerik.com/wp-login.php?action=slack-invitation).
8484

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

‎apps/app/ui-tests-app/font/all-fonts.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { Label } from "tns-core-modules/ui/label";
66
import { FontStyle, FontWeight } from "tns-core-modules/ui/enums";
77
import * as typeUtils from "tns-core-modules/utils/types";
88
import { Color } from "tns-core-modules/color";
9-
import * as utils from "tns-core-modules/utils/utils";
109
import { isIOS } from "tns-core-modules/platform";
1110

1211
const genericFontFamilies = [
@@ -48,7 +47,7 @@ let compareIgnoreCase = function (a, b) {
4847
};
4948

5049
if (isIOS) {
51-
const nsFontFamilies = utils.ios.getter(UIFont, UIFont.familyNames);
50+
const nsFontFamilies = UIFont.familyNames;
5251
for (let i = 0; i < nsFontFamilies.count; i++) {
5352
const family = nsFontFamilies.objectAtIndex(i);
5453
fontFamilies.push(family)

‎tests/app/TKUnit.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ import * as timer from "tns-core-modules/timer";
1515
import * as trace from "tns-core-modules/trace";
1616
import * as types from "tns-core-modules/utils/types";
1717
import * as platform from "tns-core-modules/platform";
18-
import { topmost } from "tns-core-modules/ui/frame";
19-
20-
import * as utils from "tns-core-modules/utils/utils";
2118

2219
const sdkVersion = parseInt(platform.device.sdkVersion);
2320

@@ -371,7 +368,7 @@ export function waitUntilReady(isReady: () => boolean, timeoutSec: number = 3, s
371368
let totalWaitTime = 0;
372369
while (true) {
373370
const begin = time();
374-
const currentRunLoop = utils.ios.getter(NSRunLoop, NSRunLoop.currentRunLoop);
371+
const currentRunLoop = NSRunLoop.currentRunLoop;
375372
currentRunLoop.limitDateForMode(currentRunLoop.currentMode);
376373
if (isReady()) {
377374
break;

‎tests/app/application/application-tests.ios.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
/* tslint:disable:no-unused-variable */
22
import * as app from "tns-core-modules/application";
3-
import * as TKUnit from "../TKUnit";
43
import * as commonTests from "./application-tests-common";
54

6-
import * as utils from "tns-core-modules/utils/utils";
7-
import getter = utils.ios.getter;
8-
95
global.moduleMerge(commonTests, exports);
106

117
// >> application-ios-observer
128
//// Add the notification observer
139
if (app.ios) {
1410
var observer = app.ios.addNotificationObserver(UIDeviceBatteryLevelDidChangeNotification,
1511
function onReceiveCallback(notification: NSNotification) {
16-
var percent = getter(UIDevice, UIDevice.currentDevice).batteryLevel * 100;
12+
var percent = UIDevice.currentDevice.batteryLevel * 100;
1713
var message = "Battery: " + percent + "%";
1814
////console.log(message);
1915
});

‎tests/app/http/http-tests.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,6 @@ export var test_request_NonStringHeadersSentAndReceivedProperly = function (done
621621
};
622622

623623
export var test_request_jsonAsContentSentAndReceivedProperly = function (done) {
624-
// >> http-post-json
625624
var result;
626625

627626
http.request({

‎tests/app/pages/page5.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import * as buttons from "tns-core-modules/ui/button";
44
import * as app from "tns-core-modules/application";
55
import * as platform from "tns-core-modules/platform";
66

7-
import * as utils from "tns-core-modules/utils/utils";
8-
97
function printDeviceInfoAndroid() {
108
console.log("android.os.Build.DEVICE = " + android.os.Build.DEVICE); //android.os.Build.DEVICE = hammerhead
119
console.log("android.os.Build.VERSION.SDK = " + android.os.Build.VERSION.SDK); //android.os.Build.VERSION.SDK = 19
@@ -29,15 +27,15 @@ function printDeviceInfoAndroid() {
2927
}
3028

3129
function printDeviceInfoIOS() {
32-
var device = utils.ios.getter(UIDevice, UIDevice.currentDevice);
30+
var device = UIDevice.currentDevice;
3331
console.log("device.name = " + device.name); //device.name = iPhone Simulator
3432
console.log("device.systemName = " + device.systemName); //device.systemName = iPhone OS
3533
console.log("device.systemVersion = " + device.systemVersion); //device.systemVersion = 8.1
3634
console.log("device.model = " + device.model); //device.model = iPhone Simulator
3735
console.log("device.localizedModel = " + device.localizedModel); //device.localizedModel = iPhone Simulator
3836
console.log("device.userInterfaceIdiom = " + device.userInterfaceIdiom); //device.userInterfaceIdiom = 0
3937
console.log("device.batteryLevel = " + device.batteryLevel); //device.batteryLevel = -1
40-
var screen = utils.ios.getter(UIScreen, UIScreen.mainScreen);
38+
var screen = UIScreen.mainScreen;
4139
console.log("screen = " + screen);
4240
console.log("screen.nativeBounds = " + screen.nativeBounds.size.width + ", " + screen.nativeBounds.size.height); //screen.nativeBounds = 640, 1136
4341
console.log("screen.scale = " + screen.scale); //screen.scale = 2

‎tests/app/ui/date-picker/date-picker-tests-native.ios.ts

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
import * as datePickerModule from "tns-core-modules/ui/date-picker";
22

3-
import * as utils from "tns-core-modules/utils/utils";
4-
53
export function getNativeYear(datePicker: datePickerModule.DatePicker): number {
6-
return utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).year;
4+
return NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).year;
75
}
86

97
export function getNativeMonth(datePicker: datePickerModule.DatePicker): number {
10-
return utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).month;
8+
return NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).month;
119
}
1210

1311
export function getNativeDay(datePicker: datePickerModule.DatePicker): number {
14-
return utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).day;
12+
return NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date).day;
1513
}
1614

1715
export function getNativeMaxDate(datePicker: datePickerModule.DatePicker): Date {
@@ -23,31 +21,31 @@ export function getNativeMinDate(datePicker: datePickerModule.DatePicker): Date
2321
}
2422

2523
export function setNativeYear(datePicker: datePickerModule.DatePicker, value: number): void {
26-
var comps = utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date);
24+
var comps = NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date);
2725
comps.year = value;
28-
datePicker.ios.setDateAnimated(utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).dateFromComponents(comps), false);
26+
datePicker.ios.setDateAnimated(NSCalendar.currentCalendar.dateFromComponents(comps), false);
2927
(<any>datePicker)._changeHandler.valueChanged(datePicker.ios);
3028
}
3129

3230
export function setNativeMonth(datePicker: datePickerModule.DatePicker, value: number): void {
33-
var comps = utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date);
31+
var comps = NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date);
3432
comps.month = value;
35-
datePicker.ios.setDateAnimated(utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).dateFromComponents(comps), false);
33+
datePicker.ios.setDateAnimated(NSCalendar.currentCalendar.dateFromComponents(comps), false);
3634
(<any>datePicker)._changeHandler.valueChanged(datePicker.ios);
3735
}
3836

3937
export function setNativeDay(datePicker: datePickerModule.DatePicker, value: number): void {
40-
var comps = utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date);
38+
var comps = NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date);
4139
comps.day = value;
42-
datePicker.ios.setDateAnimated(utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).dateFromComponents(comps), false);
40+
datePicker.ios.setDateAnimated(NSCalendar.currentCalendar.dateFromComponents(comps), false);
4341
(<any>datePicker)._changeHandler.valueChanged(datePicker.ios);
4442
}
4543

4644
export function setNativeDate(datePicker: datePickerModule.DatePicker, year: number, month: number, day: number): void {
47-
var comps = utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date);
45+
var comps = NSCalendar.currentCalendar.componentsFromDate(NSCalendarUnit.CalendarUnitYear | NSCalendarUnit.CalendarUnitMonth | NSCalendarUnit.CalendarUnitDay, datePicker.ios.date);
4846
comps.year = year;
4947
comps.month = month;
5048
comps.day = day;
51-
datePicker.ios.setDateAnimated(utils.ios.getter(NSCalendar, NSCalendar.currentCalendar).dateFromComponents(comps), false);
49+
datePicker.ios.setDateAnimated(NSCalendar.currentCalendar.dateFromComponents(comps), false);
5250
(<any>datePicker)._changeHandler.valueChanged(datePicker.ios);
5351
}

0 commit comments

Comments
 (0)