Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

shifted a smidge of logic lower per suggestion by jonathansampson #7437

Merged
merged 1 commit into from
Mar 2, 2017
Merged

shifted a smidge of logic lower per suggestion by jonathansampson #7437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/common/state/extensionState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,6 @@ const extensionState = {
tabId = tabId ? tabId.toString() : '-1'
let basePath = browserAction.get('base_path')
if (basePath) {
let baseIcons16 = browserAction.getIn(['icons', '16'])
let baseIcons48 = browserAction.getIn(['icons', '48'])
if (baseIcons16 && baseIcons48) {
return `-webkit-image-set(
url(${basePath}/${baseIcons16}) 1x,
url(${basePath}/${baseIcons48}) 2x`
}
let baseIcons19 = browserAction.getIn(['icons', '19'])
let baseIcons38 = browserAction.getIn(['icons', '38'])
if (baseIcons19 && baseIcons38) {
Expand All @@ -119,6 +112,13 @@ const extensionState = {
url(${basePath}/${basePath19}) 1x,
url(${basePath}/${basePath38}) 2x`
}
let baseIcons16 = browserAction.getIn(['icons', '16'])
let baseIcons48 = browserAction.getIn(['icons', '48'])
if (baseIcons16 && baseIcons48) {
return `-webkit-image-set(
url(${basePath}/${baseIcons16}) 1x,
url(${basePath}/${baseIcons48}) 2x`
}
}
return ''
},
Expand Down