Browse Source

fixed physics bug

flowchartTest
Alex de Mulder 9 years ago
parent
commit
de5a9a76e6
4 changed files with 476 additions and 474 deletions
  1. +472
    -471
      dist/vis.js
  2. +1
    -0
      lib/network/modules/InteractionHandler.js
  3. +1
    -1
      lib/network/modules/components/shared/Label.js
  4. +2
    -2
      lib/util.js

+ 472
- 471
dist/vis.js
File diff suppressed because it is too large
View File


+ 1
- 0
lib/network/modules/InteractionHandler.js View File

@ -257,6 +257,7 @@ class InteractionHandler {
yFixed: object.options.fixed.y yFixed: object.options.fixed.y
}; };
object.options.fixed = {};
object.options.fixed.x = true; object.options.fixed.x = true;
object.options.fixed.y = true; object.options.fixed.y = true;

+ 1
- 1
lib/network/modules/components/shared/Label.js View File

@ -37,7 +37,7 @@ class Label {
parentOptions.color = newOptionsArray[2]; parentOptions.color = newOptionsArray[2];
} }
else if (typeof newOptions.font === 'object') { else if (typeof newOptions.font === 'object') {
util.fillIfDefined(parentOptions, newOptions.font, global);
util.fillIfDefined(parentOptions, newOptions.font, allowDeletion);
} }
parentOptions.size = Number(parentOptions.size); parentOptions.size = Number(parentOptions.size);
} }

+ 2
- 2
lib/util.js View File

@ -123,7 +123,7 @@ exports.fillIfDefined = function (a, b, allowDeletion = false) {
if (b[prop] !== undefined) { if (b[prop] !== undefined) {
if (typeof b[prop] !== 'object') { if (typeof b[prop] !== 'object') {
if ((b[prop] === undefined || b[prop] === null) && a[prop] !== undefined && allowDeletion === true) { if ((b[prop] === undefined || b[prop] === null) && a[prop] !== undefined && allowDeletion === true) {
a[prop] = b[prop];
delete a[prop];
} }
else { else {
a[prop] = b[prop]; a[prop] = b[prop];
@ -218,7 +218,7 @@ exports.selectiveDeepExtend = function (props, a, b, allowDeletion = false) {
a[prop] = {}; a[prop] = {};
} }
if (a[prop].constructor === Object) { if (a[prop].constructor === Object) {
exports.deepExtend(a[prop], b[prop]);
exports.deepExtend(a[prop], b[prop], false, allowDeletion);
} }
else { else {
if ((b[prop] === undefined || b[prop] === null) && a[prop] !== undefined && allowDeletion === true) { if ((b[prop] === undefined || b[prop] === null) && a[prop] !== undefined && allowDeletion === true) {

Loading…
Cancel
Save