Skip to content

Add last fix from taitems + new option + fix for HTML in left panel #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: my-master
Choose a base branch
from
Open

Add last fix from taitems + new option + fix for HTML in left panel #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93dbfd7
Add last fix from taitems
MisterDuval Jan 5, 2021
d4316e5
add option to disable horizontal scrolling
MisterDuval Jan 5, 2021
04c01e8
Allow HTML in left panel
MisterDuval Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions js/jquery.fn.gantt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
navigate: "buttons",
navigationPosition : "bottom",
scrollToToday: true,
horizMouseScroll: true,
// cookie options
useCookie: false,
cookieKey: "jquery.fn.gantt",
Expand Down Expand Up @@ -301,7 +302,7 @@
var nameRow = $('<div>').addClass('row name').addClass('row' + i).addClass(entry.desc ? '' : 'fn-wide')
.attr('id', 'rowheader' + i).data('offset', i % settings.itemsPerPage * tools.getCellSize()).data('id', entry.id)
.append(
$('<span>').addClass('fn-label').addClass(entry.cssClass ? entry.cssClass : '').text(entry.name || '')
$('<span>').addClass('fn-label').addClass(entry.cssClass ? entry.cssClass : '').html(entry.name || '')
);

core.setRowClick(element, nameRow, i);
Expand All @@ -311,7 +312,7 @@
if (entry.desc) {
var descRow = $('<div>').addClass('row desc').addClass('row' + i).attr('id', 'RowdId_' + i).data('id', entry.id)
.append(
$('<span>').addClass('fn-label').addClass(entry.cssClass ? entry.cssClass : '').text(entry.desc)
$('<span>').addClass('fn-label').addClass(entry.cssClass ? entry.cssClass : '').html(entry.desc)
);
core.setRowClick(element, descRow, i);

Expand All @@ -328,10 +329,12 @@
var dataPanel = $('<div class="dataPanel" style="width: ' + width + 'px;"/>');

// Handle mousewheel events for scrolling the data panel
var wheel = 'onwheel' in element ?
'wheel' : document.onmousewheel !== undefined ?
'mousewheel' : 'DOMMouseScroll';
$(element).on(wheel, function (e) { core.wheelScroll(element, e); });
if (settings.horizMouseScroll) {
var wheel = 'onwheel' in element ?
'wheel' : document.onmousewheel !== undefined ?
'mousewheel' : 'DOMMouseScroll';
$(element).on(wheel, function (e) { core.wheelScroll(element, e); });
}

// Handle click events and dispatch to registered `onAddClick` function
dataPanel.click(function (e) {
Expand Down Expand Up @@ -1394,8 +1397,9 @@
var minDate = null;
$.each(element.data, function (i, entry) {
$.each(entry.values, function (i, date) {
minDate = minDate > tools.dateDeserialize(date.from) ||
minDate === null ? tools.dateDeserialize(date.from) : minDate;
var fromDate = tools.dateDeserialize(date.from);
if (isNaN(fromDate)) { return; }
minDate = minDate > fromDate || minDate === null ? fromDate : minDate;
});
});
minDate = minDate || new Date();
Expand Down
Loading