Skip to content

C
check
Commit 86419b42 by vietdo
Options

#15763 プッシュ通知が無効ならヘッダの「通知」ボタンを非表示にする

parent bb51b5c2
Showing with 383 additions and 364 deletions
abvw/bookmark.html
...@@ -8,15 +8,15 @@ ...@@ -8,15 +8,15 @@
<meta http-equiv="Cache-Control" content="no-cache"> <meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1"> <meta http-equiv="Expires" content="-1">
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__"/> <link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__"/>
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__"/> <link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__"/>
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" />
...@@ -33,17 +33,17 @@ ...@@ -33,17 +33,17 @@
<link rel="stylesheet" type="text/css" href="css/theme/accordion.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/accordion.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/limit_access.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" />
<!-- CSSビュー --> <!-- CSSビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?#UPDATEID#" / --> <!-- link rel="stylesheet" type="text/css" href="css/reset.css?#UPDATEID#" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?#UPDATEID#" /> <link rel="stylesheet" type="text/css" href="css/layout/viewer.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?#UPDATEID#" /> <link rel="stylesheet" type="text/css" href="css/theme/viewer.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?#UPDATEID#" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?#UPDATEID#" /> <link rel="stylesheet" type="text/css" href="css/layout/Anket.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?#UPDATEID#" /> <link rel="stylesheet" type="text/css" href="css/theme/Anket.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?#UPDATEID#" /> <link rel="stylesheet" type="text/css" href="css/delete_shiori.css?#UPDATEID#" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
...@@ -53,19 +53,19 @@ ...@@ -53,19 +53,19 @@
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/header.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script> <script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/bookmark.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/bookmark.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/thickbox.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/thickbox.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<style> <style>
html{ html{
-ms-touch-action : none; -ms-touch-action : none;
touch-action : none ; touch-action : none ;
} }
</style> </style>
</head> </head>
<body id="bookmark" oncontextmenu="return false;"> <body id="bookmark" oncontextmenu="return false;">
<header id="header-ws" class="header_ws"> <header id="header-ws" class="header_ws">
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</ul> </ul>
</div> </div>
<ul class="button"> <ul class="button">
<li class="floatL" id="dspPushMessage"> <li class="floatL" id="dspPushMessage" style="display:none">
<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a> <a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
<div id="accordion" style="display:none;"> <div id="accordion" style="display:none;">
<div id="show-push-message"></div> <div id="show-push-message"></div>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -118,15 +118,15 @@ ...@@ -118,15 +118,15 @@
<div id="ws-body" class="wrapper_ws" > <div id="ws-body" class="wrapper_ws" >
<div id="inc_backup"></div> <div id="inc_backup"></div>
<div id="main-ws"> <div id="main-ws">
<article id="articleMain" class="articleMain"> <article id="articleMain" class="articleMain">
<div class="tops" id="sortingDiv"> <div class="tops" id="sortingDiv">
<span class="lang" lang="txtSort"><!--並び替え--></span> <span class="lang" lang="txtSort"><!--並び替え--></span>
<ul class="sort shiori-tops" id="menu_sort"> <ul class="sort shiori-tops" id="menu_sort">
<li class="current"><a class="descending_sort lang" id="dspTitleNm" lang="dspTitleNm"><!--タイトル名--></a><b>|</b></li> <li class="current"><a class="descending_sort lang" id="dspTitleNm" lang="dspTitleNm"><!--タイトル名--></a><b>|</b></li>
<li><a id="dspTitleNmKn" lang="dspTitleNmKn" class="lang"><!--タイトル名(かな)--></a><b id="dspTitleNmKn_Seperate">|</b></li> <li><a id="dspTitleNmKn" lang="dspTitleNmKn" class="lang"><!--タイトル名(かな)--></a><b id="dspTitleNmKn_Seperate">|</b></li>
<li><a id="dspPubDt" lang="dspRegDt" class="lang"><!--登録日--></a></li> <li><a id="dspPubDt" lang="dspRegDt" class="lang"><!--登録日--></a></li>
</ul> </ul>
<a class="delete lang" id="dspDelete" lang="dspDelete"><!--削除--></a> <a class="delete lang" id="dspDelete" lang="dspDelete"><!--削除--></a>
</div> </div>
<section id="pnlTop" class='top'> <section id="pnlTop" class='top'>
<!--<a class="delete lang" id="dspDelete" lang="dspDelete">削除</a>--> <!--<a class="delete lang" id="dspDelete" lang="dspDelete">削除</a>-->
...@@ -142,11 +142,11 @@ ...@@ -142,11 +142,11 @@
<!-- Delete panel [start]--> <!-- Delete panel [start]-->
<section class="sectionDeleteConfirm" id="delete_shiori"> <section class="sectionDeleteConfirm" id="delete_shiori">
<h1 class="lang" lang="txtDeleteConfirmTitle">しおり削除確認</h1> <h1 class="lang" lang="txtDeleteConfirmTitle">しおり削除確認</h1>
<p class="message lang" lang="dspShioriDelConf">設定されているしおりを削除しますか？</p> <p class="message lang" lang="dspShioriDelConf">設定されているしおりを削除しますか？</p>
<p class="deletebtn"><a id="dspConfirmOK" lang="dspOK" class="ok lang">ＯＫ</a><a id="dspCancel" lang="dspCancel" class="cancel lang">キャンセル</a></p> <p class="deletebtn"><a id="dspConfirmOK" lang="dspOK" class="ok lang">ＯＫ</a><a id="dspCancel" lang="dspCancel" class="cancel lang">キャンセル</a></p>
</section> </section>
<!-- Delete panel [end] --> <!-- Delete panel [end] -->
<footer> <footer>
<div class="border"> <div class="border">
<div class="cnt_footer"> <div class="cnt_footer">
......
abvw/contentsearch.html
...@@ -8,15 +8,15 @@ ...@@ -8,15 +8,15 @@
<meta http-equiv="Cache-Control" content="no-cache"> <meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1"> <meta http-equiv="Expires" content="-1">
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" />
...@@ -37,16 +37,16 @@ ...@@ -37,16 +37,16 @@
<link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" /> <link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" /> <link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" />
<!-- CSSビュー --> <!-- CSSビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" / --> <!-- link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
...@@ -64,14 +64,14 @@ ...@@ -64,14 +64,14 @@
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<style> <style>
html{ html{
-ms-touch-action : none; -ms-touch-action : none;
touch-action : none ; touch-action : none ;
} }
</style> </style>
</head> </head>
<body id="contentsearch" oncontextmenu="return false;"> <body id="contentsearch" oncontextmenu="return false;">
<header id="header-ws" class="header_ws"> <header id="header-ws" class="header_ws">
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</ul> </ul>
</div> </div>
<ul class="button"> <ul class="button">
<li class="floatL" id="dspPushMessage"> <li class="floatL" id="dspPushMessage" style="display:none">
<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a> <a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
<div id="accordion" style="display:none;"> <div id="accordion" style="display:none;">
<div id="show-push-message"></div> <div id="show-push-message"></div>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<div id="inc_backup"></div> <div id="inc_backup"></div>
<div id="main-ws"> <div id="main-ws">
<article class="articlecontentsearch"> <article class="articlecontentsearch">
<div class="tops"> <div class="tops">
<div id="main-searchresult"> <div id="main-searchresult">
<span class="lang" lang="txtSearchResult" id="txtSearchResult"><!--検索結果--></span> <span class="lang" lang="txtSearchResult" id="txtSearchResult"><!--検索結果--></span>
<input type="text" id="txtSearchWs" /> <input type="text" id="txtSearchWs" />
...@@ -153,9 +153,9 @@ ...@@ -153,9 +153,9 @@
</li> </li>
</ul> </ul>
<p> <p>
<label id="dispPage" class="pageNumControl" style="visibility: hidden"> </label> <label id="dispPage" class="pageNumControl" style="visibility: hidden"> </label>
<label class="lang pageNumControl" lang="txtRecordNum" style="visibility: hidden"><!--件--></label > <label class="lang pageNumControl" lang="txtRecordNum" style="visibility: hidden"><!--件--></label >
<label class="pageNumControl" style="visibility: hidden">/</label> <label class="pageNumControl" style="visibility: hidden">/</label>
<label id="totalPage" class="pageNumControl" style="visibility: hidden"> </label> <label id="totalPage" class="pageNumControl" style="visibility: hidden"> </label>
<label class="lang pageNumControl" lang="txtRecordTotal" style="visibility: hidden"><!--件 表示--></label> <label class="lang pageNumControl" lang="txtRecordTotal" style="visibility: hidden"><!--件 表示--></label>
</p> </p>
...@@ -169,9 +169,9 @@ ...@@ -169,9 +169,9 @@
</section> </section>
</article> </article>
</div> </div>
<div id="inc_detail" ></div> <div id="inc_detail" ></div>
<footer> <footer>
<div class="border"> <div class="border">
<div class="cnt_footer"> <div class="cnt_footer">
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
</div> </div>
</div> </div>
</footer> </footer>
</div> </div>
<div id="viewer" style="display:none;" > <div id="viewer" style="display:none;" >
......
abvw/history.html
...@@ -8,15 +8,15 @@ ...@@ -8,15 +8,15 @@
<meta http-equiv="Cache-Control" content="no-cache"> <meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1"> <meta http-equiv="Expires" content="-1">
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" />
...@@ -41,16 +41,16 @@ ...@@ -41,16 +41,16 @@
<link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" /> <link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" /> <link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" />
<!-- CSSビュー --> <!-- CSSビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" / --> <!-- link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
...@@ -67,14 +67,14 @@ ...@@ -67,14 +67,14 @@
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<style> <style>
html{ html{
-ms-touch-action : none; -ms-touch-action : none;
touch-action : none ; touch-action : none ;
} }
</style> </style>
</head> </head>
<body id="history" oncontextmenu="return false;"> <body id="history" oncontextmenu="return false;">
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</ul> </ul>
</div> </div>
<ul class="button"> <ul class="button">
<li class="floatL" id="dspPushMessage"> <li class="floatL" id="dspPushMessage" style="display:none">
<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a> <a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
<div id="accordion" style="display:none;"> <div id="accordion" style="display:none;">
<div id="show-push-message"></div> <div id="show-push-message"></div>
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -129,11 +129,11 @@ ...@@ -129,11 +129,11 @@
<div id="inc_backup"></div> <div id="inc_backup"></div>
<div id="main-ws"> <div id="main-ws">
<article class="articlehistory"> <article class="articlehistory">
<span class="lang sort-title" lang="txtSort"><!--並び替え--></span> <span class="lang sort-title" lang="txtSort"><!--並び替え--></span>
<div class="tops"> <div class="tops">
<ul class="sort" id="menu_sort"> <ul class="sort" id="menu_sort">
<li> <li>
<a id="control-sort-title" class="lang nottouchdevice control_sort_on" lang="dspTitleNm"><!--タイトル名--></a> <a id="control-sort-title" class="lang nottouchdevice control_sort_on" lang="dspTitleNm"><!--タイトル名--></a>
<a class="lang control_sort_off" lang="dspTitleNm" style="display:none"><!--タイトル名--></a> <a class="lang control_sort_off" lang="dspTitleNm" style="display:none"><!--タイトル名--></a>
<b>|</b> <b>|</b>
</li> </li>
...@@ -144,12 +144,12 @@ ...@@ -144,12 +144,12 @@
</li> </li>
<li> <li>
<a id="control-sort-releasedate" class="lang nottouchdevice control_sort_on" lang="txtPubDt" ><!--公開日--></a> <a id="control-sort-releasedate" class="lang nottouchdevice control_sort_on" lang="txtPubDt" ><!--公開日--></a>
<a class="lang control_sort_off" lang="txtPubDt" style="display:none" ><!--公開日--></a> <a class="lang control_sort_off" lang="txtPubDt" style="display:none" ><!--公開日--></a>
<b>|</b> <b>|</b>
</li> </li>
<li class="current"> <li class="current">
<a id="control-sort-viewdate" class="lang nottouchdevice control_sort_on" lang="txtViewDt" ><!--閲覧日--></a> <a id="control-sort-viewdate" class="lang nottouchdevice control_sort_on" lang="txtViewDt" ><!--閲覧日--></a>
<a id="off-default" class="lang control_sort_off" lang="txtViewDt" style="display:none" ><!--閲覧日--></a> <a id="off-default" class="lang control_sort_off" lang="txtViewDt" style="display:none" ><!--閲覧日--></a>
</li> </li>
</ul> </ul>
<p> <p>
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
</div> </div>
<div id="inc_detail" ></div> <div id="inc_detail" ></div>
<footer> <footer>
<div class="border"> <div class="border">
<div class="cnt_footer"> <div class="cnt_footer">
......
abvw/js/bookmark.js
...@@ -39,7 +39,7 @@ $(document).ready(function () { ...@@ -39,7 +39,7 @@ $(document).ready(function () {
// Collection all detail of pages // Collection all detail of pages
BOOKMARK.bookmark_collectAllPages(); BOOKMARK.bookmark_collectAllPages();
$("#dspDelete").click(BOOKMARK.dspDelete_Click); $("#dspDelete").click(BOOKMARK.dspDelete_Click);
$("#dspDelete1").click(BOOKMARK.dspDelete1_Click); $("#dspDelete1").click(BOOKMARK.dspDelete1_Click);
$("#dspCancel").click(BOOKMARK.dspCancel_Click); $("#dspCancel").click(BOOKMARK.dspCancel_Click);
...@@ -76,12 +76,16 @@ $(document).ready(function () { ...@@ -76,12 +76,16 @@ $(document).ready(function () {
else { else {
HEADER.checkForceChangePassword(); HEADER.checkForceChangePassword();
} }
if (COMMON.isAnonymousLogin()) { if (COMMON.isAnonymousLogin()) {
//プッシュメッセージ隠す //プッシュメッセージ隠す
$('#dspPushMessage').hide(); $('#dspPushMessage').hide();
} }
if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
$('#dspPushMessage').show();
}
//ダイアログ関連 //ダイアログ関連
$("#dspTitleNm").click(BOOKMARK.dspTitleNm_Click); $("#dspTitleNm").click(BOOKMARK.dspTitleNm_Click);
$("#dspTitleNmKn").click(BOOKMARK.dspTitleNmKn_Click); $("#dspTitleNmKn").click(BOOKMARK.dspTitleNmKn_Click);
...@@ -96,13 +100,13 @@ $(document).ready(function () { ...@@ -96,13 +100,13 @@ $(document).ready(function () {
$("#dspTitleNmKn").show(); $("#dspTitleNmKn").show();
$("#dspTitleNmKn_Seperate").show(); $("#dspTitleNmKn_Seperate").show();
} }
//ビューア、共有表示パーツ読み込み //ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){ $("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理 //読み込み完了時の処理
I18N.i18nReplaceText(); I18N.i18nReplaceText();
}); });
}); });
BOOKMARK.refreshView = function() { BOOKMARK.refreshView = function() {
...@@ -112,7 +116,7 @@ BOOKMARK.refreshView = function() { ...@@ -112,7 +116,7 @@ BOOKMARK.refreshView = function() {
// Collection all detail of pages // Collection all detail of pages
BOOKMARK.bookmark_collectAllPages(); BOOKMARK.bookmark_collectAllPages();
BOOKMARK.ClearGrid(); BOOKMARK.ClearGrid();
//if (ClientData.BookMarkData().length == 0) { //if (ClientData.BookMarkData().length == 0) {
...@@ -127,7 +131,7 @@ BOOKMARK.refreshView = function() { ...@@ -127,7 +131,7 @@ BOOKMARK.refreshView = function() {
$("#dspDelete").show(); $("#dspDelete").show();
$("#dspDelete1").show(); $("#dspDelete1").show();
} }
// Default sort is タイトル名, default is asc // Default sort is タイトル名, default is asc
ClientData.sortOpt_searchDivision(BOOKMARK.searchDivision); ClientData.sortOpt_searchDivision(BOOKMARK.searchDivision);
//前と同じ状態にするので逆転させる //前と同じ状態にするので逆転させる
...@@ -145,7 +149,7 @@ BOOKMARK.refreshView = function() { ...@@ -145,7 +149,7 @@ BOOKMARK.refreshView = function() {
} else { } else {
BOOKMARK.dspPubDt_Click(); BOOKMARK.dspPubDt_Click();
} }
}; };
...@@ -156,7 +160,7 @@ Event groups [start] ...@@ -156,7 +160,7 @@ Event groups [start]
*/ */
BOOKMARK.dspTitleNm_Click = function() { BOOKMARK.dspTitleNm_Click = function() {
var isAsc = false; var isAsc = false;
if (ClientData.sortOpt_searchDivision() == 1) { // Name if (ClientData.sortOpt_searchDivision() == 1) { // Name
if (ClientData.sortOpt_sortType() == 1) { // ASC if (ClientData.sortOpt_sortType() == 1) { // ASC
...@@ -175,7 +179,7 @@ BOOKMARK.dspTitleNm_Click = function() { ...@@ -175,7 +179,7 @@ BOOKMARK.dspTitleNm_Click = function() {
isAsc = true; isAsc = true;
} }
ClientData.sortOpt_sortType(BOOKMARK.sortType); ClientData.sortOpt_sortType(BOOKMARK.sortType);
BOOKMARK.SortTitleName(isAsc); BOOKMARK.SortTitleName(isAsc);
//changeStatusSort(this, isAsc); //changeStatusSort(this, isAsc);
...@@ -201,7 +205,7 @@ BOOKMARK.dspTitleNmKn_Click = function() { ...@@ -201,7 +205,7 @@ BOOKMARK.dspTitleNmKn_Click = function() {
isAsc = true; isAsc = true;
} }
ClientData.sortOpt_sortType(BOOKMARK.sortType); ClientData.sortOpt_sortType(BOOKMARK.sortType);
BOOKMARK.SortTitleNameKana(isAsc); BOOKMARK.SortTitleNameKana(isAsc);
//changeStatusSort(this, isAsc); //changeStatusSort(this, isAsc);
...@@ -255,10 +259,10 @@ BOOKMARK.dspRead_Click_callback = function(data) { ...@@ -255,10 +259,10 @@ BOOKMARK.dspRead_Click_callback = function(data) {
ClientData.contentInfo_contentType(data.contentType); ClientData.contentInfo_contentType(data.contentType);
ClientData.IsRefresh(false); ClientData.IsRefresh(false);
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView); //AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
//表示 //表示
BOOKMARK.showContentView(); BOOKMARK.showContentView();
}; };
// Cancel dialog of deleting // Cancel dialog of deleting
...@@ -273,7 +277,7 @@ BOOKMARK.dspConfirmOK_Click = function() { ...@@ -273,7 +277,7 @@ BOOKMARK.dspConfirmOK_Click = function() {
// -------------------------------- // --------------------------------
// Process deleting [start] // Process deleting [start]
// -------------------------------- // --------------------------------
// Get selected bookmarks // Get selected bookmarks
var arrSelectedBookmarks = $("input[name='chkDelete']:checked"); var arrSelectedBookmarks = $("input[name='chkDelete']:checked");
$.each(arrSelectedBookmarks, function () { $.each(arrSelectedBookmarks, function () {
...@@ -302,7 +306,7 @@ BOOKMARK.dspConfirmOK_Click = function() { ...@@ -302,7 +306,7 @@ BOOKMARK.dspConfirmOK_Click = function() {
$("#dspDelete1").hide(); $("#dspDelete1").hide();
} }
}); });
// -------------------------------- // --------------------------------
// Process deleting [ end ] // Process deleting [ end ]
// -------------------------------- // --------------------------------
...@@ -315,12 +319,12 @@ BOOKMARK.dspDelete1_Click = function() { ...@@ -315,12 +319,12 @@ BOOKMARK.dspDelete1_Click = function() {
BOOKMARK.dspDelete_Click(); BOOKMARK.dspDelete_Click();
}; };
BOOKMARK.dspDelete_Click = function() { BOOKMARK.dspDelete_Click = function() {
if ($("input[name='chkDelete']:checked").length > 0) { if ($("input[name='chkDelete']:checked").length > 0) {
COMMON.lockLayout(); COMMON.lockLayout();
$("#delete_shiori").show(); $("#delete_shiori").show();
$("#delete_shiori").center(); $("#delete_shiori").center();
} }
}; };
// Show detail content // Show detail content
...@@ -374,7 +378,7 @@ BOOKMARK.ShowBookmark = function(showList) { ...@@ -374,7 +378,7 @@ BOOKMARK.ShowBookmark = function(showList) {
contentTitle = BOOKMARK.collection_contents[nIndex2].contentTitle; contentTitle = BOOKMARK.collection_contents[nIndex2].contentTitle;
contentTitleKana = BOOKMARK.collection_contents[nIndex2].contentTitleKana; contentTitleKana = BOOKMARK.collection_contents[nIndex2].contentTitleKana;
contentType = BOOKMARK.collection_contents[nIndex2].contentType; contentType = BOOKMARK.collection_contents[nIndex2].contentType;
// Search in pages // Search in pages
for (var nIndex3 = 0; nIndex3 < BOOKMARK.collection_contents[nIndex2].pages.length; nIndex3++) { for (var nIndex3 = 0; nIndex3 < BOOKMARK.collection_contents[nIndex2].pages.length; nIndex3++) {
if (pageNo == BOOKMARK.collection_contents[nIndex2].pages[nIndex3].pageNo) { if (pageNo == BOOKMARK.collection_contents[nIndex2].pages[nIndex3].pageNo) {
...@@ -385,9 +389,9 @@ BOOKMARK.ShowBookmark = function(showList) { ...@@ -385,9 +389,9 @@ BOOKMARK.ShowBookmark = function(showList) {
break; break;
} }
} }
} }
} }
if (pageDetail) { if (pageDetail) {
// If bookmark does not exist // If bookmark does not exist
if (pageDetail.existed == true) { if (pageDetail.existed == true) {
...@@ -399,7 +403,7 @@ BOOKMARK.ShowBookmark = function(showList) { ...@@ -399,7 +403,7 @@ BOOKMARK.ShowBookmark = function(showList) {
BOOKMARK.insertRow(contentid, pageThumbnail, COMMON.htmlEncode(contentTitle), BOOKMARK.insertRow(contentid, pageThumbnail, COMMON.htmlEncode(contentTitle),
pageDetail.pageText, pageDetail.pageNo, hasMemo, hasMarking, nIndex, contentType); pageDetail.pageText, pageDetail.pageNo, hasMemo, hasMarking, nIndex, contentType);
} }
else { else {
// Not existed -> Show error // Not existed -> Show error
BOOKMARK.insertRowError(contentid, COMMON.htmlEncode(contentTitle), pageDetail.pageNo); BOOKMARK.insertRowError(contentid, COMMON.htmlEncode(contentTitle), pageDetail.pageNo);
} }
...@@ -452,7 +456,7 @@ BOOKMARK.SortTitleName = function(isAsc) { ...@@ -452,7 +456,7 @@ BOOKMARK.SortTitleName = function(isAsc) {
} }
// Add to target array // Add to target array
arrTarget.push(arrSource[nTempIndex]); arrTarget.push(arrSource[nTempIndex]);
//表示対象なら表示用リストにプッシュ //表示対象なら表示用リストにプッシュ
for (var nIndex2 = 0; nIndex2 < BOOKMARK.collection_contents.length; nIndex2++) { for (var nIndex2 = 0; nIndex2 < BOOKMARK.collection_contents.length; nIndex2++) {
if (BOOKMARK.collection_contents[nIndex2].contentid == arrSource[nTempIndex].contentid) { if (BOOKMARK.collection_contents[nIndex2].contentid == arrSource[nTempIndex].contentid) {
...@@ -460,7 +464,7 @@ BOOKMARK.SortTitleName = function(isAsc) { ...@@ -460,7 +464,7 @@ BOOKMARK.SortTitleName = function(isAsc) {
break; break;
} }
} }
// Remove min item from source array // Remove min item from source array
arrSource.splice(nTempIndex, 1); arrSource.splice(nTempIndex, 1);
} }
...@@ -479,7 +483,7 @@ BOOKMARK.ClearGrid = function() { ...@@ -479,7 +483,7 @@ BOOKMARK.ClearGrid = function() {
$.each(arrSelectedBookmarks, function () { $.each(arrSelectedBookmarks, function () {
$(this).parent().parent().parent().remove(); $(this).parent().parent().parent().remove();
}); });
}; };
// Sort by title name kana // Sort by title name kana
BOOKMARK.SortTitleNameKana = function(isAsc) { BOOKMARK.SortTitleNameKana = function(isAsc) {
...@@ -519,7 +523,7 @@ BOOKMARK.SortTitleNameKana = function(isAsc) { ...@@ -519,7 +523,7 @@ BOOKMARK.SortTitleNameKana = function(isAsc) {
} }
// Add to target array // Add to target array
arrTarget.push(arrSource[nTempIndex]); arrTarget.push(arrSource[nTempIndex]);
//表示対象なら表示用リストにプッシュ //表示対象なら表示用リストにプッシュ
for (var nIndex2 = 0; nIndex2 < BOOKMARK.collection_contents.length; nIndex2++) { for (var nIndex2 = 0; nIndex2 < BOOKMARK.collection_contents.length; nIndex2++) {
if (BOOKMARK.collection_contents[nIndex2].contentid == arrSource[nTempIndex].contentid) { if (BOOKMARK.collection_contents[nIndex2].contentid == arrSource[nTempIndex].contentid) {
...@@ -527,7 +531,7 @@ BOOKMARK.SortTitleNameKana = function(isAsc) { ...@@ -527,7 +531,7 @@ BOOKMARK.SortTitleNameKana = function(isAsc) {
break; break;
} }
} }
// Remove min item from source array // Remove min item from source array
arrSource.splice(nTempIndex, 1); arrSource.splice(nTempIndex, 1);
} }
...@@ -577,7 +581,7 @@ BOOKMARK.SortPubDate = function(isAsc) { ...@@ -577,7 +581,7 @@ BOOKMARK.SortPubDate = function(isAsc) {
} }
// Add to target array // Add to target array
arrTarget.push(arrSource[nTempIndex]); arrTarget.push(arrSource[nTempIndex]);
//表示対象なら表示用リストにプッシュ //表示対象なら表示用リストにプッシュ
for (var nIndex2 = 0; nIndex2 < BOOKMARK.collection_contents.length; nIndex2++) { for (var nIndex2 = 0; nIndex2 < BOOKMARK.collection_contents.length; nIndex2++) {
if (BOOKMARK.collection_contents[nIndex2].contentid == arrSource[nTempIndex].contentid) { if (BOOKMARK.collection_contents[nIndex2].contentid == arrSource[nTempIndex].contentid) {
...@@ -585,7 +589,7 @@ BOOKMARK.SortPubDate = function(isAsc) { ...@@ -585,7 +589,7 @@ BOOKMARK.SortPubDate = function(isAsc) {
break; break;
} }
} }
// Remove min item from source array // Remove min item from source array
arrSource.splice(nTempIndex, 1); arrSource.splice(nTempIndex, 1);
} }
...@@ -637,24 +641,24 @@ BOOKMARK.insertRowError = function(contentid, pageTitle, pageNo) { ...@@ -637,24 +641,24 @@ BOOKMARK.insertRowError = function(contentid, pageTitle, pageNo) {
newRow += ' <label class="name">' + COMMON.truncate(pageTitle, 20) + '</label>'; newRow += ' <label class="name">' + COMMON.truncate(pageTitle, 20) + '</label>';
newRow += ' <div class="info">'; newRow += ' <div class="info">';
newRow += " <label class='lang name' lang='msgShioriDeleted'>" + I18N.i18nText('msgShioriDeleted') + "</label>"; newRow += " <label class='lang name' lang='msgShioriDeleted'>" + I18N.i18nText('msgShioriDeleted') + "</label>";
newRow += " </div>"; newRow += " </div>";
newRow += " </div>"; newRow += " </div>";
newRow += "</section>"; newRow += "</section>";
$('#pnlTop').after(newRow); $('#pnlTop').after(newRow);
}; };
// Insert row to grid // Insert row to grid
BOOKMARK.insertRow = function(contentid, pageThumbnail, pageTitle, pageText, pageNo, hasMemo, hasMarking, index, contentType) { BOOKMARK.insertRow = function(contentid, pageThumbnail, pageTitle, pageText, pageNo, hasMemo, hasMarking, index, contentType) {
var imgMarkingHide = '<img style="visibility:hidden" class="pen" alt="" src="./img/list/icon_pen.png" />'; var imgMarkingHide = '<img style="visibility:hidden" class="pen" alt="" src="./img/list/icon_pen.png" />';
var imgMemoHide = '<img style="visibility:hidden" class="sticker" alt="" src="./img/list/icon_sticker.png" />'; var imgMemoHide = '<img style="visibility:hidden" class="sticker" alt="" src="./img/list/icon_sticker.png" />';
var imgMarking = '<img class="pen" alt="" src="./img/list/icon_pen.png" />'; var imgMarking = '<img class="pen" alt="" src="./img/list/icon_pen.png" />';
var imgMemo = '<img class="sticker" alt="" src="./img/list/icon_sticker.png" />'; var imgMemo = '<img class="sticker" alt="" src="./img/list/icon_sticker.png" />';
var newRow = ""; var newRow = "";
newRow += "<section class='sectionBookmark'>"; newRow += "<section class='sectionBookmark'>";
newRow +='<div class="cnt_section">'; newRow +='<div class="cnt_section">';
newRow +='<span class="check">'; newRow +='<span class="check">';
newRow += "<input type='checkbox' name='chkDelete' value='{\"contentid\":" + contentid + ", \"pageNo\":" + pageNo + ", \"index\": " + index + "}'/>"; newRow += "<input type='checkbox' name='chkDelete' value='{\"contentid\":" + contentid + ", \"pageNo\":" + pageNo + ", \"index\": " + index + "}'/>";
...@@ -721,11 +725,11 @@ BOOKMARK.insertRow = function(contentid, pageThumbnail, pageTitle, pageText, pag ...@@ -721,11 +725,11 @@ BOOKMARK.insertRow = function(contentid, pageThumbnail, pageTitle, pageText, pag
newRow += '<li class="pageno"><label id="Label2" class="lang" lang="txtPage">' + I18N.i18nText('txtPage') + '</label><label id="Label3">' + pageNo + '</label></li>'; newRow += '<li class="pageno"><label id="Label2" class="lang" lang="txtPage">' + I18N.i18nText('txtPage') + '</label><label id="Label3">' + pageNo + '</label></li>';
newRow +='<li>'; newRow +='<li>';
newRow += "<a class='read read_open lang' name='dspRead' value='{\"contentid\":\"" + contentid + "\", \"pageNo\":\"" + pageNo + "\", \"contentType\":\"" + contentType + "\" }' lang='txtRead'>" + I18N.i18nText('txtRead') + "</a>"; newRow += "<a class='read read_open lang' name='dspRead' value='{\"contentid\":\"" + contentid + "\", \"pageNo\":\"" + pageNo + "\", \"contentType\":\"" + contentType + "\" }' lang='txtRead'>" + I18N.i18nText('txtRead') + "</a>";
newRow +='</li>'; newRow +='</li>';
newRow +='</ul>'; newRow +='</ul>';
newRow +='</div>'; newRow +='</div>';
newRow +='</div>'; newRow +='</div>';
...@@ -765,7 +769,7 @@ BOOKMARK.bookmark_collectAllPages = function() { ...@@ -765,7 +769,7 @@ BOOKMARK.bookmark_collectAllPages = function() {
// Join pages to request to server // Join pages to request to server
var strPageNos = BOOKMARK.buildPageNos(BOOKMARK.collection_contents[nIndex].pages); var strPageNos = BOOKMARK.buildPageNos(BOOKMARK.collection_contents[nIndex].pages);
// Call api to get all details of pages 1 time // Call api to get all details of pages 1 time
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webContentPage", "GET", AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webContentPage", "GET",
{ contentId: contentid, sid: ClientData.userInfo_sid(), pageNos: strPageNos, thumbnailFlg: 1 }, { contentId: contentid, sid: ClientData.userInfo_sid(), pageNos: strPageNos, thumbnailFlg: 1 },
...@@ -808,7 +812,7 @@ BOOKMARK.bookmark_collectAllPages = function() { ...@@ -808,7 +812,7 @@ BOOKMARK.bookmark_collectAllPages = function() {
} }
} }
); );
} }
}; };
/* /*
...@@ -828,11 +832,11 @@ BOOKMARK.buildPageNos = function(pages) { ...@@ -828,11 +832,11 @@ BOOKMARK.buildPageNos = function(pages) {
}; };
/* /*
Check a content is error or not Check a content is error or not
*/ */
BOOKMARK.IsErrorContent = function(strContentId) { BOOKMARK.IsErrorContent = function(strContentId) {
var isError = false; var isError = false;
for (var nIndex = 0; nIndex < BOOKMARK.bookmark_errorContent.length; nIndex++) { for (var nIndex = 0; nIndex < BOOKMARK.bookmark_errorContent.length; nIndex++) {
if (strContentId == BOOKMARK.bookmark_errorContent[nIndex].contentid) { if (strContentId == BOOKMARK.bookmark_errorContent[nIndex].contentid) {
isError = true; isError = true;
...@@ -843,7 +847,7 @@ BOOKMARK.IsErrorContent = function(strContentId) { ...@@ -843,7 +847,7 @@ BOOKMARK.IsErrorContent = function(strContentId) {
}; };
/* /*
Check a content is checked + ok Check a content is checked + ok
*/ */
BOOKMARK.IsOKCheckedContent = function(strContentId) { BOOKMARK.IsOKCheckedContent = function(strContentId) {
var isOK = false; var isOK = false;
...@@ -965,7 +969,7 @@ BOOKMARK.IsExistContent = function(strContentId) { ...@@ -965,7 +969,7 @@ BOOKMARK.IsExistContent = function(strContentId) {
getType: '1', getType: '1',
contentId: strContentId contentId: strContentId
}; };
result["isExisted"] = isExisted; result["isExisted"] = isExisted;
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params, AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params,
function (data) { function (data) {
...@@ -992,7 +996,7 @@ BOOKMARK.IsExistContent = function(strContentId) { ...@@ -992,7 +996,7 @@ BOOKMARK.IsExistContent = function(strContentId) {
AVWEB.showSystemError(); AVWEB.showSystemError();
} }
}); });
return result; return result;
}; };
...@@ -1004,7 +1008,7 @@ Setting dialog [ end ] ...@@ -1004,7 +1008,7 @@ Setting dialog [ end ]
*/ */
BOOKMARK.showContentView = function(){ BOOKMARK.showContentView = function(){
//TOPに戻す //TOPに戻す
var y = 0; var y = 0;
if( document.documentElement.scrollTop ){ if( document.documentElement.scrollTop ){
...@@ -1020,18 +1024,18 @@ BOOKMARK.showContentView = function(){ ...@@ -1020,18 +1024,18 @@ BOOKMARK.showContentView = function(){
} }
BOOKMARK.scrollTop = y; BOOKMARK.scrollTop = y;
window.scrollTo(0,0); window.scrollTo(0,0);
//試験 //試験
$("#header-ws").hide(); $("#header-ws").hide();
$("#ws-body").hide(); $("#ws-body").hide();
$("#topcontrol").hide(); $("#topcontrol").hide();
CONTENTVIEW_INITOBJECT.clearViewerComponent(); CONTENTVIEW_INITOBJECT.clearViewerComponent();
CONTENTVIEW.cssInit(); CONTENTVIEW.cssInit();
$("#viewer").show(); $("#viewer").show();
CONTENTVIEW.ready(); CONTENTVIEW.ready();
}; };
BOOKMARK.cssInit = function(){ BOOKMARK.cssInit = function(){
...@@ -1063,7 +1067,7 @@ BOOKMARK.downloadFunction = function(e) { ...@@ -1063,7 +1067,7 @@ BOOKMARK.downloadFunction = function(e) {
var contentId = $(this).attr('contentid'); var contentId = $(this).attr('contentid');
//Download content //Download content
HEADER.downloadResourceById(contentId); HEADER.downloadResourceById(contentId);
}; };
abvw/js/contentsearch.js
...@@ -26,13 +26,13 @@ CONTENTSEARCH.home_isMove = false; ...@@ -26,13 +26,13 @@ CONTENTSEARCH.home_isMove = false;
CONTENTSEARCH.scrollTop = 0; CONTENTSEARCH.scrollTop = 0;
$(document).ready(function(){ $(document).ready(function(){
if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)){ if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)){
return; return;
} }
COMMON.LockScreen(); COMMON.LockScreen();
document.title = I18N.i18nText('txtSearchResult') + ' | ' + I18N.i18nText('sysAppTitle'); document.title = I18N.i18nText('txtSearchResult') + ' | ' + I18N.i18nText('sysAppTitle');
// Set bookmark screen // Set bookmark screen
...@@ -42,62 +42,62 @@ $(document).ready(function(){ ...@@ -42,62 +42,62 @@ $(document).ready(function(){
if(ClientData.requirePasswordChange() != 1){ if(ClientData.requirePasswordChange() != 1){
//Format text display more record //Format text display more record
CONTENTSEARCH.formatDisplayMoreRecord(); CONTENTSEARCH.formatDisplayMoreRecord();
//remove hover effect when is touch device //remove hover effect when is touch device
CONTENTSEARCH.removeHoverCss(); CONTENTSEARCH.removeHoverCss();
//InitScreen //InitScreen
CONTENTSEARCH.initialScreen(); CONTENTSEARCH.initialScreen();
//Render Grid //Render Grid
CONTENTSEARCH.renderGridView(); CONTENTSEARCH.renderGridView();
//Go To Details Page //Go To Details Page
$('#main-ws canvas').live('click', CONTENTSEARCH.canvasClickFunction); $('#main-ws canvas').live('click', CONTENTSEARCH.canvasClickFunction);
$('#main-ws canvas').live('touchend', CONTENTSEARCH.canvasClickFunction); $('#main-ws canvas').live('touchend', CONTENTSEARCH.canvasClickFunction);
$('#main-ws canvas').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; }); $('#main-ws canvas').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; });
//Open dialog //Open dialog
$('.dialog').live('click', CONTENTSEARCH.titleClickFunction); $('.dialog').live('click', CONTENTSEARCH.titleClickFunction);
//$('.dialog').live('touchstart', CONTENTSEARCH.titleClickFunction); //$('.dialog').live('touchstart', CONTENTSEARCH.titleClickFunction);
$('.dialog').live('touchend', CONTENTSEARCH.titleClickFunction); $('.dialog').live('touchend', CONTENTSEARCH.titleClickFunction);
$('.dialog').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; }); $('.dialog').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; });
//Show Next Record //Show Next Record
$('a#control-nextrecord').click(CONTENTSEARCH.showNextRecordFunction); $('a#control-nextrecord').click(CONTENTSEARCH.showNextRecordFunction);
//Sort Title //Sort Title
$('#control-sort-title').click(CONTENTSEARCH.sortByTitleFunction); $('#control-sort-title').click(CONTENTSEARCH.sortByTitleFunction);
//Sort by title kana //Sort by title kana
$('#control-sort-titlekana').click(CONTENTSEARCH.sortByTitleKanaFunction); $('#control-sort-titlekana').click(CONTENTSEARCH.sortByTitleKanaFunction);
//sort by release date //sort by release date
$('#control-sort-releasedate').click(CONTENTSEARCH.sortByReleaseDateFunction); $('#control-sort-releasedate').click(CONTENTSEARCH.sortByReleaseDateFunction);
//Go To Details Page //Go To Details Page
$('.button-details').live('click', CONTENTSEARCH.readSubmenuFunction); $('.button-details').live('click', CONTENTSEARCH.readSubmenuFunction);
//$('.button-details').live('touchstart', CONTENTSEARCH.readSubmenuFunction); //$('.button-details').live('touchstart', CONTENTSEARCH.readSubmenuFunction);
$('.button-details').live('touchend', CONTENTSEARCH.readSubmenuFunction); $('.button-details').live('touchend', CONTENTSEARCH.readSubmenuFunction);
$('.button-details').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; }); $('.button-details').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; });
//Show Share Dialog //Show Share Dialog
$('.button-share').live('click', CONTENTSEARCH.showContentShareDlgFunction); $('.button-share').live('click', CONTENTSEARCH.showContentShareDlgFunction);
$('.button-share').live('touchend', CONTENTSEARCH.showContentShareDlgFunction); $('.button-share').live('touchend', CONTENTSEARCH.showContentShareDlgFunction);
$('.button-share').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; }); $('.button-share').live('touchmove', function () { CONTENTSEARCH.home_isMove = true; });
$('#main-search').click(CONTENTSEARCH.searchEventButtonFunction); $('#main-search').click(CONTENTSEARCH.searchEventButtonFunction);
$('#txtSearchWs').keydown(CONTENTSEARCH.mainSearchKeyDownFunction); $('#txtSearchWs').keydown(CONTENTSEARCH.mainSearchKeyDownFunction);
$('#main-search-content').click(CONTENTSEARCH.mainSearchContentClickFunction); $('#main-search-content').click(CONTENTSEARCH.mainSearchContentClickFunction);
$('#main-search-tag').click(CONTENTSEARCH.mainSearchTagClickFunction); $('#main-search-tag').click(CONTENTSEARCH.mainSearchTagClickFunction);
$('#main-search-body').click(CONTENTSEARCH.mainSearchBodyClickFunction); $('#main-search-body').click(CONTENTSEARCH.mainSearchBodyClickFunction);
$('#control-nextrecord').css('visibility', 'hidden'); $('#control-nextrecord').css('visibility', 'hidden');
$(window).resize(function () { $(window).resize(function () {
if ($("#contentDetail").css("display") != "none") { if ($("#contentDetail").css("display") != "none") {
// Refresh panel of detail to center. // Refresh panel of detail to center.
...@@ -111,12 +111,16 @@ $(document).ready(function(){ ...@@ -111,12 +111,16 @@ $(document).ready(function(){
//Check if Force Change password //Check if Force Change password
HEADER.checkForceChangePassword(); HEADER.checkForceChangePassword();
} }
if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
$('#dspPushMessage').show();
}
if (COMMON.isAnonymousLogin()) { if (COMMON.isAnonymousLogin()) {
//プッシュメッセージ隠す //プッシュメッセージ隠す
$('#dspPushMessage').hide(); $('#dspPushMessage').hide();
} }
//詳細、共有表示パーツ読み込み //詳細、共有表示パーツ読み込み
$("#inc_detail").load("./inc_detail.html?__UPDATEID__", function (myData, myStatus, xhr){ $("#inc_detail").load("./inc_detail.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理 //読み込み完了時の処理
...@@ -125,14 +129,14 @@ $(document).ready(function(){ ...@@ -125,14 +129,14 @@ $(document).ready(function(){
format: 'yyyy-mm-dd' format: 'yyyy-mm-dd'
}); });
}); });
//ビューア、共有表示パーツ読み込み //ビューア、共有表示パーツ読み込み
$("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){ $("#viewer").load("./inc_contentview.html?__UPDATEID__", function (myData, myStatus, xhr){
//読み込み完了時の処理 //読み込み完了時の処理
I18N.i18nReplaceText(); I18N.i18nReplaceText();
}); });
}); });
CONTENTSEARCH.mainSearchBodyClickFunction = function(){ CONTENTSEARCH.mainSearchBodyClickFunction = function(){
...@@ -166,14 +170,14 @@ CONTENTSEARCH.abapi = function(name, param, method, callback){ ...@@ -166,14 +170,14 @@ CONTENTSEARCH.abapi = function(name, param, method, callback){
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), name, method, param, callback, null); AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), name, method, param, callback, null);
}; };
//Initial screen //Initial screen
CONTENTSEARCH.initialScreen = function(){ CONTENTSEARCH.initialScreen = function(){
var searchText = ClientData.searchCond_searchText(); var searchText = ClientData.searchCond_searchText();
var searchDivision = ClientData.searchCond_searchDivision(); var searchDivision = ClientData.searchCond_searchDivision();
$('#txtSearchWs').val(searchText); $('#txtSearchWs').val(searchText);
//ClientData.searchCond_searchText(''); //ClientData.searchCond_searchText('');
if(searchDivision == 1){ if(searchDivision == 1){
$('#main-tag').attr('checked',false); $('#main-tag').attr('checked',false);
$('#main-body').attr('checked',false); $('#main-body').attr('checked',false);
...@@ -188,13 +192,13 @@ CONTENTSEARCH.initialScreen = function(){ ...@@ -188,13 +192,13 @@ CONTENTSEARCH.initialScreen = function(){
{ {
$('#main-content').attr('checked',false); $('#main-content').attr('checked',false);
$('#main-tag').attr('checked',false); $('#main-tag').attr('checked',false);
$('#main-body').attr('checked','checked'); $('#main-body').attr('checked','checked');
} }
CONTENTSEARCH.handleLanguage(); CONTENTSEARCH.handleLanguage();
}; };
///Render Content ///Render Content
CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to, cateid, grpid){ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to, cateid, grpid){
var params = { var params = {
sid: id, sid: id,
...@@ -210,13 +214,13 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to ...@@ -210,13 +214,13 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to
CONTENTSEARCH.abapi('webContentList', params, 'POST', function (data) { CONTENTSEARCH.abapi('webContentList', params, 'POST', function (data) {
$.each(data.contentList, function (i, post) { $.each(data.contentList, function (i, post) {
var outputDate =""; var outputDate ="";
if(post.contentDeliveryDate!=null&&post.contentDeliveryDate!=undefined&&post.contentDeliveryDate!='undefined') if(post.contentDeliveryDate!=null&&post.contentDeliveryDate!=undefined&&post.contentDeliveryDate!='undefined')
{ {
outputDate=COMMON.formatDeliveryDate(post.contentDeliveryDate); outputDate=COMMON.formatDeliveryDate(post.contentDeliveryDate);
} }
var htmlTemp ='<section class="sectionsearchlist">' var htmlTemp ='<section class="sectionsearchlist">'
+ ' <div class="cnt_section_list">' + ' <div class="cnt_section_list">'
+ ' <a class="img">' + ' <a class="img">'
...@@ -227,7 +231,7 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to ...@@ -227,7 +231,7 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to
+ ' <div class="text">' + ' <div class="text">'
+ ' <a id="title' + post.contentId + '" class="name dialog" contentid="' + post.contentId + '">' + ' <a id="title' + post.contentId + '" class="name dialog" contentid="' + post.contentId + '">'
+ ' <img class="listIcon" src="' + HEADER.getIconTypeContent(post.contentType)+'" width="20" height="20">' + ' <img class="listIcon" src="' + HEADER.getIconTypeContent(post.contentType)+'" width="20" height="20">'
+ COMMON.truncate(COMMON.htmlEncode(post.contentTitle), 20) + COMMON.truncate(COMMON.htmlEncode(post.contentTitle), 20)
+ ' </a>' + ' </a>'
+ ' <div class="info">' + ' <div class="info">'
+ ' <ul class="date">' + ' <ul class="date">'
...@@ -243,15 +247,15 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to ...@@ -243,15 +247,15 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to
+ ' </div>' + ' </div>'
+ ' </div>' + ' </div>'
+ '</section>'; + '</section>';
var shareHtml = ""; var shareHtml = "";
if( post.readerShare == '1' ){ if( post.readerShare == '1' ){
shareHtml ='<li><a class="read lang button-share" contentid="' + post.contentId + '" lang="txtShare">共有</a></li>'; shareHtml ='<li><a class="read lang button-share" contentid="' + post.contentId + '" lang="txtShare">共有</a></li>';
} }
htmlTemp = htmlTemp.replace(/\{share\}/g, shareHtml); htmlTemp = htmlTemp.replace(/\{share\}/g, shareHtml);
$('#content-grid').append(htmlTemp); $('#content-grid').append(htmlTemp);
CONTENTSEARCH.getNextRecordNumForList(); CONTENTSEARCH.getNextRecordNumForList();
//assign thumbnail to array //assign thumbnail to array
...@@ -259,11 +263,11 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to ...@@ -259,11 +263,11 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to
if((formatThumbnail != null) && (formatThumbnail != 'undefined') && (formatThumbnail != '')){ if((formatThumbnail != null) && (formatThumbnail != 'undefined') && (formatThumbnail != '')){
formatThumbnail = COMMON.formatStringBase64(formatThumbnail); formatThumbnail = COMMON.formatStringBase64(formatThumbnail);
} }
CONTENTSEARCH.thumbnailArr.push({ contentId: post.contentId, thumbnail: formatThumbnail}); CONTENTSEARCH.thumbnailArr.push({ contentId: post.contentId, thumbnail: formatThumbnail});
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type to array to manage. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type to array to manage.
//assign content type to array //assign content type to array
CONTENTSEARCH.contentTypeArr.push({ contentId: post.contentId, contentType: post.contentType }); CONTENTSEARCH.contentTypeArr.push({ contentId: post.contentId, contentType: post.contentType });
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type to array to manage. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type to array to manage.
...@@ -282,7 +286,7 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to ...@@ -282,7 +286,7 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to
//Check if content has marking or memo //Check if content has marking or memo
CONTENTSEARCH.checkContentMarkingMemoOption(post.contentId); CONTENTSEARCH.checkContentMarkingMemoOption(post.contentId);
//renderViewDate //renderViewDate
var viewdate = CONTENTSEARCH.renderViewDate(post.contentId); var viewdate = CONTENTSEARCH.renderViewDate(post.contentId);
if (viewdate != null || viewdate != 'undefined') { if (viewdate != null || viewdate != 'undefined') {
$('#lblVdate' + post.contentId).html(viewdate); $('#lblVdate' + post.contentId).html(viewdate);
...@@ -291,14 +295,14 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to ...@@ -291,14 +295,14 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to
//Get Next record number for list //Get Next record number for list
CONTENTSEARCH.getNextRecordNumForList(); CONTENTSEARCH.getNextRecordNumForList();
if(data.totalRecord < data.recordTo){ if(data.totalRecord < data.recordTo){
ClientData.searchCond_recordTo(data.totalRecord); ClientData.searchCond_recordTo(data.totalRecord);
}else{ }else{
ClientData.searchCond_recordTo(data.recordTo); ClientData.searchCond_recordTo(data.recordTo);
} }
ClientData.searchCond_recordFrom(data.recordFrom); ClientData.searchCond_recordFrom(data.recordFrom);
CONTENTSEARCH.totalPage = data.totalRecord; CONTENTSEARCH.totalPage = data.totalRecord;
//Render Page number //Render Page number
...@@ -308,11 +312,11 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to ...@@ -308,11 +312,11 @@ CONTENTSEARCH.renderContent = function(id, text, division, type, order, from, to
else{ else{
CONTENTSEARCH.reRenderPageNumber(ClientData.searchCond_recordTo(), CONTENTSEARCH.totalPage); CONTENTSEARCH.reRenderPageNumber(ClientData.searchCond_recordTo(), CONTENTSEARCH.totalPage);
} }
//Toggle scroll to top Control //Toggle scroll to top Control
CONTENTSEARCH.handleBackToTop(); CONTENTSEARCH.handleBackToTop();
//I18N.changeLanguage(ClientData.userInfo_language()); //I18N.changeLanguage(ClientData.userInfo_language());
I18N.i18nReplaceText(); I18N.i18nReplaceText();
}); });
}; };
...@@ -325,7 +329,7 @@ CONTENTSEARCH.handleBackToTop = function(){ ...@@ -325,7 +329,7 @@ CONTENTSEARCH.handleBackToTop = function(){
else{ else{
$('#control-nextrecord').css('visibility','visible'); $('#control-nextrecord').css('visibility','visible');
} }
if(CONTENTSEARCH.totalPage == 0){ if(CONTENTSEARCH.totalPage == 0){
$('#control-nextrecord').css('visibility','hidden'); $('#control-nextrecord').css('visibility','hidden');
CONTENTSEARCH.displayResultNoRecord(); CONTENTSEARCH.displayResultNoRecord();
...@@ -363,12 +367,12 @@ CONTENTSEARCH.handleLanguage = function(){ ...@@ -363,12 +367,12 @@ CONTENTSEARCH.handleLanguage = function(){
$('#control-sort-titlekana').css('display','block'); $('#control-sort-titlekana').css('display','block');
$('#separate').css('display','block'); $('#separate').css('display','block');
} }
} }
}; };
//Initial Screen //Initial Screen
CONTENTSEARCH.renderGridView = function(){ CONTENTSEARCH.renderGridView = function(){
var fromPage = CONTENTSEARCH.DEFAULT_DISP_NUMBER_RECORD_FROM; var fromPage = CONTENTSEARCH.DEFAULT_DISP_NUMBER_RECORD_FROM;
var toPage = CONTENTSEARCH.returnNumberDispRecordForList(); var toPage = CONTENTSEARCH.returnNumberDispRecordForList();
var sortType = CONTENTSEARCH.DEFAULT_SORT_TYPE; var sortType = CONTENTSEARCH.DEFAULT_SORT_TYPE;
...@@ -376,33 +380,33 @@ CONTENTSEARCH.renderGridView = function(){ ...@@ -376,33 +380,33 @@ CONTENTSEARCH.renderGridView = function(){
var searchText = ClientData.searchCond_searchText(); var searchText = ClientData.searchCond_searchText();
var searchDivision = ClientData.searchCond_searchDivision(); var searchDivision = ClientData.searchCond_searchDivision();
var sid = ClientData.userInfo_sid(); var sid = ClientData.userInfo_sid();
ClientData.searchCond_recordFrom(fromPage); ClientData.searchCond_recordFrom(fromPage);
ClientData.searchCond_recordTo(toPage); ClientData.searchCond_recordTo(toPage);
ClientData.searchCond_sortType(sortType); ClientData.searchCond_sortType(sortType);
ClientData.searchCond_sortOrder(sortOrder); ClientData.searchCond_sortOrder(sortOrder);
ClientData.searchCond_searchDivision(searchDivision); ClientData.searchCond_searchDivision(searchDivision);
ClientData.searchCond_genreId(''); ClientData.searchCond_genreId('');
ClientData.searchCond_groupId(''); ClientData.searchCond_groupId('');
var genreId = ClientData.searchCond_genreId(); var genreId = ClientData.searchCond_genreId();
var groupId = ClientData.searchCond_groupId(); var groupId = ClientData.searchCond_groupId();
//Handle display sort //Handle display sort
CONTENTSEARCH.handleSortDisp(); CONTENTSEARCH.handleSortDisp();
//Language Handle //Language Handle
CONTENTSEARCH.handleLanguage(); CONTENTSEARCH.handleLanguage();
//Refresh GridView //Refresh GridView
CONTENTSEARCH.refreshGrid(); CONTENTSEARCH.refreshGrid();
//if(searchText == '' || searchText == null){ //if(searchText == '' || searchText == null){
// CONTENTSEARCH.displayResultNoRecord(); // CONTENTSEARCH.displayResultNoRecord();
// CONTENTSEARCH.chkSearchTextEmpty = true; // CONTENTSEARCH.chkSearchTextEmpty = true;
...@@ -419,9 +423,9 @@ CONTENTSEARCH.renderGridView = function(){ ...@@ -419,9 +423,9 @@ CONTENTSEARCH.renderGridView = function(){
}; };
//Canvas Click function //Canvas Click function
CONTENTSEARCH.canvasClickFunction = function(e){ CONTENTSEARCH.canvasClickFunction = function(e){
if (e) { if (e) {
e.preventDefault(); e.preventDefault();
} }
...@@ -429,27 +433,27 @@ CONTENTSEARCH.canvasClickFunction = function(e){ ...@@ -429,27 +433,27 @@ CONTENTSEARCH.canvasClickFunction = function(e){
CONTENTSEARCH.home_isMove = false; CONTENTSEARCH.home_isMove = false;
return; return;
} }
var contentId = $(this).attr('id'); var contentId = $(this).attr('id');
var outputId = contentId.substring(17); var outputId = contentId.substring(17);
var checkflag = false; var checkflag = false;
// Set content id for screen: content detail // Set content id for screen: content detail
ClientData.contentInfo_contentId(outputId); ClientData.contentInfo_contentId(outputId);
// Get image of selected image // Get image of selected image
var base64String = CONTENTSEARCH.returnThumbnail(outputId); var base64String = CONTENTSEARCH.returnThumbnail(outputId);
ClientData.contentInfo_contentThumbnail(base64String); ClientData.contentInfo_contentThumbnail(base64String);
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type of content. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type of content.
var contentType = CONTENTSEARCH.returnContentType(outputId); var contentType = CONTENTSEARCH.returnContentType(outputId);
ClientData.contentInfo_contentType(contentType); ClientData.contentInfo_contentType(contentType);
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type of content. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type of content.
//Store Content id that user has read //Store Content id that user has read
if(ClientData.ReadingContentIds().length > 0){ if(ClientData.ReadingContentIds().length > 0){
CONTENTSEARCH.contentIdArray = ClientData.ReadingContentIds(); CONTENTSEARCH.contentIdArray = ClientData.ReadingContentIds();
for(var nIndex = 0; nIndex < CONTENTSEARCH.contentIdArray.length; nIndex++){ for(var nIndex = 0; nIndex < CONTENTSEARCH.contentIdArray.length; nIndex++){
if(CONTENTSEARCH.contentIdArray[nIndex].contentid == outputId){ if(CONTENTSEARCH.contentIdArray[nIndex].contentid == outputId){
checkflag = true; checkflag = true;
...@@ -457,9 +461,9 @@ CONTENTSEARCH.canvasClickFunction = function(e){ ...@@ -457,9 +461,9 @@ CONTENTSEARCH.canvasClickFunction = function(e){
} }
else{ else{
checkflag = false; checkflag = false;
} }
} }
if(!checkflag){ if(!checkflag){
CONTENTSEARCH.contentIdArray.push({contentid: outputId, viewdate: '', originviewdate: ''}); CONTENTSEARCH.contentIdArray.push({contentid: outputId, viewdate: '', originviewdate: ''});
} }
...@@ -467,23 +471,23 @@ CONTENTSEARCH.canvasClickFunction = function(e){ ...@@ -467,23 +471,23 @@ CONTENTSEARCH.canvasClickFunction = function(e){
else{ else{
CONTENTSEARCH.contentIdArray.push({contentid: outputId, viewdate: '', originviewdate: ''}); CONTENTSEARCH.contentIdArray.push({contentid: outputId, viewdate: '', originviewdate: ''});
} }
//Renew ReadingContentID //Renew ReadingContentID
var newArray = []; var newArray = [];
ClientData.ReadingContentIds(newArray); ClientData.ReadingContentIds(newArray);
//Set data for readingcontentid //Set data for readingcontentid
ClientData.ReadingContentIds(CONTENTSEARCH.contentIdArray); ClientData.ReadingContentIds(CONTENTSEARCH.contentIdArray);
//Set ResouceVersion for content //Set ResouceVersion for content
COMMON.setResourceVersionData(outputId); COMMON.setResourceVersionData(outputId);
//Set MetaVersion for content //Set MetaVersion for content
COMMON.setMetaVersionData(outputId); COMMON.setMetaVersionData(outputId);
//Close Submenu //Close Submenu
$('#dlgSubMenu').hide(); $('#dlgSubMenu').hide();
//Delete 'new' icon //Delete 'new' icon
CONTENTSEARCH.drawEditImage(outputId); CONTENTSEARCH.drawEditImage(outputId);
...@@ -519,19 +523,19 @@ CONTENTSEARCH.showNextRecordFunction = function(){ ...@@ -519,19 +523,19 @@ CONTENTSEARCH.showNextRecordFunction = function(){
var genreId = ClientData.searchCond_genreId(); var genreId = ClientData.searchCond_genreId();
var groupId = ClientData.searchCond_groupId(); var groupId = ClientData.searchCond_groupId();
var sid = ClientData.userInfo_sid(); var sid = ClientData.userInfo_sid();
var totalrecord = CONTENTSEARCH.totalPage; var totalrecord = CONTENTSEARCH.totalPage;
if(fromPage == null || fromPage == 'undefined'){ if(fromPage == null || fromPage == 'undefined'){
fromPage = CONTENTSEARCH.DEFAULT_DISP_NUMBER_RECORD_FROM; fromPage = CONTENTSEARCH.DEFAULT_DISP_NUMBER_RECORD_FROM;
} }
if(toPage == null || toPage == 'undefined'){ if(toPage == null || toPage == 'undefined'){
toPage = CONTENTSEARCH.returnNumberDispRecordForList(); toPage = CONTENTSEARCH.returnNumberDispRecordForList();
} }
fromPage = eval(toPage) + 1; fromPage = eval(toPage) + 1;
var iRecordNumber = eval(totalrecord) - eval(fromPage); var iRecordNumber = eval(totalrecord) - eval(fromPage);
if(iRecordNumber < CONTENTSEARCH.iNumberOfNextRecord) if(iRecordNumber < CONTENTSEARCH.iNumberOfNextRecord)
{ {
toPage = eval(fromPage) + eval(iRecordNumber); toPage = eval(fromPage) + eval(iRecordNumber);
...@@ -540,19 +544,19 @@ CONTENTSEARCH.showNextRecordFunction = function(){ ...@@ -540,19 +544,19 @@ CONTENTSEARCH.showNextRecordFunction = function(){
{ {
toPage = eval(fromPage) + (eval(CONTENTSEARCH.iNumberOfNextRecord) - 1); toPage = eval(fromPage) + (eval(CONTENTSEARCH.iNumberOfNextRecord) - 1);
} }
ClientData.searchCond_recordFrom(fromPage); ClientData.searchCond_recordFrom(fromPage);
ClientData.searchCond_recordTo(toPage); ClientData.searchCond_recordTo(toPage);
if(fromPage <= totalrecord) if(fromPage <= totalrecord)
{ {
CONTENTSEARCH.renderContent(sid, searchText, searchDivision, sortType, sortOrder, fromPage, toPage, genreId, groupId); CONTENTSEARCH.renderContent(sid, searchText, searchDivision, sortType, sortOrder, fromPage, toPage, genreId, groupId);
} }
}; };
//Sort By Title Function //Sort By Title Function
CONTENTSEARCH.sortByTitleFunction = function(){ CONTENTSEARCH.sortByTitleFunction = function(){
var sortOrder = ClientData.searchCond_sortOrder(); var sortOrder = ClientData.searchCond_sortOrder();
var sortType = ClientData.searchCond_sortType(); var sortType = ClientData.searchCond_sortType();
var sid = ClientData.userInfo_sid(); var sid = ClientData.userInfo_sid();
...@@ -564,19 +568,19 @@ CONTENTSEARCH.sortByTitleFunction = function(){ ...@@ -564,19 +568,19 @@ CONTENTSEARCH.sortByTitleFunction = function(){
if(sortOrder == COMMON.Consts.ConstOrderSetting_Asc) if(sortOrder == COMMON.Consts.ConstOrderSetting_Asc)
{ {
if(sortType == '1'){ if(sortType == '1'){
sortOrder = COMMON.Consts.ConstOrderSetting_Desc; sortOrder = COMMON.Consts.ConstOrderSetting_Desc;
} }
else{ else{
sortOrder = COMMON.Consts.ConstOrderSetting_Asc; sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
} }
ClientData.searchCond_sortOrder(sortOrder); ClientData.searchCond_sortOrder(sortOrder);
} }
else else
{ {
sortOrder = COMMON.Consts.ConstOrderSetting_Asc; sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
ClientData.searchCond_sortOrder(sortOrder); ClientData.searchCond_sortOrder(sortOrder);
} }
HEADER.setStatusSort('#control-sort-title',sortOrder == COMMON.Consts.ConstOrderSetting_Asc); HEADER.setStatusSort('#control-sort-title',sortOrder == COMMON.Consts.ConstOrderSetting_Asc);
if(recordFrom == null || recordFrom == 'undefined'){ if(recordFrom == null || recordFrom == 'undefined'){
...@@ -585,26 +589,26 @@ CONTENTSEARCH.sortByTitleFunction = function(){ ...@@ -585,26 +589,26 @@ CONTENTSEARCH.sortByTitleFunction = function(){
} }
if(recordTo == null || recordTo == 'undefined'){ if(recordTo == null || recordTo == 'undefined'){
recordTo = CONTENTSEARCH.returnNumberDispRecordForList(); recordTo = CONTENTSEARCH.returnNumberDispRecordForList();
ClientData.searchCond_recordFrom(recordTo); ClientData.searchCond_recordFrom(recordTo);
} }
sortType = '1'; sortType = '1';
ClientData.searchCond_sortType(sortType); ClientData.searchCond_sortType(sortType);
//refresh Gridview //refresh Gridview
CONTENTSEARCH.refreshGrid(); CONTENTSEARCH.refreshGrid();
//refresh add more record //refresh add more record
$('#control-nextrecord').css('visibility','hidden'); $('#control-nextrecord').css('visibility','hidden');
CONTENTSEARCH.renderContent(sid, ClientData.searchCond_searchText(), ClientData.searchCond_searchDivision(), sortType, sortOrder, recordFrom, recordTo, genreId, groupId); CONTENTSEARCH.renderContent(sid, ClientData.searchCond_searchText(), ClientData.searchCond_searchDivision(), sortType, sortOrder, recordFrom, recordTo, genreId, groupId);
}; };
//Sort By Title Kana function //Sort By Title Kana function
CONTENTSEARCH.sortByTitleKanaFunction = function(){ CONTENTSEARCH.sortByTitleKanaFunction = function(){
var sortOrder = ClientData.searchCond_sortOrder(); var sortOrder = ClientData.searchCond_sortOrder();
var sortType = ClientData.searchCond_sortType(); var sortType = ClientData.searchCond_sortType();
var sid = ClientData.userInfo_sid(); var sid = ClientData.userInfo_sid();
...@@ -612,53 +616,53 @@ CONTENTSEARCH.sortByTitleKanaFunction = function(){ ...@@ -612,53 +616,53 @@ CONTENTSEARCH.sortByTitleKanaFunction = function(){
var recordTo = ClientData.searchCond_recordTo(); var recordTo = ClientData.searchCond_recordTo();
var genreId = ClientData.searchCond_genreId(); var genreId = ClientData.searchCond_genreId();
var groupId = ClientData.searchCond_groupId(); var groupId = ClientData.searchCond_groupId();
if(sortOrder == COMMON.Consts.ConstOrderSetting_Asc) if(sortOrder == COMMON.Consts.ConstOrderSetting_Asc)
{ {
if(sortType == '2'){ if(sortType == '2'){
sortOrder = COMMON.Consts.ConstOrderSetting_Desc; sortOrder = COMMON.Consts.ConstOrderSetting_Desc;
} }
else{ else{
sortOrder = COMMON.Consts.ConstOrderSetting_Asc; sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
} }
ClientData.searchCond_sortOrder(sortOrder); ClientData.searchCond_sortOrder(sortOrder);
} }
else else
{ {
sortOrder = COMMON.Consts.ConstOrderSetting_Asc; sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
ClientData.searchCond_sortOrder(sortOrder); ClientData.searchCond_sortOrder(sortOrder);
} }
HEADER.setStatusSort('#control-sort-titlekana',sortOrder == COMMON.Consts.ConstOrderSetting_Asc); HEADER.setStatusSort('#control-sort-titlekana',sortOrder == COMMON.Consts.ConstOrderSetting_Asc);
if(recordFrom == null || recordFrom == 'undefined'){ if(recordFrom == null || recordFrom == 'undefined'){
recordFrom = CONTENTSEARCH.DEFAULT_DISP_NUMBER_RECORD_FROM; recordFrom = CONTENTSEARCH.DEFAULT_DISP_NUMBER_RECORD_FROM;
ClientData.searchCond_recordFrom(recordFrom); ClientData.searchCond_recordFrom(recordFrom);
} }
if(recordTo == null || recordTo == 'undefined'){ if(recordTo == null || recordTo == 'undefined'){
recordTo = CONTENTSEARCH.returnNumberDispRecordForList(); recordTo = CONTENTSEARCH.returnNumberDispRecordForList();
ClientData.searchCond_recordFrom(recordTo); ClientData.searchCond_recordFrom(recordTo);
} }
sortType = '2'; sortType = '2';
//refresh gridview //refresh gridview
CONTENTSEARCH.refreshGrid(); CONTENTSEARCH.refreshGrid();
//refresh add more record //refresh add more record
$('#control-nextrecord').css('visibility','hidden'); $('#control-nextrecord').css('visibility','hidden');
ClientData.searchCond_sortType(sortType); ClientData.searchCond_sortType(sortType);
CONTENTSEARCH.renderContent(sid, ClientData.searchCond_searchText(), ClientData.searchCond_searchDivision(), sortType, sortOrder, recordFrom, recordTo, genreId, groupId); CONTENTSEARCH.renderContent(sid, ClientData.searchCond_searchText(), ClientData.searchCond_searchDivision(), sortType, sortOrder, recordFrom, recordTo, genreId, groupId);
}; };
//Sort By Release Date //Sort By Release Date
CONTENTSEARCH.sortByReleaseDateFunction = function(){ CONTENTSEARCH.sortByReleaseDateFunction = function(){
var sortOrder = ClientData.searchCond_sortOrder(); var sortOrder = ClientData.searchCond_sortOrder();
var sortType = ClientData.searchCond_sortType(); var sortType = ClientData.searchCond_sortType();
var sid = ClientData.userInfo_sid(); var sid = ClientData.userInfo_sid();
...@@ -666,51 +670,51 @@ CONTENTSEARCH.sortByReleaseDateFunction = function(){ ...@@ -666,51 +670,51 @@ CONTENTSEARCH.sortByReleaseDateFunction = function(){
var recordTo = ClientData.searchCond_recordTo(); var recordTo = ClientData.searchCond_recordTo();
var genreId = ClientData.searchCond_genreId(); var genreId = ClientData.searchCond_genreId();
var groupId = ClientData.searchCond_groupId(); var groupId = ClientData.searchCond_groupId();
if(sortOrder == COMMON.Consts.ConstOrderSetting_Asc) if(sortOrder == COMMON.Consts.ConstOrderSetting_Asc)
{ {
if(sortType == '3'){ if(sortType == '3'){
sortOrder = COMMON.Consts.ConstOrderSetting_Desc; sortOrder = COMMON.Consts.ConstOrderSetting_Desc;
} }
else{ else{
sortOrder = COMMON.Consts.ConstOrderSetting_Asc; sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
} }
ClientData.searchCond_sortOrder(sortOrder); ClientData.searchCond_sortOrder(sortOrder);
} }
else else
{ {
sortOrder = COMMON.Consts.ConstOrderSetting_Asc; sortOrder = COMMON.Consts.ConstOrderSetting_Asc;
ClientData.searchCond_sortOrder(sortOrder); ClientData.searchCond_sortOrder(sortOrder);
} }
HEADER.setStatusSort('#control-sort-releasedate',sortOrder == COMMON.Consts.ConstOrderSetting_Asc); HEADER.setStatusSort('#control-sort-releasedate',sortOrder == COMMON.Consts.ConstOrderSetting_Asc);
if(recordFrom == null || recordFrom == 'undefined'){ if(recordFrom == null || recordFrom == 'undefined'){
recordFrom = CONTENTSEARCH.DEFAULT_DISP_NUMBER_RECORD_FROM; recordFrom = CONTENTSEARCH.DEFAULT_DISP_NUMBER_RECORD_FROM;
ClientData.searchCond_recordFrom(recordFrom); ClientData.searchCond_recordFrom(recordFrom);
} }
if(recordTo == null || recordTo == 'undefined'){ if(recordTo == null || recordTo == 'undefined'){
recordTo = CONTENTSEARCH.returnNumberDispRecordForList(); recordTo = CONTENTSEARCH.returnNumberDispRecordForList();
ClientData.searchCond_recordFrom(recordTo); ClientData.searchCond_recordFrom(recordTo);
} }
sortType = '3'; sortType = '3';
//refresh gridview //refresh gridview
CONTENTSEARCH.refreshGrid(); CONTENTSEARCH.refreshGrid();
//refresh add more record //refresh add more record
$('#control-nextrecord').css('visibility','hidden'); $('#control-nextrecord').css('visibility','hidden');
ClientData.searchCond_sortType(sortType); ClientData.searchCond_sortType(sortType);
CONTENTSEARCH.renderContent(sid, ClientData.searchCond_searchText(), ClientData.searchCond_searchDivision(), sortType, sortOrder, recordFrom, recordTo, genreId, groupId); CONTENTSEARCH.renderContent(sid, ClientData.searchCond_searchText(), ClientData.searchCond_searchDivision(), sortType, sortOrder, recordFrom, recordTo, genreId, groupId);
}; };
//Get Thumnail base on contentid //Get Thumnail base on contentid
CONTENTSEARCH.returnThumbnail = function(contentid){ CONTENTSEARCH.returnThumbnail = function(contentid){
for(var i = 0; i < CONTENTSEARCH.thumbnailArr.length; i++){ for(var i = 0; i < CONTENTSEARCH.thumbnailArr.length; i++){
if(CONTENTSEARCH.thumbnailArr[i].contentId == contentid){ if(CONTENTSEARCH.thumbnailArr[i].contentId == contentid){
return CONTENTSEARCH.thumbnailArr[i].thumbnail; return CONTENTSEARCH.thumbnailArr[i].thumbnail;
...@@ -723,7 +727,7 @@ CONTENTSEARCH.returnThumbnail = function(contentid){ ...@@ -723,7 +727,7 @@ CONTENTSEARCH.returnThumbnail = function(contentid){
CONTENTSEARCH.returnContentType = function(contentid){ CONTENTSEARCH.returnContentType = function(contentid){
//Array Length //Array Length
var iArrCnt = CONTENTSEARCH.contentTypeArr.length; var iArrCnt = CONTENTSEARCH.contentTypeArr.length;
//Get contentType in array by contentId //Get contentType in array by contentId
for(var i = 0; i < iArrCnt; i++){ for(var i = 0; i < iArrCnt; i++){
if (CONTENTSEARCH.contentTypeArr[i].contentId == contentid) { if (CONTENTSEARCH.contentTypeArr[i].contentId == contentid) {
...@@ -742,12 +746,12 @@ CONTENTSEARCH.readSubmenuFunction = function(e){ ...@@ -742,12 +746,12 @@ CONTENTSEARCH.readSubmenuFunction = function(e){
if (CONTENTSEARCH.home_isMove == true) { if (CONTENTSEARCH.home_isMove == true) {
CONTENTSEARCH.home_isMove = false; CONTENTSEARCH.home_isMove = false;
return; return;
} }
var contentId = $(this).attr('contentid'); var contentId = $(this).attr('contentid');
// check limit of content // check limit of content
LIMIT_ACCESS_CONTENT.checkLimitContent(contentId, LIMIT_ACCESS_CONTENT.checkLimitContent(contentId,
function() function()
{ {
CONTENTSEARCH.readSubmenuFunction_callback(contentId); CONTENTSEARCH.readSubmenuFunction_callback(contentId);
}, },
function(){ function(){
...@@ -763,23 +767,23 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId) ...@@ -763,23 +767,23 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId)
var date = new Date(); var date = new Date();
var month = date.getMonth()+1; var month = date.getMonth()+1;
var day = date.getDate(); var day = date.getDate();
var outputDate = COMMON.formatNormalDate(day, month, date.getFullYear()); var outputDate = COMMON.formatNormalDate(day, month, date.getFullYear());
ClientData.contentInfo_contentId(contentId); ClientData.contentInfo_contentId(contentId);
ClientData.contentInfo_contentThumbnail(contentThumbnail); ClientData.contentInfo_contentThumbnail(contentThumbnail);
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type of content. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type of content.
var contentType = CONTENTSEARCH.returnContentType(contentId); var contentType = CONTENTSEARCH.returnContentType(contentId);
ClientData.contentInfo_contentType(contentType); ClientData.contentInfo_contentType(contentType);
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type of content. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Assign content type of content.
var checkflag = false; var checkflag = false;
//Store Content id that user has read //Store Content id that user has read
if(ClientData.ReadingContentIds().length > 0){ if(ClientData.ReadingContentIds().length > 0){
CONTENTSEARCH.contentIdArray = ClientData.ReadingContentIds(); CONTENTSEARCH.contentIdArray = ClientData.ReadingContentIds();
for(var nIndex = 0; nIndex < CONTENTSEARCH.contentIdArray.length; nIndex++){ for(var nIndex = 0; nIndex < CONTENTSEARCH.contentIdArray.length; nIndex++){
if(CONTENTSEARCH.contentIdArray[nIndex].contentid == contentId){ if(CONTENTSEARCH.contentIdArray[nIndex].contentid == contentId){
checkflag = true; checkflag = true;
...@@ -791,9 +795,9 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId) ...@@ -791,9 +795,9 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId)
} }
else{ else{
checkflag = false; checkflag = false;
} }
} }
if(!checkflag){ if(!checkflag){
CONTENTSEARCH.contentIdArray.push({contentid: contentId, viewdate: outputDate, originviewdate: date}); CONTENTSEARCH.contentIdArray.push({contentid: contentId, viewdate: outputDate, originviewdate: date});
} }
...@@ -801,23 +805,23 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId) ...@@ -801,23 +805,23 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId)
else{ else{
CONTENTSEARCH.contentIdArray.push({contentid: contentId, viewdate: outputDate, originviewdate: date}); CONTENTSEARCH.contentIdArray.push({contentid: contentId, viewdate: outputDate, originviewdate: date});
} }
//Renew ReadingContentID //Renew ReadingContentID
var newArray = []; var newArray = [];
ClientData.ReadingContentIds(newArray); ClientData.ReadingContentIds(newArray);
//Set ResouceVersion for content //Set ResouceVersion for content
COMMON.setResourceVersionData(contentId); COMMON.setResourceVersionData(contentId);
//Set MetaVersion for content //Set MetaVersion for content
COMMON.setMetaVersionData(contentId); COMMON.setMetaVersionData(contentId);
//Set data for readingcontentid //Set data for readingcontentid
ClientData.ReadingContentIds(CONTENTSEARCH.contentIdArray); ClientData.ReadingContentIds(CONTENTSEARCH.contentIdArray);
ClientData.IsRefresh(false); ClientData.IsRefresh(false);
//Start Function : No.12 -- Editor : Le Long -- Date : 08/02/2013 -- Summary : Check content type other for download. //Start Function : No.12 -- Editor : Le Long -- Date : 08/02/2013 -- Summary : Check content type other for download.
//For testing without other Type. //For testing without other Type.
if(contentType == COMMON.ContentTypeKeys.Type_Others){ if(contentType == COMMON.ContentTypeKeys.Type_Others){
//Download content //Download content
...@@ -836,21 +840,21 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId) ...@@ -836,21 +840,21 @@ CONTENTSEARCH.readSubmenuFunction_callback = function(contentId)
//AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView); //AVWEB.avwScreenMove(COMMON.ScreenIds.ContentView);
CONTENTSEARCH.drawEditImage(contentId); CONTENTSEARCH.drawEditImage(contentId);
CONTENTSEARCH.showContentView(); CONTENTSEARCH.showContentView();
} }
//End Function : No.12 -- Editor : Le Long -- Date : 08/02/2013 -- Summary : Check content type other for download. //End Function : No.12 -- Editor : Le Long -- Date : 08/02/2013 -- Summary : Check content type other for download.
}; };
//Check if Content Has marking or memo //Check if Content Has marking or memo
CONTENTSEARCH.checkContentMarkingMemoOption = function(contentId){ CONTENTSEARCH.checkContentMarkingMemoOption = function(contentId){
//Check if contentid has marking //Check if contentid has marking
if(ClientData.MarkingData().length == 0){ if(ClientData.MarkingData().length == 0){
$('#imgBookMark'+contentId).css('visibility','hidden'); $('#imgBookMark'+contentId).css('visibility','hidden');
} }
else{ else{
for (var nIndex1 = 0; nIndex1 < ClientData.MarkingData().length; nIndex1++) { for (var nIndex1 = 0; nIndex1 < ClientData.MarkingData().length; nIndex1++) {
if (ClientData.MarkingData()[nIndex1].contentid == contentId) { if (ClientData.MarkingData()[nIndex1].contentid == contentId) {
$('#imgBookMark'+contentId).css('visibility','visible'); $('#imgBookMark'+contentId).css('visibility','visible');
break; break;
} }
...@@ -859,13 +863,13 @@ CONTENTSEARCH.checkContentMarkingMemoOption = function(contentId){ ...@@ -859,13 +863,13 @@ CONTENTSEARCH.checkContentMarkingMemoOption = function(contentId){
} }
} }
} }
if(ClientData.MemoData().length == 0){ if(ClientData.MemoData().length == 0){
$('#imgMemo'+contentId).css('visibility','hidden'); $('#imgMemo'+contentId).css('visibility','hidden');
} }
else{ else{
// Check if contentid has memo // Check if contentid has memo
for (var nIndex1 = 0; nIndex1 < ClientData.MemoData().length; nIndex1++) { for (var nIndex1 = 0; nIndex1 < ClientData.MemoData().length; nIndex1++) {
if (ClientData.MemoData()[nIndex1].contentid == contentId) { if (ClientData.MemoData()[nIndex1].contentid == contentId) {
$('#imgMemo'+contentId).css('visibility','visible'); $('#imgMemo'+contentId).css('visibility','visible');
break; break;
...@@ -882,7 +886,7 @@ CONTENTSEARCH.checkContentMarkingMemoOption = function(contentId){ ...@@ -882,7 +886,7 @@ CONTENTSEARCH.checkContentMarkingMemoOption = function(contentId){
CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
var imgThumb = new Image(); var imgThumb = new Image();
//imgThumb.src = CONTENTSEARCH.returnThumbnail(contId); //imgThumb.src = CONTENTSEARCH.returnThumbnail(contId);
var imgIconNew = new Image(); var imgIconNew = new Image();
//imgIconNew.src = COMMON.DEFAULT_IMG_CONTENT_NEW; //imgIconNew.src = COMMON.DEFAULT_IMG_CONTENT_NEW;
...@@ -897,7 +901,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -897,7 +901,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
var versionArr = ClientData.ResourceVersion(); var versionArr = ClientData.ResourceVersion();
var metaArr = ClientData.MetaVersion(); var metaArr = ClientData.MetaVersion();
var readArr = ClientData.ReadingContentIds(); var readArr = ClientData.ReadingContentIds();
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Declare variable handle contentType and Thumbnail of content. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Declare variable handle contentType and Thumbnail of content.
var contentThumbnail = CONTENTSEARCH.returnThumbnail(contId); var contentThumbnail = CONTENTSEARCH.returnThumbnail(contId);
var contentType = CONTENTSEARCH.returnContentType(contId); var contentType = CONTENTSEARCH.returnContentType(contId);
...@@ -911,12 +915,12 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -911,12 +915,12 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
imgIconNew.onload = function () { imgIconNew.onload = function () {
ctx.drawImage(imgIconNew, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]); ctx.drawImage(imgIconNew, c.width / 2 - resizeImg[0] / 2, c.height - resizeImg[1]);
$("#loadingIcon" + contId).fadeOut('slow', function () { $("#loadingIcon" + contId).fadeOut('slow', function () {
$('#content-thumbnail' + contId).fadeIn('slow'); $('#content-thumbnail' + contId).fadeIn('slow');
}); });
}; };
imgIconNew.src = COMMON.DEFAULT_IMG_CONTENT_NEW; imgIconNew.src = COMMON.DEFAULT_IMG_CONTENT_NEW;
}; };
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
if(contentThumbnail == '' || contentThumbnail == null){ if(contentThumbnail == '' || contentThumbnail == null){
if(!COMMON.isPdfContent(contentType)){ if(!COMMON.isPdfContent(contentType)){
...@@ -928,7 +932,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -928,7 +932,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
}else{ }else{
imgThumb.src = contentThumbnail; imgThumb.src = contentThumbnail;
} }
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
} }
else { else {
...@@ -943,7 +947,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -943,7 +947,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
}); });
}; };
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
if(contentThumbnail == '' || contentThumbnail == null){ if(contentThumbnail == '' || contentThumbnail == null){
if(!COMMON.isPdfContent(contentType)){ if(!COMMON.isPdfContent(contentType)){
var src = HEADER.getThumbnailForOtherType(contentType); var src = HEADER.getThumbnailForOtherType(contentType);
...@@ -954,7 +958,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -954,7 +958,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
}else{ }else{
imgThumb.src = contentThumbnail; imgThumb.src = contentThumbnail;
} }
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
readFlg = true; readFlg = true;
break; break;
...@@ -972,7 +976,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -972,7 +976,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
imgIconNew.src = COMMON.DEFAULT_IMG_CONTENT_NEW; imgIconNew.src = COMMON.DEFAULT_IMG_CONTENT_NEW;
}; };
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
if(contentThumbnail == '' || contentThumbnail == null){ if(contentThumbnail == '' || contentThumbnail == null){
if(!COMMON.isPdfContent(contentType)){ if(!COMMON.isPdfContent(contentType)){
var src = HEADER.getThumbnailForOtherType(contentType); var src = HEADER.getThumbnailForOtherType(contentType);
...@@ -983,7 +987,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -983,7 +987,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
}else{ }else{
imgThumb.src = contentThumbnail; imgThumb.src = contentThumbnail;
} }
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
} }
} }
...@@ -1010,7 +1014,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -1010,7 +1014,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
imgIconEdit.src = COMMON.DEFAULT_IMG_CONTENT_EDIT; imgIconEdit.src = COMMON.DEFAULT_IMG_CONTENT_EDIT;
}; };
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
if(contentThumbnail == '' || contentThumbnail == null){ if(contentThumbnail == '' || contentThumbnail == null){
if(!COMMON.isPdfContent(contentType)){ if(!COMMON.isPdfContent(contentType)){
var src = HEADER.getThumbnailForOtherType(contentType); var src = HEADER.getThumbnailForOtherType(contentType);
...@@ -1021,7 +1025,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -1021,7 +1025,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
}else{ }else{
imgThumb.src = contentThumbnail; imgThumb.src = contentThumbnail;
} }
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
break; break;
} }
...@@ -1047,7 +1051,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -1047,7 +1051,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
imgIconEdit.src = COMMON.DEFAULT_IMG_CONTENT_EDIT; imgIconEdit.src = COMMON.DEFAULT_IMG_CONTENT_EDIT;
}; };
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
if(contentThumbnail == '' || contentThumbnail == null){ if(contentThumbnail == '' || contentThumbnail == null){
if(!COMMON.isPdfContent(contentType)){ if(!COMMON.isPdfContent(contentType)){
var src = HEADER.getThumbnailForOtherType(contentType); var src = HEADER.getThumbnailForOtherType(contentType);
...@@ -1058,7 +1062,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -1058,7 +1062,7 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
}else{ }else{
imgThumb.src = contentThumbnail; imgThumb.src = contentThumbnail;
} }
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail. //End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Check contentType to set thumbnail.
break; break;
} }
...@@ -1073,21 +1077,21 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) { ...@@ -1073,21 +1077,21 @@ CONTENTSEARCH.checkUserHasReadContent = function(contId, resourceVer, metaVer) {
CONTENTSEARCH.drawEditImage = function(id) { CONTENTSEARCH.drawEditImage = function(id) {
var img = new Image(); var img = new Image();
var imgSrc = CONTENTSEARCH.returnThumbnail(id); var imgSrc = CONTENTSEARCH.returnThumbnail(id);
if(imgSrc != null){ if(imgSrc != null){
} }
else{ else{
var contentType = CONTENTSEARCH.returnContentType(id); var contentType = CONTENTSEARCH.returnContentType(id);
var src = HEADER.getThumbnailForOtherType(contentType); var src = HEADER.getThumbnailForOtherType(contentType);
if( src != '' ){ if( src != '' ){
imgSrc = src; imgSrc = src;
} }
} }
var c = document.getElementById('content-thumbnail' + id); var c = document.getElementById('content-thumbnail' + id);
//use getContext to use the canvas for drawing //use getContext to use the canvas for drawing
var ctx = c.getContext('2d'); var ctx = c.getContext('2d');
ctx.clearRect(0, 0, c.width, c.height); ctx.clearRect(0, 0, c.width, c.height);
...@@ -1096,15 +1100,15 @@ CONTENTSEARCH.drawEditImage = function(id) { ...@@ -1096,15 +1100,15 @@ CONTENTSEARCH.drawEditImage = function(id) {
ctx.drawImage(img, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]); ctx.drawImage(img, (c.width / 2) - (resizeImg[0] / 2) + 4, c.height - resizeImg[1] + 4, resizeImg[0], resizeImg[1]);
$("#loadingIcon" + id).fadeOut('slow', function () { $("#loadingIcon" + id).fadeOut('slow', function () {
$('#content-thumbnail' + id).fadeIn('slow'); $('#content-thumbnail' + id).fadeIn('slow');
}); });
}; };
img.src = imgSrc; img.src = imgSrc;
}; };
//Search Function //Search Function
CONTENTSEARCH.searchEventButtonFunction = function(){ CONTENTSEARCH.searchEventButtonFunction = function(){
var fromPage = CONTENTSEARCH.DEFAULT_DISP_NUMBER_RECORD_FROM; var fromPage = CONTENTSEARCH.DEFAULT_DISP_NUMBER_RECORD_FROM;
var toPage = CONTENTSEARCH.returnNumberDispRecordForList(); var toPage = CONTENTSEARCH.returnNumberDispRecordForList();
var sortType = CONTENTSEARCH.DEFAULT_SORT_TYPE; var sortType = CONTENTSEARCH.DEFAULT_SORT_TYPE;
...@@ -1114,8 +1118,8 @@ CONTENTSEARCH.searchEventButtonFunction = function(){ ...@@ -1114,8 +1118,8 @@ CONTENTSEARCH.searchEventButtonFunction = function(){
var content = $('#main-content').attr('checked'); var content = $('#main-content').attr('checked');
var tag = $('#main-tag').attr('checked'); var tag = $('#main-tag').attr('checked');
var body = $('#main-body').attr('checked'); var body = $('#main-body').attr('checked');
if(content == 'checked') if(content == 'checked')
{ {
searchDivision = $('#searchbox-content').val(); searchDivision = $('#searchbox-content').val();
...@@ -1128,7 +1132,7 @@ CONTENTSEARCH.searchEventButtonFunction = function(){ ...@@ -1128,7 +1132,7 @@ CONTENTSEARCH.searchEventButtonFunction = function(){
{ {
searchDivision = $('#searchbox-body').val(); searchDivision = $('#searchbox-body').val();
} }
var genreId = ClientData.searchCond_genreId(); var genreId = ClientData.searchCond_genreId();
var groupId = ClientData.searchCond_groupId(); var groupId = ClientData.searchCond_groupId();
var sid = ClientData.userInfo_sid(); var sid = ClientData.userInfo_sid();
...@@ -1138,11 +1142,11 @@ CONTENTSEARCH.searchEventButtonFunction = function(){ ...@@ -1138,11 +1142,11 @@ CONTENTSEARCH.searchEventButtonFunction = function(){
ClientData.searchCond_searchDivision(searchDivision); ClientData.searchCond_searchDivision(searchDivision);
//refresh grid //refresh grid
CONTENTSEARCH.refreshGrid(); CONTENTSEARCH.refreshGrid();
//Handle display sort //Handle display sort
CONTENTSEARCH.handleSortDisp(); CONTENTSEARCH.handleSortDisp();
//if(searchText == '' || searchText == null){ //if(searchText == '' || searchText == null){
// CONTENTSEARCH.displayResultNoRecord(); // CONTENTSEARCH.displayResultNoRecord();
// CONTENTSEARCH.chkSearchTextEmpty = true; // CONTENTSEARCH.chkSearchTextEmpty = true;
...@@ -1171,10 +1175,10 @@ CONTENTSEARCH.renderViewDate = function(id){ ...@@ -1171,10 +1175,10 @@ CONTENTSEARCH.renderViewDate = function(id){
//handle display sort direction //handle display sort direction
CONTENTSEARCH.handleSortDisp = function(){ CONTENTSEARCH.handleSortDisp = function(){
var typeSort; var typeSort;
var orderSort; var orderSort;
if(ClientData.searchCond_sortType() == null || ClientData.searchCond_sortType() == 'undefined' || ClientData.searchCond_sortType() == ''){ if(ClientData.searchCond_sortType() == null || ClientData.searchCond_sortType() == 'undefined' || ClientData.searchCond_sortType() == ''){
$('#title-sorttype').html(''); $('#title-sorttype').html('');
$('#title-sorttype').html(''); $('#title-sorttype').html('');
...@@ -1185,8 +1189,8 @@ CONTENTSEARCH.handleSortDisp = function(){ ...@@ -1185,8 +1189,8 @@ CONTENTSEARCH.handleSortDisp = function(){
if(ClientData.searchCond_sortOrder() != null && ClientData.searchCond_sortOrder() != 'undefined' || ClientData.searchCond_sortType() != ''){ if(ClientData.searchCond_sortOrder() != null && ClientData.searchCond_sortOrder() != 'undefined' || ClientData.searchCond_sortType() != ''){
typeSort = ClientData.searchCond_sortType(); typeSort = ClientData.searchCond_sortType();
orderSort = ClientData.searchCond_sortOrder(); orderSort = ClientData.searchCond_sortOrder();
if(typeSort == 1){ if(typeSort == 1){
HEADER.setStatusSort('#control-sort-title',orderSort == COMMON.Consts.ConstOrderSetting_Asc); HEADER.setStatusSort('#control-sort-title',orderSort == COMMON.Consts.ConstOrderSetting_Asc);
} }
else if(typeSort == 2){ else if(typeSort == 2){
...@@ -1223,7 +1227,7 @@ CONTENTSEARCH.titleClickFunction = function(e){ ...@@ -1223,7 +1227,7 @@ CONTENTSEARCH.titleClickFunction = function(e){
//Store Content id that user has read //Store Content id that user has read
if(ClientData.ReadingContentIds().length > 0){ if(ClientData.ReadingContentIds().length > 0){
CONTENTSEARCH.contentIdArray = ClientData.ReadingContentIds(); CONTENTSEARCH.contentIdArray = ClientData.ReadingContentIds();
for(var nIndex = 0; nIndex < CONTENTSEARCH.contentIdArray.length; nIndex++){ for(var nIndex = 0; nIndex < CONTENTSEARCH.contentIdArray.length; nIndex++){
if(CONTENTSEARCH.contentIdArray[nIndex].contentid == contentid){ if(CONTENTSEARCH.contentIdArray[nIndex].contentid == contentid){
checkflag = true; checkflag = true;
...@@ -1231,9 +1235,9 @@ CONTENTSEARCH.titleClickFunction = function(e){ ...@@ -1231,9 +1235,9 @@ CONTENTSEARCH.titleClickFunction = function(e){
} }
else{ else{
checkflag = false; checkflag = false;
} }
} }
if(!checkflag){ if(!checkflag){
CONTENTSEARCH.contentIdArray.push({contentid: contentid, viewdate: '', originviewdate: ''}); CONTENTSEARCH.contentIdArray.push({contentid: contentid, viewdate: '', originviewdate: ''});
} }
...@@ -1241,23 +1245,23 @@ CONTENTSEARCH.titleClickFunction = function(e){ ...@@ -1241,23 +1245,23 @@ CONTENTSEARCH.titleClickFunction = function(e){
else{ else{
CONTENTSEARCH.contentIdArray.push({contentid: contentid, viewdate: '', originviewdate: ''}); CONTENTSEARCH.contentIdArray.push({contentid: contentid, viewdate: '', originviewdate: ''});
} }
//Renew ReadingContentID //Renew ReadingContentID
var newArray = []; var newArray = [];
ClientData.ReadingContentIds(newArray); ClientData.ReadingContentIds(newArray);
//Set data for readingcontentid //Set data for readingcontentid
ClientData.ReadingContentIds(CONTENTSEARCH.contentIdArray); ClientData.ReadingContentIds(CONTENTSEARCH.contentIdArray);
//Set ResouceVersion for content //Set ResouceVersion for content
COMMON.setResourceVersionData(contentid); COMMON.setResourceVersionData(contentid);
//Set MetaVersion for content //Set MetaVersion for content
COMMON.setMetaVersionData(contentid); COMMON.setMetaVersionData(contentid);
//Close Submenu //Close Submenu
$('#dlgSubMenu').hide(); $('#dlgSubMenu').hide();
//Delete 'new' icon //Delete 'new' icon
CONTENTSEARCH.drawEditImage(contentid); CONTENTSEARCH.drawEditImage(contentid);
...@@ -1298,17 +1302,17 @@ CONTENTSEARCH.formatDisplayMoreRecord = function(){ ...@@ -1298,17 +1302,17 @@ CONTENTSEARCH.formatDisplayMoreRecord = function(){
I18N.i18nReplaceText(); I18N.i18nReplaceText();
//I18N.changeLanguage(ClientData.userInfo_language()); //I18N.changeLanguage(ClientData.userInfo_language());
$('#control-nextrecord').html(AVWEB.format(I18N.i18nText('dspViewMore'), CONTENTSEARCH.returnNumberDispRecordForList())); $('#control-nextrecord').html(AVWEB.format(I18N.i18nText('dspViewMore'), CONTENTSEARCH.returnNumberDispRecordForList()));
}; };
//CONTENTSEARCH.changeLanguageCallBackFunction = function(){ //CONTENTSEARCH.changeLanguageCallBackFunction = function(){
// CONTENTSEARCH.handleLanguage(); // CONTENTSEARCH.handleLanguage();
// //
// CONTENTSEARCH.formatDisplayMoreRecord(); // CONTENTSEARCH.formatDisplayMoreRecord();
// //
// if(CONTENTSEARCH.chkSearchTextEmpty){ // if(CONTENTSEARCH.chkSearchTextEmpty){
// displayResultNoRecord(); // displayResultNoRecord();
// } else // } else
// { // {
// if(!CONTENTSEARCH.noRecordFlg) // if(!CONTENTSEARCH.noRecordFlg)
// { // {
...@@ -1316,7 +1320,7 @@ CONTENTSEARCH.formatDisplayMoreRecord = function(){ ...@@ -1316,7 +1320,7 @@ CONTENTSEARCH.formatDisplayMoreRecord = function(){
// } // }
// enableSort(); // enableSort();
// } // }
// //
// document.title = I18N.i18nText('txtSearchResult') + ' | ' + I18N.i18nText('sysAppTitle'); // document.title = I18N.i18nText('txtSearchResult') + ' | ' + I18N.i18nText('sysAppTitle');
//}; //};
...@@ -1361,7 +1365,7 @@ CONTENTSEARCH.resizeResourceThumbnail = function(mg, width, height) { ...@@ -1361,7 +1365,7 @@ CONTENTSEARCH.resizeResourceThumbnail = function(mg, width, height) {
}; };
CONTENTSEARCH.removeHoverCss = function(){ CONTENTSEARCH.removeHoverCss = function(){
if(COMMON.isTouchDevice()){ if(COMMON.isTouchDevice()){
$('#control-sort-title').removeClass('nottouchdevice'); $('#control-sort-title').removeClass('nottouchdevice');
$('#control-sort-titlekana').removeClass('nottouchdevice'); $('#control-sort-titlekana').removeClass('nottouchdevice');
...@@ -1371,7 +1375,7 @@ CONTENTSEARCH.removeHoverCss = function(){ ...@@ -1371,7 +1375,7 @@ CONTENTSEARCH.removeHoverCss = function(){
//Dialog Read Button CLick //Dialog Read Button CLick
CONTENTSEARCH.showContentShareDlgFunction = function(e) { CONTENTSEARCH.showContentShareDlgFunction = function(e) {
if (e) { if (e) {
e.preventDefault(); e.preventDefault();
} }
...@@ -1385,11 +1389,11 @@ CONTENTSEARCH.showContentShareDlgFunction = function(e) { ...@@ -1385,11 +1389,11 @@ CONTENTSEARCH.showContentShareDlgFunction = function(e) {
// check limit of content // check limit of content
LIMIT_ACCESS_CONTENT.checkLimitContent(contentId, LIMIT_ACCESS_CONTENT.checkLimitContent(contentId,
function() function()
{ {
SHARE.contentId = contentId; SHARE.contentId = contentId;
SHARE.contentTitle = ""; SHARE.contentTitle = "";
SHARE.openContentShare(); SHARE.openContentShare();
}, },
function(){ function(){
//console.log("checkLimitContent_bbb"); //console.log("checkLimitContent_bbb");
...@@ -1399,7 +1403,7 @@ CONTENTSEARCH.showContentShareDlgFunction = function(e) { ...@@ -1399,7 +1403,7 @@ CONTENTSEARCH.showContentShareDlgFunction = function(e) {
}; };
CONTENTSEARCH.showContentView = function(){ CONTENTSEARCH.showContentView = function(){
//TOPに戻す //TOPに戻す
var y = 0; var y = 0;
if( document.documentElement.scrollTop ){ if( document.documentElement.scrollTop ){
...@@ -1415,18 +1419,18 @@ CONTENTSEARCH.showContentView = function(){ ...@@ -1415,18 +1419,18 @@ CONTENTSEARCH.showContentView = function(){
} }
CONTENTSEARCH.scrollTop = y; CONTENTSEARCH.scrollTop = y;
window.scrollTo(0,0); window.scrollTo(0,0);
//試験 //試験
$("#header-ws").hide(); $("#header-ws").hide();
$("#ws-body").hide(); $("#ws-body").hide();
$("#topcontrol").hide(); $("#topcontrol").hide();
CONTENTVIEW_INITOBJECT.clearViewerComponent(); CONTENTVIEW_INITOBJECT.clearViewerComponent();
CONTENTVIEW.cssInit(); CONTENTVIEW.cssInit();
$("#viewer").show(); $("#viewer").show();
CONTENTVIEW.ready(); CONTENTVIEW.ready();
}; };
CONTENTSEARCH.cssInit = function(){ CONTENTSEARCH.cssInit = function(){
...@@ -1465,6 +1469,6 @@ CONTENTSEARCH.downloadSubmenuFunction = function(e) { ...@@ -1465,6 +1469,6 @@ CONTENTSEARCH.downloadSubmenuFunction = function(e) {
//Download content //Download content
HEADER.downloadResourceById(contentId); HEADER.downloadResourceById(contentId);
}; };
abvw/js/header.js
...@@ -824,7 +824,10 @@ HEADER.initPushMessage = function() ...@@ -824,7 +824,10 @@ HEADER.initPushMessage = function()
// check new push message // check new push message
if (COMMON.isAnonymousLogin() == false ) { if (COMMON.isAnonymousLogin() == false ) {
HEADER.getPushMessageNew(); if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
HEADER.getPushMessageNew();
}
} }
}; };
...@@ -860,6 +863,7 @@ HEADER.getPushMessageNew = function() ...@@ -860,6 +863,7 @@ HEADER.getPushMessageNew = function()
// callback get number new message success // callback get number new message success
HEADER.callbackGetPushMessageNewSuccess = function(data) { HEADER.callbackGetPushMessageNewSuccess = function(data) {
if (data) { if (data) {
// get current number message in session // get current number message in session
var currentMessage = parseInt(ClientData.pushInfo_newMsgNumber()); var currentMessage = parseInt(ClientData.pushInfo_newMsgNumber());
...@@ -867,7 +871,6 @@ HEADER.callbackGetPushMessageNewSuccess = function(data) { ...@@ -867,7 +871,6 @@ HEADER.callbackGetPushMessageNewSuccess = function(data) {
currentMessage = 0; currentMessage = 0;
} }
var totalMessage = currentMessage + data.count; var totalMessage = currentMessage + data.count;
if ($('#liPushMessage').hasClass('hide')) { if ($('#liPushMessage').hasClass('hide')) {
// update new number message to session // update new number message to session
ClientData.pushInfo_newMsgNumber(totalMessage); ClientData.pushInfo_newMsgNumber(totalMessage);
...@@ -917,6 +920,7 @@ HEADER.getPushMessageList = function() { ...@@ -917,6 +920,7 @@ HEADER.getPushMessageList = function() {
"post", "post",
params, params,
function (data) { function (data) {
console.log(data);
// reset number message // reset number message
ClientData.pushInfo_newMsgNumber(0); ClientData.pushInfo_newMsgNumber(0);
// hide number new message // hide number new message
......
abvw/js/history.js
...@@ -99,6 +99,10 @@ $(document).ready(function(){ ...@@ -99,6 +99,10 @@ $(document).ready(function(){
HEADER.checkForceChangePassword(); HEADER.checkForceChangePassword();
} }
if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
$('#dspPushMessage').show();
}
if (COMMON.isAnonymousLogin()) { if (COMMON.isAnonymousLogin()) {
//プッシュメッセージ隠す //プッシュメッセージ隠す
$('#dspPushMessage').hide(); $('#dspPushMessage').hide();
......
abvw/js/home.js
...@@ -150,9 +150,8 @@ $(document).ready(function () { ...@@ -150,9 +150,8 @@ $(document).ready(function () {
}); });
} }
} }
console.log(ClientData.serviceOpt_apns());
console.log(ClientData.serviceOpt_usable_push_message()); if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
if((ClientData.serviceOpt_apns() == 'Y') && (ClientData.serviceOpt_usable_push_message() == 'Y')) {
$('#dspPushMessage').show(); $('#dspPushMessage').show();
} }
......
abvw/js/settings.js
...@@ -15,6 +15,10 @@ $(document).ready(function () { ...@@ -15,6 +15,10 @@ $(document).ready(function () {
// Set bookmark screen // Set bookmark screen
ClientData.BookmarkScreen(COMMON.ScreenIds.Setting); ClientData.BookmarkScreen(COMMON.ScreenIds.Setting);
if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
$('#dspPushMessage').show();
}
SETTINGS.initScreen(); SETTINGS.initScreen();
$("#dspSave").click(SETTINGS.dspSave_Click); $("#dspSave").click(SETTINGS.dspSave_Click);
...@@ -113,7 +117,7 @@ $(document).ready(function () { ...@@ -113,7 +117,7 @@ $(document).ready(function () {
/* /*
event of changing language event of changing language
*/ */
function changeLanguageCallBackFunction() { function changeLanguageCallBackFunction() {
document.title = I18N.i18nText('dspSetting') + ' | ' + I18N.i18nText('sysAppTitle'); document.title = I18N.i18nText('dspSetting') + ' | ' + I18N.i18nText('sysAppTitle');
}; };
...@@ -124,7 +128,7 @@ Check backup file exists or not for No.17 ...@@ -124,7 +128,7 @@ Check backup file exists or not for No.17
SETTINGS.IsExistBackupFile = function(file,type) { SETTINGS.IsExistBackupFile = function(file,type) {
var isExisted = false; var isExisted = false;
var params = { "sid": ClientData.userInfo_sid(), "filename": file, fileType: type }; //, deviceType: '4' var params = { "sid": ClientData.userInfo_sid(), "filename": file, fileType: type }; //, deviceType: '4'
// Get list of files // Get list of files
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post", params, AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post", params,
function (data) { function (data) {
...@@ -153,13 +157,13 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) { ...@@ -153,13 +157,13 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
} }
else if (ClientData.serviceOpt_force_pw_change_on_login() == 1) { // Recommend to change password else if (ClientData.serviceOpt_force_pw_change_on_login() == 1) { // Recommend to change password
var pwdSkipDt = ClientData.userInfo_pwdSkipDt(); var pwdSkipDt = ClientData.userInfo_pwdSkipDt();
if (pwdSkipDt) { if (pwdSkipDt) {
// Check 30 days // Check 30 days
var currDate = new Date(); var currDate = new Date();
var skipDate = new Date(pwdSkipDt); var skipDate = new Date(pwdSkipDt);
var numDay = currDate.subtractByDays(skipDate); var numDay = currDate.subtractByDays(skipDate);
if (numDay <= 30) { if (numDay <= 30) {
// Do not show dialog to change password // Do not show dialog to change password
} }
...@@ -172,7 +176,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) { ...@@ -172,7 +176,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
} }
} }
else { else {
//alert('pwdSkipDt=null'); //alert('pwdSkipDt=null');
SETTINGS.openChangePassword(); SETTINGS.openChangePassword();
...@@ -183,7 +187,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) { ...@@ -183,7 +187,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
else if (ClientData.serviceOpt_force_pw_change_on_login() == 2) { // Force to change password else if (ClientData.serviceOpt_force_pw_change_on_login() == 2) { // Force to change password
ClientData.requirePasswordChange(1); ClientData.requirePasswordChange(1);
SETTINGS.openChangePassword(); SETTINGS.openChangePassword();
$("#dspSkip").hide(); $("#dspSkip").hide();
$("#dspCancel").hide(); $("#dspCancel").hide();
//$("#dspPwdUpd1").css('margin', $("#dspCancel").css('margin')); //$("#dspPwdUpd1").css('margin', $("#dspCancel").css('margin'));
...@@ -191,7 +195,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) { ...@@ -191,7 +195,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
$("#txtChangePassComment").css('visibility', 'hidden'); $("#txtChangePassComment").css('visibility', 'hidden');
} }
} }
else if (data.requirePasswordChange == 2) { else if (data.requirePasswordChange == 2) {
...@@ -206,7 +210,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) { ...@@ -206,7 +210,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
var currDate = new Date(); var currDate = new Date();
var skipDate = new Date(pwdSkipDt); var skipDate = new Date(pwdSkipDt);
var numDay = currDate.subtractByDays(skipDate); var numDay = currDate.subtractByDays(skipDate);
if (numDay <= 30) { if (numDay <= 30) {
// Do not show dialog to change password // Do not show dialog to change password
} }
...@@ -220,7 +224,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) { ...@@ -220,7 +224,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
} }
else { else {
//alert('pwdSkipDt=null'); //alert('pwdSkipDt=null');
SETTINGS.openChangePassword(); SETTINGS.openChangePassword();
$("#dspSkip").show(); $("#dspSkip").show();
...@@ -260,7 +264,7 @@ SETTINGS.dspOptBk_OK_Click = function(e) { ...@@ -260,7 +264,7 @@ SETTINGS.dspOptBk_OK_Click = function(e) {
// ---------------------------- // ----------------------------
// Process backup here // Process backup here
// ---------------------------- // ----------------------------
// Bakup memo/marking/bookmark // Bakup memo/marking/bookmark
// backup data for No.17 // backup data for No.17
...@@ -294,7 +298,7 @@ SETTINGS.dspOptBk_OK_Click = function(e) { ...@@ -294,7 +298,7 @@ SETTINGS.dspOptBk_OK_Click = function(e) {
SETTINGS.closeBackup(); SETTINGS.closeBackup();
}); });
}; };
// set status button backup and checkbox option // set status button backup and checkbox option
...@@ -313,7 +317,7 @@ SETTINGS.setStatusButtonBackup = function() { ...@@ -313,7 +317,7 @@ SETTINGS.setStatusButtonBackup = function() {
$("#dspOptBk").show(); $("#dspOptBk").show();
} }
else { else {
$("#dspOptBk").hide(); $("#dspOptBk").hide();
} }
}; };
...@@ -415,7 +419,7 @@ SETTINGS.restoreBookmarkData = function() ...@@ -415,7 +419,7 @@ SETTINGS.restoreBookmarkData = function()
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post", AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post",
{ sid: ClientData.userInfo_sid(), filename: "Bookmark.json" }, // deviceType: '4', { sid: ClientData.userInfo_sid(), filename: "Bookmark.json" }, // deviceType: '4',
function (data) { function (data) {
if (data) { if (data) {
COMMON.getDataBookmark(data); COMMON.getDataBookmark(data);
ClientData.isChangedBookmark(false); ClientData.isChangedBookmark(false);
result = true; result = true;
...@@ -434,7 +438,7 @@ SETTINGS.restoreBookmarkData = function() ...@@ -434,7 +438,7 @@ SETTINGS.restoreBookmarkData = function()
SETTINGS.restoreMemoData = function() { SETTINGS.restoreMemoData = function() {
var result = false; var result = false;
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post", AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post",
{ sid: ClientData.userInfo_sid(), filename: "ContentMemo.json" }, //deviceType: '4', { sid: ClientData.userInfo_sid(), filename: "ContentMemo.json" }, //deviceType: '4',
function (data) { function (data) {
if (data) { if (data) {
COMMON.getDataMemo(data); COMMON.getDataMemo(data);
...@@ -452,11 +456,11 @@ SETTINGS.restoreMemoData = function() { ...@@ -452,11 +456,11 @@ SETTINGS.restoreMemoData = function() {
/* /*
* Call api to restore marking data * Call api to restore marking data
*/ */
SETTINGS.restoreMarkingData = function() SETTINGS.restoreMarkingData = function()
{ {
var result = false; var result = false;
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post", AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post",
{ sid: ClientData.userInfo_sid(), filename: "Marking.json" }, // deviceType: '4', { sid: ClientData.userInfo_sid(), filename: "Marking.json" }, // deviceType: '4',
function (data) { function (data) {
if (data) { if (data) {
COMMON.getDataMarking(data); COMMON.getDataMarking(data);
...@@ -508,7 +512,7 @@ SETTINGS.dspSave_Click = function(e) { ...@@ -508,7 +512,7 @@ SETTINGS.dspSave_Click = function(e) {
} }
// マーキング（コンテンツを開いた時に表示する） // マーキング（コンテンツを開いた時に表示する）
if ($("#chkOpt003").attr('checked') == 'checked') { if ($("#chkOpt003").attr('checked') == 'checked') {
ClientData.userOpt_makingDsp(1); ClientData.userOpt_makingDsp(1);
} }
else { else {
ClientData.userOpt_makingDsp(0); ClientData.userOpt_makingDsp(0);
...@@ -576,7 +580,7 @@ SETTINGS.dspSave_Click = function(e) { ...@@ -576,7 +580,7 @@ SETTINGS.dspSave_Click = function(e) {
type: 'success', type: 'success',
sticky: true, sticky: true,
text: I18N.i18nText('msgSaveOk') text: I18N.i18nText('msgSaveOk')
}); });
}; };
...@@ -593,7 +597,7 @@ SETTINGS.dspSkip_Click = function(e) { ...@@ -593,7 +597,7 @@ SETTINGS.dspSkip_Click = function(e) {
SETTINGS.openChangePassword = function() { SETTINGS.openChangePassword = function() {
//$("#dlgChangePassword").dialog("open"); //$("#dlgChangePassword").dialog("open");
//$(".ui-dialog-titlebar").hide(); //$(".ui-dialog-titlebar").hide();
// Clear all input values // Clear all input values
$("#txtPwdCur").val(''); $("#txtPwdCur").val('');
$("#txtPwdNew").val(''); $("#txtPwdNew").val('');
...@@ -618,7 +622,7 @@ SETTINGS.dspPwdUpd_Click = function(e) { ...@@ -618,7 +622,7 @@ SETTINGS.dspPwdUpd_Click = function(e) {
$("#dspSkip").hide(); $("#dspSkip").hide();
$("#txtChangePassComment").css('visibility', 'hidden'); $("#txtChangePassComment").css('visibility', 'hidden');
//$("#dspPwdUpd1").css('margin', '-27px 97px 0 0'); //$("#dspPwdUpd1").css('margin', '-27px 97px 0 0');
// Show dialog // Show dialog
SETTINGS.openChangePassword(); SETTINGS.openChangePassword();
}; };
...@@ -666,11 +670,11 @@ SETTINGS.dspOptBk_Click = function(e) { ...@@ -666,11 +670,11 @@ SETTINGS.dspOptBk_Click = function(e) {
// set options backup No.17 // set options backup No.17
if (ClientData.userOpt_bkMakingFlag() == 0) if (ClientData.userOpt_bkMakingFlag() == 0)
{ {
$("#chkopBkMarking").removeAttr('checked'); $("#chkopBkMarking").removeAttr('checked');
} }
else else
{ {
$("#chkopBkMarking").attr('checked', 'checked'); $("#chkopBkMarking").attr('checked', 'checked');
} }
...@@ -690,9 +694,9 @@ SETTINGS.dspOptBk_Click = function(e) { ...@@ -690,9 +694,9 @@ SETTINGS.dspOptBk_Click = function(e) {
// check content is changed // check content is changed
if (!ClientData.isChangedBookmark()) if (!ClientData.isChangedBookmark())
{ {
$('#chkopBkShiori').attr('disabled', 'disabled').removeAttr('checked'); $('#chkopBkShiori').attr('disabled', 'disabled').removeAttr('checked');
} }
else { else {
$('#chkopBkShiori').removeAttr('disabled'); $('#chkopBkShiori').removeAttr('disabled');
...@@ -703,7 +707,7 @@ SETTINGS.dspOptBk_Click = function(e) { ...@@ -703,7 +707,7 @@ SETTINGS.dspOptBk_Click = function(e) {
} }
else { else {
$('#chkopBkMemo').removeAttr('disabled'); $('#chkopBkMemo').removeAttr('disabled');
} }
if (!ClientData.isChangedMarkingData()) { if (!ClientData.isChangedMarkingData()) {
$('#chkopBkMarking').attr('disabled', 'disabled').removeAttr('checked'); $('#chkopBkMarking').attr('disabled', 'disabled').removeAttr('checked');
} }
...@@ -732,7 +736,7 @@ SETTINGS.dspPwdUpd1_Click = function(e) { ...@@ -732,7 +736,7 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
isOK = false; isOK = false;
msgError.html(I18N.i18nText('msgPwdEmpty')); msgError.html(I18N.i18nText('msgPwdEmpty'));
msgError.show(); msgError.show();
} }
else { else {
if (!ValidationUtil.CheckRequiredForText(SETTINGS.getNewPassword())) { if (!ValidationUtil.CheckRequiredForText(SETTINGS.getNewPassword())) {
...@@ -784,7 +788,7 @@ SETTINGS.dspPwdUpd1_Click = function(e) { ...@@ -784,7 +788,7 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
newPassword: SETTINGS.getNewPassword(), newPassword: SETTINGS.getNewPassword(),
appId: 4 appId: 4
}; };
if (isOK) { if (isOK) {
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), "passwordChange", "GET", params, AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), "passwordChange", "GET", params,
...@@ -892,7 +896,7 @@ SETTINGS.getCurrentPassword = function() { ...@@ -892,7 +896,7 @@ SETTINGS.getCurrentPassword = function() {
SETTINGS.getNewPassword = function() { SETTINGS.getNewPassword = function() {
return $("#txtPwdNew").val(); return $("#txtPwdNew").val();
}; };
// Get input new password // Get input new password
SETTINGS.getNewPasswordRe = function() { SETTINGS.getNewPasswordRe = function() {
return $("#txtPwdNewRe").val(); return $("#txtPwdNewRe").val();
}; };
...@@ -931,14 +935,14 @@ SETTINGS.initScreen = function() { ...@@ -931,14 +935,14 @@ SETTINGS.initScreen = function() {
$("#chkOpt003").removeAttr('checked'); $("#chkOpt003").removeAttr('checked');
} }
else { else {
$("#chkOpt003").attr('checked', 'checked'); $("#chkOpt003").attr('checked', 'checked');
} }
// Show alert when press F5.close tab.broswer // Show alert when press F5.close tab.broswer
if (ClientData.userOpt_closeOrRefreshAlert() == 0) { if (ClientData.userOpt_closeOrRefreshAlert() == 0) {
$("#chkOpt005").removeAttr('checked'); $("#chkOpt005").removeAttr('checked');
} }
else { else {
$("#chkOpt005").attr('checked', 'checked'); $("#chkOpt005").attr('checked', 'checked');
} }
// 毎回ログアウトの時、バックアップするかどうかは必ず確認する // 毎回ログアウトの時、バックアップするかどうかは必ず確認する
......
abvw/settings.html
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
<meta http-equiv="Cache-Control" content="no-cache"> <meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1"> <meta http-equiv="Expires" content="-1">
<title></title> <title></title>
<link rel="stylesheet" type="text/css" href="./common/css/jquery-ui.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./common/css/jquery.toastmessage.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./common/css/default.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./common/css/screenLock.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
...@@ -29,26 +29,26 @@ ...@@ -29,26 +29,26 @@
<link rel="stylesheet" type="text/css" href="css/theme/login_validation.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/login_validation.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/accordion.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/accordion.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/accordion.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/accordion.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/thickbox.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/thickbox.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.ui.touch-punch.min.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery.ui.touch-punch.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/header.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/settings.js?__UPDATEID__" ></script> <script type="text/javascript" src="./js/settings.js?__UPDATEID__" ></script>
<style> <style>
#slidebar-animation{ #slidebar-animation{
-ms-touch-action : none; -ms-touch-action : none;
} }
</style> </style>
<!--[if gte IE 9]> <!--[if gte IE 9]>
<style type="text/css"> <style type="text/css">
.gradient { .gradient {
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</ul> </ul>
</div> </div>
<ul class="button"> <ul class="button">
<li class="floatL"> <li class="floatL" id="dspPushMessage" style="display:none">
<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a> <a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
<div id="accordion" style="display:none;"> <div id="accordion" style="display:none;">
<div id="show-push-message"></div> <div id="show-push-message"></div>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li> <li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<ul> <ul>
<li> <li>
<span class="choice lang" lang="txtOpt001"><!--初期表示--></span> <span class="choice lang" lang="txtOpt001"><!--初期表示--></span>
<label class="firstview"><input type=radio name="firstview" value="bookshelf" id="rdoOpt001" checked="checked" checked/><label for="rdoOpt001" lang="txtHondana" class="lang"><!--本棚--></label></label> <label class="firstview"><input type=radio name="firstview" value="bookshelf" id="rdoOpt001" checked="checked" checked/><label for="rdoOpt001" lang="txtHondana" class="lang"><!--本棚--></label></label>
<label class="firstview"><input type=radio name="firstview" value="booklist" id="rdoOpt0011"><label for="rdoOpt0011" lang="txtList" class="lang"><!--リスト--></label></label> <label class="firstview"><input type=radio name="firstview" value="booklist" id="rdoOpt0011"><label for="rdoOpt0011" lang="txtList" class="lang"><!--リスト--></label></label>
</li> </li>
<li><label><input type=checkbox name="repeat" value="repeat" class="chkbx" id="chkOpt002" checked="checked" checked/><label for="chkOpt002" id="txtOpt002" lang="txtOpt002" class="lang"><!--動画、音楽を繰り返し再生する--></label></label></li> <li><label><input type=checkbox name="repeat" value="repeat" class="chkbx" id="chkOpt002" checked="checked" checked/><label for="chkOpt002" id="txtOpt002" lang="txtOpt002" class="lang"><!--動画、音楽を繰り返し再生する--></label></label></li>
......
login.html
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/common.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./abvw/css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/common.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./abvw/css/theme/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery.toastmessage.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/login.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./abvw/css/layout/login.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/login.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./abvw/css/theme/login.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/login_validation.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./abvw/css/layout/login_validation.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/login_validation.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./abvw/css/theme/login_validation.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/limit_access.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./abvw/css/layout/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/limit_access.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="./abvw/css/theme/limit_access.css?__UPDATEID__" />
<script type="text/javascript" src="./abvw/common/js/jquery-1.8.1.min.js?__UPDATEID__"></script> <script type="text/javascript" src="./abvw/common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/common/js/thickbox.js?__UPDATEID__"></script> <script type="text/javascript" src="./abvw/common/js/thickbox.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script> <script type="text/javascript" src="./abvw/common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
//jQuery.event.add(window,"load",function() { // 全ての読み込み完了後に呼ばれる関数 //jQuery.event.add(window,"load",function() { // 全ての読み込み完了後に呼ばれる関数
// var pageH = $("#container").height(); // var pageH = $("#container").height();
// console.log("pageH:" + pageH); // console.log("pageH:" + pageH);
// //
// $("#fade").css("height", pageH).delay(900).fadeOut(800); // $("#fade").css("height", pageH).delay(900).fadeOut(800);
// $("#loader").delay(600).fadeOut(300); // $("#loader").delay(600).fadeOut(300);
// $("#container").css("display", "block"); // $("#container").css("display", "block");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment