diff --git a/search_api_ajax.js b/search_api_ajax.js index c2ae8e2..1d6da41 100644 --- a/search_api_ajax.js +++ b/search_api_ajax.js @@ -43,7 +43,7 @@ // Read URL and remove Drupal base with RegExp Drupal.search_api_ajax.readUrl = function(url) { - return url.replace(new RegExp('^.*' + Drupal.settings.basePath + ajaxPath + '/' + '?'), ''); + return url.replace(new RegExp('^.*' + Drupal.settings.basePath + Drupal.settings.pathPrefix + ajaxPath + '/' + '?'), ''); }; // Translate clicked URL to BBQ state @@ -133,7 +133,7 @@ // Get AJAX, callback for returned JSON data console.log(Drupal.settings.basePath + 'search_api_ajax/' + ajaxPath + path); - $.get(Drupal.settings.basePath + 'search_api_ajax/' + ajaxPath + path, { + $.get(Drupal.settings.basePath + Drupal.settings.pathPrefix + 'search_api_ajax/' + ajaxPath + path, { query: data['query'], sort: data['sort'], order: data['order'], @@ -208,7 +208,7 @@ path = $.bbq.getState('path'); if (path != '') { ga('send', 'pageview', { - 'page': Drupal.settings.basePath + ajaxPath + '/' + path, + 'page': Drupal.settings.basePath + Drupal.settings.pathPrefix + ajaxPath + '/' + path, 'title': $(document).find("title").text() }); } @@ -280,8 +280,8 @@ // Observe facet and sorts links ^ starts with * contains // Check two paths: ^basePath/ajaxPath OR ^search_api_ajax/basePath/ajaxPath - $(selector + ' a[href="' + Drupal.settings.basePath + ajaxPath + '"], ' + selector + ' a[href^="' + Drupal.settings.basePath + ajaxPath + '?"], ' + selector + ' a[href^="' + Drupal.settings.basePath + ajaxPath + '#"], ' + selector + ' a[href^="' + Drupal.settings.basePath + ajaxPath + '/"], ' + selector + ' a[href^="' + Drupal.settings.basePath + 'search_api_ajax/' + ajaxPath + '"]').on('click', function() { - return Drupal.search_api_ajax.navigateUrl($(this).attr('href')); + $(selector + ' a[href^="' + Drupal.settings.basePath + Drupal.settings.pathPrefix + ajaxPath + '"], ' + selector + ' a[href^="' + Drupal.settings.basePath + Drupal.settings.pathPrefix + ajaxPath + '?"], ' + selector + ' a[href^="' + Drupal.settings.basePath + Drupal.settings.pathPrefix + ajaxPath + '#"], ' + selector + ' a[href^="' + Drupal.settings.basePath + Drupal.settings.pathPrefix + ajaxPath + '/"], ' + selector + ' a[href^="' + Drupal.settings.basePath + Drupal.settings.pathPrefix + 'search_api_ajax/' + ajaxPath + '"]').on('click', function() { + return Drupal.search_api_ajax.navigateUrl($(this).attr('href')); }); // Add support for facetapi checkboxes widget. @@ -302,7 +302,7 @@ }); // Observe facet range sliders - $(selector + ' .search-api-ranges-widget form[action^="' + Drupal.settings.basePath + ajaxPath + '"], ' + selector + ' .search-api-ranges-widget form[action^="' + Drupal.settings.basePath + 'search_api_ajax/' + ajaxPath + '"]').on('submit', function() { + $(selector + ' .search-api-ranges-widget form[action^="' + Drupal.settings.basePath + Drupal.settings.pathPrefix + ajaxPath + '"], ' + selector + ' .search-api-ranges-widget form[action^="' + Drupal.settings.basePath + Drupal.settings.pathPrefix + 'search_api_ajax/' + ajaxPath + '"]').on('submit', function() { rangeTarget = Drupal.search_api_ajax.readUrl('/' + $(this).find('input[name="path"]').val()); rangeField = $(this).find('input[name="range-field"]').val(); rangeFrom = $(this).find('input[name="range-from"]').val();