jingrow/gantt
1
0
Fork 0
Code Pull Requests Activity

Don't show popup while dragging

Browse Source
This commit is contained in:
Faris Ansari 2018-03-04 20:00:49 +05:30
parent 24cb69dd4e
commit ee1062c182
6 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dist/frappe-gantt.js vendored
View File

@ -549,6 +549,8 @@ class Bar {
}
show_popup() {
if (this.gantt.bar_being_dragged) return;
const start_date = date_utils.format(this.task._start, 'MMM D');
const end_date = date_utils.format(this.task._end, 'MMM D');
const subtitle = start_date + ' - ' + end_date;
@ -584,10 +586,6 @@ class Bar {
this.update_handle_position();
this.update_progressbar_position();
this.update_arrow_position();
if (this.gantt.bar_being_dragged === this.task.id) {
this.show_popup();
}
}
date_changed() {
@ -610,7 +608,7 @@ class Bar {
set_action_completed() {
this.action_completed = true;
setTimeout(() => (this.action_completed = false), 2000);
setTimeout(() => (this.action_completed = false), 1000);
}
compute_start_end_date() {
@ -1507,6 +1505,8 @@ class Gantt {
is_dragging = true;
}
bar_wrapper.classList.add('active');
x_on_start = e.offsetX;
y_on_start = e.offsetY;
@ -1562,12 +1562,17 @@ class Gantt {
});
document.addEventListener('mouseup', e => {
if (is_dragging || is_resizing_left || is_resizing_right) {
bars.forEach(bar => bar.group.classList.remove('active'));
}
is_dragging = false;
is_resizing_left = false;
is_resizing_right = false;
});
$.on(this.$svg, 'mouseup', e => {
this.bar_being_dragged = null;
bars.forEach(bar => {
const $bar = bar.$bar;
if (!$bar.finaldx) return;

2
dist/frappe-gantt.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
package.json
View File

@ -4,6 +4,7 @@
"description": "A simple, modern, interactive gantt library for the web",
"main": "src/index.js",
"scripts": {
"start": "yarn run dev",
"build": "rollup -c",
"dev": "rollup -c -w",
"test": "jest",

0
src/Arrow.js → src/arrow.js
View File

6
src/Bar.js → src/bar.js
View File

@ -192,6 +192,8 @@ export default class Bar {
}
show_popup() {
if (this.gantt.bar_being_dragged) return;
const start_date = date_utils.format(this.task._start, 'MMM D');
const end_date = date_utils.format(this.task._end, 'MMM D');
const subtitle = start_date + ' - ' + end_date;
@ -227,10 +229,6 @@ export default class Bar {
this.update_handle_position();
this.update_progressbar_position();
this.update_arrow_position();
if (this.gantt.bar_being_dragged === this.task.id) {
this.show_popup();
}
}
date_changed() {

7
src/index.js
View File

@ -596,6 +596,8 @@ export default class Gantt {
is_dragging = true;
}
bar_wrapper.classList.add('active');
x_on_start = e.offsetX;
y_on_start = e.offsetY;
@ -651,12 +653,17 @@ export default class Gantt {
});
document.addEventListener('mouseup', e => {
if (is_dragging || is_resizing_left || is_resizing_right) {
bars.forEach(bar => bar.group.classList.remove('active'));
}
is_dragging = false;
is_resizing_left = false;
is_resizing_right = false;
});
$.on(this.$svg, 'mouseup', e => {
this.bar_being_dragged = null;
bars.forEach(bar => {
const $bar = bar.$bar;
if (!$bar.finaldx) return;