Popout inbox

Rather than opening the inbox in its own window, let it appear as a
browser action popup by default, but allow promotion to its own window
if requested.

js/background.js

@@ -67,8 +67,6 @@
             });
         });
 
-        extension.browserAction(window.openInbox);
-
         // refresh views
         var views = extension.windows.getViews();
         for (var i = 0; i < views.length; ++i) {

js/index.js

@@ -20,10 +20,23 @@
 
     window.Whisper = window.Whisper || {};
     if (bg.textsecure.storage.getUnencrypted("number_id") === undefined) {
-        window.location = '/options.html';
+        extension.navigator.tabs.create('/options.html');
+        window.close();
     } else {
         new bg.Whisper.InboxView().$el.prependTo(bg.$('body',document));
         bg.textsecure.storage.putUnencrypted("unreadCount", 0);
         extension.navigator.setBadgeText("");
+
+        window.addEventListener('beforeunload', function () {
+            chrome.browserAction.setPopup({popup: 'index.html'}); // pop in
+        });
+
+        extension.windows.getCurrent(function (windowInfo) {
+            if (windowInfo.type === 'normal') {
+                bg.$('body', document).addClass('pop-in');
+            } else {
+                bg.$('.popout', document).remove();
+            }
+        });
     }
 }());

js/panel_controller.js

@@ -129,6 +129,12 @@
         }
     };
 
+    window.popoutInbox = function() {
+        chrome.browserAction.setPopup({popup: ''});
+        extension.browserAction(window.openInbox);
+        window.openInbox();
+    };
+
     // make sure windows are cleaned up on close
     extension.windows.onClosed(function (windowId) {
         if (windowMap.windowId[windowId]) {

js/views/inbox_view.js

@@ -80,6 +80,10 @@
         events: {
             'click .fab': 'showCompose',
             'select .contact': 'openConversation',
+            'click .popout': 'popout'
+        },
+        popout: function() {
+            bg.popoutInbox();
         },
         openConversation: function(e, data) {
             bg.openConversation(data.modelId);