diff --git a/module/repo/js/diff.ui.js b/module/repo/js/diff.ui.js index 8243144b26..7ce960650f 100644 --- a/module/repo/js/diff.ui.js +++ b/module/repo/js/diff.ui.js @@ -4,13 +4,13 @@ var tabTemp; var diffAppose = $.cookie.get('renderSideBySide') == 'true'; /* Close tab. */ -$('#monacoTabs').off('click', '.monaco-close').on('click', '.monaco-close', function() +window.closeTab = function(dom) { - var eleId = $(this).parent().attr('href'); - var tabsEle = $(this).parent().parent().parent(); - var isActive = $(this).parent().hasClass('active'); + const eleId = $(dom).parent().attr('href'); + const tabsEle = $(dom).parent().parent().parent(); + const isActive = $(dom).parent().hasClass('active'); - $(this).parent().parent().remove(); + $(dom).parent().parent().remove(); $(eleId).remove(); $('#' + eleId.substring(5)).parent().removeClass('selected'); if(isActive) tabsEle.children().last().find('a').trigger('click'); @@ -18,7 +18,7 @@ $('#monacoTabs').off('click', '.monaco-close').on('click', '.monaco-close', func const fileKey = eleId.substring(5).replace(/-/g, '='); $('li[z-key="' + fileKey + '"] .listitem').removeClass('selected'); -}); +} $(function() { diff --git a/module/repo/js/monaco.ui.js b/module/repo/js/monaco.ui.js index ec27b67817..7235578b36 100644 --- a/module/repo/js/monaco.ui.js +++ b/module/repo/js/monaco.ui.js @@ -4,13 +4,13 @@ var tabTemp; var parentTree = []; /* Close tab. */ -$('#monacoTabs').off('click', '.monaco-close').on('click', '.monaco-close', function() +window.closeTab = function(dom) { - var eleId = $(this).parent().attr('href'); - var tabsEle = $(this).parent().parent().parent(); - var isActive = $(this).parent().hasClass('active'); + const eleId = $(dom).parent().attr('href'); + const tabsEle = $(dom).parent().parent().parent(); + const isActive = $(dom).parent().hasClass('active'); - $(this).parent().parent().remove(); + $(dom).parent().parent().remove(); $(eleId).remove(); $('#' + eleId.substring(5)).parent().removeClass('selected'); if(isActive) tabsEle.children().last().find('a').trigger('click'); @@ -20,7 +20,7 @@ $('#monacoTabs').off('click', '.monaco-close').on('click', '.monaco-close', func $('li[z-key="' + fileKey + '"] .listitem').removeClass('selected'); arrowTabs('monacoTabs', -1); -}); +} $(function() { diff --git a/module/repo/ui/diffeditor.html.php b/module/repo/ui/diffeditor.html.php index 1f4c1a969e..10e7140e7a 100644 --- a/module/repo/ui/diffeditor.html.php +++ b/module/repo/ui/diffeditor.html.php @@ -45,6 +45,7 @@ div( ( set::id('monacoTabs'), set::className('relative'), + on::click('.monaco-close')->call('closeTab', jsRaw('this')), div(setStyle(array('position' => 'absolute', 'width' => '100%', 'height' => '35px', 'background' => '#efefef', 'top' => '0px'))), tabPane ( diff --git a/module/repo/ui/monaco.html.php b/module/repo/ui/monaco.html.php index 7325d80d07..89bf606725 100644 --- a/module/repo/ui/monaco.html.php +++ b/module/repo/ui/monaco.html.php @@ -57,6 +57,7 @@ div( ( set::id('monacoTabs'), set::className('relative'), + on::click('.monaco-close')->call('closeTab', jsRaw('this')), div(setStyle(array('position' => 'absolute', 'width' => '100%', 'height' => '40px', 'background' => '#efefef', 'top' => '0px'))), tabPane (