Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug 439245 - Selecting events in the unifinder doesn't scroll view to event. r=berend

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@252374 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla%kewis.ch
2008-06-16 16:16:42 +00:00
parent 806afa254e
commit dedc865286
5 changed files with 79 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/calendar/base/content/calendar-decorated-base.xml
View File

@@ -206,6 +206,12 @@
]]></body>
</method>
<method name="centerSelectedItems">
<body><![CDATA[
this.viewElem.centerSelectedItems();
]]></body>
</method>
<property name="selectedDay">
<getter><![CDATA[
return this.viewElem.selectedDay;

4
mozilla/calendar/base/content/calendar-month-view.xml
View File

@@ -1012,6 +1012,10 @@
]]></body>
</method>
<method name="centerSelectedItems">
<body/>
</method>
<property name="selectedDay">
<getter><![CDATA[
if (this.mSelectedDayBox)

63
mozilla/calendar/base/content/calendar-multiday-view.xml
View File

@@ -3004,6 +3004,42 @@
]]></body>
</method>
<method name="centerSelectedItems">
<body><![CDATA[
var lowMinute = 24 * 60;
var highMinute = 0;
for each (var item in this.mSelectedItems) {
var occs = [];
var startDate = item[calGetStartDateProp(item)];
var endDate = item[calGetEndDateProp(item)] || startDate;
if (item.recurrenceInfo) {
occs = item.getOccurrencesBetween(this.startDate, this.queryEndDate, {}, 0);
} else if (startDate.compare(this.startDate) >= 0 ||
endDate.compare(this.queryEndDate) <= 0) {
occs = [item];
}
if (occs.length) {
if (!startDate.isDate && !endDate.isDate) {
lowMinute = Math.min(startDate.hour * 60 + startDate.minute,
lowMinute);
highMinute = Math.max(endDate.hour * 60 + endDate.minute,
highMinute);
}
}
}
var displayDuration = highMinute - lowMinute;
if (this.mSelectedItems.length &&
displayDuration >= 0 &&
displayDuration <= this.mVisibleMinutes) {
var minute = lowMinute + (displayDuration - this.mVisibleMinutes) / 2
this.setFirstVisibleMinute(minute);
}
]]></body>
</method>
<property name="pixelsPerMinute">
<getter>return this.mPixPerMin</getter>
<setter>this.setPixelsPerMin(val); return val;</setter>
@@ -3380,6 +3416,32 @@
]]></body>
</method>
<method name="findColumnsForOccurrences">
<parameter name="aOccurrences"/>
<body><![CDATA[
if (!this.mDateColumns || !this.mDateColumns.length) {
return [];
}
var occMap = {};
for each (var occ in aOccurrences) {
var startDate = occ[calGetStartDateProp(occ)]
.getInTimezone(this.mStartDate.timezone);
var endDate = occ[calGetEndDateProp(occ)]
.getInTimezone(this.mEndDate.timezone) || startDate;
if (startDate.compare(this.mStartDate) >= 0 &&
endDate.compare(this.mEndDate) <= 0) {
for (var i = startDate.day; i <= endDate.day; i++) {
occMap[i] = true;
}
}
}
return this.mDateColumns.filter(function(col) {
return (col.date.day in occMap);
});
]]></body>
</method>
<method name="findColumnsForItem">
<parameter name="aItem"/>
<body><![CDATA[
@@ -3644,6 +3706,7 @@
<parameter name="aMinute"/>
<body><![CDATA[
this.mFirstVisibleMinute = aMinute;
this.scrollToMinute(aMinute);
return this.mFirstVisibleMinute;
]]></body>
</method>

1
mozilla/calendar/base/content/calendar-unifinder.js
View File

@@ -356,6 +356,7 @@ function unifinderSelect(event) {
// Set up the selected items in the view. Pass in true, so we don't end
// up in a circular loop
currentView().setSelectedItems(selectedItems.length, selectedItems, true);
currentView().centerSelectedItems();
calendarController.onSelectionChanged({detail: selectedItems});
}

5
mozilla/calendar/base/public/calICalendarView.idl
View File

@@ -142,6 +142,11 @@ interface calICalendarView : nsISupports
[array,size_is(aCount)] in calIItemBase aItems,
in boolean aSuppressEvent);
/**
* Make as many of the selected items as possible are visible in the view.
*/
void centerSelectedItems();
/**
* Get or set the selected day.
*/