Skip to content

C
check
Commit 16256f34 by Masaru Abe
Options

1.2.3ソース　手動マージ

parent 5eeca1bb
Showing with 1890 additions and 357 deletions
abvw/common/js/avweb.js
...@@ -480,7 +480,13 @@ AVWEB._callCmsApi = function(url, accountPath, apiName, type, params, async, suc ...@@ -480,7 +480,13 @@ AVWEB._callCmsApi = function(url, accountPath, apiName, type, params, async, suc
if(error) { if(error) {
error(xmlHttpRequest, txtStatus, errorThrown); error(xmlHttpRequest, txtStatus, errorThrown);
} else { } else {
AVWEB.showSystemError(); if(xmlHttpRequest.status == 403) {
AVWEB.showSystemError('sysErrorCallApi02');
}
else {
AVWEB.showSystemError();
}
} }
} }
}); });
...@@ -644,6 +650,12 @@ AVWEB.avwGrabContentPageImage = function(accountPath, params, success, error) { ...@@ -644,6 +650,12 @@ AVWEB.avwGrabContentPageImage = function(accountPath, params, success, error) {
*/ */
src = 'data:image/png;base64,' + xmlHttp.responseText; src = 'data:image/png;base64,' + xmlHttp.responseText;
//フィアルシステムが有効であればキャッシュ
if( CONTENTVIEW_FILESYSTEM.fs != null ){
var fileName = "page_" + params.pageNo + ".dat";
CONTENTVIEW_FILESYSTEM.savePageFile(params.contentId, fileName, src);
}
if (success) { if (success) {
success(src); success(src);
} }
...@@ -651,7 +663,7 @@ AVWEB.avwGrabContentPageImage = function(accountPath, params, success, error) { ...@@ -651,7 +663,7 @@ AVWEB.avwGrabContentPageImage = function(accountPath, params, success, error) {
if (error) { if (error) {
error(xmlHttp, xmlHttp.status, xmlHttp.statusText); error(xmlHttp, xmlHttp.status, xmlHttp.statusText);
} else { } else {
console.log(xmlHttp.status + ' ' + xmlHttp.statusText); AVWEB.avwLog(xmlHttp.status + ' ' + xmlHttp.statusText);
} }
} }
} }
...@@ -751,7 +763,7 @@ AVWEB.avwUploadBackupFile = function(accountPath, params, async, success, error) ...@@ -751,7 +763,7 @@ AVWEB.avwUploadBackupFile = function(accountPath, params, async, success, error)
}); });
}; };
/* show system error message */ /* show system error message */
AVWEB.showSystemError = function() { AVWEB.showSystemError = function(textId) {
if(AVWEB.avwHasError()) { if(AVWEB.avwHasError()) {
// すでにエラー状態であればエラーを表示しない // すでにエラー状態であればエラーを表示しない
...@@ -761,8 +773,12 @@ AVWEB.showSystemError = function() { ...@@ -761,8 +773,12 @@ AVWEB.showSystemError = function() {
AVWEB.avwSetErrorState(); AVWEB.avwSetErrorState();
} }
if( !textId ){
textId = 'sysErrorCallApi01';
}
// create DOM element for showing error message // create DOM element for showing error message
var errMes = I18N.i18nText('sysErrorCallApi01'); var errMes = I18N.i18nText(textId);
var tags = '<div id="avw-sys-error"></div>'; var tags = '<div id="avw-sys-error"></div>';
//$('body').prepend(tags); //$('body').prepend(tags);
$('body').append(tags); $('body').append(tags);
...@@ -836,20 +852,32 @@ AVWEB.avwClearError = function() { ...@@ -836,20 +852,32 @@ AVWEB.avwClearError = function() {
/* ブラウザunload時に警告メッセージの出力設定を行う関数 */ /* ブラウザunload時に警告メッセージの出力設定を行う関数 */
AVWEB.avwSetLogoutNortice = function() { AVWEB.avwSetLogoutNortice = function() {
window.onbeforeunload = function(event) { window.onbeforeunload = function(event) {
if(ClientData.isGetitsMode() || ClientData.isStreamingMode()){
if(ClientData.isGetitsMode()){ //DHカスタム
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); if( ClientData.serviceOpt_daihatsu() == 'Y'){
COMMON.RegisterLog(); if( "CONTENTVIEW_GENERAL.contentID" in window ){
if(CONTENTVIEW_GENERAL.contentID != null ){
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog();
}
} }
} else { } else {
// メッセージ表示
// FFでは、https://bugzilla.mozilla.org/show_bug.cgi?id=588292 によりメッセージが出力されない if(ClientData.isGetitsMode() || ClientData.isStreamingMode()){
var message = I18N.i18nText('sysInfoWithoutLogout'); if(ClientData.isGetitsMode()){
var e = event || window.event; COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
if(e) { COMMON.RegisterLog();
e.returnValue = message; }
} } else {
return message; // メッセージ表示
// FFでは、https://bugzilla.mozilla.org/show_bug.cgi?id=588292 によりメッセージが出力されない
var message = I18N.i18nText('sysInfoWithoutLogout');
var e = event || window.event;
if(e) {
e.returnValue = message;
}
return message;
}
} }
}; };
}; };
......
abvw/common/js/common.js
...@@ -3112,5 +3112,3 @@ COMMON.getUrlParam = function(name, url){ ...@@ -3112,5 +3112,3 @@ COMMON.getUrlParam = function(name, url){
} }
}; };
abvw/common/js/screenLock.js
...@@ -168,6 +168,26 @@ SCREENLOCK.screenLock = function(options) { ...@@ -168,6 +168,26 @@ SCREENLOCK.screenLock = function(options) {
/* show lock screen */ /* show lock screen */
function showLockScreen() { function showLockScreen() {
//DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){
if( "CONTENTVIEW_GENERAL.contentID" in window ){
if( CONTENTVIEW_GENERAL.contentID != null ){
COMMON.SetEndLog(contentID);
COMMON.RegisterLog();
}
}
//ログアウトさせる
//ログアウト時と同じ後始末処理をしてログイン画面に戻す
if( !HEADER.webLogoutEvent() ){
//ログアウト出来なかった
SessionStorageUtils.clear();
AVWEB.avwUserSetting().remove(Keys.userInfo_sid);
AVWEB.avwScreenMove(ScreenIds.Login);
}
}
// show message overlay // show message overlay
var tags = '<div id="' + elmId + '" class="screenLock">' + var tags = '<div id="' + elmId + '" class="screenLock">' +
'<div style="display:table; width:100%; height:100%;">' + '<div style="display:table; width:100%; height:100%;">' +
......
abvw/contentsearch.html
...@@ -33,10 +33,6 @@ ...@@ -33,10 +33,6 @@
<link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/share.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/share.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" />
<!--
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.date.css?__UPDATEID__" id="theme_date" />
-->
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" /> <link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" /> <link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" />
......
abvw/contentview.html
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
<script type="text/javascript" src="./js/contentview_3d.js?__UPDATEID__"></script> <script type="text/javascript" src="./js/contentview_3d.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_ContentTypeNone.js?__UPDATEID__"></script> <script type="text/javascript" src="./js/contentview_ContentTypeNone.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_ImagePreview.js?__UPDATEID__"></script> <script type="text/javascript" src="./js/contentview_ImagePreview.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/contentview_FileSystem.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/zoomDetector.js?__UPDATEID__" ></script> <script type="text/javascript" src="./common/js/zoomDetector.js?__UPDATEID__" ></script>
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
...@@ -77,8 +78,7 @@ ...@@ -77,8 +78,7 @@
</script> </script>
</head> </head>
<!-- oncontextmenu="return false;" --> <body id="viewer" oncontextmenu="return false;">
<body id="viewer" >
<div id="wrapper"> <div id="wrapper">
<!--Viewer component is added here --> <!--Viewer component is added here -->
......
abvw/history.html
...@@ -36,10 +36,6 @@ ...@@ -36,10 +36,6 @@
<link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/share.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/share.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" />
<!--
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.date.css?__UPDATEID__" id="theme_date" />
-->
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" /> <link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" /> <link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" />
</head> </head>
......
abvw/home.html
...@@ -39,10 +39,6 @@ ...@@ -39,10 +39,6 @@
<link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/share.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/layout/share.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" /> <link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" />
<!--
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/default.date.css?__UPDATEID__" id="theme_date" />
-->
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" /> <link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" /> <link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" />
</head> </head>
......
abvw/js/contentview.js
...@@ -300,7 +300,18 @@ CONTENTVIEW.handleAPIWebContentPage = function(dataJson, pos) { ...@@ -300,7 +300,18 @@ CONTENTVIEW.handleAPIWebContentPage = function(dataJson, pos) {
$('#bookmarkBoxHdBM').children().remove(); $('#bookmarkBoxHdBM').children().remove();
$('#bookmarkBoxHdBM').html('<a id="bookmarkClosing" class="delete" > </a>'); $('#bookmarkBoxHdBM').html('<a id="bookmarkClosing" class="delete" > </a>');
$("#bookmarkClosing").click(CONTENTVIEW_EVENTS.closeBookmarkBox); //$("#bookmarkClosing").click(CONTENTVIEW_EVENTS.closeBookmarkBox);
$("#bookmarkClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closeBookmarkBox(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#bookmarkBoxHdBM').append(I18N.i18nText('txtShioriCtnLs')); $('#bookmarkBoxHdBM').append(I18N.i18nText('txtShioriCtnLs'));
$('#boxBookMark').css('z-index', '101'); $('#boxBookMark').css('z-index', '101');
...@@ -625,7 +636,18 @@ CONTENTVIEW.handleCopyTextData = function(data, pos) { ...@@ -625,7 +636,18 @@ CONTENTVIEW.handleCopyTextData = function(data, pos) {
//title start //title start
$('#bookmarkBoxHdCT').children().remove(); $('#bookmarkBoxHdCT').children().remove();
$('#bookmarkBoxHdCT').html('<a id="copyTextClosing" class="delete" style="padding-top:0px;"> </a>'); $('#bookmarkBoxHdCT').html('<a id="copyTextClosing" class="delete" style="padding-top:0px;"> </a>');
$("#copyTextClosing").click(CONTENTVIEW_EVENTS.closeCopyTextBox); //$("#copyTextClosing").click(CONTENTVIEW_EVENTS.closeCopyTextBox);
$("#copyTextClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closeCopyTextBox(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#bookmarkBoxHdCT').append(I18N.i18nText('txtTextCopy')); $('#bookmarkBoxHdCT').append(I18N.i18nText('txtTextCopy'));
//title end //title end
...@@ -650,7 +672,18 @@ CONTENTVIEW.handleCopyTextData = function(data, pos) { ...@@ -650,7 +672,18 @@ CONTENTVIEW.handleCopyTextData = function(data, pos) {
//title start //title start
$('#bookmarkBoxHdCT').children().remove(); $('#bookmarkBoxHdCT').children().remove();
$('#bookmarkBoxHdCT').html('<a id="copyTextClosing" class="delete" style="padding-top:0px;"> </a>'); $('#bookmarkBoxHdCT').html('<a id="copyTextClosing" class="delete" style="padding-top:0px;"> </a>');
$("#copyTextClosing").click(CONTENTVIEW_EVENTS.closeCopyTextBox); //$("#copyTextClosing").click(CONTENTVIEW_EVENTS.closeCopyTextBox);
$("#copyTextClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closeCopyTextBox(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#bookmarkBoxHdCT').append(I18N.i18nText('txtTextCopy')); $('#bookmarkBoxHdCT').append(I18N.i18nText('txtTextCopy'));
//title end //title end
...@@ -961,27 +994,75 @@ CONTENTVIEW.changePage = function(page_index) { ...@@ -961,27 +994,75 @@ CONTENTVIEW.changePage = function(page_index) {
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
//console.log("CONTENTVIEW.changePage"); //ファイルシステムが有効であればキャッシュ確認
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), if( CONTENTVIEW_FILESYSTEM.fs == null ){
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: page_index + 1 },
function (data) { //console.log("CONTENTVIEW.changePage");
CONTENTVIEW_GENERAL.pageImages = data; AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: page_index + 1 },
/* get page Objects */ function (data) {
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, page_index); CONTENTVIEW_GENERAL.pageImages = data;
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages) /* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, page_index);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages)
.setPageObjects(CONTENTVIEW_GENERAL.pageObjects); .setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
//$('#divImageLoading').css('display', 'none');
var tran = new CONTENTVIEW_CREATEOBJECT.Transition();
//$('#divImageLoading').css('display', 'none'); tran.flipToPage(page_index);
},
var tran = new CONTENTVIEW_CREATEOBJECT.Transition(); function (xmlHttpRequest, txtStatus, errorThrown) {
tran.flipToPage(page_index); CONTENTVIEW.showErrorScreen();
}
}, );
function (xmlHttpRequest, txtStatus, errorThrown) { } else {
CONTENTVIEW.showErrorScreen();
}); // ファイル取得
var pageNoTmp = page_index + 1;
var fileName = CONTENTVIEW_GENERAL.contentID + "/page_" + pageNoTmp + ".dat";
CONTENTVIEW_FILESYSTEM.fs.root.getFile('/abook/' + fileName, { create: false },
function(fileEntry){
fileEntry.file(
function(file){
var reader = new FileReader();
reader.onloadend = function(e) {
//AVWEB.avwLog("read FileSystem");
CONTENTVIEW_GENERAL.pageImages = e.target.result;
/* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, page_index);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages)
.setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
var tran = new CONTENTVIEW_CREATEOBJECT.Transition();
tran.flipToPage(page_index);
};
reader.readAsText(file);
}
);
},
function(err){ // 失敗時のコールバック関数
//AVWEB.avwLog("NotRead FileSystem");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: page_index + 1 },
function (data) {
CONTENTVIEW_GENERAL.pageImages = data;
/* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, page_index);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages)
.setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
//$('#divImageLoading').css('display', 'none');
var tran = new CONTENTVIEW_CREATEOBJECT.Transition();
tran.flipToPage(page_index);
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
}
);
}
);
}
} }
//START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process //START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
...@@ -1878,63 +1959,159 @@ CONTENTVIEW.changePageWithoutSlide = function(pageMove) { ...@@ -1878,63 +1959,159 @@ CONTENTVIEW.changePageWithoutSlide = function(pageMove) {
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
//console.log("CONTENTVIEW.changePageWithoutSlide"); //ファイルシステムが有効であればキャッシュ確認
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), if( CONTENTVIEW_FILESYSTEM.fs == null ){
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageMove + 1 },
function (data) { //console.log("CONTENTVIEW.changePageWithoutSlide");
CONTENTVIEW_GENERAL.pageImages = data; AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageMove + 1 },
/* get page Objects */ function (data) {
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove); CONTENTVIEW_GENERAL.pageImages = data;
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects); /* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove);
$('#divImageLoading').css('display', 'none'); CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
$('#divImageLoading').css('display', 'none');
CONTENTVIEW_GENERAL.isFirstLoad = true; CONTENTVIEW_GENERAL.isFirstLoad = true;
// CONTENTVIEW.screenFit(); CONTENTVIEW_GETDATA.getContent().toPage(pageMove);
CONTENTVIEW_CREATEOBJECT.createPageBGM();
CONTENTVIEW_GETDATA.getContent().toPage(pageMove);
//START : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM //Start FUnciton: No.4 - Editor : Long - Date : 08/12/2013 - Summary : Handle jump from bookmark page
CONTENTVIEW_CREATEOBJECT.createPageBGM(); if(pageMove > 0){
//END : TRB00028 - Editor: Long - Date: 09/10/2013 - Summary : Fix For Page BGM CONTENTVIEW_GENERAL.prevContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex();
CONTENTVIEW_GETDATA.getPrevPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove - 1);
CONTENTVIEW_GETDATA.renderPrevPage();
}
if(pageMove < CONTENTVIEW_GENERAL.totalPage - 1){
CONTENTVIEW_GENERAL.nextContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex();
CONTENTVIEW_GETDATA.getNextPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove + 1);
CONTENTVIEW_GETDATA.renderNextPage();
}
//Start FUnciton: No.4 - Editor : Long - Date : 08/12/2013 - Summary : Handle jump from bookmark page /* handle slider bar */
if(pageMove > 0){ CONTENTVIEW.handleSliderBar();
//START TRB00056 - Editor: Long - Date: 09/19/2013 - Summary :
CONTENTVIEW_GENERAL.prevContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex(); if (CONTENTVIEW_GENERAL.dataPageTitle[pageMove]) {
//END TRB00056 - Editor: Long - Date: 09/19/2013 - Summary : if (CONTENTVIEW_GENERAL.dataPageTitle[pageMove] != '') {
CONTENTVIEW_GETDATA.getPrevPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove - 1); document.title = CONTENTVIEW_GENERAL.contentName + '_' + CONTENTVIEW_GENERAL.dataPageTitle[pageMove] + ' | ' + I18N.i18nText('sysAppTitle');
CONTENTVIEW_GETDATA.renderPrevPage(); } else {
} document.title = CONTENTVIEW_GENERAL.contentName + ' | ' + I18N.i18nText('sysAppTitle');
}
} else {
document.title = CONTENTVIEW_GENERAL.contentName + ' | ' + I18N.i18nText('sysAppTitle');
}
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
}
);
} else {
// ファイル取得
var pageNoTmp = pageMove + 1;
var fileName = CONTENTVIEW_GENERAL.contentID + "/page_" + pageNoTmp + ".dat";
CONTENTVIEW_FILESYSTEM.fs.root.getFile('/abook/' + fileName, { create: false },
function(fileEntry){
fileEntry.file(
function(file){
var reader = new FileReader();
reader.onloadend = function(e) {
//AVWEB.avwLog("read FileSystem");
CONTENTVIEW_GENERAL.pageImages = e.target.result;
/* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
$('#divImageLoading').css('display', 'none');
CONTENTVIEW_GENERAL.isFirstLoad = true;
CONTENTVIEW_GETDATA.getContent().toPage(pageMove);
CONTENTVIEW_CREATEOBJECT.createPageBGM();
//Start FUnciton: No.4 - Editor : Long - Date : 08/12/2013 - Summary : Handle jump from bookmark page
if(pageMove > 0){
CONTENTVIEW_GENERAL.prevContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex();
CONTENTVIEW_GETDATA.getPrevPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove - 1);
CONTENTVIEW_GETDATA.renderPrevPage();
}
if(pageMove < CONTENTVIEW_GENERAL.totalPage - 1){
CONTENTVIEW_GENERAL.nextContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex();
CONTENTVIEW_GETDATA.getNextPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove + 1);
CONTENTVIEW_GETDATA.renderNextPage();
}
if(pageMove < CONTENTVIEW_GENERAL.totalPage - 1){ /* handle slider bar */
//START TRB00056 CONTENTVIEW.handleSliderBar();
CONTENTVIEW_GENERAL.nextContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex();
//END TRB00056 if (CONTENTVIEW_GENERAL.dataPageTitle[pageMove]) {
CONTENTVIEW_GETDATA.getNextPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove + 1); if (CONTENTVIEW_GENERAL.dataPageTitle[pageMove] != '') {
CONTENTVIEW_GETDATA.renderNextPage(); document.title = CONTENTVIEW_GENERAL.contentName + '_' + CONTENTVIEW_GENERAL.dataPageTitle[pageMove] + ' | ' + I18N.i18nText('sysAppTitle');
} } else {
document.title = CONTENTVIEW_GENERAL.contentName + ' | ' + I18N.i18nText('sysAppTitle');
}
} else {
document.title = CONTENTVIEW_GENERAL.contentName + ' | ' + I18N.i18nText('sysAppTitle');
}
};
reader.readAsText(file);
}
);
},
function(err){ // 失敗時のコールバック関数
//AVWEB.avwLog("NotRead FileSystem");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageMove + 1 },
function (data) {
CONTENTVIEW_GENERAL.pageImages = data;
/* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
$('#divImageLoading').css('display', 'none');
CONTENTVIEW_GENERAL.isFirstLoad = true;
CONTENTVIEW_GETDATA.getContent().toPage(pageMove);
CONTENTVIEW_CREATEOBJECT.createPageBGM();
//End Function : No.4 - Editor : Long - Date: 08/12/2013 - Summary : Handle jump form bookmark page //Start FUnciton: No.4 - Editor : Long - Date : 08/12/2013 - Summary : Handle jump from bookmark page
if(pageMove > 0){
CONTENTVIEW_GENERAL.prevContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex();
CONTENTVIEW_GETDATA.getPrevPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove - 1);
CONTENTVIEW_GETDATA.renderPrevPage();
}
/* handle slider bar */ if(pageMove < CONTENTVIEW_GENERAL.totalPage - 1){
CONTENTVIEW.handleSliderBar(); CONTENTVIEW_GENERAL.nextContent.pageIndex = CONTENTVIEW_GETDATA.getPageIndex();
CONTENTVIEW_GETDATA.getNextPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, pageMove + 1);
if (CONTENTVIEW_GENERAL.dataPageTitle[pageMove]) { CONTENTVIEW_GETDATA.renderNextPage();
if (CONTENTVIEW_GENERAL.dataPageTitle[pageMove] != '') { }
document.title = CONTENTVIEW_GENERAL.contentName + '_' + CONTENTVIEW_GENERAL.dataPageTitle[pageMove] + ' | ' + I18N.i18nText('sysAppTitle');
} else { /* handle slider bar */
document.title = CONTENTVIEW_GENERAL.contentName + ' | ' + I18N.i18nText('sysAppTitle'); CONTENTVIEW.handleSliderBar();
}
} else { if (CONTENTVIEW_GENERAL.dataPageTitle[pageMove]) {
document.title = CONTENTVIEW_GENERAL.contentName + ' | ' + I18N.i18nText('sysAppTitle'); if (CONTENTVIEW_GENERAL.dataPageTitle[pageMove] != '') {
} document.title = CONTENTVIEW_GENERAL.contentName + '_' + CONTENTVIEW_GENERAL.dataPageTitle[pageMove] + ' | ' + I18N.i18nText('sysAppTitle');
} else {
}, document.title = CONTENTVIEW_GENERAL.contentName + ' | ' + I18N.i18nText('sysAppTitle');
function (xmlHttpRequest, txtStatus, errorThrown) { }
CONTENTVIEW.showErrorScreen(); } else {
}); document.title = CONTENTVIEW_GENERAL.contentName + ' | ' + I18N.i18nText('sysAppTitle');
}
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
}
);
}
);
}
} }
//START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process //START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
...@@ -2037,10 +2214,12 @@ CONTENTVIEW.displayOverlayForHtmlAndMediaType = function(){ ...@@ -2037,10 +2214,12 @@ CONTENTVIEW.displayOverlayForHtmlAndMediaType = function(){
//END TRB00075 - Editor: Long - Date - 24/09/2013 - Summary : Fix for prevent moving page when display dialog //END TRB00075 - Editor: Long - Date - 24/09/2013 - Summary : Fix for prevent moving page when display dialog
//Display overlay dialog for specify content type //Display overlay dialog for specify content type
CONTENTVIEW.displayOverlayForSpecifyContentType = function(){ CONTENTVIEW.displayOverlayForSpecifyContentType = function( resourceUrl ){
var contentId = ClientData.contentInfo_contentId(); var contentId = ClientData.contentInfo_contentId();
var resourceUrl = CONTENTVIEW.downloadResourceById(contentId); if( resourceUrl == null ){
resourceUrl = CONTENTVIEW.downloadResourceById(contentId);
}
//CONTENTVIEW_GENERAL.contentType = COMMON.ContentTypeKeys.Type_Html; //CONTENTVIEW_GENERAL.contentType = COMMON.ContentTypeKeys.Type_Html;
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Music){
......
abvw/js/contentview_CallApi.js
...@@ -11,24 +11,73 @@ CONTENTVIEW_CALLAPI.abapi = function(name, param, method, callback) { ...@@ -11,24 +11,73 @@ CONTENTVIEW_CALLAPI.abapi = function(name, param, method, callback) {
/* get Json stored content info */ /* get Json stored content info */
CONTENTVIEW_CALLAPI.getJsonContentInfo = function() { CONTENTVIEW_CALLAPI.getJsonContentInfo = function() {
//console.log("CONTENTVIEW_CALLAPI.getJsonContentInfo"); //ファイルシステムが有効であればキャッシュ確認
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), if( CONTENTVIEW_FILESYSTEM.fs == null ){
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 }, //console.log("CONTENTVIEW_CALLAPI.getJsonContentInfo");
function (data) { AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
CONTENTVIEW_GENERAL.pageImages = data; { contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
CONTENTVIEW_CALLAPI.webGetContentData(); function (data) {
CONTENTVIEW_CALLAPI.getSearchDataFromJson(); CONTENTVIEW_GENERAL.pageImages = data;
CONTENTVIEW_CALLAPI.getJsonDataPageTitle(); CONTENTVIEW_CALLAPI.webGetContentData();
CONTENTVIEW_CALLAPI.getJsonDataType4(); CONTENTVIEW_CALLAPI.getSearchDataFromJson();
CONTENTVIEW_CALLAPI.getJsonDataType5(); CONTENTVIEW_CALLAPI.getJsonDataPageTitle();
CONTENTVIEW_CALLAPI.getDataJsonFile(); CONTENTVIEW_CALLAPI.getJsonDataType4();
//CONTENTVIEW_CALLAPI.webGetPageImageContentSize(); CONTENTVIEW_CALLAPI.getJsonDataType5();
CONTENTVIEW_CALLAPI.webGetContentPageSize(); CONTENTVIEW_CALLAPI.getDataJsonFile();
//CONTENTVIEW_CALLAPI.webGetPageImageContentSize();
}, CONTENTVIEW_CALLAPI.webGetContentPageSize();
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen(); },
}); function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
}
);
} else {
// 1ページ目のファイル取得
var fileName = contentID + "/page_1.dat";
CONTENTVIEW_FILESYSTEM.fs.root.getFile('/abook/' + fileName, { create: false },
function(fileEntry){
fileEntry.file(function(file){
var reader = new FileReader();
reader.onloadend = function(e) {
AVWEB.avwLog("read FileSystem");
CONTENTVIEW_GENERAL.pageImages = e.target.result;
CONTENTVIEW_CALLAPI.webGetContentData();
CONTENTVIEW_CALLAPI.getSearchDataFromJson();
CONTENTVIEW_CALLAPI.getJsonDataPageTitle();
CONTENTVIEW_CALLAPI.getJsonDataType4();
CONTENTVIEW_CALLAPI.getJsonDataType5();
CONTENTVIEW_CALLAPI.getDataJsonFile();
CONTENTVIEW_CALLAPI.webGetContentPageSize();
};
//reader.readAsBinaryString(fileEntry);
reader.readAsText(file);
//reader.readAsArrayBuffer(fileEntry);
});
},
function(err){
// 失敗時のコールバック関数
AVWEB.avwLog("NotRead FileSystem");
avwGrabContentPageImage(
ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
function (data) {
CONTENTVIEW_GENERAL.pageImages = data;
CONTENTVIEW_CALLAPI.webGetContentData();
CONTENTVIEW_CALLAPI.getSearchDataFromJson();
CONTENTVIEW_CALLAPI.getJsonDataPageTitle();
CONTENTVIEW_CALLAPI.getJsonDataType4();
CONTENTVIEW_CALLAPI.getJsonDataType5();
CONTENTVIEW_CALLAPI.getDataJsonFile();
CONTENTVIEW_CALLAPI.webGetContentPageSize();
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
}
);
}
);
}
}; };
//END TRB00097 - Editor: Long - Date: 09/30/2013 - Summary : Get All Page size of content //END TRB00097 - Editor: Long - Date: 09/30/2013 - Summary : Get All Page size of content
......
abvw/js/contentview_CreateObjects.js
...@@ -796,7 +796,8 @@ CONTENTVIEW_CREATEOBJECT.trigger = function (mediaType, actionType, id, imageUrl ...@@ -796,7 +796,8 @@ CONTENTVIEW_CREATEOBJECT.trigger = function (mediaType, actionType, id, imageUrl
objectLog.resourceId = CONTENTVIEW.objType4_5[nIndex].dataObjects[nIndex1].resourceId; objectLog.resourceId = CONTENTVIEW.objType4_5[nIndex].dataObjects[nIndex1].resourceId;
} else { /* video */ } else { /* video */
CONTENTVIEW.stopAllAudio(); CONTENTVIEW.stopAllAudio();
CONTENTVIEW.showVideoObject(CONTENTVIEW.objType4_5[nIndex].x, CONTENTVIEW.objType4_5[nIndex].y, CONTENTVIEW.objType4_5[nIndex].width, CONTENTVIEW.objType4_5[nIndex].height, CONTENTVIEW.objType4_5[nIndex].dataObjects[nIndex1].fileName, false); CONTENTVIEW_FILESYSTEM.showVideoObjectCache(objType4_5[nIndex].x, objType4_5[nIndex].y, objType4_5[nIndex].width, objType4_5[nIndex].height, objType4_5[nIndex].dataObjects[nIndex1].fileName, false, contentID, objType4_5[nIndex].dataObjects[nIndex1].resourceId);
//CONTENTVIEW.showVideoObject(CONTENTVIEW.objType4_5[nIndex].x, CONTENTVIEW.objType4_5[nIndex].y, CONTENTVIEW.objType4_5[nIndex].width, CONTENTVIEW.objType4_5[nIndex].height, CONTENTVIEW.objType4_5[nIndex].dataObjects[nIndex1].fileName, false);
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
...@@ -902,6 +903,7 @@ CONTENTVIEW_CREATEOBJECT.showHtml = function(url, objectId ){ ...@@ -902,6 +903,7 @@ CONTENTVIEW_CREATEOBJECT.showHtml = function(url, objectId ){
} }
//END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad //END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
/*
$('#dialog h1 img').click(function(){ $('#dialog h1 img').click(function(){
var dateEnd = new Date(); var dateEnd = new Date();
...@@ -913,6 +915,22 @@ CONTENTVIEW_CREATEOBJECT.showHtml = function(url, objectId ){ ...@@ -913,6 +915,22 @@ CONTENTVIEW_CREATEOBJECT.showHtml = function(url, objectId ){
CONTENTVIEW_GENERAL.hideDialog(); CONTENTVIEW_GENERAL.hideDialog();
}); });
*/
$("#dialog h1 img").on({
'click touchend': function(ev){
var dateEnd = new Date();
var actionTime = dateEnd.subtractBySeconds(dateStart);
//alert("actionTime:" + actionTime);
COMMON.SetObjectLogActionTime( CONTENTVIEW_GENERAL.contentID, objectId, actionTime );
$container.removeAttr('style');
CONTENTVIEW_GENERAL.hideDialog();
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
var dateStart = new Date(); var dateStart = new Date();
...@@ -1435,7 +1453,9 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image ...@@ -1435,7 +1453,9 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image
/*stop audio on page */ /*stop audio on page */
CONTENTVIEW.stopAllAudio(); CONTENTVIEW.stopAllAudio();
if (embed == "1") { if (embed == "1") {
CONTENTVIEW.showVideoObject(x, y, w, h, mediaFile, false);
CONTENTVIEW_FILESYSTEM.showVideoObjectCache(x, y, w, h, mediaFile, false, contentID, media );
//CONTENTVIEW.showVideoObject(x, y, w, h, mediaFile, false);
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
...@@ -1452,86 +1472,163 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image ...@@ -1452,86 +1472,163 @@ CONTENTVIEW_CREATEOBJECT.videoType2 = function (mediaType, actionType, id, image
if (media != '') { if (media != '') {
$('#playvideo').children().remove(); $('#playvideo').children().remove();
CONTENTVIEW_CREATEOBJECT.createVideoFulScreen(mediaFile, id); //ファイルシステムが有効であればキャッシュ確認
if( CONTENTVIEW_FILESYSTEM.fs == null ){
$("#btnCloseVideo").click(function (e) {
//時間記録 //タグは書き出し
CONTENTVIEW_CREATEOBJECT.createVideoFulScreen(mediaFile, id);
CONTENTVIEW_GENERAL.hideDialog(); $("#btnCloseVideo").on({
/*play audio if exist */ 'click touchend': function(ev){
CONTENTVIEW.playAllAudio(); //時間記録
CONTENTVIEW_GENERAL.hideDialog();
}); /*play audio if exist */
CONTENTVIEW.playAllAudio();
//$("#main").unbind('click'); return false;
},
//document.getElementById('main').removeEventListener('touchstart',function(){},false); 'touchstart touchmove': function(){
//document.getElementById('main').removeEventListener('touchmove',function(){},false); //これを入れないと次にダイアログを開くと表示位置が大きくズレる
//document.getElementById('main').removeEventListener('touchend',function(){},false); return false;
//$("#main").unbind('touchstart'); }
//$("#main").unbind('touchmove'); });
//$("#main").unbind('touchend');
CONTENTVIEW_GENERAL.canvas_draw.removeEventListener('touchstart', function(){},false);
CONTENTVIEW_GENERAL.canvas_draw.removeEventListener('touchmove', function(){},false);
CONTENTVIEW_GENERAL.canvas_draw.removeEventListener('touchend', function(){},false);
CONTENTVIEW_GENERAL.canvas_draw.addEventListener('touchstart', function(){return false;}, false);
CONTENTVIEW_GENERAL.canvas_draw.addEventListener('touchmove', function(){return false;}, false);
CONTENTVIEW_GENERAL.canvas_draw.addEventListener('touchend', function(){return false;}, false);
$("#canvasWrapper").unbind('click');
$("#canvasWrapper").unbind('touchstart');
$("#canvasWrapper").unbind('touchmove');
$("#canvasWrapper").unbind('touchend');
document.getElementById('main').addEventListener('click', function(){return false;}, false); //必要か　ここから
document.getElementById('main').addEventListener('touchstart', function(){return false;}, false); CONTENTVIEW_GENERAL.canvas_draw.removeEventListener('touchstart', function(){},false);
document.getElementById('main').addEventListener('touchmove', function(){return false;}, false); CONTENTVIEW_GENERAL.canvas_draw.removeEventListener('touchmove', function(){},false);
document.getElementById('main').addEventListener('touchend', function(){return false;}, false); CONTENTVIEW_GENERAL.canvas_draw.removeEventListener('touchend', function(){},false);
document.getElementById('canvasWrapper').addEventListener('click', function(){return false;}, false); CONTENTVIEW_GENERAL.canvas_draw.addEventListener('touchstart', function(){return false;}, false);
document.getElementById('canvasWrapper').addEventListener('touchstart', function(){return false;}, false); CONTENTVIEW_GENERAL.canvas_draw.addEventListener('touchmove', function(){return false;}, false);
document.getElementById('canvasWrapper').addEventListener('touchmove', function(){return false;}, false); CONTENTVIEW_GENERAL.canvas_draw.addEventListener('touchend', function(){return false;}, false);
document.getElementById('canvasWrapper').addEventListener('touchend', function(){return false;}, false);
$("#canvasWrapper").unbind('click');
$("#canvasWrapper").unbind('touchstart');
$("#canvasWrapper").unbind('touchmove');
$("#canvasWrapper").unbind('touchend');
document.getElementById('main').addEventListener('click', function(){return false;}, false);
document.getElementById('main').addEventListener('touchstart', function(){return false;}, false);
document.getElementById('main').addEventListener('touchmove', function(){return false;}, false);
document.getElementById('main').addEventListener('touchend', function(){return false;}, false);
document.getElementById('canvasWrapper').addEventListener('click', function(){return false;}, false);
document.getElementById('canvasWrapper').addEventListener('touchstart', function(){return false;}, false);
document.getElementById('canvasWrapper').addEventListener('touchmove', function(){return false;}, false);
document.getElementById('canvasWrapper').addEventListener('touchend', function(){return false;}, false);
//必要か　ここまで
CONTENTVIEW_GENERAL.showDialog(true); CONTENTVIEW_GENERAL.showDialog(true);
if(ClientData.isStreamingMode()){ if(ClientData.isStreamingMode()){
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
var myVideo=document.getElementById("videoOnPopUp"); var myVideo=document.getElementById("videoOnPopUp");
if (myVideo.paused) if (myVideo.paused)
{ {
myVideo.play(); myVideo.play();
}
} }
} }
} } else {
/* //キャッシュが存在するか確認
if(ClientData.isStreamingMode()){ var fileName = CONTENTVIEW_GENERAL.contentID + "/res_" + media + ".dat";
CONTENTVIEW_FILESYSTEM.fs.root.getFile('/abook/' + fileName, { create: false },
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { function(fileEntry){
fileEntry.file(
// Show confim message to play background music function(file){
$("#contentVideoConfirm").css('z-index', 9998); var url = window.URL || window.webkitURL;
$("#contentVideoConfirm_OK").unbind('touchstart'); var resSrc = url.createObjectURL(file);
document.getElementById('contentVideoConfirm_OK').addEventListener('touchstart', function(event){ AVWEB.avwLog("read cache: createObjectURL " + resSrc);
event.preventDefault();
//alert("hoge"); createVideoFulScreen(resSrc, id);
var myVideo=document.getElementById("videoOnPopUp"); $("#btnCloseVideo").on({
if (myVideo.paused) 'click touchend': function(ev){
{ //時間記録
myVideo.play(); CONTENTVIEW_GENERAL.hideDialog();
} /*play audio if exist */
$("#contentVideoConfirm").hide(); CONTENTVIEW.playAllAudio();
return false; return false;
}, false); },
'touchstart touchmove': function(){
$("#contentVideoConfirm").show(); //これを入れないと次にダイアログを開くと表示位置が大きくズレる
$("#contentVideoConfirm").center(); return false;
}
} });
CONTENTVIEW_GENERAL.showDialog(true);
}
);
},
function(err){ // 失敗時のコールバック関数
AVWEB.avwLog("NotRead FileSystem");
//キャッシュ化
var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function(){
if (this.readyState == 4 && this.status == 200){
CONTENTVIEW_FILESYSTEM.isXhrBusy = false;
$('#divImageLoading').css('display', 'none');
//this.response is what you're looking for
AVWEB.avwLog(this.response, typeof this.response);
CONTENTVIEW_FILESYSTEM.fs.root.getFile(
'/abook/' + fileName,
{create: true},
function(fileEntry){
fileEntry.createWriter(
function(fileWriter) {
fileWriter.onwriteend = function(e) {
AVWEB.avwLog('RES書き込み完了');
};
fileWriter.onerror = function(e) {
AVWEB.avwLog('RES書き込みエラー: ' + e.toString());
};
var blobData = new Blob([xhr.response], {type:"application/octet-stream"});
fileWriter.write(blobData);
}
);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
} else {
if( this.readyState == 2 ){
AVWEB.avwLog("onreadystatechange:" + this.readyState + " " + this.status);
CONTENTVIEW_FILESYSTEM.isXhrBusy = true;
$('#divImageLoading').css('z-index', '99999');
$('#divImageLoading').css('display', 'block');
}
}
};
if( !CONTENTVIEW_FILESYSTEM.isXhrBusy ){
xhr.open('GET', mediaFile);
xhr.responseType = 'blob';
xhr.send();
} else {
AVWEB.avwLog("xhr is busy.");
}
//タグは書き出し
CONTENTVIEW_CREATEOBJECT.createVideoFulScreen(mediaFile, id);
$("#btnCloseVideo").on({
'click touchend': function(ev){
//時間記録
CONTENTVIEW_GENERAL.hideDialog();
/*play audio if exist */
CONTENTVIEW.playAllAudio();
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
CONTENTVIEW_GENERAL.showDialog(true);
}
);
} }
*/
} }
} }
}; };
...@@ -1576,22 +1673,141 @@ CONTENTVIEW_CREATEOBJECT.videoType1 = function (mediaType, actionType, id, image ...@@ -1576,22 +1673,141 @@ CONTENTVIEW_CREATEOBJECT.videoType1 = function (mediaType, actionType, id, image
/* stop all audio on page */ /* stop all audio on page */
CONTENTVIEW.stopAllAudio(); CONTENTVIEW.stopAllAudio();
CONTENTVIEW_CREATEOBJECT.createVideoFulScreen(mediaFile, id); //ファイルシステムが有効であればキャッシュ確認
if( CONTENTVIEW_FILESYSTEM.fs == null ){
$("#btnCloseVideo").click(function (e) {
CONTENTVIEW_CREATEOBJECT.createVideoFulScreen(mediaFile, id);
//時間記録
var dateEnd = new Date(); $("#btnCloseVideo").on({
var actionTime = dateEnd.subtractBySeconds(dateStart); 'click touchend': function(ev){
//alert("actionTime:" + actionTime); //時間記録
COMMON.SetObjectLogActionTime( CONTENTVIEW_GENERAL.contentID, objectId, actionTime ); var dateEnd = new Date();
var actionTime = dateEnd.subtractBySeconds(dateStart);
CONTENTVIEW_GENERAL.hideDialog(); //alert("actionTime:" + actionTime);
/* play audio */ COMMON.SetObjectLogActionTime( CONTENTVIEW_GENERAL.contentID, objectId, actionTime );
CONTENTVIEW.playAllAudio(); CONTENTVIEW_GENERAL.hideDialog();
}); /* play audio */
CONTENTVIEW.playAllAudio();
CONTENTVIEW_GENERAL.showDialog(true); },
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
CONTENTVIEW_GENERAL.showDialog(true);
} else {
//キャッシュが存在するか確認
var fileName = CONTENTVIEW_GENERAL.contentID + "/res_" + mediaResourceId + ".dat";
CONTENTVIEW_FILESYSTEM.fs.root.getFile('/abook/' + fileName, { create: false },
function(fileEntry){
fileEntry.file(
function(file){
var url = window.URL || window.webkitURL;
var resSrc = url.createObjectURL(file);
AVWEB.avwLog("read cache: createObjectURL " + resSrc);
//タグは書き出し
CONTENTVIEW_CREATEOBJECT.createVideoFulScreen(resSrc, id);
$("#btnCloseVideo").on({
'click touchend': function(ev){
//時間記録
var dateEnd = new Date();
var actionTime = dateEnd.subtractBySeconds(dateStart);
//alert("actionTime:" + actionTime);
COMMON.SetObjectLogActionTime( CONTENTVIEW_GENERAL.contentID, objectId, actionTime );
CONTENTVIEW_GENERAL.hideDialog();
/* play audio */
CONTENTVIEW.playAllAudio();
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
CONTENTVIEW_GENERAL.showDialog(true);
}
);
},
function(err){ // 失敗時のコールバック関数
AVWEB.avwLog("NotRead FileSystem");
//キャッシュ化
var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function(){
if (this.readyState == 4 && this.status == 200){
CONTENTVIEW_FILESYSTEM.isXhrBusy = false;
$('#divImageLoading').css('display', 'none');
//this.response is what you're looking for
AVWEB.avwLog(this.response, typeof this.response);
CONTENTVIEW_FILESYSTEM.fs.root.getFile(
'/abook/' + fileName,
{create: true},
function(fileEntry){
fileEntry.createWriter(
function(fileWriter) {
fileWriter.onwriteend = function(e) {
AVWEB.avwLog('RES書き込み完了');
};
fileWriter.onerror = function(e) {
AVWEB.avwLog('RES書き込みエラー: ' + e.toString());
};
var blobData = new Blob([xhr.response], {type:"application/octet-stream"});
//var blobData = new Blob([this.response], {type:"video/mp4"});
fileWriter.write(blobData);
}
);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
} else {
if( this.readyState == 2 ){
AVWEB.avwLog("onreadystatechange:" + this.readyState + " " + this.status);
CONTENTVIEW_FILESYSTEM.isXhrBusy = true;
$('#divImageLoading').css('z-index', '99999');
$('#divImageLoading').css('display', 'block');
}
}
};
if( !CONTENTVIEW_FILESYSTEM.isXhrBusy ){
xhr.open('GET', mediaFile);
xhr.responseType = 'blob';
xhr.send();
} else {
AVWEB.avwLog("xhr is busy.");
}
//タグは書き出し
CONTENTVIEW_CREATEOBJECT.createVideoFulScreen(mediaFile, id);
$("#btnCloseVideo").on({
'click touchend': function(ev){
//時間記録
var dateEnd = new Date();
var actionTime = dateEnd.subtractBySeconds(dateStart);
//alert("actionTime:" + actionTime);
COMMON.SetObjectLogActionTime( CONTENTVIEW_GENERAL.contentID, objectId, actionTime );
CONTENTVIEW_GENERAL.hideDialog();
/* play audio */
CONTENTVIEW.playAllAudio();
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
CONTENTVIEW_GENERAL.showDialog(true);
}
);
}
} }
//時間記録 //時間記録
......
abvw/js/contentview_Events.js
...@@ -387,31 +387,85 @@ CONTENTVIEW_EVENTS.firstPage_click = function() { ...@@ -387,31 +387,85 @@ CONTENTVIEW_EVENTS.firstPage_click = function() {
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
//console.log("CONTENTVIEW_EVENTS.firstPage_click"); //ファイルシステムが有効であればキャッシュ確認
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), if( CONTENTVIEW_FILESYSTEM.fs == null ){
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 }, AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
function (data) { { contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
CONTENTVIEW_GENERAL.pageImages = data; function (data) {
CONTENTVIEW_GENERAL.pageImages = data;
/* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, 0);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
/* get page Objects */ $('#divImageLoading').css('display', 'none');
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, 0);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
$('#divImageLoading').css('display', 'none');
//START TRB00097
//CONTENTVIEW.userScale = 1;
//CONTENTVIEW.changeScale(CONTENTVIEW.userScale); CONTENTVIEW.checkDisableButtonZoom();
//END TRB00097 var tran = new CONTENTVIEW_CREATEOBJECT.Transition();
CONTENTVIEW.checkDisableButtonZoom(); tran.flipToPage(0);
var tran = new CONTENTVIEW_CREATEOBJECT.Transition();
tran.flipToPage(0); },
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
}
);
} else {
// ファイル取得
var fileName = CONTENTVIEW_GENERAL.contentID + "/page_1.dat";
CONTENTVIEW_FILESYSTEM.fs.root.getFile('/abook/' + fileName, { create: false },
function(fileEntry){
fileEntry.file(
function(file){
var reader = new FileReader();
reader.onloadend = function(e) {
//AVWEB.avwLog("read FileSystem");
CONTENTVIEW_GENERAL.pageImages = e.target.result;
/* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, 0);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
$('#divImageLoading').css('display', 'none');
//userScale = 1;
//changeScale(userScale);
CONTENTVIEW.checkDisableButtonZoom();
var tran = new CONTENTVIEW_CREATEOBJECT.Transition();
tran.flipToPage(0);
};
reader.readAsText(file);
}
);
},
function(err){ // 失敗時のコールバック関数
//AVWEB.avwLog("NotRead FileSystem");
AVWEB.avwGrabContentPageImage(
ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
function (data) {
CONTENTVIEW_GENERAL.pageImages = data;
/* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, 0);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
}, $('#divImageLoading').css('display', 'none');
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen(); CONTENTVIEW.checkDisableButtonZoom();
}); var tran = new CONTENTVIEW_CREATEOBJECT.Transition();
tran.flipToPage(0);
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
}
);
}
);
}
} }
//START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process //START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
...@@ -460,26 +514,82 @@ CONTENTVIEW_EVENTS.lastPage_click = function() { ...@@ -460,26 +514,82 @@ CONTENTVIEW_EVENTS.lastPage_click = function() {
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
//console.log("CONTENTVIEW_EVENTS.lastPage_click"); //ファイルシステムが有効であればキャッシュ確認
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), if( CONTENTVIEW_FILESYSTEM.fs == null ){
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: CONTENTVIEW_GENERAL.totalPage },
function (data) { AVWEB.avwGrabContentPageImage(
CONTENTVIEW_GENERAL.pageImages = data; ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: CONTENTVIEW_GENERAL.totalPage },
/* get page Objects */ function (data) {
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, CONTENTVIEW_GENERAL.totalPage - 1); CONTENTVIEW_GENERAL.pageImages = data;
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects); /* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, CONTENTVIEW_GENERAL.totalPage - 1);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
$('#divImageLoading').css('display', 'none');
CONTENTVIEW.checkDisableButtonZoom();
var tran = new CONTENTVIEW_CREATEOBJECT.Transition();
tran.flipToPage(CONTENTVIEW_GENERAL.totalPage - 1);
$('#divImageLoading').css('display', 'none'); },
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
}
);
} else {
// ファイル取得
var fileName = contentID + "/page_" + totalPage + ".dat";
CONTENTVIEW_FILESYSTEM.fs.root.getFile('/abook/' + fileName, { create: false },
function(fileEntry){
fileEntry.file(
function(file){
var reader = new FileReader();
reader.onloadend = function(e) {
//AVWEB.avwLog("read FileSystem");
CONTENTVIEW_GENERAL.pageImages = e.target.result;
/* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, CONTENTVIEW_GENERAL.totalPage - 1);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
$('#divImageLoading').css('display', 'none');
CONTENTVIEW.checkDisableButtonZoom();
var tran = new CONTENTVIEW_CREATEOBJECT.Transition();
tran.flipToPage(CONTENTVIEW_GENERAL.totalPage - 1);
};
reader.readAsText(file);
}
);
},
function(err){ // 失敗時のコールバック関数
//AVWEB.avwLog("NotRead FileSystem");
AVWEB.avwGrabContentPageImage(
ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: CONTENTVIEW_GENERAL.totalPage },
function (data) {
CONTENTVIEW_GENERAL.pageImages = data;
/* get page Objects */
CONTENTVIEW_GETDATA.getPageObjectsByPageIndex(CONTENTVIEW_GENERAL.pageObjectsData, CONTENTVIEW_GENERAL.totalPage - 1);
CONTENTVIEW_GETDATA.getContent().setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.pageImages).setPageObjects(CONTENTVIEW_GENERAL.pageObjects);
$('#divImageLoading').css('display', 'none');
CONTENTVIEW.checkDisableButtonZoom(); CONTENTVIEW.checkDisableButtonZoom();
var tran = new CONTENTVIEW_CREATEOBJECT.Transition(); var tran = new CONTENTVIEW_CREATEOBJECT.Transition();
tran.flipToPage(CONTENTVIEW_GENERAL.totalPage - 1); tran.flipToPage(CONTENTVIEW_GENERAL.totalPage - 1);
}, },
function (xmlHttpRequest, txtStatus, errorThrown) { function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen(); CONTENTVIEW.showErrorScreen();
}); }
);
}
);
}
} }
//START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process //START : TRB00032 - Editor : Long - Date: 09/10/2013 - Summary : type none process
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
...@@ -1843,11 +1953,15 @@ CONTENTVIEW_EVENTS.onTouchmove = function(evt){ ...@@ -1843,11 +1953,15 @@ CONTENTVIEW_EVENTS.onTouchmove = function(evt){
} }
} }
else{ else{
CONTENTVIEW_EVENTS._isClick = false; //CONTENTVIEW_EVENTS._isClick = false;
// for android or ipad // for android or ipad
touch1 = evt.touches[0]; touch1 = evt.touches[0];
touch2 = evt.touches[1]; touch2 = evt.touches[1];
if( touch2 != null ){
CONTENTVIEW_EVENTS._isClick = false;
}
if(CONTENTVIEW_EVENTS._3dAnimate){ if(CONTENTVIEW_EVENTS._3dAnimate){
var imagePt = CONTENTVIEW.screenToImage(touch1.pageX, touch1.pageY); var imagePt = CONTENTVIEW.screenToImage(touch1.pageX, touch1.pageY);
...@@ -2156,14 +2270,6 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){ ...@@ -2156,14 +2270,6 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){
if (isClickLinkList == false && ClientData.IsAddingMarking() == false) { if (isClickLinkList == false && ClientData.IsAddingMarking() == false) {
//Androidは遅いのでタッチエンドで描画
//if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) {
// // redraw
// CONTENTVIEW.flip();
// CONTENTVIEW.zoomVideo();
// CONTENTVIEW.closeDialogPopUpText();
//}
if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos() == false && CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid() == false) { if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos() == false && CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid() == false) {
/* area next and prev page */ /* area next and prev page */
var cwMain = $('#main').width(); var cwMain = $('#main').width();
...@@ -2184,24 +2290,12 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){ ...@@ -2184,24 +2290,12 @@ CONTENTVIEW_EVENTS.onTouchend = function(evt){
} }
else { else {
if (ClientData.IsAddingMarking() == false && CONTENTVIEW_GENERAL.isCopyMemo == false) { if (ClientData.IsAddingMarking() == false && CONTENTVIEW_GENERAL.isCopyMemo == false) {
var cwMain = $('#main').width();
//Androidは遅いのでタッチエンドで描画 if (CONTENTVIEW_EVENTS._touchPageX > 0 && CONTENTVIEW_EVENTS._touchPageX < 300) {
//if (CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid()) { CONTENTVIEW_EVENTS.prevPage_click();
// // redraw } else if (CONTENTVIEW_EVENTS._touchPageX > (cwMain - 300) && CONTENTVIEW_EVENTS._touchPageX < cwMain) {
// CONTENTVIEW.flip(); CONTENTVIEW_EVENTS.nextPage_click();
// CONTENTVIEW.zoomVideo(); }
// CONTENTVIEW.closeDialogPopUpText();
//}
//if (CONTENTVIEW_GENERAL.avwUserEnvObj.isIos() == false && CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid() == false) {
var cwMain = $('#main').width();
if (CONTENTVIEW_EVENTS._touchPageX > 0 && CONTENTVIEW_EVENTS._touchPageX < 300) {
CONTENTVIEW_EVENTS.prevPage_click();
} else if (CONTENTVIEW_EVENTS._touchPageX > (cwMain - 300) && CONTENTVIEW_EVENTS._touchPageX < cwMain) {
CONTENTVIEW_EVENTS.nextPage_click();
}
//}
} }
} }
} }
......
abvw/js/contentview_FileSystem.js 0 → 100644
//名前空間用のオブジェクトを用意する
var CONTENTVIEW_FILESYSTEM = {};
CONTENTVIEW_FILESYSTEM.fs = null;
CONTENTVIEW_FILESYSTEM.isXhrBusy = false;
//$(function () {
//});
CONTENTVIEW_FILESYSTEM.initFS = function( func ) {
CONTENTVIEW_FILESYSTEM.fs = null;
window.requestFileSystem = window.requestFileSystem || window.webkitRequestFileSystem;
// Initiate filesystem on page load.
if (!window.requestFileSystem) {
//AVWEB.avwLog("window.requestFileSystem is null");
if( func != null ){
func();
}
return;
}
window.requestFileSystem(
window.TEMPORARY,
1024*1024,
function(filesystem) {
//AVWEB.avwLog("initFS window.requestFileSystem");
CONTENTVIEW_FILESYSTEM.fs = filesystem;
CONTENTVIEW_FILESYSTEM.fs.root.getDirectory(
'abook',
{create: true},
function(dirEntry) {
// /abookディレクトリ作成成功
if( func != null ){
func();
}
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
},
function(err){ // 失敗時のコールバック関数
CONTENTVIEW_FILESYSTEM.errorHandler(err);
if( func != null ){
func();
}
}
);
};
CONTENTVIEW_FILESYSTEM.savePageFile = function(contentId, fileName, data) {
if (!CONTENTVIEW_FILESYSTEM.fs) {
//AVWEB.avwLog('CONTENTVIEW_FILESYSTEM.fs is null. id=' + contentId);
return;
}
//パス作成
//var path = "/abook/" + contentId + "/" + fileName;
CONTENTVIEW_FILESYSTEM.fs.root.getDirectory(
'/abook/' + contentId,
{create: true},
function(dirEntry) {
// /abook/contentId ディレクトリ作成成功
CONTENTVIEW_FILESYSTEM.fs.root.getFile(
'/abook/' + contentId + "/" + fileName,
{create: true},
function(fileEntry){
fileEntry.createWriter(
function(fileWriter) {
fileWriter.onwriteend = function(e) {
//AVWEB.avwLog('書き込み完了');
};
fileWriter.onerror = function(e) {
//AVWEB.avwLog('書き込みエラー: ' + e.toString());
};
var blobData = new Blob([data], {type:"text/plain"});
fileWriter.write(blobData);
}
);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
};
CONTENTVIEW_FILESYSTEM.deleteContentDir = function(contentId) {
if (!CONTENTVIEW_FILESYSTEM.fs) {
//AVWEB.avwLog('CONTENTVIEW_FILESYSTEM.fs is null. id=' + contentId);
return;
}
CONTENTVIEW_FILESYSTEM.fs.root.getDirectory(
'/abook/' + contentId,
{},
function(dirEntry) {
dirEntry.removeRecursively(
function() {
//AVWEB.avwLog('Directory removed. id=' + contentId);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
},
null
);
};
CONTENTVIEW_FILESYSTEM.checkUpdate = function(contentId, data, func) {
if (!CONTENTVIEW_FILESYSTEM.fs) {
//AVWEB.avwLog('CONTENTVIEW_FILESYSTEM.fs is null. id=' + contentId);
//おまじない ajaxカウントをインクリする必要有り
//nAjaxLoad++;
//ファンクションがあれば実行
if( func != null ){
func(data);
}
return;
}
//既にjson.txtが存在するか
var fileName = contentID + "/json.txt";
CONTENTVIEW_FILESYSTEM.fs.root.getFile(
'/abook/' + fileName,
{ create: false },
function(fileEntry){
fileEntry.file(
function(file){
var reader = new FileReader();
reader.onloadend = function(e) {
//AVWEB.avwLog("read Json.txt");
//JSONに戻す
var jsonObjOld = JSON.parse(e.target.result);
//配信日時比較
//AVWEB.avwLog("OLD:" + jsonObjOld.contentData.lastDeliveryDate);
//AVWEB.avwLog("NEW:" + data.contentData.lastDeliveryDate);
if( jsonObjOld.contentData.lastDeliveryDate != data.contentData.lastDeliveryDate ){
//AVWEB.avwLog("Update Content.");
//ディレクトリ消し
CONTENTVIEW_FILESYSTEM.fs.root.getDirectory(
'/abook/' + contentId,
{},
function(dirEntry) {
dirEntry.removeRecursively(
function() {
//AVWEB.avwLog('Directory removed. id=' + contentId);
//再度書き込み
CONTENTVIEW_FILESYSTEM.fs.root.getDirectory(
'/abook/' + contentId,
{create: true},
function(dirEntry) {
CONTENTVIEW_FILESYSTEM.fs.root.getFile(
'/abook/' + contentId + "/json.txt",
{create: true},
function(fileEntry){
fileEntry.createWriter(
function(fileWriter) {
fileWriter.onwriteend = function(e) {
//AVWEB.avwLog('JSON書き込み完了');
//おまじない ajaxカウントをインクリする必要有り
nAjaxLoad++;
//ファンクション実行
if( func != null ){
func(data);
}
};
fileWriter.onerror = function(e) {
//AVWEB.avwLog('JSON書き込みエラー: ' + e.toString());
};
var blobData = new Blob([window.JSON.stringify(data)], {type:"text/plain"});
fileWriter.write(blobData);
}
);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
},
null
);
} else {
//おまじない ajaxカウントをインクリする必要有り
nAjaxLoad++;
//ファンクション実行
if( func != null ){
func(data);
}
}
};
reader.readAsText(file);
}
);
},
function(err){ // 失敗時のコールバック関数
//AVWEB.avwLog("NotRead json.txt");
//書き込む パス作成
//var path = "/abook/" + contentId + "/" + fileName;
CONTENTVIEW_FILESYSTEM.fs.root.getDirectory(
'/abook/' + contentId,
{create: true},
function(dirEntry) {
CONTENTVIEW_FILESYSTEM.fs.root.getFile(
'/abook/' + contentId + "/json.txt",
{create: true},
function(fileEntry){
fileEntry.createWriter(
function(fileWriter) {
fileWriter.onwriteend = function(e) {
//AVWEB.avwLog('JSON書き込み完了');
//おまじない ajaxカウントをインクリする必要有り
nAjaxLoad++;
//ファンクション実行
if( func != null ){
func(data);
}
};
fileWriter.onerror = function(e) {
//AVWEB.avwLog('JSON書き込みエラー: ' + e.toString());
};
var blobData = new Blob([window.JSON.stringify(data)], {type:"text/plain"});
fileWriter.write(blobData);
}
);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
}
);
};
CONTENTVIEW_FILESYSTEM.showVideoObjectCache = function(x, y, width, height, src, isFullscreen, contentId, resourceId ){
//AVWEB.avwLog('CONTENTVIEW_FILESYSTEM.showVideoObjectCache');
if (!CONTENTVIEW_FILESYSTEM.fs) {
//AVWEB.avwLog('CONTENTVIEW_FILESYSTEM.fs is null. id=' + contentId);
showVideoObject(x, y, width, height, src, isFullscreen, true);
return;
}
//キャッシュが存在するか確認
var fileName = contentID + "/res_" + resourceId + ".dat";
CONTENTVIEW_FILESYSTEM.fs.root.getFile('/abook/' + fileName, { create: false },
function(fileEntry){
fileEntry.file(
function(file){
//AVWEB.avwLog("read cache");
var url = window.URL || window.webkitURL;
var resSrc = url.createObjectURL(file);
showVideoObject(x, y, width, height, resSrc, isFullscreen, false);
}
);
},
function(err){ // 失敗時のコールバック関数
//AVWEB.avwLog("NotRead FileSystem");
//キャッシュ化
var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function(){
if (this.readyState == 4 && this.status == 200){
CONTENTVIEW_FILESYSTEM.isXhrBusy = false;
$('#divImageLoading').css('display', 'none');
//this.response is what you're looking for
//AVWEB.avwLog(this.response, typeof this.response);
CONTENTVIEW_FILESYSTEM.fs.root.getFile(
'/abook/' + fileName,
{create: true},
function(fileEntry){
fileEntry.createWriter(
function(fileWriter) {
fileWriter.onwriteend = function(e) {
//AVWEB.avwLog('RES書き込み完了');
};
fileWriter.onerror = function(e) {
//AVWEB.avwLog('RES書き込みエラー: ' + e.toString());
};
var blobData = new Blob([xhr.response], {type:"application/octet-stream"});
//var blobData = new Blob([this.response], {type:"video/mp4"});
fileWriter.write(blobData);
}
);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
} else {
if( this.readyState == 2 ){
//AVWEB.avwLog("onreadystatechange:" + this.readyState + " " + this.status);
$('#divImageLoading').css('display', 'block');
CONTENTVIEW_FILESYSTEM.isXhrBusy = true;
}
}
};
if( !CONTENTVIEW_FILESYSTEM.isXhrBusy ){
xhr.open('GET', src);
xhr.responseType = 'blob';
xhr.send();
} else {
//AVWEB.avwLog("xhr is busy.");
}
//タグは書き出し
showVideoObject(x, y, width, height, src, isFullscreen, true);
}
);
};
CONTENTVIEW_FILESYSTEM.errorHandler = function(e) {
var msg = '';
switch (e.code) {
case FileError.QUOTA_EXCEEDED_ERR:
msg = 'QUOTA_EXCEEDED_ERR';
break;
case FileError.NOT_FOUND_ERR:
msg = 'NOT_FOUND_ERR';
break;
case FileError.SECURITY_ERR:
msg = 'SECURITY_ERR';
break;
case FileError.INVALID_MODIFICATION_ERR:
msg = 'INVALID_MODIFICATION_ERR';
break;
case FileError.INVALID_STATE_ERR:
msg = 'INVALID_STATE_ERR';
break;
default:
msg = 'Unknown Error';
break;
};
//CONTENTVIEW_FILESYSTEM.fs = null;
//AVWEB.avwLog('FileSystemAPI Error: ' + msg);
alert('FileSystemAPI Error: ' + msg);
};
abvw/js/contentview_GetData.js
...@@ -95,13 +95,6 @@ CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) { ...@@ -95,13 +95,6 @@ CONTENTVIEW_GETDATA.getMediaType1 = function(iValueObj) {
* Action Type = 11 : html * Action Type = 11 : html
*/ */
//ストリーミングならemailは表示しない
//if(ClientData.isStreamingMode()){
// if (iValueObj.action.actionType == 6) {
// return null;
// }
//}
var pageObject = []; var pageObject = [];
pageObject['mediaType'] = iValueObj.mediaType; pageObject['mediaType'] = iValueObj.mediaType;
...@@ -900,7 +893,18 @@ CONTENTVIEW_GETDATA.getBookmarklist = function(pos) { ...@@ -900,7 +893,18 @@ CONTENTVIEW_GETDATA.getBookmarklist = function(pos) {
//title start //title start
$('#bookmarkBoxHdBM').children().remove(); $('#bookmarkBoxHdBM').children().remove();
$('#bookmarkBoxHdBM').html('<a id="bookmarkClosing" class="delete" > </a>'); $('#bookmarkBoxHdBM').html('<a id="bookmarkClosing" class="delete" > </a>');
$("#bookmarkClosing").click(CONTENTVIEW_EVENTS.closeBookmarkBox); //$("#bookmarkClosing").click(CONTENTVIEW_EVENTS.closeBookmarkBox);
$("#bookmarkClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closeBookmarkBox(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#bookmarkBoxHdBM').append(I18N.i18nText('txtShioriCtnLs')); $('#bookmarkBoxHdBM').append(I18N.i18nText('txtShioriCtnLs'));
//title end //title end
//COMMON.lockLayout(); //COMMON.lockLayout();
...@@ -934,7 +938,19 @@ CONTENTVIEW_GETDATA.getPageIndexJson = function(pos) { ...@@ -934,7 +938,19 @@ CONTENTVIEW_GETDATA.getPageIndexJson = function(pos) {
//title start //title start
$('#indexBoxHdIndex').children().remove(); $('#indexBoxHdIndex').children().remove();
$('#indexBoxHdIndex').html('<a id="indexClosing" class="delete" > </a>'); $('#indexBoxHdIndex').html('<a id="indexClosing" class="delete" > </a>');
$("#indexClosing").click(CONTENTVIEW_EVENTS.closeIndexBox);
//$("#indexClosing").click(CONTENTVIEW_EVENTS.closeIndexBox);
$("#indexClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closeIndexBox(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#indexBoxHdIndex').append(I18N.i18nText('txtIndex')); $('#indexBoxHdIndex').append(I18N.i18nText('txtIndex'));
//title end //title end
//COMMON.lockLayout(); //COMMON.lockLayout();
...@@ -990,7 +1006,19 @@ CONTENTVIEW_GETDATA.getPageIndexJson = function(pos) { ...@@ -990,7 +1006,19 @@ CONTENTVIEW_GETDATA.getPageIndexJson = function(pos) {
//title start //title start
$('#indexBoxHdIndex').children().remove(); $('#indexBoxHdIndex').children().remove();
$('#indexBoxHdIndex').html('<a id="indexClosing" class="delete" > </a>'); $('#indexBoxHdIndex').html('<a id="indexClosing" class="delete" > </a>');
$("#indexClosing").click(CONTENTVIEW_EVENTS.closeIndexBox);
//$("#indexClosing").click(CONTENTVIEW_EVENTS.closeIndexBox);
$("#indexClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closeIndexBox(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#indexBoxHdIndex').append(I18N.i18nText('txtIndex')); $('#indexBoxHdIndex').append(I18N.i18nText('txtIndex'));
//title end //title end
//COMMON.lockLayout(); //COMMON.lockLayout();
...@@ -1220,20 +1248,61 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){ ...@@ -1220,20 +1248,61 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){
//Get next page background image //Get next page background image
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
//console.log("CONTENTVIEW_GETDATA.renderNextPage"); //ファイルシステムが有効であればキャッシュ確認
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), if( CONTENTVIEW_FILESYSTEM.fs == null ){
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo }, //console.log("CONTENTVIEW_GETDATA.renderNextPage");
function (data) { AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
CONTENTVIEW_GENERAL.nextPageImage = data; { contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo },
function (data) {
CONTENTVIEW_GENERAL.nextContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.nextPageImage) CONTENTVIEW_GENERAL.nextPageImage = data;
CONTENTVIEW_GENERAL.nextContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.nextPageImage)
.setPageObjects(CONTENTVIEW_GENERAL.nextPageObjects) .setPageObjects(CONTENTVIEW_GENERAL.nextPageObjects)
.nextPage(); .nextPage();
}, },
function (xmlHttpRequest, txtStatus, errorThrown) { function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen(); CONTENTVIEW.showErrorScreen();
}); }
);
} else {
// ファイル取得
var fileName = contentID + "/page_" + pageNo + ".dat";
CONTENTVIEW_FILESYSTEM.fs.root.getFile('/abook/' + fileName, { create: false },
function(fileEntry){
fileEntry.file(
function(file){
var reader = new FileReader();
reader.onloadend = function(e) {
//AVWEB.avwLog("read FileSystem");
CONTENTVIEW_GENERAL.nextPageImage = e.target.result;
CONTENTVIEW_GENERAL.nextContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.nextPageImage)
.setPageObjects(CONTENTVIEW_GENERAL.nextPageObjects)
.nextPage();
};
reader.readAsText(file);
}
);
},
function(err){ // 失敗時のコールバック関数
//AVWEB.avwLog("NotRead FileSystem");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo },
function (data) {
CONTENTVIEW_GENERAL.nextPageImage = data;
CONTENTVIEW_GENERAL.nextContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.nextPageImage)
.setPageObjects(CONTENTVIEW_GENERAL.nextPageObjects)
.nextPage();
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
}
);
}
);
}
} }
//Start Function : No.12 - Editor : Long - Date : 08/28/2013 - Summary : Render next page content image the same with the current one //Start Function : No.12 - Editor : Long - Date : 08/28/2013 - Summary : Render next page content image the same with the current one
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
...@@ -1255,20 +1324,61 @@ CONTENTVIEW_GETDATA.renderPrevPage = function(){ ...@@ -1255,20 +1324,61 @@ CONTENTVIEW_GETDATA.renderPrevPage = function(){
//Get prev page background image //Get prev page background image
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
//console.log("CONTENTVIEW_GETDATA.renderPrevPage"); //ファイルシステムが有効であればキャッシュ確認
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), if( CONTENTVIEW_FILESYSTEM.fs == null ){
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo },
function (data) { //console.log("CONTENTVIEW_GETDATA.renderPrevPage");
CONTENTVIEW_GENERAL.prevPageImage = data; AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo },
CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage) function (data) {
CONTENTVIEW_GENERAL.prevPageImage = data;
CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage)
.setPageObjects(CONTENTVIEW_GENERAL.prevPageObjects) .setPageObjects(CONTENTVIEW_GENERAL.prevPageObjects)
.previousPage(); .previousPage();
},
}, function (xmlHttpRequest, txtStatus, errorThrown) {
function (xmlHttpRequest, txtStatus, errorThrown) { CONTENTVIEW.showErrorScreen();
CONTENTVIEW.showErrorScreen(); }
}); );
} else {
// ファイル取得
var fileName = contentID + "/page_" + pageNo + ".dat";
CONTENTVIEW_FILESYSTEM.fs.root.getFile('/abook/' + fileName, { create: false },
function(fileEntry){
fileEntry.file(
function(file){
var reader = new FileReader();
reader.onloadend = function(e) {
//AVWEB.avwLog("read FileSystem");
CONTENTVIEW_GENERAL.prevPageImage = e.target.result;
CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage)
.setPageObjects(CONTENTVIEW_GENERAL.prevPageObjects)
.previousPage();
};
reader.readAsText(file);
}
);
},
function(err){ // 失敗時のコールバック関数
//AVWEB.avwLog("NotRead FileSystem");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo },
function (data) {
CONTENTVIEW_GENERAL.prevPageImage = data;
CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage)
.setPageObjects(CONTENTVIEW_GENERAL.prevPageObjects)
.previousPage();
},
function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen();
}
);
}
);
}
} }
else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){ else if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_NoFile){
CONTENTVIEW_GENERAL.prevPageImage = CONTENTVIEW_GENERAL.pageImages; CONTENTVIEW_GENERAL.prevPageImage = CONTENTVIEW_GENERAL.pageImages;
......
abvw/js/contentview_Gomu.js
...@@ -218,13 +218,78 @@ $(function () { ...@@ -218,13 +218,78 @@ $(function () {
} }
} }
$("#dlgGomu_dspOK").click(CONTENTVIEW_GOMU.dlgGomu_dspOK_click); //$("#dlgGomu_dspOK").click(CONTENTVIEW_GOMU.dlgGomu_dspOK_click);
$("#dlgGomu_dspCancel").click(CONTENTVIEW_GOMU.dlgGomu_dspCancel_click); $("#dlgGomu_dspOK").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_dspOK_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$("#text_dlgGomu_rdo1").click(CONTENTVIEW_GOMU.dlgGomu_rdo1_text_click); //$("#dlgGomu_dspCancel").click(CONTENTVIEW_GOMU.dlgGomu_dspCancel_click);
$("#text_dlgGomu_rdo2").click(CONTENTVIEW_GOMU.dlgGomu_rdo2_text_click); $("#dlgGomu_dspCancel").on({
$("#text_dlgGomu_rdo3").click(CONTENTVIEW_GOMU.dlgGomu_rdo3_text_click); 'click touchend': function(ev){
$("#text_dlgGomu_rdo4").click(CONTENTVIEW_GOMU.dlgGomu_rdo4_text_click); CONTENTVIEW_GOMU.dlgGomu_dspCancel_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#text_dlgGomu_rdo1").click(CONTENTVIEW_GOMU.dlgGomu_rdo1_text_click);
$("#text_dlgGomu_rdo1").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_rdo1_text_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#text_dlgGomu_rdo2").click(CONTENTVIEW_GOMU.dlgGomu_rdo2_text_click);
$("#text_dlgGomu_rdo2").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_rdo2_text_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#text_dlgGomu_rdo3").click(CONTENTVIEW_GOMU.dlgGomu_rdo3_text_click);
$("#text_dlgGomu_rdo3").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_rdo3_text_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#text_dlgGomu_rdo4").click(CONTENTVIEW_GOMU.dlgGomu_rdo4_text_click);
$("#text_dlgGomu_rdo4").on({
'click touchend': function(ev){
CONTENTVIEW_GOMU.dlgGomu_rdo4_text_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
}); });
......
abvw/js/contentview_InitObjects.js
...@@ -176,7 +176,18 @@ CONTENTVIEW_INITOBJECT.initPage = function() { ...@@ -176,7 +176,18 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
/* copy text */ /* copy text */
$('#copytext').click(CONTENTVIEW_EVENTS.showCopyText); $('#copytext').click(CONTENTVIEW_EVENTS.showCopyText);
/* close copy text dialog */ /* close copy text dialog */
$("#copyTextClosing").click(CONTENTVIEW_EVENTS.closeCopyTextBox); //$("#copyTextClosing").click(CONTENTVIEW_EVENTS.closeCopyTextBox);
$("#copyTextClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closeCopyTextBox(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
} }
/*event click next page button */ /*event click next page button */
...@@ -194,7 +205,18 @@ CONTENTVIEW_INITOBJECT.initPage = function() { ...@@ -194,7 +205,18 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
$("#imgHome").click(CONTENTVIEW_EVENTS.imgHome_click); $("#imgHome").click(CONTENTVIEW_EVENTS.imgHome_click);
$("#btn_show_memo").click(CONTENTVIEW_CREATEOBJECT.showEditMemo); $("#btn_show_memo").click(CONTENTVIEW_CREATEOBJECT.showEditMemo);
$("#btn_copy_memo").click(CONTENTVIEW_CREATEOBJECT.copyMemo); $("#btn_copy_memo").click(CONTENTVIEW_CREATEOBJECT.copyMemo);
$('#memoClosing').click(CONTENTVIEW_EVENTS.closePopUpCopyMemo); //$('#memoClosing').click(CONTENTVIEW_EVENTS.closePopUpCopyMemo);
$("#memoClosing").on({
'click touchend': function(ev){
CONTENTVIEW_EVENTS.closePopUpCopyMemo(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#liAddMemo').click(CONTENTVIEW_EVENTS.click_liAddMemo); $('#liAddMemo').click(CONTENTVIEW_EVENTS.click_liAddMemo);
$('#liCopyMemo').click(CONTENTVIEW_EVENTS.click_liCopyMemo); $('#liCopyMemo').click(CONTENTVIEW_EVENTS.click_liCopyMemo);
$('#liDeleteMemo').click(CONTENTVIEW_EVENTS.click_liDeleteMemo); $('#liDeleteMemo').click(CONTENTVIEW_EVENTS.click_liDeleteMemo);
...@@ -547,8 +569,99 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){ ...@@ -547,8 +569,99 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
//enable SpecifyControl //enable SpecifyControl
CONTENTVIEW.enableSpecifyControl(); CONTENTVIEW.enableSpecifyControl();
//Display overlay dialog for specify content type //ビデオコンテンツの場合はキャッシュ確認
CONTENTVIEW.displayOverlayForSpecifyContentType(); if(contentType == ContentTypeKeys.Type_Video){
//ファイルシステムが有効であればキャッシュ確認
if( CONTENTVIEW_FILESYSTEM.fs == null ){
//Display overlay dialog for specify content type
CONTENTVIEW.displayOverlayForSpecifyContentType(null);
} else {
var resourceId = CONTENTVIEW.getVideoContentResourceId(CONTENTVIEW_GENERAL.contentID);
//キャッシュが存在するか確認
var fileName = CONTENTVIEW_GENERAL.contentID + "/res_" + resourceId + ".dat";
CONTENTVIEW_FILESYSTEM.fs.root.getFile('/abook/' + fileName, { create: false },
function(fileEntry){
fileEntry.file(
function(file){
var url = window.URL || window.webkitURL;
var resSrc = url.createObjectURL(file);
//AVWEB.avwLog("read cache: createObjectURL " + resSrc);
CONTENTVIEW.displayOverlayForSpecifyContentType(resSrc);
}
);
},
function(err){ // 失敗時のコールバック関数
//AVWEB.avwLog("NotRead FileSystem");
//キャッシュ化
var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function(){
if (this.readyState == 4 && this.status == 200){
CONTENTVIEW_FILESYSTEM.isXhrBusy = false;
$('#divImageLoading').css('display', 'none');
//this.response is what you're looking for
//AVWEB.avwLog(this.response, typeof this.response);
CONTENTVIEW_FILESYSTEM.fs.root.getFile(
'/abook/' + fileName,
{create: true},
function(fileEntry){
fileEntry.createWriter(
function(fileWriter) {
fileWriter.onwriteend = function(e) {
//AVWEB.avwLog('RES書き込み完了');
};
fileWriter.onerror = function(e) {
//AVWEB.avwLog('RES書き込みエラー: ' + e.toString());
};
var blobData = new Blob([xhr.response], {type:"application/octet-stream"});
fileWriter.write(blobData);
}
);
},
CONTENTVIEW_FILESYSTEM.errorHandler
);
} else {
if( this.readyState == 2 ){
//AVWEB.avwLog("onreadystatechange:" + this.readyState + " " + this.status);
CONTENTVIEW_FILESYSTEM.isXhrBusy = true;
$('#divImageLoading').css('z-index', '99999');
$('#divImageLoading').css('display', 'block');
}
//AVWEB.avwLog("onreadystatechange:" + this.readyState + " " + this.status);
}
};
var resourceUrl = CONTENTVIEW.downloadResourceById(CONTENTVIEW_GENERAL.contentID);
if( !CONTENTVIEW_FILESYSTEM.isXhrBusy ){
xhr.open('GET', resourceUrl);
xhr.responseType = 'blob';
xhr.send();
} else {
//AVWEB.avwLog("xhr is busy.");
}
//タグは書き出し
CONTENTVIEW.displayOverlayForSpecifyContentType(resourceUrl);
}
);
}
} else {
//Display overlay dialog for specify content type
CONTENTVIEW.displayOverlayForSpecifyContentType(null);
}
//Resize window //Resize window
$(window).resize(function () { $(window).resize(function () {
......
abvw/js/contentview_Maker.js
...@@ -50,17 +50,92 @@ CONTENTVIEW_MAKER.Maker_handleColorPickerEvent = function (){ ...@@ -50,17 +50,92 @@ CONTENTVIEW_MAKER.Maker_handleColorPickerEvent = function (){
$('#makerColorwrapper').bind('mouseleave', CONTENTVIEW_MAKER.Maker_colorWrapperMouseLeaveFunction); $('#makerColorwrapper').bind('mouseleave', CONTENTVIEW_MAKER.Maker_colorWrapperMouseLeaveFunction);
} }
$('#Maker_btnOk').live('click', CONTENTVIEW_MAKER.Maker_dspOK_click); //$('#Maker_btnOk').live('click', CONTENTVIEW_MAKER.Maker_dspOK_click);
$('#Maker_btnCancel').live('click', CONTENTVIEW_MAKER.Maker_dspCancel_click); $("#Maker_btnOk").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.Maker_dspOK_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#Maker_btnCancel').live('click', CONTENTVIEW_MAKER.Maker_dspCancel_click);
$("#Maker_btnCancel").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.Maker_dspCancel_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
CONTENTVIEW_MAKER.Maker_SetDefaultValue(); CONTENTVIEW_MAKER.Maker_SetDefaultValue();
$('#marker-small-text').live('click', CONTENTVIEW_MAKER.markerSmallTextClick); //$('#marker-small-text').live('click', CONTENTVIEW_MAKER.markerSmallTextClick);
$('#marker-medium-text').live('click', CONTENTVIEW_MAKER.markerMediumTextClick); $("#marker-small-text").on({
$('#marker-large-text').live('click', CONTENTVIEW_MAKER.markerLargeTextClick); 'click touchend': function(ev){
$('#marker-oversize-text').live('click', CONTENTVIEW_MAKER.markerOversizeTextClick); CONTENTVIEW_MAKER.markerSmallTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#marker-medium-text').live('click', CONTENTVIEW_MAKER.markerMediumTextClick);
$("#marker-medium-text").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.markerMediumTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#marker-large-text').live('click', CONTENTVIEW_MAKER.markerLargeTextClick);
$("#marker-large-text").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.markerLargeTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#marker-oversize-text').live('click', CONTENTVIEW_MAKER.markerOversizeTextClick);
$("#marker-oversize-text").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.markerOversizeTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#dlgMaker .colorpicker').live('click', CONTENTVIEW_MAKER.Maker_colorPickerClickFunction);
$("#dlgMaker .colorpicker").on({
'click touchend': function(ev){
CONTENTVIEW_MAKER.Maker_colorPickerClickFunction(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#dlgMaker .colorpicker').live('click', CONTENTVIEW_MAKER.Maker_colorPickerClickFunction);
}; };
CONTENTVIEW_MAKER.markerSmallTextClick = function(){ CONTENTVIEW_MAKER.markerSmallTextClick = function(){
......
abvw/js/contentview_Marking.js
...@@ -459,20 +459,151 @@ CONTENTVIEW_MARKING.ShowMarking = function() { ...@@ -459,20 +459,151 @@ CONTENTVIEW_MARKING.ShowMarking = function() {
// Setting dialog // Setting dialog
$(function () { $(function () {
$("#dlgMarking_dspSave").click(CONTENTVIEW_MARKING.dlgMarking_dspSave_click); //$("#dlgMarking_dspSave").click(CONTENTVIEW_MARKING.dlgMarking_dspSave_click);
$("#dlgMarking_dspCancel").click(CONTENTVIEW_MARKING.dlgMarking_dspCancel_click); $("#dlgMarking_dspSave").on({
$("#dlgMarking_dspPgClear").click(CONTENTVIEW_MARKING.dlgMarking_dspPgClear_click); 'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_dspSave_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_dspCancel").click(CONTENTVIEW_MARKING.dlgMarking_dspCancel_click);
$("#dlgMarking_dspCancel").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_dspCancel_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_dspPgClear").click(CONTENTVIEW_MARKING.dlgMarking_dspPgClear_click);
$("#dlgMarking_dspPgClear").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_dspPgClear_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
// Icons // Icons
$("#dlgMarking_imgMin").click(CONTENTVIEW_MARKING.dlgMarking_imgMin_click); //$("#dlgMarking_imgMin").click(CONTENTVIEW_MARKING.dlgMarking_imgMin_click);
$("#dlgMarking_imgMax").click(CONTENTVIEW_MARKING.dlgMarking_imgMax_click); $("#dlgMarking_imgMin").on({
$("#dlgMarking_imgClose").click(CONTENTVIEW_MARKING.dlgMarking_imgClose_click); 'click touchend': function(ev){
$("#dlgMarking_imgPen").click(CONTENTVIEW_MARKING.dlgMarking_imgPen_click); CONTENTVIEW_MARKING.dlgMarking_imgMin_click(ev);
$("#dlgMarking_imgPenOption").click(CONTENTVIEW_MARKING.dlgMarking_imgPenOption_click); return false;
$("#dlgMarking_imgMaker").click(CONTENTVIEW_MARKING.dlgMarking_imgMaker_click); },
$("#dlgMarking_imgMakerOption").click(CONTENTVIEW_MARKING.dlgMarking_imgMakerOption_click); 'touchstart touchmove': function(){
$("#dlgMarking_imgEraser").click(CONTENTVIEW_MARKING.dlgMarking_imgEraser_click); //これを入れないと次にダイアログを開くと表示位置が大きくズレる
$("#dlgMarking_imgEraserOption").click(CONTENTVIEW_MARKING.dlgMarking_imgEraserOption_click); return false;
}
});
//$("#dlgMarking_imgMax").click(CONTENTVIEW_MARKING.dlgMarking_imgMax_click);
$("#dlgMarking_imgMax").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgMax_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgClose").click(CONTENTVIEW_MARKING.dlgMarking_imgClose_click);
$("#dlgMarking_imgClose").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgClose_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgPen").click(CONTENTVIEW_MARKING.dlgMarking_imgPen_click);
$("#dlgMarking_imgPen").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgPen_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgPenOption").click(CONTENTVIEW_MARKING.dlgMarking_imgPenOption_click);
$("#dlgMarking_imgPenOption").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgPenOption_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgMaker").click(CONTENTVIEW_MARKING.dlgMarking_imgMaker_click);
$("#dlgMarking_imgMaker").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgMaker_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgMakerOption").click(CONTENTVIEW_MARKING.dlgMarking_imgMakerOption_click);
$("#dlgMarking_imgMakerOption").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgMakerOption_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgEraser").click(CONTENTVIEW_MARKING.dlgMarking_imgEraser_click);
$("#dlgMarking_imgEraser").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgEraser_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgMarking_imgEraserOption").click(CONTENTVIEW_MARKING.dlgMarking_imgEraserOption_click);
$("#dlgMarking_imgEraserOption").on({
'click touchend': function(ev){
CONTENTVIEW_MARKING.dlgMarking_imgEraserOption_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
/* /*
$('#dlgMarking').dialog({ $('#dlgMarking').dialog({
autoOpen: false, autoOpen: false,
......
abvw/js/contentview_Memo.js
...@@ -39,7 +39,18 @@ CONTENTVIEW_MEMO.handleMemoEventFunction = function(){ ...@@ -39,7 +39,18 @@ CONTENTVIEW_MEMO.handleMemoEventFunction = function(){
$('#Memo_btnSave').click(CONTENTVIEW_MEMO.buttonSaveFunction); $('#Memo_btnSave').click(CONTENTVIEW_MEMO.buttonSaveFunction);
$('#Memo_btnDel').click(CONTENTVIEW_MEMO.MemoDelFunction); $('#Memo_btnDel').click(CONTENTVIEW_MEMO.MemoDelFunction);
$('#Memo_btnCancel').click(CONTENTVIEW_MEMO.MemoCancelFunction); $('#Memo_btnCancel').click(CONTENTVIEW_MEMO.MemoCancelFunction);
$('.delete').click(CONTENTVIEW_MEMO.MemoCancelFunction); //$('.delete').click(CONTENTVIEW_MEMO.MemoCancelFunction);
$("#memoClosing2").on({
'click touchend': function(ev){
CONTENTVIEW_MEMO.MemoCancelFunction(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
}; };
CONTENTVIEW_MEMO.memoSaveFunction = function(){ CONTENTVIEW_MEMO.memoSaveFunction = function(){
......
abvw/js/contentview_Pen.js
...@@ -54,17 +54,94 @@ CONTENTVIEW_PEN.Pen_handleColorPickerEvent = function() { ...@@ -54,17 +54,94 @@ CONTENTVIEW_PEN.Pen_handleColorPickerEvent = function() {
$('#penColorwrapper').bind('mouseleave', CONTENTVIEW_PEN.Pen_colorWrapperMouseLeaveFunction); $('#penColorwrapper').bind('mouseleave', CONTENTVIEW_PEN.Pen_colorWrapperMouseLeaveFunction);
} }
$('#Pen_btnOk').live('click', CONTENTVIEW_PEN.Pen_dspOK_click); //$('#Pen_btnOk').live('click', CONTENTVIEW_PEN.Pen_dspOK_click);
$('#Pen_btnCancel').live('click', CONTENTVIEW_PEN.Pen_dspCancel_click); $("#Pen_btnOk").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.Pen_dspOK_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#Pen_btnCancel').live('click', CONTENTVIEW_PEN.Pen_dspCancel_click);
$("#Pen_btnCancel").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.Pen_dspCancel_click(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
CONTENTVIEW_PEN.Pen_SetDefaultValue(); CONTENTVIEW_PEN.Pen_SetDefaultValue();
$('#pen-small-text').live('click', CONTENTVIEW_PEN.penSmallTextClick); //$('#pen-small-text').live('click', CONTENTVIEW_PEN.penSmallTextClick);
$('#pen-medium-text').live('click', CONTENTVIEW_PEN.penMediumTextClick); $("#pen-small-text").on({
$('#pen-large-text').live('click', CONTENTVIEW_PEN.penLargeTextClick); 'click touchend': function(ev){
$('#pen-oversize-text').live('click', CONTENTVIEW_PEN.penOversizeTextClick); CONTENTVIEW_PEN.penSmallTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#pen-medium-text').live('click', CONTENTVIEW_PEN.penMediumTextClick);
$("#pen-medium-text").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.penMediumTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#pen-large-text').live('click', CONTENTVIEW_PEN.penLargeTextClick);
$("#pen-large-text").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.penLargeTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$('#pen-oversize-text').live('click', CONTENTVIEW_PEN.penOversizeTextClick);
$("#pen-oversize-text").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.penOversizeTextClick(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#dlgPen .colorpicker').live('click', CONTENTVIEW_PEN.Pen_colorPickerClickFunction); //$('#dlgPen .colorpicker').live('click', CONTENTVIEW_PEN.Pen_colorPickerClickFunction);
$("#dlgPen .colorpicker").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.Pen_colorPickerClickFunction(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
}; };
CONTENTVIEW_PEN.penSmallTextClick = function(){ CONTENTVIEW_PEN.penSmallTextClick = function(){
......
abvw/js/home.js
...@@ -2313,7 +2313,7 @@ HOME.syncMarkingContent = function() { ...@@ -2313,7 +2313,7 @@ HOME.syncMarkingContent = function() {
HOME.syncContentData = function() { HOME.syncContentData = function() {
if (ClientData.common_contentDataChkFlg() == 'true') { if (ClientData.common_contentDataChkFlg() == 'true') {
HOME.syncReadingContent(); //HOME.syncReadingContent(); //#14290 履歴画面でも取得するので省略
HOME.syncBookmarkContent(); HOME.syncBookmarkContent();
HOME.syncMemoContent(); HOME.syncMemoContent();
HOME.syncMarkingContent(); HOME.syncMarkingContent();
......
abvw/js/login.js
...@@ -180,7 +180,7 @@ LOGIN.processLogin = function() { ...@@ -180,7 +180,7 @@ LOGIN.processLogin = function() {
var paramContentID = COMMON.getUrlParam('cid', ''); var paramContentID = COMMON.getUrlParam('cid', '');
AVWEB.avwCmsApiWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params, function (data) { AVWEB.avwCmsApiWithUrl(apiLoginUrl, null, 'webClientLogin', 'GET', params, function (data) {
//requirePasswordChange = data.requirePasswordChange; requirePasswordChange = data.requirePasswordChange;
LOGIN.userinfo_sid = data.sid; LOGIN.userinfo_sid = data.sid;
LOGIN.userInfo_userName = data.userName; LOGIN.userInfo_userName = data.userName;
LOGIN.optionList = data.serviceOptionList; LOGIN.optionList = data.serviceOptionList;
......
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