diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/slider.reel | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/components/slider.reel')
| -rwxr-xr-x | js/components/slider.reel/slider.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/components/slider.reel/slider.html b/js/components/slider.reel/slider.html index ecfb6ca4..b23aa651 100755 --- a/js/components/slider.reel/slider.html +++ b/js/components/slider.reel/slider.html | |||
| @@ -27,10 +27,10 @@ | |||
| 27 | 27 | ||
| 28 | </head> | 28 | </head> |
| 29 | <body> | 29 | <body> |
| 30 | <div id="slider" class="slider"> | 30 | <div data-montage-id="slider" class="slider"> |
| 31 | <div id="parentDiv" class="slider-parent"> | 31 | <div data-montage-id="parentDiv" class="slider-parent"> |
| 32 | <canvas id="slider_track" class="slider-track"></canvas> | 32 | <canvas data-montage-id="slider_track" class="slider-track"></canvas> |
| 33 | <div id="knob" class="knob"></div> | 33 | <div data-montage-id="knob" class="knob"></div> |
| 34 | </div> | 34 | </div> |
| 35 | </div> | 35 | </div> |
| 36 | </body> | 36 | </body> |