1 files changed, 30 insertions, 28 deletions

diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index 3563a4bb859..33aa3d1aab9 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -50,29 +50,46 @@ openerp.share = function(session) {
         session.connection.share_flag.done(yes).fail(no);
     }
 
+    /* Extend the Sidebar to add Share and Embed links in the 'More' menu */
     session.web.Sidebar = session.web.Sidebar.extend({
-        add_default_sections: function() {
-            this._super();
+
+        start: function() {
             var self = this;
+            this._super(this);
             has_share(function() {
-                self.add_items('other', [{
-                    label: 'Share',
-                    callback: self.on_sidebar_click_share,
-                    classname: 'oe-share',
-                }]);
+                self.add_items('other', [
+                    {   label: 'Share',
+                        callback: self.on_click_share,
+                        classname: 'oe_share' },
+                    {   label: 'Embed',
+                        callback: self.on_click_share_link,
+                        classname: 'oe_share' },
+                ]);
             });
         },
-        on_sidebar_click_share: function(item) {
+
+        on_click_share: function(item) {
+            var view = this.getParent()
+            launch_wizard(this, view, 'emails', false);
+        },
+
+        on_click_share_link: function(item) {
             var view = this.getParent()
-            launch_wizard(this, view);
+            launch_wizard(this, view, 'embedded', false);
         },
     });
 
+    /**
+     * Extends mail (Chatter widget)
+     * - show the 'invite' button' only we came on the form view through
+     *   an action. We do this because 'invite' is based on the share
+     *   mechanism, and it tries to share an action.
+     */
     session.mail.RecordThread.include( {
         start: function() {
             start_res = this._super.apply(this, arguments);
             if (has_action_id) {
-                this.$element.find('button.oe-share-mail').show();
+                this.$element.find('button.oe_share_invite').show();
             }
             return start_res;
         }
@@ -83,12 +100,7 @@ openerp.share = function(session) {
             var self = this;
             this.check_if_action_is_defined();
             has_share(function() {
-                self.$element.find('a.oe-share_link').click(self.on_click_share_link);
-                self.$element.find('a.oe-share').click(self.on_click_share);
-                self.$element.delegate('button.oe-share-mail', 'click', self.on_click_share_mail);
-            }, function() {
-                self.$element.find('a.oe-share_link').remove();
-                self.$element.find('a.oe-share').remove();
+                self.$element.delegate('button.oe_share_invite', 'click', self.on_click_share_invite);
             });
             return this._super.apply(this, arguments);
         },
@@ -96,23 +108,13 @@ openerp.share = function(session) {
         check_if_action_is_defined: function() {
             if (this.action && this.action.id) {
                 has_action_id = true;
-                this.$element.find('a.oe-share_link').show();
-                this.$element.find('a.oe-share').show();            
             }
             else {
                 has_action_id = false;
             }
         },
-    
-        on_click_share_link: function(e) {
-            e.preventDefault();
-            launch_wizard(this, this.views[this.active_view].controller, 'embedded', false);
-        },
-        on_click_share: function(e) {
-            e.preventDefault();
-            launch_wizard(this, this.views[this.active_view].controller, 'emails', false);
-        },
-        on_click_share_mail: function(e) {
+
+        on_click_share_invite: function(e) {
             e.preventDefault();
             launch_wizard(this, this.views[this.active_view].controller, 'emails', true);
         },