Commit 9c538b46 by Kim Eunchul

#40367 【TECSS(Biz) webviewer 1.9】コンテンツを開けない

parent aaca7c2a
...@@ -1481,4 +1481,4 @@ CONTENTSEARCH.downloadPdfFunction = function(e){ ...@@ -1481,4 +1481,4 @@ CONTENTSEARCH.downloadPdfFunction = function(e){
// Download content // Download content
HEADER.downloadResourceById(contentId); HEADER.downloadResourceById(contentId);
} };
...@@ -6003,11 +6003,11 @@ CONTENTVIEW.changeScale = function(scale) { ...@@ -6003,11 +6003,11 @@ CONTENTVIEW.changeScale = function(scale) {
} }
if (height < canvas.width) { if (height < canvas.width) {
aspect = offscreen.height / offscreen.width aspect = offscreen.height / offscreen.width;
if(offScreen.width < offScreen.height){ if(offScreen.width < offScreen.height){
height = height * scale * aspect; height = height * scale * aspect;
}else{ }else{
height = height * scale height = height * scale;
} }
//height = height * scale; //height = height * scale;
if (height > canvas.width) { if (height > canvas.width) {
......
...@@ -1056,7 +1056,7 @@ CONTENTVIEW_GETDATA.getBookmarklist = function(pos) { ...@@ -1056,7 +1056,7 @@ CONTENTVIEW_GETDATA.getBookmarklist = function(pos) {
$("#divListBookmark").offset({ left: pos[0], top: (pos[1] + $('#bookmarkBoxHdBM').height()) }); $("#divListBookmark").offset({ left: pos[0], top: (pos[1] + $('#bookmarkBoxHdBM').height()) });
} }
else { else {
CONTENTVIEW.handleAPIWebContentPage(CONTENTVIEW_GENERAL.dataWebContentPage, pos) CONTENTVIEW.handleAPIWebContentPage(CONTENTVIEW_GENERAL.dataWebContentPage, pos);
} }
}; };
......
...@@ -794,7 +794,7 @@ HEADER.DoBackup = function(isBackupMarking, isBackupMemo, isBackupBookmark,isLog ...@@ -794,7 +794,7 @@ HEADER.DoBackup = function(isBackupMarking, isBackupMemo, isBackupBookmark,isLog
$('#divResultMessage .toast-item-loading').hide(); $('#divResultMessage .toast-item-loading').hide();
// active close toast button // active close toast button
$('.toast-item-close').click(function () { $().toastmessage('removeToast', $('#divResultMessage'), null) }); $('.toast-item-close').click(function () { $().toastmessage('removeToast', $('#divResultMessage'), null); });
if (isLogout) { if (isLogout) {
$('.toast-position-middle-center').css('width', '500px'); $('.toast-position-middle-center').css('width', '500px');
...@@ -1268,7 +1268,7 @@ HEADER.downloadResourceById = function(contentId){ ...@@ -1268,7 +1268,7 @@ HEADER.downloadResourceById = function(contentId){
if (HEADER.isSafariNotOnIpad()) { if (HEADER.isSafariNotOnIpad()) {
window.onbeforeunload = null; window.onbeforeunload = null;
window.open(resourceUrl, "_self"); // open url to download file on safari not for ipad window.open(resourceUrl, "_self"); // open url to download file on safari not for ipad
var toogleTime = setTimeout(function () { COMMON.ToogleLogoutNortice() }, 200); var toogleTime = setTimeout(function () { COMMON.ToogleLogoutNortice(); }, 200);
} }
else { else {
window.open(resourceUrl); //open url to download file on orther browser window.open(resourceUrl); //open url to download file on orther browser
......
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