Skip to content
This repository was archived by the owner on Feb 1, 2018. It is now read-only.

Commit ca1c0ea

Browse files
committed
Spa search index link issue is resolved
1 parent 1ee481e commit ca1c0ea

5 files changed

Lines changed: 18 additions & 14 deletions

File tree

dist/main.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,8 @@
353353

354354
$rootScope.$on("$includeContentLoaded", function(event, templateName) {
355355
if ($.fn.searchAppbase && Docbase.options.useSearch) {
356-
$('.search-form').searchAppbase(Docbase.options.searchIndexUrl);
356+
//passing false as Htmlmode : false
357+
$('.search-form').searchAppbase(Docbase.options.searchIndexUrl, false);
357358
}
358359
});
359360

@@ -992,7 +993,7 @@
992993

993994
// FILE: scripts/searchAppbase.js
994995
(function($) {
995-
$.fn.searchAppbase = function(searchIndexUrl) {
996+
$.fn.searchAppbase = function(searchIndexUrl, htmlMode) {
996997

997998
//Create the search input element and insert it into html
998999
var $search = $('<input>').attr({
@@ -1012,7 +1013,7 @@
10121013
data.version = link_part.length > 1 ? '<span class="result_record_version">'+link_part[1]+'</span>' : null;
10131014
data.folder = link_part.length > 2 ? '<span class="result_record_folder">'+fileName+'</span>' : null;
10141015
var result_info = link_part.length > 1 ? $("<div>").addClass('result_record_info').append(data.folder).append(data.version) : null;
1015-
var result_a = $('<a>').addClass('result_record_a pointer').attr({'link':data.link, 'sectionId':sectionId}).text(data.title).append(result_info);
1016+
var result_a = $('<a>').addClass('result_record_a pointer').attr({'link':data.link, 'sectionId':sectionId, 'spaLink': data.spaLink}).text(data.title).append(result_info);
10161017
var result_div = $('<div>').addClass('result_record').append(result_a);
10171018
result_a.on('click',function(){
10181019
gotoLink(this);
@@ -1069,8 +1070,9 @@
10691070
setQueryText();
10701071
};
10711072
//goto page with query string
1072-
var gotoLink = function(eve){
1073-
var fullLink = $(eve).attr('link')+'?q='+$search.val()+'#'+$(eve).attr('sectionId');
1073+
var gotoLink = function(eve) {
1074+
var linkMode = htmlMode ? $(eve).attr('link') : $(eve).attr('spaLink');
1075+
var fullLink = linkMode+'?q='+$search.val()+'#'+$(eve).attr('sectionId');
10741076
window.location.href = fullLink;
10751077
};
10761078
//set initial higlhight according to previous page query

0 commit comments

Comments
 (0)