Merge branch 'master' of github.com:firebug/firebug

firebug · Jun 22, 2012 · b803c31 · b803c31
2 parents c71f466 + f01f6df
commit b803c31
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 67 deletions.
diff --git a/extension/content/firebug/cookies/cookieReps.js b/extension/content/firebug/cookies/cookieReps.js
@@ -39,19 +39,6 @@ const Ci = Components.interfaces;
 const lastSortedColumn = "cookies.lastSortedColumn";
 const hiddenColsPref = "cookies.hiddenColumns";
 
-// Cookie status & policy
-var STATUS_UNKNOWN = Ci.nsICookie2.STATUS_UNKNOWN;
-var STATUS_ACCEPTED = Ci.nsICookie2.STATUS_ACCEPTED;
-var STATUS_DOWNGRADED = Ci.nsICookie2.STATUS_DOWNGRADED;
-var STATUS_FLAGGED = Ci.nsICookie2.STATUS_FLAGGED;
-var STATUS_REJECTED = Ci.nsICookie2.STATUS_REJECTED;
-
-var POLICY_UNKNOWN = Ci.nsICookie2.POLICY_UNKNOWN;
-var POLICY_NONE = Ci.nsICookie2.POLICY_NONE;
-var POLICY_NO_CONSENT = Ci.nsICookie2.POLICY_NO_CONSENT;
-var POLICY_IMPLICIT_CONSENT = Ci.nsICookie2.POLICY_IMPLICIT_CONSENT;
-var POLICY_NO_II = Ci.nsICookie2.POLICY_NO_II;
-
 const panelName = "cookies";
 
 // ********************************************************************************************* //
@@ -129,9 +116,6 @@ CookieReps.CookieRow = domplate(CookieReps.Rep,
                 ),
                 TD({"class": "cookieSecurityCol cookieCol"},
                     DIV({"class": "cookieSecurityLabel cookieLabel"}, "$cookie|isSecure")
-                ),
-                TD({"class": "cookieStatusCol cookieCol"},
-                    DIV({"class": "cookieLabel"}, "$cookie|getStatus")
                 )
             )
         ),
@@ -283,48 +267,6 @@ CookieReps.CookieRow = domplate(CookieReps.Rep,
         return cookie.cookie.isSecure ? Locale.$STR("cookies.secure.label") : "";
     },
 
-    getStatus: function(cookie)
-    {
-        if (!cookie.cookie.status)
-            return "";
-
-        switch (cookie.cookie.status)
-        {
-            case STATUS_UNKNOWN:
-                return "";
-            case STATUS_ACCEPTED:
-                return Locale.$STR("cookies.status.accepted");
-            case STATUS_DOWNGRADED:
-                return Locale.$STR("cookies.status.downgraded");
-            case STATUS_FLAGGED:
-                return Locale.$STR("cookies.status.flagged");
-            case STATUS_REJECTED:
-                return Locale.$STR("cookies.status.rejected");
-        }
-
-        return "";
-    },
-
-    getPolicy: function(cookie)
-    {
-        switch (cookie.cookie.policy)
-        {
-            //xxxHonza localization
-            case POLICY_UNKNOWN:
-                return "POLICY_UNKNOWN";
-            case POLICY_NONE:
-                return "POLICY_NONE";
-            case POLICY_NO_CONSENT:
-                return "POLICY_NO_CONSENT";
-            case POLICY_IMPLICIT_CONSENT:
-                return "POLICY_IMPLICIT_CONSENT";
-            case POLICY_NO_II:
-                return "POLICY_NO_II";
-        }
-
-        return "";
-    },
-
     // Firebug rep support
     supportsObject: function(cookie)
     {
@@ -1070,12 +1012,6 @@ CookieReps.CookieTable = domplate(CookieReps.Rep,
                         DIV({"class": "cookieHeaderCellBox",
                             title: Locale.$STR("cookies.header.security.tooltip")}, 
                         Locale.$STR("cookies.header.security"))
-                    ),
-                    TD({id: "colStatus", role: "columnheader",
-                        "class": "cookieHeaderCell alphaValue a11yFocus"},
-                        DIV({"class": "cookieHeaderCellBox",
-                            title: Locale.$STR("cookies.header.status.tooltip")}, 
-                        Locale.$STR("cookies.header.status"))
                     )
                 )
             )

diff --git a/extension/locale/en-US/cookies.properties b/extension/locale/en-US/cookies.properties
@@ -192,13 +192,12 @@ cookies.header.size=Size
 cookies.header.path=Path
 cookies.header.expires=Expires
 cookies.header.security=Security
-cookies.header.status=Status
 cookies.header.httponly=HttpOnly
 
 # LOCALIZATION NOTE (cookies.header.name.tooltip, cookies.header.value.tooltip,
 # cookies.header.rawValue.tooltip, cookies.header.domain.tooltip, cookies.header.size.tooltip,
 # cookies.header.path.tooltip, cookies.header.expires.tooltip, cookies.header.security.tooltip,
-# cookies.header.status.tooltip, cookies.header.httponly.tooltip):
+# cookies.header.httponly.tooltip):
 # Column tooltips used in the cookie header.
 cookies.header.name.tooltip=Name of the cookie
 cookies.header.value.tooltip=Value stored for the cookie
@@ -208,7 +207,6 @@ cookies.header.size.tooltip=Size of the stored cookie
 cookies.header.path.tooltip=Directory where the cookie is active
 cookies.header.expires.tooltip=Expiration date for the cookie
 cookies.header.security.tooltip=Shows whether it is a secure cookie or not
-cookies.header.status.tooltip=Status of the cookie (downgraded, flagged, etc.)
 cookies.header.httponly.tooltip=Shows if the cookie is an HTTP only cookie
 
 # LOCALIZATION NOTE (cookies.netinfo.Received_Cookies, cookies.netinfo.Sent_Cookies):