From 4847f720442c3fa6faefa60398d245c5814eb2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 29 Feb 2012 15:23:31 +0100
Subject: [PATCH] [REF] Wall small cleaning of code

bzr revid: tde@openerp.com-20120229142331-zr42yxqy8i0xv7js
---
 addons/mail/static/src/js/mail.js   | 10 +++++-----
 addons/mail/static/src/xml/mail.xml |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7d1de6384e6..b8a82ff0192 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -339,7 +339,9 @@ openerp.mail = function(session) {
             var self = this;
             this._super.apply(this, arguments);
             /* events and buttons */
-            this.$element.find('button.oe_mail_button_comment').bind('click', function () { self.do_comment(); });   
+            this.$element.find('button.oe_mail_button_comment').bind('click', function () { self.do_comment(); });
+            this.$element.find('button.oe_mail_wall_button_more').bind('click', function () { self.do_more(); });
+            this.$element.find('div.oe_mail_wall_nomore').hide();
             /* load mail.message search view */
             var search_view_loaded = this.load_search_view(this.params.search_view_id, {}, false);
             var search_view_ready = $.when(search_view_loaded).then(function () {
@@ -357,7 +359,7 @@ openerp.mail = function(session) {
         /**
          * Loads the mail.message search view
          * @param {Number} view_id id of the search view to load
-         * @param {??} defaults ??
+         * @param {Object} defaults ??
          * @param {Boolean} hidden ??
          */
         load_search_view: function (view_id, defaults, hidden) {
@@ -399,9 +401,7 @@ openerp.mail = function(session) {
             this.params.domain = [];
             this.sorted_comments = {};
             this.$element.find('div.oe_mail_wall_threads').empty();
-            return this.fetch_comments(domain, context, offset, limit).then(function () {
-                self.$element.find('button.oe_mail_wall_button_more').bind('click', function () { self.do_more(); });
-            });
+            return this.fetch_comments(domain, context, offset, limit);
         },
 
         /**
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 66a8e5b0835..1e4e301bc2e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -17,6 +17,9 @@
                 <button class="oe_mail_wall_button_more" type="button">See more discussions
                 </button>
             </div>
+            <div class="oe_mail_wall_nomore">
+                You have loaded all discussions.
+            </div>
         </div>
         <div class="oe_mail_wall_right">
         </div>