Bug 1323968 - Port bug 1322609 and bug 1322414 to mail/ and editor/. r=jorgk CLOSED TREE

editor/ui/composer/content/editor.xul

@@ -321,7 +321,8 @@
       <vbox>
         <findbar id="FindToolbar" browserid="content-frame"/>
         <editor editortype="html"
-                type="content-primary"
+                type="content"
+                primary="true"
                 id="content-frame"
                 onclick="EditorClick(event);"
                 ondblclick="EditorDblClick(event);"

mail/base/content/mailTabs.js

@@ -497,8 +497,8 @@ var mailTabType = {
    */
   openTab: function(aTab, aIsFirstTab, aMessageDisplay, aFolderPaneVisible) {
     // Set the messagepane as the primary browser for content.
-    document.getElementById("messagepane").setAttribute("type",
-                                                        "content-primary");
+    document.getElementById("messagepane").setAttribute("type", "content");
+    document.getElementById("messagepane").setAttribute("primary", "true");
 
     aTab.messageDisplay = aMessageDisplay;
     aTab.folderDisplay = new FolderDisplayWidget(aTab, aTab.messageDisplay);
@@ -565,8 +565,7 @@ var mailTabType = {
 
   saveTabState: function(aTab) {
     // Now let other tabs have a primary browser if they want.
-    document.getElementById("messagepane").setAttribute("type",
-                                                        "content-targetable");
+    document.getElementById("messagepane").setAttribute("type", "content");
 
     this.saveFocus(aTab);
     aTab.folderDisplay.makeInactive();
@@ -699,8 +698,8 @@ var mailTabType = {
 
   showTab: function(aTab) {
     // Set the messagepane as the primary browser for content.
-    document.getElementById("messagepane").setAttribute("type",
-                                                        "content-primary");
+    document.getElementById("messagepane").setAttribute("type", "content");
+    document.getElementById("messagepane").setAttribute("primary", "true");
 
     aTab.folderDisplay.makeActive();
 

mail/base/content/messageWindow.xul

@@ -151,7 +151,7 @@
       <!-- message view -->
       <browser id="messagepane" context="mailContext" tooltip="aHTMLTooltip"
                style="height: 0px; min-height: 1px" flex="1" name="messagepane"
-               disablesecurity="true" disablehistory="true" type="content-primary"
+               disablesecurity="true" disablehistory="true" type="content" primary="true"
                onresize="return messagePaneOnResize(event);" autofind="false"
                src="about:blank" onclick="return contentAreaClick(event);" />
       <splitter id="attachment-splitter" collapse="after" resizebefore="closest" resizeafter="closest" collapsed="true"/>

mail/base/content/messenger.xul

@@ -537,8 +537,8 @@
                         <browser id="messagepane" context="mailContext"
                                  autofind="false" minheight="1" flex="1"
                                  name="messagepane" tooltip="aHTMLTooltip"
-                                 disablehistory="true" type="content-primary"
-                                 src="about:blank"
+                                 disablehistory="true" type="content"
+                                 primary="true" src="about:blank"
                                  onresize="return messagePaneOnResize(event);"
                                  disablesecurity="true"
                                  onclick="return contentAreaClick(event);"/>

mail/base/content/msgMail3PaneWindow.js

@@ -1034,7 +1034,7 @@ function GetMessagePaneWrapper()
 function GetMessagePaneFrame()
 {
   // We must use the message pane element directly here, as other tabs can
-  // have browser elements as well (which could be set to content-primary,
+  // have browser elements as well (which could be set to content primary,
   // which would confuse things with a window.content return).
   return document.getElementById("messagepane").contentWindow;
 }

mail/base/content/msgPrintEngine.xul

@@ -33,5 +33,6 @@
   <script src="chrome://messenger/content/msgPrintEngine.js"/>
 
   <!-- The main display frame -->
-  <browser id="content" type="content-primary" name="content" src="about:blank" flex="1" disablehistory="true" disablesecurity="true"/>
+  <browser id="content" type="content" primary="true" name="content"
+           src="about:blank" flex="1" disablehistory="true" disablesecurity="true"/>
 </window>

mail/base/content/specialTabs.js

@@ -285,11 +285,12 @@ var contentTabBaseType = {
   },
 
   saveTabState: function onSaveTabState(aTab) {
-    aTab.browser.setAttribute("type", "content-targetable");
+    aTab.browser.setAttribute("type", "content");
   },
 
   showTab: function onShowTab(aTab) {
-    aTab.browser.setAttribute("type", "content-primary");
+    aTab.browser.setAttribute("type", "content");
+    aTab.browser.setAttribute("primary", "true");
   },
 
   getBrowser: function getBrowser(aTab) {
@@ -677,8 +678,9 @@ var specialTabs = {
       // As we're opening this tab, showTab may not get called, so set
       // the type according to if we're opening in background or not.
       let background = ("background" in aArgs) && aArgs.background;
-      aTab.browser.setAttribute("type", background ? "content-targetable" :
-                                                     "content-primary");
+      aTab.browser.setAttribute("type", "content");
+      if (!background)
+        aTab.browser.setAttribute("primary", "true");
 
       aTab.browser.setAttribute("id", "contentTabBrowser" + this.lastBrowserId);
 

mail/base/content/specialTabs.xul

@@ -23,7 +23,7 @@
         </toolbar>
       </toolbox>
       <notificationbox flex="1" notificationside="top">
-        <browser id="dummycontentbrowser" type="content-targetable" flex="1"
+        <browser id="dummycontentbrowser" type="content" flex="1"
                  disablehistory="true" autocompletepopup="PopupAutoComplete"
                  context="mailContext"/>
       </notificationbox>

mail/components/compose/content/messengercompose.xul

@@ -1075,7 +1075,8 @@
   <!-- The mail message body frame -->
   <vbox id="appcontent" flex="1">
     <editor id="content-frame"
-            type="content-primary"
+            type="content"
+            primary="true"
             src="about:blank"
             name="browser.message.body"
             minheight="100"

mail/components/preferences/preferencesTab.xul

@@ -12,7 +12,7 @@
     <vbox id="preferencesTab" collapsed="true">
       <vbox flex="1">
         <notificationbox flex="1">
-          <browser id="preferencesbrowser" type="content-targetable" flex="1"
+          <browser id="preferencesbrowser" type="content" flex="1"
                    disablehistory="true" autocompletepopup="PopupAutoComplete"
                    context="mailContext"/>
         </notificationbox>