Browse Source

Fix stacking when setting option (#3172) (#3201)

* Fix redraw order

* Fix error when option is not defined

* Allow template labels

* Add .travis.yml file

* Add experiment travis code

* Fix react example

* created a checklist for the release process

* unchecked everything

* added make github release

* Remove npm-debug logs

* Fix setOptions restack when setting stack

* Remove extra line

* Fix comments from review
gemini
yotamberk 6 years ago
committed by GitHub
parent
commit
eec083ce9a
2 changed files with 7 additions and 2 deletions
  1. +6
    -1
      lib/timeline/component/ItemSet.js
  2. +1
    -1
      misc/RELEASE_CHECKLIST_TEMPLATE.md

+ 6
- 1
lib/timeline/component/ItemSet.js View File

@ -634,9 +634,14 @@ ItemSet.prototype.redraw = function() {
var visibleInterval = range.end - range.start;
var zoomed = (visibleInterval != this.lastVisibleInterval) || (this.props.width != this.props.lastWidth);
var scrolled = range.start != this.lastRangeStart;
var forceRestack = (zoomed || scrolled);
var changedStackOption = options.stack != this.lastStack
var changedStackSubgroupsOption = options.stackSubgroups != this.lastStackSubgroups
var forceRestack = (zoomed || scrolled || changedStackOption || changedStackSubgroupsOption);
this.lastVisibleInterval = visibleInterval;
this.lastRangeStart = range.start;
this.lastStack = options.stack;
this.lastStackSubgroups = options.stackSubgroups;
this.props.lastWidth = this.props.width;
var firstGroup = this._firstGroup();

+ 1
- 1
misc/RELEASE_CHECKLIST_TEMPLATE.md View File

@ -80,4 +80,4 @@ If we would merge the development branch would overwrite this. To solve this we
- [ ] FORCE-Push the branches to github: `git push --force && git push --tag`
- [ ] [Re-Enable branch protection](https://github.com/almende/vis/settings/branches/develop) (enable ALL checkboxes) for `develop`.
DONE!
DONE!

Loading…
Cancel
Save