Skip to content

C
check
Commit 7766f8c6 by Vo Duc Thang
Options

9・27 第2回リリース

parent 24a2668c
Showing with 214 additions and 166 deletions
abvw/common/js/common.js
...@@ -86,7 +86,15 @@ var ShortKeys = { ...@@ -86,7 +86,15 @@ var ShortKeys = {
// Show, hide toolbar: "[" // Show, hide toolbar: "["
ShowHideToolbar: 219, ShowHideToolbar: 219,
// Show, hide marking: "]" // Show, hide marking: "]"
ShowHideMarking: 221 ShowHideMarking: 221,
// Zoom out : "-"
ZoomOutAlt: 189,
//Zoom in: "+"
ZoomInAlt: 187,
//Zoom out: "-" firefox/opera
ZoomOutAlt_Firefox: 173,
//Zoom in : "+" firefox/opera
ZoominAlt_Firefox: 61
}; };
// ------------------------------------------------- // -------------------------------------------------
......
abvw/common/json/lang/lang-en.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"Logout", "dspBkCancel":"Logout",
"txtSearchResult":"Result", "txtSearchResult":"Result",
"dspHome":"Home", "dspHome":"Home",
"txtLoginUser":"(Ver.20130927)User:", "txtLoginUser":"(Ver.20130927_2)User:",
"txtAll":"All", "txtAll":"All",
"txtMkgSize":"Size", "txtMkgSize":"Size",
"txtMkgS":"S", "txtMkgS":"S",
......
abvw/common/json/lang/lang-ja.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト", "dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果", "txtSearchResult":"検索結果",
"dspHome":"ホーム", "dspHome":"ホーム",
"txtLoginUser":"(Ver.20130927)ログイン中：", "txtLoginUser":"(Ver.20130927_2)ログイン中：",
"txtAll":"すべて", "txtAll":"すべて",
"txtMkgSize":"太さ", "txtMkgSize":"太さ",
"txtMkgS":"小", "txtMkgS":"小",
......
abvw/common/json/lang/lang-ko.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃", "dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과", "txtSearchResult":"검색 결과",
"dspHome":"홈", "dspHome":"홈",
"txtLoginUser":"(Ver.20130927)로그인 중:", "txtLoginUser":"(Ver.20130927_2)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
......
abvw/home.html
...@@ -68,15 +68,6 @@ ...@@ -68,15 +68,6 @@
<script src="./common/js/screenLock.js" type="text/javascript"></script> <script src="./common/js/screenLock.js" type="text/javascript"></script>
<script src="js/detail.js" type="text/javascript"></script> <script src="js/detail.js" type="text/javascript"></script>
<!--[if IE 9 ]>
<style>
.tab_bg_color
{
overflow-x:scroll;
}
</style>
<![endif]-->
</head> </head>
<body id="bookshelf"> <body id="bookshelf">
......
abvw/js/contentview.js
...@@ -2159,7 +2159,9 @@ function displayOverlayForSpecifyContentType(){ ...@@ -2159,7 +2159,9 @@ function displayOverlayForSpecifyContentType(){
} }
//End : TRB00075 - Editor : Long - Date : 09/25/2013 - Summary : prevent moving page //End : TRB00075 - Editor : Long - Date : 09/25/2013 - Summary : prevent moving page
/* window resize event */ /* window resize event */
$(window).resize(function () { $(window).resize(function () {
//sizingScreen();
//START : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image //START : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
setLoadingSize(); setLoadingSize();
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image //END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
...@@ -2183,6 +2185,7 @@ function displayOverlayForSpecifyContentType(){ ...@@ -2183,6 +2185,7 @@ function displayOverlayForSpecifyContentType(){
} }
} }
} }
sizingScreen();
//Start : TRB00082 - Editor : Long - Date : 09/25/2013 - Summary : For win 8 rotate handling. //Start : TRB00082 - Editor : Long - Date : 09/25/2013 - Summary : For win 8 rotate handling.
setViewportForWin8(); setViewportForWin8();
...@@ -2278,19 +2281,17 @@ function handleForContentTypeMusic(resourceUrl){ ...@@ -2278,19 +2281,17 @@ function handleForContentTypeMusic(resourceUrl){
//Create Dialog overlay //Create Dialog overlay
var $container = $('#dialog'); var $container = $('#dialog');
$container.html(''); $container.html('');
//$container.css('position', 'absolute');
$container.css('background', 'url(./img/iPad_music.png) center center no-repeat'); $container.css('background', 'url(./img/iPad_music.png) center center no-repeat');
$container.css('background-color', 'white'); $container.css('background-color', 'white');
//$container.css('background-attachment', 'fixed');
if (ClientData.userOpt_musicMode() == "1") { if (ClientData.userOpt_musicMode() == "1") {
$container.html('<audio autoplay="true" loop="true" controls style="position: absolute; width: 100%; bottom: 1%;">' $container.html('<audio autoplay="true" loop="true" controls="controls" style="position: absolute; width: 100%; bottom: 1%;">'
+ ' <source src="' + resourceUrl + '" type="audio/mpeg"> ' + ' <source src="' + resourceUrl + '" type="audio/mpeg"> '
+ '</audio>' + '</audio>'
); );
} }
else { else {
$container.html('<audio autoplay="true" controls style="position: absolute; width: 100%; bottom: 1%;">' $container.html('<audio autoplay="true" controls="controls" style="position: absolute; width: 100%; bottom: 1%;">'
+ ' <source src="' + resourceUrl + '" type="audio/mpeg"> ' + ' <source src="' + resourceUrl + '" type="audio/mpeg"> '
+ '</audio>' + '</audio>'
); );
...@@ -2340,6 +2341,7 @@ function handleForContentTypeHTML(resourceUrl){ ...@@ -2340,6 +2341,7 @@ function handleForContentTypeHTML(resourceUrl){
} }
else{ else{
$container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%; height: 100%; "> </iframe>'); $container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%; height: 100%; "> </iframe>');
$container.css('overflow', 'hidden');
} }
//END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad //END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
$container.show(); $container.show();
...@@ -2442,9 +2444,6 @@ function enableControlForImageAndNoneType(){ ...@@ -2442,9 +2444,6 @@ function enableControlForImageAndNoneType(){
//Full screen function for not pdf type //Full screen function for not pdf type
function fullScreenForNotPdfType(){ function fullScreenForNotPdfType(){
var w = $("#wrapper").width();
var h = $("#wrapper").height();
if(contentType == ContentTypeKeys.Type_Video){ if(contentType == ContentTypeKeys.Type_Video){
if(avwUserEnvObj.os == 'ipad'){ if(avwUserEnvObj.os == 'ipad'){
$('#content_video').removeAttr('controls'); $('#content_video').removeAttr('controls');
...@@ -2462,10 +2461,12 @@ function fullScreenForNotPdfType(){ ...@@ -2462,10 +2461,12 @@ function fullScreenForNotPdfType(){
$container.css('top', '0%') $container.css('top', '0%')
.css('left', '0%') .css('left', '0%')
.css('height', h) .css('height', '100%')
.css('width', w); .css('width', '100%');
//$container.attr('style', 'top: 0; left: 0; height: 100%; width: 100%;');
isZoomingContent = true; isZoomingContent = true;
isFullScreen = true;
}; };
//Original screen for not pdf type //Original screen for not pdf type
...@@ -2516,6 +2517,7 @@ function originalScreenForNotPdfType(){ ...@@ -2516,6 +2517,7 @@ function originalScreenForNotPdfType(){
//END TRB00068 //END TRB00068
isZoomingContent = false; isZoomingContent = false;
isFullScreen = false;
}; };
//Get resource Id of content //Get resource Id of content
...@@ -4424,114 +4426,130 @@ function imageToScreen(x, y) { ...@@ -4424,114 +4426,130 @@ function imageToScreen(x, y) {
//Start Function : No.4 - Editor : Long - Date : 08/09/2013 - Summary : //Start Function : No.4 - Editor : Long - Date : 08/09/2013 - Summary :
/* Adjust Component size */ /* Adjust Component size */
function sizingNotFull(width, height) { function sizingNotFull(width, height) {
//adjust size of canvas using for draw
if (isTouchDevice() == true) { //START TRB
$("#main").css('top', marginY); if(isMediaAndHTMLContent()){
$("#main").attr('height', height - (marginY * 2))
.attr('width', width - (marginX * 2));
$("#mainNext").css('top', marginY);
$("#mainPre").css('top', marginY);
$("#mainNext").attr('height', height - (marginY * 2))
.attr('width', width - (marginX * 2))
.css('left', width + marginX);
$("#mainPre").attr('height', height - (marginY * 2))
.attr('width', width - (marginX * 2))
.css('left', - (width + marginX));
} else {
$("#main").attr('height', height - (marginY * 2))
.attr('width', width - (marginX * 2))
.css('top', marginY);
$("#mainNext").attr('height', height - (marginY * 2))
.attr('width', width - (marginX * 2))
.css('top', marginY)
.css('left', width + marginX);
$("#mainPre").attr('height', height - (marginY * 2))
.attr('width', width - (marginX * 2))
.css('top', marginY)
.css('left', -(width + marginX));
} }
//END TRB
$("#draw_canvas").css('cursor', 'default'); else{
$("#marker_canvas").css('cursor', 'default'); //adjust size of canvas using for draw
if (isTouchDevice() == true) {
if (userScale != 1) { $("#main").css('top', marginY);
changeScale(userScale); $("#main").attr('height', height - (marginY * 2))
flip(); .attr('width', width - (marginX * 2));
//Start Function : No.4 - Editor : Long - Date : 08/13/2013 - Summary : Fix for zooming $("#mainNext").css('top', marginY);
if(getPageIndex() < totalPage - 1){ $("#mainPre").css('top', marginY);
flip(1);
$("#mainNext").attr('height', height - (marginY * 2))
.attr('width', width - (marginX * 2))
.css('left', width + marginX);
$("#mainPre").attr('height', height - (marginY * 2))
.attr('width', width - (marginX * 2))
.css('left', - (width + marginX));
} else {
$("#main").attr('height', height - (marginY * 2))
.attr('width', width - (marginX * 2))
.css('top', marginY);
$("#mainNext").attr('height', height - (marginY * 2))
.attr('width', width - (marginX * 2))
.css('top', marginY)
.css('left', width + marginX);
$("#mainPre").attr('height', height - (marginY * 2))
.attr('width', width - (marginX * 2))
.css('top', marginY)
.css('left', -(width + marginX));
} }
if(getPageIndex() > 0){ $("#draw_canvas").css('cursor', 'default');
flip(2); $("#marker_canvas").css('cursor', 'default');
if (userScale != 1) {
changeScale(userScale);
flip();
//Start Function : No.4 - Editor : Long - Date : 08/13/2013 - Summary : Fix for zooming
if(getPageIndex() < totalPage - 1){
flip(1);
}
if(getPageIndex() > 0){
flip(2);
}
//End Function : No.4 - Editor : Long - Date : 08/13/2013 - Summary : Fix for zooming
} }
//End Function : No.4 - Editor : Long - Date : 08/13/2013 - Summary : Fix for zooming
} /* move image check marking*/
$('#divCheckExistMarking').css('top', '70px');
/* move image check marking*/ $('#divCheckExistMarking').show();
$('#divCheckExistMarking').css('top', '70px'); }
$('#divCheckExistMarking').show();
}; };
/* Adjust Component size */ /* Adjust Component size */
function sizingFullSize(width, height) { function sizingFullSize(width, height) {
// adjust size of body // adjust size of body
if (isTouchDevice() == true) {
$("#main").css('top', '0px'); //START TRB
$("#main").attr('height', height) if(isMediaAndHTMLContent()){
.attr('width', width - (marginX * 2));
}
$("#mainNext").css('top', '0px'); //END TRB
$("#mainNext").attr('height', height) else{
.attr('width', width - (marginX * 2)); if (isTouchDevice() == true) {
$("#main").css('top', '0px');
$("#mainPre").css('top', '0px'); $("#main").attr('height', height)
$("#mainPre").attr('height', height) .attr('width', width - (marginX * 2));
.attr('width', width - (marginX * 2));
} else { $("#mainNext").css('top', '0px');
$("#main").attr('height', height) $("#mainNext").attr('height', height)
.attr('width', width - (marginX * 2)) .attr('width', width - (marginX * 2));
.css('top', '0px');
$("#mainNext").attr('height', height) $("#mainPre").css('top', '0px');
$("#mainPre").attr('height', height)
.attr('width', width - (marginX * 2));
} else {
$("#main").attr('height', height)
.attr('width', width - (marginX * 2))
.css('top', '0px');
$("#mainNext").attr('height', height)
.attr('width', width - (marginX * 2))
.css('top', '0px');
$("#mainPre").attr('height', height)
.attr('width', width - (marginX * 2)) .attr('width', width - (marginX * 2))
.css('top', '0px'); .css('top', '0px');
$("#mainPre").attr('height', height)
.attr('width', width - (marginX * 2))
.css('top', '0px');
}
//adjust size of canvas using for draw
$("#draw_canvas").css('cursor', 'default');
$("#marker_canvas").css('cursor', 'default');
if (userScale != 1) {
changeScale(userScale);
flip();
//Start Function : No.4 - Editor : Long - Date : 08/13/2013 - Summary : Fix for zooming
if(getPageIndex() < totalPage - 1){
flip(1);
} }
if(getPageIndex() > 0){ //adjust size of canvas using for draw
flip(2);
$("#draw_canvas").css('cursor', 'default');
$("#marker_canvas").css('cursor', 'default');
if (userScale != 1) {
changeScale(userScale);
flip();
//Start Function : No.4 - Editor : Long - Date : 08/13/2013 - Summary : Fix for zooming
if(getPageIndex() < totalPage - 1){
flip(1);
}
if(getPageIndex() > 0){
flip(2);
}
//End Function : No.4 - Editor : Long - Date : 08/13/2013 - Summary : Fix for zooming
} }
//End Function : No.4 - Editor : Long - Date : 08/13/2013 - Summary : Fix for zooming
} /* move image check marking*/
$('#divCheckExistMarking').css('top', '5px');
/* move image check marking*/ if (ClientData.IsAddingMarking() == true) {
$('#divCheckExistMarking').css('top', '5px'); $('#divCheckExistMarking').hide();
if (ClientData.IsAddingMarking() == true) { } else {
$('#divCheckExistMarking').hide(); $('#divCheckExistMarking').show();
} else { }
$('#divCheckExistMarking').show(); }
}
}; };
//End Function : No.4 - Editor : Long - Date : 08/09/2013 - Summary : //End Function : No.4 - Editor : Long - Date : 08/09/2013 - Summary :
function zoomVideo() { function zoomVideo() {
......
abvw/js/contentview_Anket.js
...@@ -49,18 +49,21 @@ function showAnket(url, fullscreen) { ...@@ -49,18 +49,21 @@ function showAnket(url, fullscreen) {
$('#dialog .anket-commands input').click( $('#dialog .anket-commands input').click(
function () { function () {
var opacity = 1; var opacity = 1;
//START TRB00092 - EDITOR: Long - Date: 09/26/2013 - Summary : Fix opacity //START TRB00092 - EDITOR: Long - Date: 09/26/2013 - Summary : Fix opacity
if ($(this).index() == 0) { if ($(this).index() == 0) {
opacity = 0.6; opacity = 0.3;
$('#dialog,#dialog iframe,#dialog .anket-commands,#dialog .anket-commands input').css('opacity', opacity);
$('.anket-container').css('opacity', 0);
} }
else if($(this).index()==1) else if ($(this).index() == 1) {
{
opacity = 0.8; opacity = 0.8;
//END TRB00092 - EDITOR: Long - Date: 09/26/2013 - Summary : Fix opacity
$('#dialog,#dialog iframe,#dialog .anket-commands,#dialog .anket-commands input,.anket-container').css('opacity', opacity);
}
else {
$('#dialog,#dialog iframe,#dialog .anket-commands,#dialog .anket-commands input,.anket-container').css('opacity', opacity);
} }
//END TRB00092 - EDITOR: Long - Date: 09/26/2013 - Summary : Fix opacity
$('#dialog,#dialog iframe,#dialog .anket-commands,#dialog .anket-commands input').css('opacity', opacity);
} }
); );
// resize anket // resize anket
......
abvw/js/contentview_Events.js
...@@ -482,8 +482,7 @@ function createLockLayout(opt){ ...@@ -482,8 +482,7 @@ function createLockLayout(opt){
}; };
//START TRB00049 - Editor: Long - Date: 09/26/2013 - Summary : Add short key alt //START TRB00049 - Editor: Long - Date: 09/26/2013 - Summary : Add short key alt
var altMode = false; var altMode = false;
/* handle keydown */ /* handle keydown */
$(document).keydown(function (e) { $(document).keydown(function (e) {
/* set fag true when click ctrl */ /* set fag true when click ctrl */
...@@ -586,6 +585,23 @@ $(document).keydown(function (e) { ...@@ -586,6 +585,23 @@ $(document).keydown(function (e) {
zoomOut(); zoomOut();
} }
break; break;
case ShortKeys.ZoominAlt_Firefox: /* zoomIn */
if(avwUserEnvObj.browser == 'firefox'){
if(contentType == ContentTypeKeys.Type_PDF || contentType == ContentTypeKeys.Type_Image
|| contentType == ContentTypeKeys.Type_NoFile){
zoomIn();
}
}
break;
case ShortKeys.ZoomOutAlt_Firefox: /* zoomOut */
if(avwUserEnvObj.browser == 'firefox'){
if(contentType == ContentTypeKeys.Type_PDF || contentType == ContentTypeKeys.Type_Image
|| contentType == ContentTypeKeys.Type_NoFile){
zoomOut();
}
}
break;
} }
} }
} }
...@@ -839,7 +855,7 @@ function onClick_CanvasMain(event) { ...@@ -839,7 +855,7 @@ function onClick_CanvasMain(event) {
}; };
function mouseMove_canvasMain(event) { function mouseMove_canvasMain(event) {
//Start Function : No.20 - Editor : Long //Start Function : No.20 - Editor : Long
if(_isTouching){ if(_isTouching){
//_isTouching = false; //_isTouching = false;
...@@ -915,16 +931,19 @@ function mouseMove_canvasMain(event) { ...@@ -915,16 +931,19 @@ function mouseMove_canvasMain(event) {
py = y; py = y;
currPos = {x:event.pageX,y:event.pageY}; currPos = {x:event.pageX,y:event.pageY};
// pevious page not exist -> do not move // pevious page not exist -> do not move
if(!getContent().hasPreviousPage()){ if(!getContent().hasPreviousPage()){
if(currPos.x >= _clickFirstPos.x){ if(currPos.x >= _clickFirstPos.x){
return; return;
} }
} }
// next page not exist -> do not move // next page not exist -> do not move
if(!getContent().hasNextPage()){ if(!getContent().hasNextPage()){
if(currPos.x <= _clickFirstPos.x) if(currPos.x <= _clickFirstPos.x){
return; return;
}
} }
//examinate direction //examinate direction
...@@ -1016,7 +1035,6 @@ function mouseMove_canvasMain(event) { ...@@ -1016,7 +1035,6 @@ function mouseMove_canvasMain(event) {
}; };
function mouseDown_CanvasMain(event) { function mouseDown_CanvasMain(event) {
//Start Function : No.20 - Editor : Long - Date: 08/17/2013 - Summary : //Start Function : No.20 - Editor : Long - Date: 08/17/2013 - Summary :
if(_isTouching){ if(_isTouching){
//_isTouching = false; //_isTouching = false;
...@@ -1045,8 +1063,8 @@ function mouseDown_CanvasMain(event) { ...@@ -1045,8 +1063,8 @@ function mouseDown_CanvasMain(event) {
py = event.pageY; py = event.pageY;
//Start Function : No.20 //Start Function : No.20
_clickFirstPos = {x:event.screenX, y: event.screenY}; _clickFirstPos = {x:event.pageX, y: event.pageY};
_clickLastPos = {x:event.screenX, y: event.screenY}; _clickLastPos = {x:event.pageX, y: event.pageY};
_moveNum = 0; _moveNum = 0;
......
abvw/js/contentview_InitObjects.js
...@@ -263,7 +263,6 @@ function initPage() { ...@@ -263,7 +263,6 @@ function initPage() {
/* window resize event */ /* window resize event */
$(window).resize(function () { $(window).resize(function () {
//Start : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling. //Start : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling.
setViewportForWin8(); setViewportForWin8();
//End : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling. //End : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling.
...@@ -339,7 +338,7 @@ function initPage() { ...@@ -339,7 +338,7 @@ function initPage() {
} }
/* window resize event */ /* window resize event */
$(window).resize(function () { $(window).resize(function () {
//START : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image //START : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
setLoadingSize(); setLoadingSize();
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image //END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
...@@ -612,12 +611,12 @@ function initPageMediaAndHtmlType(){ ...@@ -612,12 +611,12 @@ function initPageMediaAndHtmlType(){
//Check if content is zooming //Check if content is zooming
if(isZoomingContent){ if(isZoomingContent){
var $container = $("#dialog"); //var $container = $("#dialog");
var w = window.innerWidth; // var w = window.innerWidth;
var h = window.innerHeight; //var h = window.innerHeight;
$container.css('height', h); //$container.css('height', h);
$container.css('width', w); //$container.css('width', w);
} }
}); });
......
abvw/js/header.js
...@@ -1050,31 +1050,36 @@ function downloadResourceById(contentId){ ...@@ -1050,31 +1050,36 @@ function downloadResourceById(contentId){
contentId: contentId, contentId: contentId,
getType: '2' getType: '2'
}; };
/* abapi('webGetContent', params, 'GET', function (data) {
var resourceId=data.contentData.content.resourceId;
//Get resource
resourceUrl = getResourceByIdFromAPI(resourceId);
// open url to download file
window.open(resourceUrl);
}); */
avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", "get", params, avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", "get", params,
function (data) { function (data) {
//Get resourceurl
//Get resourceurl var resourceUrl = getResourceByIdFromAPI(data.contentData.content.resourceId);
var resourceUrl = getResourceByIdFromAPI(data.contentData.content.resourceId);
// open url to download file
// open url to download file if (isSafariNotOnIpad()) {
window.open(resourceUrl); window.onbeforeunload = null;
}, window.open(resourceUrl, "_self"); // open url to download file on safari not for ipad
var toogleTime = setTimeout(function () { ToogleLogoutNortice() }, 200);
}
else {
window.open(resourceUrl); //open url to download file on orther browser
}
},
function (xhr, b, c) { }); function (xhr, b, c) { });
}; };
//Download resource //Download resource
function getResourceByIdFromAPI(resourceId){ function getResourceByIdFromAPI(resourceId){
return getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + resourceId + "&isDownload=true"; return getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + resourceId + "&isDownload=true";
};
// check is browser safari on Mac and Window devide ( not Ipad )
function isSafariNotOnIpad() {
if (!window.chrome) {
var ua = navigator.userAgent.toLowerCase();
if (!/ipad/.test(ua) && /safari/.test(ua)) {
return true;
}
}
return false;
}; };
\ No newline at end of file
abvw/js/home.js
...@@ -196,11 +196,16 @@ $(document).ready(function () { ...@@ -196,11 +196,16 @@ $(document).ready(function () {
} }
// hide tab group with user anonymous // hide tab group with user anonymous
if(isAnonymousLogin()) if (isAnonymousLogin()) {
{ $('.switchingTab .colright').hide();
$('.switchingTab .colright').hide(); }
else $('.switchingTab .colright').show();
// set scroll for tree view on IE 9
var ua = window.navigator.userAgent.toLowerCase();
if (/msie 9.0/.test(ua)&&!/tablet/.test(ua)) {
$('.tab_bg_color').css({ "overflow-x": "scroll" });
} }
else $('.switchingTab .colright').show();
}); });
var allowTimerCloseSubMenu = true; var allowTimerCloseSubMenu = 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