diff --git a/app/javascript/src/javascripts/uploader.js b/app/javascript/src/javascripts/uploader.js
index 75e6c7717..07c627877 100644
--- a/app/javascript/src/javascripts/uploader.js
+++ b/app/javascript/src/javascripts/uploader.js
@@ -1,4 +1,4 @@
-import Uploader from './uploader/uploader.vue';
+import Uploader from './uploader/uploader.vue.erb';
import { createApp } from 'vue';
export default {
diff --git a/app/javascript/src/javascripts/uploader/uploader.vue b/app/javascript/src/javascripts/uploader/uploader.vue.erb
similarity index 98%
rename from app/javascript/src/javascripts/uploader/uploader.vue
rename to app/javascript/src/javascripts/uploader/uploader.vue.erb
index 061d0dffd..6b40327a6 100644
--- a/app/javascript/src/javascripts/uploader/uploader.vue
+++ b/app/javascript/src/javascripts/uploader/uploader.vue.erb
@@ -203,7 +203,7 @@
-
+ <%= ApplicationController.new.render_to_string(partial: "dtext_input", locals: { limit: Danbooru.config.post_descr_max_size, textarea: ''.html_safe }) %>
@@ -371,8 +371,6 @@
rating: '',
error: '',
duplicateId: 0,
-
- descrLimit: window.uploaderSettings.descrLimit,
};
},
mounted() {
diff --git a/app/views/application/_dtext_input.html.erb b/app/views/application/_dtext_input.html.erb
index 0e9b522ae..fc8ad9cf5 100644
--- a/app/views/application/_dtext_input.html.erb
+++ b/app/views/application/_dtext_input.html.erb
@@ -16,6 +16,6 @@
<%= textarea %>
-
+ <%= tag.div(class: "dtext-formatter-charcount", data: { limit: limit, count: 0 }) %>
-All text is formatted using <%= link_to "DText", help_page_path(id: "dtext"), target: "_blank", rel: "noopener", tabindex: "-1" %>
+All text is formatted using DText
diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb
index 4b212adba..28387e082 100644
--- a/app/views/uploads/new.html.erb
+++ b/app/views/uploads/new.html.erb
@@ -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();
diff --git a/config/webpack/loaders/vue.js b/config/webpack/loaders/vue.js
index 91ad4f7f9..e8a8cf7d9 100644
--- a/config/webpack/loaders/vue.js
+++ b/config/webpack/loaders/vue.js
@@ -6,7 +6,7 @@ module.exports = {
module: {
rules: [
{
- test: /\.vue$/,
+ test: /\.vue|\.vue\.erb$/,
loader: 'vue-loader',
options: {
compilerOptions: {