Changeset 22084
- Timestamp:
- 2012/11/08 09:34:54 (11 years ago)
- bzr:base-revision:
- svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_12-dev:22083
- 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-20121108003331-5iw9ngklnkrbqj99- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20121108003451-g69cpqic66iai51g
- bzr:revno:
- 4720
- 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-20121108003451-g69cpqic66iai51g
sha1: d6aeedbe41a6b694144610207d89e4ac69b472b8- bzr:timestamp:
- 2012-11-08 09:34:51.203999996 +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
r22080 r22084 68 68 $(settings.parentArea + ' .flickSlideContainer li.slideUnit').get(0)) 69 69 .width.replace('px',''))*-1; 70 71 $('div.flickSlideContainer ul.move').get(0).style.webkitTransform = 'translate(0,0)'; 70 $('div.flickSlideContainer ul.move').get(0).style.webkitTransform = 'translate(0,0)'; 72 71 } 73 72 currentX=0; … … 120 119 if(settings.direction==='prev'){ 121 120 if(currentX==0){ 122 121 slideObj.get(0).style.webkitTransform='translate(0, 0)'; 123 122 slideTimer=setTimeout(lotation,slideDuration); 124 123 slideLock=0; 125 124 }else{ 126 125 currentX = currentX+slideUnitWidth; 127 126 slideObj.get(0).style.webkitTransform = 'translate('+currentX+'px, 0)'; 128 127 slideCount--; 129 128 slidePager(); … … 133 132 }else if(settings.direction==='next'){ 134 133 if(currentX===maxX){ 135 134 slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)'; 136 135 slideTimer=setTimeout(lotation,slideDuration); 137 136 slideLock=0; 138 137 }else{ 139 138 currentX=currentX-slideUnitWidth; 140 139 slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)'; 141 140 slideCount++; 142 141 slidePager(); … … 175 174 moveX=Number(currentX+diffX); 176 175 slideObj.css('-webkit-transition','none'); 177 176 slideObj.get(0).style.webkitTransform='translate( '+moveX+'px, 0)'; 178 177 } 179 178 }else if(e.type=="touchend"){ … … 187 186 if(diffX>settings.targetWidth||(diffX>60&&diffTime<400&&orientationChangeDelay===0)){ 188 187 if(currentX==0){ 189 188 slideObj.get(0).style.webkitTransform='translate(0, 0)'; 190 189 }else{ 191 190 currentX=currentX+slideUnitWidth; 192 191 slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)'; 193 192 slideCount--; 194 193 slidePager(); … … 196 195 }else if(diffX<(settings.targetWidth*-1)||(diffX<-60&&diffTime<400&&orientationChangeDelay===0)){ 197 196 if(currentX===maxX){ 198 197 slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)'; 199 198 }else{ 200 199 currentX=currentX-slideUnitWidth; 201 200 slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)'; 202 201 slideCount++;slidePager(); 203 202 } 204 203 }else{ 205 204 if(currentX===0){ 206 205 slideObj.get(0).style.webkitTransform='translate(0, 0)'; 207 206 }else if(currentX===maxX){ 208 207 slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)'; 209 208 }else{ 210 209 slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)'; 211 210 } 212 211 }
Note: See TracChangeset
for help on using the changeset viewer.