From 41d3f8665f16bfbc104e833cb0bc57fc5a97fd3b Mon Sep 17 00:00:00 2001 From: david Date: Mon, 21 Jan 2013 15:17:57 +0000 Subject: [PATCH] Refresco git-svn-id: https://192.168.0.254/svn/Proyectos.CasaCastanedo_Web/trunk@4 672005e9-e1b1-844b-8f39-fee698d4bff2 --- src/css/reset.css | 2 +- src/js/js.max.js | 52 +++++++++++++++++++++++------------------------ 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/css/reset.css b/src/css/reset.css index 24114b1..1aba9ca 100644 --- a/src/css/reset.css +++ b/src/css/reset.css @@ -1,2 +1,2 @@ -/* Eric Meyer's Reset CSS v2.0 - http://cssreset.com */ +/* Eric Meyer's Reset CSS v2.0 - http://cssreset.com */ html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{border:0;font-size:100%;font:inherit;vertical-align:baseline;margin:0;padding:0}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:none}table{border-collapse:collapse;border-spacing:0} \ No newline at end of file diff --git a/src/js/js.max.js b/src/js/js.max.js index f3acf1c..148c74e 100644 --- a/src/js/js.max.js +++ b/src/js/js.max.js @@ -1,27 +1,27 @@ -function slideSwitch() { - var $active = $('#slideshow img.active'); - - if ( $active.length == 0 ) $active = $('#slideshow img:last'); - - // use this to pull the images in the order they appear in the markup - var $next = $active.next().length ? $active.next() - : $('#slideshow img:first'); - - // uncomment the 3 lines below to pull the images in random order - var $sibs = $active.siblings(); - var rndNum = Math.floor(Math.random() * $sibs.length ); - var $next = $( $sibs[ rndNum ] ); - - - $active.addClass('last-active'); - - $next.css({opacity: 0.0}) - .addClass('active') - .animate({opacity: 1.0}, 1000, function() { - $active.removeClass('active last-active'); - }); -} - -$(function() { - setInterval( "slideSwitch()", 5000 ); +function slideSwitch() { + var $active = $('#slideshow img.active'); + + if ( $active.length == 0 ) $active = $('#slideshow img:last'); + + // use this to pull the images in the order they appear in the markup + var $next = $active.next().length ? $active.next() + : $('#slideshow img:first'); + + // uncomment the 3 lines below to pull the images in random order + var $sibs = $active.siblings(); + var rndNum = Math.floor(Math.random() * $sibs.length ); + var $next = $( $sibs[ rndNum ] ); + + + $active.addClass('last-active'); + + $next.css({opacity: 0.0}) + .addClass('active') + .animate({opacity: 1.0}, 1000, function() { + $active.removeClass('active last-active'); + }); +} + +$(function() { + setInterval( "slideSwitch()", 5000 ); }); \ No newline at end of file