Bug 1576410 - Port |Bug 1215856 ":" should not be selected or copied in Title field| to SeaMonkey. r=frg a=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sat, 28 Sep 2019 18:16:29 +0200
changeset 32314 3f35f2caac8c39b0cf3b348660b9f4c8356fd642
parent 32313 0def45bb7f5de5ae0262c11f228d93bd79d9424a
child 32315 5c0d3f86a9a60c6728bd856313572004ce0b8064
push id219
push userfrgrahl@gmx.net
push dateSat, 28 Sep 2019 16:19:15 +0000
treeherdercomm-esr60@5c0d3f86a9a6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg, frg
bugs1576410, 1215856
Bug 1576410 - Port |Bug 1215856 ":" should not be selected or copied in Title field| to SeaMonkey. r=frg a=frg
suite/browser/pageinfo/pageInfo.js
suite/browser/pageinfo/pageInfo.xul
suite/locales/en-US/chrome/browser/pageInfo.dtd
suite/locales/en-US/chrome/browser/pageInfo.properties
--- a/suite/browser/pageinfo/pageInfo.js
+++ b/suite/browser/pageinfo/pageInfo.js
@@ -484,17 +484,17 @@ function openCacheEntry(key, cb)
   };
   diskStorage.asyncOpenURI(Services.io.newURI(key, null, null), "",
                            Ci.nsICacheStorage.OPEN_READONLY,
                            checkCacheListener);
 }
 
 function makeGeneralTab(metaViewRows, docInfo)
 {
-  var title = (docInfo.title) ? gBundle.getFormattedString("pageTitle", [docInfo.title]) : gBundle.getString("noPageTitle");
+  var title = (docInfo.title) ? docInfo.title : gBundle.getString("noPageTitle");
   document.getElementById("titletext").value = title;
 
   var url = docInfo.location.toString();
   setItemValue("urltext", url);
 
   var referrer = ("referrer" in docInfo && docInfo.referrer);
   setItemValue("refertext", referrer);
 
--- a/suite/browser/pageinfo/pageInfo.xul
+++ b/suite/browser/pageinfo/pageInfo.xul
@@ -110,24 +110,28 @@
              accesskey="&securityTab.accesskey;"/>
         <!-- Others added by overlay -->
       </tabs>
     </vbox>
 
     <tabpanels id="mainDeck" flex="1">
       <!-- General page information -->
       <vbox id="generalPanel">
-        <textbox class="header" readonly="true" id="titletext"/>
         <grid>
           <columns>
             <column/>
             <column class="gridSeparator"/>
             <column flex="1"/>
           </columns>
           <rows>
+            <row id="generalTitle">
+              <label control="titletext" value="&generalTitle;"/>
+              <separator/>
+              <textbox readonly="true" id="titletext"/>
+            </row>
             <row>
               <label control="urltext" value="&generalURL;"/>
               <separator/>
               <textbox readonly="true" id="urltext" class="urltext"/>
             </row>
             <row>
               <separator class="thin"/>
             </row>
--- a/suite/locales/en-US/chrome/browser/pageInfo.dtd
+++ b/suite/locales/en-US/chrome/browser/pageInfo.dtd
@@ -19,16 +19,17 @@
 <!ENTITY  copyLinks.accesskey       "L">
 <!ENTITY  openInNewTab.label        "Open in New Tab">
 <!ENTITY  openInNewTab.accesskey    "T">
 <!ENTITY  openInNewWindow.label     "Open in New Window">
 <!ENTITY  openInNewWindow.accesskey "W">
 
 <!ENTITY  generalTab            "General">
 <!ENTITY  generalTab.accesskey  "G">
+<!ENTITY  generalTitle          "Title:">
 <!ENTITY  generalURL            "Address:">
 <!ENTITY  generalType           "Type:">
 <!ENTITY  generalMode           "Render Mode:">
 <!ENTITY  generalSize           "Size:">
 <!ENTITY  generalReferrer       "Referring URL:">
 <!ENTITY  generalSource         "Cache Source:">
 <!ENTITY  generalModified       "Modified:">
 <!ENTITY  generalEncoding2      "Text Encoding:">
--- a/suite/locales/en-US/chrome/browser/pageInfo.properties
+++ b/suite/locales/en-US/chrome/browser/pageInfo.properties
@@ -1,17 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 pageInfo.page.title=Page Info - %S
 pageInfo.frame.title=Frame Info - %S
 
 noPageTitle=Untitled Page:
-pageTitle=%S:
 unknown=Unknown
 default=Default
 notSet=Not specified
 yes=Yes
 no=No
 
 mediaImg=Image
 mediaVideo=Video