Skip to Content
Découvrez les nouveautés de cette version : Fonctionnalités, améliorations et évolutions vous attendent ! 👉 Cliquez ici pour en savoir plus

Modifications pour le document DiagramEditSheet

Modifié par Admin le 19/03/2025 - 19:24
Depuis la version 5.1
modifié par Admin
sur 24/06/2024 - 15:24
Commentaire de modification : Install extension [com.xwiki.diagram:application-diagram/1.20.4]
À 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]

Résumé

Détails

XWiki.JavaScriptExtension[1]
Code
... ... @@ -32,17 +32,41 @@
32 32   },
33 33   setData: function(data) {
34 34   this.input.val(data);
35 - let pages = this.ui.getPagesForXml(data);
36 - if (pages.length > 0) {
37 - this.ui.pages = this.ui.getPagesForXml(data);
35 + },
36 + isCompressed: function() {
37 + return false;
38 + },
39 + // TODO: When upgrading the drawio version, ensure that this method is copied from the drawio code and the
40 + // `resolveReferences` parameter of the getFileData is set to `true` to prevent incorrect formatting of links to
41 + // wiki pages in the diagram content. https://github.com/xwikisas/application-diagram/issues/295
42 + createData: function() {
43 + var actualPages = this.ui.pages;
44 +
45 + if (this.isRealtime()) {
46 + // Uses ownPages for getting file data below
47 + this.ui.pages = this.ownPages;
48 +
49 + // Updates view state in own current page
50 + if (this.ui.currentPage != null) {
51 + var ownPage = this.ui.getPageById(
52 + this.ui.currentPage.getId(),
53 + this.ownPages);
54 +
55 + if (ownPage != null) {
56 + ownPage.viewState = this.ui.editor.graph.getViewState();
57 + ownPage.needsUpdate = true;
58 + }
59 + }
38 38   }
61 +
62 + var result = this.ui.getFileData(null, null, null, null, null, null, null, null, this,
63 + !this.isCompressed(), true);
64 + this.ui.pages = actualPages;
65 + return result;
39 39   },
40 40   open: function() {
41 41   var graphXML = this.getData() || '<mxGraphModel/>';
42 - var graphNode = mxUtils.parseXml(graphXML).documentElement;
43 - graphNode.fromStorage = true;
44 - this.ui.editor.setGraphXml(graphNode);
45 - this.ui.currentPage = this.ui.pages[0];
69 + this.ui.setFileData(graphXML);
46 46   this.changeListener = mxUtils.bind(this, function(sender, eventObject) {
47 47   this.setModified(true);
48 48   });
XWiki.JavaScriptExtension[2]
Code
... ... @@ -1,516 +514,3 @@
1 -define('svg-handler', ['jquery'], function($) {
2 - var lineHeight = 15;
3 - var spaceWidth = 5;
4 - var listBorder = 35;
5 - var addTagSpecificStyle = function(element, s, w, h, htmlConverter, str, alt) {
6 - switch (getTagName(element)){
7 - case 'h1':
8 - alt.setAttribute('font-size', Math.round(s.fontSize + 0.6 * s.fontSize) + 'px');
9 - alt.setAttribute('font-weight', 'bold');
10 - break;
11 - case 'h2':
12 - alt.setAttribute('font-size', Math.round(s.fontSize + 0.3 * s.fontSize) + 'px');
13 - alt.setAttribute('font-weight', 'bold');
14 - break;
15 - case 'h3':
16 - alt.setAttribute('font-size', Math.round(s.fontSize + 0.15 * s.fontSize) + 'px');
17 - alt.setAttribute('font-weight', 'bold');
18 - break;
19 - case 'h4':
20 - alt.setAttribute('font-weight', 'bold');
21 - break;
22 - case 'h5':
23 - alt.setAttribute('font-size', Math.round(s.fontSize - 0.15 * s.fontSize) + 'px');
24 - alt.setAttribute('font-weight', 'bold');
25 - break;
26 - case 'h6':
27 - alt.setAttribute('font-size', Math.round(s.fontSize - 0.3 * s.fontSize) + 'px');
28 - alt.setAttribute('font-weight', 'bold');
29 - break;
30 - case 'b':
31 - alt.setAttribute('font-weight', 'bold');
32 - break;
33 - case 'i':
34 - alt.setAttribute('font-style', 'italic');
35 - break;
36 - case 'li':
37 - // Because of the space that is reserved for the bullets delimiters, the list's text is moved more to the
38 - // right. For simulating the same behavior in svg, the text-anchor is removed for all the elements inside this
39 - // container, meaning also for ul and ol elements.
40 - alt.removeAttribute('text-anchor');
41 -
42 - // Adapt elements for XWiki PDF export since links are not displayed when 'a' tag is placed inside a 'text'
43 - // element.
44 - var isLinkTag = getTagName(alt) === 'a';
45 -
46 - // Have a bullet for each row.
47 - var delimiter = document.createElementNS('http://www.w3.org/2000/svg', isLinkTag ? 'text' : 'tspan');
48 - delimiter.textContent = "•";
49 - delimiter.setAttribute('x', w - 2 * spaceWidth);
50 - delimiter.setAttribute('y', h);
51 -
52 - // Move all to a container.
53 - var container = document.createElementNS('http://www.w3.org/2000/svg', isLinkTag ? 'g' : 'text');
54 - container.setAttribute('x', w);
55 - container.setAttribute('y', h);
56 - container.appendChild(delimiter);
57 -
58 - if (isLinkTag) {
59 - // The text inside alt is distributed to 'tspan' elements and since they are showned only if are placed
60 - // under a 'text' parent, we add it between them and the link.
61 - var text = document.createElementNS('http://www.w3.org/2000/svg', 'text');
62 - // Copy only first child since it refers to the actual text content which, dependending on whether the
63 - // text needed wrapping or not, is a 'tspan' with either just text inside or with multiple children
64 - // representing the wrapped text.
65 - text.appendChild($(alt).children()[0]);
66 - $(alt).empty();
67 - alt.appendChild(text);
68 - }
69 -
70 - // If alt comes from a container, we should preserve the original parent.
71 - var parent = alt.parentElement;
72 - container.appendChild(alt);
73 - if (parent != null) {
74 - parent.appendChild(container);
75 - parent.removeAttribute('text-anchor');
76 - }
77 - return container;
78 - case 'ul':
79 - // See comment from case 'li'.
80 - alt.removeAttribute('text-anchor');
81 - break;
82 - case 'ol':
83 - // See comment from care 'li'.
84 - alt.removeAttribute('text-anchor');
85 - break;
86 - case 'u':
87 - alt.setAttribute('text-decoration', 'underline');
88 - break;
89 - case 'a':
90 - var link = document.createElementNS('http://www.w3.org/2000/svg', 'a');
91 - link.setAttribute('x', w);
92 - link.setAttribute('y', h);
93 - link.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', element.href);
94 - // Add link decorations for the text. Some styles added to a 'g' are not distributed to it's children by FOP,
95 - // so we do it manually.
96 - if (getTagName(alt) == 'g') {
97 - var childNodes = $(alt).children();
98 - childNodes.each(function() {
99 - this.setAttribute('fill', '#0000EE');
100 - this.setAttribute('text-decoration', 'underline');
101 - });
102 - } else {
103 - alt.setAttribute('fill', '#0000EE');
104 - alt.setAttribute('text-decoration', 'underline');
105 - }
106 - alt.removeAttribute('text-anchor');
107 - // If alt comes from a container, we should preserve the original parent.
108 - var parent = alt.parentElement;
109 - link.appendChild(alt);
110 - if (parent != null) {
111 - parent.appendChild(link);
112 - }
113 - return link;
114 - default:
115 - return alt;
116 - }
117 - return alt;
118 - };
119 -
120 - var getStrWidth = function(str, s) {
121 - return $('<span></span>')
122 - .css({display: 'none', whiteSpace: 'nowrap'})
123 - .appendTo($('body'))
124 - .text(str)
125 - .width();
126 - };
127 -
128 - var takenCoordinates;
129 - // Creates a row inside a text element that should be wrapped. The coordinates of the first row are already saved.
130 - var createRow = function(w, h, rowNb) {
131 - var row = document.createElementNS('http://www.w3.org/2000/svg', 'tspan');
132 - row.setAttribute('x', w);
133 - row.setAttribute('y', h);
134 - if (rowNb > 0) {
135 - takenCoordinates.push({'w': w, 'h': h});
136 - }
137 - return row;
138 - };
139 -
140 - var wrapText = function(alt, s, w, h, content, contentWidth, maxWidth) {
141 - var words = content.split(/[\s+]/);
142 - var wordWidth, rowWidth = 0, rowNb = 0;
143 - var row = createRow(w, h, rowNb);
144 - alt.appendChild(row);
145 - words.each(function(word) {
146 - word += ' ';
147 - wordWidth = getStrWidth(word, s);
148 - if (rowWidth + wordWidth > maxWidth) {
149 - h += lineHeight;
150 - row = createRow(w, h, ++rowNb);
151 - row.textContent = word;
152 - alt.appendChild(row);
153 - rowWidth = wordWidth;
154 - } else {
155 - row.textContent += word;
156 - rowWidth += wordWidth;
157 - }
158 - });
159 - };
160 -
161 - /*
162 - * Consider containerWidth as the maximal width to do the word wrap when needed. Add the inner html only if the
163 - * element is not a list, since the text should be distributed to children instead of being shown at once. The same
164 - * is applied for when the text is longer then the containerWidth, since it will be distributed to tspan elements.
165 - * Shorten the containerWidth send to text wrapper for 'li' elements since in their case an adittional space is
166 - * added for the bullet delimiter and it shouldn't be included.
167 - */
168 - var addTextContent= function(element, htmlConverter, s, containerWidth, alt, w, h) {
169 - htmlConverter.innerHTML = element.innerText;
170 - var content = htmlConverter.value;
171 - var contentWidth = getStrWidth(content, s);
172 - if (!isListElement(element)) {
173 - if (contentWidth > containerWidth) {
174 - containerWidth = isListItem(element) ? containerWidth - listBorder : containerWidth;
175 - wrapText(alt, s, w, h, content, contentWidth, containerWidth);
176 - } else {
177 - alt.textContent = htmlConverter.value;
178 - }
179 - }
180 - };
181 -
182 - var getTagName = function(element) {
183 - return element && element.tagName && element.tagName.toLowerCase();
184 - };
185 -
186 - var isTextNode = function(node) {
187 - return node && node.nodeType === 3;
188 - };
189 -
190 - var isHeadingElement = function(element) {
191 - return ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].indexOf(getTagName(element)) >= 0;
192 - };
193 -
194 - var isBlockElement = function(element) {
195 - return ['p', 'div'].indexOf(getTagName(element)) >= 0 || isHeadingElement(element);
196 - };
197 -
198 - var isListElement = function(element) {
199 - return ['ul', 'ol'].indexOf(getTagName(element)) >= 0;
200 - };
201 -
202 - var isInlineElement = function(element) {
203 - return ['b', 'i', 'span'].indexOf(getTagName(element)) >= 0;
204 - };
205 -
206 - var isListItem = function(element) {
207 - return getTagName(element) === 'li';
208 - };
209 -
210 - var isNodeWithPartialStyle = function(node, nbOfSiblings) {
211 - return isTextNode(node) || ((isInlineElement(node) || isBlockElement(node)) && nbOfSiblings > 1);
212 - };
213 -
214 - var isParagraphWithPartialStyle = function(node, nbOfSiblings) {
215 - if (isNodeWithPartialStyle(node, nbOfSiblings)) {
216 - return true;
217 - }
218 -
219 - // Consider also indirect children.
220 - var childNodes = $(node).contents();
221 - if ($(node).children().length > 0) {
222 - for (var i = 0; i < childNodes.length; i++) {
223 - var child = childNodes[i];
224 - if (isParagraphWithPartialStyle(child, childNodes.length) == true) {
225 - return true;
226 - }
227 - }
228 - }
229 - return false;
230 - };
231 -
232 - var isStyleElement = function(element) {
233 - if (element == null) { return false; }
234 - return ['b', 'i', 'u', 'a'].indexOf(getTagName(element)) != -1 || isHeadingElement(element);
235 - };
236 -
237 - /*
238 - * Get multiple styles of an element (i.e. b, i, u, a tags)
239 - */
240 - var getStylesFromElement = function(element) {
241 - var styles = [];
242 - // Partially styled elements are not supported, so consider only the styles of the main element.
243 - var parentTextLength = element.parentElement.textContent.length;
244 - if (element.textContent.length == parentTextLength) {
245 - styles.push(element);
246 - }
247 - // Consider also indirect children.
248 - var childElements = element.getElementsByTagName("*");
249 - for (i = 0; i < childElements.length; i++) {
250 - var child = childElements[i];
251 - if (child.textContent.length == parentTextLength) {
252 - styles.push(child);
253 - }
254 - }
255 - return styles;
256 - };
257 -
258 - // For the current block of text take into consideration if those coordinates are already in use.
259 - // This is used when we are manually computing the container of children elements.
260 - var maybeChangeHeight = function(w, h, element) {
261 - // They didn't took into consideration the size of an heading tag.
262 - h = isHeadingElement(element) ? h - lineHeight : h;
263 - var thisCoordinates = {'w': w, 'h': h};
264 - takenCoordinates.each(function(coordinates) {
265 - if (coordinates['w'] == thisCoordinates['w'] && coordinates['h'] == thisCoordinates['h']) {
266 - h += lineHeight;
267 - thisCoordinates['h'] = h;
268 - }
269 - });
270 - takenCoordinates.push(thisCoordinates);
271 - return h;
272 - };
273 -
274 - var getAdjustedInitialCoordinates = function(w, h, fontSize) {
275 - w = Math.round(w / 2);
276 - // For smaller heights the result seems to corespond to the one in the original view, but for the others the font
277 - // size is relevant.
278 - // TODO: investigate the reasons behind this behavior.
279 - if (h < lineHeight) {
280 - h = Math.round(h / 2);
281 - } else {
282 - h = Math.round(h / 2 - fontSize / 2);
283 - }
284 - return {'w': w, 'h': h};
285 - }
286 -
287 - // Create the basis of a svg element. Calculate new coordinates if is needed.
288 - var createSvgElement = function(s, w, h, tag, element, addAnchor, isPartiallyStyledElement) {
289 - var alt = document.createElementNS('http://www.w3.org/2000/svg', tag);
290 - if (element && (isBlockElement(element) || isListItem(element) || isPartiallyStyledElement)) {
291 - h = maybeChangeHeight(w, h, element);
292 - }
293 - alt.setAttribute('x', w);
294 - alt.setAttribute('y', h);
295 - alt.setAttribute('fill', s.fontColor || 'black');
296 - if (addAnchor) {
297 - alt.setAttribute('text-anchor', 'middle');
298 - }
299 - alt.setAttribute('font-size', Math.round(s.fontSize) + 'px');
300 - alt.setAttribute('font-family', s.fontFamily);
301 -
302 - if ((s.fontStyle & mxConstants.FONT_BOLD) == mxConstants.FONT_BOLD)
303 - {
304 - alt.setAttribute('font-weight', 'bold');
305 - }
306 -
307 - if ((s.fontStyle & mxConstants.FONT_ITALIC) == mxConstants.FONT_ITALIC)
308 - {
309 - alt.setAttribute('font-style', 'italic');
310 - }
311 -
312 - if ((s.fontStyle & mxConstants.FONT_UNDERLINE) == mxConstants.FONT_UNDERLINE)
313 - {
314 - alt.setAttribute('text-decoration', 'underline');
315 - }
316 - return alt;
317 - };
318 -
319 - var convertTextElementToSvg = function(element, s, w, h, htmlConverter, str, containerWidth, isFirstChild) {
320 - if (getTagName(element) == 'br') {
321 - return document.createElementNS('http://www.w3.org/2000/svg', "text");
322 - }
323 - if (isFirstChild) {
324 - takenCoordinates = [];
325 - }
326 - var coordinates = getAdjustedInitialCoordinates(w, h, s.fontSize);
327 - w = coordinates.w;
328 - h = coordinates.h;
329 -
330 - // Use 'tspan' for 'li' elements since they will be move inside a 'text' container along with a row delimiter.
331 - // Update h in case it was manually modified to take into consideration other inserted elements.
332 - var tag = isListItem(element) ? 'tspan' : 'text';
333 - var alt = createSvgElement(s, w, h, tag, element, true);
334 - h = parseInt(alt.getAttribute('y'));
335 -
336 - addTextContent(element, htmlConverter, s, containerWidth, alt, w, h);
337 -
338 - // Convert recursively the children. Have a container that will hold the elements in case there are other children.
339 - // Consider the case when multiple styles are added to an element (e.g. <i><b>txt</b></i>).
340 - // Traverse all children and keep the styles to just one element.
341 - if (element.childElements().length > 0) {
342 - var container = createSvgElement(s, w, h, 'g', null, !isListElement(element));
343 - // TODO: Don't append alt element, unless it has a content.
344 - container.appendChild(alt);
345 - element.childElements().each(function(child) {
346 - if (isStyleElement(child)) {
347 - var styles = getStylesFromElement(child);
348 - styles.each(function(style) {
349 - alt = addTagSpecificStyle(style, s, w, h, htmlConverter, str, alt, true);
350 - });
351 - } else {
352 - var childSvg = convertTextElementToSvg(child, s, w, h, htmlConverter, str, containerWidth, false);
353 - if (childSvg != undefined) {
354 - container.appendChild(childSvg);
355 - }
356 - }
357 - });
358 - }
359 -
360 - // TODO: apply the defined style of the element.
361 - alt = addTagSpecificStyle(element, s, w, h, htmlConverter, str, alt);
362 - if (element.childElements().length > 0) {
363 - return container;
364 - } else {
365 - return alt;
366 - }
367 - };
368 -
369 -
370 - /*
371 - * Converts a partially styled element (e.g. link added to just a word of a phrase) to svg kepping as much as
372 - * possible from the original element.
373 - * When different types of elements are separated vertically (see Example 1), as long as each element is not a
374 - * composite one, the result is mainly as the input. But, for cases when the styled element is inside a phrase (see
375 - * Example 2), the result is a fallback to simple text.
376 - * TODO: In the case of Example 3, when a child of a partially styled paragraph is itself a partially styled
377 - * paragraph with "Text" nodes a fallback must be added. For now, elementsContainer.contents() separates the nodes
378 - * that are connected and there isn't a smooth solution to get which elements were on the same line (maybe consider
379 - * </br> as divider). Even though it looks the same in html, Example 4 works compared to 3 since there are
380 - * no text nodes, but this depends on how the user inserts the text.
381 - *
382 - * Example 1: <div> "Simple text" </br> <b>Bolded text</b> </div>
383 - * Example 2: <div> "Simple text" <b>Bolded text</b> </div>
384 - * Example 3: <div> "Simple text" </br> "Simple text" <b>Bolded text</b> </div>
385 - * Example 4:
386 - * <div>
387 - * "Simple text" </br>
388 - * <span>"Simple text" <b>Bolded text</b></span>
389 - * </div>
390 - */
391 - var convertPartiallyStyledParagraphToSVG = function(childNodes, s, w, h, htmlConverter, str, containerWidth) {
392 - takenCoordinates = [];
393 - var initialWidth = w;
394 - var initialHeight = h;
395 - var coordinates = getAdjustedInitialCoordinates(w, h, s.fontSize);
396 - w = coordinates.w;
397 - h = coordinates.h;
398 -
399 - var container = createSvgElement(s, w, h, /* tag */ 'g', /* element */ null,
400 - /* addAnchor */ !isListElement(childNodes[0]));
401 - // Go to last level of child nodes in case there is a style added to the root element. Keep the styles to add
402 - // them after assembling the element with its children.
403 - var styles = [];
404 - while (childNodes.length == 1 && $(childNodes[0]).children().length > 0) {
405 - var rootNode = childNodes[0];
406 - if (isStyleElement(rootNode)) {
407 - styles.push(rootNode);
408 - }
409 - childNodes = $(rootNode).contents();
410 - }
411 -
412 - // Resolve the basic case where the element is just a phrase with a styled element. Remove this after fixing
413 - // the TODO described in the comment above.
414 - var simpleNodes= childNodes.filter(function() {
415 - return isTextNode(this) || isInlineElement(this);
416 - });
417 -
418 - if(simpleNodes.length == childNodes.length) {
419 - var element = $('<span></span>').html(str)[0];
420 - // We use the unmodified coordinates to prevent adjusting them twice.
421 - var alt = convertTextElementToSvg(element, s, initialWidth, initialHeight, htmlConverter, str, containerWidth,
422 - /* isFirstChild */ true);
423 - return alt;
424 - }
425 -
426 - // Look only on first-level children since for now it is not supported to partially style paragraphs inside a
427 - // partially styled paragraph.
428 - childNodes.each(function(index) {
429 - var element = $(this).clone()[0];
430 - // Convert text content to element for consistency.
431 - if (isTextNode(element)) {
432 - element = $('<span></span>').html(element.textContent)[0];
433 - }
434 -
435 - // Don't do anything for </br> tags or empty elements.
436 - if (getTagName(element) == 'br' || element.innerText == '') {
437 - return;
438 - }
439 -
440 - // Consider that list elements will be moved to a 'text' container and in this case 'tspan' should be used as
441 - // child tag. Specify that it is a partially styled element because in this case it could contain '<br>'
442 - // tags and the children would need to have changed coordinates (heights) when they are created.
443 - var alt = createSvgElement(s, w, h, /* tag */ isListItem(element) ? 'tspan' : 'text', /* element */ element,
444 - /* addAnchor */ true, /* isPartiallyStyledElement */ true);
445 - h = parseInt(alt.getAttribute('y'));
446 -
447 - addTextContent(element, htmlConverter, s, containerWidth, alt, w, h);
448 -
449 - alt = addTagSpecificStyle(element, s, w, h, htmlConverter, str, alt);
450 - container.appendChild(alt);
451 - });
452 - // Consider the case when multiple styles are added to the root element.
453 - styles.each(function(style) {
454 - container = addTagSpecificStyle(style, s, w, h, htmlConverter, str, container, true);
455 - });
456 - return container;
457 -
458 - };
459 -
460 - // Fix the transform attribute of the element that is used when foreignObjects are not supported and the view
461 - // fallbacks to svg. This code is taken from an older draw.io version, since starting with 12.5.0 the transform
462 - // attribute doesn't take into consideration the coordinates, but only the foOffset.
463 - var adjustAlternateTextCoordinates = function(group, x, y , w , h, s, align, valign, overflow, rotation, foOffset) {
464 - x += s.dx;
465 - y += s.dy;
466 - var dx = 0;
467 - var dy = 0;
468 -
469 - if (align == mxConstants.ALIGN_CENTER) {
470 - dx -= w / 2;
471 - } else if (align == mxConstants.ALIGN_RIGHT) {
472 - dx -= w;
473 - }
474 - x += dx;
475 -
476 - if (valign == mxConstants.ALIGN_MIDDLE) {
477 - dy -= h / 2;
478 - } else if (valign == mxConstants.ALIGN_BOTTOM) {
479 - dy -= h;
480 - }
481 -
482 - if (overflow != 'fill' && mxClient.IS_FF && mxClient.IS_WIN) {
483 - dy -= 2;
484 - }
485 - y += dy;
486 -
487 - var tr = (s.scale != 1) ? 'scale(' + s.scale + ')' : '';
488 -
489 - if (s.rotation != 0 && this.rotateHtml) {
490 - tr += 'rotate(' + (s.rotation) + ',' + (w / 2) + ',' + (h / 2) + ')';
491 - var pt = this.rotatePoint((x + w / 2) * s.scale, (y + h / 2) * s.scale, s.rotation, s.rotationCx, s.rotationCy);
492 - x = pt.x - w * s.scale / 2;
493 - y = pt.y - h * s.scale / 2;
494 - } else {
495 - x *= s.scale;
496 - y *= s.scale;
497 - }
498 -
499 - if (rotation != 0) {
500 - tr += 'rotate(' + (rotation) + ',' + (-dx) + ',' + (-dy) + ')';
501 - }
502 -
503 - var transform = 'translate(' + (Math.round(x) + foOffset) + ',' + (Math.round(y) + foOffset) + ')' + tr;
504 - group.setAttribute('transform', transform);
505 - };
506 -
507 - return {
508 - convertTextElementToSvg: convertTextElementToSvg,
509 - isParagraphWithPartialStyle: isParagraphWithPartialStyle,
510 - convertPartiallyStyledParagraphToSVG: convertPartiallyStyledParagraphToSVG,
511 - adjustAlternateTextCoordinates: adjustAlternateTextCoordinates
512 - };
513 -});
514 514  /**
515 515   * Overrides the link dialog in order to support creating links to wiki pages.
516 516   */
... ... @@ -517,10 +517,9 @@
517 517  define('diagram-link-editor', [
518 518   'jquery',
519 519   'diagram-link-handler',
520 - 'svg-handler',
521 521   'draw.io',
522 522   'resourceSelector'
523 -], function($, diagramLinkHandler, svgHandler) {
9 +], function($, diagramLinkHandler) {
524 524   /**
525 525   * Override in order to change the Element type check from a.constructor !== Element, which was failing due to a
526 526   * collision with the PrototypeJS's own implementation of the standard Element.
... ... @@ -581,66 +581,8 @@
581 581   // Keep only the text content.
582 582   str = $('<div/>').html(str).text() || this.foAltText;
583 583   }
584 - // Update links inside foreignObject to use absolute URLs, since the generated SVG needs to be portable.
585 - $(fo).find('a').each(function() {
586 - var oldLink = $(this).attr('href');
587 - if (diagramLinkHandler.isXWikiCustomLink(oldLink)) {
588 - var newLink = diagramLinkHandler.getURLFromCustomLink(oldLink);
589 - $(this).attr('href', newLink);
590 - }
591 - });
592 -
593 - if (this.foAltText != null) {
594 - var s = this.state;
595 - var htmlConverter = document.createElement('textarea');
596 - var content = document.createElementNS('http://www.w3.org/2000/svg', 'g');
597 - var temporaryContent = document.createElementNS('http://www.w3.org/2000/svg', 'g');
598 - var elementsContainer = $(fo).children().first().children().first();
599 - var childNodes = elementsContainer.contents();
600 - // Consider the container width to be the width of the closest rect parent node. For some shapes, like Actor
601 - // or any non squared shape, there is no rect and we fallback to the initial width of the text node, which is
602 - // less accurate.
603 - var containerWidth = this.state.initialWidth;
604 - var prevNode = $(fo.parentNode).prev()[0];
605 - if (prevNode && prevNode.nodeName == 'rect') {
606 - var containerWidth = prevNode.width.baseVal.valueAsString;
607 - }
608 - try {
609 - if (childNodes.length > 0) {
610 - var isPartiallyStyledElement = false;
611 - var alt;
612 - childNodes.each(function(index) {
613 - // Make a clone of the node, to not alter the original child.
614 - var node = $(this).clone()[0];
615 - // If this paragraph has partially styled nodes (i.e. link added to just a part of the text) create a
616 - // fallback version of it, since not all the cases are supported and the created svg could not be
617 - // compatible with the already created elements. This is done since is too complex to calculate the
618 - // coordinates of the styled node, considering the last element added and that it may be needed to wrap
619 - // the text.
620 - if (svgHandler.isParagraphWithPartialStyle(node, childNodes.length)) {
621 - alt = svgHandler.convertPartiallyStyledParagraphToSVG(childNodes, s, w, h, htmlConverter, str,
622 - containerWidth);
623 - isPartiallyStyledElement = true;
624 - return false;
625 - } else {
626 - alt = svgHandler.convertTextElementToSvg(node, s, w, h, htmlConverter, str, containerWidth, index == 0);
627 - temporaryContent.appendChild(alt);
628 - }
629 - });
630 - content.appendChild(isPartiallyStyledElement ? alt : temporaryContent)
631 - svgHandler.adjustAlternateTextCoordinates(content, x, y, w, h, s, align, valign, overflow, rotation,
632 - this.foOffset);
633 - return content;
634 - } else {
635 - return originalCreateAlternateContent.call(this, fo, x, y, w, h, str, align, valign, wrap, format,
636 - overflow, clip, rotation);
637 - }
638 - } catch (e) {
639 - return originalCreateAlternateContent.apply(this, arguments);
640 - }
641 - } else {
642 - return originalCreateAlternateContent.apply(this, arguments);
643 - }
70 + return originalCreateAlternateContent.call(this, fo, x, y, w, h, str, align, valign, wrap, format, overflow,
71 + clip, rotation);
644 644   };
645 645   return originalDrawState.apply(this, arguments);
646 646   };
... ... @@ -672,7 +672,319 @@
672 672   };
673 673   return converter;
674 674   };
675 -
103 +
104 + // Copied from the drawio version 24.5.4 to include a fix for importing a file in an empty diagram. This method should
105 + // be removed once we upgrade to a drawio version >= 24.4.0. Being a big method, the structure was altered just to
106 + // make it shorter.
107 + var importFilesNew = function(files, x, y, maxSize, fn, resultFn, filterFn, barrierFn,
108 + resizeDialog, maxBytes, resampleThreshold, ignoreEmbeddedXml, evt) {
109 + maxSize = (maxSize != null) ? maxSize : this.maxImageSize;
110 + maxBytes = (maxBytes != null) ? maxBytes : this.maxImageBytes;
111 + var crop = x != null && y != null;
112 + var resizeImages = true;
113 + x = (x != null) ? x : 0;
114 + y = (y != null) ? y : 0;
115 + // Checks if large images are imported
116 + var largeImages = false;
117 + if (!mxClient.IS_CHROMEAPP && files != null) {
118 + var thresh = resampleThreshold || this.resampleThreshold;
119 + for (var i = 0; i < files.length; i++) {
120 + if (files[i].type.substring(0, 9) !== 'image/svg' &&
121 + files[i].type.substring(0, 6) === 'image/' &&
122 + files[i].size > thresh) {
123 + largeImages = true;
124 + break;
125 + }
126 + }
127 + }
128 + var doImportFiles = mxUtils.bind(this, function() {
129 + var graph = this.editor.graph;
130 + var gs = graph.gridSize;
131 + fn = (fn != null) ? fn : mxUtils.bind(this, function(data, mimeType, x, y, w, h, filename, done, file) {
132 + try {
133 + if (data != null && data.substring(0, 10) == '<mxlibrary') {
134 + this.spinner.stop();
135 + this.loadLibrary(new LocalLibrary(this, data, filename));
136 + this.showSidebar();
137 + return null;
138 + }
139 + else {
140 + // Drop on empty file ignores drop location
141 + if (this.isCompatibleString(data) && files.length == 1 && evt != null &&
142 + evt.type == 'drop' && this.isBlankFile() && !this.canUndo()) {
143 + crop = false;
144 + x = 0;
145 + y = 0;
146 + }
147 + return this.importFile(data, mimeType, x, y, w, h, filename,
148 + done, file, crop, ignoreEmbeddedXml, evt);
149 + }
150 + }
151 + catch (e) {
152 + this.handleError(e);
153 + return null;
154 + }
155 + });
156 + resultFn = (resultFn != null) ? resultFn : mxUtils.bind(this, function(cells) {
157 + graph.setSelectionCells(cells);
158 + });
159 + if (this.spinner.spin(document.body, mxResources.get('loading'))) {
160 + var count = files.length;
161 + var remain = count;
162 + var queue = [];
163 + // Barrier waits for all files to be loaded asynchronously
164 + var barrier = mxUtils.bind(this, function(index, fnc) {
165 + queue[index] = fnc;
166 + if (--remain == 0) {
167 + this.spinner.stop();
168 + if (barrierFn != null) {
169 + barrierFn(queue);
170 + }
171 + else {
172 + var cells = [];
173 + graph.getModel().beginUpdate();
174 + try {
175 + for (var j = 0; j < queue.length; j++) {
176 + var tmp = queue[j]();
177 + if (tmp != null) {
178 + cells = cells.concat(tmp);
179 + }
180 + }
181 + }
182 + finally {
183 + graph.getModel().endUpdate();
184 + }
185 + }
186 + resultFn(cells);
187 + }
188 + });
189 + for (var i = 0; i < count; i++) {
190 + (mxUtils.bind(this, function(index) {
191 + var file = files[index];
192 + if (file != null) {
193 + var reader = new FileReader();
194 + reader.onload = mxUtils.bind(this, function(e) {
195 + if (filterFn == null || filterFn(file)) {
196 + try {
197 + if (file.type.substring(0, 6) == 'image/') {
198 + if (file.type.substring(0, 9) == 'image/svg') {
199 + // Checks if SVG contains content attribute
200 + var data = Graph.clipSvgDataUri(e.target.result);
201 + var comma = data.indexOf(',');
202 + var svgText = decodeURIComponent(escape(atob(data.substring(comma + 1))));
203 + var root = mxUtils.parseXml(svgText);
204 + var svgs = root.getElementsByTagName('svg');
205 + if (svgs.length > 0) {
206 + var svgRoot = svgs[0];
207 + var cont = (ignoreEmbeddedXml) ? null : svgRoot.getAttribute('content');
208 + if (cont != null && cont.charAt(0) != '<' && cont.charAt(0) != '%') {
209 + cont = unescape((window.atob) ? atob(cont) : Base64.decode(cont, true));
210 + }
211 + if (cont != null && cont.charAt(0) == '%') {
212 + cont = decodeURIComponent(cont);
213 + }
214 + if (cont != null && (cont.substring(0, 8) === '<mxfile ' ||
215 + cont.substring(0, 14) === '<mxGraphModel ')) {
216 + barrier(index, mxUtils.bind(this, function() {
217 + return fn(cont, 'text/xml', x + index * gs, y + index * gs, 0, 0, file.name);
218 + }));
219 + }
220 + else {
221 + // SVG needs special handling to add viewbox if missing and
222 + // find initial size from SVG attributes (only for IE11)
223 + barrier(index, mxUtils.bind(this, function() {
224 + try {
225 + // Parses SVG and find width and height
226 + if (root != null) {
227 + var svgs = root.getElementsByTagName('svg');
228 + if (svgs.length > 0) {
229 + var svgRoot = svgs[0];
230 + var w = svgRoot.getAttribute('width');
231 + var h = svgRoot.getAttribute('height');
232 + if (w != null && w.charAt(w.length - 1) != '%') {
233 + w = parseFloat(w);
234 + }
235 + else {
236 + w = NaN;
237 + }
238 + if (h != null && h.charAt(h.length - 1) != '%') {
239 + h = parseFloat(h);
240 + }
241 + else {
242 + h = NaN;
243 + }
244 + // Check if viewBox attribute already exists
245 + var vb = svgRoot.getAttribute('viewBox');
246 + if (vb == null || vb.length == 0) {
247 + svgRoot.setAttribute('viewBox', '0 0 ' + w + ' ' + h);
248 + }
249 + // Uses width and height from viewbox for
250 + // missing width and height attributes
251 + else if (isNaN(w) || isNaN(h)) {
252 + var tokens = vb.split(' ');
253 + if (tokens.length > 3) {
254 + w = parseFloat(tokens[2]);
255 + h = parseFloat(tokens[3]);
256 + }
257 + }
258 + data = Editor.createSvgDataUri(mxUtils.getXml(svgRoot));
259 + var s = Math.min(1, Math.min(maxSize / Math.max(1, w)), maxSize / Math.max(1, h));
260 + var cells = fn(data, file.type, x + index * gs, y + index * gs, Math.max(
261 + 1, Math.round(w * s)), Math.max(1, Math.round(h * s)), file.name);
262 + // Hack to fix width and height asynchronously
263 + if (cells != null && (isNaN(w) || isNaN(h))) {
264 + var img = new Image();
265 + img.onload = mxUtils.bind(this, function() {
266 + w = Math.max(1, img.width);
267 + h = Math.max(1, img.height);
268 + cells[0].geometry.width = w;
269 + cells[0].geometry.height = h;
270 + svgRoot.setAttribute('viewBox', '0 0 ' + w + ' ' + h);
271 + data = Editor.createSvgDataUri(mxUtils.getXml(svgRoot));
272 + var semi = data.indexOf(';');
273 + if (semi > 0) {
274 + data = data.substring(0, semi) + data.substring(data.indexOf(',', semi + 1));
275 + }
276 + graph.setCellStyles('image', data, [cells[0]]);
277 + });
278 + img.src = Editor.createSvgDataUri(mxUtils.getXml(svgRoot));
279 + }
280 + return cells;
281 + }
282 + }
283 + }
284 + catch (e) {
285 + // ignores any SVG parsing errors
286 + }
287 + return null;
288 + }));
289 + }
290 + }
291 + else {
292 + barrier(index, mxUtils.bind(this, function() {
293 + return null;
294 + }));
295 + }
296 + }
297 + else {
298 + // Checks if PNG+XML is available to bypass code below
299 + var containsModel = false;
300 + if (file.type == 'image/png') {
301 + var xml = (ignoreEmbeddedXml) ? null : this.extractGraphModelFromPng(e.target.result);
302 + if (xml != null && xml.length > 0) {
303 + var img = new Image();
304 + img.src = e.target.result;
305 + barrier(index, mxUtils.bind(this, function() {
306 + return fn(xml, 'text/xml', x + index * gs, y + index * gs,
307 + img.width, img.height, file.name);
308 + }));
309 + containsModel = true;
310 + }
311 + }
312 + // Additional asynchronous step for finding image size
313 + if (!containsModel) {
314 + // Cannot load local files in Chrome App
315 + if (mxClient.IS_CHROMEAPP) {
316 + this.spinner.stop();
317 + this.showError(mxResources.get('error'), mxResources.get('dragAndDropNotSupported'),
318 + mxResources.get('cancel'), mxUtils.bind(this, function()
319 + {
320 + // Hides the dialog
321 + }), null, mxResources.get('ok'), mxUtils.bind(this, function()
322 + {
323 + // Redirects to import function
324 + this.actions.get('import').funct();
325 + })
326 + );
327 + }
328 + else {
329 + this.loadImage(e.target.result, mxUtils.bind(this, function(img) {
330 + this.resizeImage(img, e.target.result, mxUtils.bind(this, function(data2, w2, h2) {
331 + barrier(index, mxUtils.bind(this, function() {
332 + // Refuses to insert images above a certain size as they kill the app
333 + if (data2 != null && data2.length < maxBytes) {
334 + var s = (!resizeImages || !this.isResampleImageSize(
335 + file.size, resampleThreshold)) ? 1 :
336 + Math.min(1, Math.min(maxSize / w2, maxSize / h2));
337 + return fn(data2, file.type, x + index * gs, y + index * gs,
338 + Math.round(w2 * s), Math.round(h2 * s), file.name);
339 + }
340 + else {
341 + this.handleError({message: mxResources.get('imageTooBig')});
342 + return null;
343 + }
344 + }));
345 + }), resizeImages, maxSize, resampleThreshold, file.size);
346 + }), mxUtils.bind(this, function() {
347 + this.handleError({message: mxResources.get('invalidOrMissingFile')});
348 + }));
349 + }
350 + }
351 + }
352 + }
353 + else {
354 + var data = e.target.result;
355 + fn(data, file.type, x + index * gs, y + index * gs, 240, 160, file.name, function(cells) {
356 + barrier(index, function() {
357 + return cells;
358 + });
359 + }, file);
360 + }
361 + }
362 + catch (e) {
363 + // Ignores file parsing error
364 + barrier(index, mxUtils.bind(this, function() {
365 + return null;
366 + }));
367 + if (window.console != null) {
368 + console.error(e, file);
369 + }
370 + }
371 + }
372 + else {
373 + // Ignores file and decrements counter
374 + barrier(index, mxUtils.bind(this, function()
375 + {
376 + return null;
377 + }));
378 + }
379 + });
380 + // Handles special cases
381 + if (/(\.v(dx|sdx?))($|\?)/i.test(file.name) || /(\.vs(x|sx?))($|\?)/i.test(file.name)) {
382 + fn(null, file.type, x + index * gs, y + index * gs, 240, 160, file.name, function(cells) {
383 + barrier(index, function() {
384 + return cells;
385 + });
386 + }, file);
387 + }
388 + else if (file.type.substring(0, 5) == 'image' || file.type == 'application/pdf') {
389 + reader.readAsDataURL(file);
390 + }
391 + else {
392 + reader.readAsText(file);
393 + }
394 + }
395 + }))(i);
396 + }
397 + }
398 + });
399 + if (largeImages) {
400 + // Workaround for lost files array in async code
401 + var tmp = [];
402 + for (var i = 0; i < files.length; i++) {
403 + tmp.push(files[i]);
404 + }
405 + files = tmp;
406 + this.confirmImageResize(function(doResize) {
407 + resizeImages = doResize;
408 + doImportFiles();
409 + }, resizeDialog);
410 + }
411 + else {
412 + doImportFiles();
413 + }
414 + };
415 +
676 676   // Override for uploading the image as attachment instead of encode it to Base64.
677 677   var originalImportFiles = EditorUi.prototype.importFiles;
678 678   EditorUi.prototype.importFiles = function(files, x, y, maxSize, fn, resultFn, filterFn, barrierFn, resizeDialog,
... ... @@ -702,7 +702,7 @@
702 702   }
703 703   };
704 704   }
705 - originalImportFiles.apply(this, importFilesArgs);
445 + importFilesNew.apply(this, importFilesArgs);
706 706   };
707 707  
708 708   // Add support for inserting images by specifying the XWiki attachment reference.