From c9cb4a65fcb74995d91ff53fe12f7e9469a5eb5c Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Fri, 18 Sep 2020 08:50:09 +0000 Subject: [PATCH] [IMP] portal, website_blog: lint some files before fixing them Part of https://github.com/odoo/odoo/pull/57975 task-2344227 X-original-commit: 392456d686370937700a1f42f879ab6fe5ef4e68 --- addons/portal/static/src/js/portal_chatter.js | 3 +- .../static/src/js/contentshare.js | 205 +++++++++--------- 2 files changed, 104 insertions(+), 104 deletions(-) diff --git a/addons/portal/static/src/js/portal_chatter.js b/addons/portal/static/src/js/portal_chatter.js index 8e5c0a3144f..a0a761f4d8c 100644 --- a/addons/portal/static/src/js/portal_chatter.js +++ b/addons/portal/static/src/js/portal_chatter.js @@ -278,8 +278,7 @@ var PortalChatter = publicWidget.Widget.extend({ if (result === true) { $elem.addClass('o_portal_message_internal_on'); $elem.removeClass('o_portal_message_internal_off'); - } - else { + } else { $elem.addClass('o_portal_message_internal_off'); $elem.removeClass('o_portal_message_internal_on'); } diff --git a/addons/website_blog/static/src/js/contentshare.js b/addons/website_blog/static/src/js/contentshare.js index 3c264cdcbdb..8f8d40ae6e4 100644 --- a/addons/website_blog/static/src/js/contentshare.js +++ b/addons/website_blog/static/src/js/contentshare.js @@ -1,107 +1,108 @@ -(function(){ - $.fn.share = function(options) { - var option = $.extend($.fn.share.defaults,options); - var selected_text =""; - $.extend($.fn.share,{ - init : function(shareable) { - var self = this; - $.fn.share.defaults.shareable = shareable; - $.fn.share.defaults.shareable.on('mouseup',function(){ - if ($(this).parents('body.editor_enable').length === 0) { - self.popOver(); - } - }); - $.fn.share.defaults.shareable.on('mousedown',function(){ - self.destroy(); - }); - }, - getContent : function() { - var $popover_content = $('
'); - if($('.o_wblog_title, .o_wblog_post_content_field').hasClass('js_comment')){ - selected_text = this.getSelection('string'); - var $btn_c = $('').append($('')); - $popover_content.append($btn_c); - } - if($('.o_wblog_title, .o_wblog_post_content_field').hasClass('js_tweet')){ - var tweet = '"%s" - %s'; - var baseLength = tweet.replace(/%s/g, '').length; - // Shorten the selected text to match the tweet max length - // Note: all (non-localhost) urls in a tweet have 23 characters https://support.twitter.com/articles/78124 - var selectedText = this.getSelection('string').substring(0, option.maxLength - baseLength - 23); +odoo.define('website_blog.contentshare', function (require) { +'use strict'; - var text = btoa(encodeURIComponent(_.str.sprintf(tweet, selectedText, window.location.href))); - $popover_content.append(_.str.sprintf( - "", - option.shareLink, text, option.target)); +$.fn.share = function (options) { + var option = $.extend($.fn.share.defaults, options); + var selected_text = ""; + $.extend($.fn.share, { + init: function (shareable) { + var self = this; + $.fn.share.defaults.shareable = shareable; + $.fn.share.defaults.shareable.on('mouseup', function () { + if ($(this).parents('body.editor_enable').length === 0) { + self.popOver(); } - return $popover_content; - }, - commentEdition : function(){ - var positionComment = ($('#o_wblog_post_comments').position()).top-50; - $(".o_portal_chatter_composer_form textarea").val('"' + selected_text + '" ').focus(); - $('html, body').stop().animate({ - 'scrollTop': positionComment - }, 500, 'swing', function () { - window.location.hash = 'blog_post_comment_quote'; - }); - }, - getSelection : function(share) { - if(window.getSelection){ - var selection = window.getSelection(); - if (!selection || selection.rangeCount === 0) { - return ""; - } - if (share === 'string') { - return String(selection.getRangeAt(0)).replace(/\s{2,}/g, ' '); - } else { - return selection.getRangeAt(0); - } - } - else if(document.selection){ - if (share === 'string') { - return document.selection.createRange().text.replace(/\s{2,}/g, ' '); - } else { - return document.selection.createRange(); - } - } - }, - popOver : function() { - this.destroy(); - if(this.getSelection('string').length < option.minLength) - return; - var data = this.getContent(); - var range = this.getSelection(); - - var newNode = document.createElement("span"); - range.insertNode(newNode); - newNode.className = option.className; - var $pop = $(newNode); - $pop.popover({ - trigger:'manual', - placement: option.placement, - html: true, - content: function(){ - return data; - } - }).popover('show'); - $('.o_share_comment').on('click', this.commentEdition); - }, - destroy : function(){ - var $span = $('span.'+option.className); - $span.popover('hide'); - $span.remove(); + }); + $.fn.share.defaults.shareable.on('mousedown', function () { + self.destroy(); + }); + }, + getContent: function () { + var $popover_content = $('
'); + if ($('.o_wblog_title, .o_wblog_post_content_field').hasClass('js_comment')) { + selected_text = this.getSelection('string'); + var $btn_c = $('').append($('')); + $popover_content.append($btn_c); } - }); - $.fn.share.init(this); - }; + if ($('.o_wblog_title, .o_wblog_post_content_field').hasClass('js_tweet')) { + var tweet = '"%s" - %s'; + var baseLength = tweet.replace(/%s/g, '').length; + // Shorten the selected text to match the tweet max length + // Note: all (non-localhost) urls in a tweet have 23 characters https://support.twitter.com/articles/78124 + var selectedText = this.getSelection('string').substring(0, option.maxLength - baseLength - 23); - $.fn.share.defaults = { - shareLink : "http://twitter.com/intent/tweet?text=", - minLength : 5, - maxLength : 140, - target : "blank", - className : "share", - placement : "top", - }; + var text = window.btoa(encodeURIComponent(_.str.sprintf(tweet, selectedText, window.location.href))); + $popover_content.append(_.str.sprintf( + "", + option.shareLink, text, option.target)); + } + return $popover_content; + }, + commentEdition: function () { + var positionComment = ($('#o_wblog_post_comments').position()).top - 50; + $(".o_portal_chatter_composer_form textarea").val('"' + selected_text + '" ').focus(); + $('html, body').stop().animate({ + 'scrollTop': positionComment + }, 500, 'swing', function () { + window.location.hash = 'blog_post_comment_quote'; + }); + }, + getSelection: function (share) { + if (window.getSelection) { + var selection = window.getSelection(); + if (!selection || selection.rangeCount === 0) { + return ""; + } + if (share === 'string') { + return String(selection.getRangeAt(0)).replace(/\s{2,}/g, ' '); + } else { + return selection.getRangeAt(0); + } + } else if (document.selection) { + if (share === 'string') { + return document.selection.createRange().text.replace(/\s{2,}/g, ' '); + } else { + return document.selection.createRange(); + } + } + }, + popOver: function () { + this.destroy(); + if (this.getSelection('string').length < option.minLength) { + return; + } + var data = this.getContent(); + var range = this.getSelection(); -}()); + var newNode = document.createElement("span"); + range.insertNode(newNode); + newNode.className = option.className; + var $pop = $(newNode); + $pop.popover({ + trigger: 'manual', + placement: option.placement, + html: true, + content: function () { + return data; + } + }).popover('show'); + $('.o_share_comment').on('click', this.commentEdition); + }, + destroy: function () { + var $span = $('span.' + option.className); + $span.popover('hide'); + $span.remove(); + } + }); + $.fn.share.init(this); +}; + +$.fn.share.defaults = { + shareLink: "http://twitter.com/intent/tweet?text=", + minLength: 5, + maxLength: 140, + target: "blank", + className: "share", + placement: "top", +}; +});