diff --git a/addons/website_slides/static/src/js/slides_like.js b/addons/website_slides/static/src/js/slides_slide_like.js similarity index 70% rename from addons/website_slides/static/src/js/slides_like.js rename to addons/website_slides/static/src/js/slides_slide_like.js index f0589373cb9..d5afc5c4409 100644 --- a/addons/website_slides/static/src/js/slides_like.js +++ b/addons/website_slides/static/src/js/slides_slide_like.js @@ -1,18 +1,17 @@ -odoo.define('website_slides.slides_like', function (require) { +odoo.define('website_slides.slides.slide.like', function (require) { 'use strict'; var core = require('web.core'); var Widget = require('web.Widget'); -var localStorage = require('web.local_storage'); var sAnimations = require('website.content.snippets.animation'); require('website_slides.slides'); var _t = core._t; -var LikeButton = Widget.extend({ +var SlideLikeWidget = Widget.extend({ events: { - 'click .o_wslides_like_up': '_onClickUp', - 'click .o_wslides_like_down': '_onClickDown', + 'click .o_wslides_js_slide_like_up': '_onClickUp', + 'click .o_wslides_js_slide_like_down': '_onClickDown', }, //-------------------------------------------------------------------------- @@ -53,8 +52,8 @@ var LikeButton = Widget.extend({ }, }).then(function (data) { if (! data.error) { - self.$el.find('span.o_wslides_like_up span').text(data.likes); - self.$el.find('span.o_wslides_like_down span').text(data.dislikes); + self.$el.find('span.o_wslides_js_slide_like_up span').text(data.likes); + self.$el.find('span.o_wslides_js_slide_like_down span').text(data.dislikes); } else { if (data.error === 'public_user') { self._popoverAlert(self.$el, _.str.sprintf(_t('Please login to vote this slide'), (document.URL))); @@ -67,18 +66,18 @@ var LikeButton = Widget.extend({ }); }, - _onClickUp: function (event) { - var slideId = $(event.currentTarget).data('slide-id'); + _onClickUp: function (ev) { + var slideId = $(ev.currentTarget).data('slide-id'); return this._onClick(slideId, 'like'); }, - _onClickDown: function (event) { - var slideId = $(event.currentTarget).data('slide-id'); + _onClickDown: function (ev) { + var slideId = $(ev.currentTarget).data('slide-id'); return this._onClick(slideId, 'dislike'); }, }); -sAnimations.registry.websiteSlidesLike = sAnimations.Class.extend({ +sAnimations.registry.websiteSlidesSlideLike = sAnimations.Class.extend({ selector: '#wrapwrap', /** @@ -88,10 +87,16 @@ sAnimations.registry.websiteSlidesLike = sAnimations.Class.extend({ start: function () { var self = this; var defs = [this._super.apply(this, arguments)]; - $('.o_wslides_like').each(function () { - defs.push(new LikeButton(self).attachTo($(this))); + $('.o_wslides_js_slide_like').each(function () { + defs.push(new SlideLikeWidget(self).attachTo($(this))); }); return $.when.apply($, defs); }, }); + +return { + slideLikeWidget: SlideLikeWidget, + websiteSlidesSlideLike: sAnimations.registry.websiteSlidesSlideLike +}; + }); diff --git a/addons/website_slides/static/src/scss/website_slides.scss b/addons/website_slides/static/src/scss/website_slides.scss index ea784106b65..5e760c020da 100644 --- a/addons/website_slides/static/src/scss/website_slides.scss +++ b/addons/website_slides/static/src/scss/website_slides.scss @@ -1,7 +1,6 @@ // FIXME may be useless (check initial code here: https://github.com/odoo/odoo/blob/51be5bbfb38db784cb3406877cc0e8806b1bf55a/addons/website_slides/static/src/less/website_slides.less#L1) $nav-tabs-border-color: #dddddd !default; $body-bg: #FFFFFF !default; -$link-color: theme-color('primary') !default; $MAX-Z-INDEX : 2147483647 !default; @@ -37,6 +36,11 @@ $MAX-Z-INDEX : 2147483647 !default; border-width: 0 0 3px 0; } + .o_wslides_js_slide_like_up, + .o_wslides_js_slide_like_down { + cursor: pointer; + color: $link-color; + } // tools // **************************************** @@ -312,11 +316,6 @@ $MAX-Z-INDEX : 2147483647 !default; max-height: 500px; } -.o_wslides_like_up, .o_wslides_like_down { - cursor: pointer; - color: $link-color; -} - // Thumbnails .oe_slides_ellipsis { white-space: nowrap; diff --git a/addons/website_slides/views/assets.xml b/addons/website_slides/views/assets.xml index 8fc81e27112..635bf2d2dbd 100644 --- a/addons/website_slides/views/assets.xml +++ b/addons/website_slides/views/assets.xml @@ -12,11 +12,11 @@