Skip to content

Commit 4fd73d5

Browse files
committed
Merge branch 'develop' into alpha
2 parents e318784 + 585c229 commit 4fd73d5

File tree

2 files changed

+95
-35
lines changed

2 files changed

+95
-35
lines changed

package-lock.json

Lines changed: 89 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/scripts/arc/AdvancedRestClientApplication.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ export class AdvancedRestClientApplication extends ApplicationPage {
838838
'saved',
839839
];
840840
if (e.route === 'client-certificate-import') {
841-
this.importingCertificate = true;
841+
navigate('client-certificates');
842842
} else if (allowed.includes(e.route)) {
843843
navigate(e.route);
844844
} else {
@@ -853,7 +853,11 @@ export class AdvancedRestClientApplication extends ApplicationPage {
853853
[externalNavigationHandler](e) {
854854
const { url, detail } = e;
855855
const { purpose } = detail;
856-
ipc.send('open-web-url', url, purpose);
856+
if (!purpose) {
857+
ipc.send('open-external-url', url);
858+
} else {
859+
ipc.send('open-web-url', url, purpose);
860+
}
857861
}
858862

859863
/**

0 commit comments

Comments
 (0)