diff options
author | Jose Antonio Marquez | 2012-06-19 10:25:16 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-19 10:25:16 -0700 |
commit | 4d2a5acd1631f0cf4e38f127c886f481668ddce0 (patch) | |
tree | 3bc8f2b21826c0ee6d37bc77753d45a882783cbf /js/components/popup.reel/popup.html | |
parent | 616b31a644ee221edcbc19f821b2194e8edf9fad (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-4d2a5acd1631f0cf4e38f127c886f481668ddce0.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/components/popup.reel/popup.html')
-rwxr-xr-x | js/components/popup.reel/popup.html | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html index cc31106e..2262289c 100755 --- a/js/components/popup.reel/popup.html +++ b/js/components/popup.reel/popup.html | |||
@@ -16,7 +16,9 @@ | |||
16 | "owner": { | 16 | "owner": { |
17 | "prototype": "js/components/Popup.reel", | 17 | "prototype": "js/components/Popup.reel", |
18 | "properties": { | 18 | "properties": { |
19 | "element": {"#": "default_popup"} | 19 | "element": {"#": "default_popup"}, |
20 | "popupTooltip": {"#": "tooltip"}, | ||
21 | "popupContent": {"#": "content"} | ||
20 | } | 22 | } |
21 | } | 23 | } |
22 | } | 24 | } |
@@ -27,8 +29,8 @@ | |||
27 | <body> | 29 | <body> |
28 | 30 | ||
29 | <div data-montage-id="default_popup" class="default_popup"> | 31 | <div data-montage-id="default_popup" class="default_popup"> |
30 | <div class="tooltip"><span/></div> | 32 | <div data-montage-id="tooltip" class="tooltip"><span/></div> |
31 | <div class="content"></div> | 33 | <div data-montage-id="content" class="content"></div> |
32 | </div> | 34 | </div> |
33 | 35 | ||
34 | </body> | 36 | </body> |