Merge commit 'dd04c360082eb7e0c54425907224ecf692307906' into update_visjs_again

This commit is contained in:
Eldon Koyle
2016-02-17 11:57:17 -07:00
134 changed files with 19644 additions and 12155 deletions
+3 -8
View File
@@ -22,8 +22,8 @@ exports.graph3d = {
exports.Timeline = require('./lib/timeline/Timeline');
exports.Graph2d = require('./lib/timeline/Graph2d');
exports.timeline = {
Core: require('./lib/timeline/Core'),
DateUtil: require('./lib/timeline/DateUtil'),
DataStep: require('./lib/timeline/DataStep'),
Range: require('./lib/timeline/Range'),
stack: require('./lib/timeline/Stack'),
TimeStep: require('./lib/timeline/TimeStep'),
@@ -37,13 +37,14 @@ exports.timeline = {
RangeItem: require('./lib/timeline/component/item/RangeItem')
},
BackgroundGroup: require('./lib/timeline/component/BackgroundGroup'),
Component: require('./lib/timeline/component/Component'),
CurrentTime: require('./lib/timeline/component/CurrentTime'),
CustomTime: require('./lib/timeline/component/CustomTime'),
DataAxis: require('./lib/timeline/component/DataAxis'),
DataScale: require('./lib/timeline/component/DataScale'),
GraphGroup: require('./lib/timeline/component/GraphGroup'),
Group: require('./lib/timeline/component/Group'),
BackgroundGroup: require('./lib/timeline/component/BackgroundGroup'),
ItemSet: require('./lib/timeline/component/ItemSet'),
Legend: require('./lib/timeline/component/Legend'),
LineGraph: require('./lib/timeline/component/LineGraph'),
@@ -62,13 +63,7 @@ exports.network = {
exports.network.convertDot = function (input) {return exports.network.dotparser.DOTToGraph(input)};
exports.network.convertGephi = function (input,options) {return exports.network.gephiParser.parseGephi(input,options)};
// Deprecated since v3.0.0
exports.Graph = function () {
throw new Error('Graph is renamed to Network. Please create a graph as new vis.Network(...)');
};
// bundled external libraries
exports.moment = require('./lib/module/moment');
exports.hammer = require('./lib/module/hammer'); // TODO: deprecate exports.hammer some day
exports.Hammer = require('./lib/module/hammer');
exports.keycharm = require('keycharm');