From b3e547c60f93734ab7a6b65cc78c79fd8921cbea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Mon, 29 Jun 2015 17:39:56 +0200
Subject: [PATCH] Fix: Don't reload page on search form submits

Both file search and plugin repository search reloaded the page when
hitting enter in the search field. This fixes that.
(cherry picked from commit 60043cc)
---
 .../plugins/pluginmanager/static/js/pluginmanager.js        | 6 +++++-
 .../pluginmanager/templates/pluginmanager_settings.jinja2   | 2 +-
 src/octoprint/static/js/app/viewmodels/files.js             | 6 +++++-
 src/octoprint/templates/sidebar/files.jinja2                | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
index 04aa302c..8d0fb417 100644
--- a/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
+++ b/src/octoprint/plugins/pluginmanager/static/js/pluginmanager.js
@@ -147,7 +147,11 @@ $(function() {
             }
         });
 
-        self.performRepositorySearch = function() {
+        self.performRepositorySearch = function(e) {
+            if (e !== undefined) {
+                e.preventDefault();
+            }
+
             var query = self.repositorySearchQuery();
             if (query !== undefined && query.trim() != "") {
                 self.repositoryplugins.changeSearchFunction(function(entry) {
diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
index bc05691e..559817c0 100644
--- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
+++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2
@@ -83,7 +83,7 @@
             </a>
         </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...') }}">
         </form>
 
diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index 49c2666b..a5d50f8b 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -308,7 +308,11 @@ $(function() {
             return output;
         };
 
-        self.performSearch = function() {
+        self.performSearch = function(e) {
+            if (e !== undefined) {
+                e.preventDefault();
+            }
+
             var query = self.searchQuery();
             if (query !== undefined && query.trim() != "") {
                 self.listHelper.changeSearchFunction(function(entry) {
diff --git a/src/octoprint/templates/sidebar/files.jinja2 b/src/octoprint/templates/sidebar/files.jinja2
index 50067e03..66adac4a 100644
--- a/src/octoprint/templates/sidebar/files.jinja2
+++ b/src/octoprint/templates/sidebar/files.jinja2
@@ -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...') }}">
 </form>
 <div class="gcode_files" data-bind="slimScrolledForeach: listHelper.paginatedItems">