aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/text-input.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-18 13:48:51 -0700
committerValerio Virgillito2012-04-18 13:48:51 -0700
commit2e04af953463643791f6362bd8ef4c6ba190abfa (patch)
treed07aaf646091ddf9dad5b030a7905055fd323490 /node_modules/montage/ui/text-input.js
parent616a8532099fec2a15855eac97cd85cb60c4451c (diff)
downloadninja-2e04af953463643791f6362bd8ef4c6ba190abfa.tar.gz
Squashed commit of the following:
commit 2054551bfb01a0f4ca2e138b9d724835462d45cd Merge: 765c2da 616a853 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 18 13:48:21 2012 -0700 Merge branch 'refs/heads/master' into integration commit 765c2da8e1aa03550caf42b2bd5f367555ad2843 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:29:41 2012 -0700 updating the picasa carousel Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406 Merge: d27f2df cacb4a2 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 17 15:03:50 2012 -0700 Merge branch 'refs/heads/master' into integration commit d27f2df4d846064444263d7832d213535962abe7 Author: Valerio Virgillito <valerio@motorola.com> Date: Wed Apr 11 10:39:36 2012 -0700 integrating new picasa carousel component Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493 Author: Valerio Virgillito <valerio@motorola.com> Date: Tue Apr 10 14:33:00 2012 -0700 fixed the text area case issue Text area was renamed from TextArea to Textarea Signed-off-by: Valerio Virgillito <valerio@motorola.com> commit 1e83e26652266136802bc7af930379c1ecd631a6 Author: Valerio Virgillito <valerio@motorola.com> Date: Mon Apr 9 22:10:45 2012 -0700 integrating montage v0.8 into ninja. Signed-off-by: Valerio Virgillito <valerio@motorola.com> Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/text-input.js')
-rw-r--r--node_modules/montage/ui/text-input.js24
1 files changed, 1 insertions, 23 deletions
diff --git a/node_modules/montage/ui/text-input.js b/node_modules/montage/ui/text-input.js
index d707fa69..3049c383 100644
--- a/node_modules/montage/ui/text-input.js
+++ b/node_modules/montage/ui/text-input.js
@@ -79,28 +79,6 @@ var TextInput = exports.TextInput = Montage.create(NativeControl, {
79 } 79 }
80 }, 80 },
81 81
82 _valueBinding: {
83 value: null
84 },
85
86 valueBinding: {
87 get: function() {
88 return this._valueBinding;
89 },
90 set: function(value) {
91 if (this._valueBinding !== value) {
92 if (this._valueBinding !== null) {
93 Object.deleteBinding(this, "value");
94 }
95 this._valueBinding = value;
96 if (String.isString(value)) {
97 Object.defineBinding(this, "value", {boundObject: this.ownerComponent, boundObjectPropertyPath: value});
98
99 }
100 }
101 }
102 },
103
104 // set value from user input 82 // set value from user input
105 /** 83 /**
106 @private 84 @private
@@ -305,7 +283,7 @@ TextInput.addAttributes({
305 formaction: null, 283 formaction: null,
306 formenctype: null, 284 formenctype: null,
307 formmethod: null, 285 formmethod: null,
308 formnovalidate: null, 286 formnovalidate: {dataType: 'boolean'},
309 formtarget: null, 287 formtarget: null,
310 height: null, 288 height: null,
311 list: null, 289 list: null,