зеркало из https://github.com/mozilla/gecko-dev.git
Checked in attachment 149704 for bug 245179
This commit is contained in:
Родитель
00fefed70f
Коммит
1445e54e29
|
@ -271,20 +271,6 @@ function launchPreferences()
|
|||
window.openDialog("chrome://calendar/content/pref/prefBird.xul", "PrefWindow", "chrome,titlebar,resizable=no");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Called to set up the date picker from the go to day button
|
||||
*/
|
||||
|
||||
function prepareChooseDate()
|
||||
{
|
||||
// the value attribute of the datePickerPopup is the initial date shown
|
||||
|
||||
var datePickerPopup = document.getElementById( "oe-date-picker-popup" );
|
||||
|
||||
datePickerPopup.setAttribute( "value", gCalendarWindow.getSelectedDate() );
|
||||
}
|
||||
|
||||
/**
|
||||
* Called on double click in the day view all-day area
|
||||
* Could be used for week view too...
|
||||
|
|
|
@ -111,6 +111,7 @@
|
|||
<command id="next_command" oncommand="gCalendarWindow.currentView.goToNext()"/>
|
||||
<command id="previous_command" oncommand="gCalendarWindow.currentView.goToPrevious()"/>
|
||||
<command id="go_today_command" oncommand="gCalendarWindow.goToToday()"/>
|
||||
<command id="go_date_command" oncommand="gCalendarWindow.pickAndGoToDate()"/>
|
||||
|
||||
<command id="day_view_command" oncommand="gCalendarWindow.switchToDayView()" disabled="true"/>
|
||||
<command id="week_view_command" oncommand="gCalendarWindow.switchToWeekView()" disabled="true"/>
|
||||
|
@ -155,6 +156,7 @@
|
|||
<key id="go_backward_key" keycode="VK_PAGE_UP" observes="previous_command"/>
|
||||
<key id="go_forward_key" keycode="VK_PAGE_DOWN" observes="next_command"/>
|
||||
<key id="go_to_today_key" keycode="VK_DOWN" modifiers="control" observes="go_today_command"/>
|
||||
<key id="go_to_date_key" keycode="VK_UP" modifiers="control" observes="go_date_command"/>
|
||||
|
||||
<key id="key_close" key="W" modifiers="control" observes="close_calendar_command"/>
|
||||
</keyset>
|
||||
|
|
|
@ -289,7 +289,24 @@ CalendarWindow.prototype.goToToday = function calWin_goToToday( )
|
|||
document.getElementById( "lefthandcalendar" ).value = Today;
|
||||
|
||||
}
|
||||
/** PUBLIC
|
||||
*
|
||||
* Choose a date, then go to that date in the current view.
|
||||
*/
|
||||
|
||||
CalendarWindow.prototype.pickAndGoToDate = function calWin_pickAndGoToDate( )
|
||||
{
|
||||
var currentView = this.currentView;
|
||||
var args = new Object();
|
||||
args.initialDate = this.getSelectedDate();
|
||||
args.onOk = function receiveAndGoToDate( pickedDate ) {
|
||||
currentView.goToDay( pickedDate );
|
||||
document.getElementById( "lefthandcalendar" ).value = pickedDate;
|
||||
};
|
||||
openDialog("chrome://calendar/content/goToDateDialog.xul",
|
||||
"GoToDateDialog", // target= window name
|
||||
"chrome,modal", args);
|
||||
}
|
||||
|
||||
/** PUBLIC
|
||||
*
|
||||
|
|
|
@ -0,0 +1,105 @@
|
|||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is OEone Calendar Code, released October 31st, 2001.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* OEone Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2001
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s): Garth Smedley <garths@oeone.com>
|
||||
* Mike Potter <mikep@oeone.com>
|
||||
* Colin Phillips <colinp@oeone.com>
|
||||
* Chris Charabaruk <ccharabaruk@meldstar.com>
|
||||
* ArentJan Banck <ajbanck@planet.nl>
|
||||
* Eric Belhaire <eric.belhaire@ief.u-psud.fr>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
|
||||
|
||||
/***** calendar/goToDateDialog.js
|
||||
*
|
||||
var args = new Object();
|
||||
args.onOk = <function>; // function to call when OK is clicked
|
||||
args.initialDate = <Date>;
|
||||
openDialog("chrome://calendar/content/goToDateDialog.xul",
|
||||
"GoToDateDialog", // target window name
|
||||
"chrome,modal", args);
|
||||
|
||||
* When the user clicks OK the onOk function will be called with the picked date.
|
||||
*
|
||||
* IMPLEMENTATION NOTES
|
||||
**********
|
||||
*/
|
||||
|
||||
|
||||
/*-----------------------------------------------------------------
|
||||
* W I N D O W V A R I A B L E S
|
||||
*/
|
||||
|
||||
|
||||
var gOnOkFunction; // function to be called when user clicks OK
|
||||
|
||||
/*-----------------------------------------------------------------
|
||||
* W I N D O W F U N C T I O N S
|
||||
*/
|
||||
|
||||
/**
|
||||
* Called when the dialog is loaded.
|
||||
*/
|
||||
|
||||
function loadGoToDateDialog()
|
||||
{
|
||||
// Get arguments, see description at top of file
|
||||
|
||||
var args = window.arguments[0];
|
||||
|
||||
gOnOkFunction = args.onOk;
|
||||
var initialDate = args.initialDate;
|
||||
if (!initialDate) initialDate = new Date(); // now
|
||||
var datepicker = document.getElementById("datepicker");
|
||||
datepicker.value = initialDate;
|
||||
|
||||
sizeToContent();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Called when the OK button is clicked.
|
||||
*/
|
||||
|
||||
function onOKCommand()
|
||||
{
|
||||
var datepicker = document.getElementById("datepicker");
|
||||
// call caller's on OK function with picked date
|
||||
gOnOkFunction( datepicker.value );
|
||||
|
||||
// tell standard dialog stuff to close the dialog
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
<?xml version="1.0"?>
|
||||
<!-- ***** BEGIN LICENSE BLOCK *****
|
||||
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
-
|
||||
- The contents of this file are subject to the Mozilla Public License Version
|
||||
- 1.1 (the "License"); you may not use this file except in compliance with
|
||||
- the License. You may obtain a copy of the License at
|
||||
- http://www.mozilla.org/MPL/
|
||||
-
|
||||
- Software distributed under the License is distributed on an "AS IS" basis,
|
||||
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
- for the specific language governing rights and limitations under the
|
||||
- License.
|
||||
-
|
||||
- The Original Code is OEone Calendar Code, released October 31st, 2001.
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- OEone Corporation.
|
||||
- Portions created by the Initial Developer are Copyright (C) 2001
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s): Mike Potter <mikep@oeone.com>
|
||||
-
|
||||
- Alternatively, the contents of this file may be used under the terms of
|
||||
- either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
- in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
- of those above. If you wish to allow use of your version of this file only
|
||||
- under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
- use your version of this file under the terms of the MPL, indicate your
|
||||
- decision by deleting the provisions above and replace them with the notice
|
||||
- and other provisions required by the LGPL or the GPL. If you do not delete
|
||||
- the provisions above, a recipient may use your version of this file under
|
||||
- the terms of any one of the MPL, the GPL or the LGPL.
|
||||
-
|
||||
- ***** END LICENSE BLOCK ***** -->
|
||||
|
||||
<?xml-stylesheet type="text/css"
|
||||
href="chrome://global/skin/global.css" ?>
|
||||
<?xml-stylesheet type="text/css"
|
||||
href="chrome://calendar/content/datetimepickers/datepicker.css" ?>
|
||||
|
||||
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
|
||||
|
||||
<!-- CSS File with all styles specific to the dialog -->
|
||||
<?xml-stylesheet type="text/css"
|
||||
href="chrome://calendar/skin/dialogOverlay.css" ?>
|
||||
|
||||
<!-- DTD File with all strings specific to the calendar -->
|
||||
<!DOCTYPE dialog
|
||||
[
|
||||
<!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
|
||||
<!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
|
||||
]>
|
||||
|
||||
|
||||
<dialog
|
||||
id="calendar-date-dialog"
|
||||
title="&calendar.flat.topbar.choosedate;"
|
||||
onload="loadGoToDateDialog();"
|
||||
buttons="accept,cancel"
|
||||
ondialogaccept="return onOKCommand();"
|
||||
ondialogcancel="return true;"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
xmlns:nc="http://home.netscape.com/NC-rdf#">
|
||||
|
||||
<!-- Javascript includes -->
|
||||
|
||||
<script type="application/x-javascript"
|
||||
src="chrome://global/content/strres.js" />
|
||||
<script type="application/x-javascript"
|
||||
src="chrome://calendar/content/dateUtils.js"/>
|
||||
<script type="application/x-javascript"
|
||||
src="chrome://calendar/content/goToDateDialog.js"/>
|
||||
|
||||
<keyset id="dialogKeys"/>
|
||||
|
||||
<!-- The dialog -->
|
||||
|
||||
<!-- dialog-box: from dialogOverlay.xul -->
|
||||
|
||||
<hbox>
|
||||
<description>&calendar.flat.topbar.choosedate;</description>
|
||||
<datepicker id="datepicker"/>
|
||||
</hbox>
|
||||
</dialog>
|
|
@ -253,6 +253,11 @@
|
|||
label="&goTodayCmd.label;"
|
||||
accesskey="&goTodayCmd.accesskey;"
|
||||
observes="go_today_command"/>
|
||||
<menuitem id="calendar-go-menu-date"
|
||||
key="go_to_date_key"
|
||||
label="&goDateCmd.label;"
|
||||
accesskey="&goDateCmd.accesskey;"
|
||||
observes="go_date_command"/>
|
||||
<menuitem id="calendar-go-menu-previous"
|
||||
key="go_backward_key"
|
||||
label="&goPreviousCmd.label;"
|
||||
|
|
Загрузка…
Ссылка в новой задаче