prehistoric-systems/Gitako
1
1
Fork 0
mirror of https://github.com/EnixCoda/Gitako.git synced 2026-03-11 08:54:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: enhance branch resolving logic

Browse source
This commit is contained in:
EnixCoda 2019-04-09 21:28:28 +08:00
parent 7ff738f2c1
commit 85d0efbede
No known key found for this signature in database
GPG key ID: 0C1A07377913A1DD
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/utils/DOMHelper.ts
View file

@ -35,8 +35,8 @@ function $<EE extends Element, E extends (element: EE) => any, O extends () => a
otherwise?: O,
): E extends never
? O extends never
? (Element | null)
: ReturnType<O> | null
? (Element | null)
: ReturnType<O> | null
: O extends never
? (ReturnType<E> | null)
: ReturnType<O> | ReturnType<E> {
@ -60,34 +60,32 @@ function getBranches() {
function getCurrentBranch() {
const selectedBranchButtonSelector = '.repository-content .branch-select-menu summary'
const branchNameFromButtonElement = $(selectedBranchButtonSelector, element =>
(element as HTMLButtonElement).title.trim(),
)
const defaultTitle = 'Switch branches or tags'
if (branchNameFromButtonElement && branchNameFromButtonElement !== defaultTitle)
return branchNameFromButtonElement
const branchButtonElement: HTMLElement = $(selectedBranchButtonSelector)
if (branchButtonElement) {
const branchNameSpanElement = branchButtonElement.querySelector('span');
if (branchNameSpanElement) {
const partialBranchNameFromInnerText = branchNameSpanElement.innerText
if (!partialBranchNameFromInnerText.includes('…')) return partialBranchNameFromInnerText
}
const defaultTitle = 'Switch branches or tags'
const title = (branchButtonElement).title.trim()
if (title !== defaultTitle) return title
}
const commitButtonSelector = '.repository-content .overall-summary .commits a'
const urlFromCommitButton: string | undefined = $(
commitButtonSelector,
const findFileButtonSelector = '#js-repo-pjax-container .repository-content .file-navigation a[data-hotkey="t"]'
const urlFromFindFileButton: string | undefined = $(
findFileButtonSelector,
element => (element as HTMLAnchorElement).href,
)
if (urlFromCommitButton) {
const commitPathRegex = /^(.*?)\/(.*?)\/commits\/(.*?)$/
const result = urlFromCommitButton.match(commitPathRegex)
if (urlFromFindFileButton) {
const commitPathRegex = /^(.*?)\/(.*?)\/find\/(.*?)$/
const result = urlFromFindFileButton.match(commitPathRegex)
if (result) {
const [_, userName, repoName, branchName] = result
return branchName
}
}
const selectedBranchSelector =
'.select-menu.branch-select-menu .select-menu-modal .select-menu-list .select-menu-item.selected svg.select-menu-item-icon + span'
const branchNameFromSelectElement = $(selectedBranchSelector, element =>
element.textContent ? element.textContent.trim() : '',
)
if (branchNameFromSelectElement) return branchNameFromSelectElement
raiseError(new Error('cannot get current branch'))
}