Skip to content

Commit e7a520f

Browse files
BasicPrimitivesBasicPrimitives
committed
Reverted annotation for finacial ownership demo
1 parent 77776e9 commit e7a520f

2 files changed

Lines changed: 26 additions & 13 deletions

File tree

‎changelog.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
#### Version 5.8.1
6464
* Fixed performance bug in loops layout optimization
6565
#### Version 5.8.0
66-
* Added `loopsLayoutMode` property to `primitives.famdiagram.Config`. Property sets loops layout optimization mode in Family Diagram. See `Loops Layout Optimization` use case.
66+
* Added `loopsLayoutMode` property to `primitives.famdiagram.Config`. Property sets looped layout optimization mode in Family Diagram. See `Loops Layout Optimization` use case.
6767
* Added extra arrows to vertical segments of loops in family diagram
6868
* Fixed spouses selection in the family diagram
6969
* Fixed background annotation `includeChildren` property in family diagram having loops between items.
@@ -99,11 +99,11 @@
9999
#### Version 5.3.1
100100
* Fixed performance issue in react demo.
101101
#### Version 5.3.0
102-
* Added `relativeItem`, `placementType` and `position` properties to `primitives.famdiagram.ItemConfig`. Properties define user preferences for items order in Family Diagram. See "Family Members Order" data set in Family Chart & Annotations Demo.
102+
* Added `relativeItem`, `placementType` and `position` properties to `primitives.famdiagram.ItemConfig`. Properties define user preferences for items ordering in the family diagram. See "Family Members Order" data set in Family Chart & Annotations Demo.
103103
#### Version 5.2.4
104104
* Merged fix for straight connector annotations labels.
105105
#### Version 5.2.2
106-
* Fixed `update` method. In case when only nodes content properties changed like title, description, context, etc, chart will render only them. See Cursor item properties editor panel in Organizational Chart Editor Demo in React Demos.
106+
* Fixed `update` method. When only node content properties change like title and description, the chart will render only them. See the cursor item properties panel in Organizational Chart Editor Demo in React Demos.
107107
* Fixed elbows of connection lines.
108108
#### Version 5.2.1
109109
* Fixed performance bug. JSONML Templates triggered layout on every update. See Dependencies Chart Demo in React Demos.
@@ -114,7 +114,7 @@
114114
* Published React Demo & Tutorial to Github
115115
#### Version 5.1.0
116116

117-
**Warning**: Extracted jQuery UI Widgets into separate `file primitives.jquery.latest.js` !
117+
**Warning**: Extracted jQuery UI Widgets into separate `file primitives.jquery.latest.js`!
118118
* Added npm package header and published library to [www.npmjs.com](https://www.npmjs.com/package/basicprimitives)
119119
* Added pagination for nodes in page fit mode set to None.
120120
#### Version 5.0.4
@@ -149,7 +149,7 @@
149149
* Added option enableMatrixLayout, minimumMatrixSize and maximumColumnsInMatrix to primitives.famdiagram.Config. See Family Chart & Annotations demo for usage.
150150
* Reworked background annotations merge. Items backgrounds don't grow beyond padding area anymore.
151151
* Reworked keyboard navigation. So it respects nodes crossing multiple layers of nodes.
152-
* Reworked mouse highlight gravity. Nodes are no longer highlighted when cursor is out of nodes bounds.
152+
* Reworked mouse highlight gravity. Nodes are no longer highlighted when the cursor is out of node bounds.
153153
* Removed PhantomJS support and page split rendering mode. Use PDFkit plugin for PDF generation and printing.
154154
* Reworked labels conflicts resolution in labels visibility auto mode.
155155
* Fixed inactive items usage in Family diagram.
@@ -325,7 +325,7 @@
325325
* Added Shape & Connector helper widgets: bpShape & bpConnector.
326326
* Added Shape, Connector & Highlight path annotations to orgDiagram. Added ConnectorAnnotationConfig, ShapeAnnotationConfig & HighlightPathAnnotationConfig classes to orgDiagram. Added annotations collection property to orgdiagram.Config.
327327
* Added connection lines styling options: linesType, highlightLinesColor, highlightLinesWidth, highlightLinesType to orgdiagram.Config.
328-
* Changed API from hierarchical structure defined by rootItem to flat list of ItemConfig objects defined in items collection property. Added id & parent properties to ItemConfig. Changed type of cursorItem, highlightItem & selectedItems properties from object references to ItemConfig id-s. Now, in order to define root item, root item in items collection should have its parent property set to null. Chart supports multiple root items. Chart does not search for orphans and ignores looped items. It is Applications responsibility to provide consistent collection of items.
328+
* Changed API from hierarchical structure defined by `rootItem` to a flat list of `ItemConfig` objects defined in items collection property. Added `id` & `parent` properties to `ItemConfig`. Changed type of `cursorItem`, `highlightItem` & `selectedItems` properties from object references to `ItemConfig` id-s. To define root item, root item in items collection should have its parent property set to null. Chart supports multiple root items. The chart does not search for orphans and ignores looped items. It is the application's responsibility to provide a consistent collection of items.
329329
#### Version 1.0.39
330330
* Fixed SVG blurred lines in IE for charts layouted without absolute positioning.
331331
* Added tooltip option to ButtonConfig.
@@ -399,7 +399,7 @@
399399
* Fixed group title update for different heights.
400400
#### Version 1.0.19
401401
* Added childrenPlacementType to Config & ItemConfig options classes.
402-
* Added horizontalAlignment in Config.
402+
* Added `horizontalAlignment` in Config.
403403
#### Version 1.0.18
404404
* Fixed layout performance bug.
405405
#### Version 1.0.17
@@ -411,7 +411,7 @@
411411
* Fixed Bootstrap compatibility bugs. http://twitter.github.com/bootstrap/ Added Bootstrap demo for registered users.
412412
* Added onMouseClick event to Config.
413413
#### Version 1.0.15
414-
* Fixed narrow tree alignment to center instead of stretching it to available view port width.
414+
* Fixed narrow tree alignment to the center instead of stretching it to available viewport width.
415415
* Fixed Assistants & Advisers children placement. Parent's regular children are shifted down in order to provide space for them inside of parent's hierarchy.
416416
* Added maximumColumnsInMatrix option to org chart Config.
417417
* ASP.NET 3.5 Fixed IE8 related bugs.
@@ -443,17 +443,17 @@
443443
* Added items verticalAlignment property. It defines relative items alignment within one row: Top, Middle, Bottom. It only affects rows containing items of different heights.
444444
* Added connectorType options: Squared, Angular and Curved connector lines style for dots.
445445
#### Version 1.0.8
446-
* Fixed widget placement inside divs having non-absolute position.
447-
* Joomla 152-256 menu module: Suppressed layout update before sending server post back.
446+
* Fixed widget placement inside `divs` having non-absolute position.
447+
* Joomla 152-256 menu module: Suppressed layout update before sending server post-back.
448448
* ASP.NET 3.5 Custom control: Fixed custom control placement inside panels having non-absolute position.
449449
#### Version 1.0.7
450-
* Added parentItem to EventArgs class. (See use case: "Adding new items at run time")
450+
* Added `parentItem` to EventArgs class. (See use case: "Adding new items at run time")
451451
#### Version 1.0.6
452452
* Added itemTitleFirstFontColor & itemTitleSecondFontColor options to orgDiagram Config class.
453453
* Added common functions: highestContrast, luminosity, beforeOpacity, getColorHexValue, getRed, getBlue, getGreen.
454454
* Fixed itemTitleColor option.
455455
* ASP.NET custom control: Added TitleColor property to Item class.
456-
* Removed BOM marks from file.
456+
* Removed BOM marks from the release file.
457457
#### Version 1.0.5
458458
* Added onHighlightChanging & onCursorChanging events to orgDiagram Config class.
459459
* Named noname event arguments to named classes: primitives.orgdiagram.EventArgs & primitives.common.RenderEventArgs.

‎samples/javascript.controls/DemoFinancialOwnership.html‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,19 @@
7373

7474
new primitives.LabelAnnotationConfig({ fromItem: 6, toItems: [7], title: "60%" }),
7575
new primitives.LabelAnnotationConfig({ fromItem: 6, toItems: [7, 8], title: "100%" }),
76-
new primitives.LabelAnnotationConfig({ fromItem: 6, toItems: [8], title: "40%" })
76+
new primitives.LabelAnnotationConfig({ fromItem: 6, toItems: [8], title: "40%" }),
77+
{
78+
annotationType: primitives.AnnotationType.Connector,
79+
fromItem: 1,
80+
toItem: 2,
81+
label: "<span class=\"badge bg-danger\">1</span>",
82+
labelSize: { width: 30, height: 30 }, //new primitives.Size(80, 30)
83+
connectorShapeType: primitives.ConnectorShapeType.OneWay,
84+
color: primitives.Colors.Red,
85+
offset: 5,
86+
lineWidth: 2,
87+
lineType: primitives.LineType.Dashed
88+
}
7789
];
7890

7991
options.defaultTemplateName = "UnitTemplate";
@@ -86,6 +98,7 @@
8698
options.highlightLinesColor = primitives.Colors.Red;
8799
options.highlightLinesWidth = 2;
88100
options.highlightLinesType = primitives.LineType.Solid;
101+
options.padding = { left: 10, top: 70, right: 10, bottom: 10 };
89102

90103
options.cousinsIntervalMultiplier = 1;
91104

0 commit comments

Comments
 (0)