Small fix (null check on stemmagraph load).

[scpubgit/stemmatology.git] / stemmaweb / root / js / componentload.js

diff --git a/stemmaweb/root/js/componentload.js b/stemmaweb/root/js/componentload.js
index c233b15..e8003a3 100644 (file)
--- a/stemmaweb/root/js/componentload.js
+++ b/stemmaweb/root/js/componentload.js
@@ -1,6 +1,9 @@
 function loadTradition( textid ) {
     // 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();
     $('#variant_graph').empty();
@@ -10,9 +13,10 @@ function loadTradition( textid ) {
     // 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 , function() {
-       var stemma_svg_element = $('#stemma_graph svg').svg().svg('get').root();
-       console.log( stemma_svg_element );
-       stemma_svg_element.height.baseVal.value = $('#stemma_graph').height();
+           if( $('#stemma_graph svg').size() != 0 ) {
+               var stemma_svg_element = $('#stemma_graph svg').svg().svg('get').root();
+               stemma_svg_element.height.baseVal.value = $('#stemma_graph').height();
+       }
        });
     $('#variant_graph').load( basepath + "/variantgraph/" + textid , function() {
        var variant_svg_element = $('#variant_graph svg').svg().svg('get').root();