Merge

Author: Katya-Malyavina-IBM

examples/network/exampleApplications/nodeLegend.html

@@ -97,11 +97,11 @@
       var x = - mynetwork.clientWidth / 2 + 50;
       var y = - mynetwork.clientHeight / 2 + 50;
       var step = 50;
-      nodes.push({id: 1000, x: x, y: y, label: 'Internet', group: 'internet', value: 1, fixed: true, labelPosition: 'right', physics:false});
-      nodes.push({id: 1001, x: x, y: y + step, label: 'Switch', group: 'switch', value: 1, fixed: true, labelPosition: 'right', physics:false});
-      nodes.push({id: 1002, x: x, y: y + 2 * step, label: 'Server', group: 'server', value: 1, fixed: true, labelPosition: 'right', physics:false});
-      nodes.push({id: 1003, x: x, y: y + 3 * step, label: 'Computer', group: 'desktop', value: 1, fixed: true, labelPosition: 'right', physics:false});
-      nodes.push({id: 1004, x: x, y: y + 4 * step, label: 'Smartphone', group: 'mobile', value: 1, fixed: true, labelPosition: 'right', physics:false});
+      nodes.push({id: 1000, x: x, y: y, label: 'Internet', group: 'internet', value: 1, labelPosition:'right', fixed: true, physics:false});
+      nodes.push({id: 1001, x: x, y: y + step, label: 'Switch', group: 'switch', value: 1, labelPosition:'right', fixed: true,  physics:false});
+      nodes.push({id: 1002, x: x, y: y + 2 * step, label: 'Server', group: 'server', value: 1, labelPosition:'right', fixed: true,  physics:false});
+      nodes.push({id: 1003, x: x, y: y + 3 * step, label: 'Computer', group: 'desktop', value: 1, labelPosition:'right', fixed: true,  physics:false});
+      nodes.push({id: 1004, x: x, y: y + 4 * step, label: 'Smartphone', group: 'mobile', value: 1, labelPosition:'right', fixed: true,  physics:false});
 
       // create a network
       var container = document.getElementById('mynetwork');

test/Label.test.js

@@ -1649,8 +1649,8 @@ describe('Shorthand Font Options', function() {
       }
 
       var label = new Label(body, options)
-      label.size.width = 1
-      label.size.height = 1
+      label.dimensions.width = 1
+      label.dimensions.height = 1
 
       assert(
         !label.visible(),