nolanlawson
/
pinafore
forked from cybrespace/pinafore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix application name (#501) 

it should not show "Web" by default but should be absent if `application` is null
This commit is contained in:
Nolan Lawson 2018-08-26 19:46:19 -07:00 committed by GitHub
parent b60d636ee2
commit b59f544efb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
routes/_components/status/StatusDetails.html
View File

@ -6,19 +6,21 @@
> >
<time datetime={createdAtDate} title={formattedDate}>{formattedDate}</time> <time datetime={createdAtDate} title={formattedDate}>{formattedDate}</time>
</ExternalLink> </ExternalLink>
{#if applicationWebsite} {#if applicationName}
<ExternalLink className="status-application" {#if applicationWebsite}
href={applicationWebsite} <ExternalLink className="status-application"
showIcon={false} href={applicationWebsite}
ariaLabel="{applicationName} (opens in new window)"> showIcon={false}
<span class="status-application-span"> ariaLabel="{applicationName} (opens in new window)">
<span class="status-application-span">
{applicationName}
</span>
</ExternalLink>
{:else}
<span class="status-application status-application-span">
{applicationName} {applicationName}
</span> </span>
</ExternalLink> {/if}
{:else}
<span class="status-application status-application-span">
{applicationName}
</span>
{/if} {/if}
<a class="status-favs-reblogs status-reblogs" <a class="status-favs-reblogs status-reblogs"
href="/statuses/{originalStatusId}/reblogs" href="/statuses/{originalStatusId}/reblogs"
@ -136,7 +138,7 @@
store: () => store, store: () => store,
computed: { computed: {
application: ({ originalStatus }) => originalStatus.application, application: ({ originalStatus }) => originalStatus.application,
applicationName: ({ application }) => ((application && application.name) || 'Web'), applicationName: ({ application }) => (application && application.name),
applicationWebsite: ({ application }) => (application && application.website), applicationWebsite: ({ application }) => (application && application.website),
createdAtDate: ({ originalStatus }) => originalStatus.created_at, createdAtDate: ({ originalStatus }) => originalStatus.created_at,
numReblogs: ({ originalStatus }) => originalStatus.reblogs_count || 0, numReblogs: ({ originalStatus }) => originalStatus.reblogs_count || 0,