updated group options, icon api change

examples/network/38_node_as_icon.html

@@ -22,7 +22,7 @@
                     usergroups: {
                         shape: 'icon',
                         icon: {
-                            fontFace: 'FontAwesome',
+                            face: 'FontAwesome',
                             code: '\uf0c0',
                             size: 50,
                             color: '#57169a'
@@ -31,7 +31,7 @@
                     users: {
                         shape: 'icon',
                         icon: {
-                            fontFace: 'FontAwesome',
+                            face: 'FontAwesome',
                             code: '\uf007',
                             size: 50,
                             color: '#aa00ff'
@@ -62,7 +62,7 @@
                 label: 'Organisation 1',
                 shape: 'icon',
                 icon: {
-                    fontFace: 'FontAwesome',
+                    face: 'FontAwesome',
                     code: '\uf1ad',
                     size: 50,
                     color: '#f0a30a'
@@ -105,7 +105,7 @@
                     usergroups: {
                         shape: 'icon',
                         icon: {
-                            fontFace: 'Ionicons',
+                            face: 'Ionicons',
                             code: '\uf47c',
                             size: 50,
                             color: '#57169a'
@@ -114,7 +114,7 @@
                     users: {
                         shape: 'icon',
                         icon: {
-                            fontFace: 'Ionicons',
+                            face: 'Ionicons',
                             code: '\uf47e',
                             size: 50,
                             color: '#aa00ff'
@@ -145,7 +145,7 @@
                 label: 'Organisation 1',
                 shape: 'icon',
                 icon: {
-                    fontFace: 'Ionicons',
+                    face: 'Ionicons',
                     code: '\uf276',
                     size: 50,
                     color: '#f0a30a'

lib/network/Network.js

@@ -43,14 +43,16 @@ function Network (container, data, options) {
   }
 
   // set constant values
-  this.remainingOptions = {
-    dataManipulation: {
-      enabled: false,
-      initiallyVisible: false
-    },
+  this.options = {};
+  this.defaultOptions = {
+    //dataManipulation: {
+    //  enabled: false,
+    //  initiallyVisible: false
+    //},
     locale: 'en',
-    locales: locales,
+    locales: locales
   };
+  util.extend(this.options, this.defaultOptions);
 
   // containers for nodes and edges
   this.body = {
@@ -247,6 +249,7 @@ Network.prototype.setOptions = function (options) {
     // the hierarchical system can adapt the edges and the physics to it's own options because not all combinations work with the hierarichical system.
     options = this.layoutEngine.setOptions(options.layout, options);
 
+    this.groups.setOptions(options.groups);
     this.nodesHandler.setOptions(options.nodes);
     this.edgesHandler.setOptions(options.edges);
     this.physics.setOptions(options.physics);

lib/network/modules/Groups.js

@@ -49,11 +49,11 @@ class Groups {
     let optionFields = ['useDefaultGroups'];
 
     if (options !== undefined) {
-      for (let groupname in options) {
-        if (options.hasOwnProperty(groupname)) {
+      for (let groupName in options) {
+        if (options.hasOwnProperty(groupName)) {
           if (optionFields.indexOf(groupName) == -1) {
-            let group = options[groupname];
-            this.add(groupname, group);
+            let group = options[groupName];
+            this.add(groupName, group);
           }
         }
       }

lib/network/modules/InteractionHandler.js

@@ -421,7 +421,7 @@ class InteractionHandler {
    * @private
    */
   onMouseMove(event) {
-    let pointer = {x:event.pageX, y:event.pageY};
+    let pointer = this.getPointer({x:event.pageX, y:event.pageY});
     let popupVisible = false;
 
     // check if the previously selected node is still selected

lib/network/modules/NodesHandler.js

@@ -57,10 +57,10 @@ class NodesHandler {
       group: undefined,
       hidden: false,
       icon: {
-        fontFace: undefined,  //'FontAwesome',
-        code:     undefined,  //'\uf007',
-        size:     undefined,  //50,
-        color:    undefined   //'#aa00ff'
+        face: undefined,  //'FontAwesome',
+        code: undefined,  //'\uf007',
+        size: undefined,  //50,
+        color:undefined   //'#aa00ff'
       },
       image: undefined, // --> URL
       label: undefined,

lib/network/modules/components/nodes/shapes/icon.js

@@ -50,7 +50,7 @@ class Icon extends NodeBase {
     let relativeIconSize = iconSize * this.body.view.scale;
 
     if (this.options.icon.code && relativeIconSize > this.options.scaling.label.drawThreshold - 1) {
-      ctx.font = (selected ? "bold " : "") + iconSize + "px " + this.options.icon.fontFace;
+      ctx.font = (selected ? "bold " : "") + iconSize + "px " + this.options.icon.face;
 
       // draw icon
       ctx.fillStyle = this.options.icon.color || "black";