Changeset 22080
- Timestamp:
- 2012/11/06 21:46:54 (11 years ago)
- bzr:base-revision:
- svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_12-dev:22079
- bzr:committer:
- Kentaro Ohkouchi <ohkouchi@loop-az.jp>
- bzr:file-ids:
html/user_data/packages/sphone/js/jquery.flickslide.js 21059@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_11-dev%2Fhtml%2Fuser_data%2Fpackages%2Fsphone%2Fjs%2Fjquery.flickslide.js- bzr:mapping-version:
- v4
- bzr:merge:
ohkouchi@loop-az.jp-20121106124534-n2g8btlxcf3rnfr4- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20121106124650-a5dcrxcbb06z9h3x
- bzr:revno:
- 4718
- bzr:revprop:branch-nick:
- branches/version-2_12-dev
- bzr:root:
- branches/version-2_12-dev
- bzr:testament:
bazaar-ng testament short form 2.1
revision-id: ohkouchi@loop-az.jp-20121106124650-a5dcrxcbb06z9h3x
sha1: 7ab5d5654bb5b4d868af3ec8ab8ca4bfc4715285- bzr:timestamp:
- 2012-11-06 21:46:50.783999920 +0900
- bzr:user-agent:
- bzr2.5.1+bzr-svn1.2.2
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.flickslide.js
r21995 r22080 69 69 .width.replace('px',''))*-1; 70 70 71 $('div.flickSlideContainer ul.move').get(0).style.webkitTransform = 'translate3d(0,0,0)';71 $('div.flickSlideContainer ul.move').get(0).style.webkitTransform = 'translate(0,0)'; 72 72 } 73 73 currentX=0; … … 80 80 } 81 81 function lotation(){ 82 //if(slideLock===0){var slideUnitWidth=slideObj.children('li.slideUnit').outerWidth();slideObj.get(0).style.webkitTransition='-webkit-transform 0.6s ease-out';diffX=-151;if(currentX===maxX){slideObj.get(0).style.webkitTransform='translate 3d(0, 0, 0)';currentX=0;slideCount=0;slidePager();}else{currentX=currentX-slideUnitWidth;slideObj.get(0).style.webkitTransform='translate3d('+currentX+'px, 0, 0)';slideCount++;slidePager();}}82 //if(slideLock===0){var slideUnitWidth=slideObj.children('li.slideUnit').outerWidth();slideObj.get(0).style.webkitTransition='-webkit-transform 0.6s ease-out';diffX=-151;if(currentX===maxX){slideObj.get(0).style.webkitTransform='translate(0, 0)';currentX=0;slideCount=0;slidePager();}else{currentX=currentX-slideUnitWidth;slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';slideCount++;slidePager();}} 83 83 //slideLock=0;slideTimer=setTimeout(lotation,slideDuration); 84 84 } 85 85 function slidePager(){ 86 var currentPager=$('.slidePagerPointer.active'); 87 var nextID='#pager'+String(slideCount); 86 var currentPager=$(settings.parentArea ? settings.parentArea : '.flickSlideBottom').find('.slidePagerPointer.active'); 87 var nextID='.pager'+String(slideCount); 88 88 89 currentPager.removeClass('active'); 89 $(nextID).addClass('active');90 currentPager.parent().children(nextID).addClass('active'); 90 91 switch(slideCount){ 91 92 case 0: … … 119 120 if(settings.direction==='prev'){ 120 121 if(currentX==0){ 121 slideObj.get(0).style.webkitTransform='translate3d(0,0, 0)';122 slideObj.get(0).style.webkitTransform='translate(0, 0)'; 122 123 slideTimer=setTimeout(lotation,slideDuration); 123 124 slideLock=0; 124 125 }else{ 125 126 currentX = currentX+slideUnitWidth; 126 slideObj.get(0).style.webkitTransform = 'translate3d('+currentX+'px, 0, 0)';127 slideObj.get(0).style.webkitTransform = 'translate('+currentX+'px, 0)'; 127 128 slideCount--; 128 129 slidePager(); … … 132 133 }else if(settings.direction==='next'){ 133 134 if(currentX===maxX){ 134 slideObj.get(0).style.webkitTransform='translate3d('+maxX+'px, 0, 0)';135 slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)'; 135 136 slideTimer=setTimeout(lotation,slideDuration); 136 137 slideLock=0; 137 138 }else{ 138 139 currentX=currentX-slideUnitWidth; 139 slideObj.get(0).style.webkitTransform='translate3d('+currentX+'px, 0, 0)';140 slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)'; 140 141 slideCount++; 141 142 slidePager(); … … 174 175 moveX=Number(currentX+diffX); 175 176 slideObj.css('-webkit-transition','none'); 176 slideObj.get(0).style.webkitTransform='translate3d( '+moveX+'px, 0, 0)';177 slideObj.get(0).style.webkitTransform='translate( '+moveX+'px, 0)'; 177 178 } 178 179 }else if(e.type=="touchend"){ … … 186 187 if(diffX>settings.targetWidth||(diffX>60&&diffTime<400&&orientationChangeDelay===0)){ 187 188 if(currentX==0){ 188 slideObj.get(0).style.webkitTransform='translate3d(0,0, 0)';189 slideObj.get(0).style.webkitTransform='translate(0, 0)'; 189 190 }else{ 190 191 currentX=currentX+slideUnitWidth; 191 slideObj.get(0).style.webkitTransform='translate3d('+currentX+'px, 0, 0)';192 slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)'; 192 193 slideCount--; 193 194 slidePager(); … … 195 196 }else if(diffX<(settings.targetWidth*-1)||(diffX<-60&&diffTime<400&&orientationChangeDelay===0)){ 196 197 if(currentX===maxX){ 197 slideObj.get(0).style.webkitTransform='translate3d('+maxX+'px, 0, 0)';198 slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)'; 198 199 }else{ 199 200 currentX=currentX-slideUnitWidth; 200 slideObj.get(0).style.webkitTransform='translate3d('+currentX+'px, 0, 0)';201 slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)'; 201 202 slideCount++;slidePager(); 202 203 } 203 204 }else{ 204 205 if(currentX===0){ 205 slideObj.get(0).style.webkitTransform='translate3d(0,0, 0)';206 slideObj.get(0).style.webkitTransform='translate(0, 0)'; 206 207 }else if(currentX===maxX){ 207 slideObj.get(0).style.webkitTransform='translate3d('+maxX+'px, 0, 0)';208 slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)'; 208 209 }else{ 209 slideObj.get(0).style.webkitTransform='translate3d('+currentX+'px, 0, 0)';210 slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)'; 210 211 } 211 212 } … … 248 249 addClass('resizable'); 249 250 250 var pager=$('<li id="pager'+i+'" class="slidePagerPointer"></li>');251 var pager=$('<li class="pager'+i+' slidePagerPointer"></li>'); 251 252 if(i===0){ 252 253 pager.addClass('active');
Note: See TracChangeset
for help on using the changeset viewer.