20121206-3

abvw/common/json/lang/lang-en.json

@@ -48,8 +48,8 @@
 "dspTitleNm":"Title",
 "dspTitleNmKn":"Title（Kana）",
 "txtPubDt":"Released Date",
-"txtRecordNum":"",
-"txtRecordTotal":"",
+"txtRecordNum":" ",
+"txtRecordTotal":"    ",
 "dspViewMore":">> Next {0} contents",
 "txtGen":"Genre",
 "txtGr":"Group",
@@ -64,7 +64,7 @@
 "dspBkCancel":"Logout",
 "txtSearchResult":"Result",
 "dspHome":"Home",
-"txtLoginUser":"(Ver.20121206-1)User:",
+"txtLoginUser":"(Ver.20121206-3)User:",
 "txtAll":"All",
 "txtMkgSize":"Size",
 "txtMkgS":"S",

abvw/common/json/lang/lang-ja.json

@@ -64,7 +64,7 @@
 "dspBkCancel":"バックアップせずにログアウト",
 "txtSearchResult":"検索結果",
 "dspHome":"ホーム",
-"txtLoginUser":"(Ver.20121206-1)ログイン中：",
+"txtLoginUser":"(Ver.20121206-3)ログイン中：",
 "txtAll":"すべて",
 "txtMkgSize":"太さ",
 "txtMkgS":"小",

abvw/common/json/lang/lang-ko.json

@@ -64,7 +64,7 @@
 "dspBkCancel":"로그아웃",
 "txtSearchResult":"검색 결과",
 "dspHome":"홈",
-"txtLoginUser":"(Ver.20121206-1)로그인 중:",
+"txtLoginUser":"(Ver.20121206-3)로그인 중:",
 "txtAll":"전체",
 "txtMkgSize":"두께",
 "txtMkgS":"소",

abvw/contentview.html

@@ -1934,10 +1934,10 @@
 
             var strPattern = "\n";
             var strTemp = sPageText;
-            strTemp = strTemp.replace(strPattern, "<br/>");
+            strTemp = strTemp.replaceAll(strPattern, "<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 */	
 			// $("#divCopyText").dialog({ 		 		
@@ -3215,6 +3215,11 @@ function oldContent_Back(){
     	
     	/* check login */
 		if (!avwCheckLogin(ScreenIds.Login)) return;
+		// Set event to prevent leave
+		avwSetLogoutNortice();
+
+        // Lock screen
+		LockScreen();
 		
     	getContentID();
 			 
@@ -3380,7 +3385,7 @@ function oldContent_Back(){
         }
     });
 	
-	LockScreen();
+	//LockScreen();
 </script>
 
 </head>

abvw/js/contentview.js

@@ -558,7 +558,7 @@ PageObject.prototype.drawPageObject = function(context) {
 						// }	
 // 								
 					// }			

					
-					// flip();		
+					// flip();		
 									
 					/* draw marking */
 	   				drawMarkingOnScreen();	
@@ -1190,10 +1190,11 @@ function onClick_CanvasMain(event){
 }
 
 function mouseMove_canvasMain(event){
-	
-	event.preventDefault();	
+	event.preventDefault();
 	/* base image move when userScale over 1 */
-	if(moveFlag && userScale != 1) {			
+	if(moveFlag && userScale != 1) {	
+		$('#main').css('cursor','pointer');
+				
 		cancelClick = true;
 		var mx;
 		var my;
@@ -1208,7 +1209,7 @@ function mouseMove_canvasMain(event){
 			
 		// scaling
 		// 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;
@@ -1263,7 +1264,7 @@ function mouseMove_canvasMain(event){
 // 			
 // 
 // 			
-		// }
+		// }
 
 		
 	}		
@@ -1307,11 +1308,15 @@ function mouseMove_canvasMain(event){
 		}
 	}else{
 		$('#button_next_canvas').css('opacity','0');
-	}
+	}
 }
 
 function mouseDown_CanvasMain(event){	
 	moveFlag = true;
+	if(isTouchDevice() != true){
+		event.preventDefault();	
+	}
+	$('#main').css('cursor','default');
 	/*if(event.originalEvent) {
 		if(event.originalEvent.targetTouches) {
 			if(event.originalEvent.targetTouches[0].pageX) {
@@ -1336,12 +1341,13 @@ function mouseDown_CanvasMain(event){
 	// document.body.style.mozUserSelect = document.body.style.webkitUserSelect = document.body.style.userSelect = 'none';
 	// lastX = event.offsetX || (event.pageX - canvas_main.offsetLeft);
 	// lastY = event.offsetY || (event.pageY - canvas_main.offsetTop);
-	// dragStart = context_main.transformedPoint(lastX,lastY);
+	// dragStart = context_main.transformedPoint(lastX,lastY);
 	
 }
 
 function mouseUp_CanvasMain(event){
 	moveFlag = false;	
+	$('#main').css('cursor','default');
 }
 
 
@@ -1895,7 +1901,7 @@ function flip() {
 	
 	context.drawImage(offscreen,
 					 	  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();
 	
 };
@@ -2655,23 +2661,55 @@ function trackTransforms(ctx){
 function zoomIn() {
 	userScale += scaleDelta;	
 	
+	
+	
 	if(userScale > 4){
 		userScale = 4;
 	}
+	else{
+		changeScale(userScale);
 	
-	changeScale(userScale);
-	
-	flip();
+		flip();
 		
 	
-	/* zoom video */
-	zoomVideo();
+		/* zoom video */
+		zoomVideo();
+	}
+	
 	
 	checkDisableButtonZoom();
 };
 
 function checkDisableButtonZoom(){
 	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').removeClass();
@@ -2708,13 +2746,14 @@ function zoomOut() {
 	userScale -= scaleDelta;
 	if(userScale < 1) {
 		userScale = 1;
+	}else{
+		changeScale(userScale);
+		
+		flip();
+		
+		/* zoom video */
+		zoomVideo()
 	}
-	changeScale(userScale);
-	
-	flip();
-	
-	/* zoom video */
-	zoomVideo()
 	
 	checkDisableButtonZoom();
 };