aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/property-control.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-18 17:59:02 -0700
committerValerio Virgillito2012-05-18 17:59:02 -0700
commit10471fc02fa75040baf337bc62ff683854793f81 (patch)
tree345d582d72c2064e6e4ebbd23cbb7bb6c81e96df /js/components/ui/property-control.reel
parente7c288fe8f5d3a9e5c9f0eb0a045c6c195a0e7b8 (diff)
parent8a15ac2b4a7d528d04c73bf6d9c6e724d8c6ac50 (diff)
downloadninja-10471fc02fa75040baf337bc62ff683854793f81.tar.gz
Merge pull request #247 from mqg734/Dom-Architecture
Fixing button and radio controls in the Properties Panel and repetition and file-chooser control in the Materials Panel.
Diffstat (limited to 'js/components/ui/property-control.reel')
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.js12
1 files changed, 10 insertions, 2 deletions
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 },