From 5b3e63d55cb41b0cf766850189bf2eb3c160d1a2 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 22 Jul 2019 15:16:24 +0200 Subject: [PATCH] Revert "Merge PR #1330 into 12.0" This reverts commit 0f95b0fb0aa4f49ee757a18457bb7777c0d56c30, reversing changes made to d0ba3d3bafede3cd5fda4f070485b269c177a26c. --- web_timeline/README.rst | 1 - web_timeline/i18n/web_timeline.pot | 2 +- web_timeline/readme/CONTRIBUTORS.rst | 1 - web_timeline/static/description/index.html | 1 - web_timeline/static/src/css/web_timeline.css | 32 ------------------- .../static/src/js/timeline_renderer.js | 11 +------ 6 files changed, 2 insertions(+), 46 deletions(-) diff --git a/web_timeline/README.rst b/web_timeline/README.rst index f25d3def2..16db743db 100755 --- a/web_timeline/README.rst +++ b/web_timeline/README.rst @@ -183,7 +183,6 @@ Contributors * Leonardo Donelli * Adrien Didenot * Dennis Sluijk -* Serpent Consulting Services Pvt. Ltd. Other credits ~~~~~~~~~~~~~ diff --git a/web_timeline/i18n/web_timeline.pot b/web_timeline/i18n/web_timeline.pot index 22e9e73cb..f750ffa1a 100644 --- a/web_timeline/i18n/web_timeline.pot +++ b/web_timeline/i18n/web_timeline.pot @@ -86,7 +86,7 @@ msgstr "" #. module: web_timeline #. openerp-web -#: code:addons/web_timeline/static/src/js/timeline_renderer.js:476 +#: code:addons/web_timeline/static/src/js/timeline_renderer.js:467 #, python-format msgid "Template \"timeline-item\" not present in timeline view definition." msgstr "" diff --git a/web_timeline/readme/CONTRIBUTORS.rst b/web_timeline/readme/CONTRIBUTORS.rst index 5fc0f53c9..4a76c2339 100644 --- a/web_timeline/readme/CONTRIBUTORS.rst +++ b/web_timeline/readme/CONTRIBUTORS.rst @@ -4,4 +4,3 @@ * Leonardo Donelli * Adrien Didenot * Dennis Sluijk -* Serpent Consulting Services Pvt. Ltd. diff --git a/web_timeline/static/description/index.html b/web_timeline/static/description/index.html index fe3073a8a..ec8a80640 100644 --- a/web_timeline/static/description/index.html +++ b/web_timeline/static/description/index.html @@ -560,7 +560,6 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Leonardo Donelli <donelli@webmonks.it>
  • Adrien Didenot <adrien.didenot@horanet.com>
  • Dennis Sluijk <d.sluijk@onestein.nl>
    • -
  • Serpent Consulting Services Pvt. Ltd. <support@serpentcs.com>
    • diff --git a/web_timeline/static/src/css/web_timeline.css b/web_timeline/static/src/css/web_timeline.css index 89fa975a5..d32d3616e 100644 --- a/web_timeline/static/src/css/web_timeline.css +++ b/web_timeline/static/src/css/web_timeline.css @@ -29,35 +29,3 @@ left: 0px; top: 0px; } - -.vis-labelset { - position: relative; - width: 100%; - height: 100%; - overflow: visible !important; -} - -.vis-labelset .vis-label:first-child { - background: lightgrey; - position: sticky; - top: 0px !important; - z-index: 999; - max-height: 100px; - height: 100px !important; - display: -webkit-flex; -} - -.vis-foreground .vis-group:first-child { - background: lightgrey; - position: sticky; - top: 0px !important; - z-index: 999; - max-height: 100px; - height: 100px !important; - display: -webkit-flex; - overflow: auto; -} - -.vis-background .vis-group:nth-child(2) .vis-line{ - display:none !important; -} diff --git a/web_timeline/static/src/js/timeline_renderer.js b/web_timeline/static/src/js/timeline_renderer.js index b0e790590..4a0038ce6 100644 --- a/web_timeline/static/src/js/timeline_renderer.js +++ b/web_timeline/static/src/js/timeline_renderer.js @@ -210,10 +210,7 @@ odoo.define('web_timeline.TimelineRenderer', function (require) { onAdd: self.on_add, onMove: self.on_move, onUpdate: self.on_update, - onRemove: self.on_remove, - horizontalScroll: false, - verticalScroll:true, - zoomKey: 'ctrlKey', + onRemove: self.on_remove }); this.qweb = new QWeb(session.debug, {_s: session.origin}, false); if (this.arch.children.length) { @@ -226,12 +223,6 @@ odoo.define('web_timeline.TimelineRenderer', function (require) { } this.timeline = new vis.Timeline(self.$timeline.empty().get(0)); - $(this.timeline.dom.leftContainer).scroll(function() { - var hei = ($('.vis-foreground .vis-group:first-child')[0].style.height).split("px"); - var itemset_height = ($('.vis-itemset')[0].style.height).split("px"); - var new_height = parseInt(itemset_height[0]) - (parseInt(hei[0]) - 100) - $('.vis-itemset').css('height', new_height) - }); this.timeline.setOptions(this.options); if (self.mode && self['on_scale_' + self.mode + '_clicked']) { self['on_scale_' + self.mode + '_clicked']();