X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fjs%2Frelationship-full.js;h=78475716b30b0ed05570a133762f4e13d51ae1a8;hb=487674b92f431087bfd5cd66cffd35fcfc705548;hp=cd3d867d0ed8ed8d01c2470ff8a913cba3f2cd5f;hpb=20198e59252d42dcb5d8371426fb4d750870cb20;p=scpubgit%2Fstemmaweb.git

diff --git a/root/js/relationship-full.js b/root/js/relationship-full.js
index cd3d867..7847571 100644
--- a/root/js/relationship-full.js
+++ b/root/js/relationship-full.js
@@ -5,36 +5,12 @@ var start_element_height = 0;
 var reltypes = {};
 var readingdata = {};
 
-function getTextPath() {
-    var currpath = window.location.pathname;
-    // Get rid of trailing slash
-    if( currpath.lastIndexOf('/') == currpath.length - 1 ) { 
-    	currpath = currpath.slice( 0, currpath.length - 1) 
-    };
-    // Get rid of query parameters
-    if( currpath.lastIndexOf('?') != -1 ) {
-    	currpath = currpath.slice( 0, currpath.lastIndexOf('?') );
-    };
-    var path_elements = currpath.split('/');
-    var textid = path_elements.pop();
-    var basepath = path_elements.join( '/' );
-    var path_parts = [ basepath, textid ];
-    return path_parts;
-}
-
-function getRelativePath() {
-	var path_parts = getTextPath();
-	return path_parts[0];
-}
-
 function getTextURL( which ) {
-	var path_parts = getTextPath();
-	return path_parts[0] + '/' + path_parts[1] + '/' + which;
+	return basepath + textid + '/' + which;
 }
 
 function getReadingURL( reading_id ) {
-	var path_parts = getTextPath();
-	return path_parts[0] + '/' + path_parts[1] + '/reading/' + reading_id;
+	return basepath + textid + '/reading/' + reading_id;
 }
 
 // Make an XML ID into a valid selector
