From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH http-server 1/3] formatter: html: remove unused code
Date: Tue, 3 Jun 2025 15:04:24 +0200 [thread overview]
Message-ID: <20250603130426.2575764-1-d.csapak@proxmox.com> (raw)
the console js code was added in
63307be (add generic formatter framework
in January 2017 and marked to be removed (in the FIXME) with
6189d2e (Formatter/Bootstrap.pm; use configured cookie_name)
a day later.
This was never used, so simply remove it.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/PVE/APIServer/Formatter/Bootstrap.pm | 51 ------------------------
1 file changed, 51 deletions(-)
diff --git a/src/PVE/APIServer/Formatter/Bootstrap.pm b/src/PVE/APIServer/Formatter/Bootstrap.pm
index 6be0049..be37441 100644
--- a/src/PVE/APIServer/Formatter/Bootstrap.pm
+++ b/src/PVE/APIServer/Formatter/Bootstrap.pm
@@ -7,58 +7,8 @@ use HTML::Entities;
use JSON;
use URI::Escape;
-# FIXME: remove console code??
-
# Helpers to generate simple html pages using Bootstrap markup.
-my $jssrc = <<_EOJS;
-PVE.open_vm_console = function(node, vmid) {
- console.log("open vm " + vmid + " on node " + node);
-
- var downloadWithName = function(uri, name) {
- var link = jQuery('#pve_console_anchor');
- link.attr("href", uri);
-
- // Note: we need to tell android the correct file name extension
- // but we do not set 'download' tag for other environments, because
- // It can have strange side effects (additional user prompt on firefox)
- var andriod = navigator.userAgent.match(/Android/i) ? true : false;
- if (andriod) {
- link.attr("download", name);
- }
-
- if (document.createEvent) {
- var evt = document.createEvent("MouseEvents");
- evt.initMouseEvent('click', true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null);
- link.get(0).dispatchEvent(evt);
- } else {
- link.get(0).fireEvent('onclick');
- }
- };
-
- jQuery.ajax("/api2/json/console", {
- data: { vmid: vmid, node: node },
- headers: { CSRFPreventionToken: PVE.CSRFPreventionToken },
- dataType: 'json',
- type: 'POST',
- error: function(jqXHR, textStatus, errorThrown) {
- // fixme: howto view JS errors ?
- console.log("ERROR " + textStatus + ": " + errorThrown);
- },
- success: function(data) {
- var raw = "[virt-viewer]\\n";
- jQuery.each(data.data, function(k, v) {
- raw += k + "=" + v + "\\n";
- });
- var url = 'data:application/x-virt-viewer;charset=UTF-8,' +
- encodeURIComponent(raw);
-
- downloadWithName(url, "pve-spice.vv");
- }
- });
-};
-_EOJS
-
sub new {
my ($class, $res, $url, $auth, $config) = @_;
@@ -107,7 +57,6 @@ sub body {
<script type="text/javascript">
$jssetup
-$jssrc
</script>
<style>
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next reply other threads:[~2025-06-03 13:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-03 13:04 Dominik Csapak [this message]
2025-06-03 13:04 ` [pve-devel] [PATCH http-server 2/3] formatter: html: fix logout button Dominik Csapak
2025-06-03 13:04 ` [pve-devel] [PATCH http-server 3/3] formatter: html: update to bootstrap 5 Dominik Csapak
2025-06-04 17:33 ` Thomas Lamprecht
2025-06-05 8:07 ` Dominik Csapak
2025-06-04 17:26 ` [pve-devel] partially-applied: [PATCH http-server 1/3] formatter: html: remove unused code Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250603130426.2575764-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal