From be18818bbc451f17e002a56df00764c7ee3d3930 Mon Sep 17 00:00:00 2001 From: Vladimir Enchev Date: Wed, 23 Sep 2015 09:54:24 +0300 Subject: [PATCH 1/2] text-field hint now can be set to number --- apps/tests/ui/text-field/text-field-tests.ts | 17 +++++++++++++++++ .../editable-text-base.android.ts | 2 +- ui/text-field/text-field.ios.ts | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/apps/tests/ui/text-field/text-field-tests.ts b/apps/tests/ui/text-field/text-field-tests.ts index 20825b368..bf108e614 100644 --- a/apps/tests/ui/text-field/text-field-tests.ts +++ b/apps/tests/ui/text-field/text-field-tests.ts @@ -68,6 +68,23 @@ export var testSetText = function () { }); } +export var testSetHintToNumber = function () { + helper.buildUIAndRunTest(_createTextFieldFunc(), function (views: Array) { + var textField = views[0]; + var expectedValue = 1; + + // + // ### Setting the text of a TextField + // ``` JavaScript + textField.hint = expectedValue; + // ``` + // + + var actualValue = textFieldTestsNative.getNativeHint(textField); + TKUnit.assert(actualValue == expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue); + }); +} + export var testBindTextDirectlyToModel = function () { helper.buildUIAndRunTest(_createTextFieldFunc(), function (views: Array) { var textField = views[0]; diff --git a/ui/editable-text-base/editable-text-base.android.ts b/ui/editable-text-base/editable-text-base.android.ts index 184615b60..09b629d4a 100644 --- a/ui/editable-text-base/editable-text-base.android.ts +++ b/ui/editable-text-base/editable-text-base.android.ts @@ -260,6 +260,6 @@ export class EditableTextBase extends common.EditableTextBase { return; } - editableTextBase.android.setHint(data.newValue); + editableTextBase.android.setHint(data.newValue + ""); } } \ No newline at end of file diff --git a/ui/text-field/text-field.ios.ts b/ui/text-field/text-field.ios.ts index 77ecbfcc7..09264e5d1 100644 --- a/ui/text-field/text-field.ios.ts +++ b/ui/text-field/text-field.ios.ts @@ -130,6 +130,6 @@ export class TextField extends common.TextField { public _onHintPropertyChanged(data: dependencyObservable.PropertyChangeData) { var textField = data.object; - textField.ios.placeholder = data.newValue; + textField.ios.placeholder = data.newValue + ""; } } \ No newline at end of file From e0d4757b138bd575552c13aebd3874ae28c71406 Mon Sep 17 00:00:00 2001 From: Vladimir Enchev Date: Wed, 23 Sep 2015 13:24:29 +0300 Subject: [PATCH 2/2] tslint error fixed --- apps/tests/ui/text-field/text-field-tests.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tests/ui/text-field/text-field-tests.ts b/apps/tests/ui/text-field/text-field-tests.ts index bf108e614..a6d78c6db 100644 --- a/apps/tests/ui/text-field/text-field-tests.ts +++ b/apps/tests/ui/text-field/text-field-tests.ts @@ -67,7 +67,7 @@ export var testSetText = function () { TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue); }); } - +/* tslint:disable */ export var testSetHintToNumber = function () { helper.buildUIAndRunTest(_createTextFieldFunc(), function (views: Array) { var textField = views[0]; @@ -84,7 +84,7 @@ export var testSetHintToNumber = function () { TKUnit.assert(actualValue == expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue); }); } - +/* tslint:enable */ export var testBindTextDirectlyToModel = function () { helper.buildUIAndRunTest(_createTextFieldFunc(), function (views: Array) { var textField = views[0];