diff options
author | silverwind <me@silverwind.io> | 2020-12-27 15:24:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-27 15:24:27 +0100 |
commit | 50a2dd52baed6a998cca332761c3e9eccf0157a9 (patch) | |
tree | 4c5a2ca412a208ba510bcbff14ce2731c79dbb2e /web_src/js/index.js | |
parent | fe403725f45e4515ce89d6a4dfd01e9698d38ad9 (diff) | |
download | gitea-50a2dd52baed6a998cca332761c3e9eccf0157a9.tar.gz gitea-50a2dd52baed6a998cca332761c3e9eccf0157a9.zip |
Update JS dependencies and webpack (#14118)
* Update JS dependencies
- Update all JS dependencies
- Adapt webpack config for version 5
- Update to Less 4.0, adapting usage of removed mixin syntax
- Enable new ESLint rules and fix discovered issues
* update license-webpack-plugin to fix missing licenses
* update license-webpack-plugin once more to get webpack into the license output
* switch to license-checker-webpack-plugin again for performance
* update deps again
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'web_src/js/index.js')
-rw-r--r-- | web_src/js/index.js | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/web_src/js/index.js b/web_src/js/index.js index 471adfa425..c3a70d756f 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -204,24 +204,22 @@ function initRepoStatusChecker() { _csrf: csrf, }, complete(xhr) { - if (xhr.status === 200) { - if (xhr.responseJSON) { - if (xhr.responseJSON.status === 4) { - window.location.reload(); - return; - } else if (xhr.responseJSON.status === 3) { - $('#repo_migrating_progress').hide(); - $('#repo_migrating').hide(); - $('#repo_migrating_failed').show(); - $('#repo_migrating_failed_image').show(); - $('#repo_migrating_failed_error').text(xhr.responseJSON.err); - return; - } - setTimeout(() => { - initRepoStatusChecker(); - }, 2000); + if (xhr.status === 200 && xhr.responseJSON) { + if (xhr.responseJSON.status === 4) { + window.location.reload(); + return; + } else if (xhr.responseJSON.status === 3) { + $('#repo_migrating_progress').hide(); + $('#repo_migrating').hide(); + $('#repo_migrating_failed').show(); + $('#repo_migrating_failed_image').show(); + $('#repo_migrating_failed_error').text(xhr.responseJSON.err); return; } + setTimeout(() => { + initRepoStatusChecker(); + }, 2000); + return; } $('#repo_migrating_progress').hide(); $('#repo_migrating').hide(); @@ -1625,16 +1623,12 @@ async function initEditor() { let value; let parts; - if (e.keyCode === 8) { - if ($(this).getCursorPosition() === 0) { - if ($section.length > 0) { - value = $section.last().find('a').text(); - $(this).val(value + $(this).val()); - $(this)[0].setSelectionRange(value.length, value.length); - $section.last().remove(); - $divider.last().remove(); - } - } + if (e.keyCode === 8 && $(this).getCursorPosition() === 0 && $section.length > 0) { + value = $section.last().find('a').text(); + $(this).val(value + $(this).val()); + $(this)[0].setSelectionRange(value.length, value.length); + $section.last().remove(); + $divider.last().remove(); } if (e.keyCode === 191) { parts = $(this).val().split('/'); |