Commit 46640630 by Masaru Abe

テスト対応

parent d4f5a6ab
...@@ -970,7 +970,7 @@ CONTENTVIEW.showAlertScreen = function(errMes, scrMove) { ...@@ -970,7 +970,7 @@ CONTENTVIEW.showAlertScreen = function(errMes, scrMove) {
CONTENTVIEW.changePage = function(page_index) { CONTENTVIEW.changePage = function(page_index) {
//abe スライダーのページ移動 //abe スライダーのページ移動
//alert("changePage:" + page_index); //console.log("changePage:" + page_index);
// Make sure page_index is number // Make sure page_index is number
page_index = Number(page_index); page_index = Number(page_index);
...@@ -1927,7 +1927,7 @@ CONTENTVIEW.resizeScreen = function() { ...@@ -1927,7 +1927,7 @@ CONTENTVIEW.resizeScreen = function() {
CONTENTVIEW.changePageWithoutSlide = function(pageMove) { CONTENTVIEW.changePageWithoutSlide = function(pageMove) {
//abe コンテンツリンクで移動時 //abe コンテンツリンクで移動時
//alert("changePageWithoutSlide:" + pageMove); //console.log("changePageWithoutSlide:" + pageMove);
//ページ閲覧ログセット //ページ閲覧ログセット
COMMON.SetPageLog( CONTENTVIEW_GENERAL.contentID, pageMove); COMMON.SetPageLog( CONTENTVIEW_GENERAL.contentID, pageMove);
...@@ -5570,12 +5570,17 @@ CONTENTVIEW.initScreen = function(){ ...@@ -5570,12 +5570,17 @@ CONTENTVIEW.initScreen = function(){
$('#dialog').empty(); $('#dialog').empty();
$('#dialog').removeClass(); $('#dialog').removeClass();
$('#dialog').removeAttr('style'); $('#dialog').removeAttr('style');
//$('#dialog').attr('style', 'width:');
$('#dialog').addClass('web_dialog'); $('#dialog').addClass('web_dialog');
} }
$('#header_toolbar').show();
$('#txtSearch').val('');
$('#divCheckExistMarking').hide(); $('#divCheckExistMarking').hide();
$('#divCacheLoading').hide(); $('#divCacheLoading').hide();
$("#overlay").hide(); $("#overlay").hide();
$("#wrapper *").unbind("click");
}; };
$(function () { $(function () {
......
...@@ -363,6 +363,7 @@ CONTENTVIEW_CALLAPI.getDataJsonFileDone = function(data) { ...@@ -363,6 +363,7 @@ CONTENTVIEW_CALLAPI.getDataJsonFileDone = function(data) {
CONTENTVIEW_CALLAPI.loadDataBookmark = function(lstPageNo) { CONTENTVIEW_CALLAPI.loadDataBookmark = function(lstPageNo) {
if (CONTENTVIEW_GENERAL.isSendingData == true) { if (CONTENTVIEW_GENERAL.isSendingData == true) {
var params = { var params = {
......
...@@ -169,11 +169,13 @@ CONTENTVIEW_INITOBJECT.initPage = function() { ...@@ -169,11 +169,13 @@ CONTENTVIEW_INITOBJECT.initPage = function() {
/* bookmark Page */ /* bookmark Page */
$('#imgbookmark').click(CONTENTVIEW.bookmarkPage); $('#imgbookmark').click(CONTENTVIEW.bookmarkPage);
$('#listbookmark').click(CONTENTVIEW_EVENTS.showListBookMark); $('#listbookmark').click(CONTENTVIEW_EVENTS.showListBookMark);
$('#divListBookmark li').die();
$('#divListBookmark li').live('click', CONTENTVIEW_EVENTS.clickBookmark); $('#divListBookmark li').live('click', CONTENTVIEW_EVENTS.clickBookmark);
if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){ if(CONTENTVIEW_GENERAL.contentType == COMMON.ContentTypeKeys.Type_PDF){
/* page index */ /* page index */
$('#listindex').click(CONTENTVIEW_EVENTS.showListPageIndex); $('#listindex').click(CONTENTVIEW_EVENTS.showListPageIndex);
$('#divSearchResult li').die();
$('#divSearchResult li').live('click', CONTENTVIEW_EVENTS.clickSearchDetail); $('#divSearchResult li').live('click', CONTENTVIEW_EVENTS.clickSearchDetail);
/* copy text */ /* copy text */
$('#copytext').click(CONTENTVIEW_EVENTS.showCopyText); $('#copytext').click(CONTENTVIEW_EVENTS.showCopyText);
......
...@@ -119,6 +119,7 @@ CONTENTVIEW_MAKER.Maker_handleColorPickerEvent = function (){ ...@@ -119,6 +119,7 @@ CONTENTVIEW_MAKER.Maker_handleColorPickerEvent = function (){
} }
}); });
$('#dlgMaker .colorpicker').die();
$('#dlgMaker .colorpicker').live('click', CONTENTVIEW_MAKER.Maker_colorPickerClickFunction); $('#dlgMaker .colorpicker').live('click', CONTENTVIEW_MAKER.Maker_colorPickerClickFunction);
//$("#dlgMaker .colorpicker").on({ //$("#dlgMaker .colorpicker").on({
// 'click touchend': function(ev){ // 'click touchend': function(ev){
......
...@@ -125,6 +125,7 @@ CONTENTVIEW_PEN.Pen_handleColorPickerEvent = function() { ...@@ -125,6 +125,7 @@ CONTENTVIEW_PEN.Pen_handleColorPickerEvent = function() {
} }
}); });
$('#dlgPen .colorpicker').die();
$('#dlgPen .colorpicker').live('click', CONTENTVIEW_PEN.Pen_colorPickerClickFunction); $('#dlgPen .colorpicker').live('click', CONTENTVIEW_PEN.Pen_colorPickerClickFunction);
//$("#dlgPen .colorpicker").on({ //$("#dlgPen .colorpicker").on({
// 'click touchend': function(ev){ // 'click touchend': function(ev){
......
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