Returned the Dancing Man.

edgecase · Jan 26, 2012 · a2f7699 · a2f7699
1 parent 31c10bc
commit a2f7699
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/assets/js/views/participant_layout.js b/assets/js/views/participant_layout.js
@@ -13,8 +13,6 @@ var Views = (function(ns){
       this.$("#question_container").append(new Views.WelcomePanel({messageBus: this.messageBus}).render().el);
       this.$("#discussion_container").append(new Views.DiscussionPanel({messageBus: this.messageBus}).render().el);
 
-      this.$('input#name').focus();
-
       return this;
     }
 

diff --git a/assets/js/views/welcome_panel.js b/assets/js/views/welcome_panel.js
@@ -7,6 +7,9 @@ var Views = (function(ns){
       view: {
         "click #name_button": "setName",
         "keypress input#name": "setNameOnEnter"
+      },
+      messageBus: {
+        "question-changed": "hideDancingMan"
       }
     },
 
@@ -29,8 +32,13 @@ var Views = (function(ns){
       if (name.length > 0){
         this.name = name;
         this.messageBus.emit("user-join", {name: this.name});
-        this.$el.hide();
+        this.$el.empty().append($('<div id="please_wait"></div>'));
       }
+    },
+
+    hideDancingMan: function() {
+      if(this.name)
+        this.$el.hide();
     }
 
   });