Add color to E division and simple hyperlink recognition

Starbow · Feb 1, 2015 · 6c36028 · 6c36028
1 parent e9e4710
commit 6c36028
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/web/CHANGELOG.md b/web/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Error control on replay upload
 - No Queue button if no region is selected
 - Color code on division and names
+- Simple hyperlink recognition
 
 ### Changed
 - Matching regions are deselected by default

diff --git a/web/package.json b/web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "erosjs",
   "private": true,
-  "version": "0.2.3b",
+  "version": "0.2.3c",
   "author": "Starbow Dev team",
   "description": "Starbow's matchmaking web client.",
   "repository": {

diff --git a/web/src/app/modules/eros-chat/directives.js b/web/src/app/modules/eros-chat/directives.js
@@ -105,6 +105,13 @@ angular.module('erosApp.chat', ['ngAudio'])
 		restrict: 'A',
 		link: function($scope, $elem, $attrs, $controller){
 			$elem.html($scope.message.message.replace(/@\w+/g, '<span username>'+'$&'+'</span>'));
+			$elem.html($scope.message.message.replace(/http\S*/g, function(match){
+				var rep = '<a href="'+match+'" target="_blank">';
+				rep += match.length > 40 ? match.slice(0,30)+'...'+match.slice(-6) : match;
+				rep += '</a>'
+
+				return rep;
+			}));
 		}
 	};
 })
@@ -153,7 +160,7 @@ angular.module('erosApp.chat', ['ngAudio'])
 	return function(division){
 		switch(division) {
 		case 'E':
-			return "#888";
+			return "#9966cc";
 			break
 		case 'D':
 			return "#AB3E3E";