Commit 54bd3119 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! TB 3455: Add DomainIsolator, for isolating circuit by domain. 

Fixed oncommand
parent 09104f6b

browser/base/content/appmenu-viewcache.inc.xhtml

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
                     class="subviewbutton"

                     key="new-circuit-key"

                     data-l10n-id="appmenuitem-new-tor-circuit"

                     oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser.selectedBrowser);"/>

                     command="cmd_newCircuit"/>

      <toolbarseparator/>

      <toolbarbutton id="appMenu-bookmarks-button"

                     class="subviewbutton subviewbutton-nav"

browser/base/content/browser-menubar.inc

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
                          key="new-identity-key" data-l10n-id="menu-new-identity"/>

                <menuitem id="menu_newCircuit"

                          key="new-circuit-key" data-l10n-id="menu-new-tor-circuit"

                          oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser.selectedBrowser);"/>

                          command="cmd_newCircuit"/>

                <menuseparator/>

                <menuitem id="menu_openLocation"

                          hidden="true"

browser/base/content/browser-sets.inc

+3 −1
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ 
#ifdef XP_MACOSX

    <command id="zoomWindow" data-l10n-id="window-zoom-command" />

#endif



    <command id ="cmd_newCircuit" />

  </commandset>

#include ../../components/places/content/placesCommands.inc.xhtml
@@ -405,5 +407,5 @@ 
         internal="true"/>

#endif

    <key id="new-identity-key" modifiers="accel shift" key="U" command="cmd_newIdentity"/>

    <key id="new-circuit-key" modifiers="accel shift" key="L" oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser.selectedBrowser)"/>

    <key id="new-circuit-key" modifiers="accel shift" key="L" command="cmd_newCircuit"/>

  </keyset>

browser/base/content/browser-sets.js

+3 −0
Original line number Diff line number Diff line
@@ -250,6 +250,9 @@ document.addEventListener( 
          case "cmd_newIdentity":

            NewIdentityButton.onCommand(event);

            break;

          case "cmd_newCircuit":

            TorDomainIsolator.newCircuitForBrowser(gBrowser.selectedBrowser);

            break;

        }

      });

browser/base/content/navigator-toolbox.inc.xhtml

+1 −2
Original line number Diff line number Diff line
@@ -575,8 +575,7 @@ 
                   data-l10n-id="toolbar-new-identity"/>



    <toolbarbutton id="new-circuit-button" class="toolbarbutton-1 chromeclass-toolbar-additional"

                   data-l10n-id="toolbar-new-tor-circuit"

                   oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser.selectedBrowser);"/>

                   data-l10n-id="toolbar-new-tor-circuit"/>



    <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"

                   observes="View:FullScreen"