Browse Source

Adds max-width variable as it's used in so many places.

pull/32/merge
Viljami S 13 years ago
parent
commit
f38975ab98
  1. 7
      responsiveslides.js
  2. 9
      responsiveslides.min.js

7
responsiveslides.js

@ -65,6 +65,7 @@
$slide = $this.children(), $slide = $this.children(),
length = $slide.size(), length = $slide.size(),
fadetime = parseFloat(settings.speed), fadetime = parseFloat(settings.speed),
maxw = parseFloat(settings.maxwidth),
// Namespacing // Namespacing
namespace = settings.namespace, namespace = settings.namespace,
@ -114,7 +115,7 @@
// Add max-width and classes // Add max-width and classes
$this.addClass(namespace + " " + namespaceIdx); $this.addClass(namespace + " " + namespaceIdx);
if (options && options.maxwidth) { if (options && options.maxwidth) {
$this.css("max-width", parseFloat(settings.maxwidth)); $this.css("max-width", maxw);
} }
// Hide all slides, then show first one // Hide all slides, then show first one
@ -257,8 +258,8 @@
if (typeof document.body.style.maxWidth === "undefined" && options && options.maxwidth) { if (typeof document.body.style.maxWidth === "undefined" && options && options.maxwidth) {
var widthSupport = function () { var widthSupport = function () {
$this.css("width", "100%"); $this.css("width", "100%");
if ($this.width() > parseFloat(settings.maxwidth)) { if ($this.width() > maxw) {
$this.css("width", parseFloat(settings.maxwidth)); $this.css("width", maxw);
} }
}; };

9
responsiveslides.min.js vendored

@ -1,6 +1,5 @@
/*! http://responsive-slides.viljamis.com v1.23 by @viljamis */ /*! http://responsive-slides.viljamis.com v1.23 by @viljamis */
(function(c,B,t){c.fn.responsiveSlides=function(e){var b=c.extend({auto:!0,speed:1E3,timeout:4E3,pager:!1,nav:!1,prevText:"Previous",nextText:"Next",maxwidth:"",controls:"",namespace:"rslides"},e);return this.each(function(){t++;var d=c(this),l,o,p,u,m,k=0,f=d.children(),v=f.size(),w=parseFloat(b.speed),g=b.namespace,h=g+t,i=g+"_nav "+h+"_nav",q=g+"_here",j=h+"_on",x=h+"_s",n=c("<ul class='"+g+"_tabs "+h+"_tabs' />"),y={"float":"left",position:"relative"},C={"float":"none",position:"absolute"},r= (function(b,C,u){b.fn.responsiveSlides=function(e){var c=b.extend({auto:!0,speed:1E3,timeout:4E3,pager:!1,nav:!1,prevText:"Previous",nextText:"Next",maxwidth:"",controls:"",namespace:"rslides"},e);return this.each(function(){u++;var d=b(this),l,o,p,v,m,k=0,f=d.children(),w=f.size(),x=parseFloat(c.speed),q=parseFloat(c.maxwidth),g=c.namespace,h=g+u,i=g+"_nav "+h+"_nav",r=g+"_here",j=h+"_on",y=h+"_s",n=b("<ul class='"+g+"_tabs "+h+"_tabs' />"),z={"float":"left",position:"relative"},D={"float":"none",
function(a){d.trigger(g+"-before");f.stop().fadeOut(w,function(){c(this).removeClass(j).css(C)}).eq(a).fadeIn(w,function(){c(this).addClass(j).css(y).trigger(g+"-after");k=a})};if(1<f.size()){f.each(function(a){this.id=x+a});d.addClass(g+" "+h);e&&e.maxwidth&&d.css("max-width",parseFloat(b.maxwidth));f.hide().eq(0).addClass(j).css(y).show();if(!0===b.pager){var s=[];f.each(function(a){a+=1;s+="<li><a href='#' class='"+x+a+"'>"+a+"</a></li>"});n.append(s);m=n.find("a");e.controls?c(b.controls).append(n): position:"absolute"},s=function(a){d.trigger(g+"-before");f.stop().fadeOut(x,function(){b(this).removeClass(j).css(D)}).eq(a).fadeIn(x,function(){b(this).addClass(j).css(z).trigger(g+"-after");k=a})};if(1<f.size()){f.each(function(a){this.id=y+a});d.addClass(g+" "+h);e&&e.maxwidth&&d.css("max-width",q);f.hide().eq(0).addClass(j).css(z).show();if(!0===c.pager){var t=[];f.each(function(a){a+=1;t+="<li><a href='#' class='"+y+a+"'>"+a+"</a></li>"});n.append(t);m=n.find("a");e.controls?b(c.controls).append(n):
d.after(n);l=function(a){m.closest("li").removeClass(q).eq(a).addClass(q)}}!0===b.auto&&(o=function(){u=setInterval(function(){var a=k+1<v?k+1:0;!0===b.pager&&l(a);r(a)},parseFloat(b.timeout))},o());p=function(){if(b.auto===true){clearInterval(u);o()}};!0===b.pager&&m.bind("click",function(a){a.preventDefault();p();a=m.index(this);if(!(k===a||c("."+j+":animated").length)){l(a);r(a)}}).eq(0).closest("li").addClass(q)}if(!0===b.nav){i="<a href='#' class='"+i+" prev'>"+b.prevText+"</a><a href='#' class='"+ d.after(n);l=function(a){m.closest("li").removeClass(r).eq(a).addClass(r)}}!0===c.auto&&(o=function(){v=setInterval(function(){var a=k+1<w?k+1:0;!0===c.pager&&l(a);s(a)},parseFloat(c.timeout))},o());p=function(){if(c.auto===true){clearInterval(v);o()}};!0===c.pager&&m.bind("click",function(a){a.preventDefault();p();a=m.index(this);if(!(k===a||b("."+j+":animated").length)){l(a);s(a)}}).eq(0).closest("li").addClass(r)}if(!0===c.nav){i="<a href='#' class='"+i+" prev'>"+c.prevText+"</a><a href='#' class='"+
i+" next'>"+b.nextText+"</a>";e.controls?c(b.controls).append(i):d.after(i);var i=c("."+h+"_nav"),z=c("."+h+"_nav.prev");i.bind("click",function(a){a.preventDefault();if(!c("."+j+":animated").length){var d=f.index(c("."+j)),a=d-1,d=d+1<v?k+1:0;r(c(this)===z?a:d);!0===b.pager&&l(c(this)===z?a:d);p()}})}if("undefined"===typeof document.body.style.maxWidth&&e&&e.maxwidth){var A=function(){d.css("width","100%");d.width()>parseFloat(b.maxwidth)&&d.css("width",parseFloat(b.maxwidth))};A();c(B).bind("resize", i+" next'>"+c.nextText+"</a>";e.controls?b(c.controls).append(i):d.after(i);var i=b("."+h+"_nav"),A=b("."+h+"_nav.prev");i.bind("click",function(a){a.preventDefault();if(!b("."+j+":animated").length){var d=f.index(b("."+j)),a=d-1,d=d+1<w?k+1:0;s(b(this)===A?a:d);!0===c.pager&&l(b(this)===A?a:d);p()}})}if("undefined"===typeof document.body.style.maxWidth&&e&&e.maxwidth){var B=function(){d.css("width","100%");d.width()>q&&d.css("width",q)};B();b(C).bind("resize",function(){B()})}})}})(jQuery,this,0);
function(){A()})}})}})(jQuery,this,0);
Loading…
Cancel
Save