Commit85c674a

committed

correction noflash and slight modification

1 parent80a4772 commit85c674aCopy full SHA for 85c674a

File tree

2 files changed

+26

-11

lines changed

noflash
- jquery.noflash.js
- jquery.noflash.min.js

2 files changed

+26

-11

lines changed

`‎noflash/jquery.noflash.js‎`

Lines changed: 22 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,8 @@`
	`1`	`+/**`
	`2`	`+* NoFlash Responsive Slideshow jQuery Plugin`
	`3`	`+* version 2.0.0`
	`4`	`+* https://github.com/foo123/jquery-plugins`
	`5`	`+**/`
`1`	`6`	`/*`
`2`	`7`	`Documentation`
`3`	`8`
`@@ -885,13 +890,13 @@ function NoFlash( el, options )`
`885`	`890`	`ind[i]=i;`
`886`	`891`	`if(self.options.controls)`
`887`	`892`	`{`
`888`		`-varanc=$("<a class='bullet' href='#"+i+"'></a>");`
	`893`	`+varanc=$("<a class='bullet' href='#"+i+"' title=\""+(i+1)+"\"></a>");`
`889`	`894`	`controls.find(".bullets").append(anc);`
`890`	`895`	`}`
`891`	`896`	`}`
`892`	`897`	`if(self.options.controls)`
`893`	`898`	`{`
`894`		`-controls.find(".controls").append("<a class='prev' href='#");`
	`899`	`+controls.find(".controls").append("<a class='prev' href='#"Previous\"></a><a class='play-pause' href='#"Play/Pause\"></a><a class='next' href='#"Next\"></a>");`
`895`	`900`	`controls.find(".bullet").click(function(){`
`896`	`901`	`if(paused)return;`
`897`	`902`	`if(!mutex)self.doTransition(String(parseInt($(this).attr("rel"),10)));`
`@@ -943,13 +948,13 @@ function NoFlash( el, options )`
`943`	`948`	`};`
`944`	`949`
`945`	`950`	`self.init=functioninit(){`
`946`		`-W=self.el.width();H=stdMath.ceil(W/self.options.aspectRatio);`
	`951`	`+W=stdMath.round(self.el.width());H=stdMath.round(W/self.options.aspectRatio);`
`947`	`952`	`holder=$("<div class=\"noflash-holder\"></div>");`
`948`	`953`	`holder.css({margin:"0px",padding:"0px",border:'0',overflow:"hidden",position:"relative",top:"0px",left:"0px",width:String(W)+'px',height:String(H)+'px',"background-color":self.options.backColor\|\|0});`
`949`	`954`
`950`	`955`	`// resize handler`
`951`	`956`	`handlers[self.id]=function(evt){`
`952`		`-W=self.el.width();H=stdMath.ceil(W/self.options.aspectRatio);`
	`957`	`+W=stdMath.round(self.el.width());H=stdMath.round(W/self.options.aspectRatio);`
`953`	`958`	`holder.css({width:String(W)+'px',height:String(H)+'px'});`
`954`	`959`	`thisimg.css({'background-size':String(W)+'px auto'});`
`955`	`960`	`nextimg.css({'background-size':String(W)+'px auto'});`
`@@ -958,7 +963,7 @@ function NoFlash( el, options )`
`958`	`963`	`// parse dom data`
`959`	`964`	`self.el.children("div").each(function(){`
`960`	`965`	`imgs.push($(this).children("img").filter(":first").css({position:"absolute",width:'100%',height:'auto'}));`
`961`		`-captions.push($(this).children("span").filter(":first").html());`
	`966`	`+captions.push($(this).children("div").filter(":first").html());`
`962`	`967`	`varthisfx={};`
`963`	`968`	`thisfx.transition=self.options.transition;`
`964`	`969`	`thisfx.delay=self.options.delay;`
`@@ -1071,7 +1076,7 @@ function NoFlash( el, options )`
`1071`	`1076`	`};`
`1072`	`1077`
`1073`	`1078`	`self.doTransition=functiondoTransition(dir){`
`1074`		`-vari,dd,fxi,ord,r,c,temp,ordobj,ngroups,d,o,sd,odd,animateoptions;`
	`1079`	`+vari,dd,fxi,ord,r,c,temp,ordobj,ngroups,d,o,sd,del,odd,max,evtCarrier=null,animateoptions;`
`1075`	`1080`
`1076`	`1081`	`clearTimeout(timer);`
`1077`	`1082`
`@@ -1216,9 +1221,19 @@ function NoFlash( el, options )`
`1216`	`1221`	`d=1000fxi.duration/(ngroups-(ngroups-1)fxi.overlap);`
`1217`	`1222`	`o=d*fxi.overlap;`
`1218`	`1223`	`sd=d-o;`
	`1224`	`+max=0;`
`1219`	`1225`	`odd=false;`
`1220`	`1226`	`animation_in_progress=true;`
`1221`	`1227`	`for(i=0;i<numpiec;i++)`
	`1228`	`+{`
	`1229`	`+del=ordobj.delays[i]*sd;`
	`1230`	`+if(null==evtCarrier\|\|max<=del)`
	`1231`	`+{`
	`1232`	`+evtCarrier=i;`
	`1233`	`+max=del;`
	`1234`	`+}`
	`1235`	`+}`
	`1236`	`+for(i=0;i<numpiec;i++)`
`1222`	`1237`	`{`
`1223`	`1238`	`temp=$.extend(true,{},$.noflashCore.transitions[fxi.transition]);`
`1224`	`1239`	`if(temp.start1&&temp.start2)`
`@@ -1232,7 +1247,7 @@ function NoFlash( el, options )`
`1232`	`1247`	`translate(temp.animate,p[i]);`
`1233`	`1248`
`1234`	`1249`	`animateoptions={duration:d,easing:fxi.easing};`
`1235`		`-if(i==p.length-1)`
	`1250`	`+if(i===evtCarrier)`
`1236`	`1251`	`animateoptions.complete=function(){endTransition();};`
`1237`	`1252`
`1238`	`1253`	`if(fxi.transition=="zoom-fade")`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit85c674a

File tree

2 files changed

2 files changed

`‎noflash/jquery.noflash.js‎`

0 commit comments