Changeset 22087
- Timestamp:
- 2012/11/09 16:41:28 (11 years ago)
- Location:
- branches/version-2_12-multilang
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-multilang
- Property svn:mergeinfo changed
/branches/version-2_12-dev merged: 22083-22084,22086
- Property svn:mergeinfo changed
-
branches/version-2_12-multilang/data/class/SC_ClassAutoloader.php
r21991 r22087 72 72 $plugin_class = $class; 73 73 $plugin_classpath = $classpath; 74 74 75 $objPlugin->doAction('loadClassFileChange', array(&$plugin_class, &$plugin_classpath)); 76 75 77 // FIXME: トリッキーな処理で _Ex ファイルを無視しないようにする(無視するとユーザーカスタマイズで分かりにくい) 76 78 // SC_XXXX_Ex がロードされる場合にextendsのchainを 77 79 // SC_XXXX_Ex -> SC_XXXX から、 SC_XXXX_Ex -> $class (-> SC_XXXX) と変える。 78 80 // そうでない場合は、直接置き換えと想定して帰ってきたクラスをロードする 79 if ($plugin_class !== $class) { 81 if (is_array($plugin_class) && count($plugin_class) > 0) { 82 $arrPluginClassName = $plugin_class; 83 $arrPluginClassPath = $plugin_classpath; 84 85 foreach ($arrPluginClassName as $key => $plugin_class) { 86 $plugin_classpath = $arrPluginClassPath[$key]; 87 88 if ($is_ex) { 89 // Ex ファイルへのフックの場合のみチェイン変更する。 90 91 if ($parent_classname) { 92 $exp = "/(class[ ]+{$plugin_class}[ ]+extends +)[a-zA-Z_\-]+( *{?)/"; 93 $replace = '$1' . $parent_classname . '$2'; 94 95 $base_class_str = file_get_contents($plugin_classpath); 96 $base_class_str = str_replace(array('<?php', '?>'), '', $base_class_str); 97 $base_class_str = preg_replace($exp, $replace, $base_class_str, 1); 98 eval($base_class_str); 99 } else { 100 include $plugin_classpath; 101 } 102 103 $parent_classname = $plugin_class; 104 } else { 105 include $plugin_classpath; 106 } 107 } 108 80 109 if ($is_ex) { 81 // Ex ファイルへのフックの場合のみチェイン変更する。 82 $exp = "/(class[ ]+{$class}[ ]+extends +)[a-zA-Z_\-]+( *{)/"; 83 $replace = '$1' . $plugin_class . '$2'; 110 $exp = "/(class[ ]+{$class}[ ]+extends +)[a-zA-Z_\-]+( *{?)/"; 111 $replace = '$1' . $parent_classname . '$2'; 84 112 $base_class_str = file_get_contents($classpath); 85 113 $base_class_str = str_replace(array('<?php', '?>'), '', $base_class_str); 86 114 $base_class_str = preg_replace($exp, $replace, $base_class_str, 1); 87 include $plugin_classpath;88 115 eval($base_class_str); 89 116 return; 90 } else {91 include $plugin_classpath;92 117 } 93 118 } -
branches/version-2_12-multilang/data/class/helper/SC_Helper_Plugin.php
r22058 r22087 105 105 } 106 106 107 if ($hook_point == 'loadClassFileChange') { 108 $arrSaveArgs = $arrArgs; 109 $arrClassName = array(); 110 $arrClassPath = array(); 111 } 112 107 113 if (array_key_exists($hook_point, $this->arrRegistedPluginActions) 108 114 && is_array($this->arrRegistedPluginActions[$hook_point])) { … … 113 119 foreach ($arrFuncs as $func) { 114 120 if (!is_null($func['function'])) { 115 call_user_func_array($func['function'], $arrArgs); 121 if ($hook_point == 'loadClassFileChange') { 122 $classname = $arrSaveArgs[0]; 123 $classpath = $arrSaveArgs[1]; 124 $arrTempArgs = array(&$classname, &$classpath); 125 126 call_user_func_array($func['function'], $arrTempArgs); 127 128 if ($classname !== $arrSaveArgs[0]) { 129 $arrClassName[] = $classname; 130 $arrClassPath[] = $classpath; 131 } 132 } else { 133 call_user_func_array($func['function'], $arrArgs); 134 } 116 135 } 136 } 137 } 138 139 if ($hook_point == 'loadClassFileChange') { 140 if (count($arrClassName) > 0) { 141 $arrArgs[0] = $arrClassName; 142 $arrArgs[1] = $arrClassPath; 117 143 } 118 144 } -
branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
r22081 r22087 337 337 } 338 338 339 //不必要な配送先を削除 340 foreach ($_SESSION['shipping'] as $id=>$arrShipping) { 341 if(!isset($arrShipping['shipment_item'])){ 342 $objPurchase->unsetOneShippingTemp($id); 343 } 344 } 345 339 346 // $arrValues[0] には, 購入者の情報が格納されている 340 347 $objPurchase->saveOrderTemp($uniqid, $arrValues[0], $objCustomer); -
branches/version-2_12-multilang/html/user_data/packages/sphone/js/jquery.flickslide.js
r22081 r22087 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.