diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /node_modules/montage/ui/scroller.reel/scroller.html | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/scroller.reel/scroller.html')
| -rw-r--r-- | node_modules/montage/ui/scroller.reel/scroller.html | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/node_modules/montage/ui/scroller.reel/scroller.html b/node_modules/montage/ui/scroller.reel/scroller.html index 1663c26b..a0913331 100644 --- a/node_modules/montage/ui/scroller.reel/scroller.html +++ b/node_modules/montage/ui/scroller.reel/scroller.html | |||
| @@ -44,6 +44,15 @@ | |||
| 44 | } | 44 | } |
| 45 | ] | 45 | ] |
| 46 | }, | 46 | }, |
| 47 | "slot": { | ||
| 48 | "prototype": "montage/ui/slot.reel", | ||
| 49 | "properties": { | ||
| 50 | "element": {"#": "content"} | ||
| 51 | }, | ||
| 52 | "bindings": { | ||
| 53 | "domContent": {"<-": "@owner.domContent"} | ||
| 54 | } | ||
| 55 | }, | ||
| 47 | "owner": { | 56 | "owner": { |
| 48 | "prototype": "montage/ui/scroller.reel", | 57 | "prototype": "montage/ui/scroller.reel", |
| 49 | "properties": { | 58 | "properties": { |