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 6A81F736C7
for <pbs-devel@lists.proxmox.com>; Fri, 28 May 2021 14:17:53 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 68B349985
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 B4A5E9967
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 8BDDB465C2
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:49 +0200
Message-Id: <20210528121750.27718-4-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. [conf.py]
Subject: [pbs-devel] [PATCH proxmox-backup 3/4] docs: add Toolkit.js to
lto-barcode
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:17:53 -0000
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