aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorEric Guzman2012-05-18 21:51:08 -0700
committerEric Guzman2012-05-18 21:51:08 -0700
commit84097be9d7dd3403a0ac12f8c039d3ffc5281cfc (patch)
tree4f03ddf6620be09d4a755bdf647da2adc1df8908 /js/panels/Materials
parent13da56e791b7478ad3dbb8162a583a6b2c8c4b6b (diff)
parent10471fc02fa75040baf337bc62ff683854793f81 (diff)
downloadninja-84097be9d7dd3403a0ac12f8c039d3ffc5281cfc.tar.gz
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Diffstat (limited to 'js/panels/Materials')
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.html2
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js7
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 }