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

Bug 1428849 - Remove datetimepicker.xml bindings. r=mconley 

MozReview-Commit-ID: LhfabvhJP5d

--HG--
extra : rebase_source : 8a2c329fab9b90746af9a09877be049479459b75
This commit is contained in:
Tim Nguyen 2018-01-09 19:39:30 +00:00
Родитель 100cde3ae6
Коммит c9103613c5
18 изменённых файлов: 6 добавлений и 2223 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
testing/marionette/doc/api/interaction.js.html
Просмотреть файл

@ -58,7 +58,6 @@ const DISABLED_ATTRIBUTE_SUPPORTED_XUL = new Set([
"CHECKBOX",
"COLORPICKER",
"COMMAND",
"DATEPICKER",
"DESCRIPTION",
"KEY",
"KEYSET",
@ -81,7 +80,6 @@ const DISABLED_ATTRIBUTE_SUPPORTED_XUL = new Set([
"TAB",
"TABS",
"TEXTBOX",
"TIMEPICKER",
"TOOLBARBUTTON",
"TREE",
]);

2
testing/marionette/interaction.js
Просмотреть файл

@ -32,7 +32,6 @@ const DISABLED_ATTRIBUTE_SUPPORTED_XUL = new Set([
"CHECKBOX",
"COLORPICKER",
"COMMAND",
"DATEPICKER",
"DESCRIPTION",
"KEY",
"KEYSET",
@ -55,7 +54,6 @@ const DISABLED_ATTRIBUTE_SUPPORTED_XUL = new Set([
"TAB",
"TABS",
"TEXTBOX",
"TIMEPICKER",
"TOOLBARBUTTON",
"TREE",
]);

1
toolkit/content/jar.mn
Просмотреть файл

@ -71,7 +71,6 @@ toolkit.jar:
content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
content/global/bindings/datekeeper.js (widgets/datekeeper.js)
content/global/bindings/datepicker.js (widgets/datepicker.js)
content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml)
content/global/bindings/datetimepopup.xml (widgets/datetimepopup.xml)
content/global/bindings/datetimebox.xml (widgets/datetimebox.xml)
content/global/bindings/datetimebox.css (widgets/datetimebox.css)

2
toolkit/content/tests/chrome/chrome.ini
Просмотреть файл

@ -103,7 +103,6 @@ skip-if = toolkit == "cocoa"
[test_closemenu_attribute.xul]
[test_colorpicker_popup.xul]
[test_contextmenu_list.xul]
[test_datepicker.xul]
[test_deck.xul]
[test_dialogfocus.xul]
[test_findbar.xul]
@ -177,7 +176,6 @@ support-files = window_preferences_onsyncfrompreference.xul
[test_textbox_emptytext.xul]
[test_textbox_number.xul]
[test_textbox_search.xul]
[test_timepicker.xul]
[test_titlebar.xul]
skip-if = os == "linux"
[test_toolbar.xul]

415
toolkit/content/tests/chrome/test_datepicker.xul
Просмотреть файл

@ -1,415 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
<!--
XUL Widget Test for datepicker
-->
<window title="datepicker" width="500" height="600"
onload="setTimeout(testtag_datepickers, 0);"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
<hbox onpopupshown="testtag_datepicker_UI_popup()"
onpopuphidden="testtag_finish()">
<datepicker id="datepicker"/>
<datepicker id="datepicker-popup" type="popup"/>
<hbox onDOMMouseScroll="mouseScrolled = event.defaultPrevented;">
<datepicker id="datepicker-grid" type="grid" value="2007-04-21"/>
</hbox>
</hbox>
<!-- Test-only key bindings, but must not conflict with the application. -->
<keyset id="mainKeyset">
<key id="key_alt_z" key="Z" oncommand="return" modifiers="alt"/>
<key id="key_ctrl_q" key="Q" oncommand="return" modifiers="control"/>
<key id="key_meta_e" key="E" oncommand="return" modifiers="meta"/>
</keyset>
<body xmlns="http://www.w3.org/1999/xhtml">
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
</pre>
</body>
<script>
<![CDATA[
var mouseScrolled = false;
SimpleTest.waitForExplicitFinish();
function testtag_datepickers()
{
var dppopup = document.getElementById("datepicker-popup");
testtag_datepicker(document.getElementById("datepicker"), "", "datepicker");
testtag_datepicker(dppopup, "popup", "datepicker popup");
var gridpicker = document.getElementById("datepicker-grid");
is(gridpicker.monthField.selectedIndex, "3", "datepicker grid correct month is initially selected");
testtag_datepicker(gridpicker, "grid", "datepicker grid");
dppopup.open = true;
}
function testtag_finish()
{
ok(!document.getElementById("datepicker-popup").open, "datepicker popup open false again");
var dpgrid = document.getElementById("datepicker-grid");
synthesizeWheel(dpgrid, 5, 5, { deltaY: 10.0,
deltaMode: WheelEvent.DOM_DELTA_LINE });
is(mouseScrolled, true, "mouse scrolled");
is(dpgrid.displayedMonth, 2, "mouse scroll changed month");
SimpleTest.finish();
}
function testtag_datepicker(dp, type, testid)
{
testid += " ";
var today = new Date();
var tyear = today.getFullYear();
var tmonth = today.getMonth();
var tdate = today.getDate();
// testtag_comparedate(dp, testid + "initial", tyear, tmonth, tdate);
// check that setting the value property works
dp.value = testtag_getdatestring(tyear, tmonth, tdate);
testtag_comparedate(dp, testid + "set value", tyear, tmonth, tdate);
// check that setting the dateValue property works
dp.dateValue = today;
testtag_comparedate(dp, testid + "set dateValue", tyear, tmonth, tdate);
ok(dp.value !== today, testid + " set dateValue different date");
ok(!dp.readOnly, testid + "readOnly");
dp.readOnly = true;
ok(dp.readOnly, testid + "set readOnly");
dp.readOnly = false;
ok(!dp.readOnly, testid + "clear readOnly");
var setDateField = function(field, value, expectException,
expectedYear, expectedMonth, expectedDate)
{
var exh = false;
try {
dp[field] = value;
} catch (ex) { exh = true; }
is(exh, expectException, testid + "set " + field + " " + value);
testtag_comparedate(dp, testid + "set " + field + " " + value,
expectedYear, expectedMonth, expectedDate);
}
// check the value property
setDateField("value", "2003-1-27", false, 2003, 0, 27);
setDateField("value", "2002-11-8", false, 2002, 10, 8);
setDateField("value", "2001-07-02", false, 2001, 6, 2);
setDateField("value", "2002-10-25", false, 2002, 9, 25);
// check that the year, month and date fields can be set properly
setDateField("year", 2002, false, 2002, 9, 25);
setDateField("year", 0, true, 2002, 9, 25);
setDateField("month", 6, false, 2002, 6, 25);
setDateField("month", 9, false, 2002, 9, 25);
setDateField("month", 10, false, 2002, 10, 25);
setDateField("month", -1, true, 2002, 10, 25);
setDateField("month", 12, true, 2002, 10, 25);
setDateField("date", 9, false, 2002, 10, 9);
setDateField("date", 10, false, 2002, 10, 10);
setDateField("date", 15, false, 2002, 10, 15);
setDateField("date", 0, true, 2002, 10, 15);
setDateField("date", 32, true, 2002, 10, 15);
// check leap year handling
setDateField("value", "1600-2-29", false, 1600, 1, 29);
setDateField("value", "2000-2-29", false, 2000, 1, 29);
setDateField("value", "2003-2-29", false, 2003, 2, 1);
setDateField("value", "2004-2-29", false, 2004, 1, 29);
setDateField("value", "2100-2-29", false, 2100, 2, 1);
// check invalid values for the value and dateValue properties
dp.value = "2002-07-15";
setDateField("value", "", true, 2002, 6, 15);
setDateField("value", "2-2", true, 2002, 6, 15);
setDateField("value", "2000-5-6-6", true, 2002, 6, 15);
setDateField("value", "2000-a-19", true, 2002, 6, 15);
setDateField("dateValue", "none", true, 2002, 6, 15);
// grid and popup types can display a different month than the current one
var isGridOrPopup = (type == "grid" || type == "popup");
dp.displayedMonth = 3;
testtag_comparedate(dp, testid + "set displayedMonth",
2002, isGridOrPopup ? 6 : 3, 15, 3);
dp.displayedYear = 2009;
testtag_comparedate(dp, testid + "set displayedYear",
isGridOrPopup ? 2002 : 2009, isGridOrPopup ? 6 : 3, 15, 3, 2009);
if (isGridOrPopup) {
dp.value = "2008-02-29";
dp.displayedYear = 2009;
is(dp.displayedMonth, 1, "set displayedYear during leap year");
}
is(dp.open, false, testid + "open false");
if (type != "popup") {
dp.open = true;
ok(!dp.open, testid + "open still false");
}
// check the fields
if (type != "grid") {
ok(dp.yearField instanceof HTMLInputElement, testid + "yearField");
ok(dp.monthField instanceof HTMLInputElement, testid + "monthField");
ok(dp.dateField instanceof HTMLInputElement, testid + "dateField");
testtag_datepicker_UI_fields(dp, testid);
dp.readOnly = true;
// check that keyboard usage doesn't change the value when the datepicker
// is read only
testtag_datepicker_UI_key(dp, testid + "readonly ", "2003-01-29",
dp.yearField, 2003, 0, 29, 2003, 0, 29);
testtag_datepicker_UI_key(dp, testid + "readonly ", "2003-04-29",
dp.monthField, 2003, 3, 29, 2003, 3, 29);
testtag_datepicker_UI_key(dp, testid + "readonly ", "2003-06-15",
dp.dateField, 2003, 5, 15, 2003, 5, 15);
dp.readOnly = false;
}
else {
testtag_datepicker_UI_grid(dp, "grid", testid);
}
}
function testtag_datepicker_UI_fields(dp, testid)
{
testid += "UI";
dp.focus();
// test adjusting the date with the up and down keys
testtag_datepicker_UI_key(dp, testid, "2003-01-29", dp.yearField, 2004, 0, 29, 2003, 0, 29);
testtag_datepicker_UI_key(dp, testid, "1600-02-29", dp.yearField, 1601, 1, 28, 1600, 1, 28);
testtag_datepicker_UI_key(dp, testid, "2000-02-29", dp.yearField, 2001, 1, 28, 2000, 1, 28);
testtag_datepicker_UI_key(dp, testid, "2004-02-29", dp.yearField, 2005, 1, 28, 2004, 1, 28);
testtag_datepicker_UI_key(dp, testid, "2003-04-29", dp.monthField, 2003, 4, 29, 2003, 3, 29);
testtag_datepicker_UI_key(dp, testid, "2003-01-15", dp.monthField, 2003, 1, 15, 2003, 0, 15);
testtag_datepicker_UI_key(dp, testid, "2003-12-29", dp.monthField, 2003, 0, 29, 2003, 11, 29);
testtag_datepicker_UI_key(dp, testid, "2003-03-31", dp.monthField, 2003, 3, 30, 2003, 2, 30);
testtag_datepicker_UI_key(dp, testid, "2003-06-15", dp.dateField, 2003, 5, 16, 2003, 5, 15);
testtag_datepicker_UI_key(dp, testid, "2003-06-01", dp.dateField, 2003, 5, 2, 2003, 5, 1);
testtag_datepicker_UI_key(dp, testid, "2003-06-30", dp.dateField, 2003, 5, 1, 2003, 5, 30);
testtag_datepicker_UI_key(dp, testid, "1600-02-28", dp.dateField, 1600, 1, 29, 1600, 1, 28);
testtag_datepicker_UI_key(dp, testid, "2000-02-28", dp.dateField, 2000, 1, 29, 2000, 1, 28);
testtag_datepicker_UI_key(dp, testid, "2003-02-28", dp.dateField, 2003, 1, 1, 2003, 1, 28);
testtag_datepicker_UI_key(dp, testid, "2004-02-28", dp.dateField, 2004, 1, 29, 2004, 1, 28);
testtag_datepicker_UI_key(dp, testid, "2100-02-28", dp.dateField, 2100, 1, 1, 2100, 1, 28);
synthesizeKeyExpectEvent('Z', { altKey: true }, $("key_alt_z"), "command", testid + " alt shortcut");
synthesizeKeyExpectEvent('Q', { ctrlKey: true }, $("key_ctrl_q"), "command", testid + " ctrl shortcut");
synthesizeKeyExpectEvent('E', { metaKey: true }, $("key_meta_e"), "command", testid + " meta shortcut");
}
function testtag_datepicker_UI_grid(dp, type, testid)
{
testid += "UI ";
// check that pressing the cursor keys moves the date properly. For grid
// types, focus the grid first. For popup types, the grid should be focused
// automatically when opening the popup.
var ktarget = dp;
if (type == "grid")
dp.focus();
else
ktarget = dp.attachedControl;
dp.value = "2003-02-22";
synthesizeKeyExpectEvent("VK_LEFT", { }, ktarget, "change", testid + "key left");
is(dp.value, "2003-02-21", testid + "key left");
synthesizeKeyExpectEvent("VK_RIGHT", { }, ktarget, "change", testid + "key right");
is(dp.value, "2003-02-22", testid + "key right");
synthesizeKeyExpectEvent("VK_RIGHT", { }, ktarget, "change", testid + "key right next week");
is(dp.value, "2003-02-23", testid + "key right next week");
synthesizeKeyExpectEvent("VK_LEFT", { }, ktarget, "change", testid + "key left previous week");
is(dp.value, "2003-02-22", testid + "key left previous week");
synthesizeKeyExpectEvent("VK_UP", { }, ktarget, "change", testid + "key up");
is(dp.value, "2003-02-15", testid + "key up");
synthesizeKeyExpectEvent("VK_DOWN", { }, ktarget, "change", testid + "key down");
is(dp.value, "2003-02-22", testid + "key down");
synthesizeKeyExpectEvent("VK_DOWN", { }, ktarget, "change");
is(dp.value, "2003-03-01", testid + "key down next month", testid + "key down next month");
synthesizeKeyExpectEvent("VK_UP", { }, ktarget, "change");
is(dp.value, "2003-02-22", testid + "key up previous month", testid + "key up previous month");
// the displayed month may be changed with the page up and page down keys,
// however this only changes the displayed month, not the current value.
synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange", testid + "key page down");
is(dp.value, "2003-02-22", testid + "key page down");
// the monthchange event is fired when the displayed month is changed
synthesizeKeyExpectEvent("VK_UP", { }, ktarget, "monthchange", testid + "key up after month change");
is(dp.value, "2003-02-15", testid + "key up after month change");
synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up");
is(dp.value, "2003-02-15", testid + "key page up");
// check handling at the start and end of the month
dp.value = "2010-10-01";
synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up 2010-10-01");
is(dp.displayedMonth, 8, testid + "key page up 2010-10-01 displayedMonth");
is(dp.displayedYear, 2010, testid + "key page up 2010-10-01 displayedYear");
dp.value = "2010-10-01";
synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange", testid + "key page down 2010-10-01");
is(dp.displayedMonth, 10, testid + "key page down 2010-10-01 displayedMonth");
is(dp.displayedYear, 2010, testid + "key page down 2010-10-01 displayedYear");
dp.value = "2010-10-31";
synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up 2010-10-31");
is(dp.displayedMonth, 8, testid + "key page up 2010-10-31 displayedMonth");
is(dp.displayedYear, 2010, testid + "key page up 2010-10-01 displayedYear");
dp.value = "2010-10-31";
synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange", testid + "key page down 2010-10-31");
is(dp.displayedMonth, 10, testid + "key page down 2010-10-31 displayedMonth");
is(dp.displayedYear, 2010, testid + "key page up 2010-10-31 displayedYear");
// check handling at the end of february
dp.value = "2010-03-31";
synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up 2010-03-31");
is(dp.displayedMonth, 1, testid + "key page up 2010-03-31 displayedMonth");
is(dp.displayedYear, 2010, testid + "key page up 2010-03-31 displayedYear");
synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up 2010-02-28");
is(dp.displayedMonth, 0, testid + "key page up 2010-02-28 displayedMonth");
is(dp.displayedYear, 2010, testid + "key page up 2010-02-28 displayedYear");
dp.value = "2010-01-31";
synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange", testid + "key page down 2010-01-31");
is(dp.displayedMonth, 1, testid + "key page down 2010-01-31 displayedMonth");
is(dp.displayedYear, 2010, testid + "key page up 2010-01-31 displayedYear");
synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange", testid + "key page down 2010-02-28");
is(dp.displayedMonth, 2, testid + "key page down 2010-02-28 displayedMonth");
is(dp.displayedYear, 2010, testid + "key page up 2010-02-28 displayedYear");
// check handling at the end of february during a leap year
dp.value = "2008-01-31";
synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange", testid + "key page down 2008-01-31");
is(dp.displayedMonth, 1, testid + "key page down 2008-01-31 displayedMonth");
is(dp.displayedYear, 2008, testid + "key page up 2008-01-31 displayedYear");
dp.value = "2008-03-31";
synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange", testid + "key page up 2008-03-31");
is(dp.displayedMonth, 1, testid + "key page up 2008-03-31 displayedMonth");
is(dp.displayedYear, 2008, testid + "key page up 2008-03-31 displayedYear");
// the value of a read only datepicker cannot be changed
dp.value = "2003-02-15";
dp.readOnly = true;
synthesizeKeyExpectEvent("VK_LEFT", { }, ktarget, "!change", testid + "key left read only");
is(dp.value, "2003-02-15", testid + "key left read only");
synthesizeKeyExpectEvent("VK_RIGHT", { }, ktarget, "!change", testid + "key right read only");
is(dp.value, "2003-02-15", testid + "key right read only");
synthesizeKeyExpectEvent("VK_DOWN", { }, ktarget, "!change", testid + "key down read only");
is(dp.value, "2003-02-15", testid + "key down read only");
synthesizeKeyExpectEvent("VK_UP", { }, ktarget, "!change", testid + "key up read only");
is(dp.value, "2003-02-15", testid + "key up read only");
// month can still be changed even when readonly
synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "monthchange",
testid + "key page up read only");
synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "monthchange",
testid + "key page down read only");
dp.readOnly = false;
synthesizeKeyExpectEvent("VK_LEFT", { }, ktarget, "change", testid + "key left changeable again");
is(dp.value, "2003-02-14", testid + "key left changeable again");
// the value of a disabled datepicker cannot be changed
dp.disabled = true;
synthesizeKeyExpectEvent("VK_LEFT", { }, ktarget, "!change", testid + "key left disabled");
is(dp.value, "2003-02-14", testid + "key left disabled");
synthesizeKeyExpectEvent("VK_RIGHT", { }, ktarget, "!change", testid + "key right disabled");
is(dp.value, "2003-02-14", testid + "key right disabled");
synthesizeKeyExpectEvent("VK_DOWN", { }, ktarget, "!change", testid + "key down disabled");
is(dp.value, "2003-02-14", testid + "key down disabled");
synthesizeKeyExpectEvent("VK_UP", { }, ktarget, "!change", testid + "key up disabled");
is(dp.value, "2003-02-14", testid + "key up disabled");
// month cannot be changed even when disabled
synthesizeKeyExpectEvent("VK_PAGE_DOWN", { }, ktarget, "!monthchange",
testid + "key page down disabled");
synthesizeKeyExpectEvent("VK_PAGE_UP", { }, ktarget, "!monthchange",
testid + "key page up disabled");
dp.disabled = false;
synthesizeKeyExpectEvent("VK_RIGHT", { }, ktarget, "change", testid + "key right enabled again");
is(dp.value, "2003-02-15", testid + "key right enabled again");
}
function testtag_datepicker_UI_popup()
{
var dppopup = document.getElementById("datepicker-popup");
is(dppopup.open, true, "datepicker popup after open");
testtag_datepicker_UI_grid(dppopup, "popup", "datepicker popup ");
dppopup.open = false;
}
function testtag_datepicker_UI_key(dp, testid, value, field,
uyear, umonth, udate,
dyear, dmonth, ddate)
{
dp.value = value;
field.focus();
synthesizeKey("VK_UP", { });
testtag_comparedate(dp, testid + " " + value + " key up", uyear, umonth, udate);
synthesizeKey("VK_DOWN", { });
testtag_comparedate(dp, testid + " " + value + " key down", dyear, dmonth, ddate);
}
function testtag_getdatestring(year, month, date)
{
month = (month < 9) ? ("0" + ++month) : month + 1;
if (date < 10)
date = "0" + date;
return year + "-" + month + "-" + date;
}
function testtag_comparedate(dp, testid, year, month, date, displayedMonth, displayedYear)
{
is(dp.value, testtag_getdatestring(year, month, date), testid + " value");
if (testid.indexOf("initial") == -1)
is(dp.getAttribute("value"),
testtag_getdatestring(year, month, date),
testid + " value attribute");
var dateValue = dp.dateValue;
ok(dateValue.getFullYear() == year &&
dateValue.getMonth() == month &&
dateValue.getDate() == date,
testid + " dateValue");
is(dp.year, year, testid + " year");
is(dp.month, month, testid + " month");
is(dp.displayedMonth, displayedMonth ? displayedMonth : month, testid + " displayedMonth");
is(dp.displayedYear, displayedYear ? displayedYear : year, testid + " displayedYear");
is(dp.date, date, testid + " date");
}
]]>
</script>
</window>

207
toolkit/content/tests/chrome/test_timepicker.xul
Просмотреть файл

@ -1,207 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
<!--
XUL Widget Test for timepicker
-->
<window title="timepicker" width="500" height="600"
onload="setTimeout(testtag_timepicker, 0);"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
<timepicker id="timepicker"/>
<body xmlns="http://www.w3.org/1999/xhtml">
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
</pre>
</body>
<script>
<![CDATA[
SimpleTest.waitForExplicitFinish();
function testtag_timepicker()
{
var tp = document.getElementById("timepicker");
var testid = "timepicker ";
var today = new Date();
var thour = today.getHours();
var tminute = today.getMinutes();
var tsecond = today.getSeconds();
// testtag_comparetime(tp, testid + "initial", thour, tminute, tsecond);
// check that setting the value property works
tp.value = testtag_gettimestring(thour, tminute, tsecond);
testtag_comparetime(tp, testid + "set value", thour, tminute, tsecond);
var numberOrder = /^(\D*)\s*(\d+)(\D*)(\d+)(\D*)(\d+)\s*(\D*)$/;
var locale = Intl.DateTimeFormat().resolvedOptions().locale + "-u-ca-gregory-nu-latn";
var fdt = new Date(2000,0,1,16,7,9).toLocaleTimeString(locale);
is(tp.is24HourClock, Number(fdt.match(numberOrder)[2]) > 12, "is24HourClock");
// check that setting the dateValue property works
tp.dateValue = today;
testtag_comparetime(tp, testid + "set dateValue", thour, tminute, tsecond);
ok(tp.value !== today, testid + " set dateValue different time");
ok(!tp.readOnly, testid + "readOnly");
tp.readOnly = true;
ok(tp.readOnly, testid + "set readOnly");
tp.readOnly = false;
ok(!tp.readOnly, testid + "clear readOnly");
function setTimeField(field, value, expectException,
expectedHour, expectedMinute, expectedSecond)
{
var exh = false;
try {
tp[field] = value;
} catch (ex) { exh = true; }
is(exh, expectException, testid + "set " + field + " " + value);
testtag_comparetime(tp, testid + "set " + field + " " + value,
expectedHour, expectedMinute, expectedSecond);
}
// check the value property
setTimeField("value", "0:0:0", false, 0, 0, 0);
setTimeField("value", "21:1:40", false, 21, 1, 40);
setTimeField("value", "7:11:8", false, 7, 11, 8);
setTimeField("value", "04:07:02", false, 4, 7, 2);
setTimeField("value", "10:42:20", false, 10, 42, 20);
// check that the hour, minute and second fields can be set properly
setTimeField("hour", 7, false, 7, 42, 20);
setTimeField("hour", 0, false, 0, 42, 20);
setTimeField("hour", 21, false, 21, 42, 20);
setTimeField("hour", -1, true, 21, 42, 20);
setTimeField("hour", 24, true, 21, 42, 20);
setTimeField("minute", 0, false, 21, 0, 20);
setTimeField("minute", 9, false, 21, 9, 20);
setTimeField("minute", 10, false, 21, 10, 20);
setTimeField("minute", 35, false, 21, 35, 20);
setTimeField("minute", -1, true, 21, 35, 20);
setTimeField("minute", 60, true, 21, 35, 20);
setTimeField("second", 0, false, 21, 35, 0);
setTimeField("second", 9, false, 21, 35, 9);
setTimeField("second", 10, false, 21, 35, 10);
setTimeField("second", 51, false, 21, 35, 51);
setTimeField("second", -1, true, 21, 35, 51);
setTimeField("second", 60, true, 21, 35, 51);
// check when seconds is not specified
setTimeField("value", "06:05", false, 6, 5, 0);
setTimeField("value", "06:15", false, 6, 15, 0);
setTimeField("value", "16:15", false, 16, 15, 0);
// check that times overflow properly
setTimeField("value", "5:65:21", false, 6, 5, 21);
setTimeField("value", "5:25:72", false, 5, 26, 12);
// check invalid values for the value and dateValue properties
tp.value = "14:25:48";
setTimeField("value", "", true, 14, 25, 48);
setTimeField("value", "1:5:6:6", true, 14, 25, 48);
setTimeField("value", "2:a:19", true, 14, 25, 48);
setTimeField("dateValue", "none", true, 14, 25, 48);
// check the fields
ok(tp.hourField instanceof HTMLInputElement, testid + "hourField");
ok(tp.minuteField instanceof HTMLInputElement, testid + "minuteField");
ok(tp.secondField instanceof HTMLInputElement, testid + "secondField");
testtag_timepicker_UI(tp, testid);
tp.readOnly = true;
// check that keyboard usage doesn't change the value when the timepicker
// is read only
testtag_timepicker_UI_key(tp, testid + "readonly ", "14:25:48",
tp.hourField, 14, 25, 48, 14, 25, 48);
testtag_timepicker_UI_key(tp, testid + "readonly ", "14:25:48",
tp.minuteField, 14, 25, 48, 14, 25, 48);
testtag_timepicker_UI_key(tp, testid + "readonly ", "14:25:48",
tp.secondField, 14, 25, 48, 14, 25, 48);
SimpleTest.finish();
}
function testtag_timepicker_UI(tp, testid)
{
testid += "UI";
// test adjusting the time with the up and down keys
testtag_timepicker_UI_key(tp, testid, "0:12:25", tp.hourField, 1, 12, 25, 0, 12, 25);
testtag_timepicker_UI_key(tp, testid, "11:12:25", tp.hourField, 12, 12, 25, 11, 12, 25);
testtag_timepicker_UI_key(tp, testid, "7:12:25", tp.hourField, 8, 12, 25, 7, 12, 25);
testtag_timepicker_UI_key(tp, testid, "16:12:25", tp.hourField, 17, 12, 25, 16, 12, 25);
testtag_timepicker_UI_key(tp, testid, "23:12:25", tp.hourField, 0, 12, 25, 23, 12, 25);
testtag_timepicker_UI_key(tp, testid, "15:23:46", tp.minuteField, 15, 24, 46, 15, 23, 46);
testtag_timepicker_UI_key(tp, testid, "15:0:46", tp.minuteField, 15, 1, 46, 15, 0, 46);
testtag_timepicker_UI_key(tp, testid, "15:59:46", tp.minuteField, 15, 0, 46, 15, 59, 46);
testtag_timepicker_UI_key(tp, testid, "11:50:46", tp.secondField, 11, 50, 47, 11, 50, 46);
testtag_timepicker_UI_key(tp, testid, "11:50:0", tp.secondField, 11, 50, 1, 11, 50, 0);
testtag_timepicker_UI_key(tp, testid, "11:50:59", tp.secondField, 11, 50, 0, 11, 50, 59);
}
function testtag_timepicker_UI_key(tp, testid, value, field,
uhour, uminute, usecond,
dhour, dminute, dsecond)
{
tp.value = value;
field.focus();
var eventTarget = tp.readOnly ? null : tp;
var testname = testid + " " + value + " key up";
synthesizeKeyExpectEvent("VK_UP", { }, eventTarget, "change", testname);
testtag_comparetime(tp, testname, uhour, uminute, usecond);
testname = testid + " " + value + " key down";
synthesizeKeyExpectEvent("VK_DOWN", { }, eventTarget, "change", testname);
testtag_comparetime(tp, testname, dhour, dminute, dsecond);
}
function testtag_gettimestring(hour, minute, second)
{
if (minute < 10)
minute = "0" + minute;
if (second < 10)
second = "0" + second;
return hour + ":" + minute + ":" + second;
}
function testtag_comparetime(tp, testid, hour, minute, second)
{
is(tp.value, testtag_gettimestring(hour, minute, second), testid + " value");
is(tp.getAttribute("value"),
testtag_gettimestring(hour, minute, second),
testid + " value attribute");
var dateValue = tp.dateValue;
ok(dateValue.getHours() == hour &&
dateValue.getMinutes() == minute &&
dateValue.getSeconds() == second,
testid + " dateValue");
is(tp.hour, hour, testid + " hour");
is(tp.minute, minute, testid + " minute");
is(tp.second, second, testid + " second");
}
]]>
</script>
</window>

1282
toolkit/content/widgets/datetimepicker.xml
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

18
toolkit/content/xul.css
Просмотреть файл

@ -1027,24 +1027,6 @@ richlistbox > listheader {
-moz-box-ordinal-group: 1;
}
/********** datepicker and timepicker ********/
datepicker {
-moz-binding: url('chrome://global/content/bindings/datetimepicker.xml#datepicker');
}
datepicker[type="popup"] {
-moz-binding: url('chrome://global/content/bindings/datetimepicker.xml#datepicker-popup');
}
datepicker[type="grid"] {
-moz-binding: url('chrome://global/content/bindings/datetimepicker.xml#datepicker-grid');
}
timepicker {
-moz-binding: url('chrome://global/content/bindings/datetimepicker.xml#timepicker');
}
/*********** findbar ************/
findbar {

7
toolkit/locales/en-US/chrome/global/datetimepicker.dtd
Просмотреть файл

@ -1,7 +0,0 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!-- first day of week to display in datepicker, a value from 0 to 6,
0 = Sunday, 1 = Monday, etc. -->
<!ENTITY firstdayofweek.default "0">

1
toolkit/locales/jar.mn
Просмотреть файл

@ -39,7 +39,6 @@
locale/@AB_CD@/global/customizeToolbar.properties (%chrome/global/customizeToolbar.properties)
#endif
locale/@AB_CD@/global/datetimebox.dtd (%chrome/global/datetimebox.dtd)
locale/@AB_CD@/global/datetimepicker.dtd (%chrome/global/datetimepicker.dtd)
locale/@AB_CD@/global/dialogOverlay.dtd (%chrome/global/dialogOverlay.dtd)
#ifndef MOZ_FENNEC
locale/@AB_CD@/global/editMenuOverlay.dtd (%chrome/global/editMenuOverlay.dtd)

Двоичные данные
toolkit/themes/osx/global/arrow/arrow-lft-hov.gif
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 57 B

Двоичные данные
toolkit/themes/osx/global/arrow/arrow-lft.gif
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 57 B

Двоичные данные
toolkit/themes/osx/global/arrow/arrow-rit-hov.gif
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 57 B

126
toolkit/themes/osx/global/datetimepicker.css
Просмотреть файл

@ -1,126 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
datepicker, timepicker {
padding: 0 0 1px;
margin: 4px;
border: none;
}
.datetimepicker-input-box {
-moz-appearance: textfield;
cursor: text;
margin-right: 4px;
margin-bottom: 2px;
border: 3px solid;
-moz-border-top-colors: transparent #888888 #000000;
-moz-border-right-colors: transparent #FFFFFF #000000;
-moz-border-bottom-colors: transparent #FFFFFF #000000;
-moz-border-left-colors: transparent #888888 #000000;
border-top-right-radius: 2px;
border-bottom-left-radius: 2px;
padding: 0px;
background-color: -moz-Field;
color: -moz-FieldText;
}
.datetimepicker-input-subbox {
width: 1.6em;
}
html|*.datetimepicker-input {
text-align: end;
}
.datetimepicker-separator {
margin: 0 !important;
}
.datetimepicker-year {
width: 3.2em;
}
.datepicker-dropmarker {
margin-bottom: 2px;
}
datepicker[readonly="true"],
timepicker[readonly="true"] {
background-color: -moz-Dialog;
color: -moz-DialogText;
}
datepicker[disabled="true"],
timepicker[disabled="true"] {
cursor: default;
-moz-border-top-colors: transparent ThreeDShadow -moz-Dialog;
-moz-border-right-colors: transparent ThreeDShadow -moz-Dialog;
-moz-border-bottom-colors: transparent ThreeDShadow -moz-Dialog;
-moz-border-left-colors: transparent ThreeDShadow -moz-Dialog;
background-color: -moz-Dialog;
color: GrayText;
}
.datepicker-mainbox {
margin: 2px 4px;
border: 2px solid;
-moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
background-color: #EEEEEE;
color: -moz-DialogText;
}
.datepicker-popupgrid > .datepicker-mainbox {
margin: 0;
border: none;
}
.datepicker-gridlabel, .datepicker-weeklabel {
text-align: center;
}
.datepicker-gridlabel[today="true"] {
background-color: darkgrey;
color: white;
}
.datepicker-gridlabel[selected="true"] {
background-color: Highlight;
color: HighlightText;
}
.datepicker-button {
-moz-appearance: none;
min-width: 8px;
padding: 0px;
}
.datepicker-previous {
list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif");
}
.datepicker-next {
list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
}
.datepicker-previous:hover {
list-style-image: url("chrome://global/skin/arrow/arrow-lft-hov.gif");
}
.datepicker-next:hover {
list-style-image: url("chrome://global/skin/arrow/arrow-rit-hov.gif");
}
.datepicker-previous[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif");
}
.datepicker-next[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif");
}

4
toolkit/themes/osx/global/jar.mn
Просмотреть файл

@ -36,7 +36,6 @@ toolkit.jar:
skin/classic/global/tabprompts.css
skin/classic/global/tabbox.css
skin/classic/global/textbox.css
skin/classic/global/datetimepicker.css
skin/classic/global/toolbar.css
skin/classic/global/toolbarbutton.css
* skin/classic/global/tree.css
@ -48,11 +47,8 @@ toolkit.jar:
skin/classic/global/arrow/arrow-dn.gif (arrow/arrow-dn.gif)
skin/classic/global/arrow/arrow-dn.png (arrow/arrow-dn.png)
skin/classic/global/arrow/arrow-lft-dis.gif (arrow/arrow-lft-dis.gif)
skin/classic/global/arrow/arrow-lft-hov.gif (arrow/arrow-lft-hov.gif)
skin/classic/global/arrow/arrow-lft-sharp.gif (arrow/arrow-lft-sharp.gif)
skin/classic/global/arrow/arrow-lft.gif (arrow/arrow-lft.gif)
skin/classic/global/arrow/arrow-rit-dis.gif (arrow/arrow-rit-dis.gif)
skin/classic/global/arrow/arrow-rit-hov.gif (arrow/arrow-rit-hov.gif)
skin/classic/global/arrow/arrow-rit-sharp.gif (arrow/arrow-rit-sharp.gif)
skin/classic/global/arrow/arrow-rit.gif (arrow/arrow-rit.gif)
skin/classic/global/arrow/arrow-up-dis.gif (arrow/arrow-up-dis.gif)

7
toolkit/themes/shared/non-mac.jar.inc.mn
Просмотреть файл

@ -11,7 +11,6 @@
#include jar.inc.mn
skin/classic/global/customizeToolbar.css (../../windows/global/customizeToolbar.css)
skin/classic/global/datetimepicker.css (../../windows/global/datetimepicker.css)
skin/classic/global/dialog.css (../../windows/global/dialog.css)
skin/classic/global/filefield.css (../../windows/global/filefield.css)
skin/classic/global/progressmeter.css (../../windows/global/progressmeter.css)
@ -24,10 +23,6 @@
skin/classic/global/arrow/arrow-dn.gif (../../windows/global/arrow/arrow-dn.gif)
skin/classic/global/arrow/arrow-dn-dis.gif (../../windows/global/arrow/arrow-dn-dis.gif)
skin/classic/global/arrow/arrow-lft.gif (../../windows/global/arrow/arrow-lft.gif)
skin/classic/global/arrow/arrow-lft-dis.gif (../../windows/global/arrow/arrow-lft-dis.gif)
skin/classic/global/arrow/arrow-rit.gif (../../windows/global/arrow/arrow-rit.gif)
skin/classic/global/arrow/arrow-rit-dis.gif (../../windows/global/arrow/arrow-rit-dis.gif)
skin/classic/global/arrow/arrow-up.gif (../../windows/global/arrow/arrow-up.gif)
skin/classic/global/arrow/arrow-up-dis.gif (../../windows/global/arrow/arrow-up-dis.gif)
skin/classic/global/arrow/panelarrow-horizontal.svg (../../windows/global/arrow/panelarrow-horizontal.svg)
@ -72,6 +67,4 @@
#elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
#endif
% override chrome://global/skin/arrow/arrow-lft-hov.gif chrome://global/skin/arrow/arrow-lft.gif
% override chrome://global/skin/arrow/arrow-rit-hov.gif chrome://global/skin/arrow/arrow-rit.gif
% override chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png chrome://mozapps/skin/extensions/extensionGeneric.svg

147
toolkit/themes/windows/global/datetimepicker.css
Просмотреть файл

@ -1,147 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* ===== datetimepicker.css =============================================
== Styles used by the XUL datepicker and timepicker elements.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
datepicker, timepicker {
margin: 2px 4px;
padding: 0;
border: none;
background: none;
cursor: default;
}
.datetimepicker-input-box {
-moz-appearance: textfield;
cursor: text;
margin-inline-end: 2px;
border: 2px solid;
-moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
padding: 2px 0 3px 0;
padding-inline-start: 4px;
padding-inline-end: 2px;
background-color: -moz-Field;
color: -moz-FieldText;
}
.datetimepicker-input-subbox {
width: 1.6em;
}
html|*.datetimepicker-input {
text-align: end;
}
.datetimepicker-separator {
margin: 0 !important;
}
.datetimepicker-year {
width: 3.2em;
}
datepicker[readonly="true"],
timepicker[readonly="true"] {
background-color: -moz-Dialog;
color: -moz-DialogText;
}
datepicker[disabled="true"],
timepicker[disabled="true"] {
cursor: default;
background-color: -moz-Dialog;
color: GrayText;
}
.datepicker-mainbox {
margin: 2px 4px;
border: 2px solid;
-moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
background-color: -moz-Field;
color: -moz-FieldText;
}
.datepicker-popupgrid > .datepicker-mainbox {
margin: 0;
border: none;
}
.datepicker-gridlabel, .datepicker-weeklabel {
text-align: center;
}
.datepicker-gridlabel[today="true"] {
background-color: darkgrey;
color: white;
}
.datepicker-gridlabel[selected="true"] {
background-color: Highlight;
color: HighlightText;
}
.datepicker-button {
-moz-appearance: none;
min-width: 8px;
padding: 0px;
}
.datepicker-previous {
list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif");
}
.datepicker-next {
list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
}
.datepicker-previous:hover {
list-style-image: url("chrome://global/skin/arrow/arrow-lft-hov.gif");
}
.datepicker-next:hover {
list-style-image: url("chrome://global/skin/arrow/arrow-rit-hov.gif");
}
.datepicker-previous[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif");
}
.datepicker-next[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif");
}
.datepicker-previous:-moz-locale-dir(rtl) {
list-style-image: url("chrome://global/skin/arrow/arrow-rit.gif");
}
.datepicker-next:-moz-locale-dir(rtl) {
list-style-image: url("chrome://global/skin/arrow/arrow-lft.gif");
}
.datepicker-previous:-moz-locale-dir(rtl) {
list-style-image: url("chrome://global/skin/arrow/arrow-rit-hov.gif");
}
.datepicker-next:-moz-locale-dir(rtl):hover {
list-style-image: url("chrome://global/skin/arrow/arrow-lft-hov.gif");
}
.datepicker-previous[disabled="true"]:-moz-locale-dir(rtl) {
list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif");
}
.datepicker-next[disabled="true"]:-moz-locale-dir(rtl) {
list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif");
}

8
toolkit/themes/windows/global/jar.mn
Просмотреть файл

@ -32,6 +32,10 @@ toolkit.jar:
skin/classic/global/toolbarbutton.css
* skin/classic/global/tree.css
* skin/classic/global/alerts/alert.css (alerts/alert.css)
skin/classic/global/arrow/arrow-lft.gif (arrow/arrow-lft.gif)
skin/classic/global/arrow/arrow-lft-dis.gif (arrow/arrow-lft-dis.gif)
skin/classic/global/arrow/arrow-rit.gif (arrow/arrow-rit.gif)
skin/classic/global/arrow/arrow-rit-dis.gif (arrow/arrow-rit-dis.gif)
skin/classic/global/dirListing/folder.png (dirListing/folder.png)
skin/classic/global/dirListing/up.png (dirListing/up.png)
skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png)
@ -54,8 +58,8 @@ toolkit.jar:
* skin/classic/global/in-content/common.css (in-content/common.css)
* skin/classic/global/in-content/info-pages.css (in-content/info-pages.css)
skin/classic/global/toolbar/spring.png (toolbar/spring.png)
skin/classic/global/tree/twisty.svg (tree/twisty.svg)
skin/classic/global/tree/twisty-preWin10.svg (tree/twisty-preWin10.svg)
skin/classic/global/tree/twisty.svg (tree/twisty.svg)
skin/classic/global/tree/twisty-preWin10.svg (tree/twisty-preWin10.svg)
#if MOZ_BUILD_APP == browser
[browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: