зеркало из https://github.com/mozilla/gecko-dev.git
Bug 323183 Make Lightning use updated sunbird publish code. patch by ssitter@googlemail.com. r1=jminta r2=dmose
This commit is contained in:
Родитель
f3ed9ece6b
Коммит
08e6670282
|
@ -52,6 +52,7 @@ DIRS = ../../db/sqlite3/src ../../storage \
|
|||
../../extensions/xmlextras \
|
||||
../../extensions/webdav \
|
||||
../libical ../base ../providers \
|
||||
../import-export \
|
||||
components \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
@ -201,9 +201,7 @@ function LtnObserveDisplayDeckChange(event)
|
|||
|
||||
function ltnPublishCalendar()
|
||||
{
|
||||
currentCalendar = ltnSelectedCalendar();
|
||||
|
||||
openDialog("chrome://calendar/content/calendar-publish-dialog.xul", "caPublishEvents", "chrome,titlebar,modal", currentCalendar);
|
||||
publishEntireCalendar(ltnSelectedCalendar());
|
||||
}
|
||||
|
||||
function ltnFinish() {
|
||||
|
|
|
@ -60,6 +60,7 @@
|
|||
<script type="application/x-javascript" src="chrome://calendar/content/calendarUtils.js"/>
|
||||
<script type="application/x-javascript" src="chrome://calendar/content/calendarCreation.js"/>
|
||||
<script type="application/x-javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
|
||||
<script type="application/x-javascript" src="chrome://calendar/content/publish.js"/>
|
||||
<script type="application/x-javascript" src="chrome://lightning/content/lightning-utils.js"/>
|
||||
<script type="application/x-javascript" src="chrome://lightning/content/calendar-management.js"/>
|
||||
<script type="application/x-javascript" src="chrome://lightning/content/messenger-overlay-sidebar.js"/>
|
||||
|
|
|
@ -47,8 +47,9 @@ calendar.jar:
|
|||
content/calendar/calendar-alarm-dialog.js (/calendar/base/content/calendar-alarm-dialog.js)
|
||||
content/calendar/calendar-alarm-widget.css (/calendar/base/content/calendar-alarm-widget.css)
|
||||
content/calendar/calendar-alarm-widget.xml (/calendar/base/content/calendar-alarm-widget.xml)
|
||||
content/calendar/calendar-publish-dialog.js (/calendar/base/content/calendar-publish-dialog.js)
|
||||
content/calendar/calendar-publish-dialog.xul (/calendar/base/content/calendar-publish-dialog.xul)
|
||||
content/calendar/publish.js (/calendar/resources/content/publish.js)
|
||||
content/calendar/publishDialog.js (/calendar/resources/content/publishDialog.js)
|
||||
content/calendar/publishDialog.xul (/calendar/resources/content/publishDialog.xul)
|
||||
content/calendar/calendar-event-dialog.js (/calendar/base/content/calendar-event-dialog.js)
|
||||
content/calendar/calendar-event-dialog.xul (/calendar/base/content/calendar-event-dialog.xul)
|
||||
content/calendar/calendar-event-dialog.css (/calendar/base/content/calendar-event-dialog.css)
|
||||
|
|
|
@ -119,7 +119,7 @@
|
|||
<command id="export_command" oncommand="saveEventsToFile(gCalendarWindow.EventSelection.selectedEvents)" disabled="true" disabledwhennoeventsselected="true"/>
|
||||
|
||||
<command id="reload_remote_calendars" oncommand="reloadCalendars()"/>
|
||||
<command id="publish_calendar" oncommand="publishEntireCalendar()"/>
|
||||
<command id="publish_calendar" oncommand="publishEntireCalendar(getDefaultCalendar())"/>
|
||||
<command id="publish_events_command" oncommand="publishCalendarData()" disabled="true" disabledwhennoeventsselected="true"/>
|
||||
|
||||
<command id="toggle_tasks_in_view"
|
||||
|
|
|
@ -51,15 +51,13 @@ function publishCalendarDataDialogResponse(CalendarPublishObject, aProgressDialo
|
|||
CalendarPublishObject.remotePath, aProgressDialog);
|
||||
}
|
||||
|
||||
function publishEntireCalendar()
|
||||
function publishEntireCalendar(cal)
|
||||
{
|
||||
var args = new Object();
|
||||
var publishObject = new Object( );
|
||||
|
||||
args.onOk = self.publishEntireCalendarDialogResponse;
|
||||
|
||||
// get the currently selected calendar
|
||||
var cal = getDefaultCalendar();
|
||||
publishObject.calendar = cal;
|
||||
|
||||
// restore the remote ics path preference from the calendar passed in
|
||||
|
|
|
@ -84,7 +84,7 @@
|
|||
<command id="export_command" oncommand="saveEventsToFile(gCalendarWindow.EventSelection.selectedEvents)" disabled="true" disabledwhennoeventsselected="true"/>
|
||||
|
||||
<command id="reload_remote_calendars" oncommand="reloadCalendars()"/>
|
||||
<command id="publish_calendar" oncommand="publishEntireCalendar()"/>
|
||||
<command id="publish_calendar" oncommand="publishEntireCalendar(getDefaultCalendar())"/>
|
||||
<command id="publish_events_command" oncommand="publishCalendarData()" disabled="true" disabledwhennoeventsselected="true"/>
|
||||
|
||||
<command id="toggle_tasks_in_view"
|
||||
|
|
Загрузка…
Ссылка в новой задаче