X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdru.client.js;h=e985d42bac488304e1d0abe72aa5f6c95d22fd96;hb=35bf98802b243a3d22f41cb998578a6092e3913e;hp=004466318c7f9ad5c024291e365fa39c8c02761f;hpb=abb9736684a9423349f2f5bc70e2778b4cdb7655;p=mkdru-moved-to-drupal.org.git diff --git a/mkdru.client.js b/mkdru.client.js index 0044663..e985d42 100644 --- a/mkdru.client.js +++ b/mkdru.client.js @@ -137,11 +137,6 @@ mkdru.contains = function (hash, key, value) { } mkdru.pz2Term = function (data) { - // if signaled, prepare container client-side - if (mkdru.facetContainerSelector) { - $(mkdru.facetContainerSelector).html(Drupal.theme('mkdruFacetContainer', - data, mkdru.facets)); - } // map all facets against selected, for simple rendering var hash = $.deparam.fragment(); for (var key in hash) { @@ -332,11 +327,11 @@ mkdru.search = function () { filter = 'pz:id=' + mkdru.state.limit_source; } else { - var limits = mkdru.state['limit_' + facet].split(';'); + var limits = mkdru.state['limit_' + facet].split(/;+/); for (var i = 0; i < limits.length; i++) { // ex. query + and au="{limit_author}" query += ' and ' + mkdru.facets[facet]['limiter'] + '="' - + mkdru.state['limit_' + facet] + '"'; + + limits[i] + '"'; } } } @@ -401,6 +396,12 @@ $(document).ready(function () { mkdru.defaultState['limit_' + key] = null; } + // if signaled, prepare facet container client-side + if (mkdru.facetContainerSelector) { + $(mkdru.facetContainerSelector).html(Drupal.theme('mkdruFacetContainer', + mkdru.facets)); + } + mkdru.pz2 = new pz2( { "onshow": mkdru.pz2Show, "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way "pazpar2path": mkdru.pazpar2Path,