cleanup

public/src/forum/admin/general/dashboard.js

@@ -307,55 +307,65 @@ define('forum/admin/general/dashboard', ['semver'], function(semver) {
 	}
 
 	function updateTopicsGraph(topics) {
-		var tids = Object.keys(topics);
+		var tids = Object.keys(topics),
+			segments = graphs.topics.segments;
 
-		var segments = graphs.topics.segments;
+		function reassignExistingTopics() {
+			for (var i = 0, ii = segments.length; i < ii; i++ ) {
+				var tid = segments[i].tid;
 
-		for (var i = 0, ii = segments.length; i < ii; i++ ){
+				if ($.inArray(tid, tids) === -1) {
-			var tid = segments[i].tid;
+					usedTopicColors.splice($.inArray(segments[i].color, usedTopicColors), 1);
-
+					graphs.topics.removeData(i);
-			if ($.inArray(tid, tids) === -1) {
+				} else {
-				usedTopicColors.splice($.inArray(segments[i].color, usedTopicColors), 1);
+					graphs.topics.segments[i].value = topics[tid];
-				graphs.topics.removeData(i);
+					delete topics[tid];
-			} else {
+				}
-				graphs.topics.segments[i].value = topics[tid];
-				delete topics[tid];
 			}
 		}
 
-		while (segments.length < 10 && tids.length > 0) {
+		function assignNewTopics() {
-			var tid = tids.pop(),
+			while (segments.length < 10 && tids.length > 0) {
-				value = topics[tid],
+				var tid = tids.pop(),
-				color = null;
+					value = topics[tid],
+					color = null;
 
-			if (!value) {
+				if (!value) {
-				continue;
+					continue;
-			}
+				}
 
-			do {
+				do {
-				for (var i = 0, ii = topicColors.length; i < ii; i++) {
+					for (var i = 0, ii = topicColors.length; i < ii; i++) {
-					var chosenColor = topicColors[i];
+						var chosenColor = topicColors[i];
 
-					if ($.inArray(chosenColor, usedTopicColors) === -1) {
+						if ($.inArray(chosenColor, usedTopicColors) === -1) {
-						color = chosenColor;
+							color = chosenColor;
-						usedTopicColors.push(color);
+							usedTopicColors.push(color);
-						break;
+							break;
+						}
 					}
-				}
+				} while (color !== null && usedTopicColors.length === topicColors.length);
-			} while (color !== null && usedTopicColors.length === topicColors.length);
 
-			graphs.topics.addData({
+				graphs.topics.addData({
-				value: tid,
+					value: tid,
-				color: color,
+					color: color,
-				highlight: lighten(color, 10),
+					highlight: lighten(color, 10),
-				label: "tid " + value
+					label: "tid " + value
-			});
+				});
 
-			segments[segments.length - 1].tid = tid;
+				segments[segments.length - 1].tid = tid;
+			}
 		}
 
+		reassignExistingTopics();
+		assignNewTopics();
+
 		graphs.topics.update();
 	}
 
+	function buildTopicsLegend() {
+
+	}
+
 	return Admin;
 });