diff options
Diffstat (limited to 'js/panels/objects/objects-panel.reel')
| -rw-r--r-- | js/panels/objects/objects-panel.reel/objects-panel.css | 17 | ||||
| -rw-r--r-- | js/panels/objects/objects-panel.reel/objects-panel.html | 18 |
2 files changed, 3 insertions, 32 deletions
diff --git a/js/panels/objects/objects-panel.reel/objects-panel.css b/js/panels/objects/objects-panel.reel/objects-panel.css index 3fa3c479..3a83776e 100644 --- a/js/panels/objects/objects-panel.reel/objects-panel.css +++ b/js/panels/objects/objects-panel.reel/objects-panel.css | |||
| @@ -18,20 +18,3 @@ | |||
| 18 | margin: 10px 0 0 0; | 18 | margin: 10px 0 0 0; |
| 19 | padding: 0; | 19 | padding: 0; |
| 20 | } | 20 | } |
| 21 | .objects-list .list-item { | ||
| 22 | list-style-type: none; | ||
| 23 | float: left; | ||
| 24 | } | ||
| 25 | .object-icon { | ||
| 26 | background-color: #fff; | ||
| 27 | border: 1px solid #353535; | ||
| 28 | border-radius: 5px; | ||
| 29 | height: 50px; | ||
| 30 | margin: 0 15px 5px; | ||
| 31 | width: 50px; | ||
| 32 | } | ||
| 33 | .object-label { | ||
| 34 | color: #fff; | ||
| 35 | display: block; | ||
| 36 | text-align: center; | ||
| 37 | } \ No newline at end of file | ||
diff --git a/js/panels/objects/objects-panel.reel/objects-panel.html b/js/panels/objects/objects-panel.reel/objects-panel.html index d68a59c0..17f414e8 100644 --- a/js/panels/objects/objects-panel.reel/objects-panel.html +++ b/js/panels/objects/objects-panel.reel/objects-panel.html | |||
| @@ -27,11 +27,7 @@ | |||
| 27 | "arrayController": { | 27 | "arrayController": { |
| 28 | "prototype": "montage/ui/controller/array-controller", | 28 | "prototype": "montage/ui/controller/array-controller", |
| 29 | "bindings": { | 29 | "bindings": { |
| 30 | "content" : { | 30 | "content": {"<-": "@owner.objects"} |
| 31 | "boundObject": {"@": "owner"}, | ||
| 32 | "boundObjectPropertyPath": "objects", | ||
| 33 | "oneway": true | ||
| 34 | } | ||
| 35 | } | 31 | } |
| 36 | }, | 32 | }, |
| 37 | "objectComponent": { | 33 | "objectComponent": { |
| @@ -40,16 +36,8 @@ | |||
| 40 | "element": {"#": "list-item"} | 36 | "element": {"#": "list-item"} |
| 41 | }, | 37 | }, |
| 42 | "bindings": { | 38 | "bindings": { |
| 43 | "sourceObject" : { | 39 | "sourceObject" : {"<-": "@repetition.objectAtCurrentIteration"}, |
| 44 | "boundObject": {"@": "repetition"}, | 40 | "identifier" : {"<-": "@repetition.objectAtCurrentIteration.identifier"} |
| 45 | "boundObjectPropertyPath": "objectAtCurrentIteration", | ||
| 46 | "oneway": true | ||
| 47 | }, | ||
| 48 | "identifier" : { | ||
| 49 | "boundObject": {"@": "repetition"}, | ||
| 50 | "boundObjectPropertyPath": "objectAtCurrentIteration.identifier", | ||
| 51 | "oneway": true | ||
| 52 | } | ||
| 53 | } | 41 | } |
| 54 | } | 42 | } |
| 55 | 43 | ||