aboutsummaryrefslogtreecommitdiff
path: root/js/components/popup.reel/popup.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-19 01:03:59 -0700
committerArmen Kesablyan2012-06-19 01:03:59 -0700
commit2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch)
treed352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/popup.reel/popup.html
parent244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff)
parentc59eb371559a3061ce53223e249ca97daace5968 (diff)
downloadninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/popup.reel/popup.html')
-rwxr-xr-xjs/components/popup.reel/popup.html8
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>