diff options
author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/components/toolbar.reel/toolbar.html | |
parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/toolbar.reel/toolbar.html')
-rw-r--r-- | js/components/toolbar.reel/toolbar.html | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html new file mode 100644 index 00000000..d2c5972a --- /dev/null +++ b/js/components/toolbar.reel/toolbar.html | |||
@@ -0,0 +1,53 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!-- <copyright> | ||
3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
6 | </copyright> --> | ||
7 | <html lang="en"> | ||
8 | <head> | ||
9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
10 | <link href="toolbar.css" rel="stylesheet" type="text/css"> | ||
11 | <script type="text/montage-serialization"> | ||
12 | { | ||
13 | "owner": { | ||
14 | "prototype" : "js/components/toolbar.reel", | ||
15 | "properties" : { | ||
16 | "element" : {"#" : "toolbar-container"}, | ||
17 | "repetition": {"@": "buttonList" } | ||
18 | } | ||
19 | }, | ||
20 | |||
21 | "buttonList": { | ||
22 | "module": "montage/ui/repetition.reel", | ||
23 | "name": "Repetition", | ||
24 | "properties": { | ||
25 | "element": {"#": "repetition"} | ||
26 | }, | ||
27 | "bindings": { | ||
28 | "objects": {"<-": "@owner.buttons"} | ||
29 | } | ||
30 | }, | ||
31 | |||
32 | "button": { | ||
33 | "prototype": "montage/ui/button.reel", | ||
34 | "properties": { | ||
35 | "element": {"#": "button" }, | ||
36 | "label": " " | ||
37 | }, | ||
38 | "bindings": { | ||
39 | "label": {"<-": "@buttonList.objectAtCurrentIteration.title"}, | ||
40 | "sourceObject": {"<-": "@buttonList.objectAtCurrentIteration"} | ||
41 | } | ||
42 | } | ||
43 | } | ||
44 | </script> | ||
45 | </head> | ||
46 | <body> | ||
47 | <div data-montage-id="toolbar-container" class="toolbar-container"> | ||
48 | <ul data-montage-id="repetition"> | ||
49 | <li><button data-montage-id="button" class="toolbar-button"></button></li> | ||
50 | </ul> | ||
51 | </div> | ||
52 | </body> | ||
53 | </html> \ No newline at end of file | ||