Verified Commit 29744944 authored by Alex Catarineu's avatar Alex Catarineu Committed by Georg Koppen
Browse files

Remove code dealing with torbutton UI button in toolbar

The torbutton does not exist anymore, so removing related
code that is now unused, like the new browser version
flashing warning and others.

Closes #28745.
parent 4a258f42
......@@ -161,9 +161,6 @@ var torbutton_tor_check_observer = {
observe: function(subject, topic, data)
{
if (topic == k_tb_tor_check_failed_topic) {
// Update toolbar icon and tooltip.
torbutton_update_toolbutton();
// Update all open about:tor pages.
torbutton_abouttor_message_handler.updateAllOpenPages();
......@@ -187,16 +184,6 @@ var torbutton_tor_check_observer = {
},
};
function torbutton_init_toolbutton()
{
try {
torbutton_log(3, "Initializing the Torbutton button.");
torbutton_update_toolbutton();
} catch(e) {
torbutton_log(4, "Error Initializing Torbutton button: "+e);
}
}
function torbutton_is_mobile() {
return Services.appinfo.OS === "Android";
}
......@@ -288,14 +275,9 @@ torbutton_init = function() {
setupPreferencesForMobile();
// listen for our toolbar button being added so we can initialize it
torbutton_init_toolbutton();
torbutton_log(1, "registering Tor check observer");
torbutton_tor_check_observer.register();
torbutton_update_toolbutton();
try {
createTorCircuitDisplay("extensions.torbutton.display_circuit");
} catch(e) {
......@@ -427,39 +409,6 @@ function torbutton_confirm_plugins() {
}
}
// Bug 1506 P2: It might be nice to let people move the button around, I guess?
function torbutton_get_toolbutton() {
var o_toolbutton = false;
torbutton_log(1, 'get_toolbutton(): looking for button element');
if (document.getElementById("torbutton-button")) {
o_toolbutton = document.getElementById("torbutton-button");
} else if (document.getElementById("torbutton-button-tb")) {
o_toolbutton = document.getElementById("torbutton-button-tb");
} else if (document.getElementById("torbutton-button-tb-msg")) {
o_toolbutton = document.getElementById("torbutton-button-tb-msg");
} else {
torbutton_log(3, 'get_toolbutton(): did not find torbutton-button');
}
return o_toolbutton;
}
function torbutton_update_toolbutton()
{
let o_toolbutton = torbutton_get_toolbutton();
if (!o_toolbutton) return;
let isOK = torbutton_tor_check_ok();
let tbstatus = isOK ? "on" : "off";
o_toolbutton.setAttribute("tbstatus", tbstatus);
let tooltipKey = isOK ? "torbutton.panel.label.enabled"
: "torbutton.panel.label.disabled";
o_toolbutton.setAttribute("tooltiptext",
torbutton_get_property_string(tooltipKey));
}
// Bug 1506 P4: Control port interaction. Needed for New Identity.
function torbutton_socket_readline(input) {
var str = "";
......@@ -1005,7 +954,6 @@ function torbutton_do_tor_check()
else {
// The check failed. Update toolbar icon and tooltip.
checkSvc.statusOfTorCheck = checkSvc.kCheckFailed;
torbutton_update_toolbutton();
}
}
else {
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
......@@ -11,10 +11,6 @@ torbutton.circuit_display.learn_more = تعرّف على المزيد
torbutton.circuit_display.click_to_copy = انقر للنسخ
torbutton.circuit_display.copied = تم النسخ!
torbutton.content_sizer.margin_tooltip = يضيف متصفح تور هذا الهامش لجعل عرض وارتفاع نافذتك غير مميزين، لتقليل إمكانية اقتفاء أثرك عبر الإنترنت.
torbutton.panel.tooltip.disabled = انقر لتفعيل تور
torbutton.panel.tooltip.enabled = انقر لتعطيل تور
torbutton.panel.label.disabled = تور معطّل
torbutton.panel.label.enabled = تور مفعّل
extensions.torbutton@torproject.org.description = زر تور يوفر زر لتعديل إعدادات تور وايضاً لمسح بيانات التصفح الخاصة بك بسرعة وبسهولة.
torbutton.popup.external.title = هل تريد تنزيل ملف خارجي؟
torbutton.popup.external.app = لا يمكن لمتصفّح تور عرض هذه الملف، يجب عليك أن تفتحه باستعمال تطبيق آخر.\n\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
torbutton.panel.tooltip.disabled = Toru yandırmaq üçün kliklə
torbutton.panel.tooltip.enabled = Toru söndürmək üçün kliklə
torbutton.panel.label.disabled = Tor sönülüdür
torbutton.panel.label.enabled = Tor yanılıdır
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Xarici məzmun yüklənsin?
torbutton.popup.external.app = İdarə etmək üçün xarici tətbiqə ehtiyac duyulur:\n\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
torbutton.panel.tooltip.disabled = Tor အသံုးျပဳခြင့္ ျပဳႏုိင္ရန္ ကလစ္လုပ္ပါ
torbutton.panel.tooltip.enabled = Tor အသံုးျပဳခြင့္ ပိတ္ပင္ရန္ ကလစ္လုပ္ပါ
torbutton.panel.label.disabled = Tor အသံုးမျပဳႏုိင္ပါ
torbutton.panel.label.enabled = Tor အသံုးျပဳႏုိင္ပါသည္။
extensions.{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}.description = Tor proxy ကုိ Firefox တြင္ အလြယ္တကူ အသံုးျပဳခြင့္ ျပဳရန္/ မျပဳရန္ Torbutton မွ ခလုပ္တစ္ခုကုိ ထည့္သြင္းထားပါသည္
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
......@@ -11,10 +11,6 @@ torbutton.circuit_display.learn_more = আরও জানুন
torbutton.circuit_display.click_to_copy = অনুলিপি করতে ক্লিক করো
torbutton.circuit_display.copied = অনুলিপিত!
torbutton.content_sizer.margin_tooltip = টর ব্রাউজার আপনার উইন্ডো প্রস্থ এবং উচ্চতা নিখুঁত করতে এই মার্জিন যোগ করে, এবং এইভাবে মানুষ আপনাকে অনলাইন ট্র্যাক করার ক্ষমতা হ্রাস করে।
torbutton.panel.tooltip.disabled = টর সক্রিয় করতে ক্লিক করুন
torbutton.panel.tooltip.enabled = টর অক্ষম করতে ক্লিক করুন
torbutton.panel.label.disabled = টর অক্ষম
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton টর সেটিংস কনফিগার করার জন্য একটি বোতাম সরবরাহ করে এবং ব্যক্তিগত ব্রাউজিং ডেটা দ্রুত এবং সহজে পরিষ্কার করে।
torbutton.popup.external.title = একটি বাহ্যিক ফাইল টাইপ ডাউনলোড করবেন?
torbutton.popup.external.app = টর ব্রাউজার এই ফাইলটি প্রদর্শন করতে পারে না। আপনি এটি অন্য অ্যাপ্লিকেশন দিয়ে খুলতে হবে।\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
......@@ -11,10 +11,6 @@ torbutton.circuit_display.learn_more = Apreneu-ne més
torbutton.circuit_display.click_to_copy = Feu clic per a copiar
torbutton.circuit_display.copied = S'ha copiat!
torbutton.content_sizer.margin_tooltip = El navegador Tor afegeix aquest marge per a minorar la diferència de alçada i amplada de la finestra, això fa reduir la capacitat de rastrejar-te.
torbutton.panel.tooltip.disabled = Feu clic per activar Tor
torbutton.panel.tooltip.enabled = Feu clic per desactivar Tor
torbutton.panel.label.disabled = Tor està desactivat
torbutton.panel.label.enabled = Tor està activat
extensions.torbutton@torproject.org.description = Torbutton permet accedir a la configuració de Tor i esborrar fàcilment i ràpidament les dades privades de navegació per internet.
torbutton.popup.external.title = Voleu descarregar un tipus de fitxer extern?
torbutton.popup.external.app = Tor Browser no pot visualitzar aquest fitxer. Cal obrir-lo amb una altra aplicació.\n\n
......
......@@ -11,10 +11,6 @@ torbutton.circuit_display.learn_more = Zjistit více
torbutton.circuit_display.click_to_copy = Kliknutím zkopírujte
torbutton.circuit_display.copied = Zkopírováno!
torbutton.content_sizer.margin_tooltip = Prohlížeč Tor upravuje velikost vašeho okna, aby znesnadnil možnost vašeho vysledování.
torbutton.panel.tooltip.disabled = Klepněte pro zapnutí Toru
torbutton.panel.tooltip.enabled = Klepněte pro vypnutí Toru
torbutton.panel.label.disabled = Tor vypnut
torbutton.panel.label.enabled = Tor zapnut
extensions.torbutton@torproject.org.description = TorButton je tlačítko pro nastavení Toru a rychlé a jednoduché smazání soukromých údajů o vašem prohlížení.
torbutton.popup.external.title = Stáhnout externí soubor?
torbutton.popup.external.app = Prohlížeč Tor nemůže zobrazit tento soubor. Budete ho muset otevřít v jiné aplikaci.\n\n
......
torbutton.panel.tooltip.disabled = Click to enable Tor
torbutton.panel.tooltip.enabled = Click to disable Tor
torbutton.panel.label.disabled = Tor Disabled
torbutton.panel.label.enabled = Tor Enabled
extensions.torbutton@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
torbutton.popup.external.title = Load external content?
torbutton.popup.external.app = An external application is needed to handle:\n\n
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment