spree_multi_slideshow 1.1.8 → 1.2.0

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_multi_slideshow', '~> 1.1.8'
+  gem 'spree_multi_slideshow', '~> 1.2.0'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:
@@ -35,8 +35,8 @@ displays slides for which the category column, dafault is "home"
 </pre>
 style layout for slideshow: [small, medium, slide, default => custom]
 <pre>
-	<%= insert_slideshow(:id => "slides", :class => "my_slide", :pagination_class => "pagination", :show_content => true) %>
+	<%= insert_slideshow(:enable_content => true/false :style => "custom", :category => "custom") %>
 </pre>
-added class and id for slider, enable content slide
+added a content_tag for display title and description of slide
 
 Copyright (c) 2012 [Damiano Giacomello], released under the New BSD License

data/app/assets/javascripts/admin/slides/index.js

@@ -7,4 +7,4 @@ $(document).ready(function(){
             success: function(r){ $('#slides').html(r);} });
   });
 
-});
+});

data/app/assets/javascripts/admin/slides/new.js

@@ -2,4 +2,4 @@ $('#cancel_link').click(function (event) {
   event.preventDefault();
   $('#new_slide_link').show();
   $('#slides').html('');
-});
+});

data/app/assets/javascripts/admin/spree_multi_slideshow.js

@@ -1 +1 @@
-//= require admin/slide_settings
+//= require ckeditor/init

data/app/assets/javascripts/store/spree_multi_slideshow.js

