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

fix(core): type collisions with namespace (#8809)

Browse Source
This commit is contained in:
Nathan Walker
2021-02-25 21:03:07 -08:00
parent 784e9c93cd
commit ab11dc9c9f
110 changed files with 1882 additions and 1827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/ui/text-base/span.ts
View File

@@ -2,7 +2,7 @@
import { Span as SpanDefinition } from './span';
import { ViewBase } from '../core/view-base';
import { FontStyle, FontWeight } from '../styling/font';
import { TextDecoration } from '../text-base';
import { Enums } from '../enums';
import { EventData } from '../../data/observable';
import { isNullOrUndefined, isString } from '../../utils/types';
@@ -41,10 +41,10 @@ export class Span extends ViewBase implements SpanDefinition {
this.style.fontWeight = value;
}
get textDecoration(): TextDecoration {
get textDecoration(): Enums.TextDecorationType {
return this.style.textDecoration;
}
set textDecoration(value: TextDecoration) {
set textDecoration(value: Enums.TextDecorationType) {
this.style.textDecoration = value;
}