diff --git a/app/index.html b/app/index.html index 100c9908..520ee52b 100644 --- a/app/index.html +++ b/app/index.html @@ -52,8 +52,8 @@ - - + + diff --git a/app/js/controllers.js b/app/js/controllers.js index f15ea5b2..8fe3cfe0 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -602,11 +602,10 @@ angular.module('myApp.controllers', []) $scope.notify = {}; $scope.send = {}; - AppConfigManager.get(['notify_nodesktop', 'notify_nosound', 'send_ctrlenter']).then(function (settings) { - $scope.notify.sound = !settings.notify_nosound; - $scope.notify.desktop = !settings.notify_nodesktop; - $scope.send.enter = settings.send_ctrlenter ? '' : '1'; - console.log($scope.send.enter); + AppConfigManager.get('notify_nodesktop', 'notify_nosound', 'send_ctrlenter').then(function (settings) { + $scope.notify.desktop = !settings[0]; + $scope.notify.sound = !settings[1]; + $scope.send.enter = settings[2] ? '' : '1'; }); $scope.$watch('notify.sound', function(newValue) { diff --git a/app/js/services.js b/app/js/services.js index 96f6f933..2b18d354 100644 --- a/app/js/services.js +++ b/app/js/services.js @@ -1824,6 +1824,10 @@ angular.module('myApp.services', []) seqStart = seqStart || seq; + if (!seqStart) { + return true; + } + if (seqStart != curState.seq + 1) { // console.log('seq hole', seqStart, curState.seq); if (seqStart != curState.seq) {