From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 2/4] docs: add Toolkit.js to prune simulator
Date: Fri, 28 May 2021 14:17:48 +0200 [thread overview]
Message-ID: <20210528121750.27718-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210528121750.27718-1-d.csapak@proxmox.com>
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
next prev parent reply other threads:[~2021-05-28 12:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-28 12:17 [pbs-devel] [PATCH proxmox-backup 0/4] use proxmox-widget-toolkit-dev for -docs Dominik Csapak
2021-05-28 12:17 ` [pbs-devel] [PATCH proxmox-backup 1/4] docs/prune-simulator: remove displayField for Calendar Field Dominik Csapak
2021-05-28 12:17 ` Dominik Csapak [this message]
2021-05-28 12:17 ` [pbs-devel] [PATCH proxmox-backup 3/4] docs: add Toolkit.js to lto-barcode Dominik Csapak
2021-05-28 12:17 ` [pbs-devel] [PATCH proxmox-backup 4/4] docs: build api-viewer from widget-toolkit-dev Dominik Csapak
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=20210528121750.27718-3-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-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