Browse Source

Oops fixing the overflow issue with the dots of BoxItems broke item selection.

v3_develop
jos 10 years ago
parent
commit
4d66916793
8 changed files with 3128 additions and 3118 deletions
  1. +2
    -2
      dist/vis.css
  2. +3106
    -3101
      dist/vis.js
  3. +1
    -1
      dist/vis.map
  4. +1
    -1
      dist/vis.min.css
  5. +7
    -7
      dist/vis.min.js
  6. +7
    -2
      lib/timeline/component/ItemSet.js
  7. +2
    -2
      lib/timeline/component/css/itemset.css
  8. +2
    -2
      lib/timeline/component/item/BoxItem.js

+ 2
- 2
dist/vis.css View File

@ -143,9 +143,9 @@
.vis.timeline .axis { .vis.timeline .axis {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 0;
left: 0; left: 0;
top: 0;
overflow: hidden;
z-index: 1;
} }
.vis.timeline .foreground .group { .vis.timeline .foreground .group {

+ 3106
- 3101
dist/vis.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/vis.map
File diff suppressed because it is too large
View File


+ 1
- 1
dist/vis.min.css
File diff suppressed because it is too large
View File


+ 7
- 7
dist/vis.min.js
File diff suppressed because it is too large
View File


+ 7
- 2
lib/timeline/component/ItemSet.js View File

@ -368,7 +368,7 @@ ItemSet.prototype.show = function() {
// show axis with dots // show axis with dots
if (!this.dom.axis.parentNode) { if (!this.dom.axis.parentNode) {
this.body.dom.top.appendChild(this.dom.axis);
this.body.dom.backgroundVertical.appendChild(this.dom.axis);
} }
// show labelset containing labels // show labelset containing labels
@ -524,7 +524,12 @@ ItemSet.prototype.redraw = function() {
this.props.height = height; this.props.height = height;
// reposition axis // reposition axis
this.dom.axis.style.height = this.body.domProps.background.height + 'px';
// reposition axis
this.dom.axis.style.top = asSize((orientation == 'top') ?
(this.body.domProps.top.height + this.body.domProps.border.top) :
(this.body.domProps.top.height + this.body.domProps.centerContainer.height));
this.dom.axis.style.left = '0';
// check if this component is resized // check if this component is resized
resized = this._isResized() || resized; resized = this._isResized() || resized;

+ 2
- 2
lib/timeline/component/css/itemset.css View File

@ -17,9 +17,9 @@
.vis.timeline .axis { .vis.timeline .axis {
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 0;
left: 0; left: 0;
top: 0;
overflow: hidden;
z-index: 1;
} }
.vis.timeline .foreground .group { .vis.timeline .foreground .group {

+ 2
- 2
lib/timeline/component/item/BoxItem.js View File

@ -206,7 +206,6 @@ BoxItem.prototype.repositionY = function() {
line.style.top = '0'; line.style.top = '0';
line.style.height = (this.parent.top + this.top + 1) + 'px'; line.style.height = (this.parent.top + this.top + 1) + 'px';
line.style.bottom = ''; line.style.bottom = '';
dot.style.top = (this.parent.itemSet.props.top -this.props.dot.height / 2) + 'px';
} }
else { // orientation 'bottom' else { // orientation 'bottom'
var itemSetHeight = this.parent.itemSet.props.height; // TODO: this is nasty var itemSetHeight = this.parent.itemSet.props.height; // TODO: this is nasty
@ -215,8 +214,9 @@ BoxItem.prototype.repositionY = function() {
box.style.top = (this.parent.height - this.top - this.height || 0) + 'px'; box.style.top = (this.parent.height - this.top - this.height || 0) + 'px';
line.style.top = (itemSetHeight - lineHeight) + 'px'; line.style.top = (itemSetHeight - lineHeight) + 'px';
line.style.bottom = '0'; line.style.bottom = '0';
dot.style.top = (itemSetHeight - this.props.dot.height / 2) + 'px';
} }
dot.style.top = (-this.props.dot.height / 2) + 'px';
}; };
module.exports = BoxItem; module.exports = BoxItem;

Loading…
Cancel
Save