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: revert branch handler

Browse source
This commit is contained in:
EnixCoda 2018-11-09 11:17:57 +08:00
parent 201085bebf
commit 3f03c62f20
No known key found for this signature in database
GPG key ID: 6825847C88AA329A
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/driver/core/SideBar.js
View file

@ -12,9 +12,10 @@ const init = dispatch => async () => {
const metaData = URLHelper.parse()
if (DOMHelper.isInCodePage()) {
// in case GitHub page structure changes, fallback to 'master'
const detectedBranchName = DOMHelper.getCurrentBranch() || 'master'
let detectedBranchName = DOMHelper.getCurrentBranch()
branchDetected = Boolean(detectedBranchName)
detectedBranchName = detectedBranchName || 'master'
metaData.branchName = detectedBranchName
branchDetected = true
} else {
metaData.branchName = 'master'
branchDetected = false

13
src/utils/DOMHelper.js
View file

@ -40,12 +40,13 @@ function getBranches() {
}
function getCurrentBranch() {
const title = document.title
const reg = /(.*?) at (.*?)($| )/
const match = title.match(reg)
if (!match) return
const [_, nameAndPath, branch] = match
return branch
const selectedBranchButtonSelector = '.repository-content > .file-navigation > .branch-select-menu > button'
const branchNameFromButtonElement = $(selectedBranchButtonSelector, element => element.title.trim())
if (branchNameFromButtonElement) return branchNameFromButtonElement
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.trim())
if (branchNameFromSelectElement) return branchNameFromSelectElement
}
/**