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

Consolidate window logic in panel controller

Browse source 
Previously the conversation window would query the background page
for a model id and then fetch the conversation. Instead, we can fetch
the conversation before opening the window, which simplifies the front
end scripts and avoids creating multiple copies of the same model.
This commit is contained in:
lilia 2015-02-11 02:47:50 -08:00
parent 90140556e4
commit 3279dddcc3
4 changed files with 81 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

34
js/background.js
View file

@ -59,29 +59,7 @@
var opened = false;
var panel = 0;
extension.browserAction(function () {
if (opened === false) {
opened = true;
extension.windows.open({
url: 'index.html',
type: 'panel',
focused: true,
width: 260, // 280 for chat
height: 440 // 420 for chat
}, function (window) {
var isPanelEnabled = window.alwaysOnTop;
panel = window.id;
});
} else if (opened === true) {
extension.windows.focus(panel);
}
extension.windows.onClosed(function (windowId) {
if (windowId === panel) {
panel = 0;
opened = false;
}
});
});
extension.browserAction(window.openInbox);
};
function onMessageReceived(pushMessage) {
@ -228,14 +206,4 @@
console.log('got delivery receipt for unknown message', pushMessage.source, timestamp);
});
};
var windowMap = Whisper.windowMap = new Whisper.Bimap('windowId', 'modelId');
// make sure panels are cleaned up on close
extension.windows.onClosed(function (windowId) {
if (windowMap.windowId[windowId]) {
closeConversation(windowId);
}
});
})();