thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Set expireTimer to null to unset

Browse source 
// FREEBIE
This commit is contained in:
lilia 2017-02-20 19:12:53 -08:00
parent 0fac2e1d68
commit 6509646bdb
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
js/models/conversations.js
View file

@ -199,6 +199,7 @@
}, },
updateExpirationTimer: function(expireTimer, source, received_at) { updateExpirationTimer: function(expireTimer, source, received_at) {
if (!expireTimer) { expireTimer = null; }
source = source || textsecure.storage.user.getNumber(); source = source || textsecure.storage.user.getNumber();
var timestamp = received_at || Date.now(); var timestamp = received_at || Date.now();
this.save({ expireTimer: expireTimer }); this.save({ expireTimer: expireTimer });

2
js/models/messages.js
View file

@ -424,7 +424,7 @@
message.get('received_at')); message.get('received_at'));
} }
} else if (conversation.get('expireTimer')) { } else if (conversation.get('expireTimer')) {
conversation.updateExpirationTimer(0, source, conversation.updateExpirationTimer(null, source,
message.get('received_at')); message.get('received_at'));
} }
} }

4
js/views/conversation_view.js
View file

@ -32,8 +32,10 @@
}, },
setTimer: function(e) { setTimer: function(e) {
var seconds = this.$(e.target).data().seconds; var seconds = this.$(e.target).data().seconds;
if (seconds >= 0) { if (seconds > 0) {
this.model.updateExpirationTimer(seconds); this.model.updateExpirationTimer(seconds);
} else {
this.model.updateExpirationTimer(null);
} }
}, },
render: function() { render: function() {