edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

[Uploader] Fix description not having formatting buttons

Browse Source 
I forgot that the uploader uses this. Not the best fix by any strech of
the imagination but it works. Need to get back to this later.
This commit is contained in:
Earlopain 2023-08-17 16:35:38 +02:00
parent 3aecc36b3e
commit e7b8517e92
No known key found for this signature in database
GPG Key ID: 48860312319ADF61
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/src/javascripts/uploader.js
View File

@ -1,4 +1,4 @@
import Uploader from './uploader/uploader.vue';
import Uploader from './uploader/uploader.vue.erb';
import { createApp } from 'vue';
export default {

4
app/javascript/src/javascripts/uploader/uploader.vue → app/javascript/src/javascripts/uploader/uploader.vue.erb
View File

@ -203,7 +203,7 @@
<label class="section-label" for="post_description">Description</label>
</div>
<div class="col2">
<textarea class="tag-textarea dtext" id="post_description" v-model="description" rows="10" :data-limit="descrLimit" data-initialized="false"></textarea>
<%= ApplicationController.new.render_to_string(partial: "dtext_input", locals: { limit: Danbooru.config.post_descr_max_size, textarea: '<textarea class="dtext-formatter-input tag-textarea dtext" id="post_description" rows="10" v-model="description"></textarea>'.html_safe }) %>
</div>
</div>
<div v-if="allowUploadAsPending" class="flex-grid border-bottom">
@ -371,8 +371,6 @@
rating: '',
error: '',
duplicateId: 0,
descrLimit: window.uploaderSettings.descrLimit,
};
},
mounted() {

4
app/views/application/_dtext_input.html.erb
View File

@ -16,6 +16,6 @@
</div>
<%= textarea %>
<div class="dtext-formatter-preview dtext-container"></div>
<div class="dtext-formatter-charcount" data-limit="50000" data-count="0"></div>
<%= tag.div(class: "dtext-formatter-charcount", data: { limit: limit, count: 0 }) %>
</div>
<span class="hint">All text is formatted using <%= link_to "DText", help_page_path(id: "dtext"), target: "_blank", rel: "noopener", tabindex: "-1" %></span>
<span class="hint">All text is formatted using <a href="/help/dtext" target="_blank" rel="noopener" tabindex="-1">DText</a></span>

1
app/views/uploads/new.html.erb
View File

@ -41,7 +41,6 @@
allowLockedTags: <%= CurrentUser.is_admin?.to_json %>,
allowRatingLock: <%= CurrentUser.is_privileged?.to_json %>,
allowUploadAsPending: <%= CurrentUser.can_upload_free?.to_json %>,
descrLimit: <%= Danbooru.config.post_descr_max_size %>,
maxFileSize: <%= Danbooru.config.max_file_size %>,
};
Danbooru.Uploader.init();

2
config/webpack/loaders/vue.js
View File

@ -6,7 +6,7 @@ module.exports = {
module: {
rules: [
{
test: /\.vue$/,
test: /\.vue|\.vue\.erb$/,
loader: 'vue-loader',
options: {
compilerOptions: {