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

abvw/js/contentview.js

@@ -247,7 +247,12 @@ CONTENTVIEW.changePageIndex = function(page_index) {
     }
     }
     //End: Function No.12
     //End: Function No.12
     else{
     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 */
 /* check status button move page when change page */
 CONTENTVIEW.checkExistNextPrePage = function() {
 CONTENTVIEW.checkExistNextPrePage = function() {
     //check next page
     //check next page
-    
     if (CONTENTVIEW_GETDATA.getContent().hasNextPage()) {
     if (CONTENTVIEW_GETDATA.getContent().hasNextPage()) {
         //$('#nextpage').show();
         //$('#nextpage').show();
         //COMMON.enable('#nextpage');
         //COMMON.enable('#nextpage');
@@ -3508,7 +3512,7 @@ CONTENTVIEW.checkExistNextPrePage = function() {
         $('#button_pre_canvas').css('opacity', '0');
         $('#button_pre_canvas').css('opacity', '0');
 
 
     }
     }
-
+    
 };
 };
 
 
 
 
@@ -3772,8 +3776,9 @@ CONTENTVIEW.disableControlsCopyMemo = function() {
 
 
 /*enable all control when finish copy memo */
 /*enable all control when finish copy memo */
 CONTENTVIEW.enableControlsCopyMemo = function() {
 CONTENTVIEW.enableControlsCopyMemo = function() {
+	
 	CONTENTVIEW.disableControlsCopyMemo();
 	CONTENTVIEW.disableControlsCopyMemo();
-
+	
     /* set cursor pointer*/
     /* set cursor pointer*/
     $("#imgHome").css('cursor', 'pointer');
     $("#imgHome").css('cursor', 'pointer');
     $("#imgBack").css('cursor', 'pointer');
     $("#imgBack").css('cursor', 'pointer');

abvw/js/contentview_CreateObjects.js

@@ -2030,7 +2030,6 @@ CONTENTVIEW_CREATEOBJECT.Content.prototype.setUpPage = function (pageIndex, opt)
 
 
 /* check next page exists */
 /* check next page exists */
 CONTENTVIEW_CREATEOBJECT.Content.prototype.hasNextPage = function () {
 CONTENTVIEW_CREATEOBJECT.Content.prototype.hasNextPage = function () {
-
     if ((this.pageIndex + 1) > (this.pageCount - 1)) {
     if ((this.pageIndex + 1) > (this.pageCount - 1)) {
         return false;
         return false;
     }
     }

abvw/js/contentview_Events.js

@@ -838,6 +838,8 @@ CONTENTVIEW_EVENTS.onUnlock = function() {
 
 
 CONTENTVIEW_EVENTS.onClick_CanvasMain = function(event) {
 CONTENTVIEW_EVENTS.onClick_CanvasMain = function(event) {
 	
 	
+	//console.log("CONTENTVIEW_EVENTS.onClick_CanvasMain");
+	
     event.preventDefault(); 
     event.preventDefault(); 
     
     
     if(CONTENTVIEW_GENERAL.isLoadingObject){       
     if(CONTENTVIEW_GENERAL.isLoadingObject){       

abvw/js/contentview_Memo.js

@@ -93,15 +93,17 @@ CONTENTVIEW_MEMO.MemoDelFunction = function(){
 		CONTENTVIEW_GENERAL.isCopyMemo = false;
 		CONTENTVIEW_GENERAL.isCopyMemo = false;
 	}
 	}
 	else{
 	else{
+		
 		var resultArr = ClientData.MemoData();
 		var resultArr = ClientData.MemoData();
 		resultArr.splice(CONTENTVIEW_MEMO.EditIndex, 1);
 		resultArr.splice(CONTENTVIEW_MEMO.EditIndex, 1);
 		
 		
 		ClientData.MemoData(resultArr);
 		ClientData.MemoData(resultArr);
 	
 	
 		//CONTENTVIEW_MEMO.targetDiv.dialog('close');	
 		//CONTENTVIEW_MEMO.targetDiv.dialog('close');	
-		if(CONTENTVIEW_MEMO.memoCallbackFunc){				
+		if(CONTENTVIEW_MEMO.memoCallbackFunc){
 			CONTENTVIEW_MEMO.memoCallbackFunc();
 			CONTENTVIEW_MEMO.memoCallbackFunc();
 		}
 		}
+		
 	}
 	}
 	$("#overlay").hide();
 	$("#overlay").hide();
 	CONTENTVIEW_MEMO.targetDiv.children().remove();
 	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
 	//END TRB00054 - EDITOR : Long - Date : 09/19/2013 - Summary : Fix for remove loading icon when del memo
 	
 	
 	/* enable controls after finish copy */
 	/* enable controls after finish copy */
-	CONTENTVIEW.enableControlsCopyMemo();	
+	CONTENTVIEW.enableControlsCopyMemo();
+	
 };
 };
 
 
 CONTENTVIEW_MEMO.MemoCancelFunction = function(){
 CONTENTVIEW_MEMO.MemoCancelFunction = function(){