From 546cdf82cbe0135d3ff8150ad5e7c1bfb2c3c761 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Sun, 24 Aug 2014 19:28:15 -0700
Subject: [PATCH] Fix some markup issues

* Remove spurious search div
* Fix nested uls
* Use class name selected, not closed (the inverse)
* Restor nacl div
---
 index.html                              | 7 +++----
 js/views/conversation_list_item_view.js | 2 --
 js/views/conversation_list_view.js      | 6 +++---
 js/views/conversation_view.js           | 2 +-
 stylesheets/index.css                   | 2 ++
 5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/index.html b/index.html
index bb1262ade890..d9b7b842c9fc 100644
--- a/index.html
+++ b/index.html
@@ -16,6 +16,8 @@
         <link href="/stylesheets/bootstrap-tagsinput.css" rel="stylesheet" type="text/css" />
     </head>
     <body class='signal index' data-name="curve25519" data-tools="pnacl" data-configs="Debug Release" data-path="nacl/pnacl/{config}">
+        <div id="listener"></div>
+        <div id="log"></div>
         <div class='title-bar' id='header'>
             <h1>Signal</h1>
             <a href id='new-message'>New message</a>
@@ -31,9 +33,6 @@
                 </a>
             </div>
         </div>
-        <div class='search'>
-            <input name='contact_search' placeholder='Search' type='search'>
-        </div>
         <div id='gutter' class='gutter'>
             <div class='search'>
                 <form>
@@ -43,7 +42,7 @@
             <div id='contacts'></div>
         </div>
         <script type='text/x-tmpl-mustache' id='conversation'>
-            <ul class='discussion'></ul>
+            <div class='discussion-container'></ul>
             <div class='send-message-area'>
                 <div class='message-composer'>
                     <form class='send'>
diff --git a/js/views/conversation_list_item_view.js b/js/views/conversation_list_item_view.js
index 663a9fab9352..e2e4269f9fb8 100644
--- a/js/views/conversation_list_item_view.js
+++ b/js/views/conversation_list_item_view.js
@@ -16,8 +16,6 @@ var Whisper = Whisper || {};
 
       this.listenTo(this.model, 'change', this.render); // auto update
       this.listenTo(this.model, 'destroy', this.remove); // auto update
-
-      this.$el.addClass('closed');
     },
 
     open: function(e) {
diff --git a/js/views/conversation_list_view.js b/js/views/conversation_list_view.js
index f38166888799..7211368d8317 100644
--- a/js/views/conversation_list_view.js
+++ b/js/views/conversation_list_view.js
@@ -15,9 +15,9 @@ var Whisper = Whisper || {};
 
     select: function(e) {
       var target = $(e.target).closest('.conversation');
-      if (target.hasClass('closed')) {
-        target.siblings().addClass('closed');
-        target.removeClass('closed').addClass('selected');
+      if (!target.is('.selected')) {
+        target.siblings().removeClass('slected');
+        target.addClass('selected');
       }
       return false;
     },
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index d4ac408c1735..1847cfa5f33c 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -12,7 +12,7 @@ var Whisper = Whisper || {};
       this.$el.html(Mustache.render(this.template));
 
       this.view = new Whisper.MessageListView({collection: this.model.messages()});
-      this.$el.find('.discussion').append(this.view.el);
+      this.$el.find('.discussion-container').append(this.view.el);
     },
     events: {
       'submit .send': 'sendMessage',
diff --git a/stylesheets/index.css b/stylesheets/index.css
index 383d9237c0c4..c768ab429acf 100644
--- a/stylesheets/index.css
+++ b/stylesheets/index.css
@@ -1,3 +1,5 @@
 .number.error {
   background-color: #ffdddd;
 }
+
+#listener, #log { display: none; }
