diff options
| -rw-r--r-- | client/index.html | 4 | ||||
| -rw-r--r-- | client/js/controllers/home/home.js (renamed from client/js/controllers/home/main.js) | 0 | ||||
| -rw-r--r-- | client/js/controllers/network/network.js (renamed from client/js/controllers/network/main.js) | 0 | ||||
| -rw-r--r-- | client/js/services/Identity.js | 2 | ||||
| -rw-r--r-- | client/js/services/Loading.js | 15 |
5 files changed, 11 insertions, 10 deletions
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/main.js b/client/js/controllers/home/home.js index f84f625..f84f625 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/home.js diff --git a/client/js/controllers/network/main.js b/client/js/controllers/network/network.js index 7264aec..7264aec 100644 --- a/client/js/controllers/network/main.js +++ b/client/js/controllers/network/network.js 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 }; - - }]); |