pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] website, *: use public widgets instead of website animations

Browse Source 
* website_blog, website_crm_partner_assign, website_event,
  website_event_track, website_form, website_forum, website_links,
  website_mail, website_mail_channel, website_mass_mailing,
  website_sale, website_sale_comparison, website_sale_delivery,
  website_sale_stock, website_sale_wishlist, website_slides,
  website_twitter

While using the 'Animation' class of website instead of the frontend
'Widget' class leads to the same behaviors, this refactoring is done for
two reasons:
- Stop using the confusing 'Animation' name for non-animated behaviors
- Instantiation of 'Widget' is slightly faster than 'Animation'

Part of https://github.com/odoo/odoo/pull/29442
task-1932066
This commit is contained in:
qsm-odoo
2019-02-26 17:09:23 +00:00
parent 335a505d1f
commit d946b7a85d
40 changed files with 134 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/content/menu.js
+4 -4
View File
@@ -2,10 +2,10 @@ odoo.define('website.content.menu', function (require) {
'use strict';
var dom = require('web.dom');
var sAnimation = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var wUtils = require('website.utils');
sAnimation.registry.affixMenu = sAnimation.Class.extend({
publicWidget.registry.affixMenu = publicWidget.Widget.extend({
selector: 'header.o_affix_enabled',
/**
@@ -101,7 +101,7 @@ sAnimation.registry.affixMenu = sAnimation.Class.extend({
* Note: this works well with the affixMenu... by chance (autohideMenu is called
* after alphabetically).
*/
sAnimation.registry.autohideMenu = sAnimation.Class.extend({
publicWidget.registry.autohideMenu = publicWidget.Widget.extend({
selector: 'header #top_menu',
/**
@@ -151,7 +151,7 @@ sAnimation.registry.autohideMenu = sAnimation.Class.extend({
*
* @todo check bootstrap v4: maybe handled automatically now ?
*/
sAnimation.registry.menuDirection = sAnimation.Class.extend({
publicWidget.registry.menuDirection = publicWidget.Widget.extend({
selector: 'header .navbar .nav',
events: {
'show.bs.dropdown': '_onDropdownShow',
addons/website/static/src/js/user_custom_javascript.js
+2 -2
View File
@@ -10,9 +10,9 @@ odoo.define('website.user_custom_code', function (require) {
'use strict';
var Dialog = require('web.Dialog');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimations.registry.HelloWorldPopup = sAnimations.Class.extend({
publicWidget.registry.HelloWorldPopup = publicWidget.Widget.extend({
selector: '#wrapwrap',
start: function () {
addons/website_blog/static/src/js/s_latest_posts_frontend.js
+2 -2
View File
@@ -2,11 +2,11 @@ odoo.define('website_blog.s_latest_posts_frontend', function (require) {
'use strict';
var core = require('web.core');
var sAnimation = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var _t = core._t;
sAnimation.registry.js_get_posts = sAnimation.Class.extend({
publicWidget.registry.js_get_posts = publicWidget.Widget.extend({
selector : '.js_get_posts',
disabledInEditableMode: false,
addons/website_blog/static/src/js/website_blog.js
+2 -2
View File
@@ -1,9 +1,9 @@
odoo.define('website_blog.website_blog', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimations.registry.websiteBlog = sAnimations.Class.extend({
publicWidget.registry.websiteBlog = publicWidget.Widget.extend({
selector: '.website_blog',
events: {
'click .cover_footer': '_onNextBlogClick',
addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
+2 -2
View File
@@ -1,9 +1,9 @@
odoo.define('crm.partner_assign', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimations.registry.crmPartnerAssign = sAnimations.Class.extend({
publicWidget.registry.crmPartnerAssign = publicWidget.Widget.extend({
selector: '#wrapwrap:has(.interested_partner_assign_form, .desinterested_partner_assign_form, .opp-stage-button, .new_opp_form)',
events: {
'click .interested_partner_assign_confirm': '_onInterestedPartnerAssignConfirm',
addons/website_event/static/src/js/website_event.js
+2 -2
View File
@@ -3,7 +3,7 @@ odoo.define('website_event.website_event', function (require) {
var ajax = require('web.ajax');
var core = require('web.core');
var Widget = require('web.Widget');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var _t = core._t;
@@ -56,7 +56,7 @@ var EventRegistrationForm = Widget.extend({
},
});
sAnimations.registry.EventRegistrationFormInstance = sAnimations.Class.extend({
publicWidget.registry.EventRegistrationFormInstance = publicWidget.Widget.extend({
selector: '#registration_form',
/**
addons/website_event/static/src/js/website_geolocation.js
+2 -2
View File
@@ -1,9 +1,9 @@
odoo.define('website_event.geolocation', function (require) {
'use strict';
var sAnimation = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimation.registry.visitor = sAnimation.Class.extend({
publicWidget.registry.visitor = publicWidget.Widget.extend({
selector: ".oe_country_events, .country_events",
/**
addons/website_event_track/static/src/js/website_event_track.js
+2 -2
View File
@@ -1,9 +1,9 @@
odoo.define('website_event_track.website_event_track', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimations.registry.websiteEventTrack = sAnimations.Class.extend({
publicWidget.registry.websiteEventTrack = publicWidget.Widget.extend({
selector: '.o_website_event',
events: {
'input #event_track_search': '_onEventTrackSearchInput',
addons/website_form/static/src/js/website_form.js
+2 -2
View File
@@ -4,12 +4,12 @@ odoo.define('website_form.animation', function (require) {
var core = require('web.core');
var time = require('web.time');
var ajax = require('web.ajax');
var sAnimation = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var _t = core._t;
var qweb = core.qweb;
sAnimation.registry.form_builder_send = sAnimation.Class.extend({
publicWidget.registry.form_builder_send = publicWidget.Widget.extend({
selector: '.s_website_form',
willStart: function () {
addons/website_forum/static/src/js/website_forum.js
+3 -3
View File
@@ -3,13 +3,13 @@ odoo.define('website_forum.website_forum', function (require) {
var core = require('web.core');
var Wysiwyg = require('web_editor.wysiwyg.root');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var session = require('web.session');
var qweb = core.qweb;
var _t = core._t;
sAnimations.registry.websiteForum = sAnimations.Class.extend({
publicWidget.registry.websiteForum = publicWidget.Widget.extend({
selector: '.website_forum',
xmlDependencies: ['/website_forum/static/src/xml/website_forum_share_templates.xml'],
events: {
@@ -503,7 +503,7 @@ sAnimations.registry.websiteForum = sAnimations.Class.extend({
},
});
sAnimations.registry.websiteForumSpam = sAnimations.Class.extend({
publicWidget.registry.websiteForumSpam = publicWidget.Widget.extend({
selector: '.o_wforum_moderation_queue',
xmlDependencies: ['/website_forum/static/src/xml/website_forum_share_templates.xml'],
events: {
addons/website_forum/static/src/js/website_forum.share.js
+4 -4
View File
@@ -2,14 +2,14 @@ odoo.define('website_forum.share', function (require) {
'use strict';
var core = require('web.core');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var qweb = core.qweb;
// FIXME There is no reason to inherit from socialShare here
var ForumShare = sAnimations.registry.socialShare.extend({
var ForumShare = publicWidget.registry.socialShare.extend({
selector: '',
xmlDependencies: sAnimations.registry.socialShare.prototype.xmlDependencies
xmlDependencies: publicWidget.registry.socialShare.prototype.xmlDependencies
.concat(['/website_forum/static/src/xml/website_forum_share_templates.xml']),
events: {},
@@ -69,7 +69,7 @@ var ForumShare = sAnimations.registry.socialShare.extend({
},
});
sAnimations.registry.websiteForumShare = sAnimations.Class.extend({
publicWidget.registry.websiteForumShare = publicWidget.Widget.extend({
selector: '.website_forum',
events: {
'click :not(.karma_required).oe_social_share_call': '_onShareCallClick',
addons/website_links/static/src/js/website_links.js
+5 -6
View File
@@ -2,12 +2,11 @@ odoo.define('website_links.website_links', function (require) {
'use strict';
var core = require('web.core');
var Widget = require('web.Widget');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var _t = core._t;
var SelectBox = Widget.extend({
var SelectBox = publicWidget.Widget.extend({
xmlDependencies: ['/website_links/static/src/xml/recent_link.xml'],
events: {
'change': '_onChange',
@@ -105,7 +104,7 @@ var SelectBox = Widget.extend({
},
});
var RecentLinkBox = Widget.extend({
var RecentLinkBox = publicWidget.Widget.extend({
template: 'website_links.RecentLink',
events: {
'click .btn_shorten_url_clipboard': '_toggleCopyButton',
@@ -278,7 +277,7 @@ var RecentLinkBox = Widget.extend({
},
});
var RecentLinks = Widget.extend({
var RecentLinks = publicWidget.Widget.extend({
//--------------------------------------------------------------------------
// Private
@@ -337,7 +336,7 @@ var RecentLinks = Widget.extend({
},
});
sAnimations.registry.websiteLinks = sAnimations.Class.extend({
publicWidget.registry.websiteLinks = publicWidget.Widget.extend({
selector: '.o_website_links_create_tracked_url',
events: {
'click #filter-newest-links': '_onFilterNewestLinksClick',
addons/website_links/static/src/js/website_links_charts.js
+4 -5
View File
@@ -2,12 +2,11 @@ odoo.define('website_links.charts', function (require) {
'use strict';
var core = require('web.core');
var Widget = require('web.Widget');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var _t = core._t;
var BarChart = Widget.extend({
var BarChart = publicWidget.Widget.extend({
/**
* @constructor
* @param {Object} parent
@@ -102,7 +101,7 @@ var BarChart = Widget.extend({
},
});
var PieChart = Widget.extend({
var PieChart = publicWidget.Widget.extend({
/**
* @override
* @param {Object} parent
@@ -148,7 +147,7 @@ var PieChart = Widget.extend({
},
});
sAnimations.registry.websiteLinksCharts = sAnimations.Class.extend({
publicWidget.registry.websiteLinksCharts = publicWidget.Widget.extend({
selector: '.o_website_links_chart',
events: {
'click .graph-tabs li a': '_onGraphTabClick',
addons/website_links/static/src/js/website_links_code_editor.js
+2 -2
View File
@@ -2,11 +2,11 @@ odoo.define('website_links.code_editor', function (require) {
'use strict';
var core = require('web.core');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var _t = core._t;
sAnimations.registry.websiteLinksCodeEditor = sAnimations.Class.extend({
publicWidget.registry.websiteLinksCodeEditor = publicWidget.Widget.extend({
selector: '#wrapwrap:has(.o_website_links_edit_code)',
events: {
'click .o_website_links_edit_code': '_onEditCodeClick',
addons/website_links/static/src/js/website_links_menu.js
+4 -4
View File
@@ -7,12 +7,12 @@
odoo.define('website_links.website_links_menu', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimations.registry.websiteLinksMenu = sAnimations.Class.extend({
selector: '#o_website_links_share_page',
publicWidget.registry.websiteLinksMenu = publicWidget.Widget.extend({
selector: '#o_website_links_share_page',
/**
/**
* @override
*/
start: function () {
addons/website_mail/static/src/js/follow.js
+2 -2
View File
@@ -1,9 +1,9 @@
odoo.define('website_mail.follow', function (require) {
'use strict';
var sAnimation = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimation.registry.follow = sAnimation.Class.extend({
publicWidget.registry.follow = publicWidget.Widget.extend({
selector: '.js_follow',
disabledInEditableMode: false,
addons/website_mail_channel/static/src/js/website_mail_channel.js
+2 -2
View File
@@ -1,9 +1,9 @@
odoo.define('website_mail_channel', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimations.registry.websiteMailChannel = sAnimations.Class.extend({
publicWidget.registry.websiteMailChannel = publicWidget.Widget.extend({
selector: '#wrapwrap',
events: {
'click .o_mg_link_hide': '_onHideLinkClick',
addons/website_mail_channel/static/src/js/website_mail_channel.snippet.js
+2 -2
View File
@@ -1,9 +1,9 @@
odoo.define('website_mail_channel.snippet', function (require) {
'use strict';
var sAnimation = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimation.registry.follow_alias = sAnimation.Class.extend({
publicWidget.registry.follow_alias = publicWidget.Widget.extend({
selector: ".js_follow_alias",
disabledInEditableMode: false,
start: function () {
addons/website_mass_mailing/static/src/js/website_mass_mailing.js
+3 -3
View File
@@ -2,9 +2,9 @@ odoo.define('mass_mailing.website_integration', function (require) {
"use strict";
var utils = require('web.utils');
var sAnimation = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimation.registry.subscribe = sAnimation.Class.extend({
publicWidget.registry.subscribe = publicWidget.Widget.extend({
selector: ".js_subscribe",
disabledInEditableMode: false,
@@ -65,7 +65,7 @@ sAnimation.registry.subscribe = sAnimation.Class.extend({
},
});
sAnimation.registry.newsletter_popup = sAnimation.Class.extend({
publicWidget.registry.newsletter_popup = publicWidget.Widget.extend({
selector: ".o_newsletter_popup",
disabledInEditableMode: false,
addons/website_sale/static/src/js/website_sale.js
+8 -9
View File
@@ -1,13 +1,13 @@
odoo.define('website_sale.cart', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var core = require('web.core');
var _t = core._t;
var timeout;
sAnimations.registry.websiteSaleCartLink = sAnimations.Class.extend({
publicWidget.registry.websiteSaleCartLink = publicWidget.Widget.extend({
selector: '#top_menu a[href$="/shop/cart"]',
events: {
'mouseenter': '_onMouseEnter',
@@ -80,9 +80,9 @@ sAnimations.registry.websiteSaleCartLink = sAnimations.Class.extend({
odoo.define('website_sale.website_sale_category', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimations.registry.websiteSaleCategory = sAnimations.Class.extend({
publicWidget.registry.websiteSaleCategory = publicWidget.Widget.extend({
selector: '#o_shop_collapse_category',
events: {
'click .fa-chevron-right': '_onOpenClick',
@@ -118,13 +118,13 @@ sAnimations.registry.websiteSaleCategory = sAnimations.Class.extend({
odoo.define('website_sale.website_sale', function (require) {
'use strict';
var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin');
var core = require('web.core');
var config = require('web.config');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin');
require("website.content.zoomodoo");
sAnimations.registry.WebsiteSale = sAnimations.Class.extend(ProductConfiguratorMixin, {
publicWidget.registry.WebsiteSale = publicWidget.Widget.extend(ProductConfiguratorMixin, {
selector: '.oe_website_sale',
events: _.extend({}, ProductConfiguratorMixin.events || {}, {
'change form .js_product:first input[name="add_qty"]': '_onChangeAddQuantity',
@@ -596,8 +596,7 @@ sAnimations.registry.WebsiteSale = sAnimations.Class.extend(ProductConfiguratorM
},
});
sAnimations.registry.websiteSaleCart = sAnimations.Class.extend({
publicWidget.registry.websiteSaleCart = publicWidget.Widget.extend({
selector: '.oe_website_sale .oe_cart',
events: {
'click .js_change_shipping': '_onClickChangeShipping',
addons/website_sale/static/src/js/website_sale_options.js
+5 -6
View File
@@ -2,13 +2,14 @@ odoo.define('website_sale_options.website_sale', function (require) {
'use strict';
var core = require('web.core');
var _t = core._t;
var publicWidget = require('web.public.widget');
var OptionalProductsModal = require('sale.OptionalProductsModal');
var sAnimations = require('website.content.snippets.animation');
var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin');
require('website_sale.website_sale');
sAnimations.registry.WebsiteSaleOptions = sAnimations.Class.extend(ProductConfiguratorMixin, {
var _t = core._t;
publicWidget.registry.WebsiteSaleOptions = publicWidget.Widget.extend(ProductConfiguratorMixin, {
selector: '.oe_website_sale',
events: _.extend({}, ProductConfiguratorMixin.events || {}, {
'click #add_to_cart, #products_grid .product_price .a-submit': 'async _onClickAdd',
@@ -186,7 +187,5 @@ sAnimations.registry.WebsiteSaleOptions = sAnimations.Class.extend(ProductConfig
});
},
});
return sAnimations.registry.WebsiteSaleOptions;
return publicWidget.registry.WebsiteSaleOptions;
});
addons/website_sale/static/src/js/website_sale_tracking.js
+2 -3
View File
@@ -1,8 +1,8 @@
odoo.define('website_sale.tracking', function (require) {
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimations.registry.websiteSaleTracking = sAnimations.Class.extend({
publicWidget.registry.websiteSaleTracking = publicWidget.Widget.extend({
selector: '.oe_website_sale',
events: {
'click form[action="/shop/cart/update"] a.a-submit': '_onAddProductIntoCart',
@@ -110,5 +110,4 @@ sAnimations.registry.websiteSaleTracking = sAnimations.Class.extend({
this._vpv('/stats/ecom/order_payment/' + method);
},
});
});
addons/website_sale/static/src/js/website_sale_validate.js
+3 -3
View File
@@ -1,9 +1,9 @@
odoo.define('website_sale.validate', function(require) {
odoo.define('website_sale.validate', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
sAnimations.registry.websiteSaleValidate = sAnimations.Class.extend({
publicWidget.registry.websiteSaleValidate = publicWidget.Widget.extend({
selector: 'div.oe_website_sale_tx_status[data-order-id]',
/**
addons/website_sale_comparison/static/src/js/website_sale_comparison.js
+3 -4
View File
@@ -2,10 +2,9 @@ odoo.define('website_sale_comparison.comparison', function (require) {
'use strict';
var core = require('web.core');
var publicWidget = require('web.public.widget');
var utils = require('web.utils');
var Widget = require('web.Widget');
var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin');
var sAnimations = require('website.content.snippets.animation');
var website_sale_utils = require('website_sale.utils');
var qweb = core.qweb;
@@ -14,7 +13,7 @@ var _t = core._t;
// ProductConfiguratorMixin events are overridden on purpose here
// to avoid registering them more than once since they are already registered
// in website_sale.js
var ProductComparison = Widget.extend(ProductConfiguratorMixin, {
var ProductComparison = publicWidget.Widget.extend(ProductConfiguratorMixin, {
xmlDependencies: ['/website_sale_comparison/static/src/xml/comparison.xml'],
template: 'product_comparison_template',
@@ -235,7 +234,7 @@ var ProductComparison = Widget.extend(ProductConfiguratorMixin, {
},
});
sAnimations.registry.ProductComparison = sAnimations.Class.extend({
publicWidget.registry.ProductComparison = publicWidget.Widget.extend({
selector: '.oe_website_sale',
events: {
'click .o_add_compare, .o_add_compare_dyn': '_onClickAddCompare',
addons/website_sale_delivery/static/src/js/website_sale_delivery.js
+2 -2
View File
@@ -2,13 +2,13 @@ odoo.define('website_sale_delivery.checkout', function (require) {
'use strict';
var core = require('web.core');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var _t = core._t;
var concurrency = require('web.concurrency');
var dp = new concurrency.DropPrevious();
sAnimations.registry.websiteSaleDelivery = sAnimations.Class.extend({
publicWidget.registry.websiteSaleDelivery = publicWidget.Widget.extend({
selector: '.oe_website_sale',
events: {
'change select[name="shipping_id"]': '_onSetAddress',
addons/website_sale_stock/static/src/js/product_configurator_mixin.js
+2 -2
View File
@@ -2,7 +2,7 @@ odoo.define('website_sale_stock.ProductConfiguratorMixin', function (require) {
'use strict';
var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var ajax = require('web.ajax');
var core = require('web.core');
var QWeb = core.qweb;
@@ -75,7 +75,7 @@ ProductConfiguratorMixin._onChangeCombinationStock = function (ev, $parent, comb
});
};
sAnimations.registry.WebsiteSale.include({
publicWidget.registry.WebsiteSale.include({
/**
* Adds the stock checking to the regular _onChangeCombination method
* @override
addons/website_sale_wishlist/static/src/js/website_sale_wishlist.js
+2 -2
View File
@@ -1,14 +1,14 @@
odoo.define('website_sale_wishlist.wishlist', function (require) {
"use strict";
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var wSaleUtils = require('website_sale.utils');
var ProductConfiguratorMixin = require('sale.ProductConfiguratorMixin');
// ProductConfiguratorMixin events are overridden on purpose here
// to avoid registering them more than once since they are already registered
// in website_sale.js
sAnimations.registry.ProductWishlist = sAnimations.Class.extend(ProductConfiguratorMixin, {
publicWidget.registry.ProductWishlist = publicWidget.Widget.extend(ProductConfiguratorMixin, {
selector: '.oe_website_sale',
events: {
'click #my_wish': '_onClickMyWish',
addons/website_slides/static/src/js/slides.js
+6 -7
View File
@@ -1,10 +1,10 @@
odoo.define('website_slides.slides', function (require) {
'use strict';
var publicWidget = require('web.public.widget');
var time = require('web.time');
var sAnimations = require('website.content.snippets.animation');
sAnimations.registry.websiteSlides = sAnimations.Class.extend({
publicWidget.registry.websiteSlides = publicWidget.Widget.extend({
selector: '#wrapwrap',
/**
@@ -32,7 +32,7 @@ sAnimations.registry.websiteSlides = sAnimations.Class.extend({
},
});
return sAnimations.registry.websiteSlides;
return publicWidget.registry.websiteSlides;
});
@@ -41,11 +41,10 @@ return sAnimations.registry.websiteSlides;
odoo.define('website_slides.slides_embed', function (require) {
'use strict';
var Widget = require('web.Widget');
var publicWidget = require('web.public.widget');
require('website_slides.slides');
var sAnimations = require('website.content.snippets.animation');
var SlideSocialEmbed = Widget.extend({
var SlideSocialEmbed = publicWidget.Widget.extend({
events: {
'change input': '_onChangePage',
},
@@ -92,7 +91,7 @@ var SlideSocialEmbed = Widget.extend({
},
});
sAnimations.registry.websiteSlidesEmbed = sAnimations.Class.extend({
publicWidget.registry.websiteSlidesEmbed = publicWidget.Widget.extend({
selector: '#wrapwrap',
/**
addons/website_slides/static/src/js/slides_category.js
+4 -8
View File
@@ -1,13 +1,9 @@
odoo.define('website_slides.add.section', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var core = require('web.core');
var Widget = require('web.Widget');
var publicWidget = require('web.public.widget');
var _t = core._t;
var SectionDialog = Widget.extend({
var SectionDialog = publicWidget.Widget.extend({
template: 'website.slide.add.section',
events: {
'hidden.bs.modal': 'destroy',
@@ -106,7 +102,7 @@ odoo.define('website_slides.add.section', function (require) {
});
sAnimations.registry.websiteSlidesSection = sAnimations.Class.extend({
publicWidget.registry.websiteSlidesSection = publicWidget.Widget.extend({
selector: '.oe_slide_js_add_section',
xmlDependencies: ['/website_slides/static/src/xml/website_slides_upload.xml'],
events: {
@@ -145,4 +141,4 @@ odoo.define('website_slides.add.section', function (require) {
this._openDialog($(ev.currentTarget).attr('channel_id'));
},
});
});
});
addons/website_slides/static/src/js/slides_course_fullscreen_player.js
+6 -6
View File
@@ -2,8 +2,8 @@ var onYouTubeIframeAPIReady;
odoo.define('website_slides.fullscreen', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var Widget = require('web.Widget');
var publicWidget = require('web.public.widget');
var core = require('web.core');
var QWeb = core.qweb;
@@ -16,7 +16,7 @@ odoo.define('website_slides.fullscreen', function (require) {
firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
var Fullscreen = Widget.extend({
var Fullscreen = publicWidget.Widget.extend({
/**
* @override
* @param {Object} el
@@ -105,7 +105,7 @@ odoo.define('website_slides.fullscreen', function (require) {
try{
self._setupYoutubePlayer();
}
catch {
catch (e) {
onYouTubeIframeAPIReady = function(){
var self = this;
self._setupYoutubePlayer();
@@ -409,7 +409,7 @@ odoo.define('website_slides.fullscreen', function (require) {
},
})
sAnimations.registry.websiteSlidesFullscreenPlayer = Widget.extend({
publicWidget.registry.websiteSlidesFullscreenPlayer = publicWidget.Widget.extend({
selector: '.oe_js_course_slide',
xmlDependencies: ['/website_slides/static/src/xml/website_slides_fullscreen.xml'],
init: function(el){
@@ -426,4 +426,4 @@ odoo.define('website_slides.fullscreen', function (require) {
});
return Fullscreen;
});
});
addons/website_slides/static/src/js/slides_course_progress_bar.js
+5 -5
View File
@@ -1,9 +1,9 @@
odoo.define('website_slides.progress.bar', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var Widget = require('web.Widget');
var publicWidget = require('web.public.widget');
var ProgressBar = Widget.extend({
var ProgressBar = publicWidget.Widget.extend({
/**
* @override
@@ -30,7 +30,7 @@ odoo.define('website_slides.progress.bar', function (require) {
},
});
sAnimations.registry.websiteSlidesProgressBar = sAnimations.Class.extend({
publicWidget.registry.websiteSlidesProgressBar = publicWidget.Widget.extend({
selector: '.oe_slide_js_progress_bar',
/**
* @override
@@ -44,4 +44,4 @@ odoo.define('website_slides.progress.bar', function (require) {
});
return ProgressBar;
});
});
addons/website_slides/static/src/js/slides_course_quiz.js
+5 -5
View File
@@ -1,12 +1,12 @@
odoo.define('website_slides.quiz', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var core = require('web.core');
var Widget = require('web.Widget');
var QWeb = core.qweb;
var Quiz= Widget.extend({
var Quiz= publicWidget.Widget.extend({
/**
* @override
* @param {Object} el
@@ -169,7 +169,7 @@ odoo.define('website_slides.quiz', function (require) {
},
});
sAnimations.registry.websiteSlidesQuizNoFullscreen = Widget.extend({
publicWidget.registry.websiteSlidesQuizNoFullscreen = publicWidget.Widget.extend({
selector: '.o_w_slides_quiz_no_fullscreen',
xmlDependencies: ['/website_slides/static/src/xml/website_slides_fullscreen.xml'],
init: function (el){
@@ -203,4 +203,4 @@ odoo.define('website_slides.quiz', function (require) {
});
return Quiz;
});
});
addons/website_slides/static/src/js/slides_course_sidebar_list.js
+5 -6
View File
@@ -1,10 +1,9 @@
odoo.define('website_slides.sidebar', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var core = require('web.core');
var Widget = require('web.Widget');
var SideBar = Widget.extend({
var publicWidget = require('web.public.widget');
var SideBar = publicWidget.Widget.extend({
init: function (el){
this._super.apply(this,arguments);
},
@@ -19,7 +18,7 @@ odoo.define('website_slides.sidebar', function (require) {
},
});
sAnimations.registry.websiteSlidesSidebarList = Widget.extend({
publicWidget.registry.websiteSlidesSidebarList = publicWidget.Widget.extend({
selector: '.o_wslides_fullscreen_toggle_sidebar',
// xmlDependencies: ['/website_slides/static/src/xml/website_slides.xml'],
init: function (el){
@@ -31,4 +30,4 @@ odoo.define('website_slides.sidebar', function (require) {
sideBar.appendTo(".oe_js_side_bar_list");
}
});
});
});
addons/website_slides/static/src/js/slides_course_slides_list.js
+5 -5
View File
@@ -1,11 +1,11 @@
odoo.define('website_slides.slideslist', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var Widget = require('web.Widget');
var publicWidget = require('web.public.widget');
var SlideUpload = require('website_slides.upload_modal');
var List = Widget.extend({
var List = publicWidget.Widget.extend({
init: function (el){
this._super.apply(this,arguments);
this.draggedElement = undefined;
@@ -236,7 +236,7 @@ odoo.define('website_slides.slideslist', function (require) {
}
})
sAnimations.registry.websiteSlidesCourseSlidesList = Widget.extend({
publicWidget.registry.websiteSlidesCourseSlidesList = publicWidget.Widget.extend({
selector: '.oe_js_course_slides_list',
xmlDependencies: ['/website_slides/static/src/xml/website_slides_upload.xml'],
init: function (el){
@@ -248,4 +248,4 @@ odoo.define('website_slides.slideslist', function (require) {
list.appendTo(".oe_js_course_slides_list");
}
});
});
});
addons/website_slides/static/src/js/slides_delete_slide.js
+5 -9
View File
@@ -1,13 +1,9 @@
odoo.define('website_slides.delete.slide', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var core = require('web.core');
var Widget = require('web.Widget');
var publicWidget = require('web.public.widget');
var _t = core._t;
var QWeb = core.qweb;
var DeleteSlideDialog = Widget.extend({
var DeleteSlideDialog = publicWidget.Widget.extend({
template: 'website.slide.delete.slide',
events: {
'hidden.bs.modal': 'destroy',
@@ -56,7 +52,7 @@ odoo.define('website_slides.delete.slide', function (require) {
}
});
sAnimations.registry.websiteSlidesDeleteSlide = sAnimations.Class.extend({
publicWidget.registry.websiteSlidesDeleteSlide = publicWidget.Widget.extend({
selector: '.oe_slide_js_delete_slide',
xmlDependencies: ['/website_slides/static/src/xml/website_slides_upload.xml'],
events: {
@@ -85,4 +81,4 @@ odoo.define('website_slides.delete.slide', function (require) {
},
});
return DeleteSlideDialog;
});
});
addons/website_slides/static/src/js/slides_join_channel.js
+3 -4
View File
@@ -2,13 +2,12 @@ odoo.define('website_slides.slides_join_channel', function (require) {
'use strict';
var core = require('web.core');
var Widget = require('web.Widget');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
require('website_slides.slides');
var _t = core._t;
var JoinChannelButton = Widget.extend({
var JoinChannelButton = publicWidget.Widget.extend({
events: {
'click .o_wslides_join_channel_link': '_onClickJoin',
},
@@ -65,7 +64,7 @@ var JoinChannelButton = Widget.extend({
},
});
sAnimations.registry.websiteSlidesJoinChannel = sAnimations.Class.extend({
publicWidget.registry.websiteSlidesJoinChannel = publicWidget.Widget.extend({
selector: '#wrapwrap',
/**
addons/website_slides/static/src/js/slides_like.js
+3 -5
View File
@@ -2,14 +2,12 @@ odoo.define('website_slides.slides_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');
var publicWidget = require('web.public.widget');
require('website_slides.slides');
var _t = core._t;
var LikeButton = Widget.extend({
var LikeButton = publicWidget.Widget.extend({
events: {
'click .o_wslides_like_up': '_onClickUp',
'click .o_wslides_like_down': '_onClickDown',
@@ -78,7 +76,7 @@ var LikeButton = Widget.extend({
},
});
sAnimations.registry.websiteSlidesLike = sAnimations.Class.extend({
publicWidget.registry.websiteSlidesLike = publicWidget.Widget.extend({
selector: '#wrapwrap',
/**
addons/website_slides/static/src/js/slides_share.js
+3 -4
View File
@@ -1,11 +1,10 @@
odoo.define('website_slides.slides_share', function (require) {
'use strict';
var Widget = require('web.Widget');
var sAnimations = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
require('website_slides.slides');
var ShareMail = Widget.extend({
var ShareMail = publicWidget.Widget.extend({
events: {
'click button': '_sendMail',
},
@@ -39,7 +38,7 @@ var ShareMail = Widget.extend({
},
});
sAnimations.registry.websiteSlidesShare = sAnimations.Class.extend({
publicWidget.registry.websiteSlidesShare = publicWidget.Widget.extend({
selector: '#wrapwrap',
events: {
'click a.o_slides_social_share': '_onSlidesSocialShare',
addons/website_slides/static/src/js/slides_upload.js
+4 -5
View File
@@ -1,14 +1,13 @@
odoo.define('website_slides.upload_modal', function (require) {
'use strict';
var sAnimations = require('website.content.snippets.animation');
var core = require('web.core');
var Dialog = require('web.Dialog');
var publicWidget = require('web.public.widget');
var QWeb = core.qweb;
var _t = core._t;
var SlideUploadDialog = Dialog.extend({
template: 'website.slide.upload.modal',
events: _.extend({}, Dialog.prototype.events, {
@@ -16,6 +15,7 @@ var SlideUploadDialog = Dialog.extend({
'change input#upload': '_onChangeSlideUpload',
'change input#url': '_onChangeSlideUrl',
}),
/**
* @override
* @param {Object} parent
@@ -559,8 +559,7 @@ var SlideUploadDialog = Dialog.extend({
},
});
sAnimations.registry.websiteSlidesUpload = sAnimations.Class.extend({
publicWidget.registry.websiteSlidesUpload = publicWidget.Widget.extend({
selector: '.oe_slide_js_upload',
xmlDependencies: ['/website_slides/static/src/xml/website_slides_upload.xml'],
events: {
@@ -602,7 +601,7 @@ sAnimations.registry.websiteSlidesUpload = sAnimations.Class.extend({
return {
SlideUploadDialog: SlideUploadDialog,
websiteSlidesUpload: sAnimations.registry.websiteSlidesUpload
websiteSlidesUpload: publicWidget.registry.websiteSlidesUpload
};
});
addons/website_twitter/static/src/js/website.twitter.animation.js
+2 -2
View File
@@ -2,11 +2,11 @@ odoo.define('website_twitter.animation', function (require) {
'use strict';
var core = require('web.core');
var sAnimation = require('website.content.snippets.animation');
var publicWidget = require('web.public.widget');
var qweb = core.qweb;
sAnimation.registry.twitter = sAnimation.Class.extend({
publicWidget.registry.twitter = publicWidget.Widget.extend({
selector: '.twitter',
xmlDependencies: ['/website_twitter/static/src/xml/website.twitter.xml'],
events: {