Merge pull request #18 from FoolHen/master

Cleanup

Author: Powback

WebUI/package-lock.json

@@ -11,12 +11,12 @@
   "dependencies": {
     "vue": "2.6.12",
     "vue-vext-plugin": "0.1.2",
-    "vuex": "3.5.1"
+    "vuex": "3.6.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "4.5.6",
-    "@vue/cli-plugin-eslint": "4.5.6",
-    "@vue/cli-service": "4.5.6",
+    "@vue/cli-plugin-babel": "4.5.9",
+    "@vue/cli-plugin-eslint": "4.5.9",
+    "@vue/cli-service": "4.5.9",
     "@vue/devtools": "^5.1.4",
     "@vue/eslint-config-standard": "^6.0.0",
     "babel-eslint": "^10.1.0",
@@ -26,9 +26,9 @@
     "eslint-plugin-promise": "4.2.1",
     "eslint-plugin-standard": "5.0.0",
     "eslint-plugin-vue": "7.3.0",
-    "node-sass": "4.14.1",
-    "raw-loader": "4.0.1",
-    "sass-loader": "10.0.2",
+    "node-sass": "5.0.0",
+    "raw-loader": "4.0.2",
+    "sass-loader": "10.1.0",
     "vextpack": "0.1.5",
     "vue-template-compiler": "2.6.12"
   },

WebUI/package.json

@@ -20,22 +20,20 @@ export default {
     text-shadow: 0 0 6px #1551a0;
 
     .author {
-      font-family: 'Blinker';
+      font-family: 'Blinker', serif;
       font-size: 14px;
       margin-right: 8px;
     }
 
     .content {
-      font-family: 'Blinker';
+      font-family: 'Blinker', serif;
       font-size: 13px;
     }
-
     &.all {
       .author {
         text-shadow: 0 0 6px #002A61;
       }
     }
-
     &.team {
       .author {
         color: #74edff;

WebUI/src/components/ChatMessage.vue

@@ -16,7 +16,7 @@ global.StoreCommit = (type, payload) => {
 
 global.debug = window.location.href.indexOf('webui') === -1;
 
-if (debug) {
+if (global.debug) {
     console.log('Running UI on debug mode');
     setTimeout(() => {
         StoreCommit('AddMessage', { author: 'FoolHen', content: 'Talking in global chat', target: 'all' });

WebUI/src/main.js

@@ -43,8 +43,6 @@ function AdvancedChat:OnSendChatMessage(p_Contents)
 		return
 	end
 
-	print("message: "..s_Message..", target: "..s_Target)
-
 	-- Dispatch message based on the specified target.
 	if s_Target == 'all' then
 		ChatManager:SendMessage(s_Message)
@@ -64,4 +62,4 @@ function AdvancedChat:OnSendChatMessage(p_Contents)
 	return
 end
 
-g_AdvancedChat = AdvancedChat()
+g_AdvancedChat = AdvancedChat()

WebUI/yarn.lock

@@ -17,8 +17,6 @@ end
 function AdvancedChatHooks:OnInputConceptEvent(p_Hook, p_EventType, p_Action)
 	-- If this is a chat-related input concept event then filter it
 	-- to prevent the game from showing the default chat dialog.
-	print("OnInputConceptEvent")
-
 	if p_Action == UIInputAction.UIInputAction_SayAllChat and p_EventType == UIInputActionEventType.UIInputActionEventType_Pressed then
 		m_StoreManager:Dispatch("EnableTyping", "all")
 		p_Hook:Pass(UIInputAction.UIInputAction_None, p_EventType)
@@ -50,7 +48,6 @@ function AdvancedChatHooks:OnEnableCursorMode(p_Hook, p_Enable, p_Cursor)
 	-- Here we store the current cursor mode as requested by the
 	-- engine in order to restore it later on.
 
-	print("OnEnableCursorMode, enable: "..tostring(p_Enable))
 	self.m_CursorMode = p_Enable
 end
 
@@ -59,7 +56,6 @@ function AdvancedChatHooks:OnDisableMouse()
 	-- If mouse input was previously enabled by the engine
 	-- we will ignore this request.
 
-	print("OnDisableMouse")
 	if self.m_CursorMode then
 		return
 	end
@@ -73,16 +69,12 @@ function AdvancedChatHooks:OnEnableMouse()
 	-- If mouse input is already enabled we will ignore
 	-- this request.
 
-	print("OnEnableMouse")
 	if self.m_CursorMode then
-		print("mouse already enabled, ignoring")
 		return
 	end
 
-	print("mouse disabled, enabling")
-
 	-- Otherwise, we will proceed to enabling it.
 	WebUI:EnableMouse()
 end
 
-return AdvancedChatHooks
+return AdvancedChatHooks

ext/Client/__init__.lua

@@ -12,8 +12,6 @@ function AdvancedChatMessages:OnCreateChatMessage(p_Hook, p_Message, p_Channel,
 		return
 	end
 
-	print("OnCreateChatMessage")
-
 	-- Get the player sending the message, and our local player.
 	local s_OtherPlayer = PlayerManager:GetPlayerById(p_PlayerId)
 	local s_LocalPlayer = PlayerManager:GetLocalPlayer()
@@ -27,7 +25,6 @@ function AdvancedChatMessages:OnCreateChatMessage(p_Hook, p_Message, p_Channel,
 		local s_String = p_Message:gsub("^Admin: ", '')
 
 		s_Table = {author = "Admin", content = s_String, target = "admin"}
-		print('OnMessage, '.. json.encode(s_Table))
 		m_StoreManager:Dispatch("OnMessage", s_Table)
 
 		goto continue
@@ -67,14 +64,13 @@ function AdvancedChatMessages:OnCreateChatMessage(p_Hook, p_Message, p_Channel,
 	end
 
 	s_Table = {author = s_OtherPlayer.name, content = p_Message, target = s_Target}
-	print('OnMessage, '.. json.encode(s_Table))
 	m_StoreManager:Dispatch("OnMessage", s_Table)
 
 	::continue::
 
-	-- A new chat message is being created; 
+	-- A new chat message is being created;
 	-- prevent the game from rendering it.
 	p_Hook:Return()
 end
 
-return AdvancedChatMessages
+return AdvancedChatMessages