From 8d23446dec632189e48534dd915841b7e52d6584 Mon Sep 17 00:00:00 2001
From: Alex de Mulder <alexdemulder@gmail.com>
Date: Wed, 8 Jul 2015 17:55:55 +0200
Subject: [PATCH] rebuilt and updated git ignore

---
 .gitignore  |  4 ----
 HISTORY.md  |  1 +
 dist/vis.js | 15 +++++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e32679e..a182852b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,3 @@ npm-debug.log
 # vim temporary files
 .*.sw[op]
 test/
-dist/*
-dist/vis.js
-dist/vis.map
-dist/vis.min.js
diff --git a/HISTORY.md b/HISTORY.md
index 7456d461..3d601afd 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -7,6 +7,7 @@ http://visjs.org
 
 - Properly fixed the _lockedRedraw method.
 - Fixed node resizing on dragging.
+- Added shapeProperties, thanks @zukomgwili!
 
 ### Graph3d
 
diff --git a/dist/vis.js b/dist/vis.js
index 85bfb8d8..da610bdb 100644
--- a/dist/vis.js
+++ b/dist/vis.js
@@ -10611,6 +10611,7 @@ return /******/ (function(modules) { // webpackBootstrap
       if (options.zMax !== undefined) this.defaultZMax = options.zMax;
       if (options.valueMin !== undefined) this.defaultValueMin = options.valueMin;
       if (options.valueMax !== undefined) this.defaultValueMax = options.valueMax;
+      if (options.backgroundColor !== undefined) this._setBackgroundColor(options.backgroundColor);
 
       if (options.cameraPosition !== undefined) cameraPosition = options.cameraPosition;
 
@@ -10638,7 +10639,6 @@ return /******/ (function(modules) { // webpackBootstrap
           }
         }
       }
-      this._setBackgroundColor(options.backgroundColor);
     }
 
     this.setSize(this.width, this.height);
@@ -11243,7 +11243,7 @@ return /******/ (function(modules) { // webpackBootstrap
             } else {
               v = 1;
               fillStyle = this._hsv2rgb(h, s, v);
-              strokeStyle = this.axisColor;
+              strokeStyle = this.axisColor; // TODO: should be customizable
             }
           } else {
             fillStyle = 'gray';
@@ -11260,7 +11260,7 @@ return /******/ (function(modules) { // webpackBootstrap
           ctx.lineTo(top.screen.x, top.screen.y);
           ctx.closePath();
           ctx.fill();
-          ctx.stroke();
+          ctx.stroke(); // TODO: only draw stroke when strokeWidth > 0
         }
       }
     } else {
@@ -17810,6 +17810,9 @@ return /******/ (function(modules) { // webpackBootstrap
     // update contents
     var content = data && data.content;
     if (content instanceof Element) {
+      while (this.dom.inner.firstChild) {
+        this.dom.inner.removeChild(this.dom.inner.firstChild);
+      }
       this.dom.inner.appendChild(content);
     } else if (content !== undefined && content !== null) {
       this.dom.inner.innerHTML = content;
@@ -17844,11 +17847,11 @@ return /******/ (function(modules) { // webpackBootstrap
 
     // update style
     if (this.style) {
-      util.removeCssText(this.dom.label, 'vis-' + this.style);
+      util.removeCssText(this.dom.label, this.style);
       this.style = null;
     }
     if (data && data.style) {
-      util.addCssText(this.dom.label, 'vis-' + data.style);
+      util.addCssText(this.dom.label, data.style);
       this.style = data.style;
     }
   };
@@ -26721,7 +26724,7 @@ return /******/ (function(modules) { // webpackBootstrap
     return this.canvas.canvasToDOM.apply(this.canvas, arguments);
   };
   Network.prototype.DOMtoCanvas = function () {
-    return this.canvas.DOMtoCanvas(this.canvas, arguments);
+    return this.canvas.DOMtoCanvas.apply(this.canvas, arguments);
   };
   Network.prototype.findNode = function () {
     return this.clustering.findNode.apply(this.clustering, arguments);