From d87c80836d1a55b5c83db7330e7729511f081070 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 14 Jul 2015 17:04:54 +1000
Subject: [PATCH] FIX: stop losing focus when searching for site settings
---
.../javascripts/admin/controllers/admin-site-settings.js.es6 | 2 +-
app/assets/javascripts/admin/templates/site-settings.hbs | 2 +-
app/assets/javascripts/discourse/routes/discourse.js.es6 | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
index 0d617ee1a..da32c3f5e 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -47,7 +47,7 @@ export default Ember.ArrayController.extend(Presence, {
});
this.set('model', matchesGroupedByCategory);
- return this.transitionToRoute("adminSiteSettingsCategory", category || "all_results");
+ this.transitionToRoute("adminSiteSettingsCategory", category || "all_results");
},
filterContent: Discourse.debounce(function() {
diff --git a/app/assets/javascripts/admin/templates/site-settings.hbs b/app/assets/javascripts/admin/templates/site-settings.hbs
index 8587e6707..823c8d6c5 100644
--- a/app/assets/javascripts/admin/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/templates/site-settings.hbs
@@ -6,7 +6,7 @@
</label>
</div>
<div class='controls'>
- {{text-field value=filter placeholderKey="type_to_filter"}}
+ {{text-field value=filter placeholderKey="type_to_filter" class="no-blur"}}
<button {{action "clearFilter"}} class="btn">{{i18n 'admin.site_settings.clear_filter'}}</button>
</div>
</div>
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index bc7d283d0..2a2664280 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -89,7 +89,7 @@ export function cleanDOM() {
// Remove any link focus
// NOTE: the '.not("body")' is here to prevent a bug in IE10 on Win7
// cf. https://stackoverflow.com/questions/5657371/ie9-window-loses-focus-due-to-jquery-mobile
- $(document.activeElement).not("body").blur();
+ $(document.activeElement).not("body").not(".no-blur").blur();
Discourse.set('notifyCount',0);
$('#discourse-modal').modal('hide');