SkyID
/
GitCodeTree
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #217 from crashbell/master 

Fix finding a wrong branch in pull request page
This commit is contained in:
Buu Nguyen 2015-12-07 12:29:48 -08:00
parent 55192e44c0 26de85b611
commit 124c2d89b5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/adapters/github.js
View File

@ -147,7 +147,8 @@ class GitHub extends Adapter {
const GH_BRANCH_SEL_1 = '[aria-label="Switch branches or tags"]' const GH_BRANCH_SEL_1 = '[aria-label="Switch branches or tags"]'
const GH_BRANCH_SEL_2 = '.repo-root a[data-branch]' const GH_BRANCH_SEL_2 = '.repo-root a[data-branch]'
const GH_BRANCH_SEL_3 = '.repository-sidebar a[aria-label="Code"]' const GH_BRANCH_SEL_3 = '.repository-sidebar a[aria-label="Code"]'
const GH_BRANCH_SEL_4 = 'link[title*="Recent Commits to"]' const GH_BRANCH_SEL_4 = '.current-branch'
const GH_BRANCH_SEL_5 = 'link[title*="Recent Commits to"]'
const branch = const branch =
// Detect branch in code page (don't care about non-code pages, let them use the next fallback) // Detect branch in code page (don't care about non-code pages, let them use the next fallback)
@ -155,7 +156,12 @@ class GitHub extends Adapter {
// Non-code page // Non-code page
($(GH_BRANCH_SEL_3).attr('href') || ' ').match(/([^\/]+)/g)[3] || ($(GH_BRANCH_SEL_3).attr('href') || ' ').match(/([^\/]+)/g)[3] ||
// Non-code page (new design) // Non-code page (new design)
// Specific handle /commit page
($(GH_BRANCH_SEL_4).attr('title') || ' ').match(/([^\:]+)/g)[1] || ($(GH_BRANCH_SEL_4).attr('title') || ' ').match(/([^\:]+)/g)[1] ||
// Ignore if Github expands one more <link> - use last selected one instead
($(GH_BRANCH_SEL_5).length === 1
&& ($(GH_BRANCH_SEL_5).attr('title') || ' ').match(/([^\:]+)/g)[1]) ||
// Reuse last selected branch if exist // Reuse last selected branch if exist
(currentRepo.username === username && currentRepo.reponame === reponame && currentRepo.branch) (currentRepo.username === username && currentRepo.reponame === reponame && currentRepo.branch)
// Get default branch from cache // Get default branch from cache