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

Collect references to Whisper.events

Browse source 
Fixup

// FREEBIE
This commit is contained in:
lilia 2017-04-24 17:59:11 -07:00 committed by Scott Nonnenberg
parent f7c7e2251d
commit a2e0fa59c1
No known key found for this signature in database
GPG key ID: A4931C09644C654B
4 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
js/background.js
View file

@ -65,7 +65,7 @@
init(true); init(true);
}); });
var appView = window.owsDesktopApp.appView = new Whisper.AppView({el: $('body'), events: Whisper.events}); var appView = window.owsDesktopApp.appView = new Whisper.AppView({el: $('body')});
Whisper.WallClockListener.init(Whisper.events); Whisper.WallClockListener.init(Whisper.events);
Whisper.RotateSignedPreKeyListener.init(Whisper.events); Whisper.RotateSignedPreKeyListener.init(Whisper.events);
@ -87,6 +87,14 @@
appView.inboxView.networkStatusView.setSocketReconnectInterval(60000); appView.inboxView.networkStatusView.setSocketReconnectInterval(60000);
}); });
[
'openInbox',
'openInstaller',
'openConversation',
'openStandalone'
].forEach(function(eventName) {
appView.listenTo(Whisper.events, eventName, appView[eventName]);
});
}); });
window.getSyncRequest = function() { window.getSyncRequest = function() {

20
js/views/app_view.js
View file

@ -7,15 +7,15 @@
initialize: function(options) { initialize: function(options) {
this.inboxView = null; this.inboxView = null;
this.installView = null; this.installView = null;
this.events = options.events; },
this.events.on('openStandalone', this.openStandaloneInstaller, this); events: {
this.events.on('openConversation', this.openConversation, this); 'openInstaller': 'openInstaller',
this.events.on('openInstaller', this.openInstaller, this); 'openInbox': 'openInbox',
this.events.on('openInbox', this.openInbox, this);
}, },
openView: function(view) { openView: function(view) {
this.el.innerHTML = ""; this.el.innerHTML = "";
this.el.append(view.el); this.el.append(view.el);
this.delegateEvents();
}, },
openInstaller: function() { openInstaller: function() {
this.closeInstaller(); this.closeInstaller();
@ -26,10 +26,12 @@
} }
this.openView(this.installView); this.openView(this.installView);
}, },
openStandaloneInstaller: function() { openStandalone: function() {
this.closeInstaller(); if (window.config.environment !== 'production') {
this.installView = new Whisper.StandaloneRegistrationView(); this.closeInstaller();
this.openView(this.installView); this.installView = new Whisper.StandaloneRegistrationView();
this.openView(this.installView);
}
}, },
closeInstaller: function() { closeInstaller: function() {
if (this.installView) { if (this.installView) {

2
js/views/network_status_view.js
View file

@ -29,7 +29,7 @@
'click .openInstaller': 'openInstaller' 'click .openInstaller': 'openInstaller'
}, },
openInstaller: function() { openInstaller: function() {
Whisper.events.trigger('openInstaller'); this.$el.trigger('openInstaller');
}, },
onReconnectTimer: function() { onReconnectTimer: function() {
this.setSocketReconnectInterval(60000); this.setSocketReconnectInterval(60000);

4
js/views/standalone_registration_view.js
View file

@ -32,8 +32,8 @@
var verificationCode = $('#code').val().replace(/\D+/g, ""); var verificationCode = $('#code').val().replace(/\D+/g, "");
this.accountManager.registerSingleDevice(number, verificationCode).then(function() { this.accountManager.registerSingleDevice(number, verificationCode).then(function() {
Whisper.events.trigger('openInbox'); this.$el.trigger('openInbox');
}).catch(this.log.bind(this)); }.bind(this)).catch(this.log.bind(this));
}, },
log: function (s) { log: function (s) {
console.log(s); console.log(s);