aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
diff options
context:
space:
mode:
authorJonathan Duran2012-06-19 08:40:26 -0700
committerJonathan Duran2012-06-19 08:40:26 -0700
commit6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch)
tree253e5f6dd5923218e3155f78fa67ff3e43de0ebc /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
parentb51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.html')
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html13
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 @@
13 "addButton": { 13 "addButton": {
14 "prototype": "montage/ui/button.reel", 14 "prototype": "montage/ui/button.reel",
15 "properties": { 15 "properties": {
16 "element": {"#": "ml_add_btn"} 16 "element": {"#": "ml_add_btn"},
17 "enabled": false
17 }, 18 },
18 "listeners": [ 19 "listeners": [
19 { 20 {
@@ -25,8 +26,9 @@
25 "copyButton": { 26 "copyButton": {
26 "prototype": "montage/ui/button.reel", 27 "prototype": "montage/ui/button.reel",
27 "properties": { 28 "properties": {
28 "element": {"#": "ml_copy_btn"} 29 "element": {"#": "ml_copy_btn"},
29 }, 30 "enabled": false
31 },
30 "listeners": [ 32 "listeners": [
31 { 33 {
32 "type": "action", 34 "type": "action",
@@ -37,8 +39,9 @@
37 "deleteButton": { 39 "deleteButton": {
38 "prototype": "montage/ui/button.reel", 40 "prototype": "montage/ui/button.reel",
39 "properties": { 41 "properties": {
40 "element": {"#": "ml_delete_btn"} 42 "element": {"#": "ml_delete_btn"},
41 }, 43 "enabled": false
44 },
42 "listeners": [ 45 "listeners": [
43 { 46 {
44 "type": "action", 47 "type": "action",