mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Breakout timer rendering into its own view

Browse source 
Make width and height constant.
This commit is contained in:
lilia 2016-09-23 16:50:03 -07:00
parent bd713352e3
commit e809a0cf8b
6 changed files with 118 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

26
js/views/message_view.js
View file

@ -25,6 +25,23 @@
resend: i18n('resend')
}
});
var TimerView = Whisper.View.extend({
templateName: 'hourglass',
className: 'timer',
initialize: function() {
if (this.model.isExpiring()) {
this.render();
var totalTime = this.model.get('expireTimer') * 1000;
var remainingTime = this.model.msTilExpire();
var elapsed = (totalTime - remainingTime) / totalTime;
this.$('.sand')
.css('animation-duration', remainingTime*0.001 + 's')
.css('transform', 'translateY(' + elapsed*100 + '%)');
this.$el.show();
}
return this;
}
});
Whisper.MessageView = Whisper.View.extend({
tagName: 'li',
@ -134,14 +151,7 @@
}
},
renderExpiring: function() {
if (this.model.isExpiring()) {
var totalTime = this.model.get('expireTimer') * 1000;
var remainingTime = this.model.msTilExpire();
this.$('.hourglass .sand')
.css('animation-duration', remainingTime*0.001 + 's')
.css('transform', 'translateY(' + 100*(1 - (remainingTime / totalTime)) + '%)');
this.$el.addClass('expiring');
}
new TimerView({ model: this.model, el: this.$('.timer') });
},
render: function() {
var contact = this.model.isIncoming() ? this.model.getContact() : null;