From 824382b3ea5902d5e5343d2898232e1521565dff Mon Sep 17 00:00:00 2001
From: manzerbredes <loic.guegan_secondary@yahoo.fr>
Date: Wed, 2 Mar 2016 20:51:04 +0100
Subject: Clean file name

---
 client/index.html                        |  4 ++--
 client/js/controllers/home/home.js       | 36 ++++++++++++++++++++++++++++++++
 client/js/controllers/home/main.js       | 36 --------------------------------
 client/js/controllers/network/main.js    |  8 -------
 client/js/controllers/network/network.js |  8 +++++++
 client/js/services/Identity.js           |  2 +-
 client/js/services/Loading.js            | 15 ++++++-------
 7 files changed, 55 insertions(+), 54 deletions(-)
 create mode 100644 client/js/controllers/home/home.js
 delete mode 100644 client/js/controllers/home/main.js
 delete mode 100644 client/js/controllers/network/main.js
 create mode 100644 client/js/controllers/network/network.js

diff --git a/client/index.html b/client/index.html
index ca6bbe6..48ea4a0 100644
--- a/client/index.html
+++ b/client/index.html
@@ -86,9 +86,9 @@
     <!-- Include controller -->
     <script src="./js/controllers/login.js"></script>
     <script src="./js/controllers/status.js"></script>
-    <script src="./js/controllers/home/main.js"></script>
+    <script src="./js/controllers/home/home.js"></script>
     <script src="./js/controllers/home/machineDetails.js"></script>	
-    <script src="./js/controllers/network/main.js"></script>
+    <script src="./js/controllers/network/network.js"></script>
 
     
     
diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
new file mode 100644
index 0000000..f84f625
--- /dev/null
+++ b/client/js/controllers/home/home.js
@@ -0,0 +1,36 @@
+/**
+ * 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);
+	}
+
+
+}]);
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);
-	}
-
-
-}]);
diff --git a/client/js/controllers/network/main.js b/client/js/controllers/network/main.js
deleted file mode 100644
index 7264aec..0000000
--- a/client/js/controllers/network/main.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * The network controller
- * 
- * @param {$scope} $scope The $scope service from angular
- */
-mainApp.controller('networkCtrl', function ($scope)
-{
-});
\ No newline at end of file
diff --git a/client/js/controllers/network/network.js b/client/js/controllers/network/network.js
new file mode 100644
index 0000000..7264aec
--- /dev/null
+++ b/client/js/controllers/network/network.js
@@ -0,0 +1,8 @@
+/**
+ * The network controller
+ * 
+ * @param {$scope} $scope The $scope service from angular
+ */
+mainApp.controller('networkCtrl', function ($scope)
+{
+});
\ No newline at end of file
diff --git a/client/js/services/Identity.js b/client/js/services/Identity.js
index e6a9daf..db93e97 100644
--- a/client/js/services/Identity.js
+++ b/client/js/services/Identity.js
@@ -1,5 +1,5 @@
 
-mainApp.factory('Identity',[ '$http', '$cookies', '$rootScope', function($http, $cookies, $rootScope){
+mainApp.factory('Identity',[ '$http', '$cookies',  function($http, $cookies){
 
 	/* Create profile structure to store informations
 	 * about current session
diff --git a/client/js/services/Loading.js b/client/js/services/Loading.js
index b12aaa0..db06194 100644
--- a/client/js/services/Loading.js
+++ b/client/js/services/Loading.js
@@ -1,22 +1,23 @@
 
-mainApp.factory('Loading',[ '$http', 'Identity', function($http, Identity){
-
-
-
-
+mainApp.factory('Loading',[ function(){
+	/**
+	 * Display Loading modal
+	 */
 	var start=function(){
 		$('#loadingModal').modal({backdrop: 'static', keyboard: false});	
 	};
 
+	/**
+	 * Hide Loading modal
+	 */
 	var stop=function(){
 		$('#loadingModal').modal('hide');
 	}
 
 
+	// Service returns
 	return {
 		start:start,
 		stop:stop
 	};
-
-
 }]);
-- 
cgit v1.2.3