From ab88ca5299f5ce4fb1f1b8b3a1941428e073ef8a Mon Sep 17 00:00:00 2001
From: Alex de Mulder <alex@almende.org>
Date: Fri, 11 Sep 2015 18:10:35 +0200
Subject: [PATCH] - Fixed scaling not doing anything to edges.

---
 HISTORY.md                             | 1 +
 dist/vis.js                            | 8 ++++----
 lib/network/modules/components/Edge.js | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index f6526269..1e3ade8f 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -6,6 +6,7 @@ http://visjs.org
 ### Network
 
 - Fixed Phantom Edges during clustering.
+- Fixed scaling not doing anything to edges.
 
 ## 2015-09-07, version 4.8.1
 
diff --git a/dist/vis.js b/dist/vis.js
index 237349e2..aedcb1a4 100644
--- a/dist/vis.js
+++ b/dist/vis.js
@@ -5,7 +5,7 @@
  * A dynamic, browser-based visualization library.
  *
  * @version 4.8.2-SNAPSHOT
- * @date    2015-09-08
+ * @date    2015-09-11
  *
  * @license
  * Copyright (C) 2011-2015 Almende B.V, http://almende.com
@@ -23236,7 +23236,7 @@ return /******/ (function(modules) { // webpackBootstrap
     global: {
       align: ['center', 'left', 'right'],
       autoResize: true,
-      throttleRedraw: 0,
+      throttleRedraw: [10, 0, 1000, 10],
       clickToUse: false,
       // dataAttributes: ['all'], // FIXME: can be 'all' or string[]
       editable: {
@@ -26747,7 +26747,7 @@ return /******/ (function(modules) { // webpackBootstrap
       },
 
       autoResize: true,
-      throttleRedraw: 0,
+      throttleRedraw: [10, 0, 1000, 10],
       clickToUse: false,
       end: '',
       format: {
@@ -31369,7 +31369,7 @@ return /******/ (function(modules) { // webpackBootstrap
       value: function parseOptions(parentOptions, newOptions) {
         var allowDeletion = arguments.length <= 2 || arguments[2] === undefined ? false : arguments[2];
 
-        var fields = ['id', 'from', 'hidden', 'hoverWidth', 'label', 'labelHighlightBold', 'length', 'line', 'opacity', 'physics', 'selectionWidth', 'selfReferenceSize', 'to', 'title', 'value', 'width'];
+        var fields = ['id', 'from', 'hidden', 'hoverWidth', 'label', 'labelHighlightBold', 'length', 'line', 'opacity', 'physics', 'scaling', 'selectionWidth', 'selfReferenceSize', 'to', 'title', 'value', 'width'];
 
         // only deep extend the items in the field array. These do not have shorthand.
         util.selectiveDeepExtend(fields, parentOptions, newOptions, allowDeletion);
diff --git a/lib/network/modules/components/Edge.js b/lib/network/modules/components/Edge.js
index c4d36230..caafeb0a 100644
--- a/lib/network/modules/components/Edge.js
+++ b/lib/network/modules/components/Edge.js
@@ -104,6 +104,7 @@ class Edge {
       'line',
       'opacity',
       'physics',
+      'scaling',
       'selectionWidth',
       'selfReferenceSize',
       'to',