@@ -1,555 +1,229 @@
-/*
-* Slides, A Slideshow Plugin for jQuery
-* Intructions: http://slidesjs.com
-* By: Nathan Searles, http://nathansearles.com
-* Version: 1.1.9
-* Updated: September 5th, 2011
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-(function($){
-	$.fn.slides = function( option ) {
-		// override defaults with specified option
-		option = $.extend( {}, $.fn.slides.option, option );
+// page init
+jQuery(function($) {
+	initGalleries();
+});
 
-		return this.each(function(){
-			// wrap slides in control container, make sure slides are block level
-			$('.' + option.container, $(this)).children().wrapAll('<div class="slides_control"/>');
-			
-			var elem = $(this),
-				control = $('.slides_control',elem),
-				total = control.children().size(),
-				width = control.children().outerWidth(),
-				height = control.children().outerHeight(),
-				start = option.start - 1,
-				effect = option.effect.indexOf(',') < 0 ? option.effect : option.effect.replace(' ', '').split(',')[0],
-				paginationEffect = option.effect.indexOf(',') < 0 ? effect : option.effect.replace(' ', '').split(',')[1],
-				next = 0, prev = 0, number = 0, current = 0, loaded, active, clicked, position, direction, imageParent, pauseTimeout, playInterval;
-			
-			// is there only one slide?
-			if (total < 2) {
-				// Fade in .slides_container
-				$('.' + option.container, $(this)).fadeIn(option.fadeSpeed, option.fadeEasing, function(){
-					// let the script know everything is loaded
-					loaded = true;
-					// call the loaded funciton
-					option.slidesLoaded();
-				});
-				// Hide the next/previous buttons
-				$('.' + option.next + ', .' + option.prev).fadeOut(0);
-				return false;
-			}
+// galleries init
+function initGalleries(){
+	// main banner slideshow
+	jQuery('div.gallery').fadeGallery({
+		autoRotation: true,
+		switchTime: 5000, //ms
+		duration: 800 //ms
+	});
+};
 
-			// animate slides
-			function animate(direction, effect, clicked) {
-				if (!active && loaded) {
-					active = true;
-					// start of animation
-					option.animationStart(current + 1);
-					switch(direction) {
-						case 'next':
-							// change current slide to previous
-							prev = current;
-							// get next from current + 1
-							next = current + 1;
-							// if last slide, set next to first slide
-							next = total === next ? 0 : next;
-							// set position of next slide to right of previous
-							position = width*2;
-							// distance to slide based on width of slides
-							direction = -width*2;
-							// store new current slide
-							current = next;
-						break;
-						case 'prev':
-							// change current slide to previous
-							prev = current;
-							// get next from current - 1
-							next = current - 1;
-							// if first slide, set next to last slide
-							next = next === -1 ? total-1 : next;								
-							// set position of next slide to left of previous
-							position = 0;								
-							// distance to slide based on width of slides
-							direction = 0;		
-							// store new current slide
-							current = next;
-						break;
-						case 'pagination':
-							// get next from pagination item clicked, convert to number
-							next = parseInt(clicked,10);
-							// get previous from pagination item with class of current
-							prev = $('.' + option.paginationClass + ' li.'+ option.currentClass +' a', elem).attr('href').match('[^#/]+$');
-							// if next is greater then previous set position of next slide to right of previous
-							if (next > prev) {
-								position = width*2;
-								direction = -width*2;
-							} else {
-							// if next is less then previous set position of next slide to left of previous
-								position = 0;
-								direction = 0;
-							}
-							// store new current slide
-							current = next;
-						break;
-					}
+// slideshow plugin
+jQuery.fn.fadeGallery = function(_options){
+	var _options = jQuery.extend({
+		slideElements:'div.gallery-inner > ul > li',
+		pagerGener: false,
+		pagerHold: false,
+		pagerLinks:'ul.nav-list li',
+		btnNext:'a.gallery-control.right',
+		btnPrev:'a.gallery-control.left',
+		btnPlayPause:'a.play-pause',
+		btnPlay:'a.play',
+		btnPause:'a.pause',
+		pausedClass:'paused',
+		disabledClass: 'disabled',
+		playClass:'playing',
+		activeClass:'active',
+		currentNum:false,
+		allNum:false,
+		startSlide:null,
+		noCircle:false,
+		caption:'ul.caption > li',
+		pauseOnHover:false,
+		autoRotation:false,
+		autoHeight:false,
+		onChange:false,
+		switchTime:3000,
+		duration:650,
+		event:'click'
+	},_options);
 
-					// fade animation
-					if (effect === 'fade') {
-						// fade animation with crossfade
-						if (option.crossfade) {
-							// put hidden next above current
-							control.children(':eq('+ next +')', elem).css({
-								zIndex: 10
-							// fade in next
-							}).fadeIn(option.fadeSpeed, option.fadeEasing, function(){
-								if (option.autoHeight) {
-									// animate container to height of next
-									control.animate({
-										height: control.children(':eq('+ next +')', elem).outerHeight()
-									}, option.autoHeightSpeed, function(){
-										// hide previous
-										control.children(':eq('+ prev +')', elem).css({
-											display: 'none',
-											zIndex: 0
-										});								
-										// reset z index
-										control.children(':eq('+ next +')', elem).css({
-											zIndex: 0
-										});									
-										// end of animation
-										option.animationComplete(next + 1);
-										active = false;
-									});
-								} else {
-									// hide previous
-									control.children(':eq('+ prev +')', elem).css({
-										display: 'none',
-										zIndex: 0
-									});									
-									// reset zindex
-									control.children(':eq('+ next +')', elem).css({
-										zIndex: 0
-									});									
-									// end of animation
-									option.animationComplete(next + 1);
-									active = false;
-								}
-							});
-						} else {
-							// fade animation with no crossfade
-							control.children(':eq('+ prev +')', elem).fadeOut(option.fadeSpeed,  option.fadeEasing, function(){
-								// animate to new height
-								if (option.autoHeight) {
-									control.animate({
-										// animate container to height of next
-										height: control.children(':eq('+ next +')', elem).outerHeight()
-									}, option.autoHeightSpeed,
-									// fade in next slide
-									function(){
-										control.children(':eq('+ next +')', elem).fadeIn(option.fadeSpeed, option.fadeEasing);
-									});
-								} else {
-								// if fixed height
-									control.children(':eq('+ next +')', elem).fadeIn(option.fadeSpeed, option.fadeEasing, function(){
-										// fix font rendering in ie, lame
-										if($.browser.msie) {
-											$(this).get(0).style.removeAttribute('filter');
-										}
-									});
-								}									
-								// end of animation
-								option.animationComplete(next + 1);
-								active = false;
-							});
-						}
-					// slide animation
-					} else {
-						// move next slide to right of previous
-						control.children(':eq('+ next +')').css({
-							left: position,
-							display: 'block'
-						});
-						// animate to new height
-						if (option.autoHeight) {
-							control.animate({
-								left: direction,
-								height: control.children(':eq('+ next +')').outerHeight()
-							},option.slideSpeed, option.slideEasing, function(){
-								control.css({
-									left: -width
-								});
-								control.children(':eq('+ next +')').css({
-									left: width,
-									zIndex: 0
-								});
-								// reset previous slide
-								control.children(':eq('+ prev +')').css({
-									left: width,
-									display: 'none',
-									zIndex: 0
-								});
-								// end of animation
-								option.animationComplete(next + 1);
-								active = false;
-							});
-							// if fixed height
-							} else {
-								// animate control
-								control.animate({
-									left: direction
-								},option.slideSpeed, option.slideEasing, function(){
-									// after animation reset control position
-									control.css({
-										left: -width
-									});
-									// reset and show next
-									control.children(':eq('+ next +')').css({
-										left: width,
-										zIndex: 0
-									});
-									// reset previous slide
-									control.children(':eq('+ prev +')').css({
-										left: width,
-										display: 'none',
-										zIndex: 0
-									});
-									// end of animation
-									option.animationComplete(next + 1);
-									active = false;
-								});
-							}
-						}
-					// set current state for pagination
-					if (option.pagination) {
-						// remove current class from all
-						$('.'+ option.paginationClass +' li.' + option.currentClass, elem).removeClass(option.currentClass);
-						// add current class to next
-						$('.' + option.paginationClass + ' li:eq('+ next +')', elem).addClass(option.currentClass);
-					}
-				}
-			} // end animate function
-			
-			function stop() {
-				// clear interval from stored id
-				clearInterval(elem.data('interval'));
-			}
+	return this.each(function(){
+		// gallery options
+		var _this = jQuery(this);
+		var _slides = jQuery(_options.slideElements, _this);
+		var _btnPrev = jQuery(_options.btnPrev, _this);
+		var _btnNext = jQuery(_options.btnNext, _this);
+		var _btnPlayPause = jQuery(_options.btnPlayPause, _this);
+		var _btnPause = jQuery(_options.btnPause, _this);
+		var _btnPlay = jQuery(_options.btnPlay, _this);
+		var _pauseOnHover = _options.pauseOnHover;
+		var _autoRotation = _options.autoRotation;
+		var _activeClass = _options.activeClass;
+		var _disabledClass = _options.disabledClass;
+		var _pausedClass = _options.pausedClass;
+		var _playClass = _options.playClass;
+		var _autoHeight = _options.autoHeight;
+		var _duration = _options.duration;
+		var _switchTime = _options.switchTime;
+		var _controlEvent = _options.event;
+		var _currentNum = (_options.currentNum ? jQuery(_options.currentNum, _this) : false);
+		var _allNum = (_options.allNum ? jQuery(_options.allNum, _this) : false);
+		var _startSlide = _options.startSlide;
+		var _noCycle = _options.noCircle;
+		var _onChange = _options.onChange;
+		var _pagerGener = _options.pagerGener;
+		var _pagerHold = jQuery(_options.pagerHold,_this);
+		var _caption = jQuery(_options.caption,_this);
+		var _paging = '';
+		if(_pagerGener){
+			for(var i=0; i< _slides.length; i++){
+				_paging += '<li><a href="#">'+(i+1)+'</a></li>';
+			}
+			_pagerHold.html('<ul>'+_paging+'</ul>');
+		}
+		var _pagerLinks = jQuery(_options.pagerLinks, _this);
+		// gallery init
+		var _hover = false;
+		var _prevIndex = 0;
+		var _currentIndex = 0;
+		var _slideCount = _slides.length;
+		var _timer;
+		if(_slideCount < 2) return;
 
-			function pause() {
-				if (option.pause) {
-					// clear timeout and interval
-					clearTimeout(elem.data('pause'));
-					clearInterval(elem.data('interval'));
-					// pause slide show for option.pause amount
-					pauseTimeout = setTimeout(function() {
-						// clear pause timeout
-						clearTimeout(elem.data('pause'));
-						// start play interval after pause
-						playInterval = setInterval(	function(){
-							animate("next", effect);
-						},option.play);
-						// store play interval
-						elem.data('interval',playInterval);
-					},option.pause);
-					// store pause interval
-					elem.data('pause',pauseTimeout);
-				} else {
-					// if no pause, just stop
-					stop();
-				}
-			}
-				
-			// 2 or more slides required
-			if (total < 2) {
-				return;
-			}
-			
-			// error corection for start slide
-			if (start < 0) {
-				start = 0;
-			}
-			
-			if (start > total) {
-				start = total - 1;
-			}
-					
-			// change current based on start option number
-			if (option.start) {
-				current = start;
-			}
-			
-			// randomizes slide order
-			if (option.randomize) {
-				control.randomize();
-			}
-			
-			// make sure overflow is hidden, width is set
-			$('.' + option.container, elem).css({
-				overflow: 'hidden',
-				// fix for ie
-				position: 'relative'
+		_prevIndex = _slides.index(_slides.filter('.'+_activeClass));
+		if(_prevIndex < 0) _prevIndex = _currentIndex = 0;
+		else _currentIndex = _prevIndex;
+		if(_startSlide != null) {
+			if(_startSlide == 'random') _prevIndex = _currentIndex = Math.floor(Math.random()*_slideCount);
+			else _prevIndex = _currentIndex = parseInt(_startSlide);
+		}
+		_slides.hide().eq(_currentIndex).show();
+		_caption.hide().eq(_currentIndex).show();
+		if(_autoRotation) _this.removeClass(_pausedClass).addClass(_playClass);
+		else _this.removeClass(_playClass).addClass(_pausedClass);
+
+		// gallery control
+		if(_btnPrev.length) {
+			_btnPrev.bind(_controlEvent,function(){
+				prevSlide();
+				return false;
 			});
-			
-			// set css for slides
-			control.children().css({
-				position: 'absolute',
-				top: 0, 
-				left: control.children().outerWidth(),
-				zIndex: 0,
-				display: 'none'
-			 });
-			
-			// set css for control div
-			control.css({
-				position: 'relative',
-				// size of control 3 x slide width
-				width: (width * 3),
-				// set height to slide height
-				height: height,
-				// center control to slide
-				left: -width
+		}
+		if(_btnNext.length) {
+			_btnNext.bind(_controlEvent,function(){
+				nextSlide();
+				return false;
 			});
-			
-			// show slides
-			$('.' + option.container, elem).css({
-				display: 'block'
+		}
+		if(_pagerLinks.length) {
+			_pagerLinks.each(function(_ind){
+				jQuery(this).bind(_controlEvent,function(){
+					if(_currentIndex != _ind) {
+						_prevIndex = _currentIndex;
+						_currentIndex = _ind;
+						switchSlide();
+					}
+					return false;
+				});
 			});
+		}
 
-			// if autoHeight true, get and set height of first slide
-			if (option.autoHeight) {
-				control.children().css({
-					height: 'auto'
-				});
-				control.animate({
-					height: control.children(':eq('+ start +')').outerHeight()
-				},option.autoHeightSpeed);
-			}
-			
-			// checks if image is loaded
-			if (option.preload && control.find('img:eq(' + start + ')').length) {
-				// adds preload image
-				$('.' + option.container, elem).css({
-					background: 'url(' + option.preloadImage + ') no-repeat 50% 50%'
-				});
-				
-				// gets image src, with cache buster
-				var img = control.find('img:eq(' + start + ')').attr('src') + '?' + (new Date()).getTime();
-				
-				// check if the image has a parent
-				if ($('img', elem).parent().attr('class') != 'slides_control') {
-					// If image has parent, get tag name
-					imageParent = control.children(':eq(0)')[0].tagName.toLowerCase();
+		// play pause section
+		if(_btnPlayPause.length) {
+			_btnPlayPause.bind(_controlEvent,function(){
+				if(_this.hasClass(_pausedClass)) {
+					_this.removeClass(_pausedClass).addClass(_playClass);
+					_autoRotation = true;
+					autoSlide();
 				} else {
-					// Image doesn't have parent, use image tag name
-					imageParent = control.find('img:eq(' + start + ')');
+					_autoRotation = false;
+					if(_timer) clearTimeout(_timer);
+					_this.removeClass(_playClass).addClass(_pausedClass);
 				}
-
-				// checks if image is loaded
-				control.find('img:eq(' + start + ')').attr('src', img).load(function() {
-					// once image is fully loaded, fade in
-					control.find(imageParent + ':eq(' + start + ')').fadeIn(option.fadeSpeed, option.fadeEasing, function(){
-						$(this).css({
-							zIndex: 0
-						});
-						// removes preload image
-						$('.' + option.container, elem).css({
-							background: ''
-						});
-						// let the script know everything is loaded
-						loaded = true;
-						// call the loaded funciton
-						option.slidesLoaded();
-					});
-				});
-			} else {
-				// if no preloader fade in start slide
-				control.children(':eq(' + start + ')').fadeIn(option.fadeSpeed, option.fadeEasing, function(){
-					// let the script know everything is loaded
-					loaded = true;
-					// call the loaded funciton
-					option.slidesLoaded();
-				});
-			}
-			
-			// click slide for next
-			if (option.bigTarget) {
-				// set cursor to pointer
-				control.children().css({
-					cursor: 'pointer'
-				});
-				// click handler
-				control.children().click(function(){
-					// animate to next on slide click
-					animate('next', effect);
-					return false;
-				});									
-			}
-			
-			// pause on mouseover
-			if (option.hoverPause && option.play) {
-				control.bind('mouseover',function(){
-					// on mouse over stop
-					stop();
-				});
-				control.bind('mouseleave',function(){
-					// on mouse leave start pause timeout
-					pause();
-				});
-			}
-			
-			// generate next/prev buttons
-			if (option.generateNextPrev) {
-				$('.' + option.container, elem).after('<a href="#" class="'+ option.prev +'">Prev</a>');
-				$('.' + option.prev, elem).after('<a href="#" class="'+ option.next +'">Next</a>');
-			}
-			
-			// next button
-			$('.' + option.next ,elem).click(function(e){
-				e.preventDefault();
-				if (option.play) {
-					pause();
-				}
-				animate('next', effect);
+				return false;
 			});
-			
-			// previous button
-			$('.' + option.prev, elem).click(function(e){
-				e.preventDefault();
-				if (option.play) {
-					 pause();
-				}
-				animate('prev', effect);
+		}
+		if(_btnPlay.length) {
+			_btnPlay.bind(_controlEvent,function(){
+				_this.removeClass(_pausedClass).addClass(_playClass);
+				_autoRotation = true;
+				autoSlide();
+				return false;
 			});
-			
-			// generate pagination
-			if (option.generatePagination) {
-				// create unordered list
-				if (option.prependPagination) {
-					elem.prepend('<ul class='+ option.paginationClass +'></ul>');
-				} else {
-					elem.append('<ul class='+ option.paginationClass +'></ul>');
-				}
-				// for each slide create a list item and link
-				control.children().each(function(){
-					$('.' + option.paginationClass, elem).append('<li><a href="#'+ number +'">'+ (number+1) +'</a></li>');
-					number++;
-				});
-			} else {
-				// if pagination exists, add href w/ value of item number to links
-				$('.' + option.paginationClass + ' li a', elem).each(function(){
-					$(this).attr('href', '#' + number);
-					number++;
-				});
-			}
-			
-			// add current class to start slide pagination
-			$('.' + option.paginationClass + ' li:eq('+ start +')', elem).addClass(option.currentClass);
-			
-			// click handling 
-			$('.' + option.paginationClass + ' li a', elem ).click(function(){
-				// pause slideshow
-				if (option.play) {
-					 pause();
-				}
-				// get clicked, pass to animate function					
-				clicked = $(this).attr('href').match('[^#/]+$');
-				// if current slide equals clicked, don't do anything
-				if (current != clicked) {
-					animate('pagination', paginationEffect, clicked);
-				}
+		}
+		if(_btnPause.length) {
+			_btnPause.bind(_controlEvent,function(){
+				_autoRotation = false;
+				if(_timer) clearTimeout(_timer);
+				_this.removeClass(_playClass).addClass(_pausedClass);
 				return false;
 			});
-			
-			// click handling 
-			$('a.link', elem).click(function(){
-				// pause slideshow
-				if (option.play) {
-					 pause();
+		}
+		// gallery animation
+		function prevSlide() {
+			_prevIndex = _currentIndex;
+			if(_currentIndex > 0) _currentIndex--;
+			else {
+				if(_noCycle) return;
+				else _currentIndex = _slideCount-1;
+			}
+			switchSlide();
+		}
+		function nextSlide() {
+			_prevIndex = _currentIndex;
+			if(_currentIndex < _slideCount-1) _currentIndex++;
+			else {
+				if(_noCycle) return;
+				else _currentIndex = 0;
+			}
+			switchSlide();
+		}
+		function refreshStatus() {
+			if(_pagerLinks.length) _pagerLinks.removeClass(_activeClass).eq(_currentIndex).addClass(_activeClass);
+			if(_currentNum) _currentNum.text(_currentIndex+1);
+			if(_allNum) _allNum.text(_slideCount);
+			_slides.eq(_prevIndex).removeClass(_activeClass);
+			_slides.eq(_currentIndex).addClass(_activeClass);
+			if(_noCycle) {
+				if(_btnPrev.length) {
+					if(_currentIndex == 0) _btnPrev.addClass(_disabledClass);
+					else _btnPrev.removeClass(_disabledClass);
 				}
-				// get clicked, pass to animate function					
-				clicked = $(this).attr('href').match('[^#/]+$') - 1;
-				// if current slide equals clicked, don't do anything
-				if (current != clicked) {
-					animate('pagination', paginationEffect, clicked);
+				if(_btnNext.length) {
+					if(_currentIndex == _slideCount-1) _btnNext.addClass(_disabledClass);
+					else _btnNext.removeClass(_disabledClass);
 				}
-				return false;
-			});
-		
-			if (option.play) {
-				// set interval
-				playInterval = setInterval(function() {
-					animate('next', effect);
-				}, option.play);
-				// store interval id
-				elem.data('interval',playInterval);
 			}
-		});
-	};
-	
-	// default options
-	$.fn.slides.option = {
-		preload: false, // boolean, Set true to preload images in an image based slideshow
-		preloadImage: '/img/loading.gif', // string, Name and location of loading image for preloader. Default is "/img/loading.gif"
-		container: 'slides_container', // string, Class name for slides container. Default is "slides_container"
-		generateNextPrev: false, // boolean, Auto generate next/prev buttons
-		next: 'next', // string, Class name for next button
-		prev: 'prev', // string, Class name for previous button
-		pagination: true, // boolean, If you're not using pagination you can set to false, but don't have to
-		generatePagination: true, // boolean, Auto generate pagination
-		prependPagination: false, // boolean, prepend pagination
-		paginationClass: 'pagination', // string, Class name for pagination
-		currentClass: 'current', // string, Class name for current class
-		fadeSpeed: 350, // number, Set the speed of the fading animation in milliseconds
-		fadeEasing: '', // string, must load jQuery's easing plugin before http://gsgd.co.uk/sandbox/jquery/easing/
-		slideSpeed: 350, // number, Set the speed of the sliding animation in milliseconds
-		slideEasing: '', // string, must load jQuery's easing plugin before http://gsgd.co.uk/sandbox/jquery/easing/
-		start: 1, // number, Set the speed of the sliding animation in milliseconds
-		effect: 'slide', // string, '[next/prev], [pagination]', e.g. 'slide, fade' or simply 'fade' for both
-		crossfade: false, // boolean, Crossfade images in a image based slideshow
-		randomize: false, // boolean, Set to true to randomize slides
-		play: 0, // number, Autoplay slideshow, a positive number will set to true and be the time between slide animation in milliseconds
-		pause: 0, // number, Pause slideshow on click of next/prev or pagination. A positive number will set to true and be the time of pause in milliseconds
-		hoverPause: false, // boolean, Set to true and hovering over slideshow will pause it
-		autoHeight: false, // boolean, Set to true to auto adjust height
-		autoHeightSpeed: 350, // number, Set auto height animation time in milliseconds
-		bigTarget: false, // boolean, Set to true and the whole slide will link to next slide on click
-		animationStart: function(){}, // Function called at the start of animation
-		animationComplete: function(){}, // Function called at the completion of animation
-		slidesLoaded: function() {} // Function is called when slides is fully loaded
-	};
-	
-	// Randomize slide order on load
-	$.fn.randomize = function(callback) {
-		function randomizeOrder() { return(Math.round(Math.random())-0.5); }
-			return($(this).each(function() {
-			var $this = $(this);
-			var $children = $this.children();
-			var childCount = $children.length;
-			if (childCount > 1) {
-				$children.hide();
-				var indices = [];
-				for (i=0;i<childCount;i++) { indices[indices.length] = i; }
-				indices = indices.sort(randomizeOrder);
-				$.each(indices,function(j,k) { 
-					var $child = $children.eq(k);
-					var $clone = $child.clone(true);
-					$clone.show().appendTo($this);
-					if (callback !== undefined) {
-						callback($child, $clone);
-					}
-				$child.remove();
+			if(typeof _onChange === 'function') {
+				_onChange(_this, _currentIndex);
+			}
+		}
+		function switchSlide() {
+			_slides.eq(_prevIndex).stop().animate({opacity:0},{duration: _duration, queue: false,complete:function(){
+				jQuery(this).css({display:'none'});
+			}})
+			_slides.eq(_currentIndex).stop().css({display:'block',opacity:0}).animate({opacity:1},{duration: _duration, queue: false,complete:function(){
+				jQuery(this).css({opacity:''});
+			}})
+			_caption.eq(_prevIndex).fadeOut();
+			_caption.eq(_currentIndex).fadeIn();
+			if(_autoHeight) _slides.eq(_currentIndex).parent().animate({height:_slides.eq(_currentIndex).outerHeight(true)},{duration:_duration,queue:false});
+			refreshStatus();
+			autoSlide();
+		}
+
+		// autoslide function
+		function autoSlide() {
+			if(!_autoRotation || _hover) return;
+			if(_timer) clearTimeout(_timer);
+			_timer = setTimeout(nextSlide,_switchTime+_duration);
+		}
+		if(_pauseOnHover) {
+			_this.hover(function(){
+				_hover = true;
+				if(_timer) clearTimeout(_timer);
+			},function(){
+				_hover = false;
+				autoSlide();
 			});
-			}
-		}));
-	};
-})(jQuery);
+		}
+		refreshStatus();
+		autoSlide();
+	});
+};