github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-08 05:40:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: stop losing focus when searching for site settings

Browse Source
This commit is contained in:
Sam 2015-07-14 17:04:54 +10:00
parent b00554d662
commit d87c80836d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
View File

@ -47,7 +47,7 @@ export default Ember.ArrayController.extend(Presence, {
}); });
this.set('model', matchesGroupedByCategory); this.set('model', matchesGroupedByCategory);
return this.transitionToRoute("adminSiteSettingsCategory", category || "all_results"); this.transitionToRoute("adminSiteSettingsCategory", category || "all_results");
}, },
filterContent: Discourse.debounce(function() { filterContent: Discourse.debounce(function() {

2
app/assets/javascripts/admin/templates/site-settings.hbs
View File

@ -6,7 +6,7 @@
</label> </label>
</div> </div>
<div class='controls'> <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> <button {{action "clearFilter"}} class="btn">{{i18n 'admin.site_settings.clear_filter'}}</button>
</div> </div>
</div> </div>

2
app/assets/javascripts/discourse/routes/discourse.js.es6
View File

@ -89,7 +89,7 @@ export function cleanDOM() {
// Remove any link focus // Remove any link focus
// NOTE: the '.not("body")' is here to prevent a bug in IE10 on Win7 // 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 // 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.set('notifyCount',0);
$('#discourse-modal').modal('hide'); $('#discourse-modal').modal('hide');