[PALEMOON] Remove fullscreen and pointer-lock from permission managing

This commit is contained in:
JustOff 2018-05-06 14:48:52 +03:00 committed by Roy Tam
commit b6f0383b26
9 changed files with 2 additions and 158 deletions

View file

@ -52,7 +52,6 @@
<command id="cmd_cookieDef" oncommand="onCheckboxClick('cookie');"/>
<command id="cmd_desktop-notificationDef" oncommand="onCheckboxClick('desktop-notification');"/>
<command id="cmd_installDef" oncommand="onCheckboxClick('install');"/>
<command id="cmd_fullscreenDef" oncommand="onCheckboxClick('fullscreen');"/>
<command id="cmd_geoDef" oncommand="onCheckboxClick('geo');"/>
<command id="cmd_indexedDBDef" oncommand="onCheckboxClick('indexedDB');"/>
<command id="cmd_pluginsDef" oncommand="onCheckboxClick('plugins');"/>
@ -61,12 +60,9 @@
<command id="cmd_cookieToggle" oncommand="onRadioClick('cookie');"/>
<command id="cmd_desktop-notificationToggle" oncommand="onRadioClick('desktop-notification');"/>
<command id="cmd_installToggle" oncommand="onRadioClick('install');"/>
<command id="cmd_fullscreenToggle" oncommand="onRadioClick('fullscreen');"/>
<command id="cmd_geoToggle" oncommand="onRadioClick('geo');"/>
<command id="cmd_indexedDBToggle" oncommand="onRadioClick('indexedDB');"/>
<command id="cmd_pluginsToggle" oncommand="onPluginRadioClick(event);"/>
<command id="cmd_pointerLockDef" oncommand="onCheckboxClick('pointerLock');"/>
<command id="cmd_pointerLockToggle" oncommand="onRadioClick('pointerLock');"/>
</commandset>
<keyset id="pageInfoKeySet">
@ -405,31 +401,6 @@
</radiogroup>
</hbox>
</vbox>
<vbox class="permission" id="permFullscreenRow">
<label class="permissionLabel" id="permFullscreenLabel"
value="&permFullscreen;" control="fullscreenRadioGroup"/>
<hbox id="permFullscreenBox" role="group" aria-labelledby="permFullscreenLabel">
<checkbox id="fullscreenDef" command="cmd_fullscreenDef" label="&permUseDefault;"/>
<spacer flex="1"/>
<radiogroup id="fullscreenRadioGroup" orient="horizontal">
<radio id="fullscreen#0" command="cmd_fullscreenToggle" label="&permAskAlways;"/>
<radio id="fullscreen#1" command="cmd_fullscreenToggle" label="&permAllow;"/>
<radio id="fullscreen#2" command="cmd_fullscreenToggle" label="&permBlock;"/>
</radiogroup>
</hbox>
</vbox>
<vbox class="permission" id="permPointerLockRow" >
<label class="permissionLabel" id="permPointerLockLabel"
value="&permPointerLock2;" control="pointerLockRadioGroup"/>
<hbox id="permPointerLockBox" role="group" aria-labelledby="permPointerLockLabel">
<checkbox id="pointerLockDef" command="cmd_pointerLockDef" label="&permAskAlways;"/>
<spacer flex="1"/>
<radiogroup id="pointerLockRadioGroup" orient="horizontal">
<radio id="pointerLock#1" command="cmd_pointerLockToggle" label="&permAllow;"/>
<radio id="pointerLock#2" command="cmd_pointerLockToggle" label="&permBlock;"/>
</radiogroup>
</hbox>
</vbox>
</vbox>
</vbox>

View file

