diff --git a/.gitignore b/.gitignore index 4279dd13..c145381d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ # vis.js files dist/ -test/ -dist/ # npm files node_modules diff --git a/.travis.yml b/.travis.yml index cb336928..ce6f1da0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,6 @@ language: node_js node_js: "6" before_script: - npm install -g gulp -script: gulp \ No newline at end of file +script: + - gulp + - npm test diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 414327c7..a5fe23ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,6 +9,7 @@ If you have any *general question* on how to use the vis.js library in your own If you really want to open a new issue: * Please use the [search functionality](//github.com/almende/vis/issues) to make sure that there is not already an issue concerning the same topic. * Please make sure to **mention which module** of vis.js (network, timeline, graph3d, ...) your are referring to. +* Note that development happens on the `develop` git branch. Be sure to submit PRs against this branch. * If you think you found a bug please **provide a simple example** (e.g. on [jsbin](jsbin.com)) that demonstrates the problem. * If you want to propose a feature-request please **describe what you are looking for in detail**, ideally providing a screenshot, drawing or something similar. * **Close the issue later**, when the issue is no longer needed. diff --git a/HISTORY.md b/HISTORY.md index cf855fbf..98831743 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,34 @@ http://visjs.org +## 2017-01-29, version 4.18.1 + +### General + +- updated dependencies +- FIX: moved babel plugins from devDependencies to dependencies (#2629) + +### Network + +- FIX #2604: Handle label composition for long words (#2650) +- FIX #2640: Network manipulation styles together with Bootstrap styles (#2654) +- FIX #2494: Fix tree collision in hierarchical layout (#2625) +- FIX #2589: Vertically center label in network circle node (#2593) +- FIX #2591: Self reference edge should now appear in all cases (#2595) +- FIX #2613: Fixed return value for zoom in/out callback (#2615) +- FIX #2609: Values should be passed to check values.borderDashes (#2599) + +### Timeline / Graph2D + +- FIX: Fixed htmlContents example (#2651) +- FIX #2590: Min zoom bug (#2646) +- FIX #2597: Zoom while dragging (#2645) +- FIX: Minor cleanups in Timeline Range. (#2633) +- FIX #2458: Allow graph2D options to be undefined (#2634) +- FIX: Fix typo (#2622) +- FIX #2585: Fixed React example (#2587) + + ## 2017-01-15, version 4.18.0 ### General diff --git a/LICENSE-MIT b/LICENSE-MIT index 61da206c..ca928f7b 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2016 Almende B.V. +Copyright (c) 2014-2017 Almende B.V. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/NOTICE b/NOTICE deleted file mode 100644 index a5ef8dbf..00000000 --- a/NOTICE +++ /dev/null @@ -1,33 +0,0 @@ -Vis.js -Copyright 2010-2016 Almende B.V. - -Vis.js is dual licensed under both - - * The Apache 2.0 License - http://www.apache.org/licenses/LICENSE-2.0 - - and - - * The MIT License - http://opensource.org/licenses/MIT - -Vis.js may be distributed under either license. - - -Vis.js uses and redistributes the following third-party libraries: - -- component-emitter - https://github.com/component/emitter - The MIT License - -- hammer.js - http://hammerjs.github.io/ - The MIT License - -- moment.js - http://momentjs.com/ - The MIT License - -- keycharm - https://github.com/AlexDM0/keycharm - The MIT License diff --git a/README.md b/README.md index b08e5997..a61f1bd9 100644 --- a/README.md +++ b/README.md @@ -192,8 +192,8 @@ exports.Timeline = require('./lib/timeline/Timeline'); Then create a custom bundle using browserify, like: - $ browserify custom.js -t babelify -o dist/vis-custom.js -s vis - + $ browserify custom.js -t [ babelify --presets [es2015] ] -o dist/vis-custom.js -s vis + This will generate a custom bundle *vis-custom.js*, which exposes the namespace `vis` containing only `DataSet` and `Timeline`. The generated bundle can be minified using uglifyjs: $ uglifyjs dist/vis-custom.js -o dist/vis-custom.min.js @@ -217,7 +217,7 @@ The custom bundle can now be loaded like: The default bundle `vis.js` is standalone and includes external dependencies such as *hammer.js* and *moment.js*. When these libraries are already loaded by the application, vis.js does not need to include these dependencies itself too. To build a custom bundle of vis.js excluding *moment.js* and *hammer.js*, run browserify in the root of the project: - $ browserify index.js -t babelify -o dist/vis-custom.js -s vis -x moment -x hammerjs + $ browserify index.js -t [ babelify --presets [es2015] ] -o dist/vis-custom.js -s vis -x moment -x hammerjs This will generate a custom bundle *vis-custom.js*, which exposes the namespace `vis`, and has *moment.js* and *hammer.js* excluded. The generated bundle can be minified with uglifyjs: @@ -330,7 +330,7 @@ Then run the tests: ## License -Copyright (C) 2010-2016 Almende B.V. and Contributors +Copyright (C) 2010-2017 Almende B.V. and Contributors Vis.js is dual licensed under both diff --git a/docs/graph3d/index.html b/docs/graph3d/index.html index c29093b7..fd9ba49a 100644 --- a/docs/graph3d/index.html +++ b/docs/graph3d/index.html @@ -422,9 +422,27 @@ var options = {
undefined
undefined
image
or circularImage
, this option should be the URL
to an image. If the image cannot be found, the brokenImage option can be used.
undefined
undefined
title
is the string to be set as title. Use empty string to hide the title completely.
+ Parameter title
is the string or function to be set as title. Use empty string to hide the title completely.
Parameter id
is the id of the custom time bar, and is undefined
by default.