From 38f385d1ca93dba6d7de9f228f61c1f9a1eb4c27 Mon Sep 17 00:00:00 2001 From: evazion Date: Tue, 9 Jun 2020 01:28:11 -0500 Subject: [PATCH] js, css: fix eslint and stylelint warnings. --- app/javascript/src/javascripts/posts.js.erb | 6 +++--- app/javascript/src/javascripts/uploads.js.erb | 4 ++-- app/javascript/src/styles/base/000_vars.scss | 2 ++ app/javascript/src/styles/common/versions.scss | 2 +- app/javascript/src/styles/specific/dropzone.scss | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/javascript/src/javascripts/posts.js.erb b/app/javascript/src/javascripts/posts.js.erb index b7dd3e6b0..cdf7b9aaf 100644 --- a/app/javascript/src/javascripts/posts.js.erb +++ b/app/javascript/src/javascripts/posts.js.erb @@ -303,7 +303,7 @@ Post.initialize_favlist = function() { Post.view_original = function(e) { if (Utility.test_max_width(660)) { // Do the default behavior (navigate to image) - return; + return false; } var $image = $("#image"); @@ -322,7 +322,7 @@ Post.view_original = function(e) { Post.view_large = function(e) { if (Utility.test_max_width(660)) { // Do the default behavior (navigate to image) - return; + return false; } var $image = $("#image"); @@ -458,7 +458,7 @@ Post.update = async function(post_id, mode, params) { Post.pending_update_count -= 1; Post.show_pending_update_notice(); - } catch(err) { + } catch (err) { Post.pending_update_count -= 1; } } diff --git a/app/javascript/src/javascripts/uploads.js.erb b/app/javascript/src/javascripts/uploads.js.erb index c445ffe0f..800090537 100644 --- a/app/javascript/src/javascripts/uploads.js.erb +++ b/app/javascript/src/javascripts/uploads.js.erb @@ -1,4 +1,3 @@ -import Post from './posts.js.erb' import Shortcuts from './shortcuts.js'; import Utility from './utility.js'; import Dropzone from 'dropzone'; @@ -6,7 +5,8 @@ import SparkMD5 from 'spark-md5'; let Upload = {}; -Upload.MAX_FILE_SIZE = <%= Danbooru.config.max_file_size.to_json %> / (1024 * 1024); +Upload.MAX_FILE_SIZE_BYTES = <%= Danbooru.config.max_file_size.to_json %>; +Upload.MAX_FILE_SIZE = Upload.MAX_FILE_SIZE_BYTES / (1024 * 1024); Upload.IQDB_LIMIT = 5; Upload.IQDB_MIN_SIMILARITY = 50; Upload.IQDB_HIGH_SIMILARITY = 70; diff --git a/app/javascript/src/styles/base/000_vars.scss b/app/javascript/src/styles/base/000_vars.scss index f1f34fde3..af4897f49 100644 --- a/app/javascript/src/styles/base/000_vars.scss +++ b/app/javascript/src/styles/base/000_vars.scss @@ -12,6 +12,8 @@ $h1_padding: 0.8em 0 0.25em 0; $h2_padding: 0.8em 0 0.25em 0; $h3_padding: 0.8em 0 0.25em 0; $h4_padding: 0.8em 0 0.25em 0; + +/* stylelint-disable-next-line value-keyword-case */ $base_font_family: Verdana, Helvetica, sans-serif; @mixin animated-icon { diff --git a/app/javascript/src/styles/common/versions.scss b/app/javascript/src/styles/common/versions.scss index 5f37cf45e..e77525b59 100644 --- a/app/javascript/src/styles/common/versions.scss +++ b/app/javascript/src/styles/common/versions.scss @@ -7,7 +7,7 @@ body.a-index { } } - div#p-revert-listing > article.post-preview { + div#p-revert-listing > article.post-preview { margin-top: 2em; } } diff --git a/app/javascript/src/styles/specific/dropzone.scss b/app/javascript/src/styles/specific/dropzone.scss index 65608fae3..1146d4082 100644 --- a/app/javascript/src/styles/specific/dropzone.scss +++ b/app/javascript/src/styles/specific/dropzone.scss @@ -20,7 +20,7 @@ object-fit: contain; } - .dz-details { + .dz-details { margin-bottom: 1em; .dz-filename, .dz-size {