Skip to content

C
check
Commit 51de7ed6 by vietdo
Options

#9460【Web】メモの表示・非表示について

parent 6195cced
Showing with 70 additions and 3 deletions
abvw/inc_contentview.html
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
<div id="divCheckExistMarking" class="check_marking" style="display:none;"> <div id="divCheckExistMarking" class="check_marking" style="display:none;">
<img src="img/viewer/icon_marked.png" /> <img src="img/viewer/icon_marked.png" />
</div> </div>
<div id="divCheckExistMemo" class="check_marking" style="display:none;">
<img src="img/viewer/icon_memo.png" />
</div>
<header id ="header_toolbar" class="header__"> <header id ="header_toolbar" class="header__">
<div class = "wrapper_header"> <div class = "wrapper_header">
<div id ="top_toolbar" class="hdLcolumn fix"> <div id ="top_toolbar" class="hdLcolumn fix">
......
abvw/js/contentview.js
...@@ -3644,6 +3644,9 @@ CONTENTVIEW.setDefaultEvent = function() { ...@@ -3644,6 +3644,9 @@ CONTENTVIEW.setDefaultEvent = function() {
if ($('#divCheckExistMarking').length) { if ($('#divCheckExistMarking').length) {
document.getElementById('divCheckExistMarking').addEventListener('click', CONTENTVIEW_EVENTS.onClick_CanvasMain, false); document.getElementById('divCheckExistMarking').addEventListener('click', CONTENTVIEW_EVENTS.onClick_CanvasMain, false);
} }
if ($('#divCheckExistMemo').length) {
document.getElementById('divCheckExistMemo').addEventListener('click', CONTENTVIEW_EVENTS.onClick_CanvasMain, false);
}
if(CONTENTVIEW_GENERAL.avwUserEnvObj.isIos() == false && CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid() == false){ if(CONTENTVIEW_GENERAL.avwUserEnvObj.isIos() == false && CONTENTVIEW_GENERAL.avwUserEnvObj.isAndroid() == false){
document.getElementById('main').addEventListener('mousedown', CONTENTVIEW_EVENTS.mouseDown_CanvasMain, false); document.getElementById('main').addEventListener('mousedown', CONTENTVIEW_EVENTS.mouseDown_CanvasMain, false);
...@@ -4356,6 +4359,7 @@ CONTENTVIEW.draw = function(context, opt) { ...@@ -4356,6 +4359,7 @@ CONTENTVIEW.draw = function(context, opt) {
context.restore(); context.restore();
CONTENTVIEW_INITOBJECT.initImageCheckMarking(); CONTENTVIEW_INITOBJECT.initImageCheckMarking();
CONTENTVIEW_INITOBJECT.initImageCheckMemo();
}; };
//End Function : No.4 - Editor : Long - Date: 08/09/2013 - Summary : Edit function to draw multi canvas //End Function : No.4 - Editor : Long - Date: 08/09/2013 - Summary : Edit function to draw multi canvas
...@@ -4980,6 +4984,10 @@ CONTENTVIEW.sizingNotFull = function(width, height) { ...@@ -4980,6 +4984,10 @@ CONTENTVIEW.sizingNotFull = function(width, height) {
/* move image check marking*/ /* move image check marking*/
$('#divCheckExistMarking').css('top', '70px'); $('#divCheckExistMarking').css('top', '70px');
$('#divCheckExistMarking').show(); $('#divCheckExistMarking').show();
/* move image check memo*/
$('#divCheckExistMemo').css('top', '125px');
$('#divCheckExistMemo').show();
} }
}; };
...@@ -5048,6 +5056,14 @@ CONTENTVIEW.sizingFullSize = function(width, height) { ...@@ -5048,6 +5056,14 @@ CONTENTVIEW.sizingFullSize = function(width, height) {
} else { } else {
$('#divCheckExistMarking').show(); $('#divCheckExistMarking').show();
} }
/* move image check memo*/
$('#divCheckExistMemo').css('top', '60px');
if (ClientData.IsAddingMemo() == true) {
$('#divCheckExistMemo').hide();
} else {
$('#divCheckExistMemo').show();
}
} }
}; };
//End Function : No.4 - Editor : Long - Date : 08/09/2013 - Summary : //End Function : No.4 - Editor : Long - Date : 08/09/2013 - Summary :
...@@ -5634,6 +5650,7 @@ CONTENTVIEW.initScreen = function(){ ...@@ -5634,6 +5650,7 @@ CONTENTVIEW.initScreen = function(){
$('#header_toolbar').show(); $('#header_toolbar').show();
$('#txtSearch').val(''); $('#txtSearch').val('');
$('#divCheckExistMarking').hide(); $('#divCheckExistMarking').hide();
$('#divCheckExistMemo').hide();
$('#divCacheLoading').hide(); $('#divCacheLoading').hide();
$('#overlay').hide(); $('#overlay').hide();
$('#dialogPopUp').hide(); $('#dialogPopUp').hide();
......
abvw/js/contentview_CreateObjects.js
...@@ -2080,6 +2080,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () { ...@@ -2080,6 +2080,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () {
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
CONTENTVIEW_EVENTS.createLockLayout(false); CONTENTVIEW_EVENTS.createLockLayout(false);
CONTENTVIEW_INITOBJECT.initImageCheckMarking(); CONTENTVIEW_INITOBJECT.initImageCheckMarking();
CONTENTVIEW_INITOBJECT.initImageCheckMemo();
//#12373 //#12373
//console.log("tmpScale:" + tmpScale); //console.log("tmpScale:" + tmpScale);
...@@ -2153,10 +2154,12 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () { ...@@ -2153,10 +2154,12 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipNextPage = function () {
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
CONTENTVIEW_EVENTS.createLockLayout(false); CONTENTVIEW_EVENTS.createLockLayout(false);
CONTENTVIEW_INITOBJECT.initImageCheckMarking(); CONTENTVIEW_INITOBJECT.initImageCheckMarking();
CONTENTVIEW_INITOBJECT.initImageCheckMemo();
} }
}); });
} }
CONTENTVIEW_INITOBJECT.initImageCheckMarking(); CONTENTVIEW_INITOBJECT.initImageCheckMarking();
CONTENTVIEW_INITOBJECT.initImageCheckMemo();
} }
}; };
/* Flip Previous Page Transition */ /* Flip Previous Page Transition */
...@@ -2241,7 +2244,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () { ...@@ -2241,7 +2244,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () {
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
CONTENTVIEW_EVENTS.createLockLayout(false); CONTENTVIEW_EVENTS.createLockLayout(false);
CONTENTVIEW_INITOBJECT.initImageCheckMarking(); CONTENTVIEW_INITOBJECT.initImageCheckMarking();
CONTENTVIEW_INITOBJECT.initImageCheckMemo();
//#12373 //#12373
//console.log("tmpScale:" + tmpScale); //console.log("tmpScale:" + tmpScale);
if (tmpScale != 1) { if (tmpScale != 1) {
...@@ -2312,6 +2315,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () { ...@@ -2312,6 +2315,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipPreviousPage = function () {
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
CONTENTVIEW_EVENTS.createLockLayout(false); CONTENTVIEW_EVENTS.createLockLayout(false);
CONTENTVIEW_INITOBJECT.initImageCheckMarking(); CONTENTVIEW_INITOBJECT.initImageCheckMarking();
CONTENTVIEW_INITOBJECT.initImageCheckMemo();
} }
}); });
} }
...@@ -2395,7 +2399,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) { ...@@ -2395,7 +2399,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
/* set end log */ /* set end log */
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
CONTENTVIEW_INITOBJECT.initImageCheckMarking(); CONTENTVIEW_INITOBJECT.initImageCheckMarking();
CONTENTVIEW_INITOBJECT.initImageCheckMemo();
CONTENTVIEW_EVENTS.createLockLayout(false); CONTENTVIEW_EVENTS.createLockLayout(false);
//#12373 //#12373
...@@ -2474,6 +2478,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) { ...@@ -2474,6 +2478,7 @@ CONTENTVIEW_CREATEOBJECT.Transition.prototype.flipToPage = function (index) {
/* set end log */ /* set end log */
COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID); COMMON.SetEndLog(CONTENTVIEW_GENERAL.contentID);
CONTENTVIEW_INITOBJECT.initImageCheckMarking(); CONTENTVIEW_INITOBJECT.initImageCheckMarking();
CONTENTVIEW_INITOBJECT.initImageCheckMemo();
CONTENTVIEW_EVENTS.createLockLayout(false); CONTENTVIEW_EVENTS.createLockLayout(false);
......
abvw/js/contentview_InitObjects.js
...@@ -262,6 +262,10 @@ CONTENTVIEW_INITOBJECT.initPage = function() { ...@@ -262,6 +262,10 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
$('#divCheckExistMarking').css('top', '70px'); $('#divCheckExistMarking').css('top', '70px');
$('#divCheckExistMarking').hide(); $('#divCheckExistMarking').hide();
/* move image check memo*/
$('#divCheckExistMemo').css('top', '125px');
$('#divCheckExistMemo').hide();
/* disable controls */ /* disable controls */
CONTENTVIEW_GENERAL.isLoadingObject = true; CONTENTVIEW_GENERAL.isLoadingObject = true;
CONTENTVIEW_GENERAL.disableAllControl(); CONTENTVIEW_GENERAL.disableAllControl();
...@@ -812,7 +816,6 @@ CONTENTVIEW_INITOBJECT.initializeViewerComponent = function(viewId) { ...@@ -812,7 +816,6 @@ CONTENTVIEW_INITOBJECT.initializeViewerComponent = function(viewId) {
CONTENTVIEW_INITOBJECT.initImageCheckMarking = function() { CONTENTVIEW_INITOBJECT.initImageCheckMarking = function() {
/* set draw image if exist */ /* set draw image if exist */
var dataMarking = ClientData.MarkingData(); var dataMarking = ClientData.MarkingData();
var isExistMarking = false; var isExistMarking = false;
//Start Function: No.12 - Editor : Long //Start Function: No.12 - Editor : Long
...@@ -848,6 +851,45 @@ CONTENTVIEW_INITOBJECT.initImageCheckMarking = function() { ...@@ -848,6 +851,45 @@ CONTENTVIEW_INITOBJECT.initImageCheckMarking = function() {
} }
}; };
/* init image if exist memo in page */
CONTENTVIEW_INITOBJECT.initImageCheckMemo = function() {
/* set draw image if exist */
var dataMemo = ClientData.MemoData();
var isExistMemo = false;
//Start Function: No.12 - Editor : Long
var tempPageNo = 0;
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_Image)
{
tempPageNo = 1;
}
else{
tempPageNo = CONTENTVIEW.changePageIndex(CONTENTVIEW_GETDATA.getPageIndex());
}
//End Function: No.12 - Editor : Long
for (var nIndex = 0; nIndex < dataMemo.length; nIndex++) {
if (dataMemo[nIndex].contentid == CONTENTVIEW_GENERAL.contentID
&& dataMemo[nIndex].pageNo == tempPageNo) {
isExistMemo = true;
break;
}
}
/* init image display or not */
if (ClientData.IsAddingMemo() == true) {
$('#divCheckExistMemo').hide();
} else {
if (isExistMemo == true) {
$('#divCheckExistMemo').show();
} else {
$('#divCheckExistMemo').hide();
}
}
};
CONTENTVIEW_INITOBJECT.ready = function(){ CONTENTVIEW_INITOBJECT.ready = function(){
}; };
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