X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fjs%2Frelationship.js;h=8cb73d42d839a02a1fbef721a3761a0e5dc1b426;hb=d9d6b62b9d18cb04a220749f547ffb3bb155c21e;hp=c4053059fa81f3767a2ffabe01395e96e816f1fc;hpb=bfb6d17fbac27171a925e3e1b2fda41d9c383784;p=scpubgit%2Fstemmaweb.git

diff --git a/root/js/relationship.js b/root/js/relationship.js
index c405305..8cb73d4 100644
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -58,14 +58,6 @@ function node_dblclick_listener( evt ) {
   	}
   	$('#reading_normal_form').attr( 'size', nfboxsize )
   	$('#reading_normal_form').val( normal_form );
-  	if( editable ) {
-	  	// Fill in the witnesses for the de-collation box.
-	  	$('#reading_decollate_witnesses').empty();
-	  	$.each( reading_info['witnesses'], function( idx, wit ) {
-	  		$('#reading_decollate_witnesses').append( $('<option/>').attr(
-	  			'value', wit ).text( wit ) );
-	  	});
-	}
   	// Now do the morphological properties.
   	morphology_form( reading_info['lexemes'] );
   	// and then open the dialog.
@@ -253,18 +245,19 @@ function add_relations( callback_fn ) {
 	$.getJSON( textrelpath, function(data) {
 		$.each(data, function( index, rel_info ) {
 			var type_index = $.inArray(rel_info.type, rel_types);
-			var source_found = get_ellipse( rel_info.source );
-			var target_found = get_ellipse( rel_info.target );
+			var source_found = get_ellipse( rel_info.source_id );
+			var target_found = get_ellipse( rel_info.target_id );
 			if( type_index != -1 && source_found.size() && target_found.size() ) {
-				var relation = relation_manager.create( rel_info.source, rel_info.target, type_index );
-				relation.data( 'type', rel_info.type );
-				relation.data( 'scope', rel_info.scope );
-				relation.data( 'note', rel_info.note );
+				var relation = relation_manager.create( rel_info.source_id, rel_info.target_id, type_index );
+				// Save the relationship data too.
+				$.each( rel_info, function( k, v ) {
+					relation.data( k, v );
+				});
 				if( editable ) {
-					var node_obj = get_node_obj(rel_info.source);
+					var node_obj = get_node_obj(rel_info.source_id);
 					node_obj.set_selectable( false );
 					node_obj.ellipse.data( 'node_obj', null );
-					node_obj = get_node_obj(rel_info.target);
+					node_obj = get_node_obj(rel_info.target_id);
 					node_obj.set_selectable( false );
 					node_obj.ellipse.data( 'node_obj', null );
 				}
@@ -367,8 +360,10 @@ function node_obj(ellipse) {
         var target_node_text = $('ellipse[fill="#ffccff"]').siblings("text").text();
         $('#source_node_id').val( source_node_id );
         $('#source_node_text').val( source_node_text );
+        $('.rel_rdg_a').text( "'" + source_node_text + "'" );
         $('#target_node_id').val( target_node_id );
         $('#target_node_text').val( target_node_text );
+        $('.rel_rdg_b').text( "'" + target_node_text + "'" );
         $('#dialog-form').dialog( 'open' );
     };
     $('body').unbind('mousemove');
@@ -604,6 +599,27 @@ function relation_factory() {
     this.showinfo = function(relation) {
     	$('#delete_relation_type').text( relation.data('type') );
     	$('#delete_relation_scope').text( relation.data('scope') );
+    	$('#delete_relation_attributes').empty();
+    	var significance = ' is not ';
+    	if( relation.data( 'is_significant' ) === 'yes') {
+    		significance = ' is ';
+    	} else if ( relation.data( 'is_significant' ) === 'maybe' ) {
+    		significance = ' might be ';
+    	}
+		$('#delete_relation_attributes').append( 
+			"This relationship" + significance + "stemmatically significant<br/>");
+    	if( relation.data( 'a_derivable_from_b' ) ) {
+    		$('#delete_relation_attributes').append( 
+    			"'" + relation.data('source_text') + "' derivable from '" + relation.data('target_text') + "'<br/>");
+    	}
+    	if( relation.data( 'b_derivable_from_a' ) ) {
+    		$('#delete_relation_attributes').append( 
+    			"'" + relation.data('target_text') + "' derivable from '" + relation.data('source_text') + "'<br/>");
+    	}
+    	if( relation.data( 'non_independent' ) ) {
+    		$('#delete_relation_attributes').append( 
+    			"Variance unlikely to arise coincidentally<br/>");
+    	}
     	if( relation.data( 'note' ) ) {
     		$('#delete_relation_note').text('note: ' + relation.data( 'note' ) );
     	}
@@ -665,7 +681,18 @@ function draw_relation( source_id, target_id, relation_color ) {
 
 function detach_node( readings ) {
     // separate out the deleted relationships, discard for now
-    delete readings['DELETED'];
+    if( 'DELETED' in readings ) {
+    	// Remove each of the deleted relationship links.
+    	$.each( readings['DELETED'], function( idx, pair ) {
+    		var relation_id = get_relation_id( pair[0], pair[1] );
+			var relation = $( jq( relation_id ) );
+			if( relation.size() == 0 ) { 
+    			relation_id = get_relation_id( pair[1], pair[0] );
+    		}
+    		relation_manager.remove( relation_id );
+    	});
+    	delete readings['DELETED'];
+    }
     // add new node(s)
     $.extend( readingdata, readings );
     // remove from existing readings the witnesses for the new nodes/readings
@@ -779,7 +806,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); 
@@ -789,8 +816,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 ){ 
@@ -943,8 +970,9 @@ function readings_equivalent( source, target ) {
 		return true;
 	}
 	// Lowercase and strip punctuation from both and compare again
-	var stlc = sourcetext.toLowerCase().replace(/[^\w\s]|_/g, "");
-	var ttlc = targettext.toLowerCase().replace(/[^\w\s]|_/g, "");
+	var nonwc = XRegExp('[^\\p{L}\\s]|_');
+	var stlc = XRegExp.replace( sourcetext.toLocaleLowerCase(), nonwc, "", 'all' );
+	var ttlc = XRegExp.replace( targettext.toLocaleLowerCase(), nonwc, "", 'all' );
 	if( stlc === ttlc ) {
 		return true;
 	}	
@@ -1030,23 +1058,25 @@ $(document).ready(function () {
   if( editable ) {
 	$( '#dialog-form' ).dialog( {
 	autoOpen: false,
-	height: 270,
-	width: 290,
+	height: 350,
+	width: 330,
 	modal: true,
 	buttons: {
 	  'Merge readings': function( evt ) {
-		  $( evt.target ).button( 'disable' );
+	  	  var mybuttons = $(evt.target).closest('button').parent().find('button');
+		  mybuttons.button( 'disable' );
 		  $( '#status' ).empty();
 		  form_values = $( '#collapse_node_form' ).serialize();
 		  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' );
+			  mybuttons.button( 'enable' );
               $( '#dialog-form' ).dialog( 'close' );
 		  } );
 	  },
 	  OK: function( evt ) {
-		$( evt.target ).button( 'disable' );
+	  	var mybuttons = $(evt.target).closest('button').parent().find('button');
+		mybuttons.button( 'disable' );
 		$( '#status' ).empty();
 		form_values = $( '#collapse_node_form' ).serialize();
 		ncpath = getTextURL( 'relationships' );
@@ -1057,12 +1087,12 @@ $(document).ready(function () {
 				var relation_found = $.inArray( source_target[2], $( '#keymap' ).data( 'relations' ) );
 				if( source_found.size() && target_found.size() && relation_found > -1 ) {
 					var relation = relation_manager.create( source_target[0], source_target[1], relation_found );
-					relation.data( 'type', source_target[2]  );
-					relation.data( 'scope', $('#scope :selected').text()  );
-					relation.data( 'note', $('#note').val()  );
 					relation_manager.toggle_active( relation.attr('id') );
+					$.each( $('#collapse_node_form').serializeArray(), function( i, k ) {
+						relation.data( k.name, k.value );
+					});
 				}
-				$(evt.target).button( 'enable' );
+				mybuttons.button( 'enable' );
 		   });
 			$( '#dialog-form' ).dialog( 'close' );
 		}, 'json' );
@@ -1080,11 +1110,15 @@ $(document).ready(function () {
 		$.each( relationship_scopes, function(index, value) {   
 			 $('#scope').append( $('<option />').attr( "value", value ).text(value) ); 
 		});
-		// Handler to clear the annotation field, the first time the relationship is
-		// changed after opening the form.
+		$.each( ternary_values, function( index, value ) {
+			$('#is_significant').append( $('<option />').attr( "value", value ).text(value) );
+		});
+		// Handler to reset fields to default, the first time the relationship 
+		// is changed after opening the form.
 		$('#rel_type').change( function () {
 			if( !$(this).data( 'changed_after_open' ) ) {
 				$('#note').val('');
+				$(this).find(':checked').removeAttr('checked');
 			}
 			$(this).data( 'changed_after_open', true );
 		});
@@ -1112,7 +1146,8 @@ $(document).ready(function () {
 		$("#dialog_overlay").hide();
 	}
 	}).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
-		if( ajaxSettings.url == getTextURL('relationships') 
+		if( ( ajaxSettings.url == getTextURL('relationships')
+			  || ajaxSettings.url == getTextURL('merge') )
 			&& ajaxSettings.type == 'POST' && jqXHR.status == 403 ) {
 			var error;
 			if( jqXHR.responseText.indexOf('do not have permission to modify') > -1 ) {
@@ -1135,7 +1170,7 @@ $(document).ready(function () {
   $( "#delete-form" ).dialog({
     autoOpen: false,
     height: 135,
-    width: 250,
+    width: 300,
     modal: false,
     buttons: {
         OK: function() { $( this ).dialog( "close" ); },
@@ -1188,12 +1223,13 @@ $(document).ready(function () {
         Cancel: function() { $( this ).dialog( "close" ); },
         Detach: function ( evt ) { 
             var self = $(this);
-            $( evt.target ).button( "disable" );
+	  		var mybuttons = $(evt.target).closest('button').parent().find('button');
+			mybuttons.button( 'disable' );
             var form_values = $('#detach_collated_form').serialize();
             ncpath = getTextURL( 'duplicate' );
             var jqjson = $.post( ncpath, form_values, function(data) {
                 detach_node( data );
-                $(evt.target).button("enable");
+                mybuttons.button("enable");
                 self.dialog( "close" );
             } );
         }
@@ -1264,11 +1300,6 @@ $(document).ready(function () {
   // function for reading form dialog should go here; 
   // just hide the element for now if we don't have morphology
   if( can_morphologize ) {
-  	  if( editable ) {
-	  	  $('#reading_decollate_witnesses').multiselect();
-	  } else {
-	  	  $('#decollation').hide();
-	  }
 	  $('#reading-form').dialog({
 		autoOpen: false,
 		// height: 400,
@@ -1280,7 +1311,8 @@ $(document).ready(function () {
 			},
 			Update: function( evt ) {
 				// Disable the button
-				$(evt.target).button("disable");
+	  			var mybuttons = $(evt.target).closest('button').parent().find('button');
+				mybuttons.button( 'disable' );
 				$('#reading_status').empty();
 				var reading_id = $('#reading_id').val()
 				form_values = {
@@ -1307,7 +1339,7 @@ $(document).ready(function () {
 					if( $('#update_workspace_button').data('locked') == false ) {
 						color_inactive( get_ellipse( reading_id ) );
 					}
-					$(evt.target).button("enable");
+					mybuttons.button("enable");
 					$( "#reading-form" ).dialog( "close" );
 				});
 				// Re-color the node if necessary
@@ -1324,8 +1356,6 @@ $(document).ready(function () {
 		},
 		open: function() {
 			$(".ui-widget-overlay").css("background", "none");
-			$('#reading_decollate_witnesses').multiselect("refresh");
-			$('#reading_decollate_witnesses').multiselect("uncheckAll");
 			$("#dialog_overlay").show();
 			$('#reading_status').empty();
 			$("#dialog_overlay").height( $("#enlargement_container").height() );