summaryrefslogtreecommitdiffstats
path: root/devtools/shared
diff options
context:
space:
mode:
Diffstat (limited to 'devtools/shared')
-rw-r--r--devtools/shared/gcli/commands/cookie.js22
1 files changed, 13 insertions, 9 deletions
diff --git a/devtools/shared/gcli/commands/cookie.js b/devtools/shared/gcli/commands/cookie.js
index f1680042f..203ac738c 100644
--- a/devtools/shared/gcli/commands/cookie.js
+++ b/devtools/shared/gcli/commands/cookie.js
@@ -100,7 +100,7 @@ exports.items = [
let cookies = [];
while (enm.hasMoreElements()) {
- let cookie = enm.getNext().QueryInterface(Ci.nsICookie);
+ let cookie = enm.getNext().QueryInterface(Ci.nsICookie2);
if (isCookieAtHost(cookie, host)) {
cookies.push({
host: cookie.host,
@@ -108,9 +108,10 @@ exports.items = [
value: cookie.value,
path: cookie.path,
expires: cookie.expires,
- secure: cookie.secure,
- httpOnly: cookie.httpOnly,
- sameDomain: cookie.sameDomain
+ isDomain: cookie.isDomain,
+ isHttpOnly: cookie.isHttpOnly,
+ isSecure: cookie.isSecure,
+ isSession: cookie.isSession,
});
}
}
@@ -169,11 +170,14 @@ exports.items = [
for (let cookie of cookies) {
cookie.expires = translateExpires(cookie.expires);
- let noAttrs = !cookie.secure && !cookie.httpOnly && !cookie.sameDomain;
- cookie.attrs = (cookie.secure ? "secure" : " ") +
- (cookie.httpOnly ? "httpOnly" : " ") +
- (cookie.sameDomain ? "sameDomain" : " ") +
- (noAttrs ? l10n.lookup("cookieListOutNone") : " ");
+ let noAttrs = !cookie.isDomain && !cookie.isHttpOnly &&
+ !cookie.isSecure && !cookie.isSession;
+ cookie.attrs = ((cookie.isDomain ? "isDomain " : "") +
+ (cookie.isHttpOnly ? "isHttpOnly " : "") +
+ (cookie.isSecure ? "isSecure " : "") +
+ (cookie.isSession ? "isSession " : "") +
+ (noAttrs ? l10n.lookup("cookieListOutNone") : ""))
+ .trim();
}
return context.createView({