Merge pull request #1851 from scireum/feature/sbi/SIRI-880

BREAKING: Uses new sirius JS clipboard helper
scireum · Sep 29, 2023 · eaee8fa · eaee8fa
2 parents 89450ac + 2d0e3a4
commit eaee8fa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 
     <properties>
         <sirius.kernel>dev-38.3.0</sirius.kernel>
-        <sirius.web>dev-70.5.0</sirius.web>
+        <sirius.web>dev-71.0.0</sirius.web>
         <sirius.db>dev-54.2.2</sirius.db>
     </properties>
 

diff --git a/src/main/resources/default/assets/scripts/smart-values.js b/src/main/resources/default/assets/scripts/smart-values.js
@@ -40,7 +40,7 @@ function openSmartValues(elementId, type, payload, signature) {
             '       <span class="pl-2">{{label}}</span>' +
             '   </a>' +
             '   {{#copyPayload}}' +
-            '       <a href="javascript:copyToClipboard(\'{{copyPayload}}\')" class="smart-value-link btn btn-link ml-2 text-small">' +
+            '       <a href="javascript:sirius.copyToClipboard(\'{{copyPayload}}\')" class="smart-value-link btn btn-link ml-2 text-small">' +
             '          <i class="far fa-clipboard"></i>' +
             '       </a>' +
             '   {{/copyPayload}}' +
@@ -55,4 +55,3 @@ function openSmartValues(elementId, type, payload, signature) {
         $('#' + elementId).attr('data-original-title', html).tooltip('show');
     });
 }
-
diff --git a/src/main/resources/default/extensions/tycho-page-menu/footer.html.pasta b/src/main/resources/default/extensions/tycho-page-menu/footer.html.pasta
@@ -27,7 +27,7 @@
                 <script type="text/javascript">
                     sirius.ready(function () {
                         document.querySelector('#supportLink').addEventListener('click', function () {
-                            copyToClipboard(window.location.protocol + '//' + window.location.host + '/tenants/select/@user().getTenantId()?goto=' + encodeURIComponent(window.location.href));
+                            sirius.copyToClipboard(window.location.protocol + '//' + window.location.host + '/tenants/select/@user().getTenantId()?goto=' + encodeURIComponent(window.location.href));
 
                             clearMessages();
                             addSuccessMessage('@i18n("footer.html.supportLinkCopiedSuccessfully")');

diff --git a/src/main/resources/default/taglib/k/section.html.pasta b/src/main/resources/default/taglib/k/section.html.pasta
@@ -28,7 +28,7 @@
                     sirius.ready(function () {
                         document.getElementById('@copyAnchorId').addEventListener('click', function () {
                             const signedArticleId = document.getElementById('urlField').value;
-                            copyToClipboard(signedArticleId + '#@anchor')
+                            sirius.copyToClipboard(signedArticleId + '#@anchor')
 
                             clearMessages();
                             addSuccessMessage('@i18n("KnowledgeBase.urlClipboardSuccess")');

diff --git a/src/main/resources/default/templates/biz/storage/list.html.pasta b/src/main/resources/default/templates/biz/storage/list.html.pasta
@@ -142,7 +142,7 @@
                                                 </i:if>
                                                 <i:if test="!child.isDirectory()">
                                                     <t:dropdownItem
-                                                            url="@apply('javascript:copyToClipboard(\'%s\')', child.path().replace('\'', '\\\''))"
+                                                            url="@apply('javascript:sirius.copyToClipboard(\'%s\')', child.path().replace('\'', '\\\''))"
                                                             icon="fa fa-copy" labelKey="VFSController.copyPath"/>
                                                 </i:if>
                                             </t:dropdownSection>
@@ -251,22 +251,5 @@
                 modalElement.find("#select-file-modal-search-filter").focus();
             }).modal('show');
         }
-
-        function copyToClipboard(value) {
-            if (!navigator.clipboard) {
-                fallbackCopyToClipboard(value);
-            } else {
-                navigator.clipboard.writeText(value)
-            }
-        }
-
-        function fallbackCopyToClipboard(value) {
-            const fakeElem = document.createElement('textarea');
-            fakeElem.value = value;
-            document.body.appendChild(fakeElem);
-            fakeElem.select();
-            document.execCommand('copy');
-            document.body.removeChild(fakeElem);
-        }
     </script>
 </t:page>