diff --git a/frontend/app/components/draw-map.js b/frontend/app/components/draw-map.js index 8f6c547c6..0e86f9430 100644 --- a/frontend/app/components/draw-map.js +++ b/frontend/app/components/draw-map.js @@ -4548,7 +4548,8 @@ export default Ember.Component.extend(Ember.Evented, { * @param t transition, which is likely to be undefined here. */ this.pathUpdateFlow = function(t, flow) { - pathUpdate_(t, flow); + if (me.get('urlOptions.pathsCheck')) + pathUpdate_(t, flow); }; this.on('pathUpdateFlow', this, this.pathUpdateFlow); } @@ -4556,6 +4557,7 @@ export default Ember.Component.extend(Ember.Evented, { /** call pathUpdate(t) for each of the enabled flows. */ function pathUpdate(t) { + if (me.get('urlOptions.pathsCheck')) d3.keys(flows).forEach(function(flowName) { let flow = flows[flowName]; if (flow.enabled) diff --git a/frontend/app/components/draw/block-adj.js b/frontend/app/components/draw/block-adj.js index 8a78eaa57..11efc8a70 100644 --- a/frontend/app/components/draw/block-adj.js +++ b/frontend/app/components/draw/block-adj.js @@ -383,8 +383,10 @@ export default Ember.Component.extend(Ember.Evented, AxisEvents, { console.log("zoomedAxis in ", CompName, axisID_t, blockAdjId, axes); /* zoomedAxis is specific to an axisID, so respond to that if * blockAdjId[0] or blockAdjId[1] are on this.axis. + * resetZooms() does resetZoom(undefined) meaning un-zoom all axes, so match + * if axisID is undefined. */ - if (this.isAdjacentToAxis(axisID)) + if (!axisID || this.isAdjacentToAxis(axisID)) { console.log('zoomedAxis matched', axisID, blockAdjId, axes); // paths positions are updated by event axisStackChanged() already received. diff --git a/frontend/app/styles/app.scss b/frontend/app/styles/app.scss index 66f6b4c5b..6a4feeebe 100644 --- a/frontend/app/styles/app.scss +++ b/frontend/app/styles/app.scss @@ -295,7 +295,8 @@ g.axis-use.hasChart > g.axis-html > .foreignObject { * https://blog.bugsnag.com/sass-color-palettes */ div.drawing-controls.flowButtons .flowButton.alias, -.foreground > g.alias > g > path { +.foreground > g.alias > g > path, +.foreground > g.progress > g.alias > g.blockAdj > g > path { /* HTML */ border-color : #955; background-color: #955; @@ -303,7 +304,8 @@ div.drawing-controls.flowButtons .flowButton.alias, stroke: #955; } div.drawing-controls.flowButtons .flowButton.U_alias, -.foreground > g.U_alias > g > path { +.foreground > g.U_alias > g > path, +.foreground > g.progress > g.U_alias > g.blockAdj > g > path { border-color : #545; background-color: #545; stroke: #545; @@ -316,6 +318,15 @@ div.drawing-controls.flowButtons .flowButton.direct, background-color: #484; stroke: #484; } +body.devel .foreground > g > g > path { + stroke-dasharray: 30 50 calc(var(--path-stroke-width)*10); + stroke: rgb(50,50,100); + transform: translate(0px, 5px); +} +body.devel .foreground > g.progress > g > g.blockAdj > g > path { + stroke-dasharray: 10 40; + stroke: rgb(100,50,50); +} .foreground path { fill: none;