more work on monthview
This commit is contained in:
22
main.js
22
main.js
@@ -300,9 +300,9 @@ class CalendarView extends ItemView
|
||||
|
||||
let today = this.monthEl.createEl("div", { cls: "frcal__time" });
|
||||
today.append(getIcon('calendar-days'));
|
||||
today.addEventListener('click', function(e) {
|
||||
this.gotoThisWeek();
|
||||
}.bind(this));
|
||||
// today.addEventListener('click', function(e) {
|
||||
// this.gotoThisWeek();
|
||||
// }.bind(this));
|
||||
this.mountFirstEl = this.monthEl.createEl("div", { cls: "frcal__month_first", attr: { style: "flex: 70" } });
|
||||
this.mountFirstSpanEl = this.mountFirstEl.createEl("span");
|
||||
this.mountSecondEl = this.monthEl.createEl("div", { cls: "frcal__month_second", attr: { style: "flex: 0" } });
|
||||
@@ -361,11 +361,11 @@ class CalendarView extends ItemView
|
||||
|
||||
if (startMonth == null)
|
||||
{
|
||||
startMounth = moment().substract(1, "years");
|
||||
startMonth = moment().subtract(1, "years");
|
||||
}
|
||||
if (endMonth == null)
|
||||
{
|
||||
endMounth = moment().add(1, "years");
|
||||
endMonth = moment().add(1, "years");
|
||||
}
|
||||
|
||||
if (startMonth.day() != 1)
|
||||
@@ -394,7 +394,7 @@ class CalendarView extends ItemView
|
||||
|
||||
let lastMonth = startMonth.year() * 12 + startMonth.month() - 1;
|
||||
|
||||
let table = this.monthView.createEl('table');
|
||||
let table = this.mountView.createEl('table');
|
||||
for (let week = moment(startMonth); week < endMonth; week.add(1, "weeks"))
|
||||
{
|
||||
let row = table.createEl("tr");
|
||||
@@ -403,17 +403,17 @@ class CalendarView extends ItemView
|
||||
{
|
||||
lastMonth += 1;
|
||||
let span = moment(week).add(1, "months").subtract(1, "day").isoWeek() - week.isoWeek();
|
||||
row.createEl("td", { attr: { rowspan: span } }).innerText = DateFormat.month[week.month()];
|
||||
row.createEl("td", { attr: { rowspan: span } }).innerText = DateFormat.months[week.month()];
|
||||
}
|
||||
|
||||
row.createEl('td', { class: 'frcal__weekinmonth' }).innerText = week.isoWeek();
|
||||
row.createEl('td', { cls: 'frcal__weekinmonth' }).innerText = week.isoWeek();
|
||||
|
||||
for (let day=week.dom(); day < week.dom()+7; day++)
|
||||
for (let day=week.date(); day < week.date()+7; day++)
|
||||
{
|
||||
row.createEl('td', { class: 'frcal__dayinmonth', content: day.ToString()});
|
||||
row.createEl('td', { cls: 'frcal__dayinmonth'}).innerText = day.toString();
|
||||
}
|
||||
}
|
||||
this.monthView.style.display = "block";
|
||||
this.mountView.style.display = "block";
|
||||
}
|
||||
|
||||
async onClose()
|
||||
|
||||
Reference in New Issue
Block a user