diff --git a/www/js/modules/toast/service.js b/www/js/modules/toast/service.js index 0f5f626bde7fa26823cb4d39614a8b642e9ef53f..f0eaa7cbf9dbc07f0e9e185f31e9c7640172041e 100644 --- a/www/js/modules/toast/service.js +++ b/www/js/modules/toast/service.js @@ -18,11 +18,13 @@ return { show : function (message, duration, location) { - if (window.cordova) { - $cordovaToast.show(message, duration, location); - } else { - console.log($translate(message)); - } + $translate(message).then(function (data) { + if (window.cordova) { + $cordovaToast.show(message, duration, location); + } else { + console.log(data); + } + }); } }; diff --git a/www/js/pages/football-details/controller.js b/www/js/pages/football-details/controller.js index 4c7d5d6cadcaddfe37dba6d6bd9c520f5c097144..62b22c398ef297fa425e067b6648c9aef1217b10 100644 --- a/www/js/pages/football-details/controller.js +++ b/www/js/pages/football-details/controller.js @@ -47,6 +47,10 @@ Scope functions **/ + $scope.isUndefined = function (value) { + return typeof value === 'undefined' || value === null; + }; + $scope.myGoBack = function() { $ionicHistory.goBack(); }; diff --git a/www/js/pages/football/controller.js b/www/js/pages/football/controller.js index a050343bdf83c7ac3657fad03338e989abe178f4..0b881ad2551e0bc3b4d6d55d3043ba9d9a4af317 100644 --- a/www/js/pages/football/controller.js +++ b/www/js/pages/football/controller.js @@ -65,7 +65,7 @@ $scope.getLink = function (league) { if (league.device_status === 'unlock') { - return 'details({leagueId:' + league.id + '})'; + return 'football-details({leagueId:' + league.id + '})'; } return '-'; }; diff --git a/www/js/pages/tennis-details/controller.js b/www/js/pages/tennis-details/controller.js index 6ce218af862c55d07d2bd85e71489dcdf72224c6..cd8363511209cbd60b1657d3f7d867854da04a31 100644 --- a/www/js/pages/tennis-details/controller.js +++ b/www/js/pages/tennis-details/controller.js @@ -48,6 +48,10 @@ Scope functions **/ + $scope.isUndefined = function (value) { + return typeof value === 'undefined' || value === null; + }; + $scope.myGoBack = function() { $ionicHistory.goBack(); }; @@ -116,10 +120,10 @@ var scores = []; sets.forEach(function (set) { scores.push(set.split('-')); - }) + }); prediction.score = scores; } - } + }; /** End Controller functions