aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/Materials
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/Materials')
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js3
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js15
2 files changed, 17 insertions, 1 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
index 2176c6d5..c600fd0d 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
@@ -68,7 +68,8 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
68 }, 68 },
69 69
70 _materialInfo: { 70 _materialInfo: {
71 enumerable:true 71 enumerable:true,
72 serializable: true
72 }, 73 },
73 74
74 _showMaterialPopup: { 75 _showMaterialPopup: {
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index a4f758cf..0a32447e 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -12,6 +12,21 @@ var Montage = require("montage/core/core").Montage,
12//Exporting as MaterialsPopup 12//Exporting as MaterialsPopup
13exports.MaterialsPopup = Montage.create(Component, { 13exports.MaterialsPopup = Montage.create(Component, {
14 //////////////////////////////////////////////////////////////////// 14 ////////////////////////////////////////////////////////////////////
15 okButton: {
16 value: null,
17 serializable: true
18 },
19
20 cancelButton: {
21 value: null,
22 serializable: true
23 },
24
25 materialTitle: {
26 value: null,
27 serializable: true
28 },
29
15 // Material Properties 30 // Material Properties
16 _materialName: { 31 _materialName: {
17 enumerable: true, 32 enumerable: true,