From db47712eb128858d57afbf5fd715c6272b8f5820 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 26 Aug 2023 13:48:35 +0200 Subject: [PATCH] Replace jquery.are-you-sure with @github/session-resume --- package-lock.json | 18 ++++++------------ package.json | 2 +- templates/admin/base/search.tmpl | 2 +- templates/admin/config.tmpl | 2 +- templates/admin/emails/list.tmpl | 2 +- templates/admin/packages/list.tmpl | 2 +- templates/admin/repo/search.tmpl | 2 +- templates/admin/repo/unadopted.tmpl | 2 +- templates/admin/user/list.tmpl | 2 +- templates/base/disable_form_autofill.tmpl | 4 ++-- templates/code/searchform.tmpl | 2 +- templates/explore/repo_search.tmpl | 2 +- templates/explore/search.tmpl | 2 +- templates/org/settings/delete.tmpl | 2 +- templates/org/team/members.tmpl | 2 +- templates/org/team/repositories.tmpl | 2 +- templates/package/shared/list.tmpl | 2 +- templates/package/shared/versionlist.tmpl | 2 +- templates/projects/list.tmpl | 2 +- templates/repo/commits_table.tmpl | 2 +- templates/repo/home.tmpl | 2 +- .../repo/issue/labels/edit_delete_label.tmpl | 2 +- templates/repo/issue/labels/label_new.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 2 +- templates/repo/issue/new_form.tmpl | 2 +- templates/repo/issue/search.tmpl | 2 +- templates/repo/search.tmpl | 2 +- templates/repo/settings/lfs_locks.tmpl | 2 +- .../repo/settings/push_mirror_sync_modal.tmpl | 2 +- templates/shared/actions/runner_list.tmpl | 2 +- templates/shared/combomarkdowneditor.tmpl | 2 +- templates/user/auth/activate.tmpl | 2 +- templates/user/auth/forgot_passwd.tmpl | 2 +- templates/user/auth/reset_passwd.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- templates/user/settings/account.tmpl | 4 ++-- templates/user/settings/applications.tmpl | 2 +- .../applications_oauth2_edit_form.tmpl | 6 +++--- .../settings/applications_oauth2_list.tmpl | 2 +- web_src/js/features/codeeditor.js | 1 - web_src/js/features/common-global.js | 9 --------- web_src/js/index.js | 4 ++-- web_src/js/modules/formresume.js | 15 +++++++++++++++ webpack.config.js | 1 - 45 files changed, 66 insertions(+), 68 deletions(-) create mode 100644 web_src/js/modules/formresume.js diff --git a/package-lock.json b/package-lock.json index e56a49efae132..200a35ce6d8a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "@claviska/jquery-minicolors": "2.3.6", "@github/markdown-toolbar-element": "2.2.0", "@github/relative-time-element": "4.3.0", + "@github/session-resume": "0.3.1", "@github/text-expander-element": "2.5.0", "@mcaptcha/vanilla-glue": "0.1.0-alpha-3", "@primer/octicons": "19.6.0", @@ -27,7 +28,6 @@ "escape-goat": "4.0.0", "fast-glob": "3.3.1", "jquery": "3.7.0", - "jquery.are-you-sure": "1.9.0", "katex": "0.16.8", "license-checker-webpack-plugin": "0.2.1", "lightningcss-loader": "2.1.0", @@ -1015,6 +1015,11 @@ "resolved": "https://registry.npmjs.org/@github/relative-time-element/-/relative-time-element-4.3.0.tgz", "integrity": "sha512-+tFjX9//HRS1HnBa5cNgfEtE52arwiutYg1TOF+Trk40SPxst9Q8Rtc3BKD6aKsvfbtub68vfhipgchGjj9o7g==" }, + "node_modules/@github/session-resume": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@github/session-resume/-/session-resume-0.3.1.tgz", + "integrity": "sha512-v30y5fUArzMY1VwLTKEEph+jXXqH22QZ47lvsTbMtRDeCn5yBtn5UYuu3RMAbKItXI2xFsmyhX6R7+TffQNAiA==" + }, "node_modules/@github/text-expander-element": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/@github/text-expander-element/-/text-expander-element-2.5.0.tgz", @@ -6467,17 +6472,6 @@ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz", "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==" }, - "node_modules/jquery.are-you-sure": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/jquery.are-you-sure/-/jquery.are-you-sure-1.9.0.tgz", - "integrity": "sha512-2r0uFx8CyAopjeHGOdvvwpFP921TnW1+v1uJXcAWQYHYGB1tryTDhQY+5u6HsVeMwbWiRTKVZFWnLaFpDvIqZQ==", - "dependencies": { - "jquery": ">=1.4.2" - }, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/js-levenshtein-esm": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/js-levenshtein-esm/-/js-levenshtein-esm-1.2.0.tgz", diff --git a/package.json b/package.json index fd3c46c8684a4..f7c3bf22a737c 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "@claviska/jquery-minicolors": "2.3.6", "@github/markdown-toolbar-element": "2.2.0", "@github/relative-time-element": "4.3.0", + "@github/session-resume": "0.3.1", "@github/text-expander-element": "2.5.0", "@mcaptcha/vanilla-glue": "0.1.0-alpha-3", "@primer/octicons": "19.6.0", @@ -26,7 +27,6 @@ "escape-goat": "4.0.0", "fast-glob": "3.3.1", "jquery": "3.7.0", - "jquery.are-you-sure": "1.9.0", "katex": "0.16.8", "license-checker-webpack-plugin": "0.2.1", "lightningcss-loader": "2.1.0", diff --git a/templates/admin/base/search.tmpl b/templates/admin/base/search.tmpl index 19977f05a9bcc..f7e4845515b2b 100644 --- a/templates/admin/base/search.tmpl +++ b/templates/admin/base/search.tmpl @@ -1,5 +1,5 @@
-
+
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}} diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 36d9bcb8a5e2d..d251538c0ea33 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -233,7 +233,7 @@
{{.locale.Tr "admin.config.send_test_mail"}}
- + {{.CsrfTokenHtml}}
diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index 153877174bf49..f6a2ae3485598 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -5,7 +5,7 @@
- +
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}} diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 4cf30f58e68b7..c19a529c98b27 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -12,7 +12,7 @@
- +
{{template "shared/searchinput" dict "locale" .locale "Value" .Query "AutoFocus" true}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 45fed87a40013..cd2e31272b09b 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -7,7 +7,7 @@
- +
diff --git a/templates/base/disable_form_autofill.tmpl b/templates/base/disable_form_autofill.tmpl index 6f06395bedb37..54c1df3bf3ace 100644 --- a/templates/base/disable_form_autofill.tmpl +++ b/templates/base/disable_form_autofill.tmpl @@ -26,6 +26,6 @@ We make the names of these dummy inputs begin with an underline to indicate it i and these dummy form values won't be used by backend code. */}} diff --git a/templates/code/searchform.tmpl b/templates/code/searchform.tmpl index a8c8e6576d4c0..85ad63e68514e 100644 --- a/templates/code/searchform.tmpl +++ b/templates/code/searchform.tmpl @@ -1,4 +1,4 @@ - +
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true "Disabled" .CodeIndexerUnavailable}}
diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl index c056662fb89c8..5c3fb370bf188 100644 --- a/templates/explore/repo_search.tmpl +++ b/templates/explore/repo_search.tmpl @@ -1,5 +1,5 @@
- +
diff --git a/templates/explore/search.tmpl b/templates/explore/search.tmpl index b0041ee3ce25e..8ffb2bf52e8e0 100644 --- a/templates/explore/search.tmpl +++ b/templates/explore/search.tmpl @@ -1,5 +1,5 @@
- +
{{template "shared/searchinput" dict "locale" .locale "Value" .Keyword "AutoFocus" true}} diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 9c8644da27e0c..426cc25218c5f 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -8,7 +8,7 @@

{{svg "octicon-alert"}} {{.locale.Tr "org.settings.delete_prompt" | Str2html}}

- + {{.CsrfTokenHtml}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 13c60d39450d4..a8601b45adbd2 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -9,7 +9,7 @@ {{template "org/team/navbar" .}} {{if .IsOrganizationOwner}}
- + {{.CsrfTokenHtml}}