X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widget-main.js;h=a21fd42a9632b61339900fbe35bc591d89d3c215;hb=6c378665b37e896319bf50f7d4e3d71d686b794e;hp=367ec4690bdc881f4f287ef9410a8bc8db1923fd;hpb=fcd300157c2acf190002c1808b97139eda16b6c9;p=mkws-moved-to-github.git diff --git a/src/mkws-widget-main.js b/src/mkws-widget-main.js index 367ec46..a21fd42 100644 --- a/src/mkws-widget-main.js +++ b/src/mkws-widget-main.js @@ -140,25 +140,22 @@ mkws.registerWidgetType('records', function() { } var urls = hit['md-electronic-url']; - that.warn("urls = " + mkws.$.toJSON(urls)); - var bestLink = null; - var otherLinks = []; - for (var j = 0; j < urls.length; j++) { - var url = urls[j]; - that.warn("url #" + (j+1) + " = " + url); - if (!bestLink && url.match(/^(https?:)?\/\//)) { - mkws.debug("'" + url + "' *is* a URL"); - bestLink = url; - } else if (bestLink) { - mkws.debug("'" + url + "' not tested"); - otherLinks.push(url); - } else { - mkws.debug("'" + url + "' is not a URL"); - otherLinks.push(url); + if (urls) { + var bestLink = null; + var otherLinks = []; + for (var j = 0; j < urls.length; j++) { + var url = urls[j]; + if (!url.match(/^(https?:)?\/\//)) { + that.warn("link '" + url + "' is not a valid URL"); + } else if (!bestLink) { + bestLink = url; + } else { + otherLinks.push(url); + } } + hit.bestLink = bestLink; + hit.otherLinks = otherLinks; } - hit.bestLink = bestLink; - hit.otherLinks = otherLinks; } var template = team.loadTemplate(that.config.template || "records"); @@ -289,9 +286,10 @@ mkws.registerWidgetType('search', function() { mkws.registerWidgetType('search-form', function() { var team = this.team; + var that = this; this.node.submit(function() { var val = team.widget('query').value(); - team.newSearch(val); + team.newSearch(that, val); return false; }); });