Browse Source

fix: search results href siteRoot undefined

NGPixel 7 years ago
parent
commit
c51d26a02d
4 changed files with 9 additions and 6 deletions
  1. 6 3
      client/js/components/search.vue
  2. 1 1
      npm/package-lock.json
  3. 1 1
      npm/package.json
  4. 1 1
      package.json

+ 6 - 3
client/js/components/search.vue

@@ -10,7 +10,7 @@
           li(v-if='searchres.length === 0')
             a: em {{ $t('search.nomatch') }}
           li(v-for='sres in searchres', v-bind:class='{ "is-active": searchmovekey === "res." + sres.entryPath }')
-            a(v-bind:href='siteRoot + "/" + sres.entryPath') {{ sres.title }}
+            a(v-bind:href='sres.entryPath') {{ sres.title }}
         p.searchresults-label(v-if='searchsuggest.length > 0') {{ $t('search.didyoumean') }}
         ul.searchresults-list(v-if='searchsuggest.length > 0')
           li(v-for='sug in searchsuggest', v-bind:class='{ "is-active": searchmovekey === "sug." + sug }')
@@ -39,7 +39,10 @@ export default {
         self.searchactive = true
         self.searchload++
         socket.emit('search', { terms: val }, (data) => {
-          self.searchres = data.match
+          self.searchres = self._.map(data.match, m => {
+            m.entryPath = `${siteRoot}/${m.entryPath}`
+            return m
+          })
           self.searchsuggest = data.suggest
           self.searchmovearr = self._.concat([], self.searchres, self.searchsuggest)
           if (self.searchload > 0) { self.searchload-- }
@@ -74,7 +77,7 @@ export default {
       let i = this.searchmoveidx - 1
 
       if (this.searchmovearr[i]) {
-        window.location.assign(siteRoot + '/' + this.searchmovearr[i].entryPath)
+        window.location.assign(this.searchmovearr[i].entryPath)
       } else {
         this.searchq = this.searchmovearr[i]
       }

+ 1 - 1
npm/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki.js",
-  "version": "1.0.0-beta.13.1",
+  "version": "1.0.0-beta.14.1",
   "lockfileVersion": 1,
   "dependencies": {
     "amp": {

+ 1 - 1
npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki.js",
-  "version": "1.0.0-beta.13.2",
+  "version": "1.0.0-beta.14.1",
   "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
   "main": "install.js",
   "scripts": {

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.14",
   "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
   "main": "server.js",
   "scripts": {