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

overline removed

Browse Source
This commit is contained in:
Vladimir Enchev
2015-11-06 11:44:01 +02:00
parent 4cdfb64051
commit bc68f1eabb
5 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ui/enums/enums.d.ts vendored
View File

@@ -432,18 +432,12 @@
*/ */
export var underline: string; export var underline: string;
/**
* Text decoration overline.
*/
export var overline: string;
/** /**
* Text decoration line-through. * Text decoration line-through.
*/ */
export var lineThrough: string; export var lineThrough: string;
} }
/** /**
* Specifies different font weights. * Specifies different font weights.
*/ */

3
ui/enums/enums.ts
View File

@@ -23,8 +23,7 @@ export module TextAlignment {
export module TextDecoration { export module TextDecoration {
export var none = "none"; export var none = "none";
export var underline = "underline"; export var underline = "underline";
export var overline = "overline"; export var lineThrough = "line-through";
export var lineThrough = "lineThrough";
} }
export module Orientation { export module Orientation {

1
ui/styling/converters.ts
View File

@@ -27,7 +27,6 @@ export function textAlignConverter(value: string): string {
export function textDecorationConverter(value: string): string { export function textDecorationConverter(value: string): string {
switch (value) { switch (value) {
case enums.TextDecoration.none: case enums.TextDecoration.none:
case enums.TextDecoration.overline:
case enums.TextDecoration.underline: case enums.TextDecoration.underline:
case enums.TextDecoration.lineThrough: case enums.TextDecoration.lineThrough:
return value; return value;

2
ui/styling/style.ts
View File

@@ -240,7 +240,7 @@ function isVisibilityValid(value: string): boolean {
} }
function isTextDecorationValid(value: string): boolean { function isTextDecorationValid(value: string): boolean {
return value === enums.TextDecoration.none || value === enums.TextDecoration.overline || value === enums.TextDecoration.underline || value === enums.TextDecoration.lineThrough; return value === enums.TextDecoration.none || value === enums.TextDecoration.underline || value === enums.TextDecoration.lineThrough;
} }
function onVisibilityChanged(data: PropertyChangeData) { function onVisibilityChanged(data: PropertyChangeData) {

5
ui/styling/stylers.ios.ts
View File

@@ -899,10 +899,7 @@ function setTextAlignment(view: TextUIView, value: string) {
function setTextDecoration(view: TextUIView, value: string) { function setTextDecoration(view: TextUIView, value: string) {
switch (value) { switch (value) {
case enums.TextDecoration.none: case enums.TextDecoration.none:
view.text = view.attributedText ? view.attributedText.string : view.text;
break;
case enums.TextDecoration.overline:
break; break;
case enums.TextDecoration.underline: case enums.TextDecoration.underline:
setTextDecorationNative(view, view.text || view.attributedText, NSUnderlineStyleAttributeName); setTextDecorationNative(view, view.text || view.attributedText, NSUnderlineStyleAttributeName);