Skip to content

Commit

Permalink
console log removed.
Browse files Browse the repository at this point in the history
  • Loading branch information
@andygott
andygott committed Jul 5, 2011
1 parent ed26b0a commit b37cf98
Show file tree
Hide file tree
Showing 2 changed files with 160 additions and 36 deletions.
46 changes: 25 additions & 21 deletions js/jquery.rs.slideshow.js
View file
Expand Up @@ -213,21 +213,24 @@
*/

startShow: function(interval, instant) {
var $slideshow = this;
var data = $slideshow.data('rsf_slideshow');
if (!data.interval_id) {
if (instant) {
$slideshow.rsfSlideshow('nextSlide');
}
if (!interval) {
interval = data.settings.interval;
return this.each(function() {
var $slideshow = $(this);
if (!$slideshow.data('rsf_slideshow').interval_id) {
if (instant) {
$slideshow.rsfSlideshow('nextSlide');
}
if (!interval) {
interval = $slideshow.data('rsf_slideshow').settings.interval;
}
if (interval <= $slideshow.data('rsf_slideshow').settings.transition / 1000) {
interval = ($slideshow.data('rsf_slideshow').settings.transition / 1000) + 0.1;
}
$slideshow.data('rsf_slideshow').interval_id = setInterval(function() {
$slideshow.rsfSlideshow('nextSlide');
}, interval * 1000);
RssPrivateMethods._trigger($slideshow, 'rsStartShow');
}
data.interval_id = setInterval(function() {
$slideshow.rsfSlideshow('nextSlide');
}, interval * 1000);
RssPrivateMethods._trigger($slideshow, 'rsStartShow');
}
return this;
});
},


Expand All @@ -236,13 +239,14 @@
*/

stopShow: function() {
var data = this.data('rsf_slideshow');
if (data.interval_id) {
clearInterval(data.interval_id);
data.interval_id = false;
RssPrivateMethods._trigger(this, 'rsStopShow');
}
return this;
return this.each(function() {
var data = $(this).data('rsf_slideshow');
if (data.interval_id) {
clearInterval(data.interval_id);
data.interval_id = false;
RssPrivateMethods._trigger($(this), 'rsStopShow');
}
});
},


Expand Down
150 changes: 135 additions & 15 deletions tests/jquery.rs.slideshow.tests.js
View file
Expand Up @@ -6,20 +6,81 @@
$(document).ready(function() {


/**
* addSlides
*/
module("addSlides()");

test("Using URL only", function() {
$('.rs-slideshow').rsfSlideshow({autostart: false});
$('.rs-slideshow').rsfSlideshow('addSlides', 'http://example.com/image.png');
equal(
'http://example.com/image.png',
$('#slideshow').data('rsf_slideshow').slides[3].url
);
});

test("Using a single slide object", function() {
expect(4);
$('.rs-slideshow').rsfSlideshow({autostart: false});
var slide = {
url: 'http://example.com/image.png',
caption: 'Test Caption',
link_to: 'http://example.com/link-to-here',
custom_value: 'test custome value'
};
$('.rs-slideshow').rsfSlideshow('addSlides', slide);
for (var key in slide) {
equal(
slide[key],
$('#slideshow').data('rsf_slideshow').slides[3][key]
);
}
});

test("Using an array of slide objects (multiple slides)", function() {
expect(8);
$('.rs-slideshow').rsfSlideshow({autostart: false});
var slides = [
{
url: 'http://example.com/image.png',
caption: 'Test Caption',
link_to: 'http://example.com/link-to-here',
custom_value: 'test custome value'
},
{
url: 'http://example.com/image2.png',
caption: 'Test Caption 2',
link_to: 'http://example.com/link-to-here-2',
custom_value: 'test custome value 2'
}
];
$('.rs-slideshow').rsfSlideshow('addSlides', slides);
for (var i = 0, len = slides.length; i < len; i ++) {
for (var key in slides[i]) {
equal(
slides[i][key],
$('#slideshow').data('rsf_slideshow').slides[(3 + i)][key]
);
}
}
});


/**
* getSlideData
*/
module("getSlideData");
module("getSlideData()");

test("getSlideData()", function() {
test("Without params", function() {
$('.rs-slideshow').rsfSlideshow({autostart: false});
deepEqual(
$('#slideshow').rsfSlideshow('getSlideData'),
$('#slideshow').data('rsf_slideshow').slides
);
});

test("getSlideData(key)", function() {
test("Using slide index", function() {
$('.rs-slideshow').rsfSlideshow({autostart: false});
expect($('#slideshow').data('rsf_slideshow').slides.length);
for (var i = 0, len = $('#slideshow').data('rsf_slideshow').slides.length; i < len; i ++) {
Expand All @@ -34,17 +95,17 @@ $(document).ready(function() {
/**
* removeSlides
*/
module("removeSlides");
module("removeSlides()");

test("removeSlides()", function() {
test("Without params", function() {
$('.rs-slideshow').rsfSlideshow({autostart: false});
expect(2);
equal($('#slideshow').data('rsf_slideshow').slides.length, 3);
$('#slideshow').rsfSlideshow('removeSlides');
equal($('#slideshow').data('rsf_slideshow').slides.length, 0);
});

test("removeSlides(key)", function() {
test("Using slide index", function() {
$('.rs-slideshow').rsfSlideshow({autostart: false});
expect(3);
equal($('#slideshow').data('rsf_slideshow').slides.length, 3);
Expand All @@ -54,23 +115,23 @@ $(document).ready(function() {
equal($('#slideshow').data('rsf_slideshow').slides.length, 1);
});

test("removeSlides([1,2])", function() {
test("Using array: [1,2]", function() {
$('.rs-slideshow').rsfSlideshow({autostart: false});
expect(2);
equal($('#slideshow').data('rsf_slideshow').slides.length, 3);
$('#slideshow').rsfSlideshow('removeSlides', [1,2]);
equal($('#slideshow').data('rsf_slideshow').slides.length, 1);
});

test("removeSlides([1,1,2])", function() {
test("Using array: [1,1,2]", function() {
$('.rs-slideshow').rsfSlideshow({autostart: false});
expect(2);
equal($('#slideshow').data('rsf_slideshow').slides.length, 3);
$('#slideshow').rsfSlideshow('removeSlides', [1,1,2]);
equal($('#slideshow').data('rsf_slideshow').slides.length, 1);
});

test("removeSlides([0,0,0])", function() {
test("Using array: [0,0,0]", function() {
$('.rs-slideshow').rsfSlideshow({autostart: false});
expect(2);
equal($('#slideshow').data('rsf_slideshow').slides.length, 3);
Expand All @@ -79,13 +140,74 @@ $(document).ready(function() {
});


/**
* startShow()
*/
module("startShow()");

asyncTest("Without params", function(){
$('.rs-slideshow').rsfSlideshow({
autostart: false
}).bind('rsPostTransition', function(e, data) {
console.log($('#slideshow').data('rsf_slideshow').slides);
deepEqual(
$('#slideshow').data('rsf_slideshow').slides[1],
data.slide);
$('.rs-slideshow').rsfSlideshow('stopShow');
start();
}).rsfSlideshow('startShow');

});

asyncTest("Using interval", function(){
$('.rs-slideshow').rsfSlideshow({
autostart: false
}).bind('rsPostTransition', function(e, data) {
console.log($('#slideshow').data('rsf_slideshow').slides);
deepEqual(
$('#slideshow').data('rsf_slideshow').slides[1],
data.slide);
$('.rs-slideshow').rsfSlideshow('stopShow');
start();
}).rsfSlideshow('startShow', 1);
});

asyncTest("Using interval & instant flag", function(){
$('.rs-slideshow').rsfSlideshow({
autostart: false
}).bind('rsPostTransition', function(e, data) {
deepEqual(
$('#slideshow').data('rsf_slideshow').slides[1],
data.slide);
$('.rs-slideshow').rsfSlideshow('stopShow');
start();
}).rsfSlideshow('startShow', 1, true);
});


/**
* stopShow()
*/
module("stopShow()");

asyncTest("stopShow()", function(){
$('.rs-slideshow').rsfSlideshow({
autostart: false
}).bind('rsPostTransition', function(e, data) {
$(this).rsfSlideshow('stopShow');
}).bind('rsStopShow', function(e, data) {
equal(false, $(this).data('rsf_slideshow').interval_id);
start();
}).rsfSlideshow('startShow');
});


/**
* Slide Data from Markup
*/
module("Slide Data from Markup");

test("Image Src & Caption", function(){
stop();
asyncTest("Image Src & Caption", function(){
expect(2);
$('.rs-slideshow').rsfSlideshow({
autostart: false
Expand All @@ -98,8 +220,7 @@ $(document).ready(function() {
}).rsfSlideshow('goToSlide', 1);
});

test("Image Link Dest", function(){
stop();
asyncTest("Image Link Dest", function(){
expect(1);
$('.rs-slideshow').rsfSlideshow({
autostart: false
Expand All @@ -110,8 +231,7 @@ $(document).ready(function() {
}).rsfSlideshow('goToSlide', 1);
});

test("Image Alt & Title", function(){
stop();
asyncTest("Image Alt & Title", function(){
expect(2);
$('.rs-slideshow').rsfSlideshow({
autostart: false,
Expand Down

0 comments on commit b37cf98

Please sign in to comment.