Просмотр исходного кода

added some null checks to message.user.id

Henry Oswald 11 лет назад
Родитель
Сommit
c4b21f3184

+ 1 - 1
services/web/public/coffee/ide/chat/controllers/ChatButtonController.coffee

@@ -15,7 +15,7 @@ define [
 			
 		$scope.$on "chat:newMessage", (e, message) ->
 			if message?
-				if message.user.id != ide.$scope.user.id
+				if message?.user?.id != ide.$scope.user.id
 					if !$scope.ui.chatOpen
 						$scope.unreadMessages += 1
 					flashTitle()

+ 3 - 3
services/web/public/coffee/ide/chat/services/chatMessages.coffee

@@ -18,7 +18,7 @@ define [
 		
 		justSent = false	
 		ide.socket.on "new-chat-message", (message) =>
-			if message.user.id == ide.$scope.user.id and justSent
+			if message?.user?.id == ide.$scope.user.id and justSent
 				# Nothing to do
 			else
 				ide.$scope.$apply () ->
@@ -65,7 +65,7 @@ define [
 		prependMessage = (message) ->
 			firstMessage = chat.state.messages[0]
 			shouldGroup = firstMessage? and
-				firstMessage.user.id == message.user.id and
+				firstMessage.user.id == message?.user?.id and
 				firstMessage.timestamp - message.timestamp < TIMESTAMP_GROUP_SIZE
 			if shouldGroup
 				firstMessage.timestamp = message.timestamp
@@ -86,7 +86,7 @@ define [
 			
 			lastMessage = chat.state.messages[chat.state.messages.length - 1]
 			shouldGroup = lastMessage? and
-				lastMessage.user.id == message.user.id and
+				lastMessage.user.id == message?.user?.id and
 				message.timestamp - lastMessage.timestamp < TIMESTAMP_GROUP_SIZE
 			if shouldGroup
 				lastMessage.timestamp = message.timestamp