aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Remove options to be deprecated

Browse source
This commit is contained in:
Yuya Ochiai 2017-02-01 23:32:07 +09:00
parent c76797e68e
commit f5320197ab
2 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/browser/components/SettingsPage.jsx
View file

@ -198,16 +198,6 @@ const SettingsPage = React.createClass({
); );
var options = []; var options = [];
if (process.platform === 'win32' || process.platform === 'linux') {
options.push(
<Checkbox
key='inputHideMenuBar'
id='inputHideMenuBar'
ref='hideMenuBar'
checked={this.state.hideMenuBar}
onChange={this.handleChangeHideMenuBar}
>{'Hide menu bar (Press Alt to show menu bar)'}</Checkbox>);
}
if (process.platform === 'darwin' || process.platform === 'linux') { if (process.platform === 'darwin' || process.platform === 'linux') {
options.push( options.push(
<Checkbox <Checkbox
@ -257,7 +247,7 @@ const SettingsPage = React.createClass({
>{'Start app on login.'}</Checkbox>); >{'Start app on login.'}</Checkbox>);
} }
if (process.platform === 'darwin' || process.platform === 'linux') { if (process.platform === 'linux') {
options.push( options.push(
<Checkbox <Checkbox
key='inputMinimizeToTray' key='inputMinimizeToTray'
@ -269,17 +259,6 @@ const SettingsPage = React.createClass({
>{this.state.trayWasVisible || !this.state.showTrayIcon ? 'Leave app running in notification area when the window is closed' : 'Leave app running in notification area when the window is closed (available on next restart)'}</Checkbox>); >{this.state.trayWasVisible || !this.state.showTrayIcon ? 'Leave app running in notification area when the window is closed' : 'Leave app running in notification area when the window is closed (available on next restart)'}</Checkbox>);
} }
if (process.platform === 'win32') {
options.push(
<Checkbox
key='inputToggleWindowOnTrayIconClick'
id='inputToggleWindowOnTrayIconClick'
ref='toggleWindowOnTrayIconClick'
checked={this.state.toggleWindowOnTrayIconClick}
onChange={this.handleChangeToggleWindowOnTrayIconClick}
>{'Toggle window visibility when clicking on the tray icon.'}</Checkbox>);
}
if (process.platform === 'darwin' || process.platform === 'win32') { if (process.platform === 'darwin' || process.platform === 'win32') {
options.push( options.push(
<Checkbox <Checkbox

8
test/specs/browser/settings_test.js
View file

@ -50,7 +50,7 @@ describe('browser/settings.html', function desc() {
}); });
describe('Options', () => { describe('Options', () => {
describe('Hide Menu Bar', () => { describe.skip('Hide Menu Bar', () => {
it('should appear on win32 or linux', () => { it('should appear on win32 or linux', () => {
const expected = (process.platform === 'win32' || process.platform === 'linux'); const expected = (process.platform === 'win32' || process.platform === 'linux');
env.addClientCommands(this.app.client); env.addClientCommands(this.app.client);
@ -152,8 +152,8 @@ describe('browser/settings.html', function desc() {
}); });
describe('Minimize to tray', () => { describe('Minimize to tray', () => {
it('should appear on darwin or linux', () => { it('should appear on linux', () => {
const expected = (process.platform === 'darwin' || process.platform === 'linux'); const expected = (process.platform === 'linux');
env.addClientCommands(this.app.client); env.addClientCommands(this.app.client);
return this.app.client. return this.app.client.
loadSettingsPage(). loadSettingsPage().
@ -161,7 +161,7 @@ describe('browser/settings.html', function desc() {
}); });
}); });
describe('Toggle window visibility when clicking on the tray icon', () => { describe.skip('Toggle window visibility when clicking on the tray icon', () => {
it('should appear on win32', () => { it('should appear on win32', () => {
const expected = (process.platform === 'win32'); const expected = (process.platform === 'win32');
env.addClientCommands(this.app.client); env.addClientCommands(this.app.client);