Changeset 21995 for branches/version-2_12-dev

Timestamp:

2012/08/08 14:33:09 (12 years ago)

Author:

pineray

Message:

#1915 Android 2.x で規格を選択できない不具合への対処

フリックスライドができなくなるようなのでいったん差し戻し.

Location:

branches/version-2_12-dev/html/user_data/packages/sphone

Files:

• css/block.css (modified) (1 diff)
• css/products.css (modified) (2 diffs)
• js/jquery.flickslide.js (modified) (7 diffs)

branches/version-2_12-dev/html/user_data/packages/sphone/css/block.css

@@ -117 +117 @@
     list-style: none;
     -webkit-transition: all 0.6s ease-in-out;
-    -webkit-transform: translate(0,0);
+    -webkit-transform: translate3d(0,0,0);
     margin: 0;
     padding: 0;

branches/version-2_12-dev/html/user_data/packages/sphone/css/products.css

@@ -352 +352 @@
     width: 2000px;
     -webkit-transition: all 0.6s ease-in-out;
-    -webkit-transform: translate(0,0);
+    -webkit-transform: translate3d(0,0,0);
     -webkit-transition-duration: 400ms;
     -webkit-transition-property: -webkit-transform;
@@ -512 +512 @@
     list-style: none;
     -webkit-transition: all 0.6s ease-in-out;
-    -webkit-transform: translate(0,0);
+    -webkit-transform: translate3d(0,0,0);
     /*-webkit-transition-duration: 400ms;
     -webkit-transition-property: -webkit-transform;

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

@@ -69 +69 @@
                                                 .width.replace('px',''))*-1;
 
-                                    $('div.flickSlideContainer ul.move').get(0).style.webkitTransform = 'translate(0,0)';
+                                    $('div.flickSlideContainer ul.move').get(0).style.webkitTransform = 'translate3d(0,0,0)';
                                 }
                                 currentX=0;
@@ -80 +80 @@
          }
          function lotation(){
-             //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();}}
+             //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='translate3d(0, 0, 0)';currentX=0;slideCount=0;slidePager();}else{currentX=currentX-slideUnitWidth;slideObj.get(0).style.webkitTransform='translate3d('+currentX+'px, 0, 0)';slideCount++;slidePager();}}
              //slideLock=0;slideTimer=setTimeout(lotation,slideDuration);
          }
@@ -119 +119 @@
                             if(settings.direction==='prev'){
                                 if(currentX==0){
-                                    slideObj.get(0).style.webkitTransform='translate(0, 0)';
+                                    slideObj.get(0).style.webkitTransform='translate3d(0, 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 = 'translate3d('+currentX+'px, 0, 0)';
                                     slideCount--;
                                     slidePager();
@@ -132 +132 @@
                             }else if(settings.direction==='next'){
                                 if(currentX===maxX){
-                                    slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)';
+                                    slideObj.get(0).style.webkitTransform='translate3d('+maxX+'px, 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='translate3d('+currentX+'px, 0, 0)';
                                     slideCount++;
                                     slidePager();
@@ -174 +174 @@
                          moveX=Number(currentX+diffX);
                          slideObj.css('-webkit-transition','none');
-                         slideObj.get(0).style.webkitTransform='translate( '+moveX+'px, 0)';
+                         slideObj.get(0).style.webkitTransform='translate3d( '+moveX+'px, 0, 0)';
                      }
                  }else if(e.type=="touchend"){
@@ -186 +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='translate3d(0, 0, 0)';
                          }else{
                              currentX=currentX+slideUnitWidth;
-                             slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';
+                             slideObj.get(0).style.webkitTransform='translate3d('+currentX+'px, 0, 0)';
                              slideCount--;
                              slidePager();
@@ -195 +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='translate3d('+maxX+'px, 0, 0)';
                          }else{
                              currentX=currentX-slideUnitWidth;
-                             slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';
+                             slideObj.get(0).style.webkitTransform='translate3d('+currentX+'px, 0, 0)';
                              slideCount++;slidePager();
                          }
                      }else{
                          if(currentX===0){
-                             slideObj.get(0).style.webkitTransform='translate(0, 0)';
+                             slideObj.get(0).style.webkitTransform='translate3d(0, 0, 0)';
                          }else if(currentX===maxX){
-                             slideObj.get(0).style.webkitTransform='translate('+maxX+'px, 0)';
+                             slideObj.get(0).style.webkitTransform='translate3d('+maxX+'px, 0, 0)';
                          }else{
-                             slideObj.get(0).style.webkitTransform='translate('+currentX+'px, 0)';
+                             slideObj.get(0).style.webkitTransform='translate3d('+currentX+'px, 0, 0)';
                          }
                      }