diff options
| author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
| commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
| tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/panels/PanelContainer.reel | |
| parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
| parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
| download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/PanelContainer.reel')
| -rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index f1d1a855..7327fb1d 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html | |||
| @@ -56,7 +56,8 @@ | |||
| 56 | }, | 56 | }, |
| 57 | 57 | ||
| 58 | "panel_6": { | 58 | "panel_6": { |
| 59 | "prototype": "js/panels/Panel.reel", | 59 | "module": "js/panels/Panel.reel", |
| 60 | "name": "Panel", | ||
| 60 | "properties": { | 61 | "properties": { |
| 61 | "element": {"#": "panel_6"} | 62 | "element": {"#": "panel_6"} |
| 62 | } | 63 | } |