8000 Carousel: Default demo with images. · rorteg/jquery-ui@8013ac0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8013ac0

Browse files
author
georgepaterson
committed
Carousel: Default demo with images.
1 parent 65f58c7 commit 8013ac0

10 files changed

+20
-17
lines changed

‎demos/carousel/default.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<script src="../../jquery-1.6.2.js"></script>
88
<script src="../../ui/jquery.ui.core.js"></script>
99
<script src="../../ui/jquery.ui.widget.js"></script>
10+
<script src="../../ui/jquery.effects.core.js"></script>
1011
<script src="../../ui/jquery.ui.carousel.js"></script>
1112
<link rel="stylesheet" href="../demos.css">
1213
<script>
@@ -21,14 +22,14 @@
2122

2223
<div id="carousel">
2324
<ul>
24-
<li><img src="images/01.jpg" alt=" Battlestar Galactica ships 01"></li>
25-
<li><img src="images/05.jpg" alt=" Battlestar Galactica ships 05"></li>
26-
<li><img src="images/08.jpg" alt=" Battlestar Galactica ships 08"></li>
27-
<li><img src="images/10.jpg" alt=" Battlestar Galactica ships 10"></li>
28-
<li><img src="images/15.jpg" alt=" Battlestar Galactica ships 15"></li>
29-
<li><img src="images/16.jpg" alt=" Battlestar Galactica ships 16"></li>
30-
<li><img src="images/19.jpg" alt=" Battlestar Galactica ships 19"></li>
31-
<li><img src="images/20.jpg" alt=" Battlestar Galactica ships 20"></li>
25+
<li><img src="../../themes/base/images/carousel/ui-carousel-mercury.jpg" alt="Mercury"></li>
26+
<li><img src="../../themes/base/images/carousel/ui-carousel-venus.jpg" alt="Venus"></li>
27+
<li><img src="../../themes/base/images/carousel/ui-carousel-mars.jpg" alt="Mars"></li>
28+
<li><img src="../../themes/base/images/carousel/ui-carousel-earth.jpg" alt="Earth"></li>
29+
<li><img src="../../themes/base/images/carousel/ui-carousel-moon.jpg" alt="Moon"></li>
30+
<li><img src="../../themes/base/images/carousel/ui-carousel-jupiter.jpg" alt="Jupiter"></li>
31+
<li><img src="../../themes/base/images/carousel/ui-carousel-saturn.jpg" alt="Saturn"></li>
32+
<li><img src="../../themes/base/images/carousel/ui-carousel-sedna.jpg" alt="Sedna"></li>
3233
</ul>
3334
</div>
3435

‎themes/base/images/carousel/ui-carousel-earth.jpg

8.53 KB
Loading

‎themes/base/images/carousel/ui-carousel-jupiter.jpg

18.1 KB
Loading

‎themes/base/images/carousel/ui-carousel-mars.jpg

24.7 KB
Loading

‎themes/base/images/carousel/ui-carousel-mercury.jpg

19.6 KB
Loading

‎themes/base/images/carousel/ui-carousel-moon.jpg

7.12 KB
Loading

‎themes/base/images/carousel/ui-carousel-saturn.jpg

18.5 KB
Loading

‎themes/base/images/carousel/ui-carousel-sedna.jpg

5.34 KB
Loading

‎themes/base/images/carousel/ui-carousel-venus.jpg

28.5 KB
Loading

‎ui/jquery.ui.carousel.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
* jquery.ui.widget.js
1111
*/
1212
(function($, undefined) {
13-
$.widget("ui.carousel", {
14-
version: "@VERSION",
13+
$.widget('ui.carousel', {
14+
version: '@VERSION',
1515
options: {
1616
scroll: 3,
1717
visible: 3,
@@ -202,7 +202,7 @@
202202
*/
203203
var self = this,
204204
o = this.options;
205-
if(!this.animated){
205+
if(!this.animated) {
206206
this.animated = true;
207207
if ($('.ui-carousel-slide', this.element).css('left') == 'auto') {
208208
current = 0;
@@ -217,13 +217,15 @@
217217
this.currentItem = this.currentItem + this.options.scroll;
218218
}
219219
distance = current + distance;
220-
$('.ui-carousel-slide', this.element).animate({left: distance + 'px'}, this.options.speed, this.options.easing, function() {
221-
if(o.track) {
222-
self._updateTracker();
220+
$('.ui-carousel-slide', this.element).animate({left: distance + 'px'},
221+
{duration: this.options.speed, easing: this.options.easing, complete: function() {
222+
if(o.track) {
223+
self._updateTracker();
224+
}
225+
self._navigationState();
226+
self.animated = false;
223227
}
224-
self._navigationState();
225-
self.animated = false;
226-
});
228+
});
227229
}
228230
}
229231
});

0 commit comments

Comments
 (0)
0