Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 09:45:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1467713 - Part 1 - Rename functions in "permissions.js" to match "sitePermissions.js". r=jaws

Browse Source 
MozReview-Commit-ID: KeF5mcVvVHl

--HG--
extra : rebase_source : 39ef7ada1138a3bc3c87e20fca958aa26c7fff95
This commit is contained in:
Paolo Amadini 2018-06-05 15:12:39 +01:00
parent ce132119dd
commit e895567b26
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/components/preferences/permissions.js
View File

@ -330,14 +330,14 @@ var gPermissionManager = {
}
},
onPermissionSelected() {
onPermissionSelect() {
var hasSelection = this._tree.view.selection.count > 0;
var hasRows = this._tree.view.rowCount > 0;
document.getElementById("removePermission").disabled = !hasRows || !hasSelection;
document.getElementById("removeAllPermissions").disabled = !hasRows;
},
onPermissionDeleted() {
onPermissionDelete() {
if (!this._view.rowCount)
return;
var removedPermissions = [];
@ -350,7 +350,7 @@ var gPermissionManager = {
document.getElementById("removeAllPermissions").disabled = !this._permissions.length;
},
onAllPermissionsDeleted() {
onAllPermissionsDelete() {
if (!this._view.rowCount)
return;
var removedPermissions = [];
@ -365,10 +365,10 @@ var gPermissionManager = {
onPermissionKeyPress(aEvent) {
if (aEvent.keyCode == KeyEvent.DOM_VK_DELETE) {
this.onPermissionDeleted();
this.onPermissionDelete();
} else if (AppConstants.platform == "macosx" &&
aEvent.keyCode == KeyEvent.DOM_VK_BACK_SPACE) {
this.onPermissionDeleted();
this.onPermissionDelete();
aEvent.preventDefault();
}
},

6
browser/components/preferences/permissions.xul
View File

@ -51,7 +51,7 @@
<tree id="permissionsTree" flex="1" style="height: 18em;"
hidecolumnpicker="true"
onkeypress="gPermissionManager.onPermissionKeyPress(event)"
onselect="gPermissionManager.onPermissionSelected();">
onselect="gPermissionManager.onPermissionSelect();">
<treecols>
<treecol id="siteCol" data-l10n-id="permissions-site-name" flex="3"
data-field-name="origin" persist="width"/>
@ -67,11 +67,11 @@
<button id="removePermission" disabled="true"
data-l10n-id="permissions-remove"
icon="remove"
oncommand="gPermissionManager.onPermissionDeleted();"/>
oncommand="gPermissionManager.onPermissionDelete();"/>
<button id="removeAllPermissions"
data-l10n-id="permissions-remove-all"
icon="clear"
oncommand="gPermissionManager.onAllPermissionsDeleted();"/>
oncommand="gPermissionManager.onAllPermissionsDelete();"/>
</hbox>
<spacer flex="1"/>
<hbox class="actionButtons" align="right" flex="1">