Skip to content

Commit

Permalink
log cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven Wanderski committed Feb 28, 2013
1 parent c462d33 commit 9df40b6
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
11 changes: 5 additions & 6 deletions jquery.bxslider.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
slider.settings = $.extend({}, defaults, options);
// parse slideWidth setting
slider.settings.slideWidth = parseInt(slider.settings.slideWidth);
console.log(slider.settings.slideWidth);
// store the original children
slider.children = el.children(slider.settings.slideSelector);
// check if actual number of slides is less than minSlides / maxSlides
Expand All @@ -133,6 +132,8 @@
slider.active = { index: slider.settings.startSlide }
// store if the slider is in carousel mode (displaying / moving multiple slides)
slider.carousel = slider.settings.minSlides > 1 || slider.settings.maxSlides > 1;
// if carousel, force preloadImages = 'all'
if(slider.carousel) slider.settings.preloadImages = 'all';
// calculate the min / max width thresholds based on min / max number of slides
// used to setup and update carousel slides dimensions
slider.minThreshold = (slider.settings.minSlides * slider.settings.slideWidth) + ((slider.settings.minSlides - 1) * slider.settings.slideMargin);
Expand Down Expand Up @@ -199,16 +200,15 @@
position: 'relative'
});
slider.viewport.parent().css({
maxWidth: getViewportMaxWidth(),
width: '100%'
maxWidth: getViewportMaxWidth()
});
// apply css to all slider children
slider.children.css({
'float': slider.settings.mode == 'horizontal' ? 'left' : 'none',
listStyle: 'none',
position: 'relative'
});
// // apply the calculated width after the float is applied to prevent scrollbar interference
// apply the calculated width after the float is applied to prevent scrollbar interference
slider.children.width(getSlideWidth());
// if slideMargin is supplied, add the css
if(slider.settings.mode == 'horizontal' && slider.settings.slideMargin > 0) slider.children.css('marginRight', slider.settings.slideMargin);
Expand Down Expand Up @@ -239,7 +239,7 @@
// if video is true, set up the fitVids plugin
if(slider.settings.video) el.fitVids();
// set the default preload selector (visible)
var preloadSelector = slider.children.slice(slider.settings.startSlide, slider.settings.startSlide + getNumberSlidesShowing());;
var preloadSelector = slider.children.eq(slider.settings.startSlide);

This comment has been minimized.

Copy link
@ADmad

ADmad Mar 5, 2013

Why did you change to loading just first image for slider and all images for carousel instead of loading visible images for both cases?

if (slider.settings.preloadImages == "all") preloadSelector = el.children();
// only check for control addition if not in "ticker" mode
if(!slider.settings.ticker){
Expand Down Expand Up @@ -397,7 +397,6 @@
}else if(slider.settings.mode == 'vertical'){
slidesShowing = slider.settings.minSlides;
}
// console.log(slidesShowing);
return slidesShowing;
}

Expand Down
Loading

0 comments on commit 9df40b6

Please sign in to comment.