Revert "Popout inbox"

This reverts commit 31e7d285e3.

This seemed like a nice feature, but the popup bubble isn't very
conducive to nontrivial user inputs, e.g. file inputs.

Fixes #211
This commit is contained in:
lilia 2015-03-23 11:19:02 -07:00
parent 06f4d4456d
commit 5ffa265559
9 changed files with 4 additions and 52 deletions

View file

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

View file

@ -20,23 +20,10 @@
window.Whisper = window.Whisper || {};
if (bg.textsecure.storage.getUnencrypted("number_id") === undefined) {
extension.navigator.tabs.create('/options.html');
window.close();
window.location = '/options.html';
} 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();
}
});
}
}());

View file

@ -133,12 +133,6 @@
}
};
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]) {

View file

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