Merge branch 'development' into production

This commit is contained in:
ilyaigpetrov 2019-10-25 16:19:13 +00:00
commit 0a0df56dbe
2 changed files with 8 additions and 3 deletions

View File

@ -75,11 +75,16 @@ export default function getExcEditor(theState) {
constructor(props) { constructor(props) {
super(props); super(props);
const trimmedInputValueOrSpace =
props.currentTab &&
props.currentTab.url &&
!props.currentTab.url.startsWith('chrome')
? new URL(props.currentTab.url).hostname
: '';
const pacMods = props.apis.pacKitchen.getPacMods(); const pacMods = props.apis.pacKitchen.getPacMods();
this.state = { this.state = {
trimmedInputValueOrSpace: trimmedInputValueOrSpace,
props.currentTab && !props.currentTab.url.startsWith('chrome') ? new URL(props.currentTab.url).hostname : '',
sortedListOfOptions: this.modsToOpts(pacMods), sortedListOfOptions: this.modsToOpts(pacMods),
isHostHidden: {} isHostHidden: {}
}; };

View File

@ -10,7 +10,7 @@ const pacUrls = [
]; ];
const commonContext = { const commonContext = {
version: '1.37', version: '1.38',
anticensorityPacUrls: [ anticensorityPacUrls: [
...pacUrls, ...pacUrls,
], ],