@@ -79,26 +55,31 @@ function toggle_checkbox( box, value ) {
 }
 
 function morphology_form ( lexlist ) {
-  	$('#morphology').empty();
-  	$.each( lexlist, function( idx, lex ) {
-  		var morphoptions = [];
-  		if( 'wordform_matchlist' in lex ) {
-			$.each( lex['wordform_matchlist'], function( tdx, tag ) {
-				var tagstr = stringify_wordform( tag );
-				morphoptions.push( tagstr );
+  	if( lexlist.length ) {
+  		$('#morph_outer').show();
+		$('#morphology').empty();
+		$.each( lexlist, function( idx, lex ) {
+			var morphoptions = [];
+			if( 'wordform_matchlist' in lex ) {
+				$.each( lex['wordform_matchlist'], function( tdx, tag ) {
+					var tagstr = stringify_wordform( tag );
+					morphoptions.push( tagstr );
+				});
+			}
+			var formtag = 'morphology_' + idx;
+			var formstr = '';
+			if( 'form' in lex ) {
+				formstr = stringify_wordform( lex['form'] );
+			} 
+			var form_morph_elements = morph_elements( 
+				formtag, lex['string'], formstr, morphoptions );
+			$.each( form_morph_elements, function( idx, el ) {
+				$('#morphology').append( el );
 			});
-		}
-  		var formtag = 'morphology_' + idx;
-  		var formstr = '';
-  		if( 'form' in lex ) {
-  			formstr = stringify_wordform( lex['form'] );
-  		} 
-  		var form_morph_elements = morph_elements( 
-  			formtag, lex['string'], formstr, morphoptions );
-		$.each( form_morph_elements, function( idx, el ) {
-			$('#morphology').append( el );
 		});
-  	});
+	} else {
+		$('#morph_outer').hide();
+	}
 }
 
 function stringify_wordform ( tag ) {
@@ -220,9 +201,8 @@ function svgEnlargementLoaded() {
 }
 
 function add_relations( callback_fn ) {
-	var basepath = getRelativePath();
 	var textrelpath = getTextURL( 'relationships' );
-    $.getJSON( basepath + '/definitions', function(data) {
+    $.getJSON( basepath + 'definitions', function(data) {
         var rel_types = data.types.sort();
         $.getJSON( textrelpath,
         function(data) {
@@ -677,8 +657,7 @@ $(document).ready(function () {
     create: function(event, ui) { 
         $(this).data( 'relation_drawn', false );
         //TODO? Err handling?
-		var basepath = getRelativePath();
-        var jqjson = $.getJSON( basepath + '/definitions', function(data) {
+        var jqjson = $.getJSON( basepath + 'definitions', function(data) {
             var types = data.types.sort();
             $.each( types, function(index, value) {   
                  $('#rel_type').append( $('<option />').attr( "value", value ).text(value) ); 
@@ -750,74 +729,79 @@ $(document).ready(function () {
     }
   });
 
-  // function for reading form dialog should go here; for now hide the element
-  $('#reading-form').dialog({
-  	autoOpen: false,
-  	height: 400,
-  	width: 600,
-  	modal: true,
-  	buttons: {
-  		Cancel: function() {
-  			$( this ).dialog( "close" );
-  		},
-  		Update: function( evt ) {
-  			// Disable the button
-  			$(evt.target).button("disable");
-  			$('#reading_status').empty();
-			var reading_id = $('#reading_id').val()
-  			form_values = {
-  				'id' : reading_id,
-  				'is_nonsense': $('#reading_is_nonsense').is(':checked'),
-  				'grammar_invalid': $('#reading_grammar_invalid').is(':checked'),
-  				'normal_form': $('#reading_normal_form').val() };
-  			// Add the morphology values
-  			$('.reading_morphology').each( function() {
-   				if( $(this).val() != '(Click to select)' ) {
-					var rmid = $(this).attr('id');
-					rmid = rmid.substring(8);
-	  				form_values[rmid] = $(this).val();
-	  			}
-  			});
-  			// Make the JSON call
-			ncpath = getReadingURL( reading_id );
-			var reading_element = readingdata[reading_id];
-			// $(':button :contains("Update")').attr("disabled", true);
-			var jqjson = $.post( ncpath, form_values, function(data) {
-				$.each( data, function(key, value) { 
-					reading_element[key] = value;
+  // function for reading form dialog should go here; 
+  // just hide the element for now if we don't have morphology
+  if( can_morphologize ) {
+	  $('#reading-form').dialog({
+		autoOpen: false,
+		// height: 400,
+		width: 450,
+		modal: true,
+		buttons: {
+			Cancel: function() {
+				$( this ).dialog( "close" );
+			},
+			Update: function( evt ) {
+				// Disable the button
+				$(evt.target).button("disable");
+				$('#reading_status').empty();
+				var reading_id = $('#reading_id').val()
+				form_values = {
+					'id' : reading_id,
+					'is_nonsense': $('#reading_is_nonsense').is(':checked'),
+					'grammar_invalid': $('#reading_grammar_invalid').is(':checked'),
+					'normal_form': $('#reading_normal_form').val() };
+				// Add the morphology values
+				$('.reading_morphology').each( function() {
+					if( $(this).val() != '(Click to select)' ) {
+						var rmid = $(this).attr('id');
+						rmid = rmid.substring(8);
+						form_values[rmid] = $(this).val();
+					}
 				});
-				if( $('#update_workspace_button').data('locked') == false ) {
-					color_inactive( get_ellipse( reading_id ) );
-				}
-  				$(evt.target).button("enable");
-				$( "#reading-form" ).dialog( "close" );
-			});
-			// Re-color the node if necessary
-			return false;
-  		}
-  	},
-  	create: function() {
-  	},
-  	open: function() {
-        $(".ui-widget-overlay").css("background", "none");
-        $("#dialog_overlay").show();
-        $('#reading_status').empty();
-        $("#dialog_overlay").height( $("#enlargement_container").height() );
-        $("#dialog_overlay").width( $("#enlargement_container").innerWidth() );
-        $("#dialog_overlay").offset( $("#enlargement_container").offset() );
-        $("#reading-form").parent().find('.ui-button').button("enable");
-  	},
-	close: function() {
-		$("#dialog_overlay").hide();
+				// Make the JSON call
+				ncpath = getReadingURL( reading_id );
+				var reading_element = readingdata[reading_id];
+				// $(':button :contains("Update")').attr("disabled", true);
+				var jqjson = $.post( ncpath, form_values, function(data) {
+					$.each( data, function(key, value) { 
+						reading_element[key] = value;
+					});
+					if( $('#update_workspace_button').data('locked') == false ) {
+						color_inactive( get_ellipse( reading_id ) );
+					}
+					$(evt.target).button("enable");
+					$( "#reading-form" ).dialog( "close" );
+				});
+				// Re-color the node if necessary
+				return false;
+			}
+		},
+		create: function() {
+		},
+		open: function() {
+			$(".ui-widget-overlay").css("background", "none");
+			$("#dialog_overlay").show();
+			$('#reading_status').empty();
+			$("#dialog_overlay").height( $("#enlargement_container").height() );
+			$("#dialog_overlay").width( $("#enlargement_container").innerWidth() );
+			$("#dialog_overlay").offset( $("#enlargement_container").offset() );
+			$("#reading-form").parent().find('.ui-button').button("enable");
+		},
+		close: function() {
+			$("#dialog_overlay").hide();
+		}
+	  }).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
+		  if( ajaxSettings.url.lastIndexOf( getReadingURL('') ) > -1
+			&& ajaxSettings.type == 'POST' && jqXHR.status == 403 ) {
+			  var errobj = jQuery.parseJSON( jqXHR.responseText );
+			  $('#reading_status').append( '<p class="error">Error: ' + errobj.error + '</p>' );
+		  }
+		  $(event.target).parent().find('.ui-button').button("enable");
+	  });
+	} else {
+		$('#reading-form').hide();
 	}
-  }).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
-      if( ajaxSettings.url.lastIndexOf( getReadingURL('') ) > -1
-      	&& ajaxSettings.type == 'POST' && jqXHR.status == 403 ) {
-      	  var errobj = jQuery.parseJSON( jqXHR.responseText );
-          $('#reading_status').append( '<p class="error">Error: ' + errobj.error + '</p>' );
-      }
-	  $(event.target).parent().find('.ui-button').button("enable");
-  });
   
 
   $('#update_workspace_button').click( function() {