Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-03-13 11:09:23 +08:00
commit 9d612014f8
80 changed files with 1267 additions and 1198 deletions

View file

@ -597,7 +597,7 @@ var gCookiesWindow = {
removeSelectedCookies.disabled = !hasRows || !hasSelection;
},
performDeletion: function gCookiesWindow_performDeletion(deleteItems) {
performDeletion: function(deleteItems) {
var psvc = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch);
var blockFutureCookies = false;
@ -902,7 +902,7 @@ var gCookiesWindow = {
}
},
_updateRemoveAllButton: function gCookiesWindow__updateRemoveAllButton() {
_updateRemoveAllButton: function() {
let removeAllCookies = document.getElementById("removeAllCookies");
removeAllCookies.disabled = this._view._rowCount == 0;