diff --git a/mozilla/calendar/base/content/calendar-multiday-view.css b/mozilla/calendar/base/content/calendar-multiday-view.css index 386f6c0f4d5..e1e22726bf3 100644 --- a/mozilla/calendar/base/content/calendar-multiday-view.css +++ b/mozilla/calendar/base/content/calendar-multiday-view.css @@ -165,6 +165,10 @@ calendar-multiday-view { -moz-user-focus: normal; } +calendar-multiday-view[hidden="true"] { + display: none; +} + .calendar-day-label-box { background: #dddddd; } diff --git a/mozilla/calendar/base/content/calendar-multiday-view.xml b/mozilla/calendar/base/content/calendar-multiday-view.xml index 6e4debae3b1..e2a127098d0 100644 --- a/mozilla/calendar/base/content/calendar-multiday-view.xml +++ b/mozilla/calendar/base/content/calendar-multiday-view.xml @@ -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(); ]]> @@ -1313,6 +1315,9 @@ @@ -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(); ]]> - false 0 @@ -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; ]]> @@ -1829,6 +1841,15 @@ this.setPixelsPerMin(val); return val; + + + + + @@ -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); } diff --git a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js index b089e4ab713..a8ab3a98dbd 100644 --- a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js +++ b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.js @@ -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; diff --git a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul index c73ef4a679c..c291beb65c8 100644 --- a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul +++ b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul @@ -33,8 +33,9 @@ - - + + +