From 2fccd7b7e5e5d5fd0909119b1e5a4429e440a2cc Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Thu, 2 Aug 2018 10:32:28 +0200
Subject: [PATCH] Fix Clipboard after dependency-update
---
modules/core/templates/show_metadata.tpl.php | 2 +-
templates/base.twig | 2 +-
templates/error.php | 2 +-
templates/metadata-converter.php | 2 +-
templates/metadata.php | 6 +++---
.../js/lib/{jquery-3.2.1.min.js => jquery-3.3.1.min.js} | 0
www/assets/js/src/script.js | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
rename www/assets/js/lib/{jquery-3.2.1.min.js => jquery-3.3.1.min.js} (100%)
diff --git a/modules/core/templates/show_metadata.tpl.php b/modules/core/templates/show_metadata.tpl.php
index 9c5977e58..f217540c7 100644
--- a/modules/core/templates/show_metadata.tpl.php
+++ b/modules/core/templates/show_metadata.tpl.php
@@ -13,7 +13,7 @@ $metadata['<?php echo $this->data['m']['metadata-index']; unset($this->data['m']
</pre>
</div>
<script type="text/javascript">
- var clipboard = new Clipboard('#btncp');
+ var clipboard = new ClipboardJS('#btncp');
</script>
<br/>
<p><a href="<?php echo $this->data['backlink']; ?>"><span class="btn">Back</span></a></p>
diff --git a/templates/base.twig b/templates/base.twig
index b895f0ce1..02fdc60d3 100644
--- a/templates/base.twig
+++ b/templates/base.twig
@@ -34,7 +34,7 @@
</div>
<!-- postload javascript -->
- <script type="text/javascript" src="/{{ baseurlpath }}assets/js/lib/jquery-3.2.1.min.js"></script>
+ <script type="text/javascript" src="/{{ baseurlpath }}assets/js/lib/jquery-3.3.1.min.js"></script>
{% spaceless %}{% if jquery %}
{% set version = '1.8' %}
{% if jquery.version %}
diff --git a/templates/error.php b/templates/error.php
index fc0b145a0..1acf83de3 100644
--- a/templates/error.php
+++ b/templates/error.php
@@ -68,7 +68,7 @@ if (isset($this->data['errorReportAddress'])) {
<h2 style="clear: both"><?php echo $this->t('howto_header'); ?></h2>
<p><?php echo $this->t('howto_text'); ?></p>
<script type="text/javascript">
- var clipboard = new Clipboard('#btntrackid');
+ var clipboard = new ClipboardJS('#btntrackid');
</script>
<?php
$this->includeAtTemplateBase('includes/footer.php');
diff --git a/templates/metadata-converter.php b/templates/metadata-converter.php
index e784cea2e..1ff3ac72d 100644
--- a/templates/metadata-converter.php
+++ b/templates/metadata-converter.php
@@ -48,7 +48,7 @@ if (!empty($output)) {
<?php
for ($j = 1; $j <= $i; $j++) {
?>
- var clipboard<?php echo $j; ?> = new Clipboard('#btn<?php echo $j; ?>');
+ var clipboard<?php echo $j; ?> = new ClipboardJS('#btn<?php echo $j; ?>');
<?php
}
?>
diff --git a/templates/metadata.php b/templates/metadata.php
index cd43769c2..621fd08e3 100644
--- a/templates/metadata.php
+++ b/templates/metadata.php
@@ -32,9 +32,9 @@ $this->includeAtTemplateBase('includes/header.php'); ?>
<pre id="phpmetadata"><?php echo $this->data['metadataflat']; ?></pre>
</div>
<script type="text/javascript">
- var clipboard1 = new Clipboard('#btnurl'),
- clipboard2 = new Clipboard('#btnxml'),
- clipboard3 = new Clipboard('#btnphp');
+ var clipboard1 = new ClipboardJS('#btnurl'),
+ clipboard2 = new ClipboardJS('#btnxml'),
+ clipboard3 = new ClipboardJS('#btnphp');
</script>
<?php
if (array_key_exists('available_certs', $this->data)) { ?>
diff --git a/www/assets/js/lib/jquery-3.2.1.min.js b/www/assets/js/lib/jquery-3.3.1.min.js
similarity index 100%
rename from www/assets/js/lib/jquery-3.2.1.min.js
rename to www/assets/js/lib/jquery-3.3.1.min.js
diff --git a/www/assets/js/src/script.js b/www/assets/js/src/script.js
index 83ec1128d..7748abb05 100644
--- a/www/assets/js/src/script.js
+++ b/www/assets/js/src/script.js
@@ -51,7 +51,7 @@ $(document).on('change', ':file', function() {
$(document).ready(function() {
$('.language-menu').selectize();
$('#organization').selectize();
- new Clipboard('.clipboard-btn');
+ new ClipboardJS('.clipboard-btn');
// Watch for custom `fileselect` event
$(':file').on('fileselect', function(event, numFiles, label) {
--
GitLab