diff options
author | Jonathan Duran | 2012-06-25 13:40:37 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-25 13:40:37 -0700 |
commit | 8b46c251664a45039db355075bce85ddfd345269 (patch) | |
tree | 0de66b839b0c9107077705ee6f5efe737725207d /js/components/textfield.reel | |
parent | da3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff) | |
parent | 4e5331c9967d4a24df56160188cc916a4051052b (diff) | |
download | ninja-8b46c251664a45039db355075bce85ddfd345269.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into Timeline-bugfix1
Diffstat (limited to 'js/components/textfield.reel')
-rwxr-xr-x | js/components/textfield.reel/textfield.js | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/js/components/textfield.reel/textfield.js b/js/components/textfield.reel/textfield.js index 5e22fcc7..e16dd786 100755 --- a/js/components/textfield.reel/textfield.js +++ b/js/components/textfield.reel/textfield.js | |||
@@ -27,6 +27,7 @@ exports.TextField = Montage.create(Component, { | |||
27 | }, | 27 | }, |
28 | set: function(value) { | 28 | set: function(value) { |
29 | this._value = value; | 29 | this._value = value; |
30 | this._valueSyncedWithInputField = false; | ||
30 | this.needsDraw = true; | 31 | this.needsDraw = true; |
31 | } | 32 | } |
32 | }, | 33 | }, |
@@ -41,7 +42,7 @@ exports.TextField = Montage.create(Component, { | |||
41 | 42 | ||
42 | handleBlur: { | 43 | handleBlur: { |
43 | value: function(event) { | 44 | value: function(event) { |
44 | this._value = this.element.value; | 45 | this.value = this.element.value; |
45 | this._valueSyncedWithInputField = true; | 46 | this._valueSyncedWithInputField = true; |
46 | 47 | ||
47 | var e = document.createEvent("CustomEvent"); | 48 | var e = document.createEvent("CustomEvent"); |
@@ -51,27 +52,10 @@ exports.TextField = Montage.create(Component, { | |||
51 | this.dispatchEvent(e); | 52 | this.dispatchEvent(e); |
52 | } | 53 | } |
53 | }, | 54 | }, |
54 | /* | ||
55 | handleChange: | ||
56 | { | ||
57 | value:function(event) | ||
58 | { | ||
59 | this._value = this.element.value; | ||
60 | this._valueSyncedWithInputField = true; | ||
61 | |||
62 | var e = document.createEvent("CustomEvent"); | ||
63 | e.initEvent("change", true, true); | ||
64 | e.type = "change"; | ||
65 | e.value = this._value; | ||
66 | this.dispatchEvent(e); | ||
67 | } | ||
68 | }, | ||
69 | */ | ||
70 | 55 | ||
71 | draw: { | 56 | draw: { |
72 | value: function() { | 57 | value: function() { |
73 | if(!this._valueSyncedWithInputField) | 58 | if(!this._valueSyncedWithInputField) { |
74 | { | ||
75 | this.element.value = this._value; | 59 | this.element.value = this._value; |
76 | this._valueSyncedWithInputField = true; | 60 | this._valueSyncedWithInputField = true; |
77 | } | 61 | } |
@@ -80,7 +64,6 @@ exports.TextField = Montage.create(Component, { | |||
80 | 64 | ||
81 | prepareForDraw: { | 65 | prepareForDraw: { |
82 | value: function() { | 66 | value: function() { |
83 | //this.element.addEventListener("change", this, false); | ||
84 | this.element.addEventListener("blur", this, false); | 67 | this.element.addEventListener("blur", this, false); |
85 | this.element.addEventListener("keyup", this, false); | 68 | this.element.addEventListener("keyup", this, false); |
86 | } | 69 | } |