pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Don't reload page on search form submits

Browse source 
Both file search and plugin repository search reloaded the page when
hitting enter in the search field. This fixes that.
This commit is contained in:
Gina Häußge 2015-06-29 17:39:56 +02:00
parent 5f0c89c553
commit 60043ccd1e
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
View file

@ -147,7 +147,11 @@ $(function() {
} }
}); });
self.performRepositorySearch = function() { self.performRepositorySearch = function(e) {
if (e !== undefined) {
e.preventDefault();
}
var query = self.repositorySearchQuery(); var query = self.repositorySearchQuery();
if (query !== undefined && query.trim() != "") { if (query !== undefined && query.trim() != "") {
self.repositoryplugins.changeSearchFunction(function(entry) { self.repositoryplugins.changeSearchFunction(function(entry) {

2
src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
View file

@ -83,7 +83,7 @@
</a> </a>
</h4> </h4>
<form class="form-search"> <form class="form-search" data-bind="submit: performRepositorySearch">
<input type="text" class="input-block search-query" data-bind="value: repositorySearchQuery, valueUpdate: 'input'" placeholder="{{ _('Search...') }}"> <input type="text" class="input-block search-query" data-bind="value: repositorySearchQuery, valueUpdate: 'input'" placeholder="{{ _('Search...') }}">
</form> </form>

6
src/octoprint/static/js/app/viewmodels/files.js
View file

@ -308,7 +308,11 @@ $(function() {
return output; return output;
}; };
self.performSearch = function() { self.performSearch = function(e) {
if (e !== undefined) {
e.preventDefault();
}
var query = self.searchQuery(); var query = self.searchQuery();
if (query !== undefined && query.trim() != "") { if (query !== undefined && query.trim() != "") {
self.listHelper.changeSearchFunction(function(entry) { self.listHelper.changeSearchFunction(function(entry) {

2
src/octoprint/templates/sidebar/files.jinja2
View file

@ -1,4 +1,4 @@
<form class="form-search"> <form class="form-search" data-bind="submit: performSearch">
<input type="text" class="input-block search-query" data-bind="value: searchQuery, valueUpdate: 'input'" placeholder="{{ _('Search...') }}"> <input type="text" class="input-block search-query" data-bind="value: searchQuery, valueUpdate: 'input'" placeholder="{{ _('Search...') }}">
</form> </form>
<div class="gcode_files" data-bind="slimScrolledForeach: listHelper.paginatedItems"> <div class="gcode_files" data-bind="slimScrolledForeach: listHelper.paginatedItems">