aboutsummaryrefslogtreecommitdiff
path: root/js/components/popup.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/popup.reel
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/popup.reel')
-rwxr-xr-xjs/components/popup.reel/popup.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/js/components/popup.reel/popup.html b/js/components/popup.reel/popup.html
index b6f147aa..cc31106e 100755
--- a/js/components/popup.reel/popup.html
+++ b/js/components/popup.reel/popup.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 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/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -14,8 +14,7 @@
14 <script type="text/montage-serialization"> 14 <script type="text/montage-serialization">
15 { 15 {
16 "owner": { 16 "owner": {
17 "module": "js/components/Popup.reel", 17 "prototype": "js/components/Popup.reel",
18 "name": "Popup",
19 "properties": { 18 "properties": {
20 "element": {"#": "default_popup"} 19 "element": {"#": "default_popup"}
21 } 20 }
@@ -27,7 +26,7 @@
27 26
28 <body> 27 <body>
29 28
30 <div id="default_popup" class="default_popup"> 29 <div data-montage-id="default_popup" class="default_popup">
31 <div class="tooltip"><span/></div> 30 <div class="tooltip"><span/></div>
32 <div class="content"></div> 31 <div class="content"></div>
33 </div> 32 </div>