Browse Source

Merge branch 'develop' of https://github.com/almende/vis into develop

Conflicts:
	dist/vis-light.js
	dist/vis.js
v3_develop
Alex de Mulder 10 years ago
parent
commit
deb869fe43
8 changed files with 24895 additions and 31828 deletions
  1. +11458
    -11454
      dist/vis-light.js
  2. +1
    -1
      dist/vis-light.map
  3. +7
    -7
      dist/vis-light.min.js
  4. +13408
    -20350
      dist/vis.js
  5. +1
    -1
      dist/vis.map
  6. +12
    -15
      dist/vis.min.js
  7. +4
    -0
      gulpfile.js
  8. +4
    -0
      index.js

+ 11458
- 11454
dist/vis-light.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/vis-light.map
File diff suppressed because it is too large
View File


+ 7
- 7
dist/vis-light.min.js
File diff suppressed because it is too large
View File


+ 13408
- 20350
dist/vis.js
File diff suppressed because it is too large
View File


+ 1
- 1
dist/vis.map
File diff suppressed because it is too large
View File


+ 12
- 15
dist/vis.min.js
File diff suppressed because it is too large
View File


+ 4
- 0
gulpfile.js View File

@ -47,6 +47,10 @@ var webpackConfig = {
filename: VIS_JS,
sourcePrefix: ' '
},
// exclude requires of moment.js language files
module: {
wrappedContextRegExp: /$^/
},
plugins: [ bannerPlugin ],
cache: true
};

+ 4
- 0
index.js View File

@ -63,3 +63,7 @@ exports.network = {
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');

Loading…
Cancel
Save