X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fjs%2Frelationship.js;h=0f5ae0994fe1d59355ba11bea42fb321272c525c;hb=2e86ad0ea1ce82bb9702fe79ff12f954f3a33a9e;hp=c98077b7963aa88b9d2bc9e6dc8d1133ce3e60ff;hpb=dde0e57285f88b2b74739a95b4a9abcdaf61fed5;p=scpubgit%2Fstemmaweb.git diff --git a/root/js/relationship.js b/root/js/relationship.js index c98077b..0f5ae09 100644 --- a/root/js/relationship.js +++ b/root/js/relationship.js @@ -800,8 +800,8 @@ 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, '/images/tick_circle_frame.png', { id: merge_id } ); - svg.image( parent_g, (xC+20), (yC-8), 16, 16, '/images/no_entry.png', { id: 'no' + merge_id } ); + 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 ){