Änderungen von Dokument View File Macro
Zuletzt geändert von Daniel Herrmann am 2026/02/04 20:25
Von Version
3.1
bearbeitet von Daniel Herrmann
am 2025/06/23 19:53
am 2025/06/23 19:53
Änderungskommentar:
Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.26.19]
Auf Version
6.1
bearbeitet von Daniel Herrmann
am 2026/02/04 20:25
am 2026/02/04 20:25
Änderungskommentar:
Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.29.1]
Zusammenfassung
Details
- XWiki.JavaScriptExtension[0]
-
- Code
-
... ... @@ -9,90 +9,177 @@ 9 9 // are shown, a custom implementation was made to dynamically update the displyed attachments in corelation to the 10 10 // selected page parameter. This can be removed after the implementation of https://jira.xwiki.org/browse/XWIKI-22850. 11 11 require(['jquery', 'xwiki-meta', 'xwiki-suggestAttachments'], function($, xm) { 12 - const acceptedExtensions = '.ppt,.pptx,.odp,.doc,.docx,.odt,.xls,.xlsx,.ods,.pdf'; 13 - const styleObserver = new MutationObserver(function(mutations) { 14 - for (const mutation of mutations) { 15 - if (mutation.target.style.display === 'none') { 16 - styleObserver.disconnect(); 17 - pageObserver.observe(document.body, { childList: true, subtree: true }); 18 - return; 19 - } 20 - } 12 + require(['collabora-utils'], function(collabora) { 13 + initUI(collabora); 14 + }, function (err) { 15 + console.warn('collabora-utils not found, continuing without it.'); 16 + initUI(null); 21 21 }); 22 22 23 - const initializeAttachments = function(selectElement) { 24 - let scope = "document:"; 25 - if (selectElement.val() != null) { 26 - scope += selectElement.val(); 27 - } 28 - var inputElement = $('input[name="name"]'); 29 - if (inputElement.length) { 30 - let selectize = inputElement.siblings('.selectize-control'); 31 - if (selectize.length) { 32 - selectize.remove(); 33 - inputElement.removeAttr("class tabindex style").val(''); 34 - const clone = inputElement.clone().appendTo(inputElement.parent()); 35 - inputElement.remove(); 36 - inputElement = clone; 19 + function initUI(collabora) { 20 + const acceptedExtensions = '.ppt,.pptx,.odp,.doc,.docx,.odt,.xls,.xlsx,.ods,.pdf,.csv,.tsv'; 21 + const styleObserver = new MutationObserver(function(mutations) { 22 + for (const mutation of mutations) { 23 + if (mutation.target.style.display === 'none') { 24 + styleObserver.disconnect(); 25 + pageObserver.observe(document.body, { childList: true, subtree: true }); 26 + return; 27 + } 37 37 } 38 - const allowUpload = selectElement.val() == xm.document || !selectElement.val(); 39 - inputElement.suggestAttachments({ 40 - maxItems: 1, 41 - accept: acceptedExtensions, 42 - searchScope: scope, 43 - uploadAllowed: allowUpload 44 - }); 45 - } 46 - } 29 + }); 47 47 48 - const pageObserver = new MutationObserver(function(mutationsList, observer) { 49 - const selectElement = $('select[name="page"]'); 50 - if (selectElement.length) { 51 - const modal = selectElement.closest(".macro-editor-modal")[0]; 52 - if (modal.style.display !== 'none') { 53 - observer.disconnect(); 54 - styleObserver.observe(modal, { attributes: true, attributeFilter: ['style'] }); 55 - $(selectElement).change(function() { 56 - initializeAttachments($(this)) 31 + const initializeAttachments = function(selectElement) { 32 + let scope = "document:"; 33 + if (selectElement.val() != null) { 34 + scope += selectElement.val(); 35 + } 36 + var inputElement = $('input[name="name"]'); 37 + if (inputElement.length) { 38 + let selectize = inputElement.siblings('.selectize-control'); 39 + if (selectize.length) { 40 + selectize.remove(); 41 + inputElement.removeAttr("class tabindex style").val(''); 42 + const clone = inputElement.clone().appendTo(inputElement.parent()); 43 + inputElement.remove(); 44 + inputElement = clone; 45 + } 46 + const allowUpload = selectElement.val() == xm.document || !selectElement.val(); 47 + inputElement.suggestAttachments({ 48 + maxItems: 1, 49 + accept: acceptedExtensions, 50 + searchScope: scope, 51 + uploadAllowed: allowUpload 57 57 }); 58 - initializeAttachments(selectElement) 59 59 } 60 - } 61 - }); 54 + }; 62 62 63 - pageObserver.observe(document.body, { childList: true, subtree: true }); 64 -}); 56 + const checkModalAttachment = function(mutationsList, observer) { 57 + const selectElement = $('select[name="page"]'); 58 + if (selectElement.length) { 59 + const modal = selectElement.closest(".macro-editor-modal")[0]; 60 + if (modal && modal.style.display !== 'none') { 61 + observer.disconnect(); 62 + styleObserver.observe(modal, { attributes: true, attributeFilter: ['style'] }); 63 + $(selectElement).change(function() { 64 + initializeAttachments($(this)); 65 + }); 66 + initializeAttachments(selectElement); 67 + } 68 + } 69 + }; 65 65 66 -window.addEventListener("DOMContentLoaded", function () { 67 - "use strict"; 68 - document.addEventListener("click", async function (e) { 69 - if (("" + document.getElementById("xwikicontent")?.contentEditable) == "true") { 70 - return; 71 - } 72 - const viewFile = e.target?.closest(".viewFileThumbnail"); 73 - if (viewFile && viewFile.dataset.preview === 'true') { 74 - const popup = new XWiki.widgets.ModalPopup(); 75 - popup.createDialog(); 76 - popup.setContent("<span class='fa fa-spinner'></span>"); 77 - popup.dialogBox.classList.add("viewFileModal"); 78 - popup.dialogBox.style.top = "2.5vh"; 79 - popup.dialogBox.style.width = "95vw"; 80 - popup.dialogBox.style.height = "95vh"; 81 - const a = e.target.closest('a'); 82 - const downloadLink = document.createElement("a"); 83 - downloadLink.download = true; 84 - downloadLink.textContent = a.textContent; 85 - downloadLink.className = "fa fa-download button button-primary viewFileModal-downloadLink"; 86 - downloadLink.href = a.href; 87 - popup.dialogBox.insertBefore(downloadLink, popup.dialogBox.firstChild) 88 - popup.showDialog(); 89 - e.preventDefault(); 90 - const response = await fetch(XWiki.contextPath + "/wiki/" + XWiki.currentWiki + "/get/Confluence/Macros/ViewFileService?action=render&attachment=" + encodeURIComponent(viewFile.dataset.ref)); 91 - popup.setContent(await response.text()); 92 - const gallery = popup.dialogBox.querySelector(".gallery"); 93 - if (gallery) { 94 - new XWiki.Gallery(gallery); 71 + const pageObserver = new MutationObserver(checkModalAttachment); 72 + pageObserver.observe(document.body, { childList: true, subtree: true }); 73 + checkModalAttachment([], pageObserver); 74 + 75 + const getFileExtension = function(fileName) { 76 + return fileName.slice(fileName.lastIndexOf('.') + 1).toLowerCase(); 77 + }; 78 + 79 + const decorateWithCollaboraButton = function(viewFile, fileRef, spanContainer) { 80 + const attachment = XWiki.Model.resolve(fileRef, XWiki.EntityType.ATTACHMENT); 81 + var fileName = attachment.getName(); 82 + var collaboraButton = $(viewFile).find('a.collaboraEdit'); 83 + if (collaboraButton.length != 0) { 84 + const accessRights = collabora.getAccessRights(fileName); 85 + if (!accessRights) { 86 + return; 87 + } 88 + collabora.populateCollaboraButton(collaboraButton, fileName, accessRights, XWiki.Model.serialize(attachment.parent)); 89 + const clonedButton = collaboraButton.clone(true, true); 90 + clonedButton.addClass('btn btn-default'); 91 + clonedButton.addClass('viewfile-header-button'); 92 + clonedButton.attr('target', '_blank'); 93 + $(spanContainer).find('.viewFileModal-downloadLink').after(clonedButton); 95 95 } 96 - } 97 - }); 95 + }; 96 + 97 + // This function has been taken from OnlyOffice Connector Application, as it's being used to determine what 98 + // action the user can take on a file depending on the file extension. 99 + const determineOOAction = function(fileRef) { 100 + var ooCanDoByExt = { }; 101 + const editableFormats = ['docx', 'xlsx', 'pptx']; 102 + const convertibleFormats = ['odt', 'ods', 'odp', 'xls', 'csv', 'doc', 'ppt', 'pps', 'ppsx', 'rtf', 'txt', 'mht', 103 + 'html', 'htm']; 104 + editableFormats.forEach(function(x) { 105 + ooCanDoByExt[x] = 'edit'; 106 + }); 107 + convertibleFormats.forEach(function(x) { 108 + ooCanDoByExt[x] = 'convert'; 109 + }); 110 + ['pdf', 'djvu', 'fb2', 'epub', 'xps'].forEach(function(x) { 111 + ooCanDoByExt[x] = 'view'; 112 + }); 113 + var fileType = getFileExtension(fileRef); 114 + return ooCanDoByExt[fileType]; 115 + }; 116 + 117 + const decorateWithXooButton = function(viewFile, fileRef, spanContainer) { 118 + if ($(viewFile).find('span.oo-installed-check').data('ooexists')) { 119 + var whatCanDo = determineOOAction(fileRef); 120 + if (!whatCanDo) { 121 + return; 122 + } 123 + if (!XWiki.hasEdit) { 124 + whatCanDo = 'view'; 125 + } 126 + const attachment = XWiki.Model.resolve(fileRef, XWiki.EntityType.ATTACHMENT); 127 + var queryString = $.param({ 128 + 'elem': 'oOActionButtons', 129 + 'document': XWiki.Model.serialize(attachment.parent), 130 + 'filename': attachment.getName(), 131 + 'whatCanDo': whatCanDo, 132 + 'asLink': true 133 + }); 134 + 135 + $.post(new XWiki.Document('UI', 'XWikiOnlyOfficeCode').getURL('get', queryString), function(data) { 136 + const $button = $(data); 137 + $button.addClass('btn btn-default'); 138 + $button.addClass('viewfile-header-button'); 139 + $button.attr('target', '_blank'); 140 + $(spanContainer).find('.viewFileModal-downloadLink').after($button); 141 + }); 142 + } 143 + }; 144 + 145 + $(document).on("click", async function (e) { 146 + if (("" + document.getElementById("xwikicontent")?.contentEditable) == "true") { 147 + return; 148 + } 149 + const viewFile = e.target?.closest(".viewFileThumbnail"); 150 + if (viewFile && viewFile.dataset.preview === 'true') { 151 + const fileRef = viewFile.dataset.ref; 152 + const popup = new XWiki.widgets.ModalPopup(); 153 + popup.createDialog(); 154 + popup.setContent("<span class='fa fa-spinner'></span>"); 155 + popup.dialogBox.classList.add("viewFileModal"); 156 + popup.dialogBox.style.top = "2.5vh"; 157 + popup.dialogBox.style.width = "95vw"; 158 + popup.dialogBox.style.height = "95vh"; 159 + const a = e.target.closest('a'); 160 + const downloadLink = document.createElement('a'); 161 + const spanContainer = document.createElement('span'); 162 + spanContainer.className = 'viewfile-actions-header'; 163 + downloadLink.download = true; 164 + downloadLink.textContent = ' ' + $(a).find('.viewFileName').text(); 165 + downloadLink.className = 'fa fa-download button button-primary viewFileModal-downloadLink viewfile-header-button'; 166 + downloadLink.href = a.href; 167 + spanContainer.appendChild(downloadLink); 168 + decorateWithXooButton(viewFile, fileRef, spanContainer); 169 + if (collabora != null) { 170 + decorateWithCollaboraButton(viewFile, fileRef, spanContainer); 171 + } 172 + $(popup.dialogBox).prepend(spanContainer); 173 + popup.showDialog(); 174 + e.preventDefault(); 175 + const response = await fetch(XWiki.contextPath + '/wiki/' + XWiki.currentWiki + 176 + '/get/Confluence/Macros/ViewFileService?action=render&attachment=' + encodeURIComponent(fileRef)); 177 + popup.setContent(await response.text()); 178 + const gallery = popup.dialogBox.querySelector(".gallery"); 179 + if (gallery) { 180 + new XWiki.Gallery(gallery); 181 + } 182 + } 183 + }); 184 + } 98 98 });
- XWiki.StyleSheetExtension[0]
-
- Code
-
... ... @@ -1,3 +1,5 @@ 1 +#template('colorThemeInit.vm') 2 + 1 1 .viewFileModal iframe, .viewFileModal .xdialog-content { 2 2 height: calc(95vh - 5em); 3 3 } ... ... @@ -48,7 +48,7 @@ 48 48 .viewFileThumbnailCard { 49 49 width: 10rem !important; 50 50 height: fit-content !important; 51 - min-height: 10rem !important;53 + min-height: 10rem; 52 52 } 53 53 54 54 span.viewFileThumbnailCard { ... ... @@ -84,3 +84,41 @@ 84 84 .viewFileName { 85 85 overflow-wrap: break-word; 86 86 } 89 + 90 +.image-container { 91 + position: relative; 92 +} 93 + 94 +.viewfile-thumbnail-image { 95 + display: block; 96 +} 97 + 98 +.overlay { 99 + position: absolute; 100 + inset: 0px; 101 + opacity: 0; 102 + transition: .7s ease; 103 + background-color: $theme.buttonPrimaryBackgroundColor; 104 +} 105 + 106 +.image-container:hover .overlay { 107 + opacity: 1; 108 +} 109 + 110 +.overlay-text { 111 + color: $theme.buttonPrimaryTextColor; 112 + font-size: 2rem; 113 + position: absolute; 114 + top: 50%; 115 + left: 50%; 116 + transform: translate(-50%, -50%); 117 + text-align: center; 118 +} 119 + 120 +.viewfile-header-button { 121 + margin: 1rem 0.7rem; 122 +} 123 + 124 +.viewfile-actions-header { 125 + margin: 1rem; 126 +} - Inhalt parsen
-
... ... @@ -1,1 +1,1 @@ 1 - Nein1 +Ja