@ -76,20 +76,6 @@ var gPermObj = {
{
return UNKNOWN;
},
fullscreen: function getFullscreenDefaultPermissions()
{
if (!gPrefs.getBoolPref("full-screen-api.enabled")) {
return DENY;
}
return UNKNOWN;
},
pointerLock: function getPointerLockPermissions()
{
if (!gPrefs.getBoolPref("full-screen-api.pointer-lock.enabled")) {
return DENY;
}
return ALLOW;
},
};
var permissionObserver = {

View file

@ -418,31 +418,6 @@ var PermissionDefaults = {
Services.prefs.setBoolPref("dom.indexedDB.enabled", value);
},
get fullscreen() {
if (!Services.prefs.getBoolPref("full-screen-api.enabled")) {
return this.DENY;
}
// We always ask for permission to fullscreen with a specific site,
// so there is no global ALLOW.
return this.UNKNOWN;
},
set fullscreen(aValue) {
let value = (aValue != this.DENY);
Services.prefs.setBoolPref("full-screen-api.enabled", value);
},
get pointerLock() {
if (!Services.prefs.getBoolPref("full-screen-api.pointer-lock.enabled")) {
return this.DENY;
}
// We always ask for permission to hide the mouse pointer
// with a specific site, so there is no global ALLOW.
return this.UNKNOWN;
},
set pointerLock(aValue) {
let value = (aValue != this.DENY);
Services.prefs.setBoolPref("full-screen-api.pointer-lock.enabled", value);
},
}
/**
@ -489,14 +464,12 @@ var AboutPermissions = {
* Potential future additions: "sts/use", "sts/subd"
*/
_supportedPermissions: ["password", "image", "popup", "cookie",
"desktop-notification", "install", "geo", "indexedDB",
"fullscreen", "pointerLock"],
"desktop-notification", "install", "geo", "indexedDB"],
/**
* Permissions that don't have a global "Allow" option.
*/
_noGlobalAllow: ["desktop-notification", "geo", "indexedDB", "fullscreen",
"pointerLock"],
_noGlobalAllow: ["desktop-notification", "geo", "indexedDB"],
/**
* Permissions that don't have a global "Deny" option.
@ -543,8 +516,6 @@ var AboutPermissions = {
Services.prefs.addObserver("geo.enabled", this, false);
Services.prefs.addObserver("dom.indexedDB.enabled", this, false);
Services.prefs.addObserver("plugins.click_to_play", this, false);
Services.prefs.addObserver("full-screen-api.enabled", this, false);
Services.prefs.addObserver("full-screen-api.pointer-lock.enabled", this, false);
Services.prefs.addObserver("permissions.places-sites-limit", this, false);
Services.obs.addObserver(this, "perm-changed", false);
@ -695,8 +666,6 @@ var AboutPermissions = {
Services.prefs.removeObserver("geo.enabled", this, false);
Services.prefs.removeObserver("dom.indexedDB.enabled", this, false);
Services.prefs.removeObserver("plugins.click_to_play", this, false);
Services.prefs.removeObserver("full-screen-api.enabled", this, false);
Services.prefs.removeObserver("full-screen-api.pointer-lock.enabled", this, false);
Services.prefs.removeObserver("permissions.places-sites-limit", this, false);
Services.obs.removeObserver(this, "perm-changed");

View file

@ -336,64 +336,6 @@
<vbox id="plugins-box"/>
</vbox>
</hbox>
<!-- Fullscreen -->
<hbox id="fullscreen-pref-item"
class="pref-item" align="top">
<image class="pref-icon" type="fullscreen"/>
<vbox>
<hbox>
<label class="pref-title" value="&fullscreen.label;"/>
<label id="fullscreen-default" class="pref-default" value="*"/>
</hbox>
<hbox align="center">
<menulist id="fullscreen-menulist"
class="pref-menulist"
type="fullscreen"
oncommand="AboutPermissions.onPermissionCommand(event, false);">
<menupopup>
<menuitem id="fullscreen-0" value="0" label="&permission.alwaysAsk;"/>
<menuitem id="fullscreen-1" value="1" label="&permission.allow;"/>
<menuitem id="fullscreen-2" value="2" label="&permission.block;"/>
</menupopup>
</menulist>
<button id="fullscreen-set-default"
class="pref-set-default"
label="&permission.default;"
type="fullscreen"
oncommand="AboutPermissions.onPermissionCommand(event, true);"/>
</hbox>
</vbox>
</hbox>
<!-- PointerLock -->
<hbox id="pointerLock-pref-item"
class="pref-item" align="top">
<image class="pref-icon" type="pointerLock"/>
<vbox>
<hbox>
<label class="pref-title" value="&pointerLock.label;"/>
<label id="pointerLock-default" class="pref-default" value="*"/>
</hbox>
<hbox>
<menulist id="pointerLock-menulist"
class="pref-menulist"
type="pointerLock"
oncommand="AboutPermissions.onPermissionCommand(event, false);">
<menupopup>
<menuitem id="pointerLock-0" value="0" label="&permission.alwaysAsk;"/>
<menuitem id="pointerLock-1" value="1" label="&permission.allow;"/>
<menuitem id="pointerLock-2" value="2" label="&permission.block;"/>
</menupopup>
</menulist>
<button id="pointerLock-set-default"
class="pref-set-default"
label="&permission.default;"
type="pointerLock"
oncommand="AboutPermissions.onPermissionCommand(event, true);"/>
</hbox>
</vbox>
</hbox>
</vbox>
</hbox>

View file

@ -66,8 +66,6 @@
<!ENTITY permInstall "Install Extensions or Themes">
<!ENTITY permGeo "Share Location">
<!ENTITY permPlugins "Activate Plugins">
<!ENTITY permFullscreen "Enter Fullscreen">
<!ENTITY permPointerLock2 "Hide the Mouse Pointer">
<!ENTITY permIndexedDB "Maintain Offline Storage">
<!ENTITY permClearStorage "Clear Storage">

View file

@ -51,8 +51,4 @@
<!ENTITY popup.label "Open Pop-up Windows">
<!ENTITY fullscreen.label "Fullscreen">
<!ENTITY pointerLock.label "Hide the Mouse Pointer">
<!ENTITY focusSearch.key "f">

View file

@ -104,12 +104,6 @@
.pref-icon[type="plugins"] {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
}
.pref-icon[type="fullscreen"] {
list-style-image: url(chrome://global/skin/icons/question-64.png);
}
.pref-icon[type="pointerLock"] {
list-style-image: url(chrome://global/skin/icons/question-64.png);
}
.pref-title {
font-size: 125%;

View file

@ -107,12 +107,6 @@
.pref-icon[type="plugins"] {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
}
.pref-icon[type="fullscreen"] {
list-style-image: url(chrome://global/skin/icons/question-64.png);
}
.pref-icon[type="pointerLock"] {
list-style-image: url(chrome://global/skin/icons/question-64.png);
}
.pref-title {
font-size: 125%;

View file

@ -107,12 +107,6 @@
.pref-icon[type="plugins"] {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric-48.png);
}
.pref-icon[type="fullscreen"] {
list-style-image: url(chrome://global/skin/icons/question-48.png);
}
.pref-icon[type="pointerLock"] {
list-style-image: url(chrome://global/skin/icons/question-48.png);
}
.pref-title {
font-size: 125%;