diff options
| author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
| commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
| tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /js/panels/objects/object.reel/object.html | |
| parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
| parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
| download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/objects/object.reel/object.html')
| -rw-r--r-- | js/panels/objects/object.reel/object.html | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/js/panels/objects/object.reel/object.html b/js/panels/objects/object.reel/object.html new file mode 100644 index 00000000..f9de1499 --- /dev/null +++ b/js/panels/objects/object.reel/object.html | |||
| @@ -0,0 +1,44 @@ | |||
| 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> | ||
| 8 | <head> | ||
| 9 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
| 10 | <link rel="stylesheet" type="text/css" href="object.css"> | ||
| 11 | |||
| 12 | <script type="text/montage-serialization"> | ||
| 13 | { | ||
| 14 | "owner": { | ||
| 15 | "prototype": "js/panels/objects/object.reel", | ||
| 16 | "properties": { | ||
| 17 | "element": {"#": "object"}, | ||
| 18 | "iconElement": { "#": "object-icon"} | ||
| 19 | } | ||
| 20 | }, | ||
| 21 | "labelText": { | ||
| 22 | "prototype": "montage/ui/dynamic-text.reel", | ||
| 23 | "properties": { | ||
| 24 | "element": {"#": "name" } | ||
| 25 | }, | ||
| 26 | "bindings": { | ||
| 27 | "value" : {"<-": "@owner.name"} | ||
| 28 | } | ||
| 29 | } | ||
| 30 | |||
| 31 | } | ||
| 32 | </script> | ||
| 33 | |||
| 34 | </head> | ||
| 35 | <body> | ||
| 36 | |||
| 37 | |||
| 38 | <li data-montage-id="object" draggable="true"> | ||
| 39 | <div data-montage-id="object-icon" class="object-icon"></div> | ||
| 40 | <span data-montage-id="name" class="object-name"></span> | ||
| 41 | </li> | ||
| 42 | |||
| 43 | </body> | ||
| 44 | </html> | ||