summaryrefslogtreecommitdiffstats
path: root/application/palemoon/components
diff options
context:
space:
mode:
Diffstat (limited to 'application/palemoon/components')
-rw-r--r--application/palemoon/components/preferences/aboutPermissions.js35
-rw-r--r--application/palemoon/components/preferences/aboutPermissions.xul58
2 files changed, 2 insertions, 91 deletions
diff --git a/application/palemoon/components/preferences/aboutPermissions.js b/application/palemoon/components/preferences/aboutPermissions.js
index 531bb061f..9fb12d081 100644
--- a/application/palemoon/components/preferences/aboutPermissions.js
+++ b/application/palemoon/components/preferences/aboutPermissions.js
@@ -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");
diff --git a/application/palemoon/components/preferences/aboutPermissions.xul b/application/palemoon/components/preferences/aboutPermissions.xul
index c099161f2..56d6cfbbf 100644
--- a/application/palemoon/components/preferences/aboutPermissions.xul
+++ b/application/palemoon/components/preferences/aboutPermissions.xul
@@ -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>