Add option for putting new conditions to the bottom. Fix #680.

2025-01-22 15:08:12 -05:00 · 2017-08-19 00:31:13 -04:00 · 2017-08-19 00:31:13 -04:00 · bc317e0fbc
commit bc317e0fbc
parent ddf9f47c4d
23 changed files with 76 additions and 5 deletions
--- a/omega-locales/ach/LC_MESSAGES/omega-web.po
+++ b/omega-locales/ach/LC_MESSAGES/omega-web.po
@ -262,6 +262,9 @@ msgstr "Refresh current tab on profile change."
 msgid "options_showInspectMenu"
 msgstr "Allow inspecting proxy used for page elements via context menu."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Keyboard Shortcut"

--- a/omega-locales/cs/LC_MESSAGES/omega-web.po
+++ b/omega-locales/cs/LC_MESSAGES/omega-web.po
@ -264,6 +264,9 @@ msgstr "Obnovit aktuální záložku na změnu profilu."
 msgid "options_showInspectMenu"
 msgstr "Povolit kontrolu proxy pro prvky stránky přes kontextové menu."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Klávesnicové zkratky"

--- a/omega-locales/de/LC_MESSAGES/omega-web.po
+++ b/omega-locales/de/LC_MESSAGES/omega-web.po
@ -267,6 +267,9 @@ msgstr "Refresh current tab on profile change."
 msgid "options_showInspectMenu"
 msgstr "Allow inspecting proxy used for page elements via context menu."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Keyboard Shortcut"

--- a/omega-locales/en_US/LC_MESSAGES/omega-web.po
+++ b/omega-locales/en_US/LC_MESSAGES/omega-web.po
@ -263,6 +263,9 @@ msgstr "Refresh current tab on profile change."
 msgid "options_showInspectMenu"
 msgstr "Allow inspecting proxy used for page elements via context menu."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Keyboard Shortcut"

--- a/omega-locales/es/LC_MESSAGES/omega-web.po
+++ b/omega-locales/es/LC_MESSAGES/omega-web.po
@ -275,6 +275,9 @@ msgstr ""
 "Permitir inspeccionar el proxy utilizado por cada elemento de la página a "
 "través del menú contextual."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Atajo de teclado"

--- a/omega-locales/es_AR/LC_MESSAGES/omega-web.po
+++ b/omega-locales/es_AR/LC_MESSAGES/omega-web.po
@ -267,6 +267,9 @@ msgstr "Refresh current tab on profile change."
 msgid "options_showInspectMenu"
 msgstr "Allow inspecting proxy used for page elements via context menu."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Keyboard Shortcut"

--- a/omega-locales/fa/LC_MESSAGES/omega-web.po
+++ b/omega-locales/fa/LC_MESSAGES/omega-web.po
@ -270,6 +270,9 @@ msgstr ""
 "مجوز برای بررسی پروکسی مورد استفاده برای یک المان صفحه در منوی زمنیه ("
 "context menu)."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "میانبرهای کیبرد"

--- a/omega-locales/fr/LC_MESSAGES/omega-web.po
+++ b/omega-locales/fr/LC_MESSAGES/omega-web.po
@ -264,6 +264,9 @@ msgstr "Refresh current tab on profile change."
 msgid "options_showInspectMenu"
 msgstr "Allow inspecting proxy used for page elements via context menu."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Keyboard Shortcut"

--- a/omega-locales/is/LC_MESSAGES/omega-web.po
+++ b/omega-locales/is/LC_MESSAGES/omega-web.po
@ -218,6 +218,9 @@ msgstr ""
 msgid "options_showInspectMenu"
 msgstr ""

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr ""

--- a/omega-locales/ja/LC_MESSAGES/omega-web.po
+++ b/omega-locales/ja/LC_MESSAGES/omega-web.po
@ -259,6 +259,9 @@ msgstr "プロファイルの変更にともなって現在のタブを更新す
 msgid "options_showInspectMenu"
 msgstr "Allow inspecting proxy used for page elements via context menu."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "キーボードショートカット"

--- a/omega-locales/nb_NO/LC_MESSAGES/omega-web.po
+++ b/omega-locales/nb_NO/LC_MESSAGES/omega-web.po
@ -226,6 +226,9 @@ msgstr "Gjenoppfrisk gjeldende fane ved profilendring."
 msgid "options_showInspectMenu"
 msgstr ""

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Tastatursnarvei"

--- a/omega-locales/nl/LC_MESSAGES/omega-web.po
+++ b/omega-locales/nl/LC_MESSAGES/omega-web.po
@ -208,6 +208,9 @@ msgstr ""
 msgid "options_showInspectMenu"
 msgstr ""

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr ""

