Эх сурвалжийг харах

Build chat message styles on the controller side (allowing for extra parameters).

Paulo Reis 8 жил өмнө
parent
commit
ca68f01a9d

+ 2 - 5
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.first_name }}
 							span(ng-if="!message.user.first_name") {{ message.user.email }}
 							span(ng-if="!message.user.first_name") {{ message.user.email }}
 						.message(
 						.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
 							.message-content
 								p(
 								p(
 									mathjax,
 									mathjax,

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

@@ -3,9 +3,16 @@ define [
 	"ide/colors/ColorManager"
 	"ide/colors/ColorManager"
 ], (App, ColorManager) ->
 ], (App, ColorManager) ->
 	App.controller "ChatMessageController", ["$scope", "ide", ($scope, ide) ->
 	App.controller "ChatMessageController", ["$scope", "ide", ($scope, ide) ->
-		$scope.hue = (user) ->
+		hue = (user) ->
 			if !user?
 			if !user?
 				return 0
 				return 0
 			else
 			else
 				return ColorManager.getHueForUserId(user.id)
 				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%)"
 	]
 	]