From b6b0ae36385a61be34190fad2e73cff5bcad207d Mon Sep 17 00:00:00 2001 From: David Benson Date: Thu, 19 Oct 2023 11:10:41 +0100 Subject: [PATCH] 22.0.5 release --- ChangeLog | 10 + VERSION | 2 +- .../com/mxgraph/online/EmbedServlet2.java | 2 + src/main/webapp/js/app.min.js | 60 +- src/main/webapp/js/diagramly/Editor.js | 1 + src/main/webapp/js/integrate.min.js | 516 +++-- src/main/webapp/js/shapes-14-6-5.min.js | 116 +- src/main/webapp/js/stencils.min.js | 340 +-- src/main/webapp/js/viewer-static.min.js | 176 +- src/main/webapp/js/viewer.min.js | 60 +- src/main/webapp/mxgraph/mxClient.js | 2 +- src/main/webapp/resources/dia_ca.txt | 6 +- src/main/webapp/service-worker.js | 2 +- src/main/webapp/service-worker.js.map | 2 +- src/main/webapp/shapes/emoji/mxEmoji.js | 1966 +++++++++++++++++ 15 files changed, 2791 insertions(+), 470 deletions(-) create mode 100644 src/main/webapp/shapes/emoji/mxEmoji.js diff --git a/ChangeLog b/ChangeLog index 968681ed4..9ac348f46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +18-OCT-2023: 22.0.5 + +- [conf cloud] Adds support for importing short links less than 6 characters [DID-9687] +- [conf cloud] Fixes direct editing in blogposts [DID-9702] +- [conf cloud] Fixes fullscreen (lightbox) view of diagrams in page templates [DID-9690] + +06-OCT-2023: 22.0.4 + +- Adds Emoji shape support + 05-OCT-2023: 22.0.3 - Fixes possible NPE in clonePages error handler diff --git a/VERSION b/VERSION index 6d6924828..af2d26bb8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -22.0.3 \ No newline at end of file +22.0.5 \ No newline at end of file diff --git a/src/main/java/com/mxgraph/online/EmbedServlet2.java b/src/main/java/com/mxgraph/online/EmbedServlet2.java index e390c40d0..08200b992 100644 --- a/src/main/java/com/mxgraph/online/EmbedServlet2.java +++ b/src/main/java/com/mxgraph/online/EmbedServlet2.java @@ -185,6 +185,8 @@ public static void initLibraries(HashMap libraries) new String[] { SHAPES_PATH + "/pid2/mxPidValves.js" }); libraries.put("pidFlowSensors", new String[] { STENCIL_PATH + "/pid/flow_sensors.xml" }); + libraries.put("emoji", + new String[] { SHAPES_PATH + "/emoji/mxEmoji.js" }); } /** diff --git a/src/main/webapp/js/app.min.js b/src/main/webapp/js/app.min.js index 55976fa18..ded97494b 100644 --- a/src/main/webapp/js/app.min.js +++ b/src/main/webapp/js/app.min.js @@ -146,7 +146,7 @@ if("1"==urlParams.offline||"1"==urlParams.demo||"1"==urlParams.stealth||"1"==url "se.diagrams.net"==window.location.hostname&&(urlParams.db="0",urlParams.od="0",urlParams.gh="0",urlParams.gl="0",urlParams.tr="0",urlParams.plugins="0",urlParams.mode="google",urlParams.lockdown="1",window.DRAWIO_GOOGLE_APP_ID=window.DRAWIO_GOOGLE_APP_ID||"184079235871",window.DRAWIO_GOOGLE_CLIENT_ID=window.DRAWIO_GOOGLE_CLIENT_ID||"184079235871-pjf5nn0lff27lk8qf0770gmffiv9gt61.apps.googleusercontent.com");"trello"==urlParams.mode&&(urlParams.tr="1"); "embed.diagrams.net"==window.location.hostname&&(urlParams.embed="1");(null==window.location.hash||1>=window.location.hash.length)&&null!=urlParams.open&&(window.location.hash=urlParams.open);window.urlParams=window.urlParams||{};window.DOM_PURIFY_CONFIG=window.DOM_PURIFY_CONFIG||{ADD_TAGS:["use"],FORBID_TAGS:["form"],ALLOWED_URI_REGEXP:/^((?!javascript:).)*$/i,ADD_ATTR:["target","content"]};window.MAX_REQUEST_SIZE=window.MAX_REQUEST_SIZE||10485760;window.MAX_AREA=window.MAX_AREA||225E6;window.EXPORT_URL=window.EXPORT_URL||"/export";window.SAVE_URL=window.SAVE_URL||"/save";window.OPEN_URL=window.OPEN_URL||"/open";window.RESOURCES_PATH=window.RESOURCES_PATH||"resources"; window.RESOURCE_BASE=window.RESOURCE_BASE||window.RESOURCES_PATH+"/grapheditor";window.STENCIL_PATH=window.STENCIL_PATH||"stencils";window.IMAGE_PATH=window.IMAGE_PATH||"images";window.STYLE_PATH=window.STYLE_PATH||"styles";window.CSS_PATH=window.CSS_PATH||"styles";window.OPEN_FORM=window.OPEN_FORM||"open.html";window.mxBasePath=window.mxBasePath||"mxgraph";window.mxImageBasePath=window.mxImageBasePath||"mxgraph/images";window.mxLanguage=window.mxLanguage||urlParams.lang; -window.mxLanguages=window.mxLanguages||["de","se"];var mxClient={VERSION:"22.0.3",IS_IE:null!=navigator.userAgent&&0<=navigator.userAgent.indexOf("MSIE"),IS_IE11:null!=navigator.userAgent&&!!navigator.userAgent.match(/Trident\/7\./),IS_EDGE:null!=navigator.userAgent&&!!navigator.userAgent.match(/Edge\//),IS_EM:"spellcheck"in document.createElement("textarea")&&8==document.documentMode,VML_PREFIX:"v",OFFICE_PREFIX:"o",IS_NS:null!=navigator.userAgent&&0<=navigator.userAgent.indexOf("Mozilla/")&&0>navigator.userAgent.indexOf("MSIE")&&0>navigator.userAgent.indexOf("Edge/"), +window.mxLanguages=window.mxLanguages||["de","se"];var mxClient={VERSION:"22.0.5",IS_IE:null!=navigator.userAgent&&0<=navigator.userAgent.indexOf("MSIE"),IS_IE11:null!=navigator.userAgent&&!!navigator.userAgent.match(/Trident\/7\./),IS_EDGE:null!=navigator.userAgent&&!!navigator.userAgent.match(/Edge\//),IS_EM:"spellcheck"in document.createElement("textarea")&&8==document.documentMode,VML_PREFIX:"v",OFFICE_PREFIX:"o",IS_NS:null!=navigator.userAgent&&0<=navigator.userAgent.indexOf("Mozilla/")&&0>navigator.userAgent.indexOf("MSIE")&&0>navigator.userAgent.indexOf("Edge/"), IS_OP:null!=navigator.userAgent&&(0<=navigator.userAgent.indexOf("Opera/")||0<=navigator.userAgent.indexOf("OPR/")),IS_OT:null!=navigator.userAgent&&0<=navigator.userAgent.indexOf("Presto/")&&0>navigator.userAgent.indexOf("Presto/2.4.")&&0>navigator.userAgent.indexOf("Presto/2.3.")&&0>navigator.userAgent.indexOf("Presto/2.2.")&&0>navigator.userAgent.indexOf("Presto/2.1.")&&0>navigator.userAgent.indexOf("Presto/2.0.")&&0>navigator.userAgent.indexOf("Presto/1."),IS_SF:/Apple Computer, Inc/.test(navigator.vendor), IS_ANDROID:0<=navigator.appVersion.indexOf("Android"),IS_IOS:/iP(hone|od|ad)/.test(navigator.platform)||navigator.userAgent.match(/Mac/)&&navigator.maxTouchPoints&&2navigator.userAgent.indexOf("Firefox/1.")&&0>navigator.userAgent.indexOf("Firefox/2.")||0<=navigator.userAgent.indexOf("Iceweasel/")&&0>navigator.userAgent.indexOf("Iceweasel/1.")&&0>navigator.userAgent.indexOf("Iceweasel/2.")||0<=navigator.userAgent.indexOf("SeaMonkey/")&&0>navigator.userAgent.indexOf("SeaMonkey/1.")||0<=navigator.userAgent.indexOf("Iceape/")&&0>navigator.userAgent.indexOf("Iceape/1."),IS_SVG:"MICROSOFT INTERNET EXPLORER"!=navigator.appName.toUpperCase(),NO_FO:!document.createElementNS|| @@ -11819,36 +11819,36 @@ STENCIL_PATH+"/mockup/misc.xml"];mxStencilRegistry.libraries["mockup/markup"]=[S STENCIL_PATH+"/floorplan.xml"];mxStencilRegistry.libraries.bootstrap=[SHAPES_PATH+"/mxBootstrap.js",SHAPES_PATH+"/mxBasic.js",STENCIL_PATH+"/bootstrap.xml"];mxStencilRegistry.libraries.gmdl=[SHAPES_PATH+"/mxGmdl.js",STENCIL_PATH+"/gmdl.xml"];mxStencilRegistry.libraries.gcp2=[SHAPES_PATH+"/mxGCP2.js",STENCIL_PATH+"/gcp2.xml"];mxStencilRegistry.libraries.ibm=[SHAPES_PATH+"/mxIBM.js",STENCIL_PATH+"/ibm.xml"];mxStencilRegistry.libraries.cabinets=[SHAPES_PATH+"/mxCabinets.js",STENCIL_PATH+"/cabinets.xml"]; mxStencilRegistry.libraries.archimate=[SHAPES_PATH+"/mxArchiMate.js"];mxStencilRegistry.libraries.archimate3=[SHAPES_PATH+"/mxArchiMate3.js"];mxStencilRegistry.libraries.sysml=[SHAPES_PATH+"/mxSysML.js"];mxStencilRegistry.libraries.eip=[SHAPES_PATH+"/mxEip.js",STENCIL_PATH+"/eip.xml"];mxStencilRegistry.libraries.networks=[SHAPES_PATH+"/mxNetworks.js",STENCIL_PATH+"/networks.xml"];mxStencilRegistry.libraries.aws3d=[SHAPES_PATH+"/mxAWS3D.js",STENCIL_PATH+"/aws3d.xml"];mxStencilRegistry.libraries.aws4= [SHAPES_PATH+"/mxAWS4.js",STENCIL_PATH+"/aws4.xml"];mxStencilRegistry.libraries.aws4b=[SHAPES_PATH+"/mxAWS4.js",STENCIL_PATH+"/aws4.xml"];mxStencilRegistry.libraries.uml25=[SHAPES_PATH+"/mxUML25.js"];mxStencilRegistry.libraries.veeam=[STENCIL_PATH+"/veeam/2d.xml",STENCIL_PATH+"/veeam/3d.xml",STENCIL_PATH+"/veeam/veeam.xml"];mxStencilRegistry.libraries.veeam2=[STENCIL_PATH+"/veeam/2d.xml",STENCIL_PATH+"/veeam/3d.xml",STENCIL_PATH+"/veeam/veeam2.xml"];mxStencilRegistry.libraries.pid2inst=[SHAPES_PATH+ -"/pid2/mxPidInstruments.js"];mxStencilRegistry.libraries.pid2misc=[SHAPES_PATH+"/pid2/mxPidMisc.js",STENCIL_PATH+"/pid/misc.xml"];mxStencilRegistry.libraries.pid2valves=[SHAPES_PATH+"/pid2/mxPidValves.js"];mxStencilRegistry.libraries.pidFlowSensors=[STENCIL_PATH+"/pid/flow_sensors.xml"];mxStencilRegistry.libraries.salesforce=[SHAPES_PATH+"/mxSalesforce.js",STENCIL_PATH+"/salesforce.xml"];mxMarker.getPackageForType=function(m){var x=null;null!=m&&0'),Za.writeln("@media print {"),Za.writeln(".MathJax svg { shape-rendering: crispEdges; }"), -Za.writeln("}"),Za.writeln(""));null!=m.editor.fontCss&&(Za.writeln('"));for(var cb=Ba.getCustomFonts(),bb=0;bb'):(Za.writeln('"))}};if(Editor.enableCssDarkMode){var ib=La.getBackgroundImage;La.getBackgroundImage=function(){return N.adaptBackgroundPage(ib.apply(this,arguments))}}if("undefined"!==typeof MathJax){var jb=La.renderPage;La.renderPage=function(Za,cb,bb,eb,db,lb){var kb=mxClient.NO_FO,fb=jb.apply(this,arguments);mxClient.NO_FO=kb;this.graph.mathEnabled?this.mathEnabled=this.mathEnabled||!0:fb.className="geDisableMathJax";return fb}}Na=null;Ya=N.shapeForegroundColor;$a=N.shapeBackgroundColor; -Wa=N.enableFlowAnimation;N.enableFlowAnimation=!1;null!=N.themes&&"darkTheme"==N.defaultThemeName&&(Na=N.stylesheet,N.stylesheet=N.getDefaultStylesheet(),N.shapeForegroundColor="#000000",N.shapeBackgroundColor="#ffffff",N.refresh());La.open(null,null,Ea,!0,wa);N.enableFlowAnimation=Wa;null!=Na&&(N.shapeForegroundColor=Ya,N.shapeBackgroundColor=$a,N.stylesheet=Na,N.refresh())}else{Wa=Ba.background;if(null==Wa||""==Wa||Wa==mxConstants.NONE)Wa="#ffffff";La.backgroundColor=Wa;La.autoOrigin=$a;La.appendGraph(Ba, -ab,Na,Ya,Ea,!0,wa);Ea=Ba.getCustomFonts();if(null!=La.wnd)for(Na=0;Na'):(La.wnd.document.writeln('"))}Ma&&(Ba.useCssTransforms= -Ma,Ba.currentTranslate=Oa,Ba.currentScale=Xa,Ba.view.translate=Sa,Ba.view.scale=Ta);return La}var Ra=parseInt(Fa.value)/100;isNaN(Ra)&&(Ra=1,Fa.value="100 %");mxClient.IS_SF&&(Ra*=.75);var Ia=null,Va=N.shapeForegroundColor,Ua=N.shapeBackgroundColor;null!=N.themes&&"darkTheme"==N.defaultThemeName&&(Ia=N.stylesheet,N.stylesheet=N.getDefaultStylesheet(),N.shapeForegroundColor="#000000",N.shapeBackgroundColor="#ffffff",N.refresh());var ka=aa.value,ea=fa.value,oa=!Z.checked,pa=null;if(EditorUi.isElectronApp)PrintDialog.electronPrint(m, -Z.checked,ka,ea,Aa.checked,sa.value,va.value,parseInt(za.value)/100,parseInt(Fa.value)/100,Ga.get());else{oa&&(oa=ba.checked||ka==X&&ea==X);if(!oa&&null!=m.pages&&m.pages.length){var ra=0;oa=m.pages.length-1;Z.checked||(ra=parseInt(ka)-1,oa=parseInt(ea)-1);for(var ja=ra;ja<=oa;ja++){var na=m.pages[ja];ka=na==m.currentPage?N:null;if(null==ka){ka=m.createTemporaryGraph(N.stylesheet);ka.shapeForegroundColor=N.shapeForegroundColor;ka.shapeBackgroundColor=N.shapeBackgroundColor;ea=!0;ra=!1;var xa=null, -ua=null;null==na.viewState&&null==na.root&&m.updatePageRoot(na);null!=na.viewState&&(ea=na.viewState.pageVisible,ra=na.viewState.mathEnabled,xa=na.viewState.background,ua=na.viewState.backgroundImage,ka.extFonts=na.viewState.extFonts);null!=ua&&null!=ua.originalSrc&&(ua=m.createImageForPageLink(ua.originalSrc,na));ka.background=xa;ka.backgroundImage=null!=ua?new mxImage(ua.src,ua.width,ua.height,ua.x,ua.y):null;ka.pageVisible=ea;ka.mathEnabled=ra;var Ka=ka.getGraphBounds;ka.getGraphBounds=function(){var Ba= -Ka.apply(this,arguments),La=this.backgroundImage;if(null!=La&&null!=La.width&&null!=La.height){var Ea=this.view.translate,wa=this.view.scale;Ba=mxRectangle.fromRectangle(Ba);Ba.add(new mxRectangle((Ea.x+La.x)*wa,(Ea.y+La.y)*wa,La.width*wa,La.height*wa))}return Ba};var Ja=ka.getGlobalVariable;ka.getGlobalVariable=function(Ba){return"page"==Ba?na.getName():"pagenumber"==Ba?ja+1:"pagecount"==Ba?null!=m.pages?m.pages.length:1:Ja.apply(this,arguments)};document.body.appendChild(ka.container);m.updatePageRoot(na); -ka.model.setRoot(na.root)}pa=Ha(ka,pa,ja!=oa,na.getId());ka!=N&&ka.container.parentNode.removeChild(ka.container)}}else pa=Ha(N);null==pa||null==pa.wnd?m.handleError({message:mxResources.get("errorUpdatingPreview")}):(pa.mathEnabled&&(oa=pa.wnd.document,Qa&&(pa.wnd.IMMEDIATE_PRINT=!0),oa.writeln('