Page MenuHomePhabricator

D16707.id.diff
No OneTemporary

D16707.id.diff

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -436,7 +436,7 @@
'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' => '3bc9d2b1',
+ 'rsrc/js/application/conpherence/behavior-conpherence-search.js' => 'dfa4e1ac',
'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 @@
'javelin-behavior-conpherence-menu' => '07928ca3',
'javelin-behavior-conpherence-participant-pane' => '8604caa8',
'javelin-behavior-conpherence-pontificate' => 'f2e58483',
- 'javelin-behavior-conpherence-search' => '3bc9d2b1',
+ 'javelin-behavior-conpherence-search' => 'dfa4e1ac',
'javelin-behavior-countdown-timer' => 'e4cc26b3',
'javelin-behavior-dark-console' => 'f411b6ae',
'javelin-behavior-dashboard-async-panel' => '469c0d9e',
@@ -1219,13 +1219,6 @@
'javelin-dom',
'javelin-magical-init',
),
- '3bc9d2b1' => array(
- 'javelin-behavior',
- 'javelin-dom',
- 'javelin-util',
- 'javelin-workflow',
- 'javelin-stratcom',
- ),
'3cb0b2fc' => array(
'javelin-behavior',
'javelin-dom',
@@ -2095,6 +2088,13 @@
'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/src/applications/conpherence/controller/ConpherenceController.php b/src/applications/conpherence/controller/ConpherenceController.php
--- a/src/applications/conpherence/controller/ConpherenceController.php
+++ b/src/applications/conpherence/controller/ConpherenceController.php
@@ -113,11 +113,7 @@
->setHref('#')
->addClass('conpherence-participant-toggle'));
- Javelin::initBehavior(
- 'conpherence-search',
- array(
- 'searchURI' => '/conpherence/threadsearch/'.$conpherence->getID().'/',
- ));
+ Javelin::initBehavior('conpherence-search');
$header->addActionItem(
id(new PHUIIconCircleView())
@@ -187,6 +183,7 @@
'action' => '/conpherence/threadsearch/'.$id.'/',
'sigil' => 'conpherence-search-form',
'class' => 'conpherence-search-form',
+ 'id' => 'conpherence-search-form',
),
array(
$bar,
diff --git a/webroot/rsrc/js/application/conpherence/behavior-conpherence-search.js b/webroot/rsrc/js/application/conpherence/behavior-conpherence-search.js
--- a/webroot/rsrc/js/application/conpherence/behavior-conpherence-search.js
+++ b/webroot/rsrc/js/application/conpherence/behavior-conpherence-search.js
@@ -7,7 +7,7 @@
* javelin-stratcom
*/
-JX.behavior('conpherence-search', function(config) {
+JX.behavior('conpherence-search', function() {
var shown = true;
var request = null;
@@ -24,13 +24,14 @@
function _doSearch(e) {
e.kill();
var search_text = JX.$('conpherence-search-input').value;
+ var search_uri = JX.$('conpherence-search-form').action;
var search_node = JX.$('conpherence-search-results');
if (request || !search_text) {
return;
}
- request = new JX.Request(config.searchURI, function(response) {
+ request = new JX.Request(search_uri, function(response) {
JX.DOM.setContent(search_node, JX.$H(response));
request = null;
});

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 2:50 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7549145
Default Alt Text
D16707.id.diff (3 KB)

Event Timeline