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