Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 412946 Invitations show wrong start and end time; r=ctalbert

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@243655 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
daniel.boelzle%sun.com
2008-01-21 09:34:23 +00:00
parent 6124348b70
commit 63ec6df7c3
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/calendar/lightning/components/lightningTextCalendarConverter.js
View File

@@ -106,7 +106,9 @@ function createHtml(event)
.getService(Components.interfaces.calIDateTimeFormatter);
var startString = new Object();
var endString = new Object();
dateFormatter.formatInterval(event.startDate, event.endDate, startString, endString);
dateFormatter.formatInterval(event.startDate.getInTimezone(calendarDefaultTimezone()),
event.endDate.getInTimezone(calendarDefaultTimezone()),
startString, endString);
var dateString = startString.value + " - " + endString.value;
var labelText = stringBundle.GetStringFromName("imipHtml.when");
@@ -220,7 +222,25 @@ var myModule = {
this.myContractID, true, true);
},
mScriptsLoaded: false,
getClassObject: function GCO(aCompMgr, aCid, aIid) {
if (!this.mScriptsLoaded) {
// loading extra scripts from ../js:
const scripts = [ "calUtils.js" ];
var scriptLoader = Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.createInstance(Components.interfaces.mozIJSSubScriptLoader);
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService);
var baseDir = __LOCATION__.parent.parent;
baseDir.append("js");
for each (var script in scripts) {
var scriptFile = baseDir.clone();
scriptFile.append(script);
scriptLoader.loadSubScript(ioService.newFileURI(scriptFile).spec, null);
}
this.mScriptsLoaded = true;
}
if (!aCid.equals(this.myCID)) {
throw Components.results.NS_ERROR_NO_INTERFACE;
}