Bug 1408572 - Remove handleCtrlPageUpDown attribute and associated code;r=dao draft
authorBrian Grinstead <bgrinstead@mozilla.com>
Sat, 21 Oct 2017 13:06:29 -0700
changeset 684405 7e833b70e837ca0cb56c3fd2213f9a3bd3b33403
parent 683863 d1e995c8640a191cd127e87273ec96cb2fabffa9
child 736861 b4ab84d0dcfb49ee469d1b2c1d2221ede07cc63d
push id85612
push userbgrinstead@mozilla.com
push dateSat, 21 Oct 2017 20:07:39 +0000
reviewersdao
bugs1408572
milestone58.0a1
Bug 1408572 - Remove handleCtrlPageUpDown attribute and associated code;r=dao MozReview-Commit-ID: KVYtl2UMYVB
browser/base/content/tabbrowser.xml
toolkit/content/widgets/tabbox.xml
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -13,17 +13,17 @@
 
   <binding id="tabbrowser">
     <resources>
       <stylesheet src="chrome://browser/content/tabbrowser.css"/>
     </resources>
 
     <content>
       <xul:tabbox anonid="tabbox" class="tabbrowser-tabbox"
-                  flex="1" eventnode="document" xbl:inherits="handleCtrlPageUpDown,tabcontainer"
+                  flex="1" eventnode="document" xbl:inherits="tabcontainer"
                   onselect="if (event.target.localName == 'tabpanels') this.parentNode.updateCurrentBrowser();">
         <xul:tabpanels flex="1" class="plain" selectedIndex="0" anonid="panelcontainer">
           <xul:notificationbox flex="1" notificationside="top">
             <xul:hbox flex="1" class="browserSidebarContainer">
               <xul:vbox flex="1" class="browserContainer">
                 <xul:stack flex="1" class="browserStack" anonid="browserStack">
                   <xul:browser anonid="initialBrowser" type="content" message="true" messagemanagergroup="browsers"
                                primary="true" blank="true"
--- a/toolkit/content/widgets/tabbox.xml
+++ b/toolkit/content/widgets/tabbox.xml
@@ -27,30 +27,16 @@
         </setter>
         <getter>
         <![CDATA[
           return (this.getAttribute("handleCtrlTab") != "false");
         ]]>
         </getter>
       </property>
 
-      <property name="handleCtrlPageUpDown">
-        <setter>
-        <![CDATA[
-          this.setAttribute("handleCtrlPageUpDown", val);
-          return val;
-        ]]>
-        </setter>
-        <getter>
-        <![CDATA[
-          return (this.getAttribute("handleCtrlPageUpDown") != "false");
-        ]]>
-        </getter>
-      </property>
-
       <field name="_handleMetaAltArrows" readonly="true">
         /Mac/.test(navigator.platform)
       </field>
 
       <!-- _tabs and _tabpanels are deprecated, they exist only for
            backwards compatibility. -->
       <property name="_tabs" readonly="true" onget="return this.tabs;"/>
       <property name="_tabpanels" readonly="true" onget="return this.tabpanels;"/>
@@ -153,28 +139,28 @@
             case event.DOM_VK_TAB:
               if (event.ctrlKey && !event.altKey && !event.metaKey)
                 if (this.tabs && this.handleCtrlTab) {
                   this.tabs.advanceSelectedTab(event.shiftKey ? -1 : 1, true);
                   event.preventDefault();
                 }
               break;
             case event.DOM_VK_PAGE_UP:
-              if (event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey)
-                if (this.tabs && this.handleCtrlPageUpDown) {
-                  this.tabs.advanceSelectedTab(-1, true);
-                  event.preventDefault();
-                }
+              if (event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey &&
+                  this.tabs) {
+                this.tabs.advanceSelectedTab(-1, true);
+                event.preventDefault();
+              }
               break;
             case event.DOM_VK_PAGE_DOWN:
-              if (event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey)
-                if (this.tabs && this.handleCtrlPageUpDown) {
-                  this.tabs.advanceSelectedTab(1, true);
-                  event.preventDefault();
-                }
+              if (event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey &&
+                  this.tabs) {
+                this.tabs.advanceSelectedTab(1, true);
+                event.preventDefault();
+              }
               break;
             case event.DOM_VK_LEFT:
               if (event.metaKey && event.altKey && !event.shiftKey && !event.ctrlKey)
                 if (this.tabs && this._handleMetaAltArrows) {
                   var offset = window.getComputedStyle(this)
                                      .direction == "ltr" ? -1 : 1;
                   this.tabs.advanceSelectedTab(offset, true);
                   event.preventDefault();