fix merge conflict

This commit is contained in:
Henry Jameson 2019-07-06 23:52:10 +03:00
parent 8f53796420
commit 1ec4caa0bb
2 changed files with 142 additions and 23 deletions

View file

@ -26,8 +26,8 @@
:in-conversation="isExpanded" :in-conversation="isExpanded"
:highlight="getHighlight()" :highlight="getHighlight()"
:replies="getReplies(status.id)" :replies="getReplies(status.id)"
@goto="setHighlight"
class="status-fadein panel-body" class="status-fadein panel-body"
@goto="setHighlight"
@toggleExpanded="toggleExpanded" @toggleExpanded="toggleExpanded"
/> />
</div> </div>

View file

@ -58,30 +58,150 @@
<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>
</EmojiInput> <EmojiInput
<div class="visibility-tray"> v-if="newStatus.spoilerText || alwaysShowSubject"
<scope-selector v-model="newStatus.spoilerText"
:showAll="showAllScopes" :suggest="emojiSuggestor"
:userDefault="userDefaultScope" class="form-control"
:originalScope="copyMessageScope" >
:initialScope="newStatus.visibility" <input
:onScopeChange="changeVis"/>
<div class="text-format" v-if="postFormats.length > 1"> v-model="newStatus.spoilerText"
<label for="post-content-type" class="select"> type="text"
<select id="post-content-type" v-model="newStatus.contentType" class="form-control"> :placeholder="$t('post_status.content_warning')"
<option v-for="postFormat in postFormats" :key="postFormat" :value="postFormat"> class="form-post-subject"
{{$t(`post_status.content_type["${postFormat}"]`)}} >
</option> </EmojiInput>
</select> <EmojiInput
<i class="icon-down-open"></i> v-model="newStatus.status"
</label> :suggest="emojiUserSuggestor"
class="form-control main-input"
>
<textarea
ref="textarea"
v-model="newStatus.status"
:placeholder="$t('post_status.default')"
rows="1"
:disabled="posting"
class="form-post-body"
@keydown.meta.enter="postStatus(newStatus)"
@keyup.ctrl.enter="postStatus(newStatus)"
@drop="fileDrop"
@dragover.prevent="fileDrag"
@input="resize"
@paste="paste"
/>
<p
v-if="hasStatusLengthLimit"
class="character-counter faint"
:class="{ error: isOverLengthLimit }"
>
{{ charactersLeft }}
</p>
</EmojiInput>
<div class="visibility-tray">
<scope-selector
:show-all="showAllScopes"
:user-default="userDefaultScope"
:original-scope="copyMessageScope"
:initial-scope="newStatus.visibility"
:on-scope-change="changeVis"
/>
<div
v-if="postFormats.length > 1"
class="text-format"
>
<label
for="post-content-type"
class="select"
>
<select
id="post-content-type"
v-model="newStatus.contentType"
class="form-control"
>
<option
v-for="postFormat in postFormats"
:key="postFormat"
:value="postFormat"
>
{{ $t(`post_status.content_type["${postFormat}"]`) }}
</option>
</select>
<i class="icon-down-open" />
</label>
</div>
<div
v-if="postFormats.length === 1 && postFormats[0] !== 'text/plain'"
class="text-format"
>
<span class="only-format">
{{ $t(`post_status.content_type["${postFormats[0]}"]`) }}
</span>
</div>
</div> </div>
<div class="text-format" v-if="postFormats.length === 1 && postFormats[0] !== 'text/plain'"> </div>
<span class="only-format"> <poll-form
{{$t(`post_status.content_type["${postFormats[0]}"]`)}} v-if="pollsAvailable"
</span> ref="pollForm"
:visible="pollFormVisible"
@update-poll="setPoll"
/>
<div class="form-bottom">
<div class="form-bottom-left">
<media-upload
ref="mediaUpload"
:drop-files="dropFiles"
@uploading="disableSubmit"
@uploaded="addMediaFile"
@upload-failed="uploadFailed"
/>
<div
v-if="pollsAvailable"
class="poll-icon"
>
<i
:title="$t('polls.add_poll')"
class="icon-chart-bar btn btn-default"
:class="pollFormVisible && 'selected'"
@click="togglePollForm"
/>
</div>
</div> </div>
<button
v-if="posting"
disabled
class="btn btn-default"
>
{{ $t('post_status.posting') }}
</button>
<button
v-else-if="isOverLengthLimit"
disabled
class="btn btn-default"
>
{{ $t('general.submit') }}
</button>
<button
v-else
:disabled="submitDisabled"
type="submit"
class="btn btn-default"
>
{{ $t('general.submit') }}
</button>
</div>
<div
v-if="error"
class="alert error"
>
Error: {{ error }}
<i
class="button-icon icon-cancel"
@click="clearError"
/>
</div> </div>
<div class="attachments"> <div class="attachments">
<div <div
@ -203,7 +323,6 @@
cursor: pointer; cursor: pointer;
} }
.error { .error {
text-align: center; text-align: center;
} }