Commit 909ee1f5 authored by Sebastian Hengst's avatar Sebastian Hengst
Browse files

merge autoland to mozilla-central. r=merge a=merge 

MozReview-Commit-ID: 6jFAhVr6aqT
parents ef0d419a 5b44721f

browser/base/content/browser.js

+0 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,6 @@ var gBrowserInit = { 
    if (!window.toolbar.visible) {

      // adjust browser UI for popups

      gURLBar.setAttribute("readonly", "true");

      gURLBar.setAttribute("enablehistory", "false");

    }



    // Misc. inits.

browser/base/content/browser.xul

+0 −1
Original line number Diff line number Diff line
@@ -779,7 +779,6 @@ 
                     tabscrolling="true"

                     showcommentcolumn="true"

                     showimagecolumn="true"

                     enablehistory="true"

                     newlines="stripsurroundingwhitespace"

                     ontextentered="this.handleCommand(param);"

                     ontextreverted="return this.handleRevert();"

browser/base/content/tabbrowser.xml

+10 −10
Original line number Diff line number Diff line
@@ -6414,7 +6414,7 @@ 


      <field name="_firstTab">null</field>

      <field name="_lastTab">null</field>

      <field name="_afterSelectedTab">null</field>

      <field name="_beforeSelectedTab">null</field>

      <field name="_beforeHoveredTab">null</field>

      <field name="_afterHoveredTab">null</field>

      <field name="_hoveredTab">null</field>
@@ -6547,15 +6547,15 @@ 


          let selectedIndex = visibleTabs.indexOf(this.selectedItem);



          let lastVisible = visibleTabs.length - 1;

          if (this._beforeSelectedTab) {

            this._beforeSelectedTab.removeAttribute("beforeselected-visible");

          }



          if (this._afterSelectedTab)

            this._afterSelectedTab.removeAttribute("afterselected-visible");

          if (this.selectedItem.closing || selectedIndex == lastVisible) {

            this._afterSelectedTab = null;

          if (this.selectedItem.closing || selectedIndex == 0) {

            this._beforeSelectedTab = null;

          } else {

            this._afterSelectedTab = visibleTabs[selectedIndex + 1];

            this._afterSelectedTab.setAttribute("afterselected-visible",

            this._beforeSelectedTab = visibleTabs[selectedIndex - 1];

            this._beforeSelectedTab.setAttribute("beforeselected-visible",

                                                 "true");

          }
@@ -6565,7 +6565,7 @@ 
          this._firstTab.setAttribute("first-visible-tab", "true");

          if (this._lastTab)

            this._lastTab.removeAttribute("last-visible-tab");

          this._lastTab = visibleTabs[lastVisible];

          this._lastTab = visibleTabs[visibleTabs.length - 1];

          this._lastTab.setAttribute("last-visible-tab", "true");



          let hoveredTab = this._hoveredTab;

browser/base/content/test/general/browser.ini

+0 −2
Original line number Diff line number Diff line
@@ -227,8 +227,6 @@ skip-if = toolkit != "cocoa" # Because of tests for supporting pasting from Serv 
# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

[browser_bug581253.js]

# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

[browser_bug585558.js]

# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

[browser_bug585785.js]

# DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.

[browser_bug585830.js]

browser/base/content/test/tabs/browser.ini

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ skip-if = !e10s # Test only relevant for e10s. 
skip-if = !e10s # Pref and test only relevant for e10s.

[browser_opened_file_tab_navigated_to_web.js]

[browser_overflowScroll.js]

[browser_positional_attributes.js]

[browser_preloadedBrowser_zoom.js]

[browser_reload_deleted_file.js]

[browser_tabswitch_updatecommands.js]