1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 14:52:41 +01:00

Modify Celerity to emit required resources on Ajax responses

Summary: Companion diff to D4003.

Test Plan: Rigged up a response which loaded a CSS file with `body { background: red; }`, verified page turned red after I clicked the button.

Reviewers: vrana, chad, btrahan

Reviewed By: chad

CC: aran

Maniphest Tasks: T2086

Differential Revision: https://secure.phabricator.com/D4004
This commit is contained in:
epriestley 2012-11-21 08:37:01 -08:00
parent 2dcc4cfb53
commit 7138427a05
3 changed files with 34 additions and 25 deletions

2
externals/javelin vendored

@ -1 +1 @@
Subproject commit 888a4aa7ad9ae225c0abdd5358b7e52b77753433 Subproject commit d1586fc8ce044663f0e8e13aa124a2b41c243b57

View file

@ -4705,7 +4705,7 @@ celerity_register_resource_map(array(
), ),
'javelin-request' => 'javelin-request' =>
array( array(
'uri' => '/res/d881d449/rsrc/js/javelin/lib/Request.js', 'uri' => '/res/e25d75b3/rsrc/js/javelin/lib/Request.js',
'type' => 'js', 'type' => 'js',
'requires' => 'requires' =>
array( array(
@ -5961,7 +5961,7 @@ celerity_register_resource_map(array(
'uri' => '/res/pkg/5e68be89/diffusion.pkg.js', 'uri' => '/res/pkg/5e68be89/diffusion.pkg.js',
'type' => 'js', 'type' => 'js',
), ),
'15ced26b' => '2e81a7e8' =>
array( array(
'name' => 'javelin.pkg.js', 'name' => 'javelin.pkg.js',
'symbols' => 'symbols' =>
@ -5988,7 +5988,7 @@ celerity_register_resource_map(array(
19 => 'javelin-fx', 19 => 'javelin-fx',
20 => 'javelin-color', 20 => 'javelin-color',
), ),
'uri' => '/res/pkg/15ced26b/javelin.pkg.js', 'uri' => '/res/pkg/2e81a7e8/javelin.pkg.js',
'type' => 'js', 'type' => 'js',
), ),
'7839ae2d' => '7839ae2d' =>
@ -6052,7 +6052,7 @@ celerity_register_resource_map(array(
'diffusion-icons-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88',
'inline-comment-summary-css' => '47549184', 'inline-comment-summary-css' => '47549184',
'javelin-aphlict' => 'dc2e64a4', 'javelin-aphlict' => 'dc2e64a4',
'javelin-behavior' => '15ced26b', 'javelin-behavior' => '2e81a7e8',
'javelin-behavior-aphlict-dropdown' => 'dc2e64a4', 'javelin-behavior-aphlict-dropdown' => 'dc2e64a4',
'javelin-behavior-aphlict-listen' => 'dc2e64a4', 'javelin-behavior-aphlict-listen' => 'dc2e64a4',
'javelin-behavior-aphront-basic-tokenizer' => 'dc2e64a4', 'javelin-behavior-aphront-basic-tokenizer' => 'dc2e64a4',
@ -6099,26 +6099,26 @@ celerity_register_resource_map(array(
'javelin-behavior-repository-crossreference' => '7ecd31fa', 'javelin-behavior-repository-crossreference' => '7ecd31fa',
'javelin-behavior-toggle-class' => 'dc2e64a4', 'javelin-behavior-toggle-class' => 'dc2e64a4',
'javelin-behavior-workflow' => 'dc2e64a4', 'javelin-behavior-workflow' => 'dc2e64a4',
'javelin-color' => '15ced26b', 'javelin-color' => '2e81a7e8',
'javelin-dom' => '15ced26b', 'javelin-dom' => '2e81a7e8',
'javelin-event' => '15ced26b', 'javelin-event' => '2e81a7e8',
'javelin-fx' => '15ced26b', 'javelin-fx' => '2e81a7e8',
'javelin-install' => '15ced26b', 'javelin-install' => '2e81a7e8',
'javelin-json' => '15ced26b', 'javelin-json' => '2e81a7e8',
'javelin-mask' => '15ced26b', 'javelin-mask' => '2e81a7e8',
'javelin-request' => '15ced26b', 'javelin-request' => '2e81a7e8',
'javelin-resource' => '15ced26b', 'javelin-resource' => '2e81a7e8',
'javelin-stratcom' => '15ced26b', 'javelin-stratcom' => '2e81a7e8',
'javelin-tokenizer' => '15ced26b', 'javelin-tokenizer' => '2e81a7e8',
'javelin-typeahead' => '15ced26b', 'javelin-typeahead' => '2e81a7e8',
'javelin-typeahead-normalizer' => '15ced26b', 'javelin-typeahead-normalizer' => '2e81a7e8',
'javelin-typeahead-ondemand-source' => '15ced26b', 'javelin-typeahead-ondemand-source' => '2e81a7e8',
'javelin-typeahead-preloaded-source' => '15ced26b', 'javelin-typeahead-preloaded-source' => '2e81a7e8',
'javelin-typeahead-source' => '15ced26b', 'javelin-typeahead-source' => '2e81a7e8',
'javelin-uri' => '15ced26b', 'javelin-uri' => '2e81a7e8',
'javelin-util' => '15ced26b', 'javelin-util' => '2e81a7e8',
'javelin-vector' => '15ced26b', 'javelin-vector' => '2e81a7e8',
'javelin-workflow' => '15ced26b', 'javelin-workflow' => '2e81a7e8',
'lightbox-attachment-css' => '9541e1c0', 'lightbox-attachment-css' => '9541e1c0',
'maniphest-task-summary-css' => '7839ae2d', 'maniphest-task-summary-css' => '7839ae2d',
'maniphest-transaction-detail-css' => '7839ae2d', 'maniphest-transaction-detail-css' => '7839ae2d',

View file

@ -199,6 +199,15 @@ final class CelerityStaticResourceResponse {
$this->behaviors = array(); $this->behaviors = array();
} }
$this->resolveResources();
$resources = array();
foreach ($this->packaged as $resource) {
$resources[] = PhabricatorEnv::getCDNURI($resource['uri']);
}
if ($resources) {
$response['javelin_resources'] = $resources;
}
return $response; return $response;
} }