Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 13 additions & 20 deletions omega-target-chromium-extension/src/module/tabs.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,15 @@ class ChromeTabs
tabs.forEach (tab) =>
@_dirtyTabs[tab.id] = tab.id
@onUpdated tab.id, {}, tab if tab.active
if chrome.action.setPopup?
chrome.action.setTitle({title: action.title})
else
chrome.action.setTitle({title: action.shortTitle})
title = if @_canSetPopup() then action.title else action.shortTitle
chrome.action.setTitle({title: title})
@setIcon(action.icon)

onUpdated: (tabId, changeInfo, tab) ->
if @_dirtyTabs.hasOwnProperty(tab.id)
delete @_dirtyTabs[tab.id]
else if not changeInfo.url?
if changeInfo.status? and changeInfo.status != 'loading'
return
else if not changeInfo.url? and changeInfo.status == "complete"
return
@processTab(tab, changeInfo)

processTab: (tab, changeInfo) ->
Expand All @@ -58,10 +55,8 @@ class ChromeTabs
@clearIcon tab.id
return
@setIcon(action.icon, tab.id)
if chrome.action.setPopup?
chrome.action.setTitle({title: action.title, tabId: tab.id})
else
chrome.action.setTitle({title: action.shortTitle, tabId: tab.id})
title = if @_canSetPopup() then action.title else action.shortTitle
return chrome.action.setTitle({title: title, tabId: tab.id})
).catch((e) ->
console.log('error:', e)
)
Expand All @@ -77,17 +72,15 @@ class ChromeTabs

setIcon: (icon, tabId) ->
return unless icon?
if tabId?
params = {
imageData: icon
tabId: tabId
}
else
params = {
imageData: icon
}
params = {
imageData: icon
}
params.tabId = tabId if tabId?
@_chromeSetIcon(params)

_canSetPopup: ->
chrome.action.setPopup?

_chromeSetIcon: (params) ->
try
chrome.action.setIcon?(params, @ignoreError)
Expand Down
4 changes: 4 additions & 0 deletions omega-web/src/less/popup.less
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ li > a {
box-shadow: none !important;
}

ul.dropdown-menu {
position: relative;
}

li .dropdown-menu {
position: static;
top: initial;
Expand Down
2 changes: 1 addition & 1 deletion omega-web/src/options.jade
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ html(lang='en' ng-controller='MasterCtrl' ng-csp)
= ' '
span {{'options_newProfile' | tr}}
li.divider
li.nav-header Actions
li.nav-header {{'options_navHeader_actions' | tr}}
li
a.btn-default.btn.align-initial(role='button' ng-click='applyOptions()'
ng-class='{"btn-success": optionsDirty}')
Expand Down
2 changes: 1 addition & 1 deletion omega-web/src/partials/profile_pac.jade
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ div(ng-controller='PacProfileCtrl')
p.alert.alert-danger.width-limit(ng-show='profile.pacUrl && !profile.lastUpdate')
| {{'options_pacScriptObsolete' | tr}}
textarea.monospace.form-control.width-limit(ng-model='profile.pacScript' rows=20
ng-disabled='pacUrlCtrl.ctrl.$invalid || !!profile.pacUrl')
ng-readonly='pacUrlCtrl.ctrl.$invalid || !!profile.pacUrl')
2 changes: 1 addition & 1 deletion omega-web/src/partials/profile_rule_list.jade
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ div(ng-controller='RuleListProfileCtrl')
ladda='updatingProfile[profile.name]' data-spinner-color="#000000")
| #[span.glyphicon.glyphicon-download-alt] {{'options_downloadProfileNow' | tr}}
textarea.monospace.form-control.width-limit(ng-model='profile.ruleList' rows=20
ng-disabled='!!profile.sourceUrl')
ng-readonly='!!profile.sourceUrl')