diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -438,7 +438,7 @@ 'rsrc/js/application/conpherence/behavior-menu.js' => '1d45c74d', 'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861', 'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3', - 'rsrc/js/application/conpherence/behavior-widget-pane.js' => 'a8458711', + 'rsrc/js/application/conpherence/behavior-widget-pane.js' => 'a2326b96', 'rsrc/js/application/countdown/timer.js' => 'e4cc26b3', 'rsrc/js/application/daemon/behavior-bulk-job-reload.js' => 'edf8a145', 'rsrc/js/application/dashboard/behavior-dashboard-async-panel.js' => '469c0d9e', @@ -664,7 +664,7 @@ 'javelin-behavior-conpherence-drag-and-drop-photo' => 'cf86d16a', 'javelin-behavior-conpherence-menu' => '1d45c74d', 'javelin-behavior-conpherence-pontificate' => '21ba5861', - 'javelin-behavior-conpherence-widget-pane' => 'a8458711', + 'javelin-behavior-conpherence-widget-pane' => 'a2326b96', 'javelin-behavior-countdown-timer' => 'e4cc26b3', 'javelin-behavior-dark-console' => 'f411b6ae', 'javelin-behavior-dashboard-async-panel' => '469c0d9e', @@ -1759,6 +1759,19 @@ 'javelin-dom', 'javelin-reactor-dom', ), + 'a2326b96' => array( + 'javelin-behavior', + 'javelin-dom', + 'javelin-stratcom', + 'javelin-workflow', + 'javelin-util', + 'phabricator-notification', + 'javelin-behavior-device', + 'phuix-dropdown-menu', + 'phuix-action-list-view', + 'phuix-action-view', + 'conpherence-thread-manager', + ), 'a2828756' => array( 'javelin-dom', 'javelin-util', @@ -1784,19 +1797,6 @@ 'javelin-stratcom', 'javelin-dom', ), - 'a8458711' => array( - 'javelin-behavior', - 'javelin-dom', - 'javelin-stratcom', - 'javelin-workflow', - 'javelin-util', - 'phabricator-notification', - 'javelin-behavior-device', - 'phuix-dropdown-menu', - 'phuix-action-list-view', - 'phuix-action-view', - 'conpherence-thread-manager', - ), 'a8d8459d' => array( 'javelin-behavior', 'javelin-dom', diff --git a/src/applications/conpherence/controller/ConpherenceUpdateController.php b/src/applications/conpherence/controller/ConpherenceUpdateController.php --- a/src/applications/conpherence/controller/ConpherenceUpdateController.php +++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php @@ -165,7 +165,6 @@ ConpherenceTransaction::TYPE_PICTURE_CROP) ->setNewValue($crop_file->getPHID()); } - $response_mode = 'redirect'; } // all other metadata updates are continue requests @@ -202,9 +201,7 @@ $xactions[] = id(new ConpherenceTransaction()) ->setTransactionType(PhabricatorTransactions::TYPE_JOIN_POLICY) ->setNewValue($request->getStr('joinPolicy')); - if (!$request->getExists('force_ajax')) { - $response_mode = 'redirect'; - } + $response_mode = 'redirect'; break; case ConpherenceUpdateActions::LOAD: $updated = false; diff --git a/webroot/rsrc/js/application/conpherence/behavior-widget-pane.js b/webroot/rsrc/js/application/conpherence/behavior-widget-pane.js --- a/webroot/rsrc/js/application/conpherence/behavior-widget-pane.js +++ b/webroot/rsrc/js/application/conpherence/behavior-widget-pane.js @@ -92,11 +92,10 @@ e.getTarget(), { action : 'metadata', - force_ajax : true, stage : 'submit' }); }; - href = threadManager._getUpdateURI(); + href = '/conpherence/update/' + _loadedWidgetsID + '/'; } else { handler = JX.bind(null, function(widget, e) { toggleWidget({widget: widget});