From f06af802601553b7e1a4966b378774ac59664eef Mon Sep 17 00:00:00 2001
From: Vladimir Enchev <vladimir.enchev@telerik.com>
Date: Mon, 11 Apr 2016 11:47:32 +0300
Subject: [PATCH] TextBase and Button text-decoration and text-transform fixes

---
 apps/ui-tests-app/css/text-decoration.ts  | 14 ++++++++++++++
 apps/ui-tests-app/css/text-decoration.xml |  1 +
 apps/ui-tests-app/css/text-transform.ts   | 14 ++++++++++++++
 apps/ui-tests-app/css/text-transform.xml  |  1 +
 ui/button/button-common.ts                | 11 +++++++++--
 ui/text-base/text-base-common.ts          | 10 +++++++---
 ui/text-field/text-field.ios.ts           |  3 +++
 ui/text-view/text-view.ios.ts             |  3 +++
 8 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/apps/ui-tests-app/css/text-decoration.ts b/apps/ui-tests-app/css/text-decoration.ts
index 00b394e0e..a1870be63 100644
--- a/apps/ui-tests-app/css/text-decoration.ts
+++ b/apps/ui-tests-app/css/text-decoration.ts
@@ -4,6 +4,20 @@ import button = require("ui/button");
 import textField = require("ui/text-field");
 import textView = require("ui/text-view");
 
+export function changeTextButonTap(args) {
+    var btnChange = <button.Button>args.object;
+    var lbl = <label.Label>btnChange.parent.getViewById("Label");
+    var btn = <button.Button>btnChange.parent.getViewById("Button");
+    var textField = <textField.TextField>btnChange.parent.getViewById("TextField");
+    var textView = <textView.TextView>btnChange.parent.getViewById("TextView");
+    
+    if(lbl.text === "Change text") {
+        lbl.text = btn.text = textField.text = textView.text = "Text changed";
+    } else {
+        lbl.text = btn.text = textField.text = textView.text = "Change text";
+    }
+}
+
 export function butonTap(args) {
     var btnChange = <view.View>args.object;
     var lbl = <label.Label>btnChange.parent.getViewById("Label");
diff --git a/apps/ui-tests-app/css/text-decoration.xml b/apps/ui-tests-app/css/text-decoration.xml
index 38c0d8d7e..c3d6e6308 100644
--- a/apps/ui-tests-app/css/text-decoration.xml
+++ b/apps/ui-tests-app/css/text-decoration.xml
@@ -1,5 +1,6 @@
 <Page >
   <StackLayout>
+    <Button id="ChangeText" automationText="Change text" text="Change text" tap="changeTextButonTap" />
     <Button id="Change" automationText="Change" text="Change" tap="butonTap" />
     <Label id="Label" automationText="Label" text="Label" style.textDecoration="none" />
     <Button id="Button" automationText="Button" text="Button" style.textDecoration="none" />
diff --git a/apps/ui-tests-app/css/text-transform.ts b/apps/ui-tests-app/css/text-transform.ts
index 38968db29..37f73d2d8 100644
--- a/apps/ui-tests-app/css/text-transform.ts
+++ b/apps/ui-tests-app/css/text-transform.ts
@@ -4,6 +4,20 @@ import button = require("ui/button");
 import textField = require("ui/text-field");
 import textView = require("ui/text-view");
 
+export function changeTextButonTap(args) {
+    var btnChange = <button.Button>args.object;
+    var lbl = <label.Label>btnChange.parent.getViewById("Label");
+    var btn = <button.Button>btnChange.parent.getViewById("Button");
+    var textField = <textField.TextField>btnChange.parent.getViewById("TextField");
+    var textView = <textView.TextView>btnChange.parent.getViewById("TextView");
+    
+    if(lbl.text === "Change text") {
+        lbl.text = btn.text = textField.text = textView.text = "Text changed";
+    } else {
+        lbl.text = btn.text = textField.text = textView.text = "Change text";
+    }
+}
+
 export function butonTap(args) {
     var btnChange = <view.View>args.object;
     var lbl = <label.Label>btnChange.parent.getViewById("Label");
diff --git a/apps/ui-tests-app/css/text-transform.xml b/apps/ui-tests-app/css/text-transform.xml
index d9e14deb5..fc6a8ccf1 100644
--- a/apps/ui-tests-app/css/text-transform.xml
+++ b/apps/ui-tests-app/css/text-transform.xml
@@ -1,5 +1,6 @@
 <Page >
   <StackLayout>
+    <Button id="ChangeText" automationText="Change text" text="Change text" tap="changeTextButonTap" />
     <Button id="Change" automationText="Change" text="Change" tap="butonTap" />
     <Label id="Label" automationText="Label" text="label Label" style.textTransform="none" />
     <Button id="Button" automationText="Button" text="button Button" style.textTransform="none" />
diff --git a/ui/button/button-common.ts b/ui/button/button-common.ts
index a012e3195..243334a7b 100644
--- a/ui/button/button-common.ts
+++ b/ui/button/button-common.ts
@@ -25,16 +25,20 @@ var textProperty = new dependencyObservable.Property(
     "text",
     "Button",
     new proxy.PropertyMetadata("", dependencyObservable.PropertyMetadataSettings.AffectsLayout)
-    );
+);
 
 var formattedTextProperty = new dependencyObservable.Property(
     "formattedText",
     "Button",
     new proxy.PropertyMetadata("", dependencyObservable.PropertyMetadataSettings.AffectsLayout)
-    );
+);
 
 function onTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var button = <Button>data.object;
