Updates for Firefox 1.2.11

chrispederick · Aug 18, 2016 · d0a0cc4 · d0a0cc4
1 parent ab12f8d
commit d0a0cc4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/configuration/firefox/configuration.properties b/configuration/firefox/configuration.properties
@@ -1,3 +1,3 @@
 common.prefix=chrome://web-developer/content
 description=Adds a menu and a toolbar with various web developer tools.
-version=1.2.10
+version=1.2.11
diff --git a/source/firefox/javascript/cookies/cookies.js b/source/firefox/javascript/cookies/cookies.js
@@ -58,7 +58,15 @@ WebDeveloper.Cookies.canEditLocalCookie = function()
 // Deletes a cookie
 WebDeveloper.Cookies.deleteCookie = function(cookie)
 {
-  Components.classes["@mozilla.org/cookiemanager;1"].getService(Components.interfaces.nsICookieManager2).remove(cookie.host, cookie.name, cookie.path, false, false);
+  // Try to delete the cookie without origin attributes
+  try
+  {
+    Components.classes["@mozilla.org/cookiemanager;1"].getService(Components.interfaces.nsICookieManager2).remove(cookie.host, cookie.name, cookie.path, false);
+  }
+  catch(exception)
+  {
+    Components.classes["@mozilla.org/cookiemanager;1"].getService(Components.interfaces.nsICookieManager2).remove(cookie.host, cookie.name, cookie.path, false, cookie.originAttributes);
+  }
 };
 
 // Returns all cookies
@@ -75,14 +83,15 @@ WebDeveloper.Cookies.getAllCookies = function()
     cookie       = {};
     cookieObject = cookieEnumeration.getNext().QueryInterface(Components.interfaces.nsICookie2);
 
-    cookie.expires  = cookieObject.expires;
-    cookie.host     = cookieObject.host;
-    cookie.httpOnly = cookieObject.isHttpOnly;
-    cookie.name     = cookieObject.name;
-    cookie.path     = cookieObject.path;
-    cookie.secure   = cookieObject.isSecure;
-    cookie.session  = cookieObject.isSession;
-    cookie.value    = cookieObject.value;
+    cookie.expires          = cookieObject.expires;
+    cookie.host             = cookieObject.host;
+    cookie.httpOnly         = cookieObject.isHttpOnly;
+    cookie.name             = cookieObject.name;
+    cookie.originAttributes = cookieObject.originAttributes;
+    cookie.path             = cookieObject.path;
+    cookie.secure           = cookieObject.isSecure;
+    cookie.session          = cookieObject.isSession;
+    cookie.value            = cookieObject.value;
 
     allCookies.push(cookie);
   }