Skip to content

C
check
Commit ed2bc92e by Motohisa Nakano
Options

20121219-3

parent cd8ece9d
Showing with 386 additions and 126 deletions
abvw/common/json/lang/lang-en.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"Logout", "dspBkCancel":"Logout",
"txtSearchResult":"Result", "txtSearchResult":"Result",
"dspHome":"Home", "dspHome":"Home",
"txtLoginUser":"(Ver.20121218-1)User:", "txtLoginUser":"(Ver.20121219-3)User:",
"txtAll":"All", "txtAll":"All",
"txtMkgSize":"Size", "txtMkgSize":"Size",
"txtMkgS":"S", "txtMkgS":"S",
...@@ -120,5 +120,8 @@ ...@@ -120,5 +120,8 @@
"txtMemoPaste":"Paste", "txtMemoPaste":"Paste",
"txtMemoClear":"Clear", "txtMemoClear":"Clear",
"txtMemo":"Memo", "txtMemo":"Memo",
"msgBGMPlayConfirm":"EN:このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？" "msgBGMPlayConfirm":"EN:このコンテンツはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？",
"msgPWDNeedChange":"EN:パスワード変更が必要ですので、設定変更画面に戻って変更してください。",
"msgBGMPagePlayConfirm":"EN:このページはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？"
} }
abvw/common/json/lang/lang-ja.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト", "dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果", "txtSearchResult":"検索結果",
"dspHome":"ホーム", "dspHome":"ホーム",
"txtLoginUser":"(Ver.20121218-1)ログイン中：", "txtLoginUser":"(Ver.20121219-3)ログイン中：",
"txtAll":"すべて", "txtAll":"すべて",
"txtMkgSize":"太さ", "txtMkgSize":"太さ",
"txtMkgS":"小", "txtMkgS":"小",
...@@ -120,5 +120,7 @@ ...@@ -120,5 +120,7 @@
"txtMemoPaste":"貼り付け", "txtMemoPaste":"貼り付け",
"txtMemoClear":"クリア", "txtMemoClear":"クリア",
"txtMemo":"メモ", "txtMemo":"メモ",
"msgBGMPlayConfirm":"このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？" "msgBGMPlayConfirm":"このコンテンツはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？",
"msgPWDNeedChange":"パスワード変更が必要ですので、設定変更画面に戻って変更してください。",
"msgBGMPagePlayConfirm":"このページはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？"
} }
abvw/common/json/lang/lang-ko.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃", "dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과", "txtSearchResult":"검색 결과",
"dspHome":"홈", "dspHome":"홈",
"txtLoginUser":"(Ver.20121218-1)로그인 중:", "txtLoginUser":"(Ver.20121219-3)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
...@@ -120,5 +120,7 @@ ...@@ -120,5 +120,7 @@
"txtMemoPaste":"붙여 넣기", "txtMemoPaste":"붙여 넣기",
"txtMemoClear":"클리어", "txtMemoClear":"클리어",
"txtMemo":"메모", "txtMemo":"메모",
"msgBGMPlayConfirm":"KO:このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？" "msgBGMPlayConfirm":"KO:このコンテンツはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？",
"msgPWDNeedChange":"KO:パスワード変更が必要ですので、設定変更画面に戻って変更してください。",
"msgBGMPagePlayConfirm":"KO:このページはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？"
} }
abvw/contentsearch.html
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<script src="./common/js/gotop.js"></script> <script src="./common/js/gotop.js"></script>
<script src="common/js/tab.js"></script> <script src="common/js/tab.js"></script>
<script src="./common/js/screenLock.js" type="text/javascript"></script> <script src="./common/js/screenLock.js" type="text/javascript"></script>
<script src="js/SCRCDL0100.js" type="text/javascript"></script> <script src="js/detail.js" type="text/javascript"></script>
<!-- screen style definition area --> <!-- screen style definition area -->
<style> <style>
......
abvw/contentview.html
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<link rel="stylesheet" type="text/css" href="./common/css/jquery.toastmessage.css" /> <link rel="stylesheet" type="text/css" href="./common/css/jquery.toastmessage.css" />
<link href="./common/css/default.css" rel="stylesheet" type="text/css" /> <link href="./common/css/default.css" rel="stylesheet" type="text/css" />
<link href="./common/css/screenLock.css" rel="stylesheet" type="text/css" /> <link href="./common/css/screenLock.css" rel="stylesheet" type="text/css" />
<link href="css/delete_shiori.css" rel="stylesheet" type="text/css" />
<script src="./common/js/jquery-1.8.1.min.js"></script> <script src="./common/js/jquery-1.8.1.min.js"></script>
<script src="./common/js/jquery-ui-1.8.23.custom.min.js"></script> <script src="./common/js/jquery-ui-1.8.23.custom.min.js"></script>
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
<script src="./js/contentview_Marking.js"></script> <script src="./js/contentview_Marking.js"></script>
<script src="./js/contentview_PopupText.js"></script> <script src="./js/contentview_PopupText.js"></script>
<script src="./js/contentview_Paint.js"></script> <script src="./js/contentview_Paint.js"></script>
<script src="common/js/zoomDetector.js" type="text/javascript"></script> <script src="common/js/zoomDetector.js" type="text/javascript"></script>
<link type="text/css" rel="stylesheet" href="css/reset.css" /> <link type="text/css" rel="stylesheet" href="css/reset.css" />
<link type="text/css" rel="stylesheet" href="css/viewer.css" /> <link type="text/css" rel="stylesheet" href="css/viewer.css" />
...@@ -143,6 +144,8 @@ ...@@ -143,6 +144,8 @@
var typeSelectMemo = 0; var typeSelectMemo = 0;
var arrThumbnailsLoaded = []; var arrThumbnailsLoaded = [];
var isSendingData = true; var isSendingData = true;
var isPlayBGMUnlock = false;
var isJumpNotFromFirstPage = false;
/* /*
Clear canvas Clear canvas
...@@ -2658,9 +2661,77 @@ ...@@ -2658,9 +2661,77 @@
changePage($(this).attr('id')); changePage($(this).attr('id'));
} }
function playBGMOfPage(page_index_bg){
if (avwUserEnvObj.os == "ipad") {
if($('#playaudiopage').children().length > 0){
$('#playaudiopage').children().remove();
}
getPageObjectsByPageIndex(pageObjectsData,page_index_bg);
for(var nIndex = 0; nIndex < pageObjects.length; nIndex++){
if(pageObjects[nIndex]. mediaType == '3' && pageObjects[nIndex]. playType == '2'){
stopAllAudio();
TypeAudio2 = pageObjects[nIndex].playType;
srcAudioType2 = pageObjects[nIndex].audioFile;
if(ClientData.userOpt_musicMode() == "1"){
$('#playaudiopage').html(
' <audio id="play_audio_2" loop="loop" autoplay="autoplay" >' +
' <source src="' + srcAudioType2 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>'
);
}else{
$('#playaudiopage').html(
' <audio id="play_audio_2" autoplay = "autoplay" >' +
' <source src="' + srcAudioType2 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>'
);
}
document.getElementById('play_audio_2').load();
document.getElementById('play_audio_2').play();
document.getElementById("play_audio_2").pause();
}
}
}
}
function playBGMOfContent(){
if (avwUserEnvObj.os == "ipad" && isJumpNotFromFirstPage == true) {
isJumpNotFromFirstPage = false;
getPageObjectsByPageIndex(pageObjectsData,0);
for(var nIndex = 0; nIndex < pageObjects.length; nIndex++){
if(pageObjects[nIndex]. mediaType == '3' && pageObjects[nIndex]. playType == '1'){
stopAllAudio();
TypeAudio1 = pageObjects[nIndex].playType;
srcAudioType1 = pageObjects[nIndex].audioFile;
if(ClientData.userOpt_musicMode() == "1"){
$('#playaudioallpage').html(
' <audio id="play_audio_1" loop="loop" autoplay="autoplay" >' +
' <source src="' + srcAudioType1 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>'
);
}else{
$('#playaudioallpage').html(
' <audio id="play_audio_1" autoplay = "autoplay" >' +
' <source src="' + srcAudioType1 + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>'
);
}
document.getElementById('play_audio_1').load();
document.getElementById('play_audio_1').play();
document.getElementById("play_audio_1").pause();
}
}
}
}
/* event next page */ /* event next page */
function nextPage_click() { function nextPage_click() {
if(getContent().hasNextPage()) { if(getContent().hasNextPage()) {
playBGMOfContent();
playBGMOfPage(getPageIndex() + 1);
disableAllControl(); disableAllControl();
$('#divImageLoading').css('display', 'block'); $('#divImageLoading').css('display', 'block');
...@@ -2728,6 +2799,9 @@ ...@@ -2728,6 +2799,9 @@
/* event prev page */ /* event prev page */
function prevPage_click(){ function prevPage_click(){
if(getContent().hasPreviousPage()) { if(getContent().hasPreviousPage()) {
playBGMOfContent();
playBGMOfPage(getPageIndex() - 1);
disableAllControl(); disableAllControl();
$('#divImageLoading').css('display','block'); $('#divImageLoading').css('display','block');
...@@ -2760,6 +2834,9 @@ ...@@ -2760,6 +2834,9 @@
/* event first page */ /* event first page */
function firstPage_click(){ function firstPage_click(){
if(getContent().pageIndex != 0){ if(getContent().pageIndex != 0){
playBGMOfContent();
playBGMOfPage(0);
disableAllControl(); disableAllControl();
$('#divImageLoading').css('display','block'); $('#divImageLoading').css('display','block');
...@@ -2791,6 +2868,9 @@ ...@@ -2791,6 +2868,9 @@
/* event last page */ /* event last page */
function lastPage_click(){ function lastPage_click(){
if(getContent().pageIndex != (totalPage - 1)){ if(getContent().pageIndex != (totalPage - 1)){
playBGMOfContent();
playBGMOfPage(totalPage - 1);
disableAllControl(); disableAllControl();
$('#divImageLoading').css('display','block'); $('#divImageLoading').css('display','block');
...@@ -2829,6 +2909,9 @@ ...@@ -2829,6 +2909,9 @@
page_index = Number(page_index); page_index = Number(page_index);
if(page_index != getContent().pageIndex){ if(page_index != getContent().pageIndex){
playBGMOfContent();
playBGMOfPage(page_index);
disableAllControl(); disableAllControl();
$('#divImageLoading').css('display', 'block'); $('#divImageLoading').css('display', 'block');
...@@ -3410,10 +3493,17 @@ ...@@ -3410,10 +3493,17 @@
/* handle display page from book mark page */ /* handle display page from book mark page */
function handleFromBookMarkPage(){ function handleFromBookMarkPage(){
/* handle play BGM of content jump */
// getPageObjectsByPageIndex(pageObjectsData,0);
// for(var nIndex = 0; nIndex < pageObjects.length; nIndex++){
// if(pageObjects[nIndex]. mediaType == '3' && pageObjects[nIndex]. playType == '1'){
// createAudio(pageObjects[nIndex].audioFile, pageObjects[nIndex].playType);
// }
// } isJumpNotFromFirstPage = true;
/* check exist pageno */ /* check exist pageno */
if(ClientData.bookmark_pageNo()){ if(ClientData.bookmark_pageNo()){
changePage(changePageNo(ClientData.bookmark_pageNo())); changePageWithoutSlide(changePageNo(ClientData.bookmark_pageNo()));
//LocalStorageUtils.remove(Keys.bookmark_pageNo);
ClientData.bookmark_pageNo(null) ClientData.bookmark_pageNo(null)
} }
} }
...@@ -3421,12 +3511,13 @@ ...@@ -3421,12 +3511,13 @@
/* handle display page from actiontype=10 mediaType =1 :jump to content */ /* handle display page from actiontype=10 mediaType =1 :jump to content */
function handleFromJumpContent(){ function handleFromJumpContent(){
/* handle play BGM of content jump */ /* handle play BGM of content jump */
getPageObjectsByPageIndex(pageObjectsData,0); // getPageObjectsByPageIndex(pageObjectsData,0);
for(var nIndex = 0; nIndex < pageObjects.length; nIndex++){ // for(var nIndex = 0; nIndex < pageObjects.length; nIndex++){
if(pageObjects[nIndex]. mediaType == '3' && pageObjects[nIndex]. playType == '1'){ // if(pageObjects[nIndex]. mediaType == '3' && pageObjects[nIndex]. playType == '1'){
createAudio(pageObjects[nIndex].audioFile, pageObjects[nIndex].playType); // createAudio(pageObjects[nIndex].audioFile, pageObjects[nIndex].playType);
} // }
} // }
isJumpNotFromFirstPage = true;
/* check exist pageno */ /* check exist pageno */
if(ClientData.common_prePageNo()){ if(ClientData.common_prePageNo()){
...@@ -3440,12 +3531,12 @@ ...@@ -3440,12 +3531,12 @@
/* handle button back */ /* handle button back */
function oldContent_Back(){ function oldContent_Back(){
/* handle play BGM of content jump */ /* handle play BGM of content jump */
getPageObjectsByPageIndex(pageObjectsData,0); // getPageObjectsByPageIndex(pageObjectsData,0);
for(var nIndex = 0; nIndex < pageObjects.length; nIndex++){ // for(var nIndex = 0; nIndex < pageObjects.length; nIndex++){
if(pageObjects[nIndex]. mediaType == '3' && pageObjects[nIndex]. playType == '1'){ // if(pageObjects[nIndex]. mediaType == '3' && pageObjects[nIndex]. playType == '1'){
createAudio(pageObjects[nIndex].audioFile, pageObjects[nIndex].playType); // createAudio(pageObjects[nIndex].audioFile, pageObjects[nIndex].playType);
} // }
} // } isJumpNotFromFirstPage = true;
var oldDataBack = ClientData.JumpQueue(); var oldDataBack = ClientData.JumpQueue();
var oldContent = oldDataBack[oldDataBack.length - 1]; var oldContent = oldDataBack[oldDataBack.length - 1];
...@@ -3700,11 +3791,18 @@ function oldContent_Back(){ ...@@ -3700,11 +3791,18 @@ function oldContent_Back(){
getPageObjectsByPageIndex(pageObjectsData,0); getPageObjectsByPageIndex(pageObjectsData,0);
/* handle play BGM of content jump */ /* handle play BGM of content jump */
for(var nIndex = 0; nIndex < pageObjects.length; nIndex++){ for(var nIndex = 0; nIndex < pageObjects.length; nIndex++){
if(pageObjects[nIndex]. mediaType == '3' && pageObjects[nIndex]. playType == '1'){ if(pageObjects[nIndex]. mediaType == '3' && pageObjects[nIndex]. playType == '1'){
if (avwUserEnvObj.os == "ipad"){
$('#play_audio_1').attr('src',pageObjects[nIndex].audioFile);
//document.getElementById("play_audio_1").load();
document.getElementById("play_audio_1").play();
isPlayBGMUnlock = true;
}else{
createAudio(pageObjects[nIndex].audioFile, pageObjects[nIndex].playType); createAudio(pageObjects[nIndex].audioFile, pageObjects[nIndex].playType);
} }
} }
}
getPageObjectsByPageIndex(pageObjectsData,getPageIndex()); getPageObjectsByPageIndex(pageObjectsData,getPageIndex());
getContent().setPageImages(totalPage, pageImages).setPageObjects(pageObjects).setUpPage(getPageIndex); getContent().setPageImages(totalPage, pageImages).setPageObjects(pageObjects).setUpPage(getPageIndex);
...@@ -3767,6 +3865,22 @@ function oldContent_Back(){ ...@@ -3767,6 +3865,22 @@ function oldContent_Back(){
function changePageWithoutSlide(pageMove){ function changePageWithoutSlide(pageMove){
disableAllControl(); disableAllControl();
var isExistBGMPageContent = false;
getPageObjectsByPageIndex(pageObjectsData,pageMove);
for(var nIndex = 0; nIndex < pageObjects.length; nIndex++){
if(pageObjects[nIndex]. mediaType == '3' && pageObjects[nIndex]. playType == '2'){
isExistBGMPageContent = true;
}
}
if(isExistBGMPageContent == false){
getPageObjectsByPageIndex(pageObjectsData,0);
for(var nIndex = 0; nIndex < pageObjects.length; nIndex++){
if(pageObjects[nIndex]. mediaType == '3' && pageObjects[nIndex]. playType == '1'){
createAudio(pageObjects[nIndex].audioFile, pageObjects[nIndex].playType);
}
}
}
$('#divImageLoading').css('display','block'); $('#divImageLoading').css('display','block');
...@@ -3812,6 +3926,7 @@ function oldContent_Back(){ ...@@ -3812,6 +3926,7 @@ function oldContent_Back(){
/* set position model when resize*/ /* set position model when resize*/
function changePosDialog(){ function changePosDialog(){
$("#divDialogMemo").center(); $("#divDialogMemo").center();
$("#divDialogMemo").css('position', 'absolute');
$("#boxBookMark").center(); $("#boxBookMark").center();
$("#boxIndex").center(); $("#boxIndex").center();
$("#boxCopyText").center(); $("#boxCopyText").center();
...@@ -3821,6 +3936,8 @@ function oldContent_Back(){ ...@@ -3821,6 +3936,8 @@ function oldContent_Back(){
$('#dlgMaker').center(); $('#dlgMaker').center();
$('#dlgGomu').center(); $('#dlgGomu').center();
$('#dlgMarking').center(); $('#dlgMarking').center();
$('#bgmConfirm').center();
$("#bgmConfirm_page").center();
} }
function closeDialogResize(){ function closeDialogResize(){
...@@ -3829,6 +3946,14 @@ function oldContent_Back(){ ...@@ -3829,6 +3946,14 @@ function oldContent_Back(){
$('#pop_up_memo').hide(); $('#pop_up_memo').hide();
} }
function createTextConfirmAudio(){
var text = i18nText('msgBGMPlayConfirm')
$('#txtAudio').html(text);
var text = i18nText('msgBGMPagePlayConfirm')
$('#txtAudio_page').html(text);
}
function initPage(){ function initPage(){
//$('body,html').animate({ scrollTop: 0 }, 350); //$('body,html').animate({ scrollTop: 0 }, 350);
...@@ -3866,6 +3991,9 @@ function oldContent_Back(){ ...@@ -3866,6 +3991,9 @@ function oldContent_Back(){
/* handle display tooltip */ /* handle display tooltip */
handleTooltip(); handleTooltip();
/* set text dialog confirm of audio */
createTextConfirmAudio();
/* handle toolbar */ /* handle toolbar */
$('#control_screen').click(handleDisplayToolbar); $('#control_screen').click(handleDisplayToolbar);
$('#control_screen_2').click(handleDisplayToolbar); $('#control_screen_2').click(handleDisplayToolbar);
...@@ -3948,8 +4076,9 @@ function oldContent_Back(){ ...@@ -3948,8 +4076,9 @@ function oldContent_Back(){
/* check move content */ /* check move content */
if (ClientData.bookmark_pageNo()) { if (ClientData.bookmark_pageNo()) {
//changePage(changePageNo(ClientData.bookmark_pageNo())); //changePage(changePageNo(ClientData.bookmark_pageNo()));
changePageWithoutSlide(changePageNo(ClientData.bookmark_pageNo())); //changePageWithoutSlide(changePageNo(ClientData.bookmark_pageNo()));
ClientData.bookmark_pageNo(null) //ClientData.bookmark_pageNo(null)
handleFromBookMarkPage();
} else if (ClientData.common_prePageNo()) { } else if (ClientData.common_prePageNo()) {
/* handle from jump content */ /* handle from jump content */
...@@ -4190,7 +4319,7 @@ function oldContent_Back(){ ...@@ -4190,7 +4319,7 @@ function oldContent_Back(){
</div> </div>
<div id="divDialogMemo" style="width:466px;height:389px;display:none;"> </div> <div id="divDialogMemo" style="width:466px;height:389px;display:none; position: absolute"> </div>
<div id="dialogPopUp" class="popuptext_web_dialog"> </div> <div id="dialogPopUp" class="popuptext_web_dialog"> </div>
<div id="arrow" class="popuptext_arrow"> </div> <div id="arrow" class="popuptext_arrow"> </div>
...@@ -4322,7 +4451,17 @@ function oldContent_Back(){ ...@@ -4322,7 +4451,17 @@ function oldContent_Back(){
<!-- Footer [end] <!-- Footer [end]
<!-- ================================================================================== --> <!-- ================================================================================== -->
<section id="bgmConfirm" class="sectionDeleteConfirm">
<h1 class="lang" lang=""> </h1>
<p class="message lang" lang="msgBGMPlayConfirm" id="txtAudio">このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？</p>
<p class="deletebtn" ><a id="bgmConfirm_dspOK" lang="dspOK" class="ok_audio lang">ＯＫ</a><a id="bgmConfirm_dspCancel" lang="dspCancel" class="cancel_audio lang">キャンセル</a></p>
</section>
<section id="bgmConfirm_page" class="sectionDeleteConfirm">
<h1 class="lang" lang=""> </h1>
<p class="message lang" lang="msgBGMPlayConfirm" id="txtAudio_page">このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？</p>
<p class="deletebtn" ><a id="bgmConfirm_dspOK_page" lang="dspOK" class="ok_audio lang">ＯＫ</a><a id="bgmConfirm_dspCancel_page" lang="dspCancel" class="cancel_audio lang">キャンセル</a></p>
</section>
</div> </div>
<iframe style="height:0px;width:0px;visibility:hidden" src="about:blank"> <iframe style="height:0px;width:0px;visibility:hidden" src="about:blank">
this frame prevents back forward cache this frame prevents back forward cache
......
abvw/css/contentview.css
html{
overflow: hidden;
}
body { body {
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -8,7 +12,7 @@ body { ...@@ -8,7 +12,7 @@ body {
body #wrapper { body #wrapper {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: fixed; position: absolute;
background-color: #666; background-color: #666;
box-shadow: 2px 2px 8px #000 inset; box-shadow: 2px 2px 8px #000 inset;
...@@ -159,7 +163,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -159,7 +163,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
/*CSS for dialog*/ /*CSS for dialog*/
.web_dialog_overlay .web_dialog_overlay
{ {
position: fixed; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
...@@ -174,6 +178,25 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -174,6 +178,25 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
z-index: 101; z-index: 101;
display: none; display: none;
} }
/*CSS for dialog*/
.web_dialog_overlay_loading
{
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: 100%;
margin: 0;
padding: 0;
opacity: .15;
filter: alpha(opacity=15);
-moz-opacity: .15;
z-index: 101;
display: none;
}
.web_dialog .web_dialog
{ {
padding-top:100px; padding-top:100px;
...@@ -797,3 +820,9 @@ aside.MemoIndexBox .indexBoxBody_off{ ...@@ -797,3 +820,9 @@ aside.MemoIndexBox .indexBoxBody_off{
width:60px; width:60px;
height:60px; height:60px;
} }
#bgmConfirm
{
position: absolute;
display: none;
}
abvw/css/delete_shiori.css
...@@ -63,6 +63,18 @@ ...@@ -63,6 +63,18 @@
margin:-27px 0 0 135px; margin:-27px 0 0 135px;
cursor: pointer; cursor: pointer;
} }
.sectionDeleteConfirm .deletebtn a.ok_audio {
position:relative;
margin:0 168px 0 0;
cursor: pointer;
}
.sectionDeleteConfirm .deletebtn a.cancel_audio {
position:relative;
margin:-27px 60px 0 135px;
cursor: pointer;
}
.sectionDeleteConfirm .deletebtn a { .sectionDeleteConfirm .deletebtn a {
width:85px; width:85px;
height:21px; height:21px;
......
abvw/history.html
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<script src="./common/js/gotop.js"></script> <script src="./common/js/gotop.js"></script>
<script src="common/js/tab.js"></script> <script src="common/js/tab.js"></script>
<script src="./common/js/screenLock.js" type="text/javascript"></script> <script src="./common/js/screenLock.js" type="text/javascript"></script>
<script src="js/SCRCDL0100.js" type="text/javascript"></script> <script src="js/detail.js" type="text/javascript"></script>
<!-- screen style definition area --> <!-- screen style definition area -->
<style> <style>
......
abvw/home.html
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<script src="./common/js/jquery.treeview.edit.js" type="text/javascript"></script> <script src="./common/js/jquery.treeview.edit.js" type="text/javascript"></script>
<script src="./common/js/jquery.treeview.js" type="text/javascript"></script> <script src="./common/js/jquery.treeview.js" type="text/javascript"></script>
<script src="./common/js/screenLock.js" type="text/javascript"></script> <script src="./common/js/screenLock.js" type="text/javascript"></script>
<script src="js/SCRCDL0100.js" type="text/javascript"></script> <script src="js/detail.js" type="text/javascript"></script>
<!-- screen style definition area --> <!-- screen style definition area -->
......
abvw/js/bookmark.js
...@@ -27,17 +27,22 @@ $(document).ready(function () { ...@@ -27,17 +27,22 @@ $(document).ready(function () {
LockScreen(); LockScreen();
// Synchronize bookmarks with server
SyncContent();
// Collection all detail of pages
bookmark_collectAllPages();
document.title = i18nText('dspShiori') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('dspShiori') + ' | ' + i18nText('sysAppTitle');
// Set bookmark screen // Set bookmark screen
ClientData.BookmarkScreen(ScreenIds.BookmarkList); ClientData.BookmarkScreen(ScreenIds.BookmarkList);
//Check if Force Change password
if(ClientData.requirePasswordChange() != 1){
// Synchronize bookmarks with server
SyncContent();
// Collection all detail of pages
bookmark_collectAllPages();
$("#dspDelete").click(dspDelete_Click); $("#dspDelete").click(dspDelete_Click);
$("#dspDelete1").click(dspDelete1_Click); $("#dspDelete1").click(dspDelete1_Click);
$("#dspCancel").click(dspCancel_Click); $("#dspCancel").click(dspCancel_Click);
...@@ -69,6 +74,10 @@ $(document).ready(function () { ...@@ -69,6 +74,10 @@ $(document).ready(function () {
ClientData.sortOpt_searchDivision(1); ClientData.sortOpt_searchDivision(1);
ClientData.sortOpt_sortType(2); ClientData.sortOpt_sortType(2);
dspTitleNm_Click(); dspTitleNm_Click();
}
else{
checkForceChangePassword();
}
}); });
/* /*
......
abvw/js/contentsearch.js
...@@ -50,6 +50,8 @@ $(document).ready(function(){ ...@@ -50,6 +50,8 @@ $(document).ready(function(){
document.title = i18nText('txtSearchResult') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('txtSearchResult') + ' | ' + i18nText('sysAppTitle');
// Set bookmark screen ClientData.BookmarkScreen(ScreenIds.ContentSearch); // Set bookmark screen ClientData.BookmarkScreen(ScreenIds.ContentSearch);
//Check if Force Change password
if(ClientData.requirePasswordChange() != 1){
//Format text display more record //Format text display more record
formatDisplayMoreRecord(); formatDisplayMoreRecord();
...@@ -113,6 +115,10 @@ $(document).ready(function(){ ...@@ -113,6 +115,10 @@ $(document).ready(function(){
} }
} }
}); });
}else{
//Check if Force Change password
checkForceChangePassword();
}
}); });
......
abvw/js/contentview.js
...@@ -1025,6 +1025,7 @@ function removeObject(){ ...@@ -1025,6 +1025,7 @@ function removeObject(){
ClosePopupText(); ClosePopupText();
} }
$("#bgmConfirm").hide();
$("#boxCopyText").hide(); $("#boxCopyText").hide();
$("#boxSearching").hide(); $("#boxSearching").hide();
$("#boxIndex").hide(); $("#boxIndex").hide();
...@@ -1045,8 +1046,10 @@ function removeObject(){ ...@@ -1045,8 +1046,10 @@ function removeObject(){
$('#playaudio').children().remove(); $('#playaudio').children().remove();
} }
if($('#playaudiopage').children().length > 0){ if($('#playaudiopage').children().length > 0){
if (avwUserEnvObj.os != "ipad") {
$('#playaudiopage').children().remove(); $('#playaudiopage').children().remove();
} }
}
if(avwUserEnvObj.browser == 'firefox'){ if(avwUserEnvObj.browser == 'firefox'){
srcAudioType0 = ''; srcAudioType0 = '';
...@@ -2539,10 +2542,19 @@ function playAllAudio(){ ...@@ -2539,10 +2542,19 @@ function playAllAudio(){
} }
}else{ }else{
if(document.getElementById("play_audio_0") != undefined){ if(document.getElementById("play_audio_0") != undefined){
if (avwUserEnvObj.os == "ipad") {
//document.getElementById("play_audio_0").load();
}
document.getElementById("play_audio_0").play(); document.getElementById("play_audio_0").play();
}else if(document.getElementById("play_audio_2") != undefined){ }else if(document.getElementById("play_audio_2") != undefined){
if (avwUserEnvObj.os == "ipad") {
//document.getElementById("play_audio_2").load();
}
document.getElementById("play_audio_2").play(); document.getElementById("play_audio_2").play();
}else if(document.getElementById("play_audio_1") != undefined){ }else if(document.getElementById("play_audio_1") != undefined){
if (avwUserEnvObj.os == "ipad" ) {
//document.getElementById("play_audio_1").load();
}
document.getElementById("play_audio_1").play(); document.getElementById("play_audio_1").play();
} }
} }
...@@ -2596,10 +2608,32 @@ function createAudio(audio,type){ ...@@ -2596,10 +2608,32 @@ function createAudio(audio,type){
} }
if (avwUserEnvObj.os == "ipad") {
document.getElementById("play_audio_0").load();
document.getElementById("play_audio_0").play();
}
}else if(type == "1"){ /* play all page */ }else if(type == "1"){ /* play all page */
if(document.getElementById("play_audio_1") != undefined){
if(ClientData.userOpt_musicMode() == "1"){
if(avwUserEnvObj.browser == 'firefox'){
$('#playaudioallpage').html(
' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
);
}else{
document.getElementById("play_audio_1").play();
}
}else{
if(avwUserEnvObj.browser == 'firefox'){
$('#playaudioallpage').html(
' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>'
);
}else{
document.getElementById("play_audio_1").play();
}
}
}else{
TypeAudio1 = type; TypeAudio1 = type;
srcAudioType1 = audio; srcAudioType1 = audio;
...@@ -2629,8 +2663,26 @@ function createAudio(audio,type){ ...@@ -2629,8 +2663,26 @@ function createAudio(audio,type){
); );
} }
} }
// Check to play BGM on ipad
if (avwUserEnvObj.os == "ipad") {
// Show confim message to play background music
$("#bgmConfirm_dspCancel").unbind('click');
$("#bgmConfirm_dspCancel").click(function () {
$("#bgmConfirm").hide();
});
$("#bgmConfirm_dspOK").unbind('click');
$("#bgmConfirm_dspOK").click(function () {
document.getElementById('play_audio_1').load();
document.getElementById('play_audio_1').play();
$("#bgmConfirm").hide();
});
$("#bgmConfirm").show();
$("#bgmConfirm").center();
}
}
} }
else if(type == "2"){ /* play on page */ else if(type == "2"){ /* play on page */
if(document.getElementById("play_audio_2") == undefined){
stopAllAudio(); stopAllAudio();
TypeAudio2 = type; TypeAudio2 = type;
...@@ -2656,11 +2708,29 @@ function createAudio(audio,type){ ...@@ -2656,11 +2708,29 @@ function createAudio(audio,type){
}else{ }else{
$('#playaudiopage').html( $('#playaudiopage').html(
' <audio id="play_audio_2" autoplay ="autoplay">' + ' <audio id="play_audio_2" autoplay ="autoplay">' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() +'" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} }
} }
// Check to play BGM on ipad
if (avwUserEnvObj.os == "ipad") {
// Show confim message to play background music
$("#bgmConfirm_dspCancel_page").unbind('click');
$("#bgmConfirm_dspCancel_page").click(function () {
$("#bgmConfirm_page").hide();
});
$("#bgmConfirm_dspOK_page").unbind('click');
$("#bgmConfirm_dspOK_page").click(function () {
document.getElementById('play_audio_2').load();
document.getElementById('play_audio_2').play();
$("#bgmConfirm_page").hide();
});
$("#bgmConfirm_page").show();
$("#bgmConfirm_page").center();
}
}
} }
}else{ }else{
stopAllAudio(); stopAllAudio();
......
abvw/js/header.js
...@@ -9,9 +9,13 @@ $(document).ready(function () { ...@@ -9,9 +9,13 @@ $(document).ready(function () {
if (!avwCheckLogin(ScreenIds.Login)) return; if (!avwCheckLogin(ScreenIds.Login)) return;
// Set event to prevent leave // Set event to prevent leave
//avwSetLogoutNortice(); //avwSetLogoutNortice();
if(ClientData.requirePasswordChange() != 1 ) {
ToogleLogoutNortice(); ToogleLogoutNortice();
}
//Toggle Searchbox //Toggle Searchbox
$('input#searchbox-key').click(toggleSearchPanel); $('input#searchbox-key').click(toggleSearchPanel);
...@@ -418,3 +422,47 @@ function DoBackup() { ...@@ -418,3 +422,47 @@ function DoBackup() {
$('.toast-item-close').live('click', webLogoutEvent); $('.toast-item-close').live('click', webLogoutEvent);
}); });
} }
function checkForceChangePassword(){
if(ClientData.BookmarkScreen() != ScreenIds.Setting){
if(ClientData.requirePasswordChange() == 1){
//alert(i18nText('msgPWDNeedChange'));
showErrorScreenForceChangePassword();
}
}
}
function showErrorScreenForceChangePassword(){
var tags = '<div id="avw-auth-error">' +
'<div style="display:table; width:100%; height:100%;">' +
'<div style="display:table-cell; text-align:center; vertical-align:middle;">' +
'<p>'+i18nText('msgPWDNeedChange')+'</p>' +
'<div><button id="avw-unauth-ok">OK</button></div>' +
'</div></div></div>';
$('body').prepend(tags);
$('#avw-auth-error').css( {
'color': '#fff',
'opacity': 1,
'position': 'fixed',
'top': '0',
'left': '0',
'width': $(window).width(),
'height': $(window).height(),
'background': '#ccc',
'zIndex': '10000'
})
// resize error page
$(window).resize(function() {
$('#avw-auth-error').css( {
'width': $(window).width(),
'height': $(window).height()
});
});
$('#avw-unauth-ok').click(function() {
ClientData.BookmarkScreen(ScreenIds.Setting);
avwScreenMove(ScreenIds.Setting);
});
}
abvw/js/history.js
...@@ -50,13 +50,14 @@ $(document).ready(function(){ ...@@ -50,13 +50,14 @@ $(document).ready(function(){
document.title = i18nText('dspViewHistory') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('dspViewHistory') + ' | ' + i18nText('sysAppTitle');
ClientData.BookmarkScreen(ScreenIds.History);
if(ClientData.requirePasswordChange() != 1){
if(ClientData.ReadingContentIds() == null || ClientData.ReadingContentIds() == 'undefined' || ClientData.ReadingContentIds().length == 0){ if(ClientData.ReadingContentIds() == null || ClientData.ReadingContentIds() == 'undefined' || ClientData.ReadingContentIds().length == 0){
}else{ }else{
syncReadingContent(); syncReadingContent();
} }
ClientData.BookmarkScreen(ScreenIds.History);
//remove hover effect when is touch device //remove hover effect when is touch device
removeHoverCss(); removeHoverCss();
...@@ -102,6 +103,11 @@ $(document).ready(function(){ ...@@ -102,6 +103,11 @@ $(document).ready(function(){
} }
} }
}); });
}
else{
//Check if Force Change password
checkForceChangePassword();
}
}); });
//Call API //Call API
......
abvw/js/home.js
...@@ -58,6 +58,8 @@ $(document).ready(function () { ...@@ -58,6 +58,8 @@ $(document).ready(function () {
// Set bookmark screen // Set bookmark screen
ClientData.BookmarkScreen(ScreenIds.Home); ClientData.BookmarkScreen(ScreenIds.Home);
//Check if Force Change password
if(ClientData.requirePasswordChange() != 1){
// Register log // Register log
RegisterLog(); RegisterLog();
...@@ -142,6 +144,7 @@ $(document).ready(function () { ...@@ -142,6 +144,7 @@ $(document).ready(function () {
$('#dlgSubMenu').hover(subMenuHoverFunction, subMenuHoverOffFunction); $('#dlgSubMenu').hover(subMenuHoverFunction, subMenuHoverOffFunction);
$('body').click(bodyHomeClickFunction); $('body').click(bodyHomeClickFunction);
$('body').bind('touchstart', bodyHomeClickFunction);
$(window).resize(function () { $(window).resize(function () {
if ($("#contentDetail").css("display") != "none") { if ($("#contentDetail").css("display") != "none") {
...@@ -152,6 +155,9 @@ $(document).ready(function () { ...@@ -152,6 +155,9 @@ $(document).ready(function () {
} }
} }
}); });
}else{
checkForceChangePassword();
}
}); });
function subMenuHoverFunction(){ function subMenuHoverFunction(){
......
abvw/js/login.js
...@@ -78,7 +78,7 @@ function saveLoginInfo() { ...@@ -78,7 +78,7 @@ function saveLoginInfo() {
} }
ClientData.userInfo_lastLoginTime(date.jpDateTimeString()); ClientData.userInfo_lastLoginTime(date.jpDateTimeString());
ClientData.requirePasswordChange(requirePasswordChange); //ClientData.requirePasswordChange(requirePasswordChange);
//ClientData.userInfo_sid(userinfo_sid); //ClientData.userInfo_sid(userinfo_sid);
ClientData.userInfo_sid_local(userinfo_sid); ClientData.userInfo_sid_local(userinfo_sid);
saveServiceUserOption(); saveServiceUserOption();
......
abvw/js/settings.js
...@@ -19,11 +19,14 @@ ...@@ -19,11 +19,14 @@
$(document).ready(function () { $(document).ready(function () {
if (!avwCheckLogin(ScreenIds.Login)) return; if (!avwCheckLogin(ScreenIds.Login)) return;
ToogleLogoutNortice();
LockScreen(); LockScreen();
document.title = i18nText('dspSetting') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('dspSetting') + ' | ' + i18nText('sysAppTitle');
// Set bookmark screen
ClientData.BookmarkScreen(ScreenIds.Setting);
InitScreen(); InitScreen();
$("#dspSave").click(dspSave_Click); $("#dspSave").click(dspSave_Click);
...@@ -81,6 +84,7 @@ $(document).ready(function () { ...@@ -81,6 +84,7 @@ $(document).ready(function () {
$("#dspOptRes").css('visibility', ''); $("#dspOptRes").css('visibility', '');
} }
} }
}); });
/* /*
...@@ -116,6 +120,8 @@ function IsExistBackupFile() { ...@@ -116,6 +120,8 @@ function IsExistBackupFile() {
// Event success // Event success
function avwCmsApi_requirePasswordChange_success(data) { function avwCmsApi_requirePasswordChange_success(data) {
ClientData.requirePasswordChange(0);
if (data.requirePasswordChange == 1) { if (data.requirePasswordChange == 1) {
if (ClientData.serviceOpt_force_pw_change_on_login() == 0) { // No need to change password if (ClientData.serviceOpt_force_pw_change_on_login() == 0) { // No need to change password
// Skip this case // Skip this case
...@@ -141,6 +147,7 @@ function avwCmsApi_requirePasswordChange_success(data) { ...@@ -141,6 +147,7 @@ function avwCmsApi_requirePasswordChange_success(data) {
} }
} }
else { else {
//alert('pwdSkipDt=null'); //alert('pwdSkipDt=null');
OpenChangePassword(); OpenChangePassword();
...@@ -151,6 +158,7 @@ function avwCmsApi_requirePasswordChange_success(data) { ...@@ -151,6 +158,7 @@ function avwCmsApi_requirePasswordChange_success(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);
OpenChangePassword(); OpenChangePassword();
$("#dspSkip").hide(); $("#dspSkip").hide();
...@@ -189,6 +197,7 @@ function avwCmsApi_requirePasswordChange_success(data) { ...@@ -189,6 +197,7 @@ function avwCmsApi_requirePasswordChange_success(data) {
} }
else { else {
//alert('pwdSkipDt=null'); //alert('pwdSkipDt=null');
OpenChangePassword(); OpenChangePassword();
$("#dspSkip").show(); $("#dspSkip").show();
...@@ -198,6 +207,7 @@ function avwCmsApi_requirePasswordChange_success(data) { ...@@ -198,6 +207,7 @@ function avwCmsApi_requirePasswordChange_success(data) {
} }
else if (ClientData.serviceOpt_force_pw_change_periodically() == 2) { // Force to change password else if (ClientData.serviceOpt_force_pw_change_periodically() == 2) { // Force to change password
ClientData.requirePasswordChange(1);
OpenChangePassword(); OpenChangePassword();
$("#dspSkip").hide(); $("#dspSkip").hide();
...@@ -311,7 +321,7 @@ function avwCmsApi_getBackupFile_success(data) { ...@@ -311,7 +321,7 @@ function avwCmsApi_getBackupFile_success(data) {
ClientData.isChangedBookmark(false); ClientData.isChangedBookmark(false);
ClientData.isChangedMarkingData(false); ClientData.isChangedMarkingData(false);
ClientData.isChangedMemo(false); ClientData.isChangedMemo(false);
$("#dspOptBk").hide();
// Show message: msgRestoreSuccess // Show message: msgRestoreSuccess
$().toastmessage({ position: 'middle-center' }); $().toastmessage({ position: 'middle-center' });
$().toastmessage('showToast', { $().toastmessage('showToast', {
...@@ -587,6 +597,7 @@ function avwCmsApi_passwordChange_success(data) { ...@@ -587,6 +597,7 @@ function avwCmsApi_passwordChange_success(data) {
msgError.show(); msgError.show();
} }
else { else {
ClientData.requirePasswordChange(0);
msgError.html(''); msgError.html('');
closeChangePassword(); closeChangePassword();
/* show messages */ /* show messages */
......
index.html
...@@ -2,95 +2,12 @@ ...@@ -2,95 +2,12 @@
<html> <html>
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>Utilities</title> <title>Abook</title>
<script src="abvw/common/js/jquery-1.8.1.min.js" type="text/javascript"></script>
<script>
/*
Convert yyyy-MM-dd hh:mm:ss.f to Date
*/
function convertToDate(input) {
var dateResult;
var nYear = 0;
var nMonth = 0;
var nDay = 0;
var nHour = 0;
var nMinute = 0;
var nSecond = 0;
var strTemp = input;
var nIndex;
// Get year
nIndex = strTemp.indexOf("-");
nYear = Number(strTemp.substr(0, nIndex));
// Get month
strTemp = strTemp.substr(nIndex + 1);
nIndex = strTemp.indexOf("-");
nMonth = Number(strTemp.substr(0, nIndex));
// Get day
strTemp = strTemp.substr(nIndex + 1);
nIndex = strTemp.indexOf(" ");
nDay = Number(strTemp.substr(0, nIndex));
// Get hour
strTemp = strTemp.substr(nIndex + 1);
nIndex = strTemp.indexOf(":");
nHour = Number(strTemp.substr(0, nIndex));
// Get minute
strTemp = strTemp.substr(nIndex + 1);
nIndex = strTemp.indexOf(":");
nMinute = Number(strTemp.substr(0, nIndex));
// Get second
strTemp = strTemp.substr(nIndex + 1);
nIndex = strTemp.indexOf(".");
nSecond = Number(strTemp.substr(0, nIndex));
dateResult = new Date();
dateResult.setYear(nYear);
dateResult.setMonth(nMonth);
dateResult.setDate(nDay);
dateResult.setHours(nHour);
dateResult.setMinutes(nMinute);
dateResult.setSeconds(nSecond);
return dateResult;
}
$(document).ready(function () {
//alert(convertToDate("2012-11-13 12:01:07.1"));
// var s1 = "S01-03コンテンツ閲覧";
// var kana1 = "S01-03コンテンツエツラン";
// var s2 = "無地ページ編集あり";
// var kana2 = "ムジページヘンシュウアリ";
// var s3 = "無地ページ編集なし";
// var kana3 = "ムジページヘンシュウナシ";
// if (s1 < s2) {
// alert('s1 < s2');
// }
// if (s2 < s3) {
// alert('s2 < s3');
// }
// if (kana1 < kana2) {
// alert('kana1 < kana2');
// }
// if (kana2 < kana3) {
// alert('kana2 < kana3');
// }
// if ("Content_CXSS" < "S01-03コンテンツ 閲覧_縦Over") {
// alert('ok');
// }
});
</script>
</head> </head>
<body> <body>
<div style="text-align: center"> <div style="text-align: center">
<a href="login.html">ログイン - login</a><br /> <a href="login.html">ログイン - login</a><br />
<a href="WebStorageUtil.html">Webストレージ管理 - WebStorage Utility</a><br />
</div> </div>
<img src="data:image/png;base64,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" />
</body> </body>
</html> </html>
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