Modifications pour le document DiagramEditSheet

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

From 6.1 to 7.1 From 8.1 to 9.1

Depuis la version 7.1

modifié par Admin
sur 08/11/2024 - 07:52

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

À 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 (1 modifications, 0 ajouts, 0 suppressions)
- XWiki.JavaScriptExtension[2]

Détails

XWiki.JavaScriptExtension[2]

Code

@@ -42,6 +42,32 @@
      // Do nothing.
    }
++  // Override the Graph.updateSvgLinks method to ensure that the links are preserved in the final SVG.
++  // We need to directly modify the original method because drawio does not provide a parameter to override the default
++  // behavior or a smaller method that only performs the replacement.
++  Graph.prototype.updateSvgLinks = function (node, target, removeCustom) {
++    var links = node.getElementsByTagName('a');
++    for (var i = 0; i < links.length; i++) {
++      if (links[i].getAttribute('target') == null) {
++        var href = links[i].getAttribute('href');
++        if (href == null) {
++          href = links[i].getAttribute('xlink:href');
++        }
++
++        if (href != null) {
++          if (target != null && /^https?:\/\//.test(href)) {
++            // If the href starts with http or https, set the target attribute.
++            links[i].setAttribute('target', target);
++          } else if (this.isCustomLink(href)) {
++            // Handle custom links
++            let absoluteLink = $('<a/>').attr('href', diagramLinkHandler.getURLFromCustomLink(href)).prop('href');
++            links[i].setAttribute('href', absoluteLink);
++          }
++        }
++      }
++    }
++  };
++
    // Overwrite Graph.getSvg in order to replace XWiki custom links with absolute URLs.
    // Also fix the text fallback for viewers with no support for foreignObjects.
    var originalGraphGetSVG = Graph.prototype.getSvg;
@@ -101,318 +101,6 @@
      return converter;
    };
