Don't request background page from background page
This file is loaded by the background page, which means it is already bound to the background page's global context. This was not true at some time in the distant past but is true now. // FREEBIE
This commit is contained in:
lilia
parent
88ec5970d5
commit
c1aada4f0f
1 changed files with 139 additions and 143 deletions
|
|
@ -6,163 +6,159 @@
|
||||||
|
|
||||||
window.Whisper = window.Whisper || {};
|
window.Whisper = window.Whisper || {};
|
||||||
|
|
||||||
extension.windows.getBackground(function(bg) {
|
var SocketView = Whisper.View.extend({
|
||||||
var SocketView = Whisper.View.extend({
|
className: 'status',
|
||||||
className: 'status',
|
initialize: function() {
|
||||||
initialize: function() {
|
setInterval(this.updateStatus.bind(this), 5000);
|
||||||
setInterval(this.updateStatus.bind(this), 5000);
|
},
|
||||||
},
|
updateStatus: function() {
|
||||||
updateStatus: function() {
|
var className, message = '';
|
||||||
extension.windows.getBackground(function(bg) {
|
switch(getSocketStatus && getSocketStatus()) {
|
||||||
var className, message = '';
|
case WebSocket.CONNECTING:
|
||||||
switch(bg.getSocketStatus && bg.getSocketStatus()) {
|
className = 'connecting';
|
||||||
case WebSocket.CONNECTING:
|
break;
|
||||||
className = 'connecting';
|
case WebSocket.OPEN:
|
||||||
break;
|
className = 'open';
|
||||||
case WebSocket.OPEN:
|
break;
|
||||||
className = 'open';
|
case WebSocket.CLOSING:
|
||||||
break;
|
className = 'closing';
|
||||||
case WebSocket.CLOSING:
|
break;
|
||||||
className = 'closing';
|
case WebSocket.CLOSED:
|
||||||
break;
|
className = 'closed';
|
||||||
case WebSocket.CLOSED:
|
message = 'Disconnected';
|
||||||
className = 'closed';
|
break;
|
||||||
message = 'Disconnected';
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (!this.$el.hasClass(className)) {
|
|
||||||
this.$el.attr('class', className);
|
|
||||||
this.$el.text(message);
|
|
||||||
}
|
|
||||||
}.bind(this));
|
|
||||||
},
|
|
||||||
events: {
|
|
||||||
'click': 'reloadBackgroundPage'
|
|
||||||
},
|
|
||||||
reloadBackgroundPage: function() {
|
|
||||||
chrome.runtime.reload();
|
|
||||||
}
|
}
|
||||||
});
|
if (!this.$el.hasClass(className)) {
|
||||||
|
this.$el.attr('class', className);
|
||||||
Whisper.ConversationStack = Whisper.View.extend({
|
this.$el.text(message);
|
||||||
className: 'conversation-stack',
|
|
||||||
open: function(conversation) {
|
|
||||||
var $el = this.$('#conversation-' + conversation.cid);
|
|
||||||
if ($el === null || $el.length === 0) {
|
|
||||||
var view = new Whisper.ConversationView({
|
|
||||||
model: conversation,
|
|
||||||
appWindow: this.model.appWindow
|
|
||||||
});
|
|
||||||
$el = view.$el;
|
|
||||||
}
|
|
||||||
$el.prependTo(this.el);
|
|
||||||
conversation.trigger('opened');
|
|
||||||
}
|
}
|
||||||
});
|
},
|
||||||
|
events: {
|
||||||
|
'click': 'reloadBackgroundPage'
|
||||||
|
},
|
||||||
|
reloadBackgroundPage: function() {
|
||||||
|
chrome.runtime.reload();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
Whisper.InboxView = Whisper.View.extend({
|
Whisper.ConversationStack = Whisper.View.extend({
|
||||||
templateName: 'two-column',
|
className: 'conversation-stack',
|
||||||
className: 'inbox',
|
open: function(conversation) {
|
||||||
initialize: function (options) {
|
var $el = this.$('#conversation-' + conversation.cid);
|
||||||
this.render();
|
if ($el === null || $el.length === 0) {
|
||||||
this.conversation_stack = new Whisper.ConversationStack({
|
var view = new Whisper.ConversationView({
|
||||||
el: this.$('.conversation-stack'),
|
model: conversation,
|
||||||
model: { appWindow: options.appWindow }
|
appWindow: this.model.appWindow
|
||||||
});
|
});
|
||||||
|
$el = view.$el;
|
||||||
|
}
|
||||||
|
$el.prependTo(this.el);
|
||||||
|
conversation.trigger('opened');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
this.newConversationView = new Whisper.NewConversationView({
|
Whisper.InboxView = Whisper.View.extend({
|
||||||
appWindow: options.appWindow
|
templateName: 'two-column',
|
||||||
});
|
className: 'inbox',
|
||||||
this.listenTo(this.newConversationView, 'open',
|
initialize: function (options) {
|
||||||
this.openConversation.bind(this, null));
|
this.render();
|
||||||
|
this.conversation_stack = new Whisper.ConversationStack({
|
||||||
|
el: this.$('.conversation-stack'),
|
||||||
|
model: { appWindow: options.appWindow }
|
||||||
|
});
|
||||||
|
|
||||||
var inboxCollection = bg.getInboxCollection();
|
this.newConversationView = new Whisper.NewConversationView({
|
||||||
this.inboxListView = new Whisper.ConversationListView({
|
appWindow: options.appWindow
|
||||||
el : this.$('.inbox'),
|
});
|
||||||
collection : inboxCollection
|
this.listenTo(this.newConversationView, 'open',
|
||||||
}).render();
|
this.openConversation.bind(this, null));
|
||||||
|
|
||||||
this.inboxListView.listenTo(inboxCollection,
|
var inboxCollection = getInboxCollection();
|
||||||
'add change:active_at',
|
this.inboxListView = new Whisper.ConversationListView({
|
||||||
this.inboxListView.onChangeActiveAt);
|
el : this.$('.inbox'),
|
||||||
|
collection : inboxCollection
|
||||||
|
}).render();
|
||||||
|
|
||||||
this.searchView = new Whisper.ConversationSearchView({
|
this.inboxListView.listenTo(inboxCollection,
|
||||||
el : this.$('.search-results'),
|
'add change:active_at',
|
||||||
input : this.$('input.search')
|
this.inboxListView.onChangeActiveAt);
|
||||||
});
|
|
||||||
|
|
||||||
|
this.searchView = new Whisper.ConversationSearchView({
|
||||||
|
el : this.$('.search-results'),
|
||||||
|
input : this.$('input.search')
|
||||||
|
});
|
||||||
|
|
||||||
|
this.searchView.$el.hide();
|
||||||
|
|
||||||
|
this.listenTo(this.searchView, 'hide', function() {
|
||||||
this.searchView.$el.hide();
|
this.searchView.$el.hide();
|
||||||
|
this.inboxListView.$el.show();
|
||||||
|
});
|
||||||
|
this.listenTo(this.searchView, 'show', function() {
|
||||||
|
this.searchView.$el.show();
|
||||||
|
this.inboxListView.$el.hide();
|
||||||
|
});
|
||||||
|
|
||||||
this.listenTo(this.searchView, 'hide', function() {
|
if (inboxCollection.length === 0) {
|
||||||
this.searchView.$el.hide();
|
this.searchView.showAllContacts = true;
|
||||||
this.inboxListView.$el.show();
|
this.searchView.reset();
|
||||||
});
|
this.listenToOnce(inboxCollection, 'add', function(model) {
|
||||||
this.listenTo(this.searchView, 'show', function() {
|
this.searchView.showAllContacts = false;
|
||||||
this.searchView.$el.show();
|
|
||||||
this.inboxListView.$el.hide();
|
|
||||||
});
|
|
||||||
|
|
||||||
if (inboxCollection.length === 0) {
|
|
||||||
this.searchView.showAllContacts = true;
|
|
||||||
this.searchView.reset();
|
this.searchView.reset();
|
||||||
this.listenToOnce(inboxCollection, 'add', function(model) {
|
model.trigger('opened');
|
||||||
this.searchView.showAllContacts = false;
|
|
||||||
this.searchView.reset();
|
|
||||||
model.trigger('opened');
|
|
||||||
}.bind(this));
|
|
||||||
}
|
|
||||||
|
|
||||||
new SocketView().render().$el.appendTo(this.$('.socket-status'));
|
|
||||||
|
|
||||||
extension.windows.onClosed(function() {
|
|
||||||
this.inboxListView.stopListening();
|
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
},
|
|
||||||
events: {
|
|
||||||
'click': 'closeMenu',
|
|
||||||
'click .hamburger': 'toggleMenu',
|
|
||||||
'click .show-debug-log': 'showDebugLog',
|
|
||||||
'click .show-new-conversation': 'showCompose',
|
|
||||||
'select .gutter .contact': 'openConversation',
|
|
||||||
'input input.search': 'filterContacts'
|
|
||||||
},
|
|
||||||
filterContacts: function(e) {
|
|
||||||
this.searchView.filterContacts(e);
|
|
||||||
var input = this.$('input.search');
|
|
||||||
if (input.val().length > 0) {
|
|
||||||
input.addClass('active');
|
|
||||||
} else {
|
|
||||||
input.removeClass('active');
|
|
||||||
}
|
|
||||||
},
|
|
||||||
openConversation: function(e, conversation) {
|
|
||||||
this.searchView.hideHints();
|
|
||||||
conversation = ConversationController.create(conversation);
|
|
||||||
this.conversation_stack.open(conversation);
|
|
||||||
this.hideCompose();
|
|
||||||
},
|
|
||||||
showCompose: function() {
|
|
||||||
this.newConversationView.reset();
|
|
||||||
this.newConversationView.$el.prependTo(this.conversation_stack.el);
|
|
||||||
this.newConversationView.$input.focus();
|
|
||||||
this.listenToOnce(this.newConversationView, 'back', this.hideCompose);
|
|
||||||
},
|
|
||||||
hideCompose: function() {
|
|
||||||
this.newConversationView.$el.remove();
|
|
||||||
},
|
|
||||||
toggleMenu: function() {
|
|
||||||
this.$('.global-menu .menu-list').toggle();
|
|
||||||
},
|
|
||||||
showDebugLog: function() {
|
|
||||||
this.$('.debug-log').remove();
|
|
||||||
new Whisper.DebugLogView().$el.appendTo(this.el);
|
|
||||||
},
|
|
||||||
closeMenu: function(e) {
|
|
||||||
if (e && !$(e.target).hasClass('hamburger')) {
|
|
||||||
this.$('.global-menu .menu-list').hide();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
|
||||||
|
new SocketView().render().$el.appendTo(this.$('.socket-status'));
|
||||||
|
|
||||||
|
extension.windows.onClosed(function() {
|
||||||
|
this.inboxListView.stopListening();
|
||||||
|
}.bind(this));
|
||||||
|
},
|
||||||
|
events: {
|
||||||
|
'click': 'closeMenu',
|
||||||
|
'click .hamburger': 'toggleMenu',
|
||||||
|
'click .show-debug-log': 'showDebugLog',
|
||||||
|
'click .show-new-conversation': 'showCompose',
|
||||||
|
'select .gutter .contact': 'openConversation',
|
||||||
|
'input input.search': 'filterContacts'
|
||||||
|
},
|
||||||
|
filterContacts: function(e) {
|
||||||
|
this.searchView.filterContacts(e);
|
||||||
|
var input = this.$('input.search');
|
||||||
|
if (input.val().length > 0) {
|
||||||
|
input.addClass('active');
|
||||||
|
} else {
|
||||||
|
input.removeClass('active');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
openConversation: function(e, conversation) {
|
||||||
|
this.searchView.hideHints();
|
||||||
|
conversation = ConversationController.create(conversation);
|
||||||
|
this.conversation_stack.open(conversation);
|
||||||
|
this.hideCompose();
|
||||||
|
},
|
||||||
|
showCompose: function() {
|
||||||
|
this.newConversationView.reset();
|
||||||
|
this.newConversationView.$el.prependTo(this.conversation_stack.el);
|
||||||
|
this.newConversationView.$input.focus();
|
||||||
|
this.listenToOnce(this.newConversationView, 'back', this.hideCompose);
|
||||||
|
},
|
||||||
|
hideCompose: function() {
|
||||||
|
this.newConversationView.$el.remove();
|
||||||
|
},
|
||||||
|
toggleMenu: function() {
|
||||||
|
this.$('.global-menu .menu-list').toggle();
|
||||||
|
},
|
||||||
|
showDebugLog: function() {
|
||||||
|
this.$('.debug-log').remove();
|
||||||
|
new Whisper.DebugLogView().$el.appendTo(this.el);
|
||||||
|
},
|
||||||
|
closeMenu: function(e) {
|
||||||
|
if (e && !$(e.target).hasClass('hamburger')) {
|
||||||
|
this.$('.global-menu .menu-list').hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
})();
|
})();
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue