jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

js: remove jquery-ui effect-shake plugin.

Browse Source
This commit is contained in:
evazion
2021-01-29 15:06:35 -06:00
parent d0c9f6e0b8
commit 151a9b026e
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/javascript/packs/application.js
View File

@@ -11,7 +11,6 @@ require('jquery-hotkeys');
importAll(require.context('../vendor', true, /\.js$/)); importAll(require.context('../vendor', true, /\.js$/));
require('jquery'); require('jquery');
require("jquery-ui/ui/effects/effect-shake");
require("jquery-ui/ui/widgets/autocomplete"); require("jquery-ui/ui/widgets/autocomplete");
require("jquery-ui/ui/widgets/button"); require("jquery-ui/ui/widgets/button");
require("jquery-ui/ui/widgets/dialog"); require("jquery-ui/ui/widgets/dialog");

4
app/javascript/src/javascripts/artist_commentaries.js
View File

@@ -135,11 +135,13 @@ ArtistCommentary.merge_commentaries = function(description, commentary) {
// Update commentary field if it's blank, signal an error if there's a conflict. // Update commentary field if it's blank, signal an error if there's a conflict.
ArtistCommentary.update_field = function($field, value) { ArtistCommentary.update_field = function($field, value) {
$field.removeClass("validation-error");
if ($field.val().trim() === "") { if ($field.val().trim() === "") {
$field.val(value); $field.val(value);
return true; return true;
} else if ($field.val().trim() !== value) { } else if ($field.val().trim() !== value) {
$field.effect("shake", { direction: "up", distance: 5 }); $field.addClass("validation-error");
return false; return false;
} else { } else {
return true; return true;

2
app/javascript/src/styles/base/040_colors.css
View File

@@ -24,6 +24,7 @@
--form-input-background: var(--body-background-color); --form-input-background: var(--body-background-color);
--form-input-border: 1px solid #CCC; --form-input-border: 1px solid #CCC;
--form-input-placeholder-text-color: grey; --form-input-placeholder-text-color: grey;
--form-input-validation-error-border-color: red;
--form-button-text-color: var(--form-input-text-color); --form-button-text-color: var(--form-input-text-color);
--form-button-background: #EEE; --form-button-background: #EEE;
--form-button-border: var(--form-input-border); --form-button-border: var(--form-input-border);
@@ -329,6 +330,7 @@ body[data-current-user-theme="dark"] {
--form-input-background: var(--grey-3); --form-input-background: var(--grey-3);
--form-input-border: 1px solid var(--grey-4); --form-input-border: 1px solid var(--grey-4);
--form-input-placeholder-text-color: var(--grey-4); --form-input-placeholder-text-color: var(--grey-4);
--form-input-validation-error-border-color: var(--red-1);
--form-button-text-color: var(--grey-1); --form-button-text-color: var(--grey-1);
--form-button-background: var(--grey-5); --form-button-background: var(--grey-5);
--form-button-border: 1px solid var(--grey-4); --form-button-border: 1px solid var(--grey-4);

4
app/javascript/src/styles/common/simple_form.scss
View File

@@ -39,6 +39,10 @@ form.simple_form {
padding-left: 1em; padding-left: 1em;
} }
input.validation-error {
border: 1px solid var(--form-input-validation-error-border-color);
}
&.text, &.dtext { &.text, &.dtext {
.hint { .hint {
padding-left: 0; padding-left: 0;