--  // Copied from the drawio version 24.5.4 to include a fix for importing a file in an empty diagram. This method should
--  // be removed once we upgrade to a drawio version >= 24.4.0. Being a big method, the structure was altered just to
--  // make it shorter.
--  var importFilesNew = function(files, x, y, maxSize, fn, resultFn, filterFn, barrierFn,
--		resizeDialog, maxBytes, resampleThreshold, ignoreEmbeddedXml, evt) {
--    maxSize = (maxSize != null) ? maxSize : this.maxImageSize;
--    maxBytes = (maxBytes != null) ? maxBytes : this.maxImageBytes;
--    var crop = x != null && y != null;
--    var resizeImages = true;
--    x = (x != null) ? x : 0;
--    y = (y != null) ? y : 0;
--    // Checks if large images are imported
--    var largeImages = false;
--    if (!mxClient.IS_CHROMEAPP && files != null) {
--      var thresh = resampleThreshold || this.resampleThreshold;
--      for (var i = 0; i < files.length; i++) {
--        if (files[i].type.substring(0, 9) !== 'image/svg' &&
--            files[i].type.substring(0, 6) === 'image/' &&
--            files[i].size > thresh) {
--          largeImages = true;
--          break;
--        }
--      }
--    }
--    var doImportFiles = mxUtils.bind(this, function() {
--      var graph = this.editor.graph;
--      var gs = graph.gridSize;
--      fn = (fn != null) ? fn : mxUtils.bind(this, function(data, mimeType, x, y, w, h, filename, done, file) {
--        try {
--          if (data != null && data.substring(0, 10) == '<mxlibrary') {
--            this.spinner.stop();
--            this.loadLibrary(new LocalLibrary(this, data, filename));
--            this.showSidebar();
--            return null;
--          }
--          else {
--            // Drop on empty file ignores drop location
--            if (this.isCompatibleString(data) && files.length == 1 && evt != null &&
--                evt.type == 'drop' && this.isBlankFile() && !this.canUndo()) {
--              crop = false;
--              x = 0;
--              y = 0;
--            }
--            return this.importFile(data, mimeType, x, y, w, h, filename,
--                                   done, file, crop, ignoreEmbeddedXml, evt);
--          }
--        }
--        catch (e) {
--          this.handleError(e);
--          return null;
--        }
--      });
--      resultFn = (resultFn != null) ? resultFn : mxUtils.bind(this, function(cells) {
--        graph.setSelectionCells(cells);
--      });
--      if (this.spinner.spin(document.body, mxResources.get('loading'))) {
--        var count = files.length;
--        var remain = count;
--        var queue = [];
--        // Barrier waits for all files to be loaded asynchronously
--        var barrier = mxUtils.bind(this, function(index, fnc) {
--          queue[index] = fnc;
--          if (--remain == 0) {
--            this.spinner.stop();
--            if (barrierFn != null) {
--              barrierFn(queue);
--            }
--            else {
--              var cells = [];
--              graph.getModel().beginUpdate();
--              try {
--                for (var j = 0; j < queue.length; j++) {
--                  var tmp = queue[j]();
--                  if (tmp != null) {
--                    cells = cells.concat(tmp);
--                  }
--                }
--              }
--              finally {
--                graph.getModel().endUpdate();
--              }
--            }
--            resultFn(cells);
--          }
--        });
--        for (var i = 0; i < count; i++) {
--          (mxUtils.bind(this, function(index) {
--            var file = files[index];
--            if (file != null) {
--              var reader = new FileReader();
--              reader.onload = mxUtils.bind(this, function(e) {
--                if (filterFn == null || filterFn(file)) {
--                  try {
--                    if (file.type.substring(0, 6) == 'image/') {
--                      if (file.type.substring(0, 9) == 'image/svg') {
--                        // Checks if SVG contains content attribute
--                        var data = Graph.clipSvgDataUri(e.target.result);
--                        var comma = data.indexOf(',');
--                        var svgText = decodeURIComponent(escape(atob(data.substring(comma + 1))));
--                        var root = mxUtils.parseXml(svgText);
--                        var svgs = root.getElementsByTagName('svg');
--                        if (svgs.length > 0) {
--                          var svgRoot = svgs[0];
--                          var cont = (ignoreEmbeddedXml) ? null : svgRoot.getAttribute('content');
--                          if (cont != null && cont.charAt(0) != '<' && cont.charAt(0) != '%') {
--                            cont = unescape((window.atob) ? atob(cont) : Base64.decode(cont, true));
--                          }
--                          if (cont != null && cont.charAt(0) == '%') {
--                            cont = decodeURIComponent(cont);
--                          }
--                          if (cont != null && (cont.substring(0, 8) === '<mxfile ' ||
--                                               cont.substring(0, 14) === '<mxGraphModel ')) {
--                            barrier(index, mxUtils.bind(this, function() {
--                              return fn(cont, 'text/xml', x + index * gs, y + index * gs, 0, 0, file.name);
--                            }));
--                          }
--                          else {
--                            // SVG needs special handling to add viewbox if missing and
--                            // find initial size from SVG attributes (only for IE11)
--                            barrier(index, mxUtils.bind(this, function() {
--                              try {
--                                // Parses SVG and find width and height
--                                if (root != null) {
--                                  var svgs = root.getElementsByTagName('svg');
--                                  if (svgs.length > 0) {
--                                    var svgRoot = svgs[0];
--                                    var w = svgRoot.getAttribute('width');
--                                    var h = svgRoot.getAttribute('height');
--                                    if (w != null && w.charAt(w.length - 1) != '%') {
--                                      w = parseFloat(w);
--                                    }
--                                    else {
--                                      w = NaN;
--                                    }
--                                    if (h != null && h.charAt(h.length - 1) != '%') {
--                                      h = parseFloat(h);
--                                    }
--                                    else {
--                                      h = NaN;
--                                    }
--                                    // Check if viewBox attribute already exists
--                                    var vb = svgRoot.getAttribute('viewBox');
--                                    if (vb == null || vb.length == 0) {
--                                      svgRoot.setAttribute('viewBox', '0 0 ' + w + ' ' + h);
--                                    }
--                                    // Uses width and height from viewbox for
--                                    // missing width and height attributes
--                                    else if (isNaN(w) || isNaN(h)) {
--                                      var tokens = vb.split(' ');
--                                      if (tokens.length > 3) {
--                                        w = parseFloat(tokens[2]);
--                                        h = parseFloat(tokens[3]);
--                                      }
--                                    }
--                                    data = Editor.createSvgDataUri(mxUtils.getXml(svgRoot));
--                                    var s = Math.min(1, Math.min(maxSize / Math.max(1, w)), maxSize / Math.max(1, h));
--                                    var cells = fn(data, file.type, x + index * gs, y + index * gs, Math.max(
--                                      1, Math.round(w * s)), Math.max(1, Math.round(h * s)), file.name);
--                                    // Hack to fix width and height asynchronously
--                                    if (cells != null && (isNaN(w) || isNaN(h))) {
--                                      var img = new Image();
--                                      img.onload = mxUtils.bind(this, function() {
--                                        w = Math.max(1, img.width);
--                                        h = Math.max(1, img.height);
--                                        cells[0].geometry.width = w;
--                                        cells[0].geometry.height = h;
--                                        svgRoot.setAttribute('viewBox', '0 0 ' + w + ' ' + h);
--                                        data = Editor.createSvgDataUri(mxUtils.getXml(svgRoot));
--                                        var semi = data.indexOf(';');
--                                        if (semi > 0) {
--                                          data = data.substring(0, semi) + data.substring(data.indexOf(',', semi + 1));
--                                        }
--                                        graph.setCellStyles('image', data, [cells[0]]);
--                                      });
--                                      img.src = Editor.createSvgDataUri(mxUtils.getXml(svgRoot));
--                                    }
--                                    return cells;
--                                  }
--                                }
--                              }
--                              catch (e) {
--                                // ignores any SVG parsing errors
--                              }
--                              return null;
--                            }));
--                          }
--                        }
--                        else {
--                          barrier(index, mxUtils.bind(this, function() {
--                            return null;
--                          }));
--                        }
--                      }
--                      else {
--                        // Checks if PNG+XML is available to bypass code below
--                        var containsModel = false;
--                        if (file.type == 'image/png') {
--                          var xml = (ignoreEmbeddedXml) ? null : this.extractGraphModelFromPng(e.target.result);
--                          if (xml != null && xml.length > 0) {
--                            var img = new Image();
--                            img.src = e.target.result;
--                            barrier(index, mxUtils.bind(this, function() {
--                              return fn(xml, 'text/xml', x + index * gs, y + index * gs,
--                                        img.width, img.height, file.name);
--                            }));
--                            containsModel = true;
--                          }
--                        }
--                        // Additional asynchronous step for finding image size
--                        if (!containsModel) {
--                          // Cannot load local files in Chrome App
--                          if (mxClient.IS_CHROMEAPP) {
--                            this.spinner.stop();
--                            this.showError(mxResources.get('error'), mxResources.get('dragAndDropNotSupported'),
--                                           mxResources.get('cancel'), mxUtils.bind(this, function()
--                                                                                   {
--                              // Hides the dialog
--                            }), null, mxResources.get('ok'), mxUtils.bind(this, function()
--                                                                          {
--                              // Redirects to import function
--                              this.actions.get('import').funct();
--                            })
--                                          );
--                          }
--                          else {
--                            this.loadImage(e.target.result, mxUtils.bind(this, function(img) {
--                              this.resizeImage(img, e.target.result, mxUtils.bind(this, function(data2, w2, h2) {
--                                barrier(index, mxUtils.bind(this, function() {
--                                  // Refuses to insert images above a certain size as they kill the app
--                                  if (data2 != null && data2.length < maxBytes) {
--                                    var s = (!resizeImages || !this.isResampleImageSize(
--                                      file.size, resampleThreshold)) ? 1 :
--                                    Math.min(1, Math.min(maxSize / w2, maxSize / h2));
--                                    return fn(data2, file.type, x + index * gs, y + index * gs,
--                                              Math.round(w2 * s), Math.round(h2 * s), file.name);
--                                  }
--                                  else {
--                                    this.handleError({message: mxResources.get('imageTooBig')});
--                                    return null;
--                                  }
--                                }));
--                              }), resizeImages, maxSize, resampleThreshold, file.size);
--                            }), mxUtils.bind(this, function() {
--                              this.handleError({message: mxResources.get('invalidOrMissingFile')});
--                            }));
--                          }
--                        }
--                      }
--                    }
--                    else {
--                      var data = e.target.result;
--                      fn(data, file.type, x + index * gs, y + index * gs, 240, 160, file.name, function(cells) {
--                        barrier(index, function() {
--                          return cells;
--                        });
--                      }, file);
--                    }
--                  }
--                  catch (e) {
--                    // Ignores file parsing error
--                    barrier(index, mxUtils.bind(this, function() {
--                      return null;
--                    }));
--                    if (window.console != null) {
--                      console.error(e, file);
--                    }
--                  }
--                }
--                else {
--                  // Ignores file and decrements counter
--                  barrier(index, mxUtils.bind(this, function()
--                                              {
--                    return null;
--                  }));
--                }
--              });
--              // Handles special cases
--              if (/(\.v(dx|sdx?))($|\?)/i.test(file.name) || /(\.vs(x|sx?))($|\?)/i.test(file.name)) {
--                fn(null, file.type, x + index * gs, y + index * gs, 240, 160, file.name, function(cells) {
--                  barrier(index, function() {
--                    return cells;
--                  });
--                }, file);
--              }
--              else if (file.type.substring(0, 5) == 'image' || file.type == 'application/pdf') {
--                reader.readAsDataURL(file);
--              }
--              else {
--                reader.readAsText(file);
--              }
--            }
--          }))(i);
--        }
--      }
--    });
--    if (largeImages) {
--      // Workaround for lost files array in async code
--      var tmp = [];
--      for (var i = 0; i < files.length; i++) {
--        tmp.push(files[i]);
--      }
--      files = tmp;
--      this.confirmImageResize(function(doResize) {
--        resizeImages = doResize;
--        doImportFiles();
--      }, resizeDialog);
--    }
--    else {
--      doImportFiles();
--    }
--  };
--
    // Override for uploading the image as attachment instead of encode it to Base64.
    var originalImportFiles = EditorUi.prototype.importFiles;
    EditorUi.prototype.importFiles = function(files, x, y, maxSize, fn, resultFn, filterFn, barrierFn, resizeDialog,
@@ -442,7 +442,7 @@
          }
        };
      }
