Skip to content

Commit 7890808

Browse files
committed
Fix a detect to merge button
`.js-merge-branch-action` is not used now. And... web font is not used.
1 parent 1383e00 commit 7890808

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

app/scripts/contentscript.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var changeMergeButtonState = function() {
55
var $container = $('#js-repo-pjax-container');
66
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]');
88
var disabled = false;
99
var buttonHtml = '';
1010

@@ -43,7 +43,10 @@
4343
buttonMessage = 'WIP! You can\'t merge!';
4444
}
4545

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');
4750
}
4851

4952
$buttonMerge.attr('disabled', disabled);

0 commit comments

Comments
 (0)