From 5a6e65d11b9cfa4abb912e41d3b4150ad69c81ab Mon Sep 17 00:00:00 2001 From: lilia Date: Thu, 9 Mar 2017 10:40:47 -0800 Subject: [PATCH] Merge index.html into background.html Nothing stops us from rendering the inbox in the background page, since it is no longer a background page at all. TODO: intercept window close events to hide this window instead of closing it unless the app is quit explicitly. // FREEBIE --- background.html | 18 ++++++++++++++++++ js/panel_controller.js | 39 +++++---------------------------------- 2 files changed, 23 insertions(+), 34 deletions(-) diff --git a/background.html b/background.html index 5be4f45fd..5937aad1c 100644 --- a/background.html +++ b/background.html @@ -2,6 +2,13 @@ + + + Signal + + + + +
+
+ +
+ + + +
+
Loading...
+
+
diff --git a/js/panel_controller.js b/js/panel_controller.js index 0df0a853b..88eb4a286 100644 --- a/js/panel_controller.js +++ b/js/panel_controller.js @@ -47,41 +47,12 @@ console.log('open inbox'); if (inboxOpened === false) { inboxOpened = true; - extension.windows.open({ - id: 'inbox', - url: 'index.html', - focused: true, - width: 580, - height: 440, - minWidth: 600, - minHeight: 360 - }, function (windowInfo) { - appWindow = windowInfo; - inboxWindowId = appWindow.id; - - appWindow.contentWindow.addEventListener('load', function() { - setUnreadCount(storage.get("unreadCount", 0)); - }); - - appWindow.onClosed.addListener(function () { - inboxOpened = false; - appWindow = null; - }); - - appWindow.contentWindow.addEventListener('blur', function() { - inboxFocused = false; - }); - appWindow.contentWindow.addEventListener('focus', function() { - inboxFocused = true; - clearAttention(); - }); - - // close the inbox if background.html is refreshed - extension.windows.onSuspend(function() { - // TODO: reattach after reload instead of closing. - extension.windows.remove(inboxWindowId); - }); + 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) {