Merge branch 'master'

Conflicts:
	cypress/platform/xss7.html

cypress/platform/xss7.html

@@ -54,7 +54,11 @@
         // themeCSS: '.edgePath .path {stroke: red;} .arrowheadPath {fill: red;}',
         logLevel: 0,
         state: {
+<<<<<<< HEAD
           defaultRenderer: 'dagre-d3',
+=======
+          defaultRenderer: 'dagre-wrapper',
+>>>>>>> master
         },
         flowchart: {
           // defaultRenderer: 'dagre-wrapper',
@@ -68,9 +72,9 @@
         // fontFamily: 'courier',
         fontSize: 18,
         curve: 'basis',
+        securityLevel: 'antiscript',
         startOnLoad: false,
-        secure: ['secure', 'securityLevel', 'startOnLoad', 'maxTextSize'],
-        securityLevel: 'loose',
+        secure: ['secure', 'securityLevel', 'startOnLoad', 'maxTextSize']
         // themeVariables: {relationLabelColor: 'red'}
       });
       function callback(){alert('It worked');}
@@ -82,10 +86,10 @@
         document.getElementsByTagName('body')[0].appendChild(div);
         throw new Error('XSS Succeded');
       }
-
-
-      var diagram = "stateDiagram-v2\n";
-     diagram += "<img/src='1'/onerror=xssAttack()> --> B";
+      var diagram = "graph LR\n";
+  diagram += " B(<a href='<";
+  diagram += "script></";
+  diagram += "script>Javascript:xssAttack`1`'>Click)";
   // diagram += "script\u003aalert\u0028document.domain\u0029\` src=x>\"\);\n";
   console.log(diagram);
   // document.querySelector('#diagram').innerHTML = diagram;