diff options
author | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
commit | 9b45b897949bf934c8bf2c90ee2ff78f8713cb12 (patch) | |
tree | e7c276a3934c823cab894f46ee7dc5d3eda9ca83 /js/components/treeview/leaf.reel/leaf.html | |
parent | aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff) | |
parent | 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff) | |
download | ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/components/treeview/leaf.reel/leaf.html')
-rw-r--r-- | js/components/treeview/leaf.reel/leaf.html | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html new file mode 100644 index 00000000..cf0b4e40 --- /dev/null +++ b/js/components/treeview/leaf.reel/leaf.html | |||
@@ -0,0 +1,43 @@ | |||
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="leaf.css" rel="stylesheet" type="text/css" /> | ||
11 | <script type="text/montage-serialization"> | ||
12 | { | ||
13 | "owner": { | ||
14 | "module" : "js/components/treeview/leaf.reel", | ||
15 | "name" : "Leaf", | ||
16 | "properties" : { | ||
17 | "element" : {"#" : "leaf"}, | ||
18 | "label" : { "@" : "textComponent" } | ||
19 | } | ||
20 | }, | ||
21 | "textComponent" : { | ||
22 | "module" : "montage/ui/dynamic-text.reel", | ||
23 | "name" : "DynamicText", | ||
24 | "properties" : { | ||
25 | "element" : { "#" : "label" } | ||
26 | }, | ||
27 | "bindings" : { | ||
28 | "value" : { | ||
29 | "boundObject" : {"@": "owner"}, | ||
30 | "boundObjectPropertyPath": "_labelText", | ||
31 | "oneway": true | ||
32 | } | ||
33 | } | ||
34 | } | ||
35 | } | ||
36 | </script> | ||
37 | </head> | ||
38 | <body> | ||
39 | <div id="leaf" class="leaf"> | ||
40 | <span id="label" class="leaf-label"></span> | ||
41 | </div> | ||
42 | </body> | ||
43 | </html> \ No newline at end of file | ||