From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 3/4] docs: add Toolkit.js to lto-barcode
Date: Fri, 28 May 2021 14:17:49 +0200 [thread overview]
Message-ID: <20210528121750.27718-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210528121750.27718-1-d.csapak@proxmox.com>
and generate a single js file for it
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
docs/Makefile | 28 ++++++++++++-------
docs/lto-barcode/index.html | 12 +-------
docs/lto-barcode/lto-barcode.js | 6 ++--
.../prune-simulator/prune-simulator_source.js | 2 +-
4 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/docs/Makefile b/docs/Makefile
index a416ce1f..231400ac 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -50,18 +50,22 @@ PRUNE_SIMULATOR_JS_SOURCE := \
/usr/share/javascript/proxmox-widget-toolkit-dev/Toolkit.js \
prune-simulator/prune-simulator_source.js
+LTO_BARCODE_JS_SOURCE := \
+ /usr/share/javascript/proxmox-widget-toolkit-dev/Toolkit.js \
+ lto-barcode/code39.js \
+ lto-barcode/prefix-field.js \
+ lto-barcode/label-style.js \
+ lto-barcode/tape-type.js \
+ lto-barcode/paper-size.js \
+ lto-barcode/page-layout.js \
+ lto-barcode/page-calibration.js \
+ lto-barcode/label-list.js \
+ lto-barcode/label-setup.js \
+ lto-barcode/lto-barcode.js
+
LTO_BARCODE_FILES := \
lto-barcode/index.html \
- lto-barcode/code39.js \
- lto-barcode/prefix-field.js \
- lto-barcode/label-style.js \
- lto-barcode/tape-type.js \
- lto-barcode/paper-size.js \
- lto-barcode/page-layout.js \
- lto-barcode/page-calibration.js \
- lto-barcode/label-list.js \
- lto-barcode/label-setup.js \
- lto-barcode/lto-barcode.js
+ lto-barcode/lto-barcode-generator.js
API_VIEWER_SOURCES= \
api-viewer/index.html \
@@ -207,6 +211,10 @@ prune-simulator/prune-simulator.js: ${PRUNE_SIMULATOR_JS_SOURCE}
cat ${PRUNE_SIMULATOR_JS_SOURCE} >$@.tmp
mv $@.tmp $@
+lto-barcode/lto-barcode-generator.js: ${LTO_BARCODE_JS_SOURCE}
+ cat ${LTO_BARCODE_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/lto-barcode/index.html b/docs/lto-barcode/index.html
index c47798c9..4afbf213 100644
--- a/docs/lto-barcode/index.html
+++ b/docs/lto-barcode/index.html
@@ -34,17 +34,7 @@
</style>
<link rel="stylesheet" type="text/css" href="font-awesome/css/font-awesome.css"/>
<script type="text/javascript" src="extjs/ext-all.js"></script>
-
- <script type="text/javascript" src="code39.js"></script>
- <script type="text/javascript" src="prefix-field.js"></script>
- <script type="text/javascript" src="label-style.js"></script>
- <script type="text/javascript" src="tape-type.js"></script>
- <script type="text/javascript" src="paper-size.js"></script>
- <script type="text/javascript" src="page-layout.js"></script>
- <script type="text/javascript" src="page-calibration.js"></script>
- <script type="text/javascript" src="label-list.js"></script>
- <script type="text/javascript" src="label-setup.js"></script>
- <script type="text/javascript" src="lto-barcode.js"></script>
+ <script type="text/javascript" src="lto-barcode-generator.js"></script>
</head>
<body>
</body>
diff --git a/docs/lto-barcode/lto-barcode.js b/docs/lto-barcode/lto-barcode.js
index d6cb8506..2aeaba1b 100644
--- a/docs/lto-barcode/lto-barcode.js
+++ b/docs/lto-barcode/lto-barcode.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 gettext(val) { return val; };
function draw_labels(target_id, label_list, page_layout, calibration) {
let max_labels = compute_max_labels(page_layout);
diff --git a/docs/prune-simulator/prune-simulator_source.js b/docs/prune-simulator/prune-simulator_source.js
index 0964178c..84d3461c 100644
--- a/docs/prune-simulator/prune-simulator_source.js
+++ b/docs/prune-simulator/prune-simulator_source.js
@@ -1,5 +1,5 @@
// for Toolkit.js
-function gettxt(val) { return val; };
+function gettext(val) { return val; };
Ext.onReady(function() {
const NOW = new Date();
--
2.20.1
next prev parent reply other threads:[~2021-05-28 12:17 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 ` [pbs-devel] [PATCH proxmox-backup 2/4] docs: add Toolkit.js to prune simulator Dominik Csapak
2021-05-28 12:17 ` Dominik Csapak [this message]
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-4-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal