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

js/views/inbox_view.js

@@ -6,163 +6,159 @@
 
     window.Whisper = window.Whisper || {};
 
-    extension.windows.getBackground(function(bg) {
-        var SocketView = Whisper.View.extend({
-            className: 'status',
-            initialize: function() {
-                setInterval(this.updateStatus.bind(this), 5000);
-            },
-            updateStatus: function() {
-                extension.windows.getBackground(function(bg) {
-                    var className, message = '';
-                    switch(bg.getSocketStatus && bg.getSocketStatus()) {
-                        case WebSocket.CONNECTING:
-                            className = 'connecting';
-                            break;
-                        case WebSocket.OPEN:
-                            className = 'open';
-                            break;
-                        case WebSocket.CLOSING:
-                            className = 'closing';
-                            break;
-                        case WebSocket.CLOSED:
-                            className = 'closed';
-                            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();
+    var SocketView = Whisper.View.extend({
+        className: 'status',
+        initialize: function() {
+            setInterval(this.updateStatus.bind(this), 5000);
+        },
+        updateStatus: function() {
+            var className, message = '';
+            switch(getSocketStatus && getSocketStatus()) {
+                case WebSocket.CONNECTING:
+                    className = 'connecting';
+                    break;
+                case WebSocket.OPEN:
+                    className = 'open';
+                    break;
+                case WebSocket.CLOSING:
+                    className = 'closing';
+                    break;
+                case WebSocket.CLOSED:
+                    className = 'closed';
+                    message = 'Disconnected';
+                    break;
             }
-        });
-
-        Whisper.ConversationStack = Whisper.View.extend({
-            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');
+            if (!this.$el.hasClass(className)) {
+                this.$el.attr('class', className);
+                this.$el.text(message);
             }
-        });
+        },
+        events: {
+            'click': 'reloadBackgroundPage'
+        },
+        reloadBackgroundPage: function() {
+            chrome.runtime.reload();
+        }
+    });
 
-        Whisper.InboxView = Whisper.View.extend({
-            templateName: 'two-column',
-            className: 'inbox',
-            initialize: function (options) {
-                this.render();
-                this.conversation_stack = new Whisper.ConversationStack({
-                    el: this.$('.conversation-stack'),
-                    model: { appWindow: options.appWindow }
+    Whisper.ConversationStack = Whisper.View.extend({
+        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');
+        }
+    });
 
-                this.newConversationView = new Whisper.NewConversationView({
-                    appWindow: options.appWindow
-                });
-                this.listenTo(this.newConversationView, 'open',
-                    this.openConversation.bind(this, null));
+    Whisper.InboxView = Whisper.View.extend({
+        templateName: 'two-column',
+        className: 'inbox',
+        initialize: function (options) {
+            this.render();
+            this.conversation_stack = new Whisper.ConversationStack({
+                el: this.$('.conversation-stack'),
+                model: { appWindow: options.appWindow }
+            });
 
-                var inboxCollection = bg.getInboxCollection();
-                this.inboxListView = new Whisper.ConversationListView({
-                    el         : this.$('.inbox'),
-                    collection : inboxCollection
-                }).render();
+            this.newConversationView = new Whisper.NewConversationView({
+                appWindow: options.appWindow
+            });
+            this.listenTo(this.newConversationView, 'open',
+                this.openConversation.bind(this, null));
 
-                this.inboxListView.listenTo(inboxCollection,
-                        'add change:active_at',
-                        this.inboxListView.onChangeActiveAt);
+            var inboxCollection = getInboxCollection();
+            this.inboxListView = new Whisper.ConversationListView({
+                el         : this.$('.inbox'),
+                collection : inboxCollection
+            }).render();
 
-                this.searchView = new Whisper.ConversationSearchView({
-                    el    : this.$('.search-results'),
-                    input : this.$('input.search')
-                });
+            this.inboxListView.listenTo(inboxCollection,
+                    'add change:active_at',
+                    this.inboxListView.onChangeActiveAt);
 
-                this.searchView.$el.hide();
+            this.searchView = new Whisper.ConversationSearchView({
+                el    : this.$('.search-results'),
+                input : this.$('input.search')
+            });
 
-                this.listenTo(this.searchView, 'hide', function() {
-                    this.searchView.$el.hide();
-                    this.inboxListView.$el.show();
-                });
-                this.listenTo(this.searchView, 'show', function() {
-                    this.searchView.$el.show();
-                    this.inboxListView.$el.hide();
-                });
+            this.searchView.$el.hide();
+
+            this.listenTo(this.searchView, 'hide', function() {
+                this.searchView.$el.hide();
+                this.inboxListView.$el.show();
+            });
+            this.listenTo(this.searchView, 'show', function() {
+                this.searchView.$el.show();
+                this.inboxListView.$el.hide();
+            });
 
-                if (inboxCollection.length === 0) {
-                    this.searchView.showAllContacts = true;
+            if (inboxCollection.length === 0) {
+                this.searchView.showAllContacts = true;
+                this.searchView.reset();
+                this.listenToOnce(inboxCollection, 'add', function(model) {
+                    this.searchView.showAllContacts = false;
                     this.searchView.reset();
-                    this.listenToOnce(inboxCollection, 'add', function(model) {
-                        this.searchView.showAllContacts = false;
-                        this.searchView.reset();
-                        model.trigger('opened');
-                    }.bind(this));
-                }
+                    model.trigger('opened');
+                }.bind(this));
+            }
 
-                new SocketView().render().$el.appendTo(this.$('.socket-status'));
+            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();
-                }
+            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();
             }
-        });
+        }
     });
 
 })();