show correct app name in drop list

ryanray · Sep 20, 2012 · 95c4a0b · 95c4a0b
1 parent 7d891f1
commit 95c4a0b
Show file tree

Hide file tree

Showing 9 changed files with 503 additions and 320 deletions.
diff --git a/grunt.js b/grunt.js
@@ -24,7 +24,12 @@ module.exports = function(grunt) {
           "public/javascripts/bbclonemail/bbclonemail.commands.js",
           "public/javascripts/bbclonemail/bbclonemail.reqres.js",
           "public/javascripts/bbclonemail/bbclonemail.js",
+          "public/javascripts/bbclonemail/bbclonemail.mailrouter.js",
+          "public/javascripts/bbclonemail/bbclonemail.mailapp.js",
+          "public/javascripts/bbclonemail/bbclonemail.mailapp.mail.js",
+          "public/javascripts/bbclonemail/bbclonemail.mailapp.inbox.js",
           "public/javascripts/bbclonemail/bbclonemail.contactsapp.js",
+          "public/javascripts/bbclonemail/bbclonemail.contactrouter.js",
           "public/javascripts/bbclonemail/bbclonemail.contactsapp.contacts.js",
           "public/javascripts/bbclonemail/bbclonemail.contactsapp.contactlist.js",
           "public/javascripts/bbclonemail/**/*.js"

diff --git a/public/javascripts/bbclonemail/bbclonemail.contactrouter.js b/public/javascripts/bbclonemail/bbclonemail.contactrouter.js
@@ -17,7 +17,6 @@ BBCloneMail.module("ContactRouter", function(ContactRouter, App, Backbone, Mario
   // -----------------------
 
   ContactRouter.addInitializer(function(){
-    console.log("starting the contact router");
     var router = new Router();
   });
 

diff --git a/public/javascripts/bbclonemail/bbclonemail.contactsapp.js b/public/javascripts/bbclonemail/bbclonemail.contactsapp.js
@@ -1,4 +1,9 @@
 BBCloneMail.module("ContactsApp", { 
   startWithApp: false,
-  define: function(){}
+
+  define: function(ContactsApp, App){
+    ContactsApp.addInitializer(function(){
+      App.vent.trigger("app:started", "ContactsApp");
+    });
+  }
 });
diff --git a/public/javascripts/bbclonemail/bbclonemail.layout.js b/public/javascripts/bbclonemail/bbclonemail.layout.js
@@ -1,4 +1,5 @@
 BBCloneMail.module("AppLayout", function(AppLayout, App, Backbone, Marionette, $, _){
+  "use strict";
 
   // Views
   // -----
@@ -8,16 +9,24 @@ BBCloneMail.module("AppLayout", function(AppLayout, App, Backbone, Marionette, $
       "change #app-selector select": "appSelected"
     },
 
+    initialize: function(){
+      this.bindTo(App.vent, "app:started", this.showAppName, this);
+    },
+
     appSelected: function(e){
       e.preventDefault();
       var appName = $(e.currentTarget).val();
       this.trigger("app:selected", appName);
+    },
+
+    showAppName: function(appName){
+      this.$("#app-selector select").val(appName);
     }
   });
 
   // Controller
   // ---------
-  
+
   var LayoutController = function(){};
 
   _.extend(LayoutController.prototype, {

diff --git a/public/javascripts/bbclonemail/bbclonemail.mailapp.inbox.js b/public/javascripts/bbclonemail/bbclonemail.mailapp.inbox.js
@@ -48,7 +48,6 @@ BBCloneMail.module("MailApp.Inbox", {
     // ------------
 
     Inbox.addInitializer(function(){
-      console.log("starting the inbox");
       var controller = new InboxController(App.main);
       App.registerCommand("show:inbox", controller.showInbox, controller);
       App.registerCommand("show:mail", controller.showMailById, controller);
@@ -58,7 +57,6 @@ BBCloneMail.module("MailApp.Inbox", {
     });
 
     Inbox.addFinalizer(function(){
-      console.log("stopping the inbox");
       App.removeCommand("show:inbox");
       App.removeCommand("show:mail");
       App.removeCommand("show:category");

diff --git a/public/javascripts/bbclonemail/bbclonemail.mailapp.js b/public/javascripts/bbclonemail/bbclonemail.mailapp.js
@@ -1,4 +1,8 @@
 BBCloneMail.module("MailApp", { 
   startWithApp: false,
-  define: function(){}
+  define: function(MailApp, App){
+    MailApp.addInitializer(function(){
+      App.vent.trigger("app:started", "MailApp");
+    });
+  }
 });
diff --git a/public/javascripts/bbclonemail/bbclonemail.mailrouter.js b/public/javascripts/bbclonemail/bbclonemail.mailrouter.js
@@ -34,7 +34,6 @@ BBCloneMail.module("MailRouter", function(MailRouter, App, Backbone, Marionette,
   // -----------------------
 
   MailRouter.addInitializer(function(){
-    console.log("starting the mail router");
     var router = new Router();
   });