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

Simplify openConversation

Browse source 
Now that the InboxView is initialized in the background page context, we
can manipulate it more directly, without going through a global function
on the foreground window.

// FREEBIE
This commit is contained in:
lilia 2017-04-10 12:45:58 -07:00
parent 06e53871b2
commit cce1fe5c4b
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
js/background.js
View file

@ -308,12 +308,7 @@
try { try {
if (self.inboxView) { self.inboxView.remove(); } if (self.inboxView) { self.inboxView.remove(); }
self.inboxView = new Whisper.InboxView({model: self, window: destWindow}); self.inboxView = new Whisper.InboxView({model: self, window: destWindow});
destWindow.openConversation = function(conversation) { self.openConversation(getOpenConversation());
if (conversation) {
self.inboxView.openConversation(null, conversation);
}
};
destWindow.openConversation(getOpenConversation());
return self.inboxView; return self.inboxView;
@ -321,6 +316,11 @@
console.log(e); console.log(e);
} }
}); });
},
openConversation: function(conversation) {
if (this.inboxView && conversation) {
this.inboxView.openConversation(null, conversation);
}
} }
}; };

2
js/panel_controller.js
View file

@ -97,7 +97,7 @@
var open; var open;
window.openConversation = function(conversation) { window.openConversation = function(conversation) {
if (inboxOpened === true) { if (inboxOpened === true) {
appWindow.contentWindow.openConversation(conversation); owsDesktopApp.openConversation(conversation);
} else { } else {
open = conversation; open = conversation;
} }