audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge PR #1330 into 12.0"

Browse Source 
This reverts commit 0f95b0fb0a, reversing
changes made to d0ba3d3baf.
This commit is contained in:
Pedro M. Baeza
2019-07-22 15:16:24 +02:00
parent aed62d6662
commit 79df8aadbe
6 changed files with 2 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
web_timeline/static/src/css/web_timeline.css
View File

@@ -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;
}

11
web_timeline/static/src/js/timeline_renderer.js
View File

@@ -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']();