+
+    button.style._updateTextDecoration();
+    button.style._updateTextTransform();
+
     button._onTextPropertyChanged(data);
 }
 
@@ -63,6 +67,9 @@ export class Button extends view.View implements definition.Button {
         if (this.formattedText) {
             this.formattedText.updateSpansBindingContext(newValue);
         }
+
+        this.style._updateTextDecoration();
+        this.style._updateTextTransform();
     }
 
     get text(): string {
diff --git a/ui/text-base/text-base-common.ts b/ui/text-base/text-base-common.ts
index aaf801f44..c68c42510 100644
--- a/ui/text-base/text-base-common.ts
+++ b/ui/text-base/text-base-common.ts
@@ -18,16 +18,20 @@ var textProperty = new dependencyObservable.Property(
     "text",
     "TextBase",
     new proxy.PropertyMetadata("", dependencyObservable.PropertyMetadataSettings.AffectsLayout)
-    );
+);
 
 var formattedTextProperty = new dependencyObservable.Property(
     "formattedText",
     "TextBase",
     new proxy.PropertyMetadata("", dependencyObservable.PropertyMetadataSettings.AffectsLayout)
-    );
+);
 
 function onTextPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var textBase = <TextBase>data.object;
+
+    textBase.style._updateTextTransform();
+    textBase.style._updateTextDecoration();
+
     textBase._onTextPropertyChanged(data);
 }
 
@@ -53,7 +57,7 @@ export class TextBase extends view.View implements definition.TextBase, formatte
         if (this.formattedText) {
             this.formattedText.updateSpansBindingContext(newValue);
         }
-        
+
         this.style._updateTextTransform();
         this.style._updateTextDecoration();
     }
diff --git a/ui/text-field/text-field.ios.ts b/ui/text-field/text-field.ios.ts
index 700b65746..0059a7f70 100644
--- a/ui/text-field/text-field.ios.ts
+++ b/ui/text-field/text-field.ios.ts
@@ -142,6 +142,9 @@ export class TextField extends common.TextField {
     public onLoaded() {
         super.onLoaded();
         this._ios.delegate = this._delegate;
+        
+        this.style._updateTextDecoration();
+        this.style._updateTextTransform();
     }
 
     public onUnloaded() {
diff --git a/ui/text-view/text-view.ios.ts b/ui/text-view/text-view.ios.ts
index 2656a97ff..ce509f681 100644
--- a/ui/text-view/text-view.ios.ts
+++ b/ui/text-view/text-view.ios.ts
@@ -83,6 +83,9 @@ export class TextView extends common.TextView {
     public onLoaded() {
         super.onLoaded();
         this._ios.delegate = this._delegate;
+        
+        this.style._updateTextDecoration();
+        this.style._updateTextTransform();
     }
 
     public onUnloaded() {