Index: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl =================================================================== --- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl (revision 22586) +++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl (revision 22602) @@ -25,8 +25,7 @@

商品カテゴリ

Index: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl =================================================================== --- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl (revision 22586) +++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl (revision 22602) @@ -21,10 +21,15 @@ *}--> - id=""> + id="" style="display: none;"> - 5 || !in_array($child.category_id, $arrDispID)}--> style="display: none;" class="level onmark"> +
  • class="onlink">() + + + + + - +
    • Index: branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl =================================================================== --- branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl (revision 22586) +++ branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl (revision 22602) @@ -31,5 +31,5 @@

    商品カテゴリ

    - +
    Index: branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl =================================================================== --- branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl (revision 22586) +++ branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl (revision 22602) @@ -21,10 +21,15 @@ *}--> - id=""> + id="" style="display: none;"> - style="display: none;" class="level onmark"> +

  • class="onlink">()

    + + + + + - +
    • Index: branches/version-2_12-dev/data/class/util/SC_Utils.php =================================================================== --- branches/version-2_12-dev/data/class/util/SC_Utils.php (revision 22597) +++ branches/version-2_12-dev/data/class/util/SC_Utils.php (revision 22602) @@ -1093,28 +1093,4 @@ } - /* 階層構造のテーブルから与えられたIDの兄弟を取得する */ - function sfGetBrothersArray($arrData, $pid_name, $id_name, $arrPID) - { - $max = count($arrData); - - $arrBrothers = array(); - foreach ($arrPID as $id) { - // 親IDを検索する - for ($i = 0; $i < $max; $i++) { - if ($arrData[$i][$id_name] == $id) { - $parent = $arrData[$i][$pid_name]; - break; - } - } - // 兄弟IDを検索する - for ($i = 0; $i < $max; $i++) { - if ($arrData[$i][$pid_name] == $parent) { - $arrBrothers[] = $arrData[$i][$id_name]; - } - } - } - return $arrBrothers; - } - /* 階層構造のテーブルから与えられたIDの直属の子を取得する */ function sfGetUnderChildrenArray($arrData, $pid_name, $id_name, $parent) Index: branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php =================================================================== --- branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php (revision 22595) +++ branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php (revision 22602) @@ -37,4 +37,5 @@ // }}} // {{{ functions + public $arrParentID; /** @@ -133,21 +134,9 @@ $arrTree = $objCategory->getTree(); - $arrCategory = $objCategory->getList(); + $this->arrParentID = array(); foreach ($arrParentCategoryId as $category_id) { $arrParentID = $objCategory->getTreeTrail($category_id); - $arrBrothersID = SC_Utils_Ex::sfGetBrothersArray( - $arrCategory, - 'parent_category_id', - 'category_id', - $arrParentID - ); - $arrChildrenID = SC_Utils_Ex::sfGetUnderChildrenArray( - $arrCategory, - 'parent_category_id', - 'category_id', - $category_id - ); + $this->arrParentID = array_merge($this->arrParentID, $arrParentID); $this->root_parent_id[] = $arrParentID[0]; - $this->arrDispID = array_merge($arrBrothersID, $arrChildrenID); } Index: branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php =================================================================== --- branches/version-2_12-dev/tests/class/util/SC_Utils/SC_Utils_sfGetBrothersArrayTest.php (revision 22567) +++ (revision ) @@ -1,71 +1,0 @@ - '1001', 'child_id' => '1001001'), - array('parent_id' => '1002', 'child_id' => '1002001'), - array('parent_id' => '1002', 'child_id' => '1002002'), - array('parent_id' => '1003', 'child_id' => '1003001'), - array('parent_id' => '1004', 'child_id' => '1004001') - ); - $this->expected = array('1002001', '1002002', '1004001'); - $this->actual = SC_Utils::sfGetBrothersArray( - $input_array, - 'parent_id', - 'child_id', - array('1002001', '1004001') - ); - $this->verify(); - } - - ////////////////////////////////////////// - -} - Index: branches/version-2_12-dev/html/user_data/packages/sphone/css/block.css =================================================================== --- branches/version-2_12-dev/html/user_data/packages/sphone/css/block.css (revision 21995) +++ branches/version-2_12-dev/html/user_data/packages/sphone/css/block.css (revision 22602) @@ -250,4 +250,9 @@ vertical-align: middle; } +#categorytree li ul { + border: none; + margin: 0; + padding: 0; +} #categorytree li:first-child { Index: branches/version-2_12-dev/html/user_data/packages/sphone/js/category.js =================================================================== --- branches/version-2_12-dev/html/user_data/packages/sphone/js/category.js (revision 22586) +++ branches/version-2_12-dev/html/user_data/packages/sphone/js/category.js (revision 22602) @@ -1,119 +1,26 @@ -/*------------------------------------------ -指定されたノードを、オープンまたはクローズする -------------------------------------------*/ -function openOrClose(tgt){ - //指定ノードが「hidden」のとき、リストを可視化 - if(tgt.style.visibility == "hidden"){ - tgt.style.display = "block"; - tgt.style.visibility = "visible"; - tgt.style.height = "auto"; - tgt.style.paddingTop = "0.25em"; - tgt.style.lineHeight = "1em"; - tgt.style.opacity = 1.0; - } - //指定ノードが「hidden」でないとき、リストを隠す - else{ - tgt.style.display = "none"; - tgt.style.visibility = "hidden"; - tgt.style.height = "0px"; - tgt.style.paddingTop = "0"; - tgt.style.lineHeight = 0; - tgt.style.opacity = 0; - } -} - -/*------------------------------------------ -リストープン処理 -------------------------------------------*/ -function listopen(lv, num){ - var tgt = document.getElementsByClassName("level" + lv)[num]; - //次のレベルをサーチ → 次のレベルのリストをオープンする - for(var i=0; i < document.getElementsByClassName("level" + (lv+1)).length; i++){ - var next_tgt = document.getElementsByClassName("level" + (lv+1))[i]; - //li - if (next_tgt.parentNode == tgt || next_tgt.parentNode.parentNode == tgt){ - openOrClose(next_tgt); - } - } - //次のレベルをサーチ → 表示ボタンの状態を変更 - for(var i=0; i < tgt.childNodes.length; i++){ - var next_tgt = tgt.childNodes[i]; - //ul - if(next_tgt.tagName == "UL"){ - if(next_tgt.style.height == "0px"){ - if(event.srcElement.parentNode.className == "category_header plus"){ - event.srcElement.innerText = '−'; - event.srcElement.parentNode.className = "category_header minus"; - } - next_tgt.style.height = "auto"; - } - else{ - for(var i=0; i"); + linkObj.text('＋'); + tgt + .click(function(){ + $(this).siblings("ul").toggle('fast', function(){ + if ($(this).css('display') === 'none') { + tgt.children('a').text('＋'); + } else { + tgt.children('a').text('ー'); + } + }); + }) + .addClass('plus') + .append(linkObj); } - } -} + }); +});