Browse Source

Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	HISTORY.md
	dist/vis.js
flowchartTest
jos 9 years ago
parent
commit
fef525b662
2 changed files with 6 additions and 2 deletions
  1. +4
    -0
      HISTORY.md
  2. +2
    -2
      lib/shared/Validator.js

+ 4
- 0
HISTORY.md View File

@ -7,6 +7,10 @@ http://visjs.org
- Improved function `fit()` to take into account the actual width of items. - Improved function `fit()` to take into account the actual width of items.
### Graph2D
- Fixed #892, addressed any case in validator.
## 2015-05-28, version 4.1.0 ## 2015-05-28, version 4.1.0

+ 2
- 2
lib/shared/Validator.js View File

@ -109,8 +109,8 @@ class Validator {
else if (refOptionObj['fn'] !== undefined && optionType === 'function') { else if (refOptionObj['fn'] !== undefined && optionType === 'function') {
// item is a function, which is allowed // item is a function, which is allowed
} }
else {
// type of the field is incorrect
else if (refOptionObj['any'] === undefined) {
// type of the field is incorrect and the field cannot be any
console.log('%cInvalid type received for "' + option + '". Expected: ' + Validator.print(Object.keys(refOptionObj)) + '. Received [' + optionType + '] "' + options[option] + '"' + Validator.printLocation(path, option), printStyle); console.log('%cInvalid type received for "' + option + '". Expected: ' + Validator.print(Object.keys(refOptionObj)) + '. Received [' + optionType + '] "' + options[option] + '"' + Validator.printLocation(path, option), printStyle);
errorFound = true; errorFound = true;
} }

Loading…
Cancel
Save