mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

make datepicker and timepicker use menulist 

bug 259155, patch by gekacheka and me, r=mostafah
This commit is contained in:
mvl%exedo.nl 2004-09-17 19:52:56 +00:00
Родитель 8a7a839057
Коммит 9d972de4c5
2 изменённых файлов: 49 добавлений и 57 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

54
calendar/resources/content/datetimepickers/datepicker.xbl
Просмотреть файл

@ -64,13 +64,13 @@
*/
-->
<bindings id="xulDatePicker"
xmlns="http://www.mozilla.org/xbl"
xmlns:xbl="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
xmlns="http://www.mozilla.org/xbl"
xmlns:xbl="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!-- this doesn't work, maybe bug 58757 -->
<xul:script xul:type="application/x-javascript"
xul:src="chrome://calendar/content/dateUtils.js"/>
xul:src="chrome://calendar/content/dateUtils.js"/>
<binding id="datepicker" extends="xul:box" xbl:inherits="value,onchange">
<!-- ::::::::::::::::: CONTENT ::::::::::::::::::::::::: -->
@ -95,21 +95,18 @@
[this comment is outside the <content> so it won't become a
node that interferes with navigation to interior nodes.] -->
<content id="content">
<xul:hbox flex="1" id="hbox" class="datepicker-box-class">
<xul:textbox id="textbox" class="datepicker-text-class"
xbl:inherits="disabled"
onkeypress="if (event.keyCode == 13) this.kDatePicker.parseTextBoxDate(true);"
onblur="this.parentNode.parentNode.kDatePicker.parseTextBoxDate(true);"/>
<xul:menu class="datepicker-button-class"
xbl:inherits="disabled">
<xul:menupopup popupanchor="bottomright" popupalign="topright"
onpopupshowing="onPopup()">
<xul:hbox flex="1" id="hbox" class="datepicker-box-class">
<xul:menulist editable="true" sizetopopup="false" style="width:11em"
id="datepicker-text"
class="datepicker-text-class"
onkeypress="if (event.keyCode == 13) this.kDatePicker.parseTextBoxDate(true);"
xbl:inherits="disabled">
<xul:menupopup popupanchor="bottomright" popupalign="topright"
onpopupshowing="onPopup()">
<xul:minimonth onchange="this.kDatePicker.clickDate(this); "/>
</xul:menupopup>
</xul:menu>
</xul:hbox>
</xul:menulist>
</xul:hbox>
</content>
<!-- ::::::::::::::::: INTERFACE ::::::::::::::::::::::::: -->
@ -125,17 +122,10 @@
<constructor>
<![CDATA[
//var hbox = document.getAnonymousElementByAttribute(this,"id","hbox");
var hbox = document.getAnonymousNodes(this)[0];
this.kTextBox = hbox.childNodes[0];
this.kTextBox.kDatePicker = this; // enable call back to method in Moz1.7
// Fails:
// this.kTextBoxInput = document.getAnonymousNodes(this.kTextBox).childNodes[0].childNodes[0];
// this.kTextBoxInput.kDatePicker = this;
//document.getAnonymousElementByAttribute(this, "id", "button");
this.kButton = hbox.childNodes[1];
this.kPopup = kButton.childNodes[0];
this.kMinimonth = this.kPopup.childNodes[0];
this.kMinimonth = this.kTextBox.menupopup.childNodes[0];
this.kMinimonth.kDatePicker = this; // enable call back to method in Moz1.6
this.kFormatter = new DateFormater();
@ -151,7 +141,8 @@
}
this.kCallback = null;
val = this.getAttribute("onchange");
if (val) this.kCallback = function() { eval(val); };
if (val)
this.kCallback = function() { eval(val); };
]]>
</constructor>
@ -160,8 +151,8 @@
<parameter name="refresh"/>
<body><![CDATA[
if (aValue == null) { // invalid date, revert to previous date
// set textBox.value property, not attribute
this.kTextBox.value = this.formatDate(this.mValue);
// set textBox.value property, not attribute
this.kTextBox.value = this.formatDate(this.mValue);
} else {
this.mValue = aValue;
this.kTextBox.value = this.formatDate(this.mValue);
@ -195,8 +186,7 @@
<method name="onPopup">
<body><![CDATA[
var cal = this.kPopup.childNodes[0];
cal.update( this.mValue );
this.kMinimonth.update( this.mValue );
]]></body>
</method>
@ -221,6 +211,10 @@
<!-- ::::::::::::::::: HANDLERS ::::::::::::::::::::::::: -->
<handlers>
<handler event="bindingattached" action="this.initialize();"/>
<handler event="blur" phase="capturing"><![CDATA[
this.parseTextBoxDate(true);
]]></handler>
</handlers>
</binding>

52
calendar/resources/content/datetimepickers/timepicker.xbl
Просмотреть файл

@ -73,9 +73,9 @@
<!-- -->
<bindings id="xulTimePicker"
xmlns="http://www.mozilla.org/xbl"
xmlns:xbl="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
xmlns="http://www.mozilla.org/xbl"
xmlns:xbl="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!-- <script> doesn't work, maybe bug 58757 -->
<script type="application/x-javascript"
@ -107,17 +107,15 @@
node that interferes with navigation to interior nodes.] -->
<content id="content">
<xul:hbox flex="1" id="hbox" class="timepicker-box-class">
<xul:textbox xbl:inherits="disabled" class="timepicker-text-class"
id="textbox"
onkeypress="if (event.keyCode == 13) this.kTimePicker.parseTextBoxTime(true);"
onblur="this.parentNode.parentNode.kTimePicker.parseTextBoxTime(true);"/>
<xul:menu id="button" xbl:inherits="disabled"
class="timepicker-button-class">
<xul:menupopup popupanchor="bottomright" popupalign="topright"
onpopupshowing="onPopup(this)">
<xul:menulist editable="true" sizetopopup="false" style="width:7em"
id="timepicker-text"
class="timepicker-text-class"
xbl:inherits="disabled">
<xul:menupopup popupalign="topright" popupanchor="bottomright"
onpopupshowing="onPopup(this)">
<xul:timepicker-grids />
</xul:menupopup>
</xul:menu>
</xul:menupopup>
</xul:menulist>
</xul:hbox>
</content>
@ -134,26 +132,25 @@
<constructor><![CDATA[
var hbox = document.getAnonymousNodes(this)[0];
//document.getAnonymousElementByAttribute(this, "id", "textbox");
this.kTextBox = hbox.childNodes[0];
this.kTextBox.kTimePicker = this; // enable call back to method in Moz1.7
//document.getAnonymousElementByAttribute(this, "id", "button");
this.kButton = hbox.childNodes[1];
this.kFormatter = new DateFormater();
// whether currently disabled
this.mDisabled = this.getAttribute("disabled") ? true : false;
var val = this.getAttribute("value");
if (val) update(new Date(val), false);
else update(new Date(), false);
if (val)
this.update(new Date(val), false);
else
this.update(new Date(), false);
// Make the function a member of the picker
// so that 'this' will be the picker
this.kCallback = null;
val = this.getAttribute("onchange");
if (val) this.kCallback = function() { eval( val ) };
if (val)
this.kCallback = function() { eval( val ) };
]]></constructor>
<method name="update">
@ -195,10 +192,8 @@
this.mDisabled = aDisabled;
if (this.mDisabled) {
this.kTextBox.setAttribute( "disabled", "true" );
this.kButton.setAttribute( "disabled", "true" );
} else {
this.kTextBox.removeAttribute( "disabled" );
this.kButton.removeAttribute( "disabled" );
}
]]></body>
</method>
@ -217,6 +212,9 @@
<handlers>
<handler event="bindingattached" action="this.initialize();"/>
<handler event="blur" phase="capturing"><![CDATA[
this.parseTextBoxTime(true);
]]></handler>
</handlers>
</binding>
@ -488,7 +486,7 @@
<!-- One Minute Grid -->
<vbox id="oe-time-picker-one-minute-grid-box" flex="1" collapsed="true">
<vbox id="oe-time-picker-one-minute-grid-box" flex="1" hidden="true">
<grid id="oe-time-picker-one-minute-grid" flex="1">
<columns>
@ -995,11 +993,11 @@
var oneMinuteBox = this.getDescendantElementById(oneMinuteBoxId);
if (view == this.kMINUTE_VIEW_ONE) {
fiveMinuteBox.setAttribute( "collapsed", true );
oneMinuteBox.setAttribute( "collapsed", false );
fiveMinuteBox.setAttribute( "hidden", true );
oneMinuteBox.setAttribute( "hidden", false );
} else {
fiveMinuteBox.setAttribute( "collapsed", false );
oneMinuteBox.setAttribute( "collapsed", true );
fiveMinuteBox.setAttribute( "hidden", false );
oneMinuteBox.setAttribute( "hidden", true );
}
]]></body>
</method>