Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:mozilla-b2g/caldav

  • Loading branch information...
commit fbd1d6d84ef1d793fd42bc32aa8bc46f1eb5534b 2 parents 3c19897 + e36e68c
@lightsofapollo lightsofapollo authored
View
12 caldav.js
@@ -2527,8 +2527,7 @@ function write (chunk) {
oncomplete: function() {
var propstat = this.stack[this.stack.length - 1];
- var hash = propstat.propstat;
-
+ propstat = propstat.propstat;
var key;
var status = this.current.status;
var props = this.current.prop;
@@ -2536,21 +2535,14 @@ function write (chunk) {
delete this.current.status;
delete this.current.prop;
- var hasProps = false;
-
for (key in props) {
- hasProps = true;
if (Object.hasOwnProperty.call(props, key)) {
- hash[key] = {
+ propstat[key] = {
status: status,
value: props[key]
};
}
}
-
- if (!hasProps) {
- propstat.propstat = false;
- }
}
});
View
12 lib/caldav/sax/dav_response.js
@@ -165,8 +165,7 @@
oncomplete: function() {
var propstat = this.stack[this.stack.length - 1];
- var hash = propstat.propstat;
-
+ propstat = propstat.propstat;
var key;
var status = this.current.status;
var props = this.current.prop;
@@ -174,21 +173,14 @@
delete this.current.status;
delete this.current.prop;
- var hasProps = false;
-
for (key in props) {
- hasProps = true;
if (Object.hasOwnProperty.call(props, key)) {
- hash[key] = {
+ propstat[key] = {
status: status,
value: props[key]
};
}
}
-
- if (!hasProps) {
- propstat.propstat = false;
- }
}
});
View
7 samples/xml/propget.xml
@@ -2,13 +2,6 @@
<D:multistatus xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
<D:response>
- <D:href>/calendar/fake/</D:href>
- <D:propstat>
- <D:status>HTTP/1.1 404 Not Found</D:status>
- </D:propstat>
- </D:response>
-
- <D:response>
<D:href>/calendar/user/</D:href>
View
7 test/caldav/sax/dav_response_test.js
@@ -83,9 +83,8 @@ suite('caldav/sax/dav_response', function() {
});
expected = {
- '/calendar/fake/': false,
-
'/calendar/user/': {
+
'principal-URL': {
status: '200',
value: {
@@ -136,7 +135,7 @@ suite('caldav/sax/dav_response', function() {
'/calendar/user/',
expected['/calendar/user/']
],
- response[1],
+ response[0],
'/calendar/user/ response'
);
@@ -145,7 +144,7 @@ suite('caldav/sax/dav_response', function() {
'/calendar/other',
expected['/calendar/other']
],
- response[2],
+ response[1],
'/calendar/other/ response'
);
Please sign in to comment.
Something went wrong with that request. Please try again.