Merge remote-tracking branch 'bobrik/color-loading-fix' into pulls

2013-09-17 09:27:17 -07:00
parent 608b66f3ce fc069a0458
commit e23d733805
1 changed files with 1 additions and 1 deletions
@@ -51,7 +51,7 @@ function (angular, _, config) {
      // Check each query object, populate its defaults
      _.each(self.list,function(query,id) {
        _.defaults(query,_query);
-        query.color = colorAt(id);
+        query.color = query.color || colorAt(id);
      });

      if (self.ids.length === 0) {