File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 506506 "class" , dv . classes . connect ) ;
507507 }
508508 if ( dv . copyButtons ) {
509- var leftButton = typeof dv . getLeftRevertButton === 'function' && dv . getLeftRevertButton ( ) ;
510- var rightButton = typeof dv . getRightRevertButton === 'function' && dv . getRightRevertButton ( ) ;
509+ var leftButton = typeof dv . getLeftRevertButton === 'function' && dv . getLeftRevertButton ( "CodeMirror-merge-copy" ) ;
510+ var rightButton = typeof dv . getRightRevertButton === 'function' && dv . getRightRevertButton ( "CodeMirror-merge-copy" ) ;
511511 var useGeneratedButton = leftButton && rightButton
512512
513513 var btnElem = useGeneratedButton ? ( dv . type == "left" ? rightButton : leftButton ) : elt ( "div" , dv . type == "left" ? dv . rightRevertButtonText : dv . leftRevertButtonText , "CodeMirror-merge-copy" ) ;
519519 copy . setAttribute ( "role" , "button" ) ;
520520
521521 if ( editOriginals ) {
522+ var leftButton = typeof dv . getLeftRevertButton === 'function' && dv . getLeftRevertButton ( "CodeMirror-merge-copy-reverse" ) ;
523+ var rightButton = typeof dv . getRightRevertButton === 'function' && dv . getRightRevertButton ( "CodeMirror-merge-copy-reverse" ) ;
522524 var topReverse = dv . edit . heightAtLine ( chunk . editFrom , "local" ) - sTopEdit ;
523525 var btnElem = useGeneratedButton ? ( dv . type == "right" ? rightButton : leftButton ) : elt ( "div" , dv . type == "right" ? dv . rightRevertButtonText : dv . leftRevertButtonText , "CodeMirror-merge-copy-reverse" ) ;
524526 var copyReverse = dv . copyButtons . appendChild ( btnElem ) ;
You can’t perform that action at this time.
0 commit comments