[otrs-cvs] otrs/var/httpd/htdocs/js Core.Agent.Admin.ProcessManagement.Canvas.js, 1.35, 1.36

Comments:
Update of /home/cvs/otrs/var/httpd/htdocs/js
In directory lancelot:/tmp/cvs-serv16288/var/httpd/htdocs/js

Modified Files:
	Core.Agent.Admin.ProcessManagement.Canvas.js 
Log Message:
Changed style of connections back to the original BPMN style.

Author: mn

Index: Core.Agent.Admin.ProcessManagement.Canvas.js
===================================================================
RCS file: /home/cvs/otrs/var/httpd/htdocs/js/Core.Agent.Admin.ProcessManagement.Canvas.js,v
retrieving revision 1.35
retrieving revision 1.36
diff -2 -u -d -r1.35 -r1.36
--- Core.Agent.Admin.ProcessManagement.Canvas.js	26 Nov 2012 10:22:05 -0000	1.35
+++ Core.Agent.Admin.ProcessManagement.Canvas.js	27 Nov 2012 11:19:43 -0000	1.36
@@ -30,16 +30,5 @@
 Core.Agent.Admin.ProcessManagement.Canvas = (function (TargetNS) {
 
-    var Elements = {},
-        ElementList = [],
-        stateMachineConnector = {
-            connector: 'StateMachine',
-            paintStyle: { lineWidth: 2, strokeStyle: '#aaa' },
-            hoverPaintStyle: { strokeStyle: '#dbe300' },
-            endpoint: [ 'Dot', { cssClass: 'Endpoint', hoverClass: 'EndpointHover' } ],
-            endpointStyle: { fillStyle: '#aaa'  },
-            overlays: [ [ 'Arrow', { location: 0.25, width: 15, length: 10 } ], [ 'Arrow', { location: 0.75, width: 15, length: 10 } ] ],
-            anchor: 'Continuous',
-            reattach: true
-        };
+    var Elements = {};
 
     function GetCanvasSize($Element) {
@@ -138,6 +127,6 @@
             detachable: true,
             reattach: true,
-            endpoint: [ 'Dot', { hoverClass: 'EndpointHover' } ],
-            endpointStyle: { fillStyle: "#777" },
+            endpoint: [ 'Dot', { radius: 7, hoverClass: 'EndpointHover' } ],
+            paintStyle: { fillStyle: '#000' },
             parameters: {
                 'Parent': EntityID
@@ -343,4 +332,5 @@
             jsPlumb.connect({
                 connector: [ 'StateMachine', { curviness: 20, margin: -1, showLoopback:false } ],
+                paintStyle: { strokeStyle: "#000", lineWidth: 2 },
                 source: 'StartEvent',
                 target: EntityID,
@@ -350,6 +340,5 @@
                 reattach: true,
                 overlays: [
-                    [ "Arrow", { location: 0.25, width: 20, length: 12 } ],
-                    [ "Arrow", { location: 0.75, width: 20, length: 12 } ]
+                    [ "PlainArrow", { location: -15, width: 20, length: 15 } ]
                 ],
                 parameters: {
@@ -391,13 +380,18 @@
         Connection = jsPlumb.connect({
             connector: [ 'StateMachine', { curviness: 20, margin: -1, showLoopback:false } ],
+            paintStyle: { strokeStyle: "#000", lineWidth: 2 },
             source: StartActivity,
             target: EndActivity,
             anchor: 'Continuous',
-            endpoint: [ 'Dot', { hoverClass: 'EndpointHover' } ],
+            endpoints: [
+                "Blank",
+                [ 'Dot', { radius: 7, hoverClass: 'EndpointHover' } ],
+            ],
+            endpointStyle: { fillStyle: '#000' },
             detachable: true,
             reattach: true,
             overlays: [
-                [ "Arrow", { location: 0.25, width: 20, length: 12 } ],
-                [ "Arrow", { location: 0.75, width: 20, length: 12 } ],
+                [ "Diamond", { location: 18, width: 15, length: 25, paintStyle: { fillStyle: '#FFF', outlineWidth: 1, outlineColor: '#000'} } ],
+                [ "PlainArrow", { location: -15, width: 20, length: 15 } ],
                 [ "Label", { label: TransitionName, location: 0.5, cssClass: 'TransitionLabel', id: EntityID, events: {
                     mouseenter: function(labelOverlay, originalEvent) {
@@ -478,4 +472,5 @@
         jsPlumbInstance.importDefaults({
             Connector: [ 'StateMachine', { curviness: 20, margin: -1, showLoopback:false } ],
+            paintStyle: { strokeStyle: "#000", lineWidth: 2 },
             Anchor: 'Continuous'
         });
@@ -589,6 +584,7 @@
 
                 // Correct transition arrows
-                Data.connection.addOverlay([ "Arrow", { location: 0.25, width: 20, length: 12 } ]);
-                Data.connection.addOverlay([ "Arrow", { location: 0.75, width: 20, length: 12 } ]);
+                Data.connection.setPaintStyle({ strokeStyle: "#000", lineWidth: 2 });
+                Data.connection.addOverlay([ "PlainArrow", { location: -15, width: 20, length: 15 } ]);
+
             }
             // in case the target is the dummy, its a whole new transition
@@ -597,4 +593,5 @@
             else if (Data.targetId === 'Dummy') {
                 Data.connection.setPaintStyle({ strokeStyle: "red", lineWidth: 4 });
+                Data.targetEndpoint.setPaintStyle({ fillStyle: "red" });
             }
             else if (Data.targetId === Data.sourceId) {
@@ -633,6 +630,7 @@
                 // Correcting connection: setting parameters and overlays
                 Data.connection.setParameter('TransitionID', TransitionID);
-                Data.connection.addOverlay([ "Arrow", { location: 0.25, width: 20, length: 12 } ]);
-                Data.connection.addOverlay([ "Arrow", { location: 0.75, width: 20, length: 12 } ]);
+                Data.connection.setPaintStyle({ strokeStyle: "#000", lineWidth: 2 });
+                Data.connection.addOverlay([ "Diamond", { location: 18, width: 15, length: 25, paintStyle: { fillStyle: '#FFF', outlineWidth: 1, outlineColor: '#000'} } ]);
+                Data.connection.addOverlay([ "PlainArrow", { location: -15, width: 20, length: 15 } ]);
                 Data.connection.addOverlay([ "Label", { label: TransitionName, location: 0.5, cssClass: 'TransitionLabel', id: TransitionID, events: { mouseenter: function(labelOverlay, originalEvent) {
                     TargetNS.HighlightTransitionLabel(labelOverlay);
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log