diff options
author | Gareth Aye <gaye@mozilla.com> | 2014-04-09 17:09:41 -0400 |
---|---|---|
committer | Gareth Aye <gaye@mozilla.com> | 2014-04-09 17:09:41 -0400 |
commit | bed92eae10558cdd8eddfd91f5d8addaf509413c (patch) | |
tree | 7cea8cf23f76e40261198ae0bdb9034c41e12a8a | |
parent | a1cfcdfcc5acfe9c233267073fe67d24cdee000c (diff) | |
parent | a8bf85aeedc1139b7cfa527ad4c42bb9feee5345 (diff) | |
download | jsCalDAV-bed92eae10558cdd8eddfd91f5d8addaf509413c.tar.gz |
Merge pull request #22 from gaye/bug-974554master
Bug 974554 - Followup to fix packaging bug introduced in c197de
-rw-r--r-- | caldav.js | 9 | ||||
-rw-r--r-- | lib/caldav/connection.js | 9 |
2 files changed, 14 insertions, 4 deletions
@@ -2744,8 +2744,13 @@ function write (chunk) { (function(module, ns) { - var Caldav = ns.require('caldav'), - XHR = ns.require('xhr'); + var Caldav; + if (typeof(window) !== 'undefined') { + Caldav = window.Caldav; + } else { + Caldav = ns.require('caldav'); + } + var XHR = ns.require('xhr'); /** * Connection objects contain diff --git a/lib/caldav/connection.js b/lib/caldav/connection.js index 8869571..c3a2588 100644 --- a/lib/caldav/connection.js +++ b/lib/caldav/connection.js @@ -1,7 +1,12 @@ (function(module, ns) { - var Caldav = ns.require('caldav'), - XHR = ns.require('xhr'); + var Caldav; + if (typeof(window) !== 'undefined') { + Caldav = window.Caldav; + } else { + Caldav = ns.require('caldav'); + } + var XHR = ns.require('xhr'); /** * Connection objects contain |