From 5cb13de8f2f459f61b0030acc52213c6ec9693ed Mon Sep 17 00:00:00 2001 From: yotamberk Date: Sat, 7 Jan 2017 15:46:55 +0200 Subject: [PATCH 1/5] feat: add initial Travis-CI config (#2550) * Fix redraw order * Fix error when option is not defined * Allow template labels * Add .travis.yml file * Add experiment travis code --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..cb336928 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: node_js +node_js: "6" +before_script: + - npm install -g gulp +script: gulp \ No newline at end of file From db888bd2aad0c0791e788495f20fc210e1c566ea Mon Sep 17 00:00:00 2001 From: yotamberk Date: Sat, 7 Jan 2017 21:45:12 +0200 Subject: [PATCH 2/5] Fix #2538 (#2551) * Fix redraw order * Fix error when option is not defined * Allow template labels * Fix #2538 --- lib/timeline/component/TimeAxis.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/timeline/component/TimeAxis.js b/lib/timeline/component/TimeAxis.js index 30f1903b..f575af4b 100644 --- a/lib/timeline/component/TimeAxis.js +++ b/lib/timeline/component/TimeAxis.js @@ -364,14 +364,12 @@ TimeAxis.prototype._repaintMajorText = function (x, text, orientation, className if (!label) { // create label var content = document.createElement('div'); - content.innerHTML = text; label = document.createElement('div'); label.appendChild(content); this.dom.foreground.appendChild(label); } - this.dom.majorTexts.push(label); - label.childNodes[0].nodeValue = text; + label.childNodes[0].innerHTML = text; label.className = 'vis-text vis-major ' + className; //label.title = title; // TODO: this is a heavy operation @@ -383,6 +381,7 @@ TimeAxis.prototype._repaintMajorText = function (x, text, orientation, className label.style.left = x + 'px'; }; + this.dom.majorTexts.push(label); return label; }; From 1a3f786b8a56dfe58fedc482354c6831e06b72ba Mon Sep 17 00:00:00 2001 From: Uli Fahrer Date: Sat, 7 Jan 2017 15:54:33 +0100 Subject: [PATCH 3/5] Fix tooltip issue causing exception when node becomes cluster --- lib/network/modules/InteractionHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/network/modules/InteractionHandler.js b/lib/network/modules/InteractionHandler.js index 4d61d5a1..3f7a139d 100644 --- a/lib/network/modules/InteractionHandler.js +++ b/lib/network/modules/InteractionHandler.js @@ -694,7 +694,7 @@ class InteractionHandler { // we initially only check stillOnObj because this is much faster. if (stillOnObj === true) { let overNode = this.selectionHandler.getNodeAt(pointer); - stillOnObj = overNode.id === this.popup.popupTargetId; + stillOnObj = overNode === undefined ? false : overNode.id === this.popup.popupTargetId; } } } From 83cbc7786f34bf8d88a07416381cac481cb66390 Mon Sep 17 00:00:00 2001 From: Uli Fahrer Date: Sat, 7 Jan 2017 14:56:56 +0100 Subject: [PATCH 4/5] Fix missing blur edge event --- lib/network/modules/SelectionHandler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/network/modules/SelectionHandler.js b/lib/network/modules/SelectionHandler.js index 8c5eaf37..121a2e93 100644 --- a/lib/network/modules/SelectionHandler.js +++ b/lib/network/modules/SelectionHandler.js @@ -535,8 +535,8 @@ class SelectionHandler { delete this.hoverObj.edges[edgeId]; } // if the blur remains the same and the object is undefined (mouse off) or another - // edge has been hovered, we blur the edge - else if (object === undefined || object instanceof Edge) { + // edge has been hovered, or another node has been hovered we blur the edge. + else if (object === undefined || (object instanceof Edge && object.id != edgeId) || (object instanceof Node && !object.hover)) { this.blurObject(this.hoverObj.edges[edgeId]); delete this.hoverObj.edges[edgeId]; hoverChanged = true; From 0f7dc1f04369febebb973ec1f006ff67cf0c57ff Mon Sep 17 00:00:00 2001 From: dockstreet Date: Sat, 14 Jan 2017 08:15:40 -0500 Subject: [PATCH 5/5] Fixed #2560: IE11 issue 'Symbol' is undefined with babel-polyfill (#2566) * address IE11 issue 'Symbol' is undefined with babel-polyfill https://github.com/almende/vis/issues/2560 * address IE11 issue 'Symbol' is undefined with babel-polyfill https://github.com/almende/vis/issues/2560 * address IE11 issue 'Symbol' is undefined with babel-polyfill https://github.com/almende/vis/issues/2560 --- .babelrc | 3 ++- package.json | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.babelrc b/.babelrc index ebe44981..d3289f3a 100644 --- a/.babelrc +++ b/.babelrc @@ -2,6 +2,7 @@ "presets": ["es2015"], "plugins": [ "transform-es3-property-literals", - "transform-es3-member-expression-literals" + "transform-es3-member-expression-literals", + "transform-runtime" ] } diff --git a/package.json b/package.json index df792ba8..cbbce13b 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,8 @@ "watch-dev": "gulp watch --bundle" }, "dependencies": { + "babel-polyfill": "^6.20.0", + "babel-runtime": "^6.20.0", "emitter-component": "^1.1.1", "moment": "^2.12.0", "propagating-hammerjs": "^1.4.6", @@ -41,6 +43,7 @@ "babel-loader": "^6.2.10", "babel-plugin-transform-es3-member-expression-literals": "^6.8.0", "babel-plugin-transform-es3-property-literals": "^6.8.0", + "babel-plugin-transform-runtime": "^6.15.0", "babel-preset-es2015": "^6.18.0", "babelify": "^7.3.0", "clean-css": "^3.4.10",