Still some problems with non-blocking search
diff --git a/public/js/ajax.js b/public/js/ajax.js
index 2af0bc0..72ef1f7 100644
--- a/public/js/ajax.js
+++ b/public/js/ajax.js
@@ -3,6 +3,8 @@
// https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest
// https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/Using_XMLHttpRequest
// r.addEventListener("progress", updateProgress, false);
+// http://www.javascriptkit.com/javatutors/loadjavascriptcss.shtml
+// http://stackoverflow.com/questions/6112744/load-javascript-on-demand
var Ajax = {
getJSON : function (url, onload) {
var r = new XMLHttpRequest();
diff --git a/public/js/translateTree.js b/public/js/translateTree.js
index e7ce83d..6ac4378 100644
--- a/public/js/translateTree.js
+++ b/public/js/translateTree.js
@@ -90,8 +90,12 @@
function showTree (o, foundry, layer) {
var match = o.parentNode.parentNode;
+console.log("Match: " + match);
+
var tree = d3.select(match).select("div > div.treeInfo");
+console.log("Tree: " + tree);
+
if (tree.classed("active")) {
tree.classed("active", false);
return;
@@ -102,6 +106,8 @@
};
var corpusID = match.getAttribute('data-corpus-id');
+console.log(corpusID);
+
var docID = match.getAttribute('data-doc-id');
var matchID = match.getAttribute('data-match-id');
var url =
@@ -113,16 +119,38 @@
'&layer=' + layer +
'&spans=true';
+ var wrapper = new String("<span class=\"context-left\"></span><span class=\"match\"><span title=\"xip/c:MC\"><span title=\"xip/c:TOP\"><span title=\"xip/c:PP\"><span title=\"xip/c:PREP\">Mit</span> <span title=\"xip/c:NP\"><span title=\"xip/c:DET\">dieser</span> <span title=\"xip/c:NPA\"><span title=\"xip/c:NOUN\">Methode</span></span></span></span> <span title=\"xip/c:VERB\">ist</span> <span title=\"xip/c:NP\"><span title=\"xip/c:PRON\">es</span></span> <span title=\"xip/c:AP\"><span title=\"xip/c:ADV\">nun</span> <span title=\"xip/c:ADJ\">möglich</span></span> <span title=\"xip/c:ADV\">z. B.</span> <span title=\"xip/c:NPA\"><span title=\"xip/c:NP\"><span title=\"xip/c:NOUN\">Voice</span></span></span> (<span title=\"xip/c:INS\"><span title=\"xip/c:NPA\"><span title=\"xip/c:NP\"><span title=\"xip/c:NOUN\">Sprache</span></span></span></span>) <span title=\"xip/c:VERB\">bevorzugt</span> <span title=\"xip/c:PP\"><span title=\"xip/c:PREP\">in</span> <span title=\"xip/c:NP\"><span title=\"xip/c:PRON\">der</span></span> <span title=\"xip/c:NPA\"><span title=\"xip/c:NP\"><span title=\"xip/c:NOUN\">Bridge</span></span></span></span> <span title=\"xip/c:INFC\"><span title=\"xip/c:INS\"><span title=\"xip/c:VERB\">weiterzugeben</span></span></span></span></span></span><span class=\"context-right\"></span>");
+
+ var svg = tree.append("svg");
+ var svgGroup = svg.append("svg:g");
+
+ var treething = translateTree(wrapper);
+console.log(treething);
+
+ var layout = renderer.run(treething, svgGroup);
+ // 10 pixel padding
+ var w = layout.graph().width;
+ var h = layout.graph().height;
+ svg.attr("width", w + 10);
+ svg.attr("height", h + 10);
+ svgGroup.attr("transform", "translate(5, 5)");
+ tree.classed("active", true);
+
+/*
+
jQuery.getJSON(url, function (res) {
var svg = tree.append("svg");
var svgGroup = svg.append("svg:g");
var treething = translateTree(res['snippet']);
-
var layout = renderer.run(treething, svgGroup);
-
- svg.attr("width", layout.graph().width + 40)
- .attr("height", layout.graph().height + 40);
-
+ // 10 pixel padding
+ var w = layout.graph().width;
+ var h = layout.graph().height;
+ svg.attr("width", w + 10);
+ svg.attr("height", h + 10);
+ svgGroup.attr("transform", "translate(5, 5)");
tree.classed("active", true);
});
+
+*/
};
diff --git a/public/sass/matchinfo.scss b/public/sass/matchinfo.scss
index ac5830e..8c0b087 100644
--- a/public/sass/matchinfo.scss
+++ b/public/sass/matchinfo.scss
@@ -23,6 +23,11 @@
font-size: 10pt;
padding: 3pt 10pt; /* wie in ol > li.active p */
/* All cells */
+ > tr:nth-child(odd) {
+ td {
+ background-color: lighten($dark-orange, 25%);
+ }
+ }
> tr {
> * {
padding: 1pt 6pt;
diff --git a/public/sass/query.scss b/public/sass/query.scss
index 4735d0f..b5abe2f 100644
--- a/public/sass/query.scss
+++ b/public/sass/query.scss
@@ -7,7 +7,7 @@
overflow-x: hidden;
color: $darkest-orange;
background-color: $light-orange;
- text-shadow: $light-shadow;
+// text-shadow: $light-shadow;
border: {
color: $dark-orange;
style: solid;