Skip to content

Commit 7b12d27

Browse files
Added object type to label property reader
1 parent 64da9e2 commit 7b12d27

File tree

1 file changed

+57
-57
lines changed

1 file changed

+57
-57
lines changed
Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
primitives.orgdiagram.LabelsOptionTask = function (optionsTask, defaultConfig, defaultItemConfig) {
2-
var _data = {},
3-
_hash = {};
2+
var _data = {},
3+
_hash = {};
44

5-
var _dataTemplate = new primitives.common.ObjectReader({
6-
showLabels: new primitives.common.EnumerationReader(primitives.common.Enabled, false, defaultConfig.showLabels),
7-
labelOffset: new primitives.common.ValueReader(["number"], false, defaultConfig.labelOffset),
8-
labelFontSize: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontSize),
9-
labelFontFamily: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontFamily),
10-
labelFontStyle: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontStyle),
11-
labelFontWeight: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontWeight),
12-
labelColor: new primitives.common.ValueReader(["string"], false, defaultConfig.labelColor),
13-
labelSize: new primitives.common.ObjectReader({
14-
width: new primitives.common.ValueReader(["number"], false, defaultConfig.labelSize.width),
15-
height: new primitives.common.ValueReader(["number"], false, defaultConfig.labelSize.height)
16-
}, false, defaultConfig.labelSize),
17-
labelOrientation: new primitives.common.EnumerationReader(primitives.text.TextOrientationType, false, defaultConfig.labelOrientation),
18-
labelPlacement: new primitives.common.EnumerationReader(primitives.common.PlacementType, false, defaultConfig.labelPlacement),
19-
arrowsDirection: new primitives.common.EnumerationReader(primitives.common.GroupByType, false, defaultConfig.arrowsDirection),
20-
items: new primitives.common.ArrayReader(
21-
new primitives.common.ObjectReader({
22-
id: new primitives.common.ValueReader(["string", "number"], true),
23-
label: new primitives.common.ValueReader(["string", "number"], true),
24-
showLabel: new primitives.common.EnumerationReader(primitives.common.Enabled, false, defaultItemConfig.showLabel),
25-
labelSize: new primitives.common.ObjectReader({
26-
width: new primitives.common.ValueReader(["number"], false, 0),
27-
height: new primitives.common.ValueReader(["number"], false, 0)
28-
}, true),
29-
labelOrientation: new primitives.common.EnumerationReader(primitives.text.TextOrientationType, false, defaultItemConfig.labelOrientation),
30-
labelPlacement: new primitives.common.EnumerationReader(primitives.common.PlacementType, false, defaultItemConfig.labelPlacement)
31-
}),
32-
true,
33-
"id"
34-
)
35-
});
5+
var _dataTemplate = new primitives.common.ObjectReader({
6+
showLabels: new primitives.common.EnumerationReader(primitives.common.Enabled, false, defaultConfig.showLabels),
7+
labelOffset: new primitives.common.ValueReader(["number"], false, defaultConfig.labelOffset),
8+
labelFontSize: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontSize),
9+
labelFontFamily: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontFamily),
10+
labelFontStyle: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontStyle),
11+
labelFontWeight: new primitives.common.ValueReader(["string"], false, defaultConfig.labelFontWeight),
12+
labelColor: new primitives.common.ValueReader(["string"], false, defaultConfig.labelColor),
13+
labelSize: new primitives.common.ObjectReader({
14+
width: new primitives.common.ValueReader(["number"], false, defaultConfig.labelSize.width),
15+
height: new primitives.common.ValueReader(["number"], false, defaultConfig.labelSize.height)
16+
}, false, defaultConfig.labelSize),
17+
labelOrientation: new primitives.common.EnumerationReader(primitives.text.TextOrientationType, false, defaultConfig.labelOrientation),
18+
labelPlacement: new primitives.common.EnumerationReader(primitives.common.PlacementType, false, defaultConfig.labelPlacement),
19+
arrowsDirection: new primitives.common.EnumerationReader(primitives.common.GroupByType, false, defaultConfig.arrowsDirection),
20+
items: new primitives.common.ArrayReader(
21+
new primitives.common.ObjectReader({
22+
id: new primitives.common.ValueReader(["string", "number"], true),
23+
label: new primitives.common.ValueReader(["string", "number", "object"], true),
24+
showLabel: new primitives.common.EnumerationReader(primitives.common.Enabled, false, defaultItemConfig.showLabel),
25+
labelSize: new primitives.common.ObjectReader({
26+
width: new primitives.common.ValueReader(["number"], false, 0),
27+
height: new primitives.common.ValueReader(["number"], false, 0)
28+
}, true),
29+
labelOrientation: new primitives.common.EnumerationReader(primitives.text.TextOrientationType, false, defaultItemConfig.labelOrientation),
30+
labelPlacement: new primitives.common.EnumerationReader(primitives.common.PlacementType, false, defaultItemConfig.labelPlacement)
31+
}),
32+
true,
33+
"id"
34+
)
35+
});
3636

37-
function process() {
38-
var context = {
39-
isChanged: false,
40-
hash: _hash
41-
};
37+
function process() {
38+
var context = {
39+
isChanged: false,
40+
hash: _hash
41+
};
4242

43-
_data = _dataTemplate.read(_data, optionsTask.getOptions(), "options", context);
43+
_data = _dataTemplate.read(_data, optionsTask.getOptions(), "options", context);
4444

45-
return context.isChanged;
46-
}
45+
return context.isChanged;
46+
}
4747

48-
function getItemsOptions() {
49-
return _hash["options-items"];
50-
}
48+
function getItemsOptions() {
49+
return _hash["options-items"];
50+
}
5151

52-
function getItemOptions(itemid) {
53-
return _hash["options-items"][itemid];
54-
}
52+
function getItemOptions(itemid) {
53+
return _hash["options-items"][itemid];
54+
}
5555

56-
function getOptions() {
57-
return _data;
58-
}
56+
function getOptions() {
57+
return _data;
58+
}
5959

60-
return {
61-
process: process,
62-
getItemOptions: getItemOptions,
63-
getItemsOptions: getItemsOptions,
64-
getOptions: getOptions,
65-
description: "Checks items labels options."
66-
};
60+
return {
61+
process: process,
62+
getItemOptions: getItemOptions,
63+
getItemsOptions: getItemsOptions,
64+
getOptions: getOptions,
65+
description: "Checks items labels options."
66+
};
6767
};

0 commit comments

Comments
 (0)