From cf6874b169731fee39f25b3f6c75967efd63f6e4 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Sun, 31 Jan 2016 13:18:15 +0100 Subject: Add sanitize module, use angular route minified --- client/js/app.js | 2 +- client/js/controllers/status.js | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'client/js') diff --git a/client/js/app.js b/client/js/app.js index 7fedb32..c931d7e 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -1,6 +1,6 @@ // Declare main app -var mainApp=angular.module("mainApp",['ngRoute']); +var mainApp=angular.module("mainApp",['ngRoute', 'ngSanitize']); mainApp.config(['$routeProvider', function($routeProvider){ diff --git a/client/js/controllers/status.js b/client/js/controllers/status.js index 0767202..01fdcc3 100644 --- a/client/js/controllers/status.js +++ b/client/js/controllers/status.js @@ -4,15 +4,20 @@ -mainApp.controller('statusCtrl', function ($scope,$interval) +mainApp.controller('statusCtrl', function ($scope,$interval,$sce) { // Update status every 2 seconds $interval(function(){ var status=identity.fetchStatus(); - $scope.connection=status[0]; $scope.username=status[1]; $scope.lastconnection=status[2]; + if(status[0] == "1"){ + $scope.connection=$sce.trustAsHtml("Connection : Online"); + } + else{ + $scope.connection="Connection : Offline"; + } }, 2000); -- cgit v1.2.3