summaryrefslogtreecommitdiff
path: root/addons/website/static/src/snippets/s_table_of_content
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2020-09-17 10:41:10 +0000
committerqsm-odoo <qsm@odoo.com>2020-09-22 08:29:11 +0000
commit4e7be69825163c0a0ff41c882a196fc7f3158fb3 (patch)
tree517a928cddbfa019033af95f2f284cab4e82496d /addons/website/static/src/snippets/s_table_of_content
parent416b125803d043badef8e4b022c100e33d1dba04 (diff)
[IMP] website, *: move page scrollbar to #wrapwrap
*: web, web_editor, portal, account, website_blog, website_forum This is probably not ideal to move the scrolling behavior out of the html element but this will be needed for the editor to not have a double scrollbar on the right. This is actually also useful for the scrollbar to appear under the purple odoo menu instead of its right. This commit, if to be reverted in the future, however contains many improvements to make the transition easier that should be kept: jQuery and Odoo functions to be able to scrollTo a specific element, get the top scrollable element, check if an element is scrollable, etc. Also, some magic was done: if some code tries to scroll to a specific scroll position via jQuery's scrollTop or animate functions on the html/body element, those will still work as intended (obviously, using the new utils to do that is however recommended). This commit also reviews our scroll behaviors to make them more robust and share the code. Part of https://github.com/odoo/odoo/pull/57975 task-2344227
Diffstat (limited to 'addons/website/static/src/snippets/s_table_of_content')
-rw-r--r--addons/website/static/src/snippets/s_table_of_content/000.js36
1 files changed, 13 insertions, 23 deletions
diff --git a/addons/website/static/src/snippets/s_table_of_content/000.js b/addons/website/static/src/snippets/s_table_of_content/000.js
index ac610304e48..68250bc88fa 100644
--- a/addons/website/static/src/snippets/s_table_of_content/000.js
+++ b/addons/website/static/src/snippets/s_table_of_content/000.js
@@ -11,18 +11,18 @@ const TableOfContent = publicWidget.Widget.extend({
/**
* @override
*/
- start: function () {
- this._initializeNavbarTopPosition();
+ async start() {
+ await this._super(...arguments);
+ this._updateTableOfContentNavbarPosition();
extraMenuUpdateCallbacks.push(this._updateTableOfContentNavbarPosition.bind(this));
- return this._super.apply(this, arguments);
},
/**
* @override
*/
- destroy: function () {
+ destroy() {
this.$target.css('top', '');
this.$target.find('.s_table_of_content_navbar').css('top', '');
- this._super.apply(this, arguments);
+ this._super(...arguments);
},
//--------------------------------------------------------------------------
@@ -30,26 +30,16 @@ const TableOfContent = publicWidget.Widget.extend({
//--------------------------------------------------------------------------
/**
- * Initialize the top position of the snippet navbar according to the height
- * of the headers of the page.
- *
* @private
*/
- _initializeNavbarTopPosition: function () {
- let headerHeight = 0;
+ _updateTableOfContentNavbarPosition() {
+ let position = 0;
const $fixedElements = $('.o_top_fixed_element');
- _.each($fixedElements, el => headerHeight += $(el).outerHeight());
- this._updateTableOfContentNavbarPosition(headerHeight);
- },
- /**
- * @private
- * @param {number} position
- */
- _updateTableOfContentNavbarPosition: function (position) {
+ _.each($fixedElements, el => position += $(el).outerHeight());
const isHorizontalNavbar = this.$target.hasClass('s_table_of_content_horizontal_navbar');
this.$target.css('top', isHorizontalNavbar ? position : '');
this.$target.find('.s_table_of_content_navbar').css('top', isHorizontalNavbar ? '' : position + 20);
- $('body').scrollspy({target: '.s_table_of_content_navbar', offset: position + 100});
+ $().getScrollingElement().scrollspy({target: '.s_table_of_content_navbar', method: 'offset', offset: position + 100});
},
});
@@ -66,15 +56,15 @@ publicWidget.registry.anchorSlide.include({
* @override
* @private
*/
- _computeHeaderHeight: function () {
- let headerHeight = this._super(...arguments);
+ _computeExtraOffset() {
+ let extraOffset = this._super(...arguments);
if (this.$el.hasClass('table_of_content_link')) {
const tableOfContentNavbarEl = this.$el.closest('.s_table_of_content_navbar_sticky.s_table_of_content_horizontal_navbar');
if (tableOfContentNavbarEl.length > 0) {
- headerHeight += $(tableOfContentNavbarEl).outerHeight();
+ extraOffset += $(tableOfContentNavbarEl).outerHeight();
}
}
- return headerHeight;
+ return extraOffset;
},
});