From d67dd9d82f58968e980276ae773ac4ed56296ff0 Mon Sep 17 00:00:00 2001 From: L0veSunshine Date: Mon, 18 May 2020 20:26:15 +0800 Subject: [PATCH 1/4] Make localstorage read ssh or https correctly --- web_src/js/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index f7b4ef24d8b3..b21c40f50a4d 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -2436,8 +2436,8 @@ $(document).ready(async () => { if ($('#repo-clone-url').length > 0) { switch (localStorage.getItem('repo-clone-protocol')) { case 'ssh': - if ($('#repo-clone-ssh').length === 0) { - $('#repo-clone-https').trigger('click'); + if ($('#repo-clone-ssh').length > 0) { + $('#repo-clone-ssh').trigger('click'); } break; default: From 8a20848a073a4225bc74b7682085c75c9a45fd66 Mon Sep 17 00:00:00 2001 From: L0veSunshine Date: Mon, 18 May 2020 22:51:45 +0800 Subject: [PATCH 2/4] Update index.js If not login there is only a "https" button, This commit fix the "https" button hasn't blue border. --- web_src/js/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web_src/js/index.js b/web_src/js/index.js index b21c40f50a4d..692da50fc141 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -2438,6 +2438,8 @@ $(document).ready(async () => { case 'ssh': if ($('#repo-clone-ssh').length > 0) { $('#repo-clone-ssh').trigger('click'); + } else { + $('#repo-clone-https').trigger('click'); } break; default: From 695a181b01d50235b80aa6c7077924a0708e5d9c Mon Sep 17 00:00:00 2001 From: L0veSunshine Date: Mon, 18 May 2020 23:07:36 +0800 Subject: [PATCH 3/4] Keep user selected whether or not to log in --- web_src/js/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web_src/js/index.js b/web_src/js/index.js index 692da50fc141..c223107a8d1f 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -2440,6 +2440,7 @@ $(document).ready(async () => { $('#repo-clone-ssh').trigger('click'); } else { $('#repo-clone-https').trigger('click'); + localStorage.setItem('repo-clone-protocol', 'ssh'); } break; default: From 7f4dac4d40ef1cb59a9202f878981572b576fc69 Mon Sep 17 00:00:00 2001 From: L0veSunshine Date: Tue, 19 May 2020 01:09:35 +0800 Subject: [PATCH 4/4] Update index.js --- web_src/js/index.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web_src/js/index.js b/web_src/js/index.js index c223107a8d1f..b8088123729f 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1109,8 +1109,10 @@ async function initRepository() { $('.clone-url').text($(this).data('link')); $('#repo-clone-url').val($(this).data('link')); $(this).addClass('blue'); - $('#repo-clone-ssh').removeClass('blue'); - localStorage.setItem('repo-clone-protocol', 'https'); + if ($('#repo-clone-ssh').length > 0) { + $('#repo-clone-ssh').removeClass('blue'); + localStorage.setItem('repo-clone-protocol', 'https'); + } }); $('#repo-clone-url').on('click', function () { $(this).select(); @@ -2440,7 +2442,6 @@ $(document).ready(async () => { $('#repo-clone-ssh').trigger('click'); } else { $('#repo-clone-https').trigger('click'); - localStorage.setItem('repo-clone-protocol', 'ssh'); } break; default: