toolkit/content/charsetOverlay.xul

Sat, 03 Jan 2015 20:18:00 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 03 Jan 2015 20:18:00 +0100
branch
TOR_BUG_3246
changeset 7
129ffea94266
permissions
-rw-r--r--

Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.

     1 <?xml version="1.0"?> 
     2 <!-- This Source Code Form is subject to the terms of the Mozilla Public
     3    - License, v. 2.0. If a copy of the MPL was not distributed with this
     4    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
     7 <!DOCTYPE  overlay SYSTEM "chrome://global/locale/charsetOverlay.dtd">
     9 <overlay id="charsetOverlay"
    10     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    11     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
    13     <script type="application/javascript" src="chrome://global/content/charsetOverlay.js"/>
    15     <!-- Composer Charset Menu -->
    16     <menu id="composerCharsetMenu" label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;" datasources="rdf:charset-menu" ref="NC:ComposerCharsetMenuRoot" oncommand="ComposerMultiplexHandler(event)" onpopupshowing="CreateMenu('composer');UpdateMenus()" onpopupshown="CreateMenu('more-menu');">
    17         <template>
    18             <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
    19                 <menupopup>
    20                 <menuseparator uri="..." />
    21                 </menupopup>
    22             </rule>
    23             <rule>
    24                 <menupopup>
    25                 <menuitem type="radio" name="charsetGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
    26                 </menupopup>
    27             </rule>
    28         </template>
    30         <menupopup id="composerCharsetMenuPopup">
    31         <menu label="&charsetMenuAutodet.label;" accesskey="&charsetMenuAutodet.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserAutodetMenuRoot">
    32             <template>
    33                 <rule rdf:type="http://home.netscape.com/NC-rdf#CharsetDetector">
    34                     <menupopup>
    35                     <menuitem type="radio" name="detectorGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
    36                     </menupopup>
    37                 </rule>
    38             </template>
    39             <menupopup>
    40             </menupopup>
    41         </menu>
    42         <menu label="&charsetMenuMore.label;" accesskey="&charsetMenuMore.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMoreCharsetMenuRoot">
    43             <template>
    44                 <rule>
    45                     <menupopup>
    46                     <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
    47                     </menupopup>
    48                 </rule>
    49             </template>
    50             <menupopup>
    51                 <menu label="&charsetMenuMore1.label;" accesskey="&charsetMenuMore1.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore1CharsetMenuRoot">
    52                     <template>
    53                         <rule>
    54                             <menupopup>
    55                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
    56                             </menupopup>
    57                         </rule>
    58                     </template>
    59                     <menupopup>
    60                     </menupopup>
    61                 </menu>
    62                 <menu label="&charsetMenuMore2.label;" accesskey="&charsetMenuMore2.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore2CharsetMenuRoot">
    63                     <template>
    64                         <rule>
    65                             <menupopup>
    66                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
    67                             </menupopup>
    68                         </rule>
    69                     </template>
    70                     <menupopup>
    71                     </menupopup>
    72                 </menu>
    73                 <menu label="&charsetMenuMore3.label;" accesskey="&charsetMenuMore3.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore3CharsetMenuRoot">
    74                     <template>
    75                         <rule>
    76                             <menupopup>
    77                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
    78                             </menupopup>
    79                         </rule>
    80                     </template>
    81                     <menupopup>
    82                     </menupopup>
    83                 </menu>
    84                 <menu label="&charsetMenuMore4.label;" accesskey="&charsetMenuMore4.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore4CharsetMenuRoot">
    85                     <template>
    86                         <rule>
    87                             <menupopup>
    88                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
    89                             </menupopup>
    90                         </rule>
    91                     </template>
    92                     <menupopup>
    93                     </menupopup>
    94                 </menu>
    95                 <menu label="&charsetMenuMore5.label;" accesskey="&charsetMenuMore5.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore5CharsetMenuRoot">
    96                     <template>
    97                         <rule>
    98                             <menupopup>
    99                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   100                             </menupopup>
   101                         </rule>
   102                     </template>
   103                     <menupopup>
   104                     </menupopup>
   105                 </menu>
   106                 <menuseparator />
   107             </menupopup>
   108         </menu>
   109         <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
   110         </menupopup>
   111     </menu>
   113     <!-- Mail View Charset Menu -->
   114     <menu id="mailviewCharsetMenu" label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;" datasources="rdf:charset-menu" ref="NC:MailviewCharsetMenuRoot" oncommand="MailMultiplexHandler(event)" onpopupshowing="CreateMenu('mailview');UpdateMailMenus()" onpopupshown="CreateMenu('more-menu');">
   115         <template>
   116             <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
   117                 <menupopup>
   118                 <menuseparator uri="..." />
   119                 </menupopup>
   120             </rule>
   121             <rule>
   122                 <menupopup>
   123                 <menuitem type="radio" name="charsetGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   124                 </menupopup>
   125             </rule>
   126         </template>
   128         <menupopup>
   129         <menu label="&charsetMenuAutodet.label;" accesskey="&charsetMenuAutodet.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserAutodetMenuRoot">
   130             <template>
   131                 <rule rdf:type="http://home.netscape.com/NC-rdf#CharsetDetector">
   132                     <menupopup>
   133                     <menuitem type="radio" name="detectorGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   134                     </menupopup>
   135                 </rule>
   136             </template>
   137             <menupopup>
   138             </menupopup>
   139         </menu>
   140         <menu label="&charsetMenuMore.label;" accesskey="&charsetMenuMore.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMoreCharsetMenuRoot">
   141             <template>
   142                 <rule>
   143                     <menupopup>
   144                     <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   145                     </menupopup>
   146                 </rule>
   147             </template>
   148             <menupopup>
   149                 <menu label="&charsetMenuMore1.label;"  datasources="rdf:charset-menu" ref="NC:BrowserMore1CharsetMenuRoot">
   150                     <template>
   151                         <rule>
   152                             <menupopup>
   153                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   154                             </menupopup>
   155                         </rule>
   156                     </template>
   157                     <menupopup>
   158                     </menupopup>
   159                 </menu>
   160                 <menu label="&charsetMenuMore2.label;"  datasources="rdf:charset-menu" ref="NC:BrowserMore2CharsetMenuRoot">
   161                     <template>
   162                         <rule>
   163                             <menupopup>
   164                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   165                             </menupopup>
   166                         </rule>
   167                     </template>
   168                     <menupopup>
   169                     </menupopup>
   170                 </menu>
   171                 <menu label="&charsetMenuMore3.label;"  datasources="rdf:charset-menu" ref="NC:BrowserMore3CharsetMenuRoot">
   172                     <template>
   173                         <rule>
   174                             <menupopup>
   175                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   176                             </menupopup>
   177                         </rule>
   178                     </template>
   179                     <menupopup>
   180                     </menupopup>
   181                 </menu>
   182                 <menu label="&charsetMenuMore4.label;"  datasources="rdf:charset-menu" ref="NC:BrowserMore4CharsetMenuRoot">
   183                     <template>
   184                         <rule>
   185                             <menupopup>
   186                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   187                             </menupopup>
   188                         </rule>
   189                     </template>
   190                     <menupopup>
   191                     </menupopup>
   192                 </menu>
   193                 <menu label="&charsetMenuMore5.label;"  datasources="rdf:charset-menu" ref="NC:BrowserMore5CharsetMenuRoot">
   194                     <template>
   195                         <rule>
   196                             <menupopup>
   197                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   198                             </menupopup>
   199                         </rule>
   200                     </template>
   201                     <menupopup>
   202                     </menupopup>
   203                 </menu>
   204                 <menuseparator />
   205             </menupopup>
   206         </menu>
   207         <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
   208         </menupopup>
   209     </menu>
   211     <!-- Mail Edit Charset Menu -->
   212     <menu id="maileditCharsetMenu" label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;" datasources="rdf:charset-menu" ref="NC:MaileditCharsetMenuRoot" oncommand="SetDocumentCharacterSet(event.target.getAttribute('id'));" onpopupshowing="CreateMenu('mailedit');InitCharsetMenuCheckMark();" onpopupshown="CreateMenu('more-menu');">
   213         <template>
   214             <rule>
   215                 <menupopup>
   216                 <menuitem type="radio" name="charsetGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   217                 </menupopup>
   218             </rule>
   219         </template>
   221         <menupopup>
   222         <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'mailedit')"/>
   223         <menuseparator />
   224         </menupopup>
   225     </menu>
   227     <!-- Charset Menu -->
   228     <menu id="charsetMenu" label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserCharsetMenuRoot" oncommand="MultiplexHandler(event)" onpopupshowing="CreateMenu('browser');UpdateMenus(event)" onpopupshown="CreateMenu('more-menu');">
   229         <template>
   230             <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
   231                 <menupopup>
   232                 <menuseparator uri="..." />
   233                 </menupopup>
   234             </rule>
   235             <rule>
   236                 <menupopup>
   237                 <menuitem type="radio" name="charsetGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   238                 </menupopup>
   239             </rule>
   240         </template>
   242         <menupopup>
   243         <menu label="&charsetMenuAutodet.label;" accesskey="&charsetMenuAutodet.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserAutodetMenuRoot">
   244             <template>
   245                 <rule rdf:type="http://home.netscape.com/NC-rdf#CharsetDetector">
   246                     <menupopup>
   247                     <menuitem type="radio" name="detectorGroup" checked="rdf:http://home.netscape.com/NC-rdf#Checked" uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   248                     </menupopup>
   249                 </rule>
   250             </template>
   251             <menupopup>
   252             </menupopup>
   253         </menu>
   254         <menu label="&charsetMenuMore.label;" accesskey="&charsetMenuMore.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMoreCharsetMenuRoot">
   255             <template>
   256                 <rule>
   257                     <menupopup>
   258                     <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   259                     </menupopup>
   260                 </rule>
   261             </template>
   262             <menupopup>
   263                 <menu label="&charsetMenuMore1.label;" accesskey="&charsetMenuMore1.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore1CharsetMenuRoot">
   264                     <template>
   265                         <rule>
   266                             <menupopup>
   267                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   268                             </menupopup>
   269                         </rule>
   270                     </template>
   271                     <menupopup>
   272                     </menupopup>
   273                 </menu>
   274                 <menu label="&charsetMenuMore2.label;" accesskey="&charsetMenuMore2.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore2CharsetMenuRoot">
   275                     <template>
   276                         <rule>
   277                             <menupopup>
   278                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   279                             </menupopup>
   280                         </rule>
   281                     </template>
   282                     <menupopup>
   283                     </menupopup>
   284                 </menu>
   285                 <menu label="&charsetMenuMore3.label;" accesskey="&charsetMenuMore3.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore3CharsetMenuRoot">
   286                     <template>
   287                         <rule>
   288                             <menupopup>
   289                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   290                             </menupopup>
   291                         </rule>
   292                     </template>
   293                     <menupopup>
   294                     </menupopup>
   295                 </menu>
   296                 <menu label="&charsetMenuMore4.label;" accesskey="&charsetMenuMore4.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore4CharsetMenuRoot">
   297                     <template>
   298                         <rule>
   299                             <menupopup>
   300                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   301                             </menupopup>
   302                         </rule>
   303                     </template>
   304                     <menupopup>
   305                     </menupopup>
   306                 </menu>
   307                 <menu label="&charsetMenuMore5.label;" accesskey="&charsetMenuMore5.accesskey;" datasources="rdf:charset-menu" ref="NC:BrowserMore5CharsetMenuRoot">
   308                     <template>
   309                         <rule>
   310                             <menupopup>
   311                             <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
   312                             </menupopup>
   313                         </rule>
   314                     </template>
   315                     <menupopup>
   316                     </menupopup>
   317                 </menu>
   318                 <menuseparator />
   319             </menupopup>
   320         </menu>
   321         <menuitem name="charsetCustomize" accesskey="&charsetCustomize.accesskey;" label="&charsetCustomize.label;" oncommand="window.openDialog('chrome://global/content/customizeCharset.xul','PrefWindow', 'chrome,modal=yes,resizable=yes', 'browser')"/>
   322         </menupopup>
   323     </menu>
   325 </overlay>      

mercurial