+ Remove check update on tray until we get updater
+ Compliance with light theme
This commit is contained in:
parent
e4390f7a99
commit
b061ae0d41
File diff suppressed because one or more lines are too long
|
@ -44,7 +44,7 @@ export default class AlertBox extends React.Component<AlertBoxProps> {
|
||||||
children = this.props.children
|
children = this.props.children
|
||||||
}
|
}
|
||||||
wrap.props.children = <div className={"lc-alert-box lc-alert-box-"+this.props.type}>
|
wrap.props.children = <div className={"lc-alert-box lc-alert-box-"+this.props.type}>
|
||||||
<blockquote style={{color: "#dcddde"}} className="lc-blockquote">
|
<blockquote className="lc-blockquote">
|
||||||
{children}
|
{children}
|
||||||
</blockquote>
|
</blockquote>
|
||||||
</div>
|
</div>
|
||||||
|
@ -59,17 +59,17 @@ export default class AlertBox extends React.Component<AlertBoxProps> {
|
||||||
children: "***Discord's*** **Markdown** _is_ [supported](https://google.com) or you can just insert your own react childs."
|
children: "***Discord's*** **Markdown** _is_ [supported](https://google.com) or you can just insert your own react childs."
|
||||||
}
|
}
|
||||||
], [
|
], [
|
||||||
{
|
|
||||||
type: "warn"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
type: "info"
|
type: "info"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "error"
|
type: "success"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "success"
|
type: "warn"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: "error"
|
||||||
}
|
}
|
||||||
])
|
])
|
||||||
return AllPreviews
|
return AllPreviews
|
||||||
|
|
|
@ -29,7 +29,7 @@ class DangerousWebpackloader {
|
||||||
return ids.map(id => this.get(id, modules))
|
return ids.map(id => this.get(id, modules))
|
||||||
}else{
|
}else{
|
||||||
modules = modules || this.modules
|
modules = modules || this.modules
|
||||||
let module = modules.find(e => e.i === ids)
|
let module = modules.filter(e => !!e).find(e => e.i === ids)
|
||||||
if(!module)return undefined
|
if(!module)return undefined
|
||||||
return module.exports
|
return module.exports
|
||||||
}
|
}
|
||||||
|
@ -94,7 +94,7 @@ class Webpackloader {
|
||||||
return ids.map(id => this.get(id, modules))
|
return ids.map(id => this.get(id, modules))
|
||||||
}else{
|
}else{
|
||||||
modules = modules || this.modules
|
modules = modules || this.modules
|
||||||
let module = modules.find(e => e.i === ids)
|
let module = modules.filter(e => !!e).find(e => e.i === ids)
|
||||||
if(!module)return undefined
|
if(!module)return undefined
|
||||||
return module.exports
|
return module.exports
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,13 +121,13 @@ function initializeMenuItems() {
|
||||||
type: 'normal',
|
type: 'normal',
|
||||||
visible: voiceConnected,
|
visible: voiceConnected,
|
||||||
click: onOpenVoiceSettings
|
click: onOpenVoiceSettings
|
||||||
};
|
};/*
|
||||||
menuItems[MenuItems.CHECK_UPDATE] = {
|
menuItems[MenuItems.CHECK_UPDATE] = {
|
||||||
label: 'Check for Updates...',
|
label: 'Check for Updates...',
|
||||||
type: 'normal',
|
type: 'normal',
|
||||||
visible: process.platform !== 'darwin',
|
visible: process.platform !== 'darwin',
|
||||||
click: onCheckForUpdates
|
click: onCheckForUpdates
|
||||||
};
|
};*/
|
||||||
menuItems[MenuItems.QUIT] = {
|
menuItems[MenuItems.QUIT] = {
|
||||||
label: `Quit ${_Constants.APP_NAME}`,
|
label: `Quit ${_Constants.APP_NAME}`,
|
||||||
role: 'quit'
|
role: 'quit'
|
||||||
|
@ -144,7 +144,7 @@ function buildContextMenu() {
|
||||||
const separator = { type: 'separator' };
|
const separator = { type: 'separator' };
|
||||||
const hasApplications = applications != null && applications.length > 0;
|
const hasApplications = applications != null && applications.length > 0;
|
||||||
|
|
||||||
contextMenu = [menuItems[MenuItems.SECRET], separator, ...(hasApplications ? [...applications, separator] : []), menuItems[MenuItems.OPEN], menuItems[MenuItems.MUTE], menuItems[MenuItems.DEAFEN], menuItems[MenuItems.VOICE_SETTINGS], menuItems[MenuItems.CHECK_UPDATE], menuItems[MenuItems.ACKNOWLEDGEMENTS], separator, menuItems[MenuItems.QUIT]];
|
contextMenu = [menuItems[MenuItems.SECRET], separator, ...(hasApplications ? [...applications, separator] : []), menuItems[MenuItems.OPEN], menuItems[MenuItems.MUTE], menuItems[MenuItems.DEAFEN], menuItems[MenuItems.VOICE_SETTINGS], /*menuItems[MenuItems.CHECK_UPDATE], */menuItems[MenuItems.ACKNOWLEDGEMENTS], separator, menuItems[MenuItems.QUIT]];
|
||||||
}
|
}
|
||||||
|
|
||||||
function setTrayIcon(icon) {
|
function setTrayIcon(icon) {
|
||||||
|
|
Loading…
Reference in New Issue