mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 14:22:01 +00:00
Fixing bug 128822.
This commit is contained in:
parent
560c74f044
commit
30d5e58872
@ -8,21 +8,31 @@ addDirectory( "resources" );
|
||||
|
||||
addDirectory("", "components", getFolder( "Components" ), "" );
|
||||
|
||||
addDirectory( "", "bin", getFolder( "Program" ), "" );
|
||||
|
||||
var err = getLastError();
|
||||
|
||||
if ( err == SUCCESS ) {
|
||||
|
||||
registerChrome(CONTENT, calendarDir, "content");
|
||||
registerChrome(SKIN, calendarDir, "skin/modern");
|
||||
registerChrome(LOCALE, calendarDir, "locale/en-US");
|
||||
var calendarContent = getFolder(calendarDir, "content");
|
||||
var calendarSkin = getFolder(calendarDir, "skin");
|
||||
var calendarLocale = getFolder(calendarDir, "locale");
|
||||
|
||||
var returnval = registerChrome(CONTENT | DELAYED_CHROME, calendarContent );
|
||||
var returnval = registerChrome(SKIN | DELAYED_CHROME, calendarSkin, "modern/");
|
||||
var returnval = registerChrome(LOCALE | DELAYED_CHROME, calendarLocale, "en-US/");
|
||||
|
||||
err = performInstall();
|
||||
|
||||
if ( err == SUCCESS ) {
|
||||
refreshPlugins();
|
||||
alert("The Mozilla Calendar has been succesfully installed. \n"
|
||||
+"Please restart your browser to continue.");
|
||||
}
|
||||
else if( err == "999" )
|
||||
{
|
||||
alert("The Mozilla Calendar has been installed. \n You must restart your browser to continue.");
|
||||
}
|
||||
|
||||
else {
|
||||
alert("performInstall() failed. \n"
|
||||
+"_____________________________\nError code:" + err);
|
||||
|
@ -22,6 +22,7 @@
|
||||
- Contributor(s): Garth Smedley <garths@oeone.com>
|
||||
- Mike Potter <mikep@oeone.com>
|
||||
- Colin Phillips <colinp@oeone.com>
|
||||
- Chris Charabaruk <coldacid@meldstar.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
|
||||
@ -82,6 +83,7 @@
|
||||
<!-- Javascript DTD To Variable -->
|
||||
<script type="application/x-javascript">
|
||||
var confirmDeleteEvent = "&calendar.confirm.deleteevent;";
|
||||
var confirmDeleteUntitledEvent = "&calendar.confirm.deleteuntitledevent;";
|
||||
</script>
|
||||
|
||||
<!-- Javascript includes -->
|
||||
|
@ -20,6 +20,7 @@
|
||||
*
|
||||
* Contributor(s): Garth Smedley <garths@oeone.com>
|
||||
* Mike Potter <mikep@oeone.com>
|
||||
* Chris Charabaruk <coldacid@meldstar.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
|
||||
@ -318,8 +319,17 @@ function unifinderRemoveCommand()
|
||||
|
||||
if( calendarEvent != null )
|
||||
{
|
||||
if ( confirm( confirmDeleteEvent+" "+calendarEvent.title+"?" ) ) {
|
||||
gICalLib.deleteEvent( calendarEvent.id );
|
||||
if ( calendarEvent.title != "" )
|
||||
{
|
||||
if ( confirm( confirmDeleteEvent+" "+calendarEvent.title+"?" ) ) {
|
||||
gICalLib.deleteEvent( calendarEvent.id );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( confirm( confirmDeleteUntitledEvent ) ) {
|
||||
gICalLib.deleteEvent( calendarEvent.id );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -20,6 +20,7 @@
|
||||
-
|
||||
- Contributor(s): Garth Smedley <garths@oeone.com>
|
||||
- Mike Potter <mikep@oeone.com>
|
||||
- Chris Charabaruk <coldacid@meldstar.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
|
||||
@ -79,6 +80,7 @@
|
||||
<!ENTITY newevent.starttimeerror.alertmessage "Your event cannot end before it has started. Please fix either the start time or the end time." >
|
||||
<!ENTITY newevent.recurendtimeerror.alertmessage "Your event's repeat time cannot be before the event end time. Please fix this, or disable repeating." >
|
||||
<!ENTITY calendar.confirm.deleteevent "Are you sure you want to delete this event titled: " >
|
||||
<!ENTITY calendar.confirm.deleteuntitledevent "Are you sure you want to delete this untitled event?" >
|
||||
|
||||
<!ENTITY event.alarm.checkbox.label "Remind me again in " >
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user