--    importFilesNew.apply(this, importFilesArgs);
++    originalImportFiles.apply(this, importFilesArgs);
    };
    // Add support for inserting images by specifying the XWiki attachment reference.
@@ -576,6 +576,15 @@
    };
  });
++define('diagramMenuTranslations', {
++  prefix: 'diagram.editor.menu.',
++  keys: [
++    // File menu.
++    'print.label',
++    'print.title'
++  ]
++});
++
  /**
   * Integrates draw.io diagram editor in XWiki.
   */
@@ -585,11 +585,12 @@
    'diagram-utils',
    'diagram-url-io',
    'diagram-config',
++  'xwiki-l10n!diagramMenuTranslations',
    'diagram-graph-xml-filter',
    'diagram-link-editor',
    'diagram-image-editor',
    'diagram-external-services'
--], function($, diagramStore, diagramUtils, diagramUrlIO, diagramConfig) {
++], function($, diagramStore, diagramUtils, diagramUrlIO, diagramConfig, l10n) {
    // These variables are used to decide if an image should be uploaded at original resolution or
    // should be declined for being too big.
@@ -621,6 +621,7 @@
    var fixEditorUI = function(editorUI) {
      cleanMenu(editorUI);
++    renameMenu(editorUI);
      fixKeyboardShortcutsAction(editorUI);
      fixEditorButtons($(editorUI.container));
      removeThemeButton();
@@ -660,11 +660,31 @@
    var originalAddSubmenu = Menus.prototype.addSubmenu;
    Menus.prototype.addSubmenu = function(name, menu, parent, label) {
      var subMenu = this.get(name);
--    if (subMenu && subMenu.visible !== false) {
--      originalAddSubmenu.apply(this, arguments);
++    if (subMenu && subMenu.isEnabled() !== false) {
++     return originalAddSubmenu.apply(this, arguments);
      }
    };
++
++  /*
++   * Map with all the menu items that we want to have a title.
++   */
++  const titleMap = new Map([
++      ['print', l10n['print.title']]
++  ]);
++
++  /*
++   * Update the title of the menu items.
++   */
++  var originalAddMenuItem = Menus.prototype.addMenuItem;
++  Menus.prototype.addMenuItem = function(menu, key, parent, trigger, sprite, label) {
++    let item = originalAddMenuItem.apply(this, arguments);
++    if (item != null && titleMap.has(key)) {
++      item.title = titleMap.get(key);
++    }
++    return item;
++  };
++
    // Remove the language picker because the diagram editor is configured to use the XWiki language.
    var originalCreateMenubar = Menus.prototype.createMenubar;
    Menus.prototype.createMenubar = function(container) {
@@ -684,6 +684,24 @@
    };
    //
++  // Rename menu options to fit our needs.
++  //
++  var renameMenu = function(editorUI) {
++    const menuItems = [
++      // File menu
++      ['print', l10n['print.label']]
++    ];
++
++    // Iterate over the array of tuples
++    menuItems.forEach(function([menuKey, newLabel]) {
++      var action = editorUI.actions.actions[menuKey];
++      if (action) {
++        action.label = newLabel;
++      }
++    });
++  };
++
++  //
    // Clean the editor menu by removing the features that are not needed.
    //
    var cleanMenu = function(editorUI) {
@@ -696,7 +696,7 @@
         // Help menu
        'downloadDesktop', 'useOffline',
        // ExportAs
--      'exportHtml'
++      'exportHtml', 'exportPdf'
      ].forEach(function(actionName) {
        var action = editorUI.actions.actions[actionName];
        if (action) {

Modifications pour le document DiagramEditSheet

Résumé

Détails

Navigation

Pour vous aider