Merge pull request #3 from sn-o-w/zeroomega

Trivial refines
zero-peak · Dec 19, 2024 · f4a5117 · f4a5117
2 parents f14c776 + 6a58625
commit f4a5117
Showing 5 changed files with 20 additions and 23 deletions.
diff --git a/omega-target-chromium-extension/src/module/tabs.coffee b/omega-target-chromium-extension/src/module/tabs.coffee
@@ -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) ->
@@ -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)
     )
@@ -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)

diff --git a/omega-web/src/less/popup.less b/omega-web/src/less/popup.less
@@ -87,6 +87,10 @@ li > a {
   box-shadow: none !important;
 }
 
+ul.dropdown-menu {
+  position: relative;
+}
+
 li .dropdown-menu {
   position: static;
   top: initial;

diff --git a/omega-web/src/options.jade b/omega-web/src/options.jade
@@ -52,7 +52,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}')

diff --git a/omega-web/src/partials/profile_pac.jade b/omega-web/src/partials/profile_pac.jade
@@ -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')
diff --git a/omega-web/src/partials/profile_rule_list.jade b/omega-web/src/partials/profile_rule_list.jade
@@ -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')