aboutsummaryrefslogtreecommitdiff
path: root/js/components/slider.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/slider.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/slider.reel')
-rwxr-xr-xjs/components/slider.reel/slider.html13
1 files changed, 6 insertions, 7 deletions
diff --git a/js/components/slider.reel/slider.html b/js/components/slider.reel/slider.html
index b30d20a2..b23aa651 100755
--- a/js/components/slider.reel/slider.html
+++ b/js/components/slider.reel/slider.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/>
@@ -12,8 +12,7 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "module": "js/components/slider.reel", 15 "prototype": "js/components/slider.reel",
16 "name": "Slider",
17 "properties": { 16 "properties": {
18 "element": {"#": "slider"}, 17 "element": {"#": "slider"},
19 "parentDiv": {"#": "parentDiv"}, 18 "parentDiv": {"#": "parentDiv"},
@@ -28,10 +27,10 @@
28 27
29</head> 28</head>
30<body> 29<body>
31 <div id="slider" class="slider"> 30 <div data-montage-id="slider" class="slider">
32 <div id="parentDiv" class="slider-parent"> 31 <div data-montage-id="parentDiv" class="slider-parent">
33 <canvas id="slider_track" class="slider-track"></canvas> 32 <canvas data-montage-id="slider_track" class="slider-track"></canvas>
34 <div id="knob" class="knob"></div> 33 <div data-montage-id="knob" class="knob"></div>
35 </div> 34 </div>
36 </div> 35 </div>
37</body> 36</body>