From 690cd34d691e722580abfa993fb993fd30442af8 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Sat, 22 Mar 2014 15:18:21 +0530
Subject: [PATCH] [IMP] : on tweet popover hover should show pointer [FIX] :
 Sometimes selecting some portion of text,don't show twitter popover.

bzr revid: aja@tinyerp.com-20140322094821-koaudrwpinskruy5
---
 addons/website_blog/static/lib/contentshare.js    |  3 ++-
 .../website_blog/static/src/css/website_blog.css  |  4 ++++
 .../website_blog/static/src/css/website_blog.sass |  3 +++
 .../static/src/js/website_blog.editor.js          | 15 ++++++++-------
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/addons/website_blog/static/lib/contentshare.js b/addons/website_blog/static/lib/contentshare.js
index aa9561a5467..3e68f7859b7 100644
--- a/addons/website_blog/static/lib/contentshare.js
+++ b/addons/website_blog/static/lib/contentshare.js
@@ -27,12 +27,13 @@
                 }
             },
             popOver : function() {
+                this.destroy();
                 if(this.getSelection('string').length < option.minLength)
                     return;
                 var data = this.getContent();
                 var range = this.getSelection();
                 var newNode = document.createElement("mark");
-                range.surroundContents(newNode);
+                range.insertNode(newNode);
                 $('mark').addClass(option.className);
                 $('.'+option.className).popover({trigger:'manual', placement: option.placement, html: true 
                 , content:function(){
diff --git a/addons/website_blog/static/src/css/website_blog.css b/addons/website_blog/static/src/css/website_blog.css
index 1ce770c7dea..ed0d40f4558 100644
--- a/addons/website_blog/static/src/css/website_blog.css
+++ b/addons/website_blog/static/src/css/website_blog.css
@@ -156,3 +156,7 @@ p.post-meta {
   overflow: auto;
   font-weight: normal;
 }
+
+mark + .popover {
+  cursor: pointer;
+}
diff --git a/addons/website_blog/static/src/css/website_blog.sass b/addons/website_blog/static/src/css/website_blog.sass
index 7dd30826343..60ead30ce68 100644
--- a/addons/website_blog/static/src/css/website_blog.sass
+++ b/addons/website_blog/static/src/css/website_blog.sass
@@ -138,3 +138,6 @@ p.post-meta
     width: 250px
     overflow: auto
     font-weight: normal
+
+mark + .popover
+    cursor: pointer
diff --git a/addons/website_blog/static/src/js/website_blog.editor.js b/addons/website_blog/static/src/js/website_blog.editor.js
index 8c2ecb645fb..b3c53c44453 100644
--- a/addons/website_blog/static/src/js/website_blog.editor.js
+++ b/addons/website_blog/static/src/js/website_blog.editor.js
@@ -31,18 +31,19 @@
         }),
         edit: function () {
             $('.popover').remove();
-            $('mark').contents().unwrap();
             this._super();
             var vHeight = $(window).height();
             $('body').on('click','#change_cover',_.bind(this.change_bg,{},vHeight));
             $('body').on('click', '#clear_cover',_.bind(this.clean_bg,{},vHeight));
         },
         save : function() {
-            openerp.jsonRpc("/blogpsot/change_background", 'call', {
-                'post_id' : $('#blog_post_name').attr('data-oe-id'),
-                'image' : $('.cover')[0].style.background.replace('url(','').replace(')',''),
-            });
-            return this._super();
+            if ($('.cover').length){
+                openerp.jsonRpc("/blogpsot/change_background", 'call', {
+                    'post_id' : $('#blog_post_name').attr('data-oe-id'),
+                    'image' : $('.cover').css('background-image').replace('url(','').replace(')',''),
+                });
+            }
+            this._super();
         },
         clean_bg : function(vHeight) {
             $('.cover_header').css({"background-image":'none', 'min-height': vHeight});
@@ -51,7 +52,7 @@
             var self  = this;
             var editor  = new  website.editor.ImageDialog();
             editor.on('start', self, function (o) {
-                o.url = $('.cover_header')[0] ? $('.cover_header')[0].style.background.replace('url(','').replace(')','') : ''; 
+                o.url = $('.cover_header').length ? $('.cover_header').css('background-image').replace('url(','').replace(')','') : ''; 
             });
             editor.on('save', self, function (o) {
                 $('.cover_header').css({"background-image": o.url && o.url !== "" ? 'url(' + o.url + ')' : "", 'min-height': vHeight})