diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/DataModel.js | 4 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 6 | ||||
| -rw-r--r-- | www/js/EventModalCtrl.js | 6 | ||||
| -rw-r--r-- | www/js/MonitorCtrl.js | 3 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/TimelineModalCtrl.js | 6 |
6 files changed, 6 insertions, 21 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index bcbce199..9447020a 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -40,14 +40,14 @@ angular.module('zmApp.controllers') text: 'Portugese', value: 'pt' }, - /* { + { text: 'Arabic', value: 'ar' }, { text: 'Hindi', value: 'hi' - }*/ + } ]; var serverGroupList = {}; diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index b802ff0e..3df52e78 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -1681,11 +1681,7 @@ angular.module('zmApp.controllers') function humanizeTime(str) { - var et = moment(str); - var m = moment.duration(moment().diff(et)).humanize(); - - var r = m+' '+$translate.instant('kAgo'); - return (r); + return moment(str).fromNow(); } diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 373d415b..7bc7433c 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -1173,11 +1173,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro function humanizeTime(str) { - var et = moment(str); - var m = moment.duration(moment().diff(et)).humanize(); - - var r = m+' '+$translate.instant('kAgo'); - return (r); + return moment(str).fromNow(); } diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index d47c1bfb..fbfef879 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -284,9 +284,6 @@ angular.module('zmApp.controllers') $scope.monitors = []; $scope.monitors = message; - - - if ($scope.monitors.length == 0) { $rootScope.zmPopup = $ionicPopup.alert({ title: $translate.instant('kNoMonitors'), diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 8626fccd..1bbd6dee 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -588,7 +588,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla var graphIndex = 1; // will be used for graph ID - console.log ("**NOLANG" + fromDateNoLang + " " + toDateNoLang); + //console.log ("**NOLANG" + fromDateNoLang + " " + toDateNoLang); NVRDataModel.getEventsPages(0, fromDateNoLang, toDateNoLang) .then(function (data) { diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js index 10aa2ce3..f92aff26 100644 --- a/www/js/TimelineModalCtrl.js +++ b/www/js/TimelineModalCtrl.js @@ -444,11 +444,7 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' function humanizeTime(str) { - var et = moment(str); - var m = moment.duration(moment().diff(et)).humanize(); - - var r = m+' '+$translate.instant('kAgo'); - return (r); + return moment(str).fromNow(); } |