From ca68f01a9dbdb097501b1251c1b57deb167cd62d Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Wed, 13 Dec 2017 12:16:21 +0000 Subject: [PATCH] Build chat message styles on the controller side (allowing for extra parameters). --- services/web/app/views/project/editor/chat.pug | 7 ++----- .../ide/chat/controllers/ChatMessageController.coffee | 9 ++++++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/services/web/app/views/project/editor/chat.pug b/services/web/app/views/project/editor/chat.pug index fcd47a81e3..cdfbcfc097 100644 --- a/services/web/app/views/project/editor/chat.pug +++ b/services/web/app/views/project/editor/chat.pug @@ -35,12 +35,9 @@ aside.chat( span(ng-if="message.user.first_name") {{ message.user.first_name }} span(ng-if="!message.user.first_name") {{ message.user.email }} .message( - ng-style="{\ - 'border-color': 'hsl({{ hue(message.user) }}, 70%, 70%)',\ - 'background-color': 'hsl({{ hue(message.user) }}, 60%, 97%)'\ - }" + ng-style="getMessageStyle(message.user);" ) - .arrow(ng-style="{'border-color': 'hsl({{ hue(message.user) }}, 70%, 70%)'}") + .arrow(ng-style="getArrowStyle(message.user)") .message-content p( mathjax, diff --git a/services/web/public/coffee/ide/chat/controllers/ChatMessageController.coffee b/services/web/public/coffee/ide/chat/controllers/ChatMessageController.coffee index 30fbccd05a..302aa1fd94 100644 --- a/services/web/public/coffee/ide/chat/controllers/ChatMessageController.coffee +++ b/services/web/public/coffee/ide/chat/controllers/ChatMessageController.coffee @@ -3,9 +3,16 @@ define [ "ide/colors/ColorManager" ], (App, ColorManager) -> App.controller "ChatMessageController", ["$scope", "ide", ($scope, ide) -> - $scope.hue = (user) -> + hue = (user) -> if !user? return 0 else return ColorManager.getHueForUserId(user.id) + + $scope.getMessageStyle = (user) -> + "border-color" : "hsl(#{ hue(user) }, 70%, 70%)" + "background-color" : "hsl(#{ hue(user) }, 60%, 97%)" + + $scope.getArrowStyle = (user) -> + "border-color" : "hsl(#{ hue(user) }, 70%, 70%)" ] \ No newline at end of file