Skip to content

C
check
Commit 7766f8c6 by Vo Duc Thang
Options

9・27 第2回リリース

parent 24a2668c
Showing with 91 additions and 61 deletions
abvw/common/js/common.js
......@@ -86,7 +86,15 @@ var ShortKeys = {
// Show, hide toolbar: "["
ShowHideToolbar: 219,
// 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 @@
"dspBkCancel":"Logout",
"txtSearchResult":"Result",
"dspHome":"Home",
"txtLoginUser":"(Ver.20130927)User:",
"txtLoginUser":"(Ver.20130927_2)User:",
"txtAll":"All",
"txtMkgSize":"Size",
"txtMkgS":"S",
......
abvw/common/json/lang/lang-ja.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20130927)ログイン中：",
"txtLoginUser":"(Ver.20130927_2)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......
abvw/common/json/lang/lang-ko.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(Ver.20130927)로그인 중:",
"txtLoginUser":"(Ver.20130927_2)로그인 중:",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
......
abvw/home.html
......@@ -68,15 +68,6 @@
<script src="./common/js/screenLock.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>
<body id="bookshelf">
......
abvw/js/contentview_Anket.js
......@@ -49,18 +49,21 @@ function showAnket(url, fullscreen) {
$('#dialog .anket-commands input').click(
function () {
var opacity = 1;
//START TRB00092 - EDITOR: Long - Date: 09/26/2013 - Summary : Fix opacity
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;
//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
......
abvw/js/contentview_Events.js
......@@ -482,8 +482,7 @@ function createLockLayout(opt){
};
//START TRB00049 - Editor: Long - Date: 09/26/2013 - Summary : Add short key alt
var altMode = false;
var altMode = false;
/* handle keydown */
$(document).keydown(function (e) {
/* set fag true when click ctrl */
......@@ -586,6 +585,23 @@ $(document).keydown(function (e) {
zoomOut();
}
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) {
};
function mouseMove_canvasMain(event) {
//Start Function : No.20 - Editor : Long
if(_isTouching){
//_isTouching = false;
......@@ -915,16 +931,19 @@ function mouseMove_canvasMain(event) {
py = y;
currPos = {x:event.pageX,y:event.pageY};
// pevious page not exist -> do not move
if(!getContent().hasPreviousPage()){
if(currPos.x >= _clickFirstPos.x){
return;
}
}
}
// next page not exist -> do not move
if(!getContent().hasNextPage()){
if(currPos.x <= _clickFirstPos.x)
return;
if(currPos.x <= _clickFirstPos.x){
return;
}
}
//examinate direction
......@@ -1016,7 +1035,6 @@ function mouseMove_canvasMain(event) {
};
function mouseDown_CanvasMain(event) {
//Start Function : No.20 - Editor : Long - Date: 08/17/2013 - Summary :
if(_isTouching){
//_isTouching = false;
......@@ -1045,8 +1063,8 @@ function mouseDown_CanvasMain(event) {
py = event.pageY;
//Start Function : No.20
_clickFirstPos = {x:event.screenX, y: event.screenY};
_clickLastPos = {x:event.screenX, y: event.screenY};
_clickFirstPos = {x:event.pageX, y: event.pageY};
_clickLastPos = {x:event.pageX, y: event.pageY};
_moveNum = 0;
......
abvw/js/contentview_InitObjects.js
......@@ -263,7 +263,6 @@ function initPage() {
/* window resize event */
$(window).resize(function () {
//Start : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling.
setViewportForWin8();
//End : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling.
......@@ -339,7 +338,7 @@ function initPage() {
}
/* window resize event */
$(window).resize(function () {
$(window).resize(function () {
//START : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
setLoadingSize();
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
......@@ -612,12 +611,12 @@ function initPageMediaAndHtmlType(){
//Check if content is zooming
if(isZoomingContent){
var $container = $("#dialog");
var w = window.innerWidth;
var h = window.innerHeight;
//var $container = $("#dialog");
// var w = window.innerWidth;
//var h = window.innerHeight;
$container.css('height', h);
$container.css('width', w);
//$container.css('height', h);
//$container.css('width', w);
}
});
......
abvw/js/header.js
......@@ -1050,31 +1050,36 @@ function downloadResourceById(contentId){
contentId: contentId,
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,
function (data) {
//Get resourceurl
var resourceUrl = getResourceByIdFromAPI(data.contentData.content.resourceId);
// open url to download file
window.open(resourceUrl);
},
function (data) {
//Get resourceurl
var resourceUrl = getResourceByIdFromAPI(data.contentData.content.resourceId);
// open url to download file
if (isSafariNotOnIpad()) {
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) { });
};
//Download resource
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 () {
}
// hide tab group with user anonymous
if(isAnonymousLogin())
{
$('.switchingTab .colright').hide();
if (isAnonymousLogin()) {
$('.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;
......
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