Skip to content

Commit

Permalink
re-add reference block to axis before data block
Browse files Browse the repository at this point in the history
this addresses re-adding after closing a split axis with tracks (#148, partially fixed in 9e9ccdf).
draw-map.js : drawEffect() : add referencesFirst - sort viewed blocks by .referenceBlock.
 14303d7 239649 Mar  4 15:30 frontend/app/components/draw-map.js
  • Loading branch information
Don-Isdale committed Mar 4, 2020
1 parent bda87be commit 346ed13
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions frontend/app/components/draw-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -1275,7 +1275,7 @@ export default Ember.Component.extend(Ember.Evented, {
zd = oa.z[d];
let block = oa.z[key],
match = (block.scope == zd.scope) && (block.dataset.get('name') == parentName);
dLog(key, block, match);
dLog(key, trace_stack ? block : block.dataset.get('name'), match);
return match;
}
/** undefined if no parent found, otherwise is the id corresponding to parentName */
Expand Down Expand Up @@ -5982,8 +5982,14 @@ export default Ember.Component.extend(Ember.Evented, {
let data = this.get('data');
Ember.run.throttle(function () {
/** viewed[] is equivalent to data[], apart from timing differences. */
let viewed = me.get('blockService.viewed');
viewed.forEach((block) => me.oa.axisApi.ensureAxis(block.id));
let viewed = me.get('blockService.viewed'),
/** create axes for the reference blocks before the data blocks are added. */
referencesFirst = viewed.sort((a,b) => {
let aHasReference = !!a.get('referenceBlock'),
bHasReference = !!b.get('referenceBlock');
return aHasReference === bHasReference ? 0 : aHasReference ? 1 : -1;
});
referencesFirst.forEach((block) => me.oa.axisApi.ensureAxis(block.id));
me.draw(data, 'didRender');
}, 1500);

Expand Down Expand Up @@ -6077,8 +6083,9 @@ export default Ember.Component.extend(Ember.Evented, {
* 't[m] is not a function, at Object.applyStr (ember-utils.js:524)'
*/
resized : function(prevSize, currentSize) {
const trace_gui = 0;
if (trace_gui)
console.log("resized in components/draw-map", this, prevSize, currentSize);
dLog("resized in components/draw-map", this, prevSize, currentSize);
},

resize : function() {
Expand Down

0 comments on commit 346ed13

Please sign in to comment.