Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 18:32:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 348245 - Fixes regression where datepicker no longer works after using date/year dropdown. patch by Michael B��ttner <michael.buettner@sun.com>, r=lilmatt,mvl

Browse Source
This commit is contained in:
mattwillis%gmail.com 2006-09-18 19:40:53 +00:00
parent afcdab601e
commit 3790f41f80
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
calendar/resources/content/datetimepickers/datetimepickers.xml
View File

@ -278,8 +278,8 @@
xbl:inherits="disabled">
<xul:menupopup popupanchor="bottomright" popupalign="topright"
anonid="datepopup"
onpopupshowing="onPopup()"
onpopuphiding="reshowPopup()">
onpopupshowing="this.parentNode.kDatePicker.onPopup();"
onpopuphiding="this.firstChild.hidePopupList();">
<xul:minimonth/>
</xul:menupopup>
</xul:menulist>
@ -304,12 +304,12 @@
this.value = new Date();
}
this.kMinimonth.addEventListener("select", this.clickDate, false);
this.kMinimonth.addEventListener("monthchange", this.reshowPopup, false);
this.kMinimonth.addEventListener("popuplisthidden", this.reshowPopup, false);
this.mIsReshowing = false;
]]>
</constructor>
<!-- We only let the popup close if this is true.-->
<field name="mReallyClose">false</field>
<method name="update">
<parameter name="aValue"/>
<parameter name="aRefresh"/>
@ -351,11 +351,7 @@
this.mInPopup = false;
// select all to remove cursor since can't type while popped-up
this.select();
// From this point on, until the user does something we
// care about, we shouldn't close.
this.mReallyClose = false;
}
this.mIsReshowing = false;
]]>
</body>
</method>
@ -366,18 +362,14 @@
<parameter name="aEvent"/>
<body>
<![CDATA[
if (this.mReallyClose) {
return;
}
this.mIsReshowing = true;
var popup = document.getAnonymousElementByAttribute(this, "anonid", "datepopup");
// This must be in a timeout in order to give the popup time to
// finish closing. Otherwise, our widget will think the popup is
// still open, and hence it will ignore this call, and then close
// a split-second later. See bug 348146
setTimeout(popup.showPopup, 0);
var datepicker = aEvent.target.parentNode.parentNode.kDatePicker;
datepicker.mIsReshowing = true;
try {
aEvent.target.parentNode.hidePopup();
aEvent.target.parentNode.showPopup();
} finally {
datepicker.mIsReshowing = false;
}
]]>
</body>
</method>
@ -412,7 +404,6 @@
datepicker.update(new Date(aEvent.target.value), true);
// select changed value so no cursor appears (can't type to it).
datepicker.select();
this.mReallyClose = true;
aEvent.target.parentNode.hidePopup();
}
]]>

22
calendar/resources/content/datetimepickers/minimonth.xml
View File

@ -360,6 +360,18 @@
</body>
</method>
<method name="hidePopupList">
<body>
<![CDATA[
// Close open popups (if any)
var popup = this.mPopup;
this.mPopup = null;
if (popup)
popup.hidePopup();
]]>
</body>
</method>
<method name="fireEvent">
<parameter name="aEventName"/>
<body>
@ -374,8 +386,10 @@
<method name="firePopupListHidden">
<body>
<![CDATA[
this.mPopup = null;
this.fireEvent("popuplisthidden");
if (this.mPopup) {
this.mPopup = null;
this.fireEvent("popuplisthidden");
}
]]>
</body>
</method>
@ -608,11 +622,11 @@
var grandparent = element.parentNode.parentNode;
switch(grandparent) {
case this.kMonthPopup:
grandparent.hidePopup();
this.hidePopupList();
this.switchMonth(element.getAttribute("index"));
break;
case this.kYearPopup:
grandparent.hidePopup();
this.hidePopupList();
this.switchYear(element.getAttribute("value"));
break;
}