From 10e464142d10a83f64454203963397382d1ec15e Mon Sep 17 00:00:00 2001 From: Chad Little Date: Sat, 15 Oct 2016 13:59:30 +0000 Subject: [PATCH] Focus search or pontificate in Conpherence when toggled Summary: This focuses the search field when the user opens search, and then the textarea for pontificate if the search box is closed. Test Plan: Open/Close/Open/Close Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D16709 --- resources/celerity/map.php | 18 +++++++++--------- .../conpherence/behavior-conpherence-search.js | 7 +++++++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index f6ec637a91..c455ddd156 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -436,7 +436,7 @@ return array( 'rsrc/js/application/calendar/behavior-recurring-edit.js' => '5f1c4d5f', 'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408', 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2', - 'rsrc/js/application/conpherence/behavior-conpherence-search.js' => 'dfa4e1ac', + 'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '3e137827', 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'c5238acb', 'rsrc/js/application/conpherence/behavior-menu.js' => '07928ca3', 'rsrc/js/application/conpherence/behavior-participant-pane.js' => '8604caa8', @@ -666,7 +666,7 @@ return array( 'javelin-behavior-conpherence-menu' => '07928ca3', 'javelin-behavior-conpherence-participant-pane' => '8604caa8', 'javelin-behavior-conpherence-pontificate' => 'f2e58483', - 'javelin-behavior-conpherence-search' => 'dfa4e1ac', + 'javelin-behavior-conpherence-search' => '3e137827', 'javelin-behavior-countdown-timer' => 'e4cc26b3', 'javelin-behavior-dark-console' => 'f411b6ae', 'javelin-behavior-dashboard-async-panel' => '469c0d9e', @@ -1227,6 +1227,13 @@ return array( 'javelin-util', 'javelin-uri', ), + '3e137827' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-util', + 'javelin-workflow', + 'javelin-stratcom', + ), '3f5d6dbf' => array( 'javelin-behavior', 'javelin-dom', @@ -2088,13 +2095,6 @@ return array( 'df5e11d2' => array( 'javelin-install', ), - 'dfa4e1ac' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-util', - 'javelin-workflow', - 'javelin-stratcom', - ), 'e0ec7f2f' => array( 'javelin-behavior', 'javelin-dom', diff --git a/webroot/rsrc/js/application/conpherence/behavior-conpherence-search.js b/webroot/rsrc/js/application/conpherence/behavior-conpherence-search.js index aa1c2469b7..07c0cda342 100644 --- a/webroot/rsrc/js/application/conpherence/behavior-conpherence-search.js +++ b/webroot/rsrc/js/application/conpherence/behavior-conpherence-search.js @@ -18,6 +18,13 @@ JX.behavior('conpherence-search', function() { shown = !shown; JX.DOM.alterClass(node, 'show-searchbar', !shown); + if (!shown) { + JX.$('conpherence-search-input').focus(); + } else { + var form_root = JX.DOM.find(document, 'div', 'conpherence-form'); + var textarea = JX.DOM.find(form_root, 'textarea'); + textarea.focus(); + } JX.Stratcom.invoke('resize'); }