Skip to content

C
check
Commit b9c45397 by Motohisa Nakano
Options

20121206-3

parent 90cbc971
Showing with 72 additions and 28 deletions
abvw/common/json/lang/lang-en.json
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
"dspTitleNm":"Title", "dspTitleNm":"Title",
"dspTitleNmKn":"Title（Kana）", "dspTitleNmKn":"Title（Kana）",
"txtPubDt":"Released Date", "txtPubDt":"Released Date",
"txtRecordNum":"", "txtRecordNum":" ",
"txtRecordTotal":"", "txtRecordTotal":" ",
"dspViewMore":">> Next {0} contents", "dspViewMore":">> Next {0} contents",
"txtGen":"Genre", "txtGen":"Genre",
"txtGr":"Group", "txtGr":"Group",
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"Logout", "dspBkCancel":"Logout",
"txtSearchResult":"Result", "txtSearchResult":"Result",
"dspHome":"Home", "dspHome":"Home",
"txtLoginUser":"(Ver.20121206-1)User:", "txtLoginUser":"(Ver.20121206-3)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.20121206-1)ログイン中：", "txtLoginUser":"(Ver.20121206-3)ログイン中：",
"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.20121206-1)로그인 중:", "txtLoginUser":"(Ver.20121206-3)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
......
abvw/contentview.html
...@@ -1934,10 +1934,10 @@ ...@@ -1934,10 +1934,10 @@
var strPattern = "\n"; var strPattern = "\n";
var strTemp = sPageText; var strTemp = sPageText;
strTemp = strTemp.replace(strPattern, "<br/>"); strTemp = strTemp.replaceAll(strPattern, "<br/>");
strTemp += "<br/>"; strTemp += "<br/>";
$('#divCopyText').append('<div class="last" id="txtTextCopy" style="word-wrap:break-word">' + strTemp + '</div>'); $('#divCopyText').append('<div class="last" id="txtTextCopy" style="word-wrap:break-word;line-height: 20px">' + strTemp + '</div>');
/* display dialog */ /* display dialog */
// $("#divCopyText").dialog({ // $("#divCopyText").dialog({
...@@ -3215,6 +3215,11 @@ function oldContent_Back(){ ...@@ -3215,6 +3215,11 @@ function oldContent_Back(){
/* check login */ /* check login */
if (!avwCheckLogin(ScreenIds.Login)) return; if (!avwCheckLogin(ScreenIds.Login)) return;
// Set event to prevent leave
avwSetLogoutNortice();
// Lock screen
LockScreen();
getContentID(); getContentID();
...@@ -3380,7 +3385,7 @@ function oldContent_Back(){ ...@@ -3380,7 +3385,7 @@ function oldContent_Back(){
} }
}); });
LockScreen(); //LockScreen();
</script> </script>
</head> </head>
......
abvw/js/contentview.js
...@@ -558,7 +558,7 @@ PageObject.prototype.drawPageObject = function(context) { ...@@ -558,7 +558,7 @@ PageObject.prototype.drawPageObject = function(context) {
// } // }
// //
// } // }
// flip(); // flip();
/* draw marking */ /* draw marking */
drawMarkingOnScreen(); drawMarkingOnScreen();
...@@ -1190,10 +1190,11 @@ function onClick_CanvasMain(event){ ...@@ -1190,10 +1190,11 @@ function onClick_CanvasMain(event){
} }
function mouseMove_canvasMain(event){ function mouseMove_canvasMain(event){
event.preventDefault();
event.preventDefault();
/* base image move when userScale over 1 */ /* base image move when userScale over 1 */
if(moveFlag && userScale != 1) { if(moveFlag && userScale != 1) {
$('#main').css('cursor','pointer');
cancelClick = true; cancelClick = true;
var mx; var mx;
var my; var my;
...@@ -1208,7 +1209,7 @@ function mouseMove_canvasMain(event){ ...@@ -1208,7 +1209,7 @@ function mouseMove_canvasMain(event){
// scaling // scaling
// var sx = (destRect.right - destRect.left) / (srcRect.right - srcRect.left); // var sx = (destRect.right - destRect.left) / (srcRect.right - srcRect.left);
// var sy = (destRect.bottom - destRect.top) / (srcRect.bottom - srcRect.top); // var sy = (destRect.bottom - destRect.top) / (srcRect.bottom - srcRect.top);
var sx = 1 / userScale; var sx = 1 / userScale;
...@@ -1263,7 +1264,7 @@ function mouseMove_canvasMain(event){ ...@@ -1263,7 +1264,7 @@ function mouseMove_canvasMain(event){
// //
// //
// //
// } // }
} }
...@@ -1307,11 +1308,15 @@ function mouseMove_canvasMain(event){ ...@@ -1307,11 +1308,15 @@ function mouseMove_canvasMain(event){
} }
}else{ }else{
$('#button_next_canvas').css('opacity','0'); $('#button_next_canvas').css('opacity','0');
} }
} }
function mouseDown_CanvasMain(event){ function mouseDown_CanvasMain(event){
moveFlag = true; moveFlag = true;
if(isTouchDevice() != true){
event.preventDefault();
}
$('#main').css('cursor','default');
/*if(event.originalEvent) { /*if(event.originalEvent) {
if(event.originalEvent.targetTouches) { if(event.originalEvent.targetTouches) {
if(event.originalEvent.targetTouches[0].pageX) { if(event.originalEvent.targetTouches[0].pageX) {
...@@ -1336,12 +1341,13 @@ function mouseDown_CanvasMain(event){ ...@@ -1336,12 +1341,13 @@ function mouseDown_CanvasMain(event){
// document.body.style.mozUserSelect = document.body.style.webkitUserSelect = document.body.style.userSelect = 'none'; // document.body.style.mozUserSelect = document.body.style.webkitUserSelect = document.body.style.userSelect = 'none';
// 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);
// dragStart = context_main.transformedPoint(lastX,lastY); // dragStart = context_main.transformedPoint(lastX,lastY);
} }
function mouseUp_CanvasMain(event){ function mouseUp_CanvasMain(event){
moveFlag = false; moveFlag = false;
$('#main').css('cursor','default');
} }
...@@ -1895,7 +1901,7 @@ function flip() { ...@@ -1895,7 +1901,7 @@ function flip() {
context.drawImage(offscreen, context.drawImage(offscreen,
srcRect.left, srcRect.top, srcRect.right - srcRect.left, srcRect.bottom - srcRect.top, srcRect.left, srcRect.top, srcRect.right - srcRect.left, srcRect.bottom - srcRect.top,
destRect.left, destRect.top, width, height); destRect.left, destRect.top, width, height);
context.restore(); context.restore();
}; };
...@@ -2655,23 +2661,55 @@ function trackTransforms(ctx){ ...@@ -2655,23 +2661,55 @@ function trackTransforms(ctx){
function zoomIn() { function zoomIn() {
userScale += scaleDelta; userScale += scaleDelta;
if(userScale > 4){ if(userScale > 4){
userScale = 4; userScale = 4;
} }
else{
changeScale(userScale);
changeScale(userScale); flip();
flip();
/* zoom video */ /* zoom video */
zoomVideo(); zoomVideo();
}
checkDisableButtonZoom(); checkDisableButtonZoom();
}; };
function checkDisableButtonZoom(){ function checkDisableButtonZoom(){
if(userScale >= 4){ if(userScale >= 4){
$('#zoomin').removeClass();
$('#zoomin').addClass('expansion_off');
$("#zoomin").css('cursor', 'default');
}else{
$('#zoomin').unbind('click');
$('#zoomin').bind('click',zoomIn);
$('#zoomin').removeClass();
$('#zoomin').addClass('expansion');
$("#zoomin").css('cursor', 'pointer');
}
if(userScale <= 1){
$('#zoomout').removeClass();
$('#zoomout').addClass('reduction_off');
$("#zoomout").css('cursor', 'default');
}else{
$('#zoomout').unbind('click');
$('#zoomout').bind('click',zoomOut);
$('#zoomout').removeClass();
$('#zoomout').addClass('reduction');
$("#zoomout").css('cursor', 'pointer');
}
}
function checkDisableButtonZoom1(){
if(userScale >= 4){
$('#zoomin').unbind('click'); $('#zoomin').unbind('click');
$('#zoomin').removeClass(); $('#zoomin').removeClass();
...@@ -2708,13 +2746,14 @@ function zoomOut() { ...@@ -2708,13 +2746,14 @@ function zoomOut() {
userScale -= scaleDelta; userScale -= scaleDelta;
if(userScale < 1) { if(userScale < 1) {
userScale = 1; userScale = 1;
}else{
changeScale(userScale);
flip();
/* zoom video */
zoomVideo()
} }
changeScale(userScale);
flip();
/* zoom video */
zoomVideo()
checkDisableButtonZoom(); checkDisableButtonZoom();
}; };
......
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