--- a/omega-locales/pt_BR/LC_MESSAGES/omega-web.po
+++ b/omega-locales/pt_BR/LC_MESSAGES/omega-web.po
@ -263,6 +263,9 @@ msgstr "Refresh current tab on profile change."
 msgid "options_showInspectMenu"
 msgstr "Allow inspecting proxy used for page elements via context menu."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Keyboard Shortcut"

--- a/omega-locales/ru/LC_MESSAGES/omega-web.po
+++ b/omega-locales/ru/LC_MESSAGES/omega-web.po
@ -267,6 +267,9 @@ msgstr "Refresh current tab on profile change."
 msgid "options_showInspectMenu"
 msgstr "Allow inspecting proxy used for page elements via context menu."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Keyboard Shortcut"

--- a/omega-locales/sk/LC_MESSAGES/omega-web.po
+++ b/omega-locales/sk/LC_MESSAGES/omega-web.po
@ -217,6 +217,9 @@ msgstr ""
 msgid "options_showInspectMenu"
 msgstr ""

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr ""

--- a/omega-locales/sl/LC_MESSAGES/omega-web.po
+++ b/omega-locales/sl/LC_MESSAGES/omega-web.po
@ -219,6 +219,9 @@ msgstr ""
 msgid "options_showInspectMenu"
 msgstr ""

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr ""

--- a/omega-locales/tr/LC_MESSAGES/omega-web.po
+++ b/omega-locales/tr/LC_MESSAGES/omega-web.po
@ -266,6 +266,9 @@ msgstr "Refresh current tab on profile change."
 msgid "options_showInspectMenu"
 msgstr "Allow inspecting proxy used for page elements via context menu."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Keyboard Shortcut"

--- a/omega-locales/uk/LC_MESSAGES/omega-web.po
+++ b/omega-locales/uk/LC_MESSAGES/omega-web.po
@ -288,6 +288,9 @@ msgstr ""
 "Дозволити з'ясування, які проксі-сервери використовуватимуться для елементів "
 "сторінки за допомогою контекстного меню."

+msgid "options_addConditionsToBottom"
+msgstr "Put new conditions added using the popup to the bottom of the list."
+
 msgid "options_group_keyboardShortcut"
 msgstr "Клавіатурні скорочення"

--- a/omega-locales/zh_CN/LC_MESSAGES/omega-web.po
+++ b/omega-locales/zh_CN/LC_MESSAGES/omega-web.po
@ -245,6 +245,9 @@ msgstr "当更改情景模式时刷新当前标签。"
 msgid "options_showInspectMenu"
 msgstr "右键菜单中，可检查网页元素所使用的代理。"

+msgid "options_addConditionsToBottom"
+msgstr "把以弹出菜单创建的规则添加到列表末尾。"
+
 msgid "options_group_keyboardShortcut"
 msgstr "键盘快捷键"

--- a/omega-locales/zh_TW/LC_MESSAGES/omega-web.po
+++ b/omega-locales/zh_TW/LC_MESSAGES/omega-web.po
@ -245,6 +245,9 @@ msgstr "當更改情景模式時刷新當前標籤。"
 msgid "options_showInspectMenu"
 msgstr "右鍵選單中，可檢查網頁元素所使用的代理。"

+msgid "options_addConditionsToBottom"
+msgstr "把以彈出菜單創建的規則添加到列表末尾。"
+
 msgid "options_group_keyboardShortcut"
 msgstr "鍵盤快捷鍵"

--- a/omega-target/src/default_options.coffee
+++ b/omega-target/src/default_options.coffee
@ -7,6 +7,7 @@ module.exports = ->
  "-revertProxyChanges": true
  "-confirmDeletion": true
  "-showInspectMenu": true
+  "-addConditionsToBottom": false
  "-showExternalProfile": true
  "-downloadInterval": 1440
  "+proxy":
--- a/omega-target/src/options.coffee
+++ b/omega-target/src/options.coffee
@ -852,11 +852,17 @@ class Options
          profile.rules.splice(i, 1)
          break

-      # Add the new rule to the start so that it won't be shadowed by others.
-      profile.rules.unshift({
-        condition: cond
-        profileName: profileName
-      })
+
+      if @_options['-addConditionsToBottom']
+        profile.rules.push({
+          condition: cond
+          profileName: profileName
+        })
+      else
+        profile.rules.unshift({
+          condition: cond
+          profileName: profileName
+        })

    OmegaPac.Profiles.updateRevision(profile)
    changes = {}
--- a/omega-web/src/partials/ui.jade
+++ b/omega-web/src/partials/ui.jade
@ -14,6 +14,10 @@ section.settings-group
    label
      input(type='checkbox' ng-model='options["-showInspectMenu"]')
      span {{'options_showInspectMenu' | tr}}
+  div.checkbox
+    label
+      input(type='checkbox' ng-model='options["-addConditionsToBottom"]')
+      span {{'options_addConditionsToBottom' | tr}}
 section.settings-group
  h3 {{'options_group_keyboardShortcut' | tr}}
  p