From 83a0cf1cd5126b15b5f1f51760608593383a2e46 Mon Sep 17 00:00:00 2001
From: Alex de Mulder <alexdemulder@gmail.com>
Date: Thu, 26 Mar 2015 14:25:29 +0100
Subject: [PATCH] updated option handling for manipulation system

---
 examples/network/01_basic_usage.html      | 3 +++
 lib/network/modules/ManipulationSystem.js | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/network/01_basic_usage.html b/examples/network/01_basic_usage.html
index 665ed785..63da51ed 100644
--- a/examples/network/01_basic_usage.html
+++ b/examples/network/01_basic_usage.html
@@ -53,6 +53,9 @@
                   data.label = data.label + "i"
                   callback(data)
               }
+          },
+          controlNodeStyle: {
+              shape:'square'
           }
       }}//{physics:{stabilization:false}};
   var network = new vis.Network(container, data, options);
diff --git a/lib/network/modules/ManipulationSystem.js b/lib/network/modules/ManipulationSystem.js
index d68f1e3a..1a34b456 100644
--- a/lib/network/modules/ManipulationSystem.js
+++ b/lib/network/modules/ManipulationSystem.js
@@ -74,11 +74,7 @@ class ManipulationSystem {
       }
       else {
         this.options.enabled = true;
-        for (let prop in options) {
-          if (options.hasOwnProperty(prop)) {
-            this.options[prop] = options[prop];
-          }
-        }
+        util.deepExtend(this.options, options);
       }
       if (this.options.initiallyVisible === true) {
         this.editMode = true;