Page MenuHomePhabricator

D9421.id.diff
No OneTemporary

D9421.id.diff

diff --git a/src/infrastructure/celerity/CelerityStaticResourceResponse.php b/src/infrastructure/celerity/CelerityStaticResourceResponse.php
--- a/src/infrastructure/celerity/CelerityStaticResourceResponse.php
+++ b/src/infrastructure/celerity/CelerityStaticResourceResponse.php
@@ -281,7 +281,7 @@
return $response;
}
- private function getURI(
+ public function getURI(
CelerityResourceMap $map,
$name) {
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -356,6 +356,8 @@
parent::getTail(),
);
+ $response = CelerityAPI::getStaticResourceResponse();
+
if (PhabricatorEnv::getEnvConfig('notification.enabled')) {
if ($user && $user->isLoggedIn()) {
@@ -370,6 +372,9 @@
$client_uri->setDomain($this_host->getDomain());
}
+ $map = CelerityResourceMap::getNamedInstance('phabricator');
+ $swf_uri = $response->getURI($map, 'rsrc/swf/aphlict.swf');
+
$enable_debug = PhabricatorEnv::getEnvConfig('notification.debug');
Javelin::initBehavior(
'aphlict-listen',
@@ -379,6 +384,7 @@
'server' => $client_uri->getDomain(),
'port' => $client_uri->getPort(),
'debug' => $enable_debug,
+ 'swfURI' => $swf_uri,
'pageObjects' => array_fill_keys($this->pageObjects, true),
));
@@ -393,7 +399,6 @@
}
}
- $response = CelerityAPI::getStaticResourceResponse();
$tail[] = $response->renderHTMLFooter();
return $tail;
diff --git a/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js b/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
--- a/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
+++ b/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
@@ -99,10 +99,10 @@
// Add Flash object to page
JX.$(config.containerID).innerHTML =
'<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000">' +
- '<param name="movie" value="/rsrc/swf/aphlict.swf" />' +
+ '<param name="movie" value="' + config.swfURI + '" />' +
'<param name="allowScriptAccess" value="always" />' +
'<param name="wmode" value="opaque" />' +
- '<embed src="/rsrc/swf/aphlict.swf" wmode="opaque"' +
+ '<embed src="' + config.swfURI + '" wmode="opaque"' +
'width="0" height="0" id="' + config.id + '">' +
'</embed></object>'; //Evan sanctioned
});

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 4:17 PM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7332727
Default Alt Text
D9421.id.diff (2 KB)

Event Timeline