From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 6731373724
for <pbs-devel@lists.proxmox.com>; Fri, 28 May 2021 14:18:23 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 622D39984
for <pbs-devel@lists.proxmox.com>; Fri, 28 May 2021 14:17:53 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 9930C9962
for <pbs-devel@lists.proxmox.com>; Fri, 28 May 2021 14:17:51 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7223F42AB9
for <pbs-devel@lists.proxmox.com>; Fri, 28 May 2021 14:17:51 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Fri, 28 May 2021 14:17:48 +0200
Message-Id: <20210528121750.27718-3-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210528121750.27718-1-d.csapak@proxmox.com>
References: <20210528121750.27718-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.041 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [proxmox.com, conf.py]
Subject: [pbs-devel] [PATCH proxmox-backup 2/4] docs: add Toolkit.js to
prune simulator
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 28 May 2021 12:18:23 -0000
from proxmox-widget-toolkit-dev and not as normal dependency,
else we would have to ship widget-toolkit on the wiki
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
debian/control | 3 ++-
debian/debcargo.toml | 1 +
docs/Makefile | 8 ++++++++
.../{prune-simulator.js => prune-simulator_source.js} | 6 ++----
4 files changed, 13 insertions(+), 5 deletions(-)
rename docs/prune-simulator/{prune-simulator.js => prune-simulator_source.js} (99%)
diff --git a/debian/control b/debian/control
index 468dd4e1..be952de4 100644
--- a/debian/control
+++ b/debian/control
@@ -104,7 +104,8 @@ Build-Depends: debhelper (>= 11),
texlive-fonts-extra <!nodoc>,
texlive-fonts-recommended <!nodoc>,
texlive-xetex <!nodoc>,
- xindy <!nodoc>
+ xindy <!nodoc>,
+ proxmox-widget-toolkit-dev <!nodoc>
Maintainer: Proxmox Support Team <support@proxmox.com>
Standards-Version: 4.4.1
Vcs-Git: git://git.proxmox.com/git/proxmox-backup.git
diff --git a/debian/debcargo.toml b/debian/debcargo.toml
index da1a90a4..10149051 100644
--- a/debian/debcargo.toml
+++ b/debian/debcargo.toml
@@ -26,6 +26,7 @@ build_depends = [
"texlive-fonts-recommended <!nodoc>",
"texlive-xetex <!nodoc>",
"xindy <!nodoc>",
+ "proxmox-widget-toolkit-dev <!nodoc>",
]
build_depends_excludes = [
diff --git a/docs/Makefile b/docs/Makefile
index 722c0c3e..a416ce1f 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -46,6 +46,10 @@ PRUNE_SIMULATOR_FILES := \
prune-simulator/clear-trigger.png \
prune-simulator/prune-simulator.js
+PRUNE_SIMULATOR_JS_SOURCE := \
+ /usr/share/javascript/proxmox-widget-toolkit-dev/Toolkit.js \
+ prune-simulator/prune-simulator_source.js
+
LTO_BARCODE_FILES := \
lto-barcode/index.html \
lto-barcode/code39.js \
@@ -199,6 +203,10 @@ api-viewer/apidata.js: ${COMPILEDIR}/docgen
api-viewer/apidoc.js: api-viewer/apidata.js api-viewer/PBSAPI.js
cat api-viewer/apidata.js api-viewer/PBSAPI.js >$@
+prune-simulator/prune-simulator.js: ${PRUNE_SIMULATOR_JS_SOURCE}
+ cat ${PRUNE_SIMULATOR_JS_SOURCE} >$@.tmp
+ mv $@.tmp $@
+
.PHONY: html
html: ${GENERATED_SYNOPSIS} images/proxmox-logo.svg custom.css conf.py ${PRUNE_SIMULATOR_FILES} ${LTO_BARCODE_FILES} ${API_VIEWER_SOURCES}
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
diff --git a/docs/prune-simulator/prune-simulator.js b/docs/prune-simulator/prune-simulator_source.js
similarity index 99%
rename from docs/prune-simulator/prune-simulator.js
rename to docs/prune-simulator/prune-simulator_source.js
index f1119f89..0964178c 100644
--- a/docs/prune-simulator/prune-simulator.js
+++ b/docs/prune-simulator/prune-simulator_source.js
@@ -1,7 +1,5 @@
-// FIXME: HACK! Makes scrolling in number spinner work again. fixed in ExtJS >= 6.1
-if (Ext.isFirefox) {
- Ext.$eventNameMap.DOMMouseScroll = 'DOMMouseScroll';
-}
+// for Toolkit.js
+function gettxt(val) { return val; };
Ext.onReady(function() {
const NOW = new Date();
--
2.20.1