phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-40822] Remove app.dock.show from restoreMain (#1945)

Browse Source 
* [MM-40822] Remove app.dock.show from restoreMain

* Removed the test
This commit is contained in:
Devin Binnie
2022-01-12 09:38:45 -05:00
committed by GitHub
parent 4d49f1bd38
commit 4bdd8b7a45
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/windows/windowManager.test.js
View File

@@ -304,19 +304,6 @@ describe('main/windows/windowManager', () => {
expect(windowManager.settingsWindow.focus).toHaveBeenCalled(); expect(windowManager.settingsWindow.focus).toHaveBeenCalled();
windowManager.settingsWindow.focus.mockClear(); windowManager.settingsWindow.focus.mockClear();
}); });
it('should call macOS show on macOS', () => {
windowManager.mainWindow.isVisible.mockReturnValue(false);
const originalPlatform = process.platform;
Object.defineProperty(process, 'platform', {
value: 'darwin',
});
windowManager.restoreMain();
Object.defineProperty(process, 'platform', {
value: originalPlatform,
});
expect(app.dock.show).toHaveBeenCalled();
});
}); });
describe('flashFrame', () => { describe('flashFrame', () => {

3
src/main/windows/windowManager.ts
View File

@@ -230,9 +230,6 @@ export class WindowManager {
} else { } else {
this.mainWindow!.focus(); this.mainWindow!.focus();
} }
if (process.platform === 'darwin') {
app.dock.show();
}
} else if (this.settingsWindow) { } else if (this.settingsWindow) {
this.settingsWindow.focus(); this.settingsWindow.focus();
} else { } else {