pretty close if not there

This commit is contained in:
2021-10-04 22:39:02 +00:00
parent 94ac95c746
commit 8d3304ff96
2 changed files with 16 additions and 4 deletions

View File

@@ -524,6 +524,7 @@ export default {
},
extendBottom(event) {
//console.log("extend bottom fired");
if (event.editable) {
//My work around to disambiguate extending and clicking
// clearTimeout(this.dragTimeout);
@@ -539,6 +540,12 @@ export default {
}
},
async endDragExtend() {
// console.log("EndDragExtend", {
// extendEvent: this.extendEvent,
// dragged: this.dragged,
// dragEvent: this.dragEvent,
// lastMS: this.lastMouseDownMS
// });
//On drag then dragged is set to true and dragEvent and dragTime are set
//on extend then dragged is set to true extendEvent (actual event), extendOriginal and createStart are set, dragEvent is null
//on create then dragged is set to false and createStart is only value set, dragEvent is null and extendEvent is null
@@ -553,7 +560,8 @@ export default {
// this.dragEvent = null; //this needs to be set or it will keep dragging off an editable event even as the moreinfo dialog show
// return;
// }
if (this.itWasAClickNotADrag()) {
if (this.lastMouseDownMS != null && this.itWasAClickNotADrag()) {
await this.showMoreInfo(this.dragEvent);
this.dragEvent = null; //this needs to be set or it will keep dragging off an editable event even as the moreinfo dialog show
return;
@@ -626,8 +634,8 @@ export default {
//# mouse down on an event triggers this call
//console.log("StartDrag, event:", JSON.stringify(event));
if (event) {
this.lastMouseDownMS = new Date().getTime(); //snapshot time to disambiguate drag vs click
if (event.editable) {
this.lastMouseDownMS = new Date().getTime();
//My work around to disambiguate dragging and clicking
//clearTimeout(this.dragTimeout);
// console.log("startDrag in editable set dragged false");
@@ -650,7 +658,8 @@ export default {
},
itWasAClickNotADrag() {
if (this.lastMouseDownMS == null) {
//return;
//console.trace("lastMouseDownMS is null!!");
// return true;
if (this.$ay.dev) {
throw new Error("lastMouseDownMS is null!");
} else {
@@ -784,6 +793,7 @@ export default {
this.calendarHeight = window.innerHeight * 0.84;
},
viewDay({ date }) {
console.log("ViewDay clicked");
this.focus = date;
this.viewType = "day";
},
@@ -812,12 +822,13 @@ export default {
});
},
async showMoreInfo(event) {
console.log("showMoreInfo, event is", event);
//console.log("showMoreInfo, event is", event);
//workaround to disambiguate drag click from view more info click
// if (this.dragged) {
// return;
// }
// console.log("showMoreINfo not dragged, popping up");
this.selectedEvent = event;
let route = null;
this.evInfo = {};
switch (event.type) {