Skip to content

C
check
Commit 7a692c94 by Motohisa Nakano
Options

20121212

parent bcb0622d
Showing with 86 additions and 31 deletions
abvw/common/js/zoomDetector.js 0 → 100644
var zoom_ratioPre = 1;
var zoom_ratio = 1;
var zoom_timer;
var zoom_continue = false;
var zoom_callbackFunction;
var zoom_miliSeconds = 1000; // Default is 1 second
function calculateZoomLevel() {
if (zoom_timer) {
clearTimeout(zoom_timer);
zoom_timer = null;
}
zoom_ratio = document.documentElement.clientWidth / window.innerWidth;
if (zoom_ratioPre != zoom_ratio) {
if (zoom_callbackFunction) {
zoom_callbackFunction(zoom_ratioPre, zoom_ratio);
}
zoom_ratioPre = zoom_ratio;
}
if (zoom_continue == true) {
zoom_timer = setTimeout("calculateZoomLevel();", zoom_miliSeconds);
}
}
function stopDetectZoom() {
zoom_continue = false;
}
function startDetectZoom(miliSeconds, callbackFunction) {
zoom_continue = true;
if (callbackFunction) {
zoom_callbackFunction = callbackFunction;
}
if (miliSeconds) {
zoom_miliSeconds = miliSeconds;
}
zoom_timer = setTimeout("calculateZoomLevel();", zoom_miliSeconds);
}
\ No newline at end of file
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.20121211-2)User:", "txtLoginUser":"(Ver.20121212-1)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.20121211-2)ログイン中：", "txtLoginUser":"(Ver.20121212-1)ログイン中：",
"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.20121211-2)로그인 중:", "txtLoginUser":"(Ver.20121212-1)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
......
abvw/contentview.html
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo){ if(iValueObj.mediaInfo){
/* get image from Json */ /* get image from Json */
pageObject['imageUrl'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ; pageObject['imageUrl'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ;
}else{ }else{
pageObject['imageUrl'] = null; pageObject['imageUrl'] = null;
} }
...@@ -376,7 +376,7 @@ ...@@ -376,7 +376,7 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo){ if(iValueObj.mediaInfo){
/* get image from Json */ /* get image from Json */
pageObject['imageUrl'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ; pageObject['imageUrl'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ;
}else{ }else{
pageObject['imageUrl'] = null; pageObject['imageUrl'] = null;
} }
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
/*get video file */ /*get video file */
if(iValueObj.action.video){ if(iValueObj.action.video){
pageObject['mediaFile'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.video); pageObject['mediaFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.video);
pageObject['media'] = iValueObj.action.video; pageObject['media'] = iValueObj.action.video;
}else{ }else{
pageObject['mediaFile'] = ''; pageObject['mediaFile'] = '';
...@@ -395,7 +395,7 @@ ...@@ -395,7 +395,7 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo){ if(iValueObj.mediaInfo){
/* get image from Json */ /* get image from Json */
pageObject['imageUrl'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ; pageObject['imageUrl'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ;
}else{ }else{
pageObject['imageUrl'] = null; pageObject['imageUrl'] = null;
} }
...@@ -403,9 +403,9 @@ ...@@ -403,9 +403,9 @@
/*get video file */ /*get video file */
if(iValueObj.action.music){ if(iValueObj.action.music){
if(avwUserEnvObj.browser == 'msie'){ if(avwUserEnvObj.browser == 'msie'){
pageObject['audioFile'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.music) +"&isIE=true"; pageObject['audioFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.music) +"&isIE=true";
}else{ }else{
pageObject['audioFile'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.music); pageObject['audioFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(iValueObj.action.music);
} }
}else{ }else{
pageObject['audioFile'] = ''; pageObject['audioFile'] = '';
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo){ if(iValueObj.mediaInfo){
/* get image from Json */ /* get image from Json */
pageObject['imageUrl'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ; pageObject['imageUrl'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ;
}else{ }else{
pageObject['imageUrl'] = null; pageObject['imageUrl'] = null;
} }
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo.resourceId){ if(iValueObj.mediaInfo.resourceId){
/* get image from Json */ /* get image from Json */
pageObject['imageUrl'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ; pageObject['imageUrl'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ;
}else{ }else{
pageObject['imageUrl'] = null; pageObject['imageUrl'] = null;
} }
...@@ -454,7 +454,7 @@ ...@@ -454,7 +454,7 @@
var dataImageFromResource = []; var dataImageFromResource = [];
for(var nIndex = 0; nIndex < dataResourceImage.length; nIndex++){ for(var nIndex = 0; nIndex < dataResourceImage.length; nIndex++){
dataImageFromResource.push(getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(dataResourceImage[nIndex])); dataImageFromResource.push(getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(dataResourceImage[nIndex]));
} }
pageObject['imagePreview'] = dataImageFromResource; pageObject['imagePreview'] = dataImageFromResource;
...@@ -463,7 +463,7 @@ ...@@ -463,7 +463,7 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo.resourceId){ if(iValueObj.mediaInfo.resourceId){
/* get image from Json */ /* get image from Json */
pageObject['imageUrl'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ; pageObject['imageUrl'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ;
}else{ }else{
pageObject['imageUrl'] = null; pageObject['imageUrl'] = null;
} }
...@@ -480,7 +480,7 @@ ...@@ -480,7 +480,7 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo.resourceId){ if(iValueObj.mediaInfo.resourceId){
/* get image from Json */ /* get image from Json */
pageObject['imageUrl'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ; pageObject['imageUrl'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ;
}else{ }else{
pageObject['imageUrl'] = null; pageObject['imageUrl'] = null;
} }
...@@ -504,7 +504,7 @@ ...@@ -504,7 +504,7 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo.resourceId){ if(iValueObj.mediaInfo.resourceId){
/* get image from Json */ /* get image from Json */
pageObject['imageUrl'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ; pageObject['imageUrl'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ;
}else{ }else{
pageObject['imageUrl'] = null; pageObject['imageUrl'] = null;
} }
...@@ -516,7 +516,7 @@ ...@@ -516,7 +516,7 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo.resourceId){ if(iValueObj.mediaInfo.resourceId){
/* get image from Json */ /* get image from Json */
pageObject['imageUrl'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ; pageObject['imageUrl'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ;
}else{ }else{
pageObject['imageUrl'] = null; pageObject['imageUrl'] = null;
} }
...@@ -547,7 +547,7 @@ ...@@ -547,7 +547,7 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo.resourceId){ if(iValueObj.mediaInfo.resourceId){
pageObject['mediaFile'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ; pageObject['mediaFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ;
pageObject['media'] = iValueObj.mediaInfo.resourceId; pageObject['media'] = iValueObj.mediaInfo.resourceId;
}else{ }else{
pageObject['mediaFile'] = ''; pageObject['mediaFile'] = '';
...@@ -590,9 +590,9 @@ ...@@ -590,9 +590,9 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo.resourceId){ if(iValueObj.mediaInfo.resourceId){
if(avwUserEnvObj.browser == 'msie'){ if(avwUserEnvObj.browser == 'msie'){
pageObject['audioFile'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId + "&isIE=true"; pageObject['audioFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId + "&isIE=true";
}else{ }else{
pageObject['audioFile'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId; pageObject['audioFile'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId;
} }
}else{ }else{
pageObject['audioFile'] = ''; pageObject['audioFile'] = '';
...@@ -625,7 +625,7 @@ ...@@ -625,7 +625,7 @@
for(var nIndex = 0; nIndex < imageObjects.length; nIndex++){ for(var nIndex = 0; nIndex < imageObjects.length; nIndex++){
/* get image from Json */ /* get image from Json */
imageObjects[nIndex].fileName = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + imageObjects[nIndex].resourceId; imageObjects[nIndex].fileName = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + imageObjects[nIndex].resourceId;
} }
pageObject['dataObjects'] = imageObjects; pageObject['dataObjects'] = imageObjects;
...@@ -665,7 +665,7 @@ ...@@ -665,7 +665,7 @@
var videoObjects = iValueObj.mediaInfo.media; var videoObjects = iValueObj.mediaInfo.media;
for(var nIndex = 0; nIndex < videoObjects.length; nIndex++){ for(var nIndex = 0; nIndex < videoObjects.length; nIndex++){
/* get image from Json */ /* get image from Json */
videoObjects[nIndex].fileName = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + videoObjects[nIndex].resourceId; videoObjects[nIndex].fileName = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + videoObjects[nIndex].resourceId;
} }
pageObject['dataObjects'] = videoObjects; pageObject['dataObjects'] = videoObjects;
...@@ -700,7 +700,7 @@ ...@@ -700,7 +700,7 @@
/*get mediaInfo */ /*get mediaInfo */
if(iValueObj.mediaInfo){ if(iValueObj.mediaInfo){
/* get image from Json */ /* get image from Json */
pageObject['imageUrl'] = getURL("webResourceDownload") + "?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ; pageObject['imageUrl'] = getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceId=" + iValueObj.mediaInfo.resourceId ;
}else{ }else{
pageObject['imageUrl'] = null; pageObject['imageUrl'] = null;
} }
...@@ -1922,6 +1922,7 @@ ...@@ -1922,6 +1922,7 @@
tree.IsShowTotal = false; tree.IsShowTotal = false;
tree.Show("divListIndex", arrData, "listIndex_Callback"); tree.Show("divListIndex", arrData, "listIndex_Callback");
$("#divListIndex").treeview(); $("#divListIndex").treeview();
$(".treeview, .treeview ul").css('padding', '0px 8px 0');
}else{ }else{
$('#divListIndex').children().remove(); $('#divListIndex').children().remove();
$('#divListIndex').append('<span style="color:#333333; font-size:12px; cursor:default; text-decoration:none;">' + i18nText('msgNoIndex') + '</span>'); $('#divListIndex').append('<span style="color:#333333; font-size:12px; cursor:default; text-decoration:none;">' + i18nText('msgNoIndex') + '</span>');
...@@ -3630,7 +3631,7 @@ function oldContent_Back(){ ...@@ -3630,7 +3631,7 @@ function oldContent_Back(){
</div> </div>
<div id="divCheckExistMarking" class="check_marking" style="display:none"> <div id="divCheckExistMarking" class="check_marking" style="display:none">
<img src="img/list/pic_2.png" /> <img src="img/viewer/marking.png" />
</div> </div>
<header id ="header_toolbar" class="header"> <header id ="header_toolbar" class="header">
......
abvw/css/contentview.css
...@@ -455,6 +455,8 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max { ...@@ -455,6 +455,8 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
left:20px; left:20px;
position:absolute; position:absolute;
background-color: white; background-color: white;
opacity: 0.5;
border-radius: 5px;
} }
/*------------------Control Pen------------------------*/ /*------------------Control Pen------------------------*/
......
abvw/css/list_shirori_detail.css
...@@ -67,7 +67,7 @@ article .contentDetail { ...@@ -67,7 +67,7 @@ article .contentDetail {
.sectionContentDetail #book_data ul { .sectionContentDetail #book_data ul {
list-style:none; list-style:none;
line-height:1em; /*line-height:1em;*/
font-size:13px; font-size:13px;
margin:0 0 0 42px; margin:0 0 0 42px;
padding:0; padding:0;
......
abvw/css/viewer.css
...@@ -806,7 +806,7 @@ aside.indexBox .indexBoxHd .hidden_on{ ...@@ -806,7 +806,7 @@ aside.indexBox .indexBoxHd .hidden_on{
} }
aside.indexBox .indexBoxBody_on{ aside.indexBox .indexBoxBody_on{
width:370px; width:370px;
height:357px; height:362px;
background:#FFFFFF; background:#FFFFFF;
border:solid 1px #cfd0d0; border:solid 1px #cfd0d0;
border-top:none; border-top:none;
......
abvw/js/contentview.js
...@@ -1307,6 +1307,8 @@ function mouseMove_canvasMain(event){ ...@@ -1307,6 +1307,8 @@ function mouseMove_canvasMain(event){
zoomVideo(); zoomVideo();
closeDialogPopUpText();
// lastX = event.offsetX || (event.pageX - canvas_main.offsetLeft); // lastX = event.offsetX || (event.pageX - canvas_main.offsetLeft);
// lastY = event.offsetY || (event.pageY - canvas_main.offsetTop); // lastY = event.offsetY || (event.pageY - canvas_main.offsetTop);
// //
...@@ -1993,10 +1995,10 @@ function flip() { ...@@ -1993,10 +1995,10 @@ function flip() {
if(canvas.width > canvas.height) { if(canvas.width > canvas.height) {
height = canvas.height; height = canvas.height;
width = height * aspect; width = height * aspect;
if(width > canvas.width) { /*if(width > canvas.width) {
width = canvas.width; width = canvas.width;
height = width / aspect; height = width / aspect;
} }*/
} else { } else {
width = canvas.width; width = canvas.width;
height = width / aspect; height = width / aspect;
...@@ -2008,6 +2010,12 @@ function flip() { ...@@ -2008,6 +2010,12 @@ function flip() {
width = width * size; width = width * size;
} }
if(width > canvas.width){
var size = canvas.width / width;
width = canvas.width;
height = height * size;
}
if(userScale != 1 && width < canvas.width){ if(userScale != 1 && width < canvas.width){
width = width * userScale; width = width * userScale;
...@@ -2019,7 +2027,7 @@ function flip() { ...@@ -2019,7 +2027,7 @@ function flip() {
}else if(userScale != 1 && height < canvas.height){ }else if(userScale != 1 && height < canvas.height){
height = width * userScale; height = height * userScale;
if(height > canvas.height){ if(height > canvas.height){
//var size = canvas.height / height; //var size = canvas.height / height;
...@@ -2998,10 +3006,10 @@ function changeScale(scale) { ...@@ -2998,10 +3006,10 @@ function changeScale(scale) {
if(canvas.width > canvas.height) { if(canvas.width > canvas.height) {
height = canvas.height; height = canvas.height;
width = height * aspect; width = height * aspect;
if(width > canvas.width) { /*if(width > canvas.width) {
width = canvas.width; width = canvas.width;
height = width / aspect; height = width / aspect;
} }*/
} else { } else {
width = canvas.width; width = canvas.width;
height = width / aspect; height = width / aspect;
...@@ -3013,6 +3021,12 @@ function changeScale(scale) { ...@@ -3013,6 +3021,12 @@ function changeScale(scale) {
width = width * size; width = width * size;
} }
if(width > canvas.width){
var size = canvas.width / width;
width = canvas.width;
height = height * size;
}
if(width < canvas.width){ if(width < canvas.width){
//if(width >= height){ //if(width >= height){
......
abvw/js/contentview_Memo.js
...@@ -26,6 +26,8 @@ function createMemoDialog(){ ...@@ -26,6 +26,8 @@ function createMemoDialog(){
+' </div>' +' </div>'
+'</aside>'); +'</aside>');
$('#txaMemoContent').focus();
handleMemoEventFunction(); handleMemoEventFunction();
} }
function handleMemoEventFunction(){ function handleMemoEventFunction(){
...@@ -171,7 +173,7 @@ function CopyMemo(index,contentId,pageNo,targetId, posX, posY, callback){ ...@@ -171,7 +173,7 @@ function CopyMemo(index,contentId,pageNo,targetId, posX, posY, callback){
createMemoDialog(); createMemoDialog();
getMemoForEdit(); getMemoForEdit();
saveMode = 'Copy'; saveMode = 'Copy';
editJqueryUIDialog $('#Memo_btnDel').css('display','none');
//targetDiv.dialog({width: 466, height: 390, modal: true, position: [targetX, targetY], resizable: false}); //targetDiv.dialog({width: 466, height: 390, modal: true, position: [targetX, targetY], resizable: false});
//targetDiv.parent().removeClass('ui-draggable'); //targetDiv.parent().removeClass('ui-draggable');
$("#overlay").show(); $("#overlay").show();
......
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