client/js/renderer/edge.js
changeset 458 423bdf56d103
parent 434 0d5998b32a7c
child 459 98cae534083d
--- a/client/js/renderer/edge.js	Mon Jun 01 11:53:03 2015 +0200
+++ b/client/js/renderer/edge.js	Tue Jun 02 00:39:47 2015 +0200
@@ -67,20 +67,21 @@
                 return;
             }
             var _p0a = this.from_representation.paper_coords,
-            _p1a = this.to_representation.paper_coords,
-            _v = _p1a.subtract(_p0a),
-            _r = _v.length,
-            _u = _v.divide(_r),
-            _ortho = new paper.Point([- _u.y, _u.x]),
-            _group_pos = this.bundle.getPosition(this),
-            _delta = _ortho.multiply( this.options.edge_gap_in_bundles * _group_pos ),
-            _p0b = _p0a.add(_delta), /* Adding a 4 px difference */
-            _p1b = _p1a.add(_delta), /* to differentiate bundled links */
-            _a = _v.angle,
-            _textdelta = _ortho.multiply(this.options.edge_label_distance),
-            _handle = _v.divide(3),
-            _color = this.model.get("color") || this.model.get("color") || (this.model.get("created_by") || Utils._USER_PLACEHOLDER(this.renkan)).get("color"),
-            opacity = 1;
+                _p1a = this.to_representation.paper_coords,
+                _v = _p1a.subtract(_p0a),
+                _r = _v.length,
+                _u = _v.divide(_r),
+                _ortho = new paper.Point([- _u.y, _u.x]),
+                _group_pos = this.bundle.getPosition(this),
+                _delta = _ortho.multiply( this.options.edge_gap_in_bundles * _group_pos ),
+                _p0b = _p0a.add(_delta), /* Adding a 4 px difference */
+                _p1b = _p1a.add(_delta), /* to differentiate bundled links */
+                _a = _v.angle,
+                _textdelta = _ortho.multiply(this.options.edge_label_distance),
+                _handle = _v.divide(3),
+                _color = (this.model.has("style") && this.model.get("style").color) || (this.model.get("created_by") || Utils._USER_PLACEHOLDER(this.renkan)).get("color"),
+                _dash = (this.model.has("style") && this.model.get("style").dash) ? this.options.default_dash_array : null,
+                opacity = 1;
 
             if (this.model.get("delete_scheduled") || this.from_representation.model.get("delete_scheduled") || this.to_representation.model.get("delete_scheduled")) {
                 opacity = 0.5;
@@ -103,8 +104,11 @@
                 });
             }
 
+
+
             this.paper_coords = _p0b.add(_p1b).divide(2);
             this.line.strokeColor = _color;
+            this.line.dashArray = _dash;
             this.line.opacity = opacity;
             this.line.segments[0].point = _p0a;
             this.line.segments[1].point = this.paper_coords;