r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed settings

Browse Source
This commit is contained in:
Igor Zhukov 2014-02-05 15:41:28 +04:00
parent 9a24b87d95
commit 2754df1c99
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/index.html
View File

@ -52,8 +52,8 @@
<script type="text/javascript" src="js/util.js"></script>
<script type="text/javascript" src="js/app.js?14"></script>
<script type="text/javascript" src="js/services.js?16"></script>
<script type="text/javascript" src="js/controllers.js?24"></script>
<script type="text/javascript" src="js/services.js?17"></script>
<script type="text/javascript" src="js/controllers.js?25"></script>
<script type="text/javascript" src="js/filters.js?3"></script>
<script type="text/javascript" src="js/directives.js?16"></script>

9
app/js/controllers.js
View File

@ -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) {

4
app/js/services.js
View File

@ -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) {