Merge branch 'refs/heads/master' into montage-v11-integration

Conflicts:
	js/io/system/ninjalibrary.json

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index b5d7a869..6fa54495 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -13,7 +13,8 @@
             "addButton": {
                 "prototype": "montage/ui/button.reel",
                 "properties": {
-                    "element": {"#": "ml_add_btn"}
+                    "element": {"#": "ml_add_btn"},
+                                        "enabled": false
                 },
                 "listeners": [
                     {
@@ -25,8 +26,9 @@
             "copyButton": {
                 "prototype": "montage/ui/button.reel",
                 "properties": {
-                    "element": {"#": "ml_copy_btn"}
-                },
+                    "element": {"#": "ml_copy_btn"},
+                                        "enabled": false
+               },
                 "listeners": [
                     {
                         "type": "action",
@@ -37,8 +39,9 @@
             "deleteButton": {
                 "prototype": "montage/ui/button.reel",
                 "properties": {
-                    "element": {"#": "ml_delete_btn"}
-                },
+                    "element": {"#": "ml_delete_btn"},
+                                        "enabled": false
+               },
                 "listeners": [
                     {
                         "type": "action",