Modifications pour le document DiagramEditSheet

Modifié par Admin le 19/03/2025 - 19:24

From 8.1 to 7.1

Depuis la version 9.1

modifié par Admin
sur 19/03/2025 - 19:24

Commentaire de modification : Install extension [com.xwiki.diagram:application-diagram/1.22.1]

À la version 8.1

modifié par Admin
sur 10/02/2025 - 13:05

Commentaire de modification : Install extension [com.xwiki.diagram:application-diagram/1.22.0]

Source
Rendu

Résumé

Objets (2 modifications, 0 ajouts, 0 suppressions)
- XWiki.JavaScriptExtension[1]
- XWiki.JavaScriptExtension[2]

Détails

XWiki.JavaScriptExtension[1]

Code

@@ -105,19 +105,18 @@
      var attachmentReference = new XWiki.AttachmentReference(fileName, documentReference);
      var uploadMethod = (diagramConfig.isTemporaryUploadSupported) ? xutils.temporaryUploadAttachment : xutils.uploadAttachment;
      var uploadAttachment = $.proxy(uploadMethod, null, blob, attachmentReference);
--    return uploadAttachment();
++    // Avoid creating too many versions of the attachment. Upload the attachment even if we failed to delete it first.
++    return xutils.deleteAttachment(attachmentReference).then(uploadAttachment, uploadAttachment);
    };
    var imageCache = {};
