(no commit message)

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index e2be2c9018298e3b73985774578f61c85d7ce7d5..e75564420878df645ac4d06f712aca349389372d 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -825,20 +825,19 @@ Fluidbook.prototype = {
                        $(".doubleThumb").each(function() {\r
                                var pages = $(this).data('pages').toString().split(',');\r
                                var hitsp = 0;\r
-                               var pagesWithHits = 0;\r
+                               var pagesWithHits = [];\r
                                for (var i in pages) {\r
                                        var n = parseInt(pages[i]);\r
                                        if (hits[n] > 0) {\r
                                                hitsp += hits[n];\r
-                                               pagesWithHits++;\r
+                                               pagesWithHits.push(pages[i]);\r
                                        }\r
                                }\r
-                               \r
-                               if($(this))\r
 \r
-                               if ($(this).find('.hits').length > 0) {\r
-                                       return;\r
-                               }\r
+                               if ($(this))\r
+                                       if ($(this).find('.hits').length > 0) {\r
+                                               return;\r
+                                       }\r
 \r
                                if (hitsp == 0) {\r
                                        if (hideNoResults) {\r
@@ -849,10 +848,14 @@ Fluidbook.prototype = {
                                        $(this).append('<div class="hits no">' + $this.l10n.__('no result found') + '</div>');\r
                                } else {\r
                                        $(this).append('<div class="hits yes">' + hitsp + ' ' + $this.l10n.__('hit(s)') + '</div>');\r
-                                       if (pagesWithHits <= 2) {\r
-                                               $(this).find('a').attr('href', '#/page/' + $(this).attr('page'));\r
+                                       if ($this.pad.enabled) {\r
+                                               if (pagesWithHits.length == 1) {\r
+                                                       $(this).find('a').attr('href', '#/page/' + pagesWithHits[0]);\r
+                                               } else {\r
+                                                       $(this).find('a').attr('href', '#/search/' + e + '/' + $(this).attr('page'));\r
+                                               }\r
                                        } else {\r
-                                               $(this).find('a').attr('href', '#/search/' + e + '/' + $(this).attr('page'));\r
+                                               $(this).find('a').attr('href', '#/page/' + $(this).attr('page'));\r
                                        }\r
                                }\r
                        });\r