Page MenuHomePhabricator
Files F15434063

D16957.diff
No OneTemporary
Actions

D16957.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@
'conpherence.pkg.css' => '0b64e988',
'conpherence.pkg.js' => '6249a1cf',
'core.pkg.css' => '4107e0f7',
- 'core.pkg.js' => '11c6a1ec',
+ 'core.pkg.js' => '1602cd3d',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => 'a4ba74b5',
'differential.pkg.js' => '634399e9',
@@ -505,7 +505,7 @@
'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64',
'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
'rsrc/js/core/behavior-keyboard-shortcuts.js' => '01fca1f0',
- 'rsrc/js/core/behavior-lightbox-attachments.js' => '0b4ac79f',
+ 'rsrc/js/core/behavior-lightbox-attachments.js' => 'e62f3c48',
'rsrc/js/core/behavior-line-linker.js' => '1499a8cb',
'rsrc/js/core/behavior-more.js' => 'a80d0378',
'rsrc/js/core/behavior-object-selector.js' => 'e0ec7f2f',
@@ -651,7 +651,7 @@
'javelin-behavior-history-install' => '7ee2b591',
'javelin-behavior-icon-composer' => '8499b6ab',
'javelin-behavior-launch-icon-composer' => '48086888',
- 'javelin-behavior-lightbox-attachments' => '0b4ac79f',
+ 'javelin-behavior-lightbox-attachments' => 'e62f3c48',
'javelin-behavior-line-chart' => 'e4232876',
'javelin-behavior-load-blame' => '42126667',
'javelin-behavior-maniphest-batch-editor' => '782ab6e7',
@@ -991,15 +991,6 @@
'javelin-dom',
'javelin-router',
),
- '0b4ac79f' => array(
- 'javelin-behavior',
- 'javelin-stratcom',
- 'javelin-dom',
- 'javelin-mask',
- 'javelin-util',
- 'phuix-icon-view',
- 'phabricator-busy',
- ),
'0f764c35' => array(
'javelin-install',
'javelin-util',
@@ -2129,6 +2120,15 @@
'javelin-workflow',
'javelin-magical-init',
),
+ 'e62f3c48' => array(
+ 'javelin-behavior',
+ 'javelin-stratcom',
+ 'javelin-dom',
+ 'javelin-mask',
+ 'javelin-util',
+ 'phuix-icon-view',
+ 'phabricator-busy',
+ ),
'e9581f08' => array(
'javelin-behavior',
'javelin-stratcom',
diff --git a/src/view/layout/PhabricatorFileLinkView.php b/src/view/layout/PhabricatorFileLinkView.php
--- a/src/view/layout/PhabricatorFileLinkView.php
+++ b/src/view/layout/PhabricatorFileLinkView.php
@@ -83,6 +83,10 @@
return $this->fileSize;
}
+ private function getFileIcon() {
+ return FileTypeIcon::getFileIcon($this->getFileName());
+ }
+
public function getMetadata() {
return array(
'phid' => $this->getFilePHID(),
@@ -91,6 +95,8 @@
'dUri' => $this->getFileDownloadURI(),
'name' => $this->getFileName(),
'monogram' => $this->getFileMonogram(),
+ 'icon' => $this->getFileIcon(),
+ 'size' => $this->getFileSize(),
);
}
@@ -107,11 +113,8 @@
$class = $this->getCustomClass();
}
- $filename = $this->getFileName();
- $type_icon = FileTypeIcon::getFileIcon($filename);
-
$icon = id(new PHUIIconView())
- ->setIcon($type_icon);
+ ->setIcon($this->getFileIcon());
$info = phutil_tag(
'span',
@@ -125,7 +128,7 @@
array(
'class' => 'phabricator-remarkup-embed-layout-name',
),
- $filename);
+ $this->getFileName());
$inner = phutil_tag(
'span',
diff --git a/webroot/rsrc/js/core/behavior-lightbox-attachments.js b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
--- a/webroot/rsrc/js/core/behavior-lightbox-attachments.js
+++ b/webroot/rsrc/js/core/behavior-lightbox-attachments.js
@@ -99,7 +99,7 @@
);
} else {
var imgIcon = new JX.PHUIXIconView()
- .setIcon('fa-file-text-o phui-lightbox-file-icon')
+ .setIcon(target_data.icon + ' phui-lightbox-file-icon')
.getNode();
var nameElement =
JX.$N('div',

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 26, 1:47 AM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7321656
Default Alt Text
D16957.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility