From 714aea2e27f743fb5a6fe6e7d4fc7528e7167df5 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Fri, 7 Sep 2018 11:33:40 +0200 Subject: [PATCH] RequestFullscreen API does not requires confirmation anymore as you can call it directly --- src/Ui/media/Wrapper.coffee | 17 +++----------- src/Ui/media/all.js | 37 +++++++++++++------------------ src/Ui/media/lib/Translate.coffee | 1 + 3 files changed, 19 insertions(+), 36 deletions(-) create mode 100644 src/Ui/media/lib/Translate.coffee diff --git a/src/Ui/media/Wrapper.coffee b/src/Ui/media/Wrapper.coffee index 764427fb..9c98d127 100644 --- a/src/Ui/media/Wrapper.coffee +++ b/src/Ui/media/Wrapper.coffee @@ -218,20 +218,9 @@ class Wrapper w.location = params[0] actionRequestFullscreen: -> - if "Fullscreen" in @site_info.settings.permissions - elem = document.getElementById("inner-iframe") - request_fullscreen = elem.requestFullScreen || elem.webkitRequestFullscreen || elem.mozRequestFullScreen || elem.msRequestFullScreen - request_fullscreen.call(elem) - setTimeout ( => - if window.innerHeight != screen.height # Fullscreen failed, probably only allowed on click - @displayConfirm "This site requests permission:" + " Fullscreen", "Accept", => - request_fullscreen.call(elem) - ), 100 - else - @displayConfirm "This site requests permission:" + " Fullscreen", "Accept", => - @site_info.settings.permissions.push("Fullscreen") - @actionRequestFullscreen() - @ws.cmd "permissionAdd", "Fullscreen" + elem = document.getElementById("inner-iframe") + request_fullscreen = elem.requestFullScreen || elem.webkitRequestFullscreen || elem.mozRequestFullScreen || elem.msRequestFullScreen + request_fullscreen.call(elem) actionPermissionAdd: (message) -> permission = message.params diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js index 0cb9d81d..da231c38 100644 --- a/src/Ui/media/all.js +++ b/src/Ui/media/all.js @@ -39,6 +39,18 @@ }).call(this); +/* ---- src/Ui/media/lib/Translate.coffee ---- */ + + +(function() { + window._ = function(s) { + return s; + }; + +}).call(this); + + + /* ---- src/Ui/media/lib/ZeroWebsocket.coffee ---- */ @@ -1145,28 +1157,9 @@ jQuery.extend( jQuery.easing, Wrapper.prototype.actionRequestFullscreen = function() { var elem, request_fullscreen; - if (indexOf.call(this.site_info.settings.permissions, "Fullscreen") >= 0) { - elem = document.getElementById("inner-iframe"); - request_fullscreen = elem.requestFullScreen || elem.webkitRequestFullscreen || elem.mozRequestFullScreen || elem.msRequestFullScreen; - request_fullscreen.call(elem); - return setTimeout(((function(_this) { - return function() { - if (window.innerHeight !== screen.height) { - return _this.displayConfirm("This site requests permission:" + " Fullscreen", "Accept", function() { - return request_fullscreen.call(elem); - }); - } - }; - })(this)), 100); - } else { - return this.displayConfirm("This site requests permission:" + " Fullscreen", "Accept", (function(_this) { - return function() { - _this.site_info.settings.permissions.push("Fullscreen"); - _this.actionRequestFullscreen(); - return _this.ws.cmd("permissionAdd", "Fullscreen"); - }; - })(this)); - } + elem = document.getElementById("inner-iframe"); + request_fullscreen = elem.requestFullScreen || elem.webkitRequestFullscreen || elem.mozRequestFullScreen || elem.msRequestFullScreen; + return request_fullscreen.call(elem); }; Wrapper.prototype.actionPermissionAdd = function(message) { diff --git a/src/Ui/media/lib/Translate.coffee b/src/Ui/media/lib/Translate.coffee new file mode 100644 index 00000000..2b323494 --- /dev/null +++ b/src/Ui/media/lib/Translate.coffee @@ -0,0 +1 @@ +window._ = (s) -> return s \ No newline at end of file