Skip to content

Commit b1b4223

Browse files
committed
fix(tooltips): Fix content overriding in rows and tasks.
Close angular-gantt#643
1 parent 9e6787b commit b1b4223

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

assets/angular-gantt-plugins.js

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/angular-gantt-tooltips-plugin.js

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demo/dist/scripts/vendor.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56746,6 +56746,9 @@ Github: https://github.com/angular-gantt/angular-gantt.git
5674656746

5674756747
var enabled = utils.firstProperty([taskTooltips, rowTooltips], 'enabled', $scope.pluginScope.enabled);
5674856748
if (enabled && !visible && mouseEnterX !== undefined && newValue) {
56749+
var content = utils.firstProperty([taskTooltips, rowTooltips], 'content', $scope.pluginScope.content);
56750+
$scope.content = content;
56751+
5674956752
if (showDelayed) {
5675056753
showTooltipPromise = $timeout(function() {
5675156754
showTooltip(mouseEnterX);
@@ -57341,7 +57344,7 @@ angular.module('gantt.tooltips.templates', []).run(['$templateCache', function($
5734157344
' ng-class="isRightAligned ? \'gantt-task-infoArrowR\' : \'gantt-task-infoArrow\'"\n' +
5734257345
' ng-style="{top: taskRect.top + \'px\', marginTop: -elementHeight - 8 + \'px\'}">\n' +
5734357346
' <div class="gantt-task-info-content">\n' +
57344-
' <div gantt-bind-compile-html="pluginScope.content"></div>\n' +
57347+
' <div gantt-bind-compile-html="content"></div>\n' +
5734557348
' </div>\n' +
5734657349
'</div>\n' +
5734757350
'');

src/plugins/tooltips/tooltip.directive.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@
9090

9191
var enabled = utils.firstProperty([taskTooltips, rowTooltips], 'enabled', $scope.pluginScope.enabled);
9292
if (enabled && !visible && mouseEnterX !== undefined && newValue) {
93+
var content = utils.firstProperty([taskTooltips, rowTooltips], 'content', $scope.pluginScope.content);
94+
$scope.content = content;
95+
9396
if (showDelayed) {
9497
showTooltipPromise = $timeout(function() {
9598
showTooltip(mouseEnterX);

src/plugins/tooltips/tooltip.tmpl.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
ng-class="isRightAligned ? 'gantt-task-infoArrowR' : 'gantt-task-infoArrow'"
55
ng-style="{top: taskRect.top + 'px', marginTop: -elementHeight - 8 + 'px'}">
66
<div class="gantt-task-info-content">
7-
<div gantt-bind-compile-html="pluginScope.content"></div>
7+
<div gantt-bind-compile-html="content"></div>
88
</div>
99
</div>

0 commit comments

Comments
 (0)