diff options
| author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
| commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
| tree | 762d98ba8852b858c03760f4b9bef294fae6486c /js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html | |
| parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
| parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
| download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html')
| -rwxr-xr-x | js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html index df104ecc..6d7c8a2c 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html +++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html | |||
| @@ -15,8 +15,41 @@ | |||
| 15 | "module": "js/panels/Components/ComponentsPanelBase.reel", | 15 | "module": "js/panels/Components/ComponentsPanelBase.reel", |
| 16 | "name": "ComponentsPanelBase", | 16 | "name": "ComponentsPanelBase", |
| 17 | "properties": { | 17 | "properties": { |
| 18 | "element": {"#": "components_panel"} | 18 | "element": {"#": "components_panel"}, |
| 19 | "controller": {"@": "componentsTree"} | ||
| 19 | } | 20 | } |
| 21 | }, | ||
| 22 | |||
| 23 | "componentsController" : { | ||
| 24 | "module": "js/components/controllers/tree-controller", | ||
| 25 | "name": "TreeController", | ||
| 26 | "properties" : { | ||
| 27 | "branchKey" : "children", | ||
| 28 | "labelKey" : "text", | ||
| 29 | "delegate": {"@": "owner" } | ||
| 30 | }, | ||
| 31 | "bindings": { | ||
| 32 | "content": { | ||
| 33 | "boundObject": {"@": "owner"}, | ||
| 34 | "boundObjectPropertyPath": "components" | ||
| 35 | } | ||
| 36 | } | ||
| 37 | }, | ||
| 38 | |||
| 39 | "componentsTree" : { | ||
| 40 | "module" : "js/components/treeview/treeview.reel", | ||
| 41 | "name" : "Treeview", | ||
| 42 | "properties" : { | ||
| 43 | "element" : {"#": "componentsContainer"}, | ||
| 44 | "branchComponent" : {"@": "branch" }, | ||
| 45 | "contentController": {"@": "componentsController"}, | ||
| 46 | "showRoot" : false | ||
| 47 | } | ||
| 48 | }, | ||
| 49 | |||
| 50 | "branch" : { | ||
| 51 | "module" : "js/components/treeview/ninja-branch.reel", | ||
| 52 | "name" : "Branch" | ||
| 20 | } | 53 | } |
| 21 | } | 54 | } |
| 22 | </script> | 55 | </script> |
| @@ -25,9 +58,7 @@ | |||
| 25 | <body> | 58 | <body> |
| 26 | 59 | ||
| 27 | <div id="components_panel" class="components_panel"> | 60 | <div id="components_panel" class="components_panel"> |
| 28 | <div class="treeHolder"> | 61 | <div id="componentsContainer"></div> |
| 29 | <ul id="comp_tree"></ul> | ||
| 30 | </div> | ||
| 31 | </div> | 62 | </div> |
| 32 | 63 | ||
| 33 | </body> | 64 | </body> |