tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-03-13 08:28:13 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change profile icon drawing scheme. Fix #109. See also #107.

Browse Source
This commit is contained in:
FelisCatus 2014-12-27 19:20:36 +08:00
parent f42ae975a7
commit 811be9102f
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
omega-target-chromium-extension/background.coffee
View File

@ -76,6 +76,7 @@ actionForUrl = (url) ->
if result[0] == 'DIRECT' if result[0] == 'DIRECT'
details += chrome.i18n.getMessage('browserAction_directResult') details += chrome.i18n.getMessage('browserAction_directResult')
details += '\n' details += '\n'
direct = true
else else
details += "#{result[0]}\n" details += "#{result[0]}\n"
else if typeof result[1] == 'string' else if typeof result[1] == 'string'
@ -106,11 +107,10 @@ actionForUrl = (url) ->
profileColor = current.color profileColor = current.color
icon = null icon = null
if profile.name == current.name and options.isCurrentProfileStatic()
if direct if direct
resultColor = options.profile('direct').color resultColor = options.profile('direct').color
profileColor = profile.color profileColor = profile.color
else else if profile.name == current.name and options.isCurrentProfileStatic()
resultColor = profileColor = profile.color resultColor = profileColor = profile.color
icon = drawIcon(profile.color) icon = drawIcon(profile.color)
else else
@ -236,8 +236,13 @@ options.currentProfileChanged = (reason) ->
title = message + '\n' + title title = message + '\n' + title
options.setBadge() options.setBadge()
if not current.name or not OmegaPac.Profiles.isInclusive(current)
icon = drawIcon(current.color)
else
icon = drawIcon(options.profile('direct').color, current.color)
tabs.resetAll( tabs.resetAll(
icon: drawIcon(current.color) icon: icon
title: title title: title
) )