Commit 7b2b1007 by Masaru Abe

最終ページでメモを削除すると固まる問題

parent 76bb39ee
......@@ -247,7 +247,12 @@ CONTENTVIEW.changePageIndex = function(page_index) {
}
//End: Function No.12
else{
return CONTENTVIEW_GENERAL.dataWebContentPage.pages[page_index].pageNo;
//最後のページのメモを削除するとエラーになる暫定対応
if( CONTENTVIEW_GENERAL.dataWebContentPage.pages[page_index] ){
return CONTENTVIEW_GENERAL.dataWebContentPage.pages[page_index].pageNo;
} else {
return page_index - 1;
}
}
};
......@@ -3418,7 +3423,6 @@ CONTENTVIEW.ContentPage.prototype.findById = function (id) {
/* check status button move page when change page */
CONTENTVIEW.checkExistNextPrePage = function() {
//check next page
if (CONTENTVIEW_GETDATA.getContent().hasNextPage()) {
//$('#nextpage').show();
//COMMON.enable('#nextpage');
......@@ -3508,7 +3512,7 @@ CONTENTVIEW.checkExistNextPrePage = function() {
$('#button_pre_canvas').css('opacity', '0');
}
};
......@@ -3772,8 +3776,9 @@ CONTENTVIEW.disableControlsCopyMemo = function() {
/*enable all control when finish copy memo */
CONTENTVIEW.enableControlsCopyMemo = function() {
CONTENTVIEW.disableControlsCopyMemo();
/* set cursor pointer*/
$("#imgHome").css('cursor', 'pointer');
$("#imgBack").css('cursor', 'pointer');
......
......@@ -2030,7 +2030,6 @@ CONTENTVIEW_CREATEOBJECT.Content.prototype.setUpPage = function (pageIndex, opt)
/* check next page exists */
CONTENTVIEW_CREATEOBJECT.Content.prototype.hasNextPage = function () {
if ((this.pageIndex + 1) > (this.pageCount - 1)) {
return false;
}
......
......@@ -838,6 +838,8 @@ CONTENTVIEW_EVENTS.onUnlock = function() {
CONTENTVIEW_EVENTS.onClick_CanvasMain = function(event) {
//console.log("CONTENTVIEW_EVENTS.onClick_CanvasMain");
event.preventDefault();
if(CONTENTVIEW_GENERAL.isLoadingObject){
......
......@@ -93,15 +93,17 @@ CONTENTVIEW_MEMO.MemoDelFunction = function(){
CONTENTVIEW_GENERAL.isCopyMemo = false;
}
else{
var resultArr = ClientData.MemoData();
resultArr.splice(CONTENTVIEW_MEMO.EditIndex, 1);
ClientData.MemoData(resultArr);
//CONTENTVIEW_MEMO.targetDiv.dialog('close');
if(CONTENTVIEW_MEMO.memoCallbackFunc){
if(CONTENTVIEW_MEMO.memoCallbackFunc){
CONTENTVIEW_MEMO.memoCallbackFunc();
}
}
$("#overlay").hide();
CONTENTVIEW_MEMO.targetDiv.children().remove();
......@@ -116,7 +118,8 @@ CONTENTVIEW_MEMO.MemoDelFunction = function(){
//END TRB00054 - EDITOR : Long - Date : 09/19/2013 - Summary : Fix for remove loading icon when del memo
/* enable controls after finish copy */
CONTENTVIEW.enableControlsCopyMemo();
CONTENTVIEW.enableControlsCopyMemo();
};
CONTENTVIEW_MEMO.MemoCancelFunction = 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