X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fjs%2Frelationship.js;h=495d28cf4636b88d5c118ef848f0aa01b92f361a;hb=5a80f535539141528fa6c08439196988dc3bb2f4;hp=342bbc846b0022483afca972e89c5548ce2010a3;hpb=48a371e50534b0ce0a1d77c3684c6a487454d7df;p=scpubgit%2Fstemmaweb.git

diff --git a/root/js/relationship.js b/root/js/relationship.js
index 342bbc8..495d28c 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') );
@@ -818,22 +818,22 @@ function merge_nodes( source_node_id, target_node_id, consequences ) {
                 parent_g = svg.group( $('#svgenlargement svg g') );
                 var ids_text = node_ids[0] + '-' + node_ids[1]; 
                 var merge_id = 'merge-' + ids_text;
-                svg.image( parent_g, xC, (yC-8), 16, 16, merge_button_yes, { id: merge_id } );
-                svg.image( parent_g, (xC+20), (yC-8), 16, 16, merge_button_no, { id: 'no' + merge_id } );
-                $( '#' + merge_id ).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
-                $( '#no' + merge_id ).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
-                $( '#' + merge_id ).click( function( evt ){ 
+                var yes = svg.image( parent_g, xC, (yC-8), 16, 16, merge_button_yes, { id: merge_id } );
+                var no = svg.image( parent_g, (xC+20), (yC-8), 16, 16, merge_button_no, { id: 'no' + merge_id } );
+                $(yes).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
+                $(no).hover( function(){ $(this).addClass( 'draggable' ) }, function(){ $(this).removeClass( 'draggable' ) } );
+                $(yes).click( function( evt ){ 
                     merge_node( node_ids[0], node_ids[1] );
                     temp_relation.remove();
-                    $( '#' + merge_id ).parent().remove();
+                    $(evt.target).parent().remove();
                     //notify backend
                     var ncpath = getTextURL( 'merge' );
                     var form_values = "source_id=" + node_ids[0] + "&target_id=" + node_ids[1] + "&single=true";
                     $.post( ncpath, form_values );
                 } );
-                $( '#no' + merge_id ).click( function( evt ) {
+                $(no).click( function( evt ) {
                     temp_relation.remove();
-                    $( '#' + merge_id ).parent().remove();
+                    $(evt.target).parent().remove();
                 } );
             } );
         }
@@ -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 ) {