Merge pull request #5 from CrystSw/bugfix

バージョン1.1.2のmasterへの統合
CrystSw · Mar 26, 2020 · 0f226dd · 0f226dd
2 parents 25b2a37 + ccb71f4
commit 0f226dd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/olinvas_websocket_server.php b/src/olinvas_websocket_server.php
@@ -19,7 +19,7 @@
 //ロガーの初期化
 $GLOBALS['logger'] = new Logger(LOG_TYPE, LOG_OUTPUT_DIRECTORY);
 $GLOBALS['logger']->printLog(LOG_INFO, "###Olinvas websocket server has started.###");
-$GLOBALS['logger']->printLog(LOG_INFO, "###Server Version: 1.1.1 (for Client Version: 1.1.1)###");
+$GLOBALS['logger']->printLog(LOG_INFO, "###Server Version: 1.1.2 (for Client Version: 1.1.2)###");
 $GLOBALS['logger']->printLog(LOG_INFO, "###Protocol Version: 1.1###");
 
 //サーバスタートアップ

diff --git a/webroot/index.html b/webroot/index.html
@@ -30,7 +30,7 @@ <h2 class="text-center">Olinvasを使ってみよう．</h2>
 			</div>
 		</div>
 		<footer class="fixed-bottom bg-primary text-white">
-			Olinvas ver.1.1.1 (c) 2020 CrystSw
+			Olinvas ver.1.1.2 (c) 2020 CrystSw
 		</footer>
 	</body>
 </html>
diff --git a/webroot/js/olinvas.js b/webroot/js/olinvas.js
@@ -1,7 +1,7 @@
 /*==============================
 Olinvas Client
 --------------------------------
-client ver.1.1.1
+client ver.1.1.2
 protocol ver.1.1
 ==============================*/
 
@@ -85,6 +85,8 @@ var serverPort = 13181;
 				case 'ReleaseRoom-Echo':
 					lockScreen('lock_room-close');
 					$('#info_room-close').fadeIn('fast');
+
+					isEditable = false;
 					break;
 
 				case 'JoinRoom-Accept':
@@ -179,6 +181,8 @@ var serverPort = 13181;
 
 					lockScreen('lock_too-connection');
 					$('#info_too-connection').fadeIn('fast');
+
+					isEditable = false;
 					break;
 
 				case 'ConnectionBan-Echo':
@@ -187,6 +191,8 @@ var serverPort = 13181;
 					lockScreen('lock_connection-ban');
 					$('#pardon-time').text(Math.ceil(responses['pardonTime']/60));
 					$('#info_client-ban').fadeIn('fast');
+
+					isEditable = false;
 					break;
 
 				case 'ServerInfo-Echo':
@@ -226,12 +232,16 @@ var serverPort = 13181;
 				lockScreen('lock_server-access');
 				$('#info_connection-reset').fadeIn('fast');
 			}
+
+			isEditable = false;
 		},
 
 		onError : function(event){
 			//error renderer
 			lockScreen('lock_server-access');
 			$('#info_server-error').fadeIn('fast');
+
+			isEditable = false;
 		},
 
 		createRoom : function(roomName, roomPassword){

diff --git a/webroot/room.html b/webroot/room.html
@@ -8,8 +8,8 @@
 		<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css"/>
 		<script type="text/javascript" src="js/jquery-3.4.1.min.js"></script>
 		<script type="text/javascript" src="js/bootstrap.min.js"></script>
-		<script type="text/javascript" src="js/common.js?ver=1.1.1"></script>
-		<script type="text/javascript" src="js/olinvas.js?ver=1.1.1"></script>
+		<script type="text/javascript" src="js/common.js?ver=1.1.2"></script>
+		<script type="text/javascript" src="js/olinvas.js?ver=1.1.2"></script>
 	</head>
 	<body class="bg-light">
 		<header class="sticky-top bg-primary text-white mb-2" style="font-size:2rem;">
@@ -179,7 +179,7 @@ <h1 id="room-name"role="none"></h1>
 			</div>
 		</div>
 		<footer class="fixed-bottom bg-primary text-white">
-			Olinvas ver.1.1.1 (c) 2020 CrystSw
+			Olinvas ver.1.1.2 (c) 2020 CrystSw
 		</footer>
 	</body>
 </html>