ソースを参照

Revert goldenLayout changes (focus wrong tab when closin unfocused tab)

Leonardo Jeanteur 1 年間 前
コミット
2207ebf7c4
1 ファイル変更9 行追加3 行削除
  1. 9 3
      bin/libs/goldenlayout.js

+ 9 - 3
bin/libs/goldenlayout.js

@@ -4399,17 +4399,23 @@ lm.utils.copy( lm.items.Stack.prototype, {
 
 	removeChild: function( contentItem, keepChild ) {
 		var index = lm.utils.indexOf( contentItem, this.contentItems );
-		var activeContentItem = this.header.parent.getActiveContentItem();
-		var activeIndex = lm.utils.indexOf( activeContentItem, this.contentItems );
 		lm.items.AbstractContentItem.prototype.removeChild.call( this, contentItem, keepChild );
 		this.header.removeTab( contentItem );
 
-		if( activeIndex === index && this.contentItems.length > 0 ) {
+		if( this.contentItems.length > 0 ) {
 			this.setActiveContentItem( this.contentItems[ Math.max( index - 1, 0 ) ] );
 		} else {
 			this._activeContentItem = null;
 		}
 
+		// var activeContentItem = this.header.parent.getActiveContentItem();
+		// var activeIndex = lm.utils.indexOf( activeContentItem, this.contentItems );
+		// if( activeIndex === index && this.contentItems.length > 0 ) {
+		// 	this.setActiveContentItem( this.contentItems[ Math.max( index - 1, 0 ) ] );
+		// } else {
+		// 	this._activeContentItem = null;
+		// }
+
 		this._$validateClosability();
 		this.emitBubblingEvent( 'stateChanged' );
 	},