--  var saveFileAsPNGImageAttachment = function(file, index, originalPage) {
++  var saveFileAsPNGImageAttachment = function(file) {
      var deferred = $.Deferred();
--    let page = file.ui.pages[index];
--    file.ui.selectPage(page, true, null);
--    file.getUi().exportToCanvas(/* callback */ function (canvas) {
++    file.getUi().exportToCanvas(/* callback */ function(canvas) {
        if (canvas) {
          try {
--          canvas.toBlob(function (blob) {
--            pipeDeferred(saveBlobAsImageAttachment(blob, `${getXWikiAttachmentName(index)}.png`, file.documentReference), deferred);
++          canvas.toBlob(function(blob) {
++            pipeDeferred(saveBlobAsImageAttachment(blob, 'diagram.png', file.documentReference), deferred);
            });
          } catch(err) {
            deferred.reject();
@@ -130,17 +130,13 @@
          $jsontool.serialize($services.localization.render('diagram.editor.saveAsImageAttachmentError')), 'error');
        deferred.reject();
      }, /* limitHeight */ null, /* ignoreSelection */ true, /* scale */ diagramConfig.pdfImageExportZoom);
--    file.ui.selectPage(originalPage, true, null);
      return deferred.promise();
    };
--  var saveFileAsSVGImageAttachment = function(file, index, originalPage) {
--    var deferred = $.Deferred()
--    let page = file.ui.pages[index];
--    file.ui.selectPage(page, true, null);
++  var saveFileAsSVGImageAttachment = function(file) {
++    var deferred = $.Deferred();
      var svgRoot = file.ui.editor.graph.getSvg(/* background: */ '#ffffff', /* scale: */ null, /* border: */ null,
        /* nocrop: */ true, /* crisp: */ null, /* ignoreSelection: */ true);
--    file.ui.selectPage(originalPage, true, null);
      // Embed the images because the PDF exporter might not be able to access them.
      file.ui.convertImages(svgRoot, function() {
        var svg = '<?xml version="1.0" encoding="UTF-8"?>\n' +
@@ -147,62 +147,28 @@
          '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n' +
          mxUtils.getXml(svgRoot);
        var blob = new Blob([svg], {type: 'image/svg+xml'});
--      pipeDeferred(saveBlobAsImageAttachment(blob, `${getXWikiAttachmentName(index)}.svg`, file.documentReference),
--        deferred);
++      pipeDeferred(saveBlobAsImageAttachment(blob, 'diagram.svg', file.documentReference), deferred);
      }, imageCache);
      return deferred.promise();
    };
--  var saveFileAsImageAttachments = function(file, index, originalPage) {
++  var saveFileAsImageAttachments = function(file) {
      // This is a workaround for https://github.com/jgraph/drawio/issues/490
      // Stop editing for getting the latest content from diagram
      file.ui.editor.graph.stopEditing(false);
      // We upload the PNG image even if the SVG upload has failed.
--    var pngUpload = $.proxy(saveFileAsPNGImageAttachment, null, file, index, originalPage);
--    return saveFileAsSVGImageAttachment(file, index, originalPage).then(pngUpload, pngUpload);
++    var pngUpload = $.proxy(saveFileAsPNGImageAttachment, null, file);
++    return saveFileAsSVGImageAttachment(file).then(pngUpload, pngUpload);
    };
--  var getXWikiAttachmentName = function (index) {
--    if (index == 0)
--    {
--      // If is the first page we keep the old naming strategy -> diagram.png / diagram.svg
--      return "diagram";
--    }
--    return `diagram${index+1}`;
--  };
--
--  var deleteAllDiagrams = function() {
--    let baseUrl = `/xwiki/rest/diagram/${xm.documentReference.toString()}`;
--    let queryString = $.param({"form_token": xm.form_token});
--    return $.post(`${baseUrl}?${queryString}`);
--  };
--
    var saveFilesAsImageAttachments = function() {
--    var uploadDeferredList = []
--
--    forEachOpenedFile(function (file) {
--      var uploadDeferred = $.Deferred().resolve();
--      // Get the current page so we know where to return after saving.
--      let originalPage = file.ui.currentPage;
--
--      file.ui.pages.forEach(function (page, index) {
--        // We do the next upload even if the previous uploads have failed.
--        var nextUpload = $.proxy(saveFileAsImageAttachments, null, file, index,originalPage);
--        uploadDeferred = uploadDeferred.then(nextUpload, nextUpload);
--        uploadDeferredList.push(uploadDeferred.promise());
--      });
++    var uploadDeferred = $.Deferred().resolve();
++    forEachOpenedFile(function(file) {
++      // We do the next upload even if the previous uploads have failed.
++      var nextUpload = $.proxy(saveFileAsImageAttachments, null, file);
++      uploadDeferred = uploadDeferred.then(nextUpload, nextUpload);
      });
--    // Wait for all deferreds to complete.
--    return $.when.apply($, uploadDeferredList).then(
--      function () {
--        // Resolve the overall promise if all succeeded.
--        return { status: 'success' };
--      },
--      function () {
--        // Reject the overall promise if any failed.
--        return $.Deferred().reject({ status: 'fail' });
--      }
--    ).promise();
++    return uploadDeferred.promise();
    };
    var uploadInProgress = false;
@@ -214,13 +214,10 @@
        event.stopPropagation();
        var saveButton = $(event.target);
        saveButton.prop('disabled', true);
--      deleteAllDiagrams()
--      .then(saveFilesAsImageAttachments)
--      .catch(function(e) {
++      saveFilesAsImageAttachments().fail(function(e) {
          new XWiki.widgets.Notification(
            $jsontool.serialize($services.localization.render('diagram.editor.saveAsImageAttachmentError')), 'error');
--      })
--      .always(function() {
++      }).always(function() {
          saveButton.prop('disabled', false).click();
        });
      } else {

Parser le contenu

@@ -1,1 +1,1 @@
--Non
++Oui

XWiki.JavaScriptExtension[2]

Code

@@ -18,29 +18,6 @@
        a.nodeName.toLowerCase() != b.toLowerCase() ? !1 : null == c || a.getAttribute(c) == d;
    };
--/**
-- * TODO: When upgrading, make sure to check if this method has changed.
-- * This method was copied directly from draw.io, and the only change made was the call to this.showDialog.
-- * Both the width and height were modified to fit better within the XWiki UI.
-- */
--EditorUi.prototype.showBackgroundImageDialog = function (apply, img, color, showColor) {
--  apply = (apply != null) ? apply : mxUtils.bind(this, function (image, failed, color, shadowVisible) {
--    if (!failed) {
--      var change = new ChangePageSetup(this, (showColor) ? color : null, image);
--      change.ignoreColor = !showColor;
--      if (shadowVisible != null &&  showColor) {
--        change.shadowVisible = shadowVisible;
--      }
--      this.editor.graph.model.execute(change);
--    }
--  });
--
--  var dlg = new BackgroundImageDialog(this, apply, img, color, showColor);
--  this.showDialog(dlg.container, 420, (showColor) ? 260 : 240, true, true);
--  dlg.init();
--};
--
--
    EditorUi.prototype.showLinkDialog = function(value, selectLabel, callback, showNewWindowOption, linkTarget) {
      var resourceReference = diagramLinkHandler.getResourceReferenceFromCustomLink(value);
      // We append the modal to the body element in order to fix Issue #108: "Inserting a link in full screen mode is not
@@ -394,7 +394,8 @@
    //
    // Change the service name in order to disable notifications.
    //
--  EditorUi.prototype.getServiceName = function() {
++  EditorUi.prototype.getServiceName = function()
++  {
      return 'xwiki.com';
    };

Modifications pour le document DiagramEditSheet

Résumé

Détails

Navigation

Pour vous aider