opera-related fixes

httmx · Jan 31, 2014 · cbcd407 · cbcd407
1 parent eef7940
commit cbcd407
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/css/style.css b/css/style.css
@@ -1,4 +1,3 @@
-@import url(font.css);
 @import url(ui.css);
 @import url(item.css);
 @import url(shape.css);

diff --git a/index.html b/index.html
@@ -8,6 +8,7 @@
 		<script src="my-mind.js"></script>
 		<script src="https://cdn.firebase.com/v0/firebase.js"></script>
 		<script src="https://cdn.firebase.com/v0/firebase-simple-login.js"></script>
+		<link rel="stylesheet" href="css/font.css" />
 		<link rel="stylesheet" href="css/style.css" />
 		<link rel="stylesheet" href="css/print.css" media="print" />
 	</head>

diff --git a/my-mind.js b/my-mind.js
@@ -1957,8 +1957,8 @@ MM.Layout.Graph._drawHorizontalConnectors = function(item, side, children) {
 	/* rounded connectors */
 	var c1 = children[0];
 	var c2 = children[children.length-1];
-	var offset = dom.content.offsetWidth + R;
-	var x = x2;
+ 	var x = x2;
+ 	var xx = x + (side == "left" ? -R : R);
 
 	var y1 = c1.getShape().getVerticalAnchor(c1) + c1.getDOM().node.offsetTop;
 	var y2 = c2.getShape().getVerticalAnchor(c2) + c2.getDOM().node.offsetTop;
@@ -1967,9 +1967,10 @@ MM.Layout.Graph._drawHorizontalConnectors = function(item, side, children) {
 
 	ctx.beginPath();
 	ctx.moveTo(x1, y1);
+	ctx.lineTo(xx, y1)
 	ctx.arcTo(x, y1, x, y1+R, R);
 	ctx.lineTo(x, y2-R);
-	ctx.arcTo(x, y2, x2, y2, R);
+	ctx.arcTo(x, y2, xx, y2, R);
 	ctx.lineTo(x2, y2);
 
 	for (var i=1; i<children.length-1; i++) {

diff --git a/src/layout.graph.js b/src/layout.graph.js
@@ -155,8 +155,8 @@ MM.Layout.Graph._drawHorizontalConnectors = function(item, side, children) {
 	/* rounded connectors */
 	var c1 = children[0];
 	var c2 = children[children.length-1];
-	var offset = dom.content.offsetWidth + R;
-	var x = x2;
+ 	var x = x2;
+ 	var xx = x + (side == "left" ? -R : R);
 
 	var y1 = c1.getShape().getVerticalAnchor(c1) + c1.getDOM().node.offsetTop;
 	var y2 = c2.getShape().getVerticalAnchor(c2) + c2.getDOM().node.offsetTop;
@@ -165,9 +165,10 @@ MM.Layout.Graph._drawHorizontalConnectors = function(item, side, children) {
 
 	ctx.beginPath();
 	ctx.moveTo(x1, y1);
+	ctx.lineTo(xx, y1)
 	ctx.arcTo(x, y1, x, y1+R, R);
 	ctx.lineTo(x, y2-R);
-	ctx.arcTo(x, y2, x2, y2, R);
+	ctx.arcTo(x, y2, xx, y2, R);
 	ctx.lineTo(x2, y2);
 
 	for (var i=1; i<children.length-1; i++) {