[or-cvs] r13568: Make the close on toggle into two options, one for tor tabs (in torbutton/trunk/src: chrome/content chrome/locale/de-AT chrome/locale/de-CH chrome/locale/de-DE chrome/locale/el-GR chrome/locale/en-US chrome/locale/es-AR chrome/locale/fr-FR chrome/locale/hr-HR chrome/locale/it-IT chrome/locale/nl-NL chrome/locale/pl-PL chrome/locale/pt-BR chrome/locale/ru-RU chrome/locale/sl-SI chrome/locale/zh-CN chrome/locale/zh-TW defaults/preferences)
mikeperry at seul.org
mikeperry at seul.org
Tue Feb 19 05:54:25 UTC 2008
Author: mikeperry
Date: 2008-02-19 00:54:25 -0500 (Tue, 19 Feb 2008)
New Revision: 13568
Modified:
torbutton/trunk/src/chrome/content/preferences.js
torbutton/trunk/src/chrome/content/preferences.xul
torbutton/trunk/src/chrome/content/torbutton.js
torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
torbutton/trunk/src/defaults/preferences/preferences.js
Log:
Make the close on toggle into two options, one for tor tabs
and one for non-tor tabs and add it to the prefs window. Make
it off by default.
Modified: torbutton/trunk/src/chrome/content/preferences.js
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.js 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/content/preferences.js 2008-02-19 05:54:25 UTC (rev 13568)
@@ -206,6 +206,8 @@
doc.getElementById('torbutton_blockNonTorForms').checked = o_torprefs.getBoolPref('block_ntforms');
doc.getElementById('torbutton_isolateContent').checked = o_torprefs.getBoolPref('isolate_content');
doc.getElementById('torbutton_noSearch').checked = o_torprefs.getBoolPref('no_search');
+ doc.getElementById('torbutton_closeTor').checked = o_torprefs.getBoolPref('close_tor');
+ doc.getElementById('torbutton_closeNonTor').checked = o_torprefs.getBoolPref('close_nontor');
doc.getElementById('torbutton_noUpdates').checked = o_torprefs.getBoolPref('no_updates');
doc.getElementById('torbutton_setUagent').checked = o_torprefs.getBoolPref('set_uagent');
doc.getElementById('torbutton_noReferer').checked = o_torprefs.getBoolPref('disable_referer');
@@ -298,6 +300,8 @@
o_torprefs.setBoolPref('block_tforms', doc.getElementById('torbutton_blockTorForms').checked);
o_torprefs.setBoolPref('block_ntforms', doc.getElementById('torbutton_blockNonTorForms').checked);
o_torprefs.setBoolPref('no_search', doc.getElementById('torbutton_noSearch').checked);
+ o_torprefs.setBoolPref('close_tor', doc.getElementById('torbutton_closeTor').checked);
+ o_torprefs.setBoolPref('close_nontor', doc.getElementById('torbutton_closeNonTor').checked);
o_torprefs.setBoolPref('no_updates', doc.getElementById('torbutton_noUpdates').checked);
o_torprefs.setBoolPref('set_uagent', doc.getElementById('torbutton_setUagent').checked);
Modified: torbutton/trunk/src/chrome/content/preferences.xul
===================================================================
--- torbutton/trunk/src/chrome/content/preferences.xul 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/content/preferences.xul 2008-02-19 05:54:25 UTC (rev 13568)
@@ -135,6 +135,10 @@
oncommand="torbutton_prefs_set_field_attributes(document)"/>
<checkbox id="torbutton_noSearch" label="&torbutton.prefs.no_search;"
oncommand="torbutton_prefs_set_field_attributes(document)"/>
+ <checkbox id="torbutton_closeTor" label="&torbutton.prefs.close_tor;"
+ oncommand="torbutton_prefs_set_field_attributes(document)"/>
+ <checkbox id="torbutton_closeNonTor" label="&torbutton.prefs.close_nontor;"
+ oncommand="torbutton_prefs_set_field_attributes(document)"/>
</vbox>
</tabpanel>
<tabpanel id="history">
Modified: torbutton/trunk/src/chrome/content/torbutton.js
===================================================================
--- torbutton/trunk/src/chrome/content/torbutton.js 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/content/torbutton.js 2008-02-19 05:54:25 UTC (rev 13568)
@@ -196,26 +196,6 @@
} else {
torbutton_enable_tor();
}
-
- if(m_tb_prefs.getBoolPref("extensions.torbutton.close_on_toggle")) {
- // 1. Open new tabbrowser in current window..
- var browser = getBrowser();
- var newb = browser.addTab("about:blank");
-
- // 2. Close all tabs in the current window except new one
- browser.removeAllTabsBut(newb);
-
- // 3. Close all other windows except this one
- var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
- .getService(Components.interfaces.nsIWindowMediator);
- var enumerator = wm.getEnumerator("navigator:browser");
- while(enumerator.hasMoreElements()) {
- var win = enumerator.getNext();
- if(win != window) {
- win.close(); // XXX: confirm?
- }
- }
- }
}
function torbutton_set_status() {
@@ -731,6 +711,46 @@
if(!changed && force_update)
return;
+ var close_tor = m_tb_prefs.getBoolPref("extensions.torbutton.close_tor");
+ var close_nontor = m_tb_prefs.getBoolPref("extensions.torbutton.close_nontor");
+
+ if((!close_tor && !mode) || (mode && !close_nontor)) {
+ torbutton_log(3, "Not closing tabs");
+ return;
+ }
+
+ torbutton_log(3, "Closing tabs");
+ var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+ .getService(Components.interfaces.nsIWindowMediator);
+ var enumerator = wm.getEnumerator("navigator:browser");
+ while(enumerator.hasMoreElements()) {
+ var win = enumerator.getNext();
+ var browser = win.getBrowser();
+ var tabs = browser.browsers.length;
+ var remove = new Array();
+ for(var i = 0; i < tabs; i++) {
+ if(browser.browsers[i].__tb_tor_fetched != mode) {
+ remove.push(browser.browsers[i]);
+ }
+ }
+
+ for(var i = 0; i < remove.length; i++) {
+ browser.removeTab(remove[i]);
+ }
+
+ torbutton_log(3, "Length: "+browser.browsers.length);
+
+ if(browser.browsers.length == 1
+ && browser.browsers[0].__tb_tor_fetched != mode) {
+ if(win != window) {
+ win.close();
+ } else {
+ var newb = browser.addTab("about:blank");
+ browser.removeAllTabsBut(newb);
+ }
+ }
+ }
+
if(torprefs.getBoolPref('clear_http_auth')) {
var auth = Components.classes["@mozilla.org/network/http-auth-manager;1"].
getService(Components.interfaces.nsIHttpAuthManager);
Modified: torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/de-AT/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/de-CH/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/de-DE/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/el-GR/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/en-US/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 50px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/es-AR/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/fr-FR/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/hr-HR/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/it-IT/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/nl-NL/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/pl-PL/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/pt-BR/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/ru-RU/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/sl-SI/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/zh-CN/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd
===================================================================
--- torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/chrome/locale/zh-TW/torbutton.dtd 2008-02-19 05:54:25 UTC (rev 13568)
@@ -69,3 +69,5 @@
<!ENTITY torbutton.prefs.clear_http_auth "Clear HTTP auth sessions (recommended)">
<!ENTITY torbutton.prefs.block_js_history "Block javascript access to history navigation (recommended)">
<!ENTITY torbutton.prefs.resize_on_toggle "Resize window dimensions to multiples of 40px on toggle (recommended)">
+<!ENTITY torbutton.prefs.close_tor "Close all Tor windows and tabs on toggle (optional)">
+<!ENTITY torbutton.prefs.close_nontor "Close all Non-Tor windows and tabs on toggle (optional)">
Modified: torbutton/trunk/src/defaults/preferences/preferences.js
===================================================================
--- torbutton/trunk/src/defaults/preferences/preferences.js 2008-02-19 05:49:27 UTC (rev 13567)
+++ torbutton/trunk/src/defaults/preferences/preferences.js 2008-02-19 05:54:25 UTC (rev 13568)
@@ -74,7 +74,8 @@
pref("extensions.torbutton.startup",false);
pref("extensions.torbutton.crashed",false);
pref("extensions.torbutton.clear_http_auth",true);
-pref("extensions.torbutton.close_on_toggle",false);
+pref("extensions.torbutton.close_tor",false);
+pref("extensions.torbutton.close_nontor",false);
pref("extensions.torbutton.block_js_history",true);
pref("extensions.torbutton.resize_on_toggle",true);
pref("extensions.torbutton.appname_override","Netscape");
More information about the tor-commits
mailing list