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

Add support for ".woff2" resources

Summary: Ref T7210. Not sure if this fixes things, but it's definitely //an// issue.

Test Plan:
  - Not able to reproduce issue locally yet.
  - These get into the map now, at least?
  - Saw `.woff2` URIs transform in CSS.
  - Loaded a `.woff2` file.

Reviewers: btrahan, chad

Reviewed By: chad

Subscribers: epriestley

Maniphest Tasks: T7210

Differential Revision: https://secure.phabricator.com/D11720
This commit is contained in:
epriestley 2015-02-09 08:12:47 -08:00
parent 74b860519d
commit e7c2754b69
3 changed files with 13 additions and 6 deletions

View file

@ -7,7 +7,7 @@
*/ */
return array( return array(
'names' => array( 'names' => array(
'core.pkg.css' => 'e09f7a8c', 'core.pkg.css' => 'e5d56a4a',
'core.pkg.js' => '65e04767', 'core.pkg.js' => '65e04767',
'darkconsole.pkg.js' => '8ab24e01', 'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '8af45893', 'differential.pkg.css' => '8af45893',
@ -109,8 +109,8 @@ return array(
'rsrc/css/core/syntax.css' => '56c1ba38', 'rsrc/css/core/syntax.css' => '56c1ba38',
'rsrc/css/core/z-index.css' => '40eb7003', 'rsrc/css/core/z-index.css' => '40eb7003',
'rsrc/css/diviner/diviner-shared.css' => '38813222', 'rsrc/css/diviner/diviner-shared.css' => '38813222',
'rsrc/css/font/font-awesome.css' => '21b0ced7', 'rsrc/css/font/font-awesome.css' => 'ae9a7b4d',
'rsrc/css/font/font-source-sans-pro.css' => 'f5c0ffcb', 'rsrc/css/font/font-source-sans-pro.css' => '0d859f60',
'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3', 'rsrc/css/font/phui-font-icon-base.css' => '3dad2ae3',
'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82', 'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
'rsrc/css/layout/phabricator-hovercard-view.css' => '893f4783', 'rsrc/css/layout/phabricator-hovercard-view.css' => '893f4783',
@ -158,8 +158,13 @@ return array(
'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '5fb6fb0e', 'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '5fb6fb0e',
'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => 'a653cb11', 'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => 'a653cb11',
'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => '80526fc8', 'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => '80526fc8',
'rsrc/externals/font/fontawesome/fontawesome-webfont.woff2' => '4924d54d',
'rsrc/externals/font/sourcesans/SourceSansPro-Bold.woff2' => '165f5f74',
'rsrc/externals/font/sourcesans/SourceSansPro-BoldIt.woff' => 'd09a7d54', 'rsrc/externals/font/sourcesans/SourceSansPro-BoldIt.woff' => 'd09a7d54',
'rsrc/externals/font/sourcesans/SourceSansPro-BoldIt.woff2' => 'd2e33102',
'rsrc/externals/font/sourcesans/SourceSansPro-It.woff' => '3f21af52', 'rsrc/externals/font/sourcesans/SourceSansPro-It.woff' => '3f21af52',
'rsrc/externals/font/sourcesans/SourceSansPro-It.woff2' => '30a7cf60',
'rsrc/externals/font/sourcesans/SourceSansPro-Regular.woff2' => 'e89b04b1',
'rsrc/externals/font/sourcesans/SourceSansPro.woff' => '3614608c', 'rsrc/externals/font/sourcesans/SourceSansPro.woff' => '3614608c',
'rsrc/externals/font/sourcesans/SourceSansProBold.woff' => 'cbf46566', 'rsrc/externals/font/sourcesans/SourceSansProBold.woff' => 'cbf46566',
'rsrc/externals/javelin/core/Event.js' => '85ea0626', 'rsrc/externals/javelin/core/Event.js' => '85ea0626',
@ -527,8 +532,8 @@ return array(
'diffusion-icons-css' => '9c5828da', 'diffusion-icons-css' => '9c5828da',
'diffusion-source-css' => '66fdf661', 'diffusion-source-css' => '66fdf661',
'diviner-shared-css' => '38813222', 'diviner-shared-css' => '38813222',
'font-fontawesome' => '21b0ced7', 'font-fontawesome' => 'ae9a7b4d',
'font-source-sans-pro' => 'f5c0ffcb', 'font-source-sans-pro' => '0d859f60',
'global-drag-and-drop-css' => '697324ad', 'global-drag-and-drop-css' => '697324ad',
'harbormaster-css' => '49d64eb4', 'harbormaster-css' => '49d64eb4',
'herald-css' => '826075fa', 'herald-css' => '826075fa',

View file

@ -98,7 +98,7 @@ abstract class CelerityResourceController extends PhabricatorController {
// NOTE: This is a piece of magic required to make WOFF fonts work in // NOTE: This is a piece of magic required to make WOFF fonts work in
// Firefox. Possibly we should generalize this. // Firefox. Possibly we should generalize this.
if ($type == 'woff') { if ($type == 'woff' || $type == 'woff2') {
// We could be more tailored here, but it's not currently trivial to // We could be more tailored here, but it's not currently trivial to
// generate a comprehensive list of valid origins (an install may have // generate a comprehensive list of valid origins (an install may have
// arbitrarily many Phame blogs, for example), and we lose nothing by // arbitrarily many Phame blogs, for example), and we lose nothing by
@ -118,6 +118,7 @@ abstract class CelerityResourceController extends PhabricatorController {
'jpg' => 'image/jpeg', 'jpg' => 'image/jpeg',
'swf' => 'application/x-shockwave-flash', 'swf' => 'application/x-shockwave-flash',
'woff' => 'font/woff', 'woff' => 'font/woff',
'woff2' => 'font/woff2',
'eot' => 'font/eot', 'eot' => 'font/eot',
'ttf' => 'font/ttf', 'ttf' => 'font/ttf',
); );

View file

@ -34,6 +34,7 @@ abstract class CelerityResourcesOnDisk extends CelerityPhysicalResources {
'gif', 'gif',
'swf', 'swf',
'woff', 'woff',
'woff2',
'ttf', 'ttf',
'eot', 'eot',
); );