Changeset 22084 for branches/version-2_12-dev/html

Timestamp:

2012/11/08 09:34:54 (14 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_12-dev:22083

bzr:committer:

Kentaro Ohkouchi <[email protected]>

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:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

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: [email protected]
sha1: d6aeedbe41a6b694144610207d89e4ac69b472b8

bzr:timestamp:

2012-11-08 09:34:51.203999996 +0900

bzr:user-agent:

bzr2.5.1+bzr-svn1.2.2

Message:

#1961 (Android における flickslide.js の不具合修正)

• r22080 の続き. インデント修正

File:

• branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.flickslide.js (modified) (6 diffs)

branches/version-2_12-dev/html/user_data/packages/sphone/js/jquery.flickslide.js

@@ -68 +68 @@
                                                 $(settings.parentArea + ' .flickSlideContainer li.slideUnit').get(0))
                                                 .width.replace('px',''))*-1;
-
-                                                                       $('div.flickSlideContainer ul.move').get(0).style.webkitTransform = 'translate(0,0)';
+                                        $('div.flickSlideContainer ul.move').get(0).style.webkitTransform = 'translate(0,0)';
                                 }
                                 currentX=0;
@@ -120 +119 @@
                             if(settings.direction==='prev'){
                                 if(currentX==0){
-                                                                       slideObj.get(0).style.webkitTransform='translate(0, 0)';
+                                    slideObj.get(0).style.webkitTransform='translate(0, 0)';
                                     slideTimer=setTimeout(lotation,slideDuration);
                                     slideLock=0;
                                 }else{
                                     currentX = currentX+slideUnitWidth;
-                                                                       slideObj.get(0).style.webkitTransform = 'translate('+currentX+'px, 0)';
+                                    slideObj.get(0).style.webkitTransform = 'translate('+currentX+'px, 0)';
                                     slideCount--;
                                     slidePager();
@@ -133 +132 @@
                             }else if(settings.direction==='next'){
                                 if(currentX===maxX){
-                                                                       slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)';
+                                    slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)';
                                     slideTimer=setTimeout(lotation,slideDuration);
                                     slideLock=0;
                                 }else{
                                     currentX=currentX-slideUnitWidth;
-                                                                       slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';
+                                    slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';
                                     slideCount++;
                                     slidePager();
@@ -175 +174 @@
                          moveX=Number(currentX+diffX);
                          slideObj.css('-webkit-transition','none');
-                                                slideObj.get(0).style.webkitTransform='translate( '+moveX+'px, 0)';
+                         slideObj.get(0).style.webkitTransform='translate( '+moveX+'px, 0)';
                      }
                  }else if(e.type=="touchend"){
@@ -187 +186 @@
                      if(diffX>settings.targetWidth||(diffX>60&&diffTime<400&&orientationChangeDelay===0)){
                          if(currentX==0){
-                                                        slideObj.get(0).style.webkitTransform='translate(0, 0)';
+                             slideObj.get(0).style.webkitTransform='translate(0, 0)';
                          }else{
                              currentX=currentX+slideUnitWidth;
-                                                        slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';
+                             slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';
                              slideCount--;
                              slidePager();
@@ -196 +195 @@
                      }else if(diffX<(settings.targetWidth*-1)||(diffX<-60&&diffTime<400&&orientationChangeDelay===0)){
                          if(currentX===maxX){
-                                                        slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)';
+                             slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)';
                          }else{
                              currentX=currentX-slideUnitWidth;
-                                                        slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';
+                             slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';
                              slideCount++;slidePager();
                          }
                      }else{
                          if(currentX===0){
-                                                        slideObj.get(0).style.webkitTransform='translate(0, 0)';
+                             slideObj.get(0).style.webkitTransform='translate(0, 0)';
                          }else if(currentX===maxX){
-                                                        slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)';
+                             slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)';
                          }else{
-                                                        slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';
+                             slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';
                          }
                      }