From bc2b8cd00e2c09ef0fe835317aef757b20e2e21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?=
 =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?=
 <jisangs@gmail.com>
Date: Wed, 17 Jul 2019 11:14:33 +0900
Subject: [PATCH] Fix: typing_examination -> typing_exam

---
 src/game/lib/button/typing_exam_button.js           |  2 +-
 src/game/lib/global/global_variables.js             | 13 ++++++++-----
 src/game/result/result.js                           |  4 ++--
 src/game/typing/examination/game.js                 |  2 +-
 src/web/client/result.html                          |  2 +-
 .../{typing_examination.html => typing_exam.html}   |  0
 6 files changed, 13 insertions(+), 10 deletions(-)
 rename src/web/client/{typing_examination.html => typing_exam.html} (100%)

diff --git a/src/game/lib/button/typing_exam_button.js b/src/game/lib/button/typing_exam_button.js
index 14c2896..23a635e 100644
--- a/src/game/lib/button/typing_exam_button.js
+++ b/src/game/lib/button/typing_exam_button.js
@@ -37,7 +37,7 @@ function TypingExamButton(x, y, iconName, buttonText, writingID) {
 
 TypingExamButton.prototype.onClick = function() {
 	sessionStorageManager.setWritingID(this.writingID);
-	location.href = '../../web/client/typing_examination.html';
+	location.href = '../../web/client/typing_exam.html';
 	// printSessionStorage();
 }
 
diff --git a/src/game/lib/global/global_variables.js b/src/game/lib/global/global_variables.js
index 84e1c61..0bc7b93 100644
--- a/src/game/lib/global/global_variables.js
+++ b/src/game/lib/global/global_variables.js
@@ -100,18 +100,21 @@ function isMouseGameApp() {
 
 
 function isTypingPracticeApp() {
-	var appName = sessionStorageManager.getPlayingAppName();
-
-	if(appName.indexOf("practice_") > -1)
+	if(sessionStorageManager.getPlayingAppName().indexOf("practice_") > -1)
 		return true;
 
 	return false;
 }
 
 function isTypingTestApp() {
-	var appName = sessionStorageManager.getPlayingAppName();
+	if(sessionStorageManager.getPlayingAppName().indexOf("test_") > -1)
+		return true;
 
-	if(appName.indexOf("test_") > -1)
+	return false;
+}
+
+function isTypingExamApp() {
+	if(sessionStorageManager.getPlayingAppName() == "typing_exam")
 		return true;
 
 	return false;
diff --git a/src/game/result/result.js b/src/game/result/result.js
index e939962..dbd91a6 100644
--- a/src/game/result/result.js
+++ b/src/game/result/result.js
@@ -3,7 +3,7 @@ var Result = {
 	preload: function() {
 		game.load.image('icon_fullscreen', '../../../resources/image/icon/fullscreen_white.png');
 
-		if(isTypingPracticeApp() || isTypingTestApp())
+		if(isTypingPracticeApp() || isTypingTestApp() || isTypingExamApp())
 			Animal.loadResources();
 
 		RankingBoard.loadResources();
@@ -84,7 +84,7 @@ var Result = {
 		if(sessionStorageManager.getRecord() === null)
 			sessionStorageManager.setRecord(0);
 
-		if(isTypingPracticeApp() || isTypingTestApp()) {
+		if(isTypingPracticeApp() || isTypingTestApp() || isTypingExamApp()) {
 			var animalLevelID = 0;
 			if(isTypingPracticeApp())
 				animalLevelID = Animal.animalLevelIDByRecord(sessionStorageManager.getRecord(), Animal.TYPE_PRACTICE);
diff --git a/src/game/typing/examination/game.js b/src/game/typing/examination/game.js
index 6bd6708..fe24c93 100644
--- a/src/game/typing/examination/game.js
+++ b/src/game/typing/examination/game.js
@@ -14,7 +14,7 @@ var TypingExamination = {
 		// sessionStorageManager.setPlayingAppKoreanName("타자 검정");
 		// sessionStorageManager.setRecord(0);
 		// sessionStorageManager.setAppHighestRecord(100.123);
-		sessionStorageManager.setPlayingAppName("typing_examination");
+		sessionStorageManager.setPlayingAppName("typing_exam");
 		sessionStorageManager.setPlayingAppKoreanName("타자 검정");
 
 
diff --git a/src/web/client/result.html b/src/web/client/result.html
index 3850d60..0347f2b 100644
--- a/src/web/client/result.html
+++ b/src/web/client/result.html
@@ -16,7 +16,7 @@
 
 		<!-- global source files -->
 		<script src="../../game/lib/session_storage_manager.js"></script>
-		<script src="../../game/lib/global/global_variables.js?update_date=191224"></script>
+		<script src="../../game/lib/global/global_variables.js?update_date=190719"></script>
 
 		<!-- library source files -->
 		<script src="../../game/lib/util/number_util.js"></script>
diff --git a/src/web/client/typing_examination.html b/src/web/client/typing_exam.html
similarity index 100%
rename from src/web/client/typing_examination.html
rename to src/web/client/typing_exam.html