Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #156 ページを開くごとに大量のWarningが発生する(スマホ) #220

Merged
merged 1 commit into from
Aug 17, 2018
Merged

fix #156 ページを開くごとに大量のWarningが発生する(スマホ) #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/Smarty/templates/sphone/site_frame.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
//]]></script>

<!--{* ▼Head COLUMN *}-->
<!--{if $arrPageLayout.HeadNavi|@count > 0}-->
<!--{if !empty($arrPageLayout.HeadNavi)}-->
<!--{foreach key=HeadNaviKey item=HeadNaviItem from=$arrPageLayout.HeadNavi}-->
<!--{* ▼<!--{$HeadNaviItem.bloc_name}--> *}-->
<!--{if $HeadNaviItem.php_path != ""}-->
Expand Down
12 changes: 6 additions & 6 deletions data/Smarty/templates/sphone/site_main.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div data-role="page" data-keep-native=".data-role-none" data-theme="f">

<!--{* ▼HeaderHeaderTop COLUMN*}-->
<!--{if $arrPageLayout.HeaderTopNavi|@count > 0}-->
<!--{if !empty($arrPageLayout.HeaderTopNavi)}-->
<div class="header_utility">
<!--{* ▼上ナビ *}-->
<!--{foreach key=HeaderTopNaviKey item=HeaderTopNaviItem from=$arrPageLayout.HeaderTopNavi}-->
Expand All @@ -49,7 +49,7 @@


<!--{* ▼TOP COLUMN*}-->
<!--{if $arrPageLayout.TopNavi|@count > 0}-->
<!--{if !empty($arrPageLayout.TopNavi)}-->
<div class="header_utility">
<!--{* ▼上ナビ *}-->
<!--{foreach key=TopNaviKey item=TopNaviItem from=$arrPageLayout.TopNavi}-->
Expand All @@ -69,7 +69,7 @@
<!--{* ▼CENTER COLUMN *}-->
<div id="main-content">
<!--{* ▼メイン上部 *}-->
<!--{if $arrPageLayout.MainHead|@count > 0}-->
<!--{if !empty($arrPageLayout.MainHead)}-->
<!--{foreach key=MainHeadKey item=MainHeadItem from=$arrPageLayout.MainHead}-->
<!-- ▼<!--{$MainHeadItem.bloc_name}--> -->
<!--{if $MainHeadItem.php_path != ""}-->
Expand All @@ -87,7 +87,7 @@
<!-- ▲メイン -->

<!--{* ▼メイン下部 *}-->
<!--{if $arrPageLayout.MainFoot|@count > 0}-->
<!--{if !empty($arrPageLayout.MainFoot)}-->
<!--{foreach key=MainFootKey item=MainFootItem from=$arrPageLayout.MainFoot}-->
<!-- ▼<!--{$MainFootItem.bloc_name}--> -->
<!--{if $MainFootItem.php_path != ""}-->
Expand All @@ -103,7 +103,7 @@
<!--{* ▲CENTER COLUMN *}-->

<!--{* ▼BOTTOM COLUMN*}-->
<!--{if $arrPageLayout.BottomNavi|@count > 0}-->
<!--{if !empty($arrPageLayout.BottomNavi)}-->
<div id="footer_utility">
<!--{* ▼下ナビ *}-->
<!--{foreach key=BottomNaviKey item=BottomNaviItem from=$arrPageLayout.BottomNavi}-->
Expand All @@ -128,7 +128,7 @@
<!--{* ▲FOOTER *}-->

<!--{* ▼FooterBottom COLUMN*}-->
<!--{if $arrPageLayout.FooterBottomNavi|@count > 0}-->
<!--{if !empty($arrPageLayout.FooterBottomNavi)}-->
<div id="footerbottomcolumn">
<!--{* ▼上ナビ *}-->
<!--{foreach key=FooterBottomNaviKey item=FooterBottomNaviItem from=$arrPageLayout.FooterBottomNavi}-->
Expand Down
4 changes: 2 additions & 2 deletions data/class/helper/SC_Helper_PageLayout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,9 +377,9 @@ public function getColumnNum($arrPageLayout)
// メインは確定
$col_num = 1;
// LEFT NAVI
if (count($arrPageLayout['LeftNavi']) > 0) $col_num++;
if (!empty($arrPageLayout['LeftNavi'])) $col_num++;
// RIGHT NAVI
if (count($arrPageLayout['RightNavi']) > 0) $col_num++;
if (!empty($arrPageLayout['RightNavi'])) $col_num++;
return $col_num;
}
}