diff options
Diffstat (limited to 'js/components/ui')
-rwxr-xr-x | js/components/ui/file-input.reel/file-input.js | 2 | ||||
-rwxr-xr-x | js/components/ui/input-group.reel/input-group.html | 3 | ||||
-rwxr-xr-x | js/components/ui/property-control.reel/property-control.js | 12 |
3 files changed, 13 insertions, 4 deletions
diff --git a/js/components/ui/file-input.reel/file-input.js b/js/components/ui/file-input.reel/file-input.js index b57f7c21..584380ec 100755 --- a/js/components/ui/file-input.reel/file-input.js +++ b/js/components/ui/file-input.reel/file-input.js | |||
@@ -38,7 +38,7 @@ var FileInput = exports.FileInput = Montage.create(Component, { | |||
38 | { | 38 | { |
39 | value:function(event) | 39 | value:function(event) |
40 | { | 40 | { |
41 | if(event.currentTarget.id === "fileInputControl") | 41 | if(event.currentTarget.type === "file") |
42 | { | 42 | { |
43 | this.filePath = this.inputField.value; | 43 | this.filePath = this.inputField.value; |
44 | } | 44 | } |
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html index ba85c089..7da4a855 100755 --- a/js/components/ui/input-group.reel/input-group.html +++ b/js/components/ui/input-group.reel/input-group.html | |||
@@ -25,7 +25,8 @@ | |||
25 | "bindings": { | 25 | "bindings": { |
26 | "data": { | 26 | "data": { |
27 | "boundObject": {"@": "propList"}, | 27 | "boundObject": {"@": "propList"}, |
28 | "boundObjectPropertyPath": "objectAtCurrentIteration" | 28 | "boundObjectPropertyPath": "objectAtCurrentIteration", |
29 | "oneway": true | ||
29 | } | 30 | } |
30 | }, | 31 | }, |
31 | "listeners": [ | 32 | "listeners": [ |
diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js index c28979a9..20ec173e 100755 --- a/js/components/ui/property-control.reel/property-control.js +++ b/js/components/ui/property-control.reel/property-control.js | |||
@@ -120,8 +120,13 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, { | |||
120 | set: function (data) { | 120 | set: function (data) { |
121 | if (data !== this._data) { | 121 | if (data !== this._data) { |
122 | this._data = data; | 122 | this._data = data; |
123 | this.label = data.label; | 123 | if(data) { |
124 | this.controlType = data.controlType; | 124 | this._label = data.label; |
125 | this._controlType = data.controlType; | ||
126 | } else { | ||
127 | this._label = ""; | ||
128 | this._controlType = null; | ||
129 | } | ||
125 | this.needsDraw = true; | 130 | this.needsDraw = true; |
126 | } | 131 | } |
127 | } | 132 | } |
@@ -143,6 +148,9 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, { | |||
143 | { | 148 | { |
144 | value:function(event) | 149 | value:function(event) |
145 | { | 150 | { |
151 | if(event.wasSetByCode) { | ||
152 | return; | ||
153 | } | ||
146 | this._dispatchPropEvent(event); | 154 | this._dispatchPropEvent(event); |
147 | } | 155 | } |
148 | }, | 156 | }, |