bug 340949: removing caching code, nscp tz consolidation
git-svn-id: svn://10.0.0.236/trunk@231234 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
daniel.boelzle%sun.com
parent
3e5b696af6
commit
6e6e00fc4e
@ -52,7 +52,6 @@ EXTRA_SCRIPTS = \
|
||||
calWcapSession.js \
|
||||
calWcapCalendarItems.js \
|
||||
calWcapCalendar.js \
|
||||
calWcapCachedCalendar.js \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_COMPONENTS = \
|
||||
|
||||
@ -1,588 +0,0 @@
|
||||
/* -*- Mode: javascript; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** 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 Sun Microsystems code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Sun Microsystems, Inc.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2007
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Daniel Boelzle <daniel.boelzle@sun.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 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 ***** */
|
||||
|
||||
/**
|
||||
* PROTOTYPE!
|
||||
*/
|
||||
|
||||
// globals:
|
||||
var g_localCals = {};
|
||||
var g_localCalsLastSync = {};
|
||||
|
||||
function calWcapCachedCalendar() {
|
||||
this.wrappedJSObject = this;
|
||||
this.m_observers = [];
|
||||
this.m_observerMultiplexer = new ObserverMultiplexer(this);
|
||||
this.m_syncQueue = new RequestQueue();
|
||||
}
|
||||
calWcapCachedCalendar.prototype = {
|
||||
m_ifaces: [ Components.interfaces.calIWcapCalendar,
|
||||
Components.interfaces.calICalendar,
|
||||
Components.interfaces.calICalendarProvider,
|
||||
Components.interfaces.nsIInterfaceRequestor,
|
||||
Components.interfaces.nsIClassInfo,
|
||||
Components.interfaces.nsISupports ],
|
||||
|
||||
// nsISupports:
|
||||
QueryInterface:
|
||||
function( iid )
|
||||
{
|
||||
for each ( var iface in this.m_ifaces ) {
|
||||
if (iid.equals( iface ))
|
||||
return this;
|
||||
}
|
||||
throw Components.results.NS_ERROR_NO_INTERFACE;
|
||||
},
|
||||
|
||||
// nsIClassInfo:
|
||||
getInterfaces:
|
||||
function( count )
|
||||
{
|
||||
count.value = this.m_ifaces.length;
|
||||
return this.m_ifaces;
|
||||
},
|
||||
get classDescription() {
|
||||
return calWcapCalendarModule.WcapCalendarInfo.classDescription;
|
||||
},
|
||||
get contractID() {
|
||||
return calWcapCalendarModule.WcapCalendarInfo.contractID;
|
||||
},
|
||||
get classID() {
|
||||
return calWcapCalendarModule.WcapCalendarInfo.classID;
|
||||
},
|
||||
getHelperForLanguage: function( language ) { return null; },
|
||||
implementationLanguage:
|
||||
Components.interfaces.nsIProgrammingLanguage.JAVASCRIPT,
|
||||
flags: 0,
|
||||
|
||||
// nsIInterfaceRequestor:
|
||||
getInterface:
|
||||
function( iid, instance )
|
||||
{
|
||||
return this.remoteCal.getInterface( iid, instance );
|
||||
},
|
||||
|
||||
m_observerMultiplexer: null,
|
||||
m_remoteCal: null,
|
||||
get remoteCal() {
|
||||
return this.m_remoteCal;
|
||||
},
|
||||
set remoteCal(cal) {
|
||||
if (this.m_remoteCal != null)
|
||||
this.m_remoteCal.removeObserver( this.m_observerMultiplexer );
|
||||
if (cal != null) {
|
||||
cal.addObserver( this.m_observerMultiplexer );
|
||||
cal.superCalendar = this;
|
||||
}
|
||||
return (this.m_remoteCal = cal);
|
||||
},
|
||||
|
||||
getCalKey:
|
||||
function()
|
||||
{
|
||||
// xxx todo: better eoncoding?
|
||||
return encodeURIComponent( this.uri.spec /* i.e. remote uri */ +
|
||||
"?calid=" + this.calId );
|
||||
},
|
||||
|
||||
m_localCal: null,
|
||||
get localCal() {
|
||||
if (this.m_localCal == null) {
|
||||
// xxx todo: sharing? storage cal_id: STRING?
|
||||
// assure logged in, so userId/calId is properly set:
|
||||
this.remoteCal.session.getSessionId();
|
||||
// xxx todo: better eoncoding?
|
||||
var key = this.getCalKey();
|
||||
var cal = g_localCals[key];
|
||||
if (!cal) {
|
||||
this.log( "creating cache calendar for calId " + this.calId );
|
||||
var uri;
|
||||
if (CACHE == "memory") { // in-memory caching
|
||||
uri = this.uri.clone();
|
||||
uri.path += ("?calid=" + this.calId);
|
||||
}
|
||||
else {
|
||||
// xxx todo: change storage cal to support STRING cal_id
|
||||
var dbPath = CACHE_DIR.clone();
|
||||
dbPath.append( key + ".sdb" );
|
||||
uri = getIoService().newFileURI( dbPath );
|
||||
}
|
||||
this.log( "local cal uri: " + uri.spec );
|
||||
try {
|
||||
cal = getCalendarManager().createCalendar( CACHE, uri );
|
||||
g_localCals[key] = cal;
|
||||
}
|
||||
catch (exc) {
|
||||
this.notifyError( exc );
|
||||
}
|
||||
}
|
||||
this.localCal = cal;
|
||||
}
|
||||
return this.m_localCal;
|
||||
},
|
||||
set localCal(cal) {
|
||||
if (cal != null) {
|
||||
cal.suppressAlarms = this.remoteCal.suppressAlarms; // sync setting
|
||||
cal.superCalendar = this;
|
||||
}
|
||||
return (this.m_localCal = cal);
|
||||
},
|
||||
|
||||
toString:
|
||||
function()
|
||||
{
|
||||
return "cached-wcap | " + this.remoteCal.toString();
|
||||
},
|
||||
log:
|
||||
function( msg, context )
|
||||
{
|
||||
return this.remoteCal.log( msg, context ? context : this.toString() );
|
||||
},
|
||||
logError:
|
||||
function( err, context )
|
||||
{
|
||||
return this.remoteCal.logError(
|
||||
err, context ? context : this.toString() );
|
||||
},
|
||||
notifyError:
|
||||
function( err )
|
||||
{
|
||||
debugger;
|
||||
var msg = this.logError(err);
|
||||
this.notifyObservers(
|
||||
"onError",
|
||||
err instanceof Components.interfaces.nsIException
|
||||
? [err.result, err.message] : [-1, msg] );
|
||||
},
|
||||
|
||||
// calICalendarProvider:
|
||||
get prefChromeOverlay() {
|
||||
return this.remoteCal.prefChromeOverlay;
|
||||
},
|
||||
// displayName attribute already part of calIWcapCalendar
|
||||
createCalendar:
|
||||
function( name, url, listener ) {
|
||||
this.remoteCal.createCalendar( name, url, listener );
|
||||
},
|
||||
deleteCalendar: function( calendar, listener ) {
|
||||
this.remoteCal.deleteCalendar( calendar, listener );
|
||||
},
|
||||
getCalendar: function( url ) {
|
||||
return this.remoteCal.getCalendar( url );
|
||||
},
|
||||
|
||||
// calIWcapCalendar:
|
||||
// xxx todo: generic facade helpers for most function delegates
|
||||
|
||||
get session() { return this.remoteCal.session; },
|
||||
get calId() { return this.remoteCal.calId; },
|
||||
get calId_() { return this.remoteCal.calId_; },
|
||||
set calId(id) {
|
||||
this.localCal = null; // disconnect
|
||||
return (this.remoteCal.calId = id);
|
||||
},
|
||||
get description() { return this.remoteCal.description; },
|
||||
get displayName() { return this.remoteCal.displayName; },
|
||||
get isOwnedCalendar() { return this.remoteCal.isOwnedCalendar; },
|
||||
getCalendarProperties:
|
||||
function( propName, out_count ) {
|
||||
return this.remoteCal.getCalendarProperties(propName, out_count); },
|
||||
getCalProps_:
|
||||
function( bAsync ) {
|
||||
return this.remoteCal.getCalProps_(bAsync);
|
||||
},
|
||||
|
||||
get defaultTimezone() {
|
||||
return this.remoteCal.defaultTimezone;
|
||||
},
|
||||
|
||||
// calICalendar:
|
||||
get name() {
|
||||
return getCalendarManager().getCalendarPref( this, "NAME" );
|
||||
},
|
||||
set name(name) {
|
||||
getCalendarManager().setCalendarPref( this, "NAME", name );
|
||||
return name;
|
||||
},
|
||||
|
||||
get type() { return "wcap"; },
|
||||
|
||||
m_bReadOnly: false,
|
||||
get readOnly() { return (this.m_bReadOnly || this.remoteCal.readOnly); },
|
||||
set readOnly(bReadOnly) { return (this.m_bReadOnly = bReadOnly); },
|
||||
|
||||
get uri() { return this.remoteCal.uri; },
|
||||
set uri(thatUri) {
|
||||
this.localCal = null; // disconnect
|
||||
return (this.remoteCal.uri = thatUri);
|
||||
},
|
||||
|
||||
m_superCalendar: null,
|
||||
get superCalendar() { return this.m_superCalendar || this; },
|
||||
set superCalendar(cal) { return (this.m_superCalendar = cal); },
|
||||
|
||||
m_observers: null,
|
||||
notifyObservers:
|
||||
function( func, args )
|
||||
{
|
||||
this.m_observers.forEach(
|
||||
function( obj ) {
|
||||
try {
|
||||
obj[func].apply( obj, args );
|
||||
}
|
||||
catch (exc) {
|
||||
// don't call notifyError() here:
|
||||
Components.utils.reportError( exc );
|
||||
}
|
||||
} );
|
||||
},
|
||||
|
||||
addObserver:
|
||||
function( observer )
|
||||
{
|
||||
if (this.m_observers.indexOf( observer ) == -1) {
|
||||
this.m_observers.push( observer );
|
||||
}
|
||||
},
|
||||
|
||||
removeObserver:
|
||||
function( observer )
|
||||
{
|
||||
this.m_observers = this.m_observers.filter(
|
||||
function(x) { return x != observer; } );
|
||||
},
|
||||
|
||||
// xxx todo: batch currently not used
|
||||
startBatch: function() { this.notifyObservers( "onStartBatch", [] ); },
|
||||
endBatch: function() { this.notifyObservers( "onEndBatch", [] ); },
|
||||
|
||||
get suppressAlarms() { return this.remoteCal.suppressAlarms; },
|
||||
set suppressAlarms( bSuppressAlarms ) {
|
||||
this.remoteCal.suppressAlarms = bSuppressAlarms;
|
||||
return (this.localCal.suppressAlarms = this.remoteCal.suppressAlarms);
|
||||
},
|
||||
|
||||
get canRefresh() { return true; },
|
||||
|
||||
refresh:
|
||||
function()
|
||||
{
|
||||
this.log( "refresh() call." );
|
||||
if (this.remoteCal.canRefresh)
|
||||
this.remoteCal.refresh();
|
||||
if (this.localCal.canRefresh)
|
||||
this.localCal.refresh();
|
||||
// sync in changes to local calendar:
|
||||
this.sync(null);
|
||||
this.log( "refresh() returning." );
|
||||
},
|
||||
|
||||
adoptItem:
|
||||
function( item, listener )
|
||||
{
|
||||
this.remoteCal.adoptItem( item, listener );
|
||||
},
|
||||
|
||||
addItem:
|
||||
function( item, listener )
|
||||
{
|
||||
this.remoteCal.addItem( item, listener );
|
||||
},
|
||||
|
||||
modifyItem:
|
||||
function( newItem, oldItem, listener )
|
||||
{
|
||||
this.remoteCal.modifyItem( newItem, oldItem, listener );
|
||||
},
|
||||
|
||||
deleteItem:
|
||||
function( item, listener )
|
||||
{
|
||||
this.remoteCal.deleteItem( item, listener );
|
||||
},
|
||||
|
||||
getItem:
|
||||
function( id, listener )
|
||||
{
|
||||
// xxx todo: testing
|
||||
this.log( ">>>>>>>>>>>>>>>> getItem() call!");
|
||||
this.refresh();
|
||||
this.localCal.getItem( id, listener );
|
||||
this.log( "getItem() returning." );
|
||||
},
|
||||
|
||||
getItems:
|
||||
function( itemFilter, maxResults, rangeStart, rangeEnd, listener )
|
||||
{
|
||||
this.log( "getItems():\n\titemFilter=" + itemFilter +
|
||||
",\n\tmaxResults=" + maxResults +
|
||||
",\n\trangeStart=" + getIcalUTC(rangeStart) +
|
||||
",\n\trangeEnd=" + getIcalUTC(rangeEnd) );
|
||||
var this_ = this;
|
||||
this.sync(
|
||||
{ // calIOperationListener:
|
||||
onOperationComplete:
|
||||
function( calendar, status, opType, id, detail )
|
||||
{
|
||||
if (listener != null) {
|
||||
if (status == NS_OK) {
|
||||
// delegate to local cal:
|
||||
this_.log("begin localCal.getItems().");
|
||||
this_.localCal.getItems(
|
||||
itemFilter, maxResults, rangeStart, rangeEnd,
|
||||
listener );
|
||||
this_.log("end localCal.getItems().");
|
||||
}
|
||||
else {
|
||||
listener.onOperationComplete(
|
||||
calendar, status, opType, id, detail );
|
||||
}
|
||||
}
|
||||
},
|
||||
onGetResult:
|
||||
function( calendar, status, itemType, detail, count, items )
|
||||
{
|
||||
this_.notifyError( "unexpected onGetResult upon sync!" );
|
||||
}
|
||||
} );
|
||||
},
|
||||
|
||||
syncChangesTo:
|
||||
function( destCal, itemFilter, dtFrom, listener )
|
||||
{
|
||||
throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
|
||||
},
|
||||
|
||||
getStampFile:
|
||||
function()
|
||||
{
|
||||
var stampFile = this.localCal.uri.QueryInterface(
|
||||
Components.interfaces.nsIFileURL ).file.clone();
|
||||
stampFile.leafName += ".last_sync";
|
||||
return stampFile;
|
||||
},
|
||||
|
||||
getStamp:
|
||||
function()
|
||||
{
|
||||
var dtStamp = null;
|
||||
if (CACHE == "memory") {
|
||||
var stamp = g_localCalsLastSync[this.getCalKey()];
|
||||
if (stamp) // return null if undefined
|
||||
dtStamp = stamp;
|
||||
}
|
||||
else {
|
||||
var stampFile = this.getStampFile();
|
||||
if (stampFile.exists()) {
|
||||
dtStamp = new CalDateTime();
|
||||
dtStamp.jsDate = new Date(stampFile.lastModifiedTime); // is UTC
|
||||
}
|
||||
}
|
||||
return dtStamp;
|
||||
},
|
||||
|
||||
updateStamp:
|
||||
function( dtStamp )
|
||||
{
|
||||
if (CACHE == "memory") {
|
||||
g_localCalsLastSync[this.getCalKey()] = dtStamp.clone();
|
||||
}
|
||||
else {
|
||||
var stampFile = this.getStampFile();
|
||||
// xxx todo: setting lastModifiedTime does not work
|
||||
// (at least not on Windows)
|
||||
// stampFile.lastModifiedTime = (dtStamp.nativeTime / 1000);
|
||||
// xxx todo: changes inbetween get lost!
|
||||
if (stampFile.exists())
|
||||
stampFile.remove(false);
|
||||
stampFile.create(
|
||||
Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0700 );
|
||||
}
|
||||
if (LOG_LEVEL > 0) {
|
||||
var st = dtStamp;
|
||||
if (stampFile) {
|
||||
st = new CalDateTime();
|
||||
st.jsDate = new Date(stampFile.lastModifiedTime); // is UTC
|
||||
}
|
||||
this.log( "updated stamp to " + dtStamp + "\n\tnew stamp: " + st );
|
||||
}
|
||||
},
|
||||
|
||||
m_syncQueue: null,
|
||||
sync:
|
||||
function( listener )
|
||||
{
|
||||
this.log( "sync(): queueing request." );
|
||||
// serialize sync() calls into queue:
|
||||
var this_ = this;
|
||||
this.m_syncQueue.postRequest(
|
||||
function( requestToken ) {
|
||||
this_.sync_req( requestToken, listener );
|
||||
} );
|
||||
},
|
||||
sync_req:
|
||||
function( requestToken, listener )
|
||||
{
|
||||
try {
|
||||
var this_ = this;
|
||||
var localCal = this.localCal;
|
||||
var remoteCal = this.remoteCal;
|
||||
|
||||
var dtFrom = this.getStamp();
|
||||
const SYNC = Components.interfaces.calIWcapCalendar.SYNC;
|
||||
|
||||
// first sync in changes from remote, then get items from locally:
|
||||
remoteCal.syncChangesTo(
|
||||
localCal,
|
||||
Components.interfaces.calICalendar.ITEM_FILTER_ALL_ITEMS,
|
||||
dtFrom,
|
||||
{ // calIOperationListener:
|
||||
onOperationComplete:
|
||||
function( calendar, status, opType, id, detail )
|
||||
{
|
||||
try {
|
||||
if (status == NS_OK) {
|
||||
if (opType == SYNC) {
|
||||
// write stamp: only if necessary
|
||||
if (dtFrom == null ||
|
||||
dtFrom.compare(detail) != 0) {
|
||||
this_.updateStamp( detail );
|
||||
}
|
||||
if (listener != null) {
|
||||
listener.onOperationComplete(
|
||||
this_.superCalendar,
|
||||
NS_OK, SYNC, null, null );
|
||||
}
|
||||
}
|
||||
else {
|
||||
throw new Components.Exception(
|
||||
"unexpected operation type! " +
|
||||
"(expected SYNC)" );
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (listener != null) // forward errors:
|
||||
listener.onOperationComplete(
|
||||
calendar, status,
|
||||
opType, id, detail );
|
||||
// already notified in wcap cal:
|
||||
// this_.notifyError( detail );
|
||||
}
|
||||
}
|
||||
catch (exc) {
|
||||
if (listener != null) {
|
||||
listener.onOperationComplete(
|
||||
this_.superCalendar,
|
||||
Components.results.NS_ERROR_FAILURE,
|
||||
SYNC, null, exc );
|
||||
}
|
||||
this_.notifyError( exc );
|
||||
}
|
||||
this_.m_syncQueue.requestCompleted( requestToken );
|
||||
},
|
||||
onGetResult:
|
||||
function( calendar, status, itemType, detail, count, items )
|
||||
{
|
||||
this_.notifyError( "unexpected onGetResult upon " +
|
||||
"calling syncChangesTo()!" );
|
||||
}
|
||||
} );
|
||||
}
|
||||
catch (exc) {
|
||||
if (listener != null) {
|
||||
listener.onOperationComplete(
|
||||
this.superCalendar, Components.results.NS_ERROR_FAILURE,
|
||||
SYNC, null, exc );
|
||||
}
|
||||
this.notifyError( exc );
|
||||
this.m_syncQueue.requestCompleted( requestToken );
|
||||
}
|
||||
this.log( "sync_req() returning." );
|
||||
}
|
||||
};
|
||||
|
||||
function ObserverMultiplexer( calendar ) {
|
||||
this.wrappedJSObject = this;
|
||||
this.m_calendar = calendar;
|
||||
}
|
||||
ObserverMultiplexer.prototype = {
|
||||
m_calendar: null,
|
||||
|
||||
// calIObserver:
|
||||
onStartBatch:
|
||||
function()
|
||||
{
|
||||
this.m_calendar.notifyObservers( "onStartBatch", [] );
|
||||
},
|
||||
onEndBatch:
|
||||
function()
|
||||
{
|
||||
this.m_calendar.notifyObservers( "onEndBatch", [] );
|
||||
},
|
||||
onLoad:
|
||||
function()
|
||||
{
|
||||
this.m_calendar.notifyObservers( "onLoad", [] );
|
||||
},
|
||||
onAddItem:
|
||||
function( item )
|
||||
{
|
||||
this.m_calendar.notifyObservers( "onAddItem", [item] );
|
||||
},
|
||||
onModifyItem:
|
||||
function( newItem, oldItem )
|
||||
{
|
||||
this.m_calendar.notifyObservers( "onModifyItem", [newItem, oldItem] );
|
||||
},
|
||||
onDeleteItem:
|
||||
function( item )
|
||||
{
|
||||
this.m_calendar.notifyObservers( "onDeleteItem", [item] );
|
||||
},
|
||||
onAlarm:
|
||||
function( item )
|
||||
{
|
||||
this.m_calendar.notifyObservers( "onAlarm", [item] );
|
||||
},
|
||||
onError:
|
||||
function( errNo, msg )
|
||||
{
|
||||
this.m_calendar.notifyObservers( "onError", [errNo, msg] );
|
||||
}
|
||||
};
|
||||
|
||||
@ -36,21 +36,6 @@
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
function createWcapCalendar(session, /*optional*/calProps)
|
||||
{
|
||||
var cal = new calWcapCalendar(session, calProps);
|
||||
// switch (CACHE) {
|
||||
// case "memory":
|
||||
// case "storage":
|
||||
// // wrap it up:
|
||||
// var cal_ = new calWcapCachedCalendar();
|
||||
// cal_.remoteCal = cal;
|
||||
// cal = cal_;
|
||||
// break;
|
||||
// }
|
||||
return cal;
|
||||
}
|
||||
|
||||
function calWcapCalendar(session, /*optional*/calProps) {
|
||||
this.wrappedJSObject = this;
|
||||
this.m_session = session;
|
||||
|
||||
@ -64,6 +64,18 @@ function calWcapCalendar_encodeAttendee(att)
|
||||
return encodeAttr(att.id, null, params);
|
||||
};
|
||||
|
||||
calWcapCalendar.prototype.encodeNscpTzid =
|
||||
function calWcapCalendar_encodeNscpTzid(dateTime)
|
||||
{
|
||||
var params = "X-NSCP-ORIGINAL-OPERATION=X-NSCP-WCAP-PROPERTY-";
|
||||
if (!dateTime || !dateTime.isValid || dateTime.isDate || (dateTime.timezone == "floating")) {
|
||||
params += "DELETE^";
|
||||
} else {
|
||||
params += ("REPLACE^" + encodeURIComponent(this.getAlignedTimezone(dateTime.timezone)));
|
||||
}
|
||||
return params;
|
||||
};
|
||||
|
||||
calWcapCalendar.prototype.getRecurrenceParams =
|
||||
function calWcapCalendar_getRecurrenceParams(
|
||||
item, out_rrules, out_rdates, out_exrules, out_exdates)
|
||||
@ -336,13 +348,9 @@ function calWcapCalendar_storeItem(bAddItem, item, oldItem, request, netRespFunc
|
||||
if (!oldItem || !identicalDatetimes(dtstart, oldItem.startDate)
|
||||
|| !identicalDatetimes(dtend, oldItem.endDate)) {
|
||||
params += ("&dtstart=" + getIcalUTC(dtstart));
|
||||
params += ("&X-NSCP-DTSTART-TZID=" +
|
||||
"X-NSCP-ORIGINAL-OPERATION=X-NSCP-WCAP-PROPERTY-REPLACE^" +
|
||||
encodeURIComponent(this.getAlignedTimezone(dtstart.timezone)));
|
||||
params += ("&X-NSCP-DTSTART-TZID=" + this.encodeNscpTzid(dtstart));
|
||||
params += ("&dtend=" + getIcalUTC(dtend));
|
||||
params += ("&X-NSCP-DTEND-TZID=" +
|
||||
"X-NSCP-ORIGINAL-OPERATION=X-NSCP-WCAP-PROPERTY-REPLACE^" +
|
||||
encodeURIComponent(this.getAlignedTimezone(dtend.timezone)));
|
||||
params += ("&X-NSCP-DTEND-TZID=" + this.encodeNscpTzid(dtend));
|
||||
params += (bIsAllDay ? "&isAllDay=1" : "&isAllDay=0");
|
||||
|
||||
if (bIsParent && item.recurrenceInfo)
|
||||
@ -358,17 +366,9 @@ function calWcapCalendar_storeItem(bAddItem, item, oldItem, request, netRespFunc
|
||||
if (!oldItem || !identicalDatetimes(dtstart, oldItem.entryDate)
|
||||
|| !identicalDatetimes(dtend, oldItem.dueDate)) {
|
||||
params += ("&dtstart=" + getIcalUTC(dtstart));
|
||||
if (dtstart) {
|
||||
params += ("&X-NSCP-DTSTART-TZID=" +
|
||||
"X-NSCP-ORIGINAL-OPERATION=X-NSCP-WCAP-PROPERTY-REPLACE^" +
|
||||
encodeURIComponent(this.getAlignedTimezone(dtstart.timezone)));
|
||||
}
|
||||
params += ("&X-NSCP-DTSTART-TZID=" + this.encodeNscpTzid(dtstart));
|
||||
params += ("&due=" + getIcalUTC(dtend));
|
||||
if (dtend) {
|
||||
params += ("&X-NSCP-DUE-TZID=" +
|
||||
"X-NSCP-ORIGINAL-OPERATION=X-NSCP-WCAP-PROPERTY-REPLACE^" +
|
||||
encodeURIComponent(this.getAlignedTimezone(dtend.timezone)));
|
||||
}
|
||||
params += ("&X-NSCP-DUE-TZID=" + this.encodeNscpTzid(dtend));
|
||||
params += (bIsAllDay ? "&isAllDay=1" : "&isAllDay=0");
|
||||
|
||||
if (bIsParent && item.recurrenceInfo)
|
||||
|
||||
@ -66,10 +66,6 @@ var g_busyItemTitle;
|
||||
var g_busyPhantomItemUuidPrefix;
|
||||
|
||||
// global preferences:
|
||||
// caching: off|memory|storage:
|
||||
var CACHE = "off";
|
||||
// denotes where to host local storage calendar(s)
|
||||
var CACHE_DIR = null;
|
||||
|
||||
// caching the last data retrievals:
|
||||
var CACHE_LAST_RESULTS = 4;
|
||||
@ -133,30 +129,6 @@ function initWcapProvider()
|
||||
|
||||
CACHE_LAST_RESULTS = getPref("calendar.wcap.cache_last_results", 4);
|
||||
CACHE_LAST_RESULTS_INVALIDATE = getPref("calendar.wcap.cache_last_results_invalidate", 120);
|
||||
|
||||
// init cache dir directory:
|
||||
CACHE = getPref("calendar.wcap.cache", "off");
|
||||
if (CACHE == "storage") {
|
||||
var cacheDir = null;
|
||||
var sCacheDir = getPref("calendar.wcap.cache_dir", null);
|
||||
if (sCacheDir != null) {
|
||||
cacheDir = Components.classes["@mozilla.org/file/local;1"]
|
||||
.createInstance(Components.interfaces.nsILocalFile);
|
||||
cacheDir.initWithPath( sCacheDir );
|
||||
}
|
||||
else { // not found: default to wcap/ directory in profile
|
||||
var dirService = Components.classes["@mozilla.org/file/directory_service;1"]
|
||||
.getService(Components.interfaces.nsIProperties);
|
||||
cacheDir = dirService.get("ProfD", Components.interfaces.nsILocalFile);
|
||||
cacheDir.append("wcap");
|
||||
}
|
||||
CACHE_DIR = cacheDir;
|
||||
log(CACHE_DIR.path, "cache dir");
|
||||
if (!CACHE_DIR.exists()) {
|
||||
CACHE_DIR.create(Components.interfaces.nsIFile.DIRECTORY_TYPE,
|
||||
0700 /* read, write, execute/search by owner */);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (exc) {
|
||||
logError(exc, "error in init sequence");
|
||||
|
||||
@ -692,7 +692,7 @@ calWcapSession.prototype = {
|
||||
}
|
||||
}
|
||||
else {
|
||||
cal = createWcapCalendar(this_, node);
|
||||
cal = new calWcapCalendar(this_, node);
|
||||
this_.m_subscribedCals[calId] = cal;
|
||||
getCalendarManager().registerCalendar(cal);
|
||||
log("installed subscribed calendar: " + calId, this_);
|
||||
@ -917,7 +917,7 @@ calWcapSession.prototype = {
|
||||
m_defaultCalendar: null,
|
||||
get defaultCalendar() {
|
||||
if (!this.m_defaultCalendar)
|
||||
this.m_defaultCalendar = createWcapCalendar(this);
|
||||
this.m_defaultCalendar = new calWcapCalendar(this);
|
||||
return this.m_defaultCalendar;
|
||||
},
|
||||
|
||||
@ -1008,8 +1008,9 @@ calWcapSession.prototype = {
|
||||
log("installed default cal props.", this_);
|
||||
}
|
||||
}
|
||||
else
|
||||
cal = createWcapCalendar(this_, node);
|
||||
else {
|
||||
cal = new calWcapCalendar(this_, node);
|
||||
}
|
||||
}
|
||||
ret.push(cal);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user