зеркало из https://github.com/mozilla/pjs.git
Bug 327662 'Currently selected day' in unifinder doesn't update on selection. r=mvl
This commit is contained in:
Родитель
2ce0719adb
Коммит
584dad6358
|
@ -139,6 +139,7 @@
|
|||
viewElement.tasksInView = this.mTasksInView;
|
||||
|
||||
viewElement.setDateRange(aDate, aDate);
|
||||
viewElement.selectedDay = aDate;
|
||||
|
||||
this.setNavLabels(aDate)
|
||||
]]></body>
|
||||
|
|
|
@ -629,6 +629,7 @@
|
|||
box.box.selected = true;
|
||||
this.mSelectedDayBox = box;
|
||||
}
|
||||
this.fireEvent("dayselect");
|
||||
return val;
|
||||
]]></setter>
|
||||
</property>
|
||||
|
@ -643,6 +644,14 @@
|
|||
]]></setter>
|
||||
</property>
|
||||
|
||||
<method name="fireEvent">
|
||||
<parameter name="aEventName"/>
|
||||
<body><![CDATA[
|
||||
var event = document.createEvent('Events');
|
||||
event.initEvent(aEventName, true, false);
|
||||
this.dispatchEvent(event);
|
||||
]]></body>
|
||||
</method>
|
||||
|
||||
<method name="showDate">
|
||||
<parameter name="aDate"/>
|
||||
|
|
|
@ -1797,6 +1797,14 @@
|
|||
]]></setter>
|
||||
</property>
|
||||
|
||||
<method name="fireEvent">
|
||||
<parameter name="aEventName"/>
|
||||
<body><![CDATA[
|
||||
var event = document.createEvent('Events');
|
||||
event.initEvent(aEventName, true, false);
|
||||
this.dispatchEvent(event);
|
||||
]]></body>
|
||||
</method>
|
||||
|
||||
<method name="showDate">
|
||||
<parameter name="aDate"/>
|
||||
|
@ -1913,8 +1921,10 @@
|
|||
<setter><![CDATA[
|
||||
// ignore if just 1 visible, it's always selected,
|
||||
// but we don't indicate it
|
||||
if (this.numVisibleDates == 1)
|
||||
if (this.numVisibleDates == 1) {
|
||||
this.fireEvent("dayselect");
|
||||
return val;
|
||||
}
|
||||
|
||||
if (this.mSelectedDayCol) {
|
||||
this.mSelectedDayCol.column.selected = false;
|
||||
|
@ -1931,7 +1941,7 @@
|
|||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
this.fireEvent("dayselect");
|
||||
return val;
|
||||
]]></setter>
|
||||
</property>
|
||||
|
|
|
@ -210,6 +210,10 @@ function prepareCalendarUnifinder( )
|
|||
|
||||
kDefaultTimezone = calendarDefaultTimezone();
|
||||
|
||||
// Listen for changes in the selected day, so we can update if need be
|
||||
var viewDeck = document.getElementById("view-deck")
|
||||
viewDeck.addEventListener("dayselect", unifinderOnDaySelect, false);
|
||||
|
||||
refreshEventTree(); //Display something upon first load. onLoad doesn't work properly for observers
|
||||
}
|
||||
|
||||
|
@ -223,6 +227,13 @@ function finishCalendarUnifinder( )
|
|||
ccalendar.removeObserver(unifinderObserver);
|
||||
}
|
||||
|
||||
function unifinderOnDaySelect() {
|
||||
var filterList = document.getElementById("event-filter-menulist");
|
||||
if (filterList.selectedItem.value == "current") {
|
||||
refreshEventTree();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function to display event datetimes in the unifinder
|
||||
*/
|
||||
|
|
Загрузка…
Ссылка в новой задаче