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

Merge pull request #452 from mattermost/jasonblais-patch-1

Browse Source 
Update settings text for "Flash taskbar icon when..."
This commit is contained in:
Yuya Ochiai
2017-02-23 00:56:36 +09:00
committed by GitHub
parent c13f4ea88e 8ef371c1b5
commit a82daa4a32
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/browser/components/SettingsPage.jsx
View File

@@ -309,9 +309,9 @@ const SettingsPage = React.createClass({
ref='flashWindow'
checked={this.state.notifications.flashWindow === 2}
onChange={this.handleFlashWindow}
>{'Flash taskbar icon when a new message is received'}
>{'Flash app window and taskbar icon when a new message is received'}
<HelpBlock>
{'If enabled, taskbar icon flashes for a few seconds when a new message is received.'}
{'If enabled, app window and taskbar icon flash for a few seconds when a new message is received.'}
</HelpBlock>
</Checkbox>);
}

2
test/specs/browser/settings_test.js
View File

@@ -202,7 +202,7 @@ describe('browser/settings.html', function desc() {
});
});
describe('Flash taskbar icon when a new message is received', () => {
describe('Flash app window and taskbar icon when a new message is received', () => {
it('should appear on win32 and linux', () => {
const expected = (process.platform === 'win32' || process.platform === 'linux');
env.addClientCommands(this.app.client);