Skip to content

Commit 807feae

Browse files
authored
Merge pull request #3165 from BoostIO/discard-warnings
Discard warnings
2 parents f3e2205 + 4b62e93 commit 807feae

20 files changed

+31
-30
lines changed

browser/components/MarkdownSplitEditor.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ class MarkdownSplitEditor extends React.Component {
150150
onMouseMove={e => this.handleMouseMove(e)}
151151
onMouseUp={e => this.handleMouseUp(e)}>
152152
<CodeEditor
153-
styleName='codeEditor'
154153
ref='code'
155154
width={this.state.codeEditorWidthInPercent + '%'}
156155
mode='Boost Flavored Markdown'
@@ -188,7 +187,6 @@ class MarkdownSplitEditor extends React.Component {
188187
</div>
189188
<MarkdownPreview
190189
style={previewStyle}
191-
styleName='preview'
192190
theme={config.ui.theme}
193191
keyMap={config.editor.keyMap}
194192
fontSize={config.preview.fontSize}

browser/components/ModalEscButton.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const ModalEscButton = ({
88
}) => (
99
<button styleName='escButton' onClick={handleEscButtonClick}>
1010
<div styleName='esc-mark'>×</div>
11-
<div styleName='esc-text'>esc</div>
11+
<div>esc</div>
1212
</button>
1313
)
1414

browser/components/SnippetTab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class SnippetTab extends React.Component {
114114
>
115115
{snippet.name.trim().length > 0
116116
? snippet.name
117-
: <span styleName='button-unnamed'>
117+
: <span>
118118
{i18n.__('Unnamed')}
119119
</span>
120120
}

browser/lib/customMeta.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import CodeMirror from 'codemirror'
22
import 'codemirror-mode-elixir'
33

4-
CodeMirror.modeInfo.push({name: 'Stylus', mime: 'text/x-styl', mode: 'stylus', ext: ['styl'], alias: ['styl']})
4+
const stylusCodeInfo = CodeMirror.modeInfo.find(info => info.name === 'Stylus')
5+
if (stylusCodeInfo == null) {
6+
CodeMirror.modeInfo.push({name: 'Stylus', mime: 'text/x-styl', mode: 'stylus', ext: ['styl'], alias: ['styl']})
7+
} else {
8+
stylusCodeInfo.alias = ['styl']
9+
}
510
CodeMirror.modeInfo.push({name: 'Elixir', mime: 'text/x-elixir', mode: 'elixir', ext: ['ex']})

browser/main/Detail/FullscreenButton.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const FullscreenButton = ({
1111
const hotkey = (OSX ? i18n.__('Command(⌘)') : i18n.__('Ctrl(^)')) + '+B'
1212
return (
1313
<button styleName='control-fullScreenButton' title={i18n.__('Fullscreen')} onMouseDown={(e) => onClick(e)}>
14-
<img styleName='iconInfo' src='../resources/icon/icon-full.svg' />
14+
<img src='../resources/icon/icon-full.svg' />
1515
<span lang={i18n.locale} styleName='tooltip'>{i18n.__('Fullscreen')}({hotkey})</span>
1616
</button>
1717
)

browser/main/Detail/InfoPanel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class InfoPanel extends React.Component {
6060
</div>
6161

6262
<div>
63-
<input styleName='infoPanel-noteLink' ref='noteLink' value={noteLink} onClick={(e) => { e.target.select() }} />
63+
<input styleName='infoPanel-noteLink' ref='noteLink' defaultValue={noteLink} onClick={(e) => { e.target.select() }} />
6464
<button onClick={() => this.copyNoteLink()} styleName='infoPanel-copyButton'>
6565
<i className='fa fa-clipboard' />
6666
</button>

browser/main/Detail/MarkdownNoteDetail.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ class MarkdownNoteDetail extends React.Component {
450450

451451
const detailTopBar = <div styleName='info'>
452452
<div styleName='info-left'>
453-
<div styleName='info-left-top'>
453+
<div>
454454
<FolderSelect styleName='info-left-top-folderSelect'
455455
value={this.state.note.storage + '-' + this.state.note.folder}
456456
ref='folder'
@@ -484,7 +484,7 @@ class MarkdownNoteDetail extends React.Component {
484484
onFocus={(e) => this.handleFocus(e)}
485485
onMouseDown={(e) => this.handleLockButtonMouseDown(e)}
486486
>
487-
<img styleName='iconInfo' src={imgSrc} />
487+
<img src={imgSrc} />
488488
{this.state.isLocked ? <span styleName='tooltip'>Unlock</span> : <span styleName='tooltip'>Lock</span>}
489489
</button>
490490

browser/main/Detail/PermanentDeleteButton.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const PermanentDeleteButton = ({
1010
<button styleName='control-trashButton--in-trash'
1111
onClick={(e) => onClick(e)}
1212
>
13-
<img styleName='iconInfo' src='../resources/icon/icon-trash.svg' />
13+
<img src='../resources/icon/icon-trash.svg' />
1414
<span styleName='tooltip'>{i18n.__('Permanent Delete')}</span>
1515
</button>
1616
)

browser/main/Detail/SnippetNoteDetail.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ class SnippetNoteDetail extends React.Component {
808808

809809
const detailTopBar = <div styleName='info'>
810810
<div styleName='info-left'>
811-
<div styleName='info-left-top'>
811+
<div>
812812
<FolderSelect styleName='info-left-top-folderSelect'
813813
value={this.state.note.storage + '-' + this.state.note.folder}
814814
ref='folder'

browser/main/Detail/ToggleModeButton.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ const ToggleModeButton = ({
88
onClick, editorType
99
}) => (
1010
<div styleName='control-toggleModeButton'>
11-
<div styleName={editorType === 'SPLIT' ? 'active' : 'non-active'} onClick={() => onClick('SPLIT')}>
12-
<img styleName='item-star' src={editorType === 'EDITOR_PREVIEW' ? '../resources/icon/icon-mode-markdown-off-active.svg' : ''} />
11+
<div styleName={editorType === 'SPLIT' ? 'active' : undefined} onClick={() => onClick('SPLIT')}>
12+
<img src={editorType === 'EDITOR_PREVIEW' ? '../resources/icon/icon-mode-markdown-off-active.svg' : ''} />
1313
</div>
14-
<div styleName={editorType === 'EDITOR_PREVIEW' ? 'active' : 'non-active'} onClick={() => onClick('EDITOR_PREVIEW')}>
15-
<img styleName='item-star' src={editorType === 'EDITOR_PREVIEW' ? '' : '../resources/icon/icon-mode-split-on-active.svg'} />
14+
<div styleName={editorType === 'EDITOR_PREVIEW' ? 'active' : undefined} onClick={() => onClick('EDITOR_PREVIEW')}>
15+
<img src={editorType === 'EDITOR_PREVIEW' ? '' : '../resources/icon/icon-mode-split-on-active.svg'} />
1616
</div>
1717
<span lang={i18n.locale} styleName='tooltip'>{i18n.__('Toggle Mode')}</span>
1818
</div>

0 commit comments

Comments
 (0)