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

Refactor app view

Browse source 
Introduce a top level view for navigating between the inbox and the
installer, enabling an in-window relink flow. Navigation is driven
through the openInbox and openInstaller global events.

// FREEBIE
This commit is contained in:
lilia 2017-04-12 14:20:56 -07:00 • committed by Scott Nonnenberg
parent 3f5505907f
commit e4e41140c4
No known key found for this signature in database
GPG key ID: A4931C09644C654B
7 changed files with 111 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

45
js/panel_controller.js
View file

@ -1,4 +1,4 @@
/*global $, Whisper, Backbone, textsecure, extension*/
/*global $, Whisper, Backbone, extension*/
/*
* vim: ts=4:sw=4:expandtab
*/
@ -10,11 +10,11 @@
window.Whisper = window.Whisper || {};
window.isOpen = function() {
return inboxOpened;
return true;
};
window.drawAttention = function() {
if (inboxOpened && !isFocused()) {
if (isOpen() && !isFocused()) {
if (window.keepClear) {
clearInterval(window.keepClear);
delete window.keepClear;
@ -33,29 +33,10 @@
extension.windows.clearAttention(inboxWindowId);
}, 2000);
};
/* Inbox window controller */
var inboxOpened = false;
var inboxWindowId = 'inbox';
var appWindow = null;
window.openInbox = function() {
console.log('open inbox');
if (inboxOpened === false) {
inboxOpened = true;
owsDesktopApp.getAppView(window).then(function(appView) {
var bodyEl = $('body');
bodyEl.innerHTML = "";
bodyEl.append(appView.el);
});
owsDesktopApp.openConversation(getOpenConversation());
} else if (inboxOpened === true) {
extension.windows.focus(inboxWindowId, function (error) {
if (error) {
inboxOpened = false;
openInbox();
}
});
}
window.openInbox = function(options) {
Whisper.events.trigger('openInbox', options);
};
window.setUnreadCount = function(count) {
@ -68,18 +49,8 @@
}
};
var open;
window.openConversation = function(conversation) {
if (inboxOpened === true) {
owsDesktopApp.openConversation(conversation);
} else {
open = conversation;
}
openInbox();
};
window.getOpenConversation = function() {
var o = open;
open = null;
return o;
Whisper.events.trigger('openConversation', conversation);
};
})();