From 1c7d5ebe5ddd131e254bc5eda0b83f52d64b6ed8 Mon Sep 17 00:00:00 2001 From: jos Date: Mon, 7 Mar 2016 16:02:24 +0100 Subject: [PATCH] Upgraded to babel v6 --- HISTORY.md | 1 + gulpfile.js | 10 +++++++++- lib/network/Network.js | 3 +-- lib/network/modules/SelectionHandler.js | 5 +++-- package.json | 17 +++++++++-------- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 88a57e59..a0f993aa 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -6,6 +6,7 @@ http://visjs.org ### Graph2d +- Fixed #1455: allow vertical panning of the web page on touch devices. - Fixed #1692: Error when y-axis values are equal. ### Timeline diff --git a/gulpfile.js b/gulpfile.js index af46d93f..78b99401 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -45,7 +45,15 @@ var webpackConfig = { }, module: { loaders: [ - { test: /\.js$/, exclude: /node_modules/, loader: 'babel-loader'} + { + test: /\.js$/, + exclude: /node_modules/, + loader: 'babel', + query: { + cacheDirectory: true, + presets: ['es2015'] + } + } ], // exclude requires of moment.js language files diff --git a/lib/network/Network.js b/lib/network/Network.js index 68d10c76..e01f0f16 100644 --- a/lib/network/Network.js +++ b/lib/network/Network.js @@ -2,16 +2,15 @@ require('./shapes'); let Emitter = require('emitter-component'); -let Hammer = require('../module/hammer'); let util = require('../util'); let DataSet = require('../DataSet'); let DataView = require('../DataView'); let dotparser = require('./dotparser'); let gephiParser = require('./gephiParser'); -let Images = require('./Images'); let Activator = require('../shared/Activator'); let locales = require('./locales'); +import Images from './Images'; import Groups from './modules/Groups'; import NodesHandler from './modules/NodesHandler'; import EdgesHandler from './modules/EdgesHandler'; diff --git a/lib/network/modules/SelectionHandler.js b/lib/network/modules/SelectionHandler.js index 415b6ba8..ea768468 100644 --- a/lib/network/modules/SelectionHandler.js +++ b/lib/network/modules/SelectionHandler.js @@ -1,5 +1,6 @@ -let Node = require("./components/Node"); -let Edge = require("./components/Edge"); +import Node from './components/Node'; +import Edge from './components/Edge'; + let util = require('../../util'); class SelectionHandler { diff --git a/package.json b/package.json index 74f0eab5..ef124ef3 100644 --- a/package.json +++ b/package.json @@ -30,25 +30,26 @@ }, "dependencies": {}, "devDependencies": { - "emitter-component": "^1.1.1", - "hammerjs": "^2.0.6", - "keycharm": "^0.2.0", - "moment": "^2.12.0", - "propagating-hammerjs": "^1.4.6", - "uuid": "^2.0.1", - "babel": "^5.1.11", - "babel-loader": "^5.0.0", + "babel-core": "^6.6.5", + "babel-loader": "^6.2.4", + "babel-preset-es2015": "^6.6.0", "babelify": "^7.2.0", "clean-css": "^3.4.10", + "emitter-component": "^1.1.1", "gulp": "^3.9.1", "gulp-concat": "^2.6.0", "gulp-minify-css": "^1.2.4", "gulp-rename": "^1.2.2", "gulp-util": "^3.0.7", + "hammerjs": "^2.0.6", + "keycharm": "^0.2.0", "merge-stream": "^1.0.0", "mocha": "^2.4.5", + "moment": "^2.12.0", + "propagating-hammerjs": "^1.4.6", "rimraf": "^2.5.2", "uglify-js": "^2.6.2", + "uuid": "^2.0.1", "webpack": "^1.12.14", "yargs": "^4.2.0" }