From ba8232da3b90322b02e7466e9f596a05172f465e Mon Sep 17 00:00:00 2001 From: David Evans Date: Thu, 5 Apr 2018 19:38:43 +0100 Subject: [PATCH] Fix setHighlight having no effect if called before initial render [#50] --- lib/sequence-diagram.js | 7 +++---- lib/sequence-diagram.min.js | 2 +- scripts/sequence/Renderer.js | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/sequence-diagram.js b/lib/sequence-diagram.js index 4fc153e..70776f9 100644 --- a/lib/sequence-diagram.js +++ b/lib/sequence-diagram.js @@ -6489,7 +6489,6 @@ define('sequence/Renderer',[ this.knownDefs.clear(); this.highlights.clear(); - this.currentHighlight = -1; svg.empty(this.defs); svg.empty(this.fullMask); svg.empty(this.lineMask); @@ -6506,18 +6505,18 @@ define('sequence/Renderer',[ } setHighlight(line = null) { - if(line === null || !this.highlights.has(line)) { + if(line === null) { line = -1; } if(this.currentHighlight === line) { return; } - if(this.currentHighlight !== -1) { + if(this.highlights.has(this.currentHighlight)) { this.highlights.get(this.currentHighlight).forEach((o) => { o.setAttribute('class', 'region'); }); } - if(line !== -1) { + if(this.highlights.has(line)) { this.highlights.get(line).forEach((o) => { o.setAttribute('class', 'region focus'); }); diff --git a/lib/sequence-diagram.min.js b/lib/sequence-diagram.min.js index 020ab07..f169b24 100644 --- a/lib/sequence-diagram.min.js +++ b/lib/sequence-diagram.min.js @@ -1 +1 @@ -!function(){var e,t,n;!function(r){function s(e,t){return y.call(e,t)}function i(e,t){var n,r,s,i,a,o,l,h,d,g,c,u=t&&t.split("/"),p=b.map,f=p&&p["*"]||{};if(e){for(a=(e=e.split("/")).length-1,b.nodeIdCompat&&w.test(e[a])&&(e[a]=e[a].replace(w,"")),"."===e[0].charAt(0)&&u&&(e=u.slice(0,u.length-1).concat(e)),d=0;d0&&(e.splice(d-1,2),d-=2)}e=e.join("/")}if((u||f)&&p){for(d=(n=e.split("/")).length;d>0;d-=1){if(r=n.slice(0,d).join("/"),u)for(g=u.length;g>0;g-=1)if((s=p[u.slice(0,g).join("/")])&&(s=s[r])){i=s,o=d;break}if(i)break;!l&&f&&f[r]&&(l=f[r],h=d)}!i&&l&&(i=l,o=h),i&&(n.splice(0,o,i),e=n.join("/"))}return e}function a(e,t){return function(){var n=k.call(arguments,0);return"string"!=typeof n[0]&&1===n.length&&n.push(null),c.apply(r,n.concat([e,t]))}}function o(e){return function(t){f[e]=t}}function l(e){if(s(m,e)){var t=m[e];delete m[e],x[e]=!0,g.apply(r,t)}if(!s(f,e)&&!s(x,e))throw new Error("No "+e);return f[e]}function h(e){var t,n=e?e.indexOf("!"):-1;return n>-1&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function d(e){return e?h(e):[]}var g,c,u,p,f={},m={},b={},x={},y=Object.prototype.hasOwnProperty,k=[].slice,w=/\.js$/;u=function(e,t){var n,r=h(e),s=r[0],a=t[1];return e=r[1],s&&(n=l(s=i(s,a))),s?e=n&&n.normalize?n.normalize(e,function(e){return function(t){return i(t,e)}}(a)):i(e,a):(s=(r=h(e=i(e,a)))[0],e=r[1],s&&(n=l(s))),{f:s?s+"!"+e:e,n:e,pr:s,p:n}},p={require:function(e){return a(e)},exports:function(e){var t=f[e];return void 0!==t?t:f[e]={}},module:function(e){return{id:e,uri:"",exports:f[e],config:function(e){return function(){return b&&b.config&&b.config[e]||{}}}(e)}}},g=function(e,t,n,i){var h,g,c,b,y,k,w,v=[],A=typeof n;if(i=i||e,k=d(i),"undefined"===A||"function"===A){for(t=!t.length&&n.length?["require","exports","module"]:t,y=0;y{"use strict";return class{constructor(){this.listeners=new Map,this.forwards=new Set}addEventListener(e,t){const n=this.listeners.get(e);n?n.push(t):this.listeners.set(e,[t])}removeEventListener(e,t){const n=this.listeners.get(e);if(!n)return;const r=n.indexOf(t);-1!==r&&n.splice(r,1)}countEventListeners(e){return(this.listeners.get(e)||[]).length}removeAllEventListeners(e){e?this.listeners.delete(e):this.listeners.clear()}addEventForwarding(e){this.forwards.add(e)}removeEventForwarding(e){this.forwards.delete(e)}removeAllEventForwardings(){this.forwards.clear()}trigger(e,t=[]){(this.listeners.get(e)||[]).forEach(e=>e.apply(null,t)),this.forwards.forEach(n=>n.trigger(e,t))}}}),n("core/ArrayUtilities",[],()=>{"use strict";function e(e,t,n=null){if(null===n)return e.indexOf(t);for(let r=0;r=e.length)return void s.push(r.slice());const i=e[n];if(!Array.isArray(i))return r.push(i),t(e,n+1,r,s),void r.pop();for(let a=0;a{n.push(...t(e))}),n}}}),n("sequence/CodeMirrorMode",["core/ArrayUtilities"],e=>{"use strict";function t(e,t=!1){return{type:"string",suggest:t,then:Object.assign({"":0},e)}}function n(e,t){return e.v===t.v&&e.prefix===t.prefix&&e.suffix===t.suffix&&e.q===t.q}function r(t,n,r){let s=r.suggest;return Array.isArray(s)||(s=[s]),e.flatMap(s,e=>!1===e?[]:"object"==typeof e?e.known?t["known"+e.known]||[]:[e]:"string"==typeof e&&e?[{v:e,q:""===n}]:[function(e,t){return Object.keys(t.then).length>0?{v:e,suffix:" ",q:!1}:{v:e,suffix:"\n",q:!1}}(n,r)])}function s(t,s){const i=[],a=e.last(s);return Object.keys(a.then).forEach(o=>{let l=a.then[o];"number"==typeof l&&(l=s[s.length-l-1]),e.mergeSets(i,r(t,o,l),n)}),i}function i(t,r,s,{suggest:i,override:a}){let o=null;"object"==typeof i&&i.known&&(o=i.known),r.type&&o!==r.type&&(a&&(r.type=a),e.mergeSets(t["known"+r.type],[{v:r.value,suffix:" ",q:!0}],n),r.type="",r.value=""),o&&(r.type=o,r.value&&(r.value+=s.s),r.value+=s.v)}function a(t,n,r){const a={type:"",value:""};let o=r;const h=[o];return t.line.forEach((n,r)=>{r===t.line.length-1&&(t.completions=s(t,h));const d=n.q?"":n.v;let g=o.then[d];void 0===g?(g=o.then[""],t.isVar=!0):t.isVar=n.q,"number"==typeof g?h.length-=g:h.push(g||l),o=e.last(h),i(t,a,n,o)}),n&&i(t,a,null,{}),t.nextCompletions=s(t,h),t.valid=Boolean(o.then["\n"])||0===Object.keys(o.then).length,o.type}function o(e){const t=e.baseToken||{};return{value:t.v||"",quoted:t.q||!1}}const l={type:"error line-error",suggest:!1,then:{"":0}},h=["database","red"],d=(()=>{function e(e,t=1){return{type:"variable",suggest:{known:"Agent"},then:Object.assign({},e,{"":0,",":{type:"operator",then:{"":t}}})}}function n(e){return{type:"keyword",suggest:[e+" of ",e+": "],then:{of:{type:"keyword",then:{"":g}},":":{type:"operator",then:{"":a}},"":g}}}function r({exit:e,sourceExit:t,blankExit:n}){const r={type:"operator",then:{"+":l,"-":l,"*":l,"!":l,"":e}};return{"+":{type:"operator",then:{"+":l,"-":l,"*":r,"!":l,"":e}},"-":{type:"operator",then:{"+":l,"-":l,"*":r,"!":{type:"operator",then:{"+":l,"-":l,"*":l,"!":l,"":e}},"":e}},"*":{type:"operator",then:Object.assign({"+":r,"-":r,"*":l,"!":l,"":e},t||e)},"!":r,"":n||e}}const s={type:"",suggest:"\n",then:{}},i={type:"",suggest:!1,then:{}},a=t({"\n":s}),o={type:"operator",then:{"":a,"\n":i}},d=e({"\n":s,as:{type:"keyword",then:{"":{type:"variable",suggest:{known:"Agent"},then:{"":0,",":{type:"operator",then:{"":3}},"\n":s}}}}}),g=e({":":o}),c={type:"variable",suggest:{known:"Agent"},then:{"":0,":":{type:"operator",then:{"":a,"\n":i}},"\n":s}},u={":":{type:"operator",then:{"":t({as:{type:"keyword",then:{"":{type:"variable",suggest:{known:"Agent"},then:{"":0,"\n":s}}}}})}}},p={type:"keyword",then:Object.assign({over:{type:"keyword",then:{"":e(u)}}},u)},f={"\n":s,":":{type:"operator",then:{"":a,"\n":i}},with:{type:"keyword",suggest:["with height "],then:{height:{type:"keyword",then:{"":{type:"number",suggest:["6 ","30 "],then:{"\n":s,":":{type:"operator",then:{"":a,"\n":i}}}}}}}}},m=function(e,t,n){const r=Object.assign({},n);return t.forEach(t=>{r[t]={type:e,then:n}}),r}("keyword",["a","an"],function(e,t,n){const r={},s=Object.assign({},n);return t.forEach(t=>{r[t]={type:e,then:s},s[t]=0}),r}("keyword",h,{"\n":s})),b={type:"keyword",then:{"":a,":":{type:"operator",then:{"":a}},"\n":s}},x={title:{type:"keyword",then:{"":a}},theme:{type:"keyword",then:{"":{type:"string",suggest:{global:"themes",suffix:"\n"},then:{"":0,"\n":s}}}},headers:{type:"keyword",then:{none:{type:"keyword",then:{}},cross:{type:"keyword",then:{}},box:{type:"keyword",then:{}},fade:{type:"keyword",then:{}},bar:{type:"keyword",then:{}}}},terminators:{type:"keyword",then:{none:{type:"keyword",then:{}},cross:{type:"keyword",then:{}},box:{type:"keyword",then:{}},fade:{type:"keyword",then:{}},bar:{type:"keyword",then:{}}}},divider:{type:"keyword",then:Object.assign({line:{type:"keyword",then:f},space:{type:"keyword",then:f},delay:{type:"keyword",then:f},tear:{type:"keyword",then:f}},f)},define:{type:"keyword",then:{"":d,as:l}},begin:{type:"keyword",then:{"":d,reference:p,as:l}},end:{type:"keyword",then:{"":d,as:l,"\n":s}},if:b,else:{type:"keyword",suggest:["else\n","else if: "],then:{if:{type:"keyword",suggest:"if: ",then:{"":a,":":{type:"operator",then:{"":a}}}},"\n":s}},repeat:b,group:b,note:{type:"keyword",then:{over:{type:"keyword",then:{"":g}},left:n("left"),right:n("right"),between:{type:"keyword",then:{"":e({":":l},g)}}}},state:{type:"keyword",suggest:"state over ",then:{over:{type:"keyword",then:{"":{type:"variable",suggest:{known:"Agent"},then:{"":0,",":l,":":o}}}}}},text:{type:"keyword",then:{left:n("left"),right:n("right")}},autolabel:{type:"keyword",then:{off:{type:"keyword",then:{}},"":t({"\n":s},[{v:"