diff -r d341117f9370 -r 803dbeb7c919 client/js/ldtjson-bin.js --- a/client/js/ldtjson-bin.js Tue Feb 26 19:04:37 2013 +0100 +++ b/client/js/ldtjson-bin.js Wed Feb 27 19:04:36 2013 +0100 @@ -3,12 +3,12 @@ Rkns.Ldt.ProjectBin = Rkns.Utils.inherit(Rkns._BaseBin); Rkns.Ldt.ProjectBin.prototype.tagTemplate = Rkns._.template( - '
  • ' + '
  • ' + '

    <%=htitle%>

  • ' ); Rkns.Ldt.ProjectBin.prototype.annotationTemplate = Rkns._.template( - '
  • ' + '
  • ' + '

    <%=htitle%>

    <%=hdescription%>

    Start: <%=start%>, End: <%=end%>, Duration: <%=duration%>

  • ' ); @@ -149,7 +149,7 @@ Rkns.Ldt.ResultsBin = Rkns.Utils.inherit(Rkns._BaseBin); Rkns.Ldt.ResultsBin.prototype.segmentTemplate = Rkns._.template( - '
  • ' + '
  • ' + '

    <%=htitle%>

    <%=hdescription%>

    Start: <%=start%>, End: <%=end%>, Duration: <%=duration%>

  • ' ); @@ -168,9 +168,12 @@ var rxbase = searchstr.replace(/(\W)/g,'\\$1'), _rgxp = new RegExp('('+rxbase+')','gi'), rxtest = new RegExp(rxbase,'i') + } else { + var rxbase = this.search.replace(/(\W)/g,'\\$1'), + _rgxp = new RegExp('('+rxbase+')','gi'); } function highlight(_text) { - return searchstr ? _text.replace(_rgxp, "$1") : _text; + return _text.replace(_rgxp, "$1"); } function convertTC(_ms) { function pad(_n) { @@ -220,8 +223,8 @@ end: convertTC(_end), duration: convertTC(_duration), mediaid: _segment.iri_id, - projectid: _segment.project_id, - cuttingid: _segment.cutting_id, + //projectid: _segment.project_id, + //cuttingid: _segment.cutting_id, annotationid: _segment.element_id, image: _img });