Skip to content

C
check
Commit 16256f34 by Masaru Abe
Options

1.2.3ソース　手動マージ

parent 5eeca1bb
Showing with 736 additions and 71 deletions
abvw/common/js/avweb.js
...@@ -480,8 +480,14 @@ AVWEB._callCmsApi = function(url, accountPath, apiName, type, params, async, suc ...@@ -480,8 +480,14 @@ AVWEB._callCmsApi = function(url, accountPath, apiName, type, params, async, suc
if(error) { if(error) {
error(xmlHttpRequest, txtStatus, errorThrown); error(xmlHttpRequest, txtStatus, errorThrown);
} else { } else {
if(xmlHttpRequest.status == 403) {
AVWEB.showSystemError('sysErrorCallApi02');
}
else {
AVWEB.showSystemError(); 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,6 +852,17 @@ AVWEB.avwClearError = function() { ...@@ -836,6 +852,17 @@ AVWEB.avwClearError = function() {
/* ブラウザunload時に警告メッセージの出力設定を行う関数 */ /* ブラウザunload時に警告メッセージの出力設定を行う関数 */
AVWEB.avwSetLogoutNortice = function() { AVWEB.avwSetLogoutNortice = function() {
window.onbeforeunload = function(event) { window.onbeforeunload = function(event) {
//DHカスタム
if( ClientData.serviceOpt_daihatsu() == 'Y'){
if( "CONTENTVIEW_GENERAL.contentID" in window ){
if(CONTENTVIEW_GENERAL.contentID != null ){
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
COMMON.RegisterLog();
}
}
} else {
if(ClientData.isGetitsMode() || ClientData.isStreamingMode()){ if(ClientData.isGetitsMode() || ClientData.isStreamingMode()){
if(ClientData.isGetitsMode()){ if(ClientData.isGetitsMode()){
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
...@@ -851,6 +878,7 @@ AVWEB.avwSetLogoutNortice = function() { ...@@ -851,6 +878,7 @@ AVWEB.avwSetLogoutNortice = function() {
} }
return 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_CallApi.js
...@@ -11,6 +11,8 @@ CONTENTVIEW_CALLAPI.abapi = function(name, param, method, callback) { ...@@ -11,6 +11,8 @@ 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() {
//ファイルシステムが有効であればキャッシュ確認
if( CONTENTVIEW_FILESYSTEM.fs == null ){
//console.log("CONTENTVIEW_CALLAPI.getJsonContentInfo"); //console.log("CONTENTVIEW_CALLAPI.getJsonContentInfo");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 }, { contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
...@@ -28,7 +30,54 @@ CONTENTVIEW_CALLAPI.getJsonContentInfo = function() { ...@@ -28,7 +30,54 @@ CONTENTVIEW_CALLAPI.getJsonContentInfo = function() {
}, },
function (xmlHttpRequest, txtStatus, errorThrown) { function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen(); 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_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,6 +1248,8 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){ ...@@ -1220,6 +1248,8 @@ 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){
//ファイルシステムが有効であればキャッシュ確認
if( CONTENTVIEW_FILESYSTEM.fs == null ){
//console.log("CONTENTVIEW_GETDATA.renderNextPage"); //console.log("CONTENTVIEW_GETDATA.renderNextPage");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo }, { contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo },
...@@ -1233,7 +1263,46 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){ ...@@ -1233,7 +1263,46 @@ CONTENTVIEW_GETDATA.renderNextPage = function(){
}, },
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){
//ファイルシステムが有効であればキャッシュ確認
if( CONTENTVIEW_FILESYSTEM.fs == null ){
//console.log("CONTENTVIEW_GETDATA.renderPrevPage"); //console.log("CONTENTVIEW_GETDATA.renderPrevPage");
AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(), AVWEB.avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo }, { contentId: CONTENTVIEW_GENERAL.contentID, sid: ClientData.userInfo_sid(), pageNo: pageNo },
function (data) { function (data) {
CONTENTVIEW_GENERAL.prevPageImage = data; CONTENTVIEW_GENERAL.prevPageImage = data;
CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage) CONTENTVIEW_GENERAL.prevContent.setPageImages(CONTENTVIEW_GENERAL.totalPage, CONTENTVIEW_GENERAL.prevPageImage)
.setPageObjects(CONTENTVIEW_GENERAL.prevPageObjects) .setPageObjects(CONTENTVIEW_GENERAL.prevPageObjects)
.previousPage(); .previousPage();
},
function (xmlHttpRequest, txtStatus, errorThrown) {
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) { function (xmlHttpRequest, txtStatus, errorThrown) {
CONTENTVIEW.showErrorScreen(); 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){
$("#text_dlgGomu_rdo1").click(CONTENTVIEW_GOMU.dlgGomu_rdo1_text_click); CONTENTVIEW_GOMU.dlgGomu_dspOK_click(ev);
$("#text_dlgGomu_rdo2").click(CONTENTVIEW_GOMU.dlgGomu_rdo2_text_click); return false;
$("#text_dlgGomu_rdo3").click(CONTENTVIEW_GOMU.dlgGomu_rdo3_text_click); },
$("#text_dlgGomu_rdo4").click(CONTENTVIEW_GOMU.dlgGomu_rdo4_text_click); 'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
//$("#dlgGomu_dspCancel").click(CONTENTVIEW_GOMU.dlgGomu_dspCancel_click);
$("#dlgGomu_dspCancel").on({
'click touchend': function(ev){
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();
//ビデオコンテンツの場合はキャッシュ確認
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 //Display overlay dialog for specify content type
CONTENTVIEW.displayOverlayForSpecifyContentType(); 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").on({
'click touchend': function(ev){
CONTENTVIEW_PEN.Pen_colorPickerClickFunction(ev);
return false;
},
'touchstart touchmove': function(){
//これを入れないと次にダイアログを開くと表示位置が大きくズレる
return false;
}
});
$('#dlgPen .colorpicker').live('click', CONTENTVIEW_PEN.Pen_colorPickerClickFunction);
}; };
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