diff options
| author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
| commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
| tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | |
| parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.js')
| -rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | 3 |
1 files changed, 2 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: { |