don't close preview on post, move visibility notices above the preview where they belong
This commit is contained in:
parent
7bdc3d6ce9
commit
ada5a3806b
2 changed files with 39 additions and 39 deletions
|
@ -227,7 +227,7 @@ const PostStatusForm = {
|
||||||
el.style.height = 'auto'
|
el.style.height = 'auto'
|
||||||
el.style.height = undefined
|
el.style.height = undefined
|
||||||
this.error = null
|
this.error = null
|
||||||
this.closePreview()
|
this.previewStatus()
|
||||||
} else {
|
} else {
|
||||||
this.error = data.error
|
this.error = data.error
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,44 +16,6 @@
|
||||||
@drop.stop="fileDrop"
|
@drop.stop="fileDrop"
|
||||||
/>
|
/>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="preview-heading faint">
|
|
||||||
<a
|
|
||||||
class="preview-toggle faint"
|
|
||||||
@click.stop.prevent="togglePreview"
|
|
||||||
>
|
|
||||||
{{ $t('post_status.preview') }}
|
|
||||||
<i
|
|
||||||
class="icon-down-open"
|
|
||||||
:style="{ transform: showPreview ? 'rotate(0deg)' : 'rotate(-90deg)' }"
|
|
||||||
/>
|
|
||||||
</a>
|
|
||||||
<i
|
|
||||||
v-show="previewLoading"
|
|
||||||
class="icon-spin3 animate-spin"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="showPreview"
|
|
||||||
class="preview-container"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
v-if="!preview"
|
|
||||||
class="preview-status"
|
|
||||||
>
|
|
||||||
{{ $t('general.loading') }}
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-else-if="preview.error"
|
|
||||||
class="preview-status preview-error"
|
|
||||||
>
|
|
||||||
{{ preview.error }}
|
|
||||||
</div>
|
|
||||||
<StatusContent
|
|
||||||
v-else
|
|
||||||
:status="preview"
|
|
||||||
class="preview-status"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<i18n
|
<i18n
|
||||||
v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private'"
|
v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private'"
|
||||||
path="post_status.account_not_locked_warning"
|
path="post_status.account_not_locked_warning"
|
||||||
|
@ -107,6 +69,44 @@
|
||||||
<span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span>
|
<span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span>
|
||||||
<span v-else>{{ $t('post_status.direct_warning_to_all') }}</span>
|
<span v-else>{{ $t('post_status.direct_warning_to_all') }}</span>
|
||||||
</p>
|
</p>
|
||||||
|
<div class="preview-heading faint">
|
||||||
|
<a
|
||||||
|
class="preview-toggle faint"
|
||||||
|
@click.stop.prevent="togglePreview"
|
||||||
|
>
|
||||||
|
{{ $t('post_status.preview') }}
|
||||||
|
<i
|
||||||
|
class="icon-down-open"
|
||||||
|
:style="{ transform: showPreview ? 'rotate(0deg)' : 'rotate(-90deg)' }"
|
||||||
|
/>
|
||||||
|
</a>
|
||||||
|
<i
|
||||||
|
v-show="previewLoading"
|
||||||
|
class="icon-spin3 animate-spin"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="showPreview"
|
||||||
|
class="preview-container"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-if="!preview"
|
||||||
|
class="preview-status"
|
||||||
|
>
|
||||||
|
{{ $t('general.loading') }}
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-else-if="preview.error"
|
||||||
|
class="preview-status preview-error"
|
||||||
|
>
|
||||||
|
{{ preview.error }}
|
||||||
|
</div>
|
||||||
|
<StatusContent
|
||||||
|
v-else
|
||||||
|
:status="preview"
|
||||||
|
class="preview-status"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<EmojiInput
|
<EmojiInput
|
||||||
v-if="newStatus.spoilerText || alwaysShowSubject"
|
v-if="newStatus.spoilerText || alwaysShowSubject"
|
||||||
v-model="newStatus.spoilerText"
|
v-model="newStatus.spoilerText"
|
||||||
|
|
Loading…
Reference in a new issue