Merge branch 'develop' into Evan

1 files changed, 0 insertions, 36 deletions

diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js
deleted file mode 100644
index f84f625..0000000
--- a/client/js/controllers/home/main.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * The home controller
- * 
- * @param {$scope} $scope The $scope service from angular
- */
-mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', function ($scope, Compute, $rootScope, Loading, Identity)
-{
-
-	var callMeAfterPullData=function(data){
-		$scope.machines=Compute.getData().machines;
-			Loading.stop();
-	}
-
-	;
-	if(Compute.getData().machines == null && Identity.isAlreadyLogin()){
-		Loading.start();
-		Compute.pullData(callMeAfterPullData);		
-	}
-
-
-
-	
-	$scope.raiseShowMachineDetailsEvent=function(id){
-
-		var callback=function(){
-			Loading.stop();
-			var data=Compute.getData();
-			$rootScope.$broadcast("showMachineDetailsEvent", data.machines[id], data.axioms);		
-	
-		}
-		Loading.start();
-		Compute.pullMachines(callback);
-	}
-
-
-}]);