js: migrate dropzone to yarn.
Also fixes a bug where sometimes the dropzone widget didn't work because of late loading caused by the `<script async>` tag.
This commit is contained in:
@@ -7,6 +7,8 @@ function importAll(r) {
|
||||
|
||||
require('jquery-ujs');
|
||||
require('hammerjs');
|
||||
require('dropzone');
|
||||
require('spark-md5');
|
||||
|
||||
// should start looking for nodejs replacements
|
||||
importAll(require.context('../vendor', true, /\.js$/));
|
||||
@@ -43,3 +45,5 @@ export { default as Shortcuts } from '../src/javascripts/shortcuts.js';
|
||||
export { default as Upload } from '../src/javascripts/uploads.js';
|
||||
export { default as Utility } from '../src/javascripts/utility.js';
|
||||
export { default as Ugoira } from '../src/javascripts/ugoira.js';
|
||||
export { default as Dropzone } from 'dropzone';
|
||||
export { default as SparkMD5 } from 'spark-md5';
|
||||
|
||||
@@ -124,8 +124,6 @@
|
||||
<% end %>
|
||||
|
||||
<% content_for(:html_header) do %>
|
||||
<script async src="https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.4.0/min/dropzone.min.js"></script>
|
||||
<script async src="https://cdnjs.cloudflare.com/ajax/libs/spark-md5/3.0.0/spark-md5.min.js"></script>
|
||||
<script>
|
||||
$(function() {
|
||||
var enabled = true;
|
||||
@@ -140,7 +138,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
$("#filedropzone").dropzone({
|
||||
Danbooru.Upload.dropzone = new Danbooru.Dropzone("#filedropzone", {
|
||||
paramName: "upload[file]",
|
||||
url: "/uploads/preprocess",
|
||||
createImageThumbnails: false,
|
||||
@@ -161,7 +159,7 @@
|
||||
this.on("addedfile", function(file) {
|
||||
var reader = new FileReader();
|
||||
reader.addEventListener("loadend", function() {
|
||||
var buf = new SparkMD5.ArrayBuffer();
|
||||
var buf = new Danbooru.SparkMD5.ArrayBuffer();
|
||||
buf.append(this.result);
|
||||
var hash = buf.end();
|
||||
$("#upload_md5_confirmation").val(hash);
|
||||
|
||||
Reference in New Issue
Block a user