summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2019-01-21 16:38:11 +0100
committerGitHub <noreply@github.com>2019-01-21 16:38:11 +0100
commit6a50df9ea9f2a7fe28c3e0fca78e04a7d19ea1da (patch)
treea87d7d6da16a8c544c6f8c37f4188d25e409a69c /core
parent990bca8696ffc86d717ece9bcd7579db6be4ca45 (diff)
parentc1e839961eb99df24742a605a5dfc1b10ed14d00 (diff)
downloadnextcloud-server-6a50df9ea9f2a7fe28c3e0fca78e04a7d19ea1da.tar.gz
nextcloud-server-6a50df9ea9f2a7fe28c3e0fca78e04a7d19ea1da.zip
Merge pull request #13674 from nextcloud/enh/do_not_fetch_static_template
Include static search template in JS
Diffstat (limited to 'core')
-rw-r--r--core/search/js/searchprovider.js24
-rw-r--r--core/search/templates/part.results.html13
2 files changed, 16 insertions, 21 deletions
diff --git a/core/search/js/searchprovider.js b/core/search/js/searchprovider.js
index 86a22f570f8..7b4970b37f6 100644
--- a/core/search/js/searchprovider.js
+++ b/core/search/js/searchprovider.js
@@ -416,14 +416,22 @@ $(document).ready(function() {
var $searchBox = $('#searchbox');
if ($searchResults.length > 0 && $searchBox.length > 0) {
$searchResults.addClass('hidden');
- $searchResults.load(
- OC.getRootPath() + '/core/search/templates/part.results.html',
- function() {
- OC.Search = new OCA.Search.Core(
- $searchBox,
- $searchResults
- );
- }
+ $searchResults.html('<table>\n' +
+ '\t<tbody>\n' +
+ '\t\t<tr class="template">\n' +
+ '\t\t\t<td class="icon"></td>\n' +
+ '\t\t\t<td class="info">\n' +
+ '\t\t\t\t<a class="link">\n' +
+ '\t\t\t\t\t<div class="name"></div>\n' +
+ '\t\t\t\t</a>\n' +
+ '\t\t\t</td>\n' +
+ '\t\t</tr>\n' +
+ '\t</tbody>\n' +
+ '</table>\n' +
+ '<div id="status"><span></span></div>');
+ OC.Search = new OCA.Search.Core(
+ $searchBox,
+ $searchResults
);
} else {
// check again later
diff --git a/core/search/templates/part.results.html b/core/search/templates/part.results.html
deleted file mode 100644
index 6fad9f2cdd8..00000000000
--- a/core/search/templates/part.results.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<table>
- <tbody>
- <tr class="template">
- <td class="icon"></td>
- <td class="info">
- <a class="link">
- <div class="name"></div>
- </a>
- </td>
- </tr>
- </tbody>
-</table>
-<div id="status"><span></span></div> \ No newline at end of file