From: Tara L Andrews <tla@mit.edu>
Date: Sun, 30 Nov 2014 14:10:20 +0000 (+0100)
Subject: have a maybe-significant width. Fixes #42
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2Fstemmaweb.git;a=commitdiff_plain;h=cfa6ff766d71f99550b215cf31b9d5f82bdfcde4;hp=48a371e50534b0ce0a1d77c3684c6a487454d7df

have a maybe-significant width. Fixes #42
---

diff --git a/root/js/relationship.js b/root/js/relationship.js
index 342bbc8..b2a6f2d 100644
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -247,7 +247,7 @@ function add_relations( callback_fn ) {
 			var type_index = $.inArray(rel_info.type, rel_types);
 			var source_found = get_ellipse( rel_info.source_id );
 			var target_found = get_ellipse( rel_info.target_id );
-			var emphasis = rel_info.is_significant === "yes";
+			var emphasis = rel_info.is_significant;
 			if( type_index != -1 && source_found.size() && target_found.size() ) {
 				var relation = relation_manager.create( rel_info.source_id, rel_info.target_id, type_index, emphasis );
 				// Save the relationship data too.
@@ -674,7 +674,7 @@ function draw_relation( source_id, target_id, relation_color, emphasis ) {
     var ey = parseInt( target_ellipse.attr('cy') );
     var relation = svg.group( $("#svgenlargement svg g"), { 'class':'relation', 'id':relation_id } );
     svg.title( relation, source_id + '->' + target_id );
-    var stroke_width = emphasis ? 6 : 3;
+    var stroke_width = emphasis === "yes" ? 6 : emphasis === "maybe" ? 4 : 2;
     svg.path( relation, path.move( sx, sy ).curveC( sx + (2*rx), sy, ex + (2*rx), ey, ex, ey ), {fill: 'none', stroke: relation_color, strokeWidth: stroke_width });
     var relation_element = $('#svgenlargement .relation').filter( ':last' );
     relation_element.insertBefore( $('#svgenlargement g g').filter(':first') );
@@ -1061,7 +1061,7 @@ $(document).ready(function () {
 	$( '#dialog-form' ).dialog( {
 	autoOpen: false,
 	height: 350,
-	width: 330,
+	width: 340,
 	modal: true,
 	buttons: {
 	  'Merge readings': function( evt ) {
@@ -1088,7 +1088,7 @@ $(document).ready(function () {
 				var target_found = get_ellipse( source_target[1] );
 				var relation_found = $.inArray( source_target[2], $( '#keymap' ).data( 'relations' ) );
 				if( source_found.size() && target_found.size() && relation_found > -1 ) {
-					var emphasis = $('#is_significant option:selected').attr('value') === "yes";
+					var emphasis = $('#is_significant option:selected').attr('value');
 					var relation = relation_manager.create( source_target[0], source_target[1], relation_found, emphasis );
 					relation_manager.toggle_active( relation.attr('id') );
 					$.each( $('#collapse_node_form').serializeArray(), function( i, k ) {