javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-18 05:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:NativeScript/NativeScript

Browse Source 
# Conflicts:
#	.eslintrc.json
#	packages/core/ui/core/bindable/index.ts
#	tsconfig.eslint.json
This commit is contained in:
Martin Guillon
2021-05-05 10:17:27 +02:00
parent d551693726 9ec404225e
commit 3ae12184e5
51 changed files with 122 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/automated/package.json
View File

@ -17,7 +17,7 @@
"@nativescript/android": "7.0.1",
"@nativescript/ios": "7.2.0",
"@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz",
"typescript": "file:../../node_modules/typescript"
"typescript": "4.1.4"
},
"gitHead": "c06800e52ee1a184ea2dffd12a6702aaa43be4e3",
"readme": "NativeScript Application"

2
apps/toolbox/package.json
View File

@ -14,6 +14,6 @@
"@nativescript/android": "7.0.1",
"@nativescript/ios": "7.2.0",
"@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz",
"typescript": "4.0.7"
"typescript": "4.1.4"
}
}

2
apps/ui/package.json
View File

@ -14,7 +14,7 @@
"@nativescript/android": "7.0.1",
"@nativescript/ios": "7.2.0",
"@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz",
"typescript": "file:../../node_modules/typescript"
"typescript": "4.1.4"
},
"gitHead": "8ab7726d1ee9991706069c1359c552e67ee0d1a4",
"readme": "NativeScript Application",

10
apps/ui/src/css/text-shadow-page.ts
View File

@ -1,4 +1,4 @@
import { EventData, TextBase } from '@nativescript/core';
import { EventData, TextBase, parseCSSShadow } from '@nativescript/core';
// prettier-ignore
const possibleValues = [
@ -22,10 +22,10 @@ export function buttonTap(args: EventData) {
let newIndex = currentIndex++ % possibleValues.length;
let newValue = possibleValues[newIndex];
lbl.textShadow = newValue;
btn.textShadow = newValue;
textField.textShadow = newValue;
textView.textShadow = newValue;
lbl.textShadow = parseCSSShadow(newValue);
btn.textShadow = parseCSSShadow(newValue);
textField.textShadow = parseCSSShadow(newValue);
textView.textShadow = parseCSSShadow(newValue);
if (lbl.text === 'Change text') {
lbl.text = btn.text = textField.text = textView.text = 'Text changed';

2
apps/ui/src/fonts-tests/all-fonts-page.ts
View File

@ -3,7 +3,7 @@ import { Page, NavigatedData } from '@nativescript/core/ui/page';
import { StackLayout } from '@nativescript/core/ui/layouts/stack-layout';
import { ScrollView } from '@nativescript/core/ui/scroll-view';
import { Label } from '@nativescript/core/ui/label';
import { Enums } from '@nativescript/core';
import { CoreTypes } from '@nativescript/core';
import * as typeUtils from '@nativescript/core/utils/types';
import { Color } from '@nativescript/core/color';
import { isIOS } from '@nativescript/core/platform';

2
apps/ui/src/image-view/mode-matrix-page.ts
View File

@ -1,4 +1,4 @@
import { Image, Enums } from '@nativescript/core';
import { Image, CoreTypes } from '@nativescript/core';
import { GridLayout } from '@nativescript/core/ui/layouts/grid-layout';
import { Color } from '@nativescript/core/color';
import * as imageSource from '@nativescript/core/image-source';

2
apps/ui/src/image-view/stretch-modes-page.ts
View File

@ -1,4 +1,4 @@
import { Image, Enums } from '@nativescript/core';
import { Image, CoreTypes } from '@nativescript/core';
import { Label } from '@nativescript/core/ui/label';
import { LayoutBase } from '@nativescript/core/ui/layouts/layout-base';

2
apps/ui/src/layouts-percent/stack-page.ts
View File

@ -1,4 +1,4 @@
import { Enums } from '@nativescript/core';
import { CoreTypes } from '@nativescript/core';
import * as pageModule from '@nativescript/core/ui/page';
import * as model from './myview';

2
apps/ui/src/layouts-percent/wrap-page.ts
View File

@ -1,4 +1,4 @@
import { Enums } from '@nativescript/core';
import { CoreTypes } from '@nativescript/core';
import * as pageModule from '@nativescript/core/ui/page';
import * as model from './myview';

2
apps/ui/src/layouts/stack-page.ts
View File

@ -1,4 +1,4 @@
import { Enums } from '@nativescript/core';
import { CoreTypes } from '@nativescript/core';
import * as pageModule from '@nativescript/core/ui/page';
import * as model from './myview';

2
apps/ui/src/layouts/wrap-page.ts
View File

@ -1,4 +1,4 @@
import { Enums } from '@nativescript/core';
import { CoreTypes } from '@nativescript/core';
import * as pageModule from '@nativescript/core/ui/page';
import * as model from './myview';