Small change to fix temporary edges of merges not always being removed.

[scpubgit/stemmaweb.git] / root / js / relationship.js

diff --git a/root/js/relationship.js b/root/js/relationship.js
index e36243c..6eb672f 100644 (file)
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -779,7 +779,7 @@ function merge_nodes( source_node_id, target_node_id, consequences ) {
         merge_node( source_node_id, target_node_id );
         if( consequences.checkalign != null ) {
             $.each( consequences.checkalign, function( index, node_ids ) {
-                temp_relation = draw_relation( node_ids[0], node_ids[1], "#89a02c" );
+                var temp_relation = draw_relation( node_ids[0], node_ids[1], "#89a02c" );
                 var sy = parseInt( temp_relation.children('path').attr('d').split('C')[0].split(',')[1] );
                 var ey = parseInt( temp_relation.children('path').attr('d').split(' ')[2].split(',')[1] );
                 var yC = ey + (( sy - ey )/2); 
@@ -797,6 +797,10 @@ function merge_nodes( source_node_id, target_node_id, consequences ) {
                     merge_node( node_ids[0], node_ids[1] );
                     temp_relation.remove();
                     $( '#' + merge_id ).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 ) {
                     temp_relation.remove();
@@ -1037,6 +1041,7 @@ $(document).ready(function () {
                  ncpath = getTextURL( 'merge' );
                  var jqjson = $.post( ncpath, form_values, function( data ) {
                          merge_nodes( $( '#source_node_id' ).val(), $( '#target_node_id' ).val(), data );
+                         $(evt.target).button( 'enable' );
               $( '#dialog-form' ).dialog( 'close' );
                  } );
          },