diff options
author | Nivesh Rajbhandari | 2012-05-18 15:14:36 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-18 15:14:36 -0700 |
commit | 3e22b0940bb7752e292e485d8a393f215cae05de (patch) | |
tree | 0b3e70737ab040b12a1eb1fbbabb79f6826783db /js/panels/Materials | |
parent | a396caf12a9e1fc84b984d39f8e671c335d2f5d5 (diff) | |
download | ninja-3e22b0940bb7752e292e485d8a393f215cae05de.tar.gz |
Fixed Materials Popup to work with new changes to repetition bindings.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/Materials')
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.html | 2 | ||||
-rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.js | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index d18599d6..bac722cd 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html | |||
@@ -43,7 +43,7 @@ | |||
43 | "data": { | 43 | "data": { |
44 | "boundObject": {"@": "materialsProperties"}, | 44 | "boundObject": {"@": "materialsProperties"}, |
45 | "boundObjectPropertyPath": "objectAtCurrentIteration", | 45 | "boundObjectPropertyPath": "objectAtCurrentIteration", |
46 | "oneway": false | 46 | "oneway": true |
47 | } | 47 | } |
48 | }, | 48 | }, |
49 | "listeners": [ | 49 | "listeners": [ |
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index bd10f7a5..a4f758cf 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
@@ -625,6 +625,11 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
625 | } | 625 | } |
626 | ] | 626 | ] |
627 | }, | 627 | }, |
628 | |||
629 | materialsProperties: { | ||
630 | serializable: true, | ||
631 | value: null | ||
632 | }, | ||
628 | 633 | ||
629 | _materialsData: { | 634 | _materialsData: { |
630 | enumerable: true, | 635 | enumerable: true, |
@@ -641,7 +646,7 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
641 | }, | 646 | }, |
642 | set: function(data) { | 647 | set: function(data) { |
643 | this._materialsData = data; | 648 | this._materialsData = data; |
644 | if(this.materialsProperties) | 649 | if(this.materialsProperties && data.length) |
645 | { | 650 | { |
646 | this.materialsProperties.needsDraw = true; | 651 | this.materialsProperties.needsDraw = true; |
647 | } | 652 | } |