X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=43c4d78940f32560225a030201d05ee62eba65a9;hb=a24738abe032aab1125b8ca56e35369a5def9824;hp=ed64173528294df8860c17a09b23502f1efb6bde;hpb=380185d8810a5ae4b18cd3695b70d7de0f729ec1;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index ed64173..43c4d78 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -349,7 +349,7 @@ function widget($, team, type, node) {
for (var i = 0; i < data.hits.length; i++) {
var hit = data.hits[i];
var divId = team.recordElementId(hit.recid[0]);
- html.push('
', renderSummary(hit), '
');
+ html.push('', renderSummary(hit), '
');
// ### At some point, we may be able to move the
// m_currentRecordId and m_currentRecordData members
// from the team object into this widget.
@@ -363,8 +363,8 @@ function widget($, team, type, node) {
function renderSummary(hit)
{
var template = team.loadTemplate("Summary");
- hit._id = "mkwsRec_" + hit.recid;
- hit._onclick = "mkws.showDetails('" + team.name() + "', this.id);return false;"
+ hit._id = team.recordElementId(hit.recid[0]);
+ hit._onclick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;"
return template(hit);
}
});
@@ -537,12 +537,14 @@ function team($, teamName) {
debug("record");
// FIXME: record is async!!
clearTimeout(m_paz.recordTimer);
- // in case on_show was faster to redraw element
// ##### restrict to current team
- var detRecordDiv = document.getElementById('mkwsDet_' + data.recid);
- if (detRecordDiv) return;
+ var detRecordDiv = document.getElementById(recordDetailsId(data.recid[0]));
+ if (detRecordDiv) {
+ // in case on_show was faster to redraw element
+ return;
+ }
m_currentRecordData = data;
- var recordDiv = findnode(recordElementId(m_currentRecordData.recid[0]));
+ var recordDiv = findnode('.' + recordElementId(m_currentRecordData.recid[0]));
var html = renderDetails(m_currentRecordData);
$(recordDiv).append(html);
}
@@ -554,6 +556,12 @@ function team($, teamName) {
}
that.recordElementId = recordElementId;
+ // Used by onRecord(), showDetails() and renderDetails()
+ function recordDetailsId(s) {
+ return 'mkwsDet_' + s.replace(/[^a-z0-9]/ig, '_');
+ }
+ that.recordElementId = recordElementId;
+
that.targetFiltered = function(id) {
for (var i = 0; i < m_filters.length; i++) {
@@ -778,14 +786,13 @@ function team($, teamName) {
// detailed record drawing
- that.showDetails = function (prefixRecId) {
- var recId = prefixRecId.replace('mkwsRec_', '');
+ that.showDetails = function (recId) {
var oldRecordId = m_currentRecordId;
m_currentRecordId = recId;
// remove current detailed view if any
// ##### restrict to current team
- var detRecordDiv = document.getElementById('mkwsDet_' + oldRecordId);
+ var detRecordDiv = document.getElementById(recordDetailsId(oldRecordId));
// lovin DOM!
if (detRecordDiv)
detRecordDiv.parentNode.removeChild(detRecordDiv);
@@ -1059,7 +1066,7 @@ function team($, teamName) {
{
var template = loadTemplate("Record");
var details = template(data);
- return '' + details + '
';
+ return '' + details + '
';
}
that.renderDetails = renderDetails;