テスト対応

abvw/js/contentview.js

@@ -970,7 +970,7 @@ CONTENTVIEW.showAlertScreen = function(errMes, scrMove) {
 CONTENTVIEW.changePage = function(page_index) {
 
     //abe スライダーのページ移動
-    //alert("changePage:" + page_index);
+    //console.log("changePage:" + page_index);
 
     // Make sure page_index is number
     page_index = Number(page_index);
@@ -1927,7 +1927,7 @@ CONTENTVIEW.resizeScreen = function() {
 CONTENTVIEW.changePageWithoutSlide = function(pageMove) {
 
     //abe コンテンツリンクで移動時
-    //alert("changePageWithoutSlide:" + pageMove);
+    //console.log("changePageWithoutSlide:" + pageMove);
     //ページ閲覧ログセット
     COMMON.SetPageLog( CONTENTVIEW_GENERAL.contentID, pageMove);
 
@@ -5570,12 +5570,17 @@ CONTENTVIEW.initScreen = function(){
 		$('#dialog').empty();
 		$('#dialog').removeClass();
 		$('#dialog').removeAttr('style');
+		//$('#dialog').attr('style', 'width:');
 		$('#dialog').addClass('web_dialog');
 	}
+	$('#header_toolbar').show();
+	$('#txtSearch').val('');
 	$('#divCheckExistMarking').hide();
 	$('#divCacheLoading').hide();
 	$("#overlay").hide();
 	
+	$("#wrapper *").unbind("click");
+	
 };
 
 $(function () {

abvw/js/contentview_CallApi.js

@@ -363,6 +363,7 @@ CONTENTVIEW_CALLAPI.getDataJsonFileDone = function(data) {
 
 
 CONTENTVIEW_CALLAPI.loadDataBookmark = function(lstPageNo) {
+	
     if (CONTENTVIEW_GENERAL.isSendingData == true) {
 
         var params = {

abvw/js/contentview_InitObjects.js

@@ -169,11 +169,13 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
     /* bookmark Page */
     $('#imgbookmark').click(CONTENTVIEW.bookmarkPage);
     $('#listbookmark').click(CONTENTVIEW_EVENTS.showListBookMark);
+    $('#divListBookmark li').die();
     $('#divListBookmark li').live('click', CONTENTVIEW_EVENTS.clickBookmark);
 
     if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
         /* page index */
         $('#listindex').click(CONTENTVIEW_EVENTS.showListPageIndex);
+        $('#divSearchResult li').die();
         $('#divSearchResult li').live('click', CONTENTVIEW_EVENTS.clickSearchDetail);
         /* copy text */
         $('#copytext').click(CONTENTVIEW_EVENTS.showCopyText);

abvw/js/contentview_Maker.js

@@ -119,6 +119,7 @@ CONTENTVIEW_MAKER.Maker_handleColorPickerEvent = function (){
     	}
     });
     
+    $('#dlgMaker .colorpicker').die();
     $('#dlgMaker .colorpicker').live('click', CONTENTVIEW_MAKER.Maker_colorPickerClickFunction);
     //$("#dlgMaker .colorpicker").on({
     //	'click touchend': function(ev){

abvw/js/contentview_Pen.js

@@ -125,6 +125,7 @@ CONTENTVIEW_PEN.Pen_handleColorPickerEvent = function() {
     	}
     });
 
+	$('#dlgPen .colorpicker').die();
 	$('#dlgPen .colorpicker').live('click', CONTENTVIEW_PEN.Pen_colorPickerClickFunction);
     //$("#dlgPen .colorpicker").on({
     //	'click touchend': function(ev){