egtyl/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request '[PORT] Fix a number of typescript issues (gitea#32308)' (#5791) from gusted/forgejo-port-32308 into forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/5791
Reviewed-by: Michael Kriese <michael.kriese@gmx.de>
This commit is contained in:
Gusted 2024-11-04 08:44:57 +00:00
commit 14fe3c36bf
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
web_src/js/components/DiffCommitSelector.vue
View file

@ -140,11 +140,11 @@ export default {
Object.assign(this.locale, results.locale); Object.assign(this.locale, results.locale);
}, },
showAllChanges() { showAllChanges() {
window.location = `${this.issueLink}/files${this.queryParams}`; window.location.assign(`${this.issueLink}/files${this.queryParams}`);
}, },
/** Called when user clicks on since last review */ /** Called when user clicks on since last review */
changesSinceLastReviewClick() { changesSinceLastReviewClick() {
window.location = `${this.issueLink}/files/${this.lastReviewCommitSha}..${this.commits.at(-1).id}${this.queryParams}`; window.location.assign(`${this.issueLink}/files/${this.lastReviewCommitSha}..${this.commits.at(-1).id}${this.queryParams}`);
}, },
/** Clicking on a single commit opens this specific commit */ /** Clicking on a single commit opens this specific commit */
commitClicked(commitId, newWindow = false) { commitClicked(commitId, newWindow = false) {
@ -152,7 +152,7 @@ export default {
if (newWindow) { if (newWindow) {
window.open(url); window.open(url);
} else { } else {
window.location = url; window.location.assign(url);
} }
}, },
/** /**
@ -174,14 +174,14 @@ export default {
const lastCommitIdx = this.commits.findLastIndex((x) => x.selected); const lastCommitIdx = this.commits.findLastIndex((x) => x.selected);
if (lastCommitIdx === this.commits.length - 1) { if (lastCommitIdx === this.commits.length - 1) {
// user selected all commits - just show the normal diff page // user selected all commits - just show the normal diff page
window.location = `${this.issueLink}/files${this.queryParams}`; window.location.assign(`${this.issueLink}/files${this.queryParams}`);
} else { } else {
window.location = `${this.issueLink}/files/${this.commits[lastCommitIdx].id}${this.queryParams}`; window.location.assign(`${this.issueLink}/files/${this.commits[lastCommitIdx].id}${this.queryParams}`);
} }
} else { } else {
const start = this.commits[this.commits.findIndex((x) => x.selected) - 1].id; const start = this.commits[this.commits.findIndex((x) => x.selected) - 1].id;
const end = this.commits.findLast((x) => x.selected).id; const end = this.commits.findLast((x) => x.selected).id;
window.location = `${this.issueLink}/files/${start}..${end}${this.queryParams}`; window.location.assign(`${this.issueLink}/files/${start}..${end}${this.queryParams}`);
} }
} }
}, },

2
web_src/js/features/repo-issue.js
View file

@ -119,7 +119,7 @@ function excludeLabel(item) {
const regStr = `labels=((?:-?[0-9]+%2c)*)(${id})((?:%2c-?[0-9]+)*)&`; const regStr = `labels=((?:-?[0-9]+%2c)*)(${id})((?:%2c-?[0-9]+)*)&`;
const newStr = 'labels=$1-$2$3&'; const newStr = 'labels=$1-$2$3&';
window.location = href.replace(new RegExp(regStr), newStr); window.location.assign(href.replace(new RegExp(regStr), newStr));
} }
export function initRepoIssueSidebarList() { export function initRepoIssueSidebarList() {

6
web_src/js/webcomponents/origin-url.test.js
View file

@ -1,9 +1,9 @@
import {toOriginUrl} from './origin-url.js'; import {toOriginUrl} from './origin-url.js';
test('toOriginUrl', () => { test('toOriginUrl', () => {
const oldLocation = window.location; const oldLocation = window.location.href;
for (const origin of ['https://example.com', 'https://example.com:3000']) { for (const origin of ['https://example.com', 'https://example.com:3000']) {
window.location = new URL(`${origin}/`); window.location.assign(`${origin}/`);
expect(toOriginUrl('/')).toEqual(`${origin}/`); expect(toOriginUrl('/')).toEqual(`${origin}/`);
expect(toOriginUrl('/org/repo.git')).toEqual(`${origin}/org/repo.git`); expect(toOriginUrl('/org/repo.git')).toEqual(`${origin}/org/repo.git`);
expect(toOriginUrl('https://another.com')).toEqual(`${origin}/`); expect(toOriginUrl('https://another.com')).toEqual(`${origin}/`);
@ -13,5 +13,5 @@ test('toOriginUrl', () => {
expect(toOriginUrl('https://another.com:4000/')).toEqual(`${origin}/`); expect(toOriginUrl('https://another.com:4000/')).toEqual(`${origin}/`);
expect(toOriginUrl('https://another.com:4000/org/repo.git')).toEqual(`${origin}/org/repo.git`); expect(toOriginUrl('https://another.com:4000/org/repo.git')).toEqual(`${origin}/org/repo.git`);
} }
window.location = oldLocation; window.location.assign(oldLocation);
}); });