From 7de6b75595b5236c357dafaee9d100880791688d Mon Sep 17 00:00:00 2001
From: oleg <oleg.korobenko@gmail.com>
Date: Mon, 28 Sep 2015 02:58:02 +0300
Subject: [PATCH] small refactor of mixins inclusion

---
 static/js/app/components/builds/list.js       | 22 ++++++++++---------
 .../js/app/components/projects/view/index.js  | 21 +++++++++++-------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/static/js/app/components/builds/list.js b/static/js/app/components/builds/list.js
index 06b410f..675f3fc 100644
--- a/static/js/app/components/builds/list.js
+++ b/static/js/app/components/builds/list.js
@@ -13,16 +13,18 @@ define([
 	});
 
 	var Component = React.createClass({
-		mixins: [Reflux.connectFilter(buildsStore, 'items', function(items) {
-			var projectName = this.props.projectName;
-			if (projectName) {
-				return _(items).filter(function(item) {
-					return item.project.name === projectName;
-				});
-			} else {
-				return items;
-			}
-		})],
+		mixins: [
+			Reflux.connectFilter(buildsStore, 'items', function(items) {
+				var projectName = this.props.projectName;
+				if (projectName) {
+					return _(items).filter(function(item) {
+						return item.project.name === projectName;
+					});
+				} else {
+					return items;
+				}
+			})
+		],
 		render: template
 	});
 
diff --git a/static/js/app/components/projects/view/index.js b/static/js/app/components/projects/view/index.js
index 1ae0b20..6f4d2d7 100644
--- a/static/js/app/components/projects/view/index.js
+++ b/static/js/app/components/projects/view/index.js
@@ -21,14 +21,19 @@ define([
 	});
 
 	return React.createClass({
-		mixins: [Reflux.connectFilter(projectStore, 'project', function(project) {
-			if (project.name === this.props.params.name) {
-				return project;
-			} else {
-				var state = this.state;
-				return state ? state.project : projectStore.getInitialState();
-			}
-		})],
+		mixins: [
+			Reflux.connectFilter(projectStore, 'project', function(project) {
+				if (project.name === this.props.params.name) {
+					return project;
+				} else {
+					if (this.state) {
+						return this.state.project;
+					} else {
+						return projectStore.getInitialState();
+					}
+				}
+			})
+		],
 		statics: {
 			willTransitionTo: function(transition, params, query) {
 				ProjectActions.read({name: params.name});