odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]resolve conflict 

bzr revid: mba@tinyerp.com-20140224111118-ckxktrew1da6qh9n
This commit is contained in:
Mahendra Barad (OpenERP) 2014-02-24 16:41:18 +05:30
parent e468f7f159
commit 8a95bef8df
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/website_blog/static/src/js/website_blog.js
View File

@ -1,5 +1,4 @@
$(document).ready(function() {
<<<<<<< TREE
var discussion = false;
var share = false;
@ -13,14 +12,9 @@ $(document).ready(function() {
def.done( function(){
var content = $("#blog_content p");
if(content.length && discussion)
new openerp.website.blog_discussion({'document_user': $('#is_document_user').length, 'content' : content});
new openerp.website.blog_discussion({'content' : content});
if (share) $("p").share();
})
=======
var content = $("#blog_content p");
if(content.length)
new openerp.website.blog_discussion({'content' : content});
>>>>>>> MERGE-SOURCE
$('.cover_footer').on('click',page_transist);
$('a[href^="#blog_content"]').on('click', animate);