From 63ec6df7c3211ac8d65582b4549ce021d16949a1 Mon Sep 17 00:00:00 2001 From: "daniel.boelzle%sun.com" Date: Mon, 21 Jan 2008 09:34:23 +0000 Subject: [PATCH] Bug 412946 Invitations show wrong start and end time; r=ctalbert git-svn-id: svn://10.0.0.236/trunk@243655 18797224-902f-48f8-a5cc-f745e15eee43 --- .../lightningTextCalendarConverter.js | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/mozilla/calendar/lightning/components/lightningTextCalendarConverter.js b/mozilla/calendar/lightning/components/lightningTextCalendarConverter.js index 7f4278e6385..b3ab2a8de44 100644 --- a/mozilla/calendar/lightning/components/lightningTextCalendarConverter.js +++ b/mozilla/calendar/lightning/components/lightningTextCalendarConverter.js @@ -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; }