Browse Source

Fixed #1076: Fixed possible overlap of minor labels text on the TimeAxis

flowchartTest
jos 9 years ago
parent
commit
b175068b2a
3 changed files with 15 additions and 1 deletions
  1. +1
    -0
      HISTORY.md
  2. +11
    -1
      lib/timeline/component/TimeAxis.js
  3. +3
    -0
      lib/timeline/component/css/timeaxis.css

+ 1
- 0
HISTORY.md View File

@ -16,6 +16,7 @@ http://visjs.org
### Timeline ### Timeline
- Implemented support for group templates (#996). Thanks @hansmaulwurf23. - Implemented support for group templates (#996). Thanks @hansmaulwurf23.
- Fixed #1076: Fixed possible overlap of minor labels text on the TimeAxis.
- Fixed #1001: First element of group style being cut. - Fixed #1001: First element of group style being cut.
- Fixed #1071: HTML contents of a group not cleared when the contents is updated. - Fixed #1071: HTML contents of a group not cleared when the contents is updated.
- Fixed #1033: Moved item data not updated in DataSet when using an asynchronous - Fixed #1033: Moved item data not updated in DataSet when using an asynchronous

+ 11
- 1
lib/timeline/component/TimeAxis.js View File

@ -223,6 +223,7 @@ TimeAxis.prototype._repaintLabels = function () {
var xPrev = 0; var xPrev = 0;
var width = 0; var width = 0;
var prevLine; var prevLine;
var prevText;
var xFirstMajorLabel = undefined; var xFirstMajorLabel = undefined;
var max = 0; var max = 0;
var className; var className;
@ -241,9 +242,12 @@ TimeAxis.prototype._repaintLabels = function () {
if (prevLine) { if (prevLine) {
prevLine.style.width = width + 'px'; prevLine.style.width = width + 'px';
} }
if (prevText) {
prevText.style.width = width + 'px';
}
if (this.options.showMinorLabels) { if (this.options.showMinorLabels) {
this._repaintMinorText(x, step.getLabelMinor(), orientation, className);
prevText = this._repaintMinorText(x, step.getLabelMinor(), orientation, className);
} }
if (isMajor && this.options.showMajorLabels) { if (isMajor && this.options.showMajorLabels) {
@ -290,6 +294,7 @@ TimeAxis.prototype._repaintLabels = function () {
* @param {String} text * @param {String} text
* @param {String} orientation "top" or "bottom" (default) * @param {String} orientation "top" or "bottom" (default)
* @param {String} className * @param {String} className
* @return {Element} Returns the HTML element of the created label
* @private * @private
*/ */
TimeAxis.prototype._repaintMinorText = function (x, text, orientation, className) { TimeAxis.prototype._repaintMinorText = function (x, text, orientation, className) {
@ -311,6 +316,8 @@ TimeAxis.prototype._repaintMinorText = function (x, text, orientation, className
label.style.left = x + 'px'; label.style.left = x + 'px';
label.className = 'vis-text vis-minor ' + className; label.className = 'vis-text vis-minor ' + className;
//label.title = title; // TODO: this is a heavy operation //label.title = title; // TODO: this is a heavy operation
return label;
}; };
/** /**
@ -319,6 +326,7 @@ TimeAxis.prototype._repaintMinorText = function (x, text, orientation, className
* @param {String} text * @param {String} text
* @param {String} orientation "top" or "bottom" (default) * @param {String} orientation "top" or "bottom" (default)
* @param {String} className * @param {String} className
* @return {Element} Returns the HTML element of the created label
* @private * @private
*/ */
TimeAxis.prototype._repaintMajorText = function (x, text, orientation, className) { TimeAxis.prototype._repaintMajorText = function (x, text, orientation, className) {
@ -340,6 +348,8 @@ TimeAxis.prototype._repaintMajorText = function (x, text, orientation, className
label.style.top = (orientation == 'top') ? '0' : (this.props.minorLabelHeight + 'px'); label.style.top = (orientation == 'top') ? '0' : (this.props.minorLabelHeight + 'px');
label.style.left = x + 'px'; label.style.left = x + 'px';
return label;
}; };
/** /**

+ 3
- 0
lib/timeline/component/css/timeaxis.css View File

@ -21,6 +21,9 @@
position: absolute; position: absolute;
color: #4d4d4d; color: #4d4d4d;
padding: 3px; padding: 3px;
overflow: hidden;
box-sizing: border-box;
white-space: nowrap; white-space: nowrap;
} }

Loading…
Cancel
Save