X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=stemmaweb%2Froot%2Fjs%2Fcomponentload.js;h=87cc0ef0aaa402e08119f86152376426b2432f70;hb=91b888edba6393eb1dfc0e18c37f2b824724e5b4;hp=97c48c0edab0c953705d2a55241f0c1b5f0a45ad;hpb=a88e75b1e7858fa3878155c70f473897694162ba;p=scpubgit%2Fstemmatology.git

diff --git a/stemmaweb/root/js/componentload.js b/stemmaweb/root/js/componentload.js
index 97c48c0..87cc0ef 100644
--- a/stemmaweb/root/js/componentload.js
+++ b/stemmaweb/root/js/componentload.js
@@ -1,14 +1,23 @@
-function loadTradition( textid ) {
-	$('#stemma_graph').load( "stemma/" + textid , function() {
-    	var stemma_svg_element = $('#stemma_graph svg').svg().svg('get').root();
-    	stemma_svg_element.height.baseVal.value = $('#stemma_graph').height();
-	});
-    $('#variant_graph').load( "variantgraph/" + textid , function() {
-    	var variant_svg_element = $('#variant_graph svg').svg().svg('get').root();
-    	var svg_height = variant_svg_element.height.baseVal.value;
-    	var svg_width = variant_svg_element.width.baseVal.value;
-    	var container_height = $('#variant_graph').height();
-    	variant_svg_element.height.baseVal.value = container_height;
-    	variant_svg_element.width.baseVal.value = (svg_width/svg_height * container_height);
-	});
+function loadTradition( textid, textname ) {
+    // First insert the placeholder image
+    var basepath = window.location.pathname
+    if( basepath.lastIndexOf('/') == basepath.length - 1 ) { 
+    	basepath = basepath.slice( 0, basepath.length - 1) 
+    };
+    var imghtml = '<img src="' + basepath + '/images/ajax-loader.gif" alt="Loading SVG..."/>'
+    $('#stemma_graph').empty();
+    $('#stemma_graph').append( imghtml );
+    // Then get and load the actual content.
+    // TODO: scale #stemma_grpah both horizontally and vertically
+    // TODO: load svgs from SVG.Jquery (to make scaling react in Safari)
+	$('#stemma_graph').load( basepath + "/stemma/" + textid );
+	
+	// Then populate the various elements with the right text name/ID.
+	// Stemma and variant graph titles
+	$('.texttitle').empty();
+	$('.texttitle').append( textname );
+	// Stexaminer submit action
+	$('#run_stexaminer').attr( 'action', basepath + "/stexaminer/" + textid );
+	// Relationship mapper submit action
+	$('#run_relater').attr( 'action', basepath + "/relation/" + textid );
 }