Skip to content

C
check
Commit d7a9054c by Motohisa Nakano
Options

20121207-1

parent b9c45397
Showing with 111 additions and 59 deletions
abvw/common/json/lang/lang-en.json
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
"dspTitleNm":"Title", "dspTitleNm":"Title",
"dspTitleNmKn":"Title（Kana）", "dspTitleNmKn":"Title（Kana）",
"txtPubDt":"Released Date", "txtPubDt":"Released Date",
"txtRecordNum":" ", "txtRecordNum":"",
"txtRecordTotal":" ", "txtRecordTotal":"",
"dspViewMore":">> Next {0} contents", "dspViewMore":">> Next {0} contents",
"txtGen":"Genre", "txtGen":"Genre",
"txtGr":"Group", "txtGr":"Group",
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"Logout", "dspBkCancel":"Logout",
"txtSearchResult":"Result", "txtSearchResult":"Result",
"dspHome":"Home", "dspHome":"Home",
"txtLoginUser":"(Ver.20121206-3)User:", "txtLoginUser":"(Ver.20121207-1)User:",
"txtAll":"All", "txtAll":"All",
"txtMkgSize":"Size", "txtMkgSize":"Size",
"txtMkgS":"S", "txtMkgS":"S",
......
abvw/common/json/lang/lang-ja.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト", "dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果", "txtSearchResult":"検索結果",
"dspHome":"ホーム", "dspHome":"ホーム",
"txtLoginUser":"(Ver.20121206-3)ログイン中：", "txtLoginUser":"(Ver.20121207-1)ログイン中：",
"txtAll":"すべて", "txtAll":"すべて",
"txtMkgSize":"太さ", "txtMkgSize":"太さ",
"txtMkgS":"小", "txtMkgS":"小",
......
abvw/common/json/lang/lang-ko.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃", "dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과", "txtSearchResult":"검색 결과",
"dspHome":"홈", "dspHome":"홈",
"txtLoginUser":"(Ver.20121206-3)로그인 중:", "txtLoginUser":"(Ver.20121207-1)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
......
abvw/contentsearch.html
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</style> </style>
<!-- script definition --> <!-- script definition -->
<script> <script>
LockScreen(); //LockScreen();
</script> </script>
</head> </head>
<body> <body>
......
abvw/history.html
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</style> </style>
<!-- script definition --> <!-- script definition -->
<script> <script>
LockScreen(); //LockScreen();
</script> </script>
</head> </head>
<body> <body>
......
abvw/home.html
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</style> </style>
<!-- script definition --> <!-- script definition -->
<script> <script>
LockScreen(); //LockScreen();
</script> </script>
</head> </head>
......
abvw/js/bookmark.js
...@@ -28,6 +28,8 @@ $(document).ready(function () { ...@@ -28,6 +28,8 @@ $(document).ready(function () {
if (!avwCheckLogin(ScreenIds.Login)) return; if (!avwCheckLogin(ScreenIds.Login)) return;
LockScreen();
document.title = i18nText('dspShiori') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('dspShiori') + ' | ' + i18nText('sysAppTitle');
// Set bookmark screen // Set bookmark screen
...@@ -258,14 +260,18 @@ function ShowBookmark() { ...@@ -258,14 +260,18 @@ function ShowBookmark() {
hasMemo = true; hasMemo = true;
} }
} }
if (IsErrorPage(contentid, pageNo)) { // if (IsErrorPage(contentid, pageNo)) {
insertRowError(contentid, htmlEncode(ClientData.BookMarkData()[nIndex].contentTitle), pageNo); // insertRowError(contentid, htmlEncode(ClientData.BookMarkData()[nIndex].contentTitle), pageNo);
} // }
else { // else {
callApi.execute(contentid, ClientData.userInfo_sid(), pageNo, hasMemo, hasMarking, htmlEncode(ClientData.BookMarkData()[nIndex].contentTitle), nIndex); // callApi.execute(contentid, ClientData.userInfo_sid(), pageNo, hasMemo, hasMarking, htmlEncode(ClientData.BookMarkData()[nIndex].contentTitle), nIndex);
} // }
callApi.execute(contentid, ClientData.userInfo_sid(), pageNo, hasMemo, hasMarking, htmlEncode(ClientData.BookMarkData()[nIndex].contentTitle), nIndex);
} }
$("a[name='dspRead']").unbind('click');
$("a[name='dspRead']").click(dspRead_Click);
} }
// Hide all sorting symbol // Hide all sorting symbol
function HideSorting() { function HideSorting() {
...@@ -484,23 +490,38 @@ var callApi = { ...@@ -484,23 +490,38 @@ var callApi = {
this.pageNo = pageNo; this.pageNo = pageNo;
avwCmsApiSync(ClientData.userInfo_accountPath(), "webContentPage", "GET", { contentId: contentid, sid: sid, pageNos: pageNo, thumbnailFlg: 1 }, avwCmsApiSync(ClientData.userInfo_accountPath(), "webContentPage", "GET", { contentId: contentid, sid: sid, pageNos: pageNo, thumbnailFlg: 1 },
function (data) { function (data) {
if (data.pages.length == 0) {
// Page does not exist
AddErrorPage(contentid, pageNo);
insertRowError(contentid, htmlEncode(contentTitle), pageNo);
}
else {
// Update local title to be equal to server
UpdateBookmark(contentid, pageNo, data.contentTitle, data.contentTitleKana);
contentTitle = data.contentTitle;
// Insert to grid
insertRow(contentid, "data:image/jpeg;base64," + data.pages[0].pageThumbnail, htmlEncode(contentTitle), data.pages[0].pageText, pageNo, hasMemo, hasMarking, index);
}
/*
// Update local title to be equal to server // Update local title to be equal to server
UpdateBookmark(contentid, pageNo, data.contentTitle, data.contentTitleKana); UpdateBookmark(contentid, pageNo, data.contentTitle, data.contentTitleKana);
contentTitle = data.contentTitle; contentTitle = data.contentTitle;
for (var nIndex2 = 0; nIndex2 < data.pages.length; nIndex2++) { for (var nIndex2 = 0; nIndex2 < data.pages.length; nIndex2++) {
if (pageNo == data.pages[nIndex2].pageNo) { if (pageNo == data.pages[nIndex2].pageNo) {
// Update bookmark // Update bookmark
// Insert to grid // Insert to grid
insertRow(contentid, "data:image/jpeg;base64," + data.pages[nIndex2].pageThumbnail, htmlEncode(contentTitle), data.pages[nIndex2].pageText, pageNo, hasMemo, hasMarking, index); insertRow(contentid, "data:image/jpeg;base64," + data.pages[nIndex2].pageThumbnail, htmlEncode(contentTitle), data.pages[nIndex2].pageText, pageNo, hasMemo, hasMarking, index);
//TotalThread--; //TotalThread--;
break; break;
} }
} }
$("a[name='dspRead']").unbind('click'); $("a[name='dspRead']").unbind('click');
$("a[name='dspRead']").click(dspRead_Click); $("a[name='dspRead']").click(dspRead_Click);
*/
}, },
null null
); );
...@@ -717,7 +738,7 @@ $(function () { ...@@ -717,7 +738,7 @@ $(function () {
$("#dspTitleNmKn_Seperate").show(); $("#dspTitleNmKn_Seperate").show();
} }
LockScreen(); // LockScreen();
}); });
...@@ -748,6 +769,22 @@ function IsErrorContent(strContentId) { ...@@ -748,6 +769,22 @@ function IsErrorContent(strContentId) {
} }
return isError; return isError;
} }
/*
Check a content is checked + ok
*/
function IsOKCheckedContent(strContentId) {
var isOK = false;
for (var nIndex = 0; nIndex < collection_contents.length; nIndex++) {
if (strContentId == collection_contents[nIndex].contentid) {
isOK = true;
break;
}
}
return isOK;
}
/* /*
Check a page is error or not (error pages were checked before) Check a page is error or not (error pages were checked before)
*/ */
...@@ -907,19 +944,22 @@ function SyncContent() { ...@@ -907,19 +944,22 @@ function SyncContent() {
// Check existence of content [start] // Check existence of content [start]
// ================================== // ==================================
if (IsErrorContent(oneBookMark.contentid) == false) { if (IsErrorContent(oneBookMark.contentid) == false) {
if (!IsExistContent(oneBookMark.contentid)) { // If content is ok + checked
// Add to list of error content if (IsOKCheckedContent(oneBookMark.contentid) == false) {
bookmark_errorContent.push({contentid: oneBookMark.contentid}); if (!IsExistContent(oneBookMark.contentid)) {
// Remove bookmark // Add to list of error content
arrBookmarks.splice(nIndex, 1); bookmark_errorContent.push({ contentid: oneBookMark.contentid });
ClientData.isChangedBookmark(true); // Remove bookmark
} arrBookmarks.splice(nIndex, 1);
// ================================== ClientData.isChangedBookmark(true);
// Check existence of content [ end ] }
// ================================== // ==================================
else { // Check existence of content [ end ]
// Add nromal content // ==================================
AddContent(oneBookMark.contentid); else {
// Add nromal content
AddContent(oneBookMark.contentid);
}
} }
} }
else { else {
...@@ -931,7 +971,7 @@ function SyncContent() { ...@@ -931,7 +971,7 @@ function SyncContent() {
ClientData.BookMarkData(arrBookmarks); ClientData.BookMarkData(arrBookmarks);
// Call sync pages // Call sync pages
SyncPages(); //SyncPages();
} }
/* /*
......
abvw/js/contentsearch.js
...@@ -45,6 +45,8 @@ $(document).ready(function(){ ...@@ -45,6 +45,8 @@ $(document).ready(function(){
return; return;
} }
LockScreen();
document.title = i18nText('txtSearchResult') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('txtSearchResult') + ' | ' + i18nText('sysAppTitle');
// Set bookmark screen ClientData.BookmarkScreen(ScreenIds.ContentSearch); // Set bookmark screen ClientData.BookmarkScreen(ScreenIds.ContentSearch);
......
abvw/js/contentview.js
...@@ -558,7 +558,7 @@ PageObject.prototype.drawPageObject = function(context) { ...@@ -558,7 +558,7 @@ PageObject.prototype.drawPageObject = function(context) {
// } // }
// //
// } // }
// flip(); // flip();
/* draw marking */ /* draw marking */
drawMarkingOnScreen(); drawMarkingOnScreen();
...@@ -1145,7 +1145,7 @@ function onClick_CanvasMain(event){ ...@@ -1145,7 +1145,7 @@ function onClick_CanvasMain(event){
var hitPageObj = getContent().currentPage.hitTest(imagePt.x, imagePt.y); var hitPageObj = getContent().currentPage.hitTest(imagePt.x, imagePt.y);
if(hitPageObj) { if(hitPageObj) {
//console.log("PageObject Hit!! Id: " + hitPageObj.id); //console.log("PageObject Hit!! Id: " + hitPageObj.id);
hitPageObj.action(); hitPageObj.action();
}else{ }else{
...@@ -1209,7 +1209,7 @@ function mouseMove_canvasMain(event){ ...@@ -1209,7 +1209,7 @@ function mouseMove_canvasMain(event){
// scaling // scaling
// var sx = (destRect.right - destRect.left) / (srcRect.right - srcRect.left); // var sx = (destRect.right - destRect.left) / (srcRect.right - srcRect.left);
// var sy = (destRect.bottom - destRect.top) / (srcRect.bottom - srcRect.top); // var sy = (destRect.bottom - destRect.top) / (srcRect.bottom - srcRect.top);
var sx = 1 / userScale; var sx = 1 / userScale;
...@@ -1264,7 +1264,7 @@ function mouseMove_canvasMain(event){ ...@@ -1264,7 +1264,7 @@ function mouseMove_canvasMain(event){
// //
// //
// //
// } // }
} }
...@@ -1308,7 +1308,7 @@ function mouseMove_canvasMain(event){ ...@@ -1308,7 +1308,7 @@ function mouseMove_canvasMain(event){
} }
}else{ }else{
$('#button_next_canvas').css('opacity','0'); $('#button_next_canvas').css('opacity','0');
} }
} }
function mouseDown_CanvasMain(event){ function mouseDown_CanvasMain(event){
...@@ -1341,7 +1341,7 @@ function mouseDown_CanvasMain(event){ ...@@ -1341,7 +1341,7 @@ function mouseDown_CanvasMain(event){
// document.body.style.mozUserSelect = document.body.style.webkitUserSelect = document.body.style.userSelect = 'none'; // document.body.style.mozUserSelect = document.body.style.webkitUserSelect = document.body.style.userSelect = 'none';
// lastX = event.offsetX || (event.pageX - canvas_main.offsetLeft); // lastX = event.offsetX || (event.pageX - canvas_main.offsetLeft);
// lastY = event.offsetY || (event.pageY - canvas_main.offsetTop); // lastY = event.offsetY || (event.pageY - canvas_main.offsetTop);
// dragStart = context_main.transformedPoint(lastX,lastY); // dragStart = context_main.transformedPoint(lastX,lastY);
} }
...@@ -1901,7 +1901,7 @@ function flip() { ...@@ -1901,7 +1901,7 @@ function flip() {
context.drawImage(offscreen, context.drawImage(offscreen,
srcRect.left, srcRect.top, srcRect.right - srcRect.left, srcRect.bottom - srcRect.top, srcRect.left, srcRect.top, srcRect.right - srcRect.left, srcRect.bottom - srcRect.top,
destRect.left, destRect.top, width, height); destRect.left, destRect.top, width, height);
context.restore(); context.restore();
}; };
...@@ -2204,6 +2204,9 @@ var audioType3 = function(mediaType, actionType, id, imageUrl, x, y, w, h, visib ...@@ -2204,6 +2204,9 @@ var audioType3 = function(mediaType, actionType, id, imageUrl, x, y, w, h, visib
}else{ }else{
createAudio(audioFile, playType); createAudio(audioFile, playType);
this.setup(mediaType, actionType, id, null, x, y, w, h, visible, null,null); this.setup(mediaType, actionType, id, null, x, y, w, h, visible, null,null);
this.action = function(){
}
} }
}; };
audioType3.prototype = new PageObject(); audioType3.prototype = new PageObject();
...@@ -2300,8 +2303,7 @@ function createAudio(audio,type){ ...@@ -2300,8 +2303,7 @@ function createAudio(audio,type){
if(document.getElementById("play_audio_1") != undefined){ if(document.getElementById("play_audio_1") != undefined){
//document.getElementById("play_audio_1").load(); //document.getElementById("play_audio_1").load();
}else{ }else{
if(ClientData.userOpt_musicMode() == "1"){ if(ClientData.userOpt_musicMode() == "1"){
if(avwUserEnvObj.browser == 'firefox'){ if(avwUserEnvObj.browser == 'firefox'){
$('#playaudioallpage').html( $('#playaudioallpage').html(
...@@ -2312,7 +2314,7 @@ function createAudio(audio,type){ ...@@ -2312,7 +2314,7 @@ function createAudio(audio,type){
' <audio id="play_audio_1" loop="loop" autoplay ="autoplay">' + ' <audio id="play_audio_1" loop="loop" autoplay ="autoplay">' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' + ' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' </audio>' ' </audio>'
); );
} }
}else{ }else{
if(avwUserEnvObj.browser == 'firefox'){ if(avwUserEnvObj.browser == 'firefox'){
...@@ -2454,11 +2456,13 @@ function changeImageType4(objTarget,nIndex,nIndex1){ ...@@ -2454,11 +2456,13 @@ function changeImageType4(objTarget,nIndex,nIndex1){
imageObj.src = objTarget[nIndex].dataObjects[nIndex1].fileName; imageObj.src = objTarget[nIndex].dataObjects[nIndex1].fileName;
} }
/* mediaType = 1 write text object*/ /* mediaType = 7 write text object*/
var text = function(mediaType, actionType, id, x, y, w, h, visible, actionFunction, content) { var text = function(mediaType, actionType, id, x, y, w, h, visible, actionFunction, content) {
//var imageUrl = displayText(x,y,w,h,id,content); //var imageUrl = displayText(x,y,w,h,id,content);
var imageUrl = getTextObjectImage(w, h, content) var imageUrl = getTextObjectImage(w, h, content)
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, actionFunction, null); this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, actionFunction, null);
this.action = function() {
}
}; };
text.prototype = new PageObject(); text.prototype = new PageObject();
......
abvw/js/header.js
...@@ -43,7 +43,6 @@ $(document).ready(function () { ...@@ -43,7 +43,6 @@ $(document).ready(function () {
$('div#header-searchbox').css('display', 'none'); $('div#header-searchbox').css('display', 'none');
//Display user name //Display user name
//$('#login-username').html(ClientData.userInfo_loginId());
$('#login-username').text(ClientData.userInfo_userName()); $('#login-username').text(ClientData.userInfo_userName());
......
abvw/js/history.js
...@@ -44,6 +44,8 @@ $(document).ready(function(){ ...@@ -44,6 +44,8 @@ $(document).ready(function(){
if (!avwCheckLogin(ScreenIds.Login)){ if (!avwCheckLogin(ScreenIds.Login)){
return; return;
} }
LockScreen();
document.title = i18nText('dspViewHistory') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('dspViewHistory') + ' | ' + i18nText('sysAppTitle');
...@@ -249,7 +251,7 @@ function renderGridView(){ ...@@ -249,7 +251,7 @@ function renderGridView(){
handleSortDisp(); handleSortDisp();
//Display user name //Display user name
$('#login-username').html(ClientData.userInfo_loginId()); $('#login-username').html(ClientData.userInfo_loginId_session());
//Refresh GridView //Refresh GridView
refreshGrid(); refreshGrid();
......
abvw/js/home.js
...@@ -76,8 +76,11 @@ $(document).ready(function () { ...@@ -76,8 +76,11 @@ $(document).ready(function () {
//Render Genre //Render Genre
getDataJsonFileGenre(); getDataJsonFileGenre();
getDataJsonFileGroup(); getDataJsonFileGroup();
// Lock screen is here, because of in getDataJsonFileGroup() called click to expand speified nodes of treeview
LockScreen();
//Change display type to bookshelf type //Change display type to bookshelf type
$('#control-bookshelf-type').click(changeDispBookShelfFunction); $('#control-bookshelf-type').click(changeDispBookShelfFunction);
...@@ -697,18 +700,18 @@ function getDataJsonFileGroup(){ ...@@ -697,18 +700,18 @@ function getDataJsonFileGroup(){
arrData.push(node); arrData.push(node);
} }
}); });
var tree1 = new TreeView(); var tree2 = new TreeView();
//tree1.TotalCount = totalCount; //tree1.TotalCount = totalCount;
if (group_totalcontent != -1) { if (group_totalcontent != -1) {
tree1.TotalCount = group_totalcontent; tree2.TotalCount = group_totalcontent;
} }
tree1.Show("list_1", arrData, "AddGroup_Callback"); tree2.Show("list_1", arrData, "AddGroup_Callback");
$("#list_1").treeview(); $("#list_1").treeview();
// Expand nodes // Expand nodes
for (var nIndex = 0; nIndex < tree1.ExpandNodes.length; nIndex++) { for (var nIndex = 0; nIndex < tree2.ExpandNodes.length; nIndex++) {
if ($("#" + tree1.ExpandNodes[nIndex]).parent()) { if ($("#" + tree2.ExpandNodes[nIndex]).parent()) {
var objParent = $("#" + tree1.ExpandNodes[nIndex]).parent(); var objParent = $("#" + tree2.ExpandNodes[nIndex]).parent();
var objChild = objParent.children()[0]; var objChild = objParent.children()[0];
if (objChild) { if (objChild) {
try { try {
......
abvw/js/settings.js
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
$(document).ready(function () { $(document).ready(function () {
if (!avwCheckLogin(ScreenIds.Login)) return; if (!avwCheckLogin(ScreenIds.Login)) return;
LockScreen();
document.title = i18nText('dspSetting') + ' | ' + i18nText('sysAppTitle'); document.title = i18nText('dspSetting') + ' | ' + i18nText('sysAppTitle');
...@@ -643,7 +645,7 @@ $(function () { ...@@ -643,7 +645,7 @@ $(function () {
// height: 450 // height: 450
// }); // });
LockScreen(); // LockScreen();
}); });
function openBackup() { function openBackup() {
......
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