Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move to just one minimonth; also make multiday view a little bit less horrible

Browse Source
This commit is contained in:
vladimir%pobox.com 2005-06-30 22:37:00 +00:00
parent e30bb95289
commit e32dd66908
4 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/base/content/calendar-multiday-view.css
View File

@ -165,6 +165,10 @@ calendar-multiday-view {
-moz-user-focus: normal;
}
calendar-multiday-view[hidden="true"] {
display: none;
}
.calendar-day-label-box {
background: #dddddd;
}

43
calendar/base/content/calendar-multiday-view.xml
View File

@ -1305,6 +1305,8 @@
this.eventNameElement.removeAttribute("readonly");
this.mOriginalTextLabel = this.eventNameElement.value;
this.mEditing = true;
if (this.calendarView)
this.calendarView.activeInPlaceEdit = true;
this.eventNameElement.focus();
this.eventNameElement.select();
]]></body>
@ -1313,6 +1315,9 @@
<method name="stopEditing">
<body><![CDATA[
this.mEditing = false;
if (this.calendarView)
this.calendarView.activeInPlaceEdit = false;
if (this.eventNameElement.value != this.mOriginalTextLabel) {
var clone = this.mOccurrence.clone();
clone.title = this.eventNameElement.value;
@ -1348,10 +1353,13 @@
}
} else {
// start single click timeout
this.calendarView.selectedItem = this.mOccurrence;
var self = this;
if (this.editingTimer) clearTimeout(this.editingTimer);
this.editingTimer = setTimeout(function () { self.startEditing(); }, 350);
if (this.selected) {
var self = this;
if (this.editingTimer) clearTimeout(this.editingTimer);
this.editingTimer = setTimeout(function () { self.startEditing(); }, 350);
} else {
this.calendarView.selectedItem = this.mOccurrence;
}
this.mLastClickTime = evTime;
}
]]></handler>
@ -1384,6 +1392,9 @@
this.calendarView.selectedItem = this.mOccurrence;
this.mEditing = false;
if (this.calendarView)
this.calendarView.activeInPlaceEdit = false;
this.parentColumn.startSweepingToModifyEvent(this, this.mOccurrence, "middle", this.mMouseX, this.mMouseY);
this.mInMouseDown = false;
}
@ -1432,7 +1443,6 @@
this.reorient();
]]></constructor>
<field name="mTimeoutScheduled">false</field>
<field name="mLastSize">0</field>
<method name="onResize">
<parameter name="aRealSelf"/>
@ -1440,7 +1450,6 @@
var self = this;
if (aRealSelf) {
self = aRealSelf;
self.mTimeoutScheduled = false;
}
var timebar = document.getAnonymousElementByAttribute(self, "anonid", "timebar");
@ -1456,16 +1465,19 @@
if (self.mLastSize > size) {
self.pixelsPerMinute = 0.01;
self.mLastSize = size;
if (!self.mTimeoutScheduled)
setTimeout(self.onResize, 0, self);
return;
if (self.orient == "horizontal")
size = daybox.boxObject.width;
else
size = daybox.boxObject.height;
}
self.mLastSize = size;
//self.removeAttribute("hidden");
var minutes = self.mEndMin - self.mStartMin;
var ppm = size / minutes;
self.pixelsPerMinute = ppm;
self.pixelsPerMinute = Math.round(ppm * 10) / 10;
]]></body>
</method>
@ -1829,6 +1841,15 @@
<setter>this.setPixelsPerMin(val); return val;</setter>
</property>
<property name="activeInPlaceEdit">
<getter><![CDATA[
return this.mInPlaceEditActive;
]]></getter>
<setter><![CDATA[
this.mInPlaceEditActive = val;
]]></setter>
</property>
<!-- private -->
<property name="numVisibleDates" readonly="true">
@ -2202,7 +2223,7 @@
if (event.keyCode == kKE.DOM_VK_BACK_SPACE ||
event.keyCode == kKE.DOM_VK_DELETE)
{
if (this.selectedItem && this.controller) {
if (!this.activeInPlaceEdit && this.selectedItem && this.controller) {
var occurrence = (event.ctrlKey) ? this.selectedItem.parentItem : this.selectedItem;
this.controller.deleteOccurrence(occurrence);
}

11
calendar/lightning/content/messenger-overlay-sidebar.js
View File

@ -43,17 +43,11 @@ function nextMonth(dt)
}
var gMiniMonthLoading = false;
function ltnMinimonthPick(which, minimonth)
function ltnMinimonthPick(minimonth)
{
if (gMiniMonthLoading)
return;
if (which == "left") {
// update right
var d2 = nextMonth(minimonth.value);
document.getElementById("ltnMinimonthRight").showMonth(d2);
}
var cdt = new CalDateTime();
cdt.jsDate = minimonth.value;
cdt = cdt.getInTimezone(calendarDefaultTimezone());
@ -69,8 +63,7 @@ function ltnOnLoad(event)
var today = new Date();
var nextmo = nextMonth(today);
document.getElementById("ltnMinimonthLeft").value = today;
document.getElementById("ltnMinimonthRight").showMonth(nextmo);
document.getElementById("ltnMinimonth").value = today;
gMiniMonthLoading = false;

5
calendar/lightning/content/messenger-overlay-sidebar.xul
View File

@ -33,8 +33,9 @@
<vbox flex="1">
<hbox>
<minimonth id="ltnMinimonthLeft" onchange="ltnMinimonthPick('left', this);" flex="1"/>
<minimonth id="ltnMinimonthRight" onchange="ltnMinimonthPick('right', this);" flex="1"/>
<spacer flex="1"/>
<minimonth id="ltnMinimonth" onchange="ltnMinimonthPick(this);" flex="2"/>
<spacer flex="1"/>
</hbox>
<tabbox flex="1">