Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master to fork #1

Merged
merged 3 commits into from
Sep 1, 2019
Merged

Merge master to fork #1

merged 3 commits into from
Sep 1, 2019

Conversation

r3code
Copy link
Owner

@r3code r3code commented Sep 1, 2019

Thank you for contributing to vis.js!!

Please make sure to check the following requirements before creating a pull request:

  • All pull requests must be to the develop branch. Pull requests to the master branch will be closed!
  • Make sure your changes are based on the latest version of the develop branch. (Use e.g. git fetch && git rebase origin develop to update your feature branch).
  • Provide an additional or update an example to demonstrate your changes or new features.
  • Update the documentation if you introduced new behavior or changed existing behavior.
  • Reference issue numbers of issues that your pull request addresses. (If you write something like fixes #1781 in your git commit message this issue gets closed automatically by merging your pull request).
  • Expect review comments and change requests by reviewer.
  • Delete this checklist from your pull request.

* test(node-shapes): add distance to border test

* test(node-shapes): add shadow tests

* test(node-shapes): add dashes tests

* test(node-shapes): add image specific tests

* test(node-shapes): add bounding box test

* test(node-shapes): don't reuse objects accross tests
* Move all packages to a `types` directory

* Fix various lint errors (#15529)

* All VisJS config options are optional.
http://visjs.org/docs/timeline/#Configuration_Options

* increment version

* Use new strict-export-declare-modifiers lint rule (#15844)

* Updating template function defintion (#15936)

* Updating template function defintion

As mentioned [here](seveves/angular-vis#32) there is a problem with the definition of the template functions. We really should allow any as a return value because you can return a string, Handlebars, mustache or even react templates. As you can see [here](http://visjs.org/docs/timeline/#Templates) the template function always has three parameters. I made them optional because you don't have to use them at all.

* Using fat arrow syntax

I think this is the right way to do it.

* Fix lint error

* Update index.d.ts

added missing DataGroup.nestedGroups according this example: http://visjs.org/examples/timeline/groups/nestedGroups.html

* Update rollingMode option to object.

Timeline implements rolling mode with an object configuration instead boolean type.

* vis: Add types for Options.locales

* Make All LocaleMessages properties required

Also fix lint.

* Merge upstream changes (#3)

* [vis] timeline: add types for custom ordering functions (#20031)

* add types for custom ordering functions

* fix trailing whitespace

* include dependency on moment  (2.13 being the first version to include types)
add type for moment constructor for use in timeline and graph2d options

* timeline: updated TimelineOptions & Timeline (#20174)

* @types/vis separated Node color into it's own interface and added it to the Node (#20603)

* separated node color into it's own interface and added it to the node
definition too.

* tslint fixes

* vis: Fix lint (#20974)

* [vis] Timeline: Type definition changes required for Timeline module on vis.js v4.21

Highlights:
@Timeline
- Documentation added for all methods as per documented in http://visjs.org/docs/timeline/
- Add 3 new definition methods for Timeline in v4.21.0: toggleRollingMode, zoomIn, zoomOut
- Add new type EasingFunction to support the intellisense to be able to choose the type of easing function used in animation

@TimelineEventPropertiesResult
- Add documentations for methods as defined in http://visjs.org/docs/timeline/#getEventProperties

Miscellaneous:
- Rename TimelineFitOptions to TimelineAnimationOptions since the class is intended to tamper with the animation styles.
- Rename TimelineFitAnimationType to TimelineAnimationType as per reason mention on last point and added documentation.

* Add chinese locale.

* Changed type of item for the TimelineEventPropertiesResult to the approperiate type

* Additional font options for NodeOptions and EdgeOptions according to http://visjs.org/docs/network/nodes.html and http://visjs.org/docs/network/edges.html

* Allow Edge arrows from to be left out of edge options

network.setOptions({edges: {arrows: {to: true}}}); should be accepted since it works properly in vis, but previous @types/vis will fail type-checking.

* Add support of subgroupStack on DataGroup (#25480)

* Add support of subgroupStack on DataGroup

* Update index.d.ts

* Update index.d.ts

Added new SubGroupStackOptions dynamic structure and updated type of DataGroup.subgroupStack to SubGroupStackOptions | boolean

* Update index.d.ts

codestyling

* Update index.d.ts

codestyling colon

* vis: update network nodes image option (v4.21)

* Make node and edge interfaces inherit from their options (#27254)

Node and Edge interfaces should inherit from NodeOptions and EdgeOptions. These Options are meant to be global, so properties such as "id", "from" and "to" should exist only on Node and Edge interfaces. Plus, in this way it's possible to use all properties defined on parent interface.

* added order property for TimelineGroup

currently missing from official docs.
awaiting merge almende/vis#4091

* The color of vis nodes can be given as a string as well

* add on-initial-draw-complete-support

* change void function type

* [vis] DataSet.get may return null + type parameter for DataSet.map (#32570)

* Update project urls to match NPM url

Note that this *trivially* updates project urls by adding the NPM url to
the end, even when the urls are almost identical or the DT one is
outdated. I'll clean up the urls in a later commit.

This PR is unfinished! Please do not merge it yet.

* Improve @types/vis (#34293)

* Improveme @types/vis

Two improvements:

* Correct optional types on options.node.shapeProperties
* Add types for options.node.margin

* Fix lint

* Make TimelineTooltipOption properties optional

Those properties have default values in vis library so they don't need to be required.

* [@types/vis] add optional parameter to getConnectedNodes (#34820)

* [@types/vis] add optional string types to EdgeOptions (#34972)

* @types/vis Adding Types to Edges.Arrows

Adding Edges.Arrows.To/Middle/From Type

* Correcting contributor link

* Added widthConstraint options to NodeOptions and fixed linting issues (#35683)

* Added widthConstraint for nodeOptions

* Updated definitions

* Added tests

* Fixed lint issues

* Applied warnings from lint

* Vis.  Fix DataGroup mappings for nestedGroups, added visible and showNested to DataGroup as described in vis.js documentation (#35965)

* Add support of subgroupStack on DataGroup

* Update index.d.ts

* Update index.d.ts

Added new SubGroupStackOptions dynamic structure and updated type of DataGroup.subgroupStack to SubGroupStackOptions | boolean

* Update index.d.ts

codestyling

* Update index.d.ts

codestyling colon

* Fix DataGroup mappings for nestedGroups, added visible and showNested to DataGroup as described in vis.js documentation

* DataGroup test

* fix redundant line break

* [@types/vis] add getBaseEdges definition (#36462)

* [@types/vis] add getBaseEdges definition

* [@types/vis] fix trailing spaces

* Create README.md

* chore: move DefinitelyTyped types to Network.d.ts

* chore(types): clean the new types up
@r3code r3code merged commit 8517693 into r3code:master Sep 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants