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/components-panel.reel/components-panel.html | |
| 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/components-panel.reel/components-panel.html')
| -rwxr-xr-x | js/panels/components-panel.reel/components-panel.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/panels/components-panel.reel/components-panel.html b/js/panels/components-panel.reel/components-panel.html index 1a257957..a8d71d50 100755 --- a/js/panels/components-panel.reel/components-panel.html +++ b/js/panels/components-panel.reel/components-panel.html | |||
| @@ -14,8 +14,7 @@ | |||
| 14 | "owner": { | 14 | "owner": { |
| 15 | "prototype": "js/panels/components-panel.reel", | 15 | "prototype": "js/panels/components-panel.reel", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "element": {"#": "components_panel"}, | 17 | "element": {"#": "components_panel"} |
| 18 | "controller": {"@": "componentsTree"} | ||
| 19 | } | 18 | } |
| 20 | }, | 19 | }, |
| 21 | 20 | ||