File tree Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change 4
4
var changeMergeButtonState = function ( ) {
5
5
var $container = $ ( '#js-repo-pjax-container' ) ;
6
6
var issueTitle = $container . find ( '.js-issue-title' ) . text ( ) ;
7
- var $buttonMerge = $container . find ( '.merge-message button.js-merge-branch-action ' ) ;
7
+ var $buttonMerge = $container . find ( '.merge-message button[data-details-container] ' ) ;
8
8
var disabled = false ;
9
9
var buttonHtml = '' ;
10
10
43
43
buttonMessage = 'WIP! You can\'t merge!' ;
44
44
}
45
45
46
- buttonHtml = '<span class="octicon octicon-git-merge"></span> ' + ( disabled ? buttonMessage : 'Merge pull request' ) ;
46
+ var $buttonIcon = $buttonMerge . find ( '.octicon' ) ;
47
+ var buttonIconHtml = $buttonIcon . length > 0 ? $buttonIcon . prop ( 'outerHTML' ) + ' ' : '' ;
48
+
49
+ buttonHtml = buttonIconHtml + ( disabled ? buttonMessage : 'Merge pull request' ) ;
47
50
}
48
51
49
52
$buttonMerge . attr ( 'disabled' , disabled ) ;
You can’t perform that action at this time.
0 commit comments