Skip to content

EJ2-836526-Issues update #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SF3741 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

EJ2-836526-Issues update #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/dropdowndatasource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ var DropDownDataSources = (function () {
{ text: 'Snap To Object',iconCss : 'sf-icon-check-tick'},
{ text: 'Show Ruler',iconCss: 'sf-icon-check-tick'},
{ text: 'Show Page Breaks',iconCss: ''},
{ text: 'Show Multiple page',iconCss: ''},
{ text: 'Show Multiple page',iconCss: 'sf-icon-check-tick'},
{ separator: true },
{ text: 'Fit To Width'},
{ text: 'Fit To Page'},
Expand Down
14 changes: 9 additions & 5 deletions scripts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,9 +978,9 @@ var diagram = new ej.diagrams.Diagram({
width: '100%', height: '100%',
nodes: nodes, connectors: connectors, drawingObject: { type: 'Bezier',bezierSettings:{ controlPointsVisibility: ej.diagrams.ControlPointsVisibility.Source | ej.diagrams.ControlPointsVisibility.Target
,smoothness: ej.diagrams.BezierSmoothness.SymmetricDistance } },
created: created, click: click, drop: drop, getConnectorDefaults: getConnectorDefaults, //mouseLeave: mouseLeave,
created: created, click: click, drop: drop, getConnectorDefaults: getConnectorDefaults, getNodeDefaults: getNodeDefaults,
elementDraw: elementDraw, selectedItems: { constraints: ej.diagrams.SelectorConstraints.All & ~ej.diagrams.SelectorConstraints.ResizeAll & ~ej.diagrams.SelectorConstraints.Rotate },
pageSettings: { showPageBreaks: false },
pageSettings: { showPageBreaks: false ,multiplePage:true},
collectionChange: collectionChange,
scrollChange:scrollChange,
pageSettings: {
Expand Down Expand Up @@ -1098,7 +1098,10 @@ function getConnectorDefaults(connector) {
,smoothness: ej.diagrams.BezierSmoothness.SymmetricDistance }
connector.constraints = ej.diagrams.ConnectorConstraints.Default & ~ej.diagrams.ConnectorConstraints.Drag;
};

function getNodeDefaults(node){
node.constraints = ej.diagrams.NodeConstraints.Default &~ ej.diagrams.NodeConstraints.InConnect &~ ej.diagrams.NodeConstraints.OutConnect;
node.annotations =[{ constraints: ej.diagrams.AnnotationConstraints.ReadOnly}]
}
function drop(args) {
if (args.element.id.indexOf("Switch") != -1) {
args.element.addInfo = { binarystate: 0, controltype: 'inputcontrol' };
Expand Down Expand Up @@ -1387,7 +1390,7 @@ function mouseLeave(args) {

function created(args) {

diagram.fitToPage({ mode: 'Width' });
diagram.fitToPage({ mode: 'Width' });

RunSimulation();
};
Expand Down Expand Up @@ -3278,7 +3281,8 @@ function zoomChange(args){
zoomCurrentValue.content = (diagram.scrollSettings.currentZoom * 100).toFixed() + '%';
break;
case 'Zoom to Fit':
diagram.fitToPage({ mode: 'Page', region: 'Content'});
zoom.zoomFactor = 1 / currentZoom - 1;
diagram.zoomTo(zoom);
zoomCurrentValue.content = diagram.scrollSettings.currentZoom;
break;
case 'Zoom to 50%':
Expand Down