Commit 1da5496f by Kim Gyeongeun

#32343 コンテンツダウンロード機能追加バグ修正

parent 8532f402
...@@ -96,6 +96,11 @@ $(document).ready(function() { ...@@ -96,6 +96,11 @@ $(document).ready(function() {
HISTORY.home_isMove = true; HISTORY.home_isMove = true;
}); });
//PDF download
$('.button-download').live('click', HISTORY.downloadFunction);
$('.button-download').live('touchend', HISTORY.downloadFunction);
$('.button-download').live('touchmove', function () { HOME.home_isMove = true; });
$(window).resize(function() { $(window).resize(function() {
if ($("#contentDetail").css("display") != "none") { if ($("#contentDetail").css("display") != "none") {
// Refresh panel of detail to center. // Refresh panel of detail to center.
...@@ -244,7 +249,7 @@ HISTORY.renderContent = function(id, text, division, type, order) { ...@@ -244,7 +249,7 @@ HISTORY.renderContent = function(id, text, division, type, order) {
var originalViewDate = HISTORY.formatDate(HISTORY.returnOriginalViewDate(post.contentId,readingContentIds)); var originalViewDate = HISTORY.formatDate(HISTORY.returnOriginalViewDate(post.contentId,readingContentIds));
HISTORY.addReadContentToArray(post.contentId, post.resourceVersion, post.metaVersion, post.contentThumbnail, post.contentTitle, post.contentNameKana, HISTORY.addReadContentToArray(post.contentId, post.resourceVersion, post.metaVersion, post.contentThumbnail, post.contentTitle, post.contentNameKana,
post.contentDeliveryDate, post.contentType, post.readerShare, originalViewDate); post.contentDeliveryDate, post.contentType, post.readerShare, originalViewDate, post.printFlg);
} }
} }
...@@ -1047,7 +1052,7 @@ HISTORY.sortByViewDateDesc = function() { ...@@ -1047,7 +1052,7 @@ HISTORY.sortByViewDateDesc = function() {
HISTORY.renderContentAfterSort(resultArr); HISTORY.renderContentAfterSort(resultArr);
}; };
HISTORY.addReadContentToArray = function(strContentId, strResourceVersion, strMetaVersion, strThumbnail, strTitle, strTitleKana, strDelivDate, contentType, readerShare, originalViewDate) { HISTORY.addReadContentToArray = function(strContentId, strResourceVersion, strMetaVersion, strThumbnail, strTitle, strTitleKana, strDelivDate, contentType, readerShare, originalViewDate, printFlg) {
if (HISTORY.contentViewData.length > 0) { if (HISTORY.contentViewData.length > 0) {
var flag = false; var flag = false;
for ( var j = 0; j < HISTORY.contentViewData.length; j++) { for ( var j = 0; j < HISTORY.contentViewData.length; j++) {
...@@ -1068,7 +1073,8 @@ HISTORY.addReadContentToArray = function(strContentId, strResourceVersion, strMe ...@@ -1068,7 +1073,8 @@ HISTORY.addReadContentToArray = function(strContentId, strResourceVersion, strMe
metaversion : strMetaVersion, metaversion : strMetaVersion,
thumbnail : COMMON.formatStringBase64(strThumbnail), thumbnail : COMMON.formatStringBase64(strThumbnail),
contenttype : contentType, contenttype : contentType,
readerShare : readerShare readerShare : readerShare,
printFlg : printFlg
}); });
} }
...@@ -1083,7 +1089,8 @@ HISTORY.addReadContentToArray = function(strContentId, strResourceVersion, strMe ...@@ -1083,7 +1089,8 @@ HISTORY.addReadContentToArray = function(strContentId, strResourceVersion, strMe
metaversion : strMetaVersion, metaversion : strMetaVersion,
thumbnail : COMMON.formatStringBase64(strThumbnail), thumbnail : COMMON.formatStringBase64(strThumbnail),
contenttype : contentType, contenttype : contentType,
readerShare : readerShare readerShare : readerShare,
printFlg : printFlg
}); });
} }
}; };
...@@ -1489,4 +1496,3 @@ HISTORY.downloadFunction = function(e) { ...@@ -1489,4 +1496,3 @@ HISTORY.downloadFunction = function(e) {
HEADER.downloadResourceById(contentId); HEADER.downloadResourceById(contentId);
}; };
...@@ -158,7 +158,7 @@ $(document).ready(function() { ...@@ -158,7 +158,7 @@ $(document).ready(function() {
HOME.home_isMove = true; HOME.home_isMove = true;
}); });
//Show Share Dialog //PDF download
$('.button-download').live('click', HOME.downloadPdfFunction); $('.button-download').live('click', HOME.downloadPdfFunction);
$('.button-download').live('touchend', HOME.downloadPdfFunction); $('.button-download').live('touchend', HOME.downloadPdfFunction);
$('.button-download').live('touchmove', function () { HOME.home_isMove = true; }); $('.button-download').live('touchmove', function () { HOME.home_isMove